add storeid to clients

Gateway/Http/Client/TransactionAuthorization.php

@@ -50,17 +50,17 @@ class TransactionAuthorization implements ClientInterface
         \Magento\Framework\Model\Context $context,
         \Magento\Framework\Encryption\EncryptorInterface $encryptor,
         \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;
         $this->_adyenHelper = $adyenHelper;
-        $this->_adyenLogger = $adyenLogger;
         $this->_recurringType = $recurringType;
         $this->_appState = $context->getAppState();
 
-        $this->_client = $this->_adyenHelper->initializeAdyenClient();
+        $storeId = $storeManager->getStore()->getId();
+        $this->_client = $this->_adyenHelper->initializeAdyenClient($storeId);
     }
     
     /**

Gateway/Http/Client/TransactionCancel.php

@@ -37,7 +37,6 @@ class TransactionCancel implements ClientInterface
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Encryption\EncryptorInterface $encryptor
      * @param \Adyen\Payment\Helper\Data $adyenHelper
-     * @param \Adyen\Payment\Logger\AdyenLogger $adyenLogger
      * @param \Adyen\Payment\Model\RecurringType $recurringType
      * @param array $data
      */
@@ -45,17 +44,16 @@ class TransactionCancel implements ClientInterface
         \Magento\Framework\Model\Context $context,
         \Magento\Framework\Encryption\EncryptorInterface $encryptor,
         \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;
         $this->_adyenHelper = $adyenHelper;
-        $this->_adyenLogger = $adyenLogger;
         $this->_recurringType = $recurringType;
         $this->_appState = $context->getAppState();
-
-        $this->_client = $this->_adyenHelper->initializeAdyenClient();
+        $storeId = $storeManager->getStore()->getId();
+        $this->_client = $this->_adyenHelper->initializeAdyenClient($storeId);
     }
 
     /**

Gateway/Http/Client/TransactionCapture.php

@@ -47,6 +47,7 @@ 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;
@@ -54,8 +55,8 @@ class TransactionCapture implements ClientInterface
         $this->_adyenLogger = $adyenLogger;
         $this->_recurringType = $recurringType;
         $this->_appState = $context->getAppState();
-
-        $this->_client = $this->_adyenHelper->initializeAdyenClient();
+        $storeId = $storeManager->getStore()->getId();
+        $this->_client = $this->_adyenHelper->initializeAdyenClient($storeId);
     }
 
     /**

Gateway/Http/Client/TransactionPayment.php

@@ -42,9 +42,12 @@ class TransactionPayment implements ClientInterface
      * @param \Adyen\Payment\Helper\Data $adyenHelper
      */
     public function __construct(
-        \Adyen\Payment\Helper\Data $adyenHelper
+        \Adyen\Payment\Helper\Data $adyenHelper,
+        \Magento\Store\Model\StoreManagerInterface $storeManager
     ) {
         $this->adyenHelper = $adyenHelper;
+        $storeId = $storeManager->getStore()->getId();
+        $this->_client = $this->adyenHelper->initializeAdyenClient($storeId);
     }
 
     /**
@@ -55,7 +58,6 @@ class TransactionPayment implements ClientInterface
     public function placeRequest(\Magento\Payment\Gateway\Http\TransferInterface $transferObject)
     {
         $request = $transferObject->getBody();
-
         $client = $this->adyenHelper->initializeAdyenClient();
 
         $service = new \Adyen\Service\Checkout($client);

Gateway/Http/Client/TransactionRefund.php

@@ -37,7 +37,6 @@ class TransactionRefund implements ClientInterface
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Encryption\EncryptorInterface $encryptor
      * @param \Adyen\Payment\Helper\Data $adyenHelper
-     * @param \Adyen\Payment\Logger\AdyenLogger $adyenLogger
      * @param \Adyen\Payment\Model\RecurringType $recurringType
      * @param array $data
      */
@@ -45,17 +44,17 @@ class TransactionRefund implements ClientInterface
         \Magento\Framework\Model\Context $context,
         \Magento\Framework\Encryption\EncryptorInterface $encryptor,
         \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;
         $this->_adyenHelper = $adyenHelper;
-        $this->_adyenLogger = $adyenLogger;
         $this->_recurringType = $recurringType;
         $this->_appState = $context->getAppState();
 
-        $this->_client = $this->_adyenHelper->initializeAdyenClient();
+        $storeId = $storeManager->getStore()->getId();
+        $this->_client = $this->_adyenHelper->initializeAdyenClient($storeId);
     }
 
     /**