From 851c81460bafcf7159ecbefacd213d48436ab95b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20V=C3=A9ron?= <veron@veron.ch> Date: Mon, 4 Jul 2016 14:30:24 +0200 Subject: [PATCH] [SIGNED-OFF]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 <hector.hecaxmmx@gmail.com> Works as advertised --- .../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 596c0c7..0789789 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 %] <li> <span class="circ-hlt">Fees & Charges:</span> - Patron has <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrowernumber %]"> - Outstanding fees & charges - [% IF ( fines ) %] - of [% fines | $Price %] - [% END %] - </a>. - - [% IF !Koha.Preference('AllowFineOverride') %] - <span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span> + Patron has outstanding fees & charges of [% fines | $Price %]. + [% IF !Koha.Preference('AllowFineOverride') && NoIssuesCharge && fines > NoIssuesCharge %] + <span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span> [% END %] - - <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrowernumber %]">Make payment</a> - or - <a href="/cgi-bin/koha/members/paycollect.pl?borrowernumber=[% borrowernumber %]">Pay all fines</a></li> + <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrowernumber %]" class="btn btn-mini" >Make payment</a> + <a href="/cgi-bin/koha/members/paycollect.pl?borrowernumber=[% borrowernumber %]" class="btn btn-mini" >Pay all fines</a></li> </li> [% END %] -- 1.7.10.4