From aba3a72b9dee76e77b7c9319bd8d10d2ba96fc13 Mon Sep 17 00:00:00 2001 From: PJaneta Date: Mon, 20 Nov 2023 15:15:41 +0100 Subject: [PATCH] AD-50 Styling + refactor --- .../common/css/adyenv6b2ccheckoutaddon.css | 5 + .../common/js/adyen_express_checkout.js | 329 +++++++++--------- .../DefaultAdyenExpressCheckoutFacade.java | 77 ++-- 3 files changed, 207 insertions(+), 204 deletions(-) diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/_ui/responsive/common/css/adyenv6b2ccheckoutaddon.css b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/_ui/responsive/common/css/adyenv6b2ccheckoutaddon.css index ae747a198..71fd7bf8b 100644 --- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/_ui/responsive/common/css/adyenv6b2ccheckoutaddon.css +++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/_ui/responsive/common/css/adyenv6b2ccheckoutaddon.css @@ -109,3 +109,8 @@ div#section_break { position:relative !important; max-height: 280px; } + +.adyen-checkout__applepay__button { + width: 100% !important; + border-radius: 0; +} \ No newline at end of file diff --git a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/_ui/responsive/common/js/adyen_express_checkout.js b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/_ui/responsive/common/js/adyen_express_checkout.js index 1a1adf5b4..271d2d910 100644 --- a/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/_ui/responsive/common/js/adyen_express_checkout.js +++ b/adyenv6b2ccheckoutaddon/acceleratoraddon/web/webroot/_ui/responsive/common/js/adyen_express_checkout.js @@ -1,41 +1,49 @@ -var AdyenExpressCheckoutHybris = (function () { +var AdyenExpressCheckoutHybris = (function() { 'use strict'; var ErrorMessages = { - PaymentCancelled: 'checkout.error.authorization.payment.cancelled', - PaymentError: 'checkout.error.authorization.payment.error', - PaymentNotAvailable: 'checkout.summary.component.notavailable', - TermsNotAccepted: 'checkout.error.terms.not.accepted' - }; + PaymentCancelled: 'checkout.error.authorization.payment.cancelled', + PaymentError: 'checkout.error.authorization.payment.error', + PaymentNotAvailable: 'checkout.summary.component.notavailable', + TermsNotAccepted: 'checkout.error.terms.not.accepted' + }; return { - adyenConfig: { - merchantName: null, - merchantId: null, - pageType: null, - productCode: null - }, + adyenConfig: { + merchantName: null, + merchantId: null, + pageType: null, + productCode: null + }, - initiateCheckout: async function (initConfig) { - const configuration = { - ...initConfig, - analytics: { - enabled: false // Set to false to not send analytics data to Adyen. - }, - risk: { - enabled: false - }, - onError: (error, component) => { - console.error(error.name, error.message, error.stack, component); - }, - }; + initiateCheckout: async function(initConfig) { + const configuration = { + ...initConfig, + analytics: { + enabled: false // Set to false to not send analytics data to Adyen. + }, + risk: { + enabled: false + }, + onError: (error, component) => { + console.error("Checkout error occured"); + }, + }; - return await AdyenCheckout(configuration); - }, - initiateApplePayExpress: async function (params, config) { + return await AdyenCheckout(configuration); + }, + initiateApplePayExpress: async function(params, config) { var checkoutPromise = this.initiateCheckout(config); - const {amount, countryCode, applePayMerchantIdentifier, applePayMerchantName, pageType, productCode} = params; + const { + amount, + countryCode, + applePayMerchantIdentifier, + applePayMerchantName, + pageType, + productCode + } = params; + const applePayNode = document.getElementById('adyen-component-button-container'); this.adyenConfig.merchantName = applePayMerchantName; @@ -46,42 +54,29 @@ var AdyenExpressCheckoutHybris = (function () { const applePayConfiguration = { //onValidateMerchant is required if you're using your own Apple Pay certificate onValidateMerchant: (resolve, reject, validationURL) => { - resolve(); - - // Your server uses the validation URL to request a session from the Apple Pay server. - // Call resolve(MERCHANTSESSION) or reject() to complete merchant validation. - /*validateMerchant(validationURL) - .then(response => { - // Complete merchant validation with resolve(MERCHANTSESSION) after receiving an opaque merchant session object, MerchantSession - resolve(response); - }) - .catch(error => { - // Complete merchant validation with reject() if any error occurs - reject(); - });*/ + resolve(); } }; checkoutPromise.then((checkout) => { - var applePayComponent = checkout.create("applepay", { - amount: { - currency: amount.currency, - value: amount.value - }, - configuration: { - merchantName: applePayMerchantName, - merchantId: applePayMerchantIdentifier - }, - // Button config - buttonType: "check-out", - buttonColor: "black", - requiredShippingContactFields: [ - "postalAddress", - "name", - "email" - ], -// onShippingContactSelected: function(resolve, reject, event){ -// //TODO: might be used to recalculate cart with shipping method -// console.log(event.shippingContact); + var applePayComponent = checkout.create("applepay", { + amount: { + currency: amount.currency, + value: amount.value + }, + configuration: { + merchantName: applePayMerchantName, + merchantId: applePayMerchantIdentifier + }, + // Button config + buttonType: "check-out", + buttonColor: "black", + requiredShippingContactFields: [ + "postalAddress", + "name", + "email" + ], + //might be used to recalculate cart with shipping method +// onShippingContactSelected: function(resolve, reject, event){ // // var shippingMethodUpdate = { // newTotal: { @@ -90,126 +85,122 @@ var AdyenExpressCheckoutHybris = (function () { // } // resolve(shippingMethodUpdate); // }, - onClick: function(resolve, reject) { - resolve(); - }, - onSubmit: function(state, component) { - // empty to block session flow, submit logic done in onAuthorized - }, - onAuthorized: (resolve, reject, event) => { - var data = this.prepareData(event); - this.makePayment(data, resolve, reject); - } - }); - applePayComponent.isAvailable() - .then(function () { - applePayComponent.mount(applePayNode); - }) - .catch(function (e) { - // Apple Pay is not available - console.log('Something went wrong trying to mount the Apple Pay component: ' + e); + onClick: function(resolve, reject) { + resolve(); + }, + onSubmit: function(state, component) { + // empty to block session flow, submit logic done in onAuthorized + }, + onAuthorized: (resolve, reject, event) => { + var data = this.prepareData(event); + this.makePayment(data, resolve, reject); + } }); + applePayComponent.isAvailable() + .then(function() { + applePayComponent.mount(applePayNode); + }) + .catch(function(e) { + // Apple Pay is not available + console.log('Something went wrong trying to mount the Apple Pay component'); + }); }) }, - makePayment: function (data, resolve, reject) { - $.ajax({ - url: this.getUrl(), - type: "POST", - data: JSON.stringify(data), - contentType: "application/json; charset=utf-8", - success: function (response) { - try { - // var response = JSON.parse(data); - console.log(response); - - if (response.resultCode && (response.resultCode === 'Authorised' || response.resultCode === 'RedirectShopper')) { - resolve(); - AdyenExpressCheckoutHybris.handleResult(response, false); - } else { + makePayment: function(data, resolve, reject) { + $.ajax({ + url: this.getUrl(), + type: "POST", + data: JSON.stringify(data), + contentType: "application/json; charset=utf-8", + success: function(response) { + try { + if (response.resultCode && (response.resultCode === 'Authorised' || response.resultCode === 'RedirectShopper')) { + resolve(); + AdyenExpressCheckoutHybris.handleResult(response, false); + } else { + reject(); + AdyenExpressCheckoutHybris.handleResult(ErrorMessages.PaymentError, true); + } + } catch (e) { reject(); AdyenExpressCheckoutHybris.handleResult(ErrorMessages.PaymentError, true); } - } catch (e) { - console.log('Error parsing makePayment response: ' + data); + }, + error: function(xmlHttpResponse, exception) { reject(); - AdyenExpressCheckoutHybris.handleResult(ErrorMessages.PaymentError, true); - } - }, - error: function (xmlHttpResponse, exception) { - reject(); - var responseMessage = xmlHttpResponse.responseJSON; - if (xmlHttpResponse.status === 400) { - AdyenExpressCheckoutHybris.handleResult(responseMessage, true); - } else { - console.log('Error on makePayment: ' + responseMessage); - AdyenExpressCheckoutHybris.handleResult(ErrorMessages.PaymentError, true); + var responseMessage = xmlHttpResponse.responseJSON; + if (xmlHttpResponse.status === 400) { + AdyenExpressCheckoutHybris.handleResult(responseMessage, true); + } else { + console.log('Error on makePayment'); + AdyenExpressCheckoutHybris.handleResult(ErrorMessages.PaymentError, true); + } } + }) + }, + handleResult: function(data, error) { + if (error) { + document.querySelector("#resultData").value = data; + document.querySelector("#isResultError").value = error; + } else { + document.querySelector("#resultData").value = JSON.stringify(data); } - }) - }, - handleResult: function (data, error) { - if (error) { - document.querySelector("#resultData").value = data; - document.querySelector("#isResultError").value = error; - } else { - document.querySelector("#resultData").value = JSON.stringify(data); - } - document.querySelector("#handleComponentResultForm").submit(); - }, - prepareData: function(event) { - if (this.adyenConfig.pageType === 'PDP'){ - return { - productCode: this.adyenConfig.productCode, - adyenApplePayMerchantName: this.adyenConfig.merchantName, - adyenApplePayMerchantIdentifier: this.adyenConfig.merchantId, - applePayToken: btoa(JSON.stringify(event.payment.token.paymentData)), - addressData: { - email: event.payment.shippingContact.emailAddress, - firstName: event.payment.shippingContact.givenName, - lastName: event.payment.shippingContact.familyName, - line1: event.payment.shippingContact.addressLines[0], - line2: event.payment.shippingContact.addressLines[1], - postalCode: event.payment.shippingContact.postalCode, - town: event.payment.shippingContact.locality, - country: { - isocode: event.payment.shippingContact.countryCode, - name: event.payment.shippingContact.country - } + document.querySelector("#handleComponentResultForm").submit(); + }, + prepareData: function(event) { + if (this.adyenConfig.pageType === 'PDP') { + return { + productCode: this.adyenConfig.productCode, + adyenApplePayMerchantName: this.adyenConfig.merchantName, + adyenApplePayMerchantIdentifier: this.adyenConfig.merchantId, + applePayToken: btoa(JSON.stringify(event.payment.token.paymentData)), + addressData: { + email: event.payment.shippingContact.emailAddress, + firstName: event.payment.shippingContact.givenName, + lastName: event.payment.shippingContact.familyName, + line1: event.payment.shippingContact.addressLines[0], + line2: event.payment.shippingContact.addressLines[1], + postalCode: event.payment.shippingContact.postalCode, + town: event.payment.shippingContact.locality, + country: { + isocode: event.payment.shippingContact.countryCode, + name: event.payment.shippingContact.country + } + } } } - } - if (this.adyenConfig.pageType === 'cart'){ - return { - adyenApplePayMerchantName: this.adyenConfig.merchantName, - adyenApplePayMerchantIdentifier: this.adyenConfig.merchantId, - applePayToken: btoa(JSON.stringify(event.payment.token.paymentData)), - addressData: { - email: event.payment.shippingContact.emailAddress, - firstName: event.payment.shippingContact.givenName, - lastName: event.payment.shippingContact.familyName, - line1: event.payment.shippingContact.addressLines[0], - line2: event.payment.shippingContact.addressLines[1], - postalCode: event.payment.shippingContact.postalCode, - town: event.payment.shippingContact.locality, - country: { - isocode: event.payment.shippingContact.countryCode, - name: event.payment.shippingContact.country - } + if (this.adyenConfig.pageType === 'cart') { + return { + adyenApplePayMerchantName: this.adyenConfig.merchantName, + adyenApplePayMerchantIdentifier: this.adyenConfig.merchantId, + applePayToken: btoa(JSON.stringify(event.payment.token.paymentData)), + addressData: { + email: event.payment.shippingContact.emailAddress, + firstName: event.payment.shippingContact.givenName, + lastName: event.payment.shippingContact.familyName, + line1: event.payment.shippingContact.addressLines[0], + line2: event.payment.shippingContact.addressLines[1], + postalCode: event.payment.shippingContact.postalCode, + town: event.payment.shippingContact.locality, + country: { + isocode: event.payment.shippingContact.countryCode, + name: event.payment.shippingContact.country + } + } } } + console.error('unknown page type') + return {}; + }, + getUrl: function() { + if (this.adyenConfig.pageType === 'PDP') { + return ACC.config.encodedContextPath + '/expressCheckout/applePayPDP' + } + if (this.adyenConfig.pageType === 'cart') { + return ACC.config.encodedContextPath + '/expressCheckout/cart' + } + console.error('unknown page type') + return null; } - console.error('unknown page type') - return {}; - }, - getUrl: function(){ - if (this.adyenConfig.pageType === 'PDP'){ - return ACC.config.encodedContextPath + '/expressCheckout/applePayPDP' - } - if (this.adyenConfig.pageType === 'cart'){ - return ACC.config.encodedContextPath + '/expressCheckout/cart' - } - console.error('unknown page type') - return null; - } } })(); \ No newline at end of file diff --git a/adyenv6core/src/com/adyen/v6/facades/impl/DefaultAdyenExpressCheckoutFacade.java b/adyenv6core/src/com/adyen/v6/facades/impl/DefaultAdyenExpressCheckoutFacade.java index c8591f6e5..b0aab7019 100644 --- a/adyenv6core/src/com/adyen/v6/facades/impl/DefaultAdyenExpressCheckoutFacade.java +++ b/adyenv6core/src/com/adyen/v6/facades/impl/DefaultAdyenExpressCheckoutFacade.java @@ -46,7 +46,7 @@ public class DefaultAdyenExpressCheckoutFacade implements AdyenExpressCheckoutFa private static final Logger LOG = Logger.getLogger(DefaultAdyenExpressCheckoutFacade.class); private static final String USER_NAME = "ApplePayExpressGuest"; private static final String DELIVERY_MODE_CODE = "adyen-express-checkout"; - public static final String ANONYMOUS_CHECKOUT_GUID = "anonymous_checkout_guid"; + private static final String ANONYMOUS_CHECKOUT_GUID = "anonymous_checkout_guid"; private CartFactory cartFactory; private CartService cartService; @@ -76,39 +76,26 @@ public PaymentsResponse expressPDPCheckout(AddressData addressData, String produ CartModel cart = createCartForExpressCheckout(user); - AddressModel addressModel = addressReverseConverter.convert(addressData); - validateParameterNotNull(addressModel, "Empty address"); - DeliveryModeModel deliveryMode = deliveryModeService.getDeliveryModeForCode(DELIVERY_MODE_CODE); validateParameterNotNull(deliveryMode, "Delivery mode for Adyen express checkout not configured"); - addressModel.setOwner(user); - addressModel.setBillingAddress(true); - addressModel.setShippingAddress(true); - - modelService.save(addressModel); - cart.setDeliveryMode(deliveryMode); - - cart.setDeliveryAddress(addressModel); - cart.setPaymentAddress(addressModel); - + AddressModel addressModel = prepareAddressModel(addressData, user); PaymentInfoModel paymentInfo = createPaymentInfoForCart(user, addressModel, cart, Adyenv6coreConstants.PAYMENT_METHOD_APPLEPAY, merchantId, merchantName); - cart.setPaymentInfo(paymentInfo); - ProductModel product = productService.getProductForCode(productCode); + prepareCart(cart, deliveryMode, addressModel, paymentInfo); - if (product != null) { - cartService.addNewEntry(cart, product, 1L, product.getUnit()); - } - modelService.save(cart); + addProductToCart(productCode, cart); if (cartHasEntries(cart)) { CommerceCartParameter commerceCartParameter = new CommerceCartParameter(); commerceCartParameter.setCart(cart); commerceCartService.calculateCart(commerceCartParameter); - CartModel sessionCart = cartService.getSessionCart(); + CartModel sessionCart = null; + if (cartService.hasSessionCart()) { + sessionCart = cartService.getSessionCart(); + } cartService.setSessionCart(cart); CartData cartData = cartConverter.convert(cart); @@ -121,7 +108,9 @@ public PaymentsResponse expressPDPCheckout(AddressData addressData, String produ sessionService.setAttribute(ANONYMOUS_CHECKOUT_GUID, org.apache.commons.lang.StringUtils.substringBefore(cart.getUser().getUid(), "|")); - cartService.setSessionCart(sessionCart); + if (sessionCart != null) { + cartService.setSessionCart(sessionCart); + } return paymentsResponse; } else { @@ -135,27 +124,16 @@ public PaymentsResponse expressCartCheckout(AddressData addressData, String merc cartService.changeCurrentCartUser(user); CartModel cart = cartService.getSessionCart(); - AddressModel addressModel = addressReverseConverter.convert(addressData); - validateParameterNotNull(addressModel, "Empty address"); DeliveryModeModel deliveryMode = deliveryModeService.getDeliveryModeForCode(DELIVERY_MODE_CODE); validateParameterNotNull(deliveryMode, "Delivery mode for Adyen express checkout not configured"); - addressModel.setBillingAddress(true); - addressModel.setShippingAddress(true); - addressModel.setOwner(user); - modelService.save(addressModel); - - cart.setDeliveryMode(deliveryMode); - - cart.setDeliveryAddress(addressModel); - cart.setPaymentAddress(addressModel); + AddressModel addressModel = prepareAddressModel(addressData, user); PaymentInfoModel paymentInfo = createPaymentInfoForCart(user, addressModel, cart, Adyenv6coreConstants.PAYMENT_METHOD_APPLEPAY, merchantId, merchantName); - cart.setPaymentInfo(paymentInfo); - modelService.save(cart); + prepareCart(cart, deliveryMode, addressModel, paymentInfo); CommerceCartParameter commerceCartParameter = new CommerceCartParameter(); commerceCartParameter.setCart(cart); @@ -176,6 +154,35 @@ public PaymentsResponse expressCartCheckout(AddressData addressData, String merc } } + private void prepareCart(CartModel cart, DeliveryModeModel deliveryMode, AddressModel addressModel, PaymentInfoModel paymentInfo) { + cart.setDeliveryMode(deliveryMode); + cart.setDeliveryAddress(addressModel); + cart.setPaymentAddress(addressModel); + cart.setPaymentInfo(paymentInfo); + modelService.save(cart); + } + + private AddressModel prepareAddressModel(AddressData addressData, CustomerModel user) { + AddressModel addressModel = modelService.create(AddressModel.class); + addressReverseConverter.convert(addressData, addressModel); + validateParameterNotNull(addressModel, "Empty address"); + addressModel.setOwner(user); + addressModel.setBillingAddress(true); + addressModel.setShippingAddress(true); + + modelService.save(addressModel); + return addressModel; + } + + private void addProductToCart(String productCode, CartModel cart) { + ProductModel product = productService.getProductForCode(productCode); + + if (product != null) { + cartService.addNewEntry(cart, product, 1L, product.getUnit()); + } + modelService.save(cart); + } + public Optional getExpressDeliveryModePrice() { ZoneDeliveryModeModel deliveryMode = (ZoneDeliveryModeModel) deliveryModeService.getDeliveryModeForCode(DELIVERY_MODE_CODE); CurrencyModel currentCurrency = commonI18NService.getCurrentCurrency();