Bug 22511: (QA follow-up) Refactor status description in templates

[koha-equinox.git] / koha-tmpl / opac-tmpl / bootstrap / en / includes / account-table.inc

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc
index dc0c6e3..e2bb1a1 100644 (file)
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc
@@ -16,7 +16,7 @@
 
         <tbody>
             [% FOREACH ACCOUNT_LINE IN ACCOUNT_LINES %]
-                [% IF ( ACCOUNT_LINE.odd ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
+                <tr>
                     [% IF ENABLE_OPAC_PAYMENTS %]
                         <td>
                             [% IF ACCOUNT_LINE.amountoutstanding > 0 %]
@@ -29,22 +29,20 @@
                     <td><span title="[% ACCOUNT_LINE.date | html %]">[% ACCOUNT_LINE.date | $KohaDates %]</span></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 'Pay' %]Payment
+                        [% CASE 'Pay00' %]Payment (cash via SIP2)
+                        [% CASE 'Pay01' %]Payment (VISA via SIP2)
+                        [% CASE 'Pay02' %]Payment (credit card via SIP2)
                         [% CASE 'VOID' %]Voided
                         [% CASE 'N' %]New card
-                        [% CASE 'F' %]Fine
+                        [% CASE 'OVERDUE' %]Fine
                         [% CASE 'A' %]Account management fee
                         [% CASE 'M' %]Sundry
                         [% CASE 'L' %]Lost item
                         [% CASE 'W' %]Writeoff
-                        [% CASE 'FU' %]Accruing fine
                         [% CASE 'HE' %]Hold waiting too long
                         [% CASE 'Rent' %]Rental fee
                         [% CASE 'FOR' %]Forgiven
-                        [% CASE 'FFOR' %]Fine forgiven
                         [% CASE 'LR' %]Lost item fee refund
                         [% CASE 'PF' %]Lost item processing fee
                         [% CASE 'PAY' %]Payment
@@ -54,14 +52,15 @@
                         [%-CASE 'Res' %]Hold fee
                         [% CASE %][% ACCOUNT_LINE.accounttype | html %]
                         [%- END -%]
+                        [%- PROCESS account_status_description account=ACCOUNT_LINE -%]
                     </td>
                     <td>
                         [%- IF ACCOUNT_LINE.payment_type %][% AuthorisedValues.GetByCode('PAYMENT_TYPE', ACCOUNT_LINE.payment_type, 1) | html %][% END %]
                         [%- IF ACCOUNT_LINE.description %][% ACCOUNT_LINE.description | html %][% END %]
-                        [% IF ACCOUNT_LINE.title %]([% ACCOUNT_LINE.title | html %])[% END %]
+                        [% IF ACCOUNT_LINE.itemnumber %]([% ACCOUNT_LINE.item.biblio.title | html %])[% END %]
                     </td>
-                    [% IF ( ACCOUNT_LINE.amountcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% ACCOUNT_LINE.amount | $Price %]</td>
-                    [% IF ( ACCOUNT_LINE.amountoutstandingcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% ACCOUNT_LINE.amountoutstanding | $Price %]</td>
+                    [% IF ( ACCOUNT_LINE.is_credit ) %]<td class="credit">[% ACCOUNT_LINE.amount * -1 | $Price %][% ELSE %]<td class="debit">[% ACCOUNT_LINE.amount | $Price %][% END %]</td>
+                    [% IF ( ACCOUNT_LINE.is_credit ) %]<td class="credit">[% ACCOUNT_LINE.amountoutstanding * -1 | $Price %][% ELSE %]<td class="debit">[% ACCOUNT_LINE.amountoutstanding | $Price %][% END %]</td>
                 </tr>
             [% END %]
         </tbody>
@@ -116,3 +115,14 @@
 [% ELSE %]
     <h4>You have no fines or charges</h4>
 [% END %]
+
+[%- BLOCK account_status_description -%]
+    [%- SWITCH account.status -%]
+        [%- CASE 'UNRETURNED' -%]<span> (Accruing)</span>
+        [%- CASE 'RETURNED'   -%]<span> (Returned)</span>
+        [%- CASE 'REPLACED'   -%]<span> (Replaced)</span>
+        [%- CASE 'FORGIVEN'   -%]<span> (Forgiven)</span>
+        [%- CASE 'VOID'       -%]<span> (Voided)</span>
+        [%- CASE              -%]
+    [%- END -%]
+[%- END -%]