From d76737ba7d41bc261b59a2ea2cf4c591a62a0bc4 Mon Sep 17 00:00:00 2001 From: Marc Date: Mon, 8 Aug 2016 14:04:44 +0200 Subject: [PATCH] Bug 17078 - Format fines on opac-account.pl To verify: - Log in to OPAC as a user who has fines or credits - Go to page "your fines" - Verify that values for "Fine amount", "Amount outstanding" and "Total due" are not formatted as defined in syspref CurrencyFormat (e.g. for FR) To test: - Apply patch - Repeat steps above - Verify that values are formatted as appropriate with different settings for syspref CurrencyFormat Note: This patch does not force text alignment to the right. Text alignement can be done using syspref OPACUserCSS (td.sum, td.credit, td.debit) Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall --- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt index 289acfdb50..e38b10d6c8 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt @@ -1,5 +1,6 @@ [% USE Koha %] [% USE KohaDates %] +[% USE Price %] [% SET ENABLE_OPAC_PAYMENTS = Koha.Preference('EnablePayPalOpacPayments') %] [% SET DISPLAY_PAYMENT_BLOCK = 0 %] @@ -84,7 +85,7 @@ [%- SET COLSPAN = 3 -%] [%- END -%] Total due - [% total %] + [% total | $Price %] @@ -127,8 +128,8 @@ [%- IF ACCOUNT_LINE.description %], [% ACCOUNT_LINE.description %][% END %] [% IF ACCOUNT_LINE.title %]([% ACCOUNT_LINE.title %])[% END %] - [% IF ( ACCOUNT_LINE.amountcredit ) %][% ELSE %][% END %][% ACCOUNT_LINE.amount %] - [% IF ( ACCOUNT_LINE.amountoutstandingcredit ) %][% ELSE %][% END %][% ACCOUNT_LINE.amountoutstanding %] + [% IF ( ACCOUNT_LINE.amountcredit ) %][% ELSE %][% END %][% ACCOUNT_LINE.amount | $Price %] + [% IF ( ACCOUNT_LINE.amountoutstandingcredit ) %][% ELSE %][% END %][% ACCOUNT_LINE.amountoutstanding | $Price %] [% END %] -- 2.39.5