From de15346fb1bfdc7c7f02a9d2b5246e3349c17ef7 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Tue, 1 Nov 2022 14:21:58 +0000 Subject: [PATCH] Bug 31713: (follow-up) Fix terminology This patch fixes the terminology as proposed. Signed-off-by: Martin Renvoize --- installer/data/mysql/atomicupdate/bug_31713.pl | 16 ++++++++++++---- .../data/mysql/en/mandatory/sample_notices.yml | 18 +++++++++++++----- .../prog/en/includes/members-toolbar.inc | 2 +- 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/installer/data/mysql/atomicupdate/bug_31713.pl b/installer/data/mysql/atomicupdate/bug_31713.pl index ee1681ccb2..13d608c7e6 100644 --- a/installer/data/mysql/atomicupdate/bug_31713.pl +++ b/installer/data/mysql/atomicupdate/bug_31713.pl @@ -2,7 +2,7 @@ use Modern::Perl; return { bug_number => "31713", - description => "Add FEE_SUMMARY slip notice", + description => "Add ACCOUNTS_SUMMARY slip notice", up => sub { my ($args) = @_; my ($dbh, $out) = @$args{qw(dbh out)}; @@ -34,12 +34,12 @@ return { - [% IF borrower.account.outstanding_debits.total_outstanding %]

Debts

+ [% IF borrower.account.outstanding_debits.total_outstanding %] Date Charge @@ -57,14 +57,18 @@ return { [% debit.amountoutstanding | $Price %] [% END %] + [% ELSE %] + + There are no outstanding debts on your account + [% END %] - [% IF borrower.account.outstanding_credits.total_outstanding %]

Credits

+ [% IF borrower.account.outstanding_credits.total_outstanding %] Date Credit @@ -82,6 +86,10 @@ return { [% credit.amountoutstanding | $Price %] [% END %] + [% ELSE %] + + There are no outstanding credits on your account + [% END %] @@ -95,7 +103,7 @@ END_CONTENT $dbh->do(qq{ INSERT IGNORE INTO letter ( module, code, branchcode, name, is_html, title, content, message_transport_type, lang) - VALUES ( 'members', 'FEE_SUMMARY', '', 'Fee Summary Slip', 1, 'Fee Summary for [% borrower.firstname %] [% borrower.surname %]', "$slip_content", 'print', 'default' ) + VALUES ( 'members', 'ACCOUNTS_SUMMARY', '', 'Account balance slip', 1, 'Account summary for [% borrower.firstname %] [% borrower.surname %]', "$slip_content", 'print', 'default' ) }); say $out "Notice added"; }, diff --git a/installer/data/mysql/en/mandatory/sample_notices.yml b/installer/data/mysql/en/mandatory/sample_notices.yml index c2dd1a59c4..09b594a759 100644 --- a/installer/data/mysql/en/mandatory/sample_notices.yml +++ b/installer/data/mysql/en/mandatory/sample_notices.yml @@ -1284,11 +1284,11 @@ tables: - "It is valid one minute." - module: members - code: FEE_SUMMARY + code: ACCOUNTS_SUMMARY branchcode: "" - name: "Fee Summary Slip" + name: "Account balance slip" is_html: 1 - title: "Fee Summary for [% borrower.firstname %] [% borrower.surname %]" + title: "Account summary for [% borrower.firstname %] [% borrower.surname %]" message_transport_type: print lang: default content: @@ -1318,12 +1318,12 @@ tables: - " " - " " - "" - - " [% IF borrower.account.outstanding_debits.total_outstanding %]" - " " - " " - "

Debts

" - " " - " " + - " [% IF borrower.account.outstanding_debits.total_outstanding %]" - " " - " Date" - " Charge" @@ -1341,14 +1341,18 @@ tables: - " [% debit.amountoutstanding | $Price %]" - " " - " [% END %]" + - " [% ELSE %]" + - " " + - " There are no outstanding debts on your account" + - " " - " [% END %]" - "" - - " [% IF borrower.account.outstanding_credits.total_outstanding %]" - " " - " " - "

Credits

" - " " - " " + - " [% IF borrower.account.outstanding_credits.total_outstanding %]" - " " - " Date" - " Credit" @@ -1366,6 +1370,10 @@ tables: - " [% credit.amountoutstanding | $Price %]" - " " - " [% END %]" + - " [% ELSE %]" + - " " + - " There are no outstanding credits on your account" + - " " - " [% END %]" - "" - " " diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc index c55d2c69f3..dce463ab9b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc @@ -25,7 +25,7 @@
  • Print slip
  • Print quick slip
  • [% IF patron.account_balance > 0 %] -
  • Print fines slip
  • +
  • Print account balance
  • [% END %] [% IF patron.has_overdues %]
  • Print overdues
  • -- 2.20.1