From 998e51e7a505c36a9f3631e0f52d951e613a4e07 Mon Sep 17 00:00:00 2001
From: Kyle M Hall <kyle@bywatersolutions.com>
Date: Fri, 24 Jul 2020 09:00:12 -0400
Subject: [PATCH] Bug 19382: Add blocking of ability to checkout on
 circulation.pl

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
---
 circ/circulation.pl                           | 13 ++++++++
 .../prog/en/modules/circ/circulation.tt       | 14 ++++++--
 .../circ/circulation_batch_checkouts.tt       | 32 ++++++++++++-------
 3 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/circ/circulation.pl b/circ/circulation.pl
index 33d3614b22..e1391591f4 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -494,6 +494,19 @@ if ( $patron ) {
         );
     }
 
+    # Check the debt of this patrons guarantors *and* the guarantees of those guarantors
+    my $no_issues_charge_guarantors = C4::Context->preference("NoIssuesChargeGuarantorsWithGuarantees");
+    if ( $no_issues_charge_guarantors ) {
+        my $guarantors_non_issues_charges += $patron->relationships_debt({ include_guarantors => 1, only_this_guaranor => 0, include_this_patron => 1 });
+
+        if ( $guarantors_non_issues_charges > $no_issues_charge_guarantors ) {
+            $template->param(
+                charges_guarantors_guarantees => $guarantors_non_issues_charges
+            );
+            $noissues = 1 unless C4::Context->preference("allowfineoverride");
+        }
+    }
+
     my $no_issues_charge_guarantees = C4::Context->preference("NoIssuesChargeGuarantees");
     $no_issues_charge_guarantees = undef unless looks_like_number( $no_issues_charge_guarantees );
     if ( defined $no_issues_charge_guarantees ) {
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 c38fb930e6..056d40519d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -770,14 +770,22 @@
                                         <li><span class="circ-hlt return-claims">Return claims: Patron has [% return_claims.count | html %] RETURN CLAIMS.</span>
                                     [% END %]
 
-                                    [% IF ( charges ) %]
-                                        [% INCLUDE 'blocked-fines.inc' fines = chargesamount %]
-                                    [% END %]
 
                                     [% IF age_limitations %]
                                         [% INCLUDE 'category-out-of-age-limit.inc' %]
                                     [% END %]
 
+                                    [% IF ( charges ) %]
+                                        [% INCLUDE 'blocked-fines.inc' fines = chargesamount %]
+                                    [% END %]
+                                    [% IF ( charges_guarantors_guarantees ) %]
+                                        <li>
+                                            <span class="circ-hlt">Charges:</span> Patron's guarantors and their other guarantees collectively owe [% charges_guarantors_guarantees | $Price %].
+                                            [% IF noissues %]
+                                                <span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span>
+                                            [% END %]
+                                        </li>
+                                    [% END %]
                                     [% IF ( charges_guarantees ) %]
                                         <li>
                                             <span class="circ-hlt">Charges:</span> Patron's guarantees collectively owe [% chargesamount_guarantees | $Price %].
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 8ae8741ce2..59495fe2e7 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
@@ -46,18 +46,26 @@
   <div class="dialog alert">You are not allowed to use batch checkout for this patron</div>
 [% ELSIF patron and noissues and not checkout_infos %]
   <div class="dialog alert">
-    Cannot check out!
-    [% IF charges %]
-      <span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span>
-    [% END %]
-    [% IF charges_guarantees %]
-        <li>
-            <span class="circ-hlt">Charges:</span> Patron's guarantees collectively owe [% chargesamount_guarantees | $Price %].
-        </li>
-        <li>
-            <span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span>
-        </li>
-    [% END %]
+      Cannot check out!
+      [% IF ( charges ) %]
+          [% INCLUDE 'blocked-fines.inc' fines = chargesamount %]
+      [% END %]
+      [% IF ( charges_guarantors_guarantees ) %]
+          <li>
+              <span class="circ-hlt">Charges:</span> Patron's guarantors and their other guarantees collectively owe [% charges_guarantors_guarantees | $Price %].
+              [% IF noissues %]
+                  <span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span>
+              [% END %]
+          </li>
+      [% END %]
+      [% IF ( charges_guarantees ) %]
+          <li>
+              <span class="circ-hlt">Charges:</span> Patron's guarantees collectively owe [% chargesamount_guarantees | $Price %].
+              [% IF noissues %]
+                  <span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span>
+              [% END %]
+          </li>
+      [% END %]
   </div>
 [% ELSIF patron and not checkout_infos %]
   <form method="post" enctype="multipart/form-data" action="/cgi-bin/koha/circ/circulation.pl">
-- 
2.24.1 (Apple Git-126)