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

[-] Classes : #PSTEST-717 - Fix an infinite loop

Browse Source 
// Add missing params $products

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13293 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte
2012-02-14 10:36:53 +00:00
parent 4d90475bb1
commit e58ca980cd
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Cart.php
+3 -7
View File
@@ -280,11 +280,6 @@ class CartCore extends ObjectModel
if (!Cache::isStored('Cart::getCartRules'.$this->id)) if (!Cache::isStored('Cart::getCartRules'.$this->id))
{ {
$total_products_ti = $this->getOrderTotal(true, Cart::ONLY_PRODUCTS);
$total_products_te = $this->getOrderTotal(false, Cart::ONLY_PRODUCTS);
$shipping_ti = $this->getTotalShippingCost();
$shipping_te = $this->getTotalShippingCost(null, false);
$result = Db::getInstance()->executeS(' $result = Db::getInstance()->executeS('
SELECT * SELECT *
FROM `'._DB_PREFIX_.'cart_cart_rule` cd FROM `'._DB_PREFIX_.'cart_cart_rule` cd
@@ -2212,7 +2207,7 @@ class CartCore extends ObjectModel
{ {
$check_delivery_price_by_weight = Carrier::checkDeliveryPriceByWeight($row['id_carrier'], $this->getTotalWeight(), (int)$id_zone); $check_delivery_price_by_weight = Carrier::checkDeliveryPriceByWeight($row['id_carrier'], $this->getTotalWeight(), (int)$id_zone);
$total_order = $this->getOrderTotal(true, Cart::BOTH_WITHOUT_SHIPPING); $total_order = $this->getOrderTotal(true, Cart::BOTH_WITHOUT_SHIPPING, $product_list);
$check_delivery_price_by_price = Carrier::checkDeliveryPriceByPrice($row['id_carrier'], $total_order, (int)$id_zone, (int)$this->id_currency); $check_delivery_price_by_price = Carrier::checkDeliveryPriceByPrice($row['id_carrier'], $total_order, (int)$id_zone, (int)$this->id_currency);
// Get only carriers that have a range compatible with cart // Get only carriers that have a range compatible with cart
@@ -2297,7 +2292,8 @@ class CartCore extends ObjectModel
$carrier->id, $carrier->id,
$this->getOrderTotal( $this->getOrderTotal(
true, true,
Cart::BOTH_WITHOUT_SHIPPING Cart::BOTH_WITHOUT_SHIPPING,
$product_list
), ),
$id_zone, $id_zone,
(int)$this->id_currency (int)$this->id_currency