From 778b78da1ec50a49411a2b9c210cd24057265030 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Wed, 30 Apr 2014 21:14:50 +0200 Subject: [PATCH] Bug 12165: Add descriptions of charges (bug 2546) to Bootstrap Opac theme 1) Create an account with lots of different charges, fines, fees, etc. 2) Look at the accouts tab in the prog OPAC theme 3) Compare the page to bootstrap theme 4) Verify display is now the same In my tests I found some things that could still be improved, but for the goal is to make all OPAC themes behave the same. --- .../opac-tmpl/bootstrap/en/modules/opac-account.tt | 21 ++++++++++++++++++--- 1 file changed, 18 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 aa70431..256a6d3 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt @@ -48,8 +48,23 @@ [% FOREACH ACCOUNT_LINE IN ACCOUNT_LINES %] [% IF ( ACCOUNT_LINE.odd ) %][% ELSE %][% END %] [% ACCOUNT_LINE.date | $KohaDates %] - [% ACCOUNT_LINE.description %] - [% IF ( ACCOUNT_LINE.title ) %][% ACCOUNT_LINE.title |html %][% END %] + + [% SWITCH ACCOUNT_LINE.accounttype %] + [% CASE 'Pay' %]Payment,thanks + [% CASE 'Pay00' %]Payment,thanks (cash via SIP2) + [% CASE 'Pay01' %]Payment,thanks (VISA via SIP2) + [% CASE 'Pay02' %]Payment,thanks (credit card via SIP2) + [% CASE 'N' %]New Card + [% CASE 'F' %]Fine + [% CASE 'A' %]Account management fee + [% CASE 'M' %]Sundry + [% CASE 'L' %]Lost Item + [% CASE 'W' %]Writeoff + [% CASE %][% ACCOUNT_LINE.accounttype %] + [%- END -%] + [%- IF ACCOUNT_LINE.description %], [% ACCOUNT_LINE.description %][% END %] + [% IF line.title %]([% line.title |html_entity %])[% END %] + [% IF ( ACCOUNT_LINE.amountcredit ) %][% ELSE %][% END %][% ACCOUNT_LINE.amount %] [% IF ( ACCOUNT_LINE.amountoutstandingcredit ) %][% ELSE %][% END %][% ACCOUNT_LINE.amountoutstanding %] @@ -67,4 +82,4 @@ [% INCLUDE 'opac-bottom.inc' %] -[% BLOCK jsinclude %][% END %] \ No newline at end of file +[% BLOCK jsinclude %][% END %] -- 1.8.3.2