Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 31713: (follow-up) Fix terminology

Browse source 
This patch fixes the terminology as proposed.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Martin Renvoize 2022-11-01 14:21:58 +00:00 committed by Tomas Cohen Arazi
parent 712937c29a
commit 8830a743ec
Signed by: tomascohen
GPG key ID: 0A272EA1B2F3C15F
3 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
installer/data/mysql/atomicupdate/bug_31713.pl
View file

@ -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 {
</th>
</tr>
[% IF borrower.account.outstanding_debits.total_outstanding %]
<tr>
<th colspan='4' class='centerednames'>
<h4>Debts</h4>
</th>
</tr>
[% IF borrower.account.outstanding_debits.total_outstanding %]
<tr>
<th>Date</th>
<th>Charge</th>
@ -57,14 +57,18 @@ return {
<td class='debit'>[% debit.amountoutstanding | $Price %]</td>
</tr>
[% END %]
[% ELSE %]
<tr>
<td colspan='4'>There are no outstanding debts on your account</td>
</tr>
[% END %]
[% IF borrower.account.outstanding_credits.total_outstanding %]
<tr>
<th colspan='4' class='centerednames'>
<h4>Credits</h4>
</th>
</tr>
[% IF borrower.account.outstanding_credits.total_outstanding %]
<tr>
<th>Date</th>
<th>Credit</th>
@ -82,6 +86,10 @@ return {
<td class='credit'>[% credit.amountoutstanding | $Price %]</td>
</tr>
[% END %]
[% ELSE %]
<tr>
<td colspan='4'>There are no outstanding credits on your account</td>
</tr>
[% END %]
<tfoot>
@ -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";
},

18
installer/data/mysql/en/mandatory/sample_notices.yml
View file

@ -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:
- " </th>"
- " </tr>"
- ""
- " [% IF borrower.account.outstanding_debits.total_outstanding %]"
- " <tr>"
- " <th colspan='4' class='centerednames'>"
- " <h4>Debts</h4>"
- " </th>"
- " </tr>"
- " [% IF borrower.account.outstanding_debits.total_outstanding %]"
- " <tr>"
- " <th>Date</th>"
- " <th>Charge</th>"
@ -1341,14 +1341,18 @@ tables:
- " <td class='debit'>[% debit.amountoutstanding | $Price %]</td>"
- " </tr>"
- " [% END %]"
- " [% ELSE %]"
- " <tr>"
- " <td colspan='4'>There are no outstanding debts on your account</td>"
- " </tr>"
- " [% END %]"
- ""
- " [% IF borrower.account.outstanding_credits.total_outstanding %]"
- " <tr>"
- " <th colspan='4' class='centerednames'>"
- " <h4>Credits</h4>"
- " </th>"
- " </tr>"
- " [% IF borrower.account.outstanding_credits.total_outstanding %]"
- " <tr>"
- " <th>Date</th>"
- " <th>Credit</th>"
@ -1366,6 +1370,10 @@ tables:
- " <td class='credit'>[% credit.amountoutstanding | $Price %]</td>"
- " </tr>"
- " [% END %]"
- " [% ELSE %]"
- " <tr>"
- " <td colspan='4'>There are no outstanding credits on your account</td>"
- " </tr>"
- " [% END %]"
- ""
- " <tfoot>"

2
koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
View file

@ -25,7 +25,7 @@
<li><a id="printslip" href="#">Print slip</a></li>
<li><a id="printquickslip" href="#">Print quick slip</a></li>
[% IF patron.account_balance > 0 %]
<li><a id="printfineslip" target="_blank" href="/cgi-bin/koha/members/printnotice.pl?notice=FEE_SUMMARY&borrowernumber=[% patron.borrowernumber | uri %]">Print fines slip</a></li>
<li><a id="printfineslip" target="_blank" href="/cgi-bin/koha/members/printnotice.pl?notice=ACCOUNTS_SUMMARY&borrowernumber=[% patron.borrowernumber | uri %]">Print account balance</a></li>
[% END %]
[% IF patron.has_overdues %]
<li><a id="print_overdues" href="#">Print overdues</a></li>