Attachment #124419 for bug #28919

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

Lines 1-6 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc (-1 / +1 lines)
1	[% BLOCK options_for_libraries %]	1	[% BLOCK options_for_libraries %]
2	[% FOREACH l IN libraries %]	2	[% FOREACH l IN libraries %]
3	[% IF l.selected %]	3	[% IF l.branchcode == selected OR l.selected %]
4	<option value="[% prefix \| html %][% l.branchcode \| html %]" selected="selected">[% l.branchname \| html %]</option>	4	<option value="[% prefix \| html %][% l.branchcode \| html %]" selected="selected">[% l.branchname \| html %]</option>
5	[% ELSE %]	5	[% ELSE %]
6	<option value="[% prefix \| html %][% l.branchcode \| html %]">[% l.branchname \| html %]</option>	6	<option value="[% prefix \| html %][% l.branchcode \| html %]">[% l.branchname \| html %]</option>




                            [% UNLESS ( multi_hold ) %]
                                <select name="pickup" id="pickup" data-biblio-id="[% biblio.biblionumber | html %]" data-patron-id="[% patron.borrowernumber | html %]">
                                    [% PROCESS options_for_libraries libraries => Branches.pickup_locations({ search_params => { biblio => biblionumber, patron => patron }, selected => pickup }) %]
                                </select>
                            [% ELSE %]
                                <select name="pickup" id="pickup_multi" data-patron-id="[% patron.borrowernumber | html %]">
                                    [% PROCESS options_for_libraries libraries => multi_pickup_locations, selected => Branches.GetLoggedInBranchcode %]
                                [% FOREACH pickup_location IN multi_pickup_locations %]
                                    <option value="[% pickup_location.branchcode | html %]">[% pickup_location.branchname | html %]</option>
                                [% END %]
                            [% END %]
                                </select>
                            [% END %]
                            </li>

                            [% UNLESS ( multi_hold ) %]

Lines 285-294 $template->param( Link Here

(-)a/reserve/request.pl (-4 / +3 lines)
285	my $patron = Koha::Patrons->find( $borrowernumber_hold );	285	my $patron = Koha::Patrons->find( $borrowernumber_hold );
286		286
287	if ( $patron && $multi_hold ) {	287	if ( $patron && $multi_hold ) {
288	my @multi_pickup_locations =	288	my $multi_pickup_locations =
289	Koha::Biblios->search( { biblionumber => \@biblionumbers } )	289	Koha::Biblios->search( { biblionumber => \@biblionumbers } )
290	->pickup_locations( { patron => $patron } );	290	->pickup_locations( { patron => $patron } )->unblessed;
291	$template->param( multi_pickup_locations => \@multi_pickup_locations );	291	$template->param( multi_pickup_locations => $multi_pickup_locations );
292	}	292	}
293		293
294	my $logged_in_patron = Koha::Patrons->find( $borrowernumber );	294	my $logged_in_patron = Koha::Patrons->find( $borrowernumber );
295	-

Return to bug 28919

Lines 465-478 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-5 / +3 lines)
465	[% UNLESS ( multi_hold ) %]	465	[% UNLESS ( multi_hold ) %]
466	<select name="pickup" id="pickup" data-biblio-id="[% biblio.biblionumber \| html %]" data-patron-id="[% patron.borrowernumber \| html %]">	466	<select name="pickup" id="pickup" data-biblio-id="[% biblio.biblionumber \| html %]" data-patron-id="[% patron.borrowernumber \| html %]">
467	[% PROCESS options_for_libraries libraries => Branches.pickup_locations({ search_params => { biblio => biblionumber, patron => patron }, selected => pickup }) %]	467	[% PROCESS options_for_libraries libraries => Branches.pickup_locations({ search_params => { biblio => biblionumber, patron => patron }, selected => pickup }) %]
		468	</select>
468	[% ELSE %]	469	[% ELSE %]
469	<select name="pickup" id="pickup_multi" data-patron-id="[% patron.borrowernumber \| html %]">	470	<select name="pickup" id="pickup_multi" data-patron-id="[% patron.borrowernumber \| html %]">
470	<option value="" selected="selected"></option>	471	[% PROCESS options_for_libraries libraries => multi_pickup_locations, selected => Branches.GetLoggedInBranchcode %]
471	[% FOREACH pickup_location IN multi_pickup_locations %]
472	<option value="[% pickup_location.branchcode \| html %]">[% pickup_location.branchname \| html %]</option>
473	[% END %]
474	[% END %]
475	</select>	472	</select>
		473	[% END %]
476	</li>	474	</li>
477		475
478	[% UNLESS ( multi_hold ) %]	476	[% UNLESS ( multi_hold ) %]