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

[-] FO : deprecated free_shipping var set to "false"

Browse Source
This commit is contained in:
Damien Metzger committed 2013-02-14 10:32:21 +01:00
1 parent f80b7abdfa
commit 0e31de5b2f
2 files changed
+3 -21
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

controllers/front/OrderController.php
+2 -11
View File
@@ -340,19 +340,10 @@ class OrderControllerCore extends ParentOrderController
parent::_assignCarrier(); parent::_assignCarrier();
// Assign wrapping and TOS // Assign wrapping and TOS
$this->_assignWrappingAndTOS(); $this->_assignWrappingAndTOS();
// 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;
}
$this->context->smarty->assign( $this->context->smarty->assign(
array( array(
'free_shipping' => $free_shipping, '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) 'is_guest' => (isset($this->context->customer->is_guest) ? $this->context->customer->is_guest : 0)
)); ));
} }
controllers/front/OrderOpcController.php
+1 -10
View File
@@ -480,15 +480,6 @@ 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();
$delivery_option = $this->context->cart->getDeliveryOption(null, false, false); $delivery_option = $this->context->cart->getDeliveryOption(null, false, false);
@@ -496,7 +487,7 @@ class OrderOpcControllerCore extends ParentOrderController
$wrapping_fees_tax_inc = $wrapping_fees = $this->context->cart->getGiftWrappingPrice(); $wrapping_fees_tax_inc = $wrapping_fees = $this->context->cart->getGiftWrappingPrice();
$vars = array( $vars = array(
'free_shipping' => $free_shipping, 'free_shipping' => false, // Deprecated since a cart rule can be applied the specific carriers only
'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')),