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

[-] FO : cart rule fix (product restrictions mixing attributes and other criteria)

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13567 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dMetzger
2012-02-23 15:54:05 +00:00
parent b24dcffc9c
commit be71b2ddb1
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/CartRule.php
+20 -7
View File
@@ -532,7 +532,7 @@ class CartRuleCore extends ObjectModel
}
if ($countMatchingProducts < $productRuleGroup['quantity'])
return Tools::displayError('You cannot use this voucher with these products');
$eligibleProductsList = array_intersect($eligibleProductsList, $matchingProductsList);
$eligibleProductsList = array_uintersect($eligibleProductsList, $matchingProductsList, 'cartrule_products_intersect');
break;
case 'products':
$cartProducts = Db::getInstance()->ExecuteS('
@@ -550,7 +550,7 @@ class CartRuleCore extends ObjectModel
}
if ($countMatchingProducts < $productRuleGroup['quantity'])
return Tools::displayError('You cannot use this voucher with these products');
$eligibleProductsList = array_intersect($eligibleProductsList, $matchingProductsList);
$eligibleProductsList = array_uintersect($eligibleProductsList, $matchingProductsList, 'cartrule_products_intersect');
break;
case 'categories':
$cartCategories = Db::getInstance()->ExecuteS('
@@ -569,7 +569,7 @@ class CartRuleCore extends ObjectModel
}
if ($countMatchingProducts < $productRuleGroup['quantity'])
return Tools::displayError('You cannot use this voucher with these products');
$eligibleProductsList = array_intersect($eligibleProductsList, $matchingProductsList);
$eligibleProductsList = array_uintersect($eligibleProductsList, $matchingProductsList, 'cartrule_products_intersect');
break;
case 'manufacturers':
$cartManufacturers = Db::getInstance()->ExecuteS('
@@ -588,7 +588,7 @@ class CartRuleCore extends ObjectModel
}
if ($countMatchingProducts < $productRuleGroup['quantity'])
return Tools::displayError('You cannot use this voucher with these products');
$eligibleProductsList = array_intersect($eligibleProductsList, $matchingProductsList);
$eligibleProductsList = array_uintersect($eligibleProductsList, $matchingProductsList, 'cartrule_products_intersect');
break;
case 'suppliers':
$cartSuppliers = Db::getInstance()->ExecuteS('
@@ -607,17 +607,17 @@ class CartRuleCore extends ObjectModel
}
if ($countMatchingProducts < $productRuleGroup['quantity'])
return Tools::displayError('You cannot use this voucher with these products');
$eligibleProductsList = array_intersect($eligibleProductsList, $matchingProductsList);
$eligibleProductsList = array_uintersect($eligibleProductsList, $matchingProductsList, 'cartrule_products_intersect');
break;
}
if (!count($eligibleProductsList))
return Tools::displayError('You cannot use this voucher with these products');
}
$selectedProducts = array_merge($selectedProducts, $eligibleProductsList);
}
}
if ($return_products)
return $selectedProducts;
return false;
@@ -960,4 +960,17 @@ class CartRuleCore extends ObjectModel
WHERE name LIKE \'%'.pSQL($name).'%\'
');
}
}
function cartrule_products_intersect($a, $b)
{
if ($a == $b)
return 0;
$asplit = explode('-', $a);
$bsplit = explode('-', $b);
if ($asplit[0] == $bsplit[0] && (!(int)$asplit[1] || !(int)$bsplit[1]))
return 0;
return 1;
}