From 17c07ab8094708f8a868ebfb5bd64adf9c2da0e8 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Thu, 23 Feb 2023 15:33:00 +0000 Subject: [PATCH] Bug 33055: (bug 32624 follow-up) Don't send a screen message if not blocked To test: 0 - Apply first patch 1 - prove -v t/db_dependent/SIP/Patron.t 2 - It fails 3 - Apply second patch 4 - prove -v t/db_dependent/SIP/Patron.t 5 - It passes! Signed-off-by: Martin Renvoize Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 6c5c35aa32a7ff61e46d9198dee55a0239f55f96) Signed-off-by: Matt Blenkinsop (cherry picked from commit a076542019dee21a64e18a43977d7256d266c80c) Signed-off-by: Lucas Gass (cherry picked from commit 69cfbbabe39347e33ab9efc3ecf4fd3fd9d5f6f4) Signed-off-by: Arthur Suzuki --- C4/SIP/ILS/Patron.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/C4/SIP/ILS/Patron.pm b/C4/SIP/ILS/Patron.pm index d3f5d63e95..44093eae76 100644 --- a/C4/SIP/ILS/Patron.pm +++ b/C4/SIP/ILS/Patron.pm @@ -90,11 +90,11 @@ sub new { } elsif ( $noissueschargeguarantorswithguarantees ) { $fines_amount += $patron->relationships_debt({ include_guarantors => 1, only_this_guarantor => 0, include_this_patron => 0 }); $fine_blocked ||= $fines_amount > $noissueschargeguarantorswithguarantees; - $fines_msg .= " -- " . "Patron blocked by fines ($fines_amount) on related accounts"; + $fines_msg .= " -- " . "Patron blocked by fines ($fines_amount) on related accounts" if $fine_blocked; } elsif ( $noissueschargeguarantees ) { $fines_amount += $patron->relationships_debt({ include_guarantors => 0, only_this_guarantor => 0, include_this_patron => 0 }); $fine_blocked ||= $fines_amount > $noissueschargeguarantees; - $fines_msg .= " -- " . "Patron blocked by fines ($fines_amount) on guaranteed accounts"; + $fines_msg .= " -- " . "Patron blocked by fines ($fines_amount) on guaranteed accounts" if $fine_blocked; } my $circ_blocked =( C4::Context->preference('OverduesBlockCirc') ne "noblock" && defined $flags->{ODUES}->{itemlist} ) ? 1 : 0; -- 2.39.5