gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 21944: Improve efficiency of code 

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
This commit is contained in:
Kyle M Hall 2019-12-03 11:03:18 -05:00 committed by Martin Renvoize
parent 07ad62380e
commit 515df43af8
No known key found for this signature in database
GPG Key ID: 422B469130441A0F
3 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
C4/Circulation.pm
View File

@ -2079,11 +2079,10 @@ sub AddReturn {
($resfound, $resrec, undef) = C4::Reserves::CheckReserves( $item->itemnumber, undef, $lookahead ) unless ( $item->withdrawn );
# if a hold is found and is waiting at another branch, change the priority back to 1 and trigger the hold (this will trigger a transfer and update the hold status properly)
if ( $resfound eq "Waiting" and $branch ne $resrec->{branchcode} ) {
C4::Reserves::RevertWaitingStatus( { itemnumber => $item->itemnumber } );
#If the hold is reverted we need to refetch for the return values
($resfound, $resrec, undef) = C4::Reserves::CheckReserves( $item->itemnumber, undef, $lookahead ) unless ( $item->withdrawn );
my $hold = C4::Reserves::RevertWaitingStatus( { itemnumber => $item->itemnumber } );
$resfound = 'Reserved';
$resrec = $hold->unblessed;
}
($resfound, $resrec, undef) = C4::Reserves::CheckReserves( $item->itemnumber, undef, $lookahead ) unless ( $item->withdrawn );
if ($resfound) {
$resrec->{'ResFound'} = $resfound;
$messages->{'ResFound'} = $resrec;

26
C4/Reserves.pm
View File

@ -1987,24 +1987,18 @@ sub RevertWaitingStatus {
$sth = $dbh->prepare( $query );
$sth->execute( $reserve->{'biblionumber'} );
## Fix up the currently waiting reserve
$query = "
UPDATE reserves
SET
priority = 1,
found = NULL,
waitingdate = NULL
WHERE
reserve_id = ?
";
$sth = $dbh->prepare( $query );
$sth->execute( $reserve->{'reserve_id'} );
unless ( $hold->item_level_hold ) {
$hold->itemnumber(undef)->store;
}
$hold->set(
{
priority => 1,
found => undef,
waitingdate => undef,
itemnumber => $hold->item_level_hold ? $hold->itemnumber : undef,
}
)->store();
_FixPriority( { biblionumber => $reserve->{biblionumber} } );
return $hold;
}
=head2 ReserveSlip

5
t/db_dependent/Circulation.t
View File

@ -2909,7 +2909,7 @@ subtest '_FixAccountForLostAndFound returns undef if patron is deleted' => sub {
};
subtest 'Set waiting flag' => sub {
plan tests => 9;
plan tests => 11;
my $library_1 = $builder->build( { source => 'Branch' } );
my $patron_1 = $builder->build( { source => 'Borrower', value => { branchcode => $library_1->{branchcode}, categorycode => $patron_category->{categorycode} } } );
@ -2958,10 +2958,11 @@ subtest 'Set waiting flag' => sub {
$hold = Koha::Holds->find( $reserve_id );
is( $hold->found, undef, 'Hold is no longer marked waiting' );
is( $hold->priority, 1, "Hold is now priority one again");
is( $hold->waitingdate, undef, "Hold no longer has a waiting date");
is( $hold->itemnumber, $item->{itemnumber}, "Hold has retained its' itemnumber");
is( $messages->{ResFound}->{ResFound}, "Reserved", "Hold is still returned");
is( $messages->{ResFound}->{found}, undef, "Hold is no longer marked found in return message");
is( $messages->{ResFound}->{priority}, 1, "Hold is priority 1 in return message");
};
subtest 'Cancel transfers on lost items' => sub {