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

// small fix

Browse Source
This commit is contained in:
rGaillard
2012-10-12 12:11:48 +00:00
parent fedb5f583c
commit a5a06eb83d
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Cart.php
+10 -10
View File
@@ -2459,15 +2459,6 @@ class CartCore extends ObjectModel
else else
$products = $product_list; $products = $product_list;
$cache_id = 'getPackageShippingCost_'.(int)$id_carrier.'_'.(int)$use_tax.'_'.(int)$default_country->id;
if ($products)
foreach ($products as $product)
$cache_id .= '_'.(int)$product['id_product'].'_'.(int)$product['id_product_attribute'];
if (Cache::isStored($cache_id))
return Cache::retrieve($cache_id);
if (Configuration::get('PS_TAX_ADDRESS_TYPE') == 'id_address_invoice') if (Configuration::get('PS_TAX_ADDRESS_TYPE') == 'id_address_invoice')
$address_id = (int)$this->id_address_invoice; $address_id = (int)$this->id_address_invoice;
elseif (count($product_list)) elseif (count($product_list))
@@ -2480,6 +2471,14 @@ class CartCore extends ObjectModel
if (!Address::addressExists($address_id)) if (!Address::addressExists($address_id))
$address_id = null; $address_id = null;
$cache_id = 'getPackageShippingCost_'.(int)$address_id.'_'.(int)$id_carrier.'_'.(int)$use_tax.'_'.(int)$default_country->id;
if ($products)
foreach ($products as $product)
$cache_id .= '_'.(int)$product['id_product'].'_'.(int)$product['id_product_attribute'];
if (Cache::isStored($cache_id))
return Cache::retrieve($cache_id);
// Order total in default currency without fees // Order total in default currency without fees
$order_total = $this->getOrderTotal(true, Cart::ONLY_PHYSICAL_PRODUCTS_WITHOUT_SHIPPING, $product_list); $order_total = $this->getOrderTotal(true, Cart::ONLY_PHYSICAL_PRODUCTS_WITHOUT_SHIPPING, $product_list);
@@ -2727,11 +2726,12 @@ class CartCore extends ObjectModel
} }
// Apply tax // Apply tax
if (isset($carrier_tax)) if ($use_tax && isset($carrier_tax))
$shipping_cost *= 1 + ($carrier_tax / 100); $shipping_cost *= 1 + ($carrier_tax / 100);
$shipping_cost = (float)Tools::ps_round((float)$shipping_cost, 2); $shipping_cost = (float)Tools::ps_round((float)$shipping_cost, 2);
Cache::store($cache_id, $shipping_cost); Cache::store($cache_id, $shipping_cost);
return $shipping_cost; return $shipping_cost;
} }