// BugFix : With Guest Checkout, an alert is displaying each time we increase/decrease the quantity of a product

This commit is contained in:
mDeflotte
2011-11-23 13:59:14 +00:00
parent cb67ab3a3f
commit 9cd6a6d714
2 changed files with 2 additions and 10 deletions
+2 -2
View File
@@ -449,9 +449,9 @@ class OrderOpcControllerCore extends ParentOrderController
$groups = $this->context->customer->getGroups();
else
$groups = array(1);
if (!Address::isCountryActiveById((int)($this->context->cart->id_address_delivery)))
if (!Address::isCountryActiveById((int)($this->context->cart->id_address_delivery)) && $this->context->cart->id_address_delivery != 0)
$this->errors[] = Tools::displayError('This address is not in a valid area.');
elseif (!Validate::isLoadedObject($address_delivery) OR $address_delivery->deleted)
elseif ((!Validate::isLoadedObject($address_delivery) OR $address_delivery->deleted) && $this->context->cart->id_address_delivery != 0)
$this->errors[] = Tools::displayError('This address is invalid.');
else
{
-8
View File
@@ -393,14 +393,6 @@
{/foreach}
<p class="clear" />
{/if}
{* @todo Replace the $carrier by using delivery_option *}
{if $carrier->id AND !isset($virtualCart)}
<div id="order_carrier">
<h4>{l s='Carrier:'}</h4>
{if isset($carrierPicture)}<img src="{$img_ship_dir}{$carrier->id}.jpg" alt="{l s='Carrier'}" />{/if}
<span>{$carrier->name|escape:'htmlall':'UTF-8'}</span>
</div>
{/if}
</div>
{/if}
<p class="cart_navigation">