From bbdbf642fe6eb68193d0b2992bc3b1a1701155ba Mon Sep 17 00:00:00 2001 From: Katrin Fischer 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. https://bugs.koha-community.org/show_bug.cgi?id=33058 Signed-off-by: Caroline Cyr La Rose --- .../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 @@ [% ELSE %] -

[% INCLUDE 'patron-title.inc' %] has no outstanding fines.

+

[% INCLUDE 'patron-title.inc' %] has no outstanding charges.

[% END %] @@ -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 c5bc2ed26b..dab89f488d 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 %] › Patrons › Koha [% INCLUDE 'doc-head-close.inc' %] @@ -51,18 +51,18 @@
  • [% IF ( pay_individual ) %] - Pay an individual fine + Pay an individual charge [% ELSIF ( writeoff_individual ) %] - Write off an individual fine + Write off an individual charge [% ELSE %] [% IF ( selected_accts ) %] [% IF type == 'WRITEOFF' %] - Write off an amount toward selected fines + Write off an amount toward selected charges [% ELSE %] - Pay an amount toward selected fines + Pay an amount toward selected charges [% END %] [% ELSE %] - Pay an amount toward all fines + Pay an amount toward all charges [% END %] [% END %] @@ -78,18 +78,18 @@

    [% IF ( pay_individual ) %] - Pay an individual fine + Pay an individual charge [% ELSIF ( writeoff_individual ) %] - Write off an individual fine + Write off an individual charge [% ELSE %] [% IF ( selected_accts ) %] [% IF type == 'WRITEOFF' %] - Write off an amount toward selected fines + Write off an amount toward selected charges [% ELSE %] - Pay an amount toward selected fines + Pay an amount toward selected charges [% END %] [% ELSE %] - Pay an amount toward all fines + Pay an amount toward all charges [% END %] [% END %]

    @@ -148,7 +148,7 @@
    - Pay an individual fine + Pay an individual charge @@ -234,7 +234,7 @@
    - Write off an individual fine + Write off an individual charge @@ -309,12 +309,12 @@
    [% IF ( selected_accts ) %] [% IF type == 'WRITEOFF' %] - Write off an amount toward selected fines + Write off an amount toward selected charges [% ELSE %] - Pay an amount toward selected fines + Pay an amount toward selected charges [% END %] [% ELSE %] - Pay an amount toward all fines + Pay an amount toward all charges [% END %]
      -- 2.34.1