Shopizer - Stored XSS in Manage Images

@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.8.RELEASE</version>
+		<version>2.5.5</version>
 	</parent>
 
  	<modules>
@@ -611,4 +611,4 @@
 		</plugins>
 	</build>
 	
-</project>
+</project>
\ No newline at end of file

@@ -1,3 +1,6 @@
+------------------------------------------------------------------------
+English
+------------------------------------------------------------------------
 Shopizer (for java 1.8 +)
 -------------------
 
@@ -119,4 +122,259 @@ If you have interest in giving feedback or for participating to Shopizer project
 Feel to use the contact form <http://www.shopizer.com/contact.html> and share your email address
 so we can send an invite to our Slack channel
 
+### How to Contribute:
+-------------------
+Fork the repository to your GitHub account
+
+Clone from fork repository
+-------------------
+
+       $ git clone https://github.com/yourusername/shopizer.git
+
+Build application according to steps provided above
+
+Synchronize lastest version with the upstream
+-------------------
+
+       $ git remote add upstream https://github.com/yourusername/shopizer.git
+	   $ git pull upstream 2.17.0
+
+Create new branch in your repository
+-------------------
+
+	   $ git checkout -b branch-name
+
+
+Check your branch status before commit to the branch
+-------------------
+
+	   $ git status 
+	   $ git commit 
+
+Push changes to GitHub
+-------------------
+
+	   $ git push -u origin HEAD
+
+
+
+------------------------------------------------------------------------
+FRENCH
+------------------------------------------------------------------------
+
+Shopizer (pour java 1.8 +)
+-------------------
+
+[![last_version](https://img.shields.io/badge/last_version-v2.12.0-blue.svg?style=flat)](https://github.com/shopizer-ecommerce/shopizer/tree/2.12.0)
+[![Official site](https://img.shields.io/website-up-down-green-red/https/shields.io.svg?label=official%20site)](http://www.shopizer.com/)
+[![Docker Pulls](https://img.shields.io/docker/pulls/shopizerecomm/shopizer.svg)](https://hub.docker.com/r/shopizerecomm/shopizer)
+[![stackoverflow](https://img.shields.io/badge/shopizer-stackoverflow-orange.svg?style=flat)](http://stackoverflow.com/questions/tagged/shopizer)
+
+
+Logiciel de commerce électronique open source Java
+
+- Panier
+- Catalogue
+- Chercher
+- Check-out
+- Administration
+- API REST
+
+Voir la démo (jsp):
+-------------------
+http://aws-demo.shopizer.com:8080/
+
+Voir la démo (angular):
+-------------------
+Bientôt disponible
+
+
+Obtenez le code:
+-------------------
+Clonez le référentiel:
+     
+	 $ git clone git://github.com/shopizer-ecommerce/shopizer.git
+
+Si c'est la première fois que vous utilisez Github, consultez  http://help.github.com to learn the basics.
+
+ Vous pouvez également télécharger le fichier zip contenant le code depuis https://github.com/shopizer-ecommerce/shopizer 
+
+Pour créer l'application:
+-------------------	
+Depuis la ligne de commande:
+
+	$ cd shopizer
+	$ mvnw clean install
+	
+
+Exécutez l'application depuis Tomcat
+-------------------
+copier sm-shop / target / ROOT.war vers tomcat ou tout autre répertoire de déploiement du serveur d'applications
+
+Augmenter l'espace du tas à 1024 m （Heap space)
+
+### Configuration de l'espace de tas dans Tomcat (Heap space):
+
+
+Si vous utilisez Tomcat, modifiez catalina.bat pour les utilisateurs Windows ou catalina.sh pour les utilisateurs Linux / Mac
+
+	sous Windows
+	set JAVA_OPTS="-Xms1024m -Xmx1024m -XX:MaxPermSize=256m" 
+	
+	sous Linux / Mac
+	export JAVA_OPTS="-Xms1024m -Xmx1024m -XX:MaxPermSize=256m" 
+
+Exécutez l'application à partir de Spring Boot
+-------------------
+
+       $ cd sm-shop
+       $ mvnw spring-boot:run
+
+Exécutez l'application à partir de Spring Boot dans eclipse
+-------------------
+
+Faites un clic droit sur com.salesmanager.shop.application.ShopApplication
+
+exécuter en tant qu'application Java
+
+### Accédez à l'application:
+-------------------
+
+Accédez à l'application Web déployée à l'adresse: http: //localhost:8080/
+
+Accédez à la section d'administration à l'adresse: http://localhost: 8080/admin
+
+nom d'utilisateur: admin@shopizer.com
+
+mot de passe: password
+
+Les instructions ci-dessus vous permettront d'exécuter l'application avec les paramètres et configurations par défaut.
+Veuillez lire les instructions pour vous connecter à MySQL, configurer un serveur de messagerie et configurer d'autres sous-systèmes
+
+
+### Documentation:
+-------------------
+
+Documentation disponible sur le wiki <http://shopizer-ecommerce.github.io/shopizer/#>
+
+ChatOps <https://shopizer.slack.com> - Rejoignez notre chaîne Slack https://shopizer-slackin.herokuapp.com/
+
+Plus d'informations sont disponibles sur le site Web de Shopizer ici <http://www.shopizer.com>
+
+### Participation:
+-------------------
+
+Si vous souhaitez donner votre avis ou participer de quelque manière que ce soit au projet Shopizer
+N'hésitez pas à utiliser le formulaire de contact <http://www.shopizer.com/contact.html> et à partager votre adresse email
+afin que nous puissions envoyer une invitation sur notre chaîne Slack
+
+
+
+------------------------------------------------------------------------
+中文版本
+------------------------------------------------------------------------
+Shopizer（适用于 java 1.8 +）
+-------------------
+
+[![最新版本](https://img.shields.io/badge/last_version-v2.12.0-blue.svg?style=flat)](https://github.com/shopizer-ecommerce/shopizer/tree/2.12.0)
+[![官方网站](https://img.shields.io/website-up-down-green-red/https/shields.io.svg?label=official%20site)](http://www.shopizer.com/)
+[![Docker Pulls](https://img.shields.io/docker/pulls/shopizerecomm/shopizer.svg)](https://hub.docker.com/r/shopizerecomm/shopizer)
+[![stackoverflow](https://img.shields.io/badge/shopizer-stackoverflow-orange.svg?style=flat)](http://stackoverflow.com/questions/tagged/shopizer)
+
+Java开源电子商务软件 
+
+- 购物车
+- 目录
+- 搜索
+- 查看
+- 行政
+- REST API 
+
+参阅演示（jsp）：
+-------------------
+http://aws-demo.shopizer.com:8080/
+
+请参阅演示（角度）：
+-------------------
+即将推出
+
+
+获取代码：
+-------------------
+克隆存储库：
+     
+$ git clone git://github.com/shopizer-ecommerce/shopizer.git
+
+如果这是您第一次使用 Github，请查看 http://help.github.com 以了解基础知识。
+
+您还可以从 https://github.com/shopizer-ecommerce/shopizer 下载包含代码的 zip 文件
+
+将要构建应用程序： 
+
+-------------------
+从命令行： 
+
+	$ cd shopizer
+	$ mvnw clean install
+
+从 Tomcat 运行应用程序
+-------------------
+将 sm-shop/target/ROOT.war 复制到 tomcat 或任何其他应用服务器部署目录
+
+将堆空间增加到 1024 m 
+
+###Tomcat中的堆空间配置：
+
+
+如果您使用 Tomcat，请为 windows 用户编辑 catalina.bat 或为 linux / Mac 用户编辑 catalina.sh
+
+在 Windows 中
+设置 JAVA_OPTS="-Xms1024m -Xmx1024m -XX:MaxPermSize=256m"
+
+在 Linux / Mac 中
+导出 JAVA_OPTS="-Xms1024m -Xmx1024m -XX:MaxPermSize=256m"
+
+从 Spring Boot 运行应用程序
+-------------------
+
+        $ cd sm-shop
+        $ mvnw spring-boot:run
+
+在 Eclipse 中从 Spring Boot 运行应用程序
+-------------------
+
+右键单击 com.salesmanager.shop.application.ShopApplication
+
+作为 Java 应用程序运行 
+
+### 访问应用程序：
+-------------------
+
+访问已部署的 Web 应用程序：http://localhost:8080/
+
+访问管理部分：http://localhost:8080/admin
+
+用户名：admin@shopizer.com
+
+密码：password
+
+上述说明将让您使用默认设置和配置运行应用程序。
+请阅读有关如何连接到 MySQL、配置电子邮件服务器和配置其他子系统的说明
+
+
+### 文档：
+-------------------
+
+可从 wiki <http://shopizer-ecommerce.github.io/shopizer/#> 获得的文档
+
+ChatOps <https://shopizer.slack.com> - 加入我们的 Slack 频道 https://shopizer-slackin.herokuapp.com/
+
+更多信息可在此处的购物者网站上获得 <http://www.shopizer.com>
+
+### 参与：
+-------------------
+
+如果您有兴趣提供反馈或以任何方式参与 Shopizer 项目
+请使用联系表 <http://www.shopizer.com/contact.html> 并分享您的电子邮件地址
+这样我们就可以邀请您进入我们的 Slack 频道
 

@@ -12,7 +12,9 @@ public class SchemaConstant {
 	 * 
 	 */
 	//public static final String[] LANGUAGE_ISO_CODE = {"en", "fr", "ru", "es", "ar"};
-	public static final String[] LANGUAGE_ISO_CODE = {"en", "fr", "es"};
+
+	@Deprecated
+	public static final String[] LANGUAGE_ISO_CODE = {"en", "fr", "es"}; //which descriptions will ve used for reference data
 	
 	public final static int DESCRIPTION_ID_ALLOCATION_SIZE = 1;
 	public final static int DESCRIPTION_ID_START_VALUE = 2000;

@@ -29,7 +29,6 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.salesmanager.core.constants.SchemaConstant;
-import com.salesmanager.core.model.catalog.category.Category;
 import com.salesmanager.core.model.catalog.product.Product;
 import com.salesmanager.core.model.catalog.product.ProductDimensions;
 import com.salesmanager.core.model.catalog.product.price.ProductPrice;
@@ -93,7 +92,7 @@ public class ProductAvailability extends SalesManagerEntity<Long, ProductAvailab
 	private String owner;
 
 	@Column(name = "STATUS")
-	private boolean productStatus = true;
+	private boolean productStatus = true; //can be used as flag for instance can be purchase or not
 
 	@Column(name = "FREE_SHIPPING")
 	private boolean productIsAlwaysFreeShipping;

@@ -62,6 +62,10 @@ public class ProductImage extends SalesManagerEntity<Long, ProductImage> {
 	@JoinColumn(name = "PRODUCT_ID", nullable = false)
 	private Product product;
 	
+	@Column(name = "SORT_ORDER")
+	private Integer sortOrder = new Integer(0);
+	
+
 	@Transient
 	private InputStream image = null;
 	
@@ -85,6 +89,14 @@ public boolean isDefaultImage() {
 	public void setDefaultImage(boolean defaultImage) {
 		this.defaultImage = defaultImage;
 	}
+	
+	public Integer getSortOrder() {
+		return sortOrder;
+	}
+
+	public void setSortOrder(Integer sortOrder) {
+		this.sortOrder = sortOrder;
+	}
 
 	public int getImageType() {
 		return imageType;

@@ -22,6 +22,7 @@ public class FinalPrice implements Serializable {
 	private BigDecimal finalPrice = null;//final price discount or not
 	private boolean discounted = false;
 	private int discountPercent = 0;
+	private String stringPrice;
 	
 	private Date discountEndDate = null;
 	
@@ -104,4 +105,12 @@ public ProductPrice getProductPrice() {
 		return productPrice;
 	}
 
+	public String getStringPrice() {
+		return stringPrice;
+	}
+
+	public void setStringPrice(String stringPrice) {
+		this.stringPrice = stringPrice;
+	}
+
 }

@@ -108,8 +108,8 @@ public void addProductImage(ProductImage productImage, ImageContentFile contentI
        * largeContentImage.setDefaultImage(productImage.isDefaultImage());
        * largeContentImage.setImageName(new
        * StringBuilder().append("L-").append(productImage.getProductImage()).toString());
-       * 
-       * 
+       *
+       *
        * uploadImage.uploadProductImage(configuration, productImage, largeContentImage);
        */
 
@@ -120,7 +120,7 @@ public void addProductImage(ProductImage productImage, ImageContentFile contentI
        * smallContentImage.setDefaultImage(productImage.isDefaultImage());
        * smallContentImage.setImageName(new
        * StringBuilder().append("S-").append(productImage.getProductImage()).toString());
-       * 
+       *
        * uploadImage.uploadProductImage(configuration, productImage, smallContentImage);
        */
 
@@ -179,8 +179,12 @@ public void addProductImage(ProductImage productImage, ImageContentFile contentI
 
         // resize large
         // ByteArrayOutputStream output = new ByteArrayOutputStream();
-        BufferedImage largeResizedImage =
-            ProductImageSizeUtils.resizeWithRatio(bufferedImage, largeImageWidth, largeImageHeight);
+        BufferedImage largeResizedImage;
+        if(bufferedImage.getWidth() > largeImageWidth ||bufferedImage.getHeight() > largeImageHeight) {
+            largeResizedImage = ProductImageSizeUtils.resizeWithRatio(bufferedImage, largeImageWidth, largeImageHeight);
+        } else {
+            largeResizedImage = bufferedImage;
+        }
 
 
         File tempLarge =
@@ -294,12 +298,12 @@ public void removeProductImage(ProductImage productImage) throws ServiceExceptio
     /*
      * ProductImage large = new ProductImage(); large.setProduct(productImage.getProduct());
      * large.setProductImage("L" + productImage.getProductImage());
-     * 
+     *
      * this.removeImage.removeProductImage(large);
-     * 
+     *
      * ProductImage small = new ProductImage(); small.setProduct(productImage.getProduct());
      * small.setProductImage("S" + productImage.getProductImage());
-     * 
+     *
      * this.removeImage.removeProductImage(small);
      */
 

@@ -24,6 +24,9 @@ public interface ProductAttributeRepository extends JpaRepository<ProductAttribu
 	@Query("select distinct p from ProductAttribute p join fetch p.product pr left join fetch p.productOption po left join fetch p.productOptionValue pov left join fetch po.descriptions pod left join fetch pov.descriptions povd left join fetch po.merchantStore pom where pom.id = ?1 and pr.id = ?2 and povd.language.id = ?3")
 	List<ProductAttribute> findByProductId(Integer storeId, Long productId, Integer languageId);
 	
+	@Query("select distinct p from ProductAttribute p join fetch p.product pr left join fetch p.productOption po left join fetch p.productOptionValue pov left join fetch po.descriptions pod left join fetch pov.descriptions povd left join fetch po.merchantStore pom where pom.id = ?1")
+	List<ProductAttribute> findByProductId(Integer storeId, Long productId);
+	
 	@Query(value="select distinct p from ProductAttribute p join fetch p.product pr left join fetch pr.categories prc left join fetch p.productOption po left join fetch p.productOptionValue pov left join fetch po.descriptions pod left join fetch pov.descriptions povd left join fetch po.merchantStore pom where pom.id = ?1 and prc.id IN (select c.id from Category c where c.lineage like ?2% and povd.language.id = ?3)")
 	List<ProductAttribute> findOptionsByCategoryLineage(Integer storeId, String lineage, Integer languageId);
 }

@@ -15,7 +15,12 @@ public interface ProductOptionSetRepository extends JpaRepository<ProductOptionS
 	@Query("select distinct p from ProductOptionSet p join fetch p.store pm left join fetch p.option po left join fetch po.descriptions pod left join fetch p.values pv left join fetch pv.descriptions pvd where pm.id = ?1 and pod.language.id = ?2")
 	List<ProductOptionSet> findByStore(Integer storeId, Integer language);
 	
-	@Query("select distinct p from ProductOptionSet p join fetch p.store pm left join fetch p.productTypes pt left join fetch p.option po left join fetch po.descriptions pod left join fetch p.values pv left join fetch pv.descriptions pvd where pt.id= ?1 and pm.id = ?2 and pod.language.id = ?3")
+	@Query("select distinct p from ProductOptionSet p "
+			+ "join fetch p.store pm left join fetch p.productTypes pt "
+			+ "left join fetch p.option po "
+			+ "left join fetch po.descriptions pod "
+			+ "left join fetch p.values pv "
+			+ "left join fetch pv.descriptions pvd where pt.id= ?1 and pm.id = ?2 and pod.language.id = ?3")
 	List<ProductOptionSet> findByProductType(Long typeId, Integer storeId, Integer language);
 	
 	@Query("select p from ProductOptionSet p join fetch p.store pm left join fetch p.option po left join fetch po.descriptions pod left join fetch p.values pv left join fetch pv.descriptions pvd where pm.id = ?1 and p.code = ?2")

@@ -91,4 +91,9 @@ public List<ProductAttribute> getProductAttributesByCategoryLineage(MerchantStor
 	  return productAttributeRepository.findOptionsByCategoryLineage(store.getId(), lineage, language.getId());
   }
 
+@Override
+public List<ProductAttribute> getByProductId(MerchantStore store, Product product) throws ServiceException {
+	return productAttributeRepository.findByProductId(store.getId(), product.getId());
+}
+
 }

@@ -23,6 +23,9 @@ List<ProductAttribute> getByOptionValueId(MerchantStore store,
 
 	List<ProductAttribute> getByProductId(MerchantStore store, Product product, Language language)
 			throws ServiceException;
+	
+	List<ProductAttribute> getByProductId(MerchantStore store, Product product)
+			throws ServiceException;
 
 	List<ProductAttribute> getByAttributeIds(MerchantStore store, Product product, List<Long> ids)
 			throws ServiceException;

@@ -27,75 +27,72 @@
 import com.salesmanager.core.model.merchant.MerchantStore;
 
 @Service("productImage")
-public class ProductImageServiceImpl extends SalesManagerEntityServiceImpl<Long, ProductImage> 
+public class ProductImageServiceImpl extends SalesManagerEntityServiceImpl<Long, ProductImage>
 	implements ProductImageService {
-	
+
 	private ProductImageRepository productImageRepository;
 
 	@Inject
 	public ProductImageServiceImpl(ProductImageRepository productImageRepository) {
 		super(productImageRepository);
 		this.productImageRepository = productImageRepository;
 	}
-	
+
 	@Inject
 	private ProductFileManager productFileManager;
-	
 
-	
-	
+
+
+
 	public ProductImage getById(Long id) {
-		
+
 		return productImageRepository.findOne(id);
 	}
-	
-	
+
+
 	@Override
 	public void addProductImages(Product product, List<ProductImage> productImages) throws ServiceException {
-		
+
 		try {
 			for(ProductImage productImage : productImages) {
-				
+
 				Assert.notNull(productImage.getImage());
-				
+
 		        InputStream inputStream = productImage.getImage();
 		        ImageContentFile cmsContentImage = new ImageContentFile();
 		        cmsContentImage.setFileName( productImage.getProductImage() );
 		        cmsContentImage.setFile( inputStream );
 		        cmsContentImage.setFileContentType(FileContentType.PRODUCT);
-		        
 
-		        
-	
-				addProductImage(product,productImage,cmsContentImage);			
+
+
+
+				addProductImage(product,productImage,cmsContentImage);
 			}
-		
+
 		} catch (Exception e) {
 			throw new ServiceException(e);
 		}
 
 	}
-	
-	
+
+
 	@Override
 	public void addProductImage(Product product, ProductImage productImage, ImageContentFile inputImage) throws ServiceException {
-		
-		
-		
-		
+
 		productImage.setProduct(product);
 
 		try {
-			
-			Assert.notNull(inputImage.getFile(),"ImageContentFile.file cannot be null");
+			if (productImage.getImageType() == 0 ) {
+				Assert.notNull(inputImage.getFile(), "ImageContentFile.file cannot be null");
+				productFileManager.addProductImage(productImage, inputImage);
+			}
 
-			productFileManager.addProductImage(productImage, inputImage);
-	
 			//insert ProductImage
 			this.saveOrUpdate(productImage);
-			
 
-		
+
+
 		} catch (Exception e) {
 			throw new ServiceException(e);
 		} finally {
@@ -106,71 +103,71 @@ public void addProductImage(Product product, ProductImage productImage, ImageCon
 				}
 
 			} catch(Exception ignore) {
-				
+
 			}
 		}
-		
-		
+
+
 	}
-	
+
 	@Override
 	public void saveOrUpdate(ProductImage productImage) throws ServiceException {
-		
-				
+
+
 		super.save(productImage);
-		
+
 	}
-	
+
 	public void addProductImageDescription(ProductImage productImage, ProductImageDescription description)
 	throws ServiceException {
 
-		
+
 			if(productImage.getDescriptions()==null) {
 				productImage.setDescriptions(new ArrayList<ProductImageDescription>());
 			}
-			
+
 			productImage.getDescriptions().add(description);
 			description.setProductImage(productImage);
 			update(productImage);
 
 
 	}
-	
+
 	//TODO get default product image
 
-	
+
 	@Override
 	public OutputContentFile getProductImage(ProductImage productImage, ProductImageSize size) throws ServiceException {
 
-		
+
 		ProductImage pi = new ProductImage();
 		String imageName = productImage.getProductImage();
 		if(size == ProductImageSize.LARGE) {
 			imageName = "L-" + imageName;
 		}
-		
+
 		if(size == ProductImageSize.SMALL) {
 			imageName = "S-" + imageName;
 		}
-		
+
 		pi.setProductImage(imageName);
 		pi.setProduct(productImage.getProduct());
 
 		return productFileManager.getProductImage(pi);
-		
+
 	}
-	
+
 	@Override
 	public OutputContentFile getProductImage(final String storeCode, final String productCode, final String fileName, final ProductImageSize size) throws ServiceException {
 		return productFileManager.getProductImage(storeCode, productCode, fileName, size);
-		
+
 	}
-	
+
 	@Override
 	public List<OutputContentFile> getProductImages(Product product) throws ServiceException {
 		return productFileManager.getImages(product);
 	}
-	
+
 	@Override
 	public void removeProductImage(ProductImage productImage) throws ServiceException {
 
@@ -179,21 +176,21 @@ public void removeProductImage(ProductImage productImage) throws ServiceExceptio
 		}
 		ProductImage p = this.getById(productImage.getId());
 		this.delete(p);
-		
+
 	}
 
 
 	@Override
 	public Optional<ProductImage> getProductImage(Long imageId, Long productId, MerchantStore store) {
-		
-		
+
+
 		Optional<ProductImage> image = Optional.empty();
-		
+
 		ProductImage img = productImageRepository.finById(imageId, productId, store.getCode());
 		if(img!=null) {
 			image = Optional.of(img);
 		}
-		
+
 		return image;
 	}
 }

@@ -128,10 +128,6 @@ public List<Product> getProductsByIds(List<Long> productIds) throws ServiceExcep
 		return productRepository.getProductsListByIds(idSet);
 	}
 
-	public Product getById(Long productId) {
-		return productRepository.getById(productId);
-	}
-
 	@Override
 	public Product getProductWithOnlyMerchantStoreById(Long productId) {
 		return productRepository.getProductWithOnlyMerchantStoreById(productId);

@@ -44,6 +44,10 @@ public void save(E entity) throws ServiceException {
 		repository.saveAndFlush(entity);
 	}
 	
+	public void saveAll(Iterable<E> entities) throws ServiceException {
+		repository.saveAll(entities);
+	}
+	
 	
 	public void create(E entity) throws ServiceException {
 		save(entity);

@@ -21,6 +21,11 @@ public interface SalesManagerEntityService<K extends Serializable & Comparable<K
 	 */
 	void save(E entity) throws ServiceException;
 	
+	/**
+	 * Save all
+	 */
+	void saveAll(Iterable<E> entities) throws ServiceException;
+	
 	/**
 	 * Met à jour l'entité dans la base de données.
 	 * 

@@ -42,13 +42,16 @@ public MerchantStoreServiceImpl(MerchantRepository merchantRepository) {
 	}
 
 	@Override
-	@CacheEvict(value="store", key="#store.code")
+	//@CacheEvict(value="store", key="#store.code")
 	public void saveOrUpdate(MerchantStore store) throws ServiceException {
 		super.save(store);
 	}
 
 	@Override
-	@Cacheable(value = "store")
+	/**
+	 * cache moved in facades
+	 */
+	//@Cacheable(value = "store")
 	public MerchantStore getByCode(String code) throws ServiceException {
 		return merchantRepository.findByCode(code);
 	}

@@ -76,25 +76,25 @@ public class OrderServiceImpl  extends SalesManagerEntityServiceImpl<Long, Order
 
     @Inject
     private ShippingService shippingService;
-    
+
     @Inject
     private PaymentService paymentService;
-    
+
     @Inject
     private ProductService productService;
 
     @Inject
     private TaxService taxService;
-    
+
     @Inject
     private CustomerService customerService;
-    
+
     @Inject
     private ShoppingCartService shoppingCartService;
-    
+
     @Inject
     private TransactionService transactionService;
-    
+
     @Inject
     private OrderTotalService orderTotalService;
 
@@ -112,29 +112,29 @@ public void addOrderStatusHistory(Order order, OrderStatusHistory history) throw
         history.setOrder(order);
         update(order);
     }
-    
+
     @Override
     public Order processOrder(Order order, Customer customer, List<ShoppingCartItem> items, OrderTotalSummary summary, Payment payment, MerchantStore store) throws ServiceException {
-    	
+
     	return process(order, customer, items, summary, payment, null, store);
     }
-    
+
     @Override
     public Order processOrder(Order order, Customer customer, List<ShoppingCartItem> items, OrderTotalSummary summary, Payment payment, Transaction transaction, MerchantStore store) throws ServiceException {
-    	
+
     	return process(order, customer, items, summary, payment, transaction, store);
     }
-    
+
 	private Order process(Order order, Customer customer, List<ShoppingCartItem> items, OrderTotalSummary summary, Payment payment, Transaction transaction, MerchantStore store) throws ServiceException {
-    	
-    	
+
+
     	Validate.notNull(order, "Order cannot be null");
     	Validate.notNull(customer, "Customer cannot be null (even if anonymous order)");
     	Validate.notEmpty(items, "ShoppingCart items cannot be null");
     	Validate.notNull(payment, "Payment cannot be null");
     	Validate.notNull(store, "MerchantStore cannot be null");
     	Validate.notNull(summary, "Order total Summary cannot be null");
-    	
+
     	UserContext context = UserContext.getCurrentInstance();
     	if(context != null) {
     		String ipAddress = context.getIpAddress();
@@ -143,10 +143,10 @@ private Order process(Order order, Customer customer, List<ShoppingCartItem> ite
     		}
     	}
 
-    	
+
     	//first process payment
     	Transaction processTransaction = paymentService.processPayment(customer, store, payment, items, order);
-    	
+
     	if(order.getOrderHistory()==null || order.getOrderHistory().size()==0 || order.getStatus()==null) {
     		OrderStatus status = order.getStatus();
     		if(status==null) {
@@ -160,13 +160,13 @@ private Order process(Order order, Customer customer, List<ShoppingCartItem> ite
     		statusHistory.setOrder(order);
     		statusHistorySet.add(statusHistory);
     		order.setOrderHistory(statusHistorySet);
-    		
+
     	}
-    	
+
         if(customer.getId()==null || customer.getId()==0) {
           customerService.create(customer);
         }
-      
+
         order.setCustomerId(customer.getId());
         this.create(order);
 
@@ -178,7 +178,7 @@ private Order process(Order order, Customer customer, List<ShoppingCartItem> ite
     			transactionService.update(transaction);
     		}
     	}
-    	
+
     	if(processTransaction!=null) {
     		processTransaction.setOrder(order);
     		if(processTransaction.getId()==null || processTransaction.getId()==0) {
@@ -195,8 +195,8 @@ private Order process(Order order, Customer customer, List<ShoppingCartItem> ite
         Set<OrderProduct> products = order.getOrderProducts();
         for(OrderProduct orderProduct : products) {
             orderProduct.getProductQuantity();
-            Product p = productService.getByCode(orderProduct.getSku(), store.getDefaultLanguage());
-            if(p == null) 
+            Product p = productService.getById(orderProduct.getId());
+            if(p == null)
                 throw new ServiceException(ServiceException.EXCEPTION_INVENTORY_MISMATCH);
             for(ProductAvailability availability : p.getAvailabilities()) {
                 int qty = availability.getProductQuantity();
@@ -211,7 +211,7 @@ private Order process(Order order, Customer customer, List<ShoppingCartItem> ite
         }
 
 
-        
+
     	return order;
     }
 
@@ -273,28 +273,28 @@ private OrderTotalSummary caculateOrder(OrderSummary summary, Customer customer,
                 }
             }
         }
-        
+
         //only in order page, otherwise invokes too many processing
         if(
         		OrderSummaryType.ORDERTOTAL.name().equals(summary.getOrderSummaryType().name()) ||
         		OrderSummaryType.SHOPPINGCART.name().equals(summary.getOrderSummaryType().name())
-        		
+
         		) {
 
 	        //Post processing order total variation modules for sub total calculation - drools, custom modules
 	        //may affect the sub total
 	        OrderTotalVariation orderTotalVariation = orderTotalService.findOrderTotalVariation(summary, customer, store, language);
-	        
+
 	        int currentCount = 10;
-	        
+
 	        if(CollectionUtils.isNotEmpty(orderTotalVariation.getVariations())) {
 	        	for(OrderTotal variation : orderTotalVariation.getVariations()) {
 	        		variation.setSortOrder(currentCount++);
 	        		orderTotals.add(variation);
 	        		subTotal = subTotal.subtract(variation.getValue());
 	        	}
 	        }
-        
+
         }
 
 
@@ -308,7 +308,7 @@ private OrderTotalSummary caculateOrder(OrderSummary summary, Customer customer,
         orderTotalSubTotal.setTitle(Constants.OT_SUBTOTAL_MODULE_CODE);
         orderTotalSubTotal.setSortOrder(5);
         orderTotalSubTotal.setValue(subTotal);
-        
+
         orderTotals.add(orderTotalSubTotal);
 
 
@@ -322,7 +322,7 @@ private OrderTotalSummary caculateOrder(OrderSummary summary, Customer customer,
 	            shippingSubTotal.setOrderTotalCode("order.total.shipping");
 	            shippingSubTotal.setTitle(Constants.OT_SHIPPING_MODULE_CODE);
 	            shippingSubTotal.setSortOrder(100);
-	
+
 	            orderTotals.add(shippingSubTotal);
 
             if(!summary.getShippingSummary().isFreeShipping()) {
@@ -433,7 +433,7 @@ private OrderTotalSummary caculateShoppingCart( ShoppingCart shoppingCart, final
 
     	OrderSummary orderSummary = new OrderSummary();
     	orderSummary.setOrderSummaryType(OrderSummaryType.SHOPPINGCART);
-    	
+
     	if(!StringUtils.isBlank(shoppingCart.getPromoCode())) {
     		Date promoDateAdded = shoppingCart.getPromoAdded();//promo valid 1 day
     		if(promoDateAdded == null) {
@@ -451,14 +451,14 @@ private OrderTotalSummary caculateShoppingCart( ShoppingCart shoppingCart, final
     			shoppingCart.setPromoCode(null);
     			shoppingCartService.saveOrUpdate(shoppingCart);
     		}
-    	}    	
-    	
+    	}
+
     	List<ShoppingCartItem> itemList = new ArrayList<ShoppingCartItem>(shoppingCart.getLineItems());
     	//filter out unavailable
     	itemList = itemList.stream().filter(p -> p.getProduct().isAvailable()).collect(Collectors.toList());
     	orderSummary.setProducts(itemList);
-    	
-    	
+
+
     	return caculateOrder(orderSummary, customer, store, language);
 
     }
@@ -474,7 +474,7 @@ private OrderTotalSummary caculateShoppingCart( ShoppingCart shoppingCart, final
      * @param language
      * @return {@link OrderTotalSummary}
      * @throws ServiceException
-     * 
+     *
      */
     @Override
     public OrderTotalSummary calculateShoppingCartTotal(
@@ -504,7 +504,7 @@ public OrderTotalSummary calculateShoppingCartTotal(
      * @param language
      * @return {@link OrderTotalSummary}
      * @throws ServiceException
-     * 
+     *
      */
     @Override
     public OrderTotalSummary calculateShoppingCartTotal(
@@ -581,45 +581,45 @@ public void saveOrUpdate(final Order order) throws ServiceException {
 
 	@Override
 	public boolean hasDownloadFiles(Order order) throws ServiceException {
-		
+
 		Validate.notNull(order,"Order cannot be null");
 		Validate.notNull(order.getOrderProducts(),"Order products cannot be null");
 		Validate.notEmpty(order.getOrderProducts(),"Order products cannot be empty");
-		
+
 		boolean hasDownloads = false;
 		for(OrderProduct orderProduct : order.getOrderProducts()) {
-			
+
 			if(CollectionUtils.isNotEmpty(orderProduct.getDownloads())) {
 				hasDownloads = true;
 				break;
 			}
 		}
-		
+
 		return hasDownloads;
 	}
 
 	@Override
 	public List<Order> getCapturableOrders(MerchantStore store, Date startDate, Date endDate) throws ServiceException {
-		
+
 		List<Transaction> transactions = transactionService.listTransactions(startDate, endDate);
-		
+
 		List<Order> returnOrders = null;
 
 		if(!CollectionUtils.isEmpty(transactions)) {
-			
+
 			returnOrders = new ArrayList<Order>();
-			
+
 			//order id
 			Map<Long,Order> preAuthOrders = new HashMap<Long,Order> ();
 			//order id
 			Map<Long,List<Transaction>> processingTransactions = new HashMap<Long,List<Transaction>> ();
-			
+
 			for(Transaction trx : transactions) {
 				Order order = trx.getOrder();
 				if(TransactionType.AUTHORIZE.name().equals(trx.getTransactionType().name())) {
 					preAuthOrders.put(order.getId(), order);
 				}
-				
+
 				//put transaction
 				List<Transaction> listTransactions = null;
 				if(processingTransactions.containsKey(order.getId())) {
@@ -630,46 +630,46 @@ public List<Order> getCapturableOrders(MerchantStore store, Date startDate, Date
 				}
 				listTransactions.add(trx);
 			}
-			
+
 			//should have when captured
 			/**
 			 * Order id  Transaction type
 			 * 1          AUTHORIZE
-			 * 1          CAPTURE 
+			 * 1          CAPTURE
 			 */
-			
+
 			//should have when not captured
 			/**
 			 * Order id  Transaction type
 			 * 2          AUTHORIZE
 			 */
-			
+
 			for(Long orderId : processingTransactions.keySet()) {
-				
+
 				List<Transaction> trx = processingTransactions.get(orderId);
 				if(CollectionUtils.isNotEmpty(trx)) {
-					
+
 					boolean capturable = true;
 					for(Transaction t : trx) {
-						
+
 						if(TransactionType.CAPTURE.name().equals(t.getTransactionType().name())) {
 							capturable = false;
 						} else if(TransactionType.AUTHORIZECAPTURE.name().equals(t.getTransactionType().name())) {
 							capturable = false;
 						} else if(TransactionType.REFUND.name().equals(t.getTransactionType().name())) {
 							capturable = false;
 						}
-						
+
 					}
-					
+
 					if(capturable) {
 						Order o = preAuthOrders.get(orderId);
 						returnOrders.add(o);
 					}
-					
+
 				}
-				
-				
+
+
 			}
 		}
 

@@ -12,12 +12,12 @@
  *
  */
 public class ProductImageSizeUtils {
-	
+
 
 	private ProductImageSizeUtils() {
 
 	}
-	
+
 
 	/**
 	 * Simple resize, does not maintain aspect ratio
@@ -26,7 +26,7 @@ private ProductImageSizeUtils() {
 	 * @param height
 	 * @return
 	 */
-	
+
 	public static BufferedImage resize(BufferedImage image, int width, int height) {
 		int type = image.getType() == 0 ? BufferedImage.TYPE_INT_ARGB : image
 				.getType();
@@ -43,9 +43,9 @@ public static BufferedImage resize(BufferedImage image, int width, int height) {
 		g.dispose();
 		return resizedImage;
 	}
-	
+
 	/**
-	 * 
+	 *
 	 * @param img
 	 * @param targetWidth
 	 * @param targetHeight
@@ -102,8 +102,8 @@ public static BufferedImage resizeWithHint(BufferedImage img,
 
 		return ret;
 	}
-	
-	
+
+
 	public static BufferedImage resizeWithRatio(BufferedImage image, int destinationWidth, int destinationHeight) {
 
             int type = image.getType() == 0? BufferedImage.TYPE_INT_ARGB : image.getType();
@@ -121,17 +121,17 @@ public static BufferedImage resizeWithRatio(BufferedImage image, int destination
 
             //Work out the resized width/height
             if (image.getHeight() > destinationHeight || image.getWidth() > destinationWidth) {
-                fHeight = destinationHeight;
-                int wid = destinationWidth;
-                float sum = (float)image.getWidth() / (float)image.getHeight();
-                fWidth = Math.round(fHeight * sum);
-
-                if (fWidth > wid) {
-                    //rezise again for the width this time
-                    fHeight = Math.round(wid/sum);
-                    fWidth = wid;
-                }
-            }
+				if (image.getHeight() > image.getWidth()) {
+					fHeight = destinationHeight;
+					float sum = (float) image.getWidth() / (float) image.getHeight();
+					fWidth = Math.round(destinationWidth * sum);
+				} else if (image.getWidth() > image.getHeight()) {
+					fWidth = destinationWidth;
+					float sum = (float) image.getHeight() / (float) image.getWidth();
+					fHeight = Math.round(destinationHeight * sum);
+				}
+				// else sides are equal and is set to destination size at initialization of
+			}
 
             BufferedImage resizedImage = new BufferedImage(fWidth, fHeight, type);
             Graphics2D g = resizedImage.createGraphics();
@@ -146,6 +146,6 @@ public static BufferedImage resizeWithRatio(BufferedImage image, int destination
 
             return resizedImage;
 	}
-	
+
 
 }

@@ -163,6 +163,8 @@ public FinalPrice getFinalPrice(Product product) {
 				finalPrice.setOriginalPrice(op);
 			}
 		}
+		
+		finalPrice.setStringPrice(this.getStringAmount(finalPrice.getFinalPrice()));
 
 		return finalPrice;
 
@@ -199,6 +201,22 @@ public String getAdminFormatedAmount(MerchantStore store, BigDecimal amount) thr
 		return nf.format(amount);
 	}
 	
+	public String getStringAmount(BigDecimal amount) {
+		
+		if(amount==null) {
+			return "";
+		}
+
+		NumberFormat nf = NumberFormat.getInstance(Constants.DEFAULT_LOCALE);
+
+		nf.setMaximumFractionDigits(Integer.parseInt(Character
+					.toString(DECIMALCOUNT)));
+		nf.setMinimumFractionDigits(Integer.parseInt(Character
+					.toString(DECIMALCOUNT)));
+
+		return nf.format(amount);
+	}
+	
 	
 	/**
 	 * This method has to be used to format store front amounts

@@ -9,6 +9,7 @@ public class ReadableProductAttributeEntity extends ProductAttributeEntity {
 	
 	private String productAttributeWeight;
 	private String productAttributePrice;
+	private String productAttributeUnformattedPrice;
 	
 	private ReadableProductOptionEntity option;
 	private ReadableProductOptionValueEntity optionValue;
@@ -36,6 +37,12 @@ public ReadableProductOptionValueEntity getOptionValue() {
 	public void setOptionValue(ReadableProductOptionValueEntity optionValue) {
 		this.optionValue = optionValue;
 	}
+	public String getProductAttributeUnformattedPrice() {
+		return productAttributeUnformattedPrice;
+	}
+	public void setProductAttributeUnformattedPrice(String productAttributeUnformattedPrice) {
+		this.productAttributeUnformattedPrice = productAttributeUnformattedPrice;
+	}
 
 
 }

@@ -12,18 +12,14 @@ public class PersistableProductAttribute extends ProductAttributeEntity
 	private BigDecimal productAttributePrice;
 	private Long productId;
 	
-	private ProductOption option;
-	private ProductOptionValue optionValue;
-	public void setOptionValue(ProductOptionValue optionValue) {
-		this.optionValue = optionValue;
-	}
-	public ProductOptionValue getOptionValue() {
-		return optionValue;
-	}
-	public void setOption(ProductOption option) {
+	private ProductPropertyOption option;
+	private PersistableProductOptionValue optionValue;
+
+
+	public void setOption(ProductPropertyOption option) {
 		this.option = option;
 	}
-	public ProductOption getOption() {
+	public ProductPropertyOption getOption() {
 		return option;
 	}
 
@@ -49,5 +45,11 @@ public Long getProductId() {
 	public void setProductId(Long productId) {
 		this.productId = productId;
 	}
+	public PersistableProductOptionValue getOptionValue() {
+		return optionValue;
+	}
+	public void setOptionValue(PersistableProductOptionValue optionValue) {
+		this.optionValue = optionValue;
+	}
 
 }

@@ -2,7 +2,7 @@
 
 import java.io.Serializable;
 
-public class ProductOptionEntity extends ProductOption implements Serializable {
+public class ProductOptionEntity extends ProductPropertyOption implements Serializable {
 
 	/**
 	 * 

@@ -4,7 +4,7 @@
 import com.salesmanager.shop.model.entity.Entity;
 
 
-public class ProductOption extends Entity implements Serializable {
+public class ProductPropertyOption extends Entity implements Serializable {
 
   /**
    * 

@@ -5,7 +5,7 @@
 
 import com.salesmanager.shop.model.catalog.product.attribute.api.ReadableProductOptionValueEntity;
 
-public class ReadableProductOption extends ProductOption {
+public class ReadableProductOption extends ProductPropertyOption {
 
 	/**
 	 * 

@@ -9,17 +9,9 @@ public class ReadableProductOptionValue extends ProductOptionValue {
 	
 	private String price;
 	private String image;
-	private String name;
+	private String description;
 
 
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
 	public String getPrice() {
 		return price;
 	}
@@ -36,4 +28,12 @@ public void setImage(String image) {
 		this.image = image;
 	}
 
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
 }

@@ -0,0 +1,30 @@
+package com.salesmanager.shop.model.catalog.product.attribute;
+
+public class ReadableProductProperty extends ProductPropertyOption {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	
+	/** 
+	 * Property use option objects
+	 */
+	private ReadableProductOption property = null;
+	private ReadableProductPropertyValue propertyValue = null;
+	public ReadableProductOption getProperty() {
+		return property;
+	}
+	public void setProperty(ReadableProductOption property) {
+		this.property = property;
+	}
+	public ReadableProductPropertyValue getPropertyValue() {
+		return propertyValue;
+	}
+	public void setPropertyValue(ReadableProductPropertyValue propertyValue) {
+		this.propertyValue = propertyValue;
+	}
+
+
+
+}

@@ -0,0 +1,25 @@
+package com.salesmanager.shop.model.catalog.product.attribute;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ReadableProductPropertyValue extends ProductOptionValue{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	
+	private List<ProductOptionValueDescription> values = new ArrayList<ProductOptionValueDescription>();
+
+	public List<ProductOptionValueDescription> getValues() {
+		return values;
+	}
+
+	public void setValues(List<ProductOptionValueDescription> values) {
+		this.values = values;
+	}
+
+	
+
+}

@@ -10,11 +10,12 @@
 public class LightPersistableProduct implements Serializable {
 
   /**
-   * 
+   *
    */
   private static final long serialVersionUID = 1L;
   private String price;
   private boolean available;
+  private boolean productShipeable;
   private int quantity;
   public String getPrice() {
     return price;
@@ -35,5 +36,7 @@ public boolean isAvailable() {
   public void setAvailable(boolean available) {
     this.available = available;
   }
+  public boolean isProductShipeable() { return productShipeable; }
+  public void setProductShipeable(Boolean productShipeable) { this.productShipeable = productShipeable; }
 
 }

@@ -1,5 +1,6 @@
 package com.salesmanager.shop.model.catalog.product.product.definition;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -19,6 +20,7 @@ public class PersistableProductDefinition extends ProductDefinition {
 	private List<Category> categories = new ArrayList<Category>();
 	private String type;
 	private String manufacturer;
+	private BigDecimal price;
 	public List<ProductDescription> getDescriptions() {
 		return descriptions;
 	}
@@ -49,5 +51,11 @@ public String getManufacturer() {
 	public void setManufacturer(String manufacturer) {
 		this.manufacturer = manufacturer;
 	}
+	public BigDecimal getPrice() {
+		return price;
+	}
+	public void setPrice(BigDecimal price) {
+		this.price = price;
+	}
 
 }

@@ -1,5 +1,6 @@
 package com.salesmanager.shop.model.catalog.product.product.definition;
 
+import com.salesmanager.shop.model.catalog.product.ProductSpecification;
 import com.salesmanager.shop.model.entity.Entity;
 
 /**
@@ -14,17 +15,24 @@ public class ProductDefinition extends Entity {
 	 */
 	private static final long serialVersionUID = 1L;
 	private boolean visible = true;
-	private Double rating = 0D;
-	private int ratingCount;
+	private boolean shipeable = true;
+	private boolean virtual = true;
+	private boolean canBePurchased = true;
+	//private Double rating = 0D;
+	//private int ratingCount;
 	private String dateAvailable;
 	private String identifier;
+	private ProductSpecification productSpecifications;
+	private int sortOrder;
+	private int quantity;
+	
 	public boolean isVisible() {
 		return visible;
 	}
 	public void setVisible(boolean visible) {
 		this.visible = visible;
 	}
-	public Double getRating() {
+/*	public Double getRating() {
 		return rating;
 	}
 	public void setRating(Double rating) {
@@ -35,7 +43,7 @@ public int getRatingCount() {
 	}
 	public void setRatingCount(int ratingCount) {
 		this.ratingCount = ratingCount;
-	}
+	}*/
 	public String getDateAvailable() {
 		return dateAvailable;
 	}
@@ -48,5 +56,42 @@ public String getIdentifier() {
 	public void setIdentifier(String identifier) {
 		this.identifier = identifier;
 	}
+	public ProductSpecification getProductSpecifications() {
+		return productSpecifications;
+	}
+	public void setProductSpecifications(ProductSpecification productSpecifications) {
+		this.productSpecifications = productSpecifications;
+	}
+	public int getSortOrder() {
+		return sortOrder;
+	}
+	public void setSortOrder(int sortOrder) {
+		this.sortOrder = sortOrder;
+	}
+	public boolean isShipeable() {
+		return shipeable;
+	}
+	public void setShipeable(boolean shipeable) {
+		this.shipeable = shipeable;
+	}
+	public boolean isVirtual() {
+		return virtual;
+	}
+	public void setVirtual(boolean virtual) {
+		this.virtual = virtual;
+	}
+	public int getQuantity() {
+		return quantity;
+	}
+	public void setQuantity(int quantity) {
+		this.quantity = quantity;
+	}
+	public boolean isCanBePurchased() {
+		return canBePurchased;
+	}
+	public void setCanBePurchased(boolean canBePurchased) {
+		this.canBePurchased = canBePurchased;
+	}
+
 
 }

@@ -22,6 +22,7 @@ public class ReadableProductDefinition extends ProductDefinition {
 	private ProductDescription description = null;
 	private List<PersistableProductAttribute> properties = new ArrayList<PersistableProductAttribute>();
 	private List<ReadableImage> images = new ArrayList<ReadableImage>();
+	private String price;
 	
 	
 	public ReadableProductType getType() {
@@ -60,6 +61,12 @@ public List<ReadableImage> getImages() {
 	public void setImages(List<ReadableImage> images) {
 		this.images = images;
 	}
+	public String getPrice() {
+		return price;
+	}
+	public void setPrice(String price) {
+		this.price = price;
+	}
 
 
 }

@@ -8,6 +8,7 @@
 import com.salesmanager.shop.model.catalog.manufacturer.ReadableManufacturer;
 import com.salesmanager.shop.model.catalog.product.attribute.ReadableProductAttribute;
 import com.salesmanager.shop.model.catalog.product.attribute.ReadableProductOption;
+import com.salesmanager.shop.model.catalog.product.attribute.ReadableProductProperty;
 import com.salesmanager.shop.model.catalog.product.type.ReadableProductType;
 
 public class ReadableProduct extends ProductEntity implements Serializable {
@@ -26,6 +27,7 @@ public class ReadableProduct extends ProductEntity implements Serializable {
 	private ReadableManufacturer manufacturer;
 	private List<ReadableProductAttribute> attributes = new ArrayList<ReadableProductAttribute>();
 	private List<ReadableProductOption> options = new ArrayList<ReadableProductOption>();
+	private List<ReadableProductProperty> properties = new ArrayList<ReadableProductProperty>();
 	private List<ReadableCategory> categories = new ArrayList<ReadableCategory>();
 	private ReadableProductType type;
 	private boolean canBePurchased = false;
@@ -145,4 +147,13 @@ public void setProductPrice(ReadableProductPrice productPrice) {
 		this.productPrice = productPrice;
 	}
 
+	public List<ReadableProductProperty> getProperties() {
+		return properties;
+	}
+
+	public void setProperties(List<ReadableProductProperty> properties) {
+		this.properties = properties;
+	}
+
+
 }

@@ -0,0 +1,17 @@
+package com.salesmanager.shop.model.entity;
+
+public class CodeEntity extends Entity {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	private String code;
+	public String getCode() {
+		return code;
+	}
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+}

@@ -1,18 +1,21 @@
 package com.salesmanager.shop.store.controller.product.facade;
 
+import java.util.List;
+
 import org.springframework.web.multipart.MultipartFile;
 
 import com.salesmanager.core.model.merchant.MerchantStore;
 import com.salesmanager.core.model.reference.language.Language;
 import com.salesmanager.shop.model.catalog.product.attribute.PersistableProductAttribute;
+import com.salesmanager.shop.model.catalog.product.attribute.PersistableProductOptionValue;
 import com.salesmanager.shop.model.catalog.product.attribute.api.PersistableProductOptionEntity;
-import com.salesmanager.shop.model.catalog.product.attribute.api.PersistableProductOptionValueEntity;
 import com.salesmanager.shop.model.catalog.product.attribute.api.ReadableProductAttributeEntity;
 import com.salesmanager.shop.model.catalog.product.attribute.api.ReadableProductAttributeList;
 import com.salesmanager.shop.model.catalog.product.attribute.api.ReadableProductOptionEntity;
 import com.salesmanager.shop.model.catalog.product.attribute.api.ReadableProductOptionList;
 import com.salesmanager.shop.model.catalog.product.attribute.api.ReadableProductOptionValueEntity;
 import com.salesmanager.shop.model.catalog.product.attribute.api.ReadableProductOptionValueList;
+import com.salesmanager.shop.model.entity.CodeEntity;
 
 
 /*
@@ -26,8 +29,11 @@ public interface ProductOptionFacade {
 
   ReadableProductOptionEntity saveOption(PersistableProductOptionEntity option, MerchantStore store, Language language);
   
-  ReadableProductOptionValueEntity saveOptionValue(PersistableProductOptionValueEntity optionValue, MerchantStore store, Language language);
+  ReadableProductOptionValueEntity saveOptionValue(PersistableProductOptionValue optionValue, MerchantStore store, Language language);
 
+  List<CodeEntity> createAttributes(List<PersistableProductAttribute> attributes, Long productId, MerchantStore store);
+  void updateAttributes(List<PersistableProductAttribute> attributes, Long productId, MerchantStore store);
+  
   void addOptionValueImage(MultipartFile image, Long optionValueId, MerchantStore store, Language language);
   
   void removeOptionValueImage(Long optionValueId, MerchantStore store, Language language);

@@ -13,6 +13,7 @@ public interface ProductOptionSetFacade {
 	ReadableProductOptionSet get(Long id, MerchantStore store, Language language);
 	boolean exists(String code, MerchantStore store);
 	List<ReadableProductOptionSet> list(MerchantStore store, Language language);
+	List<ReadableProductOptionSet> list(MerchantStore store, Language language, String type);
 	void create(PersistableProductOptionSet optionSet, MerchantStore store, Language language);
 	void update(Long id, PersistableProductOptionSet optionSet, MerchantStore store, Language language);
 	void delete(Long id, MerchantStore store);

@@ -12,6 +12,8 @@ public interface ProductTypeFacade {
   
   ReadableProductType get(MerchantStore store, Long id, Language language);
   
+  ReadableProductType get(MerchantStore store, String code, Language language);
+  
   Long save(PersistableProductType type, MerchantStore store, Language language);
   
   void update(PersistableProductType type, Long id, MerchantStore store, Language language);

@@ -23,25 +23,21 @@
 
 	<dependencies>
 
-		<!-- sm-core -->
 		<dependency>
 			<groupId>com.shopizer</groupId>
 			<artifactId>sm-core</artifactId>
 		</dependency>
 
-		<!-- sm-core-model -->
 		<dependency>
 			<groupId>com.shopizer</groupId>
 			<artifactId>sm-core-model</artifactId>
 		</dependency>
 
-		<!-- sm-shop-model -->
 		<dependency>
 			<groupId>com.shopizer</groupId>
 			<artifactId>sm-shop-model</artifactId>
 		</dependency>
 
-		<!-- sm-search -->
 		<dependency>
 			<groupId>com.shopizer</groupId>
 			<artifactId>sm-search</artifactId>
@@ -87,13 +83,6 @@
 			<scope>provided</scope>
 		</dependency>
 
-		<!--
-		<dependency>
-			<groupId>org.springframework.security</groupId>
-			<artifactId>spring-security-taglibs</artifactId>
-		</dependency>
-		-->
-
 		<!-- https://mvnrepository.com/artifact/commons-collections/commons-collections -->
 		<!-- For Tiles -->
 		<dependency>

@@ -1,193 +0,0 @@
-2020-03-13 11:47:54 jdbc[3]: exception
-org.h2.jdbc.JdbcSQLException: Schema "SALESMANAHER" not found; SQL statement:
-select * from SALESMANAHER.CETAGORIES [90079-191]
-	at org.h2.message.DbException.getJdbcSQLException(DbException.java:345)
-	at org.h2.message.DbException.get(DbException.java:179)
-	at org.h2.message.DbException.get(DbException.java:155)
-	at org.h2.command.Parser.getSchema(Parser.java:666)
-	at org.h2.command.Parser.getSchema(Parser.java:673)
-	at org.h2.command.Parser.readTableFilter(Parser.java:1203)
-	at org.h2.command.Parser.parseSelectSimpleFromPart(Parser.java:1884)
-	at org.h2.command.Parser.parseSelectSimple(Parser.java:2032)
-	at org.h2.command.Parser.parseSelectSub(Parser.java:1878)
-	at org.h2.command.Parser.parseSelectUnion(Parser.java:1699)
-	at org.h2.command.Parser.parseSelect(Parser.java:1687)
-	at org.h2.command.Parser.parsePrepared(Parser.java:443)
-	at org.h2.command.Parser.parse(Parser.java:315)
-	at org.h2.command.Parser.parse(Parser.java:287)
-	at org.h2.command.Parser.prepareCommand(Parser.java:252)
-	at org.h2.engine.Session.prepareLocal(Session.java:560)
-	at org.h2.engine.Session.prepareCommand(Session.java:501)
-	at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1188)
-	at org.h2.jdbc.JdbcStatement.executeInternal(JdbcStatement.java:170)
-	at org.h2.jdbc.JdbcStatement.execute(JdbcStatement.java:158)
-	at net.sourceforge.squirrel_sql.client.session.StatementWrapper.execute(StatementWrapper.java:165)
-	at net.sourceforge.squirrel_sql.client.session.SQLExecuterTask.processQuery(SQLExecuterTask.java:369)
-	at net.sourceforge.squirrel_sql.client.session.SQLExecuterTask.run(SQLExecuterTask.java:212)
-	at net.sourceforge.squirrel_sql.fw.util.TaskExecuter.run(TaskExecuter.java:82)
-	at java.lang.Thread.run(Thread.java:745)
-2020-03-13 11:48:06 jdbc[3]: exception
-org.h2.jdbc.JdbcSQLException: Table "CETAGORIES" not found; SQL statement:
-select * from SALESMANAGER.CETAGORIES [42102-191]
-2020-03-13 11:48:15 jdbc[3]: exception
-org.h2.jdbc.JdbcSQLException: Table "CETEGORIES" not found; SQL statement:
-select * from SALESMANAGER.CETEGORIES [42102-191]
-2020-03-13 11:48:24 jdbc[3]: exception
-org.h2.jdbc.JdbcSQLException: Table "CATEGORIES" not found; SQL statement:
-select * from SALESMANAGER.CATEGORIES [42102-191]
-2020-03-13 11:48:25 jdbc[3]: exception
-org.h2.jdbc.JdbcSQLException: Table "CATEGORIES" not found; SQL statement:
-select * from SALESMANAGER.CATEGORIES [42102-191]
-2020-03-13 11:49:49 jdbc[3]: exception
-org.h2.jdbc.JdbcSQLException: Column "/1" not found; SQL statement:
-update SALESMANAGER.CATEGORY set LINEAGE = "/1" where CATEGORY_ID = 1 [42122-191]
-	at org.h2.message.DbException.getJdbcSQLException(DbException.java:345)
-	at org.h2.message.DbException.get(DbException.java:179)
-	at org.h2.message.DbException.get(DbException.java:155)
-	at org.h2.expression.ExpressionColumn.optimize(ExpressionColumn.java:147)
-	at org.h2.command.dml.Update.prepare(Update.java:192)
-	at org.h2.command.Parser.prepareCommand(Parser.java:257)
-	at org.h2.engine.Session.prepareLocal(Session.java:560)
-	at org.h2.engine.Session.prepareCommand(Session.java:501)
-	at org.h2.jdbc.JdbcConnection.prepareCommand(JdbcConnection.java:1188)
-	at org.h2.jdbc.JdbcStatement.executeInternal(JdbcStatement.java:170)
-	at org.h2.jdbc.JdbcStatement.execute(JdbcStatement.java:158)
-	at net.sourceforge.squirrel_sql.client.session.StatementWrapper.execute(StatementWrapper.java:165)
-	at net.sourceforge.squirrel_sql.client.session.SQLExecuterTask.processQuery(SQLExecuterTask.java:369)
-	at net.sourceforge.squirrel_sql.client.session.SQLExecuterTask.run(SQLExecuterTask.java:212)
-	at net.sourceforge.squirrel_sql.fw.util.TaskExecuter.run(TaskExecuter.java:82)
-	at java.lang.Thread.run(Thread.java:745)
-2020-10-30 11:55:15 jdbc[3]: exception
-org.h2.jdbc.JdbcSQLFeatureNotSupportedException: Feature not supported: "getFunctions" [50100-200]
-	at org.h2.message.DbException.getJdbcSQLException(DbException.java:507)
-	at org.h2.message.DbException.getJdbcSQLException(DbException.java:429)
-	at org.h2.message.DbException.get(DbException.java:205)
-	at org.h2.message.DbException.get(DbException.java:181)
-	at org.h2.message.DbException.getUnsupportedException(DbException.java:269)
-	at org.h2.message.TraceObject.unsupported(TraceObject.java:398)
-	at org.h2.jdbc.JdbcDatabaseMetaData.getFunctions(JdbcDatabaseMetaData.java:3273)
-	at org.jkiss.dbeaver.model.impl.jdbc.exec.JDBCDatabaseMetaDataImpl.getFunctions(JDBCDatabaseMetaDataImpl.java:229)
-	at org.jkiss.dbeaver.ext.generic.model.meta.GenericMetaModel.loadProcedures(GenericMetaModel.java:279)
-	at org.jkiss.dbeaver.ext.generic.model.GenericObjectContainer.loadProcedures(GenericObjectContainer.java:413)
-	at org.jkiss.dbeaver.ext.generic.model.GenericObjectContainer.getProcedures(GenericObjectContainer.java:287)
-	at org.jkiss.dbeaver.ext.generic.model.GenericObjectContainer.getProceduresOnly(GenericObjectContainer.java:313)
-	at org.jkiss.dbeaver.ext.generic.model.GenericObjectContainer.getProceduresOnly(GenericObjectContainer.java:1)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.jkiss.dbeaver.model.navigator.DBNDatabaseNode.extractPropertyValue(DBNDatabaseNode.java:824)
-	at org.jkiss.dbeaver.model.navigator.DBNDatabaseNode.access$1(DBNDatabaseNode.java:805)
-	at org.jkiss.dbeaver.model.navigator.DBNDatabaseNode$PropertyValueReader.run(DBNDatabaseNode.java:885)
-	at org.jkiss.dbeaver.model.navigator.DBNDatabaseNode$PropertyValueReader.run(DBNDatabaseNode.java:1)
-	at org.jkiss.dbeaver.model.DBUtils.tryExecuteRecover(DBUtils.java:1679)
-	at org.jkiss.dbeaver.model.navigator.DBNDatabaseNode.loadTreeItems(DBNDatabaseNode.java:498)
-	at org.jkiss.dbeaver.model.navigator.DBNDatabaseNode.loadChildren(DBNDatabaseNode.java:421)
-	at org.jkiss.dbeaver.model.navigator.DBNDatabaseNode.getChildren(DBNDatabaseNode.java:206)
-	at org.jkiss.dbeaver.model.navigator.DBNDatabaseNode.getChildren(DBNDatabaseNode.java:1)
-	at org.jkiss.dbeaver.ui.navigator.NavigatorUtils.getNodeChildrenFiltered(NavigatorUtils.java:593)
-	at org.jkiss.dbeaver.ui.controls.itemlist.ItemListControl$ItemLoadService.evaluate(ItemListControl.java:219)
-	at org.jkiss.dbeaver.ui.controls.itemlist.ItemListControl$ItemLoadService.evaluate(ItemListControl.java:1)
-	at org.jkiss.dbeaver.ui.LoadingJob.run(LoadingJob.java:86)
-	at org.jkiss.dbeaver.ui.LoadingJob.run(LoadingJob.java:71)
-	at org.jkiss.dbeaver.model.runtime.AbstractJob.run(AbstractJob.java:102)
-	at org.eclipse.core.internal.jobs.Worker.run(Worker.java:63)
-2020-10-30 11:55:15 jdbc[3]: exception
-org.h2.jdbc.JdbcSQLFeatureNotSupportedException: Feature not supported: "getFunctions" [50100-200]
-	at org.h2.message.DbException.getJdbcSQLException(DbException.java:507)
-	at org.h2.message.DbException.getJdbcSQLException(DbException.java:429)
-	at org.h2.message.DbException.get(DbException.java:205)
-	at org.h2.message.DbException.get(DbException.java:181)
-	at org.h2.message.DbException.getUnsupportedException(DbException.java:269)
-	at org.h2.message.TraceObject.unsupported(TraceObject.java:398)
-	at org.h2.jdbc.JdbcDatabaseMetaData.getFunctions(JdbcDatabaseMetaData.java:3273)
-	at org.jkiss.dbeaver.model.impl.jdbc.exec.JDBCDatabaseMetaDataImpl.getFunctions(JDBCDatabaseMetaDataImpl.java:229)
-	at org.jkiss.dbeaver.ext.generic.model.meta.GenericMetaModel.loadProcedures(GenericMetaModel.java:279)
-	at org.jkiss.dbeaver.ext.generic.model.GenericObjectContainer.loadProcedures(GenericObjectContainer.java:413)
-	at org.jkiss.dbeaver.ext.generic.model.GenericObjectContainer.getPackages(GenericObjectContainer.java:267)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.jkiss.dbeaver.model.navigator.DBNDatabaseNode.extractPropertyValue(DBNDatabaseNode.java:824)
-	at org.jkiss.dbeaver.model.navigator.DBNDatabaseNode.access$1(DBNDatabaseNode.java:805)
-	at org.jkiss.dbeaver.model.navigator.DBNDatabaseNode$PropertyValueReader.run(DBNDatabaseNode.java:885)
-	at org.jkiss.dbeaver.model.navigator.DBNDatabaseNode$PropertyValueReader.run(DBNDatabaseNode.java:1)
-	at org.jkiss.dbeaver.model.DBUtils.tryExecuteRecover(DBUtils.java:1679)
-	at org.jkiss.dbeaver.model.navigator.DBNDatabaseNode.loadTreeItems(DBNDatabaseNode.java:498)
-	at org.jkiss.dbeaver.model.navigator.DBNDatabaseNode.loadChildren(DBNDatabaseNode.java:421)
-	at org.jkiss.dbeaver.model.navigator.DBNDatabaseNode.getChildren(DBNDatabaseNode.java:206)
-	at org.jkiss.dbeaver.model.navigator.DBNDatabaseNode.getChildren(DBNDatabaseNode.java:1)
-	at org.jkiss.dbeaver.ui.navigator.NavigatorUtils.getNodeChildrenFiltered(NavigatorUtils.java:593)
-	at org.jkiss.dbeaver.ui.controls.itemlist.ItemListControl$ItemLoadService.evaluate(ItemListControl.java:219)
-	at org.jkiss.dbeaver.ui.controls.itemlist.ItemListControl$ItemLoadService.evaluate(ItemListControl.java:1)
-	at org.jkiss.dbeaver.ui.LoadingJob.run(LoadingJob.java:86)
-	at org.jkiss.dbeaver.ui.LoadingJob.run(LoadingJob.java:71)
-	at org.jkiss.dbeaver.model.runtime.AbstractJob.run(AbstractJob.java:102)
-	at org.eclipse.core.internal.jobs.Worker.run(Worker.java:63)
-2020-10-30 12:25:27 jdbc[3]: exception
-org.h2.jdbc.JdbcSQLFeatureNotSupportedException: Feature not supported: "getFunctions" [50100-200]
-	at org.h2.message.DbException.getJdbcSQLException(DbException.java:507)
-	at org.h2.message.DbException.getJdbcSQLException(DbException.java:429)
-	at org.h2.message.DbException.get(DbException.java:205)
-	at org.h2.message.DbException.get(DbException.java:181)
-	at org.h2.message.DbException.getUnsupportedException(DbException.java:269)
-	at org.h2.message.TraceObject.unsupported(TraceObject.java:398)
-	at org.h2.jdbc.JdbcDatabaseMetaData.getFunctions(JdbcDatabaseMetaData.java:3273)
-	at org.jkiss.dbeaver.model.impl.jdbc.exec.JDBCDatabaseMetaDataImpl.getFunctions(JDBCDatabaseMetaDataImpl.java:229)
-	at org.jkiss.dbeaver.ext.generic.model.meta.GenericMetaModel.loadProcedures(GenericMetaModel.java:279)
-	at org.jkiss.dbeaver.ext.generic.model.GenericObjectContainer.loadProcedures(GenericObjectContainer.java:413)
-	at org.jkiss.dbeaver.ext.generic.model.GenericObjectContainer.getProcedures(GenericObjectContainer.java:287)
-	at org.jkiss.dbeaver.ext.generic.model.GenericObjectContainer.getProceduresOnly(GenericObjectContainer.java:313)
-	at org.jkiss.dbeaver.ext.generic.model.GenericObjectContainer.getProceduresOnly(GenericObjectContainer.java:1)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.jkiss.dbeaver.model.navigator.DBNDatabaseNode.extractPropertyValue(DBNDatabaseNode.java:824)
-	at org.jkiss.dbeaver.model.navigator.DBNDatabaseNode.access$1(DBNDatabaseNode.java:805)
-	at org.jkiss.dbeaver.model.navigator.DBNDatabaseNode$PropertyValueReader.run(DBNDatabaseNode.java:885)
-	at org.jkiss.dbeaver.model.navigator.DBNDatabaseNode$PropertyValueReader.run(DBNDatabaseNode.java:1)
-	at org.jkiss.dbeaver.model.DBUtils.tryExecuteRecover(DBUtils.java:1679)
-	at org.jkiss.dbeaver.model.navigator.DBNDatabaseNode.loadTreeItems(DBNDatabaseNode.java:498)
-	at org.jkiss.dbeaver.model.navigator.DBNDatabaseNode.loadChildren(DBNDatabaseNode.java:421)
-	at org.jkiss.dbeaver.model.navigator.DBNDatabaseNode.reloadChildren(DBNDatabaseNode.java:709)
-	at org.jkiss.dbeaver.model.navigator.DBNDatabaseNode.loadChildren(DBNDatabaseNode.java:435)
-	at org.jkiss.dbeaver.model.navigator.DBNDatabaseNode.reloadChildren(DBNDatabaseNode.java:709)
-	at org.jkiss.dbeaver.model.navigator.DBNDatabaseNode.refreshNodeContent(DBNDatabaseNode.java:367)
-	at org.jkiss.dbeaver.model.navigator.DBNDatabaseNode.refreshNode(DBNDatabaseNode.java:341)
-	at org.jkiss.dbeaver.ui.navigator.actions.NavigatorHandlerRefresh$1.run(NavigatorHandlerRefresh.java:154)
-	at org.jkiss.dbeaver.model.runtime.AbstractJob.run(AbstractJob.java:102)
-	at org.eclipse.core.internal.jobs.Worker.run(Worker.java:63)
-2020-10-30 12:25:27 jdbc[3]: exception
-org.h2.jdbc.JdbcSQLFeatureNotSupportedException: Feature not supported: "getFunctions" [50100-200]
-	at org.h2.message.DbException.getJdbcSQLException(DbException.java:507)
-	at org.h2.message.DbException.getJdbcSQLException(DbException.java:429)
-	at org.h2.message.DbException.get(DbException.java:205)
-	at org.h2.message.DbException.get(DbException.java:181)
-	at org.h2.message.DbException.getUnsupportedException(DbException.java:269)
-	at org.h2.message.TraceObject.unsupported(TraceObject.java:398)
-	at org.h2.jdbc.JdbcDatabaseMetaData.getFunctions(JdbcDatabaseMetaData.java:3273)
-	at org.jkiss.dbeaver.model.impl.jdbc.exec.JDBCDatabaseMetaDataImpl.getFunctions(JDBCDatabaseMetaDataImpl.java:229)
-	at org.jkiss.dbeaver.ext.generic.model.meta.GenericMetaModel.loadProcedures(GenericMetaModel.java:279)
-	at org.jkiss.dbeaver.ext.generic.model.GenericObjectContainer.loadProcedures(GenericObjectContainer.java:413)
-	at org.jkiss.dbeaver.ext.generic.model.GenericObjectContainer.getPackages(GenericObjectContainer.java:267)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.jkiss.dbeaver.model.navigator.DBNDatabaseNode.extractPropertyValue(DBNDatabaseNode.java:824)
-	at org.jkiss.dbeaver.model.navigator.DBNDatabaseNode.access$1(DBNDatabaseNode.java:805)
-	at org.jkiss.dbeaver.model.navigator.DBNDatabaseNode$PropertyValueReader.run(DBNDatabaseNode.java:885)
-	at org.jkiss.dbeaver.model.navigator.DBNDatabaseNode$PropertyValueReader.run(DBNDatabaseNode.java:1)
-	at org.jkiss.dbeaver.model.DBUtils.tryExecuteRecover(DBUtils.java:1679)
-	at org.jkiss.dbeaver.model.navigator.DBNDatabaseNode.loadTreeItems(DBNDatabaseNode.java:498)
-	at org.jkiss.dbeaver.model.navigator.DBNDatabaseNode.loadChildren(DBNDatabaseNode.java:421)
-	at org.jkiss.dbeaver.model.navigator.DBNDatabaseNode.reloadChildren(DBNDatabaseNode.java:709)
-	at org.jkiss.dbeaver.model.navigator.DBNDatabaseNode.loadChildren(DBNDatabaseNode.java:435)
-	at org.jkiss.dbeaver.model.navigator.DBNDatabaseNode.reloadChildren(DBNDatabaseNode.java:709)
-	at org.jkiss.dbeaver.model.navigator.DBNDatabaseNode.refreshNodeContent(DBNDatabaseNode.java:367)
-	at org.jkiss.dbeaver.model.navigator.DBNDatabaseNode.refreshNode(DBNDatabaseNode.java:341)
-	at org.jkiss.dbeaver.ui.navigator.actions.NavigatorHandlerRefresh$1.run(NavigatorHandlerRefresh.java:154)
-	at org.jkiss.dbeaver.model.runtime.AbstractJob.run(AbstractJob.java:102)
-	at org.eclipse.core.internal.jobs.Worker.run(Worker.java:63)

@@ -1,77 +0,0 @@
-package com.salesmanager.shop.admin.controller;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import com.salesmanager.core.business.services.reference.country.CountryService;
-import com.salesmanager.core.business.services.user.UserService;
-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.user.User;
-import com.salesmanager.shop.constants.Constants;
-
-
-
-@Controller
-public class AdminController {
-	
-	@Inject
-	CountryService countryService;
-	
-	@Inject
-	UserService userService;
-	
-	@PreAuthorize("hasRole('AUTH')")
-	@RequestMapping(value={"/admin/home.html","/admin/"}, method=RequestMethod.GET)
-	public String displayDashboard(Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		Language language = (Language)request.getAttribute("LANGUAGE");
-		
-		//display menu
-		Map<String,String> activeMenus = new HashMap<String,String>();
-		activeMenus.put("home", "home");
-		
-		model.addAttribute("activeMenus",activeMenus);
-		
-		
-		//get store information
-		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		
-		Map<String,Country> countries = countryService.getCountriesMap(language);
-		
-		Country storeCountry = store.getCountry();
-		Country country = countries.get(storeCountry.getIsoCode());
-		
-		String sCurrentUser = request.getRemoteUser();
-		User currentUser = userService.getByUserName(sCurrentUser);
-		
-		model.addAttribute("store", store);
-		model.addAttribute("country", country);
-		model.addAttribute("user", currentUser);
-		//get last 10 orders
-		//OrderCriteria orderCriteria = new OrderCriteria();
-		//orderCriteria.setMaxCount(10);
-		//orderCriteria.setOrderBy(CriteriaOrderBy.DESC);
-		
-		return ControllerConstants.Tiles.adminDashboard;
-	}
-	
-	@RequestMapping( value=Constants.ADMIN_URI , method=RequestMethod.GET)
-	public String displayStoreLanding(HttpServletRequest request, HttpServletResponse response) {
-
-		return "redirect:" + Constants.ADMIN_URI + Constants.SLASH;
-	}
-
-
-
-}

@@ -1,376 +0,0 @@
-package com.salesmanager.shop.admin.controller.categories;
-
-import java.util.*;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import com.salesmanager.core.business.services.catalog.category.CategoryService;
-import com.salesmanager.core.business.services.reference.country.CountryService;
-import com.salesmanager.core.business.services.reference.language.LanguageService;
-import com.salesmanager.core.business.utils.ajax.AjaxResponse;
-import com.salesmanager.core.model.catalog.category.Category;
-import com.salesmanager.core.model.catalog.category.CategoryDescription;
-import com.salesmanager.core.model.merchant.MerchantStore;
-import com.salesmanager.core.model.reference.language.Language;
-import com.salesmanager.shop.admin.model.web.Menu;
-import com.salesmanager.shop.constants.Constants;
-import com.salesmanager.shop.utils.CategoryUtils;
-import com.salesmanager.shop.utils.LabelUtils;
-
-
-
-@Controller
-public class CategoryController {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(CategoryController.class);
-
-    @Inject
-    LanguageService languageService;
-
-    @Inject
-    CategoryService categoryService;
-
-    @Inject
-    CountryService countryService;
-
-    @Inject
-    LabelUtils messages;
-
-    @PreAuthorize("hasRole('PRODUCTS')")
-    @RequestMapping(value="/admin/categories/editCategory.html", method=RequestMethod.GET)
-    public String displayCategoryEdit(@RequestParam("id") long categoryId, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-        return displayCategory(categoryId,model,request);
-
-    }
-
-    @PreAuthorize("hasRole('PRODUCTS')")
-    @RequestMapping(value="/admin/categories/createCategory.html", method=RequestMethod.GET)
-    public String displayCategoryCreate(Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-        return displayCategory(null,model,request);
-
-    }
-    private String displayCategory(Long categoryId, Model model, HttpServletRequest request) throws Exception {
-        //display menu
-        setMenu(model,request);
-        MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-        Language language = (Language)request.getAttribute("LANGUAGE");
-        //get parent categories
-        List<Category> categories = categoryService.listByStore(store,language);
-        List<Language> languages = store.getLanguages();
-        Optional<Category> category;
-        if(categoryId!=null && categoryId!=0) {//edit mode
-            category =  Optional.ofNullable(categoryService.getById(categoryId, store.getId()));
-            if(!category.isPresent() || category.get().getMerchantStore().getId().intValue()!=store.getId().intValue()) {
-                return "catalogue-categories";
-            }
-        } else {
-            category = Optional.of(new Category());
-            category.get().setVisible(true);
-        }
-        com.salesmanager.shop.admin.model.catalog.Category adminCategory = new com.salesmanager.shop.admin.model.catalog.Category();
-        List<CategoryDescription> descriptions = new LinkedList<>();
-        List<com.salesmanager.shop.admin.model.catalog.Category> readableCategories = CategoryUtils.readableCategoryListConverter(categories, language);
-
-        for(Language l : languages) {
-            CategoryDescription description = null;
-            for(CategoryDescription desc : category.get().getDescriptions()) {
-                if(desc.getLanguage().getCode().equals(l.getCode())) {
-                    description = desc;
-                }
-            }
-            if(description==null) {
-                description = new CategoryDescription();
-                description.setLanguage(l);
-            }
-            descriptions.add(description);
-        }
-
-        adminCategory.setDescriptions(descriptions);
-        adminCategory.setCategory(category.get());
-
-        model.addAttribute("category", adminCategory);
-        model.addAttribute("categories", readableCategories);
-
-        return "catalogue-categories-category";
-    }
-
-
-    @PreAuthorize("hasRole('PRODUCTS')")
-    @RequestMapping(value="/admin/categories/save.html", method=RequestMethod.POST)
-    public String saveCategory(@Valid @ModelAttribute("category") com.salesmanager.shop.admin.model.catalog.Category category, BindingResult result, Model model, HttpServletRequest request) throws Exception {
-
-        model.addAttribute("category",category);
-        Language language = (Language)request.getAttribute("LANGUAGE");
-        //display menu
-        setMenu(model,request);
-        MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-        if(category.getCategory().getId() != null && category.getCategory().getId() >0) { //edit entry
-            //get from DB
-            Optional<Category> currentCategory = Optional.ofNullable(categoryService.getById(category.getCategory().getId(), store.getId()));
-
-            if(!currentCategory.isPresent() || currentCategory.get().getMerchantStore().getId().intValue()!=store.getId().intValue()) {
-                return "catalogue-categories";
-            }
-        }
-        Map<String,Language> langs = languageService.getLanguagesMap();
-        List<CategoryDescription> descriptions = category.getDescriptions();
-        if(descriptions!=null) {
-            Set<CategoryDescription> categoryDescriptions = new HashSet<>();
-            for(CategoryDescription description : descriptions) {
-
-                String code = description.getLanguage().getCode();
-                Language l = langs.get(code);
-                description.setLanguage(l);
-                description.setCategory(category.getCategory());
-                categoryDescriptions.add(description);
-
-            }
-            category.getCategory().setDescriptions(categoryDescriptions);
-        }
-        //save to DB
-        category.getCategory().setMerchantStore(store);
-        //}
-        if (result.hasErrors()) {
-            return "catalogue-categories-category";
-        }
-        //check parent
-        if(category.getCategory().getParent()!=null) {
-            if(category.getCategory().getParent().getId()==-1) {//this is a root category
-                category.getCategory().setParent(null);
-                category.getCategory().setLineage("/" + category.getCategory().getId() + "/");
-                category.getCategory().setDepth(0);
-            }
-        }
-        category.getCategory().getAuditSection().setModifiedBy(request.getRemoteUser());
-        categoryService.saveOrUpdate(category.getCategory());
-        //ajust lineage and depth
-        if(category.getCategory().getParent()!=null && category.getCategory().getParent().getId()!=-1) {
-            Category parent = new Category();
-            parent.setId(category.getCategory().getParent().getId());
-            parent.setMerchantStore(store);
-            categoryService.addChild(parent, category.getCategory());
-        }
-        //get parent categories
-        List<Category> categories = categoryService.listByStore(store,language);
-        List<com.salesmanager.shop.admin.model.catalog.Category> readableCategories = CategoryUtils.readableCategoryListConverter(categories, language);
-
-        model.addAttribute("categories", readableCategories);
-        model.addAttribute("success","success");
-        return "catalogue-categories-category";
-    }
-
-
-    //category list
-    @PreAuthorize("hasRole('PRODUCTS')")
-    @RequestMapping(value="/admin/categories/categories.html", method=RequestMethod.GET)
-    public String displayCategories(Model model, HttpServletRequest request) throws Exception {
-        setMenu(model,request);
-        //does nothing, ajax subsequent request
-        return "catalogue-categories";
-    }
-
-    @SuppressWarnings({ "unchecked"})
-    @PreAuthorize("hasRole('PRODUCTS')")
-    @RequestMapping(value="/admin/categories/paging.html", method=RequestMethod.POST)
-    public @ResponseBody ResponseEntity<String> pageCategories(HttpServletRequest request) {
-        String categoryName = request.getParameter("name");
-        String categoryCode = request.getParameter("code");
-        AjaxResponse resp = new AjaxResponse();
-        try {
-            Language language = (Language)request.getAttribute("LANGUAGE");
-            MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-            List<Category> categories = null;
-            if(!StringUtils.isBlank(categoryName)) {
-                categories = categoryService.getByName(store, categoryName, language);
-            } else if(!StringUtils.isBlank(categoryCode)) {
-                categoryService.listByCodes(store, new ArrayList<>(Collections.singletonList(categoryCode)), language);
-            } else {
-                categories = categoryService.listByStore(store, language);
-            }
-            for(Category category : categories) {
-                @SuppressWarnings("rawtypes")
-                Map entry = new HashMap();
-                entry.put("categoryId", category.getId());
-                CategoryDescription description = category.getDescriptions().iterator().next();
-
-                entry.put("name", description.getName());
-                entry.put("code", category.getCode());
-                entry.put("visible", category.isVisible());
-                resp.addDataEntry(entry);
-            }
-            resp.setStatus(AjaxResponse.RESPONSE_STATUS_SUCCESS);
-        } catch (Exception e) {
-            LOGGER.error("Error while paging categories", e);
-            resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-        }
-        String returnString = resp.toJSONString();
-        final HttpHeaders httpHeaders= new HttpHeaders();
-        httpHeaders.setContentType(MediaType.APPLICATION_JSON);
-
-        return new ResponseEntity<>(returnString, httpHeaders, HttpStatus.OK);
-    }
-
-    @PreAuthorize("hasRole('PRODUCTS')")
-    @RequestMapping(value="/admin/categories/hierarchy.html", method=RequestMethod.GET)
-    public String displayCategoryHierarchy(Model model, HttpServletRequest request) throws Exception {
-        setMenu(model,request);
-        //get the list of categories
-        Language language = (Language)request.getAttribute("LANGUAGE");
-        MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-
-        List<Category> categories = categoryService.listByStore(store, language);
-        List<com.salesmanager.shop.admin.model.catalog.Category> readableCategories = CategoryUtils.readableCategoryListConverter(categories, language);
-
-        model.addAttribute("categories", readableCategories);
-
-        return "catalogue-categories-hierarchy";
-    }
-
-    @PreAuthorize("hasRole('PRODUCTS')")
-    @RequestMapping(value="/admin/categories/remove.html", method=RequestMethod.POST)
-    public @ResponseBody ResponseEntity<String> deleteCategory(HttpServletRequest request, Locale locale) {
-        String sid = request.getParameter("categoryId");
-        MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-        AjaxResponse resp = new AjaxResponse();
-        try {
-            Long id = Long.parseLong(sid);
-            Optional<Category> category = Optional.ofNullable(categoryService.getById(id, store.getId()));
-            if(category.isPresent() || category.get().getMerchantStore().getId().intValue() !=store.getId().intValue() ) {
-                resp.setStatusMessage(messages.getMessage("message.unauthorized", locale));
-                resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-            } else {
-                categoryService.delete(category.get());
-                resp.setStatus(AjaxResponse.RESPONSE_OPERATION_COMPLETED);
-            }
-        } catch (Exception e) {
-            LOGGER.error("Error while deleting category", e);
-            resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-            resp.setErrorMessage(e);
-        }
-        String returnString = resp.toJSONString();
-        final HttpHeaders httpHeaders= new HttpHeaders();
-        httpHeaders.setContentType(MediaType.APPLICATION_JSON);
-        return new ResponseEntity<>(returnString, httpHeaders, HttpStatus.OK);
-    }
-
-    @PreAuthorize("hasRole('PRODUCTS')")
-    @RequestMapping(value="/admin/categories/moveCategory.html", method=RequestMethod.POST)
-    public @ResponseBody ResponseEntity<String> moveCategory(HttpServletRequest request, Locale locale) {
-        String parentid = request.getParameter("parentId");
-        String childid = request.getParameter("childId");
-        MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-        AjaxResponse resp = new AjaxResponse();
-        final HttpHeaders httpHeaders= new HttpHeaders();
-        httpHeaders.setContentType(MediaType.APPLICATION_JSON);
-        try {
-            Long parentId = Long.parseLong(parentid);
-            Long childId = Long.parseLong(childid);
-            Optional<Category> child = Optional.ofNullable(categoryService.getById(childId, store.getId()));
-            Optional<Category> parent = Optional.ofNullable(categoryService.getById(parentId, store.getId()));
-            if(child.isPresent()&& child.get().getParent().getId().equals(parentId)) {
-                resp.setStatus(AjaxResponse.RESPONSE_OPERATION_COMPLETED);
-                //String returnString = resp.toJSONString();
-            }
-            if(parentId!=1) {
-                if(isValid(store, child, parent)) {
-                    return getResponseAjax(locale, resp, httpHeaders);
-                }
-            }
-            parent.get().getAuditSection().setModifiedBy(request.getRemoteUser());
-            categoryService.addChild(parent.get(), child.get());
-            resp.setStatus(AjaxResponse.RESPONSE_OPERATION_COMPLETED);
-
-        } catch (Exception e) {
-            LOGGER.error("Error while moving category", e);
-            resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-            resp.setErrorMessage(e);
-        }
-
-        String returnString = resp.toJSONString();
-        return new ResponseEntity<>(returnString, httpHeaders, HttpStatus.OK);
-    }
-
-    private boolean isValid(MerchantStore store, Optional<Category> child, Optional<Category> parent) {
-        return !child.isPresent()|| !parent.isPresent()|| !child.get().getMerchantStore().getId().equals(store.getId()) || !parent.get().getMerchantStore().getId().equals(store.getId());
-    }
-
-    private ResponseEntity<String> getResponseAjax(Locale locale, AjaxResponse resp, HttpHeaders httpHeaders) {
-        resp.setStatusMessage(messages.getMessage("message.unauthorized", locale));
-        return getResponseAjax(resp, httpHeaders, AjaxResponse.RESPONSE_STATUS_FAIURE);
-    }
-
-    @PreAuthorize("hasRole('PRODUCTS')")
-    @RequestMapping(value="/admin/categories/checkCategoryCode.html", method=RequestMethod.POST)
-    public @ResponseBody ResponseEntity<String> checkCategoryCode(HttpServletRequest request) {
-        String code = request.getParameter("code");
-        String id = request.getParameter("id");
-        MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-        AjaxResponse resp = new AjaxResponse();
-        final HttpHeaders httpHeaders= new HttpHeaders();
-        httpHeaders.setContentType(MediaType.APPLICATION_JSON);
-        if(StringUtils.isBlank(code)) {
-            return getResponseAjax(resp, httpHeaders, AjaxResponse.CODE_ALREADY_EXIST);
-        }
-        try {
-            Optional<Category> category =Optional.ofNullable(categoryService.getByCode(store, code));
-            if(category.isPresent() && StringUtils.isBlank(id)) {
-                return getResponseAjax(resp, httpHeaders, AjaxResponse.CODE_ALREADY_EXIST);
-            }
-            if(category.isPresent() && !StringUtils.isBlank(id)) {
-                try {
-                    long lid = Long.parseLong(id);
-                    if(category.get().getCode().equals(code) && category.get().getId() ==lid) {
-                        return getResponseAjax(resp, httpHeaders, AjaxResponse.CODE_ALREADY_EXIST);
-                    }
-                } catch (Exception e) {
-                    return getResponseAjax(resp, httpHeaders, AjaxResponse.CODE_ALREADY_EXIST);
-                }
-            }
-            resp.setStatus(AjaxResponse.RESPONSE_OPERATION_COMPLETED);
-        } catch (Exception e) {
-            LOGGER.error("Error while getting category", e);
-            resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-            resp.setErrorMessage(e);
-        }
-        String returnString = resp.toJSONString();
-        return new ResponseEntity<>(returnString, httpHeaders, HttpStatus.OK);
-    }
-
-    private ResponseEntity<String> getResponseAjax(AjaxResponse resp, HttpHeaders httpHeaders, int codeAlreadyExist) {
-        resp.setStatus(codeAlreadyExist);
-        String returnString = resp.toJSONString();
-        return new ResponseEntity<>(returnString, httpHeaders, HttpStatus.OK);
-    }
-
-    private void setMenu(Model model, HttpServletRequest request) {
-        //display menu
-        Map<String,String> activeMenus = new HashMap<>();
-        activeMenus.put("catalogue", "catalogue");
-        activeMenus.put("catalogue-categories", "catalogue-categories");
-        @SuppressWarnings("unchecked")
-        Map<String, Menu> menus = (Map<String, Menu>)request.getAttribute("MENUMAP");
-        Menu currentMenu = menus.get("catalogue");
-        model.addAttribute("currentMenu",currentMenu);
-        model.addAttribute("activeMenus",activeMenus);
-        //
-    }
-
-}

@@ -1,115 +0,0 @@
-package com.salesmanager.shop.admin.controller.configurations;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-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.utils.CacheUtils;
-import com.salesmanager.core.business.utils.ajax.AjaxResponse;
-import com.salesmanager.core.model.merchant.MerchantStore;
-import com.salesmanager.shop.admin.controller.ControllerConstants;
-import com.salesmanager.shop.admin.model.web.Menu;
-import com.salesmanager.shop.constants.Constants;
-
-
-
-
-@Controller
-public class CacheController {
-	
-	private static final Logger LOGGER = LoggerFactory.getLogger(CacheController.class);
-	
-	@Inject
-	private CacheUtils cache;
-
-
-
-	@PreAuthorize("hasRole('AUTH')")
-	@RequestMapping(value="/admin/cache/cacheManagement.html", method=RequestMethod.GET)
-	public String displayAccounts(Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-
-		this.setMenu(model, request);
-		
-		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		
-		//get cache keys
-		List<String> cacheKeysList = cache.getCacheKeys(store);
-
-		model.addAttribute("keys", cacheKeysList);
-
-		return ControllerConstants.Tiles.Configuration.cache;
-		
-	}
-	
-	
-	@PreAuthorize("hasRole('AUTH')")
-	@RequestMapping(value="/admin/cache/clear.html", method=RequestMethod.POST)
-	public @ResponseBody ResponseEntity<String> clearCache(HttpServletRequest request, HttpServletResponse response) {
-		String cacheKey = request.getParameter("cacheKey");
-
-		AjaxResponse resp = new AjaxResponse();
-
-		try {
-
-			MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-
-			StringBuilder key = new StringBuilder();
-			key.append(store.getId()).append("_").append(cacheKey);
-			
-			if(cacheKey!=null) {
-				cache.removeFromCache(key.toString());
-			} else {
-				cache.removeAllFromCache(store);
-			}
-
-			resp.setStatus(AjaxResponse.RESPONSE_OPERATION_COMPLETED);
-
-		} catch (Exception e) {
-			LOGGER.error("Error while updateing groups", e);
-			resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-		}
-		
-		String returnString = resp.toJSONString();
-		final HttpHeaders httpHeaders= new HttpHeaders();
-	    httpHeaders.setContentType(MediaType.APPLICATION_JSON_UTF8);
-		return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-	}
-	
-
-	
-	private void setMenu(Model model, HttpServletRequest request) throws Exception {
-		
-		//display menu
-		Map<String,String> activeMenus = new HashMap<String,String>();
-		activeMenus.put("cache", "cache");
-
-		
-		@SuppressWarnings("unchecked")
-		Map<String, Menu> menus = (Map<String, Menu>)request.getAttribute("MENUMAP");
-		
-		Menu currentMenu = (Menu)menus.get("cache");
-		model.addAttribute("currentMenu",currentMenu);
-		model.addAttribute("activeMenus",activeMenus);
-		//
-		
-	}
-	
-
-}

@@ -1,234 +0,0 @@
-package com.salesmanager.shop.admin.controller.configurations;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.core.env.Environment;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import com.salesmanager.core.business.modules.email.EmailConfig;
-import com.salesmanager.core.business.services.system.EmailService;
-import com.salesmanager.core.business.services.system.MerchantConfigurationService;
-import com.salesmanager.core.model.merchant.MerchantStore;
-import com.salesmanager.core.model.system.MerchantConfiguration;
-import com.salesmanager.core.model.system.MerchantConfigurationType;
-import com.salesmanager.shop.admin.controller.ControllerConstants;
-import com.salesmanager.shop.admin.model.web.ConfigListWrapper;
-import com.salesmanager.shop.admin.model.web.Menu;
-import com.salesmanager.shop.constants.Constants;
-
-
-
-
-@Controller
-public class ConfigurationController {
-	
-	private static final Logger LOGGER = LoggerFactory.getLogger(ConfigurationController.class);
-	
-	private static final String P_MASK = "*****";
-	
-	@Inject
-	private MerchantConfigurationService merchantConfigurationService;
-	
-	@Inject
-	private EmailService emailService;
-
-	@Inject
-	Environment env;
-	
-
-	@PreAuthorize("hasRole('AUTH')")
-	@RequestMapping(value="/admin/configuration/accounts.html", method=RequestMethod.GET)
-	public String displayAccountsConfguration(Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-
-		setConfigurationMenu(model, request);
-		List<MerchantConfiguration> configs = new ArrayList<MerchantConfiguration>();
-		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		MerchantConfiguration merchantFBConfiguration = merchantConfigurationService.getMerchantConfiguration(Constants.KEY_FACEBOOK_PAGE_URL,store);
-		if(null == merchantFBConfiguration)
-		{
-			merchantFBConfiguration = new MerchantConfiguration();
-			merchantFBConfiguration.setKey(Constants.KEY_FACEBOOK_PAGE_URL);
-			merchantFBConfiguration.setMerchantConfigurationType(MerchantConfigurationType.SOCIAL);
-		}
-		configs.add(merchantFBConfiguration);
-		
-		MerchantConfiguration merchantGoogleAnalyticsConfiguration = merchantConfigurationService.getMerchantConfiguration(Constants.KEY_GOOGLE_ANALYTICS_URL,store);
-		if(null == merchantGoogleAnalyticsConfiguration)
-		{
-			merchantGoogleAnalyticsConfiguration = new MerchantConfiguration();
-			merchantGoogleAnalyticsConfiguration.setKey(Constants.KEY_GOOGLE_ANALYTICS_URL);
-			merchantGoogleAnalyticsConfiguration.setMerchantConfigurationType(MerchantConfigurationType.SOCIAL);
-		}
-		configs.add(merchantGoogleAnalyticsConfiguration);
-		
-		MerchantConfiguration merchantInstagramConfiguration = merchantConfigurationService.getMerchantConfiguration(Constants.KEY_INSTAGRAM_URL,store);
-		if(null == merchantInstagramConfiguration)
-		{
-			merchantInstagramConfiguration = new MerchantConfiguration();
-			merchantInstagramConfiguration.setKey(Constants.KEY_INSTAGRAM_URL);
-			merchantInstagramConfiguration.setMerchantConfigurationType(MerchantConfigurationType.SOCIAL);
-		}
-		configs.add(merchantInstagramConfiguration);
-		
-		MerchantConfiguration merchantPinterestConfiguration = merchantConfigurationService.getMerchantConfiguration(Constants.KEY_PINTEREST_PAGE_URL,store);
-		if(null == merchantPinterestConfiguration)
-		{
-			merchantPinterestConfiguration = new MerchantConfiguration();
-			merchantPinterestConfiguration.setKey(Constants.KEY_PINTEREST_PAGE_URL);
-			merchantPinterestConfiguration.setMerchantConfigurationType(MerchantConfigurationType.SOCIAL);
-		}
-		configs.add(merchantPinterestConfiguration);
-		
-		/**
-		MerchantConfiguration merchantGoogleApiConfiguration = merchantConfigurationService.getMerchantConfiguration(Constants.KEY_GOOGLE_API_KEY,store);
-		if(null == merchantGoogleApiConfiguration)
-		{
-			merchantGoogleApiConfiguration = new MerchantConfiguration();
-			merchantGoogleApiConfiguration.setKey(Constants.KEY_GOOGLE_API_KEY);
-			merchantGoogleApiConfiguration.setMerchantConfigurationType(MerchantConfigurationType.CONFIG);
-		}
-		configs.add(merchantGoogleApiConfiguration);
-		**/
-		
-		MerchantConfiguration twitterConfiguration = merchantConfigurationService.getMerchantConfiguration(Constants.KEY_TWITTER_HANDLE,store);
-		if(null == twitterConfiguration)
-		{
-			twitterConfiguration = new MerchantConfiguration();
-			twitterConfiguration.setKey(Constants.KEY_TWITTER_HANDLE);
-			twitterConfiguration.setMerchantConfigurationType(MerchantConfigurationType.SOCIAL);
-		}
-		configs.add(twitterConfiguration);
-		
-		ConfigListWrapper configWrapper = new ConfigListWrapper();
-		configWrapper.setMerchantConfigs(configs);
-		model.addAttribute("configuration",configWrapper);
-		
-		return com.salesmanager.shop.admin.controller.ControllerConstants.Tiles.Configuration.accounts;
-	}
-	
-	@PreAuthorize("hasRole('AUTH')")
-	@RequestMapping(value="/admin/configuration/saveConfiguration.html", method=RequestMethod.POST)
-	public String saveConfigurations(@ModelAttribute("configuration") ConfigListWrapper configWrapper, BindingResult result, Model model, HttpServletRequest request, Locale locale) throws Exception
-	{
-		setConfigurationMenu(model, request);
-		List<MerchantConfiguration> configs = configWrapper.getMerchantConfigs();
-		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		for(MerchantConfiguration mConfigs : configs)
-		{
-			mConfigs.setMerchantStore(store);
-			if(!StringUtils.isBlank(mConfigs.getValue())) {
-				mConfigs.setMerchantConfigurationType(MerchantConfigurationType.SOCIAL);
-				merchantConfigurationService.saveOrUpdate(mConfigs);
-			} else {//remove if submited blank and exists
-				MerchantConfiguration config = merchantConfigurationService.getMerchantConfiguration(mConfigs.getKey(), store);
-				if(config!=null) {
-					merchantConfigurationService.delete(config);
-				}
-			}
-		}	
-		model.addAttribute("success","success");
-		model.addAttribute("configuration",configWrapper);
-		return com.salesmanager.shop.admin.controller.ControllerConstants.Tiles.Configuration.accounts;
-		
-	}
-	
-	@PreAuthorize("hasRole('AUTH')")
-	@RequestMapping(value="/admin/configuration/email.html", method=RequestMethod.GET)
-	public String displayEmailSettings(Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		setEmailConfigurationMenu(model, request);
-		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		EmailConfig emailConfig = emailService.getEmailConfiguration(store);
-		if(emailConfig == null){
-			emailConfig = new EmailConfig();
-			//TODO: Need to check below properties. When there are no record available in MerchantConfguration table with EMAIL_CONFIG key, 
-			// instead of showing blank fields in setup screen, show default configured values from email.properties
-			emailConfig.setProtocol(env.getProperty("mailSender.protocol"));
-			emailConfig.setHost(env.getProperty("mailSender.host"));
-			emailConfig.setPort(env.getProperty("mailSender.port}"));
-			emailConfig.setUsername(env.getProperty("mailSender.username"));
-			//emailConfig.setPassword(env.getProperty("mailSender.password"));
-			emailConfig.setPassword(P_MASK);
-			emailConfig.setSmtpAuth(Boolean.parseBoolean(env.getProperty("mailSender.mail.smtp.auth")));
-			emailConfig.setStarttls(Boolean.parseBoolean(env.getProperty("mail.smtp.starttls.enable")));
-		}
-		
-		model.addAttribute("configuration", emailConfig);
-		return ControllerConstants.Tiles.Configuration.email;
-	}
-	
-	@PreAuthorize("hasRole('AUTH')")
-	@RequestMapping(value="/admin/configuration/saveEmailConfiguration.html", method=RequestMethod.POST)
-	public String saveEmailSettings(@ModelAttribute("configuration") EmailConfig config, BindingResult result, Model model, HttpServletRequest request, Locale locale) throws Exception {
-		setEmailConfigurationMenu(model, request);
-		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		EmailConfig emailConfig = emailService.getEmailConfiguration(store);
-		if(emailConfig == null){
-			emailConfig = new EmailConfig();
-		}
-		
-		// populte EmailConfig model from UI values
-		emailConfig.setProtocol(config.getProtocol());
-		emailConfig.setHost(config.getHost());
-		emailConfig.setPort(config.getPort());
-		emailConfig.setUsername(config.getUsername());
-		emailConfig.setPassword(emailConfig.getPassword());
-		if(!StringUtils.isBlank(config.getPassword())) {
-			if(!config.getPassword().equals(P_MASK)) {
-				emailConfig.setPassword(config.getPassword());
-			}
-		}
-		emailConfig.setSmtpAuth(config.isSmtpAuth());
-		emailConfig.setStarttls(config.isStarttls());
-		
-		emailService.saveEmailConfiguration(emailConfig, store);
-		
-		model.addAttribute("configuration", emailConfig);
-		model.addAttribute("success","success");
-		return ControllerConstants.Tiles.Configuration.email;
-	}
-	
-	private void setConfigurationMenu(Model model, HttpServletRequest request) throws Exception {
-		
-		Map<String,String> activeMenus = new HashMap<String,String>();
-		activeMenus.put("configuration", "configuration");
-		activeMenus.put("accounts-conf", "accounts-conf");
-		
-		@SuppressWarnings("unchecked")
-		Map<String, Menu> menus = (Map<String, Menu>)request.getAttribute("MENUMAP");
-		
-		Menu currentMenu = (Menu)menus.get("configuration");
-		model.addAttribute("currentMenu",currentMenu);
-		model.addAttribute("activeMenus",activeMenus);
-	}
-	
-	private void setEmailConfigurationMenu(Model model, HttpServletRequest request) throws Exception {
-		
-		Map<String,String> activeMenus = new HashMap<String,String>();
-		activeMenus.put("configuration", "configuration");
-		activeMenus.put("email-conf", "email-conf");
-		
-		@SuppressWarnings("unchecked")
-		Map<String, Menu> menus = (Map<String, Menu>)request.getAttribute("MENUMAP");
-		
-		Menu currentMenu = (Menu)menus.get("configuration");
-		model.addAttribute("currentMenu",currentMenu);
-		model.addAttribute("activeMenus",activeMenus);
-	}
-}

@@ -1,88 +0,0 @@
-package com.salesmanager.shop.admin.controller.configurations;
-
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.core.env.Environment;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import com.salesmanager.core.business.services.system.MerchantConfigurationService;
-import com.salesmanager.core.model.merchant.MerchantStore;
-import com.salesmanager.core.model.system.MerchantConfig;
-import com.salesmanager.shop.admin.model.web.Menu;
-import com.salesmanager.shop.constants.Constants;
-
-
-
-@Controller
-public class SystemConfigurationController {
-	
-	private static final Logger LOGGER = LoggerFactory.getLogger(SystemConfigurationController.class);
-	
-	@Inject
-	private MerchantConfigurationService merchantConfigurationService;
-
-	@Inject
-	Environment env;
-	
-
-	@PreAuthorize("hasRole('AUTH')")
-	@RequestMapping(value="/admin/configuration/system.html", method=RequestMethod.GET)
-	public String displaySysyemConfgurations(Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-
-		setMenu(model, request);
-		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		MerchantConfig merchantConfiguration = merchantConfigurationService.getMerchantConfig(store);
-
-		if(merchantConfiguration==null) {
-			merchantConfiguration = new MerchantConfig();
-		}
-		
-		model.addAttribute("store", store);
-		model.addAttribute("configuration",merchantConfiguration);
-		return com.salesmanager.shop.admin.controller.ControllerConstants.Tiles.Configuration.system;
-	}
-	
-	@PreAuthorize("hasRole('AUTH')")
-	@RequestMapping(value="/admin/configuration/saveSystemConfiguration.html", method=RequestMethod.POST)
-	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");
-		model.addAttribute("store", store);
-		model.addAttribute("configuration",merchantConfiguration);
-		return com.salesmanager.shop.admin.controller.ControllerConstants.Tiles.Configuration.system;
-		
-	}
-
-
-	private void setMenu(Model model, HttpServletRequest request) throws Exception {
-		
-		Map<String,String> activeMenus = new HashMap<String,String>();
-		activeMenus.put("configuration", "configuration");
-		activeMenus.put("system-configurations", "system-configurations");
-		
-		@SuppressWarnings("unchecked")
-		Map<String, Menu> menus = (Map<String, Menu>)request.getAttribute("MENUMAP");
-		
-		Menu currentMenu = (Menu)menus.get("configuration");
-		model.addAttribute("currentMenu",currentMenu);
-		model.addAttribute("activeMenus",activeMenus);
-	}
-}

@@ -1,215 +0,0 @@
-package com.salesmanager.shop.admin.controller.content;
-
-import com.salesmanager.core.business.services.content.ContentService;
-import com.salesmanager.core.business.services.reference.language.LanguageService;
-import com.salesmanager.core.model.content.Content;
-import com.salesmanager.core.model.content.ContentDescription;
-import com.salesmanager.core.model.content.ContentType;
-import com.salesmanager.core.model.merchant.MerchantStore;
-import com.salesmanager.core.model.reference.language.Language;
-import com.salesmanager.shop.admin.controller.ControllerConstants;
-import com.salesmanager.shop.admin.model.web.Menu;
-import com.salesmanager.shop.constants.Constants;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.util.*;
-
-@Controller
-public class ContentBoxesController {
-	
-	private static final Logger LOGGER = LoggerFactory.getLogger(ContentBoxesController.class);
-	
-	@Inject
-	private ContentService contentService;
-	
-	@Inject
-	LanguageService languageService;
-	
-	@ModelAttribute("boxPositions") 
-    public Set<Map.Entry<String, String>> boxPositions() { 
-        final Map<String, String> map = new HashMap<String, String>(); 
-
-        map.put("LEFT", "LEFT");
-        map.put("RIGHT", "RIGHT");
-
-
-        return (map.entrySet()); 
-    } 
-
-
-	
-	
-	@PreAuthorize("hasRole('CONTENT')")
-	@RequestMapping(value="/admin/content/boxes/list.html", method=RequestMethod.GET)
-	public String listContentBoxes(Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		
-		setMenu(model,request);
-
-		model.addAttribute("boxes", true);
-		return ControllerConstants.Tiles.Content.contentPages;
-		
-		
-	}
-	
-	@PreAuthorize("hasRole('CONTENT')")
-	@RequestMapping(value="/admin/content/boxes/create.html", method=RequestMethod.GET)
-	public String createBox(Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		model.addAttribute("boxes", true);
-		setMenu(model,request);
-		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		Content content = new Content();
-		content.setMerchantStore(store);
-		content.setContentType(ContentType.BOX);
-		
-		
-		List<Language> languages = store.getLanguages();
-		
-		
-		for(Language l : languages) {
-			
-			ContentDescription description = new ContentDescription();
-			description.setLanguage(l);
-			content.getDescriptions().add(description);
-		}
-		
-		//add positions
-		List<String> positions = new ArrayList<String>();
-		positions.add("LEFT");
-		positions.add("RIGHT");
-		
-		model.addAttribute("positions",positions);
-		model.addAttribute("content",content);
-		
-
-		return ControllerConstants.Tiles.Content.contentPagesDetails;
-		
-		
-	}
-	
-	@PreAuthorize("hasRole('CONTENT')")
-	@RequestMapping(value="/admin/content/boxes/details.html", method=RequestMethod.GET)
-	public String getContentDetails(@RequestParam("id") Long id, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		model.addAttribute("boxes", true);
-		setMenu(model,request);
-		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		Content content = contentService.getById(id);
-		
-
-		List<String> positions = new ArrayList<String>();
-		positions.add("LEFT");
-		positions.add("RIGHT");
-		
-		model.addAttribute("positions",positions);
-		
-		if(content==null) {
-			LOGGER.error("Content entity null for id " + id);
-			return "redirect:/admin/content/boxes/listContent.html";
-		}
-		
-		if(content.getMerchantStore().getId().intValue()!=store.getId().intValue()) {
-			LOGGER.error("Content id " + id + " does not belong to merchant " + store.getId());
-			return "redirect:/admin/content/boxes/listContent.html";
-		}
-		
-		if(!content.getContentType().name().equals(ContentType.BOX.name())) {
-			LOGGER.error("This controller does not handle content type " + content.getContentType().name());
-			return "redirect:/admin/content/boxes/listContent.html";
-		}
-		
-		List<Language> languages = store.getLanguages();
-		
-		List<ContentDescription> descriptions = new ArrayList<ContentDescription>();
-		for(Language l : languages) {
-			for(ContentDescription description : content.getDescriptions()) {
-				if(description.getLanguage().getCode().equals(l.getCode())) {
-					descriptions.add(description);
-				}
-			}
-		}
-		content.setDescriptions(descriptions);
-		
-		model.addAttribute("content",content);
-		
-
-		return ControllerConstants.Tiles.Content.contentPagesDetails;
-		
-		
-	}
-	
-
-
-	
-	
-	@PreAuthorize("hasRole('CONTENT')")
-	@RequestMapping(value="/admin/content/boxes/save.html", method=RequestMethod.POST)
-	public String saveContent(@Valid @ModelAttribute Content content, BindingResult result, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		model.addAttribute("boxes", true);
-		setMenu(model,request);
-		
-		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		
-		List<String> positions = new ArrayList<String>();
-		positions.add("LEFT");
-		positions.add("RIGHT");
-		
-		model.addAttribute("positions",positions);
-		
-		if (result.hasErrors()) {
-			return ControllerConstants.Tiles.Content.contentPagesDetails;
-		}
-		
-		Map<String,Language> langs = languageService.getLanguagesMap();
-		
-		List<ContentDescription> descriptions = content.getDescriptions();
-		for(ContentDescription description : descriptions) {
-			Language l = langs.get(description.getLanguage().getCode());
-			description.setLanguage(l);
-			description.setContent(content);
-		}
-		
-		content.setContentType(ContentType.BOX);
-		content.setMerchantStore(store);
-		contentService.saveOrUpdate(content);
-		
-		
-		model.addAttribute("content",content);
-		model.addAttribute("success","success");
-		return ControllerConstants.Tiles.Content.contentPagesDetails;
-		
-		
-	}
-	
-	
-	
-	private void setMenu(Model model, HttpServletRequest request) throws Exception {
-		
-		//display menu
-		Map<String,String> activeMenus = new HashMap<String,String>();
-		activeMenus.put("content", "content");
-		activeMenus.put("content-boxes", "content-boxes");
-		
-		@SuppressWarnings("unchecked")
-		Map<String, Menu> menus = (Map<String, Menu>)request.getAttribute("MENUMAP");
-		
-		Menu currentMenu = (Menu)menus.get("content");
-		model.addAttribute("currentMenu",currentMenu);
-		model.addAttribute("activeMenus",activeMenus);
-		//
-		
-	}
-	
-
-}

@@ -1,263 +0,0 @@
-package com.salesmanager.shop.admin.controller.content;
-
-import com.salesmanager.core.business.services.content.ContentService;
-import com.salesmanager.core.business.utils.ajax.AjaxResponse;
-import com.salesmanager.core.model.content.FileContentType;
-import com.salesmanager.core.model.content.InputContentFile;
-import com.salesmanager.core.model.merchant.MerchantStore;
-import com.salesmanager.shop.admin.controller.ControllerConstants;
-import com.salesmanager.shop.admin.model.content.ContentFiles;
-import com.salesmanager.shop.admin.model.web.Menu;
-import com.salesmanager.shop.constants.Constants;
-import com.salesmanager.shop.utils.ImageFilePath;
-import org.apache.commons.collections4.CollectionUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.io.ByteArrayInputStream;
-import java.util.*;
-
-/**
- * Manage static content type image
- * - Add images
- * - Remove images
- * @author Carl Samson
- *
- */
-@Controller
-public class ContentImageController {
-	
-	private static final Logger LOGGER = LoggerFactory.getLogger(ContentImageController.class);
-	
-	@Inject
-	private ContentService contentService;
-	
-	@Inject
-	@Qualifier("img")
-	private ImageFilePath imageUtils;
-	
-	/**
-	 * Entry point for the file browser used from the javascript
-	 * content editor
-	 * @param model
-	 * @param request
-	 * @param response
-	 * @return
-	 * @throws Exception
-	 */
-	@PreAuthorize("hasRole('CONTENT')")
-	@RequestMapping(value={"/admin/content/fileBrowser.html"}, method=RequestMethod.GET)
-	public String displayFileBrowser(Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-
-
-		return ControllerConstants.Tiles.ContentImages.fileBrowser;
-		
-	}
-	
-	
-	
-	/**
-	 * Get images for a given merchant store
-	 * @param model
-	 * @param request
-	 * @param response
-	 * @return
-	 * @throws Exception
-	 */
-	@PreAuthorize("hasRole('CONTENT')")
-	@RequestMapping(value={"/admin/content/contentImages.html","/admin/content/contentManagement.html"}, method=RequestMethod.GET)
-	public String getContentImages(Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-
-		this.setMenu(model, request);
-		return ControllerConstants.Tiles.ContentImages.contentImages;
-		
-	}
-	
-	
-	@SuppressWarnings({ "unchecked"})
-	@PreAuthorize("hasRole('CONTENT')")
-	@RequestMapping(value="/admin/content/images/paging.html", method=RequestMethod.POST)
-	public @ResponseBody ResponseEntity<String> pageImages(HttpServletRequest request, HttpServletResponse response) {
-		AjaxResponse resp = new AjaxResponse();
-
-		try {
-			
-
-			MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-			
-			List<String> imageNames = contentService.getContentFilesNames(store.getCode(),FileContentType.IMAGE);
-			
-			if(imageNames!=null) {
-
-				for(String name : imageNames) {
-
-					@SuppressWarnings("rawtypes")
-					Map entry = new HashMap();
-					entry.put("picture", new StringBuilder().append(request.getContextPath()).append(imageUtils.buildStaticImageUtils(store, name)).toString());
-					
-					entry.put("name", name);
-					entry.put("id", name);
-					resp.addDataEntry(entry);
-
-				}
-			
-			}
-			
-			resp.setStatus(AjaxResponse.RESPONSE_STATUS_SUCCESS);
-
-		} catch (Exception e) {
-			LOGGER.error("Error while paging content images", e);
-			resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-		}
-		
-		String returnString = resp.toJSONString();
-		final HttpHeaders httpHeaders= new HttpHeaders();
-	    httpHeaders.setContentType(MediaType.APPLICATION_JSON_UTF8);
-		return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-	}
-	
-	/**
-	 * Controller methods which allow Admin to add content images to underlying
-	 * Infinispan cache.
-	 * @param model model object
-	 * @param request http request object
-	 * @param response http response object
-	 * @return view allowing user to add content images
-	 * @throws Exception
-	 */
-	@PreAuthorize("hasRole('CONTENT')")
-	@RequestMapping(value="/admin/content/createContentImages.html", method=RequestMethod.GET)
-    public String displayContentImagesCreate(final Model model, final HttpServletRequest request, final HttpServletResponse response) throws Exception {
-      
-	    return ControllerConstants.Tiles.ContentImages.addContentImages;
-
-    }
-	
-	/**
-	 * Method responsible for adding content images to underlying Infinispan cache.
-	 * It will add given content image(s) for given merchant store in the cache.
-	 * Following steps will be performed in order to add images
-	 * <pre>
-	 * 1. Validate form data
-	 * 2. Get Merchant Store based on merchant Id.
-	 * 3. Call {@link InputContentFile} to add image(s).
-	 * </pre>
-	 * 
-	 * @param contentImages
-	 * @param bindingResult
-	 * @param model
-	 * @param request
-	 * @return
-	 * @throws Exception
-	 */
-	@PreAuthorize("hasRole('CONTENT')")
-	@RequestMapping(value="/admin/content/saveContentImages.html", method=RequestMethod.POST)
-	public String saveContentImages(@ModelAttribute(value="contentFiles") @Valid final ContentFiles contentImages, final BindingResult bindingResult,final Model model, final HttpServletRequest request) throws Exception{
-	    
-		this.setMenu(model, request);
-	    if (bindingResult.hasErrors()) {
-	        LOGGER.info( "Found {} Validation errors", bindingResult.getErrorCount());
-	       return ControllerConstants.Tiles.ContentImages.addContentImages;
-	       
-        }
-	    final List<InputContentFile> contentImagesList=new ArrayList<InputContentFile>();
-        final MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-        if(CollectionUtils.isNotEmpty( contentImages.getFile() )){
-            LOGGER.info("Saving {} content images for merchant {}",contentImages.getFile().size(),store.getId());
-            for(final MultipartFile multipartFile:contentImages.getFile()){
-                if(!multipartFile.isEmpty()){
-                    ByteArrayInputStream inputStream = new ByteArrayInputStream( multipartFile.getBytes() );
-                    InputContentFile cmsContentImage = new InputContentFile();
-                    cmsContentImage.setFileName(multipartFile.getOriginalFilename() );
-                    cmsContentImage.setMimeType( multipartFile.getContentType() );
-                    cmsContentImage.setFile( inputStream );
-                    cmsContentImage.setFileContentType(FileContentType.IMAGE);
-                    contentImagesList.add( cmsContentImage);
-                }
-            }
-            
-            if(CollectionUtils.isNotEmpty( contentImagesList )){
-                contentService.addContentFiles( store.getCode(), contentImagesList );
-            }
-            else{
-                // show error message on UI
-            }
-        }
-       
-        return ControllerConstants.Tiles.ContentImages.contentImages;
-	}
-	
-	
-	/**
-	 * Removes a content image from the CMS
-	 * @param request
-	 * @param response
-	 * @param locale
-	 * @return
-	 */
-	@PreAuthorize("hasRole('CONTENT')")
-	@RequestMapping(value="/admin/content/removeImage.html", method=RequestMethod.POST)
-	public @ResponseBody ResponseEntity<String> removeImage(HttpServletRequest request, HttpServletResponse response, Locale locale) {
-		String imageName = request.getParameter("name");
-
-		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		
-		AjaxResponse resp = new AjaxResponse();
-
-		
-		try {
-			
-
-			
-			contentService.removeFile(store.getCode(), FileContentType.IMAGE, imageName);
-
-		
-		
-		} catch (Exception e) {
-			LOGGER.error("Error while deleting product", e);
-			resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-			resp.setErrorMessage(e);
-		}
-		
-		String returnString = resp.toJSONString();
-		final HttpHeaders httpHeaders= new HttpHeaders();
-	    httpHeaders.setContentType(MediaType.APPLICATION_JSON_UTF8);
-		return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-	}
-	
-	private void setMenu(Model model, HttpServletRequest request) throws Exception {
-		
-		//display menu
-		Map<String,String> activeMenus = new HashMap<String,String>();
-		activeMenus.put("content", "content");
-		activeMenus.put("content-images", "content-images");
-		
-		@SuppressWarnings("unchecked")
-		Map<String, Menu> menus = (Map<String, Menu>)request.getAttribute("MENUMAP");
-		
-		Menu currentMenu = (Menu)menus.get("content");
-		model.addAttribute("currentMenu",currentMenu);
-		model.addAttribute("activeMenus",activeMenus);
-		//
-		
-	}
-
-}

@@ -1,389 +0,0 @@
-package com.salesmanager.shop.admin.controller.content;
-
-import com.salesmanager.core.business.services.catalog.product.relationship.ProductRelationshipService;
-import com.salesmanager.core.business.services.content.ContentService;
-import com.salesmanager.core.business.services.reference.language.LanguageService;
-import com.salesmanager.core.business.utils.ajax.AjaxResponse;
-import com.salesmanager.core.model.catalog.product.relationship.ProductRelationship;
-import com.salesmanager.core.model.content.Content;
-import com.salesmanager.core.model.content.ContentDescription;
-import com.salesmanager.core.model.content.ContentType;
-import com.salesmanager.core.model.merchant.MerchantStore;
-import com.salesmanager.core.model.reference.language.Language;
-import com.salesmanager.shop.admin.controller.ControllerConstants;
-import com.salesmanager.shop.admin.model.web.Menu;
-import com.salesmanager.shop.constants.Constants;
-
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
-
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.util.*;
-
-@Controller
-public class ContentPagesController {
-	
-	private static final Logger LOGGER = LoggerFactory.getLogger(ContentPagesController.class);
-	
-	@Inject
-	private ContentService contentService;
-	
-	@Inject
-	LanguageService languageService;
-	
-	@Inject
-	ProductRelationshipService productRelationshipService;
-	
-	
-	@PreAuthorize("hasRole('CONTENT')")
-	@RequestMapping(value="/admin/content/pages/list.html", method=RequestMethod.GET)
-	public String listContentPages(Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		
-		setMenu(model,request);
-
-		return ControllerConstants.Tiles.Content.contentPages;
-		
-		
-	}
-	
-	@PreAuthorize("hasRole('CONTENT')")
-	@RequestMapping(value="/admin/content/pages/create.html", method=RequestMethod.GET)
-	public String createPage(Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		
-		setMenu(model,request);
-		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		Content content = new Content();
-		content.setMerchantStore(store);
-		content.setContentType(ContentType.PAGE);
-		
-		
-		List<Language> languages = store.getLanguages();
-		
-		
-		for(Language l : languages) {
-			
-			ContentDescription description = new ContentDescription();
-			description.setLanguage(l);
-			content.getDescriptions().add(description);
-		}
-		
-		List<ProductRelationship> relationships = productRelationshipService.getGroups(store);
-		if(!CollectionUtils.isEmpty(relationships)) {
-			model.addAttribute("productGroups", relationships);
-		}
-		
-		
-		
-		model.addAttribute("content",content);
-		
-
-		return ControllerConstants.Tiles.Content.contentPagesDetails;
-		
-		
-	}
-	
-	@PreAuthorize("hasRole('CONTENT')")
-	@RequestMapping(value="/admin/content/pages/details.html", method=RequestMethod.GET)
-	public String getContentDetails(@RequestParam("id") Long id, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		
-		setMenu(model,request);
-		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		Content content = contentService.getById(id);
-		
-
-		
-		if(content==null) {
-			LOGGER.error("Content entity null for id " + id);
-			return "redirect:/admin/content/pages/listContent.html";
-		}
-		
-		if(content.getMerchantStore().getId().intValue()!=store.getId().intValue()) {
-			LOGGER.error("Content id " + id + " does not belong to merchant " + store.getId());
-			return "redirect:/admin/content/pages/listContent.html";
-		}
-		
-		if(!content.getContentType().name().equals(ContentType.PAGE.name())) {
-			LOGGER.error("This controller does not handle content type " + content.getContentType().name());
-			return "redirect:/admin/content/pages/listContent.html";
-		}
-		
-		List<Language> languages = store.getLanguages();
-		
-		List<ContentDescription> descriptions = new ArrayList<ContentDescription>();
-		for(Language l : languages) {
-			for(ContentDescription description : content.getDescriptions()) {
-				if(description.getLanguage().getCode().equals(l.getCode())) {
-					descriptions.add(description);
-				}
-			}
-		}
-		content.setDescriptions(descriptions);
-		model.addAttribute("content",content);
-		
-		List<ProductRelationship> relationships = productRelationshipService.getGroups(store);
-		if(!CollectionUtils.isEmpty(relationships)) {
-			model.addAttribute("productGroups", relationships);
-		}
-		
-		return ControllerConstants.Tiles.Content.contentPagesDetails;
-		
-		
-	}
-	
-	
-	
-	@PreAuthorize("hasRole('CONTENT')")
-	@RequestMapping(value="/admin/content/remove.html", method=RequestMethod.POST)
-	public @ResponseBody ResponseEntity<String> removeContent(HttpServletRequest request, HttpServletResponse response, Locale locale) {
-		String id = request.getParameter("id");
-
-		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		
-		AjaxResponse resp = new AjaxResponse();
-		final HttpHeaders httpHeaders= new HttpHeaders();
-	    httpHeaders.setContentType(MediaType.APPLICATION_JSON_UTF8);
-
-		
-		try {
-			
-			//get the content first
-			Long lid = Long.parseLong(id);
-			
-			Content dbContent = contentService.getById(lid);
-			
-			if(dbContent==null) {
-				LOGGER.error("Invalid content id ", id);
-				resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-				String returnString = resp.toJSONString();
-				return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-			}
-			
-			if(dbContent!=null && dbContent.getMerchantStore().getId().intValue()!= store.getId().intValue()) {
-				resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-				String returnString = resp.toJSONString();
-				return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-			}
-			
-			contentService.delete(dbContent);
-
-			resp.setStatus(AjaxResponse.RESPONSE_OPERATION_COMPLETED);
-		
-		} catch (Exception e) {
-			LOGGER.error("Error while deleting product", e);
-			resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-			resp.setErrorMessage(e);
-		}
-		
-		String returnString = resp.toJSONString();
-		return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-	}
-	
-	
-	@SuppressWarnings({ "unchecked"})
-	@PreAuthorize("hasRole('CONTENT')")
-	@RequestMapping(value="/admin/content/page.html", method=RequestMethod.POST)
-	public @ResponseBody ResponseEntity<String> pageStaticContent(@RequestParam("contentType") String contentType, HttpServletRequest request, HttpServletResponse response) {
-		AjaxResponse resp = new AjaxResponse();
-
-		try {
-			
-
-			MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-
-			Language language = (Language)request.getAttribute("LANGUAGE");
-			
-			
-
-			
-			ContentType cType = ContentType.PAGE;
-			if(ContentType.BOX.name().equals(contentType)) {
-				cType = ContentType.BOX;
-			} 
-			List<Content> contentList = contentService.listByType(cType, store, language);
-			
-			if(contentList!=null) {
-
-				for(Content content : contentList) {
-					
-					List<ContentDescription> descriptions = content.getDescriptions();
-					ContentDescription description = descriptions.get(0);
-					for(ContentDescription desc : descriptions) {
-						if(desc.getLanguage().getCode().equals(language.getCode())) {
-							description = desc;
-							break;
-						}
-					}
-					
-
-					@SuppressWarnings("rawtypes")
-					Map entry = new HashMap();
-					entry.put("id", content.getId());
-					entry.put("code", content.getCode());
-					entry.put("name", description.getName());
-					resp.addDataEntry(entry);
-
-				}
-			
-			}
-			
-			resp.setStatus(AjaxResponse.RESPONSE_STATUS_SUCCESS);
-
-		} catch (Exception e) {
-			LOGGER.error("Error while paging content", e);
-			resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-		}
-		
-		String returnString = resp.toJSONString();
-		final HttpHeaders httpHeaders= new HttpHeaders();
-	    httpHeaders.setContentType(MediaType.APPLICATION_JSON_UTF8);
-		return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-	}
-	
-	
-	@PreAuthorize("hasRole('CONTENT')")
-	@RequestMapping(value="/admin/content/pages/save.html", method=RequestMethod.POST)
-	public String saveContent(@Valid @ModelAttribute Content content, BindingResult result, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		
-		setMenu(model,request);
-		
-		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		
-		if (result.hasErrors()) {
-			return ControllerConstants.Tiles.Content.contentPagesDetails;
-		}
-		
-		Map<String,Language> langs = languageService.getLanguagesMap();
-		
-		List<ContentDescription> descriptions = content.getDescriptions();
-		for(ContentDescription description : descriptions) {
-			Language l = langs.get(description.getLanguage().getCode());
-			description.setLanguage(l);
-			description.setContent(content);
-		}
-		
-		if(content.getSortOrder()==null) {
-			content.setSortOrder(0);
-		}
-
-		content.setContentType(ContentType.PAGE);
-		content.setMerchantStore(store);
-
-		contentService.saveOrUpdate(content);
-		
-		List<ProductRelationship> relationships = productRelationshipService.getGroups(store);
-		if(!CollectionUtils.isEmpty(relationships)) {
-			model.addAttribute("productGroups", relationships);
-		}
-		
-		
-		model.addAttribute("content",content);
-		model.addAttribute("success","success");
-		return ControllerConstants.Tiles.Content.contentPagesDetails;
-		
-		
-	}
-	
-	/**
-	 * Check if the content code filled in by the
-	 * user is unique
-	 * @param request
-	 * @param response
-	 * @param locale
-	 * @return
-	 */
-	@PreAuthorize("hasRole('CONTENT')")
-	@RequestMapping(value="/admin/content/checkContentCode.html", method=RequestMethod.POST)
-	public @ResponseBody ResponseEntity<String> checkContentCode(HttpServletRequest request, HttpServletResponse response, Locale locale) {
-		
-		String code = request.getParameter("code");
-		String id = request.getParameter("id");
-
-		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-
-		AjaxResponse resp = new AjaxResponse();
-		final HttpHeaders httpHeaders= new HttpHeaders();
-	    httpHeaders.setContentType(MediaType.APPLICATION_JSON_UTF8);
-		
-		   if(StringUtils.isBlank(code)) {
-				resp.setStatus(AjaxResponse.CODE_ALREADY_EXIST);
-				String returnString = resp.toJSONString();
-				return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-		   }
-		
-		try {
-			
-		Content content = contentService.getByCode(code, store);
-		
-		
-		if(!StringUtils.isBlank(id)) {
-			try {
-				Long lid = Long.parseLong(id);
-				
-				if(content!=null && content.getCode().equals(code) && content.getId().longValue()==lid) {
-					resp.setStatus(AjaxResponse.RESPONSE_STATUS_SUCCESS);
-					String returnString = resp.toJSONString();
-					return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-				}
-			} catch (Exception e) {
-				resp.setStatus(AjaxResponse.CODE_ALREADY_EXIST);
-				String returnString = resp.toJSONString();
-				return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-			}
-
-		} else {
-			if(content!=null) {
-				resp.setStatus(AjaxResponse.CODE_ALREADY_EXIST);
-				String returnString = resp.toJSONString();
-				return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-			}
-		}
-
-			
-
-			resp.setStatus(AjaxResponse.RESPONSE_OPERATION_COMPLETED);
-
-		} catch (Exception e) {
-			LOGGER.error("Error while getting content", e);
-			resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-			resp.setErrorMessage(e);
-		}
-		
-		String returnString = resp.toJSONString();
-		return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-	}
-	
-	
-	
-	private void setMenu(Model model, HttpServletRequest request) throws Exception {
-		
-		//display menu
-		Map<String,String> activeMenus = new HashMap<String,String>();
-		activeMenus.put("content", "content");
-		activeMenus.put("content-pages", "content-pages");
-		
-		@SuppressWarnings("unchecked")
-		Map<String, Menu> menus = (Map<String, Menu>)request.getAttribute("MENUMAP");
-		
-		Menu currentMenu = (Menu)menus.get("content");
-		model.addAttribute("currentMenu",currentMenu);
-		model.addAttribute("activeMenus",activeMenus);
-		//
-		
-	}
-	
-
-}

@@ -1,255 +0,0 @@
-package com.salesmanager.shop.admin.controller.content;
-
-import java.io.ByteArrayInputStream;
-import java.net.URLConnection;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import javax.inject.Inject;
-import org.apache.commons.collections4.CollectionUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.multipart.MultipartFile;
-
-import com.salesmanager.core.model.content.FileContentType;
-import com.salesmanager.core.model.content.InputContentFile;
-import com.salesmanager.core.business.services.content.ContentService;
-import com.salesmanager.core.model.merchant.MerchantStore;
-import com.salesmanager.core.business.utils.ajax.AjaxResponse;
-import com.salesmanager.shop.admin.controller.ControllerConstants;
-import com.salesmanager.shop.admin.model.content.ContentFiles;
-import com.salesmanager.shop.admin.model.web.Menu;
-import com.salesmanager.shop.constants.Constants;
-import com.salesmanager.shop.utils.ImageFilePath;
-
-
-@Controller
-public class StaticContentController {
-	
-	private static final Logger LOGGER = LoggerFactory.getLogger(StaticContentController.class);
-	
-	@Inject
-	private ContentService contentService;
-	
-
-	@Inject
-	@Qualifier("img")
-	private ImageFilePath imageUtils;
-	
-
-	@PreAuthorize("hasRole('CONTENT')")
-	@RequestMapping(value={"/admin/content/static/contentFiles.html","/admin/content/static/contentManagement.html"}, method=RequestMethod.GET)
-	public String getContentImages(Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-
-		this.setMenu(model, request);
-		return ControllerConstants.Tiles.ContentFiles.contentFiles;
-		
-	}
-
-	
-	/**
-	 * Display files in a List grid
-	 * @param request
-	 * @param response
-	 * @return
-	 */
-	@SuppressWarnings({ "unchecked"})
-	@PreAuthorize("hasRole('CONTENT')")
-	@RequestMapping(value="/admin/content/static/page.html", method=RequestMethod.POST)
-	public @ResponseBody ResponseEntity<String> pageStaticContent(HttpServletRequest request, HttpServletResponse response) {
-		
-		AjaxResponse resp = new AjaxResponse();
-		final HttpHeaders httpHeaders= new HttpHeaders();
-	    httpHeaders.setContentType(MediaType.APPLICATION_JSON_UTF8);
-
-		try {
-			
-
-			MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-			
-			List<String> fileNames = contentService.getContentFilesNames(store.getCode(), FileContentType.STATIC_FILE);
-			
-/*			Map<String,String> configurations = (Map<String, String>)request.getSession().getAttribute(Constants.STORE_CONFIGURATION);
-			String scheme = Constants.HTTP_SCHEME;
-			if(configurations!=null) {
-				scheme = (String)configurations.get("scheme");
-			}
-			
-
-			StringBuilder storePath = new StringBuilder();
-			storePath.append(scheme).append("://")
-			.append(store.getDomainName())
-			.append(request.getContextPath());
-*/			
-
-			if(fileNames!=null) {
-
-				for(String name : fileNames) {
-					
-					String mimeType = URLConnection.getFileNameMap().getContentTypeFor(name);
-					
-					//StringBuilder filePath = new StringBuilder();
-
-					//filePath.append(storePath.toString()).append(filePathUtils.buildStaticFilePath(store,name));
-					
-					String filePath = imageUtils.buildStaticContentFilePath(store,name);
-
-					//String filePath = filePathUtils.buildStaticFileAbsolutePath(store, name);
-					
-					
-					@SuppressWarnings("rawtypes")
-					Map entry = new HashMap();
-					entry.put("name", name);
-					entry.put("path", filePath.toString());
-					entry.put("mimeType", mimeType);
-					resp.addDataEntry(entry);
-
-				}
-			
-			}
-			
-			resp.setStatus(AjaxResponse.RESPONSE_STATUS_SUCCESS);
-
-		} catch (Exception e) {
-			LOGGER.error("Error while paging content images", e);
-			resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-		}
-		
-		String returnString = resp.toJSONString();
-		return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-	}
-	
-
-	
-	/**
-	 * Method responsible for adding content files to underlying Infinispan cache.
-	 * It will add given content file(s) for given merchant store in the cache.
-	 * Following steps will be performed in order to add files
-	 * <pre>
-	 * 1. Validate form data
-	 * 2. Get Merchant Store based on merchant Id.
-	 * 3. Call {@link InputContentFile} to add file(s).
-	 * </pre>
-	 * 
-	 * @param contentImages
-	 * @param bindingResult
-	 * @param model
-	 * @param request
-	 * @return
-	 * @throws Exception
-	 */
-	@PreAuthorize("hasRole('CONTENT')")
-	@RequestMapping(value="/admin/content/static/saveFiles.html", method=RequestMethod.POST)
-	public String saveFiles(@ModelAttribute(value="contentFiles") @Valid final ContentFiles contentFiles, final BindingResult bindingResult,final Model model, final HttpServletRequest request) throws Exception{
-	    
-		this.setMenu(model, request);
-	    if (bindingResult.hasErrors()) {
-	        LOGGER.info( "Found {} Validation errors", bindingResult.getErrorCount());
-	        return ControllerConstants.Tiles.ContentFiles.contentFiles;
-	       
-        }
-	    final List<InputContentFile> contentFilesList=new ArrayList<InputContentFile>();
-        final MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-        if(CollectionUtils.isNotEmpty( contentFiles.getFile() )){
-            LOGGER.info("Saving {} content files for merchant {}",contentFiles.getFile().size(),store.getId());
-            for(final MultipartFile multipartFile:contentFiles.getFile()){
-                if(!multipartFile.isEmpty()){
-                    ByteArrayInputStream inputStream = new ByteArrayInputStream( multipartFile.getBytes() );
-                    InputContentFile cmsContentImage = new InputContentFile();
-                    cmsContentImage.setFileName(multipartFile.getOriginalFilename() );
-                    cmsContentImage.setFileContentType( FileContentType.STATIC_FILE );
-                    cmsContentImage.setFile( inputStream );
-                    contentFilesList.add( cmsContentImage);
-                }
-            }
-            
-            if(CollectionUtils.isNotEmpty( contentFilesList )){
-            	contentService.addContentFiles( store.getCode(), contentFilesList );
-            }
-            else{
-                // show error message on UI
-            }
-        }
-        
-        return ControllerConstants.Tiles.ContentFiles.contentFiles;
-	}
-	
-	
-	/**
-	 * Removes a static file from the CMS
-	 * @param request
-	 * @param response
-	 * @param locale
-	 * @return
-	 */
-	@PreAuthorize("hasRole('CONTENT')")
-	@RequestMapping(value="/admin/content/static/removeFile.html", method=RequestMethod.POST)
-	public @ResponseBody ResponseEntity<String> removeFile(HttpServletRequest request, HttpServletResponse response, Locale locale) {
-		String fileName = request.getParameter("name");
-
-		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		
-		AjaxResponse resp = new AjaxResponse();
-
-		
-		try {
-			
-
-			
-			contentService.removeFile(store.getCode(), FileContentType.STATIC_FILE, fileName);
-
-			resp.setStatus(AjaxResponse.RESPONSE_OPERATION_COMPLETED);
-		
-		} catch (Exception e) {
-			LOGGER.error("Error while deleting product", e);
-			resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-			resp.setErrorMessage(e);
-		}
-		
-		String returnString = resp.toJSONString();
-		final HttpHeaders httpHeaders= new HttpHeaders();
-	    httpHeaders.setContentType(MediaType.APPLICATION_JSON_UTF8);
-		return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-	}
-	
-	
-
-	
-	private void setMenu(Model model, HttpServletRequest request) throws Exception {
-		
-		//display menu
-		Map<String,String> activeMenus = new HashMap<String,String>();
-		activeMenus.put("content", "content");
-		activeMenus.put("content-files", "content-files");
-		
-		@SuppressWarnings("unchecked")
-		Map<String, Menu> menus = (Map<String, Menu>)request.getAttribute("MENUMAP");
-		
-		Menu currentMenu = (Menu)menus.get("content");
-		model.addAttribute("currentMenu",currentMenu);
-		model.addAttribute("activeMenus",activeMenus);
-		//
-		
-	}
-
-}

@@ -1,106 +0,0 @@
-package com.salesmanager.shop.admin.controller;
-
-/**
- * Interface contain constant for Controller.These constant will be used throughout
- * sm-shop to  providing constant values to various Controllers being used in the
- * application.
- * @author Umesh A
- *
- */
-public interface ControllerConstants
-{
-
-    interface Tiles{
-    	
-    	final String adminDashboard="admin-dashboard";
-        interface ContentImages{
-            final String addContentImages="admin-contentImages-add";
-            final String contentImages="admin-content-images";
-            final String fileBrowser="admin-content-filebrowser";
- 
-        }
-        
-        interface ContentFiles{
-            final String addContentFiles="admin-content-files-add";
-            final String contentFiles="admin-content-files";
-
- 
-        }
-        
-        interface Content{
-            final String contentPages="admin-content-pages";
-            final String contentPagesDetails="admin-content-pages-details";
-
-        }
-        
-        interface Customer{
-            final String optionsList="admin-customer-options-list";
-            final String optionDetails="admin-customer-options-details";
-            final String optionsValuesList="admin-customer-options-values-list";
-            final String optionsValueDetails="admin-customer-options-values-details";
-            final String optionsSet="admin-customer-options-set";
-
-        }
-        
-        interface Product{
-            final String productReviews="catalogue-product-reviews";
-            final String productPrices="admin-products-prices";
-            final String productPrice="admin-products-price";
-            final String relatedItems="admin-products-related";
-            final String digitalProduct="admin-products-digital";
-            final String productImages="admin-products-images";
-            final String productImagesUrl="admin-products-images-url";
-            final String productKeywords="admin-products-keywords";
-            final String customGroups="admin-products-groups";
-            final String customGroupsDetails="admin-products-groups-details";
-            final String manufacturerList="admin-products-manufacturer";
-            final String manufacturerDetails="admin-products-manufacturer-details";
-        }
-        
-        interface User{
-            final String profile="admin-user-profile";
-            final String users="admin-users";
-            final String password="admin-user-password";
-        }
-        
-        interface Store{
-            final String stores="admin-stores";
-        }
-
-
-        interface Shipping{
-            final String shippingMethod="shipping-method";
-            final String shippingMethods="shipping-methods";
-            final String shippingOptions="shipping-options";
-            final String shippingPackaging="shipping-packaging";
-            final String customShippingWeightBased="admin-shipping-custom";
-        }
-        
-        interface Payment{
-        	final String paymentMethods="payment-methods";
-        	final String paymentMethod="payment-method";
-        }
-        
-        interface Order{
-            final String orders="admin-orders";
-            final String ordersEdit="admin-orders-edit";
-            final String ordersTransactions="admin-orders-transactions";
-        }
-        
-        interface Configuration{
-            final String accounts="config-accounts";
-            final String email="config-email";
-            final String cache="admin-cache";
-            final String system="config-system";
-        }
-        
-        interface Tax{
-            final String taxClasses="tax-classes";
-            final String taxClass="tax-class";
-            final String taxConfiguration="tax-configuration";
-            final String taxRates="tax-rates";
-            final String taxRate="tax-rate";
-        }
-        
-    }
-}

@@ -1,845 +0,0 @@
-package com.salesmanager.shop.admin.controller.customers;
-
-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.services.user.GroupService;
-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.core.model.user.Group;
-import com.salesmanager.core.model.user.GroupType;
-import com.salesmanager.shop.admin.model.customer.attribute.CustomerOption;
-import com.salesmanager.shop.admin.model.customer.attribute.CustomerOptionValue;
-import com.salesmanager.shop.admin.model.web.Menu;
-import com.salesmanager.shop.constants.Constants;
-import com.salesmanager.shop.populator.customer.ReadableCustomerOptionPopulator;
-import com.salesmanager.shop.store.controller.customer.facade.CustomerFacade;
-import com.salesmanager.shop.utils.EmailUtils;
-import com.salesmanager.shop.utils.LabelUtils;
-import com.salesmanager.shop.utils.LocaleUtils;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.validation.ObjectError;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.util.*;
-import java.util.regex.Pattern;
-
-
-
-@Controller
-public class CustomerController {
-	
-	private static final Logger LOGGER = LoggerFactory.getLogger(CustomerController.class);
-	
-	private static final String CUSTOMER_ID_PARAMETER = "customer";
-	
-	
-	
-	@Inject
-	private LabelUtils messages;
-	
-	@Inject
-	private GroupService groupService;
-	
-	@Inject
-	private CustomerService customerService;
-	
-	@Inject
-	private CustomerOptionService customerOptionService;
-	
-	@Inject
-	private CustomerOptionValueService customerOptionValueService;
-	
-	@Inject
-	private CustomerOptionSetService customerOptionSetService;
-	
-	@Inject
-	private CountryService countryService;
-	
-	@Inject
-	private ZoneService zoneService;
-	
-	@Inject
-	private LanguageService languageService;
-	
-	@Inject
-	private CustomerAttributeService customerAttributeService;
-	
-	@Inject
-	@Named("passwordEncoder")
-	private PasswordEncoder passwordEncoder;
-	
-	@Inject
-	private EmailService emailService;
-	
-	@Inject
-	private EmailUtils emailUtils;
-	
-	@Inject
-	private CustomerFacade customerFacade;
-	
-	
-	/**
-	 * Customer details
-	 * @param model
-	 * @param request
-	 * @param response
-	 * @return
-	 * @throws Exception
-	 */
-	@PreAuthorize("hasRole('CUSTOMER')")
-	@RequestMapping(value="/admin/customers/customer.html", method=RequestMethod.GET)
-	public String displayCustomer(Long id, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-			
-		//display menu
-		this.setMenu(model, request);
-		
-		//get groups
-		List<Group> groups = new ArrayList<Group>();
-		List<Group> userGroups = groupService.listGroup(GroupType.CUSTOMER);
-		for(Group group : userGroups) {
-			groups.add(group);
-		}
-		
-		model.addAttribute("groups",groups);
-		
-		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		
-		List<Language> languages = languageService.getLanguages();
-
-		model.addAttribute("languages",languages);
-		
-		Customer customer = null;
-		
-		//if request.attribute contains id then get this customer from customerService
-		if(id!=null && id!=0) {//edit mode
-			
-			//get from DB
-			customer = customerService.getById(id);
-			if(customer==null) {
-				return "redirect:/admin/customers/list.html";
-			}
-			if(customer.getMerchantStore().getId().intValue()!=store.getId().intValue()) {
-				return "redirect:/admin/customers/list.html";
-			}
-			
-		} else {
-			 customer = new Customer();
-		}
-		//get list of countries (see merchant controller)
-		Language language = (Language)request.getAttribute("LANGUAGE");				
-		//get countries
-		List<Country> countries = countryService.getCountries(language);
-		
-		//get list of zones
-		List<Zone> zones = zoneService.list();
-		
-		this.getCustomerOptions(model, customer, store, language);
-
-		model.addAttribute("zones", zones);
-		model.addAttribute("countries", countries);
-		model.addAttribute("customer", customer);
-		return "admin-customer";	
-		
-	}
-	
-	private void getCustomerOptions(Model model, Customer customer, MerchantStore store, Language language) throws Exception {
-
-		Map<Long,CustomerOption> options = new HashMap<Long,CustomerOption>();
-		//get options
-		List<CustomerOptionSet> optionSet = customerOptionSetService.listByStore(store, language);
-		if(!CollectionUtils.isEmpty(optionSet)) {
-			
-			
-			ReadableCustomerOptionPopulator optionPopulator = new ReadableCustomerOptionPopulator();
-			
-			Set<CustomerAttribute> customerAttributes = customer.getAttributes();
-			
-			for(CustomerOptionSet optSet : optionSet) {
-				
-				com.salesmanager.core.model.customer.attribute.CustomerOption custOption = optSet.getCustomerOption();
-				if(!custOption.isActive()) {
-					continue;
-				}
-				CustomerOption customerOption = options.get(custOption.getId());
-				
-				optionPopulator.setOptionSet(optSet);
-				
-				
-				
-				if(customerOption==null) {
-					customerOption = new CustomerOption();
-					customerOption.setId(custOption.getId());
-					customerOption.setType(custOption.getCustomerOptionType());
-					customerOption.setName(custOption.getDescriptionsSettoList().get(0).getName());
-					
-				} 
-				
-				optionPopulator.populate(custOption, customerOption, store, language);
-				options.put(customerOption.getId(), customerOption);
-
-				if(!CollectionUtils.isEmpty(customerAttributes)) {
-					for(CustomerAttribute customerAttribute : customerAttributes) {
-						if(customerAttribute.getCustomerOption().getId().longValue()==customerOption.getId()){
-							CustomerOptionValue selectedValue = new CustomerOptionValue();
-							com.salesmanager.core.model.customer.attribute.CustomerOptionValue attributeValue = customerAttribute.getCustomerOptionValue();
-							selectedValue.setId(attributeValue.getId());
-							CustomerOptionValueDescription optValue = attributeValue.getDescriptionsSettoList().get(0);
-							selectedValue.setName(optValue.getName());
-							customerOption.setDefaultValue(selectedValue);
-							if(customerOption.getType().equalsIgnoreCase(CustomerOptionType.Text.name())) {
-								selectedValue.setName(customerAttribute.getTextValue());
-							} 
-						}
-					}
-				}
-			}
-		}
-		
-		
-		model.addAttribute("options", options.values());
-
-		
-	}
-	
-	@PreAuthorize("hasRole('CUSTOMER')")
-	@RequestMapping(value="/admin/customers/save.html", method=RequestMethod.POST)
-	public String saveCustomer(@Valid @ModelAttribute("customer") Customer customer, BindingResult result, Model model, HttpServletRequest request, Locale locale) throws Exception{
-	
-		this.setMenu(model, request);
-		
-		String email_regEx = "\\b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,4}\\b";
-		Pattern pattern = Pattern.compile(email_regEx);
-		
-		Language language = (Language)request.getAttribute("LANGUAGE");
-		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		List<Language> languages = languageService.getLanguages();
-		
-		model.addAttribute("languages",languages);
-		
-		//get groups
-		List<Group> groups = new ArrayList<Group>();
-		List<Group> userGroups = groupService.listGroup(GroupType.CUSTOMER);
-		for(Group group : userGroups) {
-			groups.add(group);
-		}
-		
-		model.addAttribute("groups",groups);
-		
-		this.getCustomerOptions(model, customer, store, language);
-		
-		//get countries
-		List<Country> countries = countryService.getCountries(language);
-
-		
-		if(!StringUtils.isBlank(customer.getEmailAddress() ) ){
-			 java.util.regex.Matcher matcher = pattern.matcher(customer.getEmailAddress());
-			 
-			 if(!matcher.find()) {
-				ObjectError error = new ObjectError("customerEmailAddress",messages.getMessage("Email.customer.EmailAddress", locale));
-				result.addError(error);
-			 }
-		}else{
-			ObjectError error = new ObjectError("customerEmailAddress",messages.getMessage("NotEmpty.customer.EmailAddress", locale));
-			result.addError(error);
-		}
-		
-
-		 
-		if( StringUtils.isBlank(customer.getBilling().getFirstName() ) ){
-			 ObjectError error = new ObjectError("billingFirstName", messages.getMessage("NotEmpty.customer.billingFirstName", locale));
-			 result.addError(error);
-		}
-		
-		if( StringUtils.isBlank(customer.getBilling().getLastName() ) ){
-			 ObjectError error = new ObjectError("billingLastName", messages.getMessage("NotEmpty.customer.billingLastName", locale));
-			 result.addError(error);
-		}
-		
-		if( StringUtils.isBlank(customer.getBilling().getAddress() ) ){
-			 ObjectError error = new ObjectError("billingAddress", messages.getMessage("NotEmpty.customer.billingStreetAddress", locale));
-			 result.addError(error);
-		}
-		 
-		if( StringUtils.isBlank(customer.getBilling().getCity() ) ){
-			 ObjectError error = new ObjectError("billingCity",messages.getMessage("NotEmpty.customer.billingCity", locale));
-			 result.addError(error);
-		}
-		 
-		if( customer.getShowBillingStateList().equalsIgnoreCase("yes" ) && customer.getBilling().getZone().getCode() == null ){
-			 ObjectError error = new ObjectError("billingState",messages.getMessage("NotEmpty.customer.billingState", locale));
-			 result.addError(error);
-			 
-		}else if( customer.getShowBillingStateList().equalsIgnoreCase("no" ) && customer.getBilling().getState() == null ){
-				 ObjectError error = new ObjectError("billingState",messages.getMessage("NotEmpty.customer.billingState", locale));
-				 result.addError(error);
-			
-		}
-		 
-		if( StringUtils.isBlank(customer.getBilling().getPostalCode() ) ){
-			 ObjectError error = new ObjectError("billingPostalCode", messages.getMessage("NotEmpty.customer.billingPostCode", locale));
-			 result.addError(error);
-		}
-		
-		//check if error from the @valid
-		if (result.hasErrors()) {
-			model.addAttribute("countries", countries);
-			return "admin-customer";
-		}
-				
-		Customer newCustomer = new Customer();
-
-		if( customer.getId()!=null && customer.getId().longValue()>0 ) {
-			newCustomer = customerService.getById( customer.getId() );
-			
-			if(newCustomer==null) {
-				return "redirect:/admin/customers/list.html";
-			}
-			
-			if(newCustomer.getMerchantStore().getId().intValue()!=store.getId().intValue()) {
-				return "redirect:/admin/customers/list.html";
-			}
-			
-			
-			
-		}else{
-			//  new customer set marchant_Id
-			MerchantStore merchantStore = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-			newCustomer.setMerchantStore(merchantStore);
-		}
-		
-		List<Group> submitedGroups = customer.getGroups();
-		Set<Integer> ids = new HashSet<Integer>();
-		for(Group group : submitedGroups) {
-			ids.add(Integer.parseInt(group.getGroupName()));
-		}
-		
-		List<Group> newGroups = groupService.listGroupByIds(ids);
-		newCustomer.setGroups(newGroups);
-		
-
-		newCustomer.setEmailAddress(customer.getEmailAddress() );		
-		
-		//get Customer country/zone 		
-		Country deliveryCountry = countryService.getByCode( customer.getDelivery().getCountry().getIsoCode()); 
-		Country billingCountry  = countryService.getByCode( customer.getBilling().getCountry().getIsoCode()) ;
-
-		Zone deliveryZone = customer.getDelivery().getZone();
-		Zone billingZone  = customer.getBilling().getZone();
-		
-
-		
-		if ("yes".equalsIgnoreCase(customer.getShowDeliveryStateList())) {
-			if(customer.getDelivery().getZone()!=null) {
-				deliveryZone = zoneService.getByCode(customer.getDelivery().getZone().getCode());
-				customer.getDelivery().setState( null );
-			}
-			
-		}else if ("no".equalsIgnoreCase(customer.getShowDeliveryStateList())){
-			if(customer.getDelivery().getState()!=null) {
-				deliveryZone = null ;
-				customer.getDelivery().setState( customer.getDelivery().getState() );
-			}
-		}
-	
-		if ("yes".equalsIgnoreCase(customer.getShowBillingStateList())) {
-			if(customer.getBilling().getZone()!=null) {
-				billingZone = zoneService.getByCode(customer.getBilling().getZone().getCode());
-				customer.getBilling().setState( null );
-			}
-			
-		}else if ("no".equalsIgnoreCase(customer.getShowBillingStateList())){
-			if(customer.getBilling().getState()!=null) {
-				billingZone = null ;
-				customer.getBilling().setState( customer.getBilling().getState() );
-			}
-		}
-				
-
-		
-		newCustomer.setDefaultLanguage(customer.getDefaultLanguage() );
-		
-		customer.getDelivery().setZone(  deliveryZone);
-		customer.getDelivery().setCountry(deliveryCountry );
-		newCustomer.setDelivery( customer.getDelivery() );
-		
-		customer.getBilling().setZone(  billingZone);
-		customer.getBilling().setCountry(billingCountry );
-		newCustomer.setBilling( customer.getBilling()  );
-		
-		customerService.saveOrUpdate(newCustomer);
-		
-		model.addAttribute("customer", newCustomer);
-		model.addAttribute("countries", countries);
-		model.addAttribute("success","success");
-		
-		return "admin-customer";
-		
-	}
-	
-	/**
-	 * Deserves shop and admin
-	 * @param request
-	 * @param locale
-	 * @return
-	 * @throws Exception
-	 */
-	@PreAuthorize("hasRole('CUSTOMER')")
-	@RequestMapping(value={"/admin/customers/attributes/save.html"}, method=RequestMethod.POST)
-	public @ResponseBody ResponseEntity<String> saveCustomerAttributes(HttpServletRequest request, Locale locale) throws Exception {
-		
-
-		AjaxResponse resp = new AjaxResponse();
-		final HttpHeaders httpHeaders= new HttpHeaders();
-	    httpHeaders.setContentType(MediaType.APPLICATION_JSON_UTF8);
-		
-		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		
-		//1=1&2=on&3=eeee&4=on&customer=1
-
-		@SuppressWarnings("rawtypes")
-		Enumeration parameterNames = request.getParameterNames();
-		
-		Customer customer = null;
-		
-		while(parameterNames.hasMoreElements()) {
-
-			String parameterName = (String)parameterNames.nextElement();
-			String parameterValue = request.getParameter(parameterName);
-			if(CUSTOMER_ID_PARAMETER.equals(parameterName)) {
-				customer = customerService.getById(new Long(parameterValue));
-				break;
-			}
-		}
-		
-		if(customer==null) {
-			LOGGER.error("Customer id [customer] is not defined in the parameters");
-			resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-			String returnString = resp.toJSONString();
-			return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-		}
-		
-		if(customer.getMerchantStore().getId().intValue()!=store.getId().intValue()) {
-			LOGGER.error("Customer id does not belong to current store");
-			resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-			String returnString = resp.toJSONString();
-			return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-		}
-		
-		List<CustomerAttribute> customerAttributes = customerAttributeService.getByCustomer(store, customer);
-		Map<Long,CustomerAttribute> customerAttributesMap = new HashMap<Long,CustomerAttribute>();
-		
-		for(CustomerAttribute attr : customerAttributes) {
-			customerAttributesMap.put(attr.getCustomerOption().getId(), attr);
-		}
-
-		parameterNames = request.getParameterNames();
-		
-		while(parameterNames.hasMoreElements()) {
-			
-			String parameterName = (String)parameterNames.nextElement();
-			String parameterValue = request.getParameter(parameterName);
-			try {
-				
-				String[] parameterKey = parameterName.split("-");
-				com.salesmanager.core.model.customer.attribute.CustomerOption customerOption = null;
-				com.salesmanager.core.model.customer.attribute.CustomerOptionValue customerOptionValue = null;
-
-				
-				if(CUSTOMER_ID_PARAMETER.equals(parameterName)) {
-					continue;
-				}
-				
-					if(parameterKey.length>1) {
-						//parse key - value
-						String key = parameterKey[0];
-						String value = parameterKey[1];
-						//should be on
-						customerOption = customerOptionService.getById(new Long(key));
-						customerOptionValue = customerOptionValueService.getById(new Long(value));
-						
-
-						
-					} else {
-						customerOption = customerOptionService.getById(new Long(parameterName));
-						customerOptionValue = customerOptionValueService.getById(new Long(parameterValue));
-
-					}
-					
-					//get the attribute
-					//CustomerAttribute attribute = customerAttributeService.getByCustomerOptionId(store, customer.getId(), customerOption.getId());
-					CustomerAttribute attribute = customerAttributesMap.get(customerOption.getId());
-					if(attribute==null) {
-						attribute = new CustomerAttribute();
-						attribute.setCustomer(customer);
-						attribute.setCustomerOption(customerOption);
-					} else {
-						customerAttributes.remove(attribute);
-					}
-					
-					if(customerOption.getCustomerOptionType().equals(CustomerOptionType.Text.name())) {
-						if(!StringUtils.isBlank(parameterValue)) {
-							attribute.setCustomerOptionValue(customerOptionValue);
-							attribute.setTextValue(parameterValue);
-						} else {
-							attribute.setTextValue(null);
-						}
-					} else {
-						attribute.setCustomerOptionValue(customerOptionValue);
-					}
-					
-					
-					if(attribute.getId()!=null && attribute.getId().longValue()>0) {
-						if(attribute.getCustomerOptionValue()==null){
-							customerAttributeService.delete(attribute);
-						} else {
-							customerAttributeService.update(attribute);
-						}
-					} else {
-						customerAttributeService.save(attribute);
-					}
-					
-
-
-			} catch (Exception e) {
-				LOGGER.error("Cannot get parameter information " + parameterName,e);
-			}
-			
-		}
-		
-		//and now the remaining to be removed
-		for(CustomerAttribute attr : customerAttributes) {
-			customerAttributeService.delete(attr);
-		}
-		
-		resp.setStatus(AjaxResponse.RESPONSE_STATUS_SUCCESS);
-		String returnString = resp.toJSONString();
-		return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-		
-
-	}
-
-
-	
-	/**
-	 * List of customers
-	 * @param model
-	 * @return
-	 * @throws Exception
-	 */
-	@RequestMapping(value="/admin/customers/list.html", method=RequestMethod.GET)
-	public String displayCustomers(Model model,HttpServletRequest request) throws Exception {
-		
-		
-		this.setMenu(model, request);
-	
-		return "admin-customers";
-		
-		
-		
-	}
-	
-	
-	
-	@SuppressWarnings("unchecked")
-	@RequestMapping(value="/admin/customers/page.html", method=RequestMethod.POST)
-	public @ResponseBody
-	ResponseEntity<String>  pageCustomers(HttpServletRequest request,HttpServletResponse response) {
-
-
-		AjaxPageableResponse resp = new AjaxPageableResponse();
-		
-		//Language language = (Language)request.getAttribute("LANGUAGE");
-		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		
-		
-		try {
-			
-
-			
-			//Map<String,Country> countriesMap = countryService.getCountriesMap(language);
-			
-			
-			int startRow = Integer.parseInt(request.getParameter("_startRow"));
-			int endRow = Integer.parseInt(request.getParameter("_endRow"));
-			String	email = request.getParameter("email");
-			String name = request.getParameter("name");
-			String firstName = request.getParameter("firstName");
-			String lastName = request.getParameter("lastName");
-			String	country = request.getParameter("country");
-			
-			
-			CustomerCriteria criteria = new CustomerCriteria();
-			criteria.setStartIndex(startRow);
-			criteria.setMaxCount(endRow);
-			
-			if(!StringUtils.isBlank(email)) {
-				criteria.setEmail(email);
-			}
-			
-			if(!StringUtils.isBlank(name)) {
-				criteria.setName(name);
-			}
-			
-			if(!StringUtils.isBlank(country)) {
-				criteria.setCountry(country);
-			}
-			
-			if(!StringUtils.isBlank(firstName)) {
-				criteria.setFirstName(firstName);
-			}
-			
-			if(!StringUtils.isBlank(lastName)) {
-				criteria.setLastName(lastName);
-			}
-			
-
-			CustomerList customerList = customerService.getListByStore(store,criteria);
-			
-			if(customerList.getCustomers()!=null) {
-			
-				for(Customer customer : customerList.getCustomers()) {
-					@SuppressWarnings("rawtypes")
-					Map entry = new HashMap();
-					entry.put("id", customer.getId());
-					entry.put("firstName", customer.getBilling().getFirstName());
-					entry.put("lastName", customer.getBilling().getLastName());
-					entry.put("email", customer.getEmailAddress());
-					entry.put("country", customer.getBilling().getCountry().getIsoCode());
-					resp.addDataEntry(entry);
-					
-				}
-			
-			}
-			
-		} catch (Exception e) {
-			LOGGER.error("Error while paging orders", e);
-			resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-		}
-		
-		String returnString = resp.toJSONString();
-		final HttpHeaders httpHeaders= new HttpHeaders();
-	    httpHeaders.setContentType(MediaType.APPLICATION_JSON_UTF8);
-		return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-		
-	
-	}
-	
-	
-	@PreAuthorize("hasRole('CUSTOMER')")
-	@RequestMapping(value="/admin/customers/resetPassword.html", method=RequestMethod.POST)
-	public @ResponseBody
-	ResponseEntity<String> resetPassword(HttpServletRequest request,HttpServletResponse response) {
-		
-		String customerId = request.getParameter("customerId");
-		
-		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		AjaxResponse resp = new AjaxResponse();
-		final HttpHeaders httpHeaders= new HttpHeaders();
-	    httpHeaders.setContentType(MediaType.APPLICATION_JSON_UTF8);
-		
-		
-		
-		try {
-			
-			Long id = Long.parseLong(customerId);
-			
-			Customer customer = customerService.getById(id);
-			
-			if(customer==null) {
-				resp.setErrorString("Customer does not exist");
-				resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-				String returnString = resp.toJSONString();
-				return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-			}
-			
-			if(customer.getMerchantStore().getId().intValue()!=store.getId().intValue()) {
-				resp.setErrorString("Invalid customer id");
-				resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-				String returnString = resp.toJSONString();
-				return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-			}
-			
-			Language userLanguage = customer.getDefaultLanguage();
-			
-			customerFacade.resetPassword(customer, store, userLanguage);
-			
-			resp.setStatus(AjaxResponse.RESPONSE_STATUS_SUCCESS);
-			
-		} catch (Exception e) {
-			LOGGER.error("An exception occured while changing password",e);
-			resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-		}
-		
-		
-		String returnString = resp.toJSONString();
-		return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-		
-		
-	}
-	
-	
-	@PreAuthorize("hasRole('CUSTOMER')")
-	@RequestMapping(value="/admin/customers/setCredentials.html", method=RequestMethod.POST)
-	public @ResponseBody
-	ResponseEntity<String> setCredentials(HttpServletRequest request,HttpServletResponse response) {
-		
-		String customerId = request.getParameter("customerId");
-		String userName = request.getParameter("userName");
-		String password = request.getParameter("password");
-		
-		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		AjaxResponse resp = new AjaxResponse();
-		final HttpHeaders httpHeaders= new HttpHeaders();
-	    httpHeaders.setContentType(MediaType.APPLICATION_JSON_UTF8);
-		
-		
-		
-		try {
-			
-			Long id = Long.parseLong(customerId);
-			
-			Customer customer = customerService.getById(id);
-			
-			if(customer==null) {
-				resp.setErrorString("Customer does not exist");
-				resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-				String returnString = resp.toJSONString();
-				return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-			}
-			
-			if(customer.getMerchantStore().getId().intValue()!=store.getId().intValue()) {
-				resp.setErrorString("Invalid customer id");
-				resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-				String returnString = resp.toJSONString();
-				return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-			}
-			
-			if(StringUtils.isBlank(userName) || StringUtils.isBlank(password)) {
-				resp.setErrorString("Invalid username or password");
-				resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-				String returnString = resp.toJSONString();
-				return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-			}
-			
-			Language userLanguage = customer.getDefaultLanguage();
-			
-			Locale customerLocale = LocaleUtils.getLocale(userLanguage);
-
-			String encodedPassword = passwordEncoder.encode(password);
-			
-			customer.setPassword(encodedPassword);
-			customer.setNick(userName);
-			
-			customerService.saveOrUpdate(customer);
-			
-			//send email
-			
-/*			try {
-
-				//creation of a user, send an email
-				String[] storeEmail = {store.getStoreEmailAddress()};
-				
-				
-				Map<String, String> templateTokens = emailUtils.createEmailObjectsMap(request.getContextPath(), store, messages, customerLocale);
-				templateTokens.put(EmailConstants.LABEL_HI, messages.getMessage("label.generic.hi", customerLocale));
-		        templateTokens.put(EmailConstants.EMAIL_CUSTOMER_FIRSTNAME, customer.getBilling().getFirstName());
-		        templateTokens.put(EmailConstants.EMAIL_CUSTOMER_LASTNAME, customer.getBilling().getLastName());
-				templateTokens.put(EmailConstants.EMAIL_RESET_PASSWORD_TXT, messages.getMessage("email.customer.resetpassword.text", customerLocale));
-				templateTokens.put(EmailConstants.EMAIL_CONTACT_OWNER, messages.getMessage("email.contactowner", storeEmail, customerLocale));
-				templateTokens.put(EmailConstants.EMAIL_PASSWORD_LABEL, messages.getMessage("label.generic.password",customerLocale));
-				templateTokens.put(EmailConstants.EMAIL_CUSTOMER_PASSWORD, password);
-
-
-				Email email = new Email();
-				email.setFrom(store.getStorename());
-				email.setFromEmail(store.getStoreEmailAddress());
-				email.setSubject(messages.getMessage("label.generic.changepassword",customerLocale));
-				email.setTo(customer.getEmailAddress());
-				email.setTemplateName(RESET_PASSWORD_TPL);
-				email.setTemplateTokens(templateTokens);
-	
-	
-				
-				emailService.sendHtmlEmail(store, email);
-				resp.setStatus(AjaxResponse.RESPONSE_STATUS_SUCCESS);
-			
-			} catch (Exception e) {
-				LOGGER.error("Cannot send email to user",e);
-				resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-			}*/
-			
-			
-			
-			
-		} catch (Exception e) {
-			LOGGER.error("An exception occured while changing password",e);
-			resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-		}
-		
-		
-		String returnString = resp.toJSONString();
-		return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-		
-		
-	}
-	
-	private void setMenu(Model model, HttpServletRequest request) throws Exception {
-		
-		//display menu
-		Map<String,String> activeMenus = new HashMap<String,String>();
-		activeMenus.put("customer", "customer");
-		activeMenus.put("customer-list", "customer-list");
-		
-		@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);
-
-
-		//
-		
-	}
-	
-	
-
-}

@@ -1,337 +0,0 @@
-package com.salesmanager.shop.admin.controller.customers;
-
-import com.salesmanager.core.business.services.customer.attribute.CustomerOptionService;
-import com.salesmanager.core.business.services.reference.language.LanguageService;
-import com.salesmanager.core.business.utils.ajax.AjaxResponse;
-import com.salesmanager.core.model.customer.attribute.CustomerOption;
-import com.salesmanager.core.model.customer.attribute.CustomerOptionDescription;
-import com.salesmanager.core.model.merchant.MerchantStore;
-import com.salesmanager.core.model.reference.language.Language;
-import com.salesmanager.shop.admin.controller.ControllerConstants;
-import com.salesmanager.shop.admin.model.web.Menu;
-import com.salesmanager.shop.constants.Constants;
-import com.salesmanager.shop.utils.LabelUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.validation.ObjectError;
-import org.springframework.web.bind.annotation.*;
-
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.util.*;
-
-@Controller
-public class CustomerOptionsController {
-	
-	@Inject
-	private LanguageService languageService;
-	
-	@Inject
-	private CustomerOptionService customerOptionService;
-	
-	@Inject
-	private LabelUtils messages;
-	
-	private static final Logger LOGGER = LoggerFactory.getLogger(CustomerOptionsController.class);
-	
-	
-	@PreAuthorize("hasRole('CUSTOMER')")
-	@RequestMapping(value="/admin/customers/options/list.html", method=RequestMethod.GET)
-	public String displayOptions(Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		
-		setMenu(model,request);
-		return ControllerConstants.Tiles.Customer.optionsList;
-		
-
-	}
-	
-	@PreAuthorize("hasRole('CUSTOMER')")
-	@RequestMapping(value="/admin/customers/options/edit.html", method=RequestMethod.GET)
-	public String displayOptionEdit(@RequestParam("id") long id, HttpServletRequest request, HttpServletResponse response, Model model, Locale locale) throws Exception {
-		return displayOption(id,request,response,model,locale);
-	}
-	
-	@PreAuthorize("hasRole('CUSTOMER')")
-	@RequestMapping(value="/admin/customers/options/create.html", method=RequestMethod.GET)
-	public String displayOptionCreate(HttpServletRequest request, HttpServletResponse response, Model model, Locale locale) throws Exception {
-		return displayOption(null,request,response,model,locale);
-	}
-	
-	private String displayOption(Long optionId, HttpServletRequest request, HttpServletResponse response,Model model,Locale locale) throws Exception {
-
-		
-		this.setMenu(model, request);
-		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		
-		List<Language> languages = store.getLanguages();
-
-		Set<CustomerOptionDescription> descriptions = new HashSet<CustomerOptionDescription>();
-		
-		CustomerOption option = new CustomerOption();
-		
-		if(optionId!=null && optionId!=0) {//edit mode
-			
-			
-			option = customerOptionService.getById(optionId);
-			
-			
-			if(option==null) {
-				return "redirect:/admin/customers/options/list.html";
-			}
-			
-			if(option.getMerchantStore().getId().intValue()!=store.getId().intValue()) {
-				return "redirect:/admin/customers/options/list.html";
-			}
-			
-			Set<CustomerOptionDescription> optionDescriptions = option.getDescriptions();
-			
-			
-			
-			for(Language l : languages) {
-			
-				CustomerOptionDescription optionDescription = null;
-				
-				if(optionDescriptions!=null) {
-					
-					for(CustomerOptionDescription description : optionDescriptions) {
-						
-						String code = description.getLanguage().getCode();
-						if(code.equals(l.getCode())) {
-							optionDescription = description;
-						}
-					}
-					
-				}
-				
-				if(optionDescription==null) {
-					optionDescription = new CustomerOptionDescription();
-					optionDescription.setLanguage(l);
-				}
-				descriptions.add(optionDescription);
-			}
-
-		} else {
-			for(Language l : languages) {
-				CustomerOptionDescription desc = new CustomerOptionDescription();
-				desc.setLanguage(l);
-				descriptions.add(desc);
-			}
-		}
-		
-
-		option.setDescriptions(descriptions);
-		model.addAttribute("option", option);
-		return ControllerConstants.Tiles.Customer.optionDetails;
-		
-		
-	}
-		
-	
-	@PreAuthorize("hasRole('CUSTOMER')")
-	@RequestMapping(value="/admin/customers/options/save.html", method=RequestMethod.POST)
-	public String saveOption(@Valid @ModelAttribute("option") CustomerOption option, BindingResult result, Model model, HttpServletRequest request, Locale locale) throws Exception {
-		
-
-		//display menu
-		setMenu(model,request);
-		
-		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		CustomerOption dbEntity =	null;	
-
-		if(option.getId() != null && option.getId() >0) { //edit entry
-			
-			//get from DB
-			dbEntity = customerOptionService.getById(option.getId());
-			
-			if(dbEntity==null) {
-				return "redirect:/admin/options/options.html";
-			}
-		}
-		
-		//validate if it contains an existing code
-		CustomerOption byCode = customerOptionService.getByCode(store, option.getCode());
-		if(byCode!=null && option.getId()==null) {
-			ObjectError error = new ObjectError("code",messages.getMessage("message.code.exist", locale));
-			result.addError(error);
-		}
-
-			
-		Map<String,Language> langs = languageService.getLanguagesMap();
-			
-
-		List<CustomerOptionDescription> descriptions = option.getDescriptionsList();
-		
-		if(descriptions!=null) {
-				
-				for(CustomerOptionDescription description : descriptions) {
-					
-					if(StringUtils.isBlank(description.getName())) {
-						ObjectError error = new ObjectError("name",messages.getMessage("message.name.required", locale));
-						result.addError(error);
-					} else {
-					
-						String code = description.getLanguage().getCode();
-						Language l = langs.get(code);
-						description.setLanguage(l);
-						description.setCustomerOption(option);
-					
-					}
-	
-				}
-				
-		}
-			
-		option.setDescriptions(new HashSet<CustomerOptionDescription>(descriptions));
-		option.setMerchantStore(store);
-
-		
-		if (result.hasErrors()) {
-			return ControllerConstants.Tiles.Customer.optionDetails;
-		}
-		
-
-		
-		
-		customerOptionService.saveOrUpdate(option);
-
-
-		
-
-		model.addAttribute("success","success");
-		return ControllerConstants.Tiles.Customer.optionDetails;
-	}
-
-	
-	
-	@SuppressWarnings("unchecked")
-	@PreAuthorize("hasRole('CUSTOMER')")
-	@RequestMapping(value="/admin/customers/options/paging.html", method=RequestMethod.POST)
-	public @ResponseBody ResponseEntity<String> pageOptions(HttpServletRequest request, HttpServletResponse response) {
-
-		AjaxResponse resp = new AjaxResponse();
-
-		
-		try {
-			
-			
-			Language language = (Language)request.getAttribute("LANGUAGE");	
-		
-			MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-			
-			List<CustomerOption> options = null;
-					
-
-				
-			options = customerOptionService.listByStore(store, language);
-				
-
-					
-					
-
-			for(CustomerOption option : options) {
-				
-				@SuppressWarnings("rawtypes")
-				Map entry = new HashMap();
-				entry.put("id", option.getId());
-				
-				CustomerOptionDescription description = option.getDescriptions().iterator().next();
-				
-				entry.put("name", description.getName());
-				entry.put("type", option.getCustomerOptionType());
-				entry.put("active", option.isActive());
-				entry.put("public", option.isPublicOption());
-				resp.addDataEntry(entry);
-				
-				
-			}
-			
-			resp.setStatus(AjaxResponse.RESPONSE_STATUS_SUCCESS);
-			
-
-		
-		} catch (Exception e) {
-			LOGGER.error("Error while paging options", e);
-			resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-		}
-		
-		String returnString = resp.toJSONString();
-		final HttpHeaders httpHeaders= new HttpHeaders();
-	    httpHeaders.setContentType(MediaType.APPLICATION_JSON_UTF8);
-		return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-		
-		
-	}
-	
-	
-
-	
-	private void setMenu(Model model, HttpServletRequest request) throws Exception {
-		
-		//display menu
-		Map<String,String> activeMenus = new HashMap<String,String>();
-		activeMenus.put("customer", "customer");
-		activeMenus.put("customer-options", "customer-options");
-		
-		@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);
-		//
-		
-	}
-	
-	@PreAuthorize("hasRole('CUSTOMER')")
-	@RequestMapping(value="/admin/customers/options/remove.html", method=RequestMethod.POST)
-	public @ResponseBody ResponseEntity<String> deleteOption(HttpServletRequest request, HttpServletResponse response, Locale locale) {
-		String sid = request.getParameter("id");
-
-		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		
-		AjaxResponse resp = new AjaxResponse();
-
-		
-		try {
-			
-			Long id = Long.parseLong(sid);
-			
-			CustomerOption entity = customerOptionService.getById(id);
-
-			if(entity==null || entity.getMerchantStore().getId().intValue()!=store.getId().intValue()) {
-
-				resp.setStatusMessage(messages.getMessage("message.unauthorized", locale));
-				resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);			
-				
-			} else {
-				
-				customerOptionService.delete(entity);
-				resp.setStatus(AjaxResponse.RESPONSE_OPERATION_COMPLETED);
-				
-			}
-		
-		
-		} catch (Exception e) {
-			LOGGER.error("Error while deleting option", e);
-			resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-			resp.setErrorMessage(e);
-		}
-		
-		String returnString = resp.toJSONString();
-		final HttpHeaders httpHeaders= new HttpHeaders();
-	    httpHeaders.setContentType(MediaType.APPLICATION_JSON_UTF8);
-		return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-	}
-
-}

@@ -1,368 +0,0 @@
-package com.salesmanager.shop.admin.controller.customers;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-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.language.LanguageService;
-import com.salesmanager.core.business.utils.ajax.AjaxResponse;
-import com.salesmanager.core.model.customer.attribute.*;
-import com.salesmanager.core.model.merchant.MerchantStore;
-import com.salesmanager.core.model.reference.language.Language;
-import com.salesmanager.shop.admin.controller.ControllerConstants;
-import com.salesmanager.shop.admin.model.web.Menu;
-import com.salesmanager.shop.constants.Constants;
-import com.salesmanager.shop.utils.LabelUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.validation.ObjectError;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-@Controller
-public class CustomerOptionsSetController {
-	
-	@Inject
-	private LanguageService languageService;
-	
-	@Inject
-	private CustomerOptionSetService customerOptionSetService;
-	
-	@Inject
-	private CustomerOptionService customerOptionService;
-	
-	@Inject
-	private CustomerOptionValueService customerOptionValueService;
-	
-	@Inject
-	private LabelUtils messages;
-	
-	private static final Logger LOGGER = LoggerFactory.getLogger(CustomerOptionsSetController.class);
-	
-	
-	@PreAuthorize("hasRole('CUSTOMER')")
-	@RequestMapping(value="/admin/customers/optionsset/list.html", method=RequestMethod.GET)
-	public String displayOptions(Model model, HttpServletRequest request, HttpServletResponse response, Locale locale) throws Exception {
-		
-		Language language = languageService.toLanguage(locale);
-		
-		
-		this.setMenu(model, request);
-		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-
-		
-		//get options 
-		List<CustomerOption> options = customerOptionService.listByStore(store, language);
-		
-		
-		//get values
-		List<CustomerOptionValue> optionsValues = customerOptionValueService.listByStore(store, language);
-
-		
-		CustomerOptionSet optionSet = new CustomerOptionSet();
-		
-		model.addAttribute("optionSet", optionSet);
-		model.addAttribute("options", options);
-		model.addAttribute("optionsValues", optionsValues);
-		return ControllerConstants.Tiles.Customer.optionsSet;
-		
-
-	}
-	
-	
-	@PreAuthorize("hasRole('CUSTOMER')")
-	@RequestMapping(value="/admin/customers/optionsset/save.html", method=RequestMethod.POST)
-	public String saveOptionSet(@Valid @ModelAttribute("optionSet") CustomerOptionSet optionSet, BindingResult result, Model model, HttpServletRequest request, Locale locale) throws Exception {
-		
-
-		//display menu
-		setMenu(model,request);
-		
-		Language language = languageService.toLanguage(locale);
-		
-		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		
-		
-		/** reference objects **/
-		
-		//get options 
-		List<CustomerOption> options = customerOptionService.listByStore(store, language);
-		
-		
-		//get values
-		List<CustomerOptionValue> optionsValues = customerOptionValueService.listByStore(store, language);
-
-
-		model.addAttribute("options", options);
-		model.addAttribute("optionsValues", optionsValues);
-
-		if(optionSet.getCustomerOption()==null || optionSet.getCustomerOptionValue()==null) {
-			model.addAttribute("errorMessageAssociation",messages.getMessage("message.optionset.noassociation", locale));
-			ObjectError error = new ObjectError("customerOptionValue.id",messages.getMessage("message.optionset.noassociation", locale));
-			result.addError(error);
-			return ControllerConstants.Tiles.Customer.optionsSet;
-		}
-		
-		//see if association already exist
-		CustomerOption option =	null;	
-
-		//get from DB
-		//option = customerOptionService.getById(optionSet.getPk().getCustomerOption().getId());
-		option = customerOptionService.getById(optionSet.getCustomerOption().getId());
-			
-		if(option==null) {
-				return "redirect:/admin/customers/optionsset/list.html";
-		}
-
-		//CustomerOptionValue optionValue = customerOptionValueService.getById(optionSet.getPk().getCustomerOptionValue().getId());
-		CustomerOptionValue optionValue = customerOptionValueService.getById(optionSet.getCustomerOptionValue().getId());
-			
-		if(optionValue==null) {
-			return "redirect:/admin/customers/optionsset/list.html";
-		}
-		
-		
-		List<CustomerOptionSet> optionsSet = customerOptionSetService.listByStore(store, language);
-		
-		if(optionsSet!=null && optionsSet.size()>0) {
-			
-			for(CustomerOptionSet optSet : optionsSet) {
-				
-				//CustomerOption opt = optSet.getPk().getCustomerOption();
-				CustomerOption opt = optSet.getCustomerOption();
-				//CustomerOptionValue optValue = optSet.getPk().getCustomerOptionValue();
-				CustomerOptionValue optValue = optSet.getCustomerOptionValue();
-				
-				//if(opt.getId().longValue()==optionSet.getPk().getCustomerOption().getId().longValue() 
-				if(opt.getId().longValue()==optionSet.getCustomerOption().getId().longValue()
-						//&& optValue.getId().longValue() == optionSet.getPk().getCustomerOptionValue().getId().longValue()) {
-						&& optValue.getId().longValue() == optionSet.getCustomerOptionValue().getId().longValue()) {
-						model.addAttribute("errorMessageAssociation",messages.getMessage("message.optionset.optionassociationexists", locale));
-						ObjectError error = new ObjectError("customerOptionValue.id",messages.getMessage("message.optionset.optionassociationexists", locale));
-						result.addError(error);
-						break;
-				}
-			}
-		}
-		
-		if (result.hasErrors()) {
-			return ControllerConstants.Tiles.Customer.optionsSet;
-		}
-		
-		
-		//optionSet.getPk().setCustomerOption(option);
-		optionSet.setCustomerOption(option);
-		//optionSet.getPk().setCustomerOptionValue(optionValue);
-		optionSet.setCustomerOptionValue(optionValue);
-		customerOptionSetService.create(optionSet);
-
-		
-
-
-		model.addAttribute("success","success");
-		return ControllerConstants.Tiles.Customer.optionsSet;
-	}
-
-	
-	
-	@SuppressWarnings("unchecked")
-	@PreAuthorize("hasRole('CUSTOMER')")
-	@RequestMapping(value="/admin/customers/optionsset/paging.html", method=RequestMethod.POST)
-	public @ResponseBody ResponseEntity<String>  pageOptionsSet(HttpServletRequest request, HttpServletResponse response) {
-
-		AjaxResponse resp = new AjaxResponse();
-
-		
-		try {
-			
-			
-			Language language = (Language)request.getAttribute("LANGUAGE");	
-			MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-			//List<CustomerOption> options = null;
-				
-			List<CustomerOptionSet> optionSet = customerOptionSetService.listByStore(store, language);
-			//for(CustomerOption option : options) {
-				
-				
-				//Set<CustomerOptionSet> optionSet = option.getCustomerOptions();
-				
-				if(optionSet!=null && optionSet.size()>0) {
-					
-					for(CustomerOptionSet optSet : optionSet) {
-						
-						//CustomerOption customerOption = optSet.getPk().getCustomerOption();
-						CustomerOption customerOption = optSet.getCustomerOption();
-						//CustomerOptionValue customerOptionValue = optSet.getPk().getCustomerOptionValue();
-						CustomerOptionValue customerOptionValue = optSet.getCustomerOptionValue();
-						
-						@SuppressWarnings("rawtypes")
-						Map entry = new HashMap();
-						
-						
-						entry.put("id", optSet.getId());
-
-						CustomerOptionDescription description = customerOption.getDescriptionsSettoList().get(0);
-						CustomerOptionValueDescription valueDescription = customerOptionValue.getDescriptionsSettoList().get(0);
-						
-						entry.put("optionCode", customerOption.getCode());
-						entry.put("optionName", description.getName());
-						entry.put("optionValueCode", customerOptionValue.getCode());
-						entry.put("optionValueName", valueDescription.getName());
-						entry.put("order", customerOptionValue.getSortOrder());
-						resp.addDataEntry(entry);
-					
-					}
-				
-				}
-				
-				
-			//}
-			
-			resp.setStatus(AjaxResponse.RESPONSE_STATUS_SUCCESS);
-			
-
-		
-		} catch (Exception e) {
-			LOGGER.error("Error while paging options", e);
-			resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-		}
-		
-		String returnString = resp.toJSONString();
-		final HttpHeaders httpHeaders= new HttpHeaders();
-	    httpHeaders.setContentType(MediaType.APPLICATION_JSON_UTF8);
-		return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-		
-		
-	}
-	
-	
-
-	
-	private void setMenu(Model model, HttpServletRequest request) throws Exception {
-		
-		//display menu
-		Map<String,String> activeMenus = new HashMap<String,String>();
-		activeMenus.put("customer", "customer");
-		activeMenus.put("customer-options", "customer-options");
-		
-		@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);
-		//
-		
-	}
-	
-	@PreAuthorize("hasRole('CUSTOMER')")
-	@RequestMapping(value="/admin/customers/optionsset/remove.html", method=RequestMethod.POST)
-	public @ResponseBody ResponseEntity<String> deleteOptionSet(HttpServletRequest request, HttpServletResponse response, Locale locale) {
-		String sid = request.getParameter("id");
-
-		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		AjaxResponse resp = new AjaxResponse();
-
-		
-		try {
-			
-
-			
-			Long optionSetId = Long.parseLong(sid);
-
-			
-			CustomerOptionSet entity = customerOptionSetService.getById(optionSetId);
-			//if(entity==null || entity.getPk().getCustomerOption().getMerchantStore().getId().intValue()!=store.getId().intValue()) {
-			if(entity==null || entity.getCustomerOption().getMerchantStore().getId().intValue()!=store.getId().intValue()) {
-
-				resp.setStatusMessage(messages.getMessage("message.unauthorized", locale));
-				resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);			
-				
-			} else {
-				
-				customerOptionSetService.delete(entity);
-				resp.setStatus(AjaxResponse.RESPONSE_OPERATION_COMPLETED);
-				
-			}
-		
-		
-		} catch (Exception e) {
-			LOGGER.error("Error while deleting option", e);
-			resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-			resp.setErrorMessage(e);
-		}
-		
-		String returnString = resp.toJSONString();
-		final HttpHeaders httpHeaders= new HttpHeaders();
-	    httpHeaders.setContentType(MediaType.APPLICATION_JSON_UTF8);
-		return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-	}
-	
-	
-
-	@PreAuthorize("hasRole('CUSTOMER')")
-	@RequestMapping(value="/admin/customers/optionsset/update.html", method=RequestMethod.POST)
-	public @ResponseBody ResponseEntity<String> updateOrder(HttpServletRequest request, HttpServletResponse response) {
-		String values = request.getParameter("_oldValues");
-		String order = request.getParameter("order");
-
-		AjaxResponse resp = new AjaxResponse();
-
-		try {
-			
-			/**
-			 * Values
-			 */
-			ObjectMapper mapper = new ObjectMapper();
-			@SuppressWarnings("rawtypes")
-			Map conf = mapper.readValue(values, Map.class);
-			
-			String sid = (String)conf.get("id");
-
-			Long optionId = Long.parseLong(sid);
-
-			CustomerOptionSet entity = customerOptionSetService.getById(optionId);
-			
-			
-			if(entity!=null) {
-				
-				entity.setSortOrder(Integer.parseInt(order));
-				customerOptionSetService.update(entity);
-				resp.setStatus(AjaxResponse.RESPONSE_OPERATION_COMPLETED);
-				
-			}
-
-		
-		} catch (Exception e) {
-			LOGGER.error("Error while paging shipping countries", e);
-			resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-		}
-		
-		String returnString = resp.toJSONString();
-		final HttpHeaders httpHeaders= new HttpHeaders();
-	    httpHeaders.setContentType(MediaType.APPLICATION_JSON_UTF8);
-		return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-	}
-	
-	
-
-}

@@ -1,345 +0,0 @@
-package com.salesmanager.shop.admin.controller.customers;
-
-import com.salesmanager.core.business.services.customer.attribute.CustomerOptionValueService;
-import com.salesmanager.core.business.services.reference.language.LanguageService;
-import com.salesmanager.core.business.utils.ajax.AjaxResponse;
-import com.salesmanager.core.model.customer.attribute.CustomerOptionValue;
-import com.salesmanager.core.model.customer.attribute.CustomerOptionValueDescription;
-import com.salesmanager.core.model.merchant.MerchantStore;
-import com.salesmanager.core.model.reference.language.Language;
-import com.salesmanager.shop.admin.controller.ControllerConstants;
-import com.salesmanager.shop.admin.model.web.Menu;
-import com.salesmanager.shop.constants.Constants;
-import com.salesmanager.shop.utils.LabelUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.validation.ObjectError;
-import org.springframework.web.bind.annotation.*;
-
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.util.*;
-
-@Controller
-public class CustomerOptionsValueController {
-	
-	@Inject
-	LanguageService languageService;
-	
-
-	@Inject
-	private CustomerOptionValueService customerOptionValueService;
-	
-	@Inject
-	LabelUtils messages;
-
-	private static final Logger LOGGER = LoggerFactory.getLogger(CustomerOptionsValueController.class);
-	
-	/**
-	 * Displays the list of customer options values
-	 * @param model
-	 * @param request
-	 * @param response
-	 * @return
-	 * @throws Exception
-	 */
-	@PreAuthorize("hasRole('CUSTOMER')")
-	@RequestMapping(value="/admin/customers/options/values/list.html", method=RequestMethod.GET)
-	public String displayOptionValues(Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		
-		
-		setMenu(model,request);
-		return ControllerConstants.Tiles.Customer.optionsValuesList;
-		
-		
-		
-	}
-	
-	/**
-	 * Display an option value in edit mode
-	 * @param id
-	 * @param request
-	 * @param response
-	 * @param model
-	 * @param locale
-	 * @return
-	 * @throws Exception
-	 */
-	@PreAuthorize("hasRole('CUSTOMER')")
-	@RequestMapping(value="/admin/customers/options/values/edit.html", method=RequestMethod.GET)
-	public String displayOptionValueEdit(@RequestParam("id") long id, HttpServletRequest request, HttpServletResponse response, Model model, Locale locale) throws Exception {
-		return displayOption(id,request,response,model,locale);
-	}
-	
-	@PreAuthorize("hasRole('CUSTOMER')")
-	@RequestMapping(value="/admin/customers/options/values/create.html", method=RequestMethod.GET)
-	public String displayOptionValueCreate(HttpServletRequest request, HttpServletResponse response, Model model, Locale locale) throws Exception {
-		return displayOption(null,request,response,model,locale);
-	}
-	
-	private String displayOption(Long id, HttpServletRequest request, HttpServletResponse response,Model model,Locale locale) throws Exception {
-
-		this.setMenu(model, request);
-		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		
-		List<Language> languages = store.getLanguages();
-
-		Set<CustomerOptionValueDescription> descriptions = new HashSet<CustomerOptionValueDescription>();
-		CustomerOptionValue option = new CustomerOptionValue();
-		
-		if(id!=null && id!=0) {//edit mode
-			
-			
-			option = customerOptionValueService.getById(id);
-			
-			
-			if(option==null) {
-				return "redirect:/admin/customers/options/values/list.html";
-			}
-			
-			if(option.getMerchantStore().getId().intValue()!=store.getId().intValue()) {
-				return "redirect:/admin/customers/options/values/list.html";
-			}
-			
-			Set<CustomerOptionValueDescription> optionDescriptions = option.getDescriptions();
-
-			for(Language l : languages) {
-			
-				CustomerOptionValueDescription optionDescription = null;
-				
-				if(optionDescriptions!=null) {
-					for(CustomerOptionValueDescription description : optionDescriptions) {
-						String code = description.getLanguage().getCode();
-						if(code.equals(l.getCode())) {
-							optionDescription = description;
-						}
-					}
-				}
-				
-				if(optionDescription==null) {
-					optionDescription = new CustomerOptionValueDescription();
-					optionDescription.setLanguage(l);
-				}
-				
-				descriptions.add(optionDescription);
-			}
-
-		} else {
-			
-			for(Language l : languages) {
-				CustomerOptionValueDescription desc = new CustomerOptionValueDescription();
-				desc.setLanguage(l);
-				descriptions.add(desc);
-			}
-			
-			option.setDescriptions(descriptions);
-		}
-		
-
-		
-		model.addAttribute("optionValue", option);
-		return ControllerConstants.Tiles.Customer.optionsValueDetails;
-		
-		
-	}
-		
-	
-	@PreAuthorize("hasRole('CUSTOMER')")
-	@RequestMapping(value="/admin/customers/options/values/save.html", method=RequestMethod.POST)
-	public String saveOption(@Valid @ModelAttribute("optionValue") CustomerOptionValue optionValue, BindingResult result, Model model, HttpServletRequest request, Locale locale) throws Exception {
-		
-
-		//display menu
-		setMenu(model,request);
-		
-		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		CustomerOptionValue dbEntity =	null;	
-
-		if(optionValue.getId() != null && optionValue.getId() >0) { //edit entry
-			
-			//get from DB
-			dbEntity = customerOptionValueService.getById(optionValue.getId());
-			
-			if(dbEntity==null) {
-				return "redirect:/admin/customers/options/values/list.html";
-			}
-			
-			if(dbEntity.getMerchantStore().getId().intValue()!=store.getId().intValue()) {
-				return "redirect:/admin/customers/options/values/list.html";
-			}
-		}
-		
-		//validate if it contains an existing code
-		CustomerOptionValue byCode = customerOptionValueService.getByCode(store, optionValue.getCode());
-		if(byCode!=null && optionValue.getId()==null) {
-			ObjectError error = new ObjectError("code",messages.getMessage("message.code.exist", locale));
-			result.addError(error);
-		}
-
-			
-		Map<String,Language> langs = languageService.getLanguagesMap();
-			
-
-		List<CustomerOptionValueDescription> descriptions = optionValue.getDescriptionsList();
-		if(descriptions!=null && descriptions.size()>0) {
-			
-				Set<CustomerOptionValueDescription> descs = new HashSet<CustomerOptionValueDescription>();
-					optionValue.setDescriptions(descs);
-					for(CustomerOptionValueDescription description : descriptions) {
-						
-						if(StringUtils.isBlank(description.getName())) {
-							ObjectError error = new ObjectError("name",messages.getMessage("message.name.required", locale));
-							result.addError(error);
-						} else {
-							String code = description.getLanguage().getCode();
-							Language l = langs.get(code);
-							description.setLanguage(l);
-							description.setCustomerOptionValue(optionValue);
-							descs.add(description);
-						}	
-					}
-
-		} else {
-			
-			ObjectError error = new ObjectError("name",messages.getMessage("message.name.required", locale));
-			result.addError(error);
-			
-		}
-			
-
-		optionValue.setMerchantStore(store);
-
-		
-		if (result.hasErrors()) {
-			return ControllerConstants.Tiles.Customer.optionsValueDetails;
-		}
-		
-
-		customerOptionValueService.saveOrUpdate(optionValue);
-
-		model.addAttribute("success","success");
-		return ControllerConstants.Tiles.Customer.optionsValueDetails;
-	}
-
-	
-	
-	@SuppressWarnings("unchecked")
-	@PreAuthorize("hasRole('CUSTOMER')")
-	@RequestMapping(value="/admin/customers/options/values/paging.html", method=RequestMethod.POST)
-	public @ResponseBody ResponseEntity<String> pageOptions(HttpServletRequest request, HttpServletResponse response) {
-
-		AjaxResponse resp = new AjaxResponse();
-
-		
-		try {
-			
-			
-			Language language = (Language)request.getAttribute("LANGUAGE");	
-		
-			MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-			
-			List<CustomerOptionValue> options = null;
-					
-	
-			options = customerOptionValueService.listByStore(store, language);
-
-			for(CustomerOptionValue option : options) {
-				
-				@SuppressWarnings("rawtypes")
-				Map entry = new HashMap();
-				entry.put("id", option.getId());
-				entry.put("code", option.getCode());
-				CustomerOptionValueDescription description = option.getDescriptions().iterator().next();
-				
-				entry.put("name", description.getName());
-				resp.addDataEntry(entry);
-				
-				
-			}
-			
-			resp.setStatus(AjaxResponse.RESPONSE_STATUS_SUCCESS);
-			
-
-		
-		} catch (Exception e) {
-			LOGGER.error("Error while paging options", e);
-			resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-		}
-		
-		String returnString = resp.toJSONString();
-		final HttpHeaders httpHeaders= new HttpHeaders();
-	    httpHeaders.setContentType(MediaType.APPLICATION_JSON_UTF8);
-		return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-		
-		
-	}
-	
-	@PreAuthorize("hasRole('CUSTOMER')")
-	@RequestMapping(value="/admin/customers/options/values/remove.html", method=RequestMethod.POST)
-	public @ResponseBody ResponseEntity<String> deleteOptionValue(HttpServletRequest request, HttpServletResponse response, Locale locale) {
-		String sid = request.getParameter("id");
-
-		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		
-		AjaxResponse resp = new AjaxResponse();
-
-		
-		try {
-			
-			Long id = Long.parseLong(sid);
-			
-			CustomerOptionValue entity = customerOptionValueService.getById(id);
-
-			if(entity==null || entity.getMerchantStore().getId().intValue()!=store.getId().intValue()) {
-				resp.setStatusMessage(messages.getMessage("message.unauthorized", locale));
-				resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);			
-			} else {
-				customerOptionValueService.delete(entity);
-				resp.setStatus(AjaxResponse.RESPONSE_OPERATION_COMPLETED);
-				
-			}
-		
-		
-		} catch (Exception e) {
-			LOGGER.error("Error while deleting option", e);
-			resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-			resp.setErrorMessage(e);
-		}
-		
-		String returnString = resp.toJSONString();
-		final HttpHeaders httpHeaders= new HttpHeaders();
-	    httpHeaders.setContentType(MediaType.APPLICATION_JSON_UTF8);
-		return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-	}
-	
-
-	
-	private void setMenu(Model model, HttpServletRequest request) throws Exception {
-		
-		//display menu
-		Map<String,String> activeMenus = new HashMap<String,String>();
-		activeMenus.put("customer", "customer");
-		activeMenus.put("customer-options", "customer-options");
-		
-		@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);
-		//
-		
-	}
-
-}

@@ -1,487 +0,0 @@
-package com.salesmanager.shop.admin.controller.merchant;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.validation.ObjectError;
-import org.springframework.web.bind.annotation.ModelAttribute;
-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.modules.email.Email;
-import com.salesmanager.core.business.services.merchant.MerchantStoreService;
-import com.salesmanager.core.business.services.reference.country.CountryService;
-import com.salesmanager.core.business.services.reference.currency.CurrencyService;
-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.services.user.UserService;
-import com.salesmanager.core.business.utils.ajax.AjaxResponse;
-import com.salesmanager.core.model.merchant.MerchantStore;
-import com.salesmanager.core.model.reference.country.Country;
-import com.salesmanager.core.model.reference.currency.Currency;
-import com.salesmanager.core.model.reference.language.Language;
-import com.salesmanager.core.model.reference.zone.Zone;
-import com.salesmanager.core.model.user.User;
-import com.salesmanager.shop.admin.controller.ControllerConstants;
-import com.salesmanager.shop.admin.model.reference.Size;
-import com.salesmanager.shop.admin.model.reference.Weight;
-import com.salesmanager.shop.admin.model.web.Menu;
-import com.salesmanager.shop.constants.Constants;
-import com.salesmanager.shop.constants.EmailConstants;
-import com.salesmanager.shop.utils.DateUtil;
-import com.salesmanager.shop.utils.EmailUtils;
-import com.salesmanager.shop.utils.FilePathUtils;
-import com.salesmanager.shop.utils.LabelUtils;
-import com.salesmanager.shop.utils.LocaleUtils;
-import com.salesmanager.shop.utils.UserUtils;
-
-@Controller
-public class MerchantStoreController {
-
-	private static final Logger LOGGER = LoggerFactory.getLogger(MerchantStoreController.class);
-
-	@Inject
-	private MerchantStoreService merchantStoreService;
-
-	@Inject
-	private CountryService countryService;
-
-	@Inject
-	private ZoneService zoneService;
-
-	@Inject
-	private LanguageService languageService;
-
-	@Inject
-	private CurrencyService currencyService;
-
-	@Inject
-	private UserService userService;
-
-	@Inject
-	private LabelUtils messages;
-
-	@Inject
-	private EmailService emailService;
-
-	@Inject
-	private EmailUtils emailUtils;
-
-	@Inject
-	private FilePathUtils filePathUtils;
-
-	private final static String NEW_STORE_TMPL = "email_template_new_store.ftl";
-
-	@PreAuthorize("hasRole('ADMIN')")
-	@RequestMapping(value = "/admin/store/list.html", method = RequestMethod.GET)
-	public String displayStores(Model model, HttpServletRequest request, HttpServletResponse response, Locale locale)
-			throws Exception {
-
-		setMenu(model, request);
-		return ControllerConstants.Tiles.Store.stores;
-	}
-
-	@PreAuthorize("hasRole('ADMIN')")
-	@RequestMapping(value = "/admin/store/paging.html", method = RequestMethod.POST)
-	public @ResponseBody ResponseEntity<String> pageStores(HttpServletRequest request, HttpServletResponse response) {
-
-		AjaxResponse resp = new AjaxResponse();
-
-		try {
-
-			List<MerchantStore> stores = merchantStoreService.findAllStoreCodeNameEmail();
-
-			for (MerchantStore store : stores) {
-
-				if (!store.getCode().equals(MerchantStore.DEFAULT_STORE)) {
-					Map<String, String> entry = new HashMap<String, String>();
-					entry.put("storeId", String.valueOf(store.getId()));
-					entry.put("code", store.getCode());
-					entry.put("name", store.getStorename());
-					entry.put("email", store.getStoreEmailAddress());
-					resp.addDataEntry(entry);
-				}
-
-			}
-
-			resp.setStatus(AjaxResponse.RESPONSE_STATUS_SUCCESS);
-
-		} catch (Exception e) {
-			LOGGER.error("Error while paging products", e);
-			resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-		}
-
-		String returnString = resp.toJSONString();
-
-		final HttpHeaders httpHeaders = new HttpHeaders();
-		httpHeaders.setContentType(MediaType.APPLICATION_JSON_UTF8);
-		return new ResponseEntity<String>(returnString, httpHeaders, HttpStatus.OK);
-	}
-
-	@PreAuthorize("hasRole('STORE')")
-	@RequestMapping(value = "/admin/store/storeCreate.html", method = RequestMethod.GET)
-	public String displayMerchantStoreCreate(Model model, HttpServletRequest request, HttpServletResponse response,
-			Locale locale) throws Exception {
-
-		setMenu(model, request);
-
-		MerchantStore store = new MerchantStore();
-
-		MerchantStore sessionStore = (MerchantStore) request.getAttribute(Constants.ADMIN_STORE);
-		store.setCurrency(sessionStore.getCurrency());
-		store.setCountry(sessionStore.getCountry());
-		store.setZone(sessionStore.getZone());
-		store.setStorestateprovince(sessionStore.getStorestateprovince());
-		store.setLanguages(sessionStore.getLanguages());
-		store.setDomainName(sessionStore.getDomainName());
-
-		return displayMerchantStore(store, model, request, response, locale);
-	}
-
-	@PreAuthorize("hasRole('STORE')")
-	@RequestMapping(value = "/admin/store/store.html", method = RequestMethod.GET)
-	public String displayMerchantStore(Model model, HttpServletRequest request, HttpServletResponse response,
-			Locale locale) throws Exception {
-
-		setMenu(model, request);
-		MerchantStore store = (MerchantStore) request.getAttribute(Constants.ADMIN_STORE);
-		return displayMerchantStore(store, model, request, response, locale);
-	}
-
-	@PreAuthorize("hasRole('STORE')")
-	@RequestMapping(value = "/admin/store/editStore.html", method = RequestMethod.GET)
-	public String displayMerchantStore(@ModelAttribute("id") Integer id, Model model, HttpServletRequest request,
-			HttpServletResponse response, Locale locale) throws Exception {
-
-		setMenu(model, request);
-		MerchantStore store = merchantStoreService.getById(id);
-		return displayMerchantStore(store, model, request, response, locale);
-	}
-
-	private String displayMerchantStore(MerchantStore store, Model model, HttpServletRequest request,
-			HttpServletResponse response, Locale locale) throws Exception {
-
-		setMenu(model, request);
-		Language language = (Language) request.getAttribute("LANGUAGE");
-		List<Language> languages = languageService.getLanguages();
-		List<Currency> currencies = currencyService.list();
-		if (CollectionUtils.isNotEmpty(currencies)) {
-			  Collections.sort(currencies, new Comparator<Currency>() {
-			      @Override
-			      public int compare(final Currency object1, final Currency object2) {
-			          return object1.getName().compareTo(object2.getName());
-			      }
-			  });
-			}
-		Date dt = store.getInBusinessSince();
-		if (dt != null) {
-			store.setDateBusinessSince(DateUtil.formatDate(dt));
-		} else {
-			store.setDateBusinessSince(DateUtil.formatDate(new Date()));
-		}
-
-		// get countries
-		List<Country> countries = countryService.getCountries(language);
-
-		List<Weight> weights = new ArrayList<Weight>();
-		weights.add(new Weight("LB", messages.getMessage("label.generic.weightunit.LB", locale)));
-		weights.add(new Weight("KG", messages.getMessage("label.generic.weightunit.KG", locale)));
-
-		List<Size> sizes = new ArrayList<Size>();
-		sizes.add(new Size("CM", messages.getMessage("label.generic.sizeunit.CM", locale)));
-		sizes.add(new Size("IN", messages.getMessage("label.generic.sizeunit.IN", locale)));
-
-		// display menu
-
-		model.addAttribute("countries", countries);
-		model.addAttribute("languages", languages);
-		model.addAttribute("currencies", currencies);
-
-		model.addAttribute("weights", weights);
-		model.addAttribute("sizes", sizes);
-		model.addAttribute("store", store);
-
-		return "admin-store";
-
-	}
-
-	@PreAuthorize("hasRole('STORE')")
-	@RequestMapping(value = "/admin/store/save.html", method = RequestMethod.POST)
-	public String saveMerchantStore(@Valid @ModelAttribute("store") MerchantStore store, BindingResult result,
-			Model model, HttpServletRequest request, HttpServletResponse response, Locale locale) throws Exception {
-
-		setMenu(model, request);
-		MerchantStore sessionStore = (MerchantStore) request.getAttribute(Constants.ADMIN_STORE);
-
-		if (store.getId() != null) {
-			if (store.getId().intValue() != sessionStore.getId().intValue()) {
-				return "redirect:/admin/store/store.html";
-			}
-		}
-
-		Date date = new Date();
-		if (!StringUtils.isBlank(store.getDateBusinessSince())) {
-			try {
-				date = DateUtil.getDate(store.getDateBusinessSince());
-				store.setInBusinessSince(date);
-			} catch (Exception e) {
-				ObjectError error = new ObjectError("dateBusinessSince",
-						messages.getMessage("message.invalid.date", locale));
-				result.addError(error);
-			}
-		}
-
-		List<Currency> currencies = currencyService.list();
-
-		Language language = (Language) request.getAttribute("LANGUAGE");
-		List<Language> languages = languageService.getLanguages();
-
-		// get countries
-		List<Country> countries = countryService.getCountries(language);
-
-		List<Weight> weights = new ArrayList<Weight>();
-		weights.add(new Weight("LB", messages.getMessage("label.generic.weightunit.LB", locale)));
-		weights.add(new Weight("KG", messages.getMessage("label.generic.weightunit.KG", locale)));
-
-		List<Size> sizes = new ArrayList<Size>();
-		sizes.add(new Size("CM", messages.getMessage("label.generic.sizeunit.CM", locale)));
-		sizes.add(new Size("IN", messages.getMessage("label.generic.sizeunit.IN", locale)));
-
-		model.addAttribute("weights", weights);
-		model.addAttribute("sizes", sizes);
-
-		model.addAttribute("countries", countries);
-		model.addAttribute("languages", languages);
-		model.addAttribute("currencies", currencies);
-
-		Country c = store.getCountry();
-		List<Zone> zonesList = zoneService.getZones(c, language);
-
-		if ((zonesList == null || zonesList.size() == 0) && StringUtils.isBlank(store.getStorestateprovince())) {
-
-			ObjectError error = new ObjectError("zone.code", messages.getMessage("merchant.zone.invalid", locale));
-			result.addError(error);
-
-		}
-
-		if (result.hasErrors()) {
-			return "admin-store";
-		}
-
-		// get country
-		Country country = store.getCountry();
-		country = countryService.getByCode(country.getIsoCode());
-		Zone zone = store.getZone();
-		if (zone != null) {
-			zone = zoneService.getByCode(zone.getCode());
-		}
-		Currency currency = store.getCurrency();
-		currency = currencyService.getById(currency.getId());
-
-		List<Language> supportedLanguages = store.getLanguages();
-		List<Language> supportedLanguagesList = new ArrayList<Language>();
-		Map<String, Language> languagesMap = languageService.getLanguagesMap();
-		for (Language lang : supportedLanguages) {
-
-			Language l = languagesMap.get(lang.getCode());
-			if (l != null) {
-				supportedLanguagesList.add(l);
-			}
-
-		}
-
-		Language defaultLanguage = store.getDefaultLanguage();
-		defaultLanguage = languageService.getById(defaultLanguage.getId());
-		if (defaultLanguage != null) {
-			store.setDefaultLanguage(defaultLanguage);
-		}
-
-		Locale storeLocale = LocaleUtils.getLocale(defaultLanguage);
-
-		store.setStoreTemplate(sessionStore.getStoreTemplate());
-		store.setCountry(country);
-		store.setZone(zone);
-		store.setCurrency(currency);
-		store.setDefaultLanguage(defaultLanguage);
-		store.setLanguages(supportedLanguagesList);
-		store.setLanguages(supportedLanguagesList);
-
-		merchantStoreService.saveOrUpdate(store);
-
-		if (!store.getCode().equals(sessionStore.getCode())) {// create store
-			// send email
-
-			try {
-
-				Map<String, String> templateTokens = emailUtils.createEmailObjectsMap(request.getContextPath(), store,
-						messages, storeLocale);
-				templateTokens.put(EmailConstants.EMAIL_NEW_STORE_TEXT,
-						messages.getMessage("email.newstore.text", storeLocale));
-				templateTokens.put(EmailConstants.EMAIL_STORE_NAME,
-						messages.getMessage("email.newstore.name", new String[] { store.getStorename() }, storeLocale));
-				templateTokens.put(EmailConstants.EMAIL_ADMIN_STORE_INFO_LABEL,
-						messages.getMessage("email.newstore.info", storeLocale));
-
-				templateTokens.put(EmailConstants.EMAIL_ADMIN_URL_LABEL,
-						messages.getMessage("label.adminurl", storeLocale));
-				templateTokens.put(EmailConstants.EMAIL_ADMIN_URL, filePathUtils.buildAdminUri(store, request));
-
-				Email email = new Email();
-				email.setFrom(store.getStorename());
-				email.setFromEmail(store.getStoreEmailAddress());
-				email.setSubject(messages.getMessage("email.newstore.title", storeLocale));
-				email.setTo(store.getStoreEmailAddress());
-				email.setTemplateName(NEW_STORE_TMPL);
-				email.setTemplateTokens(templateTokens);
-
-				emailService.sendHtmlEmail(store, email);
-
-			} catch (Exception e) {
-				LOGGER.error("Cannot send email to user", e);
-			}
-
-		}
-
-		sessionStore = merchantStoreService.getByCode(sessionStore.getCode());
-
-		// update session store
-		request.getSession().setAttribute(Constants.ADMIN_STORE, sessionStore);
-
-		model.addAttribute("success", "success");
-		model.addAttribute("store", store);
-
-		return "admin-store";
-	}
-
-	@PreAuthorize("hasRole('AUTH')")
-	@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 new ResponseEntity<String>(resp.toJSONString(), httpHeaders, HttpStatus.OK);
-			}
-
-			MerchantStore store = merchantStoreService.getByCode(code);
-
-			if (store != null) {
-				resp.setStatus(AjaxResponse.CODE_ALREADY_EXIST);
-				return new ResponseEntity<String>(resp.toJSONString(), httpHeaders, HttpStatus.OK);
-			}
-
-			resp.setStatus(AjaxResponse.RESPONSE_OPERATION_COMPLETED);
-
-		} catch (Exception e) {
-			LOGGER.error("Error while getting user", e);
-			resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-			resp.setErrorMessage(e);
-		}
-
-		String returnString = resp.toJSONString();
-
-		return new ResponseEntity<String>(returnString, httpHeaders, HttpStatus.OK);
-	}
-
-	@PreAuthorize("hasRole('ADMIN')")
-	@RequestMapping(value = "/admin/store/remove.html", method = RequestMethod.POST)
-	public @ResponseBody ResponseEntity<String> removeMerchantStore(HttpServletRequest request, Locale locale)
-			throws Exception {
-
-		String sMerchantStoreId = request.getParameter("storeId");
-
-		AjaxResponse resp = new AjaxResponse();
-		final HttpHeaders httpHeaders = new HttpHeaders();
-		httpHeaders.setContentType(MediaType.APPLICATION_JSON_UTF8);
-
-		try {
-
-			Integer storeId = Integer.parseInt(sMerchantStoreId);
-			MerchantStore store = merchantStoreService.getById(storeId);
-
-			User user = userService.getByUserName(request.getRemoteUser());
-
-			/**
-			 * In order to remove a Store the logged in ser must be SUPERADMIN
-			 */
-
-			// check if the user removed has group SUPERADMIN
-			boolean isSuperAdmin = false;
-			if (UserUtils.userInGroup(user, Constants.GROUP_SUPERADMIN)) {
-				isSuperAdmin = true;
-			}
-
-			if (!isSuperAdmin) {
-				resp.setStatusMessage(messages.getMessage("message.security.caanotremovesuperadmin", locale));
-				resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-				String returnString = resp.toJSONString();
-				return new ResponseEntity<String>(returnString, httpHeaders, HttpStatus.OK);
-			}
-
-			merchantStoreService.delete(store);
-
-			resp.setStatus(AjaxResponse.RESPONSE_OPERATION_COMPLETED);
-
-		} catch (Exception e) {
-			LOGGER.error("Error while deleting product price", e);
-			resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-			resp.setErrorMessage(e);
-		}
-
-		String returnString = resp.toJSONString();
-
-		return new ResponseEntity<String>(returnString, httpHeaders, HttpStatus.OK);
-
-	}
-
-	private void setMenu(Model model, HttpServletRequest request) throws Exception {
-
-		// display menu
-		Map<String, String> activeMenus = new HashMap<String, String>();
-		activeMenus.put("store", "store");
-		activeMenus.put("storeDetails", "storeDetails");
-
-		@SuppressWarnings("unchecked")
-		Map<String, Menu> menus = (Map<String, Menu>) request.getAttribute("MENUMAP");
-
-		Menu currentMenu = (Menu) menus.get("store");
-		model.addAttribute("currentMenu", currentMenu);
-		model.addAttribute("activeMenus", activeMenus);
-		//
-
-	}
-
-}

@@ -1,208 +0,0 @@
-package com.salesmanager.shop.admin.controller.merchant;
-
-
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import javax.annotation.Resource;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.multipart.MultipartFile;
-import com.salesmanager.core.business.services.content.ContentService;
-import com.salesmanager.core.business.services.merchant.MerchantStoreService;
-import com.salesmanager.core.business.services.reference.country.CountryService;
-import com.salesmanager.core.business.services.reference.currency.CurrencyService;
-import com.salesmanager.core.business.services.reference.language.LanguageService;
-import com.salesmanager.core.business.services.reference.zone.ZoneService;
-import com.salesmanager.core.business.utils.ajax.AjaxResponse;
-import com.salesmanager.core.model.content.FileContentType;
-import com.salesmanager.core.model.content.InputContentFile;
-import com.salesmanager.core.model.merchant.MerchantStore;
-import com.salesmanager.shop.admin.model.web.Menu;
-import com.salesmanager.shop.constants.Constants;
-
-@Controller
-public class StoreBrandingController {
-	
-	private static final Logger LOGGER = LoggerFactory.getLogger(StoreBrandingController.class);
-	
-	
-	@Inject
-	MerchantStoreService merchantStoreService;
-	
-	@Inject
-	CountryService countryService;
-	
-	@Inject
-	ZoneService zoneService;
-	
-	@Inject
-	LanguageService languageService;
-	
-	@Inject
-	CurrencyService currencyService;
-	
-	@Inject
-	private ContentService contentService;
-	
-
-	@Resource(name="templates")
-	List<String> templates;
-	
-	@PreAuthorize("hasRole('STORE')")
-	@RequestMapping(value="/admin/store/storeBranding.html", method=RequestMethod.GET)
-	public String displayStoreBranding(Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		
-		setMenu(model,request);
-
-		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		
-		//display templates
-		model.addAttribute("templates", templates);
-		
-		model.addAttribute("store", store);
-		
-
-		
-		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(@RequestParam("file") MultipartFile file, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		
-		setMenu(model,request);
-
-		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		
-		model.addAttribute("templates", templates);
-		
-		
-		model.addAttribute("store", store);
-
-		if(file!=null) {
-
-			String imageName = file.getOriginalFilename();
-			InputStream inputStream = file.getInputStream();
-			String mimeType = file.getContentType();
-			
-            InputContentFile cmsContentImage = new InputContentFile();
-            cmsContentImage.setFileName(imageName);
-            cmsContentImage.setMimeType(mimeType);
-            cmsContentImage.setFile( inputStream );
-            contentService.addLogo(store.getCode(), cmsContentImage);
-			
-            //Update store
-            store.setStoreLogo(imageName);
-            merchantStoreService.update(store);
-            request.getSession().setAttribute(Constants.ADMIN_STORE, store);
-
-		} else {
-			model.addAttribute("error","error");
-			return "admin-store-branding";
-		}
-
-		model.addAttribute("success","success");
-		return "admin-store-branding";
-	}
-	
-	@PreAuthorize("hasRole('STORE')")
-	@RequestMapping(value="/admin/store/saveTemplate.html", method=RequestMethod.POST)
-	public String saveTemplate(@ModelAttribute(value="store") final MerchantStore store, BindingResult result, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		
-		setMenu(model,request);
-
-		MerchantStore sessionstore = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		
-		sessionstore.setStoreTemplate(store.getStoreTemplate());
-		
-		merchantStoreService.saveOrUpdate(sessionstore);
-		
-		request.setAttribute(Constants.ADMIN_STORE, sessionstore);		
-		
-		//display templates
-		model.addAttribute("templates", templates);
-
-		model.addAttribute("success","success");
-		model.addAttribute("store", sessionstore);
-
-		return "admin-store-branding";
-	}
-	
-	@PreAuthorize("hasRole('STORE')")
-	@RequestMapping(value="/admin/store/removeImage.html", method=RequestMethod.POST)
-	public @ResponseBody ResponseEntity<String> removeImage(HttpServletRequest request, HttpServletResponse response, Locale locale) {
-
-		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		
-		AjaxResponse resp = new AjaxResponse();
-
-		try {
-			
-
-			
-			contentService.removeFile(store.getCode(), FileContentType.LOGO, store.getStoreLogo());
-			
-			store.setStoreLogo(null);
-			merchantStoreService.update(store);
-		
-		
-		} catch (Exception e) {
-			LOGGER.error("Error while deleting product", e);
-			resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-			resp.setErrorMessage(e);
-		}
-		
-		String returnString = resp.toJSONString();
-		final HttpHeaders httpHeaders= new HttpHeaders();
-	    httpHeaders.setContentType(MediaType.APPLICATION_JSON_UTF8);
-		return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-	}
-	
-	private void setMenu(Model model, HttpServletRequest request) throws Exception {
-		
-		//display menu
-		Map<String,String> activeMenus = new HashMap<String,String>();
-		activeMenus.put("store", "store");
-		activeMenus.put("storeBranding", "storeBranding");
-
-		
-		@SuppressWarnings("unchecked")
-		Map<String, Menu> menus = (Map<String, Menu>)request.getAttribute("MENUMAP");
-		
-		Menu currentMenu = (Menu)menus.get("store");
-		model.addAttribute("currentMenu",currentMenu);
-		model.addAttribute("activeMenus",activeMenus);
-		//
-		
-	}
-
-}

@@ -1,238 +0,0 @@
-package com.salesmanager.shop.admin.controller.merchant;
-
-
-import com.salesmanager.core.business.services.content.ContentService;
-import com.salesmanager.core.business.services.merchant.MerchantStoreService;
-import com.salesmanager.core.business.services.reference.language.LanguageService;
-import com.salesmanager.core.model.content.Content;
-import com.salesmanager.core.model.content.ContentDescription;
-import com.salesmanager.core.model.content.ContentType;
-import com.salesmanager.core.model.merchant.MerchantStore;
-import com.salesmanager.core.model.reference.language.Language;
-import com.salesmanager.shop.admin.model.merchant.StoreLanding;
-import com.salesmanager.shop.admin.model.merchant.StoreLandingDescription;
-import com.salesmanager.shop.admin.model.web.Menu;
-import com.salesmanager.shop.constants.Constants;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Controller
-public class StoreLandingController {
-	
-	@Inject
-	MerchantStoreService merchantStoreService;
-
-	@Inject
-	LanguageService languageService;
-	
-	@Inject
-	ContentService contentService;
-	
-	@PreAuthorize("hasRole('STORE')")
-	@RequestMapping(value="/admin/store/storeLanding.html", method=RequestMethod.GET)
-	public String displayStoreLanding(Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		
-		setMenu(model,request);
-
-		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		
-		List<Language> languages = store.getLanguages();
-		
-		Content content = contentService.getByCode("LANDING_PAGE", store);
-		StoreLanding landing = new StoreLanding();
-		
-		List<StoreLandingDescription> descriptions = new ArrayList<StoreLandingDescription>();
-		
-		
-		for(Language l : languages) {
-			
-			StoreLandingDescription landingDescription = null;
-			if(content!=null) {
-				for(ContentDescription desc : content.getDescriptions()) {
-					if(desc.getLanguage().getCode().equals(l.getCode())) {
-						landingDescription = new StoreLandingDescription();
-						landingDescription.setDescription(desc.getMetatagDescription());
-						landingDescription.setHomePageContent(desc.getDescription());
-						landingDescription.setKeywords(desc.getMetatagKeywords());
-						landingDescription.setTitle(desc.getName());//name is a not empty
-						landingDescription.setLanguage(desc.getLanguage());
-						break;
-					}
-				}
-			}
-			
-			if(landingDescription==null) {
-				landingDescription = new StoreLandingDescription();
-				landingDescription.setLanguage(l);
-			}
-			
-
-			
-			descriptions.add(landingDescription);
-		}
-		
-		landing.setDescriptions(descriptions);
-
-		
-		model.addAttribute("store", store);
-		model.addAttribute("storeLanding", landing);
-
-		
-		return "admin-store-landing";
-	}
-	
-	@PreAuthorize("hasRole('STORE')")
-	@RequestMapping(value="/admin/store/saveLanding.html", method=RequestMethod.POST)
-	public String saveStoreLanding(@Valid @ModelAttribute("storeLanding") StoreLanding storeLanding, BindingResult result, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-		
-		setMenu(model,request);
-		
-		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-
-		
-		if (result.hasErrors()) {
-			return "admin-store-landing";
-		}
-		
-		//get original store
-		Content content = contentService.getByCode("LANDING_PAGE", store);
-		
-		if(content==null) {
-			content = new Content();
-			content.setVisible(true);
-			content.setContentType(ContentType.SECTION);
-			content.setCode("LANDING_PAGE");
-			content.setMerchantStore(store);
-		}
-		
-
-		//List<Language> languages = store.getLanguages();
-			
-		Map<String,Language> langs = languageService.getLanguagesMap();
-		
-		
-		
-/*		for(Language l : languages) {
-			
-			StoreLandingDescription landingDescription = null;
-			for(ContentDescription desc : content.getDescriptions()) {
-					if(desc.getLanguage().getCode().equals(l.getCode())) {
-						landingDescription = new StoreLandingDescription();
-						landingDescription.setDescription(desc.getMetatagDescription());
-						landingDescription.setHomePageContent(desc.getDescription());
-						landingDescription.setKeywords(desc.getMetatagKeywords());
-						landingDescription.setTitle(desc.getName());//name is a not empty
-						landingDescription.setLanguage(desc.getLanguage());
-					}
-			}
-		
-			
-			if(landingDescription==null) {
-				landingDescription = new StoreLandingDescription();
-				landingDescription.setLanguage(l);
-			}
-			
-
-			
-			descriptions.add(landingDescription);
-		}
-		
-		landing.setDescriptions(descriptions);*/
-		
-		
-		
-			
-
-		List<StoreLandingDescription> descriptions = storeLanding.getDescriptions();
-		List<ContentDescription> contentDescriptions = new ArrayList<ContentDescription>();
-		if(descriptions!=null) {
-				
-				for(StoreLandingDescription description : descriptions) {
-					
-					String code = description.getLanguage().getCode();
-					Language l = langs.get(code);
-					
-					ContentDescription contentDescription = null;
-					if(content.getDescriptions()!=null && content.getDescriptions().size()>0) {
-						
-						for(ContentDescription desc : content.getDescriptions()) {
-							
-							if(desc.getLanguage().getCode().equals(l.getCode())) {
-								contentDescription = desc;
-								desc.setMetatagDescription(description.getDescription());
-								desc.setName(description.getTitle());
-								desc.setTitle(description.getTitle());
-								desc.setDescription(description.getHomePageContent());
-								desc.setMetatagKeywords(description.getKeywords());
-								
-								
-							}
-
-						}
-					}
-					
-					if(contentDescription==null) {
-						
-						
-						contentDescription = new ContentDescription();
-						contentDescription.setContent(content);
-						contentDescription.setLanguage(l);
-						contentDescription.setMetatagDescription(description.getDescription());
-						contentDescription.setName(description.getTitle());
-						contentDescription.setDescription(description.getHomePageContent());
-						contentDescription.setMetatagKeywords(description.getKeywords());
-
-					}
-					
-					contentDescriptions.add(contentDescription);
-
-
-
-				}
-				
-				content.setDescriptions(contentDescriptions);
-				
-			}
-
-
-		
-		contentService.saveOrUpdate(content);
-
-		model.addAttribute("success","success");
-
-		return "admin-store-landing";
-	}
-	
-	private void setMenu(Model model, HttpServletRequest request) throws Exception {
-
-		//display menu
-		Map<String,String> activeMenus = new HashMap<String,String>();
-		activeMenus.put("store", "store");
-		activeMenus.put("storeLanding", "storeLanding");
-
-		
-		@SuppressWarnings("unchecked")
-		Map<String, Menu> menus = (Map<String, Menu>)request.getAttribute("MENUMAP");
-		
-		Menu currentMenu = (Menu)menus.get("store");
-		model.addAttribute("currentMenu",currentMenu);
-		model.addAttribute("activeMenus",activeMenus);
-		//
-		
-	}
-
-}

@@ -1,601 +0,0 @@
-package com.salesmanager.shop.admin.controller.orders;
-
-import com.salesmanager.core.business.services.catalog.product.PricingService;
-import com.salesmanager.core.business.services.customer.CustomerService;
-import com.salesmanager.core.business.services.order.OrderService;
-import com.salesmanager.core.business.services.payments.PaymentService;
-import com.salesmanager.core.business.services.payments.TransactionService;
-import com.salesmanager.core.business.services.reference.country.CountryService;
-import com.salesmanager.core.business.services.reference.zone.ZoneService;
-import com.salesmanager.core.business.services.system.EmailService;
-import com.salesmanager.core.business.utils.ajax.AjaxResponse;
-import com.salesmanager.core.model.customer.Customer;
-import com.salesmanager.core.model.merchant.MerchantStore;
-import com.salesmanager.core.model.order.Order;
-import com.salesmanager.core.model.order.orderstatus.OrderStatusHistory;
-import com.salesmanager.core.model.payments.Transaction;
-import com.salesmanager.core.model.reference.language.Language;
-import com.salesmanager.core.modules.integration.IntegrationException;
-import com.salesmanager.shop.admin.model.orders.Refund;
-import com.salesmanager.shop.constants.Constants;
-import com.salesmanager.shop.utils.DateUtil;
-import com.salesmanager.shop.utils.EmailTemplatesUtils;
-import com.salesmanager.shop.utils.LabelUtils;
-import com.salesmanager.shop.utils.LocaleUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.ByteArrayOutputStream;
-import java.math.BigDecimal;
-import java.util.*;
-
-/**
- * Manage order details
- * @author Carl Samson
- */
-@Controller
-public class OrderActionsControler {
-	
-private static final Logger LOGGER = LoggerFactory.getLogger(OrderActionsControler.class);
-	
-	@Inject
-	private LabelUtils messages;
-	
-	@Inject
-	private OrderService orderService;
-	
-	@Inject
-	CountryService countryService;
-	
-	@Inject
-	ZoneService zoneService;
-	
-	@Inject
-	PaymentService paymentService;
-	
-	@Inject
-	CustomerService customerService;
-	
-	@Inject
-	PricingService pricingService;
-	
-	@Inject
-	TransactionService transactionService;
-	
-	@Inject
-	EmailService emailService;
-	
-	@Inject
-	EmailTemplatesUtils emailTemplatesUtils;
-	
-	
-	
-	@PreAuthorize("hasRole('ORDER')")
-	@RequestMapping(value="/admin/orders/captureOrder.html", method=RequestMethod.POST)
-	public @ResponseBody ResponseEntity<String> captureOrder(HttpServletRequest request, HttpServletResponse response, Locale locale) {
-
-
-		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		
-		String sId = request.getParameter("id");
-		
-		AjaxResponse resp = new AjaxResponse();
-		final HttpHeaders httpHeaders= new HttpHeaders();
-	    httpHeaders.setContentType(MediaType.APPLICATION_JSON_UTF8);
-
-		try {
-			Long id = Long.parseLong(sId);
-			
-			Order order = orderService.getById(id);
-			
-			if(order==null) {
-				
-				LOGGER.error("Order {0} does not exists", id);
-				resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-				String returnString = resp.toJSONString();
-				return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-			}
-			
-			if(order.getMerchant().getId().intValue()!=store.getId().intValue()) {
-				
-				LOGGER.error("Merchant store does not have order {0}",id);
-				resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-				String returnString = resp.toJSONString();
-				return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-			}
-			
-			Customer customer = customerService.getById(order.getCustomerId());
-			
-			if(customer==null) {
-				resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-				resp.setStatusMessage(messages.getMessage("message.notexist.customer", locale));
-				String returnString = resp.toJSONString();
-				return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-			}
-			
-			paymentService.processCapturePayment(order, customer, store);
-
-			resp.setStatus(AjaxResponse.RESPONSE_OPERATION_COMPLETED);
-
-		} catch (IntegrationException e) {
-			LOGGER.error("Error while processing capture", e);
-			resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-			resp.setErrorString(messages.getMessage(e.getMessageCode(),locale));
-		} catch (Exception e) {
-			LOGGER.error("Error while getting order", e);
-			resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-			resp.setErrorMessage(e);
-		}
-		
-		String returnString = resp.toJSONString();
-		return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-	}
-	
-	@PreAuthorize("hasRole('ORDER')")
-	@RequestMapping(value="/admin/orders/refundOrder.html", method=RequestMethod.POST)
-	public @ResponseBody ResponseEntity<String> refundOrder(@RequestBody Refund refund, HttpServletRequest request, HttpServletResponse response, Locale locale) {
-
-
-		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		
-		
-		AjaxResponse resp = new AjaxResponse();
-		final HttpHeaders httpHeaders= new HttpHeaders();
-	    httpHeaders.setContentType(MediaType.APPLICATION_JSON_UTF8);
-
-		BigDecimal submitedAmount = null;
-		
-		try {
-			
-			Order order = orderService.getById(refund.getOrderId());
-			
-			if(order==null) {
-				
-				LOGGER.error("Order {0} does not exists", refund.getOrderId());
-				resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-				String returnString = resp.toJSONString();
-				return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-			}
-			
-			if(order.getMerchant().getId().intValue()!=store.getId().intValue()) {
-				
-				LOGGER.error("Merchant store does not have order {0}",refund.getOrderId());
-				resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-				String returnString = resp.toJSONString();
-				return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-			}
-		
-			//parse amount
-			try {
-				submitedAmount = new BigDecimal(refund.getAmount());
-				if(submitedAmount.doubleValue()==0) {
-					resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-					resp.setStatusMessage(messages.getMessage("message.invalid.amount", locale));
-					String returnString = resp.toJSONString();
-					return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-				}
-				
-			} catch (Exception e) {
-				LOGGER.equals("invalid refundAmount " + refund.getAmount());
-				resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-				String returnString = resp.toJSONString();
-				return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-			}
-				
-				
-				BigDecimal orderTotal = order.getTotal();
-				if(submitedAmount.doubleValue()>orderTotal.doubleValue()) {
-					resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-					resp.setStatusMessage(messages.getMessage("message.invalid.amount", locale));
-					String returnString = resp.toJSONString();
-					return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-				}
-				
-				if(submitedAmount.doubleValue()<=0) {
-					resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-					resp.setStatusMessage(messages.getMessage("message.invalid.amount", locale));
-					String returnString = resp.toJSONString();
-					return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-				}
-				
-				Customer customer = customerService.getById(order.getCustomerId());
-				
-				if(customer==null) {
-					resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-					resp.setStatusMessage(messages.getMessage("message.notexist.customer", locale));
-					String returnString = resp.toJSONString();
-					return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-				}
-				
-	
-				paymentService.processRefund(order, customer, store, submitedAmount);
-
-				resp.setStatus(AjaxResponse.RESPONSE_OPERATION_COMPLETED);
-		} catch (IntegrationException e) {
-			LOGGER.error("Error while processing refund", e);
-			resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-			resp.setErrorString(messages.getMessage(e.getMessageCode(),locale));
-		} catch (Exception e) {
-			LOGGER.error("Error while processing refund", e);
-			resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-			resp.setErrorMessage(e);
-		}
-		
-		String returnString = resp.toJSONString();
-		return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-	}
-	
-	@PreAuthorize("hasRole('ORDER')")
-	@RequestMapping(value="/admin/orders/printInvoice.html", method=RequestMethod.GET)
-	public void printInvoice(HttpServletRequest request, HttpServletResponse response, Locale locale) throws Exception {
-		
-		String sId = request.getParameter("id");
-		
-		try {
-			
-		Long id = Long.parseLong(sId);
-		
-		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		Order order = orderService.getOrder(id, store);
-		
-		if(order.getMerchant().getId().intValue()!=store.getId().intValue()) {
-			throw new Exception("Invalid order");
-		}
-		
-
-		Language lang = store.getDefaultLanguage();
-		
-		
-
-		ByteArrayOutputStream stream  = orderService.generateInvoice(store, order, lang);
-		StringBuilder attachment = new StringBuilder();
-		//attachment.append("attachment; filename=");
-		attachment.append(order.getId());
-		attachment.append(".pdf");
-		
-        response.setHeader("Content-disposition", "attachment;filename=" + attachment.toString());
-
-        //Set the mime type for the response
-        response.setContentType("application/pdf");
-
-		
-		response.getOutputStream().write(stream.toByteArray());
-		
-		response.flushBuffer();
-			
-			
-		} catch(Exception e) {
-			LOGGER.error("Error while printing a report",e);
-		}
-			
-		
-	}
-	
-
-	@SuppressWarnings("unchecked")
-	@PreAuthorize("hasRole('ORDER')")
-	@RequestMapping(value="/admin/orders/listTransactions.html", method=RequestMethod.GET)
-	public @ResponseBody ResponseEntity<String> listTransactions(HttpServletRequest request, HttpServletResponse response) throws Exception {
-
-		String sId = request.getParameter("id");
-
-		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		
-		
-		AjaxResponse resp = new AjaxResponse();
-		final HttpHeaders httpHeaders= new HttpHeaders();
-	    httpHeaders.setContentType(MediaType.APPLICATION_JSON_UTF8);
-		
-		if(sId==null) {
-			resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-			String returnString = resp.toJSONString();
-			return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-		}
-
-
-		
-		try {
-			
-			Long id = Long.parseLong(sId);
-			
-
-			Order dbOrder = orderService.getOrder(id, store);
-
-			if(dbOrder==null) {
-				resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-				String returnString = resp.toJSONString();
-				return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-			}
-			
-			
-			if(dbOrder.getMerchant().getId().intValue()!=store.getId().intValue()) {
-				resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-				String returnString = resp.toJSONString();
-				return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-			}
-			
-
-			
-			List<Transaction> transactions = transactionService.listTransactions(dbOrder);
-			
-			if(transactions!=null) {
-				
-				for(Transaction transaction : transactions) {
-					@SuppressWarnings("rawtypes")
-					Map entry = new HashMap();
-					entry.put("transactionId", transaction.getId());
-					entry.put("transactionDate", DateUtil.formatLongDate(transaction.getTransactionDate()));
-					entry.put("transactionType", transaction.getTransactionType().name());
-					entry.put("paymentType", transaction.getPaymentType().name());
-					entry.put("transactionAmount", pricingService.getStringAmount(transaction.getAmount(), store));
-					entry.put("transactionDetails", transaction.getTransactionDetails());
-					resp.addDataEntry(entry);
-				}
-				
-				
-			}
-			
-			
-			resp.setStatus(AjaxResponse.RESPONSE_OPERATION_COMPLETED);
-			
-		} catch(Exception e) {
-			LOGGER.error("Cannot get transactions for order id " + sId, e);
-			resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-			resp.setErrorMessage(e);
-		}
-		
-		String returnString = resp.toJSONString();
-		return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-		
-		
-	}
-	
-
-	@PreAuthorize("hasRole('ORDER')")
-	@RequestMapping(value="/admin/orders/sendInvoice.html", method=RequestMethod.GET)
-	public @ResponseBody ResponseEntity<String> sendInvoice(HttpServletRequest request, HttpServletResponse response) throws Exception {
-
-		String sId = request.getParameter("id");
-		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		
-		
-		AjaxResponse resp = new AjaxResponse();
-		final HttpHeaders httpHeaders= new HttpHeaders();
-	    httpHeaders.setContentType(MediaType.APPLICATION_JSON_UTF8);
-		
-		if(sId==null) {
-			resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-			String returnString = resp.toJSONString();
-			return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-		}
-
-
-		
-		try {
-			
-			Long id = Long.parseLong(sId);
-			
-
-			Order dbOrder = orderService.getOrder(id, store);
-
-			if(dbOrder==null) {
-				resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-				String returnString = resp.toJSONString();
-				return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-			}
-			
-			
-			if(dbOrder.getMerchant().getId().intValue()!=store.getId().intValue()) {
-				resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-				String returnString = resp.toJSONString();
-				return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-			}
-			
-			//get customer
-			Customer customer = customerService.getById(dbOrder.getCustomerId());
-			
-			if(customer==null) {
-				resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-				resp.setErrorString("Customer does not exist");
-				String returnString = resp.toJSONString();
-				return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-			}
-			
-			Locale customerLocale = LocaleUtils.getLocale(customer.getDefaultLanguage());
-			
-			emailTemplatesUtils.sendOrderEmail(customer.getEmailAddress(), customer, dbOrder, customerLocale, customer.getDefaultLanguage(), store, request.getContextPath());
-			
-			
-			resp.setStatus(AjaxResponse.RESPONSE_OPERATION_COMPLETED);
-			
-		} catch(Exception e) {
-			LOGGER.error("Cannot get transactions for order id " + sId, e);
-			resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-			resp.setErrorMessage(e);
-		}
-		
-		String returnString = resp.toJSONString();
-		return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-		
-		
-	}
-	
-	
-
-	@PreAuthorize("hasRole('ORDER')")
-	@RequestMapping(value="/admin/orders/updateStatus.html", method=RequestMethod.GET)
-	public @ResponseBody ResponseEntity<String> updateStatus(HttpServletRequest request, HttpServletResponse response) throws Exception {
-
-		String sId = request.getParameter("id");
-		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		
-		
-		AjaxResponse resp = new AjaxResponse();
-		final HttpHeaders httpHeaders= new HttpHeaders();
-	    httpHeaders.setContentType(MediaType.APPLICATION_JSON_UTF8);
-		
-		if(sId==null) {
-			resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-			String returnString = resp.toJSONString();
-			return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-		}
-
-
-		
-		try {
-			
-			Long id = Long.parseLong(sId);
-			
-
-			Order dbOrder = orderService.getById(id);
-
-			if(dbOrder==null) {
-				resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-				String returnString = resp.toJSONString();
-				return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-			}
-			
-			
-			if(dbOrder.getMerchant().getId().intValue()!=store.getId().intValue()) {
-				resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-				String returnString = resp.toJSONString();
-				return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-			}
-			
-			//get customer
-			Customer customer = customerService.getById(dbOrder.getCustomerId());
-			
-			if(customer==null) {
-				resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-				resp.setErrorString("Customer does not exist");
-				String returnString = resp.toJSONString();
-				return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-			}
-			
-			Locale customerLocale = LocaleUtils.getLocale(customer.getDefaultLanguage());
-			
-			
-			Set<OrderStatusHistory> orderStatus = dbOrder.getOrderHistory();
-			OrderStatusHistory lastHistory = null;
-			if(orderStatus!=null) {
-				int count = 1;
-				for(OrderStatusHistory history : orderStatus) {
-					if(count==orderStatus.size()) {
-						lastHistory = history;
-						break;
-					}
-					count++;
-				}
-			}
-			
-			if(lastHistory==null) {
-				resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-				resp.setErrorString("No history");
-				String returnString = resp.toJSONString();
-				return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-			}
-			emailTemplatesUtils.sendUpdateOrderStatusEmail(customer, dbOrder, lastHistory, store, customerLocale, request.getContextPath());
-
-			
-			resp.setStatus(AjaxResponse.RESPONSE_OPERATION_COMPLETED);
-			
-		} catch(Exception e) {
-			LOGGER.error("Cannot get transactions for order id " + sId, e);
-			resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-			resp.setErrorString(e.getMessage());
-			resp.setErrorMessage(e);
-		}
-		
-		String returnString = resp.toJSONString();
-		return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-		
-		
-	}
-	
-	@PreAuthorize("hasRole('ORDER')")
-	@RequestMapping(value="/admin/orders/sendDownloadEmail.html", method=RequestMethod.GET)
-	public @ResponseBody ResponseEntity<String> sendDownloadEmail(HttpServletRequest request, HttpServletResponse response) throws Exception {
-
-		String sId = request.getParameter("id");
-		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		
-		
-		AjaxResponse resp = new AjaxResponse();
-		final HttpHeaders httpHeaders= new HttpHeaders();
-	    httpHeaders.setContentType(MediaType.APPLICATION_JSON_UTF8);
-		
-		if(sId==null) {
-			resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-			String returnString = resp.toJSONString();
-			return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-		}
-
-
-		
-		try {
-			
-			Long id = Long.parseLong(sId);
-			
-
-			Order dbOrder = orderService.getById(id);
-
-			if(dbOrder==null) {
-				resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-				String returnString = resp.toJSONString();
-				return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-			}
-			
-			
-			if(dbOrder.getMerchant().getId().intValue()!=store.getId().intValue()) {
-				resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-				String returnString = resp.toJSONString();
-				return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-			}
-			
-			//get customer
-			Customer customer = customerService.getById(dbOrder.getCustomerId());
-			
-			if(customer==null) {
-				resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-				resp.setErrorString("Customer does not exist");
-				String returnString = resp.toJSONString();
-				return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-			}
-			
-			Locale customerLocale = LocaleUtils.getLocale(customer.getDefaultLanguage());
-			
-			
-			emailTemplatesUtils.sendOrderDownloadEmail(customer, dbOrder, store, customerLocale, request.getContextPath());
-			
-			
-			resp.setStatus(AjaxResponse.RESPONSE_OPERATION_COMPLETED);
-			
-		} catch(Exception e) {
-			LOGGER.error("Cannot get transactions for order id " + sId, e);
-			resp.setStatus(AjaxResponse.RESPONSE_STATUS_FAIURE);
-			resp.setErrorString(e.getMessage());
-			resp.setErrorMessage(e);
-		}
-		
-		String returnString = resp.toJSONString();
-		return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
-		
-		
-	}
-
-	
-
-}

@@ -1,532 +0,0 @@
-package com.salesmanager.shop.admin.controller.orders;
-
-import com.salesmanager.core.business.modules.email.Email;
-import com.salesmanager.core.business.services.catalog.product.PricingService;
-import com.salesmanager.core.business.services.customer.CustomerService;
-import com.salesmanager.core.business.services.order.OrderService;
-import com.salesmanager.core.business.services.order.orderproduct.OrderProductDownloadService;
-import com.salesmanager.core.business.services.order.orderstatushistory.OrderStatusHistoryService;
-import com.salesmanager.core.business.services.payments.PaymentService;
-import com.salesmanager.core.business.services.payments.TransactionService;
-import com.salesmanager.core.business.services.reference.country.CountryService;
-import com.salesmanager.core.business.services.reference.zone.ZoneService;
-import com.salesmanager.core.business.services.system.EmailService;
-import com.salesmanager.core.business.utils.CoreConfiguration;
-import com.salesmanager.core.model.customer.Customer;
-import com.salesmanager.core.model.merchant.MerchantStore;
-import com.salesmanager.core.model.order.Order;
-import com.salesmanager.core.model.order.OrderTotal;
-import com.salesmanager.core.model.order.orderproduct.OrderProduct;
-import com.salesmanager.core.model.order.orderproduct.OrderProductDownload;
-import com.salesmanager.core.model.order.orderstatus.OrderStatusHistory;
-import com.salesmanager.core.model.payments.PaymentType;
-import com.salesmanager.core.model.payments.Transaction;
-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.controller.ControllerConstants;
-import com.salesmanager.shop.admin.model.web.Menu;
-import com.salesmanager.shop.constants.Constants;
-import com.salesmanager.shop.constants.EmailConstants;
-import com.salesmanager.shop.utils.DateUtil;
-import com.salesmanager.shop.utils.EmailUtils;
-import com.salesmanager.shop.utils.LabelUtils;
-import com.salesmanager.shop.utils.LocaleUtils;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.BooleanUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.validation.ObjectError;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-import java.util.*;
-import java.util.regex.Pattern;
-
-/**
- * Manage order details
- * @author Carl Samson
- *
- */
-@Controller
-public class OrderControler {
-	
-private static final Logger LOGGER = LoggerFactory.getLogger(OrderControler.class);
-	
-	@Inject
-	private LabelUtils messages;
-	
-	@Inject
-	private OrderService orderService;
-	
-	@Inject
-	CountryService countryService;
-	
-	@Inject
-	ZoneService zoneService;
-	
-	@Inject
-	PaymentService paymentService;
-	
-	@Inject
-	CustomerService customerService;
-	
-	@Inject
-	PricingService pricingService;
-	
-	@Inject
-	TransactionService transactionService;
-	
-	@Inject
-	EmailService emailService;
-	
-	@Inject
-	private EmailUtils emailUtils;
-	
-	@Inject
-	OrderProductDownloadService orderProdctDownloadService;
-
-	@Inject
-	private OrderStatusHistoryService orderStatusHistoryService;
-
-	@Inject
-	private CoreConfiguration coreConfiguration;
-	
-	private final static String ORDER_STATUS_TMPL = "email_template_order_status.ftl";
-
-
-	@PreAuthorize("hasRole('ORDER')")
-	@RequestMapping(value="/admin/orders/editOrder.html", method=RequestMethod.GET)
-	public String displayOrderEdit(@RequestParam("id") long orderId, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-
-		return displayOrder(orderId,model,request,response);
-
-	}
-
-	@PreAuthorize("hasRole('ORDER')")
-	private String displayOrder(Long orderId, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
-
-		//display menu
-		setMenu(model,request);
-		   
-		com.salesmanager.shop.admin.model.orders.Order order = new com.salesmanager.shop.admin.model.orders.Order();
-		Language language = (Language)request.getAttribute("LANGUAGE");
-		List<Country> countries = countryService.getCountries(language);
-		if(orderId!=null && orderId!=0) {		//edit mode		
-			
-			
-			MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-			
-			
-			
-			Set<OrderProduct> orderProducts = null;
-			Set<OrderTotal> orderTotal = null;
-			Set<OrderStatusHistory> orderHistory = null;
-		
-			Order dbOrder = orderService.getById(orderId);
-
-			if(dbOrder==null) {
-				return "redirect:/admin/orders/list.html";
-			}
-			
-			
-			if(dbOrder.getMerchant().getId().intValue()!=store.getId().intValue()) {
-				return "redirect:/admin/orders/list.html";
-			}
-			
-			
-			order.setId( orderId );
-		
-			if( dbOrder.getDatePurchased() !=null ){
-				order.setDatePurchased(DateUtil.formatDate(dbOrder.getDatePurchased()));
-			}
-			
-			Long customerId = dbOrder.getCustomerId();
-			
-			if(customerId!=null && customerId>0) {
-			
-				try {
-					
-					Customer customer = customerService.getById(customerId);
-					if(customer!=null) {
-						model.addAttribute("customer",customer);
-					}
-					
-					
-				} catch(Exception e) {
-					LOGGER.error("Error while getting customer for customerId " + customerId, e);
-				}
-			
-			}
-			
-			order.setOrder( dbOrder );
-			order.setBilling( dbOrder.getBilling() );
-			order.setDelivery(dbOrder.getDelivery() );
-			
-
-			orderProducts = dbOrder.getOrderProducts();
-			orderTotal = dbOrder.getOrderTotal();
-			orderHistory = dbOrder.getOrderHistory();
-			
-			//get capturable
-			if(dbOrder.getPaymentType().name() != PaymentType.MONEYORDER.name()) {
-				Transaction capturableTransaction = transactionService.getCapturableTransaction(dbOrder);
-				if(capturableTransaction!=null) {
-					model.addAttribute("capturableTransaction",capturableTransaction);
-				}
-			}
-			
-			
-			//get refundable
-			if(dbOrder.getPaymentType().name() != PaymentType.MONEYORDER.name()) {
-				Transaction refundableTransaction = transactionService.getRefundableTransaction(dbOrder);
-				if(refundableTransaction!=null) {
-						model.addAttribute("capturableTransaction",null);//remove capturable
-						model.addAttribute("refundableTransaction",refundableTransaction);
-				}
-			}
-
-			
-			List<OrderProductDownload> orderProductDownloads = orderProdctDownloadService.getByOrderId(order.getId());
-			if(CollectionUtils.isNotEmpty(orderProductDownloads)) {
-				model.addAttribute("downloads",orderProductDownloads);
-			}
-			
-		}	
-		
-		model.addAttribute("countries", countries);
-		model.addAttribute("order",order);
-		return  ControllerConstants.Tiles.Order.ordersEdit;
-	}
-	
-
-	@PreAuthorize("hasRole('ORDER')")
-	@RequestMapping(value="/admin/orders/save.html", method=RequestMethod.POST)
-	public String saveOrder(@Valid @ModelAttribute("order") com.salesmanager.shop.admin.model.orders.Order entityOrder, BindingResult result, Model model, HttpServletRequest request, Locale locale) throws Exception {
-		boolean statusOrCommentsChanged = false;
-		OrderStatusHistory orderStatusHistory = new OrderStatusHistory();
-		String email_regEx = "\\b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,4}\\b";
-		Pattern pattern = Pattern.compile(email_regEx);
-		
-		Language language = (Language)request.getAttribute("LANGUAGE");
-		List<Country> countries = countryService.getCountries(language);
-		model.addAttribute("countries", countries);
-		
-		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
-		
-		//set the id if fails
-		entityOrder.setId(entityOrder.getOrder().getId());
-		
-		model.addAttribute("order", entityOrder);
-		
-		Set<OrderProduct> orderProducts = new HashSet<OrderProduct>();
-		Set<OrderTotal> orderTotal = new HashSet<OrderTotal>();
-		Set<OrderStatusHistory> orderHistory = new HashSet<OrderStatusHistory>();
-		
-		Date date = new Date();
-		if(!StringUtils.isBlank(entityOrder.getDatePurchased() ) ){
-			try {
-				date = DateUtil.getDate(entityOrder.getDatePurchased());
-			} catch (Exception e) {
-				ObjectError error = new ObjectError("datePurchased",messages.getMessage("message.invalid.date", locale));
-				result.addError(error);
-			}
-			
-		} else{
-			date = null;
-		}
-		 
-
-		if(!StringUtils.isBlank(entityOrder.getOrder().getCustomerEmailAddress() ) ){
-			 java.util.regex.Matcher matcher = pattern.matcher(entityOrder.getOrder().getCustomerEmailAddress());
-			 
-			 if(!matcher.find()) {
-				ObjectError error = new ObjectError("customerEmailAddress",messages.getMessage("Email.order.customerEmailAddress", locale));
-				result.addError(error);
-			 }
-		}else{
-			ObjectError error = new ObjectError("customerEmailAddress",messages.getMessage("NotEmpty.order.customerEmailAddress", locale));
-			result.addError(error);
-		}
-
-		 
-		if( StringUtils.isBlank(entityOrder.getOrder().getBilling().getFirstName() ) ){
-			 ObjectError error = new ObjectError("billingFirstName", messages.getMessage("NotEmpty.order.billingFirstName", locale));
-			 result.addError(error);
-		}
-		
-		if( StringUtils.isBlank(entityOrder.getOrder().getBilling().getFirstName() ) ){
-			 ObjectError error = new ObjectError("billingLastName", messages.getMessage("NotEmpty.order.billingLastName", locale));
-			 result.addError(error);
-		}
-		 
-		if( StringUtils.isBlank(entityOrder.getOrder().getBilling().getAddress() ) ){
-			 ObjectError error = new ObjectError("billingAddress", messages.getMessage("NotEmpty.order.billingStreetAddress", locale));
-			 result.addError(error);
-		}
-		 
-		if( StringUtils.isBlank(entityOrder.getOrder().getBilling().getCity() ) ){
-			 ObjectError error = new ObjectError("billingCity",messages.getMessage("NotEmpty.order.billingCity", locale));
-			 result.addError(error);
-		}
-		 
-		if( entityOrder.getOrder().getBilling().getZone()==null){
-			if( StringUtils.isBlank(entityOrder.getOrder().getBilling().getState())){
-				 ObjectError error = new ObjectError("billingState",messages.getMessage("NotEmpty.order.billingState", locale));
-				 result.addError(error);
-			}
-		}
-		 
-		if( StringUtils.isBlank(entityOrder.getOrder().getBilling().getPostalCode() ) ){
-			 ObjectError error = new ObjectError("billingPostalCode", messages.getMessage("NotEmpty.order.billingPostCode", locale));
-			 result.addError(error);
-		}
-		
-		com.salesmanager.core.model.order.Order newOrder = orderService.getById(entityOrder.getOrder().getId() );
-		
-		//If there was a status changed by Admin, we notify the customer
-		if(BooleanUtils.toBoolean(coreConfiguration.getProperty("MAIL_SEND_ORDER_UPDATES"))
-				&&  (newOrder.getStatus() != null && !newOrder.getStatus().equals(entityOrder.getOrder().getStatus()))) {
-			statusOrCommentsChanged = true;
-			addStatusChangedHistory(entityOrder, locale, orderStatusHistory, newOrder);
-		}
-		//get capturable
-		if(newOrder.getPaymentType().name() != PaymentType.MONEYORDER.name()) {
-			Transaction capturableTransaction = transactionService.getCapturableTransaction(newOrder);
-			if(capturableTransaction!=null) {
-				model.addAttribute("capturableTransaction",capturableTransaction);
-			}
-		}
-		
-		
-		//get refundable
-		if(newOrder.getPaymentType().name() != PaymentType.MONEYORDER.name()) {
-			Transaction refundableTransaction = transactionService.getRefundableTransaction(newOrder);
-			if(refundableTransaction!=null) {
-					model.addAttribute("capturableTransaction",null);//remove capturable
-					model.addAttribute("refundableTransaction",refundableTransaction);
-			}
-		}
-	
-	
-		if (result.hasErrors()) {
-			//  somehow we lose data, so reset Order detail info.
-			entityOrder.getOrder().setOrderProducts( orderProducts);
-			entityOrder.getOrder().setOrderTotal(orderTotal);
-			entityOrder.getOrder().setOrderHistory(orderHistory);
-			
-			return ControllerConstants.Tiles.Order.ordersEdit;
-		/*	"admin-orders-edit";  */
-		}
-		
-
-
-
-		
-		Country deliveryCountry = countryService.getByCode( entityOrder.getOrder().getDelivery().getCountry().getIsoCode()); 
-		Country billingCountry  = countryService.getByCode( entityOrder.getOrder().getBilling().getCountry().getIsoCode()) ;
-		Zone billingZone = null;
-		Zone deliveryZone = null;
-		if(entityOrder.getOrder().getBilling().getZone()!=null) {
-			billingZone = zoneService.getByCode(entityOrder.getOrder().getBilling().getZone().getCode());
-		}
-		
-		if(entityOrder.getOrder().getDelivery().getZone()!=null) {
-			deliveryZone = zoneService.getByCode(entityOrder.getOrder().getDelivery().getZone().getCode());
-		}
-
-		newOrder.setCustomerEmailAddress(entityOrder.getOrder().getCustomerEmailAddress() );
-		newOrder.setStatus(entityOrder.getOrder().getStatus() );		
-		
-		newOrder.setDatePurchased(date);
-		newOrder.setLastModified( new Date() );
-		
-		if(!StringUtils.isBlank(entityOrder.getOrderHistoryComment() ) ) {
-			orderStatusHistory.setComments( entityOrder.getOrderHistoryComment() );
-			orderStatusHistory.setCustomerNotified(1);
-			orderStatusHistory.setStatus(entityOrder.getOrder().getStatus());
-			orderStatusHistory.setDateAdded(new Date() );
-			orderStatusHistory.setOrder(newOrder);
-			newOrder.getOrderHistory().add( orderStatusHistory );
-			entityOrder.setOrderHistoryComment( "" );
-			statusOrCommentsChanged = true;
-		}		
-		
-		newOrder.setDelivery( entityOrder.getOrder().getDelivery() );
-		newOrder.setBilling( entityOrder.getOrder().getBilling() );
-		newOrder.setCustomerAgreement(entityOrder.getOrder().getCustomerAgreement());
-		
-		newOrder.getDelivery().setCountry(deliveryCountry );
-		newOrder.getBilling().setCountry(billingCountry );	
-		
-		if(billingZone!=null) {
-			newOrder.getBilling().setZone(billingZone);
-		}
-		
-		if(deliveryZone!=null) {
-			newOrder.getDelivery().setZone(deliveryZone);
-		}
-		
-		orderService.saveOrUpdate(newOrder);
-		entityOrder.setOrder(newOrder);
-		entityOrder.setBilling(newOrder.getBilling());
-		entityOrder.setDelivery(newOrder.getDelivery());
-		model.addAttribute("order", entityOrder);
-		
-		Long customerId = newOrder.getCustomerId();
-		
-		if(customerId!=null && customerId>0) {
-		
-			try {
-				
-				Customer customer = customerService.getById(customerId);
-				if(customer!=null) {
-					model.addAttribute("customer",customer);
-				}
-				
-				
-			} catch(Exception e) {
-				LOGGER.error("Error while getting customer for customerId " + customerId, e);
-			}
-		
-		}
-
-		List<OrderProductDownload> orderProductDownloads = orderProdctDownloadService.getByOrderId(newOrder.getId());
-		if(CollectionUtils.isNotEmpty(orderProductDownloads)) {
-			model.addAttribute("downloads",orderProductDownloads);
-		}
-		
-		
-		/** 
-		 * send email if admin posted orderHistoryComment
-		 * 
-		 * **/
-		
-		if(statusOrCommentsChanged) {
-		
-			try {
-				
-				Customer customer = customerService.getById(newOrder.getCustomerId());
-				Language lang = store.getDefaultLanguage();
-				if(customer!=null) {
-					lang = customer.getDefaultLanguage();
-				}
-				
-				Locale customerLocale = LocaleUtils.getLocale(lang);
-
-				StringBuilder customerName = new StringBuilder();
-				customerName.append(newOrder.getBilling().getFirstName()).append(" ").append(newOrder.getBilling().getLastName());
-				
-
-				Map<String, String> templateTokens = emailUtils.createEmailObjectsMap(request.getContextPath(), store, messages, customerLocale);
-				templateTokens.put(EmailConstants.EMAIL_CUSTOMER_NAME, customerName.toString());
-				templateTokens.put(EmailConstants.EMAIL_TEXT_ORDER_NUMBER, messages.getMessage("email.order.confirmation", new String[]{String.valueOf(newOrder.getId())}, customerLocale));
-				templateTokens.put(EmailConstants.EMAIL_TEXT_DATE_ORDERED, messages.getMessage("email.order.ordered", new String[]{entityOrder.getDatePurchased()}, customerLocale));
-				templateTokens.put(EmailConstants.EMAIL_TEXT_STATUS_COMMENTS, messages.getMessage("email.order.comments", new String[]{entityOrder.getOrderHistoryComment()}, customerLocale));
-				templateTokens.put(EmailConstants.EMAIL_TEXT_DATE_UPDATED, messages.getMessage("email.order.updated", new String[]{DateUtil.formatDate(new Date())}, customerLocale));
-
-
-				if(BooleanUtils.toBoolean(coreConfiguration.getProperty("MAIL_SEND_ORDER_UPDATES"))) {
-					//This allows to send every order status update or comments from admin to the customer
-					addStatusUpdatedInfo(entityOrder, customer, customerLocale, templateTokens);
-				}
-
-
-				Email email = new Email();
-				email.setFrom(store.getStorename());
-				email.setFromEmail(store.getStoreEmailAddress());
-				email.setSubject(messages.getMessage("email.order.status.title",new String[]{String.valueOf(newOrder.getId())},customerLocale));
-				email.setTo(entityOrder.getOrder().getCustomerEmailAddress());
-				email.setTemplateName(ORDER_STATUS_TMPL);
-				email.setTemplateTokens(templateTokens);
-
-
-
-				emailService.sendHtmlEmail(store, email);
-
-			} catch (Exception e) {
-				LOGGER.error("Cannot send email to customer",e);
-			}
-			
-		}
-		
-		model.addAttribute("success","success");
-
-		
-		return  ControllerConstants.Tiles.Order.ordersEdit;
-	    /*	"admin-orders-edit";  */
-	}
-
-	private void addStatusUpdatedInfo(com.salesmanager.shop.admin.model.orders.Order entityOrder, Customer customer, Locale customerLocale, Map<String, String> templateTokens) {
-		OrderStatusHistory lastHistory = getOrderStatusHistory(entityOrder, customerLocale);
-		String hi = messages.getMessage("label.generic.hi", customerLocale);
-		if (StringUtils.isNotEmpty(lastHistory.getComments())) {
-			templateTokens.put(EmailConstants.EMAIL_TEXT_STATUS_COMMENTS, messages.getMessage("email.order.comments", new String[]{lastHistory.getComments()}, customerLocale));
-		}
-		String[] statusMessageText = {String.valueOf(entityOrder.getOrder().getId()), DateUtil.formatDate(entityOrder.getOrder().getDatePurchased())};
-		String status = messages.getMessage("label.order." + entityOrder.getOrder().getStatus().name(), customerLocale, entityOrder.getOrder().getStatus().name());
-		String[] statusMessage = {DateUtil.formatDate(lastHistory.getDateAdded()), status};
-		if (customer != null) {
-			templateTokens.put(EmailConstants.EMAIL_CUSTOMER_FIRSTNAME, customer.getBilling().getFirstName());
-			templateTokens.put(EmailConstants.EMAIL_CUSTOMER_LASTNAME, customer.getBilling().getLastName());
-		}
-		templateTokens.put(EmailConstants.LABEL_HI, hi);
-		templateTokens.put(EmailConstants.EMAIL_ORDER_STATUS_TEXT, messages.getMessage("email.order.statustext", statusMessageText, customerLocale));
-		templateTokens.put(EmailConstants.EMAIL_ORDER_STATUS, messages.getMessage("email.order.status", statusMessage, customerLocale));
-	}
-
-	private OrderStatusHistory getOrderStatusHistory(com.salesmanager.shop.admin.model.orders.Order entityOrder, Locale customerLocale) {
-		OrderStatusHistory lastHistory = null;
-		List<OrderStatusHistory> lastHistories = orderStatusHistoryService.findByOrder(entityOrder.getOrder());
-		if(CollectionUtils.isEmpty(lastHistories)) {
-			lastHistory = new OrderStatusHistory();
-			lastHistory.setComments(messages.getMessage("label.order.PROCESSING", customerLocale));
-			lastHistory.setDateAdded(new Date());
-		} else {
-			lastHistory = lastHistories.get(0);
-		}
-		return lastHistory;
-	}
-
-	private void addStatusChangedHistory(com.salesmanager.shop.admin.model.orders.Order entityOrder, Locale locale,
-										 OrderStatusHistory orderStatusHistory, Order newOrder) {
-		orderStatusHistory.setComments( messages.getMessage("email.order.status.changed",
-				new String[] {newOrder.getStatus().name(), entityOrder.getOrder().getStatus().name()}, locale));
-		orderStatusHistory.setCustomerNotified(1);
-		orderStatusHistory.setStatus(entityOrder.getOrder().getStatus());
-		orderStatusHistory.setDateAdded(new Date() );
-		orderStatusHistory.setOrder(newOrder);
-		newOrder.getOrderHistory().add(orderStatusHistory);
-	}
-
-	private void setMenu(Model model, HttpServletRequest request) throws Exception {
-	
-		//display menu
-		Map<String,String> activeMenus = new HashMap<String,String>();
-		activeMenus.put("order", "order");
-		activeMenus.put("order-list", "order-list");
-		
-		@SuppressWarnings("unchecked")
-		Map<String, Menu> menus = (Map<String, Menu>)request.getAttribute("MENUMAP");
-
-		model.addAttribute("activeMenus",activeMenus);
-		
-		Menu currentMenu = (Menu)menus.get("order");
-		model.addAttribute("currentMenu",currentMenu);
-		model.addAttribute("activeMenus",activeMenus);
-		//
-		
-	}
-
-}