Skip to content

A
Adyen Magento2

We will work on Apr 26th (Saturday) and will be off from Apr 30th (Wednesday) until May 2nd (Friday) for public holiday in our country

Commit 14b4cb63 authored by attilak's avatar attilak Committed by Rik ter Beek
Browse files
Options

Changes based on code review

parent 99397b67
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 337 deletions
Gateway/Http/Client/TransactionPayment.php
View file @ 14b4cb63
......@@ -30,12 +30,6 @@ use Magento\Payment\Gateway\Http\ClientInterface;
*/
class TransactionPayment implements ClientInterface
{
/**
* @var \Adyen\Client
*/
protected $client;
/**
* PaymentRequest constructor.
*
......@@ -59,8 +53,6 @@ class TransactionPayment implements ClientInterface
$this->_adyenLogger = $adyenLogger;
$this->_recurringType = $recurringType;
$this->_appState = $context->getAppState();
$this->client = $this->_adyenHelper->initializeAdyenClient();
}
/**
......@@ -72,7 +64,9 @@ class TransactionPayment implements ClientInterface
{
$request = $transferObject->getBody();
$service = new \Adyen\Service\Checkout($this->client);
$client = $this->_adyenHelper->initializeAdyenClient();
$service = new \Adyen\Service\Checkout($client);
try {
$response = $service->payments($request);
......
Helper/Data.php
View file @ 14b4cb63
......@@ -1307,21 +1307,21 @@ class Data extends AbstractHelper
// initialize client
$apiKey = $this->getAPIKey($storeId);
$client = new \Adyen\Client();
$client->setApplicationName("Magento 2 plugin");
$client->setXApiKey($apiKey);
$client = $this->createAdyenClient();
$client->setApplicationName("Magento 2 plugin");
$client->setXApiKey($apiKey);
$client->setAdyenPaymentSource($this->getModuleName(), $this->getModuleVersion());
$client->setAdyenPaymentSource($this->getModuleName(), $this->getModuleVersion());
$client->setExternalPlatform($this->productMetadata->getName(), $this->productMetadata->getVersion());
$client->setExternalPlatform($this->productMetadata->getName(), $this->productMetadata->getVersion());
if ($this->isDemoMode($storeId)) {
$client->setEnvironment(\Adyen\Environment::TEST);
} else {
$client->setEnvironment(\Adyen\Environment::LIVE);
}
if ($this->isDemoMode($storeId)) {
$client->setEnvironment(\Adyen\Environment::TEST);
} else {
$client->setEnvironment(\Adyen\Environment::LIVE);
}
$client->setLogger($this->adyenLogger);
$client->setLogger($this->adyenLogger);
return $client;
}
......@@ -1338,6 +1338,14 @@ class Data extends AbstractHelper
return $client;
}
/**
* @return \Adyen\Client
* @throws \Adyen\AdyenException
*/
private function createAdyenClient() {
return new \Adyen\Client();
}
/**
* Retrieve origin keys for platform's base url
*
......@@ -1353,8 +1361,7 @@ class Data extends AbstractHelper
if (!$originKey = $this->cache->load("Adyen_origin_key_for_" . $domain)) {
$originKey = "";
if ($originKeys = $this->getOriginKeys($domain)) {
$originKey = $originKeys[$domain];
if ($originKey = $this->getOriginKeyForUrl($domain)) {
$this->cache->save($originKey, "Adyen_origin_key_for_" . $domain, array(), 60 * 60 * 24);
}
}
......@@ -1363,13 +1370,13 @@ class Data extends AbstractHelper
}
/**
* Get origin keys for a specific url using the adyen api library client
* Get origin key for a specific url using the adyen api library client
*
* @param $url
* @return mixed
* @throws \Adyen\AdyenException
*/
private function getOriginKeys($url)
private function getOriginKeyForUrl($url)
{
$params = array(
"originDomains" => array(
......@@ -1381,7 +1388,12 @@ class Data extends AbstractHelper
$service = $this->adyenServiceFactory->createCheckoutUtility($client);
$respone = $service->originKeys($params);
return $respone['originKeys'];
if (empty($originKey = $respone['originKeys'][$url])) {
$originKey = "";
}
return $originKey;
}
/**
......
view/frontend/web/css/styles.css
View file @ 14b4cb63
......@@ -178,6 +178,10 @@
font-weight: 400;
}
#adyen-cc-form .fieldset > .holdername.field{
margin-bottom: 10px;
}
#adyen-cc-form .helper-text{
font-size: 11px;
color: rgb(144, 162, 189);
......
view/frontend/web/js/adyen.checkout.js deleted 100644 → 0
View file @ 99397b67
This diff is collapsed.
view/frontend/web/js/view/payment/method-renderer/adyen-cc-method.js
View file @ 14b4cb63
......@@ -30,8 +30,7 @@ define(
'Magento_Checkout/js/model/quote',
'Adyen_Payment/js/model/installments',
'mage/url',
'Adyen_Payment/js/adyen.2.0.0',
'Adyen_Payment/js/adyen.checkout'
'Adyen_Payment/js/adyen.2.0.0'
],
function ($, ko, Component, customer, creditCardData, additionalValidators, quote, installments, url) {
......
view/frontend/web/template/payment/cc-form.html
View file @ 14b4cb63
......@@ -68,29 +68,6 @@
<br/>
<!-- /ko -->
<div class="field holdername type">
<label data-bind="attr: {for: 'creditCardHolderName'}" class="label">
<span><!-- ko text: $t('Credit Card Owner')--><!-- /ko --></span>
</label>
<div class="control">
<input type="text"
class="input-text required-entry"
data-encrypted-name="holderName"
value=""
data-bind="attr: {
id: 'creditCardHolderName',
title: $t('Credit Card Owner'),
placeholder: $t('Credit Card Owner'),
'data-container': getCode() + '-cc-owner'
},
enable: isActive($parents),
value: creditCardOwner,
valueUpdate: 'keyup' "
data-validate="{required:true}"
/>
</div>
</div>
<div class="field type">
<label data-bind="attr: {for: getCode() + '_cc_type'}" class="label">
<span><!-- ko text: $t('Credit Card Type')--><!-- /ko --></span>
......@@ -120,6 +97,30 @@
">
</div>
</div>
<div class="field holdername type">
<label data-bind="attr: {for: 'creditCardHolderName'}" class="label">
<span><!-- ko text: $t('Credit Card Owner')--><!-- /ko --></span>
</label>
<div class="control">
<input type="text"
class="input-text required-entry"
data-encrypted-name="holderName"
value=""
data-bind="attr: {
id: 'creditCardHolderName',
title: $t('Credit Card Owner'),
placeholder: $t('Credit Card Owner'),
'data-container': getCode() + '-cc-owner'
},
enable: isActive($parents),
value: creditCardOwner,
valueUpdate: 'keyup' "
data-validate="{required:true}"
/>
</div>
</div>
<div class="field number cardContainerField">
<div afterRender="renderSecureFields()" data-bind="attr: { id: 'cardContainer'}" ></div>
</div>
......
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