From 3177e0f1986f4982e843cbf36b4a4e63b1f54680 Mon Sep 17 00:00:00 2001 From: Alex Buckley Date: Mon, 17 Apr 2017 05:04:51 +0000 Subject: [PATCH] Bug 2454 - Amended patch: Removed the display of accountype, Notify ID, Level values for manual credit in pay.tt and replaced the description with string "Credit" Reimplemented accounttype column but kept the notifyid a nd level columns These specific values have been removed because this bug report requires the manual credit to no longer be shown on the 'Pay fines' tab. In response to comment 4 (thankyou for noticing that Felix) I have redone this patch so users can now successfully pay or write off manual credits because the manual credit values although not being displayed are still being submitted to pay.pl. Test plan: 1. From the Koha staff interface go the Patron area and select a patron page 2. Create a fine of $10 for the patron by clicking on the 'Fines' tab and creating a fine in the 'Create manual invoice' tab 3. Create a credit of $5 for the patron in the 'Create manual credit' page 4. Then go to the 'Pay fines' tab and notice there is a row for both the fine and credit both with values in the account type, Notify ID, and level boxes of the table 5. Select "write off all" and 'OK' in the confirmation box 6. Youre redirected to Account tab, return to 'pay fines' tab and notice no fines or credits are displayed 7. Repeat steps 2, 3, 4 and then click "Pay amount", confirm it, then navigate back to the 'Pay fines' tab and notice although the fine and credit are displayed the 'total due' value is 0.00 8. Apply the patch attached to this bug report 9. Repeat steps 2, and 3. 10. Navigate to 'Pay fines' tab and notice the fine has values in account type, Notify ID, and level and the credit does not. Additionally credit has the description value of 'Credit' 11. Repeat steps 5 and 6 and as with before this patch was applied notice the 'Pay fines' tab does not show any fines or credits 12. Repeat step 7 and again notice the 'Total due' value is 0.00 Bug 2454 - Reimplemented accounttype column but kept the notifyid and level columns --- .../intranet-tmpl/prog/en/modules/members/pay.tt | 64 ++++++++++++---------- 1 file changed, 36 insertions(+), 28 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt index 092cc0d..87e3a03 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt @@ -101,6 +101,7 @@ function enableCheckboxActions(){ [% END %] + [% IF ( line.amountoutstanding > 0 ) %] [% IF CAN_user_updatecharges_writeoff %][% END %] @@ -117,35 +118,42 @@ function enableCheckboxActions(){ - [% SWITCH line.accounttype %] - [% CASE 'Pay' %]Payment, thanks - [% CASE 'Pay00' %]Payment, thanks (cash via SIP2) - [% CASE 'Pay01' %]Payment, thanks (VISA via SIP2) - [% CASE 'Pay02' %]Payment, thanks (credit card via SIP2) - [% CASE 'N' %]New card - [% CASE 'F' %]Fine - [% CASE 'A' %]Account management fee - [% CASE 'M' %]Sundry - [% CASE 'L' %]Lost item - [% CASE 'W' %]Writeoff - [% CASE 'FU' %]Accruing fine - [% CASE 'HE' %]Hold waiting too long - [% CASE 'Rent' %]Rental fee - [% CASE 'FOR' %]Forgiven - [% CASE 'LR' %]Lost item fee refund - [% CASE 'PAY' %]Payment - [% CASE 'WO' %]Writeoff - [% CASE 'C' %]Credit - [% CASE 'CR' %]Credit - [% CASE %][% line.accounttype %] - [%- END -%] - [%- IF line.description %], [% line.description %][% END %] - [% IF line.title %]([% line.title %])[% END %] + [% SWITCH line.accounttype %] + [% CASE 'Pay' %]Payment, thanks + [% CASE 'Pay00' %]Payment, thanks (cash via SIP2) + [% CASE 'Pay01' %]Payment, thanks (VISA via SIP2) + [% CASE 'Pay02' %]Payment, thanks (credit card via SIP2) + [% CASE 'N' %]New card + [% CASE 'F' %]Fine + [% CASE 'A' %]Account management fee + [% CASE 'M' %]Sundry + [% CASE 'L' %]Lost item + [% CASE 'W' %]Writeoff + [% CASE 'FU' %]Accruing fine + [% CASE 'HE' %]Hold waiting too long + [% CASE 'Rent' %]Rental fee + [% CASE 'FOR' %]Forgiven + [% CASE 'LR' %]Lost item fee refund + [% CASE 'PAY' %]Payment + [% CASE 'WO' %]Writeoff + [% CASE 'C' %]Credit + [% CASE 'CR' %]Credit + [% CASE %][% line.accounttype %] + [%- END -%] + [%- IF line.description %], [% line.description %][% END %] + [% IF line.title %]([% line.title %])[% END %] - - [% line.accounttype %] - [% line.notify_id %] - [% line.notify_level %] + [% IF (line.amountoutstanding > 0) %] + + [% line.accounttype %] + [% line.notify_id %] + [% line.notify_level %] + [% ELSE %] + + + + + [% END %] [% line.amount | $Price %] [% line.amountoutstanding | $Price %] -- 2.1.4