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

Bug 27196: [19.11.x] Don't explode if item that is waiting if checked in by SIP 

AddReserve doesn't take a hash in 19.11 - amended the call in the tests

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net>

Signed-off-by: David Cook <dcook@prosentient.com.au>

Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net>
This commit is contained in:
Jonathan Druart 2020-12-14 15:54:54 +01:00 committed by Victor Grousset/tuxayo
parent 3187f68abc
commit 14a9309824
2 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
C4/SIP/ILS/Transaction/Checkin.pm
View File

@ -1,4 +1,4 @@
#
# An object to handle checkin status
#
@ -121,9 +121,9 @@ sub do_checkin {
} else {
$self->alert_type('02');
ModReserveAffect( $messages->{ResFound}->{itemnumber},
ModReserveAffect( $self->{item}->{itemnumber},
$messages->{ResFound}->{borrowernumber}, 1, $messages->{ResFound}->{reserve_id});
ModItemTransfer( $messages->{ResFound}->{itemnumber},
ModItemTransfer( $self->{item}->{itemnumber},
$branch,
$messages->{ResFound}->{branchcode}
);

34
t/db_dependent/SIP/Transaction.t
View File

@ -243,7 +243,7 @@ subtest do_hold => sub {
};
subtest do_checkin => sub {
plan tests => 11;
plan tests => 12;
my $library = $builder->build_object( { class => 'Koha::Libraries' } );
my $library2 = $builder->build_object( { class => 'Koha::Libraries' } );
@ -298,6 +298,38 @@ subtest do_checkin => sub {
is_deeply($result,{ messages => { 'NotIssued' => $item->barcode, 'WasTransfered' => 1 } },"Messages show not issued and transferred");
is( $ci_transaction->item->destination_loc,$library->branchcode,"Item destination correctly set");
subtest 'Checkin an in transit item' => sub {
plan tests => 5;
my $library_1 = $builder->build_object({ class => 'Koha::Libraries' });
my $library_2 = $builder->build_object({ class => 'Koha::Libraries' });
my $patron = $builder->build_object({ class => 'Koha::Patrons', value => {branchcode => $library_1->branchcode, }});
my $sip_patron = C4::SIP::ILS::Patron->new( $patron->cardnumber );
my $item = $builder->build_sample_item({ library => $library_1->branchcode });
my $sip_item = C4::SIP::ILS::Item->new( $item->barcode );
t::lib::Mocks::mock_userenv(
{ branchcode => $library_1->branchcode, flags => 1 } );
my $reserve = AddReserve($library_1->branchcode,$patron->borrowernumber,$item->biblionumber);
ModReserveAffect( $item->itemnumber, $patron->borrowernumber ); # Mark waiting
my $ci_transaction = C4::SIP::ILS::Transaction::Checkin->new();
is( $ci_transaction->patron($sip_patron),
$sip_patron, "Patron assigned to transaction" );
is( $ci_transaction->item($sip_item),
$sip_item, "Item assigned to transaction" );
my $checkin = $ci_transaction->do_checkin($library_2->branchcode, C4::SIP::Sip::timestamp);
my $hold = Koha::Holds->find($reserve);
is( $hold->found, 'T', );
is( $hold->itemnumber, $item->itemnumber, );
is( Koha::Checkouts->search({itemnumber => $item->itemnumber})->count, 0, );
};
};
subtest checkin_lost => sub {