shopizer-developers

diff --git a/.classpath b/.classpath
index 8ab0272..5e66601 100644
--- a/.classpath
+++ b/.classpath
@@ -12,7 +12,7 @@
 	<classpathentry kind="src" path="sm-search/src/test/java"/>
 	<classpathentry kind="src" path="sm-shop/src/main/java"/>
 	<classpathentry kind="src" path="sm-shop/src/test/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.8.0_91">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
 			<attribute name="owner.project.facets" value="java"/>
 		</attributes>

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 fc17b83..c580950 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
-#Wed Nov 16 12:04:30 EST 2016
+#Thu Nov 17 13:15:14 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 42a2c87..adbd0e9 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
-#Wed Nov 16 12:04:29 EST 2016
+#Thu Nov 17 13:15:13 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/repositories/merchant/MerchantRepository.java b/sm-core/src/main/java/com/salesmanager/core/business/repositories/merchant/MerchantRepository.java
index bb194c1..e6a6858 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/repositories/merchant/MerchantRepository.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/repositories/merchant/MerchantRepository.java
@@ -7,6 +7,6 @@ import com.salesmanager.core.model.merchant.MerchantStore;
 
 public interface MerchantRepository extends JpaRepository<MerchantStore, Integer> {
 
-	@Query("select m from MerchantStore m left join fetch m.country mc left join fetch m.zone mz left join fetch m.defaultLanguage md left join fetch m.languages mls where m.code = ?1")
+	@Query("select m from MerchantStore m left join fetch m.country mc left join fetch m.currency mc left join fetch m.zone mz left join fetch m.defaultLanguage md left join fetch m.languages mls where m.code = ?1")
 	MerchantStore findByCode(String code);
 }

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/repositories/order/OrderRepository.java b/sm-core/src/main/java/com/salesmanager/core/business/repositories/order/OrderRepository.java
index 12cf03d..575b8be 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/repositories/order/OrderRepository.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/repositories/order/OrderRepository.java
@@ -8,5 +8,5 @@ import com.salesmanager.core.model.order.Order;
 public interface OrderRepository extends JpaRepository<Order, Long>, OrderRepositoryCustom {
 
     @Query("select o from Order o join fetch o.orderProducts op join fetch o.orderTotal ot left join fetch o.orderHistory oh left join fetch op.downloads opd left join fetch op.orderAttributes opa left join fetch op.prices opp where o.id = ?1")
-	Order findById(Long id);
+	Order findOne(Long id);
 }

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 6b2de80..10fc92d 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
-#Wed Nov 16 12:04:31 EST 2016
+#Thu Nov 17 13:15:14 EST 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=sm-search

diff --git a/sm-shop/SALESMANAGER.h2.db b/sm-shop/SALESMANAGER.h2.db
index e63210c..b2a1b8e 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 fbaa4eb..6347065 100644
--- a/sm-shop/SALESMANAGER.lock.db
+++ b/sm-shop/SALESMANAGER.lock.db
@@ -1,4 +1,4 @@
 #FileLock
-#Wed Nov 16 13:12:47 EST 2016
-id=1586e574df2e7d3900bcc6293fa7d3096c3a07037af
+#Thu Nov 17 12:49:11 EST 2016
+id=15873680ebbb35880e089352470d0b3a736e4e12ea8
 method=file

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/merchant/MerchantStoreController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/merchant/MerchantStoreController.java
index 670a00a..afed28a 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/merchant/MerchantStoreController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/merchant/MerchantStoreController.java
@@ -26,6 +26,8 @@ import com.salesmanager.shop.utils.*;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -90,9 +92,9 @@ public class MerchantStoreController {
 	}
 	
 	@PreAuthorize("hasRole('STORE_ADMIN')")
-	@RequestMapping(value = "/admin/store/paging.html", method = RequestMethod.POST, produces = "application/json")
+	@RequestMapping(value = "/admin/store/paging.html", method = RequestMethod.POST)
 	public @ResponseBody
-	String pageStores(HttpServletRequest request,
+	ResponseEntity<String> pageStores(HttpServletRequest request,
 			HttpServletResponse response) {
 
 		AjaxResponse resp = new AjaxResponse();
@@ -124,7 +126,7 @@ public class MerchantStoreController {
 
 		String returnString = resp.toJSONString();
 
-		return returnString;
+		return new ResponseEntity<String>(returnString,HttpStatus.OK);
 	}
 	
 	@PreAuthorize("hasRole('STORE')")

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/orders/OrdersController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/orders/OrdersController.java
index eb10c1e..27215fa 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/orders/OrdersController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/orders/OrdersController.java
@@ -20,7 +20,9 @@ import com.salesmanager.shop.utils.LabelUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -78,10 +80,9 @@ public class OrdersController {
 
 	@PreAuthorize("hasRole('ORDER')")
 	@SuppressWarnings({ "unchecked", "unused"})
-	//@RequestMapping(value="/admin/orders/paging.html", method=RequestMethod.GET, produces=MediaType.APPLICATION_JSON_UTF8_VALUE)
 	@RequestMapping(value="/admin/orders/paging.html", method=RequestMethod.POST)
-	public @ResponseBody String pageOrders(HttpServletRequest request, HttpServletResponse response, Locale locale) {
-
+	public @ResponseBody ResponseEntity<String> pageOrders(HttpServletRequest request, HttpServletResponse response, Locale locale) {
+		
 
 		AjaxPageableResponse resp = new AjaxPageableResponse();
 
@@ -152,8 +153,8 @@ public class OrdersController {
 		}
 		
 		String returnString = resp.toJSONString();
-		
-		return returnString;
+
+		return new ResponseEntity<String>(returnString,HttpStatus.OK);
 	}
 	
 	

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ProductsController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ProductsController.java
index 3a07c5a..5a1e670 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ProductsController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ProductsController.java
@@ -17,6 +17,8 @@ import com.salesmanager.shop.utils.LabelUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -65,8 +67,8 @@ public class ProductsController {
 	
 	@SuppressWarnings({ "rawtypes", "unchecked" })
 	@PreAuthorize("hasRole('PRODUCTS')")
-	@RequestMapping(value="/admin/products/paging.html", method=RequestMethod.POST, produces="application/json;charset=UTF-8")
-	public @ResponseBody String pageProducts(HttpServletRequest request, HttpServletResponse response) {
+	@RequestMapping(value="/admin/products/paging.html", method=RequestMethod.POST)
+	public @ResponseBody ResponseEntity<String> pageProducts(HttpServletRequest request, HttpServletResponse response) {
 		
 		//TODO what if ROOT
 		
@@ -189,7 +191,7 @@ public class ProductsController {
 		}
 		
 		String returnString = resp.toJSONString();
-		return returnString;
+		return new ResponseEntity<String>(returnString,HttpStatus.OK);
 
 
 	}

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/user/UserController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/user/UserController.java
index f7409df..6064a00 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/user/UserController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/user/UserController.java
@@ -25,6 +25,8 @@ import com.salesmanager.shop.utils.*;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Controller;
@@ -101,9 +103,9 @@ public class UserController {
 	 */
 	@SuppressWarnings("unchecked")
 	@PreAuthorize("hasRole('STORE_ADMIN')")
-	@RequestMapping(value = "/admin/users/paging.html", method = RequestMethod.POST, produces = "application/json")
+	@RequestMapping(value = "/admin/users/paging.html", method = RequestMethod.POST)
 	public @ResponseBody
-	String pageUsers(HttpServletRequest request,
+	ResponseEntity<String> pageUsers(HttpServletRequest request,
 			HttpServletResponse response) {
 
 		AjaxResponse resp = new AjaxResponse();
@@ -152,7 +154,7 @@ public class UserController {
 
 		String returnString = resp.toJSONString();
 
-		return returnString;
+		return new ResponseEntity<String>(returnString,HttpStatus.OK);
 	}
 
 	@PreAuthorize("hasRole('AUTH')")

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/controller/FilesController.java b/sm-shop/src/main/java/com/salesmanager/shop/controller/FilesController.java
index e3f4851..1d24606 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/controller/FilesController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/controller/FilesController.java
@@ -88,54 +88,5 @@ public class FilesController extends AbstractController {
 			return null;
 		}
 	}
-	
-
-	
-/*	*//**
- 	 * See order controller
-	 * Serves product download files
-	 * @param storeCode
-	 * @param productId
-	 * @param fileName
-	 * @param extension
-	 * @return
-	 * @throws IOException
-	 *//*
-	@RequestMapping("/files/{storeCode}/{orderId}/{productId}/{fileName}.{extension}")
-	public void downloadProduct(@PathVariable final String storeCode, @PathVariable final Long orderId, @PathVariable final Long productId, @PathVariable final String fileName, @PathVariable final String extension, HttpServletRequest request, HttpServletResponse response) throws IOException {
-
-		// product image
-		// example -> /files/mystore/12345/120/product1.zip
-		
-		//TODO role customer, verify the order has the requested product to download
-		
-		//Need to query the files CMS for merchant and product ( not the order )
-		
-		FileContentType imgType = null;
-		
-
-		
-		OutputContentFile image = null;
-		//try {
-			//image = productImageService.getProductImage(storeCode, productId, new StringBuilder().append(imageName).append(".").append(extension).toString());
-		//} catch (ServiceException e) {
-			//LOGGER.error("Cannot retrieve image " + imageName, e);
-		//}
-				try {
-	      // get your file as InputStream
-	      InputStream is = ...;
-	      // copy it to response's OutputStream
-	      IOUtils.copy(is, response.getOutputStream());
-	      response.setContentType("application/pdf");      
-	      response.setHeader("Content-Disposition", "attachment; filename=somefile.pdf"); 
-	      response.flushBuffer();
-	    } catch (IOException ex) {
-	      log.info("Error writing file to output stream. Filename was '" + fileName + "'");
-	      throw new RuntimeException("IOError writing file to output stream");
-	    }
-
-	}
-
-	}*/
 
 }

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 88161d7..a40e73b 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
@@ -1,21 +1,24 @@
 package com.salesmanager.shop.controller;
 
 import java.io.IOException;
+
 import javax.inject.Inject;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.salesmanager.core.model.catalog.product.file.ProductImageSize;
+import com.salesmanager.core.business.exception.ServiceException;
 import com.salesmanager.core.business.services.catalog.product.image.ProductImageService;
+import com.salesmanager.core.business.services.content.ContentService;
+import com.salesmanager.core.model.catalog.product.file.ProductImageSize;
 import com.salesmanager.core.model.content.FileContentType;
 import com.salesmanager.core.model.content.OutputContentFile;
-import com.salesmanager.core.business.services.content.ContentService;
-import com.salesmanager.core.business.exception.ServiceException;
 
 /**
  * When handling images and files from the application server
@@ -76,13 +79,29 @@ public class ImagesController {
 	}
 	
 
+	/**
+	 * For product images
+	 * @Deprecated
+	 * @param storeCode
+	 * @param productCode
+	 * @param imageType
+	 * @param imageName
+	 * @param extension
+	 * @return
+	 * @throws IOException
+	 */
 	@RequestMapping("/static/{storeCode}/{imageType}/{productCode}/{imageName}.{extension}")
 	public @ResponseBody byte[] printImage(@PathVariable final String storeCode, @PathVariable final String productCode, @PathVariable final String imageType, @PathVariable final String imageName, @PathVariable final String extension) throws IOException {
 
 		// product image
-		// example small product image -> /static/1/PRODUCT/120/product1.jpg
+		// example small product image -> /static/DEFAULT/products/TB12345/product1.jpg
+		
+		// example large product image -> /static/DEFAULT/products/TB12345/product1.jpg
 		
-		// example large product image -> /static/1/PRODUCTLG/120/product1.jpg
+		/**
+		 * List of possible imageType
+		 * 
+		 */
 		
 
 		ProductImageSize size = ProductImageSize.SMALL;
@@ -107,5 +126,58 @@ public class ImagesController {
 		}
 
 	}
+	
+	/**
+	 * Exclusive method for dealing with product images
+	 * @param storeCode
+	 * @param productCode
+	 * @param imageName
+	 * @param extension
+	 * @param request
+	 * @return
+	 * @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
+		
+		// example large product image -> /static/products/DEFAULT/TB12345/product1.jpg
+		// or
+		//example large product image -> /static/products/DEFAULT/TB12345/product1.jpg?size=large
+		
+		/**
+		 * List of possible imageType
+		 * 
+		 */
+		
+
+		ProductImageSize size = ProductImageSize.LARGE;
+		
+				
+		if(StringUtils.isNotBlank(request.getParameter("size"))) {
+			String requestSize = request.getParameter("size");
+			if(requestSize.equals(ProductImageSize.SMALL.name())) {
+				size = ProductImageSize.SMALL;
+			} 
+		}
+		
+
+		
+		OutputContentFile image = null;
+		try {
+			image = productImageService.getProductImage(storeCode, productCode, new StringBuilder().append(imageName).append(".").append(extension).toString(), size);
+		} catch (ServiceException e) {
+			LOGGER.error("Cannot retrieve image " + imageName, e);
+		}
+		if(image!=null) {
+			return image.getFile().toByteArray();
+		} else {
+			//empty image placeholder
+			return null;
+		}
+
+	}
 
 }

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/controller/ReferenceController.java b/sm-shop/src/main/java/com/salesmanager/shop/controller/ReferenceController.java
index 6fe7bfe..180c081 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/controller/ReferenceController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/controller/ReferenceController.java
@@ -16,6 +16,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -57,8 +59,9 @@ public class ReferenceController {
 	
 	
 	@SuppressWarnings("unchecked")
-	@RequestMapping(value={"/admin/reference/provinces.html","/shop/reference/provinces.html"}, method=RequestMethod.POST, produces="application/json;text/plain;charset=UTF-8")
-	public @ResponseBody String getProvinces(HttpServletRequest request, HttpServletResponse response) {
+	//@RequestMapping(value={"/admin/reference/provinces.html","/shop/reference/provinces.html"}, method=RequestMethod.POST, produces="application/json;text/plain;charset=UTF-8")
+	@RequestMapping(value={"/admin/reference/provinces.html","/shop/reference/provinces.html"}, method=RequestMethod.POST)
+	public @ResponseBody ResponseEntity<String> getProvinces(HttpServletRequest request, HttpServletResponse response) {
 		
 		String countryCode = request.getParameter("countryCode");
 		String lang = request.getParameter("lang");
@@ -113,7 +116,7 @@ public class ReferenceController {
 		
 		
 		String returnString = resp.toJSONString();
-		return returnString;
+		return new ResponseEntity<String>(returnString,HttpStatus.OK);
 		
 	}
 	

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/filter/AdminFilter.java b/sm-shop/src/main/java/com/salesmanager/shop/filter/AdminFilter.java
index d17a474..57a9979 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/filter/AdminFilter.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/filter/AdminFilter.java
@@ -55,11 +55,7 @@ public class AdminFilter extends HandlerInterceptorAdapter {
 		
 		User user = (User)request.getSession().getAttribute(Constants.ADMIN_USER);
 		
-		
 
-		
-		
-		
 		String storeCode = MerchantStore.DEFAULT_STORE;
 		MerchantStore store = (MerchantStore)request.getSession().getAttribute(Constants.ADMIN_STORE);
 		

diff --git a/sm-shop/src/main/resources/spring/shopizer-properties.xml b/sm-shop/src/main/resources/spring/shopizer-properties.xml
index e230139..943d050 100644
--- a/sm-shop/src/main/resources/spring/shopizer-properties.xml
+++ b/sm-shop/src/main/resources/spring/shopizer-properties.xml
@@ -34,8 +34,8 @@
 				
 				<prop key="POPULATE_TEST_DATA">true</prop>
 				<prop key="SHOP_SCHEME">http</prop>
-				<!-- when removing the context path from the url put that value to blank (nothing) -->
-				<prop key="CONTEXT_PATH">/sm-shop</prop>
+				<!-- when removing the context path from the url put that value to blank (nothing) otherwise put the uri for the web app eg /sm-shop -->
+				<prop key="CONTEXT_PATH"></prop>
 				<prop key="URL_EXTENSION">.html</prop>
 				<!-- Google maps key -->
 				<prop key="shopizer.googlemaps_key">YOUR-KEY-HERE</prop>

diff --git a/sm-shop/src/main/resources/spring/shopizer-servlet-context.xml b/sm-shop/src/main/resources/spring/shopizer-servlet-context.xml
index 6b44e70..3b9f6f7 100644
--- a/sm-shop/src/main/resources/spring/shopizer-servlet-context.xml
+++ b/sm-shop/src/main/resources/spring/shopizer-servlet-context.xml
@@ -56,7 +56,7 @@
 	
 	<!-- load images from local web server [com.salesmanager.web.utils.LocalImageFilePathUtils] -->
 	<beans:bean id="img" class="com.salesmanager.shop.utils.LocalImageFilePathUtils">
-		<beans:property name="basePath" value="/sm-shop/static" />
+		<beans:property name="basePath" value="/static" />
 		<!-- /static --><!-- /sm-shop/static -->
 	</beans:bean>
 	

diff --git a/sm-shop/src/main/webapp/common/adminLinks.jsp b/sm-shop/src/main/webapp/common/adminLinks.jsp
index 8b00832..0eac544 100644
--- a/sm-shop/src/main/webapp/common/adminLinks.jsp
+++ b/sm-shop/src/main/webapp/common/adminLinks.jsp
@@ -8,7 +8,7 @@
     <!-- Le styles -->
     
     <link href="<c:url value="/resources/css/bootstrap/css/sm-bootstrap.css" />" rel="stylesheet">
-    <link href="<c:url value="/resources/css/sm-bootstrap-responsive.css" />" rel="stylesheet">
+    <link href="<c:url value="/resources/css/bootstrap/css/sm-bootstrap-responsive.css" />" rel="stylesheet">
     
  
  

diff --git a/sm-shop/src/main/webapp/pages/admin/merchant/merchant.jsp b/sm-shop/src/main/webapp/pages/admin/merchant/merchant.jsp
index 2f5e79f..e919257 100644
--- a/sm-shop/src/main/webapp/pages/admin/merchant/merchant.jsp
+++ b/sm-shop/src/main/webapp/pages/admin/merchant/merchant.jsp
@@ -293,7 +293,7 @@ function callBackCheckCode(msg,code) {
 	                  <div class="control-group">
 	                        <label><s:message code="label.store.inbusinesssince" text="Web site operating since"/></label>
 	                        <div class="controls">
-	                        					<input id="dateBusinessSince" name="dateBusinessSince" value="${store.dateBusinessSince}" class="small" type="text" data-date-format="<%=com.salesmanager.core.constants.Constants.DEFAULT_DATE_FORMAT%>" data-datepicker="datepicker"> 
+	                        					<input id="dateBusinessSince" name="dateBusinessSince" value="${store.dateBusinessSince}" class="small" type="text" data-date-format="<%=com.salesmanager.core.business.constants.Constants.DEFAULT_DATE_FORMAT%>" data-datepicker="datepicker"> 
 	                                   			 <span class="help-inline"><form:errors path="dateBusinessSince" cssClass="error" /></span>
 	                        </div>
 	                  </div>

diff --git a/sm-shop/src/main/webapp/pages/admin/orders/order.jsp b/sm-shop/src/main/webapp/pages/admin/orders/order.jsp
index 02c7bd6..87b8ab3 100644
--- a/sm-shop/src/main/webapp/pages/admin/orders/order.jsp
+++ b/sm-shop/src/main/webapp/pages/admin/orders/order.jsp
@@ -532,7 +532,7 @@ function captureOrder(orderId){
 				<s:message code="label.customer.order.date" text="Order date"/>			 		
 			 	<div class="controls">
 							<form:input  cssClass="input-large" path="datePurchased"  class="small" type="text"
-							 data-date-format="<%=com.salesmanager.core.constants.Constants.DEFAULT_DATE_FORMAT%>" />
+							 data-date-format="<%=com.salesmanager.core.business.constants.Constants.DEFAULT_DATE_FORMAT%>" />
 							  <script type="text/javascript">
                                  $('#datePurchased').datepicker();
                               </script>

diff --git a/sm-shop/src/main/webapp/pages/admin/products/product.jsp b/sm-shop/src/main/webapp/pages/admin/products/product.jsp
index 7f814b1..3d0b66b 100644
--- a/sm-shop/src/main/webapp/pages/admin/products/product.jsp
+++ b/sm-shop/src/main/webapp/pages/admin/products/product.jsp
@@ -157,7 +157,7 @@ var priceFormatMessage = '<s:message code="message.price.cents" text="Wrong form
                   		<div class="control-group">
 	                        <label><s:message code="label.product.availabledate" text="Date available"/></label>
 	                        <div class="controls">
-	                        		 <input id="dateAvailable" name="dateAvailable" value="${product.dateAvailable}" class="small" type="text" data-date-format="<%=com.salesmanager.core.constants.Constants.DEFAULT_DATE_FORMAT%>" data-datepicker="datepicker"> 
+	                        		 <input id="dateAvailable" name="dateAvailable" value="${product.dateAvailable}" class="small" type="text" data-date-format="<%=com.salesmanager.core.business.constants.Constants.DEFAULT_DATE_FORMAT%>" data-datepicker="datepicker"> 
 	                                 <script type="text/javascript">
 	                                 $('#dateAvailable').datepicker();
 	                                 </script>

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 5923c43..7405294 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
-#Wed Nov 16 12:04:34 EST 2016
+#Thu Nov 17 13:15:16 EST 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=sm-shop