Merge pull request #79 from magmodules/release/2.1.7

Release/2.1.7
magmodules · Aug 27, 2024 · 993aafc · 993aafc
2 parents 5dad214 + f401403
commit 993aafc
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/Model/ProductData/Repository.php b/Model/ProductData/Repository.php
@@ -301,6 +301,12 @@ private function getImageWithFallback(?array $imageData, array $storeIds): ?stri
             }
         }
 
+        foreach ($storeIds as $storeId) {
+            if (!empty($imageData[0][$storeId]['file'])) {
+                return $imageData[0][$storeId]['file'];
+            }
+        }
+
         return $imageData[0][0]['file'] ?? null;
     }
 

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "magmodules/magento2-sooqr",
     "description": "Sooqr integration for Magento 2",
     "type": "magento2-module",
-    "version": "2.1.6",
+    "version": "2.1.7",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/etc/adminhtml/system/data.xml b/etc/adminhtml/system/data.xml
@@ -70,15 +70,15 @@
                 <comment>Select the attribute associated with the brand or manufacturer.</comment>
                 <config_path>sooqr_data/product_data/brand_attribute</config_path>
             </field>
-<!--            <field id="heading_image" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">-->
-<!--                <label>Images</label>-->
-<!--                <frontend_model>Magmodules\Sooqr\Block\Adminhtml\System\Config\Form\Field\Heading</frontend_model>-->
-<!--            </field>-->
-<!--            <field id="image_source" translate="label" type="select" sortOrder="11" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">-->
-<!--                <label>Source</label>-->
-<!--                <source_model>Magmodules\Sooqr\Model\Config\Source\ImageSource</source_model>-->
-<!--                <config_path>sooqr_data/product_data/image_source</config_path>-->
-<!--            </field>-->
+            <field id="heading_image" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>Images</label>
+                <frontend_model>Magmodules\Sooqr\Block\Adminhtml\System\Config\Form\Field\Heading</frontend_model>
+            </field>
+            <field id="image_source" translate="label" type="select" sortOrder="11" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                <label>Source</label>
+                <source_model>Magmodules\Sooqr\Model\Config\Source\ImageSource</source_model>
+                <config_path>sooqr_data/product_data/image_source</config_path>
+            </field>
 <!--            <field id="image_resize" translate="label" type="select" sortOrder="12" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">-->
 <!--                <label>Resize Image</label>-->
 <!--                <source_model>Magmodules\Sooqr\Model\Config\Source\ImageSize</source_model>-->

diff --git a/etc/config.xml b/etc/config.xml
@@ -11,7 +11,7 @@
         <sooqr_general>
             <general>
                 <enable>1</enable>
-                <version>v2.1.6</version>
+                <version>v2.1.7</version>
             </general>
             <credentials>
                 <environment>production</environment>