From dc4b55ddb9224bf97bbd3c89d3ba905dfc065565 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 --- koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc | 8 ++++---- koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt | 8 ++++---- koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc index cf38823..9c7bb1b 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 'F' -%]Fine diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt index 7afd743..ea51074 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt @@ -81,10 +81,10 @@ [% SWITCH 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 'N' %]New card [% CASE 'F' %]Fine [% CASE 'A' %]Account management fee 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 a73da77..e6e47c4 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc @@ -28,10 +28,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 'N' %]New card [% CASE 'F' %]Fine [% CASE 'A' %]Account management fee @@ -109,4 +109,4 @@ [% ELSE %]

You have no fines or charges

-[% END %] \ No newline at end of file +[% END %] -- 2.1.4