From c6de572462aad636056e8fbe0bacf5bffd5c6d79 Mon Sep 17 00:00:00 2001
From: Aleisha Amohia <aleishaamohia@hotmail.com>
Date: Wed, 17 Jan 2018 08:32:56 +0000
Subject: [PATCH] Bug 16486: Adding timestamp column to cash register
 statistics

To test:
1) Go to Reports -> Cash Register
2) Fill in some fields and submit the report
3) Confirm the timestamp (updated) column is correct
4) Confirm there are no warns

Signed-off-by: Marjorie Barry-Vila <marjorie.barry-vila@collecto.ca>
---
 .../intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt    | 4 +++-
 reports/cash_register_stats.pl                                      | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

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 36c7f7f..b21e730 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
@@ -178,7 +178,8 @@
             <th>Patron card number</th>
             <th>Patron name</th>
             <th>Transaction branch</th>
-            <th>Transaction date</th>
+            <th>Transaction original date</th>
+            <th>Transaction updated</th>
             <th>Transaction type</th>
             <th>Notes</th>
             <th>Amount</th>
@@ -194,6 +195,7 @@
                 <td>[% loopresul.bfirstname %] [% loopresul.bsurname %]</td>
                 <td>[% loopresul.branchname %]</td>
                 <td>[% loopresul.date | $KohaDates %]</td>
+                <td>[% loopresul.timestamp | $KohaDates with_hours => 1 %]</td>
                 <td>
                     [% IF loopresul.accounttype == "ACT" %]
                         <span>All payments to the library</span>
diff --git a/reports/cash_register_stats.pl b/reports/cash_register_stats.pl
index 0a1ff54..6a93ace 100755
--- a/reports/cash_register_stats.pl
+++ b/reports/cash_register_stats.pl
@@ -61,9 +61,9 @@ my $manualinv_types = $sth_manualinv->fetchall_arrayref({});
 
 if ($do_it) {
 
-    $fromDate = output_pref({ dt => eval { dt_from_string($input->param("from")) } || dt_from_string,
+    $fromDate = output_pref({ dt => eval { dt_from_string(scalar $input->param("from")) } || dt_from_string,
             dateformat => 'sql', dateonly => 1 }); #for sql query
-    $toDate   = output_pref({ dt => eval { dt_from_string($input->param("to")) } || dt_from_string,
+    $toDate   = output_pref({ dt => eval { dt_from_string(scalar $input->param("to")) } || dt_from_string,
             dateformat => 'sql', dateonly => 1 }); #for sql query
 
     my $whereTType = q{};
@@ -93,7 +93,7 @@ if ($do_it) {
     SELECT round(amount,2) AS amount, description,
         bo.surname AS bsurname, bo.firstname AS bfirstname, m.surname AS msurname, m.firstname AS mfirstname,
         bo.cardnumber, br.branchname, bo.borrowernumber,
-        al.borrowernumber, DATE(al.date) as date, al.accounttype, al.amountoutstanding, al.note,
+        al.borrowernumber, DATE(al.date) as date, al.timestamp, al.accounttype, al.amountoutstanding, al.note,
         bi.title, bi.biblionumber, i.barcode, i.itype
         FROM accountlines al
         LEFT JOIN borrowers bo ON (al.borrowernumber = bo.borrowernumber)
-- 
2.7.4