From e0690dc84748f582553c7e45166d4fa8b174a266 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>

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
---
 .../prog/en/includes/accounts.inc              | 18 +++++++++---------
 .../bootstrap/en/includes/account-table.inc    | 15 ++++++++-------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc
index 12905cc335..a37fd3a941 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 (cash via SIP2)</span>
         [%- CASE 'Pay01'   -%]<span>Payment (VISA via SIP2)</span>
         [%- CASE 'Pay02'   -%]<span>Payment (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 'PF'    -%]<span>Lost item processing fee</span>
-        [%- CASE 'PAY'     -%]<span>Payment</span>
-        [%- CASE 'WO'      -%]<span>Writeoff</span>
-        [%- CASE 'C'       -%]<span>Credit</span>
-        [%- CASE 'CR'      -%]<span>Credit</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>Lost item processing fee[%- PROCESS account_status_description account=account -%]</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 'Res'     -%]<span>Hold fee</span>
         [%- CASE           -%][% account.accounttype | html %]
     [%- END -%]
@@ -44,6 +43,7 @@
         [%- CASE 'RETURNED'   -%]<span> (Returned)</span>
         [%- CASE 'REPLACED'   -%]<span> (Replaced)</span>
         [%- CASE 'FORGIVEN'   -%]<span> (Forgiven)</span>
+        [%- CASE 'VOID'       -%]<span> (Voided)</span>
         [%- CASE              -%]
     [%- END -%]
 [%- END -%]
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 4c9e427923..11e5d0a58d 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc
@@ -39,16 +39,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' %]Lost item 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 'Res' %]Hold fee
                         [% CASE %][% ACCOUNT_LINE.accounttype | html %]
                         [%- END -%]
@@ -121,6 +121,7 @@
         [%- CASE 'RETURNED'   -%]<span> (Returned)</span>
         [%- CASE 'REPLACED'   -%]<span> (Replaced)</span>
         [%- CASE 'FORGIVEN'   -%]<span> (Forgiven)</span>
+        [%- CASE 'VOID'       -%]<span> (Voided)</span>
         [%- CASE              -%]
     [%- END -%]
 [%- END -%]
-- 
2.39.5