AD-330: Fixes for Klarna and Blik

Adyen · Jan 10, 2025 · 5e24e51 · 5e24e51
1 parent f84742b
commit 5e24e51
Show file tree

Hide file tree

Showing 16 changed files with 98 additions and 118 deletions.
diff --git a/...on/web/webroot/_ui/responsive/common/js/adyen-checkout/src/reducers/adyenConfigReducer.ts b/...on/web/webroot/_ui/responsive/common/js/adyen-checkout/src/reducers/adyenConfigReducer.ts
@@ -9,7 +9,6 @@ export const adyenConfigInitialState : AdyenConfigData = {
     immediateCapture: false,
     openInvoiceMethods: [],
     selectedPaymentMethod: "",
-    sessionData: undefined,
     shopperLocale: "",
     showBoleto: false,
     showComboCard: false,

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
@@ -11,6 +11,7 @@ export interface PlaceOrderResponse {
     executeAction?: boolean,
     paymentsAction?: PaymentAction,
     paymentsResponse?: PaymentResponseData,
+    paymentDetailsResponse?: PaymentResponseData,
     error?: string,
     errorFieldCodes?: string[]
     orderNumber?: string
@@ -61,7 +62,8 @@ export class PaymentService {
                     success: true,
                     executeAction: placeOrderData.executeAction,
                     paymentsAction: placeOrderData.paymentsAction,
-                    orderNumber: placeOrderData.orderNumber
+                    orderNumber: placeOrderData.orderNumber,
+                    paymentsResponse: placeOrderData.paymentDetailsResponse
                 }
             })
             .catch((errorResponse: AxiosError<ErrorResponse>): PlaceOrderResponse | void => {

diff --git a/...toraddon/web/webroot/_ui/responsive/common/js/adyen-checkout/src/types/adyenConfigData.ts b/...toraddon/web/webroot/_ui/responsive/common/js/adyen-checkout/src/types/adyenConfigData.ts
@@ -11,7 +11,6 @@ export interface AdyenConfigData {
     adyenClientKey: string;
     adyenPaypalMerchantId: string;
     deviceFingerPrintUrl: string;
-    sessionData: SessionData;
     selectedPaymentMethod: string;
     showRememberTheseDetails: boolean;
     checkoutShopperHost: string;
@@ -31,11 +30,6 @@ export interface AdyenConfigData {
     clickToPayLocale: string,
 }
 
-interface SessionData {
-    id: string,
-    sessionData: string
-}
-
 interface StoredPaymentMethodData {
     brand: string;
     expiryMonth: string;

diff --git a/...eckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/checkoutOrderSummary.tag b/...eckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/checkoutOrderSummary.tag
@@ -11,7 +11,7 @@
 <spring:url value="/checkout/multi/termsAndConditions" var="getTermsAndConditionsUrl"/>
 
 <c:set var="componentsWithPayButton"
-       value="[amazonpay],[applepay],[paypal],[paywithgoogle],[googlepay],[pix],[bcmc_mobile],[upi],[paysafecard]"/>
+       value="[amazonpay],[applepay],[paypal],[paywithgoogle],[googlepay],[pix],[bcmc_mobile],[upi],[paysafecard],[klarna],[ideal]"/>
 <c:set var="componentPaymentMethod" value="[${selectedPaymentMethod}]" />
 
 <%-- Components --%>
@@ -29,7 +29,6 @@
         </div>
     </c:if>
     </div>
-
     <c:choose>
         <c:when test="${componentPaymentMethod eq '[pix]' || componentPaymentMethod eq '[bcmc_mobile]'}">
             <%-- Render QR code --%>

diff --git a/...don/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/selectPaymentMethodPage.jsp b/...don/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/selectPaymentMethodPage.jsp
@@ -31,7 +31,8 @@
             const initConfig = {
                 shopperLocale: "${shopperLocale}",
                 environment: "${environmentMode}",
-                clientKey: "${clientKey}"
+                clientKey: "${clientKey}",
+                countryCode: "${countryCode}"
             };
             const paymentMethodConfigs = {};
 
@@ -53,7 +54,7 @@
             </c:if>
 
             <c:if test="${not empty issuerLists['ideal']}">
-            paymentMethodConfigs['createIdeal'] = ${issuerLists['ideal']};
+                paymentMethodConfigs['createIdeal'] = ${issuerLists['ideal']};
             </c:if>
 
             <c:if test="${not empty issuerLists['onlinebanking_IN']}">

diff --git a/...6b2ccheckoutaddon/acceleratoraddon/web/webroot/_ui/responsive/common/js/adyen.checkout.js b/...6b2ccheckoutaddon/acceleratoraddon/web/webroot/_ui/responsive/common/js/adyen.checkout.js
@@ -59,11 +59,6 @@ class AdyenCheckoutHelper {
             },
             onError: (error, component) => {
                 console.error(error.name, error.message, error.stack, component);
-            },
-            paymentMethodsConfiguration:{
-                card: {
-                    enableStoreDetails: paymentMethodConfigs.enableStoreDetails,
-                },
             }
         };
         this.checkout = await AdyenWeb.AdyenCheckout(configuration);
@@ -227,7 +222,7 @@ class AdyenCheckoutHelper {
         });
     }
 
-    makePayment(data, component, handleResult, label) {
+    makePayment(data, component, handleResult) {
         $.ajax({
             url: ACC.config.encodedContextPath + '/adyen/component/payment',
             type: "POST",