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

[-] FO : Bad html entities for alert of order-address.js

Browse Source
This commit is contained in:
gRoussac
2013-01-09 17:09:15 +01:00
parent b672b3281e
commit 6abb99552e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/front/OrderController.php
+5 -5
View File
@@ -252,7 +252,7 @@ class OrderControllerCore extends ParentOrderController
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') && !Customer::customerHasAddress($this->context->customer->id, (int)Tools::getValue('id_address_invoice'))))
$this->errors[] = Tools::displayError('Invalid address'); $this->errors[] = Tools::displayError('Invalid address', !Tools::getValue('ajax'));
else else
{ {
// Add checking for all addresses // Add checking for all addresses
@@ -260,11 +260,11 @@ class OrderControllerCore extends ParentOrderController
if (count($address_without_carriers)) if (count($address_without_carriers))
{ {
if (count($address_without_carriers) > 1) if (count($address_without_carriers) > 1)
$this->errors[] = sprintf(Tools::displayError('There are no carriers that deliver to some addresses you selected.')); $this->errors[] = sprintf(Tools::displayError('There are no carriers that deliver to some addresses you selected.', !Tools::getValue('ajax')));
elseif ($this->context->cart->isMultiAddressDelivery()) elseif ($this->context->cart->isMultiAddressDelivery())
$this->errors[] = sprintf(Tools::displayError('There are no carriers that deliver to one of the address you selected.')); $this->errors[] = sprintf(Tools::displayError('There are no carriers that deliver to one of the address you selected.', !Tools::getValue('ajax')));
else else
$this->errors[] = sprintf(Tools::displayError('There are no carriers that deliver to the address you selected.')); $this->errors[] = sprintf(Tools::displayError('There are no carriers that deliver to the address you selected.', !Tools::getValue('ajax')));
} }
else else
{ {
@@ -275,7 +275,7 @@ class OrderControllerCore extends ParentOrderController
CartRule::autoAddToCart($this->context); CartRule::autoAddToCart($this->context);
if (!$this->context->cart->update()) if (!$this->context->cart->update())
$this->errors[] = Tools::displayError('An error occurred while updating your cart.'); $this->errors[] = Tools::displayError('An error occurred while updating your cart.', !Tools::getValue('ajax'));
if (!$this->context->cart->isMultiAddressDelivery()) if (!$this->context->cart->isMultiAddressDelivery())
$this->context->cart->setNoMultishipping(); // If there is only one delivery address, set each delivery address lines with the main delivery address $this->context->cart->setNoMultishipping(); // If there is only one delivery address, set each delivery address lines with the main delivery address