From 782e13ea15412281f54e92ebda483185852f6de4 Mon Sep 17 00:00:00 2001 From: mMarinetti Date: Thu, 10 May 2012 10:14:29 +0000 Subject: [PATCH] // and again #PSCFV-1291, quantity was missing after upgrade, related to id_group_shop/id_shop_group modifications git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15165 b9a71923-0436-4b27-9f14-aed3839534dd --- install-dev/upgrade/php/set_stock_available.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/install-dev/upgrade/php/set_stock_available.php b/install-dev/upgrade/php/set_stock_available.php index f3537dac7..dbcecf2ac 100644 --- a/install-dev/upgrade/php/set_stock_available.php +++ b/install-dev/upgrade/php/set_stock_available.php @@ -1,6 +1,7 @@ query(' SELECT quantity, id_product, out_of_stock @@ -26,12 +27,14 @@ function set_stock_available() $quantity += $attribute['quantity']; //add stock available for attributes - Db::getInstance()->execute(' + $res &= Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'stock_available` - (`id_product`, `id_product_attribute`, `id_shop`, `id_shop_group`, `quantity`, `depends_on_stock`, `out_of_stock`) + (`id_product`, `id_product_attribute`, `id_shop`, `id_group_shop`, `quantity`, `depends_on_stock`, `out_of_stock`) VALUES ("'.(int)$row['id_product'].'", "'.(int)$attribute['id_product_attribute'].'", "1", "0", "'.(int)$attribute['quantity'].'", "0", "'.(int)$row['out_of_stock'].'") '); + if (!$res) + return array('error' => Db::getInstance()->getNumberError(), 'msg' => '(attributes)'.Db::getInstance()->getMsgError()); } if (count($attributes) == 0) @@ -41,11 +44,14 @@ function set_stock_available() continue; //Add stock available for product - Db::getInstance()->execute(' + $res &= Db::getInstance()->execute(' INSERT INTO `'._DB_PREFIX_.'stock_available` - (`id_product`, `id_product_attribute`, `id_shop`, `id_shop_group`, `quantity`, `depends_on_stock`, `out_of_stock`) + (`id_product`, `id_product_attribute`, `id_shop`, `id_group_shop`, `quantity`, `depends_on_stock`, `out_of_stock`) VALUES ("'.(int)$row['id_product'].'", "0", "1", "0", "'.(int)$quantity.'", "0", "'.(int)$row['out_of_stock'].'") '); + if (!$res) + return array('error' => Db::getInstance()->getNumberError(), 'msg' => '(products)'.Db::getInstance()->getMsgError()); } + return $res; }