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

[-] FO : Undefined free_shipping in POC when updateQty

Browse Source
This commit is contained in:
gRoussac
2013-04-16 11:28:22 +02:00
parent b2f5ed838d
commit f2bdb73d39
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/front/OrderController.php
-1
View File
@@ -347,7 +347,6 @@ class OrderControllerCore extends ParentOrderController
$this->context->smarty->assign(
array(
// 'free_shipping' => false, // Deprecated since a cart rule can be applied the specific carriers only
'is_guest' => (isset($this->context->customer->is_guest) ? $this->context->customer->is_guest : 0)
));
}
controllers/front/OrderOpcController.php
+11 -1
View File
@@ -498,9 +498,19 @@ class OrderOpcControllerCore extends ParentOrderController
$wrapping_fees = $this->context->cart->getGiftWrappingPrice(false);
$wrapping_fees_tax_inc = $wrapping_fees = $this->context->cart->getGiftWrappingPrice();
$oldMessage = Message::getMessageByCartId((int)($this->context->cart->id));
$free_shipping = false;
foreach ($this->context->cart->getCartRules() as $rule)
{
if ($rule['free_shipping'] && !$rule['carrier_restriction'])
{
$free_shipping = true;
break;
}
}
$vars = array(
// 'free_shipping' => false, // Deprecated since a cart rule can be applied the specific carriers only
'free_shipping' => $free_shipping,
'checkedTOS' => (int)($this->context->cookie->checkedTOS),
'recyclablePackAllowed' => (int)(Configuration::get('PS_RECYCLABLE_PACK')),
'giftAllowed' => (int)(Configuration::get('PS_GIFT_WRAPPING')),
themes/default/order-carrier.tpl
+1 -1
View File
@@ -170,7 +170,7 @@
</td>
<td>
<div class="delivery_option_price">
{if $option.total_price_with_tax && !$free_shipping}
{if $option.total_price_with_tax && (!isset($free_shipping) || (isset($free_shipping) && !$free_shipping))}
{if $use_taxes == 1}
{convertPrice price=$option.total_price_with_tax} {l s='(tax incl.)'}
{else}