8a63d78c4b
The TooMany() function and fine calculation functions were incorrectly hard coded to use homebranch for fetching the circulation rules. Those ignored completely the syspref HomeOrHoldingBranch where the user might have set it to holdingbranch and therefore the fines and whether patron has too many checkouts (TooMany()) were counted using the unintended branch's rules. This problem only arises in the cases where there are branch specific circulation rules defined. Test plan: 1. Make sure following tests pass: $ prove t/db_dependent/Circulation/_CalculateAndUpdateFine.t $ prove t/db_dependent/Circulation/TooMany.t Test plan for fines.pl: 1. Add branch specific fine rules for branches A and B. A having a fine of 1 per day and B having a fine of 0 per day. 2. Set sysprefs: CircControl = the library the items is from finesMode = Calculate and charge HomeOrHoldingBranch = holdingbranch 3. Create an item with home and holding branch of A 4. Checkout the item with a due date in the past (the past due date can be specified by clicking "Checkout settings" in the checkout page) and make sure the branch you are checking from is B. 5. Run perl /usr/share/koha/bin/cronjobs/fines.pl 6. Notice that fines have popped up now to the patron incorrectly 7. Apply patch 8. Pay fines, Check-in the item and check it out again 9. Run perl /usr/share/koha/bin/cronjobs/fines.pl 10. Notice that fine is now 0. This means that the branch B (holdingbranch of the checked-out item) specific rule is used. Test plan for staticfines.pl: 1. Add branch specific fine rules for branches A and B. A having a fine of 1 per day and B having a fine of 0 per day. 2. Set sysprefs: CircControl = the library the items is from finesMode = Calculate and charge HomeOrHoldingBranch = holdingbranch 3. Create an item with homebranch A and holding branch of A 4. Checkout the item with a due date in the past (the past due date can be specified by clicking "Checkout settings" in the checkout page) and make sure the branch you are checking from is B. 5. Run perl staticfines.pl --library A --library B --category <PATRONS_CATEGORYCODE> and notice that now there is inccorectly fines 6. Apply patch 7. Pay fines, Check-in the item and check it out again 8. Run perl staticfines.pl --library A --library B --category <PATRONS_CATEGORYCODE> and notice the fines are now not generated Rebased-by: Joonas Kylmälä <joonas.kylmala@iki.fi> Signed-off-by: Petro Vashchuk <stalkernoid@gmail.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
231 lines
6.6 KiB
Perl
Executable file
231 lines
6.6 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# This script loops through each overdue item, determines the fine,
|
|
# and updates the total amount of fines due by each user. It relies on
|
|
# the existence of /tmp/fines, which is created by ???
|
|
# Doesn't really rely on it, it relys on being able to write to /tmp/
|
|
# It creates the fines file
|
|
#
|
|
# This script is meant to be run nightly out of cron.
|
|
|
|
# Copyright 2000-2002 Katipo Communications
|
|
# Copyright 2011 PTFS-Europe Ltd
|
|
#
|
|
# This file is part of Koha.
|
|
#
|
|
# Koha is free software; you can redistribute it and/or modify it
|
|
# under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# Koha is distributed in the hope that it will be useful, but
|
|
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with Koha; if not, see <http://www.gnu.org/licenses>.
|
|
|
|
use strict;
|
|
use warnings;
|
|
use 5.010;
|
|
|
|
use Koha::Script -cron;
|
|
use C4::Context;
|
|
use C4::Overdues qw( Getoverdues CalcFine UpdateFine );
|
|
use Getopt::Long qw( GetOptions );
|
|
use Carp qw( carp croak );
|
|
use File::Spec;
|
|
use Try::Tiny qw( catch try );
|
|
|
|
use Koha::Calendar;
|
|
use Koha::DateUtils qw( dt_from_string output_pref );
|
|
use Koha::Patrons;
|
|
use C4::Log qw( cronlogaction );
|
|
|
|
my $help;
|
|
my $verbose;
|
|
my $output_dir;
|
|
my $log;
|
|
my $maxdays;
|
|
|
|
my $command_line_options = join(" ",@ARGV);
|
|
|
|
GetOptions(
|
|
'h|help' => \$help,
|
|
'v|verbose' => \$verbose,
|
|
'l|log' => \$log,
|
|
'o|out:s' => \$output_dir,
|
|
'm|maxdays:i' => \$maxdays,
|
|
);
|
|
my $usage = << 'ENDUSAGE';
|
|
|
|
This script calculates and charges overdue fines
|
|
to patron accounts. The Koha system preference 'finesMode' controls
|
|
whether the fines are calculated and charged to the patron accounts ("Calculate and charge");
|
|
or not calculated ("Don't calculate").
|
|
|
|
This script has the following parameters :
|
|
-h --help: this message
|
|
-l --log: log the output to a file (optional if the -o parameter is given)
|
|
-o --out: ouput directory for logs (defaults to env or /tmp if !exist)
|
|
-v --verbose
|
|
-m --maxdays: how many days back of overdues to process
|
|
|
|
ENDUSAGE
|
|
|
|
if ($help) {
|
|
print $usage;
|
|
exit;
|
|
}
|
|
|
|
my $script_handler = Koha::Script->new({ script => $0 });
|
|
|
|
try {
|
|
$script_handler->lock_exec;
|
|
}
|
|
catch {
|
|
my $message = "Skipping execution of $0 ($_)";
|
|
print STDERR "$message\n"
|
|
if $verbose;
|
|
cronlogaction( $message );
|
|
exit;
|
|
};
|
|
|
|
cronlogaction({ info => $command_line_options });
|
|
|
|
my @borrower_fields =
|
|
qw(cardnumber categorycode surname firstname email phone address citystate);
|
|
my @item_fields = qw(itemnumber barcode date_due);
|
|
my @other_fields = qw(days_overdue fine);
|
|
my $libname = C4::Context->preference('LibraryName');
|
|
my $control = C4::Context->preference('CircControl');
|
|
my $branch_type = C4::Context->preference('HomeOrHoldingBranch') || 'homebranch';
|
|
my $mode = C4::Context->preference('finesMode');
|
|
my $delim = "\t"; # ? C4::Context->preference('CSVDelimiter') || "\t";
|
|
|
|
my %is_holiday;
|
|
my $today = dt_from_string();
|
|
my $filename;
|
|
if ($log or $output_dir) {
|
|
$filename = get_filename($output_dir);
|
|
}
|
|
|
|
my $fh;
|
|
if ($filename) {
|
|
open $fh, '>>', $filename or croak "Cannot write file $filename: $!";
|
|
print {$fh} join $delim, ( @borrower_fields, @item_fields, @other_fields );
|
|
print {$fh} "\n";
|
|
}
|
|
my $counted = 0;
|
|
my $updated = 0;
|
|
my $params;
|
|
$params->{maximumdays} = $maxdays if $maxdays;
|
|
my $overdues = Getoverdues($params);
|
|
for my $overdue ( @{$overdues} ) {
|
|
next if $overdue->{itemlost};
|
|
|
|
if ( !defined $overdue->{borrowernumber} ) {
|
|
carp
|
|
"ERROR in Getoverdues : issues.borrowernumber IS NULL. Repair 'issues' table now! Skipping record.\n";
|
|
next;
|
|
}
|
|
my $patron = Koha::Patrons->find( $overdue->{borrowernumber} );
|
|
my $branchcode =
|
|
( $control eq 'ItemHomeLibrary' ) ? $overdue->{$branch_type}
|
|
: ( $control eq 'PatronLibrary' ) ? $patron->branchcode
|
|
: $overdue->{branchcode};
|
|
|
|
# In final case, CircControl must be PickupLibrary. (branchcode comes from issues table here).
|
|
if ( !exists $is_holiday{$branchcode} ) {
|
|
$is_holiday{$branchcode} = set_holiday( $branchcode, $today );
|
|
}
|
|
|
|
my $datedue = dt_from_string( $overdue->{date_due} );
|
|
if ( DateTime->compare( $datedue, $today ) == 1 ) {
|
|
next; # not overdue
|
|
}
|
|
++$counted;
|
|
|
|
my ( $amount, $unitcounttotal, $unitcount ) =
|
|
CalcFine( $overdue, $patron->categorycode,
|
|
$branchcode, $datedue, $today );
|
|
|
|
# Don't update the fine if today is a holiday.
|
|
# This ensures that dropbox mode will remove the correct amount of fine.
|
|
if (
|
|
$mode eq 'production'
|
|
&& ( !$is_holiday{$branchcode}
|
|
|| C4::Context->preference('ChargeFinesOnClosedDays') )
|
|
&& ( $amount && $amount > 0 )
|
|
)
|
|
{
|
|
UpdateFine(
|
|
{
|
|
issue_id => $overdue->{issue_id},
|
|
itemnumber => $overdue->{itemnumber},
|
|
borrowernumber => $overdue->{borrowernumber},
|
|
amount => $amount,
|
|
due => $datedue,
|
|
}
|
|
);
|
|
$updated++;
|
|
}
|
|
my $borrower = $patron->unblessed;
|
|
if ($filename) {
|
|
my @cells;
|
|
push @cells,
|
|
map { defined $borrower->{$_} ? $borrower->{$_} : q{} }
|
|
@borrower_fields;
|
|
push @cells, map { $overdue->{$_} } @item_fields;
|
|
push @cells, $unitcounttotal, $amount;
|
|
say {$fh} join $delim, @cells;
|
|
}
|
|
}
|
|
if ($filename){
|
|
close $fh;
|
|
}
|
|
|
|
if ($verbose) {
|
|
my $overdue_items = @{$overdues};
|
|
print <<"EOM";
|
|
Fines assessment -- $today
|
|
EOM
|
|
if ($filename) {
|
|
say "Saved to $filename";
|
|
}
|
|
print <<"EOM";
|
|
Number of Overdue Items:
|
|
counted $overdue_items
|
|
reported $counted
|
|
updated $updated
|
|
|
|
EOM
|
|
}
|
|
|
|
cronlogaction({ action => 'End', info => "COMPLETED" });
|
|
|
|
sub set_holiday {
|
|
my ( $branch, $dt ) = @_;
|
|
|
|
my $calendar = Koha::Calendar->new( branchcode => $branch );
|
|
return $calendar->is_holiday($dt);
|
|
}
|
|
|
|
sub get_filename {
|
|
my $directory = shift;
|
|
if ( !$directory ) {
|
|
$directory = C4::Context::temporary_directory;
|
|
}
|
|
if ( !-d $directory ) {
|
|
carp "Could not write to $directory ... does not exist!";
|
|
}
|
|
my $name = C4::Context->config('database');
|
|
$name =~ s/\W//;
|
|
$name .= join q{}, q{_}, $today->ymd(), '.log';
|
|
$name = File::Spec->catfile( $directory, $name );
|
|
if ($verbose && $log) {
|
|
say "writing to $name";
|
|
}
|
|
return $name;
|
|
}
|