Attachment 148254 Details for Bug 33056 – Bug 33056: Terminology: change 'fine' to 'charge'when making a payment or writeoff

[patch] Bug 33056: Terminology: change 'fine' to 'charge'when making a payment or writeoff

Bug-33056-Terminology-change-fine-to-chargewhen-ma.patch (text/plain), 9.02 KB, created by Martin Renvoize (ashimema) on 2023-03-16 09:55:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2023-03-16 09:55:17 UTC

Size: 9.02 KB

patch

obsolete

>From 874c0749859e5435140c975aa9ceacc48c4f1a86 Mon Sep 17 00:00:00 2001
>From: Katrin Fischer <katrin.fischer.83@web.de>
>Date: Thu, 23 Feb 2023 20:42:54 +0000
>Subject: [PATCH] Bug 33056: Terminology: change 'fine' to 'charge'when making
> a payment or writeoff
>
>In the development meeting of Feb 22, 2023, we decided to change 'fine' to 'charge' when referring to various types of fees ('fine' should be limited to overdue fines).
>
>To test:
>0. Go to patron's account accounting tab, Make a payment section
>   --> It will read: X has no outstanding fines.
>   0.1 Create a manual invoice
>   --> Use "Write off all" button, verify confirmation message says 'fines'
>1. Add a manual fee to a patron's account
>   1.1. Go to a patron's account > Accounting tab
>   1.2. Click 'Create manual invoice'
>   1.3. Enter an amount
>   1.4. Click 'Save'
>2. Pay an individual charge
>   2.1. Click 'Make a payment'
>   2.2. Click the 'Pay' button next to an individual charge
>   --> In the browser tab title, it says 'Collect fine payment for ...'
>   --> In the breadcrumbs, the last section is 'Pay an individual fine'
>   --> The heading of the page is 'Pay an individual fine'
>   --> The heading inside the payment tab is 'Pay an individual fine'
>   2.3. Click 'Cancel' and go back to the 'Make a payment' tab
>3. Pay an amount toward all charges
>   3.1. Click 'Pay amount'
>   --> In the browser tab title, it says 'Collect fine payment for ...'
>   --> In the breadcrumbs, the last section is 'Pay an amount toward all fines'
>   --> The heading of the page is 'Pay an amount toward all fines'
>   --> The heading inside the payment tab is 'Pay an amount toward all fines'
>   3.2. Click 'Cancel' and go back to the 'Make a payment' tab
>4. Pay an amount toward selected charges
>   4.1. Click 'Pay selected'
>   --> In the browser tab title, it says 'Collect fine payment for ...'
>   --> In the breadcrumbs, the last section is 'Pay an amount toward selected fines'
>   --> The heading of the page is 'Pay an amount toward selected fines'
>   --> The heading inside the payment tab is 'Pay an amount toward selected fines'
>   4.2. Click 'Cancel' and go back to the 'Make a payment' tab
>5. Write off an individual charge
>   5.1. Click the 'Write off' button next to an individual charge
>   --> In the browser tab title, it says 'Collect fine payment for ...'
>   --> In the breadcrumbs, the last section is 'Write off an individual fine'
>   --> The heading of the page is 'Write off an individual fine'
>   --> The heading inside the payment tab is 'Write off an individual fine'
>   5.2. Click 'Cancel' and go back to the 'Make a payment' tab
>6. Write off selected charges
>   6.1. Click 'Writeoff selected'
>   --> In the browser tab title, it says 'Write off an amount for ...'
>   --> In the breadcrumbs, the last section is 'Write off an amount toward selected fines'
>   --> The heading of the page is 'Write off an amount toward selected fines'
>   --> The heading inside the payment tab is 'Write off an amount toward selected fines'
>   6.2. Click 'Cancel' and go back to the 'Make a payment' tab
>7. Apply patch and repeat
>   --> All fines should now be charges.
>
>Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> .../prog/en/modules/members/pay.tt            |  4 +--
> .../prog/en/modules/members/paycollect.tt     | 32 +++++++++----------
> 2 files changed, 18 insertions(+), 18 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
>index 0e5771c382..392344b933 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
>@@ -187,7 +187,7 @@
> </fieldset>
> </form>
> [% ELSE %]
>-    <p>[% INCLUDE 'patron-title.inc' %] has no outstanding fines.</p>
>+    <p>[% INCLUDE 'patron-title.inc' %] has no outstanding charges.</p>
> [% END %]
>         </div> 
>     </div> 
>@@ -225,7 +225,7 @@
> 
>             $('#pay-fines-form').preventDoubleFormSubmit();
>             $("#woall").click(function(event){
>-                var msg = _("Are you sure you want to write off %s in outstanding fines? This cannot be undone!").format( "[% total | $Price %]" );
>+                var msg = _("Are you sure you want to write off %s in outstanding charges? This cannot be undone!").format( "[% total | $Price %]" );
>                 var answer = confirm(msg);
>                     if (!answer){
>                         event.preventDefault();
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
>index 250f8d8f63..8ad95e5855 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
>@@ -25,7 +25,7 @@
>     [% IF type == 'WRITEOFF' %]
>         Write off an amount for [% INCLUDE 'patron-title.inc' no_html = 1 %]
>     [% ELSE %]
>-        Collect fine payment for [% INCLUDE 'patron-title.inc' no_html = 1 %]
>+        Collect payment for [% INCLUDE 'patron-title.inc' no_html = 1 %]
>     [% END %] &rsaquo; Patrons &rsaquo; Koha
> </title>
> [% INCLUDE 'doc-head-close.inc' %]
>@@ -51,18 +51,18 @@
>         <li>
>             <a href="#" aria-current="page">
>                 [% IF ( pay_individual ) %]
>-                    <span>Pay an individual fine</span>
>+                    <span>Pay an individual charge</span>
>                 [% ELSIF ( writeoff_individual ) %]
>-                    <span>Write off an individual fine</span>
>+                    <span>Write off an individual charge</span>
>                 [% ELSE %]
>                     [% IF ( selected_accts ) %]
>                         [% IF type == 'WRITEOFF' %]
>-                            <span>Write off an amount toward selected fines</span>
>+                            <span>Write off an amount toward selected charges</span>
>                         [% ELSE %]
>-                            <span>Pay an amount toward selected fines</span>
>+                            <span>Pay an amount toward selected charges</span>
>                         [% END %]
>                     [% ELSE %]
>-                        <span>Pay an amount toward all fines</span>
>+                        <span>Pay an amount toward all charges</span>
>                     [% END %]
>                 [% END %]
>             </a>
>@@ -78,18 +78,18 @@
> 
>             <h1>
>                 [% IF ( pay_individual ) %]
>-                    <span>Pay an individual fine</span>
>+                    <span>Pay an individual charge</span>
>                 [% ELSIF ( writeoff_individual ) %]
>-                    <span>Write off an individual fine</span>
>+                    <span>Write off an individual charge</span>
>                 [% ELSE %]
>                     [% IF ( selected_accts ) %]
>                         [% IF type == 'WRITEOFF' %]
>-                            <span>Write off an amount toward selected fines</span>
>+                            <span>Write off an amount toward selected charges</span>
>                         [% ELSE %]
>-                            <span>Pay an amount toward selected fines</span>
>+                            <span>Pay an amount toward selected charges</span>
>                         [% END %]
>                     [% ELSE %]
>-                        <span>Pay an amount toward all fines</span>
>+                        <span>Pay an amount toward all charges</span>
>                     [% END %]
>                 [% END %]
>             </h1>
>@@ -148,7 +148,7 @@
>     <input type="hidden" name="change_given" id="change_given" />
> 
> <fieldset class="rows">
>-    <legend>Pay an individual fine</legend>
>+    <legend>Pay an individual charge</legend>
>     <input type="hidden" name="payment_note" id="payment_note" value="[% payment_note | html %]" />
>     <table>
>     <thead><tr>
>@@ -234,7 +234,7 @@
>     <form name="woindivfine" id="woindivfine" action="/cgi-bin/koha/members/pay.pl" method="post" >
>     <input type="hidden" name="csrf_token" value="[% csrf_token | html %]" />
>     <fieldset class="rows">
>-    <legend>Write off an individual fine</legend>
>+    <legend>Write off an individual charge</legend>
>     <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber | html %]" />
>     <input type="hidden" name="pay_individual" id="pay_individual" value="[% pay_individual | html %]" />
>     <input type="hidden" name="itemnumber" id="itemnumber" value="[% itemnumber | html %]" />
>@@ -309,12 +309,12 @@
>     <fieldset class="rows">
>     [% IF ( selected_accts ) %]
>         [% IF type == 'WRITEOFF' %]
>-            <legend>Write off an amount toward selected fines</legend>
>+            <legend>Write off an amount toward selected charges</legend>
>         [% ELSE %]
>-            <legend>Pay an amount toward selected fines</legend>
>+            <legend>Pay an amount toward selected charges</legend>
>         [% END %]
>     [% ELSE %]
>-        <legend>Pay an amount toward all fines</legend>
>+        <legend>Pay an amount toward all charges</legend>
>     [% END %]
> 
>     <ol>
>-- 
>2.39.2

Actions: View | Diff | Splinter Review

Attachments on bug 33056: 147740 | 147742 | 148254