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

// Fixed warning and wrong cart rule total

Browse Source
This commit is contained in:
Damien Metzger
2013-02-14 09:46:18 +01:00
parent 2890e439b5
commit f80b7abdfa
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Cart.php
+4 -2
View File
@@ -2325,7 +2325,7 @@ class CartCore extends ObjectModel
public function getDeliveryOption($default_country = null, $dontAutoSelectOptions = false, $use_cache = true) public function getDeliveryOption($default_country = null, $dontAutoSelectOptions = false, $use_cache = true)
{ {
static $cache = array(); static $cache = array();
$cache_id = (int)$default_country.'-'.(int)$dontAutoSelectOptions; $cache_id = (int)(is_object($default_country) ? $default_country->id : 0).'-'.(int)$dontAutoSelectOptions;
if (isset($cache[$cache_id]) && $use_cache) if (isset($cache[$cache_id]) && $use_cache)
return $cache[$cache_id]; return $cache[$cache_id];
@@ -2865,7 +2865,9 @@ class CartCore extends ObjectModel
if ($cart_rule['free_shipping'] && (empty($cart_rule['code']) || preg_match('/^'.CartRule::BO_ORDER_CODE_PREFIX.'[0-9]+/', $cart_rule['code']))) if ($cart_rule['free_shipping'] && (empty($cart_rule['code']) || preg_match('/^'.CartRule::BO_ORDER_CODE_PREFIX.'[0-9]+/', $cart_rule['code'])))
{ {
$cart_rule['value_real'] -= $total_shipping; $cart_rule['value_real'] -= $total_shipping;
$cart_rule['value_tax_exc'] = $total_shipping_tax_exc; $cart_rule['value_tax_exc'] -= $total_shipping_tax_exc;
$total_discounts -= $total_shipping;
$total_discounts_tax_exc -= $total_shipping_tax_exc;
// Update total shipping // Update total shipping
$total_shipping = 0; $total_shipping = 0;