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

// Oops

Browse Source
This commit is contained in:
Damien Metzger
2013-10-22 17:15:08 +02:00
parent cc1dd2510a
commit 4e8ba711d9
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminStatsController.php
+1 -2
View File
@@ -358,6 +358,7 @@ class AdminStatsControllerCore extends AdminStatsTabController
GROUP BY LEFT(`invoice_date`, 10)'); GROUP BY LEFT(`invoice_date`, 10)');
foreach ($result as $row) foreach ($result as $row)
$purchases[strtotime($row['date'])] = $row['total_purchase_price']; $purchases[strtotime($row['date'])] = $row['total_purchase_price'];
return $purchases;
} }
else else
return Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue(' return Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
@@ -370,8 +371,6 @@ class AdminStatsControllerCore extends AdminStatsTabController
LEFT JOIN `'._DB_PREFIX_.'order_detail` od ON o.id_order = od.id_order LEFT JOIN `'._DB_PREFIX_.'order_detail` od ON o.id_order = od.id_order
WHERE `invoice_date` BETWEEN "'.pSQL($date_from).' 00:00:00" AND "'.pSQL($date_to).' 23:59:59" WHERE `invoice_date` BETWEEN "'.pSQL($date_from).' 00:00:00" AND "'.pSQL($date_to).' 23:59:59"
'.Shop::addSqlRestriction(false, 'o')); '.Shop::addSqlRestriction(false, 'o'));
} }
public static function getExpenses($date_from, $date_to, $granularity = false) public static function getExpenses($date_from, $date_to, $granularity = false)