// Fix bug with address changing and multi-address on opc

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13892 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte
2012-03-06 14:29:00 +00:00
parent a30e24abef
commit 43d0a4dee2
2 changed files with 4 additions and 1 deletions
+1 -1
View File
@@ -3012,7 +3012,7 @@ class CartCore extends ObjectModel
)';
Db::getInstance()->execute($sql);
// upgradng address delivery
// Upgrading address delivery
$sql = 'UPDATE `'._DB_PREFIX_.'cart_product`
SET `id_address_delivery` =
(
+3
View File
@@ -189,6 +189,9 @@ class OrderOpcControllerCore extends ParentOrderController
$this->context->cart->id_address_invoice = Tools::isSubmit('same') ? $this->context->cart->id_address_delivery : (int)(Tools::getValue('id_address_invoice'));
if (!$this->context->cart->update())
$this->errors[] = Tools::displayError('An error occurred while updating your cart.');
if (!$this->context->cart->isMultiAddressDelivery())
$this->context->cart->setNoMultishipping(); // As the cart is no multishipping, set each delivery address lines with the main delivery address
if (!count($this->errors))
{