From a353fe5d988d64f52d0a530b1d507f8f8eab2a5a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marc=20V=C3=A9ron?= Date: Mon, 4 Jul 2016 14:30:24 +0200 Subject: [PATCH] Bug 16810: Fines note not showing on checkout Fines did not show on patron checkout and detail pages unless amout was greater than syspref NoIssueCharges. This patch fixes the logic in koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc Additionally, it changes links to buttons and makes some small text changes to ease translation. To test: - Apply patch - Display checkout or detail page and verify proper display for a patron who has - no fines (no message) - fines not exceeding syspref NoissueCharges (message) - fines exceeding syspref NoIssueCharges (message) Signed-off-by: Hector Castro Works as advertised Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall --- .../prog/en/includes/blocked-fines.inc | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 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 596c0c7a2e..0789789bff 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc @@ -1,22 +1,13 @@ [% USE Price %] [% SET NoIssuesCharge = Koha.Preference('noissuescharge') %] - -[% IF NoIssuesCharge && fines > NoIssuesCharge %] +[% IF fines > 0 %]
  • Fees & Charges: - Patron has - Outstanding fees & charges - [% IF ( fines ) %] - of [% fines | $Price %] - [% END %] - . - - [% IF !Koha.Preference('AllowFineOverride') %] - Checkouts are BLOCKED because fine balance is OVER THE LIMIT. + Patron has outstanding fees & charges of [% fines | $Price %]. + [% IF !Koha.Preference('AllowFineOverride') && NoIssuesCharge && fines > NoIssuesCharge %] + Checkouts are BLOCKED because fine balance is OVER THE LIMIT. [% END %] - - Make payment - or - Pay all fines
    • + Make payment + Pay all fines [% END %] -- 2.39.5