From 31d43ab84d84fd91f4cbf239af510394b88ef8ae Mon Sep 17 00:00:00 2001
From: Pasi Kallinen <pasi.kallinen@joensuu.fi>
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 <pasi.kallinen@joensuu.fi>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit c1784437b4962bee46cd801967bbeb75a3f33fec)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 75c74c469d72c2b68a33018566a978a62113bd0a)
Signed-off-by: Arthur Suzuki <arthur.suzuki@biblibre.com>
---
 .../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 @@
 <div class="tabs-container">
 [% IF ( error_over ) %]
     <div id="error_message" class="dialog alert">
-    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 %].
     </div>
 [% END %]
 [% IF ( error_under ) %]
     <div id="error_message" class="dialog alert">
-    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 %].
     </div>
 [% END %]
 
@@ -138,7 +138,7 @@
             <th>Amount outstanding</th>
         </tr></thead>
     <tfoot>
-        <tr><td colspan="3">Total amount payable:</td><td>[% amountoutstanding | format('%.2f') %]</td></tr>
+        <tr><td colspan="3">Total amount payable:</td><td>[% amountoutstanding | $Price %]</td></tr>
     </tfoot>
     <tbody><tr>
             <td>
@@ -146,8 +146,8 @@
             </td>
             [% line.debit_type_code = debit_type_code %]
             <td>[% PROCESS account_type_description account=line %]</td>
-            <td class="debit">[% amount | format('%.2f') %]</td>
-            <td class="debit">[% amountoutstanding | format('%.2f') %]</td>
+            <td class="debit">[% amount | $Price %]</td>
+            <td class="debit">[% amountoutstanding | $Price %]</td>
         </tr></tbody>
 </table>
 
@@ -215,13 +215,13 @@
             <th>Amount</th>
             <th>Amount outstanding</th>
         </tr></thead>
-    <tfoot><tr><td colspan="3">Total amount outstanding:</td><td>[% amountoutstanding | format('%.2f') %]</td></tr></tfoot>
+    <tfoot><tr><td colspan="3">Total amount outstanding:</td><td>[% amountoutstanding | $Price %]</td></tr></tfoot>
     <tbody><tr>
             <td>[% individual_description | html %]</td>
             [% line.debit_type_code = debit_type_code %]
             <td>[% PROCESS account_type_description account=line %]</td>
-            <td class="debit">[% amount | format('%.2f') %]</td>
-            <td class="debit">[% amountoutstanding | format('%.2f') %]</td>
+            <td class="debit">[% amount | $Price %]</td>
+            <td class="debit">[% amountoutstanding | $Price %]</td>
         </tr></tbody>
     </table>
 
@@ -277,7 +277,7 @@
     <ol>
         <li>
             <span class="label">Total amount outstanding: </span>
-            <span class="debit">[% total | format('%.2f') %]</span>
+            <span class="debit">[% total | $Price %]</span>
         </li>
     <li>
         [% IF type == 'WRITEOFF' %]
-- 
2.39.5