From 5e63e0b5a7ad15e64e961639a8e40890636c4325 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 27 Jun 2014 14:21:03 -0400 Subject: [PATCH] [PASSED QA] Bug 12429 [staff client] patron seeing fines codes Bug 2546 introduced translatable handling of Koha account type codes but missed several codes. This patch adds handling of these codes to the staff client. This patch also corrects a couple of instances of incorrect capitalization. To test, apply the patch and view fines page (Patron details -> Fines) and the pay fines page (Patron details -> Fines -> Pay fines). You should not see any account type codes like CR, LR, or FU. Signed-off-by: Aleisha Signed-off-by: Katrin Fischer --- .../prog/en/modules/members/boraccount.tt | 20 ++++++++++++++------ .../intranet-tmpl/prog/en/modules/members/pay.tt | 20 ++++++++++++++------ 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt index 1debd29..26808a3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt @@ -46,16 +46,24 @@ [% account.date %] [% SWITCH account.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 '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 'L' %]Lost item [% CASE 'W' %]Writeoff + [% CASE 'FU' %]Accruing fine + [% 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 %][% account.accounttype %] [%- END -%] [%- IF account.description %], [% account.description %][% END %] 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 c35131d..7ba26d8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt @@ -115,16 +115,24 @@ 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 '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 'L' %]Lost item [% CASE 'W' %]Writeoff + [% CASE 'FU' %]Accruing fine + [% 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 %] -- 1.9.1