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

// Code cleaning

Browse Source
This commit is contained in:
Damien Metzger
2013-10-16 11:47:59 +02:00
parent 8f9fc10221
commit 7c5ff8073f
2 changed files with 38 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/dashproducts/dashproducts.php
+19 -21
View File
@@ -406,6 +406,7 @@ class Dashproducts extends Module
if (Validate::isLoadedObject($gapi) && $gapi->isConfigured()) if (Validate::isLoadedObject($gapi) && $gapi->isConfigured())
{ {
$products = array(); $products = array();
// Only works with the default product URL pattern at this time
if ($result = $gapi->requestReportData('ga:pagePath', 'ga:visits', $date_from, $date_to, '-ga:visits', 'ga:pagePath=~/([a-z]{2}/)?([a-z]+/)?[0-9][0-9]*\-.*\.html$', 1, 10)) if ($result = $gapi->requestReportData('ga:pagePath', 'ga:visits', $date_from, $date_to, '-ga:visits', 'ga:pagePath=~/([a-z]{2}/)?([a-z]+/)?[0-9][0-9]*\-.*\.html$', 1, 10))
foreach ($result as $row) foreach ($result as $row)
{ {
@@ -416,30 +417,27 @@ class Dashproducts extends Module
return $products; return $products;
} }
else else
{ return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
$sql = 'SELECT p.id_object, pv.counter SELECT p.id_object, pv.counter
FROM `'._DB_PREFIX_.'page_viewed` pv FROM `'._DB_PREFIX_.'page_viewed` pv
LEFT JOIN `'._DB_PREFIX_.'date_range` dr ON pv.`id_date_range` = dr.`id_date_range` LEFT JOIN `'._DB_PREFIX_.'date_range` dr ON pv.`id_date_range` = dr.`id_date_range`
LEFT JOIN `'._DB_PREFIX_.'page` p ON pv.`id_page` = p.`id_page` LEFT JOIN `'._DB_PREFIX_.'page` p ON pv.`id_page` = p.`id_page`
LEFT JOIN `'._DB_PREFIX_.'page_type` pt ON pt.`id_page_type` = p.`id_page_type` LEFT JOIN `'._DB_PREFIX_.'page_type` pt ON pt.`id_page_type` = p.`id_page_type`
WHERE pt.`name` = \'product\' WHERE pt.`name` = \'product\'
'.Shop::addSqlRestriction(false, 'pv').' '.Shop::addSqlRestriction(false, 'pv').'
AND dr.`time_start` BETWEEN "'.pSQL($date_from).'" AND "'.pSQL($date_to).'" AND dr.`time_start` BETWEEN "'.pSQL($date_from).'" AND "'.pSQL($date_to).'"
AND dr.`time_end` BETWEEN "'.pSQL($date_from).'" AND "'.pSQL($date_to).'"'; AND dr.`time_end` BETWEEN "'.pSQL($date_from).'" AND "'.pSQL($date_to).'"');
return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql);
}
} }
public function getMostSearchTerms($date_from, $date_to, $limit = 10) public function getMostSearchTerms($date_from, $date_to, $limit = 10)
{ {
$sql = 'SELECT `keywords`, count(`id_statssearch`) as count_keywords, `results` return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
FROM `'._DB_PREFIX_.'statssearch` ss SELECT `keywords`, count(`id_statssearch`) as count_keywords, `results`
WHERE ss.`date_add` BETWEEN "'.pSQL($date_from).'" AND "'.pSQL($date_to).'" FROM `'._DB_PREFIX_.'statssearch` ss
'.Shop::addSqlRestriction(false, 'ss').' WHERE ss.`date_add` BETWEEN "'.pSQL($date_from).'" AND "'.pSQL($date_to).'"
GROUP BY ss.`keywords` '.Shop::addSqlRestriction(false, 'ss').'
ORDER BY `count_keywords` DESC GROUP BY ss.`keywords`
LIMIT 0, '.(int)$limit; ORDER BY `count_keywords` DESC
return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); LIMIT '.(int)$limit);
} }
} }
modules/dashproducts/views/templates/hook/dashboard_zone_two.tpl
+19 -10
View File
@@ -39,17 +39,26 @@
<nav> <nav>
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li class="active"><a href="#dash_recent_orders" data-toggle="tab"> <li class="active">
<i class="icon-fire"></i> {l s='Recent Orders'}</a> <a href="#dash_recent_orders" data-toggle="tab">
<i class="icon-fire"></i> {l s='Recent Orders'}
</a>
</li>
<li>
<a href="#dash_best_sellers" data-toggle="tab">
<i class="icon-trophy"></i> {l s='Best Sellers'}
</a>
</li>
<li>
<a href="#dash_most_viewed" data-toggle="tab">
<i class="icon-eye-open"></i> {l s='Most Viewed'}
</a>
</li>
<li>
<a href="#dash_top_search" data-toggle="tab">
<i class="icon-search"></i> {l s='Top Search'}
</a>
</li> </li>
<li><a href="#dash_best_sellers" data-toggle="tab">
<i class="icon-trophy"></i> {l s='Best Sellers'}</a></li>
<li><a href="#dash_most_viewed" data-toggle="tab">
<i class="icon-eye-open"></i> {l s='Most Viewed'}</a></li>
<li><a href="#dash_top_search" data-toggle="tab">
<i class="icon-search"></i> {l s='Top Search'}</a></li>
<li><a href="#dash_best_sales" data-toggle="tab">
<i class="icon-thumbs-up"></i> {l s='Best Sales'}</a></li>
</ul> </ul>
</nav> </nav>
<div class="tab-content panel"> <div class="tab-content panel">