Attachment #166905 for bug #36871

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

Lines 1136-1145 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-4 / +1 lines)
1136	data-biblio-id="[% biblioloo.biblionumber \| html %]"	1136	data-biblio-id="[% biblioloo.biblionumber \| html %]"
1137	data-patron-id="[% patron.borrowernumber \| html %]"	1137	data-patron-id="[% patron.borrowernumber \| html %]"
1138	data-pickup-locations='[% biblioloo.pickup_locations_codes.json \| $raw %]'>	1138	data-pickup-locations='[% biblioloo.pickup_locations_codes.json \| $raw %]'>
1139	<option value=""></option>	1139	[% PROCESS options_for_libraries libraries => Branches.pickup_locations({ search_params => { biblio => biblionumber, patron => patron }, selected => biblioloo.default_pickup_branch }) %]
1140	[% FOREACH pickup_location IN biblioloo.pickup_locations %]
1141	<option value="[% pickup_location.branchcode \| html %]">[% pickup_location.branchname \| html %]</option>
1142	[% END %]
1143	</select>	1140	</select>
1144	[% END %]	1141	[% END %]
1145	</td>	1142	</td>




                    if ($item->{ccode}) {
                        $itemdata_ccode = 1;
                    }
                    if ( $patron && $multi_hold ) {

                        # Add the valid pickup locations
                        my @pickup_locations = $biblio->pickup_locations( { patron => $patron } )
                            ->search( { branchcode => $default_pickup_branch } )->as_list;
                        $biblioloopiter{default_pickup_branch}       = $default_pickup_branch;
                        $biblioloopiter{pickup_locations}       = \@pickup_locations;
                        $biblioloopiter{pickup_locations_codes} = [ map { $_->branchcode } @pickup_locations ];
                    }
                }

                push @{ $biblioloopiter{itemloop} }, $item;

            $template->param( reserveloop => \@reserveloop );
        }

        if ( $patron && $multi_hold ) {
            # Add the valid pickup locations
            my @pickup_locations = $biblio->pickup_locations({ patron => $patron })->as_list;
            $biblioloopiter{pickup_locations} = \@pickup_locations;
            $biblioloopiter{pickup_locations_codes} = [ map { $_->branchcode } @pickup_locations ];
        }

        $num_bibs_available++ unless $biblioloopiter{none_avail};
        push @biblioloop, \%biblioloopiter;
    }
- 

Return to bug 36871

Lines 565-570 if ( ( $findborrower && $borrowernumber_hold \|\| $findclub && $club_hold ) Link Here

(-)a/reserve/request.pl (-8 / +9 lines)
565	if ($item->{ccode}) {	565	if ($item->{ccode}) {
566	$itemdata_ccode = 1;	566	$itemdata_ccode = 1;
567	}	567	}
		568	if ( $patron && $multi_hold ) {
		569
		570	# Add the valid pickup locations
		571	my @pickup_locations = $biblio->pickup_locations( { patron => $patron } )
		572	->search( { branchcode => $default_pickup_branch } )->as_list;
		573	$biblioloopiter{default_pickup_branch} = $default_pickup_branch;
		574	$biblioloopiter{pickup_locations} = \@pickup_locations;
		575	$biblioloopiter{pickup_locations_codes} = [ map { $_->branchcode } @pickup_locations ];
		576	}
568	}	577	}
569		578
570	push @{ $biblioloopiter{itemloop} }, $item;	579	push @{ $biblioloopiter{itemloop} }, $item;
Lines 692-704 if ( ( $findborrower && $borrowernumber_hold \|\| $findclub && $club_hold ) Link Here
692	$template->param( reserveloop => \@reserveloop );	701	$template->param( reserveloop => \@reserveloop );
693	}	702	}
694		703
695	if ( $patron && $multi_hold ) {
696	# Add the valid pickup locations
697	my @pickup_locations = $biblio->pickup_locations({ patron => $patron })->as_list;
698	$biblioloopiter{pickup_locations} = \@pickup_locations;
699	$biblioloopiter{pickup_locations_codes} = [ map { $_->branchcode } @pickup_locations ];
700	}
701
702	$num_bibs_available++ unless $biblioloopiter{none_avail};	704	$num_bibs_available++ unless $biblioloopiter{none_avail};
703	push @biblioloop, \%biblioloopiter;	705	push @biblioloop, \%biblioloopiter;
704	}	706	}
705	-