// Fixed bug in multishop when multishipping is not activated: sometimes the multishipping was "forced" in the cart

2012-09-12 17:22:43 +00:00
parent a6b29fd875
commit 19280eb719
1 changed files with 2 additions and 1 deletions
@@ -3333,7 +3333,8 @@ class CartCore extends ObjectModel
 				WHERE `id_cart` = '.(int)$this->id.'
 					AND `id_shop` = '.(int)$this->id_shop.'
 			)
-			WHERE `id_cart` = '.(int)$this->id.' AND `id_shop` = '.(int)$this->id_shop;
+			WHERE `id_cart` = '.(int)$this->id.'
+			'.(Configuration::get('PS_ALLOW_MULTISHIPPING') ? ' AND `id_shop` = '.(int)$this->id_shop : '');

 		Db::getInstance()->execute($sql);