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

[-] FO : remove "Invalid address warning" when not "same" an no invoice address

Browse Source
This commit is contained in:
gRoussac committed 2013-03-11 14:43:37 +01:00
1 parent 9be5d8ac64
commit eb48c91eac
1 file changed
+6 -2
Download Patch File Download Diff File Expand all files Collapse all files
controllers/front/OrderController.php
+6 -2
View File
@@ -250,14 +250,18 @@ class OrderControllerCore extends ParentOrderController
if (!Tools::getValue('multi-shipping')) if (!Tools::getValue('multi-shipping'))
$this->context->cart->setNoMultishipping(); $this->context->cart->setNoMultishipping();
$same = Tools::isSubmit('same');
if(!Tools::getValue('id_address_invoice', false) && !$same)
$same = true;
if (!Customer::customerHasAddress($this->context->customer->id, (int)Tools::getValue('id_address_delivery')) if (!Customer::customerHasAddress($this->context->customer->id, (int)Tools::getValue('id_address_delivery'))
|| (!Tools::isSubmit('same') && Tools::getValue('id_address_delivery') != Tools::getValue('id_address_invoice') || (!$same && Tools::getValue('id_address_delivery') != Tools::getValue('id_address_invoice')
&& !Customer::customerHasAddress($this->context->customer->id, (int)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')); $this->errors[] = Tools::displayError('Invalid address', !Tools::getValue('ajax'));
else else
{ {
$this->context->cart->id_address_delivery = (int)Tools::getValue('id_address_delivery'); $this->context->cart->id_address_delivery = (int)Tools::getValue('id_address_delivery');
$this->context->cart->id_address_invoice = Tools::isSubmit('same') ? $this->context->cart->id_address_delivery : (int)Tools::getValue('id_address_invoice'); $this->context->cart->id_address_invoice = $same ? $this->context->cart->id_address_delivery : (int)Tools::getValue('id_address_invoice');
CartRule::autoRemoveFromCart($this->context); CartRule::autoRemoveFromCart($this->context);
CartRule::autoAddToCart($this->context); CartRule::autoAddToCart($this->context);