Bug 8435: (follow-up) prevent t/00-load.t failing

[koha.git] / reports / stats.print.pl

diff --git a/reports/stats.print.pl b/reports/stats.print.pl
index 2a6df6a..066aafa 100755 (executable)
--- a/reports/stats.print.pl
+++ b/reports/stats.print.pl
@@ -1,11 +1,11 @@
 #!/usr/bin/perl
 
 use strict;
+#use warnings; FIXME - Bug 2505
 use CGI;
 use C4::Output;
-use HTML::Template;
+
 use C4::Auth;
-use C4::Interface::CGI::Output;
 use C4::Context;
 use Date::Manip;
 use C4::Stats;
@@ -23,6 +23,7 @@ my $csv = Text::CSV_XS->new(
 
 my $input=new CGI;
 my $time=$input->param('time');
+my $time2=$input->param('time2');
 
 my @loop1;
 my @loop2;
@@ -56,6 +57,10 @@ if ($time eq ''){
         $date2=ParseDate('tomorrow');
 }
 
+if ($time2 ne ''){
+            $date=ParseDate($time);
+            $date2=ParseDate($time2);
+}
 
 my $date=UnixDate($date,'%Y-%m-%d');
 my $date2=UnixDate($date2,'%Y-%m-%d');
@@ -94,7 +99,8 @@ while ($i<$count ){
                my $sec=substr($payments[$i]{'timestamp'},12,2);
                my $time="$hour:$min:$sec";
                my $time2="$payments[$i]{'date'}";
-               my $branch=Getpaidbranch($time2,$payments[$i]{'borrowernumber'});
+#               my $branch=Getpaidbranch($time2,$payments[$i]{'borrowernumber'});
+              my $branch=$payments[$i]{'branch'};
 
                my @rows1 = ($branch,          # lets build up a row
                             $payments[$i]->{'datetime'},
@@ -102,17 +108,19 @@ while ($i<$count ){
                             $payments[$i]->{'firstname'},
                             $charges[$i2]->{'description'},
                             $charges[$i2]->{'accounttype'},
-                            sprintf("%.2f", $charges[$i2]->{'amount'}), # rounding amounts to 2dp
+   # rounding amounts to 2dp and adding dollar sign to make excel read it as currency format
+                            "\$".sprintf("%.2f", $charges[$i2]->{'amount'}), 
                             $payments[$i]->{'type'},
-                            $payments[$i]->{'value'});
+                            "\$".$payments[$i]->{'value'});
 
                push (@loop1, \@rows1);
+              $totalpaid = $totalpaid + $payments[$i]->{'value'};
            }
        } else {
          ++$totalwritten;
        }
+
        $i++; #increment the while loop
-       $totalpaid = $totalpaid + $payments[$i]->{'value'};
 }
 
 #get credits and append to the bottom of payments
@@ -129,11 +137,11 @@ while ($i<$count ){
                     $credits[$i]->{'firstname'},
                     $credits[$i]->{'description'},
                     $credits[$i]->{'accounttype'},
-                    $credits[$i]->{'amount'});
+                    "\$".$credits[$i]->{'amount'});
 
        push (@loop2, \@rows2);
-       $i++;
        $totalcredits = $totalcredits + $credits[$i]->{'amount'};
+       $i++;
 }
 
 #takes off first char minus sign "-100.00"
@@ -141,9 +149,9 @@ $totalcredits = substr($totalcredits, 1);
 
 print $input->header(
     -type       => 'application/vnd.ms-excel',
-    -attachment => "moo.csv",         
+    -attachment => "stats.csv",
 );
-print "Branch, Datetime, Surame, Firstnames, Description, Type, Invoice amount, Payment type, Payment Amount\n";
+print "Branch, Datetime, Surname, Firstnames, Description, Type, Invoice amount, Payment type, Payment Amount\n";
 
 
 for my $row ( @loop1 ) {
@@ -167,3 +175,4 @@ print ",,,,,,,\n";
 print ",,Total Amount Paid, $totalpaid\n";
 print ",,Total Number Written, $totalwritten\n";
 print ",,Total Amount Credits, $totalcredits\n";
+