shopizer-uncached

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 315fe7e..40d15a6 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
-#Tue Nov 22 08:49:18 EST 2016
+#Thu Nov 24 13:46:23 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 500eb55..fc3b17c 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
-#Tue Nov 22 12:01:26 EST 2016
+#Thu Nov 24 13:46:23 EST 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=shopizer-shipping-distance-processor

diff --git a/sm-core/.settings/org.eclipse.jdt.core.prefs b/sm-core/.settings/org.eclipse.jdt.core.prefs
index 1ab2bb5..529ef07 100644
--- a/sm-core/.settings/org.eclipse.jdt.core.prefs
+++ b/sm-core/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,12 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/constants/Constants.java b/sm-core/src/main/java/com/salesmanager/core/business/constants/Constants.java
index 97957d2..c2747c8 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/constants/Constants.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/constants/Constants.java
@@ -17,7 +17,7 @@ public class Constants {
 	public final static String DEFAULT_LANGUAGE = "en";
 	
 	public final static String EMAIL_CONFIG = "EMAIL_CONFIG";
-	public final static String MERCHANT_CONFIG = "MERCHANT_CONFIG";
+	//public final static String MERCHANT_CONFIG = "MERCHANT_CONFIG";
 	
 	public final static String UNDERSCORE = "_";
 	public final static String SLASH = "/";

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/services/system/MerchantConfigurationServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/services/system/MerchantConfigurationServiceImpl.java
index f0d8fe9..50e0b52 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/services/system/MerchantConfigurationServiceImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/services/system/MerchantConfigurationServiceImpl.java
@@ -71,7 +71,7 @@ public class MerchantConfigurationServiceImpl extends
 	@Override
 	public MerchantConfig getMerchantConfig(MerchantStore store) throws ServiceException {
 
-		MerchantConfiguration configuration = merchantConfigurationRepository.findByMerchantStoreAndKey(store.getId(), Constants.MERCHANT_CONFIG);
+		MerchantConfiguration configuration = merchantConfigurationRepository.findByMerchantStoreAndKey(store.getId(), MerchantConfigurationType.CONFIG.name());
 		
 		MerchantConfig config = null;
 		if(configuration!=null) {
@@ -91,12 +91,13 @@ public class MerchantConfigurationServiceImpl extends
 	@Override
 	public void saveMerchantConfig(MerchantConfig config, MerchantStore store) throws ServiceException {
 		
-		MerchantConfiguration configuration = merchantConfigurationRepository.findByMerchantStoreAndKey(store.getId(), Constants.MERCHANT_CONFIG);
+		MerchantConfiguration configuration = merchantConfigurationRepository.findByMerchantStoreAndKey(store.getId(), MerchantConfigurationType.CONFIG.name());
 
 		if(configuration==null) {
 			configuration = new MerchantConfiguration();
 			configuration.setMerchantStore(store);
-			configuration.setKey(Constants.MERCHANT_CONFIG);
+			configuration.setKey(MerchantConfigurationType.CONFIG.name());
+			configuration.setMerchantConfigurationType(MerchantConfigurationType.CONFIG);
 		}
 		
 		String value = config.toJSONString();

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 6273004..3e0f538 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
-#Tue Nov 22 12:01:26 EST 2016
+#Thu Nov 24 13:46:24 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 fdcd774..f8abde1 100644
Binary files a/sm-shop/files/store/StoreRepository.dat and b/sm-shop/files/store/StoreRepository.dat differ

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/configurations/SystemConfigurationController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/configurations/SystemConfigurationController.java
index 56dccfb..1d7af4e 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/configurations/SystemConfigurationController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/configurations/SystemConfigurationController.java
@@ -61,6 +61,7 @@ public class SystemConfigurationController {
 	public String saveSystemConfigurations(@ModelAttribute("configuration") MerchantConfig merchantConfiguration, BindingResult result, Model model, HttpServletRequest request, Locale locale) throws Exception
 	{
 		setMenu(model, request);
+		
 		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
 		merchantConfigurationService.saveMerchantConfig(merchantConfiguration, store);
 		model.addAttribute("success","success");

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/init/data/InitializationLoader.java b/sm-shop/src/main/java/com/salesmanager/shop/init/data/InitializationLoader.java
index b153c6b..7731529 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/init/data/InitializationLoader.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/init/data/InitializationLoader.java
@@ -2,11 +2,15 @@ package com.salesmanager.shop.init.data;
 
 import com.salesmanager.core.business.constants.SystemConstants;
 import com.salesmanager.core.business.exception.ServiceException;
+import com.salesmanager.core.business.services.merchant.MerchantStoreService;
 import com.salesmanager.core.business.services.reference.init.InitializationDatabase;
+import com.salesmanager.core.business.services.system.MerchantConfigurationService;
 import com.salesmanager.core.business.services.system.SystemConfigurationService;
 import com.salesmanager.core.business.services.user.GroupService;
 import com.salesmanager.core.business.services.user.PermissionService;
 import com.salesmanager.core.business.utils.CoreConfiguration;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.system.MerchantConfig;
 import com.salesmanager.core.model.system.SystemConfiguration;
 import com.salesmanager.core.model.user.Group;
 import com.salesmanager.core.model.user.GroupType;
@@ -31,6 +35,9 @@ public class InitializationLoader {
 	
 	@Inject
 	private AppConfiguration appConfiguration;
+	
+	@Inject
+	private MerchantConfigurationService merchantConfigurationService;
 
 	
 	@Inject
@@ -54,17 +61,24 @@ public class InitializationLoader {
 	@Inject
 	private CoreConfiguration configuration;
 	
+	@Inject
+	protected MerchantStoreService merchantService;
+	
 	@PostConstruct
 	public void init() {
 		
 		try {
 			
 			if (initializationDatabase.isEmpty()) {
+				
+				
+				//All default data to be created
+				
 				LOGGER.info(String.format("%s : Shopizer database is empty, populate it....", "sm-shop"));
 		
 				 initializationDatabase.populate("sm-shop");
 				
-				
+				 MerchantStore store = merchantService.getByCode(MerchantStore.DEFAULT_STORE);
 				
 				 //security groups and permissions
 
@@ -184,6 +198,12 @@ public class InitializationLoader {
 				  Permission gcustomerpermission = new Permission("AUTH_CUSTOMER");
 				  gcustomerpermission.getGroups().add(gcustomer);
 				  permissionService.create(gcustomerpermission);
+				  
+				  MerchantConfig config = new MerchantConfig();
+				  config.setAllowPurchaseItems(true);
+				  config.setDisplayAddToCartOnFeaturedItems(true);
+				  
+				  merchantConfigurationService.saveMerchantConfig(config, store);
 
 				  loadData();
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/shoppingCart/ShoppingCartController.java b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/shoppingCart/ShoppingCartController.java
index 0fa84ad..5207547 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/shoppingCart/ShoppingCartController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/shoppingCart/ShoppingCartController.java
@@ -119,7 +119,7 @@ public class ShoppingCartController extends AbstractController {
 	 * @return
 	 * @throws Exception
 	 */
-    @RequestMapping(value={"/addShoppingCartItem.html"}, method=RequestMethod.POST)
+    @RequestMapping(value={"/addShoppingCartItem"}, method=RequestMethod.POST)
 	public @ResponseBody
 	ShoppingCartData addShoppingCartItem(@RequestBody final ShoppingCartItem item, final HttpServletRequest request, final HttpServletResponse response, final Locale locale) throws Exception {
 

diff --git a/sm-shop/src/main/webapp/resources/js/shop-minicart.js b/sm-shop/src/main/webapp/resources/js/shop-minicart.js
index 8062b6a..eb2674d 100644
--- a/sm-shop/src/main/webapp/resources/js/shop-minicart.js
+++ b/sm-shop/src/main/webapp/resources/js/shop-minicart.js
@@ -139,7 +139,7 @@
 		
 		$.ajax({  
 			 type: 'POST',  
-			 url: getContextPath() + '/shop/cart/addShoppingCartItem.html',  
+			 url: getContextPath() + '/shop/cart/addShoppingCartItem',  
 			 data: scItem, 
 			 contentType: 'application/json;charset=utf-8',
 			 dataType: 'json', 

diff --git a/sm-shop/src/main/webapp/resources/js/shopping-cart.js b/sm-shop/src/main/webapp/resources/js/shopping-cart.js
index 03d01c2..f546c64 100644
--- a/sm-shop/src/main/webapp/resources/js/shopping-cart.js
+++ b/sm-shop/src/main/webapp/resources/js/shopping-cart.js
@@ -136,7 +136,7 @@
 		
 		$.ajax({  
 			 type: 'POST',  
-			 url: getContextPath() + '/shop/cart/addShoppingCartItem.html',  
+			 url: getContextPath() + '/shop/cart/addShoppingCartItem',  
 			 data: scItem, 
 			 contentType: 'application/json;charset=utf-8',
 			 dataType: 'json', 

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 8facc58..ea69618 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 23 08:48:04 EST 2016
+#Thu Nov 24 13:46:26 EST 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=sm-shop