Bug 22521: Update fines handling to use accountline.status

[srvgit] / misc / cronjobs / staticfines.pl

diff --git a/misc/cronjobs/staticfines.pl b/misc/cronjobs/staticfines.pl
index 1309c8b..774c3b0 100755 (executable)
--- a/misc/cronjobs/staticfines.pl
+++ b/misc/cronjobs/staticfines.pl
@@ -3,7 +3,7 @@
 #  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 ???
-# Doesnt really rely on it, it relys on being able to write to /tmp/
+# Doesn't really rely on it, it relies on being able to write to /tmp/
 # It creates the fines file
 #
 #  This script is meant to be run nightly out of cron.
@@ -37,6 +37,7 @@ BEGIN {
 
 use Date::Calc qw/Date_to_Days/;
 
+use Koha::Script -cron;
 use C4::Context;
 use C4::Circulation;
 use C4::Overdues;
@@ -135,24 +136,24 @@ if (defined $borrowernumberlimit) {
 }
 my $overdueItemsCounted = 0;
 my %calendars           = ();
-$today      = C4::Dates->new();
-$today_iso  = $today->output('iso');
+$today      = dt_from_string;
+$today_iso  = output_pref( { dt => $today, dateonly => 1, dateformat => 'iso' } );
 my ($tyear, $tmonth, $tday) = split( /-/, $today_iso );
 $today_days = Date_to_Days( $tyear, $tmonth, $tday );
 
 for ( my $i = 0 ; $i < scalar(@$data) ; $i++ ) {
     next if $data->[$i]->{'itemlost'};
-    my $datedue;
-    my $datedue_days;
+    my ( $datedue, $datedue_days );
     eval {
-    $datedue = C4::Dates->new( $data->[$i]->{'date_due'}, 'iso' );
-    $datedue_days = Date_to_Days( split( /-/, $datedue->output('iso') ) );
+        $datedue = dt_from_string( $data->[$i]->{'date_due'} );
+        my $datedue_iso = output_pref( { dt => $datedue, dateonly => 1, dateformat => 'iso' } );
+        $datedue_days = Date_to_Days( split( /-/, $datedue_iso ) );
     };
     if ($@) {
     warn "Error on date for borrower " . $data->[$i]->{'borrowernumber'} .  ": $@date_due: " . $data->[$i]->{'date_due'} . "\ndatedue_days: " . $datedue_days . "\nSkipping";
     next;
     }
-    my $due_str = $datedue->output();
+    my $due_str = output_pref( { dt => $datedue, dateonly => 1 } );
     unless ( defined $data->[$i]->{'borrowernumber'} ) {
         print STDERR "ERROR in Getoverdues line $i: issues.borrowernumber IS NULL.  Repair 'issues' table now!  Skipping record.\n";
         next;    # Note: this doesn't solve everything.  After NULL borrowernumber, multiple issues w/ real borrowernumbers can pile up.
@@ -188,12 +189,12 @@ for ( my $i = 0 ; $i < scalar(@$data) ; $i++ ) {
     ( $datedue_days <= $today_days ) or next;    # or it's not overdue, right?
 
     $overdueItemsCounted++;
-    my ( $amount, $type, $unitcounttotal, $unitcount ) = CalcFine(
+    my ( $amount, $unitcounttotal, $unitcount ) = CalcFine(
         $data->[$i],
         $borrower->{'categorycode'},
         $branchcode,
-        dt_from_string($datedue->output('iso')),
-        dt_from_string($today->output('iso')),
+        $datedue,
+        $today,
     );
 
     # Reassign fine's amount if specified in command-line
@@ -206,9 +207,6 @@ for ( my $i = 0 ; $i < scalar(@$data) ; $i++ ) {
         next;
     }
 
-    # FIXME: $type NEVER gets populated by anything.
-    ( defined $type ) or $type = '';
-
     # 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' and !$borrowersalreadyapplied->{$data->[$i]->{'borrowernumber'}}) {
@@ -229,14 +227,13 @@ for ( my $i = 0 ; $i < scalar(@$data) ; $i++ ) {
             $sth4->execute($itemnumber);
             my $title = $sth4->fetchrow;
 
-            my $nextaccntno = C4::Accounts::getnextacctno($borrowernumber);
             my $desc        = "staticfine";
             my $query       = "INSERT INTO accountlines
-                        (borrowernumber,itemnumber,date,amount,description,accounttype,amountoutstanding,lastincrement,accountno)
-                                VALUES (?,?,now(),?,?,'F',?,?,?)";
+                        (borrowernumber,itemnumber,date,amount,description,accounttype,status,amountoutstanding)
+                                VALUES (?,?,now(),?,?,'OVERDUE','RETURNED',?)";
             my $sth2 = $dbh->prepare($query);
-            $bigdebug and warn "query: $query\nw/ args: $borrowernumber, $itemnumber, $amount, $desc, $amount, $amount, $nextaccntno\n";
-            $sth2->execute( $borrowernumber, $itemnumber, $amount, $desc, $amount, $amount, $nextaccntno );
+            $bigdebug and warn "query: $query\nw/ args: $borrowernumber, $itemnumber, $amount, $desc, $amount\n";
+            $sth2->execute( $borrowernumber, $itemnumber, $amount, $desc, $amount );
 
         }
     }