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

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

0001-Bug-20395-Change-paycollect-to-use-Price-formatter.patch (text/plain), 4.52 KB, created by paxed on 2018-03-15 07:43:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: paxed

Created: 2018-03-15 07:43:37 UTC

Size: 4.52 KB

patch

obsolete

>From 0f5e0ed6011da2f9a019a2d3eae959c7363a5abc 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>
>---
> .../prog/en/modules/members/paycollect.tt          | 23 +++++++++++-----------
> 1 file changed, 12 insertions(+), 11 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 39df1437c0..56a73214ce 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
>@@ -1,5 +1,6 @@
> [% USE Koha %]
> [% USE Branches %]
>+[% USE Price %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Koha &rsaquo; Patrons &rsaquo; Collect fine payment for  [% patron.firstname %] [% patron.surname %]</title>
>@@ -38,7 +39,7 @@
> <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 %]
> 
>@@ -66,15 +67,15 @@
>             <th>Amount outstanding</th>
>         </tr></thead>
>     <tfoot>
>-        <td colspan="3">Total amount payable:</td><td>[% amountoutstanding | format('%.2f') %]</td>
>+        <td colspan="3">Total amount payable:</td><td>[% amountoutstanding | $Price %]</td>
>     </tfoot>
>     <tbody><tr>
>             <td>
>                 [% individual_description %]
>             </td>
>             <td>[% accounttype %]</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>
> 
>@@ -83,7 +84,7 @@
>     <li>
>         <label for="paid">Collect from patron: </label>
>             
>-        <input name="paid" id="paid" value="[% amountoutstanding %]" />
>+        <input name="paid" id="paid" value="[% amountoutstanding | $Price on_editing => 1 %]" />
>     </li>
> </ol>
> </fieldset>
>@@ -112,12 +113,12 @@
>             <th>Amount</th>
>             <th>Amount outstanding</th>
>         </tr></thead>
>-    <tfoot><td colspan="3">Total amount outstanding:</td><td>[% amountoutstanding | format('%.2f') %]</td></tfoot>
>+    <tfoot><td colspan="3">Total amount outstanding:</td><td>[% amountoutstanding | $Price %]</td></tfoot>
>     <tbody><tr>
>             <td>[% description %] [% title %]</td>
>             <td>[% accounttype %]</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>
> 
>@@ -125,7 +126,7 @@
>                 <li>
>                     <label for="paid">Writeoff amount: </label>
>                     
>-                    <input name="amountwrittenoff" id="amountwrittenoff" value="[% amountoutstanding %]" />
>+                    <input name="amountwrittenoff" id="amountwrittenoff" value="[% amountoutstanding | $Price on_editing => 1 %]" />
>                 </li>
>             </ol>
>         </fieldset>
>@@ -145,12 +146,12 @@
>     <ol>
>         <li>
>             <span class="label">Total amount outstanding: </span>
>-            <span class="debit">[% total | format('%.2f') %]</span>
>+            <span class="debit">[% total | $Price %]</span>
>         </li>
>     <li>
>         <label for="paid">Collect from patron: </label>
>         
>-        <input name="paid" id="paid" value="[% total | format('%.2f') %]" />
>+        <input name="paid" id="paid" value="[% total | $Price on_editing => 1 %]" />
>     </li>
>     <li>
>         <label for="selected_accts_notes">Note: </label>
>-- 
>2.11.0
>

Actions: View | Diff | Splinter Review

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