From 86316e3a32adf670abe2e76b7dc30d612d577b7a Mon Sep 17 00:00:00 2001 From: Damon Skelhorn Date: Wed, 21 Nov 2012 15:02:59 +0000 Subject: [PATCH 1/3] Bug #PSCFV-5637 - Order reference (string) if passed in from a 1.4 theme in id_order is cast into a integer which destroys the value. --- controllers/front/GuestTrackingController.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/controllers/front/GuestTrackingController.php b/controllers/front/GuestTrackingController.php index f5452ab6d..e9a38439b 100644 --- a/controllers/front/GuestTrackingController.php +++ b/controllers/front/GuestTrackingController.php @@ -51,17 +51,18 @@ class GuestTrackingControllerCore extends FrontController if (Tools::isSubmit('submitGuestTracking') || Tools::isSubmit('submitTransformGuestToCustomer')) { // These lines are here for retrocompatibility with old theme - $id_order = (int)Tools::getValue('id_order'); + $id_order = Tools::getValue('id_order'); $order_collection = array(); if ($id_order) { if (is_numeric($id_order)) + { $order = new Order((int)$id_order); + if (Validate::isLoadedObject($order)) + $order_collection[] = $order; + } else - $order = Order::getByReference($id_order); - - if (Validate::isLoadedObject($order)) - $order_collection[] = $order; + $order_collection = Order::getByReference($id_order); } // Get order reference, ignore package reference (after the #, on the order reference) From b52dda80a041be057a95ca0313a1873477fda063 Mon Sep 17 00:00:00 2001 From: Damon Skelhorn Date: Wed, 21 Nov 2012 16:48:47 +0000 Subject: [PATCH 2/3] Bug #PSCFV-5626 - Amended SQL query to correctly sum the totals for each day. --- controllers/admin/AdminHomeController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/controllers/admin/AdminHomeController.php b/controllers/admin/AdminHomeController.php index 6a73b8d58..246ec0012 100644 --- a/controllers/admin/AdminHomeController.php +++ b/controllers/admin/AdminHomeController.php @@ -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 total_paid / conversion_rate as total_converted, left(invoice_date, 10) as invoice_date + $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 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['invoice_date'].' 02:00:00'), $row['total_converted']); + $chart->getCurve(1)->setPoint(strtotime($row['trimmed_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); From ac1bcdf674ec7ad1e218fc65f6f93ea7e6b369b9 Mon Sep 17 00:00:00 2001 From: Damon Skelhorn Date: Wed, 21 Nov 2012 17:05:08 +0000 Subject: [PATCH 3/3] Revert "Bug #PSCFV-5626 - Amended SQL query to correctly sum the totals for each day." This reverts commit b52dda80a041be057a95ca0313a1873477fda063. --- controllers/admin/AdminHomeController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/controllers/admin/AdminHomeController.php b/controllers/admin/AdminHomeController.php index 246ec0012..6a73b8d58 100644 --- a/controllers/admin/AdminHomeController.php +++ b/controllers/admin/AdminHomeController.php @@ -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);