Merge pull request #88 from magmodules/release/2.5.1

Release/2.5.1

Author: Marvin-Magmodules

.github/workflows/compile-and-phpstan.yml

@@ -7,13 +7,13 @@ jobs:
       matrix:
         include:
           - PHP_VERSION: php74-fpm
-            MAGENTO_VERSION: 2.4.0
+            MAGENTO_VERSION: 2.4.4-p13
           - PHP_VERSION: php81-fpm
             MAGENTO_VERSION: 2.4.6-p4
           - PHP_VERSION: php83-fpm
             MAGENTO_VERSION: 2.4.7
           - PHP_VERSION: php84-fpm
-            MAGENTO_VERSION: 2.4.8
+            MAGENTO_VERSION: 2.4.8-p2
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1

Service/ProductData/AttributeCollector/Data/Parents.php

@@ -140,12 +140,18 @@ private function fetchStatusAttributeId(): ?int
     {
         $connection = $this->resource->getConnection();
         $eavTable = $this->resource->getTableName('eav_attribute');
+        $entityTypeTable = $this->resource->getTableName('eav_entity_type');
 
         return (int) $connection->fetchOne(
             $connection->select()
-                ->from($eavTable, ['attribute_id'])
-                ->where('entity_type_id = ?', 4)
-                ->where('attribute_code = ?', 'status')
+                ->from(['ea' => $eavTable], ['attribute_id'])
+                ->join(
+                    ['et' => $entityTypeTable],
+                    'ea.entity_type_id = et.entity_type_id',
+                    []
+                )
+                ->where('et.entity_type_code = ?', 'catalog_product')
+                ->where('ea.attribute_code = ?', 'status')
                 ->limit(1)
         ) ?: null;
     }

Service/ProductData/Filter.php

@@ -48,13 +48,17 @@ public function execute(array $filter, int $storeId = 0): array
         $entityIds = $this->filterVisibility($filter, $storeId);
         $entityIds = $this->filterStatus($entityIds, $filter['add_disabled_products'], $storeId);
 
-        $websiteId = $storeId ? $this->getWebsiteId($storeId) : null;
-        return $this->filterByWebsiteAndCategory(
-            $entityIds,
-            $websiteId,
-            $filter['category_restriction_behaviour'],
-            $filter['category']
-        );
+        if ($filter['restrict_by_category']) {
+            $websiteId = $storeId ? $this->getWebsiteId($storeId) : null;
+            $entityIds = $this->filterByWebsiteAndCategory(
+                $entityIds,
+                $websiteId,
+                $filter['category_restriction_behaviour'],
+                $filter['category']
+            );
+        }
+
+        return $entityIds;
     }
 
     /**
@@ -63,13 +67,20 @@ public function execute(array $filter, int $storeId = 0): array
     private function prefetchAttributeIds(): void
     {
         $connection = $this->resourceConnection->getConnection();
+
+        $entityTypeTable = $this->resourceConnection->getTableName('eav_entity_type');
         $eavTable = $this->resourceConnection->getTableName('eav_attribute');
 
         $attributes = $connection->fetchPairs(
             $connection->select()
-                ->from($eavTable, ['attribute_code', 'attribute_id'])
-                ->where('entity_type_id = ?', 4)
-                ->where('attribute_code IN (?)', ['status', 'visibility'])
+                ->from(['ea' => $eavTable], ['attribute_code', 'attribute_id'])
+                ->join(
+                    ['et' => $entityTypeTable],
+                    'ea.entity_type_id = et.entity_type_id',
+                    []
+                )
+                ->where('et.entity_type_code = ?', 'catalog_product')
+                ->where('ea.attribute_code IN (?)', ['status', 'visibility'])
         );
 
         $this->statusAttributeId = (int)($attributes['status'] ?? 0);

composer.json

@@ -2,7 +2,7 @@
     "name": "magmodules/magento2-sooqr",
     "description": "Sooqr integration for Magento 2",
     "type": "magento2-module",
-    "version": "2.5.0",
+    "version": "2.5.1",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

etc/config.xml

@@ -11,7 +11,7 @@
         <sooqr_general>
             <general>
                 <enable>1</enable>
-                <version>v2.5.0</version>
+                <version>v2.5.1</version>
             </general>
             <credentials>
                 <environment>production</environment>