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

Revert "Bug #PSCFV-5626 - Amended SQL query to correctly sum the totals for each day."

Browse Source 
This reverts commit b52dda80a0.
This commit is contained in:
Damon Skelhorn
2012-11-21 17:05:08 +00:00
parent b52dda80a0
commit ac1bcdf674
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminHomeController.php
+3 -3
View File
@@ -374,15 +374,15 @@ class AdminHomeControllerCore extends AdminController
$chart = new Chart();
$chart->getCurve(1)->setType('bars');
$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('SELECT sum(total_paid / conversion_rate) as total_converted, left(invoice_date, 10) as trimmed_invoice_date
$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
SELECT total_paid / conversion_rate as total_converted, left(invoice_date, 10) as invoice_date
FROM '._DB_PREFIX_.'orders o
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').'\'
'.Shop::addSqlRestriction(Shop::SHARE_ORDER).'
GROUP BY trimmed_invoice_date
');
foreach ($result as $row)
$chart->getCurve(1)->setPoint(strtotime($row['trimmed_invoice_date'].' 02:00:00'), $row['total_converted']);
$chart->getCurve(1)->setPoint(strtotime($row['invoice_date'].' 02:00:00'), $row['total_converted']);
$chart->setSize(580, 170);
$chart->setTimeMode(strtotime('-7 DAYS', time()), time(), 'd');
$currency = Tools::setCurrency($this->context->cookie);