Confirm recalls for: [% INCLUDE 'patron-title.inc' patron = logged_in_user %] ([% logged_in_user.cardnumber | html %])

+ [% IF nosyspref %] + Recalls have not been enabled. Please contact your library. + [% ELSIF error == 'unavailable' %] + There are no items available for recall. + Return to [% biblio.title | html %] + [% ELSE %] + [% IF error %] +

+ [% IF error == 'duplicate' %] + You have reached the maximum number of recalls on this record. + [% ELSIF error == 'unavailable' %] + There are no items available for recall. + [% ELSIF error == 'cannot' %] + You cannot place a recall on this item. + [% ELSE %] + An error has occurred while attempting to place a recall. Please contact your library. + [% END %] +

+ [% END %] + + [% IF success %] +

Your recall has been placed. The patron the item is currently checked out to has been asked to return the item within [% due_interval | html %] days, by [% due_date | $KohaDates %].

You will be notified when your item is waiting to be picked up at the library.

+ [% ELSIF not error %] +

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.

+ [% IF logged_in_user %] +

+ +

+ Place a recall on [% biblio.title | html %] ([% biblio.author | html %])? +

+ Pick up location: + +
Recall not needed after: Clear text[% INCLUDE 'date-format.inc' %]
Recall next available item
Recall a specific item

Select a specific item:
	Item type	Barcode	Home library	Last location	Collection	Call number	Copy number	Vol info	Information
+ [% IF item.can_be_recalled( patron => logged_in_user ) %] + + [% ELSE %] + + + [% END %] +	[% ItemTypes.GetDescription( item.effective_itemtype ) \| html %]	[% item.barcode \| html %]	[% Branches.GetName( item.homebranch ) \| html %]	[% Branches.GetName( item.holdingbranch) \| html %]	[% AuthorisedValues.GetByCode( 'CCODE', item.ccode, 1 ) \| html %]	[% item.itemcallnumber \| html %]	[% item.copynumber \| html %]	[% item.enumchron \| html %]	+ [% IF ( item.checkout ) %] + Due [% item.checkout.date_due \| $KohaDates %] + [% ELSIF ( item.get_transfer ) %] + In transit from [% Branches.GetName( item.get_transfer.frombranch ) \| html %] to [% Branches.GetName( item.get_transfer.tobranch ) \| html %] since [% item.get_transfer.datesent \| $KohaDates %] + [% END %] + [% IF ( item.itemlost \|\| item.withdrawn ) %] + Unavailable (lost or missing) + [% END %] + [% IF ( item.notforloan ) %] + Not for loan ([% item.notforloan \| html %]) + [% END %] + [% hold = item.current_holds.next %] + [% IF ( item.recall ) %] + + [% IF ( item.recall.waitingdate ) %] + Waiting for patron at [% Branches.GetName( item.recall.branchcode ) \| html %] since [% item.recall.waitingdate \| $KohaDates %]. + [% ELSE %] + Recalled by patron expected at [% Branches.GetName( item.recall.branchcode ) \| html %] since [% item.recall.recalldate \| $KohaDates %]. + [% END %] + + [% ELSIF ( hold.waitingdate ) %] + + Waiting for patron at [% Branches.GetName( hold.branchcode ) \| html %] since [% hold.waitingdate \| $KohaDates %]. + + [% ELSIF ( hold.borrowernumber == logged_in_user.borrowernumber ) %] + + You have already placed a reserve on this item. + + [% END # / IF ( item.recall or hold ) %] +

+ + + + Cancel +

+ +

+ [% ELSE %] +

You must be logged in to place a recall.

+ [% END %] + [% END %] + [% END %] +

+ +

Recalls history

+ [% IF Koha.Preference('UseRecalls') %] + [% IF RECALLS.count %] +

+ + + + + + + + + + + + + + [% FOREACH RECALL IN RECALLS %] + + + + + + + + + + [% END %] + + +

Title	Placed on	Expires on	Pickup location	Status	Due date
+ + [% RECALL.biblio.title \| html %] + [% FOREACH s IN RECALL.biblio.subtitle %] + [% s \| html %] + [% END %] + + [% RECALL.biblio.author \| html %] +	+ + Recall date: + [% RECALL.recalldate \| $KohaDates %] + +	+ [% IF ( RECALL.expirationdate ) %] + + Expiration: + [% RECALL.expirationdate \| $KohaDates %] + + [% ELSIF ( !RECALL.old ) %] + + Expiration: + Never expires + + [% ELSE %] + - + [% END %] +	+ Pick up location: + [% RECALL.library.branchname \| html %] +	+ Status: + [% IF ( RECALL.in_transit ) %] + In transit to [% RECALL.library.branchname \| html %] + [% ELSIF ( RECALL.waiting ) %] + Ready for pickup + [% ELSIF ( RECALL.overdue ) %] + Overdue to be returned + [% ELSIF ( RECALL.expired ) %] + Expired on [% RECALL.expirationdate \| $KohaDates %] + [% ELSIF ( RECALL.cancelled ) %] + Cancelled on [% RECALL.cancellationdate \| $KohaDates %] + [% ELSIF ( RECALL.finished ) %] + Fulfilled + [% ELSE %] + Requested + [% END %] +	+ Due date + [% IF ( RECALL.requested ) %] + Due to be returned by [% RECALL.checkout.date_due \| $KohaDates %] + [% ELSIF ( RECALL.waiting and RECALL.expirationdate ) %] + Pick up by [% RECALL.expirationdate \| $KohaDates %] + [% ELSE %] + - + [% END %] +	+ [% IF ( RECALL.requested or RECALL.overdue ) %] + + + + + + + [% END %] +

+ + [% ELSE %] + No recalls have been made. + [% END # / # RECALLS.count %] + [% ELSE %] + Recalls have not been enabled. Please contact your library. + [% END %] + + + + + + +[% INCLUDE 'opac-bottom.inc' %] +[% BLOCK jsinclude %] + [% INCLUDE 'datatables.inc' %] + +[% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt index 9e73090c6ea..e60a2345d70 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt @@ -193,6 +193,8 @@ [% END %] [% IF ( bibitemloo.already_reserved ) %]

You have already requested this title.

+ [% ELSIF ( bibitemloo.recall ) %] +

You have already placed a recall on this title.

[% ELSE %] [% UNLESS ( bibitemloo.bib_available ) %]

There are no items that can be placed on hold.

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt index e101127ca27..0fcdca8ed8d 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt @@ -202,6 +202,7 @@ [% END %] [% IF ( RESERVES.count ) %]

Holds ([% RESERVES.count | html %])

[% END %] + [% IF Koha.Preference('UseRecalls') && RECALLS.count %]

Recalls ([% RECALLS.count | html %])

[% END %] [% IF Koha.Preference('ArticleRequests') && logged_in_user.article_requests_current %]

Article requests ([% logged_in_user.article_requests_current.count | html %])

[% END %] [% IF ( OverDriveCirculation ) %]

OverDrive Account

@@ -300,6 +301,8 @@ [% IF ( Koha.Preference('OpacStarRatings') == 'all' ) %] [% INCLUDE 'user-star-ratings.inc' item=ISSUE %] [% END %] + + [% IF ( ISSUE.recall ) %]
This item has been recalled. Please return by the new due date.[% END %] @@ -654,6 +657,84 @@ [% PROCESS 'holds-table.inc' HOLDS = RESERVES, SuspendHoldsOpac = SuspendHoldsOpac, showpriority = showpriority, AutoResumeSuspendedHolds = AutoResumeSuspendedHolds %] + [% IF Koha.Preference('UseRecalls') && RECALLS.count %] +

[% ISSUE.author | html %]

+ + + + + + + + + + + + + [% FOREACH RECALL IN RECALLS %] + + + + + + + + [% END %] + + +

Recalls ([% RECALLS.count | html %])
Title	Placed on	Expires on	Pickup location	Status
+ + [% RECALL.biblio.title \| html %] + [% FOREACH s IN RECALL.biblio.subtitle %] + [% s \| html %] + [% END %] + + [% RECALL.biblio.author \| html %] +	+ + Recall date: + [% RECALL.recalldate \| $KohaDates %] + +	+ [% IF ( RECALL.expirationdate ) %] + + Expiration: + [% RECALL.expirationdate \| $KohaDates %] + + [% ELSE %] + + Expiration: + Never expires + + [% END %] +	+ Pick up location: + [% RECALL.library.branchname \| html %] +	+ Status: + [% IF ( RECALL.requested ) %] + Requested + [% ELSIF ( RECALL.overdue ) %] + Overdue to be returned + [% ELSIF ( RECALL.in_transit ) %] + In transit to [% RECALL.library.branchname \| html %] + [% ELSIF ( RECALL.waiting ) %] + Ready for pickup + [% END %] +	+ [% IF ( !RECALL.cancellationdate && ( RECALL.requested \|\| RECALL.overdue ) ) %] + + + + + + + [% END %] +

+ [% END # / # RECALLS.count %] + [% IF Koha.Preference('ArticleRequests') %]

[% IF logged_in_user.article_requests_current.count %] @@ -965,6 +1046,10 @@ $('#opac-user-clubs').load('/cgi-bin/koha/clubs/clubs-tab.pl?borrowernumber=[% borrowernumber | html %]'); }); } + + $("#cancel_recall").click(function(e){ + return confirmDelete(_("Are you sure you want to undo this recall?")); + }); }); //]]> var borrowernumber = "[% borrowernumber | html %]"; diff --git a/opac/opac-course-details.pl b/opac/opac-course-details.pl index 3afa8a921a3..0a727565f6a 100755 --- a/opac/opac-course-details.pl +++ b/opac/opac-course-details.pl @@ -46,6 +46,13 @@ die("No course_id given") unless ($course_id); my $course = GetCourse($course_id); my $course_reserves = GetCourseReserves( course_id => $course_id, include_items => 1, include_count => 1 ); +foreach my $cr ( @$course_reserves ) { + if ( $cr->{issue}->{date_due} and $cr->{issue}->{borrowernumber} and $borrowernumber != $cr->{issue}->{borrowernumber} and C4::Context->preference('UseRecalls') ) { + $cr->{course_item}->{avail_for_recall} = 1; + $cr->{course_item}->{biblionumber} = Koha::Items->find( $cr->{itemnumber} )->biblionumber; + } +} + $template->param( course => $course, course_reserves => $course_reserves, diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl index f1100878bd4..5e2890839ec 100755 --- a/opac/opac-detail.pl +++ b/opac/opac-detail.pl @@ -703,7 +703,8 @@ if ( not $viewallitems and @items > $max_items_to_display ) { } my $reserve_status = C4::Reserves::GetReserveStatus($itm->{itemnumber}); - if( $reserve_status eq "Waiting"){ $itm->{'waiting'} = 1; } + my $recall_status = Koha::Recalls->find({ itemnumber => $itm->{itemnumber}, status => 'W', old => undef }); + if( $reserve_status eq "Waiting" or defined $recall_status ){ $itm->{'waiting'} = 1; } if( $reserve_status eq "Reserved"){ $itm->{'onhold'} = 1; } my ( $transfertwhen, $transfertfrom, $transfertto ) = GetTransfers($itm->{itemnumber}); diff --git a/opac/opac-recall.pl b/opac/opac-recall.pl new file mode 100755 index 00000000000..43c1bf59eff --- /dev/null +++ b/opac/opac-recall.pl @@ -0,0 +1,137 @@ +#!/usr/bin/perl + +# This file is part of Koha. +# +# Copyright 2020 Aleisha Amohia +# +# Koha is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# Koha is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . + +use Modern::Perl; +use CGI qw ( -utf8 ); +use C4::Auth; +use C4::Output; +use C4::Context; + +my $query = new CGI; +my ( $template, $borrowernumber, $cookie ) = get_template_and_user( + { + template_name => "opac-recall.tt", + query => $query, + type => "opac", + authnotrequired => 0, + } +); + +my $op = $query->param('op') || ''; +my $biblionumber = $query->param('biblionumber'); +my $biblio = Koha::Biblios->find( $biblionumber ); + +if ( C4::Context->preference('UseRecalls') ) { + + my $patron = Koha::Patrons->find( $borrowernumber ); + my $error; + + unless ( $biblio->can_be_recalled({ patron => $patron }) ) { $error = 'unavailable'; } + + my $items = Koha::Items->search({ biblionumber => $biblionumber }); + + # check if already recalled + my $recalled = Koha::Recalls->search({ biblionumber => $biblionumber, borrowernumber => $borrowernumber, old => undef })->count; + if ( defined $recalled and $recalled > 0 ) { + my $recalls_per_record = Koha::CirculationRules->get_effective_rule({ categorycode => $patron->categorycode, branchcode => undef, itemtype => undef, rule_name => 'recalls_per_record' }); + + if ( defined $recalls_per_record and $recalled >= $recalls_per_record->{rule_value} ){ + $error = 'duplicate'; + } + } + + # submitting recall request + if ($op eq 'request'){ + + if ( defined $error and $error eq 'unavailable' ){ + # no items available for recall + print $query->redirect("/cgi-bin/koha/opac-recall.pl?biblionumber=$biblionumber&error=unavailable"); + + } elsif ( !defined $error ){ + # can recall + + my $level = $query->param('type'); + my $pickuploc = $query->param('pickup'); + my $expdate = $query->param('expirationdate'); + my $itemnumber = $query->param('itemnumber'); + + my ( $recall, $due_interval, $due_date ); + if ( $level eq 'itemlevel' and defined $itemnumber ) { + my $item = Koha::Items->find( $itemnumber ); + if ( $item->can_be_recalled({ patron => $patron }) ) { + ( $recall, $due_interval, $due_date ) = Koha::Recalls->add_recall({ + patron => $patron, + biblio => $biblio, + branchcode => $pickuploc, + item => $item, + expirationdate => $expdate, + interface => 'OPAC', + }); + } else { + $error = 'cannot'; + } + } else { + if ( $biblio->can_be_recalled({ patron => $patron }) ) { + ( $recall, $due_interval, $due_date ) = Koha::Recalls->add_recall({ + patron => $patron, + biblio => $biblio, + branchcode => $pickuploc, + expirationdate => $expdate, + interface => 'OPAC', + }); + } else { + $error = 'cannot'; + } + } + if ( defined $recall ) { + $template->param( + success => 1, + due_interval => $due_interval, + due_date => $due_date, + ); + } else { + $error = 'failed'; + } + } + } elsif ($op eq 'cancel'){ + my $recall_id = $query->param('recall_id'); + Koha::Recalls->find( $recall_id )->set_cancelled; + print $query->redirect('/cgi-bin/koha/opac-user.pl'); + } + + my $branches = Koha::Libraries->search(); + my $single_branch_mode = $branches->count == 1; + + $template->param( + biblio => $biblio, + error => $error, + items => $items, + single_branch_mode => $single_branch_mode, + branches => $branches, + ); + +} else { + # UseRecalls disabled + $template->param( + nosyspref => 1, + biblio => $biblio, + ); +} + +output_with_http_headers $query, $cookie, $template->output, 'html'; diff --git a/opac/opac-recalls.pl b/opac/opac-recalls.pl new file mode 100755 index 00000000000..fae79787fe8 --- /dev/null +++ b/opac/opac-recalls.pl @@ -0,0 +1,42 @@ +#!/usr/bin/perl + +# Copyright 2020 Aleisha Amohia +# +# This file is part of Koha. +# Koha is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. + +# Koha is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . + +use Modern::Perl; +use CGI qw ( -utf8 ); +use Encode qw( encode ); +use C4::Auth; # get_template_and_user +use C4::Output; +use Koha::Recalls; + +my $input = new CGI; +my ( $template, $borrowernumber, $cookie ) = get_template_and_user( + { + template_name => "opac-recalls.tt", + query => $input, + type => "opac", + authnotrequired => 0, + } +); + +my $recalls = Koha::Recalls->search({ borrowernumber => $borrowernumber }); +$template->param( + RECALLS => $recalls, + recallsview => 1 +); + +output_html_with_http_headers $input, $cookie, $template->output; diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl index 2a11ad48e58..1e272139826 100755 --- a/opac/opac-reserve.pl +++ b/opac/opac-reserve.pl @@ -623,6 +623,10 @@ foreach my $biblioNum (@biblionumbers) { $biblioLoopIter{holdable} &&= CanBookBeReserved( $borrowernumber, $biblioNum )->{status} eq 'OK'; + if ( CanBookBeReserved( $borrowernumber, $biblioNum )->{status} eq 'recall' ){ + $biblioLoopIter{recall} = 1; + } + # For multiple holds per record, if a patron has previously placed a hold, # the patron can only place more holds of the same type. That is, if the # patron placed a record level hold, all the holds the patron places must diff --git a/opac/opac-user.pl b/opac/opac-user.pl index 6d967c88031..71a69b77c81 100755 --- a/opac/opac-user.pl +++ b/opac/opac-user.pl @@ -297,6 +297,11 @@ if ( $pending_checkouts->count ) { # Useless test $issue->{biblionumber} ? $my_summary_html =~ s/{BIBLIONUMBER}/$issue->{biblionumber}/g : $my_summary_html =~ s/{BIBLIONUMBER}//g; $issue->{MySummaryHTML} = $my_summary_html; } + + my $recall = Koha::Recalls->find({ itemnumber => $issue->{itemnumber}, old => undef }); + if ( defined $recall ) { + $issue->{recalled} = 1; + } } } my $overduesblockrenewing = C4::Context->preference('OverduesBlockRenewing'); @@ -318,10 +323,12 @@ $template->param( show_barcode => 1 ) if $show_barcode; # now the reserved items.... my $reserves = Koha::Holds->search( { borrowernumber => $borrowernumber } ); +my $recalls = Koha::Recalls->search({ borrowernumber => $borrowernumber, old => undef }); $template->param( RESERVES => $reserves, showpriority => $show_priority, + RECALLS => $recalls, ); if (C4::Context->preference('BakerTaylorEnabled')) { diff --git a/t/db_dependent/Holds.t b/t/db_dependent/Holds.t index 69b2071284e..a5bd0abc9f7 100755 --- a/t/db_dependent/Holds.t +++ b/t/db_dependent/Holds.t @@ -7,7 +7,7 @@ use t::lib::TestBuilder; use C4::Context; -use Test::More tests => 61; +use Test::More tests => 62; use MARC::Record; use C4::Biblio; @@ -1226,3 +1226,31 @@ subtest 'CanItemBeReserved / pickup_not_in_hold_group' => sub { $schema->storage->txn_rollback; }; + +subtest 'CanItemBeReserved / recall' => sub { + plan tests => 1; + + $schema->storage->txn_begin; + + my $itemtype1 = $builder->build_object( { class => 'Koha::ItemTypes' } ); + my $library1 = $builder->build_object( { class => 'Koha::Libraries', value => {pickup_location => 1} } ); + my $patron1 = $builder->build_object( { class => 'Koha::Patrons', value => {branchcode => $library1->branchcode} } ); + my $biblio1 = $builder->build_sample_biblio({ itemtype => $itemtype1->itemtype }); + my $item1 = $builder->build_sample_item( + { + biblionumber => $biblio1->biblionumber, + library => $library1->branchcode + } + ); + Koha::Recall->new({ + borrowernumber => $patron1->borrowernumber, + biblionumber => $biblio1->biblionumber, + branchcode => $library1->branchcode, + itemnumber => $item1->itemnumber, + recalldate => '2020-05-04 10:10:10', + item_level_recall => 1, + })->store; + is( CanItemBeReserved( $patron1->borrowernumber, $item1->itemnumber, $library1->branchcode )->{status}, 'recall', "Can't reserve an item that they have already recalled" ); + + $schema->storage->txn_rollback; +}; -- 2.11.0