Attachment 104513 Details for Bug 24098 – Bug 24098: Standardize Fines/Fees & Charges

[patch] Bug 24098: Standardize Fines/Fees & Charges

Bug-24098-Standardize-FinesFees--Charges.patch (text/plain), 4.80 KB, created by Owen Leonard on 2020-05-07 13:26:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2020-05-07 13:26:13 UTC

Size: 4.80 KB

patch

obsolete

>From 4c241ed77bf3d07899b99ed5b90c44979386da38 Mon Sep 17 00:00:00 2001
>From: Katrin Fischer <katrin.fischer.83@web.de>
>Date: Mon, 13 Apr 2020 02:20:30 +0200
>Subject: [PATCH] Bug 24098: Standardize Fines/Fees & Charges
>
>This patch suggests to adopt the terminology used in the OPAC
>to only use charges and leave off the Fines or Fees.
>
>To test:
>- Add a charge to your account
>- Check the note on the details and checkouts tabs
>- Check the tab name on the details tab
>- Activate batch checkouts via systempreferences for your
> patron category:
> - BatchCheckouts
> - BatchCheckoutsValidCategories
>- Add a guarantee to your patron and allow to see fines
> (requires: AllowStaffToSetFinesVisibilityForGuarantor)
>- Add a manual fine for the guaranee above NoIssuesChargeGuarantee
>- Go to the batch checkout tab of your patron and verify note there
>
>Signed-off-by: Owen Leonard <oleonard@myacpl.org>
>---
> koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc | 4 ++--
> koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 2 +-
> .../intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt | 2 +-
> 4 files changed, 5 insertions(+), 5 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc
>index 4bba7f7ba9..ccb5ed2df6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc
>@@ -2,8 +2,8 @@
> [% SET NoIssuesCharge = Koha.Preference('noissuescharge') %]
> [% IF fines and fines > 0 %]
> <li>
>- Fees &amp; Charges:
>- Patron has outstanding fees &amp; charges of [% fines | $Price %].
>+ Charges:
>+ Patron has outstanding charges of [% fines | $Price %].
> [% IF !Koha.Preference('AllowFineOverride') && NoIssuesCharge && fines > NoIssuesCharge %]
> Checkouts are BLOCKED because fine balance is OVER THE LIMIT.
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>index 7423164850..a4d721a062 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>@@ -766,7 +766,7 @@
> 
> [% IF ( charges_guarantees ) %]
> <li>
>- Fees &amp; Charges: Patron's guarantees collectively owe [% chargesamount_guarantees | $Price %].
>+ Charges: Patron's guarantees collectively owe [% chargesamount_guarantees | $Price %].
> [% IF noissues %]
> Checkouts are BLOCKED because fine balance is OVER THE LIMIT.
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
>index 2550819714..4df661a155 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
>@@ -51,7 +51,7 @@
> [% END %]
> [% IF charges_guarantees %]
> <li>
>- Fees &amp; Charges: Patron's guarantees collectively owe [% chargesamount_guarantees | $Price %].
>+ Charges: Patron's guarantees collectively owe [% chargesamount_guarantees | $Price %].
> </li>
> <li>
> Checkouts are BLOCKED because fine balance is OVER THE LIMIT.
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>index 8321edef92..01587de3e2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>@@ -710,7 +710,7 @@
> [% END %]
> [% IF ( fines ) %]
> <li id="finestab">
>- <a href="#finesandcharges">Fines &amp; Charges ([% fines | $Price %])</a>
>+ <a href="#finesandcharges">Charges ([% fines | $Price %])</a>
> </li>
> [% END %]
> [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 24098: 102788 | 104513 | 104560