add storeid to helper

Gateway/Http/Client/TransactionAuthorization.php

@@ -51,7 +51,6 @@ class TransactionAuthorization implements ClientInterface
         \Magento\Framework\Encryption\EncryptorInterface $encryptor,
         \Adyen\Payment\Helper\Data $adyenHelper,
         \Adyen\Payment\Model\RecurringType $recurringType,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
         array $data = []
     ) {
         $this->_encryptor = $encryptor;
@@ -59,8 +58,7 @@ class TransactionAuthorization implements ClientInterface
         $this->_recurringType = $recurringType;
         $this->_appState = $context->getAppState();
 
-        $storeId = $storeManager->getStore()->getId();
-        $this->_client = $this->_adyenHelper->initializeAdyenClient($storeId);
+        $this->_client = $this->_adyenHelper->initializeAdyenClient();
     }
     
     /**

Gateway/Http/Client/TransactionCancel.php

@@ -45,15 +45,14 @@ class TransactionCancel implements ClientInterface
         \Magento\Framework\Encryption\EncryptorInterface $encryptor,
         \Adyen\Payment\Helper\Data $adyenHelper,
         \Adyen\Payment\Model\RecurringType $recurringType,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
         array $data = []
     ) {
         $this->_encryptor = $encryptor;
         $this->_adyenHelper = $adyenHelper;
         $this->_recurringType = $recurringType;
         $this->_appState = $context->getAppState();
-        $storeId = $storeManager->getStore()->getId();
-        $this->_client = $this->_adyenHelper->initializeAdyenClient($storeId);
+
+        $this->_client = $this->_adyenHelper->initializeAdyenClient();
     }
 
     /**

Gateway/Http/Client/TransactionCapture.php

@@ -47,7 +47,6 @@ class TransactionCapture implements ClientInterface
         \Adyen\Payment\Helper\Data $adyenHelper,
         \Adyen\Payment\Logger\AdyenLogger $adyenLogger,
         \Adyen\Payment\Model\RecurringType $recurringType,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
         array $data = []
     ) {
         $this->_encryptor = $encryptor;
@@ -55,8 +54,8 @@ class TransactionCapture implements ClientInterface
         $this->_adyenLogger = $adyenLogger;
         $this->_recurringType = $recurringType;
         $this->_appState = $context->getAppState();
-        $storeId = $storeManager->getStore()->getId();
-        $this->_client = $this->_adyenHelper->initializeAdyenClient($storeId);
+
+        $this->_client = $this->_adyenHelper->initializeAdyenClient();
     }
 
     /**

Gateway/Http/Client/TransactionPayment.php

@@ -46,8 +46,6 @@ class TransactionPayment implements ClientInterface
         \Magento\Store\Model\StoreManagerInterface $storeManager
     ) {
         $this->adyenHelper = $adyenHelper;
-        $storeId = $storeManager->getStore()->getId();
-        $this->_client = $this->adyenHelper->initializeAdyenClient($storeId);
     }
 
     /**

Gateway/Http/Client/TransactionRefund.php

@@ -45,7 +45,6 @@ class TransactionRefund implements ClientInterface
         \Magento\Framework\Encryption\EncryptorInterface $encryptor,
         \Adyen\Payment\Helper\Data $adyenHelper,
         \Adyen\Payment\Model\RecurringType $recurringType,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
         array $data = []
     ) {
         $this->_encryptor = $encryptor;
@@ -53,8 +52,7 @@ class TransactionRefund implements ClientInterface
         $this->_recurringType = $recurringType;
         $this->_appState = $context->getAppState();
 
-        $storeId = $storeManager->getStore()->getId();
-        $this->_client = $this->_adyenHelper->initializeAdyenClient($storeId);
+        $this->_client = $this->_adyenHelper->initializeAdyenClient();
     }
 
     /**

Helper/Data.php

@@ -1343,6 +1343,10 @@ class Data extends AbstractHelper
     public function initializeAdyenClient($storeId = null, $apiKey = null)
     {
         // initialize client
+        if (empty($storeId)) {
+            $storeId = $this->storeManager->getStore()->getId();
+        }
+
         if (empty($apiKey)) {
             $apiKey = $this->getAPIKey($storeId);
         }