From 478d249595de42e0d9fe2c265d0d3eb0ae292bab Mon Sep 17 00:00:00 2001
From: Julian Wundrak <j.wundrak@dotsource.de>
Date: Tue, 1 Oct 2019 07:52:01 +0200
Subject: [PATCH] Use configuration of current store instead of default store

---
 Helper/Config.php | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/Helper/Config.php b/Helper/Config.php
index 6467d9d..1218b11 100644
--- a/Helper/Config.php
+++ b/Helper/Config.php
@@ -1,6 +1,8 @@
 <?php
 namespace Paymentwall\Paymentwall\Helper;
 
+use Magento\Store\Model\ScopeInterface;
+
 class Config extends \Magento\Framework\App\Helper\AbstractHelper
 {
     private $config;
@@ -15,24 +17,24 @@ public function getInitConfig()
     {
         \Paymentwall_Config::getInstance()->set([
             'api_type' => \Paymentwall_Config::API_GOODS,
-            'public_key' => $this->config->getValue('payment/paymentwall/api_key'),
-            'private_key' => $this->config->getValue('payment/paymentwall/secret_key')
+            'public_key' => $this->config->getValue('payment/paymentwall/api_key', ScopeInterface::SCOPE_STORE),
+            'private_key' => $this->config->getValue('payment/paymentwall/secret_key', ScopeInterface::SCOPE_STORE)
         ]);
     }
 
     public function getInitBrickConfig($isPingback = false)
     {
-        $testMode = $this->config->getValue('payment/brick/test_mode');
-        $privateTestKey = $this->config->getValue('payment/brick/private_test_key');
-        $secretKey = $this->config->getValue('payment/brick/secret_key');
+        $testMode = $this->config->getValue('payment/brick/test_mode', ScopeInterface::SCOPE_STORE);
+        $privateTestKey = $this->config->getValue('payment/brick/private_test_key', ScopeInterface::SCOPE_STORE);
+        $secretKey = $this->config->getValue('payment/brick/secret_key', ScopeInterface::SCOPE_STORE);
         if ($isPingback) {
             \Paymentwall_Config::getInstance()->set([
                 'private_key' => $testMode ? $privateTestKey : $secretKey
             ]);
         } else {
-            $publicTestKey = $this->config->getValue('payment/brick/public_test_key');
-            $publicKey = $this->config->getValue('payment/brick/public_key');
-            $privateKey = $this->config->getValue('payment/brick/private_key');
+            $publicTestKey = $this->config->getValue('payment/brick/public_test_key', ScopeInterface::SCOPE_STORE);
+            $publicKey = $this->config->getValue('payment/brick/public_key', ScopeInterface::SCOPE_STORE);
+            $privateKey = $this->config->getValue('payment/brick/private_key', ScopeInterface::SCOPE_STORE);
             \Paymentwall_Config::getInstance()->set([
                 'api_type' => \Paymentwall_Config::API_GOODS,
                 'public_key' => $testMode ? $publicTestKey : $publicKey,
@@ -43,6 +45,6 @@ public function getInitBrickConfig($isPingback = false)
 
     public function getConfig($name, $type = 'paymentwall')
     {
-        return $this->config->getValue("payment/{$type}/{$name}");
+        return $this->config->getValue("payment/{$type}/{$name}", ScopeInterface::SCOPE_STORE);
     }
 }