Merge pull request #18 from SwedbankPay/hotfix/scope-config

Improve scope functionality
SwedbankPay · Apr 22, 2021 · 369cde9 · 369cde9
2 parents 9ccc810 + 492bf6b
commit 369cde9
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/Helper/Config.php b/Helper/Config.php
@@ -197,6 +197,29 @@ public function isPayment($module = '')
         return $isPayment;
     }
 
+    /**
+     * @param string $scopeType
+     * @param string|int $scopeId
+     * @param string $module
+     * @return bool
+     */
+    public function isScopeActive($scopeType, $scopeId, $module = 'core')
+    {
+        if ($scopeType === ScopeInterface::SCOPE_STORES) {
+            return $this->isActive($scopeId, $module);
+        }
+
+        if ($this->isPayment($module)) {
+            $configPath = $this->getPaymentConfigPath('active', $module);
+        }
+
+        if (!isset($configPath)) {
+            $configPath = $this->getConfigPath('active', $module);
+        }
+
+        return $this->scopeConfig->isSetFlag($configPath, $scopeType, $scopeId);
+    }
+
     /**
      * @param Store|int|string|null $store
      * @param string $module
@@ -207,6 +230,8 @@ public function isPayment($module = '')
      */
     public function isActive($store = null, $module = 'core')
     {
+        $store = $store ?? $this->storeManager->getStore()->getId();
+
         if ($this->isPayment($module)) {
             $configPath = $this->getPaymentConfigPath('active', $module);
         }

diff --git a/Observer/ConfigChangeObserver.php b/Observer/ConfigChangeObserver.php
@@ -144,7 +144,7 @@ public function execute(Observer $observer)
 
             $moduleConfigHelper = $this->configFactory->create($moduleName);
 
-            $isValid = $moduleConfigHelper->isActive($store);
+            $isValid = $moduleConfigHelper->isScopeActive($scope, $scopeId);
 
             if ($isActivated && !$isValid) {
                 $moduleConfigHelper->deactivateModule($scope, $scopeId);