Merge pull request #1939 from BabovicT/patch-14

Fixed wrong categories returned when concatenator is AND
coreshop · Mar 25, 2022 · 78a443a · 78a443a
2 parents 468824a + 447a1cf
commit 78a443a
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/CoreShop/Component/Index/Filter/CategoryMultiSelectConditionProcessor.php b/src/CoreShop/Component/Index/Filter/CategoryMultiSelectConditionProcessor.php
@@ -32,8 +32,9 @@ public function prepareValuesForRendering(FilterConditionInterface $condition, F
             $field = 'parentCategoryIds';
         }
 
+        $concatenator = $condition->getConfiguration()['concatenator'] ?: 'OR';
         $parsedValues = [];
-        $rawValues = $list->getGroupByValues($field, true);
+        $rawValues = $list->getGroupByValues($field, true, $concatenator == 'AND' ? false : true);
 
         foreach ($rawValues as $v) {
             $explode = explode(',', $v['value']);