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

(-)a/Koha/CirculationRules.pm (+3 lines)
Lines 195-200 our $RULE_KINDS = { Link Here
195
    recall_shelf_time => {
195
    recall_shelf_time => {
196
        scope => [ 'branchcode', 'categorycode', 'itemtype' ],
196
        scope => [ 'branchcode', 'categorycode', 'itemtype' ],
197
    },
197
    },
198
    holds_pickup_period => {
199
        scope => [ 'branchcode', 'categorycode', 'itemtype' ],
200
    },
198
    # Not included (deprecated?):
201
    # Not included (deprecated?):
199
    #   * accountsent
202
    #   * accountsent
200
    #   * reservecharge
203
    #   * reservecharge
(-)a/Koha/Hold.pm (+11 lines)
Lines 208-213 sub set_waiting { Link Here
208
208
209
    my $new_expiration_date = $today->clone->add(days => $max_pickup_delay);
209
    my $new_expiration_date = $today->clone->add(days => $max_pickup_delay);
210
210
211
    my $rule = Koha::CirculationRules->get_effective_rule({
212
        categorycode => $self->borrower->categorycode,
213
        itemtype => $self->item->effective_itemtype,
214
        branchcode => $self->branchcode,
215
        rule_name => 'holds_pickup_period',
216
    });
217
    if ( defined($rule) and $rule->rule_value ne '' ){
218
        # circulation rule overrides ReservesMaxPickUpDelay
219
        $max_pickup_delay = $rule->rule_value;
220
    }
221
211
    if ( C4::Context->preference("ExcludeHolidaysFromMaxPickUpDelay") ) {
222
    if ( C4::Context->preference("ExcludeHolidaysFromMaxPickUpDelay") ) {
212
        my $itemtype = $self->item ? $self->item->effective_itemtype : $self->biblio->itemtype;
223
        my $itemtype = $self->item ? $self->item->effective_itemtype : $self->biblio->itemtype;
213
        my $daysmode = Koha::CirculationRules->get_effective_daysmode(
224
        my $daysmode = Koha::CirculationRules->get_effective_daysmode(
(-)a/admin/smart-rules.pl (+2 lines)
Lines 299-304 elsif ($op eq 'add') { Link Here
299
    my $recall_due_date_interval = $input->param('recall_due_date_interval');
299
    my $recall_due_date_interval = $input->param('recall_due_date_interval');
300
    my $recall_overdue_fine = $input->param('recall_overdue_fine');
300
    my $recall_overdue_fine = $input->param('recall_overdue_fine');
301
    my $recall_shelf_time = $input->param('recall_shelf_time');
301
    my $recall_shelf_time = $input->param('recall_shelf_time');
302
    my $holds_pickup_period = strip_non_numeric($input->param('holds_pickup_period'));
302
303
303
    my $rules = {
304
    my $rules = {
304
        maxissueqty                   => $maxissueqty,
305
        maxissueqty                   => $maxissueqty,
Lines 339-344 elsif ($op eq 'add') { Link Here
339
        recall_due_date_interval      => $recall_due_date_interval,
340
        recall_due_date_interval      => $recall_due_date_interval,
340
        recall_overdue_fine           => $recall_overdue_fine,
341
        recall_overdue_fine           => $recall_overdue_fine,
341
        recall_shelf_time             => $recall_shelf_time,
342
        recall_shelf_time             => $recall_shelf_time,
343
        holds_pickup_period           => $holds_pickup_period,
342
    };
344
    };
343
345
344
    Koha::CirculationRules->set_rules(
346
    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 294-299 if ( $step == 5 ) { Link Here
294
                recall_due_date_interval         => undef,
294
                recall_due_date_interval         => undef,
295
                recall_overdue_fine              => undef,
295
                recall_overdue_fine              => undef,
296
                recall_shelf_time                => undef,
296
                recall_shelf_time                => undef,
297
                holds_pickup_period              => undef,
297
              }
298
              }
298
        };
299
        };
299
300
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt (-1 / +7 lines)
Lines 140-145 Link Here
140
                <th>Holds per record (count)</th>
140
                <th>Holds per record (count)</th>
141
                <th>On shelf holds allowed</th>
141
                <th>On shelf holds allowed</th>
142
                <th>OPAC item level holds</th>
142
                <th>OPAC item level holds</th>
143
                <th>Holds pickup period (day)</th>
143
                <th>Article requests</th>
144
                <th>Article requests</th>
144
                <th>Rental discount (%)</th>
145
                <th>Rental discount (%)</th>
145
                [% IF Koha.Preference('UseRecalls') %]
146
                [% IF Koha.Preference('UseRecalls') %]
Lines 197-204 Link Here
197
                        [% SET recall_due_date_interval = all_rules.$c.$i.recall_due_date_interval %]
198
                        [% SET recall_due_date_interval = all_rules.$c.$i.recall_due_date_interval %]
198
                        [% SET recall_overdue_fine = all_rules.$c.$i.recall_overdue_fine %]
199
                        [% SET recall_overdue_fine = all_rules.$c.$i.recall_overdue_fine %]
199
                        [% SET recall_shelf_time = all_rules.$c.$i.recall_shelf_time %]
200
                        [% SET recall_shelf_time = all_rules.$c.$i.recall_shelf_time %]
201
                        [% SET holds_pickup_period = all_rules.$c.$i.holds_pickup_period %]
202
203
                        [% 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 %]
200
204
201
                        [% 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 %]
202
                        [% IF show_rule %]
205
                        [% IF show_rule %]
203
                            [% SET row_count = row_count + 1 %]
206
                            [% SET row_count = row_count + 1 %]
204
                            <tr row_countd="row_[% row_count | html %]">
207
                            <tr row_countd="row_[% row_count | html %]">
Lines 346-351 Link Here
346
                                            <span>Don't allow</span>
349
                                            <span>Don't allow</span>
347
                                        [% END %]
350
                                        [% END %]
348
                                    </td>
351
                                    </td>
352
                                    <td>[% holds_pickup_period | html %]</td>
349
                                    <td>
353
                                    <td>
350
                                        [% IF article_requests == 'no' %]
354
                                        [% IF article_requests == 'no' %]
351
                                            <span>No</span>
355
                                            <span>No</span>
Lines 492-497 Link Here
492
                            <option value="F">Force</option>
496
                            <option value="F">Force</option>
493
                        </select>
497
                        </select>
494
                    </td>
498
                    </td>
499
                    <td><input type="text" name="holds_pickup_period" id="holds_pickup_period" size="2" /></td>
495
                    <td>
500
                    <td>
496
                        <select id="article_requests" name="article_requests">
501
                        <select id="article_requests" name="article_requests">
497
                            <option value="no">No</option>
502
                            <option value="no">No</option>
Lines 558-563 Link Here
558
                      <th>Holds per record (count)</th>
563
                      <th>Holds per record (count)</th>
559
                      <th>On shelf holds allowed</th>
564
                      <th>On shelf holds allowed</th>
560
                      <th>OPAC item level holds</th>
565
                      <th>OPAC item level holds</th>
566
                      <th>Holds pickup period (day)</th>
561
                      <th>Article requests</th>
567
                      <th>Article requests</th>
562
                      <th>Rental discount (%)</th>
568
                      <th>Rental discount (%)</th>
563
                      [% IF Koha.Preference('UseRecalls') %]
569
                      [% IF Koha.Preference('UseRecalls') %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt (+20 lines)
Lines 275-280 Link Here
275
                                            [% END # / UNLESS singleBranchMode %]
275
                                            [% END # / UNLESS singleBranchMode %]
276
                                        </ul>
276
                                        </ul>
277
277
278
                                        [% IF pickup_delays %]
279
                                            <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>
280
                                        [% END %]
281
278
                                        <a class="toggle-hold-options" id="toggle-hold-options-[% bibitemloo.biblionumber | html %]" style="display:none;" href="#">Show more options</a>
282
                                        <a class="toggle-hold-options" id="toggle-hold-options-[% bibitemloo.biblionumber | html %]" style="display:none;" href="#">Show more options</a>
279
283
280
                                        <div id="hold-options-[% bibitemloo.biblionumber | html %]" class="hold-options">
284
                                        <div id="hold-options-[% bibitemloo.biblionumber | html %]" class="hold-options">
Lines 499-504 Link Here
499
<script>
503
<script>
500
    var MSG_NO_ITEM_SELECTED = _("Expecting a specific item selection.");
504
    var MSG_NO_ITEM_SELECTED = _("Expecting a specific item selection.");
501
505
506
    function calculate_delay_days(){
507
        var selected_branch = $("#branch_1").val();
508
        [% FOREACH branchcode IN pickup_delays.keys %]
509
            var branchcode = "[% branchcode | html %]";
510
            if ( branchcode == selected_branch ) {
511
                $("#pickup_delay_days").text([% pickup_delays.$branchcode | html %]);
512
            }
513
        [% END %]
514
    }
515
502
    $(document).ready(function() {
516
    $(document).ready(function() {
503
517
504
        $(".toggle_unholdable").click(function(e){
518
        $(".toggle_unholdable").click(function(e){
Lines 506-511 Link Here
506
            $(this).parent('div').find(".unholdable").toggle();
520
            $(this).parent('div').find(".unholdable").toggle();
507
        });
521
        });
508
522
523
        calculate_delay_days();
524
        $("#pickup_delay").show();
525
        $("#branch_1").change(function(){
526
            calculate_delay_days();
527
        });
528
509
        $("#hold-request-form").preventDoubleFormSubmit();
529
        $("#hold-request-form").preventDoubleFormSubmit();
510
        var copiesRowId = null;
530
        var copiesRowId = null;
511
        var wasSpecific = false;
531
        var wasSpecific = false;
(-)a/misc/cronjobs/thirdparty/TalkingTech_itiva_outbound.pl (+11 lines)
Lines 338-343 sub GetWaitingHolds { Link Here
338
        my $calendar = Koha::Calendar->new( branchcode => $issue->{'site'}, days_mode => $daysmode );
338
        my $calendar = Koha::Calendar->new( branchcode => $issue->{'site'}, days_mode => $daysmode );
339
339
340
        my $waiting_date = dt_from_string( $issue->{waitingdate}, 'sql' );
340
        my $waiting_date = dt_from_string( $issue->{waitingdate}, 'sql' );
341
        my $rule = Koha::CirculationRules->get_effective_rule({
342
            categorycode => $issue->{categorycode},
343
            itemtype => $item->effective_itemtype,
344
            branchcode => $issue->{branchcode},
345
            rule_name => 'holds_pickup_period',
346
        });
347
        if ( defined($rule) and $rule->rule_value ne '' ){
348
            # circulation rule overrides ReservesMaxPickUpDelay
349
            $pickupdelay = $rule->rule_value;
350
        }
351
341
        my $pickup_date = $waiting_date->clone->add( days => $pickupdelay );
352
        my $pickup_date = $waiting_date->clone->add( days => $pickupdelay );
342
        if ( $calendar->is_holiday($pickup_date) ) {
353
        if ( $calendar->is_holiday($pickup_date) ) {
343
            $pickup_date = $calendar->next_open_days( $pickup_date, 1 );
354
            $pickup_date = $calendar->next_open_days( $pickup_date, 1 );
(-)a/opac/opac-reserve.pl (+15 lines)
Lines 693-696 if ( Link Here
693
    );
693
    );
694
}
694
}
695
695
696
my @branches = Koha::Libraries->search();
697
my %hold_pickup_delay_by_branch = ();
698
699
foreach my $branch ( @branches ) {
700
    my $rule = Koha::CirculationRules->get_effective_rule({
701
        categorycode => $patron->categorycode,
702
        branchcode => $branch->branchcode,
703
        itemtype => undef,
704
        rule_name => 'holds_pickup_period',
705
    });
706
    $hold_pickup_delay_by_branch{$branch->branchcode} = $rule->rule_value if ( $rule and $rule->rule_value );
707
}
708
709
$template->param( pickup_delays => \%hold_pickup_delay_by_branch );
710
696
output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 };
711
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