Fix Subproduct Image Data (#1157)

Author: bsuravech

Helper/Entity/ProductHelper.php

@@ -829,7 +829,14 @@ private function addNullValue($customData, $subProducts, $attribute, AttributeRe
                 $valueText = $subProduct->getAttributeText($attributeName);
 
                 $values = array_merge($values, $this->getValues($valueText, $subProduct, $attributeResource));
-                $subProductImages = $this->addSubProductImage($subProductImages, $attribute, $subProduct, $valueText);
+                if ($this->configHelper->useAdaptiveImage($attributeResource->getStoreId())) {
+                    $subProductImages = $this->addSubProductImage(
+                        $subProductImages,
+                        $attribute,
+                        $subProduct,
+                        $valueText
+                    );
+                }
             }
         }
 
@@ -869,18 +876,18 @@ private function addSubProductImage($subProductImages, $attribute, $subProduct,
             return $subProductImages;
         }
 
-        $subImage = $subProduct->getData($this->configHelper->getImageType());
-        if (!$subImage || $subImage === 'no_selection') {
-            return $subProductImages;
-        }
-
         $image = $this->imageHelper
             ->init($subProduct, $this->configHelper->getImageType())
             ->resize(
                 $this->configHelper->getImageWidth(),
                 $this->configHelper->getImageHeight()
             );
 
+        $subImage = $subProduct->getData($image->getType());
+        if (!$subImage || $subImage === 'no_selection') {
+            return $subProductImages;
+        }
+
         try {
             $textValueInLower = mb_strtolower($valueText, 'utf-8');
             $subProductImages[$textValueInLower] = $image->getUrl();