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

(-)a/Koha/CirculationRules.pm (+4 lines)
Lines 86-91 our $RULE_KINDS = { Link Here
86
        scope       => [ 'branchcode', 'categorycode' ],
86
        scope       => [ 'branchcode', 'categorycode' ],
87
        is_monetary => 1,
87
        is_monetary => 1,
88
    },
88
    },
89
    hold_fee => {
90
        scope       => [ 'branchcode', 'categorycode', 'itemtype' ],
91
        is_monetary => 1,
92
    },
89
    open_article_requests_limit => {
93
    open_article_requests_limit => {
90
        scope => [ 'branchcode', 'categorycode' ],
94
        scope => [ 'branchcode', 'categorycode' ],
91
    },
95
    },
(-)a/Koha/Patron/Category.pm (-1 lines)
Lines 311-317 sub to_api_mapping { Link Here
311
        dateofbirthrequired                    => 'lower_age_limit',
311
        dateofbirthrequired                    => 'lower_age_limit',
312
        enrolmentfee                           => 'enrolment_fee',
312
        enrolmentfee                           => 'enrolment_fee',
313
        overduenoticerequired                  => 'overdue_notice_required',
313
        overduenoticerequired                  => 'overdue_notice_required',
314
        reservefee                             => 'reserve_fee',
315
        hidelostitems                          => 'hide_lost_items',
314
        hidelostitems                          => 'hide_lost_items',
316
        category_type                          => 'category_type',
315
        category_type                          => 'category_type',
317
        BlockExpiredPatronOpacActions          => 'block_expired_patron_opac_actions',
316
        BlockExpiredPatronOpacActions          => 'block_expired_patron_opac_actions',
(-)a/admin/smart-rules.pl (+3 lines)
Lines 121-126 if ( $op eq 'cud-delete' ) { Link Here
121
                recall_shelf_time                => undef,
121
                recall_shelf_time                => undef,
122
                decreaseloanholds                => undef,
122
                decreaseloanholds                => undef,
123
                holds_pickup_period              => undef,
123
                holds_pickup_period              => undef,
124
                hold_fee                         => undef,
124
            }
125
            }
125
        }
126
        }
126
    );
127
    );
Lines 318-323 elsif ( $op eq 'cud-add' ) { Link Here
318
    my $recall_overdue_fine           = $input->param('recall_overdue_fine');
319
    my $recall_overdue_fine           = $input->param('recall_overdue_fine');
319
    my $recall_shelf_time             = $input->param('recall_shelf_time');
320
    my $recall_shelf_time             = $input->param('recall_shelf_time');
320
    my $holds_pickup_period           = strip_non_numeric( scalar $input->param('holds_pickup_period') );
321
    my $holds_pickup_period           = strip_non_numeric( scalar $input->param('holds_pickup_period') );
322
    my $hold_fee                      = $input->param('hold_fee') || q{};
321
323
322
    my $rules = {
324
    my $rules = {
323
        maxissueqty                      => $maxissueqty,
325
        maxissueqty                      => $maxissueqty,
Lines 361-366 elsif ( $op eq 'cud-add' ) { Link Here
361
        recall_overdue_fine              => $recall_overdue_fine,
363
        recall_overdue_fine              => $recall_overdue_fine,
362
        recall_shelf_time                => $recall_shelf_time,
364
        recall_shelf_time                => $recall_shelf_time,
363
        holds_pickup_period              => $holds_pickup_period,
365
        holds_pickup_period              => $holds_pickup_period,
366
        hold_fee                         => $hold_fee,
364
    };
367
    };
365
368
366
    Koha::CirculationRules->set_rules(
369
    Koha::CirculationRules->set_rules(
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt (-2 / +12 lines)
Lines 156-161 Link Here
156
                        <th>On shelf holds allowed</th>
156
                        <th>On shelf holds allowed</th>
157
                        <th>OPAC item level holds</th>
157
                        <th>OPAC item level holds</th>
158
                        <th>Holds pickup period (day)</th>
158
                        <th>Holds pickup period (day)</th>
159
                        <th>Hold fee</th>
159
                        [% IF Koha.Preference('ArticleRequests') %]
160
                        [% IF Koha.Preference('ArticleRequests') %]
160
                            <th>Article requests</th>
161
                            <th>Article requests</th>
161
                        [% END %]
162
                        [% END %]
Lines 218-225 Link Here
218
                            [% SET recall_overdue_fine = all_rules.$c.$i.recall_overdue_fine %]
219
                            [% SET recall_overdue_fine = all_rules.$c.$i.recall_overdue_fine %]
219
                            [% SET recall_shelf_time = all_rules.$c.$i.recall_shelf_time %]
220
                            [% SET recall_shelf_time = all_rules.$c.$i.recall_shelf_time %]
220
                            [% SET holds_pickup_period = all_rules.$c.$i.holds_pickup_period %]
221
                            [% SET holds_pickup_period = all_rules.$c.$i.holds_pickup_period %]
222
                            [% SET hold_fee = all_rules.$c.$i.hold_fee %]
221
223
222
                            [% SET show_rule = note || maxissueqty || maxonsiteissueqty || issuelength || daysmode || lengthunit || hardduedate || hardduedatecompare || fine || chargeperiod || chargeperiod_charge_at || firstremind || overduefinescap || cap_fine_to_replacement_price || expire_reserves_charge || finedays || maxsuspensiondays || suspension_chargeperiod || renewalsallowed || unseenrenewalsallowed || renewalperiod || norenewalbefore || noautorenewalbefore || 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 %]
224
                            [% SET show_rule = note || maxissueqty || maxonsiteissueqty || issuelength || daysmode || lengthunit || hardduedate || hardduedatecompare || fine || chargeperiod || chargeperiod_charge_at || firstremind || overduefinescap || cap_fine_to_replacement_price || expire_reserves_charge || finedays || maxsuspensiondays || suspension_chargeperiod || renewalsallowed || unseenrenewalsallowed || renewalperiod || norenewalbefore || noautorenewalbefore || 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 || hold_fee %]
223
                            [% IF show_rule %]
225
                            [% IF show_rule %]
224
                                [% SET row_count = row_count + 1 %]
226
                                [% SET row_count = row_count + 1 %]
225
                                <tr row_countd="row_[% row_count | html %]">
227
                                <tr row_countd="row_[% row_count | html %]">
Lines 412-417 Link Here
412
                                            [% holds_pickup_period | html %]
414
                                            [% holds_pickup_period | html %]
413
                                        [% END %]
415
                                        [% END %]
414
                                    </td>
416
                                    </td>
417
                                    <td>
418
                                        [% IF hold_fee.defined && hold_fee != '' %]
419
                                            [% hold_fee | $Price %]
420
                                        [% ELSE %]
421
                                            <span>0.00</span>
422
                                        [% END %]
423
                                    </td>
415
                                    [% IF Koha.Preference('ArticleRequests') %]
424
                                    [% IF Koha.Preference('ArticleRequests') %]
416
                                        <td data-code="[% article_requests | html %]">
425
                                        <td data-code="[% article_requests | html %]">
417
                                            [% IF article_requests == 'no' %]
426
                                            [% IF article_requests == 'no' %]
Lines 565-570 Link Here
565
                            </select>
574
                            </select>
566
                        </td>
575
                        </td>
567
                        <td><input type="text" name="holds_pickup_period" id="holds_pickup_period" size="2" /></td>
576
                        <td><input type="text" name="holds_pickup_period" id="holds_pickup_period" size="2" /></td>
577
                        <td><input type="text" name="hold_fee" id="hold_fee" size="5" inputmode="decimal" pattern="^\d+(\.\d{2})?$" /></td>
568
                        [% IF Koha.Preference('ArticleRequests') %]
578
                        [% IF Koha.Preference('ArticleRequests') %]
569
                            <td>
579
                            <td>
570
                                <select id="article_requests" name="article_requests">
580
                                <select id="article_requests" name="article_requests">
Lines 637-642 Link Here
637
                        <th>On shelf holds allowed</th>
647
                        <th>On shelf holds allowed</th>
638
                        <th>OPAC item level holds</th>
648
                        <th>OPAC item level holds</th>
639
                        <th>Holds pickup period (day)</th>
649
                        <th>Holds pickup period (day)</th>
650
                        <th>Hold fee</th>
640
                        [% IF Koha.Preference('ArticleRequests') %]
651
                        [% IF Koha.Preference('ArticleRequests') %]
641
                            <th>Article requests</th>
652
                            <th>Article requests</th>
642
                        [% END %]
653
                        [% END %]
643
- 

Return to bug 3492