From 7c8b170ddb2cff16687c5667e5a1361875a5946e Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Thu, 25 Aug 2022 08:56:54 +0100 Subject: [PATCH] Bug 31095: Remove GetDebarments from Patron::Import This patch replaced GetDebarments with $patron->restrictions->search in Koha::Patron::Import. Test plan 1. Confirm that importing patrons with debarred and debarredcomment fields in the import still works as expected Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 9ea8cf0a8f5a5a827f1f553923a016811d04de9b) Signed-off-by: Matt Blenkinsop --- Koha/Patrons/Import.pm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Koha/Patrons/Import.pm b/Koha/Patrons/Import.pm index 6f62cc1a37..3ba184d1e2 100644 --- a/Koha/Patrons/Import.pm +++ b/Koha/Patrons/Import.pm @@ -29,7 +29,7 @@ use C4::Letters qw( GetPreparedLetter EnqueueLetter ); use Koha::Libraries; use Koha::Patrons; use Koha::Patron::Categories; -use Koha::Patron::Debarments qw( AddDebarment GetDebarments ); +use Koha::Patron::Debarments qw( AddDebarment ); use Koha::DateUtils qw( dt_from_string output_pref ); =head1 NAME @@ -293,16 +293,15 @@ sub import_patrons { if ( $borrower{debarred} && ( ( $borrower{debarred} ne $member->{debarred} ) || ( $borrower{debarredcomment} ne $member->{debarredcomment} ) ) ) { # Check to see if this debarment already exists - my $debarrments = GetDebarments( + my $restrictions = $patron->restrictions->search( { - borrowernumber => $borrowernumber, - expiration => $borrower{debarred}, - comment => $borrower{debarredcomment} + expiration => $borrower{debarred}, + comment => $borrower{debarredcomment} } ); # If it doesn't, then add it! - unless (@$debarrments) { + unless ($restrictions->count) { AddDebarment( { borrowernumber => $borrowernumber, -- 2.39.5