From 9c3a4b1a71b2e0d054b87131de624b5095f0e2e4 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
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 <martin.renvoize@ptfs-europe.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
---
 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 {
     </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";
     },
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:
             - "    </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>"
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 @@
                 <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>
-- 
2.30.2