From 24a7eb1516768fa3f0df8592dfba42a5087aa51f Mon Sep 17 00:00:00 2001 From: Andrew Fuerste Henry Date: Wed, 17 Sep 2025 20:40:56 +0000 Subject: [PATCH] Bug 40256: Use debit_type.description for display of manual fees To test: 1 - edit the description of your MANUAL debit type to read "TEST" instead of "Manual fee" 2 - create a new debit type with code "BOO" and description "Broken" 3 - find a patron, go to accounting then to apply manual invoice 4 - note that the debit types presented for use show "Manual fee" instead of "TEST" 5 - create a debit on your patron with type MANAUAL and a second debit using the type created in step 2 6 - in your patron account, confirm your manual fee shows "Manual fee" in the Type column 7 - confirm the debit created in step 5 shows "broken" in the type column 8 - log into the OPAC as your patron, go to their account 9 - confirm your MANUAL debit shows "Manual fee" in the type column 10 - confirm your other debit shows no value in the type column -- for some reason the OPAC isn't showing non-system type values here, which seems to be a new issue APPLY PATCH 11 - reload patron account in staff client, see it now shows "TEST" in the type column for your MANUAL debit 12 - reload the debit types page in admin, confirm it now shows "TEST" in the description column for the MANUAL debit type 13 - reload the patron account on the OPAC, see it now shows no value in the Type column for either of your debits. Whatever's stopping the type from showing for the custom debit type is also stopping it from showing for the MANUAL debit type --- koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/includes/accounts.inc | 2 +- t/mock_templates/intranet-tmpl/prog/en/includes/accounts.inc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc index 87a9f1f9d56..610e1bd6151 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc @@ -19,7 +19,7 @@ [%~ CASE 'LOST' ~%] Lost item [%~ CASE 'MANUAL' ~%] - Manual fee + [% debit_type.description | html %] [%~ CASE 'NEW_CARD' ~%] New card [%~ CASE 'OVERDUE' ~%] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/accounts.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/accounts.inc index b3e397ba206..01f2fb6ebf2 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/accounts.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/accounts.inc @@ -21,7 +21,7 @@ [%- CASE 'LOST' -%] Lost item [%- CASE 'MANUAL' -%] - Manual fee + [% debit_type.description | html %] [%- CASE 'NEW_CARD' -%] New card [%- CASE 'OVERDUE' -%] diff --git a/t/mock_templates/intranet-tmpl/prog/en/includes/accounts.inc b/t/mock_templates/intranet-tmpl/prog/en/includes/accounts.inc index 781a7f79699..50fd720c569 100644 --- a/t/mock_templates/intranet-tmpl/prog/en/includes/accounts.inc +++ b/t/mock_templates/intranet-tmpl/prog/en/includes/accounts.inc @@ -19,7 +19,7 @@ [%- CASE 'LOST' -%] Lost item [%- CASE 'MANUAL' -%] - Manual fee + [% debit_type.description | html %] [%- CASE 'NEW_CARD' -%] New card [%- CASE 'OVERDUE' -%] -- 2.39.5