From a263fbc19b7402c9eb0e32b06152794924619c3f Mon Sep 17 00:00:00 2001
From: Suzanne Paterno <paterno@noblenet.org>
Date: Thu, 10 Aug 2017 11:38:53 -0400
Subject: [PATCH] LP#1688398: change wording on OPAC bill payment pages

On the credit card screens replaced the word "Fines" with "Charges"
since not all charges are fines. Can be cost of replacement materials,
as well as other non-circulation fees.

Signed-off-by: Suzanne Paterno <paterno@noblenet.org>
Signed-off-by: Cesar Velez <cesar.velez@equinoxinitiative.org>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
---
 Open-ILS/src/templates/opac/myopac/main.tt2      | 16 ++++++++--------
 .../templates/opac/myopac/main_payment_form.tt2  |  2 +-
 .../templates/opac/parts/myopac/main_base.tt2    | 10 +++++-----
 Open-ILS/src/templates/opac/parts/topnav.tt2     |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Open-ILS/src/templates/opac/myopac/main.tt2 b/Open-ILS/src/templates/opac/myopac/main.tt2
index 91133fc68d..8c5aa3c126 100644
--- a/Open-ILS/src/templates/opac/myopac/main.tt2
+++ b/Open-ILS/src/templates/opac/myopac/main.tt2
@@ -21,7 +21,7 @@
             <thead>
                 <tr>
                     <td colspan='10' style='padding: 6px'>
-                        <strong>[% l("Fines") %]</strong>
+                        <strong>[% l("Pay Selected Circulation Charges") %]</strong>
                     </td>
                 </tr>
                 <tr>
@@ -36,7 +36,7 @@
                         <input id="pay_fines_box1" checked="checked"
                             type="checkbox" onclick="select_all_checkboxes('xact', this.checked)"
                             title="[% l('Click to (un)select all fines') %]" />
-                        <label for="pay_fines_box1">[% l('Pay Fines') %]</label>
+                        <label for="pay_fines_box1">[% l('Pay Charges') %]</label>
                     </td>
                     [% END %]
                 </tr>
@@ -114,11 +114,11 @@
         <hr class='opac-auto-013'  color="#dcdbdb" />
         <br/>
         <table width='100%' class='data_grid data_grid_center'
-            id='myopac_trans_table' title="[% l('Other Fines and Fees') %]">
+            id='myopac_trans_table' title="[% l('Other Charges and Fees') %]">
             <thead>
                 <tr>
                     <td colspan='8' style='padding: 6px'>
-                        <span class="bold">[% l("Other Fees") %]</span>
+                        <span class="bold">[% l("Pay Selected Other Charges") %]</span>
                     </td>
                 </tr>
                 <tr>
@@ -133,8 +133,8 @@
                         style="white-space:nowrap;">
                         <input id="pay_fines_box2" checked="checked"
                             type="checkbox" onclick="select_all_checkboxes('xact_misc', this.checked)"
-                            title="[% l('Click to (un)select all fines') %]" />
-                        <label for="pay_fines_box2">[% l("Pay Fines") %]</label>
+                            title="[% l('Click to (un)select all charges') %]" />
+                        <label for="pay_fines_box2">[% l("Pay Charges") %]</label>
                     </td>
                     [% END %]
                 </tr>
@@ -181,8 +181,8 @@
     [% ELSIF myopac_cc_allowed %]
     <div class="text-right pad-top-ten">
         <input type="submit"
-            value="[% l('Pay selected fines') %]"
-            title="[% l('Pay selected fines') %]"
+            value="[% l('Pay selected charges') %]"
+            title="[% l('Pay selected charges') %]"
             class="opac-button" />
     </div>
     [% END %]
diff --git a/Open-ILS/src/templates/opac/myopac/main_payment_form.tt2 b/Open-ILS/src/templates/opac/myopac/main_payment_form.tt2
index 9ed377d67a..54d079297e 100644
--- a/Open-ILS/src/templates/opac/myopac/main_payment_form.tt2
+++ b/Open-ILS/src/templates/opac/myopac/main_payment_form.tt2
@@ -10,7 +10,7 @@
         ctx.get_org_setting(ctx.user.home_ou.id, 'credit.processor.stripe.enabled') AND ctx.get_org_setting(ctx.user.home_ou.id, 'credit.processor.default') == 'Stripe';
         ctx.use_stripe = 1;
     END %]
-<h3 class="sr-only">[% l('Pay Fines') %]</h3>
+<h3 class="sr-only">[% l('Pay Charges') %]</h3>
 [% IF ctx.fines.balance_owed <= 0 %]
 <div>
     [% l("You either have no fines to pay or you have selected fines whose " _
diff --git a/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2 b/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2
index e19b33699e..ded602185d 100644
--- a/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2
+++ b/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2
@@ -16,14 +16,14 @@
     <div id="myopac_sum_fines_placehold"></div>
     [% ELSE %]
     <div id="myopac_sum_fines">
-        [% l('Fines:') %]
+        [% l('Charges:') %]
         <span class='[% ctx.user_stats.fines.balance_owed ? "alert" : ""%]'>
             [% money(ctx.user_stats.fines.balance_owed) %]
         </span><br />
         [% IF (ctx.fines.grocery.size OR ctx.fines.circulation.size) AND ctx.get_org_setting(ctx.user.home_ou, 'credit.payments.allow') == 1 %]
         <form action="[% ctx.opac_root %]/myopac/main_payment_form" method="get"><input
-            type="submit" title="[% l('Pay Fines') %]"
-            value="[% l('Pay Fines') %]" class="pos-rel-top-5 opac-button" /></form>
+            type="submit" title="[% l('Pay Charges') %]"
+            value="[% l('Pay Charges') %]" class="pos-rel-top-5 opac-button" /></form>
         [% END %]
     </div>
     [% END %]
@@ -97,10 +97,10 @@
     <div id='fines_payments_wrapper'>
         <div id='acct_fines_tabs'>
             [% IF myopac_main_page == 'main' %]
-            <a href='#' class="acct-tab-on">[% l("Fines") %]</a>
+            <a href='#' class="acct-tab-on">[% l("Charges") %]</a>
             <a href='[% mkurl(ctx.opac_root _ '/myopac/main_payments') %]' class="acct-tab-off">[% l("Payments") %]</a>
             [% ELSE %]
-            <a href='[% mkurl(ctx.opac_root _ '/myopac/main') %]' class="acct-tab-off">[% l("Fines") %]</a>
+            <a href='[% mkurl(ctx.opac_root _ '/myopac/main') %]' class="acct-tab-off">[% l("Charges") %]</a>
             <a href='#' class="acct-tab-on">[% l("Payments") %]</a>
             [% END %]
         </div>
diff --git a/Open-ILS/src/templates/opac/parts/topnav.tt2 b/Open-ILS/src/templates/opac/parts/topnav.tt2
index fc12a35a47..e84fbca781 100644
--- a/Open-ILS/src/templates/opac/parts/topnav.tt2
+++ b/Open-ILS/src/templates/opac/parts/topnav.tt2
@@ -66,7 +66,7 @@
                 <span class="dash-align">
                     <a class="dash-link" href="[% mkurl(ctx.opac_root _ '/myopac/main', {}, ['single', 'message_id', 'sort','sort_type'])
                         %]"><span id="dash_fines">[% money(ctx.user_stats.fines.balance_owed)
-                        %]</span> [% l("Fines") %]</a>
+                        %]</span> [% l("Charges") %]</a>
                 </span>
             </div>
             <div id="dashboard_e" class="hidden">
-- 
2.43.2