Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AD-330: Fixes for Klarna and Blik #506

Merged
merged 1 commit into from
Jan 10, 2025
Merged

AD-330: Fixes for Klarna and Blik #506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ...on/web/webroot/_ui/responsive/common/js/adyen-checkout/src/reducers/adyenConfigReducer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ export const adyenConfigInitialState : AdyenConfigData = {
immediateCapture: false,
openInvoiceMethods: [],
selectedPaymentMethod: "",
sessionData: undefined,
shopperLocale: "",
showBoleto: false,
showComboCard: false,
Expand Down
4 changes: 3 additions & 1 deletion ...oraddon/web/webroot/_ui/responsive/common/js/adyen-checkout/src/service/paymentService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export interface PlaceOrderResponse {
executeAction?: boolean,
paymentsAction?: PaymentAction,
paymentsResponse?: PaymentResponseData,
paymentDetailsResponse?: PaymentResponseData,
error?: string,
errorFieldCodes?: string[]
orderNumber?: string
Expand Down Expand Up @@ -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 => {
Expand Down
6 changes: 0 additions & 6 deletions ...toraddon/web/webroot/_ui/responsive/common/js/adyen-checkout/src/types/adyenConfigData.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ export interface AdyenConfigData {
adyenClientKey: string;
adyenPaypalMerchantId: string;
deviceFingerPrintUrl: string;
sessionData: SessionData;
selectedPaymentMethod: string;
showRememberTheseDetails: boolean;
checkoutShopperHost: string;
Expand All @@ -31,11 +30,6 @@ export interface AdyenConfigData {
clickToPayLocale: string,
}

interface SessionData {
id: string,
sessionData: string
}

interface StoredPaymentMethodData {
brand: string;
expiryMonth: string;
Expand Down
3 changes: 1 addition & 2 deletions ...eckoutaddon/acceleratoraddon/web/webroot/WEB-INF/tags/responsive/checkoutOrderSummary.tag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 --%>
Expand All @@ -29,7 +29,6 @@
</div>
</c:if>
</div>

<c:choose>
<c:when test="${componentPaymentMethod eq '[pix]' || componentPaymentMethod eq '[bcmc_mobile]'}">
<%-- Render QR code --%>
Expand Down
5 changes: 3 additions & 2 deletions ...don/web/webroot/WEB-INF/views/responsive/pages/checkout/multi/selectPaymentMethodPage.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@
const initConfig = {
shopperLocale: "${shopperLocale}",
environment: "${environmentMode}",
clientKey: "${clientKey}"
clientKey: "${clientKey}",
countryCode: "${countryCode}"
};
const paymentMethodConfigs = {};

Expand All @@ -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']}">
Expand Down
7 changes: 1 addition & 6 deletions ...6b2ccheckoutaddon/acceleratoraddon/web/webroot/_ui/responsive/common/js/adyen.checkout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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",
Expand Down
Loading
Loading