dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] FO: Fix PSCFV-4078

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17458 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rGaillard
2012-09-21 13:06:53 +00:00
parent 2897c024ce
commit 4dac4d9609
4 changed files with 54 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Cart.php
+4 -3
View File
@@ -781,8 +781,9 @@ class CartCore extends ObjectModel
$sql .= '
WHERE cp.`id_product` = '.(int)$id_product.'
AND cp.`id_product_attribute` = '.(int)$id_product_attribute.'
AND cp.`id_cart` = '.(int)$this->id.'
AND cp.`id_address_delivery` = '.(int)$id_address_delivery;
AND cp.`id_cart` = '.(int)$this->id;
if (Configuration::get('PS_ALLOW_MULTISHIPPING') && $this->isMultiAddressDelivery())
$sql .= ' AND cp.`id_address_delivery` = '.(int)$id_address_delivery;
if ($id_customization)
$sql .= ' AND c.`id_customization` = '.(int)$id_customization;
@@ -886,7 +887,7 @@ class CartCore extends ObjectModel
SET `quantity` = `quantity` '.$qty.', `date_add` = NOW()
WHERE `id_product` = '.(int)$id_product.
(!empty($id_product_attribute) ? ' AND `id_product_attribute` = '.(int)$id_product_attribute : '').'
AND `id_cart` = '.(int)$this->id.' AND `id_address_delivery` = '.(int)$id_address_delivery.'
AND `id_cart` = '.(int)$this->id.(Configuration::get('PS_ALLOW_MULTISHIPPING') && $this->isMultiAddressDelivery() ? ' AND `id_address_delivery` = '.(int)$id_address_delivery : '').'
LIMIT 1'
);
}