dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Use date_from and date_to in dashboard stats

Browse Source
This commit is contained in:
Damien Metzger
2013-09-03 10:34:21 +02:00
parent 7b902ac99d
commit 61d10abc76
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminDashboardController.php
+2 -2
View File
@@ -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));
}
}
modules/dashactivity/dashactivity.php
+8 -2
View File
@@ -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),
)
);
}
modules/dashtrends/dashtrends.php
+2 -2
View File
@@ -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);