Merge pull request #5 from PayEx/bugfix/payment-config-scope

Fixes an issue with payment config scope
PayEx · Jun 18, 2019 · bec4401 · bec4401
2 parents 7951409 + 6fd1a2a
commit bec4401
Showing 1 changed file with 11 additions and 18 deletions.
diff --git a/Helper/Config.php b/Helper/Config.php
@@ -166,15 +166,8 @@ public function getPaymentValue($code, $paymentMethod, $store = null)
      */
     public function isPayment($module = '')
     {
-        $isPayment = false;
-
-        try {
-            $paymentConfigPath = $this->getPaymentConfigPath('active', $module);
-            if ($this->pathValidator->validate($paymentConfigPath)) {
-                $isPayment = true;
-            }
-        } catch (ValidatorException $e) {
-        }
+        $paymentConfigPath = $this->getPaymentConfigPath('active', $module);
+        $isPayment = ($this->scopeConfig->isSetFlag($paymentConfigPath) == null) ? false : true;
 
         return $isPayment;
     }
@@ -186,25 +179,25 @@ public function isPayment($module = '')
      */
     public function isActive($store = null, $module = '')
     {
-        $isActive = false;
-
-        if ($isPayment = $this->isPayment($module)) {
-            $isActive = $this->scopeConfig->isSetFlag($this->getPaymentConfigPath('active', $module));
+        if ($this->isPayment($module)) {
+            $configPath = $this->getPaymentConfigPath('active', $module);
         }
 
-        if (!$isPayment) {
-            $isActive = $this->scopeConfig->isSetFlag($this->getConfigPath('active', $module));
+        if (!isset($configPath)) {
+            $configPath = $this->getConfigPath('active', $module);
         }
 
-        if (!$isActive || $module != '') {
-            return $isActive;
-        }
+        $isActive = $this->scopeConfig->isSetFlag($configPath, $this->getScope($store), $store);
 
         if (in_array($this->_getModuleName(), $this->moduleDependencies)) {
             $key = array_search($this->_getModuleName(), $this->moduleDependencies);
             unset($this->moduleDependencies[$key]);
         }
 
+        if (!$isActive || $module != '' || count($this->moduleDependencies) == 0) {
+            return $isActive;
+        }
+
         foreach ($this->moduleDependencies as $dependency) {
             if ($dependency == 'PayEx_Core') {
                 continue;