// BugFix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11694 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
+1
-3
@@ -2989,7 +2989,6 @@ class CartCore extends ObjectModel
|
|||||||
SELECT `id_address_delivery`
|
SELECT `id_address_delivery`
|
||||||
FROM `'._DB_PREFIX_.'cart`
|
FROM `'._DB_PREFIX_.'cart`
|
||||||
WHERE `id_cart` = '.(int)$this->id.'
|
WHERE `id_cart` = '.(int)$this->id.'
|
||||||
AND `id_shop` = '.(int)$this->id_shop.'
|
|
||||||
)
|
)
|
||||||
WHERE `id_cart` = '.(int)$this->id;
|
WHERE `id_cart` = '.(int)$this->id;
|
||||||
|
|
||||||
@@ -3021,8 +3020,7 @@ class CartCore extends ObjectModel
|
|||||||
$sql = 'UPDATE `'._DB_PREFIX_.'customization`
|
$sql = 'UPDATE `'._DB_PREFIX_.'customization`
|
||||||
SET `id_address_delivery` = '.(int)$id_address_delivery.'
|
SET `id_address_delivery` = '.(int)$id_address_delivery.'
|
||||||
WHERE `id_cart` = '.(int)$this->id.'
|
WHERE `id_cart` = '.(int)$this->id.'
|
||||||
AND (`id_address_delivery` = 0 OR `id_address_delivery` IS NULL)
|
AND (`id_address_delivery` = 0 OR `id_address_delivery` IS NULL)';
|
||||||
AND `id_shop` = '.(int)$this->id_shop;
|
|
||||||
|
|
||||||
Db::getInstance()->execute($sql);
|
Db::getInstance()->execute($sql);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user