From deaada093e3db480535f19be39e5aa98aa81aeed Mon Sep 17 00:00:00 2001 From: genevieve Date: Tue, 15 Sep 2015 11:18:49 -0400 Subject: [PATCH] [PASSED QA] Bug 6934: Fix code in CashRegisterStats (dataTables pagination, more accurate descriptions, add a delimiter pull down, change C4::Dates to Koha::DateUtils) I cleaned up the code according to comment #23. I got rid of DHTMLcalendar_dateformat, beacause it wasn't use in cash_register_stats.tt. C4::Dates is deprecated, Koha::DateUtils is now used. Some column names are changed and the pagination for the dataTables is fixed. Signed-off-by: Hector Castro Signed-off-by: Katrin Fischer --- .../prog/en/includes/reports-menu.inc | 2 +- .../prog/en/modules/reports/cash_register_stats.tt | 52 +++++++++++++--------- reports/cash_register_stats.pl | 31 +++++++------ 3 files changed, 49 insertions(+), 36 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc index 41dd0d2..03b4b64 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc @@ -10,7 +10,7 @@
  • Catalog
  • Circulation
  • Serials
  • -
  • Cash Register
  • +
  • Cash register
  • Holds
  • 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 4a5c10e..4ec7fe1 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 @@ -1,17 +1,19 @@ +[% USE KohaDates %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Reports [% IF ( do_it ) %]› Cash Register Statistics › Results[% ELSE %]› Cash Register Statistics[% END %] +Koha › Reports [% IF ( do_it ) %]› Cash register statistics › Results[% ELSE %]› Cash register statistics[% END %] [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'datatables.inc' %] [% INCLUDE 'datatables-strings.inc' %] - + [% INCLUDE 'calendar.inc' %]