From ef4b61dd080846cbfc89eb48380aabccd546edf1 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Wed, 10 May 2023 08:32:26 +0000 Subject: [PATCH] Bug 26403: (QA follow-up) Add missing debit and credit types to includes This adds the missing debit and credit types to the includes, namely: DISCOUNT, PURCHASE, PAYOUT, and VOID. I sorted them as they appear in the GUI (alphabetically) so it's a little easier to spot missing ones. Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit c76533c5a1bc740ded800039ef5843e1345be4e5) Signed-off-by: Matt Blenkinsop --- .../intranet-tmpl/prog/en/includes/accounts.inc | 15 +++++++++------ .../opac-tmpl/bootstrap/en/includes/accounts.inc | 15 +++++++++------ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc index 2cc3f4783d..50742d5b29 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc @@ -23,22 +23,25 @@ [%- CASE 'RENT_DAILY_RENEW' -%]Renewal of daily rental item [%- CASE 'RESERVE' -%]Hold fee [%- CASE 'RESERVE_EXPIRED' -%]Hold waiting too long - [%- CASE 'Payout' -%]Payout + [%- CASE 'PAYOUT' -%]Payment from library to patron + [%- CASE 'VOID' -%]Credit has been voided [%- 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 'CANCELLATION' -%]Cancelled charge [%- CASE 'CREDIT' -%]Credit + [%- CASE 'DISCOUNT' -%]Discount + [%- CASE 'FORGIVEN' -%]Forgiven [%- CASE 'LOST_FOUND' -%]Lost item fee refund [%- CASE 'OVERPAYMENT' -%]Overpayment refund - [%- CASE 'REFUND' -%]Refund - [%- CASE 'CANCELLATION' -%]Cancelled charge + [%- CASE 'PAYMENT' -%]Payment [%- CASE 'PROCESSING_FOUND' -%]Lost item processing fee refund + [%- CASE 'PURCHASE' -%]Purchase + [%- CASE 'REFUND' -%]Refund + [%- CASE 'WRITEOFF' -%]Writeoff [%- CASE -%][% credit_type.description | html %] [%- END -%] [%- END -%] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/accounts.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/accounts.inc index ccfd877166..dfd026a240 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/accounts.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/accounts.inc @@ -25,22 +25,25 @@ [%- CASE 'RENT_DAILY_RENEW' -%]Renewal of daily rental item [%- CASE 'RESERVE' -%]Hold fee [%- CASE 'RESERVE_EXPIRED' -%]Hold waiting too long - [%- CASE 'Payout' -%]Payout + [%- CASE 'PAYOUT' -%]Payment from library to patron + [%- CASE 'VOID' -%]Credit has been voided [%- 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 'CANCELLATION' -%]Cancelled charge [%- CASE 'CREDIT' -%]Credit + [%- CASE 'DISCOUNT' -%]Discount + [%- CASE 'FORGIVEN' -%]Forgiven [%- CASE 'LOST_FOUND' -%]Lost item fee refund [%- CASE 'OVERPAYMENT' -%]Overpayment refund - [%- CASE 'REFUND' -%]Refund - [%- CASE 'CANCELLATION' -%]Cancelled charge + [%- CASE 'PAYMENT' -%]Payment [%- CASE 'PROCESSING_FOUND' -%]Lost item processing fee refund + [%- CASE 'PURCHASE' -%]Purchase + [%- CASE 'REFUND' -%]Refund + [%- CASE 'WRITEOFF' -%]Writeoff [%- CASE -%][% credit_type.description | html %] [%- END -%] [%- END -%] -- 2.39.5