Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 20395: Change paycollect to use Price formatter

Browse source 
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 c1784437b4)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
This commit is contained in:
Pasi Kallinen 2018-03-14 11:04:50 +02:00 committed by Lucas Gass
parent 1ad034be21
commit 75c74c469d
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
View file

@ -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' %]