diff --git a/zc_plugins/SalesReport/v4.0.0/admin/includes/classes/sales_report2.php b/zc_plugins/SalesReport/v4.0.0/admin/includes/classes/sales_report2.php
index 1926ecc..6f475a6 100644
--- a/zc_plugins/SalesReport/v4.0.0/admin/includes/classes/sales_report2.php
+++ b/zc_plugins/SalesReport/v4.0.0/admin/includes/classes/sales_report2.php
@@ -77,7 +77,19 @@ class sales_report2 extends base
$timeframe_id,
$timeframe_sort;
- function __construct($parms)
+ // -----
+ // Static methods used by the report to display the up- and down-arrow icons.
+ //
+ public static function getUpArrowIcon()
+ {
+ return '';
+ }
+ public static function getDownArrowIcon()
+ {
+ return '';
+ }
+
+ public function __construct($parms)
{
global $db;
diff --git a/zc_plugins/SalesReport/v4.0.0/admin/stats_sales_report2.php b/zc_plugins/SalesReport/v4.0.0/admin/stats_sales_report2.php
index 183fe70..99ff1cc 100644
--- a/zc_plugins/SalesReport/v4.0.0/admin/stats_sales_report2.php
+++ b/zc_plugins/SalesReport/v4.0.0/admin/stats_sales_report2.php
@@ -25,7 +25,6 @@
//_TODO ability filter results by manufacturer (not just sort!)
//_TODO Matrix -> checkboxes for "per manufacturer" / "per product" / "per customer" stats
-
require 'includes/application_top.php';
require DIR_WS_CLASSES . 'currencies.php';
@@ -345,10 +344,10 @@
//
$new_window = isset($_GET['new_window']);
$_SESSION['sales_report_new_window'] = $new_window;
-
+
// start the page parsing timer
$parse_start = get_microtime();
-
+
// if any required field is empty, cancel the report and alert the user
// JavaScript checks should usually catch these, this is "just in case"
if (!$start_date || !$end_date || !$date_target || !$detail_level || !$output_format) {
@@ -388,7 +387,7 @@
// we have to pass the sorting values of the form since
// the class instantiation does not require them
$sr->output_csv($csv_header);
- exit;
+ zen_exit();
}
} // END if ($output_format != 'none')
}
@@ -409,17 +408,25 @@
';
}
?>
@@ -1026,10 +1180,10 @@
// because the displayed data is so different from timeframe
// totals, otherwise column layout is a nightmare :)
$colspan = 13;
- if ($display_tax) {
+ if ($display_tax === true) {
$colspan += 2;
}
- if ($order_total_validation) {
+ if ($order_total_validation === true) {
$colspan += 1;
}
?>
@@ -1037,75 +1191,123 @@
-
-
-
+
+
+
+
+
+
+
+
+
-
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
$p_data) {
?>
-
-
-
+
+
+
+
+
+
+
+
+
-
+
+
+
-
-
format($p_data['base_price']); ?>
-
format($p_data['final_price']); ?>
-
+
+
+
+
+ format($p_data['base_price']); ?>
+
+
+ format($p_data['final_price']); ?>
+
+
+
+
-
format($p_data['tax']); ?>
+
+ format($p_data['tax']); ?>
+
-
format($p_data['onetime_charges']); ?>
+
+ format($p_data['onetime_charges']); ?>
+
-
format($p_data['total']); ?>
+
+ format($p_data['total']); ?>
+
-
format($p_data['grand']); ?>
+
+ format($p_data['grand']); ?>
+
$p_data) {
@@ -1115,90 +1317,148 @@
detail_level === 'matrix' && isset($timeframe['orders']) && isset($timeframe['products'])) { // display the data matrix
$colspan = 13;
- if ($display_tax) {
+ if ($display_tax === true) {
$colspan += 2;
}
- if ($order_total_validation) {
+ if ($order_total_validation === true) {
$colspan += 1;
}
?>