Attachment #123000 for bug #19532

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

Lines 395-400 foreach my $item (@items) { Link Here

(-)a/catalogue/detail.pl (+6 lines)
395	$item->{cover_images} = $item_object->cover_images;	395	$item->{cover_images} = $item_object->cover_images;
396	}	396	}
397		397
		398	my $recall = Koha::Recalls->find({ itemnumber => $item->{itemnumber}, old => undef });
		399	if ( defined $recall ) {
		400	$item->{recalled} = 1;
		401	$item->{recall} = $recall;
		402	}
		403
398	if ($currentbranch and C4::Context->preference('SeparateHoldings')) {	404	if ($currentbranch and C4::Context->preference('SeparateHoldings')) {
399	if ($itembranchcode and $itembranchcode eq $currentbranch) {	405	if ($itembranchcode and $itembranchcode eq $currentbranch) {
400	push @itemloop, $item;	406	push @itemloop, $item;

Lines 171-176 if ( $restoreduedatespec && $restoreduedatespec eq "highholds_empty" ) { Link Here

(-)a/circ/circulation.pl (-1 / +6 lines)
171	}	171	}
172	my $issueconfirmed = $query->param('issueconfirmed');	172	my $issueconfirmed = $query->param('issueconfirmed');
173	my $cancelreserve = $query->param('cancelreserve');	173	my $cancelreserve = $query->param('cancelreserve');
		174	my $cancel_recall = $query->param('cancel_recall');
		175	my $recall_id = $query->param('recall_id');
174	my $debt_confirmed = $query->param('debt_confirmed') \|\| 0; # Don't show the debt error dialog twice	176	my $debt_confirmed = $query->param('debt_confirmed') \|\| 0; # Don't show the debt error dialog twice
175	my $charges = $query->param('charges') \|\| q{};	177	my $charges = $query->param('charges') \|\| q{};
176		178
Lines 406-412 if (@$barcodes) { Link Here
406	}	408	}
407	unless($confirm_required) {	409	unless($confirm_required) {
408	my $switch_onsite_checkout = exists $messages->{ONSITE_CHECKOUT_WILL_BE_SWITCHED};	410	my $switch_onsite_checkout = exists $messages->{ONSITE_CHECKOUT_WILL_BE_SWITCHED};
409	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, } );	411	my $recall_id = $messages->{RECALLED};
		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, cancel_recall => $cancel_recall, recall_id => $recall_id, } );
410	$template_params->{issue} = $issue;	413	$template_params->{issue} = $issue;
411	$session->clear('auto_renew');	414	$session->clear('auto_renew');
412	$inprocess = 1;	415	$inprocess = 1;
Lines 453-458 if ($patron) { Link Here
453	$template->param(	456	$template->param(
454	holds_count => $holds->count(),	457	holds_count => $holds->count(),
455	WaitingHolds => $waiting_holds,	458	WaitingHolds => $waiting_holds,
		459	recalls => $patron->recalls,
		460	specific_patron => 1,
456	);	461	);
457	}	462	}
458		463

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

(-)a/circ/returns.pl (-1 / +77 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 167-172 if ( $query->param('reserve_id') ) { Link Here
167	}	176	}
168	}	177	}
169		178
		179	if ( $query->param('recall_id') ) {
		180	my $recall = Koha::Recalls->find( scalar $query->param('recall_id') );
		181	my $itemnumber = $query->param('itemnumber');
		182	my $return_branch = $query->param('returnbranch');
		183
		184	my $expirationdate = $recall->calc_expirationdate;
		185	my $item;
		186	if ( !$recall->item_level_recall ) {
		187	$item = Koha::Items->find( $itemnumber );
		188	}
		189
		190	if ( $recall->branchcode ne $return_branch ) {
		191	$recall->start_transfer({ item => $item }) if !$recall->in_transit;
		192	} else {
		193	$recall->set_waiting({ item => $item }) if !$recall->waiting;
		194	}
		195	}
		196
170	my $borrower;	197	my $borrower;
171	my $returned = 0;	198	my $returned = 0;
172	my $messages;	199	my $messages;
Lines 226-231 if ($transit) { Link Here
226	my $transfer = Koha::Item::Transfers->find($transit);	253	my $transfer = Koha::Item::Transfers->find($transit);
227	if ( $canceltransfer ) {	254	if ( $canceltransfer ) {
228	$transfer->cancel({ reason => 'Manual', force => 1});	255	$transfer->cancel({ reason => 'Manual', force => 1});
		256	my $recall_transfer_deleted = Koha::Recalls->find({ itemnumber => $itemnumber, status => 'T' });
		257	if ( defined $recall_transfer_deleted ) {
		258	$recall_transfer_deleted->revert_transfer;
		259	}
229	$template->param( transfercancelled => 1);	260	$template->param( transfercancelled => 1);
230	} else {	261	} else {
231	$transfer->transit;	262	$transfer->transit;
Lines 234-239 if ($transit) { Link Here
234	my $item = Koha::Items->find($itemnumber);	265	my $item = Koha::Items->find($itemnumber);
235	my $transfer = $item->get_transfer;	266	my $transfer = $item->get_transfer;
236	$transfer->cancel({ reason => 'Manual', force => 1});	267	$transfer->cancel({ reason => 'Manual', force => 1});
		268	my $recall_transfer_deleted = Koha::Recalls->find({ itemnumber => $itemnumber, status => 'T' });
		269	if ( defined $recall_transfer_deleted ) {
		270	$recall_transfer_deleted->revert_transfer;
		271	}
237	if($dest eq "ttr"){	272	if($dest eq "ttr"){
238	print $query->redirect("/cgi-bin/koha/circ/transferstoreceive.pl");	273	print $query->redirect("/cgi-bin/koha/circ/transferstoreceive.pl");
239	exit;	274	exit;
Lines 362-367 $template->param( inputloop => \@inputloop ); Link Here
362	my $found = 0;	397	my $found = 0;
363	my $waiting = 0;	398	my $waiting = 0;
364	my $reserved = 0;	399	my $reserved = 0;
		400	my $recalled = 0;
365		401
366	# new op dev : we check if the document must be returned to his homebranch directly,	402	# new op dev : we check if the document must be returned to his homebranch directly,
367	# if the document is transferred, we have warning message .	403	# if the document is transferred, we have warning message .
Lines 420-426 if ( $messages->{'WrongTransfer'} and not $messages->{'WasTransfered'}) { Link Here
420	#	456	#
421	# reserve found and item arrived at the expected branch	457	# reserve found and item arrived at the expected branch
422	#	458	#
423	if ( $messages->{'ResFound'}) {	459	if ( $messages->{'ResFound'} ) {
424	my $reserve = $messages->{'ResFound'};	460	my $reserve = $messages->{'ResFound'};
425	my $patron = Koha::Patrons->find( $reserve->{borrowernumber} );	461	my $patron = Koha::Patrons->find( $reserve->{borrowernumber} );
426	my $holdmsgpreferences = C4::Members::Messaging::GetMessagingPreferences( { borrowernumber => $reserve->{'borrowernumber'}, message_name => 'Hold_Filled' } );	462	my $holdmsgpreferences = C4::Members::Messaging::GetMessagingPreferences( { borrowernumber => $reserve->{'borrowernumber'}, message_name => 'Hold_Filled' } );
Lines 472-477 if ( $messages->{'ResFound'}) { Link Here
472	);	508	);
473	}	509	}
474		510
		511	if ( $messages->{RecallFound} ) {
		512	my $recall = $messages->{RecallFound};
		513	if ( dt_from_string( $recall->timestamp ) == dt_from_string ) {
		514	# we just updated this recall
		515	$template->param( recall => $recall );
		516	} else {
		517	my $transferbranch = $messages->{RecallNeedsTransfer};
		518	my $transfertodo = ( !$transferbranch or $transferbranch eq $recall->library->branchcode ) ? undef : 1;
		519	$template->param(
		520	found => 1,
		521	recall => $recall,
		522	recalled => $recall->waiting ? 0 : 1,
		523	transfertodo => $transfertodo,
		524	waitingrecall => $recall->waiting ? 1 : 0,
		525	);
		526	}
		527	}
		528
		529	if ( $messages->{TransferredRecall} ) {
		530	my $recall = $messages->{TransferredRecall};
		531
		532	# confirm transfer has arrived at the branch
		533	my $transfer = Koha::Item::Transfers->search({ datearrived => { '!=' => undef }, itemnumber => $recall->itemnumber }, { order_by => { -desc => 'datearrived' } })->next;
		534
		535	# if transfer has completed, show popup to confirm as waiting
		536	if ( defined $transfer and $transfer->tobranch eq $recall->branchcode ) {
		537	$template->param(
		538	found => 1,
		539	recall => $recall,
		540	recalled => 1,
		541	);
		542	}
		543	}
		544
475	# Error Messages	545	# Error Messages
476	my @errmsgloop;	546	my @errmsgloop;
477	foreach my $code ( keys %$messages ) {	547	foreach my $code ( keys %$messages ) {
Lines 553-558 foreach my $code ( keys %$messages ) { Link Here
553	}	623	}
554	elsif ( $code eq 'ReturnClaims' ) {	624	elsif ( $code eq 'ReturnClaims' ) {
555	$template->param( ReturnClaims => $messages->{ReturnClaims} );	625	$template->param( ReturnClaims => $messages->{ReturnClaims} );
		626	} elsif ( $code eq 'RecallFound' ) {
		627	;
		628	} elsif ( $code eq 'RecallNeedsTransfer' ) {
		629	;
		630	} elsif ( $code eq 'TransferredRecall' ) {
		631	;
556	} else {	632	} else {
557	die "Unknown error code $code"; # note we need all the (empty) elsif's above, or we die.	633	die "Unknown error code $code"; # note we need all the (empty) elsif's above, or we die.
558	# This forces the issue of staying in sync w/ Circulation.pm	634	# This forces the issue of staying in sync w/ Circulation.pm

Lines 109-114 while ( my $library = $libraries->next ) { Link Here

(-)a/circ/transferstoreceive.pl (+7 lines)
109	if ( my $first_hold = $holds->next ) {	109	if ( my $first_hold = $holds->next ) {
110	$getransf{patron} = Koha::Patrons->find( $first_hold->borrowernumber );	110	$getransf{patron} = Koha::Patrons->find( $first_hold->borrowernumber );
111	}	111	}
		112
		113	# check for a recall for this transfer
		114	my $recall = $item->recall;
		115	if ( defined $recall ) {
		116	$getransf{recall} = $recall;
		117	}
		118
112	push( @transferloop, \%getransf );	119	push( @transferloop, \%getransf );
113	}	120	}
114		121

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 175-180 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc (+3 lines)
175	[% IF Koha.Preference('ILLModule') && CAN_user_ill %]	175	[% IF Koha.Preference('ILLModule') && CAN_user_ill %]
176	[% 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>	176	[% 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>
177	[% END %]	177	[% END %]
		178	[% IF Koha.Preference('UseRecalls') && CAN_user_recalls %]
		179	[% IF recallsview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/recallshistory.pl?borrowernumber=[% patron.borrowernumber \| uri %]">Recalls history</a></li>
		180	[% END %]
178	</ul></div>	181	</ul></div>
179		182
180	<!-- Modal -->	183	<!-- 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>




                                <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" data-order="[% item.datelastseen | html %]">[% item.datelastseen | $KohaDates %]</td>
                    <td class="dateaccessioned" data-order="[% item.dateaccessioned | html %]">[% item.dateaccessioned | $KohaDates %]</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 %]
    [% Asset.js("lib/Chocolat/js/chocolat.js") | $raw %]
    <script>

Lines 519-524 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt (+6 lines)
519	Holds ([% Biblio.HoldsCount( SEARCH_RESULT.biblionumber ) \| html %])	519	Holds ([% Biblio.HoldsCount( SEARCH_RESULT.biblionumber ) \| html %])
520	[% END %]	520	[% END %]
521	[% END # /IF SEARCH_RESULT.norequests %]	521	[% END # /IF SEARCH_RESULT.norequests %]
		522	[% IF Koha.Preference('UseRecalls') and CAN_user_recalls %]
		523	\| <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>
		524	[% END %]
522		525
523	[% IF Koha.Preference('intranetbookbag') == 1 %]	526	[% IF Koha.Preference('intranetbookbag') == 1 %]
524	[% IF ( SEARCH_RESULT.incart ) %]	527	[% IF ( SEARCH_RESULT.incart ) %]
Lines 654-659 Link Here
654	[% IF ( other_items_loo.intransit ) %]	657	[% IF ( other_items_loo.intransit ) %]
655	(In transit)	658	(In transit)
656	[% END %]	659	[% END %]
		660	[% IF ( other_items_loo.recalled ) %]
		661	(Recalled)
		662	[% END %]
657	[% IF ( other_items_loo.onhold ) %]	663	[% IF ( other_items_loo.onhold ) %]
658	(On hold)	664	(On hold)
659	[% END %]	665	[% END %]

Lines 147-152 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt (+1 lines)
147	[% IF ( resultsloo.onloancount ) %] Checked out ([% resultsloo.onloancount \| html %]),<br /> [% END %]	147	[% IF ( resultsloo.onloancount ) %] Checked out ([% resultsloo.onloancount \| html %]),<br /> [% END %]
148	[% IF ( resultsloo.withdrawncount ) %] Withdrawn ([% resultsloo.withdrawncount \| html %]),<br /> [% END %]	148	[% IF ( resultsloo.withdrawncount ) %] Withdrawn ([% resultsloo.withdrawncount \| html %]),<br /> [% END %]
149	[% IF ( resultsloo.itemlostcount ) %] Lost ([% resultsloo.itemlostcount \| html %])<br />[% END %]	149	[% IF ( resultsloo.itemlostcount ) %] Lost ([% resultsloo.itemlostcount \| html %])<br />[% END %]
		150	[% IF ( resultsloo.recalledcount ) %] Waiting to fill recall ([% resultsloo.recalled \| html %])[% END %]
150	[% IF ( resultsloo.onholdcount ) %] Waiting on hold ([% resultsloo.onholdcount \| html %])[% END %]	151	[% IF ( resultsloo.onholdcount ) %] Waiting on hold ([% resultsloo.onholdcount \| html %])[% END %]
151	</span>	152	</span>
152	<span class="notforloan">	153	<span class="notforloan">




                        <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 232-237 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-1 / +50 lines)
232	Please confirm that the accompanying materials are present: [% ADDITIONAL_MATERIALS \| html %]	232	Please confirm that the accompanying materials are present: [% ADDITIONAL_MATERIALS \| html %]
233	</li>	233	</li>
234	[% END %]	234	[% END %]
		235
		236	[% IF RECALLED %]
		237	[% IF RECALLED.waiting %]
		238	<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>
		239	[% ELSIF RECALLED.requested or RECALLED.overdue %]
		240	<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>
		241	[% END %]
		242	[% END %]
		243
235	</ul>	244	</ul>
236		245
237	[% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]	246	[% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
Lines 281-286 Link Here
281	</p>	290	</p>
282	[% END %]	291	[% END %]
283		292
		293	[% IF ( RECALLED ) %]
		294	<p>
		295	<label for="cancelrecall">Cancel recall</label>
		296	<input type="radio" value="cancel" name="cancel_recall" id="cancelrecall" />
		297	<input type="hidden" value="[% RECALLED.recall_id \| html %]" name="recall_id" />
		298	</p>
		299	[% IF RECALLED.waiting %]
		300	<p>
		301	<label for="revertrecall">Revert waiting status</label>
		302	<input type="radio" value="revert" name="cancel_recall" id="revertrecall" checked="checked"/>
		303	<input type="hidden" value="[% RECALLED.recall_id \| html %]" name="recall_id" />
		304	</p>
		305	[% END %]
		306	[% END %]
		307
284	<input type="hidden" name="barcode" value="[% barcode \| html %]" />	308	<input type="hidden" name="barcode" value="[% barcode \| html %]" />
285	<input type="hidden" name="borrowernumber" value="[% patron.borrowernumber \| html %]" />	309	<input type="hidden" name="borrowernumber" value="[% patron.borrowernumber \| html %]" />
286	<input type="hidden" name="issueconfirmed" value="1" />	310	<input type="hidden" name="issueconfirmed" value="1" />
Lines 321-326 Link Here
321	</form>	345	</form>
322	[% END %]	346	[% END %]
323		347
		348	[% IF ( RECALLED ) %]
		349	<form method="get" action="/cgi-bin/koha/circ/circulation.pl">
		350	<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>
		351	</form>
		352	[% END %]
		353
324	<form method="get" action="/cgi-bin/koha/circ/circulation.pl">	354	<form method="get" action="/cgi-bin/koha/circ/circulation.pl">
325	[% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]	355	[% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
326	<input type="hidden" name="borrowernumber" value="[% patron.borrowernumber \| html %]" />	356	<input type="hidden" name="borrowernumber" value="[% patron.borrowernumber \| html %]" />
Lines 338-344 Link Here
338	[% END %]	368	[% END %]
339	</form>	369	</form>
340		370
341	[% IF ( RESERVED \|\| ISSUED_TO_ANOTHER ) && (CAN_user_reserveforothers_place_holds ) %]	371	[% IF ( RESERVED \|\| ISSUED_TO_ANOTHER \|\| RECALLED ) && (CAN_user_reserveforothers_place_holds ) %]
342	[% UNLESS noissues %]	372	[% UNLESS noissues %]
343	<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>	373	<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>
344	[% END %]	374	[% END %]
Lines 460-465 Link Here
460	[% IF ( USERBLOCKEDOVERDUE ) %]	490	[% IF ( USERBLOCKEDOVERDUE ) %]
461	<li>Checkouts are BLOCKED because patron has overdue items.</li>	491	<li>Checkouts are BLOCKED because patron has overdue items.</li>
462	[% END %]	492	[% END %]
		493
		494	[% IF ( RECALLED_INTRANSIT ) %]
		495	<li>Item has been recalled and is in transit for pickup at [% Branches.GetName( RECALLED_INTRANSIT ) \| html %].</li>
		496	[% END %]
463	</ul>	497	</ul>
464		498
465	[% IF (forceallow) %]	499	[% IF (forceallow) %]
Lines 823-828 Link Here
823	</a>	857	</a>
824	</li>	858	</li>
825	[% END %]	859	[% END %]
		860
		861	[% IF Koha.Preference('UseRecalls') %]
		862	<li>
		863	<a href="#recalls" id="recalls-tab">
		864	[% recalls.count \| html %] Recalls
		865	</a>
		866	</li>
		867	[% END %]
826	</ul>	868	</ul>
827		869
828	<!-- SUMMARY : TODAY & PREVIOUS ISSUES -->	870	<!-- SUMMARY : TODAY & PREVIOUS ISSUES -->
Lines 837-842 Link Here
837	</div> <!-- /#clubs-tab -->	879	</div> <!-- /#clubs-tab -->
838	[% END %]	880	[% END %]
839		881
		882	[% IF Koha.Preference('UseRecalls') %]
		883	<div id="recalls">
		884	[% INCLUDE 'recalls.inc' %]
		885	</div>
		886	[% END %]
		887
840	[% INCLUDE borrower_debarments.inc %]	888	[% INCLUDE borrower_debarments.inc %]
841		889
842	<div id="reserves">	890	<div id="reserves">
Lines 1083-1088 Link Here
1083	</script>	1131	</script>
1084	[% INCLUDE 'str/members-menu.inc' %]	1132	[% INCLUDE 'str/members-menu.inc' %]
1085	[% Asset.js("js/members-menu.js") \| $raw %]	1133	[% Asset.js("js/members-menu.js") \| $raw %]
		1134	[% Asset.js("js/recalls.js") \| $raw %]
1086	[% END %]	1135	[% END %]
1087		1136
1088	[% INCLUDE 'intranet-bottom.inc' %]	1137	[% INCLUDE 'intranet-bottom.inc' %]

Lines 8-13 Link Here

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

Lines 163-168 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt (+3 lines)
163	[% ELSIF error == "onsite_checkout" %]	163	[% ELSIF error == "onsite_checkout" %]
164	<p>Item cannot be renewed because it's an onsite checkout</p>	164	<p>Item cannot be renewed because it's an onsite checkout</p>
165		165
		166	[% ELSIF error == 'recalled' %]
		167	<p>This item has been recalled.</p>
		168
166	[% ELSE %]	169	[% ELSE %]
167		170
168	[% error \| html %]	171	[% 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 82-87 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt (+2 lines)
82	[% reser.patron.first_valid_email_address \| html %]	82	[% reser.patron.first_valid_email_address \| html %]
83	</a>	83	</a>
84	[% END %]	84	[% END %]
		85	[% ELSIF ( reser.recall ) %]
		86	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>
85	[% ELSE %]	87	[% ELSE %]
86	<p>None</p>	88	<p>None</p>
87	[% END %]	89	[% END %]

Lines 739-744 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (+15 lines)
739	</a>	739	</a>
740	</li>	740	</li>
741	[% END %]	741	[% END %]
		742
		743	[% IF Koha.Preference('UseRecalls') %]
		744	<li>
		745	<a href="#recalls" id="recalls-tab">
		746	[% recalls.count \| html %] Recalls
		747	</a>
		748	</li>
		749	[% END %]
742	</ul>	750	</ul>
743		751
744	[% INCLUDE "checkouts-table.inc" %]	752	[% INCLUDE "checkouts-table.inc" %]
Lines 761-766 Link Here
761	</div>	769	</div>
762	[% END %]	770	[% END %]
763		771
		772	[% IF Koha.Preference('UseRecalls') %]
		773	<div id="recalls">
		774	[% INCLUDE 'recalls.inc' %]
		775	</div>
		776	[% END %]
		777
764	[% INCLUDE borrower_debarments.inc %]	778	[% INCLUDE borrower_debarments.inc %]
765		779
766	[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]	780	[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
Lines 885-890 Link Here
885	[% Asset.js("js/holds.js") \| $raw %]	899	[% Asset.js("js/holds.js") \| $raw %]
886	[% INCLUDE 'str/members-menu.inc' %]	900	[% INCLUDE 'str/members-menu.inc' %]
887	[% Asset.js("js/members-menu.js") \| $raw %]	901	[% Asset.js("js/members-menu.js") \| $raw %]
		902	[% Asset.js("js/recalls.js") \| $raw %]
888	[% Asset.js("js/messaging-preference-form.js") \| $raw %]	903	[% Asset.js("js/messaging-preference-form.js") \| $raw %]
889	<script>	904	<script>
890		905




[% 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>Old recalls &rsaquo; Circulation &rsaquo; Koha</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>Overdue recalls &rsaquo; Circulaion &rsaquo; Koha</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>Recalls queue &rsaquo; Circulation &rsaquo; Koha</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>Recalls to pull &rsaquo; Circulation &rsaquo; Koha</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>Recalls awaiting pickup &rsaquo; Circulation &rsaquo; Koha</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>Confirm recalls &rsaquo; Recalls &rsaquo; Koha</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 333-339 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-1 / +3 lines)
333	</div>	333	</div>
334	[% END %]	334	[% END %]
335		335
336	[% IF ( no_reserves_allowed \|\| exceeded_maxreserves \|\| exceeded_holds_per_record \|\| alreadyreserved \|\| none_available \|\| alreadypossession \|\| ageRestricted ) %]	336	[% IF ( no_reserves_allowed \|\| exceeded_maxreserves \|\| exceeded_holds_per_record \|\| alreadyreserved \|\| none_available \|\| alreadypossession \|\| ageRestricted \|\| recall ) %]
337	<div class="dialog alert">	337	<div class="dialog alert">
338		338
339	[% UNLESS ( multi_hold ) %]	339	[% UNLESS ( multi_hold ) %]
Lines 355-360 Link Here
355	<li> <strong>No items are available</strong> to be placed on hold.</li>	355	<li> <strong>No items are available</strong> to be placed on hold.</li>
356	[% ELSIF ( maxreserves ) %]	356	[% ELSIF ( maxreserves ) %]
357	<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>	357	<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>
		358	[% ELSIF ( recall ) %]
		359	<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>
358	[% END # /IF exceeded_maxreserves %]	360	[% END # /IF exceeded_maxreserves %]
359	</ul>	361	</ul>
360	[% ELSE # UNLESS multi_hold %]	362	[% ELSE # UNLESS multi_hold %]

Lines 96-101 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt (-2 / +13 lines)
96		96
97	[% CASE 'NOTICES' %]Notices[% UNLESS Koha.Preference('NoticesLog') %] <i class="fa fa-warning" title="Log not enabled"></i>[% END %]	97	[% CASE 'NOTICES' %]Notices[% UNLESS Koha.Preference('NoticesLog') %] <i class="fa fa-warning" title="Log not enabled"></i>[% END %]
98	[% CASE 'NEWS' %]News[% UNLESS Koha.Preference('NewsLog') %] <i class="fa fa-warning" title="Log not enabled"></i>[% END %]	98	[% CASE 'NEWS' %]News[% UNLESS Koha.Preference('NewsLog') %] <i class="fa fa-warning" title="Log not enabled"></i>[% END %]
		99	[% CASE 'RECALLS' %]Recalls[% UNLESS Koha.Preference('RecallsLog') %] <i class="fa fa-warning" title="Log not enabled"></i>[% END %]
		100
99	[% CASE %][% module \| html %]	101	[% CASE %][% module \| html %]
100	[% END %]	102	[% END %]
101	[% END %]	103	[% END %]
Lines 131-136 Link Here
131	[% CASE 'SERIAL CLAIM' %]Serial claim	133	[% CASE 'SERIAL CLAIM' %]Serial claim
132	[% CASE 'ACQUISITION CLAIM' %]Acquisition claim	134	[% CASE 'ACQUISITION CLAIM' %]Acquisition claim
133	[% CASE 'ACQUISITION ORDER' %]Acquisition order	135	[% CASE 'ACQUISITION ORDER' %]Acquisition order
		136	[% CASE 'FULFILL' %]Fulfill
		137	[% CASE 'OVERDUE' %]Overdue
		138	[% CASE 'EXPIRE' %]Expire
134	[% CASE %][% action \| html %]	139	[% CASE %][% action \| html %]
135	[% END %]	140	[% END %]
136	[% END %]	141	[% END %]
Lines 201-207 Link Here
201	[% ELSE %]	206	[% ELSE %]
202	<label for="moduleALL" class="viewlog"><input type="checkbox" id="moduleALL" name="modules" value=""> All</label>	207	<label for="moduleALL" class="viewlog"><input type="checkbox" id="moduleALL" name="modules" value=""> All</label>
203	[% END %]	208	[% END %]
204	[% FOREACH modx IN [ 'AUTH' 'CATALOGUING' 'AUTHORITIES' 'MEMBERS' 'ACQUISITIONS' 'SERIAL' 'HOLDS' 'ILL' 'CIRCULATION' 'CLAIMS' 'FINES' 'SYSTEMPREFERENCE' 'CRONJOBS', 'REPORTS', 'SEARCHENGINE', 'NOTICES', 'NEWS' ] %]	209	[% FOREACH modx IN [ 'AUTH' 'CATALOGUING' 'AUTHORITIES' 'MEMBERS' 'ACQUISITIONS' 'SERIAL' 'HOLDS' 'ILL' 'CIRCULATION' 'CLAIMS' 'FINES' 'SYSTEMPREFERENCE' 'CRONJOBS', 'REPORTS', 'SEARCHENGINE', 'NOTICES', 'NEWS', 'RECALLS' ] %]
205	[% IF modules.grep(modx).size %]	210	[% IF modules.grep(modx).size %]
206	<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>	211	<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>
207	[% ELSE %]	212	[% ELSE %]
Lines 223-229 Link Here
223	<label for="actionALL" class="viewlog"><input type="checkbox" id="actionALL" name="actions" value=""> All</label>	228	<label for="actionALL" class="viewlog"><input type="checkbox" id="actionALL" name="actions" value=""> All</label>
224	[% END %]	229	[% END %]
225		230
226	[% FOREACH actx IN [ 'ADD' 'DELETE' 'MODIFY' 'ISSUE' 'RETURN' 'RENEW' 'CREATE' 'CANCEL' 'SUSPEND' 'RESUME' 'ADDCIRCMESSAGE' 'DELCIRCMESSAGE' 'STATUS_CHANGE' 'PATRON_NOTICE' 'CHANGE PASS' 'Run' 'EDIT_MAPPINGS' 'RESET_MAPPINGS' 'ADD_BASKET' 'MODIFY_BASKET' 'MODIFY_BASKET_HEADER' 'MODIFY_BASKET_USERS' 'CLOSE_BASKET' 'APPROVE_BASKET' 'REOPEN_BASKET' ] %]	231	[% FOREACH actx IN [ 'ADD' 'DELETE' 'MODIFY' 'ISSUE' 'RETURN' 'RENEW' 'CREATE' 'CANCEL' 'SUSPEND' 'RESUME' 'ADDCIRCMESSAGE' 'DELCIRCMESSAGE' 'STATUS_CHANGE' 'PATRON_NOTICE' 'CHANGE PASS' 'Run' 'EDIT_MAPPINGS' 'RESET_MAPPINGS' 'ADD_BASKET' 'MODIFY_BASKET' 'MODIFY_BASKET_HEADER' 'MODIFY_BASKET_USERS' 'CLOSE_BASKET' 'APPROVE_BASKET' 'REOPEN_BASKET' 'OVERDUE' 'EXPIRE' 'FULFILL' ] %]
227	[% IF actions.grep(actx).size %]	232	[% IF actions.grep(actx).size %]
228	<label for="action[% actx\| replace('\s+', '_') \| html %]" class="viewlog"><input type="checkbox" id="action[% actx \| replace('\s+', '_') \| html %]" name="actions" value="[% actx \| html %]" checked="checked"> [% PROCESS translate_log_action action=actx %]</label>	233	<label for="action[% actx\| replace('\s+', '_') \| html %]" class="viewlog"><input type="checkbox" id="action[% actx \| replace('\s+', '_') \| html %]" name="actions" value="[% actx \| html %]" checked="checked"> [% PROCESS translate_log_action action=actx %]</label>
229	[% ELSE %]	234	[% ELSE %]
Lines 354-359 Link Here
354	[% ELSE %]	359	[% ELSE %]
355	[% loopro.object \| html %]	360	[% loopro.object \| html %]
356	[% END %]	361	[% END %]
		362	[% ELSIF ( loopro.module == 'RECALLS' ) %]
		363	[% IF loopro.recall.item_level_recall %]
		364	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>
		365	[% ELSE %]
		366	Biblio-level recall on <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopro.recall.biblionumber \| uri %]">biblio</a>
		367	[% END %]
357	[% ELSE %]	368	[% ELSE %]
358	[% loopro.object \| html %]	369	[% loopro.object \| html %]
359	[% END %]	370	[% END %]

Lines 360-365 $(document).ready(function() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js (-1 / +14 lines)
360	onsite_checkout += " <span class='onsite_checkout'>(" + __("On-site checkout") + ")</span>";	360	onsite_checkout += " <span class='onsite_checkout'>(" + __("On-site checkout") + ")</span>";
361	}	361	}
362		362
		363	if ( oObj.recalled == 1 ) {
		364	title += " - <span class='circ-hlt item-recalled'>This item has been recalled and the due date updated.</span>";
		365	}
		366
363	title += " "	367	title += " "
364	+ "<a href='/cgi-bin/koha/catalogue/moredetail.pl?biblionumber="	368	+ "<a href='/cgi-bin/koha/catalogue/moredetail.pl?biblionumber="
365	+ oObj.biblionumber	369	+ oObj.biblionumber
Lines 453-458 $(document).ready(function() { Link Here
453		457
454	if ( oObj.can_renew ) {	458	if ( oObj.can_renew ) {
455	// Do nothing	459	// Do nothing
		460	} else if ( oObj.can_renew_error == "recalled" ) {
		461	msg += "<span>"
		462	+ "<a href='/cgi-bin/koha/recalls/request.pl?biblionumber=" + oObj.biblionumber + "'>" + RECALLED + "</a>"
		463	+ "</span>";
		464
		465	span_style = "display: none";
		466	span_class = "renewals-allowed-recalled";
456	} else if ( oObj.can_renew_error == "on_reserve" ) {	467	} else if ( oObj.can_renew_error == "on_reserve" ) {
457	msg += "<span>"	468	msg += "<span>"
458	+"<a href='/cgi-bin/koha/reserve/request.pl?biblionumber=" + oObj.biblionumber + "'>" + __("On hold") + "</a>"	469	+"<a href='/cgi-bin/koha/reserve/request.pl?biblionumber=" + oObj.biblionumber + "'>" + __("On hold") + "</a>"
Lines 583-589 $(document).ready(function() { Link Here
583	"bSortable": false,	594	"bSortable": false,
584	"bVisible": AllowCirculate ? true : false,	595	"bVisible": AllowCirculate ? true : false,
585	"mDataProp": function ( oObj ) {	596	"mDataProp": function ( oObj ) {
586	if ( oObj.can_renew_error == "on_reserve" ) {	597	if ( oObj.can_renew_error == "recalled" ) {
		598	return "<a href='/cgi-bin/koha/recalls/request.pl?biblionumber=" + oObj.biblionumber + "'>" + __("Recalled") + "</a>";
		599	} else if ( oObj.can_renew_error == "on_reserve" ) {
587	return "<a href='/cgi-bin/koha/reserve/request.pl?biblionumber=" + oObj.biblionumber + "'>" + __("On hold") + "</a>";	600	return "<a href='/cgi-bin/koha/reserve/request.pl?biblionumber=" + oObj.biblionumber + "'>" + __("On hold") + "</a>";
588	} else if ( oObj.materials ) {	601	} else if ( oObj.materials ) {
589	return "<input type='checkbox' class='confirm' id='confirm_" + oObj.itemnumber + "' name='confirm' value='" + oObj.itemnumber + "' data-materials='" + oObj.materials.escapeHtml() + "'></input>";	602	return "<input type='checkbox' class='confirm' id='confirm_" + oObj.itemnumber + "' name='confirm' value='" + oObj.itemnumber + "' data-materials='" + oObj.materials.escapeHtml() + "'></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 273-278 $template->param( Link Here

(-)a/members/moremember.pl (+2 lines)
273	files => Koha::Patron::Files->new( borrowernumber => $borrowernumber ) ->GetFilesInfo(),	273	files => Koha::Patron::Files->new( borrowernumber => $borrowernumber ) ->GetFilesInfo(),
274	#debarments => scalar GetDebarments({ borrowernumber => $borrowernumber }),	274	#debarments => scalar GetDebarments({ borrowernumber => $borrowernumber }),
275	has_modifications => $has_modifications,	275	has_modifications => $has_modifications,
		276	recalls => $patron->recalls,
		277	specific_patron => 1,
276	);	278	);
277		279
278	output_html_with_http_headers $input, $cookie, $template->output;	280	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 qw( get_template_and_user );
use C4::Output qw( output_html_with_http_headers );

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 qw( output_html_with_http_headers );
use C4::Auth qw( get_template_and_user );

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 qw( get_template_and_user );
use C4::Output qw( output_html_with_http_headers );
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 qw( get_template_and_user );
use C4::Output qw( output_html_with_http_headers );
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 qw( get_template_and_user );
use C4::Output qw( output_html_with_http_headers );
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 qw( get_template_and_user );
use C4::Output qw( output_html_with_http_headers );
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 qw( get_template_and_user );
use C4::Output qw( output_html_with_http_headers );
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 333-338 foreach my $biblionumber (@biblionumbers) { Link Here

(-)a/reserve/request.pl (+3 lines)
333	}	333	}
334	elsif ( $canReserve->{status} eq 'alreadypossession' ) {	334	elsif ( $canReserve->{status} eq 'alreadypossession' ) {
335	$template->param( $canReserve->{status} => 1);	335	$template->param( $canReserve->{status} => 1);
		336	}
		337	elsif ( $canReserve->{status} eq 'recall' ) {
		338	$template->param( $canReserve->{status} => 1 );
336	$biblioloopiter{ $canReserve->{status} } = 1;	339	$biblioloopiter{ $canReserve->{status} } = 1;
337	}	340	}
338	else {	341	else {




        $materials = $descriptions->{lib} // $c->{materials};
    }
    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 249-255 sub add_form { Link Here

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




            }
        }

        # 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 505-518 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)
505	<span class="holdonitem">There is an item level hold on this item (priority = [% hold.priority \| html %]).</span>	505	<span class="holdonitem">There is an item level hold on this item (priority = [% hold.priority \| html %]).</span>
506	[% END %]	506	[% END %]
507	[% END %]	507	[% END %]
508	[% UNLESS ( item.itemnotforloan \|\| item.notforloan_per_itemtype \|\| item.onloan \|\| item.itemlost \|\| item.withdrawn \|\| item.damaged \|\| item.transfertwhen \|\| hold ) %]	508
509	<span class="available">Available</span>	509	[% IF item.recalled %]
		510	[% IF item.recall.waitingdate %]
		511	Waiting at [% Branches.GetName( item.recall.branchcode ) \| html %] since [% item.recall.waitingdate \| $KohaDates %]
		512	[% ELSE %]
		513	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 %]
		514	[% END %]
		515	[% END %]
		516
		517	[% UNLESS ( item.itemnotforloan \|\| item.notforloan_per_itemtype \|\| item.onloan \|\| item.itemlost \|\| item.withdrawn \|\| item.damaged \|\| item.transfertwhen \|\| hold \|\| item.recalled ) %]
		518	Available
510	[% END %]	519	[% END %]
511		520
512	[% IF ( item.restricted ) %]	521	[% IF ( item.restricted ) %]
513	<span class="restricted">([% item.restrictedvalue \| html %])</span>	522	<span class="restricted">([% item.restrictedvalue \| html %])</span>
514	[% END %]	523	[% END %]
515
516	</td>	524	</td>
517	<td class="datelastseen" data-order="[% item.datelastseen \| html %]">[% item.datelastseen \| $KohaDates %]</td>	525	<td class="datelastseen" data-order="[% item.datelastseen \| html %]">[% item.datelastseen \| $KohaDates %]</td>
518	<td class="dateaccessioned" data-order="[% item.dateaccessioned \| html %]">[% item.dateaccessioned \| $KohaDates %]</td>	526	<td class="dateaccessioned" data-order="[% item.dateaccessioned \| html %]">[% item.dateaccessioned \| $KohaDates %]</td>
Lines 1027-1032 Note that permanent location is a code, and location may be an authval. Link Here
1027	[% MACRO jsinclude BLOCK %]	1035	[% MACRO jsinclude BLOCK %]
1028	[% INCLUDE 'catalog-strings.inc' %]	1036	[% INCLUDE 'catalog-strings.inc' %]
1029	[% Asset.js("js/catalog.js") \| $raw %]	1037	[% Asset.js("js/catalog.js") \| $raw %]
		1038	[% Asset.js("js/recalls.js") \| $raw %]
1030	[% Asset.js("js/coce.js") \| $raw %]	1039	[% Asset.js("js/coce.js") \| $raw %]
1031	[% Asset.js("lib/Chocolat/js/chocolat.js") \| $raw %]	1040	[% Asset.js("lib/Chocolat/js/chocolat.js") \| $raw %]
1032	<script>	1041	<script>

Lines 85-90 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt (+12 lines)
85	<a class="circ-button" href="/cgi-bin/koha/circ/reserveratios.pl"><i class="fa fa-line-chart"></i> Hold ratios</a>	85	<a class="circ-button" href="/cgi-bin/koha/circ/reserveratios.pl"><i class="fa fa-line-chart"></i> Hold ratios</a>
86	</li>	86	</li>
87	</ul>	87	</ul>
		88
		89	[% IF Koha.Preference('UseRecalls') and CAN_user_recalls %]
		90	<h3>Recalls</h3>
		91
		92	<ul class="buttons-list">
		93	<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>
		94	<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>
		95	<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>
		96	<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>
		97	<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>
		98	</ul>
		99	[% END %]
88	</div>	100	</div>
89		101
90	<!-- Add the extra clearfix for only the required viewport -->	102	<!-- Add the extra clearfix for only the required viewport -->

Lines 625-631 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-1 / +204 lines)
625	[% END # /IF transfer \|\| needstransfer %]	625	[% END # /IF transfer \|\| needstransfer %]
626		626
627	<!-- case of simple return no issue or transfer but with a reservation -->	627	<!-- case of simple return no issue or transfer but with a reservation -->
628	[% IF ( reserved ) %]	628	[% IF ( reserved and !recalled and !waitingrecall ) %]
629	<!-- reserved -->	629	<!-- reserved -->
630	<div id="hold-found2" class="modal fade audio-alert-action block">	630	<div id="hold-found2" class="modal fade audio-alert-action block">
631	<div class="modal-dialog">	631	<div class="modal-dialog">
Lines 737-742 Link Here
737	</div> <!-- /.modal-dialog -->	737	</div> <!-- /.modal-dialog -->
738	</div> <!-- /#hold-found2 -->	738	</div> <!-- /#hold-found2 -->
739	[% END #/IF reserved %]	739	[% END #/IF reserved %]
		740
		741	[% IF ( recalled ) %]
		742	<!-- recalled -->
		743	<div id="recalled" class="modal fade audio-alert-action block">
		744	<div class="modal-dialog">
		745	<div class="modal-content">
		746	<form method="post" action="/cgi-bin/koha/circ/returns.pl" class="confirm">
		747
		748	<div class="modal-header">
		749	<h3>
		750	Recall found:
		751	<br/>
		752	<a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% recall.biblionumber \| uri %]">[% recall.biblio.title \| html %]</a>
		753	[% IF recall.item %]
		754	<div class="recall-found-barcode">
		755	(<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% recall.biblionumber \| uri %]&itemnumber=[% recall.itemnumber \| uri %]">[% recall.item.barcode \| html %]</a>)
		756	</div>
		757	[% END %]
		758	</h3>
		759	</div>
		760
		761	<div class="modal-body">
		762	[% IF ( recall.recallnotes ) %]
		763	<h4>Notes:</h4>
		764	<p>[% recall.recallnotes \| html %]</p>
		765	<hr />
		766	[% END %]
		767	<h5>Recall placed by:</h5>
		768	<ul>
		769	<li>
		770	[% INCLUDE 'patron-title.inc' patron=recall.patron hide_patron_infos_if_needed=1 invert_name=1 link_to="circulation_recalls" %]
		771	<span class="patron-category"> - [% recall.patron.category.description \| html %]</span>
		772	</li>
		773
		774	[% INCLUDE display_holdpatron_address patron=recall.patron %]
		775
		776	[% IF ( recall.patron.phone ) %]
		777	<li>[% recall.patron.phone \| html %]</li>
		778	[% END %]
		779
		780	[% IF ( recall.patron.email ) %]
		781	<li>
		782	[% IF ( transfertodo ) %]
		783	[% recall.patron.email \| html %]
		784	[% ELSE %]
		785	<a id="boremail" href="mailto:[% recall.patron.email \| html %]">[% recall.patron.email \| html %]</a>
		786	[% END %]
		787	</li>
		788	[% END %]
		789
		790	[% UNLESS ( transfertodo) %]
		791	[% INCLUDE display_bormessagepref %]
		792	[% END %]
		793
		794	[% IF ( recall.patron.is_debarred ) %]
		795	<li class="error">Patron is RESTRICTED</li>
		796	[% END %]
		797
		798	[% IF ( recall.patron.gonenoaddress ) %]
		799	<li class="error">Patron's address is in doubt</li>
		800	[% END %]
		801	</ul>
		802	[% IF ( transfertodo ) %]
		803	<h4><strong>Transfer to:</strong> [% Branches.GetName( recall.branchcode ) \| html %]</h4>
804	[% ELSE %]
805	<h4><strong>Recall at</strong> [% Branches.GetName( recall.branchcode ) \| html %]</h4>
806	[% END %]
807
808	<input type="hidden" name="recall_id" value="[% recall.recall_id \| html %]">
809	<input type="hidden" name="itemnumber" value="[% itemnumber \| html %]">
810	<input type="hidden" name="returnbranch" value="[% Branches.GetLoggedInBranchcode \| html %]">
811	<input type="hidden" name="recall_slip" value="0">
812
813	</div>
814
815	<div class="modal-footer">
816	[% IF ( transfertodo ) %]
817	<button type="submit" class="btn btn-default approve">
818	<i class="fa fa-check"></i> Confirm recall and transfer
819	</button>
820	<button type="button" class="btn btn-default print-recall">
821	<i class="fa fa-print"></i> Print slip, transfer, and confirm
822	</button>
823	[% ELSE %]
824	<button type="submit" class="btn btn-default approve">
825	<i class="fa fa-check"></i> Confirm recall
826	</button>
827	<button type="button" class="btn btn-default print-recall">
828	<i class="fa fa-print"></i> Print slip and confirm
829	</button>
830	[% END %]
831
832	<button data-dismiss="modal" aria-hidden="true" type="submit" class="btn btn-default deny">
833	<i class="fa fa-times"></i> Ignore
834	</button>
835	</div> <!-- /.modal-footer -->
836	</form> <!-- /.confirm -->
837	</div> <!-- /.modal-content -->
838	</div> <!-- /.modal-dialog -->
839	</div> <!-- /#recalled -->
840	[% END #/IF recalled %]
841
842	[% IF ( waitingrecall ) %]
843	<!-- recalled -->
844	<div id="recalledwaiting" class="modal fade audio-alert-action block">
845	<div class="modal-dialog">
846	<div class="modal-content">
847	<form method="post" action="/cgi-bin/koha/circ/returns.pl" class="confirm">
848
849	<div class="modal-header">
850	<h3>
851	Recall found (item is already waiting):
852	<br/>
853	<a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% recall.biblionumber \| uri %]">[% recall.biblio.title \| html %]</a>
854	[% IF recall.item %]
855	<div class="recall-found-barcode">
856	(<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% recall.biblionumber \| uri %]&itemnumber=[% recall.itemnumber \| uri %]">[% recall.item.barcode \| html %]</a>)
857	</div>
858	[% END %]
859	</h3>
860	</div>
861
862	<div class="modal-body">
863	[% IF ( recall.recallnotes ) %]
864	<h4>Notes:</h4>
865	<p>[% recall.recallnotes \| html %]</p>
866	<hr />
867	[% END %]
868	<h5>Recall placed by:</h5>
869	<ul>
870	<li>
871	[% INCLUDE 'patron-title.inc' patron=recall.patron hide_patron_infos_if_needed=1 invert_name=1 link_to="circulation_recalls" %]
872	<span class="patron-category"> - [% recall.patron.category.description \| html %]</span>
873	</li>
874
875	[% INCLUDE display_holdpatron_address patron=recall.patron %]
876
877	[% IF ( recall.patron.phone ) %]
878	<li>[% recall.patron.phone \| html %]</li>
879	[% END %]
880
881	[% IF ( recall.patron.email ) %]
882	<li>
883	[% IF ( transfertodo ) %]
884	[% recall.patron.email \| html %]
885	[% ELSE %]
886	<a id="boremail" href="mailto:[% recall.patron.email \| html %]">[% recall.patron.email \| html %]</a>
887	[% END %]
888	</li>
889	[% END %]
890
891	[% UNLESS ( transfertodo) %]
892	[% INCLUDE display_bormessagepref %]
893	[% END %]
894
895	[% IF ( recall.patron.is_debarred ) %]
896	<li class="error">Patron is RESTRICTED</li>
897	[% END %]
898
899	[% IF ( recall.patron.gonenoaddress ) %]
900	<li class="error">Patron's address is in doubt</li>
901	[% END %]
902	</ul>
903	[% IF ( transfertodo ) %]
904	<h4><strong>Transfer to:</strong> [% Branches.GetName( recall.branchcode ) \| html %]</h4>
905	[% ELSE %]
906	<h4><strong>Wait for pickup at</strong> [% Branches.GetName( recall.branchcode ) \| html %]</h4>
907	[% END %]
908
909	<input type="hidden" name="recall_id" value="[% recall.recall_id \| html %]">
910	<input type="hidden" name="itemnumber" value="[% itemnumber \| html %]">
911	<input type="hidden" name="returnbranch" value="[% Branches.GetLoggedInBranchcode \| html %]">
912	<input type="hidden" name="recall_slip" value="0">
913
914	</div>
915
916	<div class="modal-footer">
917	<button type="submit" class="btn btn-default approve">
918	<i class="fa fa-check"></i> Confirm recall
919	</button>
920	<button type="button" class="btn btn-default print-recall">
921	<i class="fa fa-print"></i> Print slip and confirm
922	</button>
923
924	<button data-dismiss="modal" aria-hidden="true" type="submit" class="btn btn-default deny">
925	<i class="fa fa-times"></i> Ignore
926	</button>
927	</div> <!-- /.modal-footer -->
928	</form> <!-- /.confirm -->
929	</div> <!-- /.modal-content -->
930	</div> <!-- /.modal-dialog -->
931	</div> <!-- /#recalledwaiting-->
932	[% END #/IF recalledwaiting %]
740	[% END # /IF found %]	933	[% END # /IF found %]
741		934
742	<div class="static_checkin_messages">	935	<div class="static_checkin_messages">
Lines 1027-1032 Link Here
1027	[% END %]	1220	[% END %]
1028	[% END %]	1221	[% END %]
1029	var columns_settings = [% TablesSettings.GetColumns( 'circ', 'returns', 'checkedintable', 'json' ) \| $raw %]	1222	var columns_settings = [% TablesSettings.GetColumns( 'circ', 'returns', 'checkedintable', 'json' ) \| $raw %]
		1223
		1224	[% IF recall_slip %]
		1225	Dopop('/cgi-bin/koha/recalls/recall_pickup_slip.pl?recall_id=[% recall_id \| uri %]');
		1226	[% END %]
		1227
1030	var returns_table = KohaTable("checkedintable", {	1228	var returns_table = KohaTable("checkedintable", {
1031	"bFilter":false,	1229	"bFilter":false,
1032	"bPaginate":false,	1230	"bPaginate":false,
Lines 1148-1153 Link Here
1148	this.form.submit();	1346	this.form.submit();
1149	});	1347	});
1150		1348
		1349	$('.print-recall').on("click",function(e){
		1350	this.form.recall_slip.value = 1;
		1351	this.form.submit();
		1352	});
		1353
1151	$('.cancel-hold').on("click",function(e){	1354	$('.cancel-hold').on("click",function(e){
1152	this.form.cancel_reserve.value = 1;	1355	this.form.cancel_reserve.value = 1;
1153	this.form.submit();	1356	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 qw( get_template_and_user );
	22	use C4::Output qw( output_html_with_http_headers );
	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 qw( output_html_with_http_headers );
		24	use C4::Auth qw( get_template_and_user );
		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 qw( get_template_and_user );
	22	use C4::Output qw( output_html_with_http_headers );
	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 qw( get_template_and_user );
	22	use C4::Output qw( output_html_with_http_headers );
	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 qw( get_template_and_user );
	22	use C4::Output qw( output_html_with_http_headers );
	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 qw( get_template_and_user );
		22	use C4::Output qw( output_html_with_http_headers );
		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 qw( get_template_and_user );
		22	use C4::Output qw( output_html_with_http_headers );
		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 210-215 while ( my $c = $sth->fetchrow_hashref() ) { Link Here

(-)a/svc/checkouts (+22 lines)
210	$materials = $descriptions->{lib} // $c->{materials};	210	$materials = $descriptions->{lib} // $c->{materials};
211	}	211	}
212	my @subtitles = split(/ \\| /, $c->{'subtitle'} // '' );	212	my @subtitles = split(/ \\| /, $c->{'subtitle'} // '' );
		213
		214	my $item = Koha::Items->find( $c->{itemnumber} );
		215	my $recalled = 0;
		216	my $recall = undef;
		217	$recall = $item->check_recalls if $item->can_be_waiting_recall;
		218	if ( defined $recall ) {
		219	if ( $recall->item_level_recall ) {
		220	if ( $recall->itemnumber == $c->{itemnumber} ) {
		221	# item-level recall on this item
		222	$recalled = 1;
		223	} else {
		224	$recalled = 0;
		225	}
		226	} else {
		227	# biblio-level recall, but don't want to mark recalled if the recall has been allocated a different item
		228	if ( !$recall->waiting ) {
		229	$recalled = 1;
		230	}
		231	}
		232	}
		233
213	my $checkout = {	234	my $checkout = {
214	DT_RowId => $c->{itemnumber} . '-' . $c->{borrowernumber},	235	DT_RowId => $c->{itemnumber} . '-' . $c->{borrowernumber},
215	title => $c->{title},	236	title => $c->{title},
Lines 282-287 while ( my $c = $sth->fetchrow_hashref() ) { Link Here
282	cardnumber => $c->{cardnumber},	303	cardnumber => $c->{cardnumber},
283	},	304	},
284	issued_today => !$c->{not_issued_today},	305	issued_today => !$c->{not_issued_today},
		306	recalled => $recalled,
285	};	307	};
286		308
287	if ( $c->{not_issued_today} ) {	309	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 189-194 if ($do_it) { Link Here

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