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

// Fix bug with gift products and multishipping

Browse Source
This commit is contained in:
mDeflotte
2012-05-21 17:31:43 +00:00
parent c9b101ccce
commit 21ed1ef008
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/CartRule.php
+1 -3
View File
@@ -593,10 +593,7 @@ class CartRuleCore extends ObjectModel
}
if ($countMatchingProducts < $productRuleGroup['quantity'])
return (!$display_error) ? false : Tools::displayError('You cannot use this voucher with these products');
// p($matchingProductsList);
// p($eligibleProductsList);
$eligibleProductsList = CartRule::array_uintersect($eligibleProductsList, $matchingProductsList);
// d($eligibleProductsList);
break;
case 'categories':
$cartCategories = Db::getInstance()->executeS('
@@ -890,6 +887,7 @@ class CartRuleCore extends ObjectModel
$reduction_value += ($use_tax ? $product['price_wt'] : $product['price']);
if (!isset(CartRule::$only_one_gift[$this->id.'-'.$this->gift_product]) || CartRule::$only_one_gift[$this->id.'-'.$this->gift_product] == 0)
CartRule::$only_one_gift[$this->id.'-'.$this->gift_product] = $id_address;
break;
}
}
}