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

(-)a/Koha/CirculationRules.pm (-1 / +2 lines)
Lines 21-26 use Modern::Perl; Link Here
21
use Carp qw( croak );
21
use Carp qw( croak );
22
22
23
use Koha::Exceptions;
23
use Koha::Exceptions;
24
use Koha::Exceptions::CirculationRule;
24
use Koha::CirculationRule;
25
use Koha::CirculationRule;
25
use Koha::Caches;
26
use Koha::Caches;
26
use Koha::Cache::Memory::Lite;
27
use Koha::Cache::Memory::Lite;
Lines 381-387 sub set_rule { Link Here
381
    my $can_be_blank = defined $kind_info->{can_be_blank} ? $kind_info->{can_be_blank} : 1;
382
    my $can_be_blank = defined $kind_info->{can_be_blank} ? $kind_info->{can_be_blank} : 1;
382
    $rule_value = undef if defined $rule_value && $rule_value eq "" && !$can_be_blank;
383
    $rule_value = undef if defined $rule_value && $rule_value eq "" && !$can_be_blank;
383
    my $is_monetary = defined $kind_info->{is_monetary} ? $kind_info->{is_monetary} : 0;
384
    my $is_monetary = defined $kind_info->{is_monetary} ? $kind_info->{is_monetary} : 0;
384
    Koha::Exceptions::BadParameter->throw("set_rule expected decimal")
385
    Koha::Exceptions::CirculationRule::NotDecimal->throw( name => $rule_name, value => $rule_value )
385
        if ( $is_monetary && defined($rule_value) && $rule_value !~ /^\d+(\.\d{2})?$/ );
386
        if ( $is_monetary && defined($rule_value) && $rule_value !~ /^\d+(\.\d{2})?$/ );
386
387
387
    for my $v ( $branchcode, $categorycode, $itemtype ) {
388
    for my $v ( $branchcode, $categorycode, $itemtype ) {
(-)a/Koha/Exceptions/CirculationRule.pm (-1 / +33 lines)
Line 0 Link Here
0
- 
1
package Koha::Exceptions::CirculationRule;
2
3
# This file is part of Koha.
4
#
5
# Koha is free software; you can redistribute it and/or modify it
6
# under the terms of the GNU General Public License as published by
7
# the Free Software Foundation; either version 3 of the License, or
8
# (at your option) any later version.
9
#
10
# Koha is distributed in the hope that it will be useful, but
11
# WITHOUT ANY WARRANTY; without even the implied warranty of
12
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13
# GNU General Public License for more details.
14
#
15
# You should have received a copy of the GNU General Public License
16
# along with Koha; if not, see <http://www.gnu.org/licenses>.
17
18
use Modern::Perl;
19
20
use Koha::Exception;
21
22
use Exception::Class (
23
    'Koha::Exceptions::CirculationRule' => {
24
        isa => 'Koha::Exception',
25
    },
26
    'Koha::Exceptions::CirculationRule::NotDecimal' => {
27
        isa         => 'Koha::Exceptions::CirculationRule',
28
        description => "The circulation rule expected a decimal value",
29
        fields      => [ 'name', 'value' ],
30
    },
31
);
32
33
1;

Return to bug 33028