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

[-] MO : Trackingfront, could not load employee stats date

Browse Source
This commit is contained in:
gRoussac
2013-10-12 23:24:32 +02:00
parent ee29f4365e
commit f9cfde9a05
3 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
classes/Referrer.php
View File

@@ -139,21 +139,22 @@ class ReferrerCore extends ObjectModel
} }
$sql = 'SELECT COUNT(DISTINCT cs.id_connections_source) AS visits, $sql = 'SELECT COUNT(DISTINCT cs.id_connections_source) AS visits,
COUNT(DISTINCT cs.id_connections) as visitors, COUNT(DISTINCT cs.id_connections) as visitors,
COUNT(DISTINCT c.id_guest) as uniqs, COUNT(DISTINCT c.id_guest) as uniqs,
COUNT(DISTINCT cp.time_start) as pages COUNT(DISTINCT cp.time_start) as pages
FROM '._DB_PREFIX_.'referrer_cache rc FROM '._DB_PREFIX_.'referrer_cache rc
LEFT JOIN '._DB_PREFIX_.'referrer r ON rc.id_referrer = r.id_referrer 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_.'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_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 c ON cs.id_connections = c.id_connections
LEFT JOIN '._DB_PREFIX_.'connections_page cp ON cp.id_connections = c.id_connections LEFT JOIN '._DB_PREFIX_.'connections_page cp ON cp.id_connections = c.id_connections
'.$join.' '.$join.'
WHERE cs.date_add BETWEEN '.ModuleGraph::getDateBetween($employee).' WHERE 1'.
'.Shop::addSqlRestriction(false, 'rs').' ((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, 'c').' Shop::addSqlRestriction(false, 'rs').
AND rc.id_referrer = '.(int)$this->id Shop::addSqlRestriction(false, 'c').
.$where; ' AND rc.id_referrer = '.(int)$this->id.
$where;
return Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow($sql); return Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow($sql);
} }

3
modules/trackingfront/header.tpl
View File

@@ -31,7 +31,8 @@
<script type="text/javascript" src="{$smarty.const._PS_JS_DIR_}jquery/jquery-1.7.2.min.js"></script> <script type="text/javascript" src="{$smarty.const._PS_JS_DIR_}jquery/jquery-1.7.2.min.js"></script>
<script type="text/javascript" src="{$smarty.const._PS_JS_DIR_}jquery/ui/jquery.ui.core.min.js"></script> <script type="text/javascript" src="{$smarty.const._PS_JS_DIR_}jquery/ui/jquery.ui.core.min.js"></script>
<script type="text/javascript" src="{$smarty.const._PS_JS_DIR_}jquery/ui/jquery.ui.datepicker.min.js"></script> <script type="text/javascript" src="{$smarty.const._PS_JS_DIR_}jquery/ui/jquery.ui.datepicker.min.js"></script>
<link type="text/css" rel="stylesheet" href="{$smarty.const._PS_JS_DIR_}jquery/themes/base/jquery.ui.datepicker.css" /> <link type="text/css" rel="stylesheet" href="{$smarty.const._PS_JS_DIR_}jquery/ui/themes/base/jquery.ui.all.css" />
<link type="text/css" rel="stylesheet" href="{$smarty.const._PS_JS_DIR_}jquery/ui/themes/base/jquery.ui.datepicker.css" />
</head> </head>
<body> <body>

29
modules/trackingfront/trackingfront.php
View File

@@ -50,6 +50,7 @@ class TrackingFront extends Module
$fakeEmployee = new Employee(); $fakeEmployee = new Employee();
$fakeEmployee->stats_date_from = $this->context->cookie->stats_date_from; $fakeEmployee->stats_date_from = $this->context->cookie->stats_date_from;
$fakeEmployee->stats_date_to = $this->context->cookie->stats_date_to; $fakeEmployee->stats_date_to = $this->context->cookie->stats_date_to;
$result = Db::getInstance()->getRow(' $result = Db::getInstance()->getRow('
SELECT `id_referrer` SELECT `id_referrer`
FROM `'._DB_PREFIX_.'referrer` FROM `'._DB_PREFIX_.'referrer`
@@ -95,10 +96,13 @@ class TrackingFront extends Module
$this->smarty->assign('errors', $errors); $this->smarty->assign('errors', $errors);
} }
$from = date('Y-m-d');
$to = date('Y-m-d');
if (Tools::isSubmit('submitDatePicker')) if (Tools::isSubmit('submitDatePicker'))
{ {
$this->context->cookie->stats_date_from = Tools::getValue('datepickerFrom'); $from = Tools::getValue('datepickerFrom');
$this->context->cookie->stats_date_to = Tools::getValue('datepickerTo'); $to= Tools::getValue('datepickerTo');
} }
if (Tools::isSubmit('submitDateDay')) if (Tools::isSubmit('submitDateDay'))
{ {
@@ -133,6 +137,8 @@ class TrackingFront extends Module
$from = (date('Y') - 1).date('-01-01'); $from = (date('Y') - 1).date('-01-01');
$to = (date('Y') - 1).date('-12-31'); $to = (date('Y') - 1).date('-12-31');
} }
$this->context->cookie->stats_date_from = $from;
$this->context->cookie->stats_date_to = $to;
} }
public function isLogged() public function isLogged()
@@ -187,15 +193,16 @@ class TrackingFront extends Module
$echo = ' $echo = '
<script type="text/javascript"> <script type="text/javascript">
$("#datepickerFrom").datepicker({ $(document).ready(function() {
prevText:"", $("#datepickerFrom").datepicker({
nextText:"", prevText:"",
dateFormat:"yy-mm-dd"}); nextText:"",
$("#datepickerTo").datepicker({ dateFormat:"yy-mm-dd"});
prevText:"", $("#datepickerTo").datepicker({
nextText:"", prevText:"",
dateFormat:"yy-mm-dd"}); nextText:"",
dateFormat:"yy-mm-dd"});
});
function updateValues() function updateValues()
{ {
$.getJSON("stats.php",{ajaxProductFilter:1,id_referrer:'.$referrer->id.',token:"'.$this->context->cookie->tracking_passwd.'",id_product:0}, $.getJSON("stats.php",{ajaxProductFilter:1,id_referrer:'.$referrer->id.',token:"'.$this->context->cookie->tracking_passwd.'",id_product:0},