From 715ccbcf72a974c25e1b937fbba2c582a60a76a9 Mon Sep 17 00:00:00 2001 From: Gregory Roussac Date: Mon, 28 Jan 2013 17:00:54 +0100 Subject: [PATCH] [-] FO : Fix bug #PSCFV-6516 when not same address to process --- controllers/front/OrderController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/controllers/front/OrderController.php b/controllers/front/OrderController.php index 1ffdd1dac..1881cc530 100644 --- a/controllers/front/OrderController.php +++ b/controllers/front/OrderController.php @@ -251,7 +251,8 @@ class OrderControllerCore extends ParentOrderController $this->context->cart->setNoMultishipping(); if (!Customer::customerHasAddress($this->context->customer->id, (int)Tools::getValue('id_address_delivery')) - || (Tools::isSubmit('same') && !Customer::customerHasAddress($this->context->customer->id, (int)Tools::getValue('id_address_invoice')))) + || (!Tools::isSubmit('same') && Tools::getValue('id_address_delivery') != Tools::getValue('id_address_invoice') + && !Customer::customerHasAddress($this->context->customer->id, (int)Tools::getValue('id_address_invoice')))) $this->errors[] = Tools::displayError('Invalid address', !Tools::getValue('ajax')); else {