From 61d10abc7621d2117a62f8f536824cfe008b9aa6 Mon Sep 17 00:00:00 2001
From: Damien Metzger <damien.metzger@prestashop.com>
Date: Tue, 3 Sep 2013 10:34:21 +0200
Subject: [PATCH] // Use date_from and date_to in dashboard stats

---
 controllers/admin/AdminDashboardController.php |  4 ++--
 modules/dashactivity/dashactivity.php          | 10 ++++++++--
 modules/dashtrends/dashtrends.php              |  4 ++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/controllers/admin/AdminDashboardController.php b/controllers/admin/AdminDashboardController.php
index f7a5665b7..e4e672561 100644
--- a/controllers/admin/AdminDashboardController.php
+++ b/controllers/admin/AdminDashboardController.php
@@ -81,9 +81,9 @@ class AdminDashboardControllerCore extends AdminController
 		$params = array(
 			'date_from' => $this->context->employee->stats_date_from,
 			'date_to' => $this->context->employee->stats_date_to,
-			);
+		);
 		
-		$datas = Hook::exec('dashboardDatas', array(), $id_module, true);
+		$datas = Hook::exec('dashboardDatas', $params, $id_module, true);
 		die(Tools::jsonEncode($datas));
 	}
 }
\ No newline at end of file
diff --git a/modules/dashactivity/dashactivity.php b/modules/dashactivity/dashactivity.php
index 13205e299..62c0f84c6 100644
--- a/modules/dashactivity/dashactivity.php
+++ b/modules/dashactivity/dashactivity.php
@@ -54,9 +54,15 @@ class Dashactivity extends Module
 	
 	public function hookDashboardDatas($params)
 	{
+		$order_nbr = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
+		SELECT COUNT(o.`id_order`)
+		FROM `'._DB_PREFIX_.'orders` o
+		WHERE o.`invoice_date` BETWEEN "'.pSQL($params['date_from']).'" AND "'.pSQL($params['date_to']).'"
+		'.Shop::addSqlRestriction(Shop::SHARE_ORDER, 'o'));
+
 		return array(
 			'data_value' => array(
-				'order_nbr' => 365,
+				'order_nbr' => $order_nbr,
 				'pending_orders' => 120,
 				'return_exchanges' => 35,
 				'abandoned_cart' => 12,
@@ -72,7 +78,7 @@ class Dashactivity extends Module
 				'unique_visitors' => 3500,
 				),
 			'data_trends' => array(
-				'orders_trends' => array('way' => 'down', 'value' => 0.66),
+				'orders_trends' => array('way' => 'down', 'value' => 0.42),
 				)
 			);
 	}
diff --git a/modules/dashtrends/dashtrends.php b/modules/dashtrends/dashtrends.php
index f7ad51266..3f1a280a8 100644
--- a/modules/dashtrends/dashtrends.php
+++ b/modules/dashtrends/dashtrends.php
@@ -66,13 +66,13 @@ class Dashtrends extends Module
 			$visits_score = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
 			SELECT COUNT(c.`id_connections`)
 			FROM `'._DB_PREFIX_.'connections` c
-			WHERE c.`date_add` BETWEEN '.ModuleGraph::getDateBetween().'
+			WHERE c.`date_add` BETWEEN "'.pSQL($params['date_from']).'" AND "'.pSQL($params['date_to']).'"
 			'.Shop::addSqlRestriction(false, 'c'));
 		}
 		$row = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow('
 		SELECT COUNT(o.`id_order`) as orders_score, SUM(o.`total_paid_tax_excl` / o.conversion_rate) as sales_score
 		FROM `'._DB_PREFIX_.'orders` o
-		WHERE o.`invoice_date` BETWEEN '.ModuleGraph::getDateBetween().'
+		WHERE o.`invoice_date` BETWEEN "'.pSQL($params['date_from']).'" AND "'.pSQL($params['date_to']).'"
 		'.Shop::addSqlRestriction(Shop::SHARE_ORDER, 'o'));
 		extract($row);