From d7344a2a3467b6d532ec019342ed287bb19eeb7a Mon Sep 17 00:00:00 2001 From: Rajni Kewlani Date: Fri, 2 Aug 2019 12:06:09 +0200 Subject: [PATCH 1/6] Update README.md --- README.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index fac115681..0044ba790 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,10 @@ Additionally, required when using yacceleratorfulfilment (b2c_acc recipe): ### 3. Modify local.properties Modify config/local.properties file: -append ,/[^/]+(/[^?]*)+(adyen-response)$,/adyen(/[^?]*)+$ to the value of csrf.allowed.url.patterns + +1. append ,/[^/]+(/[^?]*)+(adyen-response)$,/adyen(/[^?]*)+$ to the value of csrf.allowed.url.patterns +2. add is3DS2allowed = true + ### 4. Build ``` @@ -128,9 +131,9 @@ For Boleto, it will contain the pdf url, the base64 encoded data, expiration dat https://docs.adyen.com/developers/payment-methods/boleto-bancario/boleto-payment-request ## 3DS2 configuration - By default 3DS2 is disabled. If you want to enable 3DS2 in your system, please set following property in local.properties file, build your environment and restart the server. + By default 3DS2 is enabled. If you want to enable 3DS2 in your system, please set following property in local.properties file, build your environment and restart the server. ``` -is3DS2allowed = true +is3DS2allowed = false ``` ## Documentation From 32f9273b4d2e9120ec753e0c17fbf918e900ea65 Mon Sep 17 00:00:00 2001 From: Rajni Kewlani Date: Fri, 2 Aug 2019 12:06:50 +0200 Subject: [PATCH 2/6] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0044ba790..36183cc3a 100644 --- a/README.md +++ b/README.md @@ -41,8 +41,8 @@ Additionally, required when using yacceleratorfulfilment (b2c_acc recipe): Modify config/local.properties file: -1. append ,/[^/]+(/[^?]*)+(adyen-response)$,/adyen(/[^?]*)+$ to the value of csrf.allowed.url.patterns -2. add is3DS2allowed = true +1. append ``` ,/[^/]+(/[^?]*)+(adyen-response)$,/adyen(/[^?]*)+$ ``` to the value of ```csrf.allowed.url.patterns``` +2. add ```is3DS2allowed = true``` ### 4. Build From 49f54e5a352d201cf9fecffb51585b6f93c6b151 Mon Sep 17 00:00:00 2001 From: Rajni Kewlani Date: Tue, 6 Aug 2019 11:20:48 +0200 Subject: [PATCH 3/6] Fixed typo in debug statement --- .../com/adyen/v6/controllers/AdyenNotificationController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adyenv6notification/web/src/com/adyen/v6/controllers/AdyenNotificationController.java b/adyenv6notification/web/src/com/adyen/v6/controllers/AdyenNotificationController.java index 3be026f09..9131cacd3 100644 --- a/adyenv6notification/web/src/com/adyen/v6/controllers/AdyenNotificationController.java +++ b/adyenv6notification/web/src/com/adyen/v6/controllers/AdyenNotificationController.java @@ -52,7 +52,7 @@ public String onReceive(@PathVariable final String baseSiteId, final HttpServlet return RESPONSE_NOT_ACCEPTED; } - LOG.debug("Received Adyen notification1:" + requestString); + LOG.debug("Received Adyen notification:" + requestString); if (! adyenNotificationAuthenticationProvider.authenticateBasic(request, baseSiteId)) { throw new AccessDeniedException("Wrong credentials. Please check your basesite, username and password."); } From 41347bedd7c1702213866dd782564ab0ee1abbd3 Mon Sep 17 00:00:00 2001 From: rajni Date: Wed, 7 Aug 2019 09:54:01 +0200 Subject: [PATCH 4/6] [PW-1589]:Klarna slice support added. --- .../src/com/adyen/v6/constants/Adyenv6coreConstants.java | 3 +++ .../com/adyen/v6/facades/DefaultAdyenCheckoutFacade.java | 6 +++--- .../src/com/adyen/v6/factory/AdyenRequestFactory.java | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/adyenv6core/src/com/adyen/v6/constants/Adyenv6coreConstants.java b/adyenv6core/src/com/adyen/v6/constants/Adyenv6coreConstants.java index 388018a53..62cb5d702 100644 --- a/adyenv6core/src/com/adyen/v6/constants/Adyenv6coreConstants.java +++ b/adyenv6core/src/com/adyen/v6/constants/Adyenv6coreConstants.java @@ -54,6 +54,7 @@ public final class Adyenv6coreConstants extends GeneratedAdyenv6coreConstants { public static final String COUNTRY_CODE_DENMARK = "DK"; public static final String COUNTRY_CODE_FINLAND = "FI"; public static final String COUNTRY_CODE_NORWAY = "NO"; + public static final String KLARNA_SLICE = "klarna_account"; //Prefix for Oney methods like facilpay_3x or facilpay_4x public static final String PAYMENT_METHOD_FACILPAY_PREFIX = "facilypay"; @@ -68,6 +69,8 @@ private Adyenv6coreConstants() { public static final List OPENINVOICE_METHODS_API = Collections.unmodifiableList(new ArrayList() {{ add(KLARNA); add(RATEPAY); + add(KLARNA_SLICE); + // add(AFTERPAY); // not supported yet }}); diff --git a/adyenv6core/src/com/adyen/v6/facades/DefaultAdyenCheckoutFacade.java b/adyenv6core/src/com/adyen/v6/facades/DefaultAdyenCheckoutFacade.java index e550a5c5e..9573fa770 100644 --- a/adyenv6core/src/com/adyen/v6/facades/DefaultAdyenCheckoutFacade.java +++ b/adyenv6core/src/com/adyen/v6/facades/DefaultAdyenCheckoutFacade.java @@ -406,7 +406,7 @@ public PaymentsResponse handleRedirectPayload(HashMap details) { PaymentsResponse response; String paymentMethod = getSessionService().getAttribute(PAYMENT_METHOD); - if (paymentMethod != null && paymentMethod.equals(KLARNA)) { + if (paymentMethod != null && paymentMethod.startsWith(KLARNA)) { response = getAdyenPaymentService().getPaymentDetailsFromPayload(details, getSessionService().getAttribute(SESSION_PAYMENT_DATA)); } else { response = getAdyenPaymentService().getPaymentDetailsFromPayload(details); @@ -469,8 +469,8 @@ public OrderData authorisePayment(final HttpServletRequest request, final CartDa getSessionService().setAttribute(SESSION_MD, paymentsResponse.getRedirect().getData().get(MD)); getSessionService().setAttribute(SESSION_PAYMENT_DATA, paymentsResponse.getPaymentData()); } - if (KLARNA.equals(adyenPaymentMethod)) { - getSessionService().setAttribute(PAYMENT_METHOD, KLARNA); + if (adyenPaymentMethod.startsWith(KLARNA)) { + getSessionService().setAttribute(PAYMENT_METHOD, adyenPaymentMethod); getSessionService().setAttribute(SESSION_PAYMENT_DATA, paymentsResponse.getPaymentData()); } lockSessionCart(); diff --git a/adyenv6core/src/com/adyen/v6/factory/AdyenRequestFactory.java b/adyenv6core/src/com/adyen/v6/factory/AdyenRequestFactory.java index 3c53d910d..04500dad6 100644 --- a/adyenv6core/src/com/adyen/v6/factory/AdyenRequestFactory.java +++ b/adyenv6core/src/com/adyen/v6/factory/AdyenRequestFactory.java @@ -343,7 +343,7 @@ private void updatePaymentRequestForAlternateMethod(PaymentsRequest paymentsRequ paymentsRequest.setReturnUrl(cartData.getAdyenReturnUrl()); if (adyenPaymentMethod.equals(PAYMENT_METHOD_IDEAL)) { paymentMethod.setIdealIssuer(cartData.getAdyenIssuerId()); - } else if (KLARNA.contains(adyenPaymentMethod)||adyenPaymentMethod.startsWith(PAYMENT_METHOD_FACILPAY_PREFIX)) { + } else if (adyenPaymentMethod.startsWith(KLARNA)||adyenPaymentMethod.startsWith(PAYMENT_METHOD_FACILPAY_PREFIX)) { setOpenInvoiceData(paymentsRequest, cartData, customerModel); } } From 349472a27b658ff518874d563c88c5206d2d9aa9 Mon Sep 17 00:00:00 2001 From: Rajni Kewlani Date: Thu, 8 Aug 2019 11:36:58 +0200 Subject: [PATCH 5/6] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 36183cc3a..c248eab37 100644 --- a/README.md +++ b/README.md @@ -131,7 +131,7 @@ For Boleto, it will contain the pdf url, the base64 encoded data, expiration dat https://docs.adyen.com/developers/payment-methods/boleto-bancario/boleto-payment-request ## 3DS2 configuration - By default 3DS2 is enabled. If you want to enable 3DS2 in your system, please set following property in local.properties file, build your environment and restart the server. + By default 3DS2 is enabled (Except for OCC). If you want to disable 3DS2 in your system, please set following property in local.properties file, build your environment and restart the server. ``` is3DS2allowed = false ``` From 2aba70d297fe3ba0b33ddbe62f9b559d27622419 Mon Sep 17 00:00:00 2001 From: rajni Date: Thu, 8 Aug 2019 12:05:19 +0200 Subject: [PATCH 6/6] Release version bumped to 6.1.0 --- .../resources/adyenv6b2ccheckoutaddon.build.number | 4 ++-- adyenv6backoffice/resources/adyenv6backoffice.build.number | 4 ++-- adyenv6core/resources/adyenv6core.build.number | 4 ++-- .../src/com/adyen/v6/constants/Adyenv6coreConstants.java | 2 +- .../resources/adyenv6fulfilmentprocess.build.number | 4 ++-- .../resources/adyenv6notification.build.number | 4 ++-- .../resources/adyenv6ordermanagement.build.number | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/adyenv6b2ccheckoutaddon/resources/adyenv6b2ccheckoutaddon.build.number b/adyenv6b2ccheckoutaddon/resources/adyenv6b2ccheckoutaddon.build.number index 51eef7afb..4ecadfa46 100644 --- a/adyenv6b2ccheckoutaddon/resources/adyenv6b2ccheckoutaddon.build.number +++ b/adyenv6b2ccheckoutaddon/resources/adyenv6b2ccheckoutaddon.build.number @@ -7,5 +7,5 @@ module.name=platform-module name=adyenv6b2ccheckoutaddon releasedate=20170509 1903 vendor=adyen -version=6.0.0 -version.api=6.0.0 \ No newline at end of file +version=6.1.0 +version.api=6.1.0 \ No newline at end of file diff --git a/adyenv6backoffice/resources/adyenv6backoffice.build.number b/adyenv6backoffice/resources/adyenv6backoffice.build.number index 2730a44f3..92d548692 100644 --- a/adyenv6backoffice/resources/adyenv6backoffice.build.number +++ b/adyenv6backoffice/resources/adyenv6backoffice.build.number @@ -7,5 +7,5 @@ module.name=platform-module name=adyenv6backoffice releasedate=20170509 1903 vendor=adyen -version=6.0.0 -version.api=6.0.0 \ No newline at end of file +version=6.1.0 +version.api=6.1.0 \ No newline at end of file diff --git a/adyenv6core/resources/adyenv6core.build.number b/adyenv6core/resources/adyenv6core.build.number index 12ca8363b..b93d76ece 100644 --- a/adyenv6core/resources/adyenv6core.build.number +++ b/adyenv6core/resources/adyenv6core.build.number @@ -6,5 +6,5 @@ group.id=com.adyen.v6 module.name=platform-module name=adyenv6core vendor=adyen -version=6.0.0 -version.api=6.0.0 \ No newline at end of file +version=6.1.0 +version.api=6.1.0 \ No newline at end of file diff --git a/adyenv6core/src/com/adyen/v6/constants/Adyenv6coreConstants.java b/adyenv6core/src/com/adyen/v6/constants/Adyenv6coreConstants.java index 62cb5d702..48f87a8e7 100644 --- a/adyenv6core/src/com/adyen/v6/constants/Adyenv6coreConstants.java +++ b/adyenv6core/src/com/adyen/v6/constants/Adyenv6coreConstants.java @@ -31,7 +31,7 @@ public final class Adyenv6coreConstants extends GeneratedAdyenv6coreConstants { public static final String EXTENSIONNAME = "adyenv6core"; public static final String PLUGIN_NAME = "adyen-hybris"; - public static final String PLUGIN_VERSION = "6.0.0"; + public static final String PLUGIN_VERSION = "6.1.0"; public static final String PAYMENT_PROVIDER = "Adyen"; public static final String PAYMENT_METHOD ="paymentMethod"; diff --git a/adyenv6fulfilmentprocess/resources/adyenv6fulfilmentprocess.build.number b/adyenv6fulfilmentprocess/resources/adyenv6fulfilmentprocess.build.number index c40bf68c1..6e56836d1 100644 --- a/adyenv6fulfilmentprocess/resources/adyenv6fulfilmentprocess.build.number +++ b/adyenv6fulfilmentprocess/resources/adyenv6fulfilmentprocess.build.number @@ -6,5 +6,5 @@ group.id=com.adyen.v6 module.name=platform-module name=adyenv6fulfilmentprocess vendor=adyen -version=6.0.0 -version.api=6.0.0 +version=6.1.0 +version.api=6.1.0 diff --git a/adyenv6notification/resources/adyenv6notification.build.number b/adyenv6notification/resources/adyenv6notification.build.number index 96bce5cd0..e4a80cf5a 100644 --- a/adyenv6notification/resources/adyenv6notification.build.number +++ b/adyenv6notification/resources/adyenv6notification.build.number @@ -5,5 +5,5 @@ description=adyenv6notification name=adyenv6notification releasedate=20170803 1323 vendor=adyen -version=6.0.0 -version.api=6.0.0 +version=6.1.0 +version.api=6.1.0 diff --git a/adyenv6ordermanagement/resources/adyenv6ordermanagement.build.number b/adyenv6ordermanagement/resources/adyenv6ordermanagement.build.number index 2eb77edc9..e85bfdc20 100644 --- a/adyenv6ordermanagement/resources/adyenv6ordermanagement.build.number +++ b/adyenv6ordermanagement/resources/adyenv6ordermanagement.build.number @@ -7,5 +7,5 @@ module.name=platform-module name=adyenv6ordermanagement releasedate=20170509 1754 vendor=adyen -version=6.0.0 -version.api=6.0.0 +version=6.1.0 +version.api=6.1.0