shopizer-developers

diff --git a/shopizer-canadapost/.classpath b/shopizer-canadapost/.classpath
index cd61a83..62d4b8e 100644
--- a/shopizer-canadapost/.classpath
+++ b/shopizer-canadapost/.classpath
@@ -28,7 +28,7 @@
 			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
 		</attributes>
 	</classpathentry>
-	<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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</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 8210518..854fbee 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 02 09:09:45 EDT 2016
+#Mon Nov 07 09:14:48 EST 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=shopizer-canadapost

diff --git a/shopizer-shipping-distance-module/.classpath b/shopizer-shipping-distance-module/.classpath
index cd61a83..62d4b8e 100644
--- a/shopizer-shipping-distance-module/.classpath
+++ b/shopizer-shipping-distance-module/.classpath
@@ -28,7 +28,7 @@
 			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
 		</attributes>
 	</classpathentry>
-	<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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

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 fa296bd..289e0af 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 02 09:09:44 EDT 2016
+#Mon Nov 07 09:14:47 EST 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=shopizer-shipping-distance-processor

diff --git a/sm-core/.classpath b/sm-core/.classpath
index 5cad398..fc5f96c 100644
--- a/sm-core/.classpath
+++ b/sm-core/.classpath
@@ -27,7 +27,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

diff --git a/sm-core/files/store/StoreRepository.dat b/sm-core/files/store/StoreRepository.dat
index 819e524..8da2fe1 100644
Binary files a/sm-core/files/store/StoreRepository.dat and b/sm-core/files/store/StoreRepository.dat differ

diff --git a/sm-core/SALESMANAGER-TEST.h2.db b/sm-core/SALESMANAGER-TEST.h2.db
index d357fe7..9f60507 100644
Binary files a/sm-core/SALESMANAGER-TEST.h2.db and b/sm-core/SALESMANAGER-TEST.h2.db differ

diff --git a/sm-core-model/.classpath b/sm-core-model/.classpath
index ba13a8b..6cd5836 100644
--- a/sm-core-model/.classpath
+++ b/sm-core-model/.classpath
@@ -17,7 +17,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

diff --git a/sm-core-model/src/main/java/com/salesmanager/core/model/order/orderstatus/OrderStatus.java b/sm-core-model/src/main/java/com/salesmanager/core/model/order/orderstatus/OrderStatus.java
index 64251a4..93e9dbe 100644
--- a/sm-core-model/src/main/java/com/salesmanager/core/model/order/orderstatus/OrderStatus.java
+++ b/sm-core-model/src/main/java/com/salesmanager/core/model/order/orderstatus/OrderStatus.java
@@ -6,6 +6,7 @@ public enum OrderStatus {
 	PROCESSED("processed"),
 	DELIVERED("delivered"),
 	REFUNDED("refunded"),
+	CANCELED("canceled"),
 	;
 	
 	private String value;

diff --git a/sm-search/.classpath b/sm-search/.classpath
index 5cad398..fc5f96c 100644
--- a/sm-search/.classpath
+++ b/sm-search/.classpath
@@ -27,7 +27,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

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 4b15cdf..4f8c0c1 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 02 09:09:45 EDT 2016
+#Mon Nov 07 09:14:49 EST 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=sm-search

diff --git a/sm-shop/.settings/org.eclipse.core.resources.prefs b/sm-shop/.settings/org.eclipse.core.resources.prefs
index 04cfa2c..bc0fda7 100644
--- a/sm-shop/.settings/org.eclipse.core.resources.prefs
+++ b/sm-shop/.settings/org.eclipse.core.resources.prefs
@@ -1,6 +1,10 @@
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
+encoding//src/main/resources/bundles/messages_fr.properties=UTF-8
+encoding//src/main/resources/bundles/payment_fr.properties=UTF-8
+encoding//src/main/resources/bundles/shipping_fr.properties=UTF-8
+encoding//src/main/resources/bundles/shopizer_fr.properties=UTF-8
 encoding//src/test/java=UTF-8
 encoding//src/test/resources=UTF-8
 encoding/<project>=UTF-8

diff --git a/sm-shop/SALESMANAGER.h2.db b/sm-shop/SALESMANAGER.h2.db
index ffb3539..0325b6e 100644
Binary files a/sm-shop/SALESMANAGER.h2.db and b/sm-shop/SALESMANAGER.h2.db differ

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/customers/CustomerController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/customers/CustomerController.java
index 24e018d..66c638c 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/customers/CustomerController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/customers/CustomerController.java
@@ -18,7 +18,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.security.authentication.encoding.PasswordEncoder;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
@@ -61,6 +60,7 @@ import com.salesmanager.shop.populator.customer.ReadableCustomerOptionPopulator;
 import com.salesmanager.shop.utils.EmailUtils;
 import com.salesmanager.shop.utils.LabelUtils;
 import com.salesmanager.shop.utils.LocaleUtils;
+import org.springframework.security.crypto.password.PasswordEncoder;
 
 
 
@@ -651,7 +651,7 @@ public class CustomerController {
 			Locale customerLocale = LocaleUtils.getLocale(userLanguage);
 			
 			String password = UserReset.generateRandomString();
-			String encodedPassword = passwordEncoder.encodePassword(password, null);
+			String encodedPassword = passwordEncoder.encode(password);
 			
 			customer.setPassword(encodedPassword);
 			

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/security/UserServicesImpl.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/security/UserServicesImpl.java
index 1ee8242..e70adb5 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/security/UserServicesImpl.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/security/UserServicesImpl.java
@@ -12,12 +12,12 @@ import com.salesmanager.shop.constants.Constants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.dao.DataAccessException;
-import org.springframework.security.authentication.encoding.PasswordEncoder;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
 import javax.inject.Inject;
@@ -113,7 +113,7 @@ public class UserServicesImpl implements WebUserServices{
 		
 		  MerchantStore store = merchantStoreService.getMerchantStore(MerchantStore.DEFAULT_STORE);
 
-		  String password = passwordEncoder.encodePassword("password", null);
+		  String password = passwordEncoder.encode("password");
 		  
 		  List<Group> groups = groupService.listGroup(GroupType.ADMIN);
 		  

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/application/ShopApplicationConfiguration.java b/sm-shop/src/main/java/com/salesmanager/shop/application/ShopApplicationConfiguration.java
index bf3e0ba..6421d41 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/application/ShopApplicationConfiguration.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/application/ShopApplicationConfiguration.java
@@ -1,10 +1,15 @@
 package com.salesmanager.shop.application;
 
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.ImportResource;
+import org.springframework.web.servlet.config.annotation.ViewResolverRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.view.tiles3.TilesConfigurer;
+import org.springframework.web.servlet.view.tiles3.TilesViewResolver;
 
 import com.salesmanager.core.business.configuration.CoreApplicationConfiguration;
 
@@ -13,6 +18,27 @@ import com.salesmanager.core.business.configuration.CoreApplicationConfiguration
 @EnableAutoConfiguration
 @Import(CoreApplicationConfiguration.class)//import sm-core configurations
 @ImportResource("spring/shopizer-shop-context.xml")
-public class ShopApplicationConfiguration {
+public class ShopApplicationConfiguration extends WebMvcConfigurerAdapter{
+	
+	
+    /**
+     * Configure TilesConfigurer.
+     */
+    @Bean
+    public TilesConfigurer tilesConfigurer(){
+        TilesConfigurer tilesConfigurer = new TilesConfigurer();
+        tilesConfigurer.setDefinitions(new String[] {"/WEB-INF/tiles/tiles-admin.xml","/WEB-INF/tiles/tiles-shop.xml"});
+        tilesConfigurer.setCheckRefresh(true);
+        return tilesConfigurer;
+    }
+ 
+    /**
+     * Configure ViewResolvers to deliver preferred views.
+     */
+    @Override
+    public void configureViewResolvers(ViewResolverRegistry registry) {
+        TilesViewResolver viewResolver = new TilesViewResolver();
+        registry.viewResolver(viewResolver);
+    }
 
 }

diff --git a/sm-shop/src/main/resources/bundles/shopizer.properties b/sm-shop/src/main/resources/bundles/shopizer.properties
index 9fbb0a8..97d5408 100644
--- a/sm-shop/src/main/resources/bundles/shopizer.properties
+++ b/sm-shop/src/main/resources/bundles/shopizer.properties
@@ -500,6 +500,7 @@ label.order.SHIPPED=Delivered
 label.order.PREPARED=Prepared
 label.order.REFUNDED=Refunded
 label.order.DELIVERED=Delivered
+label.order.CANCELED=Canceled
 refund=Refund
 
 order.total.subtotal=Sub-total

diff --git a/sm-shop/src/main/resources/bundles/shopizer_fr.properties b/sm-shop/src/main/resources/bundles/shopizer_fr.properties
index fff6a77..da9ee46 100644
--- a/sm-shop/src/main/resources/bundles/shopizer_fr.properties
+++ b/sm-shop/src/main/resources/bundles/shopizer_fr.properties
@@ -498,6 +498,7 @@ label.order.SHIPPED=Livrée
 label.order.PREPARED=Préparés
 label.order.REFUNDED=Remboursée
 label.order.DELIVERED=Livrée
+label.order.CANCELED=Annulée
 refund=Remboursement
 
 order.total.subtotal=Sous-total

diff --git a/sm-shop/src/main/resources/spring/shopizer-security.xml b/sm-shop/src/main/resources/spring/shopizer-security.xml
index dadbc93..4a9f198 100644
--- a/sm-shop/src/main/resources/spring/shopizer-security.xml
+++ b/sm-shop/src/main/resources/spring/shopizer-security.xml
@@ -1,11 +1,11 @@
 <beans:beans xmlns="http://www.springframework.org/schema/security"
 	xmlns:beans="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-	http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+	http://www.springframework.org/schema/beans/spring-beans.xsd
 	http://www.springframework.org/schema/jdbc
-	http://www.springframework.org/schema/jdbc/spring-jdbc-3.1.xsd
+	http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
 	http://www.springframework.org/schema/security
-	http://www.springframework.org/schema/security/spring-security-3.1.xsd">
+	http://www.springframework.org/schema/security/spring-security.xsd">
 
 
 	<global-method-security secured-annotations="enabled" jsr250-annotations="enabled" pre-post-annotations="enabled"/>

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 4224150..d6b4761 100644
--- a/sm-shop/src/main/resources/spring/shopizer-servlet-context.xml
+++ b/sm-shop/src/main/resources/spring/shopizer-servlet-context.xml
@@ -11,27 +11,6 @@
         http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
 
-
-
-	<!-- Handles HTTP GET requests for /resources/** by efficiently serving up static resources in the ${webappRoot}/resources/ directory -->
-	<resources mapping="/resources/**" location="/resources/" />
-	
-	<beans:bean id="viewResolver" class="org.springframework.web.servlet.view.UrlBasedViewResolver">
- 		<beans:property name="viewClass">
-  			<beans:value>org.springframework.web.servlet.view.tiles2.TilesView</beans:value> 
-  		</beans:property>
-  	</beans:bean>
-
-
-	<beans:bean id="tilesConfigurer" class="org.springframework.web.servlet.view.tiles2.TilesConfigurer">
- 			<beans:property name="definitions">
- 				<beans:list>
-  					<beans:value>/WEB-INF/tiles/tiles-admin.xml</beans:value>
-  					<beans:value>/WEB-INF/tiles/tiles-shop.xml</beans:value>
-  				</beans:list>
-  			</beans:property>
-  	</beans:bean>
-
 	<!-- Resolves views selected for rendering by @Controllers to .jsp resources in the /WEB-INF/views directory -->
 	<beans:bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
 		<beans:property name="prefix" value="/WEB-INF/views/" />

diff --git a/sm-shop/src/main/resources/spring/shopizer-shop-context.xml b/sm-shop/src/main/resources/spring/shopizer-shop-context.xml
index f8ed72d..f11485f 100644
--- a/sm-shop/src/main/resources/spring/shopizer-shop-context.xml
+++ b/sm-shop/src/main/resources/spring/shopizer-shop-context.xml
@@ -18,7 +18,7 @@
   	<!-- properties -->
   	<beans:import resource="classpath:/spring/shopizer-properties.xml" />
   	<!-- security -->
-<!--   	<beans:import resource="classpath:/spring/shopizer-security.xml" /> -->
+	<beans:import resource="classpath:/spring/shopizer-security.xml" />
   	<!-- servlet-context -->
   	<beans:import resource="classpath:/spring/shopizer-servlet-context.xml" />
 	

diff --git a/sm-shop/target/classes/bundles/shopizer.properties b/sm-shop/target/classes/bundles/shopizer.properties
index 9fbb0a8..97d5408 100644
--- a/sm-shop/target/classes/bundles/shopizer.properties
+++ b/sm-shop/target/classes/bundles/shopizer.properties
@@ -500,6 +500,7 @@ label.order.SHIPPED=Delivered
 label.order.PREPARED=Prepared
 label.order.REFUNDED=Refunded
 label.order.DELIVERED=Delivered
+label.order.CANCELED=Canceled
 refund=Refund
 
 order.total.subtotal=Sub-total

diff --git a/sm-shop/target/classes/bundles/shopizer_fr.properties b/sm-shop/target/classes/bundles/shopizer_fr.properties
index fff6a77..da9ee46 100644
--- a/sm-shop/target/classes/bundles/shopizer_fr.properties
+++ b/sm-shop/target/classes/bundles/shopizer_fr.properties
@@ -498,6 +498,7 @@ label.order.SHIPPED=Livrée
 label.order.PREPARED=Préparés
 label.order.REFUNDED=Remboursée
 label.order.DELIVERED=Livrée
+label.order.CANCELED=Annulée
 refund=Remboursement
 
 order.total.subtotal=Sous-total

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 e494ceb..5fb99b6 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 02 12:45:59 EDT 2016
+#Mon Nov 07 09:14:52 EST 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=sm-shop