From f9001c9bdb4f58352e2b5fffbad720a50f2abd68 Mon Sep 17 00:00:00 2001
From: Katrin Fischer <katrin.fischer.83@web.de>
Date: Sun, 7 Apr 2019 18:23:32 +0000
Subject: [PATCH] Bug 22090: Add missing information to cash register CSV file

Some information was missing from the CSV export file
of the Cash register report: manager surname, patron surname
and payment notes.

Also pretties up the column headers a bit and makes the
sequence between GUI and CSV export match.

To test:
- Make sure you have some fines and fees and payments in
  your system
- Make a search with the Cash register report
- Export results as CSV
- Proof read hader line and make sure contents match headings
- Verify first name and surname are shown for manager and patron
- Verify notes show up

Signed-off-by: Michal Denar <black23@gmail.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 1a2572915b4bf4a11b3a65c3a65e506610263a03)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 5469ae4eea46416410bddaef4934aa1db6e767f9)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
---
 .../en/includes/csv_headers/reports/cash_register_stats.tt  | 2 +-
 .../prog/en/modules/reports/cash_register_stats.tt          | 2 +-
 reports/cash_register_stats.pl                              | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/reports/cash_register_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/reports/cash_register_stats.tt
index 11ec56b9cd..a475c76d6c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/reports/cash_register_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/reports/cash_register_stats.tt
@@ -1 +1 @@
-[%- BLOCK -%]mfirstname[% sep %]card number[% sep %]firstname[% sep %]branchname[% sep %]date[% sep %]accounttype[% sep %]amount[% sep %]title[% sep %]barcode[% sep %]itype[%- END -%]
+[%- BLOCK -%]Manager name[% sep | html %]Patron cardnumber[% sep | html %]Patron name[% sep | html %]Transaction library[% sep | html %]Transaction date[% sep | html %]Transaction type[% sep |html %]Notes[% sep | html %]Amount[% sep | html %]Title[% sep | html %]Barcode[% sep | html %]Item type[%- END -%]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt
index d38df2f949..6a0074190a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt
@@ -132,7 +132,7 @@
                     </select>
                 </li>
                 <li>
-                    <label>Transaction branch</label>
+                    <label>Transaction library</label>
                     <select name="branch" id="branch">
                         <option value="ALL">All</option>
                         [% FOREACH branchloo IN branchloop %]
diff --git a/reports/cash_register_stats.pl b/reports/cash_register_stats.pl
index 0a1ff54fcc..b030f6684e 100755
--- a/reports/cash_register_stats.pl
+++ b/reports/cash_register_stats.pl
@@ -143,17 +143,17 @@ if ($do_it) {
         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 @rows;
             foreach my $row (@loopresult) {
                 my @rowValues;
-                push @rowValues, $row->{mfirstname},
+                push @rowValues, $row->{mfirstname}. ' ' . $row->{msurname},
                         $row->{cardnumber},
-                        $row->{bfirstname},
+                        $row->{bfirstname} . ' ' . $row->{bsurname},
                         $row->{branchname},
                         $row->{date},
                         $row->{accounttype},
+                        $row->{note},
                         $row->{amount},
                         $row->{title},
                         $row->{barcode},
-- 
2.39.5