From 34b9c061f347da750f4565a57012c9caab93f925 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Wed, 9 Sep 2020 15:34:13 +0100
Subject: [PATCH] Bug 26418: Fix translatability of REFUND credit type

The description of REFUND type accountline credits introduced with the "issue refund" feature is not translatable.

To test:
- Make sure a language with a complete translation is installed
- Switch to the language
- Go to any user account
- Add a manual invoice
- Pay it off fully or partially
- Click on "issue refund"
- Confirm the refund
- Check the description of the line in the patron account is not translated.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 .../prog/en/includes/accounts.inc             |  2 +-
 .../bootstrap/en/includes/account-table.inc   | 43 +++++++++++--------
 pos/register.pl                               |  2 +-
 3 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc
index 3e37c8d407..62ea570040 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc
@@ -7,7 +7,7 @@
             [%- CASE 'FORGIVEN'         -%]Forgiven
             [%- CASE 'CREDIT'           -%]Credit
             [%- CASE 'LOST_FOUND'       -%]Lost item fee refund
-            [%- CASE 'Refund'           -%]Refund
+            [%- CASE 'REFUND'           -%]Refund
             [%- CASE                    -%][% account.credit_type.description | html %]
         [%- END -%]
     [%- ELSIF account.debit_type_code -%]
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 dc3444da34..54fd662c28 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc
@@ -179,27 +179,33 @@
                 [%- CASE 'FORGIVEN'         -%]Forgiven
                 [%- CASE 'CREDIT'           -%]Credit
                 [%- CASE 'LOST_FOUND'       -%]Lost item fee refund
+                [%- CASE 'REFUND'           -%]Refund
                 [%- CASE                    -%][% account.credit_type.description | html %]
             [%- END -%]
         [%- ELSIF account.debit_type_code -%]
-        [%- SWITCH account.debit_type_code -%]
-            [%- CASE 'ACCOUNT'          -%]Account creation fee
-            [%- CASE 'ACCOUNT_RENEW'    -%]Account renewal fee
-            [%- CASE 'LOST'             -%]Lost item
-            [%- CASE 'MANUAL'           -%]Manual fee
-            [%- CASE 'NEW_CARD'         -%]New card
-            [%- CASE 'OVERDUE'          -%]Fine
-            [%- CASE 'PROCESSING'       -%]Lost item processing fee
-            [%- CASE 'RENT'             -%]Rental fee
-            [%- CASE 'RENT_DAILY'       -%]Daily rental fee
-            [%- CASE 'RENT_RENEW'       -%]Renewal of rental item
-            [%- CASE 'RENT_DAILY_RENEW' -%]Renewal of daily rental item
-            [%- CASE 'RESERVE'          -%]Hold fee
-            [%- CASE 'RESERVE_EXPIRED'  -%]Hold waiting too long
-            [%- CASE                    -%][% account.debit_type.description | html %]
-        [%- END -%]
+            [%- SWITCH account.debit_type_code -%]
+                [%- CASE 'ACCOUNT'          -%]Account creation fee
+                [%- CASE 'ACCOUNT_RENEW'    -%]Account renewal fee
+                [%- CASE 'LOST'             -%]Lost item
+                [%- CASE 'MANUAL'           -%]Manual fee
+                [%- CASE 'NEW_CARD'         -%]New card
+                [%- CASE 'OVERDUE'          -%]Fine
+                [%- CASE 'PROCESSING'       -%]Lost item processing fee
+                [%- CASE 'RENT'             -%]Rental fee
+                [%- CASE 'RENT_DAILY'       -%]Daily rental fee
+                [%- CASE 'RENT_RENEW'       -%]Renewal of rental item
+                [%- CASE 'RENT_DAILY_RENEW' -%]Renewal of daily rental item
+                [%- CASE 'RESERVE'          -%]Hold fee
+                [%- CASE 'RESERVE_EXPIRED'  -%]Hold waiting too long
+                [%- CASE                    -%][% account.debit_type.description | html %]
+            [%- END -%]
         [%- END -%]
-        [%- SWITCH account.status -%]
+        [%- PROCESS account_status_description account=account -%]
+    </span>
+[%- END # /BLOCK account_type_description -%]
+
+[%- BLOCK account_status_description -%]
+    [%- SWITCH account.status -%]
             [%- CASE 'UNRETURNED' -%]<span> (Accruing)</span>
             [%- CASE 'RETURNED'   -%]<span> (Returned)</span>
             [%- CASE 'REPLACED'   -%]<span> (Replaced)</span>
@@ -208,5 +214,4 @@
             [%- CASE 'LOST'       -%]<span> (Lost)</span>
             [%- CASE              -%]
         [%- END -%]
-    </span>
-[%- END # /BLOCK account_type_description -%]
+[%- END -%]
diff --git a/pos/register.pl b/pos/register.pl
index e73f3c14c9..97d6d63cf6 100755
--- a/pos/register.pl
+++ b/pos/register.pl
@@ -127,7 +127,7 @@ else {
 
                     my $refund = $accountline->reduce(
                         {
-                            reduction_type => 'Refund',
+                            reduction_type => 'REFUND',
                             branch         => $library_id,
                             staff_id       => $logged_in_user->id,
                             interface      => 'intranet',
-- 
2.39.5