Bug 18256: Koha::Items - Remove GetItemsCount

[koha.git] / reports / cash_register_stats.pl

diff --git a/reports/cash_register_stats.pl b/reports/cash_register_stats.pl
index 00561c3..7d29119 100755 (executable)
--- a/reports/cash_register_stats.pl
+++ b/reports/cash_register_stats.pl
@@ -71,7 +71,7 @@ if ($do_it) {
     if ($transaction_type eq 'ALL') { #All Transactons
         $whereTType = '';
     } elsif ($transaction_type eq 'ACT') { #Active
-        $whereTType = " accounttype NOT IN ('F', 'FU', 'FOR', 'M', 'L') AND ";
+        $whereTType = " accounttype IN ('Pay','C') AND ";
     } else { #Single transac type
         if ($transaction_type eq 'FORW') {
             $whereTType = " accounttype = 'FOR' OR accounttype = 'W' AND ";
@@ -137,35 +137,14 @@ if ($do_it) {
             total => $grantotal,
         );
     } else{
-        binmode STDOUT, ':encoding(UTF-8)';
-        my $q_errors;
         my $format = 'csv';
         my $reportname = $input->param('basename');
         my $reportfilename = $reportname ? "$reportname.$format" : "reportresults.$format" ;
         #my $reportfilename = "$reportname.html" ;
         my $delimiter = C4::Context->preference('delimiter') || ',';
-        my ( $content );
-        if ( $format eq 'csv' ) {
-            my $csv = Text::CSV::Encoded->new({ encoding_out => 'UTF-8', sep_char => $delimiter});
-            $csv or die "Text::CSV::Encoded->new({binary => 1}) FAILED: " . Text::CSV::Encoded->error_diag();
-            my @headers = ();
-            push @headers, "mfirstname",
-                        "cardnumber",
-                        "bfirstname",
-                        "branchname",
-                        "date",
-                        "accounttype",
-                        "amount",
-                        "title",
-                        "barcode",
-                        "itype";
-            if ($csv->combine(@headers)) {
-                $content .= Encode::decode('UTF-8', $csv->string()) . "\n";
-            } else {
-                push @$q_errors, { combine => 'HEADER ROW: ' . $csv->error_diag() } ;
-            }
+            my @rows;
             foreach my $row (@loopresult) {
-                my @rowValues = ();
+                my @rowValues;
                 push @rowValues, $row->{mfirstname},
                         $row->{cardnumber},
                         $row->{bfirstname},
@@ -176,24 +155,20 @@ if ($do_it) {
                         $row->{title},
                         $row->{barcode},
                         $row->{itype};
-                if ($csv->combine(@rowValues)) {
-                    $content .= Encode::decode('UTF-8',$csv->string()) . "\n";
-                } else {
-                    push @$q_errors, { combine => $csv->error_diag() } ;
+                    push (@rows, \@rowValues) ;
                 }
-            }
-        }
+                my @total;
+                for (1..6){push(@total,"")};
+                push(@total, $grantotal);
         print $input->header(
-            -type => 'text/csv',
-            -attachment=> $reportfilename
-        );
-        print $content;
-
-        print $delimiter x 6;
-        print $grantotal."\n";
-        foreach my $err (@$q_errors) {
-            print "# ERROR: " . (map {$_ . ": " . $err->{$_}} keys %$err) . "\n";
-        }   # here we print all the non-fatal errors at the end.  Not super smooth, but better than nothing.
+            -type       => 'text/csv',
+            -encoding    => 'utf-8',
+            -attachment => $reportfilename,
+            -name       => $reportfilename
+         );
+        my $csvTemplate = C4::Templates::gettemplate('reports/csv/cash_register_stats.tt', 'intranet', $input);
+            $csvTemplate->param(sep => $delimiter, rows => \@rows, total => \@total );
+        print $csvTemplate->output;
         exit(1);
     }
 
@@ -203,7 +178,7 @@ $template->param(
     beginDate        => $fromDate,
     endDate          => $toDate,
     transaction_type => $transaction_type,
-    branchloop       => C4::Branch::GetBranchesLoop($manager_branchcode),
+    branchloop       => Koha::Libraries->search({}, { order_by => ['branchname'] })->unblessed,
     manualinv_types  => $manualinv_types,
     CGIsepChoice => GetDelimiterChoices,
 );