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

(-)a/C4/Circulation.pm (-2 / +2 lines)
Lines 2906-2912 sub CanBookBeRenewed { Link Here
2906
2906
2907
        return ( 0, "too_unseen" )
2907
        return ( 0, "too_unseen" )
2908
          if C4::Context->preference('UnseenRenewals') &&
2908
          if C4::Context->preference('UnseenRenewals') &&
2909
            $issuing_rule->{unseen_renewals_allowed} &&
2909
            looks_like_number($issuing_rule->{unseen_renewals_allowed}) &&
2910
            $issuing_rule->{unseen_renewals_allowed} <= $issue->unseen_renewals;
2910
            $issuing_rule->{unseen_renewals_allowed} <= $issue->unseen_renewals;
2911
2911
2912
        my $overduesblockrenewing = C4::Context->preference('OverduesBlockRenewing');
2912
        my $overduesblockrenewing = C4::Context->preference('OverduesBlockRenewing');
Lines 3149-3155 sub AddRenewal { Link Here
3149
                    rule_name    => 'unseen_renewals_allowed'
3149
                    rule_name    => 'unseen_renewals_allowed'
3150
                }
3150
                }
3151
            );
3151
            );
3152
            if (!$seen && $rule && $rule->rule_value) {
3152
            if (!$seen && $rule && looks_like_number($rule->rule_value)) {
3153
                $unseen_renewals++;
3153
                $unseen_renewals++;
3154
            } else {
3154
            } else {
3155
                # If the renewal is seen, unseen should revert to 0
3155
                # If the renewal is seen, unseen should revert to 0
(-)a/admin/smart-rules.pl (-16 / +15 lines)
Lines 256-262 elsif ($op eq 'add') { Link Here
256
    my $itemtype  = $input->param('itemtype');     # item type
256
    my $itemtype  = $input->param('itemtype');     # item type
257
    my $fine = $input->param('fine');
257
    my $fine = $input->param('fine');
258
    my $finedays     = $input->param('finedays');
258
    my $finedays     = $input->param('finedays');
259
    my $maxsuspensiondays = $input->param('maxsuspensiondays') || '';
259
    my $maxsuspensiondays = $input->param('maxsuspensiondays') || q{};
260
    my $suspension_chargeperiod = $input->param('suspension_chargeperiod') || 1;
260
    my $suspension_chargeperiod = $input->param('suspension_chargeperiod') || 1;
261
    my $firstremind  = $input->param('firstremind');
261
    my $firstremind  = $input->param('firstremind');
262
    my $chargeperiod = $input->param('chargeperiod');
262
    my $chargeperiod = $input->param('chargeperiod');
Lines 264-298 elsif ($op eq 'add') { Link Here
264
    my $maxissueqty = strip_non_numeric( scalar $input->param('maxissueqty') );
264
    my $maxissueqty = strip_non_numeric( scalar $input->param('maxissueqty') );
265
    my $maxonsiteissueqty = strip_non_numeric( scalar $input->param('maxonsiteissueqty') );
265
    my $maxonsiteissueqty = strip_non_numeric( scalar $input->param('maxonsiteissueqty') );
266
    my $renewalsallowed  = $input->param('renewalsallowed');
266
    my $renewalsallowed  = $input->param('renewalsallowed');
267
    my $unseen_renewals_allowed  = $input->param('unseen_renewals_allowed');
267
    my $unseen_renewals_allowed  = defined $input->param('unseen_renewals_allowed') ? strip_non_numeric( scalar $input->param('unseen_renewals_allowed') ) : q{};
268
    my $renewalperiod    = $input->param('renewalperiod');
268
    my $renewalperiod    = $input->param('renewalperiod');
269
    my $norenewalbefore  = $input->param('norenewalbefore');
269
    my $norenewalbefore  = $input->param('norenewalbefore');
270
    $norenewalbefore = '' if $norenewalbefore =~ /^\s*$/;
270
    $norenewalbefore = q{} if $norenewalbefore =~ /^\s*$/;
271
    my $auto_renew = $input->param('auto_renew') eq 'yes' ? 1 : 0;
271
    my $auto_renew = $input->param('auto_renew') eq 'yes' ? 1 : 0;
272
    my $no_auto_renewal_after = $input->param('no_auto_renewal_after');
272
    my $no_auto_renewal_after = $input->param('no_auto_renewal_after');
273
    $no_auto_renewal_after = '' if $no_auto_renewal_after =~ /^\s*$/;
273
    $no_auto_renewal_after = q{} if $no_auto_renewal_after =~ /^\s*$/;
274
    my $no_auto_renewal_after_hard_limit = $input->param('no_auto_renewal_after_hard_limit') || '';
274
    my $no_auto_renewal_after_hard_limit = $input->param('no_auto_renewal_after_hard_limit') || q{};
275
    $no_auto_renewal_after_hard_limit = eval { dt_from_string( scalar $no_auto_renewal_after_hard_limit ) } if ( $no_auto_renewal_after_hard_limit );
275
    $no_auto_renewal_after_hard_limit = eval { dt_from_string( scalar $no_auto_renewal_after_hard_limit ) } if ( $no_auto_renewal_after_hard_limit );
276
    $no_auto_renewal_after_hard_limit = output_pref( { dt => $no_auto_renewal_after_hard_limit, dateonly => 1, dateformat => 'iso' } ) if ( $no_auto_renewal_after_hard_limit );
276
    $no_auto_renewal_after_hard_limit = output_pref( { dt => $no_auto_renewal_after_hard_limit, dateonly => 1, dateformat => 'iso' } ) if ( $no_auto_renewal_after_hard_limit );
277
    my $reservesallowed  = strip_non_numeric( scalar $input->param('reservesallowed') );
277
    my $reservesallowed  = strip_non_numeric( scalar $input->param('reservesallowed') );
278
    my $holds_per_record = strip_non_numeric( scalar $input->param('holds_per_record') );
278
    my $holds_per_record = strip_non_numeric( scalar $input->param('holds_per_record') );
279
    my $holds_per_day    = strip_non_numeric( scalar $input->param('holds_per_day') );
279
    my $holds_per_day    = strip_non_numeric( scalar $input->param('holds_per_day') );
280
    my $onshelfholds     = $input->param('onshelfholds') || 0;
280
    my $onshelfholds     = $input->param('onshelfholds') || 0;
281
    my $issuelength  = $input->param('issuelength');
281
    my $issuelength  = $input->param('issuelength') || 0;
282
    $issuelength = $issuelength eq q{} ? undef : $issuelength;
283
    my $daysmode = $input->param('daysmode');
282
    my $daysmode = $input->param('daysmode');
284
    my $lengthunit  = $input->param('lengthunit');
283
    my $lengthunit  = $input->param('lengthunit');
285
    my $hardduedate = $input->param('hardduedate') || undef;
284
    my $hardduedate = $input->param('hardduedate') || q{};
286
    $hardduedate = eval { dt_from_string( scalar $hardduedate ) } if ( $hardduedate );
285
    $hardduedate = eval { dt_from_string( scalar $hardduedate ) } if ( $hardduedate );
287
    $hardduedate = output_pref( { dt => $hardduedate, dateonly => 1, dateformat => 'iso' } ) if ( $hardduedate );
286
    $hardduedate = output_pref( { dt => $hardduedate, dateonly => 1, dateformat => 'iso' } ) if ( $hardduedate );
288
    my $hardduedatecompare = $input->param('hardduedatecompare');
287
    my $hardduedatecompare = $input->param('hardduedatecompare');
289
    my $rentaldiscount = $input->param('rentaldiscount');
288
    my $rentaldiscount = $input->param('rentaldiscount') || 0;
290
    my $opacitemholds = $input->param('opacitemholds') || 0;
289
    my $opacitemholds = $input->param('opacitemholds') || 0;
291
    my $article_requests = $input->param('article_requests') || 'no';
290
    my $article_requests = $input->param('article_requests') || 'no';
292
    my $overduefinescap = $input->param('overduefinescap') || '';
291
    my $overduefinescap = $input->param('overduefinescap') || q{};
293
    my $cap_fine_to_replacement_price = ($input->param('cap_fine_to_replacement_price') || '') eq 'on';
292
    my $cap_fine_to_replacement_price = ($input->param('cap_fine_to_replacement_price') || q{}) eq 'on';
294
    my $note = $input->param('note');
293
    my $note = $input->param('note');
295
    my $decreaseloanholds = $input->param('decreaseloanholds') || undef;
294
    my $decreaseloanholds = $input->param('decreaseloanholds') || q{};
296
    my $recalls_allowed = $input->param('recalls_allowed');
295
    my $recalls_allowed = $input->param('recalls_allowed');
297
    my $recalls_per_record = $input->param('recalls_per_record');
296
    my $recalls_per_record = $input->param('recalls_per_record');
298
    my $on_shelf_recalls = $input->param('on_shelf_recalls');
297
    my $on_shelf_recalls = $input->param('on_shelf_recalls');
Lines 482-488 elsif ( $op eq "add-open-article-requests-limit" ) { Link Here
482
481
483
    Koha::Exception->throw("No value passed for article request limit")
482
    Koha::Exception->throw("No value passed for article request limit")
484
      if not defined $open_article_requests_limit # There is a JS check for that
483
      if not defined $open_article_requests_limit # There is a JS check for that
485
      || $open_article_requests_limit eq '';
484
      || $open_article_requests_limit eq q{};
486
485
487
    if ( $branch eq "*" ) {
486
    if ( $branch eq "*" ) {
488
        if ( $categorycode eq "*" ) {
487
        if ( $categorycode eq "*" ) {
Lines 556-562 elsif ( $op eq "set-article-request-fee" ) { Link Here
556
555
557
    Koha::Exception->throw("No value passed for article request fee")
556
    Koha::Exception->throw("No value passed for article request fee")
558
      if not defined $fee # There is a JS check for that
557
      if not defined $fee # There is a JS check for that
559
      || $fee eq '';
558
      || $fee eq q{};
560
559
561
    Koha::CirculationRules->set_rules(
560
    Koha::CirculationRules->set_rules(
562
        {   categorycode => ( $category  eq '*' ) ? undef : $category,
561
        {   categorycode => ( $category  eq '*' ) ? undef : $category,
Lines 714-720 my $definedbranch = $all_rules->count ? 1 : 0; Link Here
714
my $rules = {};
713
my $rules = {};
715
while ( my $r = $all_rules->next ) {
714
while ( my $r = $all_rules->next ) {
716
    $r = $r->unblessed;
715
    $r = $r->unblessed;
717
    $rules->{ $r->{categorycode} // '' }->{ $r->{itemtype} // '' }->{ $r->{rule_name} } = $r->{rule_value};
716
    $rules->{ $r->{categorycode} // q{} }->{ $r->{itemtype} // q{} }->{ $r->{rule_name} } = $r->{rule_value};
718
}
717
}
719
718
720
$template->param(show_branch_cat_rule_form => 1);
719
$template->param(show_branch_cat_rule_form => 1);
Lines 764-769 sub by_itemtype { Link Here
764
sub strip_non_numeric {
763
sub strip_non_numeric {
765
    my $string = shift;
764
    my $string = shift;
766
    $string =~ s/\s//g;
765
    $string =~ s/\s//g;
767
    $string = '' if $string !~ /^\d+/;
766
    $string = q{} if $string !~ /^\d+/;
768
    return $string;
767
    return $string;
769
}
768
}
(-)a/installer/data/mysql/atomicupdate/bug_29012.pl (+41 lines)
Line 0 Link Here
1
use Modern::Perl;
2
3
return {
4
    bug_number => "29012",
5
    description => "Some rules are not saved when left blank while editing a 'rule' line in smart-rules.pl",
6
    up => sub {
7
        my ($args) = @_;
8
        my ($dbh, $out) = @$args{qw(dbh out)};
9
        my %default_rule_values = (
10
            issuelength             => 0,
11
            hardduedate             => '',
12
            unseen_renewals_allowed => '',
13
            rentaldiscount          => 0,
14
            decreaseloanholds       => '',
15
        );
16
        while (my ($rule_name, $rule_value) = each (%default_rule_values)) {
17
            $dbh->do(q{
18
                INSERT IGNORE INTO circulation_rules (branchcode, categorycode, itemtype, rule_name, rule_value)
19
                    SELECT branchcode, categorycode, itemtype, ?, ? FROM circulation_rules cr
20
                        WHERE EXISTS (
21
                            SELECT * FROM circulation_rules cr2
22
                                WHERE
23
                                    cr2.rule_name="suspension_chargeperiod"
24
                                    AND ( (cr2.branchcode=cr.branchcode) OR ( ISNULL(cr2.branchcode) AND ISNULL(cr.branchcode) ) )
25
                                    AND ( (cr2.categorycode=cr.categorycode) OR ( ISNULL(cr2.categorycode) AND ISNULL(cr.categorycode) ) )
26
                                    AND ( (cr2.itemtype=cr.itemtype) OR ( ISNULL(cr2.itemtype) AND ISNULL(cr.itemtype) ) )
27
                        )
28
                        AND NOT EXISTS (
29
                            SELECT * FROM circulation_rules cr2
30
                                WHERE
31
                                    cr2.rule_name=?
32
                                    AND ( (cr2.branchcode=cr.branchcode) OR ( ISNULL(cr2.branchcode) AND ISNULL(cr.branchcode) ) )
33
                                    AND ( (cr2.categorycode=cr.categorycode) OR ( ISNULL(cr2.categorycode) AND ISNULL(cr.categorycode) ) )
34
                                    AND ( (cr2.itemtype=cr.itemtype) OR ( ISNULL(cr2.itemtype) AND ISNULL(cr.itemtype) ) )
35
                        )
36
                        GROUP BY branchcode, categorycode, itemtype
37
            }, undef, $rule_name, $rule_value, $rule_name);
38
        }
39
        say $out "Add default values for blank circulation rules that weren't saved to the database";
40
    },
41
}
(-)a/installer/onboarding.pl (-4 / +4 lines)
Lines 242-248 if ( $step == 5 ) { Link Here
242
        my $categorycode    = $input->param('categorycode');
242
        my $categorycode    = $input->param('categorycode');
243
        my $itemtype        = $input->param('itemtype');
243
        my $itemtype        = $input->param('itemtype');
244
        my $maxissueqty     = $input->param('maxissueqty');
244
        my $maxissueqty     = $input->param('maxissueqty');
245
        my $issuelength     = $input->param('issuelength');
245
        my $issuelength     = $input->param('issuelength') || 0;
246
        my $lengthunit      = $input->param('lengthunit');
246
        my $lengthunit      = $input->param('lengthunit');
247
        my $renewalsallowed = $input->param('renewalsallowed');
247
        my $renewalsallowed = $input->param('renewalsallowed');
248
        my $renewalperiod   = $input->param('renewalperiod');
248
        my $renewalperiod   = $input->param('renewalperiod');
Lines 252-258 if ( $step == 5 ) { Link Here
252
        my $onshelfholds    = $input->param('onshelfholds') || 0;
252
        my $onshelfholds    = $input->param('onshelfholds') || 0;
253
        $maxissueqty =~ s/\s//g;
253
        $maxissueqty =~ s/\s//g;
254
        $maxissueqty = undef if $maxissueqty !~ /^\d+/;
254
        $maxissueqty = undef if $maxissueqty !~ /^\d+/;
255
        $issuelength = $issuelength eq q{} ? undef : $issuelength;
256
255
257
        my $params = {
256
        my $params = {
258
            branchcode      => $branchcode,
257
            branchcode      => $branchcode,
Lines 286-293 if ( $step == 5 ) { Link Here
286
                overduefinescap                  => "",
285
                overduefinescap                  => "",
287
                rentaldiscount                   => 0,
286
                rentaldiscount                   => 0,
288
                reservesallowed                  => $reservesallowed,
287
                reservesallowed                  => $reservesallowed,
289
                suspension_chargeperiod          => undef,
288
                suspension_chargeperiod          => 1,
290
                decreaseloanholds                => undef,
289
                decreaseloanholds                => "",
290
                unseen_renewals_allowed          => "",
291
                recalls_allowed                  => undef,
291
                recalls_allowed                  => undef,
292
                recalls_per_record               => undef,
292
                recalls_per_record               => undef,
293
                on_shelf_recalls                 => undef,
293
                on_shelf_recalls                 => undef,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt (-2 / +7 lines)
Lines 303-309 Link Here
303
                                    <td>[% suspension_chargeperiod | html %]</td>
303
                                    <td>[% suspension_chargeperiod | html %]</td>
304
                                    <td>[% renewalsallowed | html %]</td>
304
                                    <td>[% renewalsallowed | html %]</td>
305
                                    [% IF Koha.Preference('UnseenRenewals') %]
305
                                    [% IF Koha.Preference('UnseenRenewals') %]
306
                                        <td>[% unseenrenewalsallowed | html %]</td>
306
                                        <td>
307
                                            [% IF unseenrenewalsallowed.defined && unseenrenewalsallowed != '' %]
308
                                                [% unseenrenewalsallowed | html %]
309
                                            [% ELSE %]
310
                                                <span>Unlimited</span>
311
                                            [% END %]
312
                                        </td>
307
                                    [% END %]
313
                                    [% END %]
308
                                    <td>[% renewalperiod | html %]</td>
314
                                    <td>[% renewalperiod | html %]</td>
309
                                    <td>[% norenewalbefore | html %]</td>
315
                                    <td>[% norenewalbefore | html %]</td>
310
- 

Return to bug 29012