Skip to content

A
Adyen Magento2

We will be off from 27/1 (Monday) to 31/1 (Friday) (GMT +7) for our Tet Holiday (Lunar New Year) in our country

Commit 0433c8c9 authored by alessio's avatar alessio
Browse files
Options

add storeid to helper

parent 78c71646
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 14 deletions
Gateway/Http/Client/TransactionAuthorization.php
View file @ 0433c8c9
...@@ -51,7 +51,6 @@ class TransactionAuthorization implements ClientInterface ...@@ -51,7 +51,6 @@ class TransactionAuthorization implements ClientInterface
\Magento\Framework\Encryption\EncryptorInterface $encryptor, \Magento\Framework\Encryption\EncryptorInterface $encryptor,
\Adyen\Payment\Helper\Data $adyenHelper, \Adyen\Payment\Helper\Data $adyenHelper,
\Adyen\Payment\Model\RecurringType $recurringType, \Adyen\Payment\Model\RecurringType $recurringType,
\Magento\Store\Model\StoreManagerInterface $storeManager,
array $data = [] array $data = []
) { ) {
$this->_encryptor = $encryptor; $this->_encryptor = $encryptor;
...@@ -59,8 +58,7 @@ class TransactionAuthorization implements ClientInterface ...@@ -59,8 +58,7 @@ class TransactionAuthorization implements ClientInterface
$this->_recurringType = $recurringType; $this->_recurringType = $recurringType;
$this->_appState = $context->getAppState(); $this->_appState = $context->getAppState();
$storeId = $storeManager->getStore()->getId(); $this->_client = $this->_adyenHelper->initializeAdyenClient();
$this->_client = $this->_adyenHelper->initializeAdyenClient($storeId);
} }
/** /**
......
Gateway/Http/Client/TransactionCancel.php
View file @ 0433c8c9
...@@ -45,15 +45,14 @@ class TransactionCancel implements ClientInterface ...@@ -45,15 +45,14 @@ class TransactionCancel implements ClientInterface
\Magento\Framework\Encryption\EncryptorInterface $encryptor, \Magento\Framework\Encryption\EncryptorInterface $encryptor,
\Adyen\Payment\Helper\Data $adyenHelper, \Adyen\Payment\Helper\Data $adyenHelper,
\Adyen\Payment\Model\RecurringType $recurringType, \Adyen\Payment\Model\RecurringType $recurringType,
\Magento\Store\Model\StoreManagerInterface $storeManager,
array $data = [] array $data = []
) { ) {
$this->_encryptor = $encryptor; $this->_encryptor = $encryptor;
$this->_adyenHelper = $adyenHelper; $this->_adyenHelper = $adyenHelper;
$this->_recurringType = $recurringType; $this->_recurringType = $recurringType;
$this->_appState = $context->getAppState(); $this->_appState = $context->getAppState();
$storeId = $storeManager->getStore()->getId();
$this->_client = $this->_adyenHelper->initializeAdyenClient($storeId); $this->_client = $this->_adyenHelper->initializeAdyenClient();
} }
/** /**
......
Gateway/Http/Client/TransactionCapture.php
View file @ 0433c8c9
...@@ -47,7 +47,6 @@ class TransactionCapture implements ClientInterface ...@@ -47,7 +47,6 @@ class TransactionCapture implements ClientInterface
\Adyen\Payment\Helper\Data $adyenHelper, \Adyen\Payment\Helper\Data $adyenHelper,
\Adyen\Payment\Logger\AdyenLogger $adyenLogger, \Adyen\Payment\Logger\AdyenLogger $adyenLogger,
\Adyen\Payment\Model\RecurringType $recurringType, \Adyen\Payment\Model\RecurringType $recurringType,
\Magento\Store\Model\StoreManagerInterface $storeManager,
array $data = [] array $data = []
) { ) {
$this->_encryptor = $encryptor; $this->_encryptor = $encryptor;
...@@ -55,8 +54,8 @@ class TransactionCapture implements ClientInterface ...@@ -55,8 +54,8 @@ class TransactionCapture implements ClientInterface
$this->_adyenLogger = $adyenLogger; $this->_adyenLogger = $adyenLogger;
$this->_recurringType = $recurringType; $this->_recurringType = $recurringType;
$this->_appState = $context->getAppState(); $this->_appState = $context->getAppState();
$storeId = $storeManager->getStore()->getId();
$this->_client = $this->_adyenHelper->initializeAdyenClient($storeId); $this->_client = $this->_adyenHelper->initializeAdyenClient();
} }
/** /**
......
Gateway/Http/Client/TransactionPayment.php
View file @ 0433c8c9
...@@ -46,8 +46,6 @@ class TransactionPayment implements ClientInterface ...@@ -46,8 +46,6 @@ class TransactionPayment implements ClientInterface
\Magento\Store\Model\StoreManagerInterface $storeManager \Magento\Store\Model\StoreManagerInterface $storeManager
) { ) {
$this->adyenHelper = $adyenHelper; $this->adyenHelper = $adyenHelper;
$storeId = $storeManager->getStore()->getId();
$this->_client = $this->adyenHelper->initializeAdyenClient($storeId);
} }
/** /**
......
Gateway/Http/Client/TransactionRefund.php
View file @ 0433c8c9
...@@ -45,7 +45,6 @@ class TransactionRefund implements ClientInterface ...@@ -45,7 +45,6 @@ class TransactionRefund implements ClientInterface
\Magento\Framework\Encryption\EncryptorInterface $encryptor, \Magento\Framework\Encryption\EncryptorInterface $encryptor,
\Adyen\Payment\Helper\Data $adyenHelper, \Adyen\Payment\Helper\Data $adyenHelper,
\Adyen\Payment\Model\RecurringType $recurringType, \Adyen\Payment\Model\RecurringType $recurringType,
\Magento\Store\Model\StoreManagerInterface $storeManager,
array $data = [] array $data = []
) { ) {
$this->_encryptor = $encryptor; $this->_encryptor = $encryptor;
...@@ -53,8 +52,7 @@ class TransactionRefund implements ClientInterface ...@@ -53,8 +52,7 @@ class TransactionRefund implements ClientInterface
$this->_recurringType = $recurringType; $this->_recurringType = $recurringType;
$this->_appState = $context->getAppState(); $this->_appState = $context->getAppState();
$storeId = $storeManager->getStore()->getId(); $this->_client = $this->_adyenHelper->initializeAdyenClient();
$this->_client = $this->_adyenHelper->initializeAdyenClient($storeId);
} }
/** /**
......
Helper/Data.php
View file @ 0433c8c9
...@@ -1343,6 +1343,10 @@ class Data extends AbstractHelper ...@@ -1343,6 +1343,10 @@ class Data extends AbstractHelper
public function initializeAdyenClient($storeId = null, $apiKey = null) public function initializeAdyenClient($storeId = null, $apiKey = null)
{ {
// initialize client // initialize client
if (empty($storeId)) {
$storeId = $this->storeManager->getStore()->getId();
}
if (empty($apiKey)) { if (empty($apiKey)) {
$apiKey = $this->getAPIKey($storeId); $apiKey = $this->getAPIKey($storeId);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment