From cb1d0d4e91072406f82c9da4dba4c0170b27b601 Mon Sep 17 00:00:00 2001
From: Hayley Mapley <hayleymapley@catalyst.net.nz>
Date: Mon, 27 May 2019 14:38:52 +1200
Subject: [PATCH] Bug 22627: Renames OPAC fines tab to 'your charges' to be
 more inclusive

Brought up on Bug 21578, the 'your fines' tab in the OPAC would be
better named as 'your charges' as not all charges are fines, some are
credits etc.

To test:
1) In the OPAC, click on the user's name and note that the tab that was called your fines is now called your charges.
2) When you click on the tab, the title says Your charges, the breadcrumb says Your
charges, and the table title is Your charges.

Sponsored-by: Catalyst IT.
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc | 2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc      | 2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt    | 4 ++--
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt       | 2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt    | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

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 6705ad5dcd..b79274fa74 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc
@@ -1,4 +1,4 @@
-<h3>Fines and charges</h3>
+<h3>Charges</h3>
 
 [% IF ( ACCOUNT_LINES ) %]
     <form method="post" action="opac-account-pay.pl" class="form-horizontal">
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc
index 976fc13df1..f1cdfa5ab2 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc
@@ -15,7 +15,7 @@
                 [% ELSE %]
                     <li>
                 [% END %]
-                <a href="/cgi-bin/koha/opac-account.pl">your fines</a></li>
+                <a href="/cgi-bin/koha/opac-account.pl">your charges</a></li>
             [% END %]
 
             [% IF ( userupdateview ) %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt
index c6f6cc7efc..70da8a22fe 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt
@@ -7,7 +7,7 @@
 [% SET ENABLE_OPAC_PAYMENTS = Koha.Preference('EnablePayPalOpacPayments') || plugins %]
 [% SET DISPLAY_PAYMENT_BLOCK = 0 %]
 [% INCLUDE 'doc-head-open.inc' %]
-<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your fines and charges</title>
+<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your charges</title>
 [% INCLUDE 'doc-head-close.inc' %]
 [% BLOCK cssinclude %]
     [% Asset.css("css/datatables.css") | $raw %]
@@ -21,7 +21,7 @@
     <ul class="breadcrumb">
         <li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">&rsaquo;</span></li>
         <li>[% IF logged_in_user %]<a href="/cgi-bin/koha/opac-user.pl">[% INCLUDE 'patron-title.inc' patron = logged_in_user %]</a>[% END %] <span class="divider">&rsaquo;</span></li>
-        <li><a href="#">Your fines and charges</a></li>
+        <li><a href="#">Your charges</a></li>
     </ul>
 
     <div class="container-fluid">
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
index 40f5eed3a4..879713c13b 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
@@ -386,7 +386,7 @@
                         [% IF ( OPACFinesTab ) %]
                             <!-- FINES BOX -->
                             [% IF ( amountoutstanding > 0 ) %]
-                                <div id="opac-user-fines"> <h3>Fines and charges</h3>
+                                <div id="opac-user-fines"> <h3>Charges</h3>
                                     <table class="table table-bordered table-striped">
                                         <thead><tr><th colspan="2">Amount</th></tr></thead>
                                         <tbody>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
index e147cdd6f8..5c952b68a8 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
@@ -267,7 +267,7 @@
                                         Holds ([% HOLDS.count | html %])
                                     </a>
                                 </li>
-                                <li><a href="#account-tab" data-toggle="tab">Fines and charges ([% total | $Price %])</a></li>
+                                <li><a href="#account-tab" data-toggle="tab">Charges ([% total | $Price %])</a></li>
                             </ul>
                             <div class="tab-content">
                                 <div id="checkouts-tab" class="tab-pane active">
-- 
2.39.5