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

Merge pull request #575 from dreammeup/development

Browse Source 
[-] BO : Correcting errors in order graph at admin home
This commit is contained in:
Gregory Roussac
2013-07-16 07:17:03 -07:00
parent 8d39f32506 82c7e3eeff
commit e7eae03508
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminHomeController.php
+3 -2
View File
@@ -377,12 +377,13 @@ class AdminHomeControllerCore extends AdminController
$chart = new Chart(); $chart = new Chart();
$chart->getCurve(1)->setType('bars'); $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, left(invoice_date, 10) as invoice_date SELECT SUM(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 total_paid > 0 AND total_paid > 0
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).'
GROUP BY DATE(invoice_date)
'); ');
foreach ($result as $row) foreach ($result as $row)
$chart->getCurve(1)->setPoint(strtotime($row['invoice_date'].' 02:00:00'), $row['total_converted']); $chart->getCurve(1)->setPoint(strtotime($row['invoice_date'].' 02:00:00'), $row['total_converted']);