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

(-)a/Koha/Hold.pm (-2 / +2 lines)
Lines 206-213 sub set_waiting { Link Here
206
    my $max_pickup_delay = C4::Context->preference("ReservesMaxPickUpDelay");
206
    my $max_pickup_delay = C4::Context->preference("ReservesMaxPickUpDelay");
207
    my $cancel_on_holidays = C4::Context->preference('ExpireReservesOnHolidays');
207
    my $cancel_on_holidays = C4::Context->preference('ExpireReservesOnHolidays');
208
208
209
    my $new_expiration_date = $today->clone->add(days => $max_pickup_delay);
210
211
    my $rule = Koha::CirculationRules->get_effective_rule({
209
    my $rule = Koha::CirculationRules->get_effective_rule({
212
        categorycode => $self->borrower->categorycode,
210
        categorycode => $self->borrower->categorycode,
213
        itemtype => $self->item->effective_itemtype,
211
        itemtype => $self->item->effective_itemtype,
Lines 219-224 sub set_waiting { Link Here
219
        $max_pickup_delay = $rule->rule_value;
217
        $max_pickup_delay = $rule->rule_value;
220
    }
218
    }
221
219
220
    my $new_expiration_date = $today->clone->add(days => $max_pickup_delay);
221
222
    if ( C4::Context->preference("ExcludeHolidaysFromMaxPickUpDelay") ) {
222
    if ( C4::Context->preference("ExcludeHolidaysFromMaxPickUpDelay") ) {
223
        my $itemtype = $self->item ? $self->item->effective_itemtype : $self->biblio->itemtype;
223
        my $itemtype = $self->item ? $self->item->effective_itemtype : $self->biblio->itemtype;
224
        my $daysmode = Koha::CirculationRules->get_effective_daysmode(
224
        my $daysmode = Koha::CirculationRules->get_effective_daysmode(
(-)a/admin/smart-rules.pl (-1 / +1 lines)
Lines 287-293 elsif ($op eq 'add') { Link Here
287
    my $cap_fine_to_replacement_price = ($input->param('cap_fine_to_replacement_price') || '') eq 'on';
287
    my $cap_fine_to_replacement_price = ($input->param('cap_fine_to_replacement_price') || '') eq 'on';
288
    my $note = $input->param('note');
288
    my $note = $input->param('note');
289
    my $decreaseloanholds = $input->param('decreaseloanholds') || undef;
289
    my $decreaseloanholds = $input->param('decreaseloanholds') || undef;
290
    my $holds_pickup_period = strip_non_numeric($input->param('holds_pickup_period'));
290
    my $holds_pickup_period = strip_non_numeric( scalar $input->param('holds_pickup_period') );
291
291
292
    my $rules = {
292
    my $rules = {
293
        maxissueqty                   => $maxissueqty,
293
        maxissueqty                   => $maxissueqty,
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt (-10 / +14 lines)
Lines 274-280 Link Here
274
                                        </ul>
274
                                        </ul>
275
275
276
                                        [% IF pickup_delays %]
276
                                        [% IF pickup_delays %]
277
                                            <p id="pickup_delay" style="display:none;">When your item is ready for pickup, you will have <span id="pickup_delay_days"></span> days to pick it up from this library.</p>
277
                                            <p class="pickup_delay" style="display:none;">When your item is ready for pickup, you will have <span id="pickup_delay_days_[% bibitemloo.biblionumber | html %]"></span> days to pick it up from this library.</p>
278
                                        [% END %]
278
                                        [% END %]
279
279
280
                                        <a class="toggle-hold-options" id="toggle-hold-options-[% bibitemloo.biblionumber | html %]" style="display:none;" href="#">Show more options</a>
280
                                        <a class="toggle-hold-options" id="toggle-hold-options-[% bibitemloo.biblionumber | html %]" style="display:none;" href="#">Show more options</a>
Lines 513-525 Link Here
513
    }
513
    }
514
514
515
    function calculate_delay_days(){
515
    function calculate_delay_days(){
516
        var selected_branch = $("#branch_1").val();
516
        $(".branch > select").each(function(){
517
        [% FOREACH branchcode IN pickup_delays.keys %]
517
            var selected_branch = $(this).val();
518
            var branchcode = "[% branchcode | html %]";
518
            var branch_biblionumber = $(this).attr('id');
519
            if ( branchcode == selected_branch ) {
519
            var biblionumber = branch_biblionumber.slice( branch_biblionumber.indexOf('_')+1 );
520
                $("#pickup_delay_days").text([% pickup_delays.$branchcode | html %]);
520
            [% FOREACH branchcode IN pickup_delays.keys %]
521
            }
521
                var branchcode = "[% branchcode | html %]";
522
        [% END %]
522
                if ( branchcode == selected_branch ) {
523
                    $("#pickup_delay_days_" + biblionumber).text([% pickup_delays.$branchcode | html %]);
524
                }
525
            [% END %]
526
        });
523
    }
527
    }
524
528
525
    $(document).ready(function() {
529
    $(document).ready(function() {
Lines 530-537 Link Here
530
        });
534
        });
531
535
532
        calculate_delay_days();
536
        calculate_delay_days();
533
        $("#pickup_delay").show();
537
        $(".pickup_delay").show();
534
        $("#branch_1").change(function(){
538
        $(".branch > select").change(function(){
535
            calculate_delay_days();
539
            calculate_delay_days();
536
        });
540
        });
537
541
(-)a/opac/opac-reserve.pl (-3 / +6 lines)
Lines 689-695 if ( Link Here
689
    );
689
    );
690
}
690
}
691
691
692
my @branches = Koha::Libraries->search();
692
my @branches = Koha::Libraries->search->as_list;
693
my %hold_pickup_delay_by_branch = ();
693
my %hold_pickup_delay_by_branch = ();
694
694
695
foreach my $branch ( @branches ) {
695
foreach my $branch ( @branches ) {
Lines 699-705 foreach my $branch ( @branches ) { Link Here
699
        itemtype => undef,
699
        itemtype => undef,
700
        rule_name => 'holds_pickup_period',
700
        rule_name => 'holds_pickup_period',
701
    });
701
    });
702
    $hold_pickup_delay_by_branch{$branch->branchcode} = $rule->rule_value if ( $rule and $rule->rule_value );
702
    if ( $rule and $rule->rule_value ) {
703
        $hold_pickup_delay_by_branch{$branch->branchcode} = $rule->rule_value;
704
    } else {
705
        $hold_pickup_delay_by_branch{$branch->branchcode} = C4::Context->preference('ReservesMaxPickUpDelay');
706
    }
703
}
707
}
704
708
705
$template->param( pickup_delays => \%hold_pickup_delay_by_branch );
709
$template->param( pickup_delays => \%hold_pickup_delay_by_branch );
706
- 

Return to bug 8367