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

// Fixed first part of bug #PSCFV-3857

Browse Source
This commit is contained in:
dMetzger committed 2012-09-10 08:27:38 +00:00
1 parent f8a80ea6a5
commit 5a53f18cc4
2 files changed
+4 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

classes/Chart.php
+1 -1
View File
@@ -166,7 +166,7 @@ class Curve
{ {
$this->type = ''; $this->type = '';
if ($type == 'bars') if ($type == 'bars')
$this->type = 'bars:{show:true}'; $this->type = 'bars:{show:true,lineWidth:10}';
if ($type == 'steps') if ($type == 'steps')
$this->type = 'lines:{show:true,steps:true}'; $this->type = 'lines:{show:true,steps:true}';
} }
controllers/admin/AdminHomeController.php
+3 -2
View File
@@ -373,15 +373,16 @@ class AdminHomeControllerCore extends AdminController
<div id="stat_google">'; <div id="stat_google">';
$chart = new Chart(); $chart = new Chart();
$chart->getCurve(1)->setType('bars');
$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
SELECT total_paid / conversion_rate as total_converted, invoice_date SELECT total_paid / conversion_rate as total_converted, left(invoice_date, 10) as invoice_date
FROM '._DB_PREFIX_.'orders o FROM '._DB_PREFIX_.'orders o
WHERE valid = 1 WHERE valid = 1
AND invoice_date BETWEEN \''.date('Y-m-d', strtotime('-7 DAYS', time())).' 00:00:00\' AND \''.date('Y-m-d H:i:s').'\' AND invoice_date BETWEEN \''.date('Y-m-d', strtotime('-7 DAYS', time())).' 00:00:00\' AND \''.date('Y-m-d H:i:s').'\'
'.Shop::addSqlRestriction(Shop::SHARE_ORDER).' '.Shop::addSqlRestriction(Shop::SHARE_ORDER).'
'); ');
foreach ($result as $row) foreach ($result as $row)
$chart->getCurve(1)->setPoint(strtotime($row['invoice_date']), $row['total_converted']); $chart->getCurve(1)->setPoint(strtotime($row['invoice_date'].' 14:00:00'), $row['total_converted']);
$chart->setSize(580, 170); $chart->setSize(580, 170);
$chart->setTimeMode(strtotime('-7 DAYS', time()), time(), 'd'); $chart->setTimeMode(strtotime('-7 DAYS', time()), time(), 'd');
$currency = Tools::setCurrency($this->context->cookie); $currency = Tools::setCurrency($this->context->cookie);