Attachment 111219 Details for Bug 26398 – Bug 26398: Restore translations for credit/debit type dropdown

[patch] Bug 26398: Restore translations for credit/debit type dropdown

Bug-26398-Restore-translations-for-creditdebit-typ.patch (text/plain), 6.79 KB, created by Martin Renvoize (ashimema) on 2020-10-05 10:57:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2020-10-05 10:57:48 UTC

Size: 6.79 KB

patch

obsolete

>From 92abd9d1766b515a305c7d8c4c7157490205094f Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Mon, 7 Sep 2020 13:08:46 +0100
>Subject: [PATCH] Bug 26398: Restore translations for credit/debit type
> dropdown
>
>---
> .../prog/en/includes/accounts.inc             | 60 +++++++++++--------
> .../prog/en/modules/members/mancredit.tt      |  5 +-
> .../prog/en/modules/members/maninvoice.tt     |  7 ++-
> 3 files changed, 43 insertions(+), 29 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc
>index 62ea570040..9b6c431a6b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc
>@@ -1,33 +1,9 @@
> [%- BLOCK account_type_description -%]
>     <span>
>     [%- IF account.credit_type_code -%]
>-        [%- SWITCH account.credit_type_code -%]
>-            [%- CASE 'PAYMENT'          -%]Payment
>-            [%- CASE 'WRITEOFF'         -%]Writeoff
>-            [%- CASE 'FORGIVEN'         -%]Forgiven
>-            [%- CASE 'CREDIT'           -%]Credit
>-            [%- CASE 'LOST_FOUND'       -%]Lost item fee refund
>-            [%- CASE 'REFUND'           -%]Refund
>-            [%- CASE                    -%][% account.credit_type.description | html %]
>-        [%- END -%]
>+        [%- PROCESS credit_type_description credit_type = account.credit_type -%]
>     [%- 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 'Payout'           -%]Payout
>-           [%- CASE                    -%][% account.debit_type.description | html %]
>-       [%- END -%]
>+        [%- PROCESS debit_type_description debit_type = account.debit_type -%]
>     [%- END -%]
>     [%- PROCESS account_status_description account=account -%]
>     </span>
>@@ -58,3 +34,35 @@
>         [%- CASE              -%]
>     [%- END -%]
> [%- END -%]
>+
>+[%- BLOCK debit_type_description -%]
>+    [%- SWITCH 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 'Payout'           -%]Payout
>+        [%- CASE                    -%][% debit_type.description | html %]
>+    [%- END -%]
>+[%- END -%]
>+
>+[%- BLOCK credit_type_description -%]
>+    [%- SWITCH credit_type.code -%]
>+        [%- CASE 'PAYMENT'          -%]Payment
>+        [%- CASE 'WRITEOFF'         -%]Writeoff
>+        [%- CASE 'FORGIVEN'         -%]Forgiven
>+        [%- CASE 'CREDIT'           -%]Credit
>+        [%- CASE 'LOST_FOUND'       -%]Lost item fee refund
>+        [%- CASE 'REFUND'           -%]Refund
>+        [%- CASE                    -%][% credit_type.description | html %]
>+    [%- END -%]
>+[%- END -%]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
>index 997ff495f5..2befd05878 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
>@@ -3,6 +3,9 @@
> [% USE Koha %]
> [% USE Branches %]
> [% SET footerjs = 1 %]
>+
>+[% PROCESS 'accounts.inc' %]
>+
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Koha &rsaquo; Patrons &rsaquo; Create manual credit</title>
> [% INCLUDE 'doc-head-close.inc' %]
>@@ -46,7 +49,7 @@
>                                 <label for="type">Credit type: </label>
>                                 <select name="type" id="type">
>                                     [% FOREACH credit_type IN credit_types %]
>-                                    <option value="[% credit_type.code | html %]">[% credit_type.description | html %]</option>
>+                                    <option value="[% credit_type.code | html %]">[%- PROCESS credit_type_description credit_type=credit_type -%]</option>
>                                     [% END %]
>                                 </select>
>                             </li>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt
>index 1490f1c745..07c866d5d2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt
>@@ -4,6 +4,9 @@
> [% USE Price %]
> [% USE Branches %]
> [% SET footerjs = 1 %]
>+
>+[% PROCESS 'accounts.inc' %]
>+
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Koha &rsaquo; Patrons &rsaquo; Create manual invoice</title>
> [% INCLUDE 'doc-head-close.inc' %]
>@@ -56,9 +59,9 @@
>                                 <select name="type" id="type">
>                                     [% FOREACH debit_type IN debit_types %]
>                                     [% IF debit_type.code == type %]
>-                                    <option value="[% debit_type.code | html %]" selected="selected">[% debit_type.description | html %]</option>
>+                                    <option value="[% debit_type.code | html %]" selected="selected">[%- PROCESS debit_type_description debit_type=debit_type -%]</option>
>                                     [% ELSE %]
>-                                    <option value="[% debit_type.code | html %]">[% debit_type.description | html %]</option>
>+                                    <option value="[% debit_type.code | html %]">[%- PROCESS debit_type_description debit_type=debit_type -%]</option>
>                                     [% END %]
>                                     [% END %]
>                                 </select>
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 26398: 109701 | 111219 | 111928 | 111941 | 112844