Merge pull request #2773 from Adyen/ECP-9498

[ECP-9498] Implement `onError` callback for the Paypal.
Adyen · Oct 28, 2024 · 5c2bc8b · 5c2bc8b
2 parents 5ff9a68 + 1a43cff
commit 5c2bc8b
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 8 deletions.
diff --git a/Helper/PaymentsDetails.php b/Helper/PaymentsDetails.php
@@ -111,7 +111,7 @@ private function cleanUpPaymentDetailsPayload(array $payload): array
         );
 
         foreach (self::REQUEST_HELPER_PARAMETERS as $helperParam) {
-            if (array_key_exists($helperParam, $payload['details'])) {
+            if (isset($payload['details']) && array_key_exists($helperParam, $payload['details'])) {
                 unset($payload['details'][$helperParam]);
             }
         }

diff --git a/view/frontend/web/js/model/adyen-checkout.js b/view/frontend/web/js/model/adyen-checkout.js
@@ -19,7 +19,7 @@ define(
     ) {
         'use strict';
         return {
-            buildCheckoutComponent: function (paymentMethodsResponse, handleOnAdditionalDetails, handleOnCancel = undefined, handleOnSubmit = undefined) {
+            buildCheckoutComponent: function (paymentMethodsResponse, handleOnAdditionalDetails, handleOnCancel = undefined, handleOnSubmit = undefined, handleOnError = undefined) {
                 if (!!paymentMethodsResponse.paymentMethodsResponse) {
                     return AdyenCheckout({
                             locale: adyenConfiguration.getLocale(),
@@ -28,7 +28,8 @@ define(
                             paymentMethodsResponse: paymentMethodsResponse.paymentMethodsResponse,
                             onAdditionalDetails: handleOnAdditionalDetails,
                             onCancel: handleOnCancel,
-                            onSubmit: handleOnSubmit
+                            onSubmit: handleOnSubmit,
+                            onError: handleOnError
                         }
                     );
                 } else {

diff --git a/view/frontend/web/js/view/payment/method-renderer/adyen-paypal-method.js b/view/frontend/web/js/view/payment/method-renderer/adyen-paypal-method.js
@@ -12,14 +12,21 @@ define(
         'Magento_Checkout/js/model/quote',
         'Adyen_Payment/js/view/payment/method-renderer/adyen-pm-method',
         'Magento_Checkout/js/model/full-screen-loader',
+        'Adyen_Payment/js/model/adyen-payment-service',
+        'Magento_Checkout/js/model/error-processor',
+        'Adyen_Payment/js/model/adyen-configuration'
     ],
     function(
         quote,
         adyenPaymentMethod,
-        fullScreenLoader
+        fullScreenLoader,
+        adyenPaymentService,
+        errorProcessor,
+        adyenConfiguration
     ) {
         return adyenPaymentMethod.extend({
             placeOrderButtonVisible: false,
+            token: null,
             initialize: function () {
                 this._super();
             },
@@ -32,14 +39,47 @@ define(
             },
             renderActionComponent: function(resultCode, action, component) {
                 fullScreenLoader.stopLoader();
-
+                this.token = action.sdkData.token;
                 this.actionComponent = component.handleAction(action);
             },
             handleOnFailure: function(response, component) {
                 this.isPlaceOrderAllowed(true);
                 fullScreenLoader.stopLoader();
                 component.handleReject(response);
             },
+            handleOnError:  function (error, component) {
+                if ('test' === adyenConfiguration.getCheckoutEnvironment()) {
+                    console.log("onError:",error);
+                }
+
+                // call endpoint with component.paymentData if available
+                let request = {};
+                if (!!component.paymentData) {
+                    request.paymentData = component.paymentData;
+                }
+
+                //Create details array for the payload
+                let details = {};
+                if(!!this.token) {
+                    details.orderID = this.token;
+                }
+                request.details = details;
+
+                adyenPaymentService.paymentDetails(request, this.orderId).done(function() {
+                    $.mage.redirect(
+                        window.checkoutConfig.payment.adyen.successPage
+                    );
+                }).fail(function(response) {
+                    fullScreenLoader.stopLoader();
+                    if (this.popupModal) {
+                        this.closeModal(this.popupModal);
+                    }
+                    errorProcessor.process(response,
+                        this.currentMessageContainer);
+                    this.isPlaceOrderAllowed(true);
+                    this.showErrorMessage(response);
+                });
+            }
         })
     }
 );
diff --git a/view/frontend/web/js/view/payment/method-renderer/adyen-pm-method.js b/view/frontend/web/js/view/payment/method-renderer/adyen-pm-method.js
@@ -87,7 +87,8 @@ define(
                         paymentMethodsResponse,
                         this.handleOnAdditionalDetails.bind(this),
                         this.handleOnCancel.bind(this),
-                        this.handleOnSubmit.bind(this)
+                        this.handleOnSubmit.bind(this),
+                        this.handleOnError.bind(this)
                     );
 
                     if (!!this.checkoutComponent) {
@@ -374,15 +375,20 @@ define(
 
                 try {
                     const orderId = await placeOrderAction(data, self.currentMessageContainer);
-                    self.afterPlaceOrder();
                     const responseJSON = await adyenPaymentService.getOrderPaymentStatus(orderId);
                     self.validateActionOrPlaceOrder(responseJSON, orderId, component);
                 } catch (response) {
                     self.handleOnFailure(response, component);
                 }
             },
 
-
+            handleOnError: function (error, component) {
+                /*
+                 *  Passing false as the response to hide the actual error message from the shopper for security.
+                 *  This will show a generic error message instead of the actual error message.
+                 */
+                this.handleOnFailure(error, component);
+            },
             handleOnFailure: function(response, component) {
                 this.isPlaceOrderAllowed(true);
                 fullScreenLoader.stopLoader();