shopizer-uncached

diff --git a/sm-core/pom.xml b/sm-core/pom.xml
index 72a0c7f..1087f97 100644
--- a/sm-core/pom.xml
+++ b/sm-core/pom.xml
@@ -126,11 +126,20 @@
 		    <artifactId>freemarker</artifactId>
 		</dependency>
 		
-		<!-- https://mvnrepository.com/artifact/javax.mail/javax.mail-api -->
+ 		<!-- https://mvnrepository.com/artifact/javax.mail/javax.mail-api -->
+ 		<!--
 		<dependency>
 		    <groupId>javax.mail</groupId>
 		    <artifactId>javax.mail-api</artifactId>
+		</dependency> -->
+		
+		<!-- https://mvnrepository.com/artifact/javax.mail/mail -->
+		<dependency>
+		    <groupId>javax.mail</groupId>
+		    <artifactId>mail</artifactId>
+		    <version>1.4.7</version>
 		</dependency>
+		
 
 		<!-- https://mvnrepository.com/artifact/org.springframework/spring-context-support -->
 		<dependency>

diff --git a/sm-shop/files/store/StoreRepository.dat b/sm-shop/files/store/StoreRepository.dat
index f8abde1..24d7eff 100644
Binary files a/sm-shop/files/store/StoreRepository.dat and b/sm-shop/files/store/StoreRepository.dat differ

diff --git a/sm-shop/SALESMANAGER.h2.db b/sm-shop/SALESMANAGER.h2.db
new file mode 100644
index 0000000..02428a2
Binary files /dev/null and b/sm-shop/SALESMANAGER.h2.db differ

diff --git a/sm-shop/SALESMANAGER.lock.db b/sm-shop/SALESMANAGER.lock.db
new file mode 100644
index 0000000..f5f7387
--- /dev/null
+++ b/sm-shop/SALESMANAGER.lock.db
@@ -0,0 +1,4 @@
+#FileLock
+#Mon Nov 28 12:30:37 EST 2016
+id=158abfd02e65b2be4012364a048aa29e21595fda4f8
+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 c7fbe61..b02f30d 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
@@ -368,18 +368,21 @@ public class MerchantStoreController {
 	}
 	
 	@PreAuthorize("hasRole('AUTH')")
-	@RequestMapping(value="/admin/store/checkStoreCode.html", method=RequestMethod.POST, produces="application/json")
-	public @ResponseBody String checkStoreCode(HttpServletRequest request, HttpServletResponse response, Locale locale) {
+	@RequestMapping(value="/admin/store/checkStoreCode.html", method=RequestMethod.POST)
+	public @ResponseBody ResponseEntity<String> checkStoreCode(HttpServletRequest request, HttpServletResponse response, Locale locale) {
 		String code = request.getParameter("code");
 
 
 		AjaxResponse resp = new AjaxResponse();
 		
+		final HttpHeaders httpHeaders= new HttpHeaders();
+	    httpHeaders.setContentType(MediaType.APPLICATION_JSON_UTF8);
+		
 		try {
 			
 			if(StringUtils.isBlank(code)) {
 				resp.setStatus(AjaxResponse.CODE_ALREADY_EXIST);
-				return resp.toJSONString();
+				return new ResponseEntity<String>(resp.toJSONString(),httpHeaders,HttpStatus.OK);
 			}
 			
 			MerchantStore store = merchantStoreService.getByCode(code);
@@ -389,7 +392,7 @@ public class MerchantStoreController {
 			
 			if(store!=null) {
 				resp.setStatus(AjaxResponse.CODE_ALREADY_EXIST);
-				return resp.toJSONString();
+				return new ResponseEntity<String>(resp.toJSONString(),httpHeaders,HttpStatus.OK);
 			}
 
 
@@ -404,7 +407,8 @@ public class MerchantStoreController {
 		
 		String returnString = resp.toJSONString();
 		
-		return returnString;
+		
+		return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
 	}
 	
 	

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/merchant/StoreBrandingController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/merchant/StoreBrandingController.java
index cb56557..36e274a 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/merchant/StoreBrandingController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/merchant/StoreBrandingController.java
@@ -82,6 +82,16 @@ public class StoreBrandingController {
 		return "admin-store-branding";
 	}
 	
+	/**
+	 * https://spring.io/guides/gs/uploading-files/
+	 * @param contentImages
+	 * @param result
+	 * @param model
+	 * @param request
+	 * @param response
+	 * @return
+	 * @throws Exception
+	 */
 	@PreAuthorize("hasRole('STORE')")
 	@RequestMapping(value="/admin/store/saveBranding.html", method=RequestMethod.POST)
 	public String saveStoreBranding(@ModelAttribute(value="contentImages") @Valid final ContentFiles contentImages, BindingResult result, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
@@ -90,6 +100,16 @@ public class StoreBrandingController {
 
 		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
 		
+		model.addAttribute("templates", templates);
+		
+		
+		model.addAttribute("store", store);
+		
+		if(contentImages == null || contentImages.getFile() == null) {
+			model.addAttribute("error","error");
+			return "admin-store-branding";
+		}
+		
 		
 		if(contentImages.getFile()!=null && contentImages.getFile().size()>0) {
 
@@ -109,11 +129,8 @@ public class StoreBrandingController {
 		}
 		
 		//display templates
-		model.addAttribute("templates", templates);
-		
-		model.addAttribute("success","success");
-		model.addAttribute("store", store);
 
+		model.addAttribute("success","success");
 		return "admin-store-branding";
 	}
 	

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 ea69618..a2629b5 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
-#Thu Nov 24 13:46:26 EST 2016
+#Mon Nov 28 12:12:04 EST 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=sm-shop