Skip to content

Commit f8e07c4

Browse files
[Swatch] Fix error when value is not an array fixes #3800
1 parent 033f248 commit f8e07c4

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

src/module-elasticsuite-swatches/Helper/Swatches.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,11 @@ public function loadFirstVariationWithImage(ProductInterface $configurableProduc
9090

9191
foreach ($usedProducts as $simpleProduct) {
9292
foreach ($requiredAttributes as $attributeCode => $requiredValues) {
93-
if (!in_array($simpleProduct->getData($attributeCode), $requiredValues)) {
94-
break 2;
93+
if (!in_array(
94+
$simpleProduct->getData($attributeCode),
95+
is_array($requiredValues) ? $requiredValues : [$requiredValues]
96+
)) {
97+
continue 2;
9598
}
9699
}
97100

src/module-elasticsuite-swatches/Model/Plugin/ProductImage.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ private function getFilterArray(array $request, \Magento\Catalog\Model\Product $
9090
private function loadSimpleVariation(Product $parentProduct, array $filterArray)
9191
{
9292
$childProduct = $this->swatchHelperData->loadVariationByFallback($parentProduct, $filterArray);
93-
if ($childProduct && !$childProduct->getImage()) {
93+
if ($childProduct && (!$childProduct->getImage() || $childProduct->getImage() == 'no_selection')) {
9494
$childProduct = $this->swatchHelperData->loadFirstVariationWithImage($parentProduct, $filterArray);
9595
}
9696
if (!$childProduct) {

0 commit comments

Comments
 (0)