From 8463e9a18a925e0db38d588e8b00a50f4c4c9e43 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Fri, 22 Mar 2019 12:00:00 +0000
Subject: [PATCH] Bug 22511: Update UI to use accountlines.status

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 .../intranet-tmpl/prog/en/includes/accounts.inc  | 16 ++++++++--------
 .../bootstrap/en/modules/opac-account.tt         | 14 +++++++-------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc
index fd306c77b4..d9ea72c433 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc
@@ -4,22 +4,21 @@
         [%- CASE 'Pay00'   -%]<span>Payment, thanks (cash via SIP2)</span>
         [%- CASE 'Pay01'   -%]<span>Payment, thanks (VISA via SIP2)</span>
         [%- CASE 'Pay02'   -%]<span>Payment, thanks (credit card via SIP2)</span>
-        [%- CASE 'VOID'    -%]<span>Voided</span>
         [%- CASE 'N'       -%]<span>New card</span>
         [%- CASE 'OVERDUE' -%]<span>Fine[%- PROCESS account_status_description account=account -%]</span>
         [%- CASE 'A'       -%]<span>Account management fee</span>
         [%- CASE 'M'       -%]<span>Sundry</span>
         [%- CASE 'L'       -%]<span>Lost item</span>
-        [%- CASE 'W'       -%]<span>Writeoff</span>
+        [%- CASE 'W'       -%]<span>Writeoff[%- PROCESS account_status_description account=account -%]</span>
         [%- CASE 'HE'      -%]<span>Hold waiting too long</span>
         [%- CASE 'Rent'    -%]<span>Rental fee</span>
-        [%- CASE 'FOR'     -%]<span>Forgiven</span>
-        [%- CASE 'LR'      -%]<span>Lost item fee refund</span>
+        [%- CASE 'FOR'     -%]<span>Forgiven[%- PROCESS account_status_description account=account -%]</span>
+        [%- CASE 'LR'      -%]<span>Lost item fee refund[%- PROCESS account_status_description account=account -%]</span>
         [%- CASE 'PF'      -%]<span>Processing fee</span>
-        [%- CASE 'PAY'     -%]<span>Payment</span>
-        [%- CASE 'WO'      -%]<span>Writeoff</span>
-        [%- CASE 'C'       -%]<span>Credit</span>
-        [%- CASE 'CR'      -%]<span>Credit</span>
+        [%- CASE 'PAY'     -%]<span>Payment[%- PROCESS account_status_description account=account -%]</span>
+        [%- CASE 'WO'      -%]<span>Writeoff[%- PROCESS account_status_description account=account -%]</span>
+        [%- CASE 'C'       -%]<span>Credit[%- PROCESS account_status_description account=account -%]</span>
+        [%- CASE 'CR'      -%]<span>Credit[%- PROCESS account_status_description account=account -%]</span>
         [%- CASE           -%][% account.accounttype | html %]
     [%- END -%]
 [%- END -%]
@@ -42,6 +41,7 @@
         [%- CASE 'UNRETURNED' -%]<span> (Accruing)</span>
         [%- CASE 'RETURNED'   -%]<span> (Returned)</span>
         [%- CASE 'FORGIVEN'   -%]<span> (Forgiven)</span>
+        [%- CASE 'VOID'       -%]<span> (Voided)</span>
         [%- CASE              -%]
     [%- END -%]
 [%- END -%]
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 04798489c9..2ccd7a0401 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt
@@ -117,16 +117,16 @@
                                             [%- CASE 'A'       -%]Account management fee
                                             [%- CASE 'M'       -%]Sundry
                                             [%- CASE 'L'       -%]Lost item
-                                            [%- CASE 'W'       -%]Writeoff
+                                            [%- CASE 'W'       -%]Writeoff[%- PROCESS account_status_description account=account -%]
                                             [%- CASE 'HE'      -%]Hold waiting too long
                                             [%- CASE 'Rent'    -%]Rental fee
-                                            [%- CASE 'FOR'     -%]Forgiven
-                                            [%- CASE 'LR'      -%]Lost item fee refund
+                                            [%- CASE 'FOR'     -%]Forgiven[%- PROCESS account_status_description account=account -%]
+                                            [%- CASE 'LR'      -%]Lost item fee refund[%- PROCESS account_status_description account=account -%]
                                             [%- CASE 'PF'      -%]Processing fee
-                                            [%- CASE 'PAY'     -%]Payment
-                                            [%- CASE 'WO'      -%]Writeoff
-                                            [%- CASE 'C'       -%]Credit
-                                            [%- CASE 'CR'      -%]Credit
+                                            [%- CASE 'PAY'     -%]Payment[%- PROCESS account_status_description account=account -%]
+                                            [%- CASE 'WO'      -%]Writeoff[%- PROCESS account_status_description account=account -%]
+                                            [%- CASE 'C'       -%]Credit[%- PROCESS account_status_description account=account -%]
+                                            [%- CASE 'CR'      -%]Credit[%- PROCESS account_status_description account=account -%]
                                             [%- CASE -%][% ACCOUNT_LINE.accounttype | html %]
                                           [%- END -%]
                                           [%- IF ACCOUNT_LINE.payment_type %], [% AuthorisedValues.GetByCode('PAYMENT_TYPE', ACCOUNT_LINE.payment_type, 1) | html %][% END %]
-- 
2.20.1