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

(-)a/admin/smart-rules.pl (-1 / +1 lines)
Lines 286-292 elsif ($op eq 'add') { Link Here
286
    my $article_requests = $input->param('article_requests') || 'no';
286
    my $article_requests = $input->param('article_requests') || 'no';
287
    my $overduefinescap = $input->param('overduefinescap') || q{};
287
    my $overduefinescap = $input->param('overduefinescap') || q{};
288
    my $cap_fine_to_replacement_price = ($input->param('cap_fine_to_replacement_price') || q{}) eq 'on';
288
    my $cap_fine_to_replacement_price = ($input->param('cap_fine_to_replacement_price') || q{}) eq 'on';
289
    my $expire_reserves_charge = $input->param('expire_reserves_charge') // q{};
289
    my $expire_reserves_charge = $input->param('expire_reserves_charge') || 0;
290
    my $note = $input->param('note');
290
    my $note = $input->param('note');
291
    my $decreaseloanholds = $input->param('decreaseloanholds') || q{};
291
    my $decreaseloanholds = $input->param('decreaseloanholds') || q{};
292
    my $recalls_allowed = $input->param('recalls_allowed');
292
    my $recalls_allowed = $input->param('recalls_allowed');
(-)a/installer/data/mysql/atomicupdate/bug_25711.pl (-7 / +40 lines)
Lines 12-25 return { Link Here
12
            WHERE variable='ExpireReservesMaxPickUpDelayCharge';
12
            WHERE variable='ExpireReservesMaxPickUpDelayCharge';
13
        });
13
        });
14
14
15
        $expire_reserves_charge //= 0;
15
        $expire_reserves_charge ||= 0;
16
16
17
        $dbh->do(qq{
17
        my $sth = $dbh->prepare("SELECT branchcode, categorycode, itemtype FROM circulation_rules
18
            INSERT INTO circulation_rules
18
            GROUP BY branchcode, categorycode, itemtype");
19
                ( categorycode, branchcode, itemtype, rule_name, rule_value )
19
        $sth->execute();
20
            VALUES
20
21
                ( NULL, NULL, NULL, 'expire_reserves_charge', $expire_reserves_charge );
21
        while ( my $r = $sth->fetchrow_hashref ) {
22
        });
22
            my ($expire_reserves_charge_value) = $dbh->do("
23
                DELETE FROM circulation_rules
24
                WHERE
25
                    categorycode ".(defined $r->{categorycode} ? "= '$r->{categorycode}'" : 'IS NULL')."
26
                    AND branchcode ".(defined $r->{branchcode} ? "= '$r->{branchcode}'" : 'IS NULL')."
27
                    AND itemtype ".(defined $r->{itemtype} ? "= '$r->{itemtype}'" : 'IS NULL')."
28
                    AND rule_name = 'expire_reserves_charge'
29
                    AND (rule_value IS NULL OR rule_value = '')
30
            ");
31
32
            my ($expire_reserves_charge_value_exists) = $dbh->selectrow_array("
33
                SELECT COUNT(1) FROM circulation_rules
34
                WHERE
35
                    categorycode ".(defined $r->{categorycode} ? "= '$r->{categorycode}'" : 'IS NULL')."
36
                    AND branchcode ".(defined $r->{branchcode} ? "= '$r->{branchcode}'" : 'IS NULL')."
37
                    AND itemtype ".(defined $r->{itemtype} ? "= '$r->{itemtype}'" : 'IS NULL')."
38
                    AND rule_name = 'expire_reserves_charge'
39
            ");
40
41
            if( ! $expire_reserves_charge_value_exists ) {
42
                $dbh->do(qq{
43
                    INSERT INTO circulation_rules
44
                        ( categorycode, branchcode, itemtype, rule_name, rule_value )
45
                    VALUES
46
                        ( }
47
                        .(defined $r->{categorycode} ? "'$r->{categorycode}'" : 'NULL')
48
                        .","
49
                        .(defined $r->{branchcode} ? "'$r->{branchcode}'" : 'NULL')
50
                        .","
51
                        .(defined $r->{itemtype} ? "'$r->{itemtype}'" : 'NULL')
52
                        .qq{, 'expire_reserves_charge', $expire_reserves_charge );
53
                });
54
            }
55
        }
23
56
24
        say $out "ExpireReservesMaxPickUpDelayCharge migrated to the expire_reserves_charge circulation rule";
57
        say $out "ExpireReservesMaxPickUpDelayCharge migrated to the expire_reserves_charge circulation rule";
25
    },
58
    },
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt (-6 / +1 lines)
Lines 303-313 Link Here
303
                                        [% END %]
303
                                        [% END %]
304
                                    </td>
304
                                    </td>
305
                                    <td>
305
                                    <td>
306
                                        [% IF expire_reserves_charge.defined && expire_reserves_charge != '' %]
306
                                        [% expire_reserves_charge | html %]
307
                                            [% expire_reserves_charge | html %]
308
                                        [% ELSE %]
309
                                            <a href="/cgi-bin/koha/admin/preferences.pl?op=search&amp;searchfield=ExpireReservesMaxPickUpDelayCharge">Default</a>
310
                                        [% END %]
311
                                    </td>
307
                                    </td>
312
                                    <td>[% finedays | html %]</td>
308
                                    <td>[% finedays | html %]</td>
313
                                    <td>[% maxsuspensiondays | html %]</td>
309
                                    <td>[% maxsuspensiondays | html %]</td>
314
- 

Return to bug 25711