From 481cb5c28a2f80f8be9d1e04035cae415d7054af Mon Sep 17 00:00:00 2001 From: Zollner Robert Date: Fri, 4 Oct 2013 23:30:24 +0300 Subject: [PATCH 1/3] [-] BO : Fixed Bug what displayed Dashboard sales statistics in wrong currency --- controllers/admin/AdminHomeController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/controllers/admin/AdminHomeController.php b/controllers/admin/AdminHomeController.php index 45797273e..279ce6d32 100644 --- a/controllers/admin/AdminHomeController.php +++ b/controllers/admin/AdminHomeController.php @@ -303,7 +303,7 @@ class AdminHomeControllerCore extends AdminController public function getMonthlyStatistics() { - $currency = Tools::setCurrency($this->context->cookie); + $currency = Tools::setCurrency(NULL); $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow(' SELECT IFNULL(SUM(`total_paid_real` / conversion_rate), "0") as total_sales, COUNT(*) as total_orders FROM `'._DB_PREFIX_.'orders` @@ -400,7 +400,7 @@ class AdminHomeControllerCore extends AdminController $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); + $currency = Tools::setCurrency(NULL); $chart->getCurve(1)->setLabel($this->l('Sales + Tax').' ('.strtoupper($currency->iso_code).')'); $content .= $chart->fetch(); From 1787923c4c20b2d6c809ac271d65fc0a5e653b2f Mon Sep 17 00:00:00 2001 From: Zollner Robert Date: Sat, 5 Oct 2013 00:42:29 +0300 Subject: [PATCH 2/3] [-] BO : Fixed Bug what displayed Dashboard sales statistics in wrong currency (changed NULL to lowercase) --- controllers/admin/AdminHomeController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/controllers/admin/AdminHomeController.php b/controllers/admin/AdminHomeController.php index 279ce6d32..d923c051c 100644 --- a/controllers/admin/AdminHomeController.php +++ b/controllers/admin/AdminHomeController.php @@ -303,7 +303,7 @@ class AdminHomeControllerCore extends AdminController public function getMonthlyStatistics() { - $currency = Tools::setCurrency(NULL); + $currency = Tools::setCurrency(null); $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow(' SELECT IFNULL(SUM(`total_paid_real` / conversion_rate), "0") as total_sales, COUNT(*) as total_orders FROM `'._DB_PREFIX_.'orders` @@ -400,7 +400,7 @@ class AdminHomeControllerCore extends AdminController $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(NULL); + $currency = Tools::setCurrency(null); $chart->getCurve(1)->setLabel($this->l('Sales + Tax').' ('.strtoupper($currency->iso_code).')'); $content .= $chart->fetch(); From 30adb0932da79aae9700e280f3970292e6d2e95d Mon Sep 17 00:00:00 2001 From: Zollner Robert Date: Mon, 7 Oct 2013 23:42:26 +0300 Subject: [PATCH 3/3] [-] BO : pass correct typed parameter to setCurrency --- controllers/admin/AdminHomeController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/controllers/admin/AdminHomeController.php b/controllers/admin/AdminHomeController.php index d923c051c..50fa95051 100644 --- a/controllers/admin/AdminHomeController.php +++ b/controllers/admin/AdminHomeController.php @@ -303,7 +303,7 @@ class AdminHomeControllerCore extends AdminController public function getMonthlyStatistics() { - $currency = Tools::setCurrency(null); + $currency = Tools::setCurrency((object)array('id_currency' => null)); $result = Db::getInstance(_PS_USE_SQL_SLAVE_)->getRow(' SELECT IFNULL(SUM(`total_paid_real` / conversion_rate), "0") as total_sales, COUNT(*) as total_orders FROM `'._DB_PREFIX_.'orders` @@ -400,7 +400,7 @@ class AdminHomeControllerCore extends AdminController $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(null); + $currency = Tools::setCurrency((object)array('id_currency' => null)); $chart->getCurve(1)->setLabel($this->l('Sales + Tax').' ('.strtoupper($currency->iso_code).')'); $content .= $chart->fetch();