shopizer-uncached

diff --git a/.project b/.project
new file mode 100644
index 0000000..9ece14e
--- /dev/null
+++ b/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>shopizer</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>

diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

diff --git a/sm-core/src/main/resources/configs.properties b/sm-core/src/main/resources/configs.properties
index 666613f..43e15f8 100644
--- a/sm-core/src/main/resources/configs.properties
+++ b/sm-core/src/main/resources/configs.properties
@@ -14,6 +14,6 @@ elasticsearch.server.proxy.password=
 # Infinispan Configuration
 infinispan.cache.location=./infinispan
 
-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 5339980..5bfe0b4 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/SALESMANAGER.h2.db b/sm-shop/SALESMANAGER.h2.db
index 25199cb..6f1b0b6 100644
Binary files a/sm-shop/SALESMANAGER.h2.db and b/sm-shop/SALESMANAGER.h2.db differ

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);