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

(-)a/Koha/CirculationRules.pm (+3 lines)
Lines 203-208 our $RULE_KINDS = { Link Here
203
    recall_shelf_time => {
203
    recall_shelf_time => {
204
        scope => [ 'branchcode', 'categorycode', 'itemtype' ],
204
        scope => [ 'branchcode', 'categorycode', 'itemtype' ],
205
    },
205
    },
206
    holds_pickup_period => {
207
        scope => [ 'branchcode', 'categorycode', 'itemtype' ],
208
    },
206
    # Not included (deprecated?):
209
    # Not included (deprecated?):
207
    #   * accountsent
210
    #   * accountsent
208
    #   * reservecharge
211
    #   * reservecharge
(-)a/Koha/Hold.pm (+11 lines)
Lines 225-230 sub set_waiting { Link Here
225
225
226
    my $new_expiration_date = $today->clone->add(days => $max_pickup_delay);
226
    my $new_expiration_date = $today->clone->add(days => $max_pickup_delay);
227
227
228
    my $rule = Koha::CirculationRules->get_effective_rule({
229
        categorycode => $self->borrower->categorycode,
230
        itemtype => $self->item->effective_itemtype,
231
        branchcode => $self->branchcode,
232
        rule_name => 'holds_pickup_period',
233
    });
234
    if ( defined($rule) and $rule->rule_value ne '' ){
235
        # circulation rule overrides ReservesMaxPickUpDelay
236
        $max_pickup_delay = $rule->rule_value;
237
    }
238
228
    if ( C4::Context->preference("ExcludeHolidaysFromMaxPickUpDelay") ) {
239
    if ( C4::Context->preference("ExcludeHolidaysFromMaxPickUpDelay") ) {
229
        my $itemtype = $self->item ? $self->item->effective_itemtype : $self->biblio->itemtype;
240
        my $itemtype = $self->item ? $self->item->effective_itemtype : $self->biblio->itemtype;
230
        my $daysmode = Koha::CirculationRules->get_effective_daysmode(
241
        my $daysmode = Koha::CirculationRules->get_effective_daysmode(
(-)a/admin/smart-rules.pl (+2 lines)
Lines 293-298 elsif ($op eq 'add') { Link Here
293
    my $recall_due_date_interval = $input->param('recall_due_date_interval');
293
    my $recall_due_date_interval = $input->param('recall_due_date_interval');
294
    my $recall_overdue_fine = $input->param('recall_overdue_fine');
294
    my $recall_overdue_fine = $input->param('recall_overdue_fine');
295
    my $recall_shelf_time = $input->param('recall_shelf_time');
295
    my $recall_shelf_time = $input->param('recall_shelf_time');
296
    my $holds_pickup_period = strip_non_numeric($input->param('holds_pickup_period'));
296
297
297
    my $rules = {
298
    my $rules = {
298
        maxissueqty                   => $maxissueqty,
299
        maxissueqty                   => $maxissueqty,
Lines 333-338 elsif ($op eq 'add') { Link Here
333
        recall_due_date_interval      => $recall_due_date_interval,
334
        recall_due_date_interval      => $recall_due_date_interval,
334
        recall_overdue_fine           => $recall_overdue_fine,
335
        recall_overdue_fine           => $recall_overdue_fine,
335
        recall_shelf_time             => $recall_shelf_time,
336
        recall_shelf_time             => $recall_shelf_time,
337
        holds_pickup_period           => $holds_pickup_period,
336
    };
338
    };
337
339
338
    Koha::CirculationRules->set_rules(
340
    Koha::CirculationRules->set_rules(
(-)a/installer/data/mysql/atomicupdate/bug_8367-add_holds_pickup_period_circrule.perl (+6 lines)
Line 0 Link Here
1
$DBversion = 'XXX';
2
if( CheckVersion( $DBversion ) ) {
3
    $dbh->do(q{INSERT IGNORE INTO circulation_rules (branchcode, categorycode, itemtype, rule_name, rule_value) VALUES (NULL, NULL, NULL, 'holds_pickup_period', NULL) });
4
5
    NewVersion( $DBversion, 8367, "Add holds_pickup_period circulation rule" );
6
}
(-)a/installer/onboarding.pl (+1 lines)
Lines 282-287 if ( $step == 5 ) { Link Here
282
                recall_due_date_interval         => undef,
282
                recall_due_date_interval         => undef,
283
                recall_overdue_fine              => undef,
283
                recall_overdue_fine              => undef,
284
                recall_shelf_time                => undef,
284
                recall_shelf_time                => undef,
285
                holds_pickup_period              => undef,
285
              }
286
              }
286
        };
287
        };
287
288
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt (-1 / +7 lines)
Lines 144-149 Link Here
144
                <th>Holds per record (count)</th>
144
                <th>Holds per record (count)</th>
145
                <th>On shelf holds allowed</th>
145
                <th>On shelf holds allowed</th>
146
                <th>OPAC item level holds</th>
146
                <th>OPAC item level holds</th>
147
                <th>Holds pickup period (day)</th>
147
                [% IF Koha.Preference('ArticleRequests') %]
148
                [% IF Koha.Preference('ArticleRequests') %]
148
                <th>Article requests</th>
149
                <th>Article requests</th>
149
                [% END %]
150
                [% END %]
Lines 203-210 Link Here
203
                        [% SET recall_due_date_interval = all_rules.$c.$i.recall_due_date_interval %]
204
                        [% SET recall_due_date_interval = all_rules.$c.$i.recall_due_date_interval %]
204
                        [% SET recall_overdue_fine = all_rules.$c.$i.recall_overdue_fine %]
205
                        [% SET recall_overdue_fine = all_rules.$c.$i.recall_overdue_fine %]
205
                        [% SET recall_shelf_time = all_rules.$c.$i.recall_shelf_time %]
206
                        [% SET recall_shelf_time = all_rules.$c.$i.recall_shelf_time %]
207
                        [% SET holds_pickup_period = all_rules.$c.$i.holds_pickup_period %]
208
209
                        [% SET show_rule = note || maxissueqty || maxonsiteissueqty || issuelength || daysmode || lengthunit || hardduedate || hardduedatecompare || fine || chargeperiod || chargeperiod_charge_at || firstremind || overduefinescap || cap_fine_to_replacement_price || finedays || maxsuspensiondays || suspension_chargeperiod || renewalsallowed || unseenrenewalsallowed || renewalperiod || norenewalbefore || auto_renew || no_auto_renewal_after || no_auto_renewal_after_hard_limit || reservesallowed || holds_per_day || holds_per_record || onshelfholds || opacitemholds || article_requests || rentaldiscount || decreaseloanholds || recalls_allowed || recalls_per_record || on_shelf_recalls || recall_due_date_interval || recall_overdue_fine || recall_shelf_time || holds_pickup_period %]
206
210
207
                        [% SET show_rule = note || maxissueqty || maxonsiteissueqty || issuelength || daysmode || lengthunit || hardduedate || hardduedatecompare || fine || chargeperiod || chargeperiod_charge_at || firstremind || overduefinescap || cap_fine_to_replacement_price || finedays || maxsuspensiondays || suspension_chargeperiod || renewalsallowed || unseenrenewalsallowed || renewalperiod || norenewalbefore || auto_renew || no_auto_renewal_after || no_auto_renewal_after_hard_limit || reservesallowed || holds_per_day || holds_per_record || onshelfholds || opacitemholds || article_requests || rentaldiscount || decreaseloanholds || recalls_allowed || recalls_per_record || on_shelf_recalls || recall_due_date_interval || recall_overdue_fine || recall_shelf_time %]
208
                        [% IF show_rule %]
211
                        [% IF show_rule %]
209
                            [% SET row_count = row_count + 1 %]
212
                            [% SET row_count = row_count + 1 %]
210
                            <tr row_countd="row_[% row_count | html %]">
213
                            <tr row_countd="row_[% row_count | html %]">
Lines 366-371 Link Here
366
                                            <span>Don't allow</span>
369
                                            <span>Don't allow</span>
367
                                        [% END %]
370
                                        [% END %]
368
                                    </td>
371
                                    </td>
372
                                    <td>[% holds_pickup_period | html %]</td>
369
                                    [% IF Koha.Preference('ArticleRequests') %]
373
                                    [% IF Koha.Preference('ArticleRequests') %]
370
                                    <td>
374
                                    <td>
371
                                        [% IF article_requests == 'no' %]
375
                                        [% IF article_requests == 'no' %]
Lines 514-519 Link Here
514
                            <option value="F">Force</option>
518
                            <option value="F">Force</option>
515
                        </select>
519
                        </select>
516
                    </td>
520
                    </td>
521
                    <td><input type="text" name="holds_pickup_period" id="holds_pickup_period" size="2" /></td>
517
                    [% IF Koha.Preference('ArticleRequests') %]
522
                    [% IF Koha.Preference('ArticleRequests') %]
518
                    <td>
523
                    <td>
519
                        <select id="article_requests" name="article_requests">
524
                        <select id="article_requests" name="article_requests">
Lines 582-587 Link Here
582
                      <th>Holds per record (count)</th>
587
                      <th>Holds per record (count)</th>
583
                      <th>On shelf holds allowed</th>
588
                      <th>On shelf holds allowed</th>
584
                      <th>OPAC item level holds</th>
589
                      <th>OPAC item level holds</th>
590
                      <th>Holds pickup period (day)</th>
585
                      [% IF Koha.Preference('ArticleRequests') %]
591
                      [% IF Koha.Preference('ArticleRequests') %]
586
                      <th>Article requests</th>
592
                      <th>Article requests</th>
587
                      [% END %]
593
                      [% END %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt (+20 lines)
Lines 282-287 Link Here
282
                                            [% END # / UNLESS singleBranchMode %]
282
                                            [% END # / UNLESS singleBranchMode %]
283
                                        </ul>
283
                                        </ul>
284
284
285
                                        [% IF pickup_delays %]
286
                                            <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>
287
                                        [% END %]
288
285
                                        <a class="toggle-hold-options" id="toggle-hold-options-[% bibitemloo.biblionumber | html %]" style="display:none;" href="#">Show more options</a>
289
                                        <a class="toggle-hold-options" id="toggle-hold-options-[% bibitemloo.biblionumber | html %]" style="display:none;" href="#">Show more options</a>
286
290
287
                                        <div id="hold-options-[% bibitemloo.biblionumber | html %]" class="hold-options">
291
                                        <div id="hold-options-[% bibitemloo.biblionumber | html %]" class="hold-options">
Lines 489-494 Link Here
489
    var MSG_EMPTY_START_DATE = _("Hold start date should be filled.");
493
    var MSG_EMPTY_START_DATE = _("Hold start date should be filled.");
490
    var MSG_EMPTY_END_DATE   = _("Hold expiration date should be filled.");
494
    var MSG_EMPTY_END_DATE   = _("Hold expiration date should be filled.");
491
495
496
    function calculate_delay_days(){
497
        var selected_branch = $("#branch_1").val();
498
        [% FOREACH branchcode IN pickup_delays.keys %]
499
            var branchcode = "[% branchcode | html %]";
500
            if ( branchcode == selected_branch ) {
501
                $("#pickup_delay_days").text([% pickup_delays.$branchcode | html %]);
502
            }
503
        [% END %]
504
    }
505
492
    $(document).ready(function() {
506
    $(document).ready(function() {
493
507
494
        $(".toggle_unholdable").click(function(e){
508
        $(".toggle_unholdable").click(function(e){
Lines 496-501 Link Here
496
            $(this).parent('div').find(".unholdable").toggle();
510
            $(this).parent('div').find(".unholdable").toggle();
497
        });
511
        });
498
512
513
        calculate_delay_days();
514
        $("#pickup_delay").show();
515
        $("#branch_1").change(function(){
516
            calculate_delay_days();
517
        });
518
499
        $("#hold-request-form").preventDoubleFormSubmit();
519
        $("#hold-request-form").preventDoubleFormSubmit();
500
        var copiesRowId = null;
520
        var copiesRowId = null;
501
        var wasSpecific = false;
521
        var wasSpecific = false;
(-)a/misc/cronjobs/thirdparty/TalkingTech_itiva_outbound.pl (+11 lines)
Lines 339-344 sub GetWaitingHolds { Link Here
339
339
340
        my $waiting_date = dt_from_string( $issue->{waitingdate}, 'sql' );
340
        my $waiting_date = dt_from_string( $issue->{waitingdate}, 'sql' );
341
341
342
        my $rule = Koha::CirculationRules->get_effective_rule({
343
            categorycode => $issue->{categorycode},
344
            itemtype => $item->effective_itemtype,
345
            branchcode => $issue->{branchcode},
346
            rule_name => 'holds_pickup_period',
347
        });
348
        if ( defined($rule) and $rule->rule_value ne '' ){
349
            # circulation rule overrides ReservesMaxPickUpDelay
350
            $pickupdelay = $rule->rule_value;
351
        }
352
342
        $issue->{'date_due'} = output_pref({dt => dt_from_string($issue->{expirationdate}), dateformat => 'iso' });
353
        $issue->{'date_due'} = output_pref({dt => dt_from_string($issue->{expirationdate}), dateformat => 'iso' });
343
        $issue->{'level'} = 1;    # only one level for Hold Waiting notifications
354
        $issue->{'level'} = 1;    # only one level for Hold Waiting notifications
344
355
(-)a/opac/opac-reserve.pl (+15 lines)
Lines 613-616 if ( Link Here
613
    );
613
    );
614
}
614
}
615
615
616
my @branches = Koha::Libraries->search();
617
my %hold_pickup_delay_by_branch = ();
618
619
foreach my $branch ( @branches ) {
620
    my $rule = Koha::CirculationRules->get_effective_rule({
621
        categorycode => $patron->categorycode,
622
        branchcode => $branch->branchcode,
623
        itemtype => undef,
624
        rule_name => 'holds_pickup_period',
625
    });
626
    $hold_pickup_delay_by_branch{$branch->branchcode} = $rule->rule_value if ( $rule and $rule->rule_value );
627
}
628
629
$template->param( pickup_delays => \%hold_pickup_delay_by_branch );
630
616
output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 };
631
output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 };
(-)a/t/db_dependent/Holds/WaitingReserves.t (-2 / +67 lines)
Lines 8-14 use Koha::DateUtils qw( dt_from_string ); Link Here
8
use t::lib::Mocks;
8
use t::lib::Mocks;
9
use t::lib::TestBuilder;
9
use t::lib::TestBuilder;
10
10
11
use Test::More tests => 11;
11
use Test::More tests => 13;
12
12
13
use_ok('C4::Reserves', qw( ModReserve ModReserveAffect ));
13
use_ok('C4::Reserves', qw( ModReserve ModReserveAffect ));
14
14
Lines 63-73 my $biblio = $builder->build_sample_biblio; Link Here
63
my $biblio2 = $builder->build_sample_biblio;
63
my $biblio2 = $builder->build_sample_biblio;
64
my $biblio3 = $builder->build_sample_biblio;
64
my $biblio3 = $builder->build_sample_biblio;
65
my $biblio4 = $builder->build_sample_biblio;
65
my $biblio4 = $builder->build_sample_biblio;
66
my $biblio5 = $builder->build_sample_biblio;
67
my $biblio6 = $builder->build_sample_biblio;
66
68
67
my $item1 = $builder->build_sample_item({biblionumber => $biblio->biblionumber});
69
my $item1 = $builder->build_sample_item({biblionumber => $biblio->biblionumber});
68
my $item2 = $builder->build_sample_item({biblionumber => $biblio2->biblionumber});
70
my $item2 = $builder->build_sample_item({biblionumber => $biblio2->biblionumber});
69
my $item3 = $builder->build_sample_item({biblionumber => $biblio3->biblionumber});
71
my $item3 = $builder->build_sample_item({biblionumber => $biblio3->biblionumber});
70
my $item4 = $builder->build_sample_item({biblionumber => $biblio4->biblionumber});
72
my $item4 = $builder->build_sample_item({biblionumber => $biblio4->biblionumber});
73
my $item5 = $builder->build_sample_item({biblionumber => $biblio5->biblionumber});
74
my $item6 = $builder->build_sample_item({biblionumber => $biblio6->biblionumber});
75
76
Koha::CirculationRules->set_rules({
77
    categorycode => undef,
78
    itemtype => undef,
79
    branchcode => undef,
80
    rules => {
81
        holds_pickup_period => undef,
82
    }
83
});
71
84
72
my $today = dt_from_string();
85
my $today = dt_from_string();
73
86
Lines 199-202 ModReserveAffect( $item4->itemnumber, $patron2->{borrowernumber}, 0, $reserve4-> Link Here
199
my $r4 = Koha::Holds->find($reserve4->{reserve_id});
212
my $r4 = Koha::Holds->find($reserve4->{reserve_id});
200
is($r4->expirationdate, $requested_expiredate->ymd, 'Requested expiration date should be kept' );
213
is($r4->expirationdate, $requested_expiredate->ymd, 'Requested expiration date should be kept' );
201
214
215
Koha::CirculationRules->set_rules({
216
    categorycode => $patron1->{categorycode},
217
    itemtype => undef,
218
    branchcode => undef,
219
    rules => {
220
        holds_pickup_period => '3',
221
    }
222
});
223
t::lib::Mocks::mock_preference('ReservesMaxPickUpDelay', 7);
224
225
my $reserve5_reservedate = $today->clone;
226
my $reserve5_expirationdate = $reserve5_reservedate->add(days => 3);
227
228
my $reserve5 = $builder->build({
229
    source => 'Reserve',
230
    value => {
231
        borrowernumber => $patron1->{borrowernumber},
232
        reservedate => $reserve5_reservedate->ymd,
233
        expirationdate => undef,
234
        biblionumber => $biblio5->biblionumber,
235
        branchcode => 'LIB2',
236
        priority => 1,
237
        found => '',
238
    },
239
});
240
241
ModReserveAffect( $item5->itemnumber, $patron1->{borrowernumber});
242
my $r5 = Koha::Holds->find($reserve5->{reserve_id});
243
244
is($r5->expirationdate, $reserve5_expirationdate->ymd, 'Expiration date should be set to today + 3 based on circulation rules' );
245
246
my $reserve6_reservedate = $today->clone;
247
# add 3 days of pickup + 1 day of holiday
248
my $reserve6_expirationdate = $reserve6_reservedate->add(days => 5);
249
250
my $reserve6 = $builder->build({
251
    source => 'Reserve',
252
    value => {
253
        borrowernumber => $patron1->{borrowernumber},
254
        reservedate => $reserve6_reservedate->ymd,
255
        expirationdate => undef,
256
        biblionumber => $biblio6->biblionumber,
257
        branchcode => 'LIB1',
258
        priority => 1,
259
        found => '',
260
    },
261
});
262
263
ModReserveAffect( $item6->itemnumber, $patron1->{borrowernumber});
264
my $r6 = Koha::Holds->find($reserve6->{reserve_id});
265
266
is($r6->expirationdate, $reserve6_expirationdate->ymd, 'Expiration date should be set to today + 4 based on circulation rules and including a holiday' );
267
202
$schema->storage->txn_rollback;
268
$schema->storage->txn_rollback;
203
- 

Return to bug 8367