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

[-] FO : #PSFV-660 - Fix bug with multishipping proposed whereas de multishipping is disable

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14214 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte
2012-03-16 10:19:21 +00:00
parent 1e9a3823ab
commit 25f3f74ee3
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Cart.php
+3 -1
View File
@@ -771,7 +771,9 @@ class CartCore extends ObjectModel
if (Context::getContext()->customer->id)
{
if ($id_address_delivery == 0) // The $id_address_delivery is null, get the default customer address
if ($id_address_delivery == 0 && (int)$this->id_address_delivery) // The $id_address_delivery is null, use the cart delivery address
$id_address_delivery = $this->id_address_delivery;
elseif ($id_address_delivery == 0) // The $id_address_delivery is null, get the default customer address
$id_address_delivery = (int)Address::getFirstCustomerAddressId((int)Context::getContext()->customer->id);
elseif (!Customer::customerHasAddress(Context::getContext()->customer->id, $id_address_delivery)) // The $id_address_delivery must be linked with customer
$id_address_delivery = 0;