Merge pull request #154 from Adyen/develop

Release 6.2.1
Adyen · Oct 28, 2019 · ba1dcb8 · ba1dcb8
2 parents cd83937 + 9913888
commit ba1dcb8
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 14 deletions.
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.2.0
-version.api=6.2.0
+version=6.2.1
+version.api=6.2.1
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.2.0
-version.api=6.2.0
+version=6.2.1
+version.api=6.2.1
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.2.0
-version.api=6.2.0
+version=6.2.1
+version.api=6.2.1
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.2.0";
+	public static final String PLUGIN_VERSION = "6.2.1";
 	public static final String PAYMENT_PROVIDER = "Adyen";
 	public static final String PAYMENT_METHOD ="paymentMethod";
 

diff --git a/adyenv6core/src/com/adyen/v6/facades/DefaultAdyenCheckoutFacade.java b/adyenv6core/src/com/adyen/v6/facades/DefaultAdyenCheckoutFacade.java
@@ -690,7 +690,9 @@ private OrderData createOrderFromPaymentsResponse(final PaymentsResponse payment
         orderData.setAdyenMultibancoDeadline(paymentsResponse.getMultibancoDeadline());
         orderData.setAdyenMultibancoReference(paymentsResponse.getMultibancoReference());
 
-        orderData.setAdyenPosReceipt(paymentsResponse.getAdditionalData().get("pos.receipt"));
+        if (paymentsResponse.getAdditionalData() != null) {
+            orderData.setAdyenPosReceipt(paymentsResponse.getAdditionalData().get("pos.receipt"));
+        }
 
         return orderData;
     }

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.2.0
-version.api=6.2.0
+version=6.2.1
+version.api=6.2.1
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.2.0
-version.api=6.2.0
+version=6.2.1
+version.api=6.2.1
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.2.0
-version.api=6.2.0
+version=6.2.1
+version.api=6.2.1