Fix unset store path when custom is enabled

thomas-kl1 · web-flow · commit a51b5a8268b3 · 2024-04-12T15:48:16.000+02:00
diff --git a/Model/Config.php b/Model/Config.php
@@ -40,7 +40,8 @@ public function getStorePathType(): PathType
 
     public function isUnsetSingleStorePath(): bool
     {
-        return $this->scopeConfig->isSetFlag(self::CONFIG_PATH_UNSET_SINGLE_STORE_PATH);
+        return $this->scopeConfig->isSetFlag(self::CONFIG_PATH_UNSET_SINGLE_STORE_PATH)
+            && $this->getStorePathType() !== PathType::Custom;
     }
 
     public function getCountry(StoreInterface $store): string

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,8 @@ public function getStorePathType(): PathType`
`40`	`40`
`41`	`41`	`public function isUnsetSingleStorePath(): bool`
`42`	`42`	`{`
`43`		`- return $this->scopeConfig->isSetFlag(self::CONFIG_PATH_UNSET_SINGLE_STORE_PATH);`
	`43`	`+ return $this->scopeConfig->isSetFlag(self::CONFIG_PATH_UNSET_SINGLE_STORE_PATH)`
	`44`	`+ && $this->getStorePathType() !== PathType::Custom;`
`44`	`45`	`}`
`45`	`46`
`46`	`47`	`public function getCountry(StoreInterface $store): string`