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

[-] BO: Fix PSCFV-2818 application of specific price rules when multiple conditions of same type in the same group

Browse Source
This commit is contained in:
rGaillard
2012-06-28 21:48:21 +00:00
parent f663e6b6e0
commit f27e979ba5
1 changed files with 36 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/SpecificPriceRule.php
+36 -17
View File
@@ -185,32 +185,51 @@ class SpecificPriceRuleCore extends ObjectModel
$where = '(';
foreach ($conditions_group as $id_condition_group => $condition_group)
{
$fields = array(
'category' => array(
'name' => 'cp.id_category',
'values' => array()
),
'manufacturer' => array(
'name' => 'p.id_manufacturer',
'values' => array(),
),
'supplier' => array(
'name' => 'p.id_supplier',
'values' => array()
),
'feature' => array(
'name' => 'fp.id_feature_value',
'values' => array()
),
'attribute' => array(
'name'=> 'pac.id_attribute',
'values' => array()
)
);
foreach ($condition_group as $condition)
{
$field = false;
if ($condition['type'] == 'category')
{
$field = 'cp.id_category';
$categories = true;
}
elseif ($condition['type'] == 'manufacturer')
$field = 'p.id_manufacturer';
elseif ($condition['type'] == 'supplier')
$field = 'p.id_supplier';
elseif ($condition['type'] == 'feature')
{
$field = 'fp.id_feature_value';
$features = true;
}
elseif ($condition['type'] == 'attribute')
{
$field = 'pac.id_attribute';
$attributes = true;
}
if ($field)
$where .= $field.'='.(int)$condition['value'].' AND ';
$fields[$condition['type']]['values'][] = $condition['value'];
}
foreach ($fields as $field)
{
if (!$n_conditions = count($field['values']))
continue;
$where .= $field['name'].' IN ('.implode(',', array_map('intval', $field['values'])).') AND ';
if ($n_conditions > 1)
$query->having('COUNT('.bqSQL($field['name']).') >='.(int)$n_conditions);
}
$where = rtrim($where, ' AND ').') OR (';
}
$where = rtrim($where, 'OR (');