Merge branch 'release/v103.2.1' into 'master'

release/v103.2.1 into master See merge request agence-dnd/marketplace/magento-2/external/magento2-connector-community!55
akeneo · Nov 23, 2022 · 07f5876 · 07f5876
2 parents d690519 + 1aa9bca
commit 07f5876
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -380,3 +380,6 @@
 
 ### Version 103.2.0 :
 * Improve column sizes per attribute type inside product temporary table in order to reduce the MYSQL table volume
+
+### Version 103.2.1 :
+* Fix product model completeness filter channel value when multiple channels are mapped to different websites
diff --git a/Job/Product.php b/Job/Product.php
@@ -3870,14 +3870,14 @@ protected function getProductModelFilters($family = null)
         /** @var string $mode */
         $mode = $this->configHelper->getFilterMode();
         if ($mode == Mode::STANDARD) {
-            /** bool|string[] $modelCompletenessFilter */
-            $modelCompletenessFilter = $this->getModelCompletenessFilter();
             /**
              * @var string $key
              * @var string[Ø] $filter
              */
             foreach ($filters as $key => $filter) {
                 if (isset($filter['search'])) {
+                    /** bool|string[] $modelCompletenessFilter */
+                    $modelCompletenessFilter = $this->getModelCompletenessFilter($filter['scope']);
                     if (isset($filter['search']['enabled'])) {
                         unset($filters[$key]['search']['enabled']);
                     }
@@ -3903,12 +3903,12 @@ protected function getProductModelFilters($family = null)
     /**
      * Get product models completeness filter
      *
-     * @return array|bool
+     * @param string $scope
+     *
+     * @return array|false|string[]
      */
-    protected function getModelCompletenessFilter()
+    protected function getModelCompletenessFilter(string $scope)
     {
-        /** @var string $scope */
-        $scope = $this->configHelper->getAdminDefaultChannel();
         /** @var string $completenessType */
         $completenessType = $this->configHelper->getModelCompletenessTypeFilter();
         /** @var mixed $locales */

diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
     "nyholm/psr7": "^1.5"
   },
   "type": "magento2-module",
-  "version": "103.2.0",
+  "version": "103.2.1",
   "license": [
     "OSL-3.0",
     "AFL-3.0"