shopizer-developers

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 78742cd..24e018d 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
@@ -1,4 +1,4 @@
-package com.salesmanager.web.admin.controller.customers;
+package com.salesmanager.shop.admin.controller.customers;
 
 import java.util.Enumeration;
 import java.util.HashMap;
@@ -8,6 +8,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.regex.Pattern;
 
+import javax.inject.Inject;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
@@ -16,7 +17,6 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.authentication.encoding.PasswordEncoder;
 import org.springframework.stereotype.Controller;
@@ -28,39 +28,41 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.salesmanager.core.business.customer.model.Customer;
-import com.salesmanager.core.business.customer.model.CustomerCriteria;
-import com.salesmanager.core.business.customer.model.CustomerList;
-import com.salesmanager.core.business.customer.model.attribute.CustomerAttribute;
-import com.salesmanager.core.business.customer.model.attribute.CustomerOptionSet;
-import com.salesmanager.core.business.customer.model.attribute.CustomerOptionType;
-import com.salesmanager.core.business.customer.model.attribute.CustomerOptionValueDescription;
-import com.salesmanager.core.business.customer.service.CustomerService;
-import com.salesmanager.core.business.customer.service.attribute.CustomerAttributeService;
-import com.salesmanager.core.business.customer.service.attribute.CustomerOptionService;
-import com.salesmanager.core.business.customer.service.attribute.CustomerOptionSetService;
-import com.salesmanager.core.business.customer.service.attribute.CustomerOptionValueService;
-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.business.system.service.EmailService;
-import com.salesmanager.core.modules.email.Email;
-import com.salesmanager.core.utils.ajax.AjaxPageableResponse;
-import com.salesmanager.core.utils.ajax.AjaxResponse;
-import com.salesmanager.web.admin.entity.customer.attribute.CustomerOption;
-import com.salesmanager.web.admin.entity.customer.attribute.CustomerOptionValue;
-import com.salesmanager.web.admin.entity.userpassword.UserReset;
-import com.salesmanager.web.admin.entity.web.Menu;
-import com.salesmanager.web.constants.Constants;
-import com.salesmanager.web.constants.EmailConstants;
-import com.salesmanager.web.populator.customer.CustomerOptionPopulator;
-import com.salesmanager.web.utils.EmailUtils;
-import com.salesmanager.web.utils.LabelUtils;
-import com.salesmanager.web.utils.LocaleUtils;
+import com.salesmanager.core.business.modules.email.Email;
+import com.salesmanager.core.business.services.customer.CustomerService;
+import com.salesmanager.core.business.services.customer.attribute.CustomerAttributeService;
+import com.salesmanager.core.business.services.customer.attribute.CustomerOptionService;
+import com.salesmanager.core.business.services.customer.attribute.CustomerOptionSetService;
+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.services.system.EmailService;
+import com.salesmanager.core.business.utils.ajax.AjaxPageableResponse;
+import com.salesmanager.core.business.utils.ajax.AjaxResponse;
+import com.salesmanager.core.model.customer.Customer;
+import com.salesmanager.core.model.customer.CustomerCriteria;
+import com.salesmanager.core.model.customer.CustomerList;
+import com.salesmanager.core.model.customer.attribute.CustomerAttribute;
+import com.salesmanager.core.model.customer.attribute.CustomerOptionSet;
+import com.salesmanager.core.model.customer.attribute.CustomerOptionType;
+import com.salesmanager.core.model.customer.attribute.CustomerOptionValueDescription;
+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.admin.model.customer.attribute.CustomerOption;
+import com.salesmanager.shop.admin.model.customer.attribute.CustomerOptionValue;
+import com.salesmanager.shop.admin.model.userpassword.UserReset;
+import com.salesmanager.shop.admin.model.web.Menu;
+import com.salesmanager.shop.constants.Constants;
+import com.salesmanager.shop.constants.EmailConstants;
+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;
+
+
 
 @Controller
 public class CustomerController {
@@ -171,13 +173,13 @@ public class CustomerController {
 		if(!CollectionUtils.isEmpty(optionSet)) {
 			
 			
-			CustomerOptionPopulator optionPopulator = new CustomerOptionPopulator();
+			ReadableCustomerOptionPopulator optionPopulator = new ReadableCustomerOptionPopulator();
 			
 			Set<CustomerAttribute> customerAttributes = customer.getAttributes();
 			
 			for(CustomerOptionSet optSet : optionSet) {
 				
-				com.salesmanager.core.business.customer.model.attribute.CustomerOption custOption = optSet.getCustomerOption();
+				com.salesmanager.core.model.customer.attribute.CustomerOption custOption = optSet.getCustomerOption();
 				if(!custOption.isActive()) {
 					continue;
 				}
@@ -202,7 +204,7 @@ public class CustomerController {
 					for(CustomerAttribute customerAttribute : customerAttributes) {
 						if(customerAttribute.getCustomerOption().getId().longValue()==customerOption.getId()){
 							CustomerOptionValue selectedValue = new CustomerOptionValue();
-							com.salesmanager.core.business.customer.model.attribute.CustomerOptionValue attributeValue = customerAttribute.getCustomerOptionValue();
+							com.salesmanager.core.model.customer.attribute.CustomerOptionValue attributeValue = customerAttribute.getCustomerOptionValue();
 							selectedValue.setId(attributeValue.getId());
 							CustomerOptionValueDescription optValue = attributeValue.getDescriptionsSettoList().get(0);
 							selectedValue.setName(optValue.getName());
@@ -432,8 +434,8 @@ public class CustomerController {
 			try {
 				
 				String[] parameterKey = parameterName.split("-");
-				com.salesmanager.core.business.customer.model.attribute.CustomerOption customerOption = null;
-				com.salesmanager.core.business.customer.model.attribute.CustomerOptionValue customerOptionValue = null;
+				com.salesmanager.core.model.customer.attribute.CustomerOption customerOption = null;
+				com.salesmanager.core.model.customer.attribute.CustomerOptionValue customerOptionValue = null;
 
 				
 				if(CUSTOMER_ID_PARAMETER.equals(parameterName)) {
@@ -724,25 +726,6 @@ public class CustomerController {
 		
 	}
 	
-/*	private void setMenuCreate(Model model, HttpServletRequest request) throws Exception {
-		
-		//display menu
-		Map<String,String> activeMenus = new HashMap<String,String>();
-		activeMenus.put("customer", "customer");
-		activeMenus.put("customer-create", "customer-create");
-		
-		@SuppressWarnings("unchecked")
-		Map<String, Menu> menus = (Map<String, Menu>)request.getAttribute("MENUMAP");
-		
-		Menu currentMenu = (Menu)menus.get("customer");
-		model.addAttribute("currentMenu",currentMenu);
-		model.addAttribute("activeMenus",activeMenus);
-
-
-		//
-		
-	}*/
 	
-		
 
 }

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/model/customer/attribute/CustomerAttributes.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/model/customer/attribute/CustomerAttributes.java
index fc8b481..a096f7e 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/model/customer/attribute/CustomerAttributes.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/model/customer/attribute/CustomerAttributes.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.admin.entity.customer.attribute;
+package com.salesmanager.shop.admin.model.customer.attribute;
 
 import java.util.List;
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/model/customer/attribute/CustomerOption.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/model/customer/attribute/CustomerOption.java
index ebf45ae..69aed4a 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/model/customer/attribute/CustomerOption.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/model/customer/attribute/CustomerOption.java
@@ -1,9 +1,11 @@
-package com.salesmanager.web.admin.entity.customer.attribute;
+package com.salesmanager.shop.admin.model.customer.attribute;
 
 import java.io.Serializable;
 import java.util.List;
 
-import com.salesmanager.web.entity.ShopEntity;
+import com.salesmanager.shop.model.ShopEntity;
+
+
 
 public class CustomerOption extends ShopEntity implements Serializable {
 	
@@ -13,11 +15,6 @@ public class CustomerOption extends ShopEntity implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private String type;
 	private String name;
-	
-	//private List<long> values;
-	//private String value;
-	//private long idValue;
-
 
 
 	private CustomerOptionValue defaultValue;

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/model/customer/attribute/CustomerOptionValue.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/model/customer/attribute/CustomerOptionValue.java
index c682f4e..3406cd3 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/model/customer/attribute/CustomerOptionValue.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/model/customer/attribute/CustomerOptionValue.java
@@ -1,8 +1,10 @@
-package com.salesmanager.web.admin.entity.customer.attribute;
+package com.salesmanager.shop.admin.model.customer.attribute;
 
 import java.io.Serializable;
 
-import com.salesmanager.web.entity.ShopEntity;
+import com.salesmanager.shop.model.ShopEntity;
+
+
 
 public class CustomerOptionValue extends ShopEntity implements Serializable {
 	

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/constants/Constants.java b/sm-shop/src/main/java/com/salesmanager/shop/constants/Constants.java
index 16cee25..14b12a9 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/constants/Constants.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/constants/Constants.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.constants;
+package com.salesmanager.shop.constants;
 
 public class Constants {
 	

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/CatalogEntity.java b/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/CatalogEntity.java
index 409cd07..d456fe5 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/CatalogEntity.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/CatalogEntity.java
@@ -1,8 +1,9 @@
-package com.salesmanager.web.entity.catalog;
+package com.salesmanager.shop.model.catalog;
 
 import java.io.Serializable;
 
-import com.salesmanager.web.entity.ShopEntity;
+import com.salesmanager.shop.model.ShopEntity;
+
 
 public abstract class CatalogEntity extends ShopEntity implements Serializable {
 	

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/category/Category.java b/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/category/Category.java
index 894e028..5ea85f6 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/category/Category.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/category/Category.java
@@ -1,8 +1,9 @@
-package com.salesmanager.web.entity.catalog.category;
+package com.salesmanager.shop.model.catalog.category;
 
 import java.io.Serializable;
 
-import com.salesmanager.web.entity.Entity;
+import com.salesmanager.shop.model.Entity;
+
 
 public class Category extends Entity implements Serializable {
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/category/CategoryDescription.java b/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/category/CategoryDescription.java
index c46f546..e3403fd 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/category/CategoryDescription.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/category/CategoryDescription.java
@@ -1,8 +1,10 @@
-package com.salesmanager.web.entity.catalog.category;
+package com.salesmanager.shop.model.catalog.category;
 
 import java.io.Serializable;
 
-import com.salesmanager.web.entity.catalog.CatalogEntity;
+import com.salesmanager.shop.model.catalog.CatalogEntity;
+
+
 
 public class CategoryDescription extends CatalogEntity implements Serializable {
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/category/CategoryEntity.java b/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/category/CategoryEntity.java
index 230ccf4..50fbf8a 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/category/CategoryEntity.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/category/CategoryEntity.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.entity.catalog.category;
+package com.salesmanager.shop.model.catalog.category;
 
 import java.io.Serializable;
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/category/PersistableCategory.java b/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/category/PersistableCategory.java
index 102bd57..1ccbc20 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/category/PersistableCategory.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/category/PersistableCategory.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.entity.catalog.category;
+package com.salesmanager.shop.model.catalog.category;
 
 import java.io.Serializable;
 import java.util.ArrayList;

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/category/ReadableCategory.java b/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/category/ReadableCategory.java
index 5e3aae6..fde4217 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/category/ReadableCategory.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/category/ReadableCategory.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.entity.catalog.category;
+package com.salesmanager.shop.model.catalog.category;
 
 import java.io.Serializable;
 import java.util.ArrayList;

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/manufacturer/Manufacturer.java b/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/manufacturer/Manufacturer.java
index ce78cab..7e0e1db 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/manufacturer/Manufacturer.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/manufacturer/Manufacturer.java
@@ -1,8 +1,9 @@
-package com.salesmanager.web.entity.catalog.manufacturer;
+package com.salesmanager.shop.model.catalog.manufacturer;
 
 import java.io.Serializable;
 
-import com.salesmanager.web.entity.Entity;
+import com.salesmanager.shop.model.Entity;
+
 
 public class Manufacturer extends Entity implements Serializable {
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/manufacturer/ManufacturerDescription.java b/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/manufacturer/ManufacturerDescription.java
index ae2d664..b5fd37c 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/manufacturer/ManufacturerDescription.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/manufacturer/ManufacturerDescription.java
@@ -1,8 +1,9 @@
-package com.salesmanager.web.entity.catalog.manufacturer;
+package com.salesmanager.shop.model.catalog.manufacturer;
 
 import java.io.Serializable;
 
-import com.salesmanager.web.entity.catalog.CatalogEntity;
+import com.salesmanager.shop.model.catalog.CatalogEntity;
+
 
 public class ManufacturerDescription extends CatalogEntity implements
 		Serializable {

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/manufacturer/ManufacturerEntity.java b/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/manufacturer/ManufacturerEntity.java
index fd87699..5ea2804 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/manufacturer/ManufacturerEntity.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/manufacturer/ManufacturerEntity.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.entity.catalog.manufacturer;
+package com.salesmanager.shop.model.catalog.manufacturer;
 
 import java.io.Serializable;
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/manufacturer/PersistableManufacturer.java b/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/manufacturer/PersistableManufacturer.java
index 62648cb..03ea62c 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/manufacturer/PersistableManufacturer.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/manufacturer/PersistableManufacturer.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.entity.catalog.manufacturer;
+package com.salesmanager.shop.model.catalog.manufacturer;
 
 import java.io.Serializable;
 import java.util.List;

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/manufacturer/ReadableManufacturer.java b/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/manufacturer/ReadableManufacturer.java
index 1269eaf..f56ce8d 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/manufacturer/ReadableManufacturer.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/manufacturer/ReadableManufacturer.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.entity.catalog.manufacturer;
+package com.salesmanager.shop.model.catalog.manufacturer;
 
 import java.io.Serializable;
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/product/Product.java b/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/product/Product.java
index 0bb1686..3ece43b 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/product/Product.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/product/Product.java
@@ -1,8 +1,9 @@
-package com.salesmanager.web.entity.catalog.product;
+package com.salesmanager.shop.model.catalog.product;
 
 import java.io.Serializable;
 
-import com.salesmanager.web.entity.Entity;
+import com.salesmanager.shop.model.Entity;
+
 
 public class Product extends Entity implements Serializable {
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/product/ProductReviewEntity.java b/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/product/ProductReviewEntity.java
index 82dedd5..a4ae928 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/product/ProductReviewEntity.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/product/ProductReviewEntity.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.entity.catalog.product;
+package com.salesmanager.shop.model.catalog.product;
 
 import java.io.Serializable;
 
@@ -8,7 +8,8 @@ import javax.validation.constraints.NotNull;
 
 import org.hibernate.validator.constraints.NotEmpty;
 
-import com.salesmanager.web.entity.ShopEntity;
+import com.salesmanager.shop.model.ShopEntity;
+
 
 public class ProductReviewEntity extends ShopEntity implements Serializable {
 	

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/product/ReadableProductReview.java b/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/product/ReadableProductReview.java
index fb955fd..4c5a1c6 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/product/ReadableProductReview.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/product/ReadableProductReview.java
@@ -1,8 +1,9 @@
-package com.salesmanager.web.entity.catalog.product;
+package com.salesmanager.shop.model.catalog.product;
 
 import java.io.Serializable;
 
-import com.salesmanager.web.entity.customer.ReadableCustomer;
+import com.salesmanager.shop.model.customer.ReadableCustomer;
+
 
 public class ReadableProductReview extends ProductReviewEntity implements Serializable {
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/product/RelatedProduct.java b/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/product/RelatedProduct.java
index 18727a2..18ae1a7 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/product/RelatedProduct.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/product/RelatedProduct.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.entity.catalog.product;
+package com.salesmanager.shop.model.catalog.product;
 
 import java.io.Serializable;
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/SearchProductList.java b/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/SearchProductList.java
index 7931181..528462f 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/SearchProductList.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/catalog/SearchProductList.java
@@ -1,9 +1,10 @@
-package com.salesmanager.web.entity.catalog;
+package com.salesmanager.shop.model.catalog;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.salesmanager.web.entity.catalog.category.ReadableCategory;
+import com.salesmanager.shop.model.catalog.category.ReadableCategory;
+
 
 /**
  * Object representing the results of a search query

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/CustomerAttribute.java b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/CustomerAttribute.java
index 0a97dd2..3e60a72 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/CustomerAttribute.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/CustomerAttribute.java
@@ -1,8 +1,9 @@
-package com.salesmanager.web.entity.customer.attribute;
+package com.salesmanager.shop.model.customer.attribute;
 
 import java.io.Serializable;
 
-import com.salesmanager.web.entity.Entity;
+import com.salesmanager.shop.model.Entity;
+
 
 
 public class CustomerAttribute extends Entity implements Serializable {

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/CustomerAttributeEntity.java b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/CustomerAttributeEntity.java
index 1e183f8..69da2ed 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/CustomerAttributeEntity.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/CustomerAttributeEntity.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.entity.customer.attribute;
+package com.salesmanager.shop.model.customer.attribute;
 
 import java.io.Serializable;
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/ReadableCustomerAttribute.java b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/ReadableCustomerAttribute.java
index 6a8f3e7..2e6d172 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/ReadableCustomerAttribute.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/ReadableCustomerAttribute.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.entity.customer.attribute;
+package com.salesmanager.shop.model.customer.attribute;
 
 public class ReadableCustomerAttribute extends CustomerAttributeEntity {
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/Customer.java b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/Customer.java
index a48b31c..dd666a8 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/Customer.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/Customer.java
@@ -1,8 +1,9 @@
-package com.salesmanager.web.entity.customer;
+package com.salesmanager.shop.model.customer;
 
 import java.io.Serializable;
 
-import com.salesmanager.web.entity.Entity;
+import com.salesmanager.shop.model.Entity;
+
 
 public class Customer extends Entity implements Serializable {
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/CustomerEntity.java b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/CustomerEntity.java
index 75f95a1..2a8e9a5 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/CustomerEntity.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/CustomerEntity.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.entity.customer;
+package com.salesmanager.shop.model.customer;
 
 import java.io.Serializable;
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/ReadableCustomer.java b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/ReadableCustomer.java
index 36c20bc..d2601eb 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/ReadableCustomer.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/ReadableCustomer.java
@@ -1,10 +1,11 @@
-package com.salesmanager.web.entity.customer;
+package com.salesmanager.shop.model.customer;
 
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.salesmanager.web.entity.customer.attribute.ReadableCustomerAttribute;
+import com.salesmanager.shop.model.customer.attribute.ReadableCustomerAttribute;
+
 
 public class ReadableCustomer extends CustomerEntity implements Serializable {
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/Entity.java b/sm-shop/src/main/java/com/salesmanager/shop/model/Entity.java
index b4d4d93..a9cc2a1 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/Entity.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/Entity.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.entity;
+package com.salesmanager.shop.model;
 
 import java.io.Serializable;
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/ServiceEntity.java b/sm-shop/src/main/java/com/salesmanager/shop/model/ServiceEntity.java
index 86aba5d..560a807 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/ServiceEntity.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/ServiceEntity.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.entity;
+package com.salesmanager.shop.model;
 
 public abstract class ServiceEntity {
 	

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/ShopEntity.java b/sm-shop/src/main/java/com/salesmanager/shop/model/ShopEntity.java
index 85eb7ac..855bf11 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/ShopEntity.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/ShopEntity.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.entity;
+package com.salesmanager.shop.model;
 
 import java.io.Serializable;
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/ReadableCustomerOptionPopulator.java b/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/ReadableCustomerOptionPopulator.java
new file mode 100644
index 0000000..cf50846
--- /dev/null
+++ b/sm-shop/src/main/java/com/salesmanager/shop/populator/customer/ReadableCustomerOptionPopulator.java
@@ -0,0 +1,70 @@
+package com.salesmanager.shop.populator.customer;
+
+import java.util.ArrayList;
+import java.util.List;
+
+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;
+
+
+
+public class ReadableCustomerOptionPopulator extends
+		AbstractDataPopulator<com.salesmanager.core.model.customer.attribute.CustomerOption, com.salesmanager.shop.admin.model.customer.attribute.CustomerOption> {
+
+	
+	private CustomerOptionSet optionSet;
+	
+	public CustomerOptionSet getOptionSet() {
+		return optionSet;
+	}
+
+	public void setOptionSet(CustomerOptionSet optionSet) {
+		this.optionSet = optionSet;
+	}
+	
+
+	@Override
+	public CustomerOption populate(
+			com.salesmanager.core.model.customer.attribute.CustomerOption source,
+			CustomerOption target, MerchantStore store, Language language) throws ConversionException {
+		
+		
+		CustomerOption customerOption = target;
+		if(customerOption==null) {
+			customerOption = new CustomerOption();
+		} 
+		
+		customerOption.setId(source.getId());
+		customerOption.setType(source.getCustomerOptionType());
+		customerOption.setName(source.getDescriptionsSettoList().get(0).getName());
+
+		List<CustomerOptionValue> values = customerOption.getAvailableValues();
+		if(values==null) {
+			values = new ArrayList<CustomerOptionValue>();
+			customerOption.setAvailableValues(values);
+		}
+		
+		com.salesmanager.core.model.customer.attribute.CustomerOptionValue optionValue = optionSet.getCustomerOptionValue();
+		CustomerOptionValue custOptValue = new CustomerOptionValue();
+		custOptValue.setId(optionValue.getId());
+		custOptValue.setLanguage(language.getCode());
+		custOptValue.setName(optionValue.getDescriptionsSettoList().get(0).getName());
+		values.add(custOptValue);
+		
+		return customerOption;
+
+	}
+
+    @Override
+    protected CustomerOption createTarget()
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+}

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/CustomerDashboardController.java b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/CustomerDashboardController.java
index 3078f0d..93b99e0 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/CustomerDashboardController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/CustomerDashboardController.java
@@ -79,7 +79,7 @@ public class CustomerDashboardController extends AbstractController {
 		if(!CollectionUtils.isEmpty(optionSet)) {
 			
 			
-			CustomerOptionPopulator optionPopulator = new CustomerOptionPopulator();
+			ReadableCustomerOptionPopulator optionPopulator = new ReadableCustomerOptionPopulator();
 			
 			Set<CustomerAttribute> customerAttributes = customer.getAttributes();
 			

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/utils/AbstractimageFilePath.java b/sm-shop/src/main/java/com/salesmanager/shop/utils/AbstractimageFilePath.java
index 1321534..5a05f65 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/utils/AbstractimageFilePath.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/utils/AbstractimageFilePath.java
@@ -1,12 +1,14 @@
-package com.salesmanager.web.utils;
+package com.salesmanager.shop.utils;
 
 import org.apache.commons.lang3.StringUtils;
 
-import com.salesmanager.core.business.catalog.product.model.Product;
-import com.salesmanager.core.business.catalog.product.model.manufacturer.Manufacturer;
-import com.salesmanager.core.business.content.model.FileContentType;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.web.constants.Constants;
+import com.salesmanager.core.model.catalog.product.Product;
+import com.salesmanager.core.model.catalog.product.manufacturer.Manufacturer;
+import com.salesmanager.core.model.content.FileContentType;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.shop.constants.Constants;
+
+
 
 
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/utils/EmailUtils.java b/sm-shop/src/main/java/com/salesmanager/shop/utils/EmailUtils.java
index 59774e9..a1ac85a 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/utils/EmailUtils.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/utils/EmailUtils.java
@@ -1,15 +1,17 @@
-package com.salesmanager.web.utils;
+package com.salesmanager.shop.utils;
 
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 
-import org.springframework.beans.factory.annotation.Autowired;
+import javax.inject.Inject;
+
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.web.constants.Constants;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.shop.constants.Constants;
+
 
 @Component
 public class EmailUtils {

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/utils/ImageFilePath.java b/sm-shop/src/main/java/com/salesmanager/shop/utils/ImageFilePath.java
index a6a65c6..20f6ea4 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/utils/ImageFilePath.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/utils/ImageFilePath.java
@@ -1,9 +1,8 @@
-package com.salesmanager.web.utils;
-
-import com.salesmanager.core.business.catalog.product.model.Product;
-import com.salesmanager.core.business.catalog.product.model.manufacturer.Manufacturer;
-import com.salesmanager.core.business.merchant.model.MerchantStore;
+package com.salesmanager.shop.utils;
 
+import com.salesmanager.core.model.catalog.product.Product;
+import com.salesmanager.core.model.catalog.product.manufacturer.Manufacturer;
+import com.salesmanager.core.model.merchant.MerchantStore;
 
 public interface ImageFilePath {
 	

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/utils/ImageFilePathUtils.java b/sm-shop/src/main/java/com/salesmanager/shop/utils/ImageFilePathUtils.java
index a1ea2a5..90e09f0 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/utils/ImageFilePathUtils.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/utils/ImageFilePathUtils.java
@@ -1,8 +1,6 @@
-package com.salesmanager.web.utils;
-
-import com.salesmanager.web.constants.Constants;
-
+package com.salesmanager.shop.utils;
 
+import com.salesmanager.shop.constants.Constants;
 
 public class ImageFilePathUtils extends AbstractimageFilePath{
 	
@@ -10,13 +8,11 @@ public class ImageFilePathUtils extends AbstractimageFilePath{
 
 	@Override
 	public String getBasePath() {
-		// TODO Auto-generated method stub
 		return basePath;
 	}
 
 	@Override
 	public void setBasePath(String basePath) {
-		// TODO Auto-generated method stub
 		this.basePath = basePath;
 	}
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/utils/LocaleUtils.java b/sm-shop/src/main/java/com/salesmanager/shop/utils/LocaleUtils.java
index 2454b95..fe8c147 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/utils/LocaleUtils.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/utils/LocaleUtils.java
@@ -1,17 +1,18 @@
-package com.salesmanager.web.utils;
+package com.salesmanager.shop.utils;
 
 import java.util.Locale;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.salesmanager.core.business.merchant.model.MerchantStore;
-import com.salesmanager.core.business.reference.language.model.Language;
-import com.salesmanager.web.admin.controller.categories.CategoryController;
+import com.salesmanager.core.business.constants.Constants;
+import com.salesmanager.core.model.merchant.MerchantStore;
+import com.salesmanager.core.model.reference.language.Language;
+
 
 public class LocaleUtils {
 	
-	private static final Logger LOGGER = LoggerFactory.getLogger(CategoryController.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(LocaleUtils.class);
 	
 	public static Locale getLocale(Language language) {
 		
@@ -27,7 +28,7 @@ public class LocaleUtils {
 	 */
 	public static Locale getLocale(MerchantStore store) {
 		
-		Locale defaultLocale = com.salesmanager.core.constants.Constants.DEFAULT_LOCALE;
+		Locale defaultLocale = Constants.DEFAULT_LOCALE;
 		Locale[] locales = Locale.getAvailableLocales();
 		for(int i = 0; i< locales.length; i++) {
 			Locale l = locales[i];
@@ -45,23 +46,5 @@ public class LocaleUtils {
 		
 	}
 	
-/*	public static Language getRequestLanguage(HttpServletRequest request) {
-		
-		Language language = (Language) request.getSession().getAttribute(Constants.LANGUAGE);
-		if(language==null) {
-			
-			Locale locale = LocaleContextHolder.getLocale();
-			if(locale!=null) {
-				
-			}
-			
-			MerchantStore store = (MerchantStore)request.getSession().getAttribute(Constants.MERCHANT_STORE);
-			if(store!=null) {
-				language = store.getDefaultLanguage();
-			}
-		}
-		return language;
-		
-	}*/
 
 }