From 5191185e29f713bd6904b771c1b5ea0b6880b914 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Fri, 5 Jan 2024 16:08:44 +0000 Subject: [PATCH] Bug 35100: Various fixes 1) Don't automagically always set a transfer to in transit on checkin.. wait for the user to actually confirm that's the case 2) New transfers triggered by a hold should take precidence, so hide transfers for any other reason from display 3) Update get_transfer and get_transfers to ensure ordering isn't lost when prefetch is used and add tests for this Signed-off-by: Nick Clemens --- C4/Circulation.pm | 12 +- C4/Items.pm | 2 +- Koha/Item.pm | 15 +- Koha/Schema/Result/Item.pm | 3 +- catalogue/detail.pl | 3 +- circ/returns.pl | 12 +- .../prog/en/modules/circ/returns.tt | 5 +- t/db_dependent/Circulation.t | 35 ++- t/db_dependent/Koha/Item.t | 251 +++++++++++++++++- t/db_dependent/Koha/Items.t | 78 +----- 10 files changed, 306 insertions(+), 110 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index b98c267f4b7..3ad9f62ca50 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -2376,10 +2376,9 @@ sub AddReturn { else { $messages->{'TransferTrigger'} = $transfer->reason; if ( $transfer->frombranch eq $branch ) { - $transfer->transit; - $messages->{'WasTransfered'} = $transfer->tobranch; - } - else { + $messages->{'TransferTo'} = $transfer->tobranch; + $messages->{'WasTransfered'} = $transfer->id; + } else { $messages->{'WrongTransfer'} = $transfer->tobranch; $messages->{'WrongTransferItem'} = $item->itemnumber; } @@ -2533,8 +2532,9 @@ sub AddReturn { (C4::Context->preference("UseBranchTransferLimits") and ! IsBranchTransferAllowed($branch, $returnbranch, $item->$BranchTransferLimitsType ) )) { - ModItemTransfer($item->itemnumber, $branch, $returnbranch, $transfer_trigger, { skip_record_index => 1 }); - $messages->{'WasTransfered'} = $returnbranch; + my $transfer = ModItemTransfer($item->itemnumber, $branch, $returnbranch, $transfer_trigger, { skip_record_index => 1 }); + $messages->{'TransferTo'} = $returnbranch; + $messages->{'WasTransfered'} = $transfer->id; $messages->{'TransferTrigger'} = $transfer_trigger; } else { $messages->{'NeedsTransfer'} = $returnbranch; diff --git a/C4/Items.pm b/C4/Items.pm index c640b63baa3..c2f7ae16b54 100644 --- a/C4/Items.pm +++ b/C4/Items.pm @@ -386,7 +386,7 @@ sub ModItemTransfer { $transfer->transit({ skip_record_index => $params->{skip_record_index} }); } - return; + return $transfer; } =head2 ModDateLastSeen diff --git a/Koha/Item.pm b/Koha/Item.pm index a86b9287645..1156b6f4a04 100644 --- a/Koha/Item.pm +++ b/Koha/Item.pm @@ -776,9 +776,13 @@ we still expect the item to end up at a final location eventually. sub get_transfer { my ($self) = @_; + my $transfers = $self->_result->current_branchtransfers->search( + undef, + { 'order_by' => [ { '-desc' => 'datesent' }, { '-asc' => 'daterequested' } ] } + ); - my $transfer = $self->_result->current_branchtransfers->next; - return Koha::Item::Transfer->_new_from_dbic($transfer) if $transfer; + my $transfer = $transfers->next; + return Koha::Item::Transfer->_new_from_dbic($transfer) if $transfer; } =head3 get_transfers @@ -801,9 +805,12 @@ we still expect the item to end up at a final location eventually. sub get_transfers { my ($self) = @_; - my $transfer_rs = $self->_result->current_branchtransfers; + my $transfers_rs = $self->_result->current_branchtransfers->search( + undef, + { 'order_by' => [ { '-desc' => 'datesent' }, { '-asc' => 'daterequested' } ] } + ); - return Koha::Item::Transfers->_new_from_dbic($transfer_rs); + return Koha::Item::Transfers->_new_from_dbic($transfers_rs); } =head3 last_returned_by diff --git a/Koha/Schema/Result/Item.pm b/Koha/Schema/Result/Item.pm index 8320ce4c761..042e803a672 100644 --- a/Koha/Schema/Result/Item.pm +++ b/Koha/Schema/Result/Item.pm @@ -1024,8 +1024,7 @@ __PACKAGE__->has_many( "$args->{foreign_alias}.datearrived" => undef, "$args->{foreign_alias}.datecancelled" => undef, }; - }, - { order_by => [ { -desc => 'datesent' }, { -asc => 'daterequested' } ] } + } ); # Relationship with bundled items diff --git a/catalogue/detail.pl b/catalogue/detail.pl index 9edaf3f3bbf..dbeb095ada3 100755 --- a/catalogue/detail.pl +++ b/catalogue/detail.pl @@ -196,7 +196,8 @@ $params->{ itemlost } = 0 if $patron->category->hidelostitems && !$showallitems; my $items_params = { ( $invalid_marc_record ? () : ( host_items => 1 ) ), }; -my $items = $biblio->items($items_params)->search_ordered( $params, { prefetch => ['issue','current_branchtransfers'] } ); +my $items = + $biblio->items($items_params)->search_ordered( $params, { prefetch => [ 'issue', 'current_branchtransfers' ] } ); # flag indicating existence of at least one item linked via a host record my $hostrecords = $biblio->host_items->count; diff --git a/circ/returns.pl b/circ/returns.pl index c0df0611390..cf3c2c54ff8 100755 --- a/circ/returns.pl +++ b/circ/returns.pl @@ -519,10 +519,11 @@ my $recalled = 0; if ( $messages->{'WasTransfered'} ) { $template->param( - found => 1, - transfer => $messages->{'WasTransfered'}, - trigger => $messages->{'TransferTrigger'}, - itemnumber => $itemnumber, + found => 1, + transfer => $messages->{'WasTransfered'}, + transferto => $messages->{'TransferTo'}, + trigger => $messages->{'TransferTrigger'}, + itemnumber => $itemnumber, ); } @@ -696,6 +697,9 @@ foreach my $code ( keys %$messages ) { elsif ( $code eq 'WasTransfered' ) { ; # FIXME... anything to do here? } + elsif ( $code eq 'TransferTo' ) { + ; # Handled above, along with WasTransfered + } elsif ( $code eq 'withdrawn' ) { $err{withdrawn} = 1; } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index 2abde7f9c5a..f937133addd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -121,7 +121,7 @@ [% END # /IF hold_auto_filled %] - [% IF ( trigger ) %] + [% IF ( trigger && !transfertodo ) %]

Reason for transfer

@@ -737,7 +737,7 @@