diff --git a/classes/Referrer.php b/classes/Referrer.php
index c05720fac..bf90593eb 100644
--- a/classes/Referrer.php
+++ b/classes/Referrer.php
@@ -139,21 +139,22 @@ class ReferrerCore extends ObjectModel
}
$sql = 'SELECT COUNT(DISTINCT cs.id_connections_source) AS visits,
- COUNT(DISTINCT cs.id_connections) as visitors,
- COUNT(DISTINCT c.id_guest) as uniqs,
- COUNT(DISTINCT cp.time_start) as pages
- FROM '._DB_PREFIX_.'referrer_cache rc
- LEFT JOIN '._DB_PREFIX_.'referrer r ON rc.id_referrer = r.id_referrer
- LEFT JOIN '._DB_PREFIX_.'referrer_shop rs ON r.id_referrer = rs.id_referrer
- LEFT JOIN '._DB_PREFIX_.'connections_source cs ON rc.id_connections_source = cs.id_connections_source
- LEFT JOIN '._DB_PREFIX_.'connections c ON cs.id_connections = c.id_connections
- LEFT JOIN '._DB_PREFIX_.'connections_page cp ON cp.id_connections = c.id_connections
- '.$join.'
- WHERE cs.date_add BETWEEN '.ModuleGraph::getDateBetween($employee).'
- '.Shop::addSqlRestriction(false, 'rs').'
- '.Shop::addSqlRestriction(false, 'c').'
- AND rc.id_referrer = '.(int)$this->id
- .$where;
+ COUNT(DISTINCT cs.id_connections) as visitors,
+ COUNT(DISTINCT c.id_guest) as uniqs,
+ COUNT(DISTINCT cp.time_start) as pages
+ FROM '._DB_PREFIX_.'referrer_cache rc
+ LEFT JOIN '._DB_PREFIX_.'referrer r ON rc.id_referrer = r.id_referrer
+ LEFT JOIN '._DB_PREFIX_.'referrer_shop rs ON r.id_referrer = rs.id_referrer
+ LEFT JOIN '._DB_PREFIX_.'connections_source cs ON rc.id_connections_source = cs.id_connections_source
+ LEFT JOIN '._DB_PREFIX_.'connections c ON cs.id_connections = c.id_connections
+ LEFT JOIN '._DB_PREFIX_.'connections_page cp ON cp.id_connections = c.id_connections
+ '.$join.'
+ WHERE 1'.
+ ((isset($employee->stats_date_from) && isset($employee->stats_date_from))? ' AND cs.date_add BETWEEN \''.pSQL($employee->stats_date_from).' 00:00:00\' AND \''.pSQL($employee->stats_date_to).' 23:59:59\'' : '').
+ Shop::addSqlRestriction(false, 'rs').
+ Shop::addSqlRestriction(false, 'c').
+ ' AND rc.id_referrer = '.(int)$this->id.
+ $where;
return Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow($sql);
}
diff --git a/modules/trackingfront/header.tpl b/modules/trackingfront/header.tpl
index 5008e28c2..644a10465 100644
--- a/modules/trackingfront/header.tpl
+++ b/modules/trackingfront/header.tpl
@@ -31,7 +31,8 @@
-
+
+
diff --git a/modules/trackingfront/trackingfront.php b/modules/trackingfront/trackingfront.php
index bf68b987f..89067df3e 100644
--- a/modules/trackingfront/trackingfront.php
+++ b/modules/trackingfront/trackingfront.php
@@ -50,6 +50,7 @@ class TrackingFront extends Module
$fakeEmployee = new Employee();
$fakeEmployee->stats_date_from = $this->context->cookie->stats_date_from;
$fakeEmployee->stats_date_to = $this->context->cookie->stats_date_to;
+
$result = Db::getInstance()->getRow('
SELECT `id_referrer`
FROM `'._DB_PREFIX_.'referrer`
@@ -95,10 +96,13 @@ class TrackingFront extends Module
$this->smarty->assign('errors', $errors);
}
+ $from = date('Y-m-d');
+ $to = date('Y-m-d');
+
if (Tools::isSubmit('submitDatePicker'))
{
- $this->context->cookie->stats_date_from = Tools::getValue('datepickerFrom');
- $this->context->cookie->stats_date_to = Tools::getValue('datepickerTo');
+ $from = Tools::getValue('datepickerFrom');
+ $to= Tools::getValue('datepickerTo');
}
if (Tools::isSubmit('submitDateDay'))
{
@@ -133,6 +137,8 @@ class TrackingFront extends Module
$from = (date('Y') - 1).date('-01-01');
$to = (date('Y') - 1).date('-12-31');
}
+ $this->context->cookie->stats_date_from = $from;
+ $this->context->cookie->stats_date_to = $to;
}
public function isLogged()
@@ -187,15 +193,16 @@ class TrackingFront extends Module
$echo = '