Attachment #91708 for bug #22284

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

Lines 211-217 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-1 / +11 lines)
211	<li>	211	<li>
212	<label for="pickup">Pickup at:</label>	212	<label for="pickup">Pickup at:</label>
213	<select name="pickup" size="1" id="pickup">	213	<select name="pickup" size="1" id="pickup">
214	[% PROCESS options_for_libraries libraries => Branches.all({ selected => pickup, search_params => { pickup_location => 1 } }) %]	214	[% UNLESS ( multi_hold ) %]
		215	[% PROCESS options_for_libraries libraries => Branches.pickup_locations({ search_params => { biblio => biblionumber, patron => patron }, selected => pickup }) %]
		216	[% ELSE %]
		217	[% PROCESS options_for_libraries libraries => Branches.all({ selected => pickup, search_params => { pickup_location => 1 } }) %]
		218	[% END %]
215	</select>	219	</select>
216	</li>	220	</li>
217		221
Lines 314-319 Link Here
314	<th>Vol no.</th>	318	<th>Vol no.</th>
315	[% END %]	319	[% END %]
316	<th class="title-string">Information</th>	320	<th class="title-string">Information</th>
		321	<th class="title-string">Allowed pickup locations</th>
317	</tr>	322	</tr>
318	</thead>	323	</thead>
319	<tbody>	324	<tbody>
Lines 350-355 Link Here
350	Not holdable	355	Not holdable
351	[% ELSIF itemloo.not_holdable == 'cannotReserveFromOtherBranches' %]	356	[% ELSIF itemloo.not_holdable == 'cannotReserveFromOtherBranches' %]
352	Patron is from different library	357	Patron is from different library
		358	[% ELSIF itemloo.not_holdable == 'branchNotInHoldGroup' %]
		359	Cannot place hold from patrons's library
353	[% ELSIF itemloo.not_holdable == 'itemAlreadyOnHold' %]	360	[% ELSIF itemloo.not_holdable == 'itemAlreadyOnHold' %]
354	Patron already has hold for this item	361	Patron already has hold for this item
355	[% ELSIF itemloo.not_holdable == 'cannotBeTransferred' %]	362	[% ELSIF itemloo.not_holdable == 'cannotBeTransferred' %]
Lines 438-443 Link Here
438	<span class="nfl">Not for loan ([% AuthorisedValues.GetByCode( 'NOT_LOAN', itemloo.notforloan ) \| html %])</span>	445	<span class="nfl">Not for loan ([% AuthorisedValues.GetByCode( 'NOT_LOAN', itemloo.notforloan ) \| html %])</span>
439	[% END %]	446	[% END %]
440	</td>	447	</td>
		448	<td>
		449	[% itemloo.pickup_locations \| html %]
		450	</td>
441	</tr>	451	</tr>
442	[% END %] <!--UNLESS item hide-->	452	[% END %] <!--UNLESS item hide-->
443	[% END %] <!-- itemloop -->	453	[% END %] <!-- itemloop -->

Lines 227-233 foreach my $biblionumber (@biblionumbers) { Link Here

(-)a/reserve/request.pl (-3 / +7 lines)
227	my $force_hold_level;	227	my $force_hold_level;
228	if ( $patron ) {	228	if ( $patron ) {
229	{ # CanBookBeReserved	229	{ # CanBookBeReserved
230	my $canReserve = CanBookBeReserved( $patron->borrowernumber, $biblionumber, $pickup );	230	my $canReserve = CanBookBeReserved( $patron->borrowernumber, $biblionumber );
231	if ( $canReserve->{status} eq 'OK' ) {	231	if ( $canReserve->{status} eq 'OK' ) {
232		232
233	#All is OK and we can continue	233	#All is OK and we can continue
Lines 477-483 foreach my $biblionumber (@biblionumbers) { Link Here
477		477
478	$item->{'holdallowed'} = $branchitemrule->{'holdallowed'};	478	$item->{'holdallowed'} = $branchitemrule->{'holdallowed'};
479		479
480	my $can_item_be_reserved = CanItemBeReserved( $patron->borrowernumber, $itemnumber, $pickup );	480	my $can_item_be_reserved = CanItemBeReserved( $patron->borrowernumber, $itemnumber );
481	$item->{not_holdable} = $can_item_be_reserved->{status} unless ( $can_item_be_reserved->{status} eq 'OK' );	481	$item->{not_holdable} = $can_item_be_reserved->{status} unless ( $can_item_be_reserved->{status} eq 'OK' );
482		482
483	$item->{item_level_holds} = Koha::IssuingRules->get_opacitemholds_policy( { item => $item_object, patron => $patron } );	483	$item->{item_level_holds} = Koha::IssuingRules->get_opacitemholds_policy( { item => $item_object, patron => $patron } );
Lines 491-496 foreach my $biblionumber (@biblionumbers) { Link Here
491	{	491	{
492	$item->{available} = 1;	492	$item->{available} = 1;
493	$num_available++;	493	$num_available++;
		494	if($branchitemrule->{'hold_fulfillment_policy'} eq 'any' ) {
		495	$item->{pickup_locations} = 'Any library';
		496	} else {
		497	$item->{pickup_locations} = join (', ', map { $_->{branchname} } Koha::Items->find($itemnumber)->pickup_locations());
		498	}
494		499
495	push( @available_itemtypes, $item->{itype} );	500	push( @available_itemtypes, $item->{itype} );
496	}	501	}
497	-

Return to bug 22284