From 53937e3cd055f8d3d2d3f46abbc42521abc78b22 Mon Sep 17 00:00:00 2001 From: dMetzger Date: Thu, 30 Aug 2012 13:33:25 +0000 Subject: [PATCH] // Fixed migrate_orders problem #PSCFV-3799 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17097 b9a71923-0436-4b27-9f14-aed3839534dd --- install-dev/upgrade/php/migrate_orders.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/install-dev/upgrade/php/migrate_orders.php b/install-dev/upgrade/php/migrate_orders.php index 3de5a0c07..781a1777a 100644 --- a/install-dev/upgrade/php/migrate_orders.php +++ b/install-dev/upgrade/php/migrate_orders.php @@ -84,9 +84,8 @@ function migrate_orders() $default_group_id = mo_getCustomerDefaultGroup((int)$order['id_customer']); $price_display_method = mo_getPriceDisplayMethod((int)$default_group_id); $order_details_list = Db::getInstance()->executeS(' - SELECT * + SELECT od.* FROM `'._DB_PREFIX_.'order_detail` od - LEFT JOIN `'._DB_PREFIX_.'product` p ON p.id_product = od.product_id WHERE od.`id_order` = '.(int)$order['id_order']); foreach ($order_details_list as $order_details) @@ -113,7 +112,8 @@ function migrate_orders() { if (in_array($order_details[$k], array('product_price', 'reduction_percent', 'reduction_amount', 'group_reduction', 'product_quantity_discount', 'tax_rate', 'ecotax', 'ecotax_tax_rate'))) $order_details[$k] = (float)$order_details[$k]; - $order_details[$k] = Db::getInstance()->escape($order_details[$k]); + else + $order_details[$k] = Db::getInstance()->escape($order_details[$k]); } $values_order_detail[] = '(\''.implode('\', \'', $order_details).'\')'; }