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

// Cart display for free shipping

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15574 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dMetzger
2012-05-21 18:53:30 +00:00
parent dee40a32b1
commit 231a924e31
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/CartRule.php
+1 -1
View File
@@ -717,7 +717,7 @@ class CartRuleCore extends ObjectModel
if ($this->free_shipping && ($filter == CartRule::FILTER_ACTION_ALL || $filter == CartRule::FILTER_ACTION_SHIPPING))
{
if (!$this->carrier_restriction)
$reduction_value += $context->cart->getPackageShippingCost(is_null($package) ? null : $package['id_carrier'], $use_tax, $context->country, is_null($package) ? null : $package['products']);
$reduction_value += $context->cart->getOrderTotal($use_tax, Cart::ONLY_SHIPPING, is_null($package) ? null : $package['products'], is_null($package) ? null : $package['id_carrier']);
else
{
$data = Db::getInstance()->executeS('