shopizer-memoizeit
Changes
shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties 2(+1 -1)
shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties 2(+1 -1)
sm-core/src/main/java/com/salesmanager/core/business/modules/cms/product/infinispan/CmsImageFileManagerImpl.java 11(+1 -10)
sm-core/src/main/java/com/salesmanager/core/business/services/shipping/ShippingServiceImpl.java 4(+3 -1)
sm-shop/SALESMANAGER.h2.db 0(+0 -0)
sm-shop/SALESMANAGER.lock.db 4(+2 -2)
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 158fd91..315fe7e 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 Nov 21 13:54:23 EST 2016
+#Tue Nov 22 08:49:18 EST 2016
version=2.5.0-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 183ac56..080fcf2 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 Nov 21 13:54:22 EST 2016
+#Tue Nov 22 08:49:17 EST 2016
version=2.5.0-SNAPSHOT
groupId=com.shopizer
m2e.projectName=shopizer-shipping-distance-processor
diff --git a/sm-core/src/main/java/com/salesmanager/core/business/modules/cms/product/infinispan/CmsImageFileManagerImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/modules/cms/product/infinispan/CmsImageFileManagerImpl.java
index 23dab9d..3d62e42 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/modules/cms/product/infinispan/CmsImageFileManagerImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/modules/cms/product/infinispan/CmsImageFileManagerImpl.java
@@ -119,8 +119,6 @@ public class CmsImageFileManagerImpl
}
Node<String, Object> productNode = this.getNode(nodePath.toString());
-
- System.out.println("*** WRITING PRODUCT IMAGE TO KEY " + productNode.toString());
InputStream isFile = contentImage.getFile();
@@ -132,12 +130,6 @@ public class CmsImageFileManagerImpl
// object for a given product containing all images
productNode.put(contentImage.getFileName(), output.toByteArray());
-
- /////NOW READ THE IMAGE
- OutputContentFile ocf = getProductImage(productImage);
- if(ocf==null) {
- //we have a problem
- }
}
@@ -444,8 +436,7 @@ public class CmsImageFileManagerImpl
Node<String,Object> productNode = this.getNode(nodePath.toString());
- System.out.println("*** READING PRODUCT IMAGE TO KEY " + productNode.toString());
-
+
byte[] imageBytes = (byte[])productNode.get( imageName );
if(imageBytes==null) {
diff --git a/sm-core/src/main/java/com/salesmanager/core/business/services/shipping/ShippingServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/services/shipping/ShippingServiceImpl.java
index 2f996db..7013c18 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/services/shipping/ShippingServiceImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/services/shipping/ShippingServiceImpl.java
@@ -531,11 +531,13 @@ public class ShippingServiceImpl implements ShippingService {
Locale locale = languageService.toLocale(language);
//invoke pre processors
+ //the main pre-processor determines at runtime the shipping module
+ //also available distance calculation
if(!CollectionUtils.isEmpty(shippingModulePreProcessors)) {
for(ShippingQuotePrePostProcessModule preProcessor : shippingModulePreProcessors) {
//System.out.println("Using pre-processor " + preProcessor.getModuleCode());
preProcessor.prePostProcessShippingQuotes(shippingQuote, packages, orderTotal, delivery, shippingOrigin, store, configuration, shippingModule, shippingConfiguration, shippingMethods, locale);
- //TODO switch module if required
+ //switch module if required
if(shippingQuote.getCurrentShippingModule()!=null && !shippingQuote.getCurrentShippingModule().getCode().equals(shippingModule.getCode())) {
shippingModule = shippingQuote.getCurrentShippingModule();
moduleName = shippingModule.getCode();
diff --git a/sm-core/target/classes/rules/shipping-custom-rules.xls b/sm-core/target/classes/rules/shipping-custom-rules.xls
index 5d8d5eb..ee3793c 100644
Binary files a/sm-core/target/classes/rules/shipping-custom-rules.xls and b/sm-core/target/classes/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 a0b29ef..da054ab 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 Nov 21 13:54:23 EST 2016
+#Tue Nov 22 08:49:18 EST 2016
version=2.5.0-SNAPSHOT
groupId=com.shopizer
m2e.projectName=sm-search
diff --git a/sm-shop/files/store/StoreRepository.dat b/sm-shop/files/store/StoreRepository.dat
index 3803aca..fdcd774 100644
Binary files a/sm-shop/files/store/StoreRepository.dat and b/sm-shop/files/store/StoreRepository.dat differ
sm-shop/SALESMANAGER.h2.db 0(+0 -0)
diff --git a/sm-shop/SALESMANAGER.h2.db b/sm-shop/SALESMANAGER.h2.db
index 08986be..9ef5d74 100644
Binary files a/sm-shop/SALESMANAGER.h2.db and b/sm-shop/SALESMANAGER.h2.db differ
sm-shop/SALESMANAGER.lock.db 4(+2 -2)
diff --git a/sm-shop/SALESMANAGER.lock.db b/sm-shop/SALESMANAGER.lock.db
index e7e6add..b979148 100644
--- a/sm-shop/SALESMANAGER.lock.db
+++ b/sm-shop/SALESMANAGER.lock.db
@@ -1,4 +1,4 @@
#FileLock
-#Mon Nov 21 14:10:26 EST 2016
-id=158884beacb7f2999065523f5b0b828af957fcb93f9
+#Tue Nov 22 09:03:38 EST 2016
+id=1588c595d4388cd2492f2a9e2c9b3a612bdd4ee7fb5
method=file
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/controller/ImagesController.java b/sm-shop/src/main/java/com/salesmanager/shop/controller/ImagesController.java
index bea7c56..95c47e7 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/controller/ImagesController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/controller/ImagesController.java
@@ -138,8 +138,8 @@ public class ImagesController {
* @return
* @throws IOException
*/
- @RequestMapping("/static/products/{storeCode}/{productCode}/{imageSize}/{imageName}")
- public @ResponseBody byte[] printImage(@PathVariable final String storeCode, @PathVariable final String productCode, @PathVariable final String imageSize, @PathVariable final String imageName, HttpServletRequest request) throws IOException {
+ @RequestMapping("/static/products/{storeCode}/{productCode}/{imageSize}/{imageName}.{extension}")
+ public @ResponseBody byte[] printImage(@PathVariable final String storeCode, @PathVariable final String productCode, @PathVariable final String imageSize, @PathVariable final String imageName, @PathVariable final String extension, HttpServletRequest request) throws IOException {
// product image small
// example small product image -> /static/products/DEFAULT/TB12345/SMALL/product1.jpg
@@ -164,7 +164,7 @@ public class ImagesController {
OutputContentFile image = null;
try {
- image = productImageService.getProductImage(storeCode, productCode, imageName, size);
+ image = productImageService.getProductImage(storeCode, productCode, new StringBuilder().append(imageName).append(".").append(extension).toString(), size);
} catch (ServiceException e) {
LOGGER.error("Cannot retrieve image " + imageName, e);
}
@@ -187,8 +187,8 @@ public class ImagesController {
* @return
* @throws IOException
*/
- @RequestMapping("/static/products/{storeCode}/{productCode}/{imageName}")
- public @ResponseBody byte[] printImage(@PathVariable final String storeCode, @PathVariable final String productCode, @PathVariable final String imageName, HttpServletRequest request) throws IOException {
+ @RequestMapping("/static/products/{storeCode}/{productCode}/{imageName}.{extension}")
+ public @ResponseBody byte[] printImage(@PathVariable final String storeCode, @PathVariable final String productCode, @PathVariable final String imageName, @PathVariable final String extension, HttpServletRequest request) throws IOException {
// product image
// example small product image -> /static/products/DEFAULT/TB12345/product1.jpg?size=small
@@ -218,7 +218,7 @@ public class ImagesController {
OutputContentFile image = null;
try {
- image = productImageService.getProductImage(storeCode, productCode, imageName, size);
+ image = productImageService.getProductImage(storeCode, productCode, new StringBuilder().append(imageName).append(".").append(extension).toString(), size);
} catch (ServiceException e) {
LOGGER.error("Cannot retrieve image " + imageName, e);
}
diff --git a/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties b/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties
index fd8d328..c2c85d6 100644
--- a/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties
+++ b/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties
@@ -1,5 +1,5 @@
#Generated by Maven Integration for Eclipse
-#Mon Nov 21 13:54:27 EST 2016
+#Tue Nov 22 08:49:21 EST 2016
version=2.5.0-SNAPSHOT
groupId=com.shopizer
m2e.projectName=sm-shop