From 19d8f790d711df7042a3c741c804114dd9b62885 Mon Sep 17 00:00:00 2001
From: Katrin Fischer <Katrin.Fischer.83@web.de>
Date: Wed, 30 Apr 2014 21:14:50 +0200
Subject: [PATCH] Bug 12165: Add descriptions of charges (bug 2546) to
 Bootstrap Opac theme
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

1) Create an account with lots of different charges, fines, fees, etc.
2) Look at the accounts 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.

Signed-off-by: Marc Véron <veron@veron.ch>

Tested by changing accounttype in table accountlines to all possible
values like Pay, Pay00, Pay01 etc.  Both themes display the same values,
e.g. "Payment, thanks (cash via SIP2)" for Pay00

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
---
 .../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 aa70431249..256a6d3c7e 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 ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
                                         <td>[% ACCOUNT_LINE.date | $KohaDates %]</td>
-                                        <td>[% ACCOUNT_LINE.description %]
-                                        [% IF ( ACCOUNT_LINE.title ) %][% ACCOUNT_LINE.title |html %][% END %]</td>
+                                        <td>
+                                          [% 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 %]
+                                        </td>
                                         [% IF ( ACCOUNT_LINE.amountcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% ACCOUNT_LINE.amount %]</td>
                                         [% IF ( ACCOUNT_LINE.amountoutstandingcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% ACCOUNT_LINE.amountoutstanding %]</td>
                                     </tr>
@@ -67,4 +82,4 @@
 </div> <!-- / .main -->
 
 [% INCLUDE 'opac-bottom.inc' %]
-[% BLOCK jsinclude %][% END %]
\ No newline at end of file
+[% BLOCK jsinclude %][% END %]
-- 
2.39.5