Attachment #150488 for bug #31391

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




    if ( $rank eq "del" ) {
        $hold->cancel({ cancellation_reason => $cancellation_reason });
    }
    elsif ( $rank eq "recall" ) {
        if ( !$biblionumber ) {
            $biblionumber = $hold->biblionumber;
        }
        my $biblio = Koha::Biblios->find( $biblionumber );
        if ( !$borrowernumber ) {
            $borrowernumber = $hold->borrowernumber;
        }
        my $patron = Koha::Patrons->find( $borrowernumber );
        if ( $hold->item_level_hold ) {
            if ( $hold->item->can_be_recalled({ patron => $patron, hold_convert => 1 }) ) {
                my ( $recall, $due_interval, $due_date ) = Koha::Recalls->add_recall({
                    patron => $patron,
                    biblio => $biblio,
                    branchcode => $branchcode,
                    expirationdate => $date,
                    interface => 'intranet',
                    item => $hold->item,
                });
                $hold->cancel({ cancellation_reason => 'RECALLED' });
            }
        } else {
            if ( $biblio->can_be_recalled({ patron => $patron, hold_convert => 1 }) ) {
                my ( $recall, $due_interval, $due_date ) = Koha::Recalls->add_recall({
                    patron => $patron,
                    biblio => $biblio,
                    branchcode => $branchcode,
                    expirationdate => $date,
                    interface => 'intranet',
                });
                $hold->cancel({ cancellation_reason => 'RECALLED' });
            }
        }
    }
    elsif ($hold->found && $hold->priority eq '0' && $date) {
        logaction( 'HOLDS', 'MODIFY', $hold->reserve_id, $hold )
            if C4::Context->preference('HoldsLog');

Lines 1402-1407 sub recalls { Link Here

(-)a/Koha/Biblio.pm (-1 / +3 lines)
1402		1402
1403	Does biblio-level checks and returns the items attached to this biblio that are available for recall	1403	Does biblio-level checks and returns the items attached to this biblio that are available for recall
1404		1404
		1405	if hold_convert $param is included, this is to say that this a check to convert a hold to a recall, so we should not check for an existing hold.
		1406
1405	=cut	1407	=cut
1406		1408
1407	sub can_be_recalled {	1409	sub can_be_recalled {
Lines 1427-1433 sub can_be_recalled { Link Here
1427	my @all_itemnumbers;	1429	my @all_itemnumbers;
1428	foreach my $item ( @all_items ) {	1430	foreach my $item ( @all_items ) {
1429	push( @all_itemnumbers, $item->itemnumber );	1431	push( @all_itemnumbers, $item->itemnumber );
1430	if ( $item->can_be_recalled({ patron => $patron }) ) {	1432	if ( $item->can_be_recalled({ patron => $patron, hold_convert => $params->{hold_convert} }) ) {
1431	push( @itemtypes, $item->effective_itemtype );	1433	push( @itemtypes, $item->effective_itemtype );
1432	push( @itemnumbers, $item->itemnumber );	1434	push( @itemnumbers, $item->itemnumber );
1433	push( @items, $item );	1435	push( @items, $item );

Lines 1872-1877 sub recall { Link Here

(-)a/Koha/Item.pm (-1 / +5 lines)
1872		1872
1873	Does item-level checks and returns if items can be recalled by this borrower	1873	Does item-level checks and returns if items can be recalled by this borrower
1874		1874
		1875	if hold_convert $param is included, this is to say that this a check to convert a hold to a recall, so we should not check for an existing hold.
		1876
1875	=cut	1877	=cut
1876		1878
1877	sub can_be_recalled {	1879	sub can_be_recalled {
Lines 1923-1929 sub can_be_recalled { Link Here
1923	return 0 if ( Koha::Checkouts->search({ itemnumber => $self->itemnumber, borrowernumber => $patron->borrowernumber })->count > 0 );	1925	return 0 if ( Koha::Checkouts->search({ itemnumber => $self->itemnumber, borrowernumber => $patron->borrowernumber })->count > 0 );
1924		1926
1925	# check if this patron has already reserved this item	1927	# check if this patron has already reserved this item
1926	return 0 if ( Koha::Holds->search({ itemnumber => $self->itemnumber, borrowernumber => $patron->borrowernumber })->count > 0 );	1928	unless ( $params->{hold_convert} ) {
		1929	return 0 if ( Koha::Holds->search({ itemnumber => $self->itemnumber, borrowernumber => $patron->borrowernumber })->count > 0 );
		1930	}
1927	}	1931	}
1928		1932
1929	# check item availability	1933	# check item availability

Lines 70-75 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc (+6 lines)
70	<option value="[% hold.priority \| html %]" selected="selected">[% this_priority \| html %]</option>	70	<option value="[% hold.priority \| html %]" selected="selected">[% this_priority \| html %]</option>
71	[% END %]	71	[% END %]
72	<option value="del">del</option>	72	<option value="del">del</option>
		73	[% IF Koha.Preference('UseRecalls') AND Koha.Preference('RecallsInterface') != 'opac' %]
		74	<option value="recall">recall</option>
		75	[% END %]
73	</select>	76	</select>
74	[% ELSE %]	77	[% ELSE %]
75	<input type="hidden" name="rank-request" class="rank-request" value="[% hold.priority \| html %]" data-hold-id="[% hold.reserve_id \| html %]">	78	<input type="hidden" name="rank-request" class="rank-request" value="[% hold.priority \| html %]" data-hold-id="[% hold.reserve_id \| html %]">
Lines 85-90 Link Here
85	[% ELSE %]	88	[% ELSE %]
86	<option value="[% hold.priority \| html %]" selected="selected">[% this_priority \| html %]</option>	89	<option value="[% hold.priority \| html %]" selected="selected">[% this_priority \| html %]</option>
87	[% END %]	90	[% END %]
		91	[% IF Koha.Preference('UseRecalls') AND Koha.Preference('RecallsInterface') != 'opac' %]
		92	<option value="recall">recall</option>
		93	[% END %]
88	</select>	94	</select>
89	[% END %]	95	[% END %]
90	[% ELSE %]	96	[% ELSE %]

Lines 2-9 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/request.tt (-17 / +246 lines)
2	[% USE Asset %]	2	[% USE Asset %]
3	[% USE Koha %]	3	[% USE Koha %]
4	[% USE KohaDates %]	4	[% USE KohaDates %]
		5	[% USE TablesSettings %]
		6	[% USE Branches %]
		7	[% USE Categories %]
		8	[% USE AuthorisedValues %]
		9	[% USE ItemTypes %]
5	[% SET footerjs = 1 %]	10	[% SET footerjs = 1 %]
6	[% INCLUDE 'doc-head-open.inc' %]	11	[% INCLUDE 'doc-head-open.inc' %]
		12	[% SET libraries = Branches.all %]
		13	[% SET categories = Categories.all.unblessed %]
		14	[% SET columns = ['name', 'cardnumber', 'dateofbirth', 'category', 'branch', 'address', 'phone'] %]
		15	[% PROCESS "patron-search.inc" %]
7	<title>Confirm recalls &rsaquo; Recalls &rsaquo; Koha</title>	16	<title>Confirm recalls &rsaquo; Recalls &rsaquo; Koha</title>
8	[% INCLUDE 'doc-head-close.inc' %]	17	[% INCLUDE 'doc-head-close.inc' %]
9	</head>	18	</head>
Lines 12-47 Link Here
12	[% INCLUDE 'circ-search.inc' %]	21	[% INCLUDE 'circ-search.inc' %]
13	[% END %]	22	[% END %]
14		23
15	<div id="breadcrumbs">	24	<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
16	<a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;	25	<ol>
17	<a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> &rsaquo;	26	<li>
18	<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.biblionumber \| uri %]">[% biblio.title \| html %]</a> &rsaquo;	27	<a href="/cgi-bin/koha/mainpage.pl">Home</a>
19	Confirm recalls on [% biblio.title \| html %]	28	</li>
20	</div>	29	<li>
		30	<a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>
		31	</li>
		32	<li>
		33	[% INCLUDE 'biblio-title.inc' link =1 %]
		34	</li>
		35	<li>
		36	<a href="#" aria-current="page">
		37	Place a recall
		38	</a>
		39	</li>
		40	</ol>
		41	</nav>
21		42
22	<div class="main container-fluid">	43	<div class="main container-fluid">
23	<div class="row">	44	<div class="row">
24	<div class="col-sm-10 col-sm-push-2">	45	<div class="col-sm-10 col-sm-push-2">
25	<main>	46	<main>
26		47
27	<h1>Existing recalls</h1>	48	<h1>Recalls</h1>
28		49
29	[% IF Koha.Preference('UseRecalls') %]	50	<h2>Place a recall on [% INCLUDE 'biblio-title.inc' link = 1 %]</h2>
30	[% IF recalls.count %]	51
31	<form method="post" action="/cgi-bin/koha/recalls/request.pl">	52	[% IF patron %]
32	<input type="hidden" name="op" value="cancel_multiple_recalls">	53
		54	[% IF error %]
		55	<div class="dialog alert">
		56	Unable to place a recall. Check your circulation rules.
		57	</div>
		58	[% END %]
		59
		60	<fieldset class="rows">
		61	<legend>Recall details</legend>
		62	<form id="recallform" action="/cgi-bin/koha/recalls/request.pl" method="post">
33	<input type="hidden" name="biblionumber" value="[% biblio.biblionumber \| html %]">	63	<input type="hidden" name="biblionumber" value="[% biblio.biblionumber \| html %]">
34	<input type="checkbox" id="select_all"> <span id="select_all_text">Select all</span>	64
35	[% INCLUDE 'recalls.inc' %]	65	<ol>
		66	<li>
		67	<label for="borrowernumber">Patron:</label> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber \| uri %]">[% INCLUDE 'patron-title.inc' %]</a>
		68	<input type="hidden" name="borrowernumber" value="[% patron.borrowernumber \| html %]">
		69	</li>
		70
		71	[% UNLESS ( single_branch_mode ) %]<li>
		72	<label for="pickup">Pick up at:</label>
		73	<select name="pickup" id="pickup">
		74	[% FOREACH branch IN branches %]
		75	[% IF branch.branchcode == patron.branchcode %]
		76	<option value="[% branch.branchcode \| html %]" selected>[% Branches.GetName( branch.branchcode ) \| html %]</option>
		77	[% ELSE %]
		78	<option value="[% branch.branchcode \| html %]">[% Branches.GetName( branch.branchcode ) \| html %]</option>
		79	[% END %]
		80	[% END %]
		81	</select>
		82	</li>[% END %]
		83
		84	<li>
		85	<label for="expirationdate">Recall not needed after:</label> <input type="text" name="expirationdate" id="expirationdate" size="20" class="flatpickr">
		86	</li>
		87	<li>
		88	<label for="type">Recall next available item</label> <input type="checkbox" name="type" id="type" checked>
		89	</li>
		90	</ol>
		91
		92	<fieldset class="action">
		93	<input type="hidden" name="op" value="request">
		94	<input type="hidden" name="biblionumber" value="[% biblio.biblionumber \| html %]">
		95	[% IF error %]
		96	<input type="submit" class="btn btn-default" value="Place recall" disabled="disabled">
		97	[% ELSE %]
		98	<input type="submit" class="btn btn-default" value="Place recall">
		99	[% END %]
		100	<a href="/cgi-bin/koha/recalls/request.pl?biblionumber=[% biblio.biblionumber \| uri %]" class="cancel">Cancel</a>
		101	</fieldset>
		102
		103	<table id="items">
		104	<caption>Place a recall on a specific item</caption>
		105	<thead>
		106	<tr>
		107	<th> </th>
		108	<th>Item type</th>
		109	<th>Barcode</th>
		110	[% UNLESS ( single_branch_mode ) %]
		111	<th>Home library</th>
		112	<th>Last location</th>
		113	[% END %]
		114	<th>Collection</th>
		115	<th>Call number</th>
		116	<th>Copy number</th>
		117	<th>Vol no.</th>
		118	<th>Information</th>
		119	</tr>
		120	</thead>
		121	<tbody>
		122	[% FOREACH item IN items %]<tr>
		123	<td>
		124	[% IF item.can_be_recalled( patron => patron ) %]
		125	<input type="radio" class="itemnumber" name="itemnumber" value="[% item.itemnumber \| html %]">
		126	[% ELSE %]
		127	<span class="error">
		128	<i class="fa fa-times fa-lg" title="Cannot be recalled"></i>
		129	</span>
130	[% END %]
131	</td>
132	<td>[% ItemTypes.GetDescription( item.effective_itemtype ) \| html %]</td>
133	<td>[% item.barcode \| html %]</td>
134	[% UNLESS ( single_branch_mode ) %]
135	<td>[% Branches.GetName( item.homebranch ) \| html %]</td>
136	<td>[% Branches.GetName( item.holdingbranch) \| html %]</td>
137	[% END %]
138	<td>[% AuthorisedValues.GetByCode( 'CCODE', item.ccode, 1 ) \| html %]</td>
139	<td>[% item.itemcallnumber \| html %]</td>
140	<td>[% item.copynumber \| html %]</td>
141	<td>[% item.enumchron \| html %]</td>
142	<td>
143	[% IF ( item.checkout ) %]
144	<span class="checkedout">Due [% item.checkout.date_due \| $KohaDates %]</span>
145	[% ELSIF ( item.get_transfer ) %]
146	<span class="intransit">In transit from [% Branches.GetName( item.get_transfer.frombranch ) \| html %] to [% Branches.GetName( item.get_transfer.tobranch ) \| html %] since [% item.get_transfer.datesent \| $KohaDates %]</span>
147	[% END %]
148	[% IF ( item.itemlost \|\| item.withdrawn ) %]
149	<span class="lost">Unavailable (lost or missing)</span>
150	[% END %]
151	[% IF ( item.notforloan ) %]
152	<span class="notforloan">Not for loan ([% item.notforloan \| html %])</span>
153	[% END %]
154	[% hold = item.current_holds.next %]
155	[% IF ( item.recall ) %]
156	<span class="waiting">
157	[% IF ( item.recall.waiting_date ) %]
158	Waiting for patron at [% Branches.GetName( item.recall.pickup_library_id ) \| html %] since [% item.recall.waiting_date \| $KohaDates %].
159	[% ELSIF ( item.recall.item_id == item.itemnumber ) %]
160	Recalled by patron expected at [% Branches.GetName( item.recall.pickup_library_id ) \| html %] since [% item.recall.created_date \| $KohaDates %].
161	[% END %]
162	</span>
163	[% ELSIF ( hold.waitingdate ) %]
164	<span class="waiting">
165	Waiting for patron at [% Branches.GetName( hold.branchcode ) \| html %] since [% hold.waitingdate \| $KohaDates %].
166	</span>
167	[% ELSIF ( hold.borrowernumber == logged_in_user.borrowernumber ) %]
168	<span class="waiting">
169	Patron has already placed a <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% patron.borrowernumber \| uri %]#reserves">reserve</a> on this item.
170	</span>
171	[% END # / IF ( item.recall or hold ) %]
172	</td>
173	</tr>[% END %]
174	</tbody>
175	</table>
176
36	<fieldset class="action">	177	<fieldset class="action">
37	<button type="submit" id="cancel_selected" class="btn btn-default btn-sm">Cancel selected recalls</button>	178	<input type="hidden" name="op" value="request">
		179	<input type="hidden" name="biblionumber" value="[% biblio.biblionumber \| html %]">
		180	[% IF error %]
		181	<input type="submit" class="btn btn-default" value="Place recall" disabled="disabled">
		182	[% ELSE %]
		183	<input type="submit" class="btn btn-default" value="Place recall">
		184	[% END %]
		185	<a href="/cgi-bin/koha/recalls/request.pl?biblionumber=[% biblio.biblionumber \| uri %]" class="cancel">Cancel</a>
38	</fieldset>	186	</fieldset>
39	</form>	187	</form>
		188
		189	</fieldset>
		190
		191	[% ELSE %]
		192
		193	[% IF Koha.Preference('RecallsInterface') == 'opac' %]
		194	<div class="dialog alert">
		195	Due to the <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=RecallsInterface">RecallsInterface system preference</a>, recalls cannot be placed through the staff client.
		196	</div>
40	[% ELSE %]	197	[% ELSE %]
41	<div class="dialog message">No recalls have been made.</div>	198
		199	<fieldset>
		200	<h2>Search patrons</h2>
		201	<div id="circ_recalls_select" class="toptabs">
		202	<ul class="nav nav-tabs" role="tablist">
		203	<li role="presentation" class="active"><a href="#recalls_patronsearch_pane" aria-controls="recalls_patronsearch_pane" role="tab" data-toggle="tab">Patrons</a></li>
		204	</ul>
		205	<div class="tab-content">
		206	<div id="recalls_patronsearch_pane" role="tabpanel" class="tab-pane active">
		207	[% PROCESS patron_search_filters_simple %]
		208	[% PROCESS patron_search_table table_id => 'table_borrowers', open_on_row_click => 1 %]
		209	</div>
		210	</div> <!-- /.tab-content -->
		211	</div>
		212	</fieldset>
		213
42	[% END %]	214	[% END %]
43	[% ELSE %]	215
44	<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>	216	<h2>Existing recalls</h2>
		217
		218	[% IF Koha.Preference('UseRecalls') %]
		219	[% IF recalls.count %]
		220	<form method="post" action="/cgi-bin/koha/recalls/request.pl">
		221	<input type="hidden" name="op" value="cancel_multiple_recalls">
		222	<input type="checkbox" id="select_all"> <span id="select_all_text">Select all</span>
		223	[% INCLUDE 'recalls.inc' %]
		224	<fieldset class="action">
		225	<button type="submit" id="cancel_selected" class="btn btn-default btn-sm">Cancel selected recalls</button>
		226	</fieldset>
		227	</form>
		228	[% ELSE %]
		229	<div class="dialog message">No recalls have been made.</div>
		230	[% END %]
		231	[% ELSE %]
		232	<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>
		233	[% END %]
		234
45	[% END %]	235	[% END %]
46		236
47	</main>	237	</main>
Lines 60-65 Link Here
60	[% Asset.js("js/recalls.js") \| $raw %]	250	[% Asset.js("js/recalls.js") \| $raw %]
61	[% INCLUDE 'datatables.inc' %]	251	[% INCLUDE 'datatables.inc' %]
62	[% INCLUDE 'columns_settings.inc' %]	252	[% INCLUDE 'columns_settings.inc' %]
		253	[% INCLUDE 'calendar.inc' %]
		254	[% SET url_biblio_params = "biblionumber=" _ biblio.biblionumber %]
		255	[% PROCESS patron_search_js table_id => 'table_borrowers', categories => categories, libraries => libraries, extended_attribute_types => attribute_type_codes, columns => columns, open_on_row_click => 1, on_click_url => '/cgi-bin/koha/recalls/request.pl?' _ url_biblio_params, redirect_if_one_result => 1, redirect_url => '/cgi-bin/koha/recalls/request.pl?' _ url_biblio_params, redirect_if_attribute_equal => 'cardnumber' %]
		256	<script>
		257	table_settings = [% TablesSettings.GetColumns( 'circ', 'circulation', 'table_borrowers', 'json' ) \| $raw %];
		258	$(document).ready(function(){
		259	$("#recalls_patronsearch").on("submit", filter);
		260	[% UNLESS patron %]
		261	[% IF ( PatronAutoComplete ) %]
		262	patron_autocomplete($("#search_patron_filter"), { 'link-to': 'recall', 'url-params': '[% url_biblio_params \| url %]' });
		263	[% END %]
		264	[% END %]
		265	$("#items").dataTable($.extend(true, {}, dataTablesDefaults, {
		266	'bPaginate': false,
		267	"sDom": '<"top pager"ilf>t',
		268	}));
		269
		270	//Override fieldset styling for dataTables search box
		271	$("div.top.pager").css("margin-left","1em");
		272	$(".dataTables_filter label").css({
		273	"width":"auto",
		274	"margin-right":"0em"
		275	});
		276	$("#type").click(function() {
		277	if(this.checked){
		278	$("input[name=itemnumber]").each(function() {
		279	$(this).prop("checked", false);
		280	});
		281	}
		282	});
		283	$("input[name=itemnumber]").click(function() {
		284	$("input[name=itemnumber]").each(function() {
		285	if(this.checked){
		286	$("#type").prop("checked", false);
		287	}
		288	});
		289	});
		290	});
		291	</script>
63	[% END %]	292	[% END %]
64		293
65	[% INCLUDE 'intranet-bottom.inc' %]	294	[% INCLUDE 'intranet-bottom.inc' %]

Lines 219-224 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (+8 lines)
219	<p>No club with this name, please, try another</p>	219	<p>No club with this name, please, try another</p>
220	</div>	220	</div>
221	[% END %]	221	[% END %]
		222
		223	[% IF ( recallerror ) %]
		224	<div class="dialog alert">
		225	<h3>Hold cannot be converted to a recall</h3>
		226	<p>A recall cannot be placed on one or more holds. Check your <a href="/cgi-bin/koha/admin/smart-rules.pl">circulation and fine rules</a>.</p>
		227	</div>
		228	[% END %]
		229
222	<fieldset>	230	<fieldset>
223	[% UNLESS multi_hold %]	231	[% UNLESS multi_hold %]
224	[% IF clubcount %]	232	[% IF clubcount %]

Lines 71-77 function patron_autocomplete(node, options) { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/patron-autocomplete.js (-1 / +3 lines)
71	? "/cgi-bin/koha/circ/circulation.pl"	71	? "/cgi-bin/koha/circ/circulation.pl"
72	: link_to == 'reserve'	72	: link_to == 'reserve'
73	? "/cgi-bin/koha/reserve/request.pl"	73	? "/cgi-bin/koha/reserve/request.pl"
74	: "/cgi-bin/koha/members/moremember.pl";	74	: link_to == 'recall'
		75	? "/cgi-bin/koha/recalls/request.pl"
		76	: "/cgi-bin/koha/members/moremember.pl";
75	item.link += ( url_params ? '?' + url_params + '&' : "?" ) + 'borrowernumber=' + item.patron_id;	77	item.link += ( url_params ? '?' + url_params + '&' : "?" ) + 'borrowernumber=' + item.patron_id;
76	} else {	78	} else {
77	item.link = null;	79	item.link = null;




my $biblionumber = $query->param('biblionumber');
my $biblio = Koha::Biblios->find( $biblionumber );

if ($op eq 'cancel'){
    my $recall_id = $query->param('recall_id');
    Koha::Recalls->find( $recall_id )->set_cancelled;
    print $query->redirect('/cgi-bin/koha/opac-user.pl');
}

if ( C4::Context->preference('UseRecalls') and C4::Context->preference('RecallsInterface') ne 'staff' ) {

    my $patron = Koha::Patrons->find( $borrowernumber );

                $error = 'failed';
            }
        }
    } elsif ($op eq 'cancel'){
        my $recall_id = $query->param('recall_id');
        Koha::Recalls->find( $recall_id )->set_cancelled;
        print $query->redirect('/cgi-bin/koha/opac-user.pl');
    }

    my $branches = Koha::Libraries->search();




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

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

    if ( C4::Context->preference('UseRecalls') and C4::Context->preference('RecallsInterface') ne 'opac' and $borrowernumber ) {
        my $patron = Koha::Patrons->find( $borrowernumber );

        unless ( $biblio->can_be_recalled({ patron => $patron }) ) { $error = 'unavailable'; }
        my $items = Koha::Items->search({ biblionumber => $biblionumber })->as_list;

        # check if already recalled
        my $recalled = $biblio->recalls->filter_by_current->search({ patron_id => $borrowernumber })->count;
        if ( defined $recalled and $recalled > 0 ) {
            my $recalls_per_record = Koha::CirculationRules->get_effective_rule({
                categorycode => $patron->categorycode,
                branchcode => undef,
                itemtype => undef,
                rule_name => 'recalls_per_record'
            });
            if ( defined $recalls_per_record and $recalls_per_record->rule_value and $recalled >= $recalls_per_record->rule_value ){
                $error = 'duplicate';
            }
        }

        if ( !defined $error ){
            my $pickuploc = $input->param('pickup');
            my $expdate = $input->param('expirationdate');
            my $level = $input->param('type');
            my $itemnumber = $input->param('itemnumber');

            my ( $recall, $due_interval, $due_date );

            if ( !defined $level and defined $itemnumber ) {
                my $item = Koha::Items->find( $itemnumber );
                if ( $item->can_be_recalled({ patron => $patron }) ) {
                    ( $recall, $due_interval, $due_date ) = Koha::Recalls->add_recall({
                        patron => $patron,
                        biblio => $biblio,
                        branchcode => $pickuploc,
                        item => $item,
                        expirationdate => $expdate,
                        interface => 'staff',
                    });
                } else {
                    $error = 'cannot';
                }
            } else {
                if ( $biblio->can_be_recalled({ patron => $patron }) ) {
                    ( $recall, $due_interval, $due_date ) = Koha::Recalls->add_recall({
                        patron => $patron,
                        biblio => $biblio,
                        branchcode => $pickuploc,
                        expirationdate => $expdate,
                        interface => 'staff',
                    });
                } else {
                    $error = 'cannot';
                }
            }
            if ( !defined $recall ) {
                $error = 'failed';
            } else {
                # successful recall, go back to Recalls tab
                print $input->redirect("/cgi-bin/koha/recalls/request.pl?biblionumber=$biblionumber");
            }
        }
    }
}

if ( $borrowernumber ) {
    my $patron = Koha::Patrons->find( $borrowernumber );

    if ( C4::Context->preference('UseRecalls') and C4::Context->preference('RecallsInterface') ne 'opac' and $patron and $patron->borrowernumber ) {
        if ( !$biblio->can_be_recalled({ patron => $patron }) ) {
            $error = 1;
        }

        $template->param(
            patron => $patron,
        );
    }
}

my $recalls = Koha::Recalls->search({ biblio_id => $biblionumber, completed => 0 });
my $branches = Koha::Libraries->search;
my $single_branch_mode = $branches->count == 1;
my $items = Koha::Items->search({ biblionumber => $biblionumber });

$template->param(
    recalls     => $recalls,
    recallsview => 1,
    biblio      => $biblio,
    checkboxes  => 1,
    branches    => $branches,
    items       => $items,
    error       => $error,
    single_branch_mode => $single_branch_mode,
    C4::Search::enabled_staff_search_views,
    attribute_type_codes => ( C4::Context->preference('ExtendedPatronAttributes')
        ? [ Koha::Patron::Attribute::Types->search( { staff_searchable => 1 } )->get_column('code') ]
        : []
    ),
);

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

Lines 46-51 my @branch = $query->multi_param('pickup'); Link Here

(-)a/reserve/modrequest.pl (-1 / +13 lines)
46	my @itemnumber = $query->multi_param('itemnumber');	46	my @itemnumber = $query->multi_param('itemnumber');
47	my @biblionumber = $query->multi_param('biblionumber');	47	my @biblionumber = $query->multi_param('biblionumber');
48	my $count=@rank;	48	my $count=@rank;
		49	my $recallerror;
49		50
50	@biblionumber = uniq @biblionumber;	51	@biblionumber = uniq @biblionumber;
51		52
Lines 80-85 else { Link Here
80	$params->{reservedate} = $reservedates[$i] \|\| undef;	81	$params->{reservedate} = $reservedates[$i] \|\| undef;
81	}	82	}
82		83
		84	if ( $rank[$i] eq 'recall' and !$recallerror ) {
		85	my $hold = Koha::Holds->find( $reserve_id[$i] );
		86	if ( !$hold->biblio->can_be_recalled({ patron => $hold->patron }) ) {
		87	$recallerror = 1;
		88	}
		89	}
		90
83	try {	91	try {
84	ModReserve($params);	92	ModReserve($params);
85	} catch {	93	} catch {
Lines 106-111 if ( $from eq 'borrower'){ Link Here
106	print $query->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrower[0]");	114	print $query->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrower[0]");
107	} else {	115	} else {
108	my $url = URI->new("/cgi-bin/koha/reserve/request.pl");	116	my $url = URI->new("/cgi-bin/koha/reserve/request.pl");
109	$url->query_form( biblionumber => [@biblionumber]);	117	if ( $recallerror ) {
		118	$url->query_form( biblionumber => [@biblionumber], recallerror => 1 );
		119	} else {
		120	$url->query_form( biblionumber => [@biblionumber] );
		121	}
110	print $query->redirect($url);	122	print $query->redirect($url);
111	}	123	}

Lines 719-724 $template->param( pickup => $pickup \|\| C4::Context->userenv->{branch} ); Link Here

(-)a/reserve/request.pl (+5 lines)
719		719
720	$template->param(borrowernumber => $borrowernumber_hold);	720	$template->param(borrowernumber => $borrowernumber_hold);
721		721
		722	my $recallerror = $input->param('recallerror');
		723	if ( $recallerror ) {
		724	$template->param( recallerror => 1 );
		725	}
		726
722	# printout the page	727	# printout the page
723	output_html_with_http_headers $input, $cookie, $template->output;	728	output_html_with_http_headers $input, $cookie, $template->output;
724		729





    $schema->storage->txn_rollback;
};

subtest 'ModReserve to convert a hold to a recall' => sub {
    plan tests => 2;

    $schema->storage->txn_begin;

    my $category = $builder->build({ source => 'Category' });
    my $branch = $builder->build({ source => 'Branch' })->{ branchcode };
    my $biblio = $builder->build_sample_biblio( { itemtype => 'DUMMY' } );
    my $item = $builder->build_sample_item(
        { library => $branch, biblionumber => $biblio->biblionumber } );

    my $patron = Koha::Patron->new(
        {
            firstname    => 'my firstname',
            surname      => 'whatever surname',
            categorycode => $category->{categorycode},
            branchcode   => $branch,
        }
    )->store;
    my $borrowernumber = $patron->borrowernumber;

    my $patron2 = Koha::Patron->new(
        {
            firstname    => 'my firstname',
            surname      => 'whatever surname',
            categorycode => $category->{categorycode},
            branchcode   => $branch,
        }
    )->store;

    t::lib::Mocks::mock_preference("UseRecalls", 1);
    t::lib::Mocks::mock_userenv( { branchcode => $branch } );

    C4::Circulation::AddIssue( $patron2->unblessed, $item->barcode );

    Koha::CirculationRules->set_rules({
        branchcode => undef,
        categorycode => undef,
        itemtype => undef,
        rules => {
            recalls_allowed => 5,
            recalls_per_record => 1,
            on_shelf_recalls => 'any',
        },
    });

    my $reserve_id = AddReserve(
        {
            branchcode     => $branch,
            borrowernumber => $borrowernumber,
            biblionumber   => $biblio->biblionumber,
            priority       =>
              C4::Reserves::CalculatePriority( $biblio->biblionumber ),
            itemnumber => $item->id,
        }
    );

    my $hold = Koha::Holds->find($reserve_id);
    my $before_recalls = Koha::Recalls->search->filter_by_current->count;

    ModReserve(
        {
            reserve_id     => $hold->id,
            expirationdate => '1981-06-10',
            priority       => 99,
            rank           => "recall",
            itemnumber     => $item->id,
        }
    );

    $hold = Koha::Holds->find($reserve_id);
    my $after_recalls = Koha::Recalls->search->filter_by_current->count;

    ok( !defined $hold, 'Hold was cancelled' );
    is( $after_recalls, $before_recalls + 1, 'Recall count increased by 1 as hold was converted to a recall' );

    $schema->storage->txn_rollback;
};

Return to bug 31391

Lines 1119-1124 sub ModReserve { Link Here

(-)a/C4/Reserves.pm (+34 lines)
1119	if ( $rank eq "del" ) {	1119	if ( $rank eq "del" ) {
1120	$hold->cancel({ cancellation_reason => $cancellation_reason });	1120	$hold->cancel({ cancellation_reason => $cancellation_reason });
1121	}	1121	}
		1122	elsif ( $rank eq "recall" ) {
		1123	if ( !$biblionumber ) {
		1124	$biblionumber = $hold->biblionumber;
		1125	}
		1126	my $biblio = Koha::Biblios->find( $biblionumber );
		1127	if ( !$borrowernumber ) {
		1128	$borrowernumber = $hold->borrowernumber;
		1129	}
		1130	my $patron = Koha::Patrons->find( $borrowernumber );
		1131	if ( $hold->item_level_hold ) {
		1132	if ( $hold->item->can_be_recalled({ patron => $patron, hold_convert => 1 }) ) {
		1133	my ( $recall, $due_interval, $due_date ) = Koha::Recalls->add_recall({
		1134	patron => $patron,
		1135	biblio => $biblio,
		1136	branchcode => $branchcode,
		1137	expirationdate => $date,
		1138	interface => 'intranet',
		1139	item => $hold->item,
		1140	});
		1141	$hold->cancel({ cancellation_reason => 'RECALLED' });
		1142	}
		1143	} else {
		1144	if ( $biblio->can_be_recalled({ patron => $patron, hold_convert => 1 }) ) {
		1145	my ( $recall, $due_interval, $due_date ) = Koha::Recalls->add_recall({
		1146	patron => $patron,
		1147	biblio => $biblio,
		1148	branchcode => $branchcode,
		1149	expirationdate => $date,
		1150	interface => 'intranet',
		1151	});
		1152	$hold->cancel({ cancellation_reason => 'RECALLED' });
		1153	}
		1154	}
		1155	}
1122	elsif ($hold->found && $hold->priority eq '0' && $date) {	1156	elsif ($hold->found && $hold->priority eq '0' && $date) {
1123	logaction( 'HOLDS', 'MODIFY', $hold->reserve_id, $hold )	1157	logaction( 'HOLDS', 'MODIFY', $hold->reserve_id, $hold )
1124	if C4::Context->preference('HoldsLog');	1158	if C4::Context->preference('HoldsLog');

Lines 1812-1814 subtest 'Koha::Holds->get_items_that_can_fill returns items with datecancelled o Link Here

(-)a/t/db_dependent/Holds.t (-1 / +79 lines)
1812		1812
1813	$schema->storage->txn_rollback;	1813	$schema->storage->txn_rollback;
1814	};	1814	};
1815	-	1815
		1816	subtest 'ModReserve to convert a hold to a recall' => sub {
		1817	plan tests => 2;
		1818
		1819	$schema->storage->txn_begin;
		1820
		1821	my $category = $builder->build({ source => 'Category' });
		1822	my $branch = $builder->build({ source => 'Branch' })->{ branchcode };
		1823	my $biblio = $builder->build_sample_biblio( { itemtype => 'DUMMY' } );
		1824	my $item = $builder->build_sample_item(
		1825	{ library => $branch, biblionumber => $biblio->biblionumber } );
		1826
		1827	my $patron = Koha::Patron->new(
		1828	{
		1829	firstname => 'my firstname',
		1830	surname => 'whatever surname',
		1831	categorycode => $category->{categorycode},
		1832	branchcode => $branch,
		1833	}
		1834	)->store;
		1835	my $borrowernumber = $patron->borrowernumber;
		1836
		1837	my $patron2 = Koha::Patron->new(
		1838	{
		1839	firstname => 'my firstname',
		1840	surname => 'whatever surname',
		1841	categorycode => $category->{categorycode},
		1842	branchcode => $branch,
		1843	}
		1844	)->store;
		1845
		1846	t::lib::Mocks::mock_preference("UseRecalls", 1);
		1847	t::lib::Mocks::mock_userenv( { branchcode => $branch } );
		1848
		1849	C4::Circulation::AddIssue( $patron2->unblessed, $item->barcode );
		1850
		1851	Koha::CirculationRules->set_rules({
		1852	branchcode => undef,
		1853	categorycode => undef,
		1854	itemtype => undef,
		1855	rules => {
		1856	recalls_allowed => 5,
		1857	recalls_per_record => 1,
		1858	on_shelf_recalls => 'any',
		1859	},
		1860	});
		1861
		1862	my $reserve_id = AddReserve(
		1863	{
		1864	branchcode => $branch,
		1865	borrowernumber => $borrowernumber,
		1866	biblionumber => $biblio->biblionumber,
		1867	priority =>
		1868	C4::Reserves::CalculatePriority( $biblio->biblionumber ),
		1869	itemnumber => $item->id,
		1870	}
		1871	);
		1872
		1873	my $hold = Koha::Holds->find($reserve_id);
		1874	my $before_recalls = Koha::Recalls->search->filter_by_current->count;
		1875
		1876	ModReserve(
		1877	{
		1878	reserve_id => $hold->id,
		1879	expirationdate => '1981-06-10',
1880	priority => 99,
1881	rank => "recall",
1882	itemnumber => $item->id,
1883	}
1884	);
1885
1886	$hold = Koha::Holds->find($reserve_id);
1887	my $after_recalls = Koha::Recalls->search->filter_by_current->count;
1888
1889	ok( !defined $hold, 'Hold was cancelled' );
1890	is( $after_recalls, $before_recalls + 1, 'Recall count increased by 1 as hold was converted to a recall' );
1891
1892	$schema->storage->txn_rollback;
1893	};

Lines 36-41 my $op = $query->param('op') \|\| ''; Link Here

(-)a/opac/opac-recall.pl (-4 / +6 lines)
36	my $biblionumber = $query->param('biblionumber');	36	my $biblionumber = $query->param('biblionumber');
37	my $biblio = Koha::Biblios->find( $biblionumber );	37	my $biblio = Koha::Biblios->find( $biblionumber );
38		38
		39	if ($op eq 'cancel'){
		40	my $recall_id = $query->param('recall_id');
		41	Koha::Recalls->find( $recall_id )->set_cancelled;
		42	print $query->redirect('/cgi-bin/koha/opac-user.pl');
		43	}
		44
39	if ( C4::Context->preference('UseRecalls') and C4::Context->preference('RecallsInterface') ne 'staff' ) {	45	if ( C4::Context->preference('UseRecalls') and C4::Context->preference('RecallsInterface') ne 'staff' ) {
40		46
41	my $patron = Koha::Patrons->find( $borrowernumber );	47	my $patron = Koha::Patrons->find( $borrowernumber );
Lines 112-121 if ( C4::Context->preference('UseRecalls') and C4::Context->preference('RecallsI Link Here
112	$error = 'failed';	118	$error = 'failed';
113	}	119	}
114	}	120	}
115	} elsif ($op eq 'cancel'){
116	my $recall_id = $query->param('recall_id');
117	Koha::Recalls->find( $recall_id )->set_cancelled;
118	print $query->redirect('/cgi-bin/koha/opac-user.pl');
119	}	121	}
120		122
121	my $branches = Koha::Libraries->search();	123	my $branches = Koha::Libraries->search();

Lines 38-64 my ($template, $loggedinuser, $cookie)= get_template_and_user( Link Here

(-)a/recalls/request.pl (-5 / +93 lines)
38	my $op = $input->param('op') \|\| 'list';	38	my $op = $input->param('op') \|\| 'list';
39	my @recall_ids = $input->multi_param('recall_ids');	39	my @recall_ids = $input->multi_param('recall_ids');
40	my $biblionumber = $input->param('biblionumber');	40	my $biblionumber = $input->param('biblionumber');
41	my $recalls = Koha::Recalls->search({ biblio_id => $biblionumber, completed => 0 });
42	my $biblio = Koha::Biblios->find( $biblionumber );	41	my $biblio = Koha::Biblios->find( $biblionumber );
		42	my $borrowernumber = $input->param('borrowernumber');
		43	my $error = $input->param('error');
43		44
44	if ( $op eq 'cancel_multiple_recalls' ) {	45	if ( $op eq 'cancel_multiple_recalls' ) {
45	foreach my $id ( @recall_ids ) {	46	foreach my $id ( @recall_ids ) {
46	Koha::Recalls->find( $id )->set_cancelled;	47	Koha::Recalls->find( $id )->set_cancelled;
47	}	48	}
48	$op = 'list'
49	}	49	}
		50	elsif ( $op eq 'request' ) {
		51
		52	if ( C4::Context->preference('UseRecalls') and C4::Context->preference('RecallsInterface') ne 'opac' and $borrowernumber ) {
		53	my $patron = Koha::Patrons->find( $borrowernumber );
		54
		55	unless ( $biblio->can_be_recalled({ patron => $patron }) ) { $error = 'unavailable'; }
		56	my $items = Koha::Items->search({ biblionumber => $biblionumber })->as_list;
		57
		58	# check if already recalled
		59	my $recalled = $biblio->recalls->filter_by_current->search({ patron_id => $borrowernumber })->count;
		60	if ( defined $recalled and $recalled > 0 ) {
		61	my $recalls_per_record = Koha::CirculationRules->get_effective_rule({
		62	categorycode => $patron->categorycode,
		63	branchcode => undef,
		64	itemtype => undef,
		65	rule_name => 'recalls_per_record'
		66	});
		67	if ( defined $recalls_per_record and $recalls_per_record->rule_value and $recalled >= $recalls_per_record->rule_value ){
		68	$error = 'duplicate';
		69	}
		70	}
		71
		72	if ( !defined $error ){
		73	my $pickuploc = $input->param('pickup');
		74	my $expdate = $input->param('expirationdate');
		75	my $level = $input->param('type');
		76	my $itemnumber = $input->param('itemnumber');
		77
		78	my ( $recall, $due_interval, $due_date );
		79
		80	if ( !defined $level and defined $itemnumber ) {
		81	my $item = Koha::Items->find( $itemnumber );
		82	if ( $item->can_be_recalled({ patron => $patron }) ) {
		83	( $recall, $due_interval, $due_date ) = Koha::Recalls->add_recall({
		84	patron => $patron,
		85	biblio => $biblio,
		86	branchcode => $pickuploc,
		87	item => $item,
		88	expirationdate => $expdate,
		89	interface => 'staff',
		90	});
		91	} else {
		92	$error = 'cannot';
		93	}
		94	} else {
		95	if ( $biblio->can_be_recalled({ patron => $patron }) ) {
		96	( $recall, $due_interval, $due_date ) = Koha::Recalls->add_recall({
		97	patron => $patron,
		98	biblio => $biblio,
		99	branchcode => $pickuploc,
		100	expirationdate => $expdate,
		101	interface => 'staff',
		102	});
		103	} else {
		104	$error = 'cannot';
		105	}
		106	}
		107	if ( !defined $recall ) {
		108	$error = 'failed';
		109	} else {
		110	# successful recall, go back to Recalls tab
		111	print $input->redirect("/cgi-bin/koha/recalls/request.pl?biblionumber=$biblionumber");
		112	}
		113	}
114	}
115	}
116
117	if ( $borrowernumber ) {
118	my $patron = Koha::Patrons->find( $borrowernumber );
119
120	if ( C4::Context->preference('UseRecalls') and C4::Context->preference('RecallsInterface') ne 'opac' and $patron and $patron->borrowernumber ) {
121	if ( !$biblio->can_be_recalled({ patron => $patron }) ) {
122	$error = 1;
123	}
50		124
51	if ( $op eq 'list' ) {	125	$template->param(
52	$recalls = Koha::Recalls->search({ biblio_id => $biblionumber, completed => 0 });	126	patron => $patron,
53	$biblio = Koha::Biblios->find( $biblionumber );	127	);
		128	}
54	}	129	}
55		130
		131	my $recalls = Koha::Recalls->search({ biblio_id => $biblionumber, completed => 0 });
		132	my $branches = Koha::Libraries->search;
		133	my $single_branch_mode = $branches->count == 1;
		134	my $items = Koha::Items->search({ biblionumber => $biblionumber });
		135
56	$template->param(	136	$template->param(
57	recalls => $recalls,	137	recalls => $recalls,
58	recallsview => 1,	138	recallsview => 1,
59	biblio => $biblio,	139	biblio => $biblio,
60	checkboxes => 1,	140	checkboxes => 1,
		141	branches => $branches,
		142	items => $items,
		143	error => $error,
		144	single_branch_mode => $single_branch_mode,
61	C4::Search::enabled_staff_search_views,	145	C4::Search::enabled_staff_search_views,
		146	attribute_type_codes => ( C4::Context->preference('ExtendedPatronAttributes')
		147	? [ Koha::Patron::Attribute::Types->search( { staff_searchable => 1 } )->get_column('code') ]
		148	: []
		149	),
62	);	150	);
63		151
64	output_html_with_http_headers $input, $cookie, $template->output;	152	output_html_with_http_headers $input, $cookie, $template->output;