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

// Fix bug: undefined variable

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16237 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte
2012-07-05 12:59:57 +00:00
parent 74b71ae1fb
commit fd36dd7130
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/front/OrderOpcController.php
+10
View File
@@ -474,8 +474,18 @@ class OrderOpcControllerCore extends ParentOrderController
else else
$link_conditions .= '&content_only=1'; $link_conditions .= '&content_only=1';
// If a rule offer free-shipping, force hidding shipping prices
$free_shipping = false;
foreach ($this->context->cart->getCartRules() as $rule)
if ($rule['free_shipping'])
{
$free_shipping = true;
break;
}
$carriers = $this->context->cart->simulateCarriersOutput(); $carriers = $this->context->cart->simulateCarriersOutput();
$vars = array( $vars = array(
'free_shipping' => $free_shipping,
'checkedTOS' => (int)($this->context->cookie->checkedTOS), 'checkedTOS' => (int)($this->context->cookie->checkedTOS),
'recyclablePackAllowed' => (int)(Configuration::get('PS_RECYCLABLE_PACK')), 'recyclablePackAllowed' => (int)(Configuration::get('PS_RECYCLABLE_PACK')),
'giftAllowed' => (int)(Configuration::get('PS_GIFT_WRAPPING')), 'giftAllowed' => (int)(Configuration::get('PS_GIFT_WRAPPING')),