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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-2 / +6 lines)
Lines 724-732 Link Here
724
                                                    </td>
724
                                                    </td>
725
                                                    <td>
725
                                                    <td>
726
                                                    [% IF (itemloo.pickup_locations_count > 0) %]
726
                                                    [% IF (itemloo.pickup_locations_count > 0) %]
727
                                                        <select name="item_pickup" class="pickup_locations"
727
                                                        <select name="item_pickup_[% itemloo.itemnumber | html %]" class="pickup_locations"
728
                                                                data-item-id="[% itemloo.itemnumber | html %]"
728
                                                                data-item-id="[% itemloo.itemnumber | html %]"
729
                                                                data-patron-id="[% patron.borrowernumber | html %]"></select>
729
                                                                data-patron-id="[% patron.borrowernumber | html %]">
730
                                                        [% IF (itemloo.default_pickup_location) %]
731
                                                            <option value="[% itemloo.default_pickup_location.branchcode | html %]" selected="selected">[% itemloo.default_pickup_location.branchname | html %]</option>
732
                                                        [% END %]
733
                                                        </select>
730
                                                    [% END %]
734
                                                    [% END %]
731
                                                    </td>
735
                                                    </td>
732
                                                </tr>
736
                                                </tr>
(-)a/reserve/placerequest.pl (-3 / +4 lines)
Lines 45-51 my $biblionumber = $input->param('biblionumber'); Link Here
45
my $borrowernumber = $input->param('borrowernumber');
45
my $borrowernumber = $input->param('borrowernumber');
46
my $notes          = $input->param('notes');
46
my $notes          = $input->param('notes');
47
my $branch         = $input->param('pickup');
47
my $branch         = $input->param('pickup');
48
my $item_pickup    = $input->param('item_pickup');
49
my $startdate      = $input->param('reserve_date') || '';
48
my $startdate      = $input->param('reserve_date') || '';
50
my @rank           = $input->multi_param('rank-request');
49
my @rank           = $input->multi_param('rank-request');
51
my $type           = $input->param('type');
50
my $type           = $input->param('type');
Lines 94-111 if ( $type eq 'str8' && $borrower ) { Link Here
94
        my $can_override = C4::Context->preference('AllowHoldPolicyOverride');
93
        my $can_override = C4::Context->preference('AllowHoldPolicyOverride');
95
        if ( defined $checkitem && $checkitem ne '' ) {
94
        if ( defined $checkitem && $checkitem ne '' ) {
96
95
96
            my $item_pickup_location = $input->param("item_pickup_$checkitem");
97
97
            my $item = Koha::Items->find($checkitem);
98
            my $item = Koha::Items->find($checkitem);
98
99
99
            if ( $item->biblionumber ne $biblionumber ) {
100
            if ( $item->biblionumber ne $biblionumber ) {
100
                $biblionumber = $item->biblionumber;
101
                $biblionumber = $item->biblionumber;
101
            }
102
            }
102
103
103
            my $can_item_be_reserved = CanItemBeReserved($borrower->{'borrowernumber'}, $item->itemnumber, $item_pickup)->{status};
104
            my $can_item_be_reserved = CanItemBeReserved($borrower->{'borrowernumber'}, $item->itemnumber, $item_pickup_location)->{status};
104
105
105
            if ( $can_item_be_reserved eq 'OK' || ( $can_item_be_reserved ne 'itemAlreadyOnHold' && $can_override ) ) {
106
            if ( $can_item_be_reserved eq 'OK' || ( $can_item_be_reserved ne 'itemAlreadyOnHold' && $can_override ) ) {
106
                AddReserve(
107
                AddReserve(
107
                    {
108
                    {
108
                        branchcode       => $item_pickup,
109
                        branchcode       => $item_pickup_location,
109
                        borrowernumber   => $borrower->{'borrowernumber'},
110
                        borrowernumber   => $borrower->{'borrowernumber'},
110
                        biblionumber     => $biblionumber,
111
                        biblionumber     => $biblionumber,
111
                        priority         => $rank[0],
112
                        priority         => $rank[0],
(-)a/reserve/request.pl (-2 / +5 lines)
Lines 578-587 foreach my $biblionumber (@biblionumbers) { Link Here
578
                  )
578
                  )
579
                {
579
                {
580
                    # Send the pickup locations count to the UI, the pickup locations will be pulled using the API
580
                    # Send the pickup locations count to the UI, the pickup locations will be pulled using the API
581
                    $item->{pickup_locations_count} = $item_object->pickup_locations({ patron => $patron })->count;
581
                    my $pickup_locations = $item_object->pickup_locations({ patron => $patron });
582
                    $item->{pickup_locations_count} = $pickup_locations->count;
582
                    if ( $item->{pickup_locations_count} > 0 ) {
583
                    if ( $item->{pickup_locations_count} > 0 ) {
583
                        $num_available++;
584
                        $num_available++;
584
                        $item->{available} = 1;
585
                        $item->{available} = 1;
586
                        # pass the holding branch for use as default
587
                        my $default_pickup_location = $pickup_locations->search({ branchcode => $item->{holdingbranch} })->next;
588
                        $item->{default_pickup_location} = $default_pickup_location;
585
                    }
589
                    }
586
                    else {
590
                    else {
587
                        $item->{available} = 0;
591
                        $item->{available} = 0;
588
- 

Return to bug 28338