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

// Fixed chart for period before the store creation

Browse Source
This commit is contained in:
Damien Metzger
2013-10-24 11:17:33 +02:00
parent d173b2d4cd
commit a34784a15d
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/data/theme.sql
+1 -1
View File
@@ -125,7 +125,7 @@ UPDATE `PREFIX_hook_module` SET position = 5
WHERE id_module = (SELECT id_module FROM `PREFIX_module` WHERE name = 'blockmyaccountfooter') WHERE id_module = (SELECT id_module FROM `PREFIX_module` WHERE name = 'blockmyaccountfooter')
AND id_hook = @id_hook; AND id_hook = @id_hook;
UPDATE `PREFIX_hook_module` SET position = 3 UPDATE `PREFIX_hook_module` SET position = 6
WHERE id_module = (SELECT id_module FROM `PREFIX_module` WHERE name = 'blockcontactinfos') WHERE id_module = (SELECT id_module FROM `PREFIX_module` WHERE name = 'blockcontactinfos')
AND id_hook = @id_hook; AND id_hook = @id_hook;
modules/dashtrends/dashtrends.php
+6 -3
View File
@@ -238,15 +238,18 @@ class Dashtrends extends Module
$chart_data = array(); $chart_data = array();
foreach (array_keys($this->dashboard_data) as $chart_key) foreach (array_keys($this->dashboard_data) as $chart_key)
{ {
$calibration = array_sum($this->dashboard_data[$chart_key]) / count($this->dashboard_data[$chart_key]); $chart_data[$chart_key] = $chart_data_compare[$chart_key] = array();
if (!$count = count($this->dashboard_data[$chart_key]))
continue;
$calibration = array_sum($this->dashboard_data[$chart_key]) / $count;
$chart_data[$chart_key] = array();
foreach ($this->dashboard_data[$chart_key] as $key => $value) foreach ($this->dashboard_data[$chart_key] as $key => $value)
$chart_data[$chart_key][] = array(1000 * $key, $calibration ? 100 * $value / $calibration : 0); $chart_data[$chart_key][] = array(1000 * $key, $calibration ? 100 * $value / $calibration : 0);
if ($this->dashboard_data_compare) if ($this->dashboard_data_compare)
{ {
$chart_data_compare[$chart_key] = array();
foreach ($this->dashboard_data_compare[$chart_key] as $key => $value) foreach ($this->dashboard_data_compare[$chart_key] as $key => $value)
$chart_data_compare[$chart_key][] = array(1000 * $key, $calibration ? 100 * $value / $calibration : 0); $chart_data_compare[$chart_key][] = array(1000 * $key, $calibration ? 100 * $value / $calibration : 0);
} }