From a41583c1208bc8c64e1f0e62d4e7440e06d4b9fb Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Mon, 7 Sep 2020 13:08:46 +0100 Subject: [PATCH] Bug 26398: Restore translations for credit/debit type dropdown Signed-off-by: Caroline Cyr La Rose --- .../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 -%] [%- 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 -%] @@ -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' %] Koha › Patrons › Create manual credit [% INCLUDE 'doc-head-close.inc' %] @@ -46,7 +49,7 @@ 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' %] Koha › Patrons › Create manual invoice [% INCLUDE 'doc-head-close.inc' %] @@ -56,9 +59,9 @@ -- 2.17.1