Merge pull request #428 from Adyen/storeid_fix

PW-1200: Always pass storeid to initializeAdyenClient when available 

Gateway/Http/Client/TransactionAuthorization.php

@@ -50,13 +50,11 @@ 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,
         array $data = []
     ) {
         $this->_encryptor = $encryptor;
         $this->_adyenHelper = $adyenHelper;
-        $this->_adyenLogger = $adyenLogger;
         $this->_recurringType = $recurringType;
         $this->_appState = $context->getAppState();
 

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,13 +44,11 @@ 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,
         array $data = []
     ) {
         $this->_encryptor = $encryptor;
         $this->_adyenHelper = $adyenHelper;
-        $this->_adyenLogger = $adyenLogger;
         $this->_recurringType = $recurringType;
         $this->_appState = $context->getAppState();
 

Gateway/Http/Client/TransactionPayment.php

@@ -55,7 +55,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,13 +44,11 @@ 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,
         array $data = []
     ) {
         $this->_encryptor = $encryptor;
         $this->_adyenHelper = $adyenHelper;
-        $this->_adyenLogger = $adyenLogger;
         $this->_recurringType = $recurringType;
         $this->_appState = $context->getAppState();
 

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);
         }