Attachment 136484 Details for Bug 20395 – Bug 20395: Change paycollect to use Price formatter

[patch] Bug 20395: Change paycollect to use Price formatter

Bug-20395-Change-paycollect-to-use-Price-formatter.patch (text/plain), 3.72 KB, created by Martin Renvoize (ashimema) on 2022-06-24 10:14:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2022-06-24 10:14:07 UTC

Size: 3.72 KB

patch

obsolete

>From ebbb9301977081aad7476600fc4cd4b96f374cf9 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>
>---
> .../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 20e588ab18..125ccc6e10 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
>@@ -112,12 +112,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 %]
> 
>@@ -154,7 +154,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>
>@@ -162,8 +162,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>
> 
>@@ -245,13 +245,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>
> 
>@@ -307,7 +307,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.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 20395: 72903 | 72976 | 73057 | 73058 | 136484 | 136485 | 136503