gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 28774: Don't store blank values for rental discount 

This patch adds 'can_be_blank => 0' for the rentaldiscount rule to prevent
storing blank values in the database

Additionally, if there is no charge we do not need to check for a discount
and can simply return

To test:
1 - Set rental discount to "" to a rule in circulation rules
2 - Checkout an item that will follow this rule
3 - Check the intranet log:
    [WARN] Argument "" isn't numeric in subtraction (-) at /kohadevbox/koha/C4/Circulation.pm line 3385.
4 - Apply patch and restart all
5 - Update database
6 - Set the rule to "" again
7 - Check the DB, no rule is stored
    SELECT * FROM circulation_rules WHERE rule_name = 'rentaldiscount';
8 - Checkout the item again
9 - No warns in log

Signed-off-by: David Nind <david@davidnind.com>

Signed-off-by: Joonas Kylmälä <joonas.kylmala@iki.fi>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 11ec644edf)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
This commit is contained in:
Nick Clemens 2021-07-28 12:23:50 +00:00 committed by Fridolin Somers
parent b6c9ab1197
commit d4e16785a3
3 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
C4/Circulation.pm
View File

@ -3367,19 +3367,19 @@ sub GetIssuingCharges {
if ( my $item_data = $sth->fetchrow_hashref ) {
$item_type = $item_data->{itemtype};
$charge = $item_data->{rentalcharge};
# FIXME This should follow CircControl
my $branch = C4::Context::mybranch();
my $patron = Koha::Patrons->find( $borrowernumber );
my $discount = Koha::CirculationRules->get_effective_rule({
categorycode => $patron->categorycode,
branchcode => $branch,
itemtype => $item_type,
rule_name => 'rentaldiscount'
});
if ($discount) {
$charge = ( $charge * ( 100 - $discount->rule_value ) ) / 100;
}
if ($charge) {
# FIXME This should follow CircControl
my $branch = C4::Context::mybranch();
my $patron = Koha::Patrons->find( $borrowernumber );
my $discount = Koha::CirculationRules->get_effective_rule({
categorycode => $patron->categorycode,
branchcode => $branch,
itemtype => $item_type,
rule_name => 'rentaldiscount'
});
if ($discount) {
$charge = ( $charge * ( 100 - $discount->rule_value ) ) / 100;
}
$charge = sprintf '%.2f', $charge; # ensure no fractions of a penny returned
}
}

1
Koha/CirculationRules.pm
View File

@ -156,6 +156,7 @@ our $RULE_KINDS = {
},
rentaldiscount => {
scope => [ 'branchcode', 'categorycode', 'itemtype' ],
can_be_blank => 0,
},
reservesallowed => {
scope => [ 'branchcode', 'categorycode', 'itemtype' ],

8
installer/data/mysql/atomicupdate/bug_28774_remove_blank_rentaldiscount.perl Normal file
View File

@ -0,0 +1,8 @@
$DBversion = 'XXX';
if( CheckVersion( $DBversion ) ) {
$dbh->do(q{
DELETE FROM circulation_rules
WHERE rule_name = 'rentaldiscount' AND rule_value=''
});
NewVersion( $DBversion, 28774, "Delete blank rental discounts");
}