AD-390: Payment result refactoring

Adyen · Jan 3, 2025 · c15988e · c15988e
1 parent 51efb84
commit c15988e
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 11 deletions.
diff --git a/...on/web/webroot/_ui/responsive/common/js/adyen-checkout/src/components/payment/Payment.tsx b/...on/web/webroot/_ui/responsive/common/js/adyen-checkout/src/components/payment/Payment.tsx
@@ -203,7 +203,7 @@ class Payment extends React.Component<Props, State> {
                     this.dropIn.handleAction(responseData.paymentsAction)
                 } else {
                     actions.resolve({
-                        resultCode: 'Authorised'
+                        resultCode: responseData.paymentsResponse.resultCode
                     });
                     this.setState({orderNumber: responseData.orderNumber})
                     this.setState({redirectToNextStep: true})

diff --git a/...oraddon/web/webroot/_ui/responsive/common/js/adyen-checkout/src/service/paymentService.ts b/...oraddon/web/webroot/_ui/responsive/common/js/adyen-checkout/src/service/paymentService.ts
@@ -2,14 +2,15 @@ import {AxiosError, AxiosResponse} from "axios";
 import {CSRFToken, urlContextPath} from "../util/baseUrlUtil";
 import {AddressData, PlaceOrderRequest} from "../types/paymentForm";
 import {AddressModel} from "../reducers/types";
-import {PaymentAction} from "@adyen/adyen-web";
+import {PaymentAction,PaymentResponseData} from "@adyen/adyen-web";
 import {ErrorResponse} from "../types/errorResponse";
 import {adyenAxios} from "../axios/AdyenAxios";
 
 export interface PlaceOrderResponse {
     success: boolean,
     executeAction?: boolean,
     paymentsAction?: PaymentAction,
+    paymentsResponse?: PaymentResponseData,
     error?: string,
     errorFieldCodes?: string[]
     orderNumber?: string
@@ -30,7 +31,8 @@ export class PaymentService {
                     success: true,
                     executeAction: placeOrderData.executeAction,
                     paymentsAction: placeOrderData.paymentsAction,
-                    orderNumber: placeOrderData.orderNumber
+                    orderNumber: placeOrderData.orderNumber,
+                    paymentsResponse: placeOrderData.paymentsResponse
                 }
             })
             .catch((errorResponse: AxiosError<ErrorResponse>): PlaceOrderResponse | void => {

diff --git a/adyenv6core/src/com/adyen/commerce/dto/OrderPaymentResult.java b/adyenv6core/src/com/adyen/commerce/dto/OrderPaymentResult.java
@@ -0,0 +1,22 @@
+package com.adyen.commerce.dto;
+
+import com.adyen.model.checkout.PaymentResponse;
+import de.hybris.platform.commercefacades.order.data.OrderData;
+
+public class OrderPaymentResult {
+    private OrderData orderData;
+    private PaymentResponse paymentResponse;
+
+    public OrderPaymentResult(OrderData orderData, PaymentResponse paymentResponse) {
+        this.orderData = orderData;
+        this.paymentResponse = paymentResponse;
+    }
+
+    public OrderData getOrderData() {
+        return orderData;
+    }
+
+    public PaymentResponse getPaymentResponse() {
+        return paymentResponse;
+    }
+}
diff --git a/adyenv6core/src/com/adyen/commerce/facades/AdyenCheckoutApiFacade.java b/adyenv6core/src/com/adyen/commerce/facades/AdyenCheckoutApiFacade.java
@@ -1,5 +1,6 @@
 package com.adyen.commerce.facades;
 
+import com.adyen.commerce.dto.OrderPaymentResult;
 import com.adyen.model.checkout.PaymentDetailsRequest;
 import com.adyen.model.checkout.PaymentRequest;
 import com.adyen.v6.facades.AdyenCheckoutFacade;
@@ -13,7 +14,7 @@ public interface AdyenCheckoutApiFacade extends AdyenCheckoutFacade {
 
     void preHandlePlaceOrder(PaymentRequest paymentRequest, String adyenPaymentMethod, AddressForm billingAddress, Boolean useAdyenDeliveryAddress);
 
-    OrderData placeOrderWithPayment(final HttpServletRequest request, final CartData cartData, PaymentRequest paymentRequest) throws Exception;
+    OrderPaymentResult placeOrderWithPayment(final HttpServletRequest request, final CartData cartData, PaymentRequest paymentRequest) throws Exception;
 
     OrderData placeOrderWithAdditionalDetails(PaymentDetailsRequest detailsRequest) throws Exception;
 }
diff --git a/adyenv6core/src/com/adyen/commerce/facades/impl/DefaultAdyenCheckoutApiFacade.java b/adyenv6core/src/com/adyen/commerce/facades/impl/DefaultAdyenCheckoutApiFacade.java
@@ -1,5 +1,6 @@
 package com.adyen.commerce.facades.impl;
 
+import com.adyen.commerce.dto.OrderPaymentResult;
 import com.adyen.commerce.facades.AdyenCheckoutApiFacade;
 import com.adyen.model.checkout.AfterpayDetails;
 import com.adyen.model.checkout.ApplePayDetails;
@@ -96,7 +97,7 @@ protected static String getBrowserInfoJson(BrowserInfo browserInfo) {
 
 
     @Override
-    public OrderData placeOrderWithPayment(final HttpServletRequest request, final CartData cartData, PaymentRequest paymentRequest) throws Exception {
+    public OrderPaymentResult placeOrderWithPayment(final HttpServletRequest request, final CartData cartData, PaymentRequest paymentRequest) throws Exception {
 
         RequestInfo requestInfo = new RequestInfo(request);
         requestInfo.setShopperLocale(getShopperLocale());
@@ -114,7 +115,9 @@ public OrderData placeOrderWithPayment(final HttpServletRequest request, final C
         }
         if (PaymentResponse.ResultCodeEnum.AUTHORISED == paymentResponse.getResultCode()) {
             LOGGER.info("Creating authorized order");
-            return createAuthorizedOrder(paymentResponse);
+            OrderData authorizedOrder = createAuthorizedOrder(paymentResponse);
+            return new OrderPaymentResult(authorizedOrder, paymentResponse);
+
         }
 
         throw new AdyenNonAuthorizedPaymentException(paymentResponse);

diff --git a/adyenv6core/src/com/adyen/v6/facades/impl/DefaultAdyenExpressCheckoutFacade.java b/adyenv6core/src/com/adyen/v6/facades/impl/DefaultAdyenExpressCheckoutFacade.java
@@ -1,5 +1,6 @@
 package com.adyen.v6.facades.impl;
 
+import com.adyen.commerce.dto.OrderPaymentResult;
 import com.adyen.commerce.facades.AdyenCheckoutApiFacade;
 import com.adyen.model.checkout.PaymentRequest;
 import com.adyen.model.checkout.PaymentResponse;
@@ -215,14 +216,14 @@ protected OrderData expressPDPCheckoutOCC(PaymentRequest paymentRequest, Address
 
             CartData cartData = cartConverter.convert(cart);
 
-            OrderData orderData = adyenCheckoutApiFacade.placeOrderWithPayment(request, cartData, paymentRequest);
+            OrderPaymentResult orderPaymentResult = adyenCheckoutApiFacade.placeOrderWithPayment(request, cartData, paymentRequest);
 
 
             if (sessionCart != null) {
                 cartService.setSessionCart(sessionCart);
             }
 
-            return orderData;
+            return orderPaymentResult.getOrderData();
         } else {
             throw new InvalidCartException("Checkout attempt on empty cart");
         }
@@ -293,7 +294,8 @@ protected OrderData expressCartCheckoutOCC(PaymentRequest paymentRequest, Addres
         if (cartHasEntries(cart)) {
             CartData cartData = cartConverter.convert(cart);
 
-            return adyenCheckoutApiFacade.placeOrderWithPayment(request, cartData, paymentRequest);
+            OrderPaymentResult orderPaymentResult = adyenCheckoutApiFacade.placeOrderWithPayment(request, cartData, paymentRequest);
+            return orderPaymentResult.getOrderData();
         } else {
             throw new InvalidCartException("Checkout attempt on empty cart");
         }

diff --git a/adyenwebcommons/src/com/adyen/commerce/controllerbase/PlaceOrderControllerBase.java b/adyenwebcommons/src/com/adyen/commerce/controllerbase/PlaceOrderControllerBase.java
@@ -1,5 +1,6 @@
 package com.adyen.commerce.controllerbase;
 
+import com.adyen.commerce.dto.OrderPaymentResult;
 import com.adyen.commerce.exception.AdyenControllerException;
 import com.adyen.commerce.facades.AdyenCheckoutApiFacade;
 import com.adyen.commerce.request.PlaceOrderRequest;
@@ -171,13 +172,14 @@ private OCCPlaceOrderResponse handlePayment(HttpServletRequest request, PlaceOrd
 
         try {
             cartData.setAdyenReturnUrl(getPaymentRedirectReturnUrl());
-            OrderData orderData = getAdyenCheckoutApiFacade().placeOrderWithPayment(request, cartData, placeOrderRequest.getPaymentRequest());
-
+            OrderPaymentResult orderPaymentResult = getAdyenCheckoutApiFacade().placeOrderWithPayment(request, cartData, placeOrderRequest.getPaymentRequest());
+            OrderData orderData = orderPaymentResult.getOrderData();
             String orderCode = getCheckoutCustomerStrategy().isAnonymousCheckout() ? orderData.getGuid() : orderData.getCode();
 
             OCCPlaceOrderResponse placeOrderResponse = new OCCPlaceOrderResponse();
             placeOrderResponse.setOrderNumber(orderCode);
             placeOrderResponse.setOrderData(orderData);
+            placeOrderResponse.setPaymentsResponse(orderPaymentResult.getPaymentResponse());
             return placeOrderResponse;
 
         } catch (ApiException e) {

diff --git a/adyenwebcommons/src/com/adyen/commerce/response/OCCPlaceOrderResponse.java b/adyenwebcommons/src/com/adyen/commerce/response/OCCPlaceOrderResponse.java
@@ -1,5 +1,6 @@
 package com.adyen.commerce.response;
 
+import com.adyen.model.checkout.PaymentResponse;
 import de.hybris.platform.commercefacades.order.data.OrderData;
 
 public class OCCPlaceOrderResponse extends PlaceOrderResponse {