Merge pull request #712 from akeneo/release/104.3.17

Release/104.3.17
akeneo · Dec 17, 2024 · e9c9ff8 · e9c9ff8
2 parents 2ac5c3b + fc69208
commit e9c9ff8
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -526,3 +526,7 @@
 
 ### Version 104.3.16 :
 * PGTO-398: Do not create an empty value for visual and color swatch in stores
+
+### Version 104.3.17 :
+* AMC-483: Dot not use option code as admin label in single store mode
+* AMC-483: Fix single store mode URL rewrite
diff --git a/Helper/Store.php b/Helper/Store.php
@@ -79,10 +79,11 @@ public function __construct(
      * Retrieve all stores information
      *
      * @param string|string[] $arrayKey
+     * @param bool $ignoreSingleStore
      *
      * @return mixed[]
      */
-    public function getStores($arrayKey = 'store_id')
+    public function getStores($arrayKey = 'store_id', bool $ignoreSingleStore = false)
     {
         if (!is_array($arrayKey)) {
             $arrayKey = [$arrayKey];
@@ -111,7 +112,7 @@ public function getStores($arrayKey = 'store_id')
                 continue;
             }
 
-            if ($this->storeManager->isSingleStoreMode() && (int)$websiteId !== 0) {
+            if (!$ignoreSingleStore && $this->isSingleStoreMode() && (int)$websiteId !== 0) {
                 continue;
             }
 
@@ -195,6 +196,14 @@ public function getStores($arrayKey = 'store_id')
         return $data;
     }
 
+    /**
+     * @return bool
+     */
+    public function isSingleStoreMode(): bool
+    {
+        return $this->storeManager->isSingleStoreMode();
+    }
+
     /**
      * Retrieve all store combination
      *

diff --git a/Job/Category.php b/Job/Category.php
@@ -788,7 +788,7 @@ public function setUrlRewrite()
         /** @var string $tableName */
         $tmpTable = $this->entitiesHelper->getTableName($this->jobExecutor->getCurrentJob()->getCode());
         /** @var array $stores */
-        $stores = $this->storeHelper->getStores('lang');
+        $stores = $this->storeHelper->getStores('lang', true);
         /** @var mixed[] $categoryPath */
         $categoryPath = $this->getCategoryPath();
         /** @var mixed[] $rootCatAndStore */

diff --git a/Job/Option.php b/Job/Option.php
@@ -532,7 +532,7 @@ public function insertSwatchOption(): void
                 /** @var string $value */
                 $value = 'labels-' . $local;
 
-                if ($this->configHelper->getOptionCodeAsAdminLabel() && $store['store_id'] == 0) {
+                if (!$this->storeHelper->isSingleStoreMode() && $this->configHelper->getOptionCodeAsAdminLabel() && $store['store_id'] == 0) {
                     $value = 'code';
                 }
 

diff --git a/Job/Product.php b/Job/Product.php
@@ -3669,9 +3669,9 @@ public function setUrlRewrite(): void
         $urlRewriteTable = $this->entitiesHelper->getTable('url_rewrite');
         $productCategoriesTable = $this->entitiesHelper->getTable('catalog_category_product');
         $stores = array_merge(
-            $this->storeHelper->getStores(['lang']), // en_US
-            $this->storeHelper->getStores(['lang', 'channel_code']), // en_US-channel
-            $this->storeHelper->getStores(['channel_code']) // channel
+            $this->storeHelper->getStores(['lang'], true), // en_US
+            $this->storeHelper->getStores(['lang', 'channel_code'], true), // en_US-channel
+            $this->storeHelper->getStores(['channel_code'], true) // channel
         );
 
         $isUrlMapped = false;
@@ -3687,7 +3687,7 @@ public function setUrlRewrite(): void
         // Reset stores variable to generate a column per store when nothing is mapped or url_key is global
         if (!$isUrlMapped) {
             $stores = array_merge(
-                $this->storeHelper->getStores(['lang']) // en_US
+                $this->storeHelper->getStores(['lang'], true) // en_US
             );
         }
 

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