From 36d5f38a8eb034a8269f56ee7583352a243cb7cc Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Mon, 15 Mar 2021 16:09:42 +0000 Subject: [PATCH] Bug 24295: Remove GetTransfers from opac-basket.pl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch replaces the call to GetTransfers in opac-basket with the get_transfer method available from the Koha::Item object Test plan 1/ Trigger the transfer of the item 2/ Check the opac-basket page for the display of the current transfer status 3/ Apply patch 4/ Repeat step 2 JK: Remove unneeded string formatting for transfertwhen as it's done on the template toolkit side already with $KohaDates. Add missing Koha::Items module import. Rebased-by: Joonas Kylmälä Signed-off-by: Joonas Kylmälä Signed-off-by: Martin Renvoize --- opac/opac-basket.pl | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/opac/opac-basket.pl b/opac/opac-basket.pl index f2eefd0bca..5a8bdf32da 100755 --- a/opac/opac-basket.pl +++ b/opac/opac-basket.pl @@ -26,13 +26,13 @@ use C4::Biblio qw( GetMarcSubjects GetMarcUrls ); -use C4::Circulation qw( GetTransfers ); use C4::Auth qw( get_template_and_user ); use C4::Output qw( output_html_with_http_headers ); use Koha::RecordProcessor; use Koha::CsvProfiles; use Koha::AuthorisedValues; use Koha::Biblios; +use Koha::Items; my $query = CGI->new; @@ -124,11 +124,12 @@ foreach my $biblionumber ( @bibs ) { if ($itm->{'location'}){ $itm->{'location_opac'} = $shelflocations->{$itm->{'location'} }; } - my ( $transfertwhen, $transfertfrom, $transfertto ) = GetTransfers($itm->{itemnumber}); - if ( defined( $transfertwhen ) && $transfertwhen ne '' ) { - $itm->{transfertwhen} = $transfertwhen; - $itm->{transfertfrom} = $transfertfrom; - $itm->{transfertto} = $transfertto; + my $item_object = Koha::Items->find($itm->{itemnumber}); + my $transfer = $item_object->get_transfer; + if ( $transfer && $transfer->in_transit ) { + $itm->{transfertwhen} = $transfer->datesent; + $itm->{transfertfrom} = $transfer->frombranch; + $itm->{transfertto} = $transfer->tobranch; } } $num++; -- 2.20.1