From d8a12683dc5e5ce451d0eb0c0d05e62c07fabc9b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Marc=20V=C3=A9ron?= <veron@veron.ch>
Date: Mon, 4 Jul 2016 14:30:24 +0200
Subject: [PATCH] Bug 16810: Fines note not showing on checkout
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

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

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit a353fe5d988d64f52d0a530b1d507f8f8eab2a5a)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
---
 .../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 %]
     <li>
         <span class="circ-hlt">Fees &amp; Charges:</span>
-        Patron has <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrowernumber %]">
-            Outstanding fees &amp; 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 &amp; 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 %]
-- 
2.39.5