From 781346e534ba9cbae02645c76deb76e7d942ea70 Mon Sep 17 00:00:00 2001 From: Francois Charbonnier Date: Thu, 13 Oct 2016 13:28:21 -0400 Subject: [PATCH] Bug 17442 - Reinstate patron's fine warning that was lost with bug 14497 Bug 14497 added a warning to patron details page if patron's fines exceed noissuescharge, but it also changed the condition to display the warning on the circulation page. Until 16.05, the staff could see the fees and charges warning on the circulation page when the patron had fines. But, with Bug 14497, the warning appears only when the patron's fines exceed the noissuescharge syspref. This patch will keep the new warning on he patron detail page. It will rollback the warning to the original behaviour. The fees and charges warning will show up no matter how much the patron owes to the library. Test plan : 1) Apply this patch 2) Find or create a patron who's fines doesn't exceed noissuescharge 3) You should see the fees and charges warning on the circulation page (circulation.pl) 4) Browse to the patron's details page (moremember.pl). The warning doesn't appear 5) Find or create a patron who's fines exceed noissuescharge 5) Browse to that patron's details ( moremember.pl ) 6) You should see a warning near the top of the page --- koha-tmpl/intranet-tmpl/prog/en/includes/fines.inc | 6 ++++++ koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/fines.inc diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/fines.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/fines.inc new file mode 100644 index 0000000..15ccf81 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/fines.inc @@ -0,0 +1,6 @@ +
  • +Fees & Charges: Patron has Outstanding fees & charges[% IF ( chargesamount ) %] of [% chargesamount %][% END %]. +[% IF ( charges_is_blocker ) %] +Checkouts are BLOCKED because fine balance is OVER THE LIMIT. +[% END %] +Make payment
  • 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 e0284b2..1ce3be6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -791,7 +791,7 @@ No patron matched [% message | html %] [% END %] [% IF ( charges ) %] - [% INCLUDE 'blocked-fines.inc' + [% INCLUDE 'fines.inc' fines = chargesamount %] [% END %] -- 2.1.0