Merge pull request #131 from Adyen/develop

Release 6.1.0
Adyen · Aug 8, 2019 · d052aec · d052aec
2 parents f023a1b + 2aba70d
commit d052aec
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 21 deletions.
diff --git 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 (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 = true
+is3DS2allowed = false
 ```
 
  ## Documentation

diff --git 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
+version=6.1.0
+version.api=6.1.0
diff --git 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
+version=6.1.0
+version.api=6.1.0
diff --git 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
+version=6.1.0
+version.api=6.1.0
diff --git 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";
 
@@ -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<String> OPENINVOICE_METHODS_API = Collections.unmodifiableList(new ArrayList<String>() {{
 		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
@@ -406,7 +406,7 @@ public PaymentsResponse handleRedirectPayload(HashMap<String, String> 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
@@ -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);
         }
     }

diff --git 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
@@ -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/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.");
 		}

diff --git 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