From 31d43ab84d84fd91f4cbf239af510394b88ef8ae Mon Sep 17 00:00:00 2001 From: Pasi Kallinen Date: Wed, 14 Mar 2018 11:04:50 +0200 Subject: [PATCH] Bug 20395: Change paycollect to use Price formatter Test plan: 1) Apply patch 2) Go to Home -> Patrons -> Patron details (for any patron) 3) Create manual invoice for the patron 4) Pay fines -> Pay -button 5) Check that the currency values look correct 6) Pay fines -> Pay amount -button 7) Check that the currency values look correct 8) Pay fines -> Pay selected -button 9) Check that the currency values look correct 10) Change the CurrencyFormat setting 11) Repeat 2-9 Signed-off-by: Pasi Kallinen Signed-off-by: Martin Renvoize Signed-off-by: Tomas Cohen Arazi (cherry picked from commit c1784437b4962bee46cd801967bbeb75a3f33fec) Signed-off-by: Lucas Gass (cherry picked from commit 75c74c469d72c2b68a33018566a978a62113bd0a) Signed-off-by: Arthur Suzuki --- .../prog/en/modules/members/paycollect.tt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) 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 d2246e4a1a..09dcfc08fb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt @@ -95,12 +95,12 @@
[% IF ( error_over ) %]
- You must pay a value less than or equal to [% total_due | format('%.2f') %]. + You must pay a value less than or equal to [% total_due | $Price %].
[% END %] [% IF ( error_under ) %]
- You must collect a value greater than or equal to [% total_paid | format('%.2f') %]. + You must collect a value greater than or equal to [% total_paid | $Price %].
[% END %] @@ -138,7 +138,7 @@ Amount outstanding - Total amount payable:[% amountoutstanding | format('%.2f') %] + Total amount payable:[% amountoutstanding | $Price %] @@ -146,8 +146,8 @@ [% line.debit_type_code = debit_type_code %] [% PROCESS account_type_description account=line %] - [% amount | format('%.2f') %] - [% amountoutstanding | format('%.2f') %] + [% amount | $Price %] + [% amountoutstanding | $Price %] @@ -215,13 +215,13 @@ Amount Amount outstanding - Total amount outstanding:[% amountoutstanding | format('%.2f') %] + Total amount outstanding:[% amountoutstanding | $Price %] [% individual_description | html %] [% line.debit_type_code = debit_type_code %] [% PROCESS account_type_description account=line %] - [% amount | format('%.2f') %] - [% amountoutstanding | format('%.2f') %] + [% amount | $Price %] + [% amountoutstanding | $Price %] @@ -277,7 +277,7 @@
  1. Total amount outstanding: - [% total | format('%.2f') %] + [% total | $Price %]
  2. [% IF type == 'WRITEOFF' %] -- 2.39.5