Attachment #109782 for bug #19532

View | Details | Raw Unified | Return to bug 19532
Collapse All | Expand All

Lines 406-411 foreach my $item (@items) { Link Here

(-)a/catalogue/detail.pl (+6 lines)
406	}	406	}
407	}	407	}
408		408
		409	my $recall = Koha::Recalls->find({ itemnumber => $item->{itemnumber}, old => undef });
		410	if ( defined $recall ) {
		411	$item->{recalled} = 1;
		412	$item->{recall} = $recall;
		413	}
		414
409	if ($currentbranch and C4::Context->preference('SeparateHoldings')) {	415	if ($currentbranch and C4::Context->preference('SeparateHoldings')) {
410	if ($itembranchcode and $itembranchcode eq $currentbranch) {	416	if ($itembranchcode and $itembranchcode eq $currentbranch) {
411	push @itemloop, $item;	417	push @itemloop, $item;

Lines 177-182 if ( $restoreduedatespec && $restoreduedatespec eq "highholds_empty" ) { Link Here

(-)a/circ/circulation.pl (-1 / +6 lines)
177	}	177	}
178	my $issueconfirmed = $query->param('issueconfirmed');	178	my $issueconfirmed = $query->param('issueconfirmed');
179	my $cancelreserve = $query->param('cancelreserve');	179	my $cancelreserve = $query->param('cancelreserve');
		180	my $cancel_recall = $query->param('cancel_recall');
		181	my $recall_id = $query->param('recall_id');
180	my $debt_confirmed = $query->param('debt_confirmed') \|\| 0; # Don't show the debt error dialog twice	182	my $debt_confirmed = $query->param('debt_confirmed') \|\| 0; # Don't show the debt error dialog twice
181	my $charges = $query->param('charges') \|\| q{};	183	my $charges = $query->param('charges') \|\| q{};
182		184
Lines 409-415 if (@$barcodes) { Link Here
409	}	411	}
410	unless($confirm_required) {	412	unless($confirm_required) {
411	my $switch_onsite_checkout = exists $messages->{ONSITE_CHECKOUT_WILL_BE_SWITCHED};	413	my $switch_onsite_checkout = exists $messages->{ONSITE_CHECKOUT_WILL_BE_SWITCHED};
412	my $issue = AddIssue( $patron->unblessed, $barcode, $datedue, $cancelreserve, undef, undef, { onsite_checkout => $onsite_checkout, auto_renew => $session->param('auto_renew'), switch_onsite_checkout => $switch_onsite_checkout, } );	414	my $recall_id = $query->param('recall_id');
		415	my $issue = AddIssue( $patron->unblessed, $barcode, $datedue, $cancelreserve, undef, undef, { onsite_checkout => $onsite_checkout, auto_renew => $session->param('auto_renew'), switch_onsite_checkout => $switch_onsite_checkout, cancel_recall => $cancel_recall, recall_id => $recall_id, } );
413	$template_params->{issue} = $issue;	416	$template_params->{issue} = $issue;
414	$session->clear('auto_renew');	417	$session->clear('auto_renew');
415	$inprocess = 1;	418	$inprocess = 1;
Lines 456-461 if ($patron) { Link Here
456	$template->param(	459	$template->param(
457	holds_count => $holds->count(),	460	holds_count => $holds->count(),
458	WaitingHolds => $waiting_holds,	461	WaitingHolds => $waiting_holds,
		462	recalls => $patron->recalls,
		463	specific_patron => 1,
459	);	464	);
460	}	465	}
461		466

Lines 80-85 if ( $query->param('print_slip') ) { Link Here

(-)a/circ/returns.pl (-2 / +75 lines)
80	);	80	);
81	}	81	}
82		82
		83	# print a recall slip
		84	if ( $query->param('recall_slip') ) {
		85	$template->param(
		86	recall_slip => 1,
		87	recall_id => scalar $query->param('recall_id'),
		88	);
		89	}
		90
		91
83	#####################	92	#####################
84	#Global vars	93	#Global vars
85	my $userenv = C4::Context->userenv;	94	my $userenv = C4::Context->userenv;
Lines 175-180 if ( $query->param('reserve_id') ) { Link Here
175	}	184	}
176	}	185	}
177		186
		187	if ( $query->param('recall_id') ) {
		188	my $recall = Koha::Recalls->find( scalar $query->param('recall_id') );
		189	my $itemnumber = $query->param('itemnumber');
		190	my $return_branch = $query->param('returnbranch');
		191
		192	my $expirationdate = $recall->calc_expirationdate;
		193	my $item;
		194	if ( !$recall->item_level_recall ) {
		195	$item = Koha::Items->find( $itemnumber );
		196	}
		197
		198	if ( $recall->branchcode ne $return_branch ) {
		199	$recall->start_transfer({ item => $item }) if !$recall->in_transit;
		200	} else {
		201	$recall->set_waiting({ item => $item }) if !$recall->waiting;
		202	}
		203	}
		204
178	my $borrower;	205	my $borrower;
179	my $returned = 0;	206	my $returned = 0;
180	my $messages;	207	my $messages;
Lines 233-239 if ($dotransfer){ Link Here
233	if ($canceltransfer){	260	if ($canceltransfer){
234	$itemnumber=$query->param('itemnumber');	261	$itemnumber=$query->param('itemnumber');
235	DeleteTransfer($itemnumber);	262	DeleteTransfer($itemnumber);
236	if($dest eq "ttr"){	263	my $recall_transfer_deleted = Koha::Recalls->find({ itemnumber => $itemnumber, status => 'T' });
		264	if ( defined $recall_transfer_deleted ) {
		265	$recall_transfer_deleted->revert_transfer;
		266	}
		267	if($dest and $dest eq "ttr"){
237	print $query->redirect("/cgi-bin/koha/circ/transferstoreceive.pl");	268	print $query->redirect("/cgi-bin/koha/circ/transferstoreceive.pl");
238	exit;	269	exit;
239	} else {	270	} else {
Lines 276-281 if ($barcode) { Link Here
276	holdingbranch => $item->holdingbranch,	307	holdingbranch => $item->holdingbranch,
277	returnbranch => $returnbranch,	308	returnbranch => $returnbranch,
278	author => $biblio->author,	309	author => $biblio->author,
		310	itemnumber => $item->itemnumber,
279	itembarcode => $item->barcode,	311	itembarcode => $item->barcode,
280	itemtype => $item->effective_itemtype,	312	itemtype => $item->effective_itemtype,
281	ccode => $item->ccode,	313	ccode => $item->ccode,
Lines 350-355 $template->param( inputloop => \@inputloop ); Link Here
350	my $found = 0;	382	my $found = 0;
351	my $waiting = 0;	383	my $waiting = 0;
352	my $reserved = 0;	384	my $reserved = 0;
		385	my $recalled = 0;
353		386
354	# new op dev : we check if the document must be returned to his homebranch directly,	387	# new op dev : we check if the document must be returned to his homebranch directly,
355	# if the document is transferred, we have warning message .	388	# if the document is transferred, we have warning message .
Lines 404-410 if ( $messages->{'WrongTransfer'} and not $messages->{'WasTransfered'}) { Link Here
404	#	437	#
405	# reserve found and item arrived at the expected branch	438	# reserve found and item arrived at the expected branch
406	#	439	#
407	if ( $messages->{'ResFound'}) {	440	if ( $messages->{'ResFound'} ) {
408	my $reserve = $messages->{'ResFound'};	441	my $reserve = $messages->{'ResFound'};
409	my $patron = Koha::Patrons->find( $reserve->{borrowernumber} );	442	my $patron = Koha::Patrons->find( $reserve->{borrowernumber} );
410	my $holdmsgpreferences = C4::Members::Messaging::GetMessagingPreferences( { borrowernumber => $reserve->{'borrowernumber'}, message_name => 'Hold_Filled' } );	443	my $holdmsgpreferences = C4::Members::Messaging::GetMessagingPreferences( { borrowernumber => $reserve->{'borrowernumber'}, message_name => 'Hold_Filled' } );
Lines 461-466 if ( $messages->{'ResFound'}) { Link Here
461	);	494	);
462	}	495	}
463		496
		497	if ( $messages->{RecallFound} ) {
		498	my $recall = $messages->{RecallFound};
		499	if ( dt_from_string( $recall->timestamp ) == dt_from_string ) {
		500	# we just updated this recall
		501	$template->param( recall => $recall );
		502	} else {
		503	my $transferbranch = $messages->{RecallNeedsTransfer};
		504	my $transfertodo = ( !$transferbranch or $transferbranch eq $recall->library->branchcode ) ? undef : 1;
		505	$template->param(
		506	found => 1,
		507	recall => $recall,
		508	recalled => $recall->waiting ? 0 : 1,
		509	transfertodo => $transfertodo,
		510	waitingrecall => $recall->waiting ? 1 : 0,
		511	);
		512	}
		513	}
		514
		515	if ( $messages->{TransferredRecall} ) {
		516	my $recall = $messages->{TransferredRecall};
		517
		518	# confirm transfer has arrived at the branch
		519	my $transfer = Koha::Item::Transfers->search({ datearrived => { '!=' => undef }, itemnumber => $recall->itemnumber }, { order_by => { -desc => 'datearrived' } })->next;
		520
		521	# if transfer has completed, show popup to confirm as waiting
		522	if ( defined $transfer and $transfer->tobranch eq $recall->branchcode ) {
		523	$template->param(
		524	found => 1,
		525	recall => $recall,
		526	recalled => 1,
		527	);
		528	}
		529	}
		530
464	# Error Messages	531	# Error Messages
465	my @errmsgloop;	532	my @errmsgloop;
466	foreach my $code ( keys %$messages ) {	533	foreach my $code ( keys %$messages ) {
Lines 533-538 foreach my $code ( keys %$messages ) { Link Here
533	}	600	}
534	elsif ( $code eq 'ReturnClaims' ) {	601	elsif ( $code eq 'ReturnClaims' ) {
535	$template->param( ReturnClaims => $messages->{ReturnClaims} );	602	$template->param( ReturnClaims => $messages->{ReturnClaims} );
		603	} elsif ( $code eq 'RecallFound' ) {
		604	;
		605	} elsif ( $code eq 'RecallNeedsTransfer' ) {
		606	;
		607	} elsif ( $code eq 'TransferredRecall' ) {
		608	;
536	} else {	609	} else {
537	die "Unknown error code $code"; # note we need all the (empty) elsif's above, or we die.	610	die "Unknown error code $code"; # note we need all the (empty) elsif's above, or we die.
538	# This forces the issue of staying in sync w/ Circulation.pm	611	# This forces the issue of staying in sync w/ Circulation.pm

Lines 116-121 while ( my $library = $libraries->next ) { Link Here

(-)a/circ/transferstoreceive.pl (+7 lines)
116	if ( my $first_hold = $holds->next ) {	116	if ( my $first_hold = $holds->next ) {
117	$getransf{patron} = Koha::Patrons->find( $first_hold->borrowernumber );	117	$getransf{patron} = Koha::Patrons->find( $first_hold->borrowernumber );
118	}	118	}
		119
		120	# check for a recall for this transfer
		121	my $recall = $item->recall;
		122	if ( defined $recall ) {
		123	$getransf{recall} = $recall;
		124	}
		125
119	push( @transferloop, \%getransf );	126	push( @transferloop, \%getransf );
120	}	127	}
121		128

Lines 41-45 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc (+3 lines)
41	<a href="/cgi-bin/koha/catalogue/issuehistory.pl?biblionumber=[% biblio_object_id \| url %]" >Checkout history</a></li>	41	<a href="/cgi-bin/koha/catalogue/issuehistory.pl?biblionumber=[% biblio_object_id \| url %]" >Checkout history</a></li>
42	[% IF ( CAN_user_tools_view_system_logs ) %][% IF ( logview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&modules=CATALOGUING&action=MODIFY&object=[% biblio_object_id \| url %]&object_type=biblio">Modification log</a> </li>[% END %]	42	[% IF ( CAN_user_tools_view_system_logs ) %][% IF ( logview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&modules=CATALOGUING&action=MODIFY&object=[% biblio_object_id \| url %]&object_type=biblio">Modification log</a> </li>[% END %]
43	[% IF ( CAN_user_stockrotation_manage_rota_items && Koha.Preference('StockRotation') ) %][% IF ( stockrotationview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/catalogue/stockrotation.pl?biblionumber=[% biblio_object_id \| uri %]">Rota</a> </li>[% END %]	43	[% IF ( CAN_user_stockrotation_manage_rota_items && Koha.Preference('StockRotation') ) %][% IF ( stockrotationview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/catalogue/stockrotation.pl?biblionumber=[% biblio_object_id \| uri %]">Rota</a> </li>[% END %]
		44	[% IF ( Koha.Preference('UseRecalls') && CAN_user_recalls ) %]
		45	[% IF ( recallsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/recalls/request.pl?biblionumber=[% biblio_object_id \| url %]">Recalls ([% Biblio.RecallsCount( biblio_object_id ) \| html %])</a></li>
		46	[% END %]
44	</ul>	47	</ul>
45	</div>	48	</div>

Lines 146-151 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc (+3 lines)
146	[% IF Koha.Preference('ILLModule') && CAN_user_ill %]	146	[% IF Koha.Preference('ILLModule') && CAN_user_ill %]
147	[% IF illview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/ill-requests.pl?borrowernumber=[% patron.borrowernumber \| uri %]">ILL requests history</a></li>	147	[% IF illview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/ill-requests.pl?borrowernumber=[% patron.borrowernumber \| uri %]">ILL requests history</a></li>
148	[% END %]	148	[% END %]
		149	[% IF Koha.Preference('UseRecalls') && CAN_user_recalls %]
		150	[% IF recallsview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/recallshistory.pl?borrowernumber=[% patron.borrowernumber \| uri %]">Recalls history</a></li>
		151	[% END %]
149	</ul></div>	152	</ul></div>
150		153
151	<!-- Modal -->	154	<!-- Modal -->

Lines 46-51 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc (+8 lines)
46	[% IF Koha.Preference('OnSiteCheckouts') %]	46	[% IF Koha.Preference('OnSiteCheckouts') %]
47	<li><a href="/cgi-bin/koha/circ/on-site_checkouts.pl">Pending on-site checkouts</a></li>	47	<li><a href="/cgi-bin/koha/circ/on-site_checkouts.pl">Pending on-site checkouts</a></li>
48	[% END %]	48	[% END %]
		49
		50	[% IF Koha.Preference('UseRecalls') and CAN_user_recalls %]
		51	<li><a href="/cgi-bin/koha/recalls/recalls_queue.pl" title="All active recalls">Recalls queue</a></li>
		52	<li><a href="/cgi-bin/koha/recalls/recalls_to_pull.pl" title="Recalls that could be filled but have not been set waiting">Recalls to pull</a></li>
		53	<li><a href="/cgi-bin/koha/recalls/recalls_overdue.pl" title="Recalled items that are overdue to be returned">Overdue recalls</a></li>
		54	<li><a href="/cgi-bin/koha/recalls/recalls_waiting.pl" title="Recalled items awaiting pickup">Recalls awaiting pickup</a></li>
		55	<li><a href="/cgi-bin/koha/recalls/recalls_old_queue.pl" title="Inactive recalls">Old recalls</a></li>
		56	[% END %]
49	</ul>	57	</ul>
50		58
51	</div>	59	</div>

Lines 53-58 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc (+1 lines)
53	[%- END -%]	53	[%- END -%]
54	[%- IF hide_patron_infos_if_needed AND ( display_patron_name OR display_cardnumber ) -%]	54	[%- IF hide_patron_infos_if_needed AND ( display_patron_name OR display_cardnumber ) -%]
55	[%- IF link_to == 'circulation_reserves' %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% data.borrowernumber \| uri %]#reserves">	55	[%- IF link_to == 'circulation_reserves' %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% data.borrowernumber \| uri %]#reserves">
		56	[%- ELSIF link_to == 'circulation_recalls' %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% data.borrowernumber \| uri %]#recalls">
56	[%- ELSE %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% data.borrowernumber \| uri %]">	57	[%- ELSE %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% data.borrowernumber \| uri %]">
57	[%- END -%]	58	[%- END -%]
58	[%- END -%]	59	[%- END -%]




[% USE Branches %]
<div id="recalls">
[% IF recalls.count %]
    <table id="recalls-table">
        <thead>
            <tr>
                [% IF checkboxes %]<th class="recall-checkbox nosort">&nbsp;</th>[% END %]
                <th class="recall-title anti-the">Title</th>
                [% UNLESS specific_patron %]<th class="recall-patron">Requested by</th>[% END %]
                <th class="recall-date">Placed on</th>
                <th class="recall-expiry">Expires on</th>
                <th class="recall-branch">Pickup location</th>
                <th class="recall-status">Status</th>
                [% UNLESS viewing_old %]<th class="recall-duedate">Due date</th>[% END %]
                [% UNLESS viewing_old %]<th class="recall-actions nosort">&nbsp;</th>[% END %]
            </tr>
        </thead>

        <tbody>
            [% FOREACH recall IN recalls %]
                [% IF recall.old %]<tr class="old">[% ELSE %]<tr>[% END %]

                    [% IF checkboxes %]
                        <td class="recall-checkbox">
                            [% IF recall.old %]
                                &nbsp;
                            [% ELSE %]
                                <input type="checkbox" value="[% recall.recall_id | html %]" name="recall_ids">
                            [% END %]
                        </td>
                    [% END %]

                    <td class="recall-title">
                        <b><a class="recall-title" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% recall.biblionumber | html %]">
                            [% recall.biblio.title | html %]
                            [% FOREACH s IN recall.biblio.subtitle %]
                                [% s | html %]
                            [% END %]
                        </a></b>
                        [% IF recall.item %][% recall.item.barcode | html %][% END %]
                        [% recall.biblio.author | html %]
                    </td>

                    [% UNLESS specific_patron %]
                        <td class="recall-patron">
                            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% recall.borrowernumber | uri %]">[% recall.patron.firstname | html %] [% recall.patron.surname | html %] ([% recall.patron.cardnumber | html %])</a>
                        </td>
                    [% END %]

                    <td class="recall-date">
                        [% recall.recalldate | $KohaDates %]
                    </td>

                    <td class="recall-expiry">
                        [% IF ( recall.expirationdate ) %]
                            [% recall.expirationdate | $KohaDates %]
                        [% ELSIF ( !recall.old ) %]
                            Never expires
                        [% ELSE %]
                            -
                        [% END %]
                    </td>

                    <td class="recall-branch">
                        [% recall.library.branchname | html %]
                    </td>

                    <td class="recall-status">
                        [% IF ( recall.in_transit ) %]
                            In transit to [% recall.library.branchname | html %]
                        [% ELSIF ( recall.waiting ) %]
                            Ready for pickup
                        [% ELSIF ( recall.expired ) %]
                            Expired on [% recall.expirationdate | $KohaDates %]
                        [% ELSIF ( recall.cancelled ) %]
                            Cancelled on [% recall.cancellationdate | $KohaDates %]
                        [% ELSIF ( recall.overdue ) %]
                            Overdue to be returned
                        [% ELSIF ( recall.finished ) %]
                            Fulfilled
                        [% ELSE %]
                            Requested
                        [% END %]
                    </td>

                    [% UNLESS viewing_old %]
                    <td class="recall-duedate">
                        [% IF recall.requested and recall.checkout %]
                            Due to be returned by [% recall.checkout.date_due | $KohaDates %]
                        [% ELSIF recall.waiting and RECALL.expirationdate %]
                            Pick up by [% RECALL.expirationdate | $KohaDates %]
                        [% ELSE %]
                            -
                        [% END %]
                    </td>
                    [% END %]

                    [% UNLESS viewing_old %]
                    <td class="recall-cancel actions">
                        [% IF recall.old %]
                            &nbsp;
                        [% ELSE %]
                            <div class="btn-group">
                                <a class="btn btn-sm dropdown-toggle" data-toggle="dropdown" href="#"> Actions <span class="caret"></span></a>
                                <ul class="dropdown-menu pull-right">
                                    [% IF ( recall.requested or recall.overdue ) %]
                                        <li><a class="cancel_recall" data-id="[% recall.recall_id | html %]" data-action="cancel"><i class="fa fa-times"></i> Cancel</a></li>
                                        [% IF ( recall.should_be_overdue ) %]
                                            <li><a class="overdue_recall" data-id="[% recall.recall_id | html %]" data-action="overdue"><i class="fa fa-hourglass-end"></i> Mark as overdue</a></li>
                                        [% END %]
                                    [% ELSIF ( recall.waiting ) %]
                                        <li><a class="revert_recall" data-id="[% recall.recall_id | html %]" data-action="revert"><i class="fa fa-undo"></i> Revert waiting</a></li>
                                        <li><a class="expire_recall" data-id="[% recall.recall_id | html %]" data-action="expire"><i class="fa fa-times"></i> Expire</a></li>
                                    [% ELSIF ( recall.in_transit ) %]
                                        <li><a class="transit_recall" data-id="[% recall.recall_id | html %]" data-action="transit"><i class="fa fa-times"></i> Cancel recall and return to: [% Branches.GetName(recall.item.homebranch) | html %]</a></li>
                                    [% END %]
                                </ul>
                            </div>
                        [% END %]
                    </td>
                    [% END %]

                </tr>
            [% END %]
        </tbody>
    </table>
    [% ELSE %]
        [% IF patron.borrowernumber %]
            <div class="dialog message">Patron has no recalls.</div>
        [% ELSE %]
            <div class="dialog message">There are no recalls to show.</div>
        [% END %]
    [% END %]
</div>

Lines 57-61 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc (+1 lines)
57	var BROWSER_RETURN_TO_SEARCH = _("Results");	57	var BROWSER_RETURN_TO_SEARCH = _("Results");
58	var BROWSER_PREVIOUS = _("Previous");	58	var BROWSER_PREVIOUS = _("Previous");
59	var BROWSER_NEXT = _("Next");	59	var BROWSER_NEXT = _("Next");
		60	var RECALLED = _("Recalled");
60	</script>	61	</script>
61	<!-- / strings.inc -->	62	<!-- / strings.inc -->




                                <span class="holdonitem">There is an item level hold on this item (priority = [% hold.priority | html %]).</span>
                            [% END %]
                        [% END %]

                        [% IF item.recalled %]
                            [% IF item.recall.waitingdate %]
                                Waiting at [% Branches.GetName( item.recall.branchcode ) | html %] since [% item.recall.waitingdate | $KohaDates %]
                            [% ELSE %]
                                Item recalled by <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% item.recall.borrowernumber | uri %]">[% item.recall.patron.firstname | html %] [% item.recall.patron.surname | html %] ([% item.recall.patron.cardnumber | html %])</a> on [% item.recall.recalldate | $KohaDates %]
                            [% END %]
                        [% END %]

                        [% UNLESS ( item.itemnotforloan || item.notforloan_per_itemtype || item.onloan || item.itemlost || item.withdrawn || item.damaged || item.transfertwhen || hold || item.recalled ) %]
                            Available
                        [% END %]

                        [% IF ( item.restricted ) %]
                            <span class="restricted">([% item.restrictedvalue | html %])</span>
                        [% END %]

                    </td>
                    <td class="datelastseen"><span title="[% item.datelastseen | html %]">[% item.datelastseen | $KohaDates %]</span></td>
                    <td class="dateaccessioned"><span title="[% item.dateaccessioned | html %]">[% item.dateaccessioned | $KohaDates %]</span></td>

[% MACRO jsinclude BLOCK %]
    [% INCLUDE 'catalog-strings.inc' %]
    [% Asset.js("js/catalog.js") | $raw %]
    [% Asset.js("js/recalls.js") | $raw %]
    [% Asset.js("js/coce.js") | $raw %]
    <script>
        var interface = "[% interface | html %]";

Lines 487-492 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt (+6 lines)
487	Holds ([% Biblio.HoldsCount( SEARCH_RESULT.biblionumber ) \| html %])	487	Holds ([% Biblio.HoldsCount( SEARCH_RESULT.biblionumber ) \| html %])
488	[% END %]	488	[% END %]
489	[% END # /IF SEARCH_RESULT.norequests %]	489	[% END # /IF SEARCH_RESULT.norequests %]
		490	[% IF Koha.Preference('UseRecalls') and CAN_user_recalls %]
		491	\| <a id="recall_[% SEARCH_RESULT.biblionumber \| html %]" href="/cgi-bin/koha/recalls/request.pl?biblionumber=[% SEARCH_RESULT.biblionumber \| html %]">Recalls ([% Biblio.RecallsCount( SEARCH_RESULT.biblionumber ) \| html %])</a>
		492	[% END %]
490		493
491	[% IF Koha.Preference('intranetbookbag') == 1 %]	494	[% IF Koha.Preference('intranetbookbag') == 1 %]
492	[% IF ( SEARCH_RESULT.incart ) %]	495	[% IF ( SEARCH_RESULT.incart ) %]
Lines 622-627 Link Here
622	[% IF ( other_items_loo.intransit ) %]	625	[% IF ( other_items_loo.intransit ) %]
623	(In transit)	626	(In transit)
624	[% END %]	627	[% END %]
		628	[% IF ( other_items_loo.recalled ) %]
		629	(Recalled)
		630	[% END %]
625	[% IF ( other_items_loo.onhold ) %]	631	[% IF ( other_items_loo.onhold ) %]
626	(On hold)	632	(On hold)
627	[% END %]	633	[% END %]

Lines 120-125 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt (+1 lines)
120	[% IF ( resultsloo.itemlostcount ) %] Lost ([% resultsloo.itemlostcount \| html %])<br />[% END %]	120	[% IF ( resultsloo.itemlostcount ) %] Lost ([% resultsloo.itemlostcount \| html %])<br />[% END %]
121	[% IF ( resultsloo.orderedcount ) %] On order ([% resultsloo.orderedcount \| html %])<br/>[% END %]	121	[% IF ( resultsloo.orderedcount ) %] On order ([% resultsloo.orderedcount \| html %])<br/>[% END %]
122	[% IF ( resultsloo.notforloancount ) %] Not for loan ([% resultsloo.notforloancount \| html %])[% END %]	122	[% IF ( resultsloo.notforloancount ) %] Not for loan ([% resultsloo.notforloancount \| html %])[% END %]
		123	[% IF ( resultsloo.recalledcount ) %] Waiting to fill recall ([% resultsloo.recalled \| html %])[% END %]
123	[% IF ( resultsloo.onholdcount ) %] Waiting on hold ([% resultsloo.onholdcount \| html %])[% END %]	124	[% IF ( resultsloo.onholdcount ) %] Waiting on hold ([% resultsloo.onholdcount \| html %])[% END %]
124	</span>	125	</span>
125	</td>	126	</td>




                        <a class="circ-button" href="/cgi-bin/koha/circ/reserveratios.pl"><i class="fa fa-line-chart"></i> Hold ratios</a>
                    </li>
                </ul>

                [% IF Koha.Preference('UseRecalls') and CAN_user_recalls %]
                    <h3>Recalls</h3>

                    <ul class="buttons-list">
                        <li><a class="circ-button" href="/cgi-bin/koha/recalls/recalls_queue.pl" title="All active recalls"><i class="fa fa-tasks"></i> Recalls queue</a></li>
                        <li><a class="circ-button" href="/cgi-bin/koha/recalls/recalls_to_pull.pl" title="Recalls that could be filled but have not been set waiting"><i class="fa fa-hand-grab-o"></i> Recalls to pull</a></li>
                        <li><a class="circ-button" href="/cgi-bin/koha/recalls/recalls_overdue.pl" title="Recalled items that are overdue to be returned"><i class="fa fa-clock-o"></i> Overdue recalls</a></li>
                        <li><a class="circ-button" href="/cgi-bin/koha/recalls/recalls_waiting.pl" title="Recalled items awaiting pickup"><i class="fa fa-calendar"></i> Recalls awaiting pickup</a></li>
                        <li><a class="circ-button" href="/cgi-bin/koha/recalls/recalls_old_queue.pl" title="Inactive recalls"><i class="fa fa-tasks"></i> Old recalls</a></li>
                    </ul>
                [% END %]
            </div>

            <!-- Add the extra clearfix for only the required viewport -->

Lines 196-201 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-1 / +50 lines)
196	[% END %]	196	[% END %]
197	</li>	197	</li>
198	[% END %]	198	[% END %]
		199
		200	[% IF RECALLED %]
		201	[% IF RECALLED.waiting %]
		202	<li>Item <i>[% RECALLED.biblio.title \| html %]</i> ([% RECALLED.item.barcode \| html %]) has been waiting for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% RECALLED.borrowernumber \| uri %]">[% RECALLED.patron.firstname \| html %] [% RECALLED.patron.surname \| html %]</a> ([% RECALLED.patron.cardnumber \| html %]) at [% Branches.GetName( RECALLED.branchcode ) \| html %] since [% RECALLED.waitingdate \| $KohaDates %]</li>
		203	[% ELSIF RECALLED.requested or RECALLED.overdue %]
		204	<li>Item <i>[% RECALLED.biblio.title \| html %]</i> [% IF RECALLED.item %]([% RECALLED.item.barcode \| html %])[% END %] has been recalled by <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% RECALLED.borrowernumber \| uri %]">[% RECALLED.patron.firstname \| html %] [% RECALLED.patron.surname \| html %]</a> ([% RECALLED.patron.cardnumber \| html %]) at [% Branches.GetName( RECALLED.branchcode ) \| html %] since [% RECALLED.recalldate \| $KohaDates %]</li>
		205	[% END %]
		206	[% END %]
		207
199	</ul>	208	</ul>
200		209
201	[% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]	210	[% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
Lines 227-232 Link Here
227	</p>	236	</p>
228	[% END %]	237	[% END %]
229		238
		239	[% IF ( RECALLED ) %]
		240	<p>
		241	<label for="cancelrecall">Cancel recall</label>
		242	<input type="radio" value="cancel" name="cancel_recall" id="cancelrecall" />
		243	<input type="hidden" value="[% RECALLED.recall_id \| html %]" name="recall_id" />
		244	</p>
		245	[% IF RECALLED.waiting %]
		246	<p>
		247	<label for="revertrecall">Revert waiting status</label>
		248	<input type="radio" value="revert" name="cancel_recall" id="revertrecall" checked="checked"/>
		249	<input type="hidden" value="[% RECALLED.recall_id \| html %]" name="recall_id" />
		250	</p>
		251	[% END %]
		252	[% END %]
		253
230	<input type="hidden" name="barcode" value="[% barcode \| html %]" />	254	<input type="hidden" name="barcode" value="[% barcode \| html %]" />
231	<input type="hidden" name="borrowernumber" value="[% patron.borrowernumber \| html %]" />	255	<input type="hidden" name="borrowernumber" value="[% patron.borrowernumber \| html %]" />
232	<input type="hidden" name="issueconfirmed" value="1" />	256	<input type="hidden" name="issueconfirmed" value="1" />
Lines 277-282 Link Here
277	</form>	301	</form>
278	[% END %]	302	[% END %]
279		303
		304	[% IF ( RECALLED ) %]
		305	<form method="get" action="/cgi-bin/koha/circ/circulation.pl">
		306	<button class="print" type="submit" onclick="Dopop('/cgi-bin/koha/recalls/recall_pickup_slip.pl?recall_id=[% RECALLED.recall_id \| html %]');this.form.submit();"><i class="fa fa-print"></i> Don't check out and print slip (P)</button>
		307	</form>
		308	[% END %]
		309
280	<form method="get" action="/cgi-bin/koha/circ/circulation.pl">	310	<form method="get" action="/cgi-bin/koha/circ/circulation.pl">
281	[% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]	311	[% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
282	<input type="hidden" name="borrowernumber" value="[% patron.borrowernumber \| html %]" />	312	<input type="hidden" name="borrowernumber" value="[% patron.borrowernumber \| html %]" />
Lines 294-300 Link Here
294	[% END %]	324	[% END %]
295	</form>	325	</form>
296		326
297	[% IF ( RESERVED \|\| ISSUED_TO_ANOTHER ) && (CAN_user_reserveforothers_place_holds ) %]	327	[% IF ( RESERVED \|\| ISSUED_TO_ANOTHER \|\| RECALLED ) && (CAN_user_reserveforothers_place_holds ) %]
298	[% UNLESS noissues %]	328	[% UNLESS noissues %]
299	<button type="submit" onclick="window.location.href='/cgi-bin/koha/reserve/request.pl?biblionumber=[% itembiblionumber \| html %]&borrowernumber=[% patron.borrowernumber \| html %]'"><i class="fa fa-sticky-note-o"></i> Cancel checkout and place a hold for [% INCLUDE 'patron-title.inc' %]</button>	329	<button type="submit" onclick="window.location.href='/cgi-bin/koha/reserve/request.pl?biblionumber=[% itembiblionumber \| html %]&borrowernumber=[% patron.borrowernumber \| html %]'"><i class="fa fa-sticky-note-o"></i> Cancel checkout and place a hold for [% INCLUDE 'patron-title.inc' %]</button>
300	[% END %]	330	[% END %]
Lines 412-417 Link Here
412	[% IF ( USERBLOCKEDOVERDUE ) %]	442	[% IF ( USERBLOCKEDOVERDUE ) %]
413	<li>Checkouts are BLOCKED because patron has overdue items.</li>	443	<li>Checkouts are BLOCKED because patron has overdue items.</li>
414	[% END %]	444	[% END %]
		445
		446	[% IF ( RECALLED_INTRANSIT ) %]
		447	<li>Item has been recalled and is in transit for pickup at [% Branches.GetName( RECALLED_INTRANSIT ) \| html %].</li>
		448	[% END %]
415	</ul>	449	</ul>
416		450
417	[% IF (forceallow) %]	451	[% IF (forceallow) %]
Lines 906-911 Link Here
906	</a>	940	</a>
907	</li>	941	</li>
908	[% END %]	942	[% END %]
		943
		944	[% IF Koha.Preference('UseRecalls') %]
		945	<li>
		946	<a href="#recalls" id="recalls-tab">
		947	[% recalls.count \| html %] Recalls
		948	</a>
		949	</li>
		950	[% END %]
909	</ul>	951	</ul>
910		952
911	<!-- SUMMARY : TODAY & PREVIOUS ISSUES -->	953	<!-- SUMMARY : TODAY & PREVIOUS ISSUES -->
Lines 920-925 Link Here
920	</div> <!-- /#clubs-tab -->	962	</div> <!-- /#clubs-tab -->
921	[% END %]	963	[% END %]
922		964
		965	[% IF Koha.Preference('UseRecalls') %]
		966	<div id="recalls">
		967	[% INCLUDE 'recalls.inc' %]
		968	</div>
		969	[% END %]
		970
923	[% INCLUDE borrower_debarments.inc %]	971	[% INCLUDE borrower_debarments.inc %]
924		972
925	<div id="reserves">	973	<div id="reserves">
Lines 1170-1175 Link Here
1170	</script>	1218	</script>
1171	[% INCLUDE 'str/members-menu.inc' %]	1219	[% INCLUDE 'str/members-menu.inc' %]
1172	[% Asset.js("js/members-menu.js") \| $raw %]	1220	[% Asset.js("js/members-menu.js") \| $raw %]
		1221	[% Asset.js("js/recalls.js") \| $raw %]
1173	[% END %]	1222	[% END %]
1174		1223
1175	[% INCLUDE 'intranet-bottom.inc' %]	1224	[% INCLUDE 'intranet-bottom.inc' %]

Lines 8-13 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt (+2 lines)
8	<title>Koha &rsaquo; Circulation &rsaquo; Transfers print receipt</title>	8	<title>Koha &rsaquo; Circulation &rsaquo; Transfers print receipt</title>
9	[% ELSIF ( caller == 'members' ) %]	9	[% ELSIF ( caller == 'members' ) %]
10	<title>Koha &rsaquo; Patrons &rsaquo; Print receipt for [% borrowernumber \| html %]</title>	10	<title>Koha &rsaquo; Patrons &rsaquo; Print receipt for [% borrowernumber \| html %]</title>
		11	[% ELSIF ( caller == 'recall' ) %]
		12	<title>Koha &rsaquo; Circulation &rsaquo; Recall print receipt</title>
11	[% ELSIF ( title ) %][%# FIXME title is never defined %]	13	[% ELSIF ( title ) %][%# FIXME title is never defined %]
12	<title>Koha &rsaquo; Patrons &rsaquo; [% title \| html %]</title>	14	<title>Koha &rsaquo; Patrons &rsaquo; [% title \| html %]</title>
13	[% END %]	15	[% END %]

Lines 137-142 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt (+3 lines)
137	[% ELSIF error == "onsite_checkout" %]	137	[% ELSIF error == "onsite_checkout" %]
138	<p>Item cannot be renewed because it's an onsite checkout</p>	138	<p>Item cannot be renewed because it's an onsite checkout</p>
139		139
		140	[% ELSIF error == 'recalled' %]
		141	<p>This item has been recalled.</p>
		142
140	[% ELSE %]	143	[% ELSE %]
141		144
142	[% error \| html %]	145	[% error \| html %]




                            [% END # /IF transfer || needstransfer %]

                            <!-- case of simple return no issue or transfer but with a reservation  -->
                            [% IF ( reserved and !recalled and !waitingrecall ) %]
                                <!-- reserved -->
                                <div id="hold-found2" class="modal fade audio-alert-action block">
                                    <div class="modal-dialog">

                                    </div> <!-- /.modal-dialog -->
                                </div> <!-- /#hold-found2 -->
                            [% END #/IF reserved %]

                            [% IF ( recalled ) %]
                                <!-- recalled -->
                                <div id="recalled" class="modal fade audio-alert-action block">
                                    <div class="modal-dialog">
                                        <div class="modal-content">
                                            <form method="post" action="/cgi-bin/koha/circ/returns.pl" class="confirm">

                                                <div class="modal-header">
                                                    <h3>
                                                        Recall found:
                                                        <br/>
                                                        <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% recall.biblionumber | uri %]">[% recall.biblio.title | html %]</a>
                                                        [% IF recall.item %]
                                                            <div class="recall-found-barcode">
                                                                (<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% recall.biblionumber | uri %]&amp;itemnumber=[% recall.itemnumber | uri %]">[% recall.item.barcode | html %]</a>)
                                                            </div>
                                                        [% END %]
                                                    </h3>
                                                </div>

                                                <div class="modal-body">
                                                    [% IF ( recall.recallnotes ) %]
                                                        <h4>Notes:</h4>
                                                        <p>[% recall.recallnotes | html %]</p>
                                                        <hr />
                                                    [% END %]
                                                    <h5>Recall placed by:</h5>
                                                    <ul>
                                                        <li>
                                                            [% INCLUDE 'patron-title.inc' patron=recall.patron hide_patron_infos_if_needed=1 invert_name=1 link_to="circulation_recalls" %]
                                                            <span class="patron-category"> - [% recall.patron.category.description | html %]</span>
                                                        </li>

                                                        [% INCLUDE display_holdpatron_address patron=recall.patron %]

                                                        [% IF ( recall.patron.phone ) %]
                                                            <li>[% recall.patron.phone | html %]</li>
                                                        [% END %]

                                                        [% IF ( recall.patron.email ) %]
                                                            <li>
                                                                [% IF ( transfertodo ) %]
                                                                    [% recall.patron.email | html %]
                                                                [% ELSE %]
                                                                    <a id="boremail" href="mailto:[% recall.patron.email | html %]">[% recall.patron.email | html %]</a>
                                                                [% END %]
                                                            </li>
                                                        [% END %]

                                                        [% UNLESS ( transfertodo) %]
                                                            [% INCLUDE display_bormessagepref %]
                                                        [% END %]

                                                        [% IF ( recall.patron.is_debarred ) %]
                                                            <li class="error">Patron is RESTRICTED</li>
                                                        [% END %]

                                                        [% IF ( recall.patron.gonenoaddress ) %]
                                                            <li class="error">Patron's address is in doubt</li>
                                                        [% END %]
                                                    </ul>
                                                    [% IF ( transfertodo ) %]
                                                        <h4><strong>Transfer to:</strong> [% Branches.GetName( recall.branchcode ) | html %]</h4>
                                                    [% ELSE %]
                                                        <h4><strong>Recall at</strong> [% Branches.GetName( recall.branchcode ) | html %]</h4>
                                                    [% END %]

                                                    <input type="hidden" name="recall_id" value="[% recall.recall_id | html %]">
                                                    <input type="hidden" name="itemnumber" value="[% itemnumber | html %]">
                                                    <input type="hidden" name="returnbranch" value="[% Branches.GetLoggedInBranchcode | html %]">
                                                    <input type="hidden" name="recall_slip" value="0">

                                                </div>

                                                <div class="modal-footer">
                                                    [% IF ( transfertodo ) %]
                                                        <button type="submit" class="btn btn-default approve">
                                                            <i class="fa fa-check"></i> Confirm recall and transfer
                                                        </button>
                                                        <button type="button" class="btn btn-default print-recall">
                                                            <i class="fa fa-print"></i> Print slip, transfer, and confirm
                                                        </button>
                                                    [% ELSE %]
                                                        <button type="submit" class="btn btn-default approve">
                                                            <i class="fa fa-check"></i> Confirm recall
                                                        </button>
                                                        <button type="button" class="btn btn-default print-recall">
                                                            <i class="fa fa-print"></i> Print slip and confirm
                                                        </button>
                                                    [% END %]

                                                    <button data-dismiss="modal" aria-hidden="true" type="submit" class="btn btn-default deny">
                                                        <i class="fa fa-times"></i> Ignore
                                                    </button>
                                                </div> <!-- /.modal-footer -->
                                            </form> <!-- /.confirm -->
                                        </div> <!-- /.modal-content -->
                                    </div> <!-- /.modal-dialog -->
                                </div> <!-- /#recalled -->
                            [% END #/IF recalled %]

                            [% IF ( waitingrecall ) %]
                                <!-- recalled -->
                                <div id="recalledwaiting" class="modal fade audio-alert-action block">
                                    <div class="modal-dialog">
                                        <div class="modal-content">
                                            <form method="post" action="/cgi-bin/koha/circ/returns.pl" class="confirm">

                                                <div class="modal-header">
                                                    <h3>
                                                        Recall found (item is already waiting):
                                                        <br/>
                                                        <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% recall.biblionumber | uri %]">[% recall.biblio.title | html %]</a>
                                                        [% IF recall.item %]
                                                            <div class="recall-found-barcode">
                                                                (<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% recall.biblionumber | uri %]&amp;itemnumber=[% recall.itemnumber | uri %]">[% recall.item.barcode | html %]</a>)
                                                            </div>
                                                        [% END %]
                                                    </h3>
                                                </div>

                                                <div class="modal-body">
                                                    [% IF ( recall.recallnotes ) %]
                                                        <h4>Notes:</h4>
                                                        <p>[% recall.recallnotes | html %]</p>
                                                        <hr />
                                                    [% END %]
                                                    <h5>Recall placed by:</h5>
                                                    <ul>
                                                        <li>
                                                            [% INCLUDE 'patron-title.inc' patron=recall.patron hide_patron_infos_if_needed=1 invert_name=1 link_to="circulation_recalls" %]
                                                            <span class="patron-category"> - [% recall.patron.category.description | html %]</span>
                                                        </li>

                                                        [% INCLUDE display_holdpatron_address patron=recall.patron %]

                                                        [% IF ( recall.patron.phone ) %]
                                                            <li>[% recall.patron.phone | html %]</li>
                                                        [% END %]

                                                        [% IF ( recall.patron.email ) %]
                                                            <li>
                                                                [% IF ( transfertodo ) %]
                                                                    [% recall.patron.email | html %]
                                                                [% ELSE %]
                                                                    <a id="boremail" href="mailto:[% recall.patron.email | html %]">[% recall.patron.email | html %]</a>
                                                                [% END %]
                                                            </li>
                                                        [% END %]

                                                        [% UNLESS ( transfertodo) %]
                                                            [% INCLUDE display_bormessagepref %]
                                                        [% END %]

                                                        [% IF ( recall.patron.is_debarred ) %]
                                                            <li class="error">Patron is RESTRICTED</li>
                                                        [% END %]

                                                        [% IF ( recall.patron.gonenoaddress ) %]
                                                            <li class="error">Patron's address is in doubt</li>
                                                        [% END %]
                                                    </ul>
                                                    [% IF ( transfertodo ) %]
                                                        <h4><strong>Transfer to:</strong> [% Branches.GetName( recall.branchcode ) | html %]</h4>
                                                    [% ELSE %]
                                                        <h4><strong>Wait for pickup at</strong> [% Branches.GetName( recall.branchcode ) | html %]</h4>
                                                    [% END %]

                                                    <input type="hidden" name="recall_id" value="[% recall.recall_id | html %]">
                                                    <input type="hidden" name="itemnumber" value="[% itemnumber | html %]">
                                                    <input type="hidden" name="returnbranch" value="[% Branches.GetLoggedInBranchcode | html %]">
                                                    <input type="hidden" name="recall_slip" value="0">

                                                </div>

                                                <div class="modal-footer">
                                                    <button type="submit" class="btn btn-default approve">
                                                        <i class="fa fa-check"></i> Confirm recall
                                                    </button>
                                                    <button type="button" class="btn btn-default print-recall">
                                                        <i class="fa fa-print"></i> Print slip and confirm
                                                    </button>

                                                    <button data-dismiss="modal" aria-hidden="true" type="submit" class="btn btn-default deny">
                                                        <i class="fa fa-times"></i> Ignore
                                                    </button>
                                                </div> <!-- /.modal-footer -->
                                            </form> <!-- /.confirm -->
                                        </div> <!-- /.modal-content -->
                                    </div> <!-- /.modal-dialog -->
                                </div> <!-- /#recalledwaiting-->
                            [% END #/IF recalledwaiting %]
                        [% END # /IF found %]

                        <div class="static_checkin_messages">

                [% END %]
            [% END %]
            var columns_settings = [% TablesSettings.GetColumns( 'circ', 'returns', 'checkedintable', 'json' ) | $raw %]

            [% IF recall_slip %]
                Dopop('/cgi-bin/koha/recalls/recall_pickup_slip.pl?recall_id=[% recall_id | uri %]');
            [% END %]

            var returns_table = KohaTable("checkedintable", {
                    "bFilter":false,
                    "bPaginate":false,

                this.form.submit();
            });

            $('.print-recall').on("click",function(e){
                this.form.recall_slip.value = 1;
                this.form.submit();
            });

            $('.cancel-hold').on("click",function(e){
                this.form.cancel_reserve.value = 1;
                this.form.submit();

Lines 68-73 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt (+2 lines)
68	[% reser.patron.first_valid_email_address \| html %]	68	[% reser.patron.first_valid_email_address \| html %]
69	</a>	69	</a>
70	[% END %]	70	[% END %]
		71	[% ELSIF ( reser.recall ) %]
		72	Recall requested by <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reser.recall.borrowernumber \| uri %]">[% reser.recall.patron.surname \| html %][% IF reser.recall.patron.firstname %], [% reser.recall.patron.firstname \| html %][% END %] ([% reser.recall.patron.cardnumber \| html %])</a>
71	[% ELSE %]	73	[% ELSE %]
72	<p>None</p>	74	<p>None</p>
73	[% END %]	75	[% END %]

Lines 798-803 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (+15 lines)
798	</a>	798	</a>
799	</li>	799	</li>
800	[% END %]	800	[% END %]
		801
		802	[% IF Koha.Preference('UseRecalls') %]
		803	<li>
		804	<a href="#recalls" id="recalls-tab">
		805	[% recalls.count \| html %] Recalls
		806	</a>
		807	</li>
		808	[% END %]
801	</ul>	809	</ul>
802		810
803	[% INCLUDE "checkouts-table.inc" %]	811	[% INCLUDE "checkouts-table.inc" %]
Lines 820-825 Link Here
820	</div>	828	</div>
821	[% END %]	829	[% END %]
822		830
		831	[% IF Koha.Preference('UseRecalls') %]
		832	<div id="recalls">
		833	[% INCLUDE 'recalls.inc' %]
		834	</div>
		835	[% END %]
		836
823	[% INCLUDE borrower_debarments.inc %]	837	[% INCLUDE borrower_debarments.inc %]
824		838
825	[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]	839	[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
Lines 948-953 Link Here
948	[% Asset.js("js/holds.js") \| $raw %]	962	[% Asset.js("js/holds.js") \| $raw %]
949	[% INCLUDE 'str/members-menu.inc' %]	963	[% INCLUDE 'str/members-menu.inc' %]
950	[% Asset.js("js/members-menu.js") \| $raw %]	964	[% Asset.js("js/members-menu.js") \| $raw %]
		965	[% Asset.js("js/recalls.js") \| $raw %]
951	[% Asset.js("js/messaging-preference-form.js") \| $raw %]	966	[% Asset.js("js/messaging-preference-form.js") \| $raw %]
952	<script>	967	<script>
953		968




[% USE raw %]
[% USE KohaDates %]
[% USE Koha %]
[% USE Asset %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Recalls history for [% INCLUDE 'patron-title.inc' %]</title>
[% INCLUDE 'doc-head-close.inc' %]
</head>

<body id="recalls_history" class="pat">
    [% INCLUDE 'header.inc' %]
    [% INCLUDE 'patron-search.inc' %]

    <div id="breadcrumbs">
        <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
        <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo;
        Recalls history for [% INCLUDE 'patron-title.inc' %]
    </div>
    <div class="main container-fluid">
        <div class="row">
            <div class="col-sm-10 col-sm-push-2">
                <main>
                    [% INCLUDE 'members-toolbar.inc' %]
                    <h1>Recalls history</h1>
                    [% IF Koha.Preference('UseRecalls') %]
                        <input type="checkbox" id="hide_old" name="hide_old" checked="checked">
                        <label for="hide_old">Show old recalls</label>
                        [% INCLUDE 'recalls.inc' %]
                    [% ELSE %]
                         <div class="dialog message">Recalls have not been enabled. Enable the <a href="/cgi-bin/koha/admin/preferences.pl?tab=circulation">UseRecalls</a> system preference to use recalls.</div>
                    [% END %]
                </main>
            </div>
        <div class="col-sm-2 col-sm-pull-10">
            <aside>
                [% INCLUDE 'circ-menu.inc' %]
            </aside>
        </div>
    </div>

[% MACRO jsinclude BLOCK %]
    [% INCLUDE 'datatables.inc' %]
    [% INCLUDE 'columns_settings.inc' %]
    [% Asset.js("js/recalls.js") | $raw %]
[% END %]

[% INCLUDE 'intranet-bottom.inc' %]




[% USE raw %]
[% USE Koha %]
[% USE KohaDates %]
[% USE Asset %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Circulation &rsaquo; Old recalls</title>
[% INCLUDE 'doc-head-close.inc' %]
</head>
<body id="circ_recalls_old_queue" class="circ">
[% INCLUDE 'header.inc' %]
[% INCLUDE 'cat-search.inc' %]

<div id="breadcrumbs">
    <a href="/cgi-bin/koha/mainpage.pl">Home</a>
    &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a>
    &rsaquo; <a href="/cgi-bin/koha/recalls/recalls_old_queue.pl">Old recalls</a>
</div>

<div class="main container-fluid">
    <div class="row">
        [% IF Koha.Preference('CircSidebar') %]
            <div class="col-sm-10 col-sm-push-2">
        [% ELSE %]
            <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
        [% END %]
        <main>

        <h1>Old recalls</h1>
        [% IF Koha.Preference('UseRecalls') %]
            [% INCLUDE 'recalls.inc' %]
        [% ELSE %]
            <div class="dialog message">Recalls have not been enabled. Enable the <a href="/cgi-bin/koha/admin/preferences.pl?tab=circulation">UseRecalls</a> system preference to use recalls.</div>
        [% END %]

        </main>
        </div> <!-- /.col-etc -->

        [% IF Koha.Preference('CircSidebar') %]
            <div class="col-sm-2 col-sm-pull-10">
                <aside>
                    [% INCLUDE 'circ-nav.inc' %]
                </aside>
            </div> <!-- /.col-sm-2.col-sm-pull-10 -->
        [% END %]

    </div> <!-- /.row -->
</div>

[% MACRO jsinclude BLOCK %]
    [% INCLUDE 'datatables.inc' %]
    [% INCLUDE 'columns_settings.inc' %]
    [% Asset.js("js/recalls.js") | $raw %]
[% END %]

[% INCLUDE 'intranet-bottom.inc' %]




[% USE raw %]
[% USE Koha %]
[% USE KohaDates %]
[% USE Asset %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Circulation &rsaquo; Overdue recalls</title>
[% INCLUDE 'doc-head-close.inc' %]
</head>
<body id="circ_overdue_recalls" class="circ">
[% INCLUDE 'header.inc' %]
[% INCLUDE 'cat-search.inc' %]

<div id="breadcrumbs">
    <a href="/cgi-bin/koha/mainpage.pl">Home</a>
    &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a>
    &rsaquo; <a href="/cgi-bin/koha/recalls/recalls_overdue.pl">Overdue recalls</a>
</div>

<div class="main container-fluid">
    <div class="row">
        [% IF Koha.Preference('CircSidebar') %]
            <div class="col-sm-10 col-sm-push-2">
        [% ELSE %]
            <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
        [% END %]
        <main>

        <h1>Overdue recalls</h1>
        [% IF Koha.Preference('UseRecalls') %]
            [% IF recalls.count %]
                <form method="post" action="/cgi-bin/koha/recalls/recalls_overdue.pl">
                    <input type="hidden" name="op" value="cancel_multiple_recalls">
                    <input type="checkbox" id="select_all"> <span id="select_all_text">Select all</span>
                    [% INCLUDE 'recalls.inc' %]
                    <fieldset class="action">
                        <button type="submit" id="cancel_selected" class="btn btn-default btn-sm">Cancel selected recalls</button>
                    </fieldset>
                </form>
            [% ELSE %]
                <div class="dialog message">There are no recalls to show.</div>
            [% END %]
        [% ELSE %]
            <div class="dialog message">Recalls have not been enabled. Enable the <a href="/cgi-bin/koha/admin/preferences.pl?tab=circulation">UseRecalls</a> system preference to use recalls.</div>
        [% END %]

        </main>
        </div> <!-- /.col-etc -->

        [% IF Koha.Preference('CircSidebar') %]
            <div class="col-sm-2 col-sm-pull-10">
                <aside>
                    [% INCLUDE 'circ-nav.inc' %]
                </aside>
            </div> <!-- /.col-sm-2.col-sm-pull-10 -->
        [% END %]

    </div> <!-- /.row -->
</div>

[% MACRO jsinclude BLOCK %]
    [% INCLUDE 'columns_settings.inc' %]
    [% INCLUDE 'datatables.inc' %]
    [% Asset.js("js/recalls.js") | $raw %]
[% END %]

[% INCLUDE 'intranet-bottom.inc' %]




[% USE raw %]
[% USE Koha %]
[% USE KohaDates %]
[% USE Asset %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Circulation &rsaquo; Recalls queue</title>
[% INCLUDE 'doc-head-close.inc' %]
</head>
<body id="circ_recalls_queue" class="circ">
[% INCLUDE 'header.inc' %]
[% INCLUDE 'cat-search.inc' %]

<div id="breadcrumbs">
    <a href="/cgi-bin/koha/mainpage.pl">Home</a>
    &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a>
    &rsaquo; <a href="/cgi-bin/koha/recalls/recalls_queue.pl">Recalls queue</a>
</div>

<div class="main container-fluid">
    <div class="row">
        [% IF Koha.Preference('CircSidebar') %]
            <div class="col-sm-10 col-sm-push-2">
        [% ELSE %]
            <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
        [% END %]
        <main>

        <h1>Recalls queue</h1>
        [% IF Koha.Preference('UseRecalls') %]
            [% IF recalls.count %]
                <form method="post" action="/cgi-bin/koha/recalls/recalls_queue.pl">
                    <input type="hidden" name="op" value="cancel_multiple_recalls">
                    <input type="checkbox" id="select_all"> <span id="select_all_text">Select all</span>
                    [% INCLUDE 'recalls.inc' %]
                    <fieldset class="action">
                        <button type="submit" id="cancel_selected" class="btn btn-default btn-sm">Cancel selected recalls</button>
                    </fieldset>
                </form>
            [% ELSE %]
                <div class="dialog message">There are no recalls to show.</div>
            [% END %]
        [% ELSE %]
            <div class="dialog message">Recalls have not been enabled. Enable the <a href="/cgi-bin/koha/admin/preferences.pl?tab=circulation">UseRecalls</a> system preference to use recalls.</div>
        [% END %]

        </main>
        </div> <!-- /.col-etc -->

        [% IF Koha.Preference('CircSidebar') %]
            <div class="col-sm-2 col-sm-pull-10">
                <aside>
                    [% INCLUDE 'circ-nav.inc' %]
                </aside>
            </div> <!-- /.col-sm-2.col-sm-pull-10 -->
        [% END %]

    </div> <!-- /.row -->
</div>

[% MACRO jsinclude BLOCK %]
    [% INCLUDE 'datatables.inc' %]
    [% INCLUDE 'columns_settings.inc' %]
    [% Asset.js("js/recalls.js") | $raw %]
[% END %]

[% INCLUDE 'intranet-bottom.inc' %]




[% USE raw %]
[% USE Koha %]
[% USE KohaDates %]
[% USE AuthorisedValues %]
[% USE Branches %]
[% USE ItemTypes %]
[% USE Asset %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Circulation &rsaquo; Recalls to pull</title>
[% INCLUDE 'doc-head-close.inc' %]
</head>
<body id="circ_recalls_to_pull" class="circ">
[% INCLUDE 'header.inc' %]
[% INCLUDE 'cat-search.inc' %]

<div id="breadcrumbs">
    <a href="/cgi-bin/koha/mainpage.pl">Home</a>
    &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a>
    &rsaquo; <a href="/cgi-bin/koha/recalls/recalls_to_pull.pl">Recalls to pull</a>
</div>

<div class="main container-fluid">
    <div class="row">
        [% IF Koha.Preference('CircSidebar') %]
            <div class="col-sm-10 col-sm-push-2">
        [% ELSE %]
            <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
        [% END %]
        <main>

        <h1>Recalls to pull</h1>
        The following recalls could be fulfilled by available items.

        [% IF Koha.Preference('UseRecalls') %]
            <div id="recalls">
                [% IF recalls %]
                <table id="recalls-table">
                    <thead>
                        <tr>
                            <th class="recall-topull">Pull this many items</th>
                            <th class="recall-items">Items available</th>
                            <th class="recall-patrons">Patrons with recalls</th>
                            <th class="recall-firstpatron">First patron</th>
                            <th class="recall-title anti-the">Title</th>
                            <th class="recall-libraries">Libraries</th>
                            <th class="recall-callnumbers">Available call numbers</th>
                            <th class="recall-copynumbers">Available copy numbers</th>
                            <th class="recall-enumeration">Available enumeration</th>
                            <th class="recall-itemtypes">Available item types</th>
                            <th class="recall-locations">Available locations</th>
                            <th class="recall-date title-string">Earliest recall date</th>
                            <th class="recall-action nosort">&nbsp;</th>
                        </tr>
                    </thead>
                    <tbody>
                        [% FOREACH recall IN recalls %]
                        <tr>
                            <td class="recall-topull"><b>[% recall.pull_count | html %]</b></td>
                            <td class="recall-items">[% recall.items_count | html %]</td>
                            <td class="recall-patrons">[% recall.patrons_count | html %]</td>
                            <td class="recall-firstpatron"><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% recall.first_recall.borrowernumber | uri %]">[% recall.first_recall.patron.firstname | html %] [% recall.first_recall.patron.surname | html %]</a></td>
                            <td class="recall-title">
                                [% INCLUDE 'biblio-default-view.inc' biblionumber=recall.first_recall.biblio.biblionumber %]
                                [% INCLUDE 'biblio-title.inc' biblio=recall.first_recall.biblio %]
                                [% IF recall.first_recall.biblio.author %] by [% recall.first_recall.biblio.author | html %][% END %]
                            </td>
                            <td class="recall-libraries">
                                <ul>
                                    [% FOREACH library IN recall.libraries %]
                                        <li>[% Branches.GetName( library ) | html %]</li>
                                    [% END %]
                                </ul>
                            </td>
                            <td class="recall-callnumbers">
                                <ul>
                                    [% FOREACH callnumber IN recall.callnumbers %]
                                        <li>[% callnumber | html %]</li>
                                    [% END %]
                                </ul>
                            </td>
                            <td class="recall-copynumbers">
                                <ul>
                                    [% FOREACH copyno IN recall.copynumbers %]
                                        <li>[% copyno | html %]</li>
                                    [% END %]
                                </ul>
                            </td>
                            <td class="recall-enumeration">
                                <ul>
                                    [% FOREACH enumchron IN recall.enumchrons %]
                                        <li>[% enumchron | html %]</li>
                                    [% END %]
                                </ul>
                            </td>
                            <td class="recall-itemtypes">
                                <ul>
                                    [% FOREACH itemtype IN recall.itemtypes %]
                                        <li>[% ItemTypes.GetDescription( itemtype ) | html %]</li>
                                    [% END %]
                                </ul>
                            </td>
                            <td class="recall-locations">
                                <ul>
                                    [% FOREACH loc IN recall.locations %]
                                        <li>[% AuthorisedValues.GetByCode('LOC', loc) | html %]</li>
                                    [% END %]
                                </ul>
                            </td>
                            <td class="recall-date">
                                <span title="[% recall.first_recall.recalldate | html %]">[% recall.first_recall.recalldate | $KohaDates %] in [% recall.first_recall.library.branchname | html %]</span>
                            </td>
                            <td class="recall-action">
                                <form action="/cgi-bin/koha/recalls/recalls_to_pull.pl" method="post">
                                    <input type="hidden" name="recall_id" value="[% recall.first_recall.recall_id | html %]">
                                    <input type="hidden" name="op" value="cancel">
                                    [% IF recall.first_recall.in_transit %]
                                        <button type="submit" class="btn btn-default cancelreturn"><i class="fa fa-times"></i> Cancel recall and return to: [% Branches.GetName(recall.first_recall.item.homebranch) | html %]</button>
                                    [% ELSE %]
                                        <button type="submit" class="btn btn-default cancel"><i class="fa fa-times"></i> Cancel recall</button>
                                    [% END %]
                                </form>
                            </td>
                        </tr>
                        [% END %]
                    </tbody>
                </table>
                [% ELSE %]
                    <div class="dialog message">There are no recalls to pull.</div>
                [% END %]
            </div>
        [% ELSE %]
            <div class="dialog message">Recalls have not been enabled. Enable the <a href="/cgi-bin/koha/admin/preferences.pl?tab=circulation">UseRecalls</a> system preference to use recalls.</div>
        [% END %]

        </main>
        </div> <!-- /.col-etc -->

        [% IF Koha.Preference('CircSidebar') %]
            <div class="col-sm-2 col-sm-pull-10">
                <aside>
                    [% INCLUDE 'circ-nav.inc' %]
                </aside>
            </div> <!-- /.col-sm-2.col-sm-pull-10 -->
        [% END %]

    </div> <!-- /.row -->
</div>

[% MACRO jsinclude BLOCK %]
    [% INCLUDE 'datatables.inc' %]
    [% INCLUDE 'columns_settings.inc' %]
    <script>
        $(document).ready(function(){
            $("#recalls-table").dataTable($.extend(true, {}, dataTablesDefaults, {
                "aoColumnDefs": [
                    { 'bSortable': false, 'aTargets': [ 'nosort' ] },
                    { "sType": "title-string", "aTargets" : [ "title-string" ] },
                    { "sType": "anti-the", "aTargets": [ "anti-the" ] }
                ],
                "sPaginationType": "full_numbers"
            }));

            $(".cancelreturn").click(function(){
                return confirmDelete(_("Are you sure you want to remove this recall and return the item to it's home library?"));
            });

            $(".cancel").click(function(){
                return confirmDelete(_("Are you sure you want to remove this recall?"));
            });
        });
    </script>
[% END %]

[% INCLUDE 'intranet-bottom.inc' %]




[% USE raw %]
[% USE Koha %]
[% USE KohaDates %]
[% USE Asset %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Circulation &rsaquo; Recalls awaiting pickup</title>
[% INCLUDE 'doc-head-close.inc' %]
</head>
<body id="circ_recalls_awaiting_pickup" class="circ">
[% INCLUDE 'header.inc' %]
[% INCLUDE 'cat-search.inc' %]

<div id="breadcrumbs">
    <a href="/cgi-bin/koha/mainpage.pl">Home</a>
    &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a>
    &rsaquo; <a href="/cgi-bin/koha/recalls/recalls_waiting.pl">Recalls awaiting pickup</a>
</div>

<div class="main container-fluid">
    <div class="row">
        [% IF Koha.Preference('CircSidebar') %]
            <div class="col-sm-10 col-sm-push-2">
        [% ELSE %]
            <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
        [% END %]
        <main>
                <h1>Recalls awaiting pickup</h1>

                [% IF Koha.Preference('UseRecalls') %]

                <div id="results" class="toptabs">

                    <ul>
                        <li><a href="#recallswaiting">Recalls waiting: [% recalls.count | html %]</a></li>
                        <li><a href="#recallsover">Recalls waiting over [% Koha.Preference('RecallsMaxPickUpDelay') | html %] days: [% over.count | html %]</a></li>
                    </ul>

                    <div id="recallswaiting">
                        [% IF ( recalls ) %]
                            <table id="recallswaiting-table">
                                <thead><tr>
                                    <th class="recall-waitingdate title-string">Available since</th>
                                    <th class="recall-title anti-the">Title</th>
                                    <th class="recall-patron">Requested by</th>
                                    <th class="recall-library">Pickup location</th>
                                    <th class="recall-action nosort">&nbsp;</th>
                                </tr></thead>
                                <tbody>
                                    [% FOREACH recall IN recalls %]<tr>
                                        <td class="recall-waitingdate">[% recall.waitingdate | $KohaDates %]</td>
                                        <td class="recall-title">
                                            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% recall.biblionumber | uri %]">
                                                [% recall.biblio.title | html %]
                                                [% FOREACH s IN recall.biblio.subtitle %]
                                                    [% s | html %]
                                                [% END %]
                                            </a>
                                            [% recall.biblio.author | html %]
                                            <br><i>Barcode: [% recall.item.barcode | html %]</i>
                                        </td>
                                        <td class="recall-patron">
                                             <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% recall.borrowernumber | uri %]">[% recall.patron.firstname | html %] [% recall.patron.surname | html %]</a>
                                             [% IF ( recall.patron.phone ) %]<br />[% recall.patron.phone | html %][% END %]
                                             [% IF ( recall.patron.email ) %]<br /><a href="mailto:[% recall.patron.email | uri %]?subject=Recall waiting: [% recall.biblio.title | uri %]">[% recall.patron.email | html %]</a>[% END %]
                                        </td>
                                        <td class="recall-library">[% recall.library.branchname | html %]</td>
                                        <td class="recall-action actions">
                                            <form action="/cgi-bin/koha/recalls/recalls_waiting.pl" method="post">
                                                <input type="hidden" name="recall_id" value="[% recall.recall_id | html %]">
                                                <input type="hidden" name="op" value="modify">
                                                <fieldset class="action">
                                                    <input type="submit" name="revert" class="revert_recall" value="Revert waiting status">
                                                    <input type="submit" name="expire" class="expire_recall" value="Expire recall">
                                                </fieldset>
                                            </form>
                                        </td>
                                    </tr>[% END %]
                                </tbody>
                            </table>
                        [% ELSE %]
                            <div class="dialog message">There are no recalls to show.</div>
                        [% END %]
                    </div> <!-- recallswaiting -->

                    <div id="recallsover">
                        [% IF ( over.size ) %]
                            [% IF ( Koha.Preference('RecallsMaxPickUpDelay') ) %]<p>Recalls listed here have been awaiting pickup for more than [% Koha.Preference('RecallsMaxPickUpDelay') | html %] days.</p>[% END %]
                            <table id="recallsover-table">
                                <thead><tr>
                                    <th class="recall-waitingdate title-string">Available since</th>
                                    <th class="recall-title anti-the">Title</th>
                                    <th class="recall-patron">Requested by</th>
                                    <th class="recall-library">Pickup location</th>
                                    <th class="recall-action nosort">&nbsp;</th>
                                </tr></thead>
                                <tbody>
                                    [% FOREACH recall IN over %]<tr>
                                        <td class="recall-waitingdate">[% recall.waitingdate | $KohaDates %]</td>
                                        <td class="recall-title">
                                            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% recall.biblionumber | uri %]">
                                                [% recall.biblio.title | html %]
                                                [% FOREACH s IN recall.biblio.subtitles %]
                                                    [% s | html %]
                                                [% END %]
                                                [% recall.item.enumchron | html %]
                                            </a>
                                            [% recall.biblio.author | html %]
                                            <br><i>Barcode: [% recall.item.barcode | html %]</i>
                                        </td>
                                        <td class="recall-patron">
                                            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% recall.borrowernumber | uri %]">[% recall.patron.firstname | html %] [% recall.patron.surname | html %]</a>
                                            [% IF ( recall.patron.phone ) %]<br />[% recall.patron.phone | html %][% END %]
                                            [% IF ( recall.patron.email ) %]<br /><a href="mailto:[% recall.patron.email | uri %]?subject=Recall waiting: [% recall.biblio.title | uri %]">[% recall.patron.email | html %]</a>[% END %]
                                        </td>
                                        <td class="recall-library">[% recall.library.branchname | html %]</td>
                                        <td class="recall-action actions">
                                            <form action="/cgi-bin/koha/recalls/recalls_waiting.pl" method="post">
                                                <input type="hidden" name="recall_id" value="[% recall.recall_id | html %]">
                                                <input type="hidden" name="op" value="modify">
                                                <fieldset class="action">
                                                    <input type="submit" name="revert" class="revert_recall" value="Revert waiting status">
                                                    <input type="submit" name="expire" class="expire_recall" value="Expire recall">
                                                </fieldset>
                                            </form>
                                        </td>
                                    </tr>[% END %]
                                </tbody>
                            </table>
                        [% ELSE %]
                            <div class="dialog message">There are no recalls to show.</div>
                        [% END %]
                    </div> <!-- recallsover -->

                </div> <!-- results-->

                [% ELSE %]
                    <div class="dialog message">Recalls have not been enabled. Enable the <a href="/cgi-bin/koha/admin/preferences.pl?tab=circulation">UseRecalls</a> system preference to use recalls.</div>
                [% END %] <!-- Koha.Preference('UseRecalls') -->

        </main>
        </div> <!-- /.col-etc -->

        [% IF Koha.Preference('CircSidebar') %]
            <div class="col-sm-2 col-sm-pull-10">
                <aside>
                    [% INCLUDE 'circ-nav.inc' %]
                </aside>
            </div> <!-- /.col-sm-2.col-sm-pull-10 -->
        [% END %]

    </div> <!-- /.row -->
</div>

[% MACRO jsinclude BLOCK %]
    [% INCLUDE 'datatables.inc' %]
    [% INCLUDE 'columns_settings.inc' %]
    <script>
        $(document).ready(function() {
            $('#results').tabs();

            $("#recallswaiting-table, #recallsover-table").dataTable($.extend(true, {}, dataTablesDefaults, {
                "autoWidth": false,
                "aoColumnDefs": [
                    { 'bSortable': false, 'aTargets': [ 'nosort' ] },
                ],
                "sPaginationType": "full_numbers"
            }));

            $(".revert_recall").click(function(e) {
                return confirmDelete(_("Are you sure you want to revert this recall's status from Waiting?"));
            });

            $(".expire_recall").click(function(e) {
                return confirmDelete(_("Are you sure you want to remove this recall?"));
            });
        });
    </script>
[% END %]

[% INCLUDE 'intranet-bottom.inc' %]




[% USE raw %]
[% USE Asset %]
[% USE Koha %]
[% USE KohaDates %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Circulation &rsaquo; Recalls &rsaquo; Confirm recalls</title>
[% INCLUDE 'doc-head-close.inc' %]
</head>
<body id="recalls-request" class="catalog">
[% INCLUDE 'header.inc' %]
[% INCLUDE 'circ-search.inc' %]

<div id="breadcrumbs">
    <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
    <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> &rsaquo;
    <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber | uri %]">[% biblio.title | html %]</a> &rsaquo;
    Confirm recalls on [% biblio.title | html %]
</div>

<div class="main container-fluid">
<div class="row">
<div class="col-sm-10 col-sm-push-2">
<main>

    <h1>Existing recalls</h1>

    [% IF Koha.Preference('UseRecalls') %]
        [% IF recalls.count %]
            <form method="post" action="/cgi-bin/koha/recalls/request.pl">
                <input type="hidden" name="op" value="cancel_multiple_recalls">
                <input type="checkbox" id="select_all"> <span id="select_all_text">Select all</span>
                [% INCLUDE 'recalls.inc' %]
                <fieldset class="action">
                    <button type="submit" id="cancel_selected" class="btn btn-default btn-sm">Cancel selected recalls</button>
                </fieldset>
            </form>
        [% ELSE %]
            <div class="dialog message">No recalls have been made.</div>
        [% END %]
    [% ELSE %]
        <div class="dialog message">Recalls have not been enabled. Enable the <a href="/cgi-bin/koha/admin/preferences.pl?tab=circulation">UseRecalls</a> system preference to use recalls.</div>
    [% END %]

</main>
</div> <!-- /.col-sm-10.col-sm-push-2 -->

<div class="col-sm-2 col-sm-pull-10">
    <aside>
        [% INCLUDE 'biblio-view-menu.inc' %]
    </aside>
</div> <!-- .col-sm-2.col-sm-pull-10 -->

</div> <!-- /.row -->
</div> <!-- /.main.container-fluid -->

[% MACRO jsinclude BLOCK %]
    [% Asset.js("js/recalls.js") | $raw %]
    [% INCLUDE 'datatables.inc' %]
    [% INCLUDE 'columns_settings.inc' %]
[% END %]

[% INCLUDE 'intranet-bottom.inc' %]

Lines 300-306 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-1 / +3 lines)
300	</div>	300	</div>
301	[% END %]	301	[% END %]
302		302
303	[% IF ( exceeded_maxreserves \|\| exceeded_holds_per_record \|\| alreadyreserved \|\| none_available \|\| alreadypossession \|\| ageRestricted ) %]	303	[% IF ( exceeded_maxreserves \|\| exceeded_holds_per_record \|\| alreadyreserved \|\| none_available \|\| alreadypossession \|\| ageRestricted \|\| recall ) %]
304	<div class="dialog alert">	304	<div class="dialog alert">
305		305
306	[% UNLESS ( multi_hold ) %]	306	[% UNLESS ( multi_hold ) %]
Lines 320-325 Link Here
320	<li> <strong>No items are available</strong> to be placed on hold.</li>	320	<li> <strong>No items are available</strong> to be placed on hold.</li>
321	[% ELSIF ( maxreserves ) %]	321	[% ELSIF ( maxreserves ) %]
322	<li><strong>Too many holds: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber \| uri %]">[% patron.firstname \| html %] [% patron.surname \| html %] </a> has too many holds.</li>	322	<li><strong>Too many holds: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber \| uri %]">[% patron.firstname \| html %] [% patron.surname \| html %] </a> has too many holds.</li>
		323	[% ELSIF ( recall ) %]
		324	<li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber \| uri %]">[% patron.firstname \| html %] [% patron.surname \| html %]</a> has <strong>already placed a recall</strong> on this item.</li>
323	[% END # /IF exceeded_maxreserves %]	325	[% END # /IF exceeded_maxreserves %]
324	</ul>	326	</ul>
325	[% ELSE # UNLESS multi_hold %]	327	[% ELSE # UNLESS multi_hold %]

Lines 54-59 fieldset.rows label.viewlog { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt (-2 / +12 lines)
54	[% CASE 'SYSTEMPREFERENCE' %]System prefs	54	[% CASE 'SYSTEMPREFERENCE' %]System prefs
55	[% CASE 'CRONJOBS' %]Cron jobs	55	[% CASE 'CRONJOBS' %]Cron jobs
56	[% CASE 'REPORTS' %]Reports	56	[% CASE 'REPORTS' %]Reports
		57	[% CASE 'RECALLS' %]Recalls
57	[% CASE %][% module \| html %]	58	[% CASE %][% module \| html %]
58	[% END %]	59	[% END %]
59	[% END %]	60	[% END %]
Lines 76-81 fieldset.rows label.viewlog { Link Here
76	[% CASE 'DELCIRCMESSAGE' %]Delete circulation message	77	[% CASE 'DELCIRCMESSAGE' %]Delete circulation message
77	[% CASE 'STATUS_CHANGE' %]Change ILL request status	78	[% CASE 'STATUS_CHANGE' %]Change ILL request status
78	[% CASE 'Run' %]Run	79	[% CASE 'Run' %]Run
		80	[% CASE 'FULFILL' %]Fulfill
		81	[% CASE 'OVERDUE' %]Overdue
		82	[% CASE 'EXPIRE' %]Expire
79	[% CASE %][% action \| html %]	83	[% CASE %][% action \| html %]
80	[% END %]	84	[% END %]
81	[% END %]	85	[% END %]
Lines 127-133 fieldset.rows label.viewlog { Link Here
127	[% ELSE %]	131	[% ELSE %]
128	<label for="moduleALL" class="viewlog"><input type="checkbox" id="moduleALL" name="modules" value=""> All</label>	132	<label for="moduleALL" class="viewlog"><input type="checkbox" id="moduleALL" name="modules" value=""> All</label>
129	[% END %]	133	[% END %]
130	[% FOREACH modx IN [ 'AUTH' 'CATALOGUING' 'AUTHORITIES' 'MEMBERS' 'ACQUISITIONS' 'SERIAL' 'HOLDS' 'ILL' 'CIRCULATION' 'LETTER' 'FINES' 'SYSTEMPREFERENCE' 'CRONJOBS', 'REPORTS' ] %]	134	[% FOREACH modx IN [ 'AUTH' 'CATALOGUING' 'AUTHORITIES' 'MEMBERS' 'ACQUISITIONS' 'SERIAL' 'HOLDS' 'ILL' 'CIRCULATION' 'LETTER' 'FINES' 'SYSTEMPREFERENCE' 'CRONJOBS' 'REPORTS' 'RECALLS' ] %]
131	[% IF modules.grep(modx).size %]	135	[% IF modules.grep(modx).size %]
132	<label for="module[% modx \| html %]" class="viewlog"><input type="checkbox" id="module[% modx \| html %]" name="modules" value="[% modx \| html %]" checked="checked"> [% PROCESS translate_log_module module=modx %]</label>	136	<label for="module[% modx \| html %]" class="viewlog"><input type="checkbox" id="module[% modx \| html %]" name="modules" value="[% modx \| html %]" checked="checked"> [% PROCESS translate_log_module module=modx %]</label>
133	[% ELSE %]	137	[% ELSE %]
Lines 149-155 fieldset.rows label.viewlog { Link Here
149	<label for="actionALL" class="viewlog"><input type="checkbox" id="actionALL" name="actions" value=""> All</label>	153	<label for="actionALL" class="viewlog"><input type="checkbox" id="actionALL" name="actions" value=""> All</label>
150	[% END %]	154	[% END %]
151		155
152	[% FOREACH actx IN [ 'ADD' 'DELETE' 'MODIFY' 'ISSUE' 'RETURN' 'RENEW' 'CREATE' 'CANCEL' 'SUSPEND' 'RESUME' 'ADDCIRCMESSAGE' 'DELCIRCMESSAGE' 'STATUS_CHANGE' 'CHANGE PASS' 'Run' ] %]	156	[% FOREACH actx IN [ 'ADD' 'DELETE' 'MODIFY' 'ISSUE' 'RETURN' 'RENEW' 'CREATE' 'CANCEL' 'SUSPEND' 'RESUME' 'ADDCIRCMESSAGE' 'DELCIRCMESSAGE' 'STATUS_CHANGE' 'CHANGE PASS' 'Run' 'OVERDUE' 'EXPIRE' 'FULFILL' ] %]
153	[% IF actions.grep(actx).size %]	157	[% IF actions.grep(actx).size %]
154	<label for="action[% actx \| html %]" class="viewlog"><input type="checkbox" id="action[% actx \| html %]" name="actions" value="[% actx \| html %]" checked="checked"> [% PROCESS translate_log_action action=actx %]</label>	158	<label for="action[% actx \| html %]" class="viewlog"><input type="checkbox" id="action[% actx \| html %]" name="actions" value="[% actx \| html %]" checked="checked"> [% PROCESS translate_log_action action=actx %]</label>
155	[% ELSE %]	159	[% ELSE %]
Lines 267-272 fieldset.rows label.viewlog { Link Here
267	[% ELSE %]	271	[% ELSE %]
268	[% loopro.object \| html %]	272	[% loopro.object \| html %]
269	[% END %]	273	[% END %]
		274	[% ELSIF ( loopro.module == 'RECALLS' ) %]
		275	[% IF loopro.recall.item_level_recall %]
		276	Item-level recall on <a href="/cgi-bin/koha/catalogue/moredetail.pl?item=[% loopro.recall.itemnumber \| uri %]&biblionumber=[% loopro.recall.biblionumber \| uri %]&bi=[% loopro.recall.item.biblioitemnumber \| uri %]">item</a>
		277	[% ELSE %]
		278	Biblio-level recall on <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopro.recall.biblionumber \| uri %]">biblio</a>
		279	[% END %]
270	[% ELSE %]	280	[% ELSE %]
271	[% IF ( loopro.module == 'SERIAL' ) %]	281	[% IF ( loopro.module == 'SERIAL' ) %]
272	<a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% loopro.object \| uri %]">Subscription [% loopro.object \| html %] </a>	282	<a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% loopro.object \| uri %]">Subscription [% loopro.object \| html %] </a>

Lines 331-336 $(document).ready(function() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js (-1 / +14 lines)
331	onsite_checkout += " <span class='onsite_checkout'>(" + INHOUSE_USE + ")</span>";	331	onsite_checkout += " <span class='onsite_checkout'>(" + INHOUSE_USE + ")</span>";
332	}	332	}
333		333
		334	if ( oObj.recalled == 1 ) {
		335	title += " - <span class='circ-hlt item-recalled'>This item has been recalled and the due date updated.</span>";
		336	}
		337
334	title += " "	338	title += " "
335	+ "<a href='/cgi-bin/koha/catalogue/moredetail.pl?biblionumber="	339	+ "<a href='/cgi-bin/koha/catalogue/moredetail.pl?biblionumber="
336	+ oObj.biblionumber	340	+ oObj.biblionumber
Lines 419-424 $(document).ready(function() { Link Here
419		423
420	if ( oObj.can_renew ) {	424	if ( oObj.can_renew ) {
421	// Do nothing	425	// Do nothing
		426	} else if ( oObj.can_renew_error == "recalled" ) {
		427	msg += "<span>"
		428	+ "<a href='/cgi-bin/koha/recalls/request.pl?biblionumber=" + oObj.biblionumber + "'>" + RECALLED + "</a>"
		429	+ "</span>";
		430
		431	span_style = "display: none";
		432	span_class = "renewals-allowed-recalled";
422	} else if ( oObj.can_renew_error == "on_reserve" ) {	433	} else if ( oObj.can_renew_error == "on_reserve" ) {
423	msg += "<span>"	434	msg += "<span>"
424	+ "<a href='/cgi-bin/koha/reserve/request.pl?biblionumber=" + oObj.biblionumber + "'>" + ON_HOLD + "</a>"	435	+ "<a href='/cgi-bin/koha/reserve/request.pl?biblionumber=" + oObj.biblionumber + "'>" + ON_HOLD + "</a>"
Lines 541-547 $(document).ready(function() { Link Here
541	"bSortable": false,	552	"bSortable": false,
542	"bVisible": AllowCirculate ? true : false,	553	"bVisible": AllowCirculate ? true : false,
543	"mDataProp": function ( oObj ) {	554	"mDataProp": function ( oObj ) {
544	if ( oObj.can_renew_error == "on_reserve" ) {	555	if ( oObj.can_renew_error == "recalled" ) {
		556	return "<a href='/cgi-bin/koha/recalls/request.pl?biblionumber=" + oObj.biblionumber + "'>" + RECALLED + "</a>";
		557	} else if ( oObj.can_renew_error == "on_reserve" ) {
545	return "<a href='/cgi-bin/koha/reserve/request.pl?biblionumber=" + oObj.biblionumber + "'>" + ON_HOLD + "</a>";	558	return "<a href='/cgi-bin/koha/reserve/request.pl?biblionumber=" + oObj.biblionumber + "'>" + ON_HOLD + "</a>";
546	} else {	559	} else {
547	return "<input type='checkbox' class='checkin' id='checkin_" + oObj.itemnumber + "' name='checkin' value='" + oObj.itemnumber +"'></input>";	560	return "<input type='checkbox' class='checkin' id='checkin_" + oObj.itemnumber + "' name='checkin' value='" + oObj.itemnumber +"'></input>";




$(document).ready(function() {

        $(".cancel_recall").click(function(e){
            if (confirmDelete(__("Are you sure you want to remove this recall?"))){
                var $self = $(this);
                var $recall_id = $(this).data('id');
                var $action = $(this).data('action');
                var ajaxData = {
                    'recall_id': $recall_id,
                    'action'   : $action,
                };

                $.ajax({
                    url: '/cgi-bin/koha/svc/recall',
                    type: 'POST',
                    dataType: 'json',
                    data: ajaxData,
                })
                .done(function(data) {
                    var message = "";
                    if(data.success == 0) {
                        message = __("The recall may have already been cancelled. Please refresh the page.");
                    } else {
                        message = __("Cancelled");
                    }
                    $self.parent().parent().parent().parent().html(message);
                });
            }
        });

        $(".expire_recall").click(function(e){
            if (confirmDelete(__("Are you sure you want to expire this recall?"))){
                var $self = $(this);
                var $recall_id = $(this).data('id');
                var $action = $(this).data('action');
                var ajaxData = {
                    'recall_id': $recall_id,
                    'action'   : $action,
                };

                $.ajax({
                    url: '/cgi-bin/koha/svc/recall',
                    type: 'POST',
                    dataType: 'json',
                    data: ajaxData,
                })
                .done(function(data) {
                    var message = "";
                    if(data.success == 0) {
                        message = __("The recall may have already been expired. Please refresh the page.");
                    } else {
                        message = __("Expired");
                    }
                    $self.parent().parent().parent().parent().html(message);
                });
            }
        });

        $(".revert_recall").click(function(e){
            if (confirmDelete(__("Are you sure you want to revert the waiting status of this recall?"))){
                var $self = $(this);
                var $recall_id = $(this).data('id');
                var $action = $(this).data('action');
                var ajaxData = {
                    'recall_id': $recall_id,
                    'action'   : $action,
                };

                $.ajax({
                    url: '/cgi-bin/koha/svc/recall',
                    type: 'POST',
                    dataType: 'json',
                    data: ajaxData,
                })
                .done(function(data) {
                    var message = "";
                    if(data.success == 0) {
                        message = __("The recall waiting status may have already been reverted. Please refresh the page.");
                    } else {
                        message = __("Status updated");
                    }
                    $self.parent().parent().parent().parent().html(message);
                });
            }
        });

        $(".overdue_recall").click(function(e){
            if (confirmDelete(__("Are you sure you want to mark this recall as overdue?"))){
                var $self = $(this);
                var $recall_id = $(this).data('id');
                var $action = $(this).data('action');
                var ajaxData = {
                    'recall_id': $recall_id,
                    'action'   : $action,
                };

                $.ajax({
                    url: '/cgi-bin/koha/svc/recall',
                    type: 'POST',
                    dataType: 'json',
                    data: ajaxData,
                })
                .done(function(data) {
                    var message = "";
                    if(data.success == 0) {
                        message = __("The recall may have already been marked as overdue. Please refresh the page.");
                    } else {
                        message = __("Marked overdue");
                    }
                    $self.parent().parent().parent().parent().html(message);
                });
            }
        });

        $(".transit_recall").click(function(e){
            if (confirmDelete(__("Are you sure you want to remove this recall and return the item to it's home library?"))){
                var $self = $(this);
                var $recall_id = $(this).data('id');
                var $action = $(this).data('action');
                var ajaxData = {
                    'recall_id': $recall_id,
                    'action'   : $action,
                };

                $.ajax({
                    url: '/cgi-bin/koha/svc/recall',
                    type: 'POST',
                    dataType: 'json',
                    data: ajaxData,
                })
                .done(function(data) {
                    var message = "";
                    if(data.success == 0) {
                        message = __("The recall may have already been removed. Please refresh the page.");
                    } else {
                        message = __("Cancelled");
                    }
                    $self.parent().parent().parent().parent().html(message);
                });
            }
        });

        $("#recalls-table").dataTable($.extend(true, {}, dataTablesDefaults, {
            "aoColumnDefs": [
                { 'bSortable': false, 'aTargets': [ 'nosort' ] },
                { "sType": "title-string", "aTargets" : [ "title-string" ] },
                { "sType": "anti-the", "aTargets": [ "anti-the" ] }
            ],
            "sPaginationType": "full_numbers"
        }));

        $("#cancel_selected").click(function(e){
            if ($("input[name='recall_ids']:checked").length > 0){
                return confirmDelete(__("Are you sure you want to remove the selected recall(s)?"));
            } else {
                alert(__("Please make a selection."));
            }
        });

        $("#select_all").click(function(){
            if ($("#select_all").prop("checked")){
                $("input[name='recall_ids']").prop("checked", true);
            } else {
                $("input[name='recall_ids']").prop("checked", false);
            }
        });

        $("#hide_old").click(function(){
            if ($("#hide_old").prop("checked")){
                $(".old").show();
            } else {
                $(".old").hide();
            }
        });
});

Lines 210-215 $template->param( Link Here

(-)a/members/moremember.pl (+2 lines)
210	relatives_borrowernumbers => \@relatives,	210	relatives_borrowernumbers => \@relatives,
211	logged_in_user => $logged_in_user,	211	logged_in_user => $logged_in_user,
212	files => Koha::Patron::Files->new( borrowernumber => $borrowernumber ) ->GetFilesInfo(),	212	files => Koha::Patron::Files->new( borrowernumber => $borrowernumber ) ->GetFilesInfo(),
		213	recalls => $patron->recalls,
		214	specific_patron => 1,
213	);	215	);
214		216
215	output_html_with_http_headers $input, $cookie, $template->output;	217	output_html_with_http_headers $input, $cookie, $template->output;




#!/usr/bin/perl

# Copyright 2020 Aleisha Amohia <aleisha@catalyst.net.nz>
#
# 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 <http://www.gnu.org/licenses>.

use Modern::Perl;
use CGI qw ( -utf8 );
use C4::Auth;
use C4::Output;

my $input = CGI->new;
my ($template, $loggedinuser, $cookie)= get_template_and_user(
    {
       template_name => "members/recallshistory.tt",
       query => $input,
       type => "intranet",
       authnotrequired => 0,
       flagsrequired => { recalls => 1 },
       debug => 1,
    }
);

my $borrowernumber = $input->param('borrowernumber');
my $recalls = Koha::Recalls->search({ borrowernumber => $borrowernumber }, { order_by => { '-desc' => 'recalldate' } });
my $patron = Koha::Patrons->find( $borrowernumber );

$template->param(
        patron          => $patron,
        recalls         => $recalls,
        recallsview     => 1,
        specific_patron => 1,
);

output_html_with_http_headers $input, $cookie, $template->output;




#!/usr/bin/perl

# Copyright 2020 Aleisha Amohia <aleisha@catalyst.net.nz>
#
# 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 <http://www.gnu.org/licenses>.

use Modern::Perl;
use CGI qw ( -utf8 );
use C4::Context;
use C4::Output;
use C4::Auth;

my $input = new CGI;

my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
    {
        template_name   => "circ/printslip.tt",
        query           => $input,
        type            => "intranet",
        authnotrequired => 0,
        flagsrequired   => { circulate => "circulate_remaining_permissions" },
    }
);

my $recallid = $input->param('recall_id');
my $recall = Koha::Recalls->find($recallid);

my $itemnumber;
if ( $recall->itemnumber ){
    $itemnumber = $recall->itemnumber;
} else {
    $itemnumber = $recall->checkout->itemnumber;
}

# Print slip to inform library staff of details of recall requester, so the item can be put aside for requester
my $letter = C4::Letters::GetPreparedLetter(
    module => 'circulation',
    letter_code => 'RECALL_REQUESTER_DET',
    message_transport_type => 'print',
    tables => {
         'branches' => $recall->branchcode,
         'borrowers' => $recall->borrowernumber,
         'biblio'   => $recall->biblionumber,
         'items'   => $itemnumber,
         'recalls'  => $recall->recall_id,
    }
);

my ($slip, $is_html);
if ($letter) {
    $slip = $letter->{content};
    $is_html = $letter->{is_html};
}

$template->param(
    slip => $slip,
    plain => !$is_html,
    caller => 'recall',
);

output_html_with_http_headers $input, $cookie, $template->output;




#!/usr/bin/perl

# Copyright 2020 Aleisha Amohia <aleisha@catalyst.net.nz>
#
# 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 <http://www.gnu.org/licenses>.

use Modern::Perl;
use CGI qw ( -utf8 );
use C4::Auth;
use C4::Output;
use Koha::BiblioFrameworks;

my $query = new CGI;
my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
    {
      template_name   => "recalls/recalls_old_queue.tt",
      query           => $query,
      type            => "intranet",
      authnotrequired => 0,
      flagsrequired   => { recalls => "manage_recalls" },
      debug           => 1,
    }
);

my $recalls = Koha::Recalls->search({ old => 1 });
$template->param(
    recalls => $recalls,
    viewing_old => 1
);

# Checking if there is a Fast Cataloging Framework
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );

# writing the template
output_html_with_http_headers $query, $cookie, $template->output;




#!/usr/bin/perl

# Copyright 2020 Aleisha Amohia <aleisha@catalyst.net.nz>
#
# 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 <http://www.gnu.org/licenses>.

use Modern::Perl;
use CGI qw ( -utf8 );
use C4::Auth;
use C4::Output;
use Koha::BiblioFrameworks;
use Koha::DateUtils;

my $query = new CGI;
my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
    {
       template_name   => "recalls/recalls_overdue.tt",
       query           => $query,
       type            => "intranet",
       authnotrequired => 0,
       flagsrequired   => { recalls => "manage_recalls" },
       debug           => 1,
    }
);

my $op = $query->param('op') || 'list';
my @recall_ids = $query->multi_param('recall_ids');

if ( $op eq 'cancel_multiple_recalls' ) {
    foreach my $id ( @recall_ids ) {
        Koha::Recalls->find( $id )->set_cancelled;
    }
    $op = 'list'
}

if ( $op eq 'list' ) {
    my $recalls = Koha::Recalls->search({ status => 'O' });
    # will be set as Overdue by the misc/cronjobs/recall/overdue_recalls.pl cronjob
    $template->param(
        recalls => $recalls,
        checkboxes => 1,
    );
}

# Checking if there is a Fast Cataloging Framework
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );

# writing the template
output_html_with_http_headers $query, $cookie, $template->output;




#!/usr/bin/perl

# Copyright 2020 Aleisha Amohia <aleisha@catalyst.net.nz>
#
# 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 <http://www.gnu.org/licenses>.

use Modern::Perl;
use CGI qw ( -utf8 );
use C4::Auth;
use C4::Output;
use Koha::BiblioFrameworks;

my $query = new CGI;
my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
    {
      template_name   => "recalls/recalls_queue.tt",
      query           => $query,
      type            => "intranet",
      authnotrequired => 0,
      flagsrequired   => { recalls => 'manage_recalls' },
      debug           => 1,
    }
);

my $op = $query->param('op') || 'list';
my @recall_ids = $query->multi_param('recall_ids');
if ( $op eq 'cancel_multiple_recalls' ) {
    foreach my $id ( @recall_ids ) {
        Koha::Recalls->find( $id )->set_cancelled;
    }
    $op = 'list'
}
elsif ( $op eq 'list' ) {
    my $recalls = Koha::Recalls->search({ old => undef });
    $template->param(
        recalls => $recalls,
        checkboxes => 1,
    );
}

# Checking if there is a Fast Cataloging Framework
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );

# writing the template
output_html_with_http_headers $query, $cookie, $template->output;




#!/usr/bin/perl

# Copyright 2020 Aleisha Amohia <aleisha@catalyst.net.nz>
#
# 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 <http://www.gnu.org/licenses>.

use Modern::Perl;
use CGI qw ( -utf8 );
use C4::Auth;
use C4::Output;
use Koha::BiblioFrameworks;

my $query = new CGI;
my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
    {
      template_name   => "recalls/recalls_to_pull.tt",
      query           => $query,
      type            => "intranet",
      authnotrequired => 0,
      flagsrequired   => { recalls => 'manage_recalls' },
      debug           => 1,
    }
);

my $op = $query->param('op') || 'list';
my $recall_id = $query->param('recall_id');
if ( $op eq 'cancel' ) {
    my $recall = Koha::Recalls->find( $recall_id );
    if ( $recall->in_transit ) {
        C4::Items::ModItemTransfer( $recall->item->itemnumber, $recall->item->holdingbranch, $recall->item->homebranch, 'CancelRecall' );
    }
    $recall->set_cancelled;
    $op = 'list';
}

if ( $op eq 'list' ) {
    my @recalls = Koha::Recalls->search({ status => [ 'R','O','T' ] });
    my @pull_list;
    my %seen_bib;
    foreach my $recall ( @recalls ) {
        if ( $seen_bib{$recall->biblionumber} ){
            # we've already looked at the recalls on this biblio
            next;
        } else {
            # this is an unseen biblio
            $seen_bib{$recall->biblionumber}++;

            # get recall data about this biblio
            my @this_bib_recalls = Koha::Recalls->search({ biblionumber => $recall->biblionumber, status => [ 'R','O','T' ] }, { order_by => { -asc => 'recalldate' } });
            my $recalls_count = scalar @this_bib_recalls;
            my @unique_patrons = do { my %seen; grep { !$seen{$_->borrowernumber}++ } @this_bib_recalls };
            my $patrons_count = scalar @unique_patrons;
            my $first_recall = $this_bib_recalls[0];

            my $items_count = 0;
            my @callnumbers;
            my @copynumbers;
            my @enumchrons;
            my @itemtypes;
            my @locations;
            my @libraries;

            my @items = Koha::Items->search({ biblionumber => $recall->biblionumber });
            foreach my $item ( @items ) {
                if ( $item->can_be_waiting_recall and !$item->checkout ) {
                    # if item can be pulled to fulfill recall, collect item data
                    $items_count++;
                    push( @callnumbers, $item->itemcallnumber ) if ( $item->itemcallnumber );
                    push( @copynumbers, $item->copynumber ) if ( $item->copynumber );
                    push( @enumchrons, $item->enumchron ) if ( $item->enumchron );
                    push( @itemtypes, $item->effective_itemtype ) if ( $item->effective_itemtype );
                    push( @locations, $item->location ) if ( $item->location );
                    push( @libraries, $item->holdingbranch ) if ( $item->holdingbranch );
                }
            }

            if ( $items_count > 0 ) {
            # don't push data if there are no items available for this recall

                # get unique values
                my @unique_callnumbers = do { my %seen; grep { !$seen{$_}++ } @callnumbers };
                my @unique_copynumbers = do { my %seen; grep { !$seen{$_}++ } @copynumbers };
                my @unique_enumchrons = do { my %seen; grep { !$seen{$_}++ } @enumchrons };
                my @unique_itemtypes = do { my %seen; grep { !$seen{$_}++ } @itemtypes };
                my @unique_locations = do { my %seen; grep { !$seen{$_}++ } @locations };
                my @unique_libraries = do { my %seen; grep { !$seen{$_}++ } @libraries };

                push( @pull_list, {
                    biblio => $recall->biblio,
                    items_count => $items_count,
                    recalls_count => $recalls_count,
                    patrons_count => $patrons_count,
                    pull_count => $items_count <= $recalls_count ? $items_count : $recalls_count,
                    first_recall => $first_recall,
                    callnumbers => \@unique_callnumbers,
                    copynumbers => \@unique_copynumbers,
                    enumchrons => \@unique_enumchrons,
                    itemtypes => \@unique_itemtypes,
                    locations => \@unique_locations,
                    libraries => \@unique_libraries,
                });
            }
        }
    }
    $template->param(
        recalls => \@pull_list,
    );
}

# Checking if there is a Fast Cataloging Framework
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );

# writing the template
output_html_with_http_headers $query, $cookie, $template->output;




#!/usr/bin/perl

# Copyright 2020 Aleisha Amohia <aleisha@catalyst.net.nz>
#
# 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 <http://www.gnu.org/licenses>.

use Modern::Perl;
use CGI qw ( -utf8 );
use C4::Auth;
use C4::Output;
use Koha::Recalls;
use Koha::BiblioFrameworks;
use Koha::DateUtils;
use Koha::Patrons;

my $query = new CGI;
my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
    {
        template_name   => "recalls/recalls_waiting.tt",
        query           => $query,
        type            => "intranet",
        authnotrequired => 0,
        flagsrequired   => { recalls => "manage_recalls" },
        debug           => 1,
    }
);

my $op = $query->param('op') || 'list';

if ( $op eq 'modify' ) {
    my $expire = $query->param('expire') || '';
    my $revert = $query->param('revert') || '';
    my $recall_id = $query->param('recall_id');
    if ( $expire ) {
        Koha::Recalls->find( $recall_id )->set_expired({ interface => 'INTRANET' });
    } elsif ( $revert ) {
        Koha::Recalls->find( $recall_id )->revert_waiting;
    }
    $op = 'list';
}

if ( $op eq 'list' ) {
    my @recalls = Koha::Recalls->search({ status => 'W' });
    my $borrower = Koha::Patrons->find( $loggedinuser );
    my @over;
    my $maxdelay = C4::Context->preference('RecallsMaxPickUpDelay') || 7;
    my $today = dt_from_string();
    foreach my $r ( @recalls ){
        my $lastwaitingday = dt_from_string( $r->waitingdate )->add( days => $maxdelay );
        if ( $today > $lastwaitingday ){
            push @over, $r;
        }
    }
    $template->param(
        recalls => \@recalls,
        over => \@over,
    );
}

# Checking if there is a Fast Cataloging Framework
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );

# writing the template
output_html_with_http_headers $query, $cookie, $template->output;




#!/usr/bin/perl

# Copyright 2020 Aleisha Amohia <aleisha@catalyst.net.nz>
#
# 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 <http://www.gnu.org/licenses>.

use Modern::Perl;
use CGI qw ( -utf8 );
use C4::Auth;
use C4::Output;
use C4::Search;
use Koha::Recalls;
use Koha::Biblios;

my $input = CGI->new;
my ($template, $loggedinuser, $cookie)= get_template_and_user(
    {
       template_name => "recalls/request.tt",
       query => $input,
       type => "intranet",
       authnotrequired => 0,
       flagsrequired => { recalls => "manage_recalls" },
       debug => 1,
    }
);

my $op = $input->param('op') || 'list';
my @recall_ids = $input->multi_param('recall_ids');
my $biblionumber = $input->param('biblionumber');
my $recalls = Koha::Recalls->search({ biblionumber => $biblionumber, old => undef });
my $biblio = Koha::Biblios->find( $biblionumber );

if ( $op eq 'cancel_multiple_recalls' ) {
    foreach my $id ( @recall_ids ) {
        Koha::Recalls->find( $id )->set_cancelled;
    }
    $op = 'list'
}

if ( $op eq 'list' ) {
    $recalls = Koha::Recalls->search({ biblionumber => $biblionumber, old => undef });
    $biblio = Koha::Biblios->find( $biblionumber );
}

$template->param(
    recalls     => $recalls,
    recallsview => 1,
    biblio      => $biblio,
    checkboxes  => 1,
    C4::Search::enabled_staff_search_views,
);

output_html_with_http_headers $input, $cookie, $template->output;

Lines 314-319 foreach my $biblionumber (@biblionumbers) { Link Here

(-)a/reserve/request.pl (+4 lines)
314	$template->param( $canReserve->{status} => 1 );	314	$template->param( $canReserve->{status} => 1 );
315	$biblioloopiter{ $canReserve->{status} } = 1;	315	$biblioloopiter{ $canReserve->{status} } = 1;
316	}	316	}
		317	elsif ( $canReserve->{status} eq 'recall' ) {
		318	$template->param( $canReserve->{status} => 1 );
		319	$biblioloopiter{ $canReserve->{status} } = 1;
		320	}
317	else {	321	else {
318	$biblioloopiter{ $canReserve->{status} } = 1;	322	$biblioloopiter{ $canReserve->{status} } = 1;
319	}	323	}




        $damaged = $av->count ? $av->next->lib : '';
    }
    my @subtitles = split(/ \| /, $c->{'subtitle'} // '' );

    my $item = Koha::Items->find( $c->{itemnumber} );
    my $recalled = 0;
    my $recall = undef;
    $recall = $item->check_recalls if $item->can_be_waiting_recall;
    if ( defined $recall ) {
        if ( $recall->item_level_recall ) {
            if ( $recall->itemnumber == $c->{itemnumber} ) {
                # item-level recall on this item
                $recalled = 1;
            } else {
                $recalled = 0;
            }
        } else {
            # biblio-level recall, but don't want to mark recalled if the recall has been allocated a different item
            if ( !$recall->waiting ) {
                $recalled = 1;
            }
        }
    }

    my $checkout = {
        DT_RowId             => $c->{itemnumber} . '-' . $c->{borrowernumber},
        title                => $c->{title},

            cardnumber => $c->{cardnumber},
        },
        issued_today => !$c->{not_issued_today},
        recalled => $recalled,
    };

    if ( $c->{not_issued_today} ) {




#!/usr/bin/perl

# Copyright 2020 Aleisha Amohia <aleisha@catalyst.net.nz>
#
# 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 <http://www.gnu.org/licenses>.

use Modern::Perl;

use CGI;
use JSON qw(encode_json);

use C4::Context;
use C4::Auth qw(check_cookie_auth);
use C4::Output qw(output_with_http_headers);
use C4::Circulation qw(AddReturn);
use Koha::Recalls;

my $input = new CGI;
my $json = encode_json({ success => 0 });

my ( $auth_status, $sessionID ) = check_cookie_auth( $input->cookie('CGISESSID'), { recall => 'manage_recalls' } );

if ( $auth_status ne "ok" ) {
    print $input->header(-type => 'text/plain', -status => '403 Forbidden');
    exit 0;
}

my $recall_id = $input->param('recall_id');
my $recall = Koha::Recalls->find( $recall_id );
unless ( $recall ) {
    my $json = encode_json({ success => 0 });
    output_with_http_headers( $input, undef, $json, "json" );
    exit;
}

my $op = $input->param('action');

if ( $op eq 'cancel' ) {
    # cancel recall
    $recall->set_cancelled;
    if ( $recall->cancelled ){
        $json = encode_json({ success => 1 });
    }

} elsif ( $op eq 'expire' ) {
    # expire recall
    $recall->set_expired({ interface => 'INTRANET' });
    if ( $recall->expired ){
        $json = encode_json({ success => 1 });
    }

} elsif ( $op eq 'revert' ) {
    # revert recall waiting status
    $recall->revert_waiting;
    if ( $recall->requested ){
        $json = encode_json({ success => 1 });
    }

} elsif ( $op eq 'overdue' ) {
    # mark recall as overdue
    $recall->set_overdue({ interface => 'INTRANET' });
    if ( $recall->overdue ){
        $json = encode_json({ success => 1 });
    }

} elsif ( $op eq 'transit' ) {
    # cancel recall and return item to home library
    if ( $recall->in_transit ) {
        C4::Items::ModItemTransfer( $recall->item->itemnumber, $recall->item->holdingbranch, $recall->item->homebranch, 'CancelRecall' );
    }
    $recall->set_cancelled;
    if ( $recall->cancelled ){
        $json = encode_json({ success => 1 });
    }
}

output_with_http_headers( $input, undef, $json, "json" );

Lines 247-253 sub add_form { Link Here

(-)a/tools/letter.pl (-1 / +1 lines)
247	{value => 'items.fine', text => 'items.fine'},	247	{value => 'items.fine', text => 'items.fine'},
248	add_fields('borrowers');	248	add_fields('borrowers');
249	if ($module eq 'circulation') {	249	if ($module eq 'circulation') {
250	push @{$field_selection}, add_fields('opac_news');	250	push @{$field_selection}, add_fields('opac_news', 'recalls');
251		251
252	}	252	}
253		253




                }
            }
        }

        # get recall information
        if ( $log->module eq "RECALLS" ) {
            if ( $log->object ) {
                my $recall = Koha::Recalls->find( $log->object );
                if ( $recall && $output eq 'screen' ) {
                    $result->{recall} = $recall;
                }
            }
        }
        push @data, $result;
    }
    if ( $output eq "screen" ) {
- 

Return to bug 19532

Line 0 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc (+134 lines)
		1	[% USE Branches %]
		2	<div id="recalls">
		3	[% IF recalls.count %]
		4	<table id="recalls-table">
		5	<thead>
		6	<tr>
		7	[% IF checkboxes %]<th class="recall-checkbox nosort"> </th>[% END %]
		8	<th class="recall-title anti-the">Title</th>
		9	[% UNLESS specific_patron %]<th class="recall-patron">Requested by</th>[% END %]
		10	<th class="recall-date">Placed on</th>
		11	<th class="recall-expiry">Expires on</th>
		12	<th class="recall-branch">Pickup location</th>
		13	<th class="recall-status">Status</th>
		14	[% UNLESS viewing_old %]<th class="recall-duedate">Due date</th>[% END %]
		15	[% UNLESS viewing_old %]<th class="recall-actions nosort"> </th>[% END %]
		16	</tr>
		17	</thead>
		18
		19	<tbody>
		20	[% FOREACH recall IN recalls %]
		21	[% IF recall.old %]<tr class="old">[% ELSE %]<tr>[% END %]
		22
		23	[% IF checkboxes %]
		24	<td class="recall-checkbox">
		25	[% IF recall.old %]
		26
		27	[% ELSE %]
		28	<input type="checkbox" value="[% recall.recall_id \| html %]" name="recall_ids">
		29	[% END %]
		30	</td>
		31	[% END %]
		32
		33	<td class="recall-title">
		34	<b><a class="recall-title" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% recall.biblionumber \| html %]">
		35	[% recall.biblio.title \| html %]
		36	[% FOREACH s IN recall.biblio.subtitle %]
		37	[% s \| html %]
		38	[% END %]
		39	</a></b>
		40	[% IF recall.item %][% recall.item.barcode \| html %][% END %]
		41	[% recall.biblio.author \| html %]
		42	</td>
		43
		44	[% UNLESS specific_patron %]
		45	<td class="recall-patron">
		46	<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% recall.borrowernumber \| uri %]">[% recall.patron.firstname \| html %] [% recall.patron.surname \| html %] ([% recall.patron.cardnumber \| html %])</a>
		47	</td>
		48	[% END %]
		49
		50	<td class="recall-date">
		51	[% recall.recalldate \| $KohaDates %]
		52	</td>
		53
		54	<td class="recall-expiry">
		55	[% IF ( recall.expirationdate ) %]
		56	[% recall.expirationdate \| $KohaDates %]
		57	[% ELSIF ( !recall.old ) %]
		58	Never expires
		59	[% ELSE %]
		60	-
		61	[% END %]
		62	</td>
		63
		64	<td class="recall-branch">
65	[% recall.library.branchname \| html %]
66	</td>
67
68	<td class="recall-status">
69	[% IF ( recall.in_transit ) %]
70	In transit to [% recall.library.branchname \| html %]
71	[% ELSIF ( recall.waiting ) %]
72	Ready for pickup
73	[% ELSIF ( recall.expired ) %]
74	Expired on [% recall.expirationdate \| $KohaDates %]
75	[% ELSIF ( recall.cancelled ) %]
76	Cancelled on [% recall.cancellationdate \| $KohaDates %]
77	[% ELSIF ( recall.overdue ) %]
78	Overdue to be returned
79	[% ELSIF ( recall.finished ) %]
80	Fulfilled
81	[% ELSE %]
82	Requested
83	[% END %]
84	</td>
85
86	[% UNLESS viewing_old %]
87	<td class="recall-duedate">
88	[% IF recall.requested and recall.checkout %]
89	Due to be returned by [% recall.checkout.date_due \| $KohaDates %]
90	[% ELSIF recall.waiting and RECALL.expirationdate %]
91	Pick up by [% RECALL.expirationdate \| $KohaDates %]
92	[% ELSE %]
93	-
94	[% END %]
95	</td>
96	[% END %]
97
98	[% UNLESS viewing_old %]
99	<td class="recall-cancel actions">
100	[% IF recall.old %]
101
102	[% ELSE %]
103	<div class="btn-group">
104	<a class="btn btn-sm dropdown-toggle" data-toggle="dropdown" href="#"> Actions <span class="caret"></span></a>
105	<ul class="dropdown-menu pull-right">
106	[% IF ( recall.requested or recall.overdue ) %]
107	<li><a class="cancel_recall" data-id="[% recall.recall_id \| html %]" data-action="cancel"><i class="fa fa-times"></i> Cancel</a></li>
108	[% IF ( recall.should_be_overdue ) %]
109	<li><a class="overdue_recall" data-id="[% recall.recall_id \| html %]" data-action="overdue"><i class="fa fa-hourglass-end"></i> Mark as overdue</a></li>
110	[% END %]
111	[% ELSIF ( recall.waiting ) %]
112	<li><a class="revert_recall" data-id="[% recall.recall_id \| html %]" data-action="revert"><i class="fa fa-undo"></i> Revert waiting</a></li>
113	<li><a class="expire_recall" data-id="[% recall.recall_id \| html %]" data-action="expire"><i class="fa fa-times"></i> Expire</a></li>
114	[% ELSIF ( recall.in_transit ) %]
115	<li><a class="transit_recall" data-id="[% recall.recall_id \| html %]" data-action="transit"><i class="fa fa-times"></i> Cancel recall and return to: [% Branches.GetName(recall.item.homebranch) \| html %]</a></li>
116	[% END %]
117	</ul>
118	</div>
119	[% END %]
120	</td>
121	[% END %]
122
123	</tr>
124	[% END %]
125	</tbody>
126	</table>
127	[% ELSE %]
128	[% IF patron.borrowernumber %]
129	<div class="dialog message">Patron has no recalls.</div>
130	[% ELSE %]
131	<div class="dialog message">There are no recalls to show.</div>
132	[% END %]
133	[% END %]
134	</div>

Lines 452-465 Note that permanent location is a code, and location may be an authval. Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-3 / +12 lines)
452	<span class="holdonitem">There is an item level hold on this item (priority = [% hold.priority \| html %]).</span>	452	<span class="holdonitem">There is an item level hold on this item (priority = [% hold.priority \| html %]).</span>
453	[% END %]	453	[% END %]
454	[% END %]	454	[% END %]
455	[% UNLESS ( item.itemnotforloan \|\| item.notforloan_per_itemtype \|\| item.onloan \|\| item.itemlost \|\| item.withdrawn \|\| item.damaged \|\| item.transfertwhen \|\| hold ) %]	455
456	<span class="available">Available</span>	456	[% IF item.recalled %]
		457	[% IF item.recall.waitingdate %]
		458	Waiting at [% Branches.GetName( item.recall.branchcode ) \| html %] since [% item.recall.waitingdate \| $KohaDates %]
		459	[% ELSE %]
		460	Item recalled by <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% item.recall.borrowernumber \| uri %]">[% item.recall.patron.firstname \| html %] [% item.recall.patron.surname \| html %] ([% item.recall.patron.cardnumber \| html %])</a> on [% item.recall.recalldate \| $KohaDates %]
		461	[% END %]
		462	[% END %]
		463
		464	[% UNLESS ( item.itemnotforloan \|\| item.notforloan_per_itemtype \|\| item.onloan \|\| item.itemlost \|\| item.withdrawn \|\| item.damaged \|\| item.transfertwhen \|\| hold \|\| item.recalled ) %]
		465	Available
457	[% END %]	466	[% END %]
458		467
459	[% IF ( item.restricted ) %]	468	[% IF ( item.restricted ) %]
460	<span class="restricted">([% item.restrictedvalue \| html %])</span>	469	<span class="restricted">([% item.restrictedvalue \| html %])</span>
461	[% END %]	470	[% END %]
462
463	</td>	471	</td>
464	<td class="datelastseen"><span title="[% item.datelastseen \| html %]">[% item.datelastseen \| $KohaDates %]</span></td>	472	<td class="datelastseen"><span title="[% item.datelastseen \| html %]">[% item.datelastseen \| $KohaDates %]</span></td>
465	<td class="dateaccessioned"><span title="[% item.dateaccessioned \| html %]">[% item.dateaccessioned \| $KohaDates %]</span></td>	473	<td class="dateaccessioned"><span title="[% item.dateaccessioned \| html %]">[% item.dateaccessioned \| $KohaDates %]</span></td>
Lines 962-967 Note that permanent location is a code, and location may be an authval. Link Here
962	[% MACRO jsinclude BLOCK %]	970	[% MACRO jsinclude BLOCK %]
963	[% INCLUDE 'catalog-strings.inc' %]	971	[% INCLUDE 'catalog-strings.inc' %]
964	[% Asset.js("js/catalog.js") \| $raw %]	972	[% Asset.js("js/catalog.js") \| $raw %]
		973	[% Asset.js("js/recalls.js") \| $raw %]
965	[% Asset.js("js/coce.js") \| $raw %]	974	[% Asset.js("js/coce.js") \| $raw %]
966	<script>	975	<script>
967	var interface = "[% interface \| html %]";	976	var interface = "[% interface \| html %]";

Lines 74-79 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt (+12 lines)
74	<a class="circ-button" href="/cgi-bin/koha/circ/reserveratios.pl"><i class="fa fa-line-chart"></i> Hold ratios</a>	74	<a class="circ-button" href="/cgi-bin/koha/circ/reserveratios.pl"><i class="fa fa-line-chart"></i> Hold ratios</a>
75	</li>	75	</li>
76	</ul>	76	</ul>
		77
		78	[% IF Koha.Preference('UseRecalls') and CAN_user_recalls %]
		79	<h3>Recalls</h3>
		80
		81	<ul class="buttons-list">
		82	<li><a class="circ-button" href="/cgi-bin/koha/recalls/recalls_queue.pl" title="All active recalls"><i class="fa fa-tasks"></i> Recalls queue</a></li>
		83	<li><a class="circ-button" href="/cgi-bin/koha/recalls/recalls_to_pull.pl" title="Recalls that could be filled but have not been set waiting"><i class="fa fa-hand-grab-o"></i> Recalls to pull</a></li>
		84	<li><a class="circ-button" href="/cgi-bin/koha/recalls/recalls_overdue.pl" title="Recalled items that are overdue to be returned"><i class="fa fa-clock-o"></i> Overdue recalls</a></li>
		85	<li><a class="circ-button" href="/cgi-bin/koha/recalls/recalls_waiting.pl" title="Recalled items awaiting pickup"><i class="fa fa-calendar"></i> Recalls awaiting pickup</a></li>
		86	<li><a class="circ-button" href="/cgi-bin/koha/recalls/recalls_old_queue.pl" title="Inactive recalls"><i class="fa fa-tasks"></i> Old recalls</a></li>
		87	</ul>
		88	[% END %]
77	</div>	89	</div>
78		90
79	<!-- Add the extra clearfix for only the required viewport -->	91	<!-- Add the extra clearfix for only the required viewport -->

Lines 541-547 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-1 / +204 lines)
541	[% END # /IF transfer \|\| needstransfer %]	541	[% END # /IF transfer \|\| needstransfer %]
542		542
543	<!-- case of simple return no issue or transfer but with a reservation -->	543	<!-- case of simple return no issue or transfer but with a reservation -->
544	[% IF ( reserved ) %]	544	[% IF ( reserved and !recalled and !waitingrecall ) %]
545	<!-- reserved -->	545	<!-- reserved -->
546	<div id="hold-found2" class="modal fade audio-alert-action block">	546	<div id="hold-found2" class="modal fade audio-alert-action block">
547	<div class="modal-dialog">	547	<div class="modal-dialog">
Lines 653-658 Link Here
653	</div> <!-- /.modal-dialog -->	653	</div> <!-- /.modal-dialog -->
654	</div> <!-- /#hold-found2 -->	654	</div> <!-- /#hold-found2 -->
655	[% END #/IF reserved %]	655	[% END #/IF reserved %]
		656
		657	[% IF ( recalled ) %]
		658	<!-- recalled -->
		659	<div id="recalled" class="modal fade audio-alert-action block">
		660	<div class="modal-dialog">
		661	<div class="modal-content">
		662	<form method="post" action="/cgi-bin/koha/circ/returns.pl" class="confirm">
		663
		664	<div class="modal-header">
		665	<h3>
		666	Recall found:
		667	<br/>
		668	<a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% recall.biblionumber \| uri %]">[% recall.biblio.title \| html %]</a>
		669	[% IF recall.item %]
		670	<div class="recall-found-barcode">
		671	(<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% recall.biblionumber \| uri %]&itemnumber=[% recall.itemnumber \| uri %]">[% recall.item.barcode \| html %]</a>)
		672	</div>
		673	[% END %]
		674	</h3>
		675	</div>
		676
		677	<div class="modal-body">
		678	[% IF ( recall.recallnotes ) %]
		679	<h4>Notes:</h4>
		680	<p>[% recall.recallnotes \| html %]</p>
		681	<hr />
		682	[% END %]
		683	<h5>Recall placed by:</h5>
		684	<ul>
		685	<li>
		686	[% INCLUDE 'patron-title.inc' patron=recall.patron hide_patron_infos_if_needed=1 invert_name=1 link_to="circulation_recalls" %]
		687	<span class="patron-category"> - [% recall.patron.category.description \| html %]</span>
		688	</li>
		689
		690	[% INCLUDE display_holdpatron_address patron=recall.patron %]
		691
		692	[% IF ( recall.patron.phone ) %]
		693	<li>[% recall.patron.phone \| html %]</li>
		694	[% END %]
		695
		696	[% IF ( recall.patron.email ) %]
		697	<li>
		698	[% IF ( transfertodo ) %]
		699	[% recall.patron.email \| html %]
		700	[% ELSE %]
		701	<a id="boremail" href="mailto:[% recall.patron.email \| html %]">[% recall.patron.email \| html %]</a>
		702	[% END %]
		703	</li>
		704	[% END %]
		705
		706	[% UNLESS ( transfertodo) %]
		707	[% INCLUDE display_bormessagepref %]
		708	[% END %]
		709
		710	[% IF ( recall.patron.is_debarred ) %]
		711	<li class="error">Patron is RESTRICTED</li>
		712	[% END %]
		713
		714	[% IF ( recall.patron.gonenoaddress ) %]
		715	<li class="error">Patron's address is in doubt</li>
		716	[% END %]
		717	</ul>
		718	[% IF ( transfertodo ) %]
		719	<h4><strong>Transfer to:</strong> [% Branches.GetName( recall.branchcode ) \| html %]</h4>
720	[% ELSE %]
721	<h4><strong>Recall at</strong> [% Branches.GetName( recall.branchcode ) \| html %]</h4>
722	[% END %]
723
724	<input type="hidden" name="recall_id" value="[% recall.recall_id \| html %]">
725	<input type="hidden" name="itemnumber" value="[% itemnumber \| html %]">
726	<input type="hidden" name="returnbranch" value="[% Branches.GetLoggedInBranchcode \| html %]">
727	<input type="hidden" name="recall_slip" value="0">
728
729	</div>
730
731	<div class="modal-footer">
732	[% IF ( transfertodo ) %]
733	<button type="submit" class="btn btn-default approve">
734	<i class="fa fa-check"></i> Confirm recall and transfer
735	</button>
736	<button type="button" class="btn btn-default print-recall">
737	<i class="fa fa-print"></i> Print slip, transfer, and confirm
738	</button>
739	[% ELSE %]
740	<button type="submit" class="btn btn-default approve">
741	<i class="fa fa-check"></i> Confirm recall
742	</button>
743	<button type="button" class="btn btn-default print-recall">
744	<i class="fa fa-print"></i> Print slip and confirm
745	</button>
746	[% END %]
747
748	<button data-dismiss="modal" aria-hidden="true" type="submit" class="btn btn-default deny">
749	<i class="fa fa-times"></i> Ignore
750	</button>
751	</div> <!-- /.modal-footer -->
752	</form> <!-- /.confirm -->
753	</div> <!-- /.modal-content -->
754	</div> <!-- /.modal-dialog -->
755	</div> <!-- /#recalled -->
756	[% END #/IF recalled %]
757
758	[% IF ( waitingrecall ) %]
759	<!-- recalled -->
760	<div id="recalledwaiting" class="modal fade audio-alert-action block">
761	<div class="modal-dialog">
762	<div class="modal-content">
763	<form method="post" action="/cgi-bin/koha/circ/returns.pl" class="confirm">
764
765	<div class="modal-header">
766	<h3>
767	Recall found (item is already waiting):
768	<br/>
769	<a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% recall.biblionumber \| uri %]">[% recall.biblio.title \| html %]</a>
770	[% IF recall.item %]
771	<div class="recall-found-barcode">
772	(<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% recall.biblionumber \| uri %]&itemnumber=[% recall.itemnumber \| uri %]">[% recall.item.barcode \| html %]</a>)
773	</div>
774	[% END %]
775	</h3>
776	</div>
777
778	<div class="modal-body">
779	[% IF ( recall.recallnotes ) %]
780	<h4>Notes:</h4>
781	<p>[% recall.recallnotes \| html %]</p>
782	<hr />
783	[% END %]
784	<h5>Recall placed by:</h5>
785	<ul>
786	<li>
787	[% INCLUDE 'patron-title.inc' patron=recall.patron hide_patron_infos_if_needed=1 invert_name=1 link_to="circulation_recalls" %]
788	<span class="patron-category"> - [% recall.patron.category.description \| html %]</span>
789	</li>
790
791	[% INCLUDE display_holdpatron_address patron=recall.patron %]
792
793	[% IF ( recall.patron.phone ) %]
794	<li>[% recall.patron.phone \| html %]</li>
795	[% END %]
796
797	[% IF ( recall.patron.email ) %]
798	<li>
799	[% IF ( transfertodo ) %]
800	[% recall.patron.email \| html %]
801	[% ELSE %]
802	<a id="boremail" href="mailto:[% recall.patron.email \| html %]">[% recall.patron.email \| html %]</a>
803	[% END %]
804	</li>
805	[% END %]
806
807	[% UNLESS ( transfertodo) %]
808	[% INCLUDE display_bormessagepref %]
809	[% END %]
810
811	[% IF ( recall.patron.is_debarred ) %]
812	<li class="error">Patron is RESTRICTED</li>
813	[% END %]
814
815	[% IF ( recall.patron.gonenoaddress ) %]
816	<li class="error">Patron's address is in doubt</li>
817	[% END %]
818	</ul>
819	[% IF ( transfertodo ) %]
820	<h4><strong>Transfer to:</strong> [% Branches.GetName( recall.branchcode ) \| html %]</h4>
821	[% ELSE %]
822	<h4><strong>Wait for pickup at</strong> [% Branches.GetName( recall.branchcode ) \| html %]</h4>
823	[% END %]
824
825	<input type="hidden" name="recall_id" value="[% recall.recall_id \| html %]">
826	<input type="hidden" name="itemnumber" value="[% itemnumber \| html %]">
827	<input type="hidden" name="returnbranch" value="[% Branches.GetLoggedInBranchcode \| html %]">
828	<input type="hidden" name="recall_slip" value="0">
829
830	</div>
831
832	<div class="modal-footer">
833	<button type="submit" class="btn btn-default approve">
834	<i class="fa fa-check"></i> Confirm recall
835	</button>
836	<button type="button" class="btn btn-default print-recall">
837	<i class="fa fa-print"></i> Print slip and confirm
838	</button>
839
840	<button data-dismiss="modal" aria-hidden="true" type="submit" class="btn btn-default deny">
841	<i class="fa fa-times"></i> Ignore
842	</button>
843	</div> <!-- /.modal-footer -->
844	</form> <!-- /.confirm -->
845	</div> <!-- /.modal-content -->
846	</div> <!-- /.modal-dialog -->
847	</div> <!-- /#recalledwaiting-->
848	[% END #/IF recalledwaiting %]
656	[% END # /IF found %]	849	[% END # /IF found %]
657		850
658	<div class="static_checkin_messages">	851	<div class="static_checkin_messages">
Lines 939-944 Link Here
939	[% END %]	1132	[% END %]
940	[% END %]	1133	[% END %]
941	var columns_settings = [% TablesSettings.GetColumns( 'circ', 'returns', 'checkedintable', 'json' ) \| $raw %]	1134	var columns_settings = [% TablesSettings.GetColumns( 'circ', 'returns', 'checkedintable', 'json' ) \| $raw %]
		1135
		1136	[% IF recall_slip %]
		1137	Dopop('/cgi-bin/koha/recalls/recall_pickup_slip.pl?recall_id=[% recall_id \| uri %]');
		1138	[% END %]
		1139
942	var returns_table = KohaTable("checkedintable", {	1140	var returns_table = KohaTable("checkedintable", {
943	"bFilter":false,	1141	"bFilter":false,
944	"bPaginate":false,	1142	"bPaginate":false,
Lines 1044-1049 Link Here
1044	this.form.submit();	1242	this.form.submit();
1045	});	1243	});
1046		1244
		1245	$('.print-recall').on("click",function(e){
		1246	this.form.recall_slip.value = 1;
		1247	this.form.submit();
		1248	});
		1249
1047	$('.cancel-hold').on("click",function(e){	1250	$('.cancel-hold').on("click",function(e){
1048	this.form.cancel_reserve.value = 1;	1251	this.form.cancel_reserve.value = 1;
1049	this.form.submit();	1252	this.form.submit();

Line 0 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/recallshistory.tt (+48 lines)
	1	[% USE raw %]
	2	[% USE KohaDates %]
	3	[% USE Koha %]
	4	[% USE Asset %]
	5	[% SET footerjs = 1 %]
	6	[% INCLUDE 'doc-head-open.inc' %]
	7	<title>Recalls history for [% INCLUDE 'patron-title.inc' %]</title>
	8	[% INCLUDE 'doc-head-close.inc' %]
	9	</head>
	10
	11	<body id="recalls_history" class="pat">
	12	[% INCLUDE 'header.inc' %]
	13	[% INCLUDE 'patron-search.inc' %]
	14
	15	<div id="breadcrumbs">
	16	<a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
	17	<a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> &rsaquo;
	18	Recalls history for [% INCLUDE 'patron-title.inc' %]
	19	</div>
	20	<div class="main container-fluid">
	21	<div class="row">
	22	<div class="col-sm-10 col-sm-push-2">
	23	<main>
	24	[% INCLUDE 'members-toolbar.inc' %]
	25	<h1>Recalls history</h1>
	26	[% IF Koha.Preference('UseRecalls') %]
	27	<input type="checkbox" id="hide_old" name="hide_old" checked="checked">
	28	<label for="hide_old">Show old recalls</label>
	29	[% INCLUDE 'recalls.inc' %]
	30	[% ELSE %]
	31	<div class="dialog message">Recalls have not been enabled. Enable the <a href="/cgi-bin/koha/admin/preferences.pl?tab=circulation">UseRecalls</a> system preference to use recalls.</div>
	32	[% END %]
	33	</main>
	34	</div>
	35	<div class="col-sm-2 col-sm-pull-10">
	36	<aside>
	37	[% INCLUDE 'circ-menu.inc' %]
	38	</aside>
	39	</div>
	40	</div>
	41
	42	[% MACRO jsinclude BLOCK %]
	43	[% INCLUDE 'datatables.inc' %]
	44	[% INCLUDE 'columns_settings.inc' %]
	45	[% Asset.js("js/recalls.js") \| $raw %]
	46	[% END %]
	47
	48	[% INCLUDE 'intranet-bottom.inc' %]

Line 0 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/recalls.js (+175 lines)
		1	$(document).ready(function() {
		2
		3	$(".cancel_recall").click(function(e){
		4	if (confirmDelete(__("Are you sure you want to remove this recall?"))){
		5	var $self = $(this);
		6	var $recall_id = $(this).data('id');
		7	var $action = $(this).data('action');
		8	var ajaxData = {
		9	'recall_id': $recall_id,
		10	'action' : $action,
		11	};
		12
		13	$.ajax({
		14	url: '/cgi-bin/koha/svc/recall',
		15	type: 'POST',
		16	dataType: 'json',
		17	data: ajaxData,
		18	})
		19	.done(function(data) {
		20	var message = "";
		21	if(data.success == 0) {
		22	message = __("The recall may have already been cancelled. Please refresh the page.");
		23	} else {
		24	message = __("Cancelled");
		25	}
		26	$self.parent().parent().parent().parent().html(message);
		27	});
		28	}
		29	});
		30
		31	$(".expire_recall").click(function(e){
		32	if (confirmDelete(__("Are you sure you want to expire this recall?"))){
		33	var $self = $(this);
		34	var $recall_id = $(this).data('id');
		35	var $action = $(this).data('action');
		36	var ajaxData = {
		37	'recall_id': $recall_id,
		38	'action' : $action,
		39	};
		40
		41	$.ajax({
		42	url: '/cgi-bin/koha/svc/recall',
		43	type: 'POST',
		44	dataType: 'json',
		45	data: ajaxData,
		46	})
		47	.done(function(data) {
		48	var message = "";
		49	if(data.success == 0) {
		50	message = __("The recall may have already been expired. Please refresh the page.");
		51	} else {
		52	message = __("Expired");
		53	}
		54	$self.parent().parent().parent().parent().html(message);
		55	});
		56	}
		57	});
		58
		59	$(".revert_recall").click(function(e){
		60	if (confirmDelete(__("Are you sure you want to revert the waiting status of this recall?"))){
		61	var $self = $(this);
		62	var $recall_id = $(this).data('id');
		63	var $action = $(this).data('action');
		64	var ajaxData = {
65	'recall_id': $recall_id,
66	'action' : $action,
67	};
68
69	$.ajax({
70	url: '/cgi-bin/koha/svc/recall',
71	type: 'POST',
72	dataType: 'json',
73	data: ajaxData,
74	})
75	.done(function(data) {
76	var message = "";
77	if(data.success == 0) {
78	message = __("The recall waiting status may have already been reverted. Please refresh the page.");
79	} else {
80	message = __("Status updated");
81	}
82	$self.parent().parent().parent().parent().html(message);
83	});
84	}
85	});
86
87	$(".overdue_recall").click(function(e){
88	if (confirmDelete(__("Are you sure you want to mark this recall as overdue?"))){
89	var $self = $(this);
90	var $recall_id = $(this).data('id');
91	var $action = $(this).data('action');
92	var ajaxData = {
93	'recall_id': $recall_id,
94	'action' : $action,
95	};
96
97	$.ajax({
98	url: '/cgi-bin/koha/svc/recall',
99	type: 'POST',
100	dataType: 'json',
101	data: ajaxData,
102	})
103	.done(function(data) {
104	var message = "";
105	if(data.success == 0) {
106	message = __("The recall may have already been marked as overdue. Please refresh the page.");
107	} else {
108	message = __("Marked overdue");
109	}
110	$self.parent().parent().parent().parent().html(message);
111	});
112	}
113	});
114
115	$(".transit_recall").click(function(e){
116	if (confirmDelete(__("Are you sure you want to remove this recall and return the item to it's home library?"))){
117	var $self = $(this);
118	var $recall_id = $(this).data('id');
119	var $action = $(this).data('action');
120	var ajaxData = {
121	'recall_id': $recall_id,
122	'action' : $action,
123	};
124
125	$.ajax({
126	url: '/cgi-bin/koha/svc/recall',
127	type: 'POST',
128	dataType: 'json',
129	data: ajaxData,
130	})
131	.done(function(data) {
132	var message = "";
133	if(data.success == 0) {
134	message = __("The recall may have already been removed. Please refresh the page.");
135	} else {
136	message = __("Cancelled");
137	}
138	$self.parent().parent().parent().parent().html(message);
139	});
140	}
141	});
142
143	$("#recalls-table").dataTable($.extend(true, {}, dataTablesDefaults, {
144	"aoColumnDefs": [
145	{ 'bSortable': false, 'aTargets': [ 'nosort' ] },
146	{ "sType": "title-string", "aTargets" : [ "title-string" ] },
147	{ "sType": "anti-the", "aTargets": [ "anti-the" ] }
148	],
149	"sPaginationType": "full_numbers"
150	}));
151
152	$("#cancel_selected").click(function(e){
153	if ($("input[name='recall_ids']:checked").length > 0){
154	return confirmDelete(__("Are you sure you want to remove the selected recall(s)?"));
155	} else {
156	alert(__("Please make a selection."));
157	}
158	});
159
160	$("#select_all").click(function(){
161	if ($("#select_all").prop("checked")){
162	$("input[name='recall_ids']").prop("checked", true);
163	} else {
164	$("input[name='recall_ids']").prop("checked", false);
165	}
166	});
167
168	$("#hide_old").click(function(){
169	if ($("#hide_old").prop("checked")){
170	$(".old").show();
171	} else {
172	$(".old").hide();
173	}
174	});
175	});

Line 0 Link Here

(-)a/members/recallshistory.pl (+47 lines)
	1	#!/usr/bin/perl
	2
	3	# Copyright 2020 Aleisha Amohia <aleisha@catalyst.net.nz>
	4	#
	5	# This file is part of Koha.
	6
	7	# Koha is free software; you can redistribute it and/or modify it
	8	# under the terms of the GNU General Public License as published by
	9	# the Free Software Foundation; either version 3 of the License, or
	10	# (at your option) any later version.
	11	# Koha is distributed in the hope that it will be useful, but
	12	# WITHOUT ANY WARRANTY; without even the implied warranty of
	13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	14	# GNU General Public License for more details.
	15
	16	# You should have received a copy of the GNU General Public License
	17	# along with Koha; if not, see <http://www.gnu.org/licenses>.
	18
	19	use Modern::Perl;
	20	use CGI qw ( -utf8 );
	21	use C4::Auth;
	22	use C4::Output;
	23
	24	my $input = CGI->new;
	25	my ($template, $loggedinuser, $cookie)= get_template_and_user(
	26	{
	27	template_name => "members/recallshistory.tt",
	28	query => $input,
	29	type => "intranet",
	30	authnotrequired => 0,
	31	flagsrequired => { recalls => 1 },
	32	debug => 1,
	33	}
	34	);
	35
	36	my $borrowernumber = $input->param('borrowernumber');
	37	my $recalls = Koha::Recalls->search({ borrowernumber => $borrowernumber }, { order_by => { '-desc' => 'recalldate' } });
	38	my $patron = Koha::Patrons->find( $borrowernumber );
	39
	40	$template->param(
	41	patron => $patron,
	42	recalls => $recalls,
	43	recallsview => 1,
	44	specific_patron => 1,
	45	);
	46
	47	output_html_with_http_headers $input, $cookie, $template->output;

Line 0 Link Here

(-)a/recalls/recall_pickup_slip.pl (+74 lines)
		1	#!/usr/bin/perl
		2
		3	# Copyright 2020 Aleisha Amohia <aleisha@catalyst.net.nz>
		4	#
		5	# This file is part of Koha.
		6	#
		7	# Koha is free software; you can redistribute it and/or modify it
		8	# under the terms of the GNU General Public License as published by
		9	# the Free Software Foundation; either version 3 of the License, or
		10	# (at your option) any later version.
		11	#
		12	# Koha is distributed in the hope that it will be useful, but
		13	# WITHOUT ANY WARRANTY; without even the implied warranty of
		14	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		15	# GNU General Public License for more details.
		16	#
		17	# You should have received a copy of the GNU General Public License
		18	# along with Koha; if not, see <http://www.gnu.org/licenses>.
		19
		20	use Modern::Perl;
		21	use CGI qw ( -utf8 );
		22	use C4::Context;
		23	use C4::Output;
		24	use C4::Auth;
		25
		26	my $input = new CGI;
		27
		28	my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
		29	{
		30	template_name => "circ/printslip.tt",
		31	query => $input,
		32	type => "intranet",
		33	authnotrequired => 0,
		34	flagsrequired => { circulate => "circulate_remaining_permissions" },
		35	}
		36	);
		37
		38	my $recallid = $input->param('recall_id');
		39	my $recall = Koha::Recalls->find($recallid);
		40
		41	my $itemnumber;
		42	if ( $recall->itemnumber ){
		43	$itemnumber = $recall->itemnumber;
		44	} else {
		45	$itemnumber = $recall->checkout->itemnumber;
		46	}
		47
		48	# Print slip to inform library staff of details of recall requester, so the item can be put aside for requester
		49	my $letter = C4::Letters::GetPreparedLetter(
		50	module => 'circulation',
		51	letter_code => 'RECALL_REQUESTER_DET',
		52	message_transport_type => 'print',
		53	tables => {
		54	'branches' => $recall->branchcode,
		55	'borrowers' => $recall->borrowernumber,
		56	'biblio' => $recall->biblionumber,
		57	'items' => $itemnumber,
		58	'recalls' => $recall->recall_id,
		59	}
		60	);
		61
		62	my ($slip, $is_html);
		63	if ($letter) {
		64	$slip = $letter->{content};
65	$is_html = $letter->{is_html};
66	}
67
68	$template->param(
69	slip => $slip,
70	plain => !$is_html,
71	caller => 'recall',
72	);
73
74	output_html_with_http_headers $input, $cookie, $template->output;

Line 0 Link Here

(-)a/recalls/recalls_old_queue.pl (+47 lines)
	1	#!/usr/bin/perl
	2
	3	# Copyright 2020 Aleisha Amohia <aleisha@catalyst.net.nz>
	4	#
	5	# This file is part of Koha.
	6	# Koha is free software; you can redistribute it and/or modify it
	7	# under the terms of the GNU General Public License as published by
	8	# the Free Software Foundation; either version 3 of the License, or
	9	# (at your option) any later version.
	10	#
	11	# Koha is distributed in the hope that it will be useful, but
	12	# WITHOUT ANY WARRANTY; without even the implied warranty of
	13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	14	# GNU General Public License for more details.
	15	#
	16	# You should have received a copy of the GNU General Public License
	17	# along with Koha; if not, see <http://www.gnu.org/licenses>.
	18
	19	use Modern::Perl;
	20	use CGI qw ( -utf8 );
	21	use C4::Auth;
	22	use C4::Output;
	23	use Koha::BiblioFrameworks;
	24
	25	my $query = new CGI;
	26	my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
	27	{
	28	template_name => "recalls/recalls_old_queue.tt",
	29	query => $query,
	30	type => "intranet",
	31	authnotrequired => 0,
	32	flagsrequired => { recalls => "manage_recalls" },
	33	debug => 1,
	34	}
	35	);
	36
	37	my $recalls = Koha::Recalls->search({ old => 1 });
	38	$template->param(
	39	recalls => $recalls,
	40	viewing_old => 1
	41	);
	42
	43	# Checking if there is a Fast Cataloging Framework
	44	$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
	45
	46	# writing the template
	47	output_html_with_http_headers $query, $cookie, $template->output;

Line 0 Link Here

(-)a/recalls/recalls_overdue.pl (+61 lines)
	1	#!/usr/bin/perl
	2
	3	# Copyright 2020 Aleisha Amohia <aleisha@catalyst.net.nz>
	4	#
	5	# This file is part of Koha.
	6	# Koha is free software; you can redistribute it and/or modify it
	7	# under the terms of the GNU General Public License as published by
	8	# the Free Software Foundation; either version 3 of the License, or
	9	# (at your option) any later version.
	10	#
	11	# Koha is distributed in the hope that it will be useful, but
	12	# WITHOUT ANY WARRANTY; without even the implied warranty of
	13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	14	# GNU General Public License for more details.
	15	#
	16	# You should have received a copy of the GNU General Public License
	17	# along with Koha; if not, see <http://www.gnu.org/licenses>.
	18
	19	use Modern::Perl;
	20	use CGI qw ( -utf8 );
	21	use C4::Auth;
	22	use C4::Output;
	23	use Koha::BiblioFrameworks;
	24	use Koha::DateUtils;
	25
	26	my $query = new CGI;
	27	my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
	28	{
	29	template_name => "recalls/recalls_overdue.tt",
	30	query => $query,
	31	type => "intranet",
	32	authnotrequired => 0,
	33	flagsrequired => { recalls => "manage_recalls" },
	34	debug => 1,
	35	}
	36	);
	37
	38	my $op = $query->param('op') \|\| 'list';
	39	my @recall_ids = $query->multi_param('recall_ids');
	40
	41	if ( $op eq 'cancel_multiple_recalls' ) {
	42	foreach my $id ( @recall_ids ) {
	43	Koha::Recalls->find( $id )->set_cancelled;
	44	}
	45	$op = 'list'
	46	}
	47
	48	if ( $op eq 'list' ) {
	49	my $recalls = Koha::Recalls->search({ status => 'O' });
	50	# will be set as Overdue by the misc/cronjobs/recall/overdue_recalls.pl cronjob
	51	$template->param(
	52	recalls => $recalls,
	53	checkboxes => 1,
	54	);
	55	}
	56
	57	# Checking if there is a Fast Cataloging Framework
	58	$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
	59
	60	# writing the template
	61	output_html_with_http_headers $query, $cookie, $template->output;

Line 0 Link Here

(-)a/recalls/recalls_queue.pl (+57 lines)
	1	#!/usr/bin/perl
	2
	3	# Copyright 2020 Aleisha Amohia <aleisha@catalyst.net.nz>
	4	#
	5	# This file is part of Koha.
	6	# Koha is free software; you can redistribute it and/or modify it
	7	# under the terms of the GNU General Public License as published by
	8	# the Free Software Foundation; either version 3 of the License, or
	9	# (at your option) any later version.
	10	#
	11	# Koha is distributed in the hope that it will be useful, but
	12	# WITHOUT ANY WARRANTY; without even the implied warranty of
	13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	14	# GNU General Public License for more details.
	15	#
	16	# You should have received a copy of the GNU General Public License
	17	# along with Koha; if not, see <http://www.gnu.org/licenses>.
	18
	19	use Modern::Perl;
	20	use CGI qw ( -utf8 );
	21	use C4::Auth;
	22	use C4::Output;
	23	use Koha::BiblioFrameworks;
	24
	25	my $query = new CGI;
	26	my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
	27	{
	28	template_name => "recalls/recalls_queue.tt",
	29	query => $query,
	30	type => "intranet",
	31	authnotrequired => 0,
	32	flagsrequired => { recalls => 'manage_recalls' },
	33	debug => 1,
	34	}
	35	);
	36
	37	my $op = $query->param('op') \|\| 'list';
	38	my @recall_ids = $query->multi_param('recall_ids');
	39	if ( $op eq 'cancel_multiple_recalls' ) {
	40	foreach my $id ( @recall_ids ) {
	41	Koha::Recalls->find( $id )->set_cancelled;
	42	}
	43	$op = 'list'
	44	}
	45	elsif ( $op eq 'list' ) {
	46	my $recalls = Koha::Recalls->search({ old => undef });
	47	$template->param(
	48	recalls => $recalls,
	49	checkboxes => 1,
	50	);
	51	}
	52
	53	# Checking if there is a Fast Cataloging Framework
	54	$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
	55
	56	# writing the template
	57	output_html_with_http_headers $query, $cookie, $template->output;

Line 0 Link Here

(-)a/recalls/recalls_to_pull.pl (+126 lines)
		1	#!/usr/bin/perl
		2
		3	# Copyright 2020 Aleisha Amohia <aleisha@catalyst.net.nz>
		4	#
		5	# This file is part of Koha.
		6	# Koha is free software; you can redistribute it and/or modify it
		7	# under the terms of the GNU General Public License as published by
		8	# the Free Software Foundation; either version 3 of the License, or
		9	# (at your option) any later version.
		10	#
		11	# Koha is distributed in the hope that it will be useful, but
		12	# WITHOUT ANY WARRANTY; without even the implied warranty of
		13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		14	# GNU General Public License for more details.
		15	#
		16	# You should have received a copy of the GNU General Public License
		17	# along with Koha; if not, see <http://www.gnu.org/licenses>.
		18
		19	use Modern::Perl;
		20	use CGI qw ( -utf8 );
		21	use C4::Auth;
		22	use C4::Output;
		23	use Koha::BiblioFrameworks;
		24
		25	my $query = new CGI;
		26	my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
		27	{
		28	template_name => "recalls/recalls_to_pull.tt",
		29	query => $query,
		30	type => "intranet",
		31	authnotrequired => 0,
		32	flagsrequired => { recalls => 'manage_recalls' },
		33	debug => 1,
		34	}
		35	);
		36
		37	my $op = $query->param('op') \|\| 'list';
		38	my $recall_id = $query->param('recall_id');
		39	if ( $op eq 'cancel' ) {
		40	my $recall = Koha::Recalls->find( $recall_id );
		41	if ( $recall->in_transit ) {
		42	C4::Items::ModItemTransfer( $recall->item->itemnumber, $recall->item->holdingbranch, $recall->item->homebranch, 'CancelRecall' );
		43	}
		44	$recall->set_cancelled;
		45	$op = 'list';
		46	}
		47
		48	if ( $op eq 'list' ) {
		49	my @recalls = Koha::Recalls->search({ status => [ 'R','O','T' ] });
		50	my @pull_list;
		51	my %seen_bib;
		52	foreach my $recall ( @recalls ) {
		53	if ( $seen_bib{$recall->biblionumber} ){
		54	# we've already looked at the recalls on this biblio
		55	next;
		56	} else {
		57	# this is an unseen biblio
		58	$seen_bib{$recall->biblionumber}++;
		59
		60	# get recall data about this biblio
		61	my @this_bib_recalls = Koha::Recalls->search({ biblionumber => $recall->biblionumber, status => [ 'R','O','T' ] }, { order_by => { -asc => 'recalldate' } });
		62	my $recalls_count = scalar @this_bib_recalls;
		63	my @unique_patrons = do { my %seen; grep { !$seen{$_->borrowernumber}++ } @this_bib_recalls };
		64	my $patrons_count = scalar @unique_patrons;
65	my $first_recall = $this_bib_recalls[0];
66
67	my $items_count = 0;
68	my @callnumbers;
69	my @copynumbers;
70	my @enumchrons;
71	my @itemtypes;
72	my @locations;
73	my @libraries;
74
75	my @items = Koha::Items->search({ biblionumber => $recall->biblionumber });
76	foreach my $item ( @items ) {
77	if ( $item->can_be_waiting_recall and !$item->checkout ) {
78	# if item can be pulled to fulfill recall, collect item data
79	$items_count++;
80	push( @callnumbers, $item->itemcallnumber ) if ( $item->itemcallnumber );
81	push( @copynumbers, $item->copynumber ) if ( $item->copynumber );
82	push( @enumchrons, $item->enumchron ) if ( $item->enumchron );
83	push( @itemtypes, $item->effective_itemtype ) if ( $item->effective_itemtype );
84	push( @locations, $item->location ) if ( $item->location );
85	push( @libraries, $item->holdingbranch ) if ( $item->holdingbranch );
86	}
87	}
88
89	if ( $items_count > 0 ) {
90	# don't push data if there are no items available for this recall
91
92	# get unique values
93	my @unique_callnumbers = do { my %seen; grep { !$seen{$_}++ } @callnumbers };
94	my @unique_copynumbers = do { my %seen; grep { !$seen{$_}++ } @copynumbers };
95	my @unique_enumchrons = do { my %seen; grep { !$seen{$_}++ } @enumchrons };
96	my @unique_itemtypes = do { my %seen; grep { !$seen{$_}++ } @itemtypes };
97	my @unique_locations = do { my %seen; grep { !$seen{$_}++ } @locations };
98	my @unique_libraries = do { my %seen; grep { !$seen{$_}++ } @libraries };
99
100	push( @pull_list, {
101	biblio => $recall->biblio,
102	items_count => $items_count,
103	recalls_count => $recalls_count,
104	patrons_count => $patrons_count,
105	pull_count => $items_count <= $recalls_count ? $items_count : $recalls_count,
106	first_recall => $first_recall,
107	callnumbers => \@unique_callnumbers,
108	copynumbers => \@unique_copynumbers,
109	enumchrons => \@unique_enumchrons,
110	itemtypes => \@unique_itemtypes,
111	locations => \@unique_locations,
112	libraries => \@unique_libraries,
113	});
114	}
115	}
116	}
117	$template->param(
118	recalls => \@pull_list,
119	);
120	}
121
122	# Checking if there is a Fast Cataloging Framework
123	$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
124
125	# writing the template
126	output_html_with_http_headers $query, $cookie, $template->output;

Line 0 Link Here

(-)a/recalls/recalls_waiting.pl (+76 lines)
		1	#!/usr/bin/perl
		2
		3	# Copyright 2020 Aleisha Amohia <aleisha@catalyst.net.nz>
		4	#
		5	# This file is part of Koha.
		6	# Koha is free software; you can redistribute it and/or modify it
		7	# under the terms of the GNU General Public License as published by
		8	# the Free Software Foundation; either version 3 of the License, or
		9	# (at your option) any later version.
		10	#
		11	# Koha is distributed in the hope that it will be useful, but
		12	# WITHOUT ANY WARRANTY; without even the implied warranty of
		13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		14	# GNU General Public License for more details.
		15	#
		16	# You should have received a copy of the GNU General Public License
		17	# along with Koha; if not, see <http://www.gnu.org/licenses>.
		18
		19	use Modern::Perl;
		20	use CGI qw ( -utf8 );
		21	use C4::Auth;
		22	use C4::Output;
		23	use Koha::Recalls;
		24	use Koha::BiblioFrameworks;
		25	use Koha::DateUtils;
		26	use Koha::Patrons;
		27
		28	my $query = new CGI;
		29	my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
		30	{
		31	template_name => "recalls/recalls_waiting.tt",
		32	query => $query,
		33	type => "intranet",
		34	authnotrequired => 0,
		35	flagsrequired => { recalls => "manage_recalls" },
		36	debug => 1,
		37	}
		38	);
		39
		40	my $op = $query->param('op') \|\| 'list';
		41
		42	if ( $op eq 'modify' ) {
		43	my $expire = $query->param('expire') \|\| '';
		44	my $revert = $query->param('revert') \|\| '';
		45	my $recall_id = $query->param('recall_id');
		46	if ( $expire ) {
		47	Koha::Recalls->find( $recall_id )->set_expired({ interface => 'INTRANET' });
		48	} elsif ( $revert ) {
		49	Koha::Recalls->find( $recall_id )->revert_waiting;
		50	}
		51	$op = 'list';
		52	}
		53
		54	if ( $op eq 'list' ) {
		55	my @recalls = Koha::Recalls->search({ status => 'W' });
		56	my $borrower = Koha::Patrons->find( $loggedinuser );
		57	my @over;
		58	my $maxdelay = C4::Context->preference('RecallsMaxPickUpDelay') \|\| 7;
		59	my $today = dt_from_string();
		60	foreach my $r ( @recalls ){
		61	my $lastwaitingday = dt_from_string( $r->waitingdate )->add( days => $maxdelay );
		62	if ( $today > $lastwaitingday ){
		63	push @over, $r;
		64	}
65	}
66	$template->param(
67	recalls => \@recalls,
68	over => \@over,
69	);
70	}
71
72	# Checking if there is a Fast Cataloging Framework
73	$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
74
75	# writing the template
76	output_html_with_http_headers $query, $cookie, $template->output;

Line 0 Link Here

(-)a/recalls/request.pl (+65 lines)
		1	#!/usr/bin/perl
		2
		3	# Copyright 2020 Aleisha Amohia <aleisha@catalyst.net.nz>
		4	#
		5	# This file is part of Koha.
		6	# Koha is free software; you can redistribute it and/or modify it
		7	# under the terms of the GNU General Public License as published by
		8	# the Free Software Foundation; either version 3 of the License, or
		9	# (at your option) any later version.
		10	#
		11	# Koha is distributed in the hope that it will be useful, but
		12	# WITHOUT ANY WARRANTY; without even the implied warranty of
		13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		14	# GNU General Public License for more details.
		15	#
		16	# You should have received a copy of the GNU General Public License
		17	# along with Koha; if not, see <http://www.gnu.org/licenses>.
		18
		19	use Modern::Perl;
		20	use CGI qw ( -utf8 );
		21	use C4::Auth;
		22	use C4::Output;
		23	use C4::Search;
		24	use Koha::Recalls;
		25	use Koha::Biblios;
		26
		27	my $input = CGI->new;
		28	my ($template, $loggedinuser, $cookie)= get_template_and_user(
		29	{
		30	template_name => "recalls/request.tt",
		31	query => $input,
		32	type => "intranet",
		33	authnotrequired => 0,
		34	flagsrequired => { recalls => "manage_recalls" },
		35	debug => 1,
		36	}
		37	);
		38
		39	my $op = $input->param('op') \|\| 'list';
		40	my @recall_ids = $input->multi_param('recall_ids');
		41	my $biblionumber = $input->param('biblionumber');
		42	my $recalls = Koha::Recalls->search({ biblionumber => $biblionumber, old => undef });
		43	my $biblio = Koha::Biblios->find( $biblionumber );
		44
		45	if ( $op eq 'cancel_multiple_recalls' ) {
		46	foreach my $id ( @recall_ids ) {
		47	Koha::Recalls->find( $id )->set_cancelled;
		48	}
		49	$op = 'list'
		50	}
		51
		52	if ( $op eq 'list' ) {
		53	$recalls = Koha::Recalls->search({ biblionumber => $biblionumber, old => undef });
		54	$biblio = Koha::Biblios->find( $biblionumber );
		55	}
		56
		57	$template->param(
		58	recalls => $recalls,
		59	recallsview => 1,
		60	biblio => $biblio,
		61	checkboxes => 1,
		62	C4::Search::enabled_staff_search_views,
		63	);
		64
65	output_html_with_http_headers $input, $cookie, $template->output;

Lines 187-192 while ( my $c = $sth->fetchrow_hashref() ) { Link Here

(-)a/svc/checkouts (+22 lines)
187	$damaged = $av->count ? $av->next->lib : '';	187	$damaged = $av->count ? $av->next->lib : '';
188	}	188	}
189	my @subtitles = split(/ \\| /, $c->{'subtitle'} // '' );	189	my @subtitles = split(/ \\| /, $c->{'subtitle'} // '' );
		190
		191	my $item = Koha::Items->find( $c->{itemnumber} );
		192	my $recalled = 0;
		193	my $recall = undef;
		194	$recall = $item->check_recalls if $item->can_be_waiting_recall;
		195	if ( defined $recall ) {
		196	if ( $recall->item_level_recall ) {
		197	if ( $recall->itemnumber == $c->{itemnumber} ) {
		198	# item-level recall on this item
		199	$recalled = 1;
		200	} else {
		201	$recalled = 0;
		202	}
		203	} else {
		204	# biblio-level recall, but don't want to mark recalled if the recall has been allocated a different item
		205	if ( !$recall->waiting ) {
		206	$recalled = 1;
		207	}
		208	}
		209	}
		210
190	my $checkout = {	211	my $checkout = {
191	DT_RowId => $c->{itemnumber} . '-' . $c->{borrowernumber},	212	DT_RowId => $c->{itemnumber} . '-' . $c->{borrowernumber},
192	title => $c->{title},	213	title => $c->{title},
Lines 254-259 while ( my $c = $sth->fetchrow_hashref() ) { Link Here
254	cardnumber => $c->{cardnumber},	275	cardnumber => $c->{cardnumber},
255	},	276	},
256	issued_today => !$c->{not_issued_today},	277	issued_today => !$c->{not_issued_today},
		278	recalled => $recalled,
257	};	279	};
258		280
259	if ( $c->{not_issued_today} ) {	281	if ( $c->{not_issued_today} ) {

Line 0 Link Here

(-)a/svc/recall (+89 lines)
		1	#!/usr/bin/perl
		2
		3	# Copyright 2020 Aleisha Amohia <aleisha@catalyst.net.nz>
		4	#
		5	# This file is part of Koha.
		6	#
		7	# Koha is free software; you can redistribute it and/or modify it under the
		8	# terms of the GNU General Public License as published by the Free Software
		9	# Foundation; either version 3 of the License, or (at your option) any later
		10	# version.
		11	#
		12	# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
		13	# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
		14	# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
		15	#
		16	# You should have received a copy of the GNU General Public License
		17	# along with Koha; if not, see <http://www.gnu.org/licenses>.
		18
		19	use Modern::Perl;
		20
		21	use CGI;
		22	use JSON qw(encode_json);
		23
		24	use C4::Context;
		25	use C4::Auth qw(check_cookie_auth);
		26	use C4::Output qw(output_with_http_headers);
		27	use C4::Circulation qw(AddReturn);
		28	use Koha::Recalls;
		29
		30	my $input = new CGI;
		31	my $json = encode_json({ success => 0 });
		32
		33	my ( $auth_status, $sessionID ) = check_cookie_auth( $input->cookie('CGISESSID'), { recall => 'manage_recalls' } );
		34
		35	if ( $auth_status ne "ok" ) {
		36	print $input->header(-type => 'text/plain', -status => '403 Forbidden');
		37	exit 0;
		38	}
		39
		40	my $recall_id = $input->param('recall_id');
		41	my $recall = Koha::Recalls->find( $recall_id );
		42	unless ( $recall ) {
		43	my $json = encode_json({ success => 0 });
		44	output_with_http_headers( $input, undef, $json, "json" );
		45	exit;
		46	}
		47
		48	my $op = $input->param('action');
		49
		50	if ( $op eq 'cancel' ) {
		51	# cancel recall
		52	$recall->set_cancelled;
		53	if ( $recall->cancelled ){
		54	$json = encode_json({ success => 1 });
		55	}
		56
		57	} elsif ( $op eq 'expire' ) {
		58	# expire recall
		59	$recall->set_expired({ interface => 'INTRANET' });
		60	if ( $recall->expired ){
		61	$json = encode_json({ success => 1 });
		62	}
		63
		64	} elsif ( $op eq 'revert' ) {
65	# revert recall waiting status
66	$recall->revert_waiting;
67	if ( $recall->requested ){
68	$json = encode_json({ success => 1 });
69	}
70
71	} elsif ( $op eq 'overdue' ) {
72	# mark recall as overdue
73	$recall->set_overdue({ interface => 'INTRANET' });
74	if ( $recall->overdue ){
75	$json = encode_json({ success => 1 });
76	}
77
78	} elsif ( $op eq 'transit' ) {
79	# cancel recall and return item to home library
80	if ( $recall->in_transit ) {
81	C4::Items::ModItemTransfer( $recall->item->itemnumber, $recall->item->holdingbranch, $recall->item->homebranch, 'CancelRecall' );
82	}
83	$recall->set_cancelled;
84	if ( $recall->cancelled ){
85	$json = encode_json({ success => 1 });
86	}
87	}
88
89	output_with_http_headers( $input, undef, $json, "json" );

Lines 186-191 if ($do_it) { Link Here

(-)a/tools/viewlog.pl (-1 / +10 lines)
186	}	186	}
187	}	187	}
188	}	188	}
		189
		190	# get recall information
		191	if ( $log->module eq "RECALLS" ) {
		192	if ( $log->object ) {
		193	my $recall = Koha::Recalls->find( $log->object );
		194	if ( $recall && $output eq 'screen' ) {
		195	$result->{recall} = $recall;
		196	}
		197	}
		198	}
189	push @data, $result;	199	push @data, $result;
190	}	200	}
191	if ( $output eq "screen" ) {	201	if ( $output eq "screen" ) {
192	-