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

[-] FO : Fix bug #PSCFV-6516 when not same address to process

Browse Source
This commit is contained in:
Gregory Roussac
2013-01-28 17:00:54 +01:00
parent 90708ad38e
commit 715ccbcf72
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/front/OrderController.php
+2 -1
View File
@@ -251,7 +251,8 @@ class OrderControllerCore extends ParentOrderController
$this->context->cart->setNoMultishipping(); $this->context->cart->setNoMultishipping();
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') && !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')); $this->errors[] = Tools::displayError('Invalid address', !Tools::getValue('ajax'));
else else
{ {