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

Bug 24620: Fix test, remove replaced code, use dt_from_string 

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:
Nick Clemens 2020-03-10 07:12:07 -04:00 committed by Martin Renvoize
parent c132946cc0
commit dcaba0ac4e
No known key found for this signature in database
GPG Key ID: 422B469130441A0F
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
C4/Reserves.pm
View File

@ -1142,9 +1142,6 @@ sub ModReserveAffect {
$hold->itemnumber($itemnumber);
$hold->set_waiting($transferToDo);
_koha_notify_reserve( $hold->reserve_id )
if ( !$transferToDo && !$already_on_shelf );
if( !$transferToDo ){
_koha_notify_reserve( $hold->reserve_id ) unless $already_on_shelf;
my $transfers = Koha::Item::Transfers->search({
@ -1152,7 +1149,7 @@ sub ModReserveAffect {
datearrived => undef
});
while( my $transfer = $transfers->next ){
$transfer->datearrived( DateTime->now( time_zone => C4::Context->tz() ) )->store;
$transfer->datearrived( dt_from_string() )->store;
};
}

15
t/db_dependent/Circulation.t
View File

@ -3820,8 +3820,8 @@ subtest 'Filling a hold should cancel existing transfer' => sub {
t::lib::Mocks::mock_preference('AutomaticItemReturn', 1);
my $libraryA = $builder->build_object( { class => 'Koha::Libraries' } )->store;
my $libraryB = $builder->build_object( { class => 'Koha::Libraries' } )->store;
my $libraryA = $builder->build_object( { class => 'Koha::Libraries' } );
my $libraryB = $builder->build_object( { class => 'Koha::Libraries' } );
my $patron = $builder->build_object(
{
class => 'Koha::Patrons',
@ -3838,11 +3838,12 @@ subtest 'Filling a hold should cancel existing transfer' => sub {
my ( undef, $message ) = AddReturn( $item->barcode, $libraryA->branchcode, undef, undef );
is( Koha::Item::Transfers->search({ itemnumber => $item->itemnumber, datearrived => undef })->count, 1, "We generate a transfer on checkin");
AddReserve(
$libraryA->branchcode, $patron->borrowernumber, $item->biblionumber, '',
1, undef, undef, '',
undef, $item->itemnumber, undef, undef
);
AddReserve({
branchcode => $libraryA->branchcode,
borrowernumber => $patron->borrowernumber,
biblionumber => $item->biblionumber,
itemnumber => $item->itemnumber
});
my $reserves = Koha::Holds->search({ itemnumber => $item->itemnumber });
is( $reserves->count, 1, "Reserve is placed");
( undef, $message ) = AddReturn( $item->barcode, $libraryA->branchcode, undef, undef );