shopizer-uncached

Fixed shipping rules

1/24/2017 12:58:39 PM

Details

diff --git a/shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties b/shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties
index 26963ff..ccb4a0d 100644
--- a/shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties
+++ b/shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Mon Jan 23 09:10:37 EST 2017
+#Mon Jan 23 11:10:48 EST 2017
 version=2.0.5-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=shopizer-canadapost
diff --git a/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties b/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties
index aa9e6bc..7a7cfdd 100644
--- a/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties
+++ b/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Mon Jan 23 09:10:38 EST 2017
+#Tue Jan 24 09:45:39 EST 2017
 version=2.0.5-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=shopizer-shipping-distance-processor
diff --git a/sm-core/src/main/java/com/salesmanager/core/business/modules/integration/shipping/impl/ShippingInputParameters.java b/sm-core/src/main/java/com/salesmanager/core/business/modules/integration/shipping/impl/ShippingInputParameters.java
index 1122fa1..58c5000 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/modules/integration/shipping/impl/ShippingInputParameters.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/modules/integration/shipping/impl/ShippingInputParameters.java
@@ -9,6 +9,7 @@ public class ShippingInputParameters {
 	private String province;
 	private long distance;
 	private long size;
+	private int price;//integer should be rounded from BigBecimal
 	private String priceQuote;
 	
 	public String getModuleName() {
@@ -61,16 +62,23 @@ public class ShippingInputParameters {
 		.append(" size : ").append(this.getSize())
 		.append(" distance : ").append(this.getDistance())
 		.append(" province : ").append(this.getProvince())
+		.append(" price : ").append(this.getPrice())
 		.append(" country : ").append(this.getCountry());
-		return sb.toString();
-		
+		return sb.toString();	
 	}
+	
 	public long getSize() {
 		return size;
 	}
 	public void setSize(long size) {
 		this.size = size;
 	}
+	public int getPrice() {
+		return price;
+	}
+	public void setPrice(int price) {
+		this.price = price;
+	}
 
 
 }
diff --git a/sm-core/src/main/resources/rules/shipping-custom-rules.xls b/sm-core/src/main/resources/rules/shipping-custom-rules.xls
index 5d8d5eb..c640402 100644
Binary files a/sm-core/src/main/resources/rules/shipping-custom-rules.xls and b/sm-core/src/main/resources/rules/shipping-custom-rules.xls differ
diff --git a/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties b/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties
index d0692af..bd3719c 100644
--- a/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties
+++ b/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Mon Jan 23 09:10:44 EST 2017
+#Tue Jan 24 09:45:40 EST 2017
 version=2.0.5-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=sm-search
diff --git a/sm-shop/SALESMANAGER.h2.db b/sm-shop/SALESMANAGER.h2.db
index 12ecc5b..9b3d2ad 100644
Binary files a/sm-shop/SALESMANAGER.h2.db and b/sm-shop/SALESMANAGER.h2.db differ
diff --git a/sm-shop/SALESMANAGER.lock.db b/sm-shop/SALESMANAGER.lock.db
index b778a5b..64f3cf0 100644
--- a/sm-shop/SALESMANAGER.lock.db
+++ b/sm-shop/SALESMANAGER.lock.db
@@ -1,4 +1,4 @@
 #FileLock
-#Mon Jan 23 09:54:31 EST 2017
-id=159cbd238c7267fbdac586b94cdc401f368a176c14c
+#Tue Jan 24 09:55:15 EST 2017
+id=159d0f940cfe8e170eaeb477c167cff8f72abedebfe
 method=file