Koha › Circulation › Recalls queue

All borrowable material is subject to recall if checked out and needed by someone else. We will ask the person who has checked out this item to return it so you may use it.

diff --git a/opac/opac-recall.pl b/opac/opac-recall.pl index 6efe79f1da..ff0a19144c 100755 --- a/opac/opac-recall.pl +++ b/opac/opac-recall.pl @@ -23,6 +23,7 @@ use DateTime; use C4::Auth; use C4::Output; use C4::Context; +use C4::Letters; use Koha::Items; use Koha::Recall; use Koha::Recalls; @@ -48,17 +49,19 @@ my $biblio = Koha::Biblios->find($item->biblionumber); my $recalled = Koha::Recalls->find({ itemnumber => $itemnumber }); my $error; +if ( defined $recalled && $recalled->borrowernumber == $borrowernumber && ($recalled->is_requested || $recalled->is_waiting || $recalled->is_overdue) ){ + # can't place a recall on an item that this borrower has already recalled + # if recall is expired or cancelled, user may recall again + $error = 'duplicate'; +} + if ($op eq 'request'){ - if (!defined($borrowernumber)){ + if (!defined $borrowernumber){ # can't place recall if not logged in $error = 'notloggedin'; print $query->redirect('/cgi-bin/koha/opac-detail.pl?biblionumber='.$item->biblionumber); - } elsif ( defined $recalled && $recalled->borrowernumber == $borrowernumber && ($recalled->is_requested || $recalled->is_waiting || $recalled->is_overdue) ){ - # can't place a recall on an item that this borrower has already recalled - # if recall is expired or cancelled, user may recall again - $error = 'duplicate'; - } else { - # can recall + } elsif ( !defined $error ){ + # can recall my $borrower = Koha::Patrons->find($borrowernumber); my $issuing_rule = Koha::IssuingRules->get_effective_issuing_rule({ categorycode => $borrower->categorycode, itemtype => $item->itype, branchcode => $item->holdingbranch }); my $recall_request = Koha::Recall->new({ diff --git a/svc/checkouts b/svc/checkouts index 9a1b3a5648..133fbedb23 100755 --- a/svc/checkouts +++ b/svc/checkouts @@ -171,6 +171,12 @@ while ( my $c = $sth->fetchrow_hashref() ) { my $av = Koha::AuthorisedValues->search({ category => 'DAMAGED', authorised_value => $c->{damaged} }); $damaged = $av->count ? $av->next->lib : ''; } + my $recall = Koha::Recalls->find({ itemnumber => $c->{itemnumber}, biblionumber => $c->{biblionumber}, status => { '=', ['R','O'] } }); + my $recalled = 0; + if ( defined $recall ){ + $recalled = 1; + } + my $checkout = { DT_RowId => $c->{itemnumber} . '-' . $c->{borrowernumber}, title => $c->{title}, @@ -228,6 +234,7 @@ while ( my $c = $sth->fetchrow_hashref() ) { cardnumber => $c->{cardnumber}, }, issued_today => !$c->{not_issued_today}, + recalled => $recalled, }; if ( $c->{not_issued_today} ) { diff --git a/t/db_dependent/Koha/Recalls.t b/t/db_dependent/Koha/Recalls.t index 76ad08f1bb..1b421ff50b 100644 --- a/t/db_dependent/Koha/Recalls.t +++ b/t/db_dependent/Koha/Recalls.t @@ -62,9 +62,12 @@ is( $recall->is_waiting, 1, 'Recall is waiting for pickup' ); $recall->update({ status => 'C', cancellationdate => dt_from_string(), old => 1 }); is( $recall->is_cancelled, 1, 'Recall has been cancelled' ); -$recall->update({ status => 'E', expirationdate => dt_from_string() }); +$recall->update({ status => 'E', expirationdate => dt_from_string(), old => 1 }); is( $recall->has_expired, 1, 'Recall has expired' ); +$recall->update({ status => 'F', old => 1 }); +is ($recall->is_finished, 1, 'Recall is closed'); + is( $biblio->{biblionumber}, $recall->biblio->biblionumber, 'Can access biblio from recall' ); is( $patron->{borrowernumber}, $recall->patron->borrowernumber, 'Can access borrower from recall' ); @@ -73,6 +76,4 @@ is( $item->{itemnumber}, $recall->item->itemnumber, 'Can access item from recall is( $library->{branchcode}, $recall->library->branchcode, 'Can access branch from recall' ); -is( $checkout->{issue_id}, $recall->checkout->issue_id, 'Can access checkout from recall' ); - $schema->storage->txn_rollback; -- 2.11.0