Skip to content

A
Adyen Magento2
Commit 14c25f45 authored by Attila Kiss's avatar Attila Kiss Committed by GitHub
Browse files
Options

[PW-3174] Use the generic component for card payments (#840) 

* Use bundle instead of the component

* Store action and additionalData from /payments response

* [WIP] handle paymentDetails for card payments

* Remove custom redirect page

The checkout redirect component does the redirect for both 3DS1(now) and
alternative payment(WIP)

* Store and return details

Store action, resultCode, additionalData, pspReference, nad paymentData

* Show challenge in a popup for 3DS2
parent 89409fb6
Expand all Show whitespace changes
Inline Side-by-side
Showing with 128 additions and 747 deletions
Block/Redirect/Redirect.php deleted 100755 → 0
View file @ 89409fb6
This diff is collapsed.
Controller/Process/Redirect.php
View file @ 14c25f45
...@@ -148,7 +148,6 @@ class Redirect extends \Magento\Framework\App\Action\Action ...@@ -148,7 +148,6 @@ class Redirect extends \Magento\Framework\App\Action\Action
if ($order->getPayment()) { if ($order->getPayment()) {
$active = $order->getPayment()->getAdditionalInformation('3dActive'); $active = $order->getPayment()->getAdditionalInformation('3dActive');
$success = $order->getPayment()->getAdditionalInformation('3dSuccess'); $success = $order->getPayment()->getAdditionalInformation('3dSuccess');
$checkoutAPM = $order->getPayment()->getAdditionalInformation('checkoutAPM');
} }
// check if 3D secure is active. If not just go to success page // check if 3D secure is active. If not just go to success page
...@@ -247,27 +246,7 @@ class Redirect extends \Magento\Framework\App\Action\Action ...@@ -247,27 +246,7 @@ class Redirect extends \Magento\Framework\App\Action\Action
$this->_redirect($this->_adyenHelper->getAdyenAbstractConfigData('return_path')); $this->_redirect($this->_adyenHelper->getAdyenAbstractConfigData('return_path'));
} }
} else {
$this->_adyenLogger->addAdyenResult("Customer was redirected to bank for 3D-secure validation.");
$order->addStatusHistoryComment(
__(
'Customer was redirected to bank for 3D-secure validation. Once the shopper authenticated,
the order status will be updated accordingly.
<br />Make sure that your notifications are being processed!
<br />If the order is stuck on this status, the shopper abandoned the session.
The payment can be seen as unsuccessful.
<br />The order can be automatically cancelled based on the OFFER_CLOSED notification.
Please contact Adyen Support to enable this.'
)
)->save();
$this->_view->loadLayout();
$this->_view->getLayout()->initMessages();
$this->_view->renderLayout();
} }
} elseif (!empty($checkoutAPM)) {
$this->_view->loadLayout();
$this->_view->getLayout()->initMessages();
$this->_view->renderLayout();
} else { } else {
$this->_redirect('checkout/onepage/success', ['_query' => ['utm_nooverride' => '1']]); $this->_redirect('checkout/onepage/success', ['_query' => ['utm_nooverride' => '1']]);
} }
......
Gateway/Validator/CheckoutResponseValidator.php
View file @ 14c25f45
...@@ -69,25 +69,27 @@ class CheckoutResponseValidator extends AbstractValidator ...@@ -69,25 +69,27 @@ class CheckoutResponseValidator extends AbstractValidator
// validate result // validate result
if (!empty($response['resultCode'])) { if (!empty($response['resultCode'])) {
$payment->setAdditionalInformation('resultCode', $response['resultCode']); $payment->setAdditionalInformation('resultCode', $response['resultCode']);
switch ($response['resultCode']) {
case "IdentifyShopper": if (!empty($response['action'])) {
$payment->setAdditionalInformation('threeDSType', $response['resultCode']); $payment->setAdditionalInformation('action', $response['action']);
$payment->setAdditionalInformation( }
'threeDS2Token',
$response['authentication']['threeds2.fingerprintToken'] if (!empty($response['additionalData'])) {
); $payment->setAdditionalInformation('additionalData', $response['additionalData']);
$payment->setAdditionalInformation('adyenPaymentData', $response['paymentData']); }
break;
case "ChallengeShopper": if (!empty($response['pspReference'])) {
$payment->setAdditionalInformation('threeDSType', $response['resultCode']); $payment->setAdditionalInformation('pspReference', $response['pspReference']);
$payment->setAdditionalInformation( }
'threeDS2Token',
$response['authentication']['threeds2.challengeToken'] if (!empty($response['paymentData'])) {
);
$payment->setAdditionalInformation('adyenPaymentData', $response['paymentData']); $payment->setAdditionalInformation('adyenPaymentData', $response['paymentData']);
break; }
switch ($response['resultCode']) {
case "Authorised": case "Authorised":
case "Received": case "Received":
// TODO refactor since the full additionalData is stored in additionalInformation already
// For banktransfers store all bankTransfer details // For banktransfers store all bankTransfer details
if (!empty($response['additionalData']['bankTransfer.owner'])) { if (!empty($response['additionalData']['bankTransfer.owner'])) {
foreach ($response['additionalData'] as $key => $value) { foreach ($response['additionalData'] as $key => $value) {
...@@ -115,21 +117,14 @@ class CheckoutResponseValidator extends AbstractValidator ...@@ -115,21 +117,14 @@ class CheckoutResponseValidator extends AbstractValidator
} }
$payment->setAdditionalInformation('pspReference', $response['pspReference']); $payment->setAdditionalInformation('pspReference', $response['pspReference']);
break; break;
case "IdentifyShopper":
case "ChallengeShopper":
case "PresentToShopper": case "PresentToShopper":
if (!empty($response['action'])) {
$payment->setAdditionalInformation('action', $response['action']);
}
if (!empty($response['pspReference'])) {
$payment->setAdditionalInformation('pspReference', $response['pspReference']);
}
break;
case 'Pending': case 'Pending':
$payment->setAdditionalInformation('adyenPaymentData', $response['paymentData']); // nothing extra
if (!empty($response['action'])) {
$payment->setAdditionalInformation('action', $response['action']);
}
break; break;
case "RedirectShopper": case "RedirectShopper":
// TODO refactor this resultCode handling
$payment->setAdditionalInformation('threeDSType', $response['resultCode']); $payment->setAdditionalInformation('threeDSType', $response['resultCode']);
$redirectUrl = null; $redirectUrl = null;
......
Helper/PaymentResponseHandler.php
View file @ 14c25f45
...@@ -100,15 +100,50 @@ class PaymentResponseHandler ...@@ -100,15 +100,50 @@ class PaymentResponseHandler
$this->adyenLogger->error("Payment details call failed, paymentsResponse is empty"); $this->adyenLogger->error("Payment details call failed, paymentsResponse is empty");
return false; return false;
} }
if (!empty($paymentsResponse['resultCode']))
$payment->setAdditionalInformation('resultCode', $paymentsResponse['resultCode']);
if (!empty($paymentsResponse['action'])) {
$payment->setAdditionalInformation('action', $paymentsResponse['action']);
}
if (!empty($paymentsResponse['additionalData'])) {
$payment->setAdditionalInformation('additionalData', $paymentsResponse['additionalData']);
}
if (!empty($paymentsResponse['pspReference'])) {
$payment->setAdditionalInformation('pspReference', $paymentsResponse['pspReference']);
}
if (!empty($paymentsResponse['paymentData'])) {
$payment->setAdditionalInformation('adyenPaymentData', $paymentsResponse['paymentData']);
}
switch ($paymentsResponse['resultCode']) { switch ($paymentsResponse['resultCode']) {
case self::PRESENT_TO_SHOPPER: case self::PRESENT_TO_SHOPPER:
case self::PENDING: case self::PENDING:
case self::RECEIVED: case self::RECEIVED:
$payment->setAdditionalInformation("paymentsResponse", $paymentsResponse);
break; break;
//We don't need to handle these resultCodes //We don't need to handle these resultCodes
case self::AUTHORISED:
case self::REDIRECT_SHOPPER: case self::REDIRECT_SHOPPER:
$this->adyenLogger->addAdyenResult("Customer was redirected.");
if ($order) {
$order->addStatusHistoryComment(
__(
'Customer was redirected to an external payment page. (In case of card payments the shopper is redirected to the bank for 3D-secure validation.) Once the shopper is authenticated,
the order status will be updated accordingly.
<br />Make sure that your notifications are being processed!
<br />If the order is stuck on this status, the shopper abandoned the session.
The payment can be seen as unsuccessful.
<br />The order can be automatically cancelled based on the OFFER_CLOSED notification.
Please contact Adyen Support to enable this.'
)
)->save();
}
break;
case self::AUTHORISED:
case self::IDENTIFY_SHOPPER: case self::IDENTIFY_SHOPPER:
case self::CHALLENGE_SHOPPER: case self::CHALLENGE_SHOPPER:
break; break;
......
Model/AdyenPaymentDetails.php
View file @ 14c25f45
...@@ -151,6 +151,17 @@ class AdyenPaymentDetails implements AdyenPaymentDetailsInterface ...@@ -151,6 +151,17 @@ class AdyenPaymentDetails implements AdyenPaymentDetailsInterface
$this->checkoutSession->restoreQuote(); $this->checkoutSession->restoreQuote();
throw new LocalizedException(__('The payment is REFUSED.')); throw new LocalizedException(__('The payment is REFUSED.'));
} }
return json_encode($this->paymentResponseHandler->formatPaymentResponse($paymentDetails['resultCode']));
$action = null;
if (!empty($paymentDetails['action'])) {
$action = $paymentDetails['action'];
}
$additionalData = null;
if (!empty($paymentDetails['additionalData'])) {
$additionalData = $paymentDetails['additionalData'];
}
return json_encode($this->paymentResponseHandler->formatPaymentResponse($paymentDetails['resultCode'], $action, $additionalData));
} }
} }
view/frontend/layout/adyen_process_redirect.xml deleted 100755 → 0
View file @ 89409fb6
<?xml version="1.0"?>
<!--
/**
* ######
* ######
* ############ ####( ###### #####. ###### ############ ############
* ############# #####( ###### #####. ###### ############# #############
* ###### #####( ###### #####. ###### ##### ###### ##### ######
* ###### ###### #####( ###### #####. ###### ##### ##### ##### ######
* ###### ###### #####( ###### #####. ###### ##### ##### ######
* ############# ############# ############# ############# ##### ######
* ############ ############ ############# ############ ##### ######
* ######
* #############
* ############
*
* Adyen Payment module (https://www.adyen.com/)
*
* Copyright (c) 2015 Adyen BV (https://www.adyen.com/)
* See LICENSE.txt for license details.
*
* Author: Adyen <magento@adyen.com>
*/
-->
<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/layout_generic.xsd">
<container name="root">
<block class="Adyen\Payment\Block\Redirect\Redirect" name="adyen-redirect-form" template="redirect/redirect.phtml" cacheable="false"/>
</container>
</layout>
\ No newline at end of file
view/frontend/templates/redirect/redirect.phtml deleted 100644 → 0
View file @ 89409fb6
<?php
/**
* ######
* ######
* ############ ####( ###### #####. ###### ############ ############
* ############# #####( ###### #####. ###### ############# #############
* ###### #####( ###### #####. ###### ##### ###### ##### ######
* ###### ###### #####( ###### #####. ###### ##### ##### ##### ######
* ###### ###### #####( ###### #####. ###### ##### ##### ######
* ############# ############# ############# ############# ##### ######
* ############ ############ ############# ############ ##### ######
* ######
* #############
* ############
*
* Adyen Payment module (https://www.adyen.com/)
*
* Copyright (c) 2015 Adyen BV (https://www.adyen.com/)
* See LICENSE.txt for license details.
*
* Author: Adyen <magento@adyen.com>
*/
?>
<?php
if ($block->getRedirectMethod() == "GET") { ?>
<body>
<script>
window.location.replace("<?= $block->escapeJs($block->getRedirectUrl()); ?>");
</script>
</body>
<?php
} else { ?>
<body onload="document.getElementById('3dform').submit();">
<form method="POST" action="<?= $block->escapeHtml($block->getRedirectUrl()); ?>" id="3dform">
<input type="hidden" name="PaReq" value="<?= $block->escapeHtml($block->getPaReq()); ?>"/>
<input type="hidden" name="MD" value="<?= $block->escapeHtml($block->getMd()); ?>"/>
<input type="hidden" name="TermUrl" value="<?= $block->escapeHtml($block->getTermUrl()); ?>"/>
<noscript>
<br>
<br>
<div style="text-align: center">
<h1>Processing your 3-D Secure Transaction</h1>
<p>Please click continue to continue the processing of your 3-D Secure transaction.</p>
<input type="submit" class="button" value="continue"/>
</div>
</noscript>
</form>
</body>
<?php
} ?>
\ No newline at end of file
view/frontend/web/js/view/payment/method-renderer/adyen-hpp-method.js
View file @ 14c25f45
...@@ -38,7 +38,6 @@ define( ...@@ -38,7 +38,6 @@ define(
'Magento_Ui/js/model/messages', 'Magento_Ui/js/model/messages',
'Adyen_Payment/js/model/payment-details', 'Adyen_Payment/js/model/payment-details',
'Magento_Checkout/js/model/error-processor', 'Magento_Checkout/js/model/error-processor',
'adyenCheckout',
'Adyen_Payment/js/bundle' 'Adyen_Payment/js/bundle'
], ],
function( function(
...@@ -59,7 +58,6 @@ define( ...@@ -59,7 +58,6 @@ define(
Messages, Messages,
paymentDetails, paymentDetails,
errorProcessor, errorProcessor,
AdyenCheckout,
AdyenComponent AdyenComponent
) { ) {
'use strict'; 'use strict';
......
view/frontend/web/js/view/payment/method-renderer/adyen-oneclick-method.js
View file @ 14c25f45
...@@ -42,9 +42,7 @@ define( ...@@ -42,9 +42,7 @@ define(
'Adyen_Payment/js/model/payment-details', 'Adyen_Payment/js/model/payment-details',
'Magento_Checkout/js/model/error-processor', 'Magento_Checkout/js/model/error-processor',
'Adyen_Payment/js/model/adyen-payment-service', 'Adyen_Payment/js/model/adyen-payment-service',
'adyenCheckout', 'Adyen_Payment/js/bundle',
]
'Adyen_Payment/js/bundle';
], ],
function( function(
...@@ -69,8 +67,7 @@ function( ...@@ -69,8 +67,7 @@ function(
paymentDetails, paymentDetails,
errorProcessor, errorProcessor,
adyenPaymentService, adyenPaymentService,
AdyenCheckout, AdyenComponent
AdyenComponent,
) { ) {
'use strict'; 'use strict';
......
view/frontend/web/template/payment/cc-form.html
View file @ 14c25f45
...@@ -95,9 +95,9 @@ ...@@ -95,9 +95,9 @@
<div class="checkout-component-dock" afterRender="renderSecureFields()" data-bind="attr: { id: 'cardContainer'}"></div> <div class="checkout-component-dock" afterRender="renderSecureFields()" data-bind="attr: { id: 'cardContainer'}"></div>
</div> </div>
<div id="threeDS2Wrapper"> <div id="cc_actionModalWrapper">
<div id="threeDS2Modal"> <div id="cc_actionModal">
<div id="threeDS2Container"></div> <div id="cc_actionContainer"></div>
</div> </div>
</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