From e7e1f2faeea94d2568779f9e7bbdc100909561c3 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Wed, 10 Apr 2019 00:02:09 +0200 Subject: [PATCH] Bug 22674: Change wording of payments in the GUI This changes the different versions of "Payment, thanks" to just read "Payment". To test: - Look at the Fines & Charges tables in - OPAC patron account > your fines - Staff patron account > Accounting > Transactions tab - Staff patron account > Accounting > Make a payment tab - Verify all tables display the descriptions correctly - Decide if you like this better than before Yes: sign-off No: comment on the bug please Signed-off-by: Owen Leonard Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens --- koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc | 8 ++++---- .../opac-tmpl/bootstrap/en/includes/account-table.inc | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc index 31fa26c831..12905cc335 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc @@ -1,9 +1,9 @@ [%- BLOCK account_type_description -%] [%- SWITCH account.accounttype -%] - [%- CASE 'Pay' -%]Payment, thanks - [%- CASE 'Pay00' -%]Payment, thanks (cash via SIP2) - [%- CASE 'Pay01' -%]Payment, thanks (VISA via SIP2) - [%- CASE 'Pay02' -%]Payment, thanks (credit card via SIP2) + [%- CASE 'Pay' -%]Payment + [%- CASE 'Pay00' -%]Payment (cash via SIP2) + [%- CASE 'Pay01' -%]Payment (VISA via SIP2) + [%- CASE 'Pay02' -%]Payment (credit card via SIP2) [%- CASE 'VOID' -%]Voided [%- CASE 'N' -%]New card [%- CASE 'OVERDUE' -%]Fine[%- PROCESS account_status_description account=account -%] 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 91c4282f52..4c9e427923 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc @@ -29,10 +29,10 @@ [% ACCOUNT_LINE.date | $KohaDates %] [% SWITCH ACCOUNT_LINE.accounttype %] - [% CASE 'Pay' %]Payment, thanks - [% CASE 'Pay00' %]Payment, thanks (cash via SIP2) - [% CASE 'Pay01' %]Payment, thanks (VISA via SIP2) - [% CASE 'Pay02' %]Payment, thanks (credit card via SIP2) + [% CASE 'Pay' %]Payment + [% CASE 'Pay00' %]Payment (cash via SIP2) + [% CASE 'Pay01' %]Payment (VISA via SIP2) + [% CASE 'Pay02' %]Payment (credit card via SIP2) [% CASE 'VOID' %]Voided [% CASE 'N' %]New card [% CASE 'OVERDUE' %]Fine[%- PROCESS account_status_description account=account -%] -- 2.39.5