@@ -, +, @@
and Pay fines tables
- Apply patch
- Give a patron a high fine or credit (e.g. 12345.67)
- Got to pages Home > Patrons > Accounts for... and
Home > Patrons > Pay fines
- Verify that amounts display following syspref 'CurrencyFormat'
(e.g. 12'345.67 for syspref set to 360'000.00 (CH)
---
koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt | 9 +++++----
koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt | 11 ++++++-----
2 files changed, 11 insertions(+), 9 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
@@ -1,6 +1,7 @@
[% USE Koha %]
[% USE KohaDates %]
[% USE ColumnsSettings %]
+[% USE Price %]
[% INCLUDE 'doc-head-open.inc' %]
Koha › Patrons › Account for [% INCLUDE 'patron-title.inc' %]
[% INCLUDE 'doc-head-close.inc' %]
@@ -108,8 +109,8 @@ $(document).ready(function() {
[%- IF account.description %], [% account.description %][% END %]
[% IF ( account.itemnumber ) %][% account.title |html %][% END %]
[% account.note | html_line_break %] |
- [% IF ( account.amountcredit ) %][% ELSE %] | [% END %][% account.amount %] |
- [% IF ( account.amountoutstandingcredit ) %][% ELSE %] | [% END %][% account.amountoutstanding %] |
+ [% IF ( account.amountcredit ) %][% ELSE %] | [% END %][% account.amount | $Price %] |
+ [% IF ( account.amountoutstandingcredit ) %][% ELSE %] | [% END %][% account.amountoutstanding | $Price %] |
[% IF ( account.payment ) %]
Print
@@ -131,9 +132,9 @@ $(document).ready(function() {
|
Total due |
[% IF ( totalcredit ) %]
- [% total %] |
+ [% total | $Price %] |
[% ELSE %]
- [% total %] |
+ [% total | $Price %] |
[% END %]
|
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
@@ -1,6 +1,7 @@
[% USE Koha %]
[% USE AuthorisedValues %]
[% USE Branches %]
+[% USE Price %]
[% INCLUDE 'doc-head-open.inc' %]
Koha › Patrons › Pay Fines for [% borrower.firstname %] [% borrower.surname %]
[% INCLUDE 'doc-head-close.inc' %]
@@ -19,7 +20,7 @@ function enableCheckboxActions(){
$(document).ready(function(){
$('#pay-fines-form').preventDoubleFormSubmit();
$("#woall").click(function(event){
- var msg = _("Are you sure you want to write off %s in outstanding fines? This cannot be undone!").format( "[% total | format('%.2f') %]" );
+ var msg = _("Are you sure you want to write off %s in outstanding fines? This cannot be undone!").format( "[% total | $Price %]" );
var answer = confirm(msg);
if (!answer){
event.preventDefault();
@@ -87,7 +88,7 @@ function enableCheckboxActions(){
Total due: |
- [% total | format('%.2f') %] |
+ [% total | $Price %] |
@@ -145,15 +146,15 @@ function enableCheckboxActions(){
[% line.accounttype %] |
[% line.notify_id %] |
[% line.notify_level %] |
- [% line.amount | format('%.2f') %] |
- [% line.amountoutstanding | format('%.2f') %] |
+ [% line.amount | $Price %] |
+ [% line.amountoutstanding | $Price %] |
[% END %]
[% IF ( account_grp.total ) %]
Sub total: |
- [% account_grp.total | format('%.2f') %] |
+ [% account_grp.total | $Price %] |
[% END %]
[% END %]
--