Details
diff --git a/sm-core/src/main/resources/profiles/docker/shopizer-core.properties b/sm-core/src/main/resources/profiles/docker/shopizer-core.properties
index f214421..f07a0d0 100644
--- a/sm-core/src/main/resources/profiles/docker/shopizer-core.properties
+++ b/sm-core/src/main/resources/profiles/docker/shopizer-core.properties
@@ -15,6 +15,6 @@ elasticsearch.server.proxy.password=
config.cms.store.location=/tmp/store
config.cms.files.location=/tmp/repos
-shippingDistancePreProcessor.apiKey=AIzaSyCFqjgSH_6_ktwKLcVi-IRojLx2iRWlcig
+shippingDistancePreProcessor.apiKey=
diff --git a/sm-core/src/main/resources/spring/processors/shopizer-core-shipping-processors.xml b/sm-core/src/main/resources/spring/processors/shopizer-core-shipping-processors.xml
index 49b6601..f1d5d30 100644
--- a/sm-core/src/main/resources/spring/processors/shopizer-core-shipping-processors.xml
+++ b/sm-core/src/main/resources/spring/processors/shopizer-core-shipping-processors.xml
@@ -16,7 +16,8 @@
the distance between shipping origin and customer shipping address. It uses google
distance calculation and requires google api keys to be configured belog.
-->
- <ref bean="shippingDistancePreProcessor"/>
+
+ <!--<ref bean="shippingDistancePreProcessor"/>-->
<!--
Used drules decision tables to decide at runtime which module the system will use
diff --git a/sm-core/src/main/resources/spring/shopizer-core-modules.xml b/sm-core/src/main/resources/spring/shopizer-core-modules.xml
index a0ed900..3d1c80c 100644
--- a/sm-core/src/main/resources/spring/shopizer-core-modules.xml
+++ b/sm-core/src/main/resources/spring/shopizer-core-modules.xml
@@ -25,9 +25,16 @@
<beans:entry key="usps" value-ref="usps"/>
<beans:entry key="ups" value-ref="ups"/>
<beans:entry key="weightBased" value-ref="weightBased"/>
- <beans:entry key="priceByDistance" value-ref="priceByDistance"/>
<beans:entry key="storePickUp" value-ref="storePickUp"/>
- <beans:entry key="customQuotesRules" value-ref="customShippingPriceModule"/><!--as defined in shopizer-core-rules-->
+ <!--
+ Requires google maps shippingDistancePreProcessor.apiKey=<YOUR KEY>
+ in configs.properties
+ <beans:entry key="priceByDistance" value-ref="priceByDistance"/>
+ -->
+ <!--
+ This will activate drules
+ <beans:entry key="customQuotesRules" value-ref="customShippingPriceModule"/>
+ --><!--as defined in shopizer-core-rules-->
</util:map>
<!-- Payment integration modules -->
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/order/facade/OrderFacadeImpl.java b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/order/facade/OrderFacadeImpl.java
index a7fe1a0..a6d1ac7 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/order/facade/OrderFacadeImpl.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/order/facade/OrderFacadeImpl.java
@@ -408,7 +408,7 @@ public class OrderFacadeImpl implements OrderFacade {
payment.setModuleName(order.getPaymentModule());
payment.setCurrency(modelOrder.getCurrency());
- if(order.getPayment().get("paymentToken") != null) {// set any tokenization payment token
+ if(order.getPayment() != null && order.getPayment().get("paymentToken") != null) {// set any tokenization payment token
String paymentToken = order.getPayment().get("paymentToken");
Map<String,String> paymentMetaData = new HashMap<String,String>();
payment.setPaymentMetaData(paymentMetaData);
