shopizer-developers

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 35e285d..bc05658 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
-#Fri Oct 28 08:24:27 EDT 2016
+#Mon Oct 31 08:50:52 EDT 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 fa7e0fd..5cc9c03 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
-#Fri Oct 28 08:24:27 EDT 2016
+#Mon Oct 31 08:50:52 EDT 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=shopizer-shipping-distance-processor

diff --git a/sm-core/target/classes/META-INF/maven/com.shopizer/sm-core/pom.properties b/sm-core/target/classes/META-INF/maven/com.shopizer/sm-core/pom.properties
index 487dd61..c610e4b 100644
--- a/sm-core/target/classes/META-INF/maven/com.shopizer/sm-core/pom.properties
+++ b/sm-core/target/classes/META-INF/maven/com.shopizer/sm-core/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Fri Oct 28 08:24:23 EDT 2016
+#Mon Oct 31 08:50:51 EDT 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=sm-core

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 ab14ea5..c23384b 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
-#Fri Oct 28 08:24:28 EDT 2016
+#Mon Oct 31 08:50:53 EDT 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=sm-search

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerBillingAddressPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerBillingAddressPopulator.java
index cb5a538..8bbb6fa 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerBillingAddressPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerBillingAddressPopulator.java
@@ -1,17 +1,17 @@
 /**
  * 
  */
-package com.salesmanager.web.populator.customer;
+package com.salesmanager.shop.populator.customer;
 
-import com.salesmanager.core.business.customer.model.Customer;
-import com.salesmanager.core.business.generic.exception.ConversionException;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.utils.AbstractDataPopulator;
-import com.salesmanager.web.entity.customer.Address;
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.core.model.customer.Customer;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.shop.model.customer.Address;
 
 /**
- * @author Admin
+ * @author csamson
  *
  */
 public class CustomerBillingAddressPopulator extends AbstractDataPopulator<Customer, Address>

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerDeliveryAddressPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerDeliveryAddressPopulator.java
index ac16570..3d4ccbe 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerDeliveryAddressPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerDeliveryAddressPopulator.java
@@ -1,16 +1,17 @@
 /**
  * 
  */
-package com.salesmanager.web.populator.customer;
+package com.salesmanager.shop.populator.customer;
 
 import org.apache.commons.lang.StringUtils;
 
-import com.salesmanager.core.business.customer.model.Customer;
-import com.salesmanager.core.business.generic.exception.ConversionException;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.utils.AbstractDataPopulator;
-import com.salesmanager.web.entity.customer.Address;
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.core.model.customer.Customer;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.shop.model.customer.Address;
+
 
 /**
  * @author Admin

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerEntityPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerEntityPopulator.java
index a3c8f5b..fb59fa2 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerEntityPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerEntityPopulator.java
@@ -1,17 +1,18 @@
 /**
  *
  */
-package com.salesmanager.web.populator.customer;
+package com.salesmanager.shop.populator.customer;
 
 import org.apache.commons.lang.StringUtils;
 
-import com.salesmanager.core.business.customer.model.Customer;
-import com.salesmanager.core.business.generic.exception.ConversionException;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.utils.AbstractDataPopulator;
-import com.salesmanager.web.entity.customer.Address;
-import com.salesmanager.web.entity.customer.CustomerEntity;
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.core.model.customer.Customer;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.shop.model.customer.Address;
+import com.salesmanager.shop.model.customer.CustomerEntity;
+
 
 /**
  * <p>

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerOptionPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerOptionPopulator.java
index 609d491..576bcf1 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerOptionPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerOptionPopulator.java
@@ -1,18 +1,24 @@
-package com.salesmanager.web.populator.customer;
+package com.salesmanager.shop.populator.customer;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.salesmanager.core.business.customer.model.attribute.CustomerOptionSet;
-import com.salesmanager.core.business.generic.exception.ConversionException;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.utils.AbstractDataPopulator;
-import com.salesmanager.web.admin.entity.customer.attribute.CustomerOption;
-import com.salesmanager.web.admin.entity.customer.attribute.CustomerOptionValue;
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.core.model.customer.attribute.CustomerOptionSet;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.shop.admin.model.customer.attribute.CustomerOption;
+import com.salesmanager.shop.admin.model.customer.attribute.CustomerOptionValue;
 
+
+/**
+ * Used in the admin section
+ * @author c.samson
+ *
+ */
 public class CustomerOptionPopulator extends
-		AbstractDataPopulator<com.salesmanager.core.business.customer.model.attribute.CustomerOption, com.salesmanager.web.admin.entity.customer.attribute.CustomerOption> {
+		AbstractDataPopulator<com.salesmanager.core.model.customer.attribute.CustomerOption, com.salesmanager.shop.admin.model.customer.attribute.CustomerOption> {
 
 	
 	private CustomerOptionSet optionSet;
@@ -27,7 +33,7 @@ public class CustomerOptionPopulator extends
 
 	@Override
 	public CustomerOption populate(
-			com.salesmanager.core.business.customer.model.attribute.CustomerOption source,
+			com.salesmanager.core.model.customer.attribute.CustomerOption source,
 			CustomerOption target, MerchantStore store, Language language) throws ConversionException {
 		
 		
@@ -46,7 +52,7 @@ public class CustomerOptionPopulator extends
 			customerOption.setAvailableValues(values);
 		}
 		
-		com.salesmanager.core.business.customer.model.attribute.CustomerOptionValue optionValue = optionSet.getCustomerOptionValue();
+		com.salesmanager.core.model.customer.attribute.CustomerOptionValue optionValue = optionSet.getCustomerOptionValue();
 		CustomerOptionValue custOptValue = new CustomerOptionValue();
 		custOptValue.setId(optionValue.getId());
 		custOptValue.setLanguage(language.getCode());

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerPopulator.java
index 0103182..89d24b5 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerPopulator.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/CustomerPopulator.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.populator.customer;
+package com.salesmanager.shop.populator.customer;
 
 import java.util.Map;
 
@@ -7,26 +7,28 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.salesmanager.core.business.common.model.Billing;
-import com.salesmanager.core.business.common.model.Delivery;
-import com.salesmanager.core.business.customer.model.Customer;
-import com.salesmanager.core.business.customer.model.attribute.CustomerAttribute;
-import com.salesmanager.core.business.customer.model.attribute.CustomerOption;
-import com.salesmanager.core.business.customer.model.attribute.CustomerOptionValue;
-import com.salesmanager.core.business.customer.service.attribute.CustomerOptionService;
-import com.salesmanager.core.business.customer.service.attribute.CustomerOptionValueService;
-import com.salesmanager.core.business.generic.exception.ConversionException;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.country.model.Country;
-import com.salesmanager.core.business.reference.country.service.CountryService;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.core.business.reference.language.service.LanguageService;
-import com.salesmanager.core.business.reference.zone.model.Zone;
-import com.salesmanager.core.business.reference.zone.service.ZoneService;
-import com.salesmanager.core.utils.AbstractDataPopulator;
-import com.salesmanager.web.entity.customer.Address;
-import com.salesmanager.web.entity.customer.PersistableCustomer;
-import com.salesmanager.web.entity.customer.attribute.PersistableCustomerAttribute;
+import com.salesmanager.core.business.exception.ConversionException;
+import com.salesmanager.core.business.services.customer.attribute.CustomerOptionService;
+import com.salesmanager.core.business.services.customer.attribute.CustomerOptionValueService;
+import com.salesmanager.core.business.services.reference.country.CountryService;
+import com.salesmanager.core.business.services.reference.language.LanguageService;
+import com.salesmanager.core.business.services.reference.zone.ZoneService;
+import com.salesmanager.core.business.utils.AbstractDataPopulator;
+import com.salesmanager.core.model.common.Billing;
+import com.salesmanager.core.model.common.Delivery;
+import com.salesmanager.core.model.customer.Customer;
+import com.salesmanager.core.model.customer.attribute.CustomerAttribute;
+import com.salesmanager.core.model.customer.attribute.CustomerOption;
+import com.salesmanager.core.model.customer.attribute.CustomerOptionValue;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.country.Country;
+import com.salesmanager.core.model.reference.language.Language;
+import com.salesmanager.core.model.reference.zone.Zone;
+import com.salesmanager.shop.model.customer.Address;
+import com.salesmanager.shop.model.customer.PersistableCustomer;
+import com.salesmanager.shop.model.customer.attribute.PersistableCustomerAttribute;
+
+
 
 public class CustomerPopulator extends
 		AbstractDataPopulator<PersistableCustomer, Customer> {
@@ -68,10 +70,10 @@ public class CustomerPopulator extends
 			target.setEmailAddress(source.getEmailAddress());
 			target.setNick(source.getUserName());
 			if(source.getGender()!=null && target.getGender()==null) {
-				target.setGender( com.salesmanager.core.business.customer.model.CustomerGender.valueOf( source.getGender() ) );
+				target.setGender( com.salesmanager.core.model.customer.CustomerGender.valueOf( source.getGender() ) );
 			}
 			if(target.getGender()==null) {
-				target.setGender( com.salesmanager.core.business.customer.model.CustomerGender.M);
+				target.setGender( com.salesmanager.core.model.customer.CustomerGender.M);
 			}
 
 			Map<String,Country> countries = countryService.getCountriesMap(language);

diff --git a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerBillingAddressPopulator.class b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerBillingAddressPopulator.class
index f1d4b5c..6a43bd9 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerBillingAddressPopulator.class and b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerBillingAddressPopulator.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerDeliveryAddressPopulator.class b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerDeliveryAddressPopulator.class
index e6939b6..1fa509e 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerDeliveryAddressPopulator.class and b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerDeliveryAddressPopulator.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerEntityPopulator.class b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerEntityPopulator.class
index 9b33d7a..987c0e5 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerEntityPopulator.class and b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerEntityPopulator.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerOptionPopulator.class b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerOptionPopulator.class
index a46d4a3..7190cf0 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerOptionPopulator.class and b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerOptionPopulator.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerPopulator.class b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerPopulator.class
index ca1c07f..6c03b04 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerPopulator.class and b/sm-shop/target/classes/com/salesmanager/shop/populator/customer/CustomerPopulator.class differ

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 2c2bf00..796fc90 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
-#Fri Oct 28 08:24:32 EDT 2016
+#Mon Oct 31 08:50:57 EDT 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=sm-shop