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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
controllers/front/OrderOpcController.php
+2 -2
View File
@@ -449,9 +449,9 @@ class OrderOpcControllerCore extends ParentOrderController
$groups = $this->context->customer->getGroups(); $groups = $this->context->customer->getGroups();
else else
$groups = array(1); $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.'); $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.'); $this->errors[] = Tools::displayError('This address is invalid.');
else else
{ {
themes/prestashop/shopping-cart.tpl
-8
View File
@@ -393,14 +393,6 @@
{/foreach} {/foreach}
<p class="clear" /> <p class="clear" />
{/if} {/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> </div>
{/if} {/if}
<p class="cart_navigation"> <p class="cart_navigation">