Merge pull request #705 from akeneo/release/104.3.12

Release/104.3.12
akeneo · Sep 11, 2024 · 08a7fb4 · 08a7fb4
2 parents d5c3997 + 479b8a5
commit 08a7fb4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -503,3 +503,6 @@
 ### Version 104.3.11 :
 * PGTO-398: keep the swatch option if exists
 * AMC-483: Single store mode feature
+
+### Version 104.3.12 :
+* AMC-483: Fix single store mode tax class
diff --git a/Helper/Config.php b/Helper/Config.php
@@ -1323,10 +1323,12 @@ public function getProductTaxClasses()
                 $result[0] = $class['tax_class'];
             }
 
-            /** @var StoreInterface $store */
-            foreach ($stores as $store) {
-                if ($store->getWebsiteId() === $class['website']) {
-                    $result[$store->getId()] = $class['tax_class'];
+            if (!$this->storeManager->isSingleStoreMode()) {
+                /** @var StoreInterface $store */
+                foreach ($stores as $store) {
+                    if ($store->getWebsiteId() === $class['website']) {
+                        $result[$store->getId()] = $class['tax_class'];
+                    }
                 }
             }
         }

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