From 14f7660b2e46ac4e13478b0a60f9cf8b1ef68add Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Mon, 14 Aug 2023 10:55:09 -0400 Subject: [PATCH] Bug 34529: Offline circulation should be able to accept userid as well as cardnumber Like everywhere else in Koha, offline circulation should be able to use userid as well as cardnumber to look up the patron for a transaction ( checkouts and fine payments ). Test Plan: 1) Apply this patch 2) Restart all the things! 3) Download the test.koc file attached to this bug 4) Verify you have an item with the barcode 39999000001396 create it if needed 5) Set a patron's username to "hacevedo" 6) Upload and import the test.koc file into offline circ 7) Verify the item was checked out and the payment was made Signed-off-by: Philip Orr Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi --- C4/Circulation.pm | 4 +++- offline_circ/list.pl | 8 +++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index 16a400711a..34ff9542e7 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -4242,6 +4242,7 @@ sub ProcessOfflineIssue { my $operation = shift; my $patron = Koha::Patrons->find( { cardnumber => $operation->{cardnumber} } ); + $patron ||= Koha::Patrons->find( { userid => $operation->{cardnumber} } ); if ( $patron ) { my $item = Koha::Items->find({ barcode => $operation->{barcode} }); @@ -4275,7 +4276,8 @@ sub ProcessOfflineIssue { sub ProcessOfflinePayment { my $operation = shift; - my $patron = Koha::Patrons->find({ cardnumber => $operation->{cardnumber} }); + my $patron = Koha::Patrons->find( { cardnumber => $operation->{cardnumber} } ); + $patron ||= Koha::Patrons->find( { userid => $operation->{cardnumber} } ); $patron->account->pay( { diff --git a/offline_circ/list.pl b/offline_circ/list.pl index 252dc8594b..2838a18530 100755 --- a/offline_circ/list.pl +++ b/offline_circ/list.pl @@ -48,7 +48,13 @@ for (@$operations) { $_->{'bibliotitle'} = $biblio->title; $_->{'biblionumber'} = $biblio->biblionumber; } - my $patron = $_->{cardnumber} ? Koha::Patrons->find( { cardnumber => $_->{cardnumber} } ) : undef; + + my $patron = + $_->{cardnumber} + ? Koha::Patrons->find( { cardnumber => $_->{cardnumber} } ) + || Koha::Patrons->find( { userid => $_->{cardnumber} } ) + : undef; + if ($patron) { $_->{'borrowernumber'} = $patron->borrowernumber; $_->{'borrower'} = ($patron->firstname ? $patron->firstname:'').' '.$patron->surname; -- 2.39.5