Bugzilla – Attachment 67361 Details for
Bug 5620
Capture Mode of payment
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 5620 - Patch corrections, fixes to template files
Bug-5620---Patch-corrections-fixes-to-template-fil.patch (text/plain), 3.76 KB, created by
David Bourgault
on 2017-09-26 14:59:05 UTC
(
hide
)
Description:
Bug 5620 - Patch corrections, fixes to template files
Filename:
MIME Type:
Creator:
David Bourgault
Created:
2017-09-26 14:59:05 UTC
Size:
3.76 KB
patch
obsolete
>From 5de351cbf604acf1ab6d2118b187aff3d88dec63 Mon Sep 17 00:00:00 2001 >From: David Bourgault <david.bourgault@inlibro.com> >Date: Tue, 26 Sep 2017 10:58:21 -0400 >Subject: [PATCH] Bug 5620 - Patch corrections, fixes to template files > >Patch should now apply >Small fixes to use of template plugin AuthorisedValues >--- > .../atomicupdate/bug5620_Add_Mode_Of_Payment.sql | 6 ++-- > .../prog/en/modules/members/paycollect.tt | 34 ++++++++++------------ > 2 files changed, 19 insertions(+), 21 deletions(-) > >diff --git a/installer/data/mysql/atomicupdate/bug5620_Add_Mode_Of_Payment.sql b/installer/data/mysql/atomicupdate/bug5620_Add_Mode_Of_Payment.sql >index 2dc58ea..b3e8196 100644 >--- a/installer/data/mysql/atomicupdate/bug5620_Add_Mode_Of_Payment.sql >+++ b/installer/data/mysql/atomicupdate/bug5620_Add_Mode_Of_Payment.sql >@@ -1,6 +1,6 @@ > ALTER table accountlines ADD COLUMN paymentmode TEXT NOT NULL; > INSERT INTO authorised_value_categories VALUES ('PAYMODE'); > INSERT INTO authorised_values (category, authorised_value, lib, lib_opac) VALUES >-('PAYMODE','CASH','Cash', 'Cash'), >-('PAYMODE','CC','Credit Card', 'Credit Card'), >-('PAYMODE','DEBIG','Debit', 'Debit'); >+('PAYMODE','CASH', 'Cash', 'Cash'), >+('PAYMODE','CC', 'Credit Card', 'Credit Card'), >+('PAYMODE','DEBIT', 'Debit', 'Debit'); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt >index 606063e..3e52214 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt >@@ -152,11 +152,10 @@ function moneyFormat(textObj) { > <label for="paymentmode">Payment mode: </label> > <select name="paymentmode" id="paymentmode"> > [% FOREACH paymentmode IN AuthorisedValues.GetAuthValueDropbox('PAYMODE') %] >- <option value="[% paymentmode.value %]">[% paymentmode.label %]</option> >+ <option value="[% paymentmode.authorised_value %]">[% paymentmode.lib %]</option> > [% END %] > </select> > </li> >- > </ol> > </fieldset> > >@@ -216,24 +215,23 @@ function moneyFormat(textObj) { > <span class="label">Total amount outstanding: </span> > <span class="debit">[% total | format('%.2f') %]</span> > </li> >- <li> >- <label for="paid">Collect from patron: </label> >- <!-- default to paying all --> >- <input name="paid" id="paid" value="[% total | format('%.2f') %]" /> >- </li> >- <li> >- <label for="paymentmode">Payment mode: </label> >- <select name="paymentmode" id="paymentmode"> >- [% FOREACH paymentmode IN AuthorisedValues.GetAuthValueDropbox('PAYMODE') %] >- <option value="[% paymentmode.value %]">[% paymentmode.label %]</option> >- [% END %] >- </select> >- </li> >- >- <li> >+ <li> >+ <label for="paid">Collect from patron: </label> >+ <!-- default to paying all --> >+ <input name="paid" id="paid" value="[% total | format('%.2f') %]" /> >+ </li> >+ <li> >+ <label for="paymentmode">Payment mode: </label> >+ <select name="paymentmode" id="paymentmode"> >+ [% FOREACH paymentmode IN AuthorisedValues.GetAuthValueDropbox('PAYMODE') %] >+ <option value="[% paymentmode.authorised_value %]">[% paymentmode.lib %]</option> >+ [% END %] >+ </select> >+ </li> >+ <li> > <label for="selected_accts_notes">Note: </label> > <textarea name="selected_accts_notes" id="selected_accts_notes">[% selected_accts_notes %]</textarea> >- </li> >+ </li> > </ol> > </fieldset> > <div class="action"><input type="submit" name="submitbutton" value="Confirm" /> >-- >2.7.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 5620
:
2997
|
51290
|
56036
|
56037
|
56080
|
60994
|
60996
|
67361
|
67362
|
67394
|
67603
|
67634
|
67661
|
69002