shopizer-aplcache

diff --git a/sm-core/.classpath b/sm-core/.classpath
new file mode 100644
index 0000000..b77ae7b
--- /dev/null
+++ b/sm-core/.classpath
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+	<classpathentry kind="src" path="target/generated-sources/querydsl"/>
+	<classpathentry kind="src" path="target/generated-sources/apt"/>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

diff --git a/sm-core/.gitignore b/sm-core/.gitignore
new file mode 100644
index 0000000..ea8c4bf
--- /dev/null
+++ b/sm-core/.gitignore
@@ -0,0 +1 @@
+/target

diff --git a/sm-core/.project b/sm-core/.project
new file mode 100644
index 0000000..23f3a60
--- /dev/null
+++ b/sm-core/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>sm-core</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+	</natures>
+</projectDescription>

diff --git a/sm-core/pom.xml b/sm-core/pom.xml
new file mode 100644
index 0000000..9e97a00
--- /dev/null
+++ b/sm-core/pom.xml
@@ -0,0 +1,657 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>com.shopizer</groupId>
+	<artifactId>sm-core</artifactId>
+	<version>2.0-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
+	<name>sm-core</name>
+	<url>http://www.shopizer.com</url>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<jdk.version>1.6</jdk.version>
+		
+		
+		<jackson-version>1.9.13</jackson-version>
+		<axis-version>1.4</axis-version>
+		<jaxws.api.version>2.1</jaxws.api.version>
+		<jaxws.version>2.1.4</jaxws.version>
+		<jsr181.version>1.0-MR1</jsr181.version>
+		<jsr250.version>1.0</jsr250.version>
+		<org.elasticsearch-version>0.90.2</org.elasticsearch-version>
+		<jasperreports-version>3.7.4</jasperreports-version>
+		
+		<freemarker.version>2.3.19</freemarker.version>
+		<org.slf4j-version>1.6.6</org.slf4j-version>
+		<hibernate.ehcache.version>3.5.1-Final</hibernate.ehcache.version>
+		<sm-core.hibernate-entitymanager-version>4.1.2</sm-core.hibernate-entitymanager-version>
+		<sm-core.hibernate-jpamodelgen.version>1.1.1.Final</sm-core.hibernate-jpamodelgen.version>
+		<sm-core.aspectj.version>1.5.4</sm-core.aspectj.version>
+		<sm-core.mysql-connector-java>5.1.19</sm-core.mysql-connector-java>
+		<sm-core.junit.version>4.9</sm-core.junit.version>
+		<sm-core.org.springframework.version>3.1.0.RELEASE</sm-core.org.springframework.version>
+		<sm-core.c3p0.version>0.9.1.2</sm-core.c3p0.version>
+		<sm-core.querydsl.version>2.3.3</sm-core.querydsl.version>
+		<sm-core.jodatime.version>2.0</sm-core.jodatime.version>
+		<sm-core.jodatime-hibernate.version>1.3</sm-core.jodatime-hibernate.version>
+		<sm-core.javassist.version>3.3</sm-core.javassist.version>
+		<sm-search.version>0.0.3</sm-search.version>
+	</properties>
+
+	<dependencies>
+	
+		<!--<dependency>
+    		<groupId>com.shopizer</groupId>
+    		<artifactId>com.shopizer.authorizenet</artifactId>
+    		<version>0.0.1-SNAPSHOT</version>
+		</dependency>-->
+		
+	    <!-- sm-search -->		
+		<dependency>
+			<groupId>com.shopizer</groupId>
+			<artifactId>sm-search</artifactId>
+			<version>${sm-search.version}</version>
+		</dependency>
+
+
+		<!-- Loggers -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+			<version>${org.slf4j-version}</version>
+		</dependency>
+
+		<!-- Hibernate -->
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-core</artifactId>
+			<version>${sm-core.hibernate-entitymanager-version}</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>javassist</artifactId>
+					<groupId>org.javassist</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-entitymanager</artifactId>
+			<version>${sm-core.hibernate-entitymanager-version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>asm</groupId>
+					<artifactId>asm</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>asm</groupId>
+					<artifactId>asm-attrs</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>cglib</groupId>
+					<artifactId>cglib</artifactId>
+				</exclusion>
+				<exclusion>
+					<artifactId>javassist</artifactId>
+					<groupId>javassist</groupId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.hibernate</groupId>
+					<artifactId>hibernate-core</artifactId>
+				</exclusion>
+				<exclusion>
+					<artifactId>javassist</artifactId>
+					<groupId>org.javassist</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<!-- Hibernate ehcache -->
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-ehcache</artifactId>
+			<version>${hibernate.ehcache.version}</version>
+		</dependency>
+
+		<!-- Javassist -->
+		<dependency>
+			<groupId>javassist</groupId>
+			<artifactId>javassist</artifactId>
+			<version>${sm-core.javassist.version}</version>
+		</dependency>
+
+		<!-- QueryDsl -->
+		<dependency>
+			<groupId>com.mysema.querydsl</groupId>
+			<artifactId>querydsl-apt</artifactId>
+			<version>${sm-core.querydsl.version}</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.mysema.querydsl</groupId>
+			<artifactId>querydsl-core</artifactId>
+			<version>${sm-core.querydsl.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.mysema.querydsl</groupId>
+			<artifactId>querydsl-jpa</artifactId>
+			<version>${sm-core.querydsl.version}</version>
+		</dependency>
+
+		<!-- Pool c3p0 -->
+		<dependency>
+			<groupId>c3p0</groupId>
+			<artifactId>c3p0</artifactId>
+			<version>${sm-core.c3p0.version}</version>
+		</dependency>
+
+		<!-- Spring -->
+		<!--
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-asm</artifactId>
+			<version>${sm-core.org.springframework-security.version}</version>
+		</dependency>
+		-->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-aop</artifactId>
+			<version>${sm-core.org.springframework.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-aspects</artifactId>
+			<version>${sm-core.org.springframework.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-beans</artifactId>
+			<version>${sm-core.org.springframework.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+			<version>${sm-core.org.springframework.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-core</artifactId>
+			<version>${sm-core.org.springframework.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-expression</artifactId>
+			<version>${sm-core.org.springframework.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-orm</artifactId>
+			<version>${sm-core.org.springframework.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-web</artifactId>
+			<version>${sm-core.org.springframework.version}</version>
+		</dependency>
+
+		<!-- JSR 303 with Hibernate Validator -->
+		<dependency>
+			<groupId>javax.validation</groupId>
+			<artifactId>validation-api</artifactId>
+			<version>1.0.0.GA</version>
+		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-validator</artifactId>
+			<version>4.3.0.Final</version>
+		</dependency>
+
+		<!-- AspectJ -->
+		<dependency>
+			<groupId>aspectj</groupId>
+			<artifactId>aspectjrt</artifactId>
+			<version>${sm-core.aspectj.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>aspectj</groupId>
+			<artifactId>aspectjweaver</artifactId>
+			<version>${sm-core.aspectj.version}</version>
+		</dependency>
+
+		<!-- Mysql Connector -->
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+			<version>${sm-core.mysql-connector-java}</version>
+		</dependency>
+		
+		<!-- H2 Connector -->
+		<dependency>
+			<groupId>com.h2database</groupId>
+			<artifactId>h2</artifactId>
+			<version>1.3.152</version>
+		</dependency>
+
+
+		<!-- Jackson JSON Processor -->
+		<dependency>
+			<groupId>org.codehaus.jackson</groupId>
+			<artifactId>jackson-mapper-asl</artifactId>
+			<version>${jackson-version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.googlecode.json-simple</groupId>
+			<artifactId>json-simple</artifactId>
+			<version>1.1.1</version>
+		</dependency>
+
+		<!-- File Upload -->
+		<dependency>
+			<groupId>commons-fileupload</groupId>
+			<artifactId>commons-fileupload</artifactId>
+			<version>1.2.2</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>2.0.1</version>
+		</dependency>
+
+		<dependency>
+			<groupId>commons-collections</groupId>
+			<artifactId>commons-collections</artifactId>
+			<version>3.2.1</version>
+	   </dependency>
+	   
+		<!-- Apache common -->
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>3.0</version>
+		</dependency>
+		
+		<dependency>
+			<groupId>commons-validator</groupId>
+			<artifactId>commons-validator</artifactId>
+			<version>1.4.0</version>
+		</dependency>
+		
+		<!--
+		<dependency>
+  			<groupId>org.jboss.cache</groupId>
+  			<artifactId>jbosscache-core</artifactId>
+  			<version>3.2.5.GA</version>
+		</dependency>
+		-->
+		
+		<dependency>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+			<version>2.6</version>
+		</dependency>
+
+
+		<dependency>
+			<groupId>commons-httpclient</groupId>
+			<artifactId>commons-httpclient</artifactId>
+			<version>3.1</version>
+		</dependency>
+
+		
+
+		<!-- JodaTime -->
+		<dependency>
+			<groupId>joda-time</groupId>
+			<artifactId>joda-time</artifactId>
+			<version>${sm-core.jodatime.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.jadira.usertype</groupId>
+			<artifactId>usertype.core</artifactId>
+			<version>3.0.0.CR1</version>
+		</dependency>
+
+
+        <!-- Infinispan -->
+  		<dependency>
+			<groupId>org.infinispan</groupId>
+    		<artifactId>infinispan-core</artifactId>
+    		<version>5.1.6.FINAL</version>
+  		</dependency>
+
+  		<!-- TO REMOVE -->
+  		<dependency>
+    		<groupId>org.infinispan</groupId>
+    		<artifactId>infinispan-cachestore-bdbje</artifactId>
+    		<version>5.1.4.FINAL</version>
+  		</dependency>
+
+		<dependency>      
+			<groupId>org.infinispan</groupId>      
+			<artifactId>infinispan-cachestore-jdbc</artifactId>      
+			<version>5.1.4.FINAL</version>
+		</dependency> 
+		
+		<dependency>
+			<groupId>org.infinispan</groupId>
+			<artifactId>infinispan-tree</artifactId>
+			<version>5.1.6.FINAL</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.freemarker</groupId>
+			<artifactId>freemarker</artifactId>
+			<version>${freemarker.version}</version>
+		</dependency>
+		
+		<dependency>
+			<groupId>javax.mail</groupId>
+			<artifactId>mail</artifactId>
+			<version>1.4.5</version>
+		</dependency>
+		
+
+		<dependency>
+			<groupId>org.jopendocument</groupId>
+			<artifactId>jOpenDocument</artifactId>
+			<version>1.3b1</version>
+		</dependency>
+		
+	    <dependency>
+			<groupId>com.lowagie</groupId>
+			<artifactId>itext</artifactId>
+			<version>4.2.1</version>
+		</dependency>
+		
+		
+		<!-- integration -->
+		<!--
+		<dependency>
+  			<groupId>com.paypal.sdk</groupId>
+  			<artifactId>rest-api-sdk</artifactId>
+  			<version>0.7.1</version>
+		</dependency>
+		-->
+		
+		<dependency>
+			<groupId>com.paypal.sdk</groupId>
+			<artifactId>merchantsdk</artifactId>
+			<version>2.6.109</version>
+		</dependency>
+		
+	    <dependency>
+	        <groupId>com.maxmind.geoip2</groupId>
+	        <artifactId>geoip2</artifactId>
+	        <version>0.7.0</version>
+	    </dependency>
+	    
+
+			
+		<!-- Test dependencies -->
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>${sm-core.junit.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-test</artifactId>
+			<version>${sm-core.org.springframework.version}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<!-- <dependency> <groupId>com.oracle</groupId> <artifactId>ojdbc5</artifactId> 
+			<version>11.1.0.7.0</version> <scope>provided</scope> </dependency> -->
+	</dependencies>
+	
+	<repositories>	
+		<!-- For testing against latest Spring snapshots -->
+		<repository>
+			<id>org.springframework.maven.snapshot</id>
+			<name>Spring Maven Snapshot Repository</name>
+			<url>http://maven.springframework.org/snapshot</url>
+			<releases><enabled>false</enabled></releases>
+			<snapshots><enabled>true</enabled></snapshots>
+		</repository>
+		<!-- For developing against latest Spring milestones -->
+		<repository>
+			<id>org.springframework.maven.milestone</id>
+			<name>Spring Maven Milestone Repository</name>
+			<url>http://maven.springframework.org/milestone</url>
+			<snapshots><enabled>false</enabled></snapshots>
+		</repository>
+		<repository>
+			<id>org.jboss.repository.releases</id>
+			<name>JBoss Maven Release Repository</name>			
+			<url>https://repository.jboss.org/nexus/content/repositories/releases</url>
+			<snapshots><enabled>false</enabled></snapshots>			
+		</repository>
+	</repositories>
+
+	<build>
+		<!-- 
+			Annotation processor to be generated in target/generated-sources
+			The build will generate the required annotated classes in generated-sources
+			Then will jump to the regular build in pluginManagement
+			
+			mvn clean
+			mvn install
+			
+			** if the install phase complains on missing Qxyz classes then
+			
+			mvn clean
+			mvn generate-sources
+			mvn install
+			
+			*** Want to have the schema generated
+			
+			** hbm2ddl not working 
+			mvn hibernate3:hbm2ddl
+			 
+		-->
+		<plugins>
+			<plugin>
+				<groupId>org.bsc.maven</groupId>
+				<artifactId>maven-processor-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>process</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>com.mysema.maven</groupId>
+				<artifactId>maven-apt-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>process</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>target/generated-sources/querydsl</outputDirectory>
+							<processor>com.mysema.query.apt.jpa.JPAAnnotationProcessor</processor>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-compiler-plugin</artifactId>
+					<version>2.3.2</version>
+					<configuration>
+						<source>${jdk.version}</source>
+						<target>${jdk.version}</target>
+						<encoding>${project.build.sourceEncoding}</encoding>
+						<compilerArgument>-proc:none</compilerArgument>
+					</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-surefire-plugin</artifactId>
+					<version>2.12</version>
+					<configuration>
+          				<skipTests>true</skipTests>
+        			</configuration>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-war-plugin</artifactId>
+					<version>2.2</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-install-plugin</artifactId>
+					<version>2.3.1</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-release-plugin</artifactId>
+					<version>2.2.2</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-assembly-plugin</artifactId>
+					<version>2.3</version>
+				</plugin>
+				<plugin>
+					<groupId>org.bsc.maven</groupId>
+					<artifactId>maven-processor-plugin</artifactId>
+					<version>2.0.5</version>
+					<configuration>
+						<outputDirectory>target/generated-sources</outputDirectory>
+						<options>
+							<fullyAnnotationConfigured>true</fullyAnnotationConfigured>
+							<addSuppressWarningsAnnotation>true</addSuppressWarningsAnnotation>
+						</options>
+					</configuration>
+					<executions>
+						<execution>
+							<id>process</id>
+							<goals>
+								<goal>process</goal>
+							</goals>
+							<phase>generate-sources</phase>
+						</execution>
+					</executions>
+				</plugin>
+				<plugin>
+					<groupId>org.bsc.maven</groupId>
+					<artifactId>maven-processor-plugin</artifactId>
+					<executions>
+						<execution>
+							<id>process</id>
+							<goals>
+								<goal>process</goal>
+							</goals>
+							<phase>generate-sources</phase>
+							<configuration>
+								<options>
+									<fullyAnnotationConfigured>true</fullyAnnotationConfigured>
+									<addSuppressWarningsAnnotation>true</addSuppressWarningsAnnotation>
+								</options>
+							</configuration>
+						</execution>
+					</executions>
+					<dependencies>
+						<dependency>
+							<groupId>org.hibernate</groupId>
+							<artifactId>hibernate-jpamodelgen</artifactId>
+							<version>${sm-core.hibernate-jpamodelgen.version}</version>
+						</dependency>
+					</dependencies>
+				</plugin>
+				<plugin>
+					<groupId>com.mysema.maven</groupId>
+					<artifactId>maven-apt-plugin</artifactId>
+					<version>1.0.2</version>
+					<configuration>
+						<outputDirectory>target/generated-sources/querydsl</outputDirectory>
+					</configuration>
+					<executions>
+						<execution>
+							<goals>
+								<goal>process</goal>
+							</goals>
+							<configuration>
+								<processor>com.mysema.query.apt.jpa.JPAAnnotationProcessor</processor>
+							</configuration>
+						</execution>
+					</executions>
+					<dependencies>
+						<dependency>
+							<groupId>com.mysema.querydsl</groupId>
+							<artifactId>querydsl-apt</artifactId>
+							<version>${sm-core.querydsl.version}</version>
+						</dependency>
+					</dependencies>
+				</plugin>
+				<!-- hbm2ddl Hibernate entities to schema -->
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>hibernate3-maven-plugin</artifactId>
+					<version>2.2</version><!-- 2.2 -->
+					<executions>
+						<execution>
+							<phase>process-classes</phase>
+							<goals>
+								<goal>hbm2ddl</goal>
+							</goals>
+						</execution>
+					</executions>
+					<configuration>
+						<components>
+							<component>
+								<name>hbm2ddl</name>
+								<implementation>jpaconfiguration</implementation>
+							</component>
+						</components>
+						<componentProperties>
+							<persistenceunit>sm-unit</persistenceunit>
+							<!--<propertyfile>src/test/resources/hbm2ddl.properties</propertyfile>-->
+							<outputfilename>schema.ddl</outputfilename>
+							<drop>false</drop>
+							<create>true</create>
+							<export>false</export>
+							<format>true</format>
+						</componentProperties>
+					</configuration>
+				</plugin>
+				<!--This plugin's configuration is used to store Eclipse m2e settings 
+					only. It has no influence on the Maven build itself. -->
+				<plugin>
+					<groupId>org.eclipse.m2e</groupId>
+					<artifactId>lifecycle-mapping</artifactId>
+					<version>1.0.0</version>
+					<configuration>
+						<lifecycleMappingMetadata>
+							<pluginExecutions>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>org.codehaus.mojo</groupId>
+										<artifactId>aspectj-maven-plugin</artifactId>
+										<versionRange>[1.0,)</versionRange>
+										<goals>
+											<goal>test-compile</goal>
+											<goal>compile</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<execute />
+									</action>
+								</pluginExecution>
+							</pluginExecutions>
+						</lifecycleMappingMetadata>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
+</project>

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/category/dao/CategoryDao.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/category/dao/CategoryDao.java
new file mode 100644
index 0000000..dff49b7
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/category/dao/CategoryDao.java
@@ -0,0 +1,51 @@
+package com.salesmanager.core.business.catalog.category.dao;
+
+import java.util.List;
+
+import com.salesmanager.core.business.catalog.category.model.Category;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDao;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+public interface CategoryDao extends SalesManagerEntityDao<Long, Category> {
+
+	List<Category> listBySeUrl(MerchantStore store, String seUrl);
+
+	List<Category> listByStoreAndParent(MerchantStore store, Category category);
+
+	List<Category> listByLineage(MerchantStore store, String lineage);
+
+	List<Category> getByName(MerchantStore store, String name, Language language);
+
+	Category getByCode(MerchantStore store, String code);
+	
+	List<Category> listByStore(MerchantStore store);
+
+	List<Category> listByStore(MerchantStore store, Language language);
+
+	Category getById(Long id);
+
+	List<Category> listByDepth(MerchantStore store, int depth);
+
+	List<Category> listByDepth(MerchantStore store, int depth, Language language);
+
+	List<Category> listByLineage(String merchantStoreCode, String lineage);
+
+	Category getByCode(String merchantStoreCode, String code);
+
+	Category getBySeUrl(MerchantStore store, String seUrl);
+
+	List<Category> listByParent(Category category, Language language);
+
+	Category getByLanguage(long categoryId, Language language);
+
+	List<Object[]> countProductsByCategories(MerchantStore store,
+			List<Long> categoryIds);
+
+	List<Category> getByCodes(MerchantStore store, List<String> codes,
+			Language language);
+
+	List<Category> getByIds(MerchantStore store, List<Long> ids,
+			Language language);
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/category/dao/CategoryDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/category/dao/CategoryDaoImpl.java
new file mode 100644
index 0000000..99cb5cd
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/category/dao/CategoryDaoImpl.java
@@ -0,0 +1,370 @@
+package com.salesmanager.core.business.catalog.category.dao;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.persistence.Query;
+
+import org.springframework.stereotype.Repository;
+
+import com.mysema.query.jpa.JPQLQuery;
+import com.mysema.query.jpa.impl.JPAQuery;
+import com.salesmanager.core.business.catalog.category.model.Category;
+import com.salesmanager.core.business.catalog.category.model.QCategory;
+import com.salesmanager.core.business.catalog.category.model.QCategoryDescription;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDaoImpl;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+@Repository("categoryDao")
+public class CategoryDaoImpl extends SalesManagerEntityDaoImpl<Long, Category> implements CategoryDao {
+
+	public CategoryDaoImpl() {
+		super();
+	}
+	
+	@Override
+	public List<Category> getByName(MerchantStore store, String name, Language language) {
+		QCategory qCategory = QCategory.category;
+		QCategoryDescription qDescription = QCategoryDescription.categoryDescription;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qCategory)
+			.leftJoin(qCategory.descriptions, qDescription).fetch()
+			.leftJoin(qCategory.merchantStore).fetch()
+			.where(qDescription.name.like("%" + name + "%")
+			.and(qDescription.language.id.eq(language.getId()))
+			.and(qCategory.merchantStore.id.eq(store.getId())))
+			.orderBy(qCategory.sortOrder.asc());
+		
+
+		
+		List<Category> categories = query.list(qCategory);
+		return categories;
+	}
+	
+
+
+	@Override
+	public List<Category> listBySeUrl(MerchantStore store,String seUrl) {
+		QCategory qCategory = QCategory.category;
+		QCategoryDescription qDescription = QCategoryDescription.categoryDescription;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qCategory)
+			.leftJoin(qCategory.descriptions, qDescription).fetch()
+			.leftJoin(qCategory.merchantStore).fetch()
+			.where(qDescription.seUrl.like(seUrl)
+			.and(qCategory.merchantStore.id.eq(store.getId())))
+			.orderBy(qDescription._super.title.desc(), qDescription._super.name.desc(), qDescription.language.id.desc()).orderBy(qCategory.sortOrder.asc());
+		
+		return query.list(qCategory);
+	}
+	
+	@Override
+	public Category getBySeUrl(MerchantStore store,String seUrl) {
+		QCategory qCategory = QCategory.category;
+		QCategoryDescription qDescription = QCategoryDescription.categoryDescription;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qCategory)
+			.leftJoin(qCategory.descriptions, qDescription).fetch()
+			.leftJoin(qCategory.merchantStore).fetch()
+			.where(qDescription.seUrl.eq(seUrl)
+			.and(qCategory.merchantStore.id.eq(store.getId())));
+
+		
+		return query.uniqueResult(qCategory);
+	}
+	
+	@Override
+	public Category getByCode(MerchantStore store, String code) {
+		QCategory qCategory = QCategory.category;
+		QCategoryDescription qDescription = QCategoryDescription.categoryDescription;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qCategory)
+			.leftJoin(qCategory.descriptions, qDescription).fetch()
+			.leftJoin(qCategory.merchantStore).fetch()
+			.where(qCategory.code.eq(code)
+			.and(qCategory.merchantStore.id.eq(store.getId())));
+
+		return query.uniqueResult(qCategory);
+	}
+	
+	@Override
+	public List<Category> getByCodes(MerchantStore store, List<String> codes, Language language) {
+		QCategory qCategory = QCategory.category;
+		QCategoryDescription qDescription = QCategoryDescription.categoryDescription;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qCategory)
+			.leftJoin(qCategory.descriptions, qDescription).fetch()
+			.leftJoin(qCategory.merchantStore).fetch()
+			.where(qCategory.code.in(codes)
+			.and(qCategory.merchantStore.id.eq(store.getId()))
+			.and(qDescription.language.id.eq(language.getId())))
+			.orderBy(qCategory.sortOrder.asc(), qCategory.lineage.asc(), qCategory.lineage.asc(), qCategory.depth.asc(), qDescription.language.id.desc());
+		
+		return query.list(qCategory);
+	}
+	
+	@Override
+	public List<Category> getByIds(MerchantStore store, List<Long> ids, Language language) {
+		QCategory qCategory = QCategory.category;
+		QCategoryDescription qDescription = QCategoryDescription.categoryDescription;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qCategory)
+			.leftJoin(qCategory.descriptions, qDescription).fetch()
+			.leftJoin(qCategory.merchantStore).fetch()
+			.where(qCategory.id.in(ids)
+			.and(qCategory.merchantStore.id.eq(store.getId()))
+			.and(qDescription.language.id.eq(language.getId())))
+			.orderBy(qCategory.sortOrder.asc(), qCategory.lineage.asc(), qCategory.lineage.asc(), qCategory.depth.asc(), qDescription.language.id.desc());
+		
+		return query.list(qCategory);
+	}
+	
+	@Override
+	public Category getByLanguage(long categoryId, Language language) {
+		QCategory qCategory = QCategory.category;
+		QCategoryDescription qDescription = QCategoryDescription.categoryDescription;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qCategory)
+			.leftJoin(qCategory.descriptions, qDescription).fetch()
+			.leftJoin(qCategory.merchantStore).fetch()
+			.where(qCategory.id.eq(categoryId)
+			.and(qDescription.language.code.eq(language.getCode())));
+
+		
+		return query.uniqueResult(qCategory);
+	}
+	
+	@Override
+	public Category getByCode(String merchantStoreCode, String code) {
+		QCategory qCategory = QCategory.category;
+		QCategoryDescription qDescription = QCategoryDescription.categoryDescription;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qCategory)
+			.leftJoin(qCategory.descriptions, qDescription).fetch()
+			.leftJoin(qCategory.merchantStore).fetch()
+			.where(qCategory.code.eq(code)
+			.and(qCategory.merchantStore.code.eq(merchantStoreCode)));
+
+		
+		return query.uniqueResult(qCategory);
+	}
+	
+	@Override
+	public Category getById(Long id) {
+		QCategory qCategory = QCategory.category;
+		QCategoryDescription qDescription = QCategoryDescription.categoryDescription;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qCategory)
+			.leftJoin(qCategory.descriptions, qDescription).fetch()
+			.leftJoin(qCategory.merchantStore).fetch()
+			.where(qCategory.id.eq(id));
+
+		return query.uniqueResult(qCategory);
+	}
+	
+	@Override
+	public List<Category> listByLineage(MerchantStore store, String lineage) {
+		QCategory qCategory = QCategory.category;
+		QCategoryDescription qDescription = QCategoryDescription.categoryDescription;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qCategory)
+			.leftJoin(qCategory.descriptions, qDescription).fetch()
+			.leftJoin(qCategory.merchantStore).fetch()
+			.where(qCategory.lineage.like(new StringBuilder().append(lineage).append("%").toString())
+			.and(qCategory.merchantStore.id.eq(store.getId())))
+			.orderBy(qCategory.sortOrder.asc(), qCategory.lineage.asc(), qCategory.lineage.asc(), qCategory.depth.asc(), qDescription.language.id.desc());
+		
+		return query.listDistinct(qCategory);
+	}
+	
+	@Override
+	public List<Category> listByLineage(String merchantStoreCode, String lineage) {
+		QCategory qCategory = QCategory.category;
+		QCategoryDescription qDescription = QCategoryDescription.categoryDescription;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qCategory)
+			.leftJoin(qCategory.descriptions, qDescription).fetch()
+			.leftJoin(qCategory.merchantStore).fetch()
+			.where(qCategory.lineage.like(new StringBuilder().append(lineage).append("%").toString())
+			.and(qCategory.merchantStore.code.eq(merchantStoreCode)))
+			.orderBy(qCategory.sortOrder.asc(),qCategory.lineage.asc(), qCategory.lineage.asc(), qCategory.depth.asc(), qDescription.language.id.desc());
+		
+		return query.listDistinct(qCategory);
+	}
+	
+	@Override
+	public List<Category> listByDepth(MerchantStore store, int depth) {
+		QCategory qCategory = QCategory.category;
+		QCategoryDescription qDescription = QCategoryDescription.categoryDescription;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qCategory)
+			.leftJoin(qCategory.descriptions, qDescription).fetch()
+			.leftJoin(qCategory.merchantStore).fetch()
+			.where(qCategory.depth.eq(depth)
+			.and(qCategory.merchantStore.id.eq(store.getId())))
+			.orderBy(qCategory.sortOrder.asc(), qCategory.lineage.asc(), qCategory.lineage.asc(), qCategory.depth.asc(), qDescription.language.id.desc());
+		
+		return query.listDistinct(qCategory);
+	}
+	
+	@Override
+	public List<Category> listByDepth(MerchantStore store, int depth, Language language) {
+		QCategory qCategory = QCategory.category;
+		QCategoryDescription qDescription = QCategoryDescription.categoryDescription;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qCategory)
+			.leftJoin(qCategory.descriptions, qDescription).fetch()
+			.leftJoin(qCategory.merchantStore).fetch()
+			.where(qCategory.depth.eq(depth)
+			.and(qCategory.merchantStore.id.eq(store.getId()))
+			.and(qDescription.language.id.eq(language.getId())))
+			.orderBy(qCategory.sortOrder.asc(), qCategory.lineage.asc(), qCategory.lineage.asc(), qCategory.depth.asc(), qDescription.language.id.desc());
+		
+		return query.listDistinct(qCategory);
+	}
+	
+	@Override
+	public List<Category> listByParent(Category category, Language language) {
+		
+		QCategory qCategory = QCategory.category;
+		QCategoryDescription qDescription = QCategoryDescription.categoryDescription;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qCategory)
+			.leftJoin(qCategory.descriptions, qDescription).fetch()
+			.leftJoin(qCategory.merchantStore).fetch()
+			.leftJoin(qCategory.parent).fetch()
+			.where(qCategory.parent.id.eq(category.getId())
+			.and(qCategory.merchantStore.id.eq(category.getMerchantStore().getId())))
+			.orderBy(qCategory.lineage.asc(), qCategory.lineage.asc(), qCategory.depth.asc(), qDescription.language.id.desc());
+		
+		return query.listDistinct(qCategory);
+		
+	}
+	
+	
+
+	@Override
+	public List<Category> listByStoreAndParent(MerchantStore store, Category category) {
+		QCategory qCategory = QCategory.category;
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		if (store == null) {
+			if (category == null) {
+				query.from(qCategory)
+					.where(qCategory.parent.isNull())
+					.orderBy(qCategory.sortOrder.asc(),qCategory.id.desc());
+			} else {
+				query.from(qCategory)
+					.where(qCategory.parent.eq(category))
+					.orderBy(qCategory.sortOrder.asc(),qCategory.id.desc());
+			}
+		} else {
+			if (category == null) {
+				query.from(qCategory)
+					.where(qCategory.parent.isNull()
+						.and(qCategory.merchantStore.eq(store)))
+					.orderBy(qCategory.sortOrder.asc(),qCategory.id.desc());
+			} else {
+				query.from(qCategory)
+					.where(qCategory.parent.eq(category)
+						.and(qCategory.merchantStore.eq(store)))
+					.orderBy(qCategory.sortOrder.asc(),qCategory.id.desc());
+			}
+		}
+		
+		return query.list(qCategory);
+	}
+	
+	
+
+
+	@Override
+	public List<Category> listByStore(MerchantStore store) {
+		QCategory qCategory = QCategory.category;
+		QCategoryDescription qDescription = QCategoryDescription.categoryDescription;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qCategory)
+			.leftJoin(qCategory.descriptions, qDescription).fetch()
+			.leftJoin(qCategory.merchantStore).fetch()
+			.where(qCategory.merchantStore.id.eq(store.getId()))
+			.orderBy(qCategory.sortOrder.asc(),qCategory.id.asc());
+		
+		return query.listDistinct(qCategory);
+	}
+	
+	@Override
+	public List<Object[]> countProductsByCategories(MerchantStore store, List<Long> categoryIds) {
+
+		
+		StringBuilder qs = new StringBuilder();
+		qs.append("select categories, count(product.id) from Product product ");
+		qs.append("inner join product.categories categories ");
+		qs.append("where categories.id in (:cid) ");
+		qs.append("and product.available=true and product.dateAvailable<=:dt ");
+		qs.append("group by categories.id");
+		
+    	String hql = qs.toString();
+		Query q = super.getEntityManager().createQuery(hql);
+
+    	q.setParameter("cid", categoryIds);
+    	q.setParameter("dt", new Date());
+
+
+    	
+    	@SuppressWarnings("unchecked")
+		List<Object[]> counts =  q.getResultList();
+
+    	
+    	return counts;
+		
+		
+	}
+	
+	@Override
+	public List<Category> listByStore(MerchantStore store, Language language) {
+		QCategory qCategory = QCategory.category;
+		QCategoryDescription qDescription = QCategoryDescription.categoryDescription;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qCategory)
+			.leftJoin(qCategory.descriptions, qDescription).fetch()
+			.leftJoin(qCategory.merchantStore).fetch()
+			.where((qCategory.merchantStore.id.eq(store.getId()))
+			.and(qDescription.language.id.eq(language.getId())))
+			.orderBy(qCategory.sortOrder.asc(),qCategory.id.asc());
+		
+		return query.listDistinct(qCategory);
+	}
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/category/model/Category.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/category/model/Category.java
new file mode 100755
index 0000000..4c4e889
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/category/model/Category.java
@@ -0,0 +1,213 @@
+package com.salesmanager.core.business.catalog.category.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+import javax.persistence.UniqueConstraint;
+import javax.validation.Valid;
+
+import org.hibernate.validator.constraints.NotEmpty;
+
+import com.salesmanager.core.business.common.model.audit.AuditListener;
+import com.salesmanager.core.business.common.model.audit.AuditSection;
+import com.salesmanager.core.business.common.model.audit.Auditable;
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.constants.SchemaConstant;
+
+@Entity
+@EntityListeners(value = AuditListener.class)
+@Table(name = "CATEGORY", schema= SchemaConstant.SALESMANAGER_SCHEMA,uniqueConstraints=
+    @UniqueConstraint(columnNames = {"MERCHANT_ID", "CODE"}) )
+
+
+public class Category extends SalesManagerEntity<Long, Category> implements Auditable {
+	private static final long serialVersionUID = -846291242449186747L;
+	
+	@Id
+	@Column(name = "CATEGORY_ID", unique=true, nullable=false)
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT", pkColumnValue = "CATEGORY_SEQ_NEXT_VAL")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Long id;
+
+	@Embedded
+	private AuditSection auditSection = new AuditSection();
+
+	@Valid
+	@OneToMany(mappedBy="category", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+	private List<CategoryDescription> descriptions = new ArrayList<CategoryDescription>();
+	
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name="MERCHANT_ID", nullable=false)
+	private MerchantStore merchantStore;
+	
+	@ManyToOne
+	@JoinColumn(name = "PARENT_ID")
+	private Category parent;
+	
+	@OneToMany(mappedBy = "parent", cascade = CascadeType.REMOVE, orphanRemoval = true)
+	private List<Category> categories = new ArrayList<Category>();
+	
+	@Column(name = "CATEGORY_IMAGE", length=100)
+	private String categoryImage;
+
+	@Column(name = "SORT_ORDER")
+	private Integer sortOrder = 0;
+
+	@Column(name = "CATEGORY_STATUS")
+	private boolean categoryStatus;
+
+	@Column(name = "VISIBLE")
+	private boolean visible;
+
+	@Column(name = "DEPTH")
+	private Integer depth;
+
+	@Column(name = "LINEAGE")
+	private String lineage;
+	
+	@NotEmpty
+	@Column(name="CODE", length=100, nullable=false)
+	private String code;
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public Category() {
+	}
+	
+	public Category(MerchantStore store) {
+		this.merchantStore = store;
+		this.id = 0L;
+	}
+	
+	@Override
+	public Long getId() {
+		return this.id;
+	}
+
+	@Override
+	public void setId(Long id) {
+		this.id = id;
+	}
+	
+	@Override
+	public AuditSection getAuditSection() {
+		return auditSection;
+	}
+	
+	@Override
+	public void setAuditSection(AuditSection auditSection) {
+		this.auditSection = auditSection;
+	}
+
+	public List<CategoryDescription> getDescriptions() {
+		return descriptions;
+	}
+
+	public void setDescriptions(List<CategoryDescription> descriptions) {
+		this.descriptions = descriptions;
+	}
+
+	public String getCategoryImage() {
+		return categoryImage;
+	}
+
+	public void setCategoryImage(String categoryImage) {
+		this.categoryImage = categoryImage;
+	}
+
+	public Integer getSortOrder() {
+		return sortOrder;
+	}
+
+	public void setSortOrder(Integer sortOrder) {
+		this.sortOrder = sortOrder;
+	}
+
+	public boolean isCategoryStatus() {
+		return categoryStatus;
+	}
+
+	public void setCategoryStatus(boolean categoryStatus) {
+		this.categoryStatus = categoryStatus;
+	}
+
+	public boolean isVisible() {
+		return visible;
+	}
+
+	public void setVisible(boolean visible) {
+		this.visible = visible;
+	}
+
+	public Integer getDepth() {
+		return depth;
+	}
+
+	public void setDepth(Integer depth) {
+		this.depth = depth;
+	}
+
+	public String getLineage() {
+		return lineage;
+	}
+
+	public void setLineage(String lineage) {
+		this.lineage = lineage;
+	}
+
+	public Category getParent() {
+		return parent;
+	}
+
+	public void setParent(Category parent) {
+		this.parent = parent;
+	}
+	
+
+
+
+	public MerchantStore getMerchantStore() {
+		return merchantStore;
+	}
+
+	public void setMerchantStore(MerchantStore merchantStore) {
+		this.merchantStore = merchantStore;
+	}
+
+	public List<Category> getCategories() {
+		return categories;
+	}
+
+	public void setCategories(List<Category> categories) {
+		this.categories = categories;
+	}
+	
+	public CategoryDescription getDescription() {
+		if(descriptions!=null && descriptions.size()>0) {
+			return descriptions.iterator().next();
+		}
+		
+		return null;
+	}
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/category/model/CategoryDescription.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/category/model/CategoryDescription.java
new file mode 100644
index 0000000..14b67f6
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/category/model/CategoryDescription.java
@@ -0,0 +1,101 @@
+package com.salesmanager.core.business.catalog.category.model;
+
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
+
+import com.salesmanager.core.business.common.model.Description;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+@Entity
+@Table(name="CATEGORY_DESCRIPTION", schema="SALESMANAGER",uniqueConstraints={
+		@UniqueConstraint(columnNames={
+			"CATEGORY_ID",
+			"LANGUAGE_ID"
+		})
+	}
+)
+public class CategoryDescription extends Description {
+	private static final long serialVersionUID = -3248423008455359301L;
+	
+
+	@ManyToOne(targetEntity = Category.class)
+	@JoinColumn(name = "CATEGORY_ID", nullable = false)
+	private Category category;
+
+	@Column(name="SEF_URL", length=120)
+	private String seUrl;
+	
+	@Column(name = "CATEGORY_HIGHLIGHT")
+	private String categoryHighlight;
+
+	public String getCategoryHighlight() {
+		return categoryHighlight;
+	}
+
+	public void setCategoryHighlight(String categoryHighlight) {
+		this.categoryHighlight = categoryHighlight;
+	}
+
+	@Column(name="META_TITLE", length=120)
+	private String metatagTitle;
+	
+	@Column(name="META_KEYWORDS")
+	private String metatagKeywords;
+	
+	@Column(name="META_DESCRIPTION")
+	private String metatagDescription;
+	
+	public CategoryDescription() {
+	}
+	
+	public CategoryDescription(String name, Language language) {
+		this.setName(name);
+		this.setLanguage(language);
+		super.setId(0L);
+	}
+	
+	public String getSeUrl() {
+		return seUrl;
+	}
+
+	public void setSeUrl(String seUrl) {
+		this.seUrl = seUrl;
+	}
+
+	public String getMetatagTitle() {
+		return metatagTitle;
+	}
+
+	public void setMetatagTitle(String metatagTitle) {
+		this.metatagTitle = metatagTitle;
+	}
+
+	public String getMetatagKeywords() {
+		return metatagKeywords;
+	}
+
+	public void setMetatagKeywords(String metatagKeywords) {
+		this.metatagKeywords = metatagKeywords;
+	}
+
+	public String getMetatagDescription() {
+		return metatagDescription;
+	}
+
+	public void setMetatagDescription(String metatagDescription) {
+		this.metatagDescription = metatagDescription;
+	}
+
+	public Category getCategory() {
+		return category;
+	}
+
+	public void setCategory(Category category) {
+		this.category = category;
+	}
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/category/service/CategoryService.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/category/service/CategoryService.java
new file mode 100644
index 0000000..1238500
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/category/service/CategoryService.java
@@ -0,0 +1,102 @@
+package com.salesmanager.core.business.catalog.category.service;
+
+import java.util.List;
+
+import com.salesmanager.core.business.catalog.category.model.Category;
+import com.salesmanager.core.business.catalog.category.model.CategoryDescription;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityService;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+public interface CategoryService extends SalesManagerEntityService<Long, Category> {
+
+	List<Category> listByLineage(MerchantStore store, String lineage) throws ServiceException;
+	
+	List<Category> listBySeUrl(MerchantStore store, String seUrl) throws ServiceException;
+	
+	CategoryDescription getDescription(Category category, Language language) throws ServiceException;
+
+	void addCategoryDescription(Category category, CategoryDescription description) throws ServiceException;
+
+	void addChild(Category parent, Category child) throws ServiceException;
+
+	List<Category> listByParent(Category category) throws ServiceException;
+	
+	List<Category> listByStoreAndParent(MerchantStore store, Category category) throws ServiceException;
+	
+	
+	List<Category> getByName(MerchantStore store, String name, Language language) throws ServiceException;
+	
+	List<Category> listByStore(MerchantStore store) throws ServiceException;
+
+	Category getByCode(MerchantStore store, String code)
+			throws ServiceException;
+
+	List<Category> listByStore(MerchantStore store, Language language)
+			throws ServiceException;
+
+	void saveOrUpdate(Category category) throws ServiceException;
+
+	List<Category> listByDepth(MerchantStore store, int depth);
+
+	/**
+	 * Get root categories by store for a given language
+	 * @param store
+	 * @param depth
+	 * @param language
+	 * @return
+	 */
+	List<Category> listByDepth(MerchantStore store, int depth, Language language);
+
+	List<Category> listByLineage(String storeCode, String lineage)
+			throws ServiceException;
+
+	Category getByCode(String storeCode, String code) throws ServiceException;
+
+	Category getBySeUrl(MerchantStore store, String seUrl);
+
+	List<Category> listByParent(Category category, Language language);
+
+	Category getByLanguage(long categoryId, Language language);
+
+	/**
+	 * Returns a list by category containing the category code and the number of products
+	 * 1->obj[0] = book
+	 *    obj[1] = 150
+	 * 2->obj[0] = novell
+	 *    obj[1] = 35
+	 *   ...
+	 * @param store
+	 * @param categoryIds
+	 * @return
+	 * @throws ServiceException
+	 */
+	List<Object[]> countProductsByCategories(MerchantStore store,
+			List<Long> categoryIds) throws ServiceException;
+
+	/**
+	 * Returns a list of Category by category code for a given language
+	 * @param store
+	 * @param codes
+	 * @param language
+	 * @return
+	 */
+	List<Category> listByCodes(MerchantStore store, List<String> codes,
+			Language language);
+
+	/**
+	 * List of Category by id
+	 * @param store
+	 * @param ids
+	 * @param language
+	 * @return
+	 */
+	List<Category> listByIds(MerchantStore store, List<Long> ids,
+			Language language);
+
+
+	
+	
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/category/service/CategoryServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/category/service/CategoryServiceImpl.java
new file mode 100644
index 0000000..a8aea7b
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/category/service/CategoryServiceImpl.java
@@ -0,0 +1,437 @@
+package com.salesmanager.core.business.catalog.category.service;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.Assert;
+
+import com.salesmanager.core.business.catalog.category.dao.CategoryDao;
+import com.salesmanager.core.business.catalog.category.model.Category;
+import com.salesmanager.core.business.catalog.category.model.CategoryDescription;
+import com.salesmanager.core.business.catalog.product.model.Product;
+import com.salesmanager.core.business.catalog.product.service.ProductService;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityServiceImpl;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.language.model.Language;
+import com.salesmanager.core.constants.Constants;
+
+@Service("categoryService")
+public class CategoryServiceImpl extends SalesManagerEntityServiceImpl<Long, Category> implements CategoryService {
+	
+	private CategoryDao categoryDao;
+	
+
+	  
+	  @Autowired
+	  private ProductService productService;
+	  
+
+	
+	@Autowired
+	public CategoryServiceImpl(CategoryDao categoryDao) {
+		super(categoryDao);
+		
+		this.categoryDao = categoryDao;
+	}
+	
+	public void create(Category category) throws ServiceException {
+		
+		super.create(category);
+		
+		StringBuilder lineage = new StringBuilder();
+		Category parent = category.getParent();
+		if(parent!=null && parent.getId()!=null && parent.getId()!=0) {
+			lineage.append(parent.getLineage()).append("/").append(parent.getId());
+			category.setDepth(parent.getDepth()+1);
+		} else {
+			lineage.append("/");
+			category.setDepth(0);
+		}
+		category.setLineage(lineage.toString());
+		super.update(category);
+		
+		
+	}
+	
+	@Override
+	public List<Object[]> countProductsByCategories(MerchantStore store,
+			List<Long> categoryIds) throws ServiceException {
+		
+		return categoryDao.countProductsByCategories(store, categoryIds);
+		
+	}
+	
+	@Override
+	public List<Category> listByCodes(MerchantStore store, List<String> codes,
+			Language language) {
+		return categoryDao.getByCodes(store, codes, language);
+	}
+	
+	@Override
+	public List<Category> listByIds(MerchantStore store, List<Long> ids,
+			Language language) {
+		return categoryDao.getByIds(store, ids, language);
+	}
+	
+	@Override
+	public Category getByLanguage(long categoryId, Language language) {
+		return categoryDao.getByLanguage(categoryId, language);
+	}
+	
+	@Override
+	public void saveOrUpdate(Category category) throws ServiceException {
+		
+		
+		//save or update (persist and attach entities
+		if(category.getId()!=null && category.getId()>0) {
+
+			super.update(category);
+			
+		} else {
+			
+			super.save(category);
+			
+		}
+		
+	}
+
+	@Override
+	public List<Category> listByLineage(MerchantStore store, String lineage) throws ServiceException {
+		try {
+			return categoryDao.listByLineage(store, lineage);
+		} catch (Exception e) {
+			throw new ServiceException(e);
+		}
+		
+		
+	}
+	
+	@Override
+	public List<Category> listByLineage(String storeCode, String lineage) throws ServiceException {
+		try {
+			return categoryDao.listByLineage(storeCode, lineage);
+		} catch (Exception e) {
+			throw new ServiceException(e);
+		}
+		
+		
+	}
+	
+
+	@Override
+	public List<Category> listBySeUrl(MerchantStore store, String seUrl) throws ServiceException{
+		
+		try {
+			return categoryDao.listBySeUrl(store, seUrl);
+		} catch (Exception e) {
+			throw new ServiceException(e);
+		}
+		
+	}
+	
+	@Override
+	public Category getBySeUrl(MerchantStore store,String seUrl) {
+		return categoryDao.getBySeUrl(store, seUrl);
+	}
+	
+	
+	@Override
+	public Category getByCode(MerchantStore store, String code) throws ServiceException {
+		
+		try {
+			return categoryDao.getByCode(store, code);
+		} catch (Exception e) {
+			throw new ServiceException(e);
+		}
+		
+	}
+	
+	@Override
+	public Category getByCode(String storeCode, String code) throws ServiceException {
+		
+		try {
+			return categoryDao.getByCode(storeCode, code);
+		} catch (Exception e) {
+			throw new ServiceException(e);
+		}
+		
+	}
+	
+	
+	@Override
+	public Category getById(Long id) {
+		
+
+			return categoryDao.getById(id);
+
+		
+	}
+	
+	@Override
+	public List<Category> listByParent(Category category) throws ServiceException {
+		
+		try {
+			return categoryDao.listByStoreAndParent(null, category);
+		} catch (Exception e) {
+			throw new ServiceException(e);
+		}
+		
+	}
+	
+	@Override
+	public List<Category> listByStoreAndParent(MerchantStore store, Category category) throws ServiceException {
+		
+		try {
+			return categoryDao.listByStoreAndParent(store, category);
+		} catch (Exception e) {
+			throw new ServiceException(e);
+		}
+		
+	}
+	
+	@Override
+	public List<Category> listByParent(Category category, Language language) {
+		Assert.notNull(category, "Category cannot be null");
+		Assert.notNull(language, "Language cannot be null");
+		Assert.notNull(category.getMerchantStore(), "category.merchantStore cannot be null");
+		
+		return categoryDao.listByParent(category, language);
+	}
+
+	
+	@Override
+	public void addCategoryDescription(Category category, CategoryDescription description)
+			throws ServiceException {
+		
+		
+		
+		try {
+			category.getDescriptions().add(description);
+			description.setCategory(category);
+			update(category);
+		} catch (Exception e) {
+			throw new ServiceException(e);
+		}
+
+	}
+
+	
+	//@Override
+	public void delete(Category category) throws ServiceException {
+		
+		//get category with lineage (subcategories)
+		StringBuilder lineage = new StringBuilder();
+		lineage.append(category.getLineage()).append(category.getId()).append(Constants.SLASH);
+		List<Category> categories = this.listByLineage(category.getMerchantStore(), lineage.toString());
+		
+		Category dbCategory = this.getById( category.getId() );
+		
+		
+		if(dbCategory != null && dbCategory.getId().longValue() == category.getId().longValue() ) {			
+			
+			
+			categories.add(dbCategory);
+			
+			
+			Collections.reverse(categories);
+			
+			List<Long> categoryIds = new ArrayList<Long>();
+	
+				
+			for(Category c : categories) {		
+					categoryIds.add(c.getId());
+			}
+
+			List<Product> products = productService.getProducts(categoryIds);
+			org.hibernate.Session session = this.categoryDao.getEntityManager().unwrap(org.hibernate.Session.class);//need to refresh the session to update all product categories
+
+			
+			for(Product product : products) {
+				session.evict(product);//refresh product so we get all product categories
+				Product dbProduct = productService.getById(product.getId());
+				Set<Category> productCategories = dbProduct.getCategories();
+				if(productCategories.size()>1) {
+					for(Category c : categories) {
+						productCategories.remove(c);
+						productService.update(dbProduct);
+					}
+					
+					if(product.getCategories()==null || product.getCategories().size()==0) {
+						productService.delete(dbProduct);
+					}
+					
+				} else {
+					productService.delete(dbProduct);
+				}
+				
+				
+			}
+			
+			Category categ = this.getById(category.getId());
+			categoryDao.delete(categ);
+			
+		}
+		
+	}
+
+
+	//@Override
+	//public void addProduct(Category category, Product product) throws ServiceException {
+		//if (!category.getProducts().contains(product)) {
+		//	category.getProducts().add(product);
+		//	update(category);
+		//}
+	//}
+
+	//@Override
+	//public void removeProduct(Category category, Product product)
+			//throws ServiceException {
+		//if (category.getProducts().contains(product)) {
+		//	category.getProducts().remove(product);
+		//	update(category);
+		//}
+	//}
+
+	//@Override
+	//public void addProducts(Category category, List<Product> products)
+	//		throws ServiceException {
+		//if (!category.getProducts().contains(products)) {
+		//	category.getProducts().addAll(products);
+		//	update(category);
+		//}
+	//}
+
+	//@Override
+	//public void removeProducts(Category category, List<Product> products)
+		//	throws ServiceException {
+		//if (category.getProducts().contains(products)) {
+		//	category.getProducts().removeAll(products);
+		//	update(category);
+		//}
+	//}
+
+	@Override
+	public CategoryDescription getDescription(Category category, Language language) {
+		
+		
+		for (CategoryDescription description : category.getDescriptions()) {
+			if (description.getLanguage().equals(language)) {
+				return description;
+			}
+		}
+		return null;
+	}
+	
+	@Override
+	public void addChild(Category parent, Category child) throws ServiceException {
+		
+		
+		if(child==null || child.getMerchantStore()==null) {
+			throw new ServiceException("Child category and merchant store should not be null");
+		}
+		
+		try {
+			
+			if(parent==null) {
+				
+				//assign to root
+				child.setParent(null);
+				child.setDepth(0);
+				//child.setLineage(new StringBuilder().append("/").append(child.getId()).append("/").toString());
+				child.setLineage("/");
+				
+			} else {
+				
+				Category p = this.getById(parent.getId());//parent
+				
+				
+
+				
+				String lineage = p.getLineage();
+				int depth = p.getDepth();//TODO sometimes null
+				
+				child.setParent(p);
+				child.setDepth(depth+1);
+				child.setLineage(new StringBuilder().append(lineage).append(p.getId()).append("/").toString());
+				
+				
+			}
+			
+
+			update(child);
+			StringBuilder childLineage = new StringBuilder();
+			childLineage.append(child.getLineage()).append(child.getId()).append("/");
+			List<Category> subCategories = listByLineage(child.getMerchantStore(),childLineage.toString());
+			
+			
+			//ajust all sub categories lineages
+			if(subCategories!=null && subCategories.size()>0) {
+				for(Category subCategory : subCategories) {
+					if(child.getId()!=subCategory.getId()) {
+						addChild(child, subCategory);
+					}
+				}
+				
+			}
+		} catch (Exception e) {
+			throw new ServiceException(e);
+		}
+		
+
+	}
+	
+	@Override
+	public List<Category> listByDepth(MerchantStore store, int depth) {
+		return categoryDao.listByDepth(store, depth);
+	}
+	
+	@Override
+	public List<Category> listByDepth(MerchantStore store, int depth, Language language) {
+		return categoryDao.listByDepth(store, depth, language);
+	}
+
+	@Override
+	public List<Category> getByName(MerchantStore store, String name, Language language) throws ServiceException {
+		
+		try {
+			return categoryDao.getByName(store, name, language);
+		} catch (Exception e) {
+			throw new ServiceException(e);
+		}
+		
+		
+	}
+	
+	
+
+	@Override
+	public List<Category> listByStore(MerchantStore store)
+			throws ServiceException {
+
+		try {
+			return categoryDao.listByStore(store);
+		} catch (Exception e) {
+			throw new ServiceException(e);
+		}
+	}
+	
+	@Override
+	public List<Category> listByStore(MerchantStore store, Language language)
+			throws ServiceException {
+
+		try {
+			return categoryDao.listByStore(store, language);
+		} catch (Exception e) {
+			throw new ServiceException(e);
+		}
+	}
+	
+	
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/common/CatalogServiceHelper.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/common/CatalogServiceHelper.java
new file mode 100644
index 0000000..efab325
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/common/CatalogServiceHelper.java
@@ -0,0 +1,100 @@
+package com.salesmanager.core.business.catalog.common;
+
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Set;
+
+import com.salesmanager.core.business.catalog.product.model.Product;
+import com.salesmanager.core.business.catalog.product.model.attribute.ProductAttribute;
+import com.salesmanager.core.business.catalog.product.model.attribute.ProductOption;
+import com.salesmanager.core.business.catalog.product.model.attribute.ProductOptionDescription;
+import com.salesmanager.core.business.catalog.product.model.attribute.ProductOptionValue;
+import com.salesmanager.core.business.catalog.product.model.attribute.ProductOptionValueDescription;
+import com.salesmanager.core.business.catalog.product.model.availability.ProductAvailability;
+import com.salesmanager.core.constants.Constants;
+
+
+public class CatalogServiceHelper {
+	
+	/**
+	 * Filters descriptions and set the appropriate language
+	 * @param p
+	 * @param language
+	 */
+	public static void setToLanguage(Product p, int language) {
+		
+		
+	Set<ProductAttribute> attributes = p.getAttributes();
+		if(attributes!=null) {
+			
+			for(ProductAttribute attribute : attributes) {
+
+				ProductOption po = attribute.getProductOption();
+				Set<ProductOptionDescription> spod = po.getDescriptions();
+				if(spod!=null) {
+					Set<ProductOptionDescription> podDescriptions = new HashSet<ProductOptionDescription>();
+					for(ProductOptionDescription pod : spod) {
+						//System.out.println("    ProductOptionDescription : " + pod.getProductOptionName());
+						if(pod.getLanguage().getId()==language) {
+							podDescriptions.add(pod);
+						}
+					}
+					po.setDescriptions(podDescriptions);
+				}
+				
+				ProductOptionValue pov = attribute.getProductOptionValue();
+				
+				
+				Set<ProductOptionValueDescription> spovd = pov.getDescriptions();
+				if(spovd!=null) {
+					Set<ProductOptionValueDescription> povdDescriptions = new HashSet();
+					for(ProductOptionValueDescription povd : spovd) {
+						if(povd.getLanguage().getId()==language) {
+							povdDescriptions.add(povd);
+						}
+					}
+					pov.setDescriptions(povdDescriptions);
+				}
+					
+			}
+		}
+		
+	}
+	
+	/**
+	 * Overwrites the availability in order to return 1 price / region
+	 * @param product
+	 * @param locale
+	 */
+	public static void setToAvailability(Product product, Locale locale) {
+		
+		Set<ProductAvailability> availabilities =  product.getAvailabilities();
+		
+		ProductAvailability defaultAvailability = null;
+		ProductAvailability localeAvailability = null;
+		
+		for(ProductAvailability availability : availabilities) {
+			
+			if(availability.getRegion().equals(Constants.ALL_REGIONS)) {
+				defaultAvailability = availability;
+			} 
+			if(availability.getRegion().equals(locale.getCountry())) {
+				localeAvailability = availability;
+			}
+			
+		}
+		
+		if(defaultAvailability!=null || localeAvailability!=null) {
+			Set<ProductAvailability> productAvailabilities = new HashSet<ProductAvailability>();
+			if(defaultAvailability!=null) {
+				productAvailabilities.add(defaultAvailability);
+			}
+			if(localeAvailability!=null) {
+				productAvailabilities.add(localeAvailability);
+			}
+			product.setAvailabilities(productAvailabilities);
+		}
+		
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/attribute/ProductAttributeDao.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/attribute/ProductAttributeDao.java
new file mode 100644
index 0000000..6e4546e
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/attribute/ProductAttributeDao.java
@@ -0,0 +1,24 @@
+package com.salesmanager.core.business.catalog.product.dao.attribute;
+
+import java.util.List;
+
+import com.salesmanager.core.business.catalog.product.model.Product;
+import com.salesmanager.core.business.catalog.product.model.attribute.ProductAttribute;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDao;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+public interface ProductAttributeDao extends SalesManagerEntityDao<Long, ProductAttribute> {
+
+	List<ProductAttribute> getByOptionId(MerchantStore store,
+			Long id);
+
+	List<ProductAttribute> getByOptionValueId(MerchantStore store,
+			Long id);
+
+	List<ProductAttribute> getByProduct(MerchantStore store,
+			Product product, Language language);
+
+	List<ProductAttribute> getByAttributeIds(MerchantStore store, List<Long> ids);
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/attribute/ProductAttributeDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/attribute/ProductAttributeDaoImpl.java
new file mode 100644
index 0000000..d2e7b9e
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/attribute/ProductAttributeDaoImpl.java
@@ -0,0 +1,122 @@
+package com.salesmanager.core.business.catalog.product.dao.attribute;
+
+import java.util.List;
+
+import org.springframework.stereotype.Repository;
+
+import com.mysema.query.jpa.JPQLQuery;
+import com.mysema.query.jpa.impl.JPAQuery;
+import com.salesmanager.core.business.catalog.product.model.Product;
+import com.salesmanager.core.business.catalog.product.model.QProduct;
+import com.salesmanager.core.business.catalog.product.model.attribute.ProductAttribute;
+import com.salesmanager.core.business.catalog.product.model.attribute.QProductAttribute;
+import com.salesmanager.core.business.catalog.product.model.attribute.QProductOption;
+import com.salesmanager.core.business.catalog.product.model.attribute.QProductOptionValue;
+import com.salesmanager.core.business.catalog.product.model.attribute.QProductOptionValueDescription;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDaoImpl;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+@Repository("productAttributeDao")
+public class ProductAttributeDaoImpl extends SalesManagerEntityDaoImpl<Long, ProductAttribute> 
+	implements ProductAttributeDao {
+	
+	
+	@Override
+	public ProductAttribute getById(Long id) {
+		QProductAttribute qEntity = QProductAttribute.productAttribute;
+		QProductOption qProductOption = QProductOption.productOption;
+		QProductOptionValue qProductOptionValue = QProductOptionValue.productOptionValue;
+		
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qEntity)
+			.join(qEntity.product).fetch()
+			.leftJoin(qEntity.productOption, qProductOption).fetch()
+			.leftJoin(qEntity.productOptionValue, qProductOptionValue).fetch()
+			.leftJoin(qProductOption.descriptions).fetch()
+			.leftJoin(qProductOptionValue.descriptions).fetch()
+			.leftJoin(qProductOption.merchantStore).fetch()
+			.where(qEntity.id.eq(id));
+		
+		return query.uniqueResult(qEntity);
+	}
+	
+	@Override
+	public List<ProductAttribute> getByOptionId(MerchantStore store, Long id) {
+		QProductAttribute qEntity = QProductAttribute.productAttribute;
+		QProductOption qProductOption = QProductOption.productOption;
+		
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qEntity)
+			.join(qEntity.product).fetch()
+			.leftJoin(qEntity.productOption, qProductOption).fetch()
+			.leftJoin(qProductOption.merchantStore).fetch()
+			.where(qProductOption.id.eq(id)
+			.and(qProductOption.merchantStore.id.eq(store.getId())));
+		
+		return query.list(qEntity);
+	}
+	
+	@Override
+	public List<ProductAttribute> getByAttributeIds(MerchantStore store, List<Long> ids) {
+		QProductAttribute qEntity = QProductAttribute.productAttribute;
+		QProductOption qProductOption = QProductOption.productOption;
+		
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qEntity)
+			.join(qEntity.product).fetch()
+			.leftJoin(qEntity.productOption, qProductOption).fetch()
+			.leftJoin(qProductOption.merchantStore).fetch()
+			.where(qEntity.id.in(ids)
+			.and(qProductOption.merchantStore.id.eq(store.getId())));
+		
+		return query.list(qEntity);
+	}
+	
+	@Override
+	public List<ProductAttribute> getByOptionValueId(MerchantStore store, Long id) {
+		QProductAttribute qEntity = QProductAttribute.productAttribute;
+		QProductOptionValue qProductOptionValue = QProductOptionValue.productOptionValue;
+		
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qEntity)
+			.join(qEntity.product).fetch()
+			.leftJoin(qEntity.productOptionValue, qProductOptionValue).fetch()
+			.leftJoin(qProductOptionValue.merchantStore).fetch()
+			.where(qProductOptionValue.id.eq(id)
+			.and(qProductOptionValue.merchantStore.id.eq(store.getId())));
+		
+		return query.list(qEntity);
+	}
+
+	
+	@Override
+	public List<ProductAttribute> getByProduct(MerchantStore store, Product product, Language language) {
+		QProductAttribute qEntity = QProductAttribute.productAttribute;
+		QProductOptionValue qProductOptionValue = QProductOptionValue.productOptionValue;
+		QProductOptionValueDescription qProductOptionValueDescription = QProductOptionValueDescription.productOptionValueDescription;
+		QProduct qProduct = QProduct.product;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qEntity)
+			.leftJoin(qEntity.productOptionValue, qProductOptionValue).fetch()
+			.leftJoin(qProductOptionValue.merchantStore).fetch()
+			.join(qEntity.product,qProduct).fetch()
+			.leftJoin(qProductOptionValue.descriptions,qProductOptionValueDescription).fetch()
+			.where(qProduct.id.eq(product.getId())
+			.and(qProductOptionValue.merchantStore.id.eq(store.getId()))
+			.and(qProductOptionValueDescription.language.id.eq(language.getId())));
+		
+		return query.list(qEntity);
+	}
+	
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/attribute/ProductOptionDao.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/attribute/ProductOptionDao.java
new file mode 100644
index 0000000..00dbc50
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/attribute/ProductOptionDao.java
@@ -0,0 +1,31 @@
+package com.salesmanager.core.business.catalog.product.dao.attribute;
+
+import java.util.List;
+
+import com.salesmanager.core.business.catalog.product.model.attribute.ProductOption;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDao;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+public interface ProductOptionDao extends SalesManagerEntityDao<Long, ProductOption> {
+
+	List<ProductOption> listByStore(MerchantStore store, Language language);
+
+	List<ProductOption> getByName(MerchantStore store, String name,
+			Language language);
+
+	void saveOrUpdate(ProductOption entity) throws ServiceException;
+
+	/**
+	 * Get read only attributes.
+	 * @param store
+	 * @param language
+	 * @return
+	 */
+	List<ProductOption> getReadOnly(MerchantStore store,
+			Language language);
+
+	ProductOption getByCode(MerchantStore store, String optionCode);
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/attribute/ProductOptionDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/attribute/ProductOptionDaoImpl.java
new file mode 100644
index 0000000..da21fd3
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/attribute/ProductOptionDaoImpl.java
@@ -0,0 +1,125 @@
+package com.salesmanager.core.business.catalog.product.dao.attribute;
+
+import java.util.List;
+
+import org.springframework.stereotype.Repository;
+
+import com.mysema.query.jpa.JPQLQuery;
+import com.mysema.query.jpa.impl.JPAQuery;
+import com.salesmanager.core.business.catalog.product.model.attribute.ProductOption;
+import com.salesmanager.core.business.catalog.product.model.attribute.QProductOption;
+import com.salesmanager.core.business.catalog.product.model.attribute.QProductOptionDescription;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDaoImpl;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+@Repository("productOptionDao")
+public class ProductOptionDaoImpl extends SalesManagerEntityDaoImpl<Long, ProductOption>
+		implements ProductOptionDao {
+	
+	@Override
+	public List<ProductOption> listByStore(MerchantStore store, Language language) {
+		
+		QProductOption qProductOption = QProductOption.productOption;
+		QProductOptionDescription qDescription = QProductOptionDescription.productOptionDescription;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qProductOption)
+			.leftJoin(qProductOption.descriptions, qDescription).fetch()
+			.leftJoin(qProductOption.merchantStore).fetch()
+			.where(qProductOption.merchantStore.id.eq(store.getId())
+			.and(qDescription.language.id.eq(language.getId())))
+			.orderBy(qProductOption.id.asc());
+		
+		return query.listDistinct(qProductOption);
+		
+	}
+	
+	@Override
+	public ProductOption getById(Long id) {
+		QProductOption qProductOption = QProductOption.productOption;
+		QProductOptionDescription qDescription = QProductOptionDescription.productOptionDescription;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qProductOption)
+			.leftJoin(qProductOption.descriptions, qDescription).fetch()
+			.leftJoin(qProductOption.merchantStore).fetch()
+			.where(qProductOption.id.eq(id));
+		
+		return query.uniqueResult(qProductOption);
+	}
+	
+	@Override
+	public List<ProductOption> getByName(MerchantStore store, String name, Language language) {
+		QProductOption qProductOption = QProductOption.productOption;
+		QProductOptionDescription qDescription = QProductOptionDescription.productOptionDescription;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qProductOption)
+			.leftJoin(qProductOption.descriptions, qDescription).fetch()
+			.leftJoin(qProductOption.merchantStore).fetch()
+			.where(qDescription.name.like("%" + name + "%")
+			.and(qDescription.language.id.eq(language.getId()))
+			.and(qProductOption.merchantStore.id.eq(store.getId())));
+		
+
+		
+		List<ProductOption> options = query.list(qProductOption);
+		return options;
+	}
+	
+	@Override
+	public List<ProductOption> getReadOnly(MerchantStore store, Language language) {
+		QProductOption qProductOption = QProductOption.productOption;
+		QProductOptionDescription qDescription = QProductOptionDescription.productOptionDescription;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qProductOption)
+			.leftJoin(qProductOption.descriptions, qDescription).fetch()
+			.leftJoin(qProductOption.merchantStore).fetch()
+			.where(qProductOption.readOnly.eq(true)
+			.and(qDescription.language.id.eq(language.getId()))
+			.and(qProductOption.merchantStore.id.eq(store.getId())));
+		
+
+		
+		List<ProductOption> options = query.list(qProductOption);
+		return options;
+	}
+	
+	@Override
+	public void saveOrUpdate(ProductOption entity) throws ServiceException {
+		
+		
+		//save or update (persist and attach entities
+		if(entity.getId()!=null && entity.getId()>0) {
+			super.update(entity);
+		} else {
+			super.save(entity);
+		}
+	}
+	
+	@Override
+	public ProductOption getByCode(MerchantStore store, String optionCode) {
+		QProductOption qProductOption = QProductOption.productOption;
+		QProductOptionDescription qDescription = QProductOptionDescription.productOptionDescription;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qProductOption)
+			.leftJoin(qProductOption.descriptions, qDescription).fetch()
+			.leftJoin(qProductOption.merchantStore).fetch()
+			.where(qProductOption.merchantStore.id.eq(store.getId())
+			.and(qProductOption.code.eq(optionCode)));
+		
+		return query.uniqueResult(qProductOption);
+	}
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/attribute/ProductOptionValueDao.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/attribute/ProductOptionValueDao.java
new file mode 100644
index 0000000..43bdfcb
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/attribute/ProductOptionValueDao.java
@@ -0,0 +1,24 @@
+package com.salesmanager.core.business.catalog.product.dao.attribute;
+
+import java.util.List;
+
+import com.salesmanager.core.business.catalog.product.model.attribute.ProductOptionValue;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDao;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+public interface ProductOptionValueDao extends SalesManagerEntityDao<Long, ProductOptionValue> {
+
+	List<ProductOptionValue> listByStore(MerchantStore store, Language language);
+
+	ProductOptionValue getById(MerchantStore store, Long id);
+
+	List<ProductOptionValue> getByName(MerchantStore store, String name,
+			Language language);
+
+	List<ProductOptionValue> listByStoreNoReadOnly(MerchantStore store,
+			Language language);
+
+	ProductOptionValue getByCode(MerchantStore store, String optionValueCode);
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/attribute/ProductOptionValueDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/attribute/ProductOptionValueDaoImpl.java
new file mode 100644
index 0000000..3c547b0
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/attribute/ProductOptionValueDaoImpl.java
@@ -0,0 +1,120 @@
+package com.salesmanager.core.business.catalog.product.dao.attribute;
+
+import java.util.List;
+
+import org.springframework.stereotype.Repository;
+
+import com.mysema.query.jpa.JPQLQuery;
+import com.mysema.query.jpa.impl.JPAQuery;
+import com.salesmanager.core.business.catalog.product.model.attribute.ProductOptionValue;
+import com.salesmanager.core.business.catalog.product.model.attribute.QProductOptionValue;
+import com.salesmanager.core.business.catalog.product.model.attribute.QProductOptionValueDescription;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDaoImpl;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+@Repository("productOptionValueDao")
+public class ProductOptionValueDaoImpl extends SalesManagerEntityDaoImpl<Long, ProductOptionValue>
+		implements ProductOptionValueDao {
+	
+	
+	@Override
+	public List<ProductOptionValue> listByStore(MerchantStore store, Language language) {
+		
+		QProductOptionValue qProductOption = QProductOptionValue.productOptionValue;
+		QProductOptionValueDescription qDescription = QProductOptionValueDescription.productOptionValueDescription;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qProductOption)
+			.leftJoin(qProductOption.descriptions, qDescription).fetch()
+			.leftJoin(qProductOption.merchantStore).fetch()
+			.where(qProductOption.merchantStore.id.eq(store.getId())
+			.and(qDescription.language.id.eq(language.getId())));
+			query.orderBy(qProductOption.id.asc());
+			
+			
+		
+		return query.listDistinct(qProductOption);
+		
+	}
+	
+	@Override
+	public List<ProductOptionValue> listByStoreNoReadOnly(MerchantStore store, Language language) {
+		
+		QProductOptionValue qProductOption = QProductOptionValue.productOptionValue;
+		QProductOptionValueDescription qDescription = QProductOptionValueDescription.productOptionValueDescription;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qProductOption)
+			.leftJoin(qProductOption.descriptions, qDescription).fetch()
+			.leftJoin(qProductOption.merchantStore).fetch()
+			.where(qProductOption.merchantStore.id.eq(store.getId())
+			.and(qProductOption.productOptionDisplayOnly.eq(false))
+			.and(qDescription.language.id.eq(language.getId())));
+			query.orderBy(qProductOption.id.asc());
+			
+			
+		
+		return query.listDistinct(qProductOption);
+		
+	}
+	
+
+	
+	@Override
+	public ProductOptionValue getById(MerchantStore store, Long id) {
+		QProductOptionValue qProductOption = QProductOptionValue.productOptionValue;
+		QProductOptionValueDescription qDescription = QProductOptionValueDescription.productOptionValueDescription;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qProductOption)
+			.leftJoin(qProductOption.descriptions, qDescription).fetch()
+			.leftJoin(qProductOption.merchantStore).fetch()
+			.where(qProductOption.id.eq(id)
+			.and(qProductOption.merchantStore.id.eq(store.getId())));
+		
+		return query.uniqueResult(qProductOption);
+	}
+	
+	@Override
+	public List<ProductOptionValue> getByName(MerchantStore store, String name, Language language) {
+		QProductOptionValue qProductOption = QProductOptionValue.productOptionValue;
+		QProductOptionValueDescription qDescription = QProductOptionValueDescription.productOptionValueDescription;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qProductOption)
+			.leftJoin(qProductOption.descriptions, qDescription).fetch()
+			.leftJoin(qProductOption.merchantStore).fetch()
+			.where(qDescription.name.like("%" + name + "%")
+			.and(qDescription.language.id.eq(language.getId()))
+			.and(qProductOption.merchantStore.id.eq(store.getId())));
+		
+
+		
+		List<ProductOptionValue> options = query.list(qProductOption);
+		return options;
+	}
+	
+	@Override
+	public ProductOptionValue getByCode(MerchantStore store, String optionValueCode) {
+		QProductOptionValue qProductOption = QProductOptionValue.productOptionValue;
+		QProductOptionValueDescription qDescription = QProductOptionValueDescription.productOptionValueDescription;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qProductOption)
+			.leftJoin(qProductOption.descriptions, qDescription).fetch()
+			.leftJoin(qProductOption.merchantStore).fetch()
+			.where(qProductOption.code.eq(optionValueCode)
+			.and(qProductOption.merchantStore.id.eq(store.getId())));
+		
+		return query.uniqueResult(qProductOption);
+	}
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/availability/ProductAvailabilityDao.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/availability/ProductAvailabilityDao.java
new file mode 100644
index 0000000..1f8baa4
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/availability/ProductAvailabilityDao.java
@@ -0,0 +1,8 @@
+package com.salesmanager.core.business.catalog.product.dao.availability;
+
+import com.salesmanager.core.business.catalog.product.model.availability.ProductAvailability;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDao;
+
+public interface ProductAvailabilityDao extends SalesManagerEntityDao<Long, ProductAvailability> {
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/availability/ProductAvailabilityDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/availability/ProductAvailabilityDaoImpl.java
new file mode 100644
index 0000000..77c0346
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/availability/ProductAvailabilityDaoImpl.java
@@ -0,0 +1,14 @@
+package com.salesmanager.core.business.catalog.product.dao.availability;
+
+import org.springframework.stereotype.Repository;
+
+import com.salesmanager.core.business.catalog.product.model.availability.ProductAvailability;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDaoImpl;
+
+@Repository("productAvailabilityDao")
+public class ProductAvailabilityDaoImpl extends SalesManagerEntityDaoImpl<Long, ProductAvailability>
+		implements ProductAvailabilityDao {
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/file/DigitalProductDao.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/file/DigitalProductDao.java
new file mode 100644
index 0000000..e88ac90
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/file/DigitalProductDao.java
@@ -0,0 +1,13 @@
+package com.salesmanager.core.business.catalog.product.dao.file;
+
+import com.salesmanager.core.business.catalog.product.model.Product;
+import com.salesmanager.core.business.catalog.product.model.file.DigitalProduct;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDao;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+
+public interface DigitalProductDao extends SalesManagerEntityDao<Long, DigitalProduct> {
+
+	DigitalProduct getByProduct(MerchantStore store, Product product);
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/file/DigitalProductDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/file/DigitalProductDaoImpl.java
new file mode 100644
index 0000000..51ccee5
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/file/DigitalProductDaoImpl.java
@@ -0,0 +1,58 @@
+package com.salesmanager.core.business.catalog.product.dao.file;
+
+import java.util.List;
+
+import javax.persistence.NonUniqueResultException;
+
+import org.springframework.stereotype.Repository;
+
+import com.mysema.query.jpa.JPQLQuery;
+import com.mysema.query.jpa.impl.JPAQuery;
+import com.salesmanager.core.business.catalog.product.model.Product;
+import com.salesmanager.core.business.catalog.product.model.QProduct;
+import com.salesmanager.core.business.catalog.product.model.file.DigitalProduct;
+import com.salesmanager.core.business.catalog.product.model.file.QDigitalProduct;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDaoImpl;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+
+@Repository("digitalProductDao")
+public class DigitalProductDaoImpl extends SalesManagerEntityDaoImpl<Long, DigitalProduct> 
+	implements DigitalProductDao {
+	
+	@Override
+	public DigitalProduct getByProduct(MerchantStore store, Product product) {
+		
+		QDigitalProduct qDigitalProduct = QDigitalProduct.digitalProduct;
+		QProduct qProduct = QProduct.product;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qDigitalProduct)
+			.innerJoin(qDigitalProduct.product, qProduct).fetch()
+			.innerJoin(qProduct.merchantStore).fetch()
+			.where(qProduct.merchantStore.id.eq(store.getId())
+					.and(qProduct.id.eq(product.getId())));
+		
+		List<DigitalProduct> results = query.list(qDigitalProduct);
+        if (results.isEmpty()) return null;
+        
+        else if (results.size() == 1) return results.get(0);
+        throw new NonUniqueResultException();
+	}
+	
+	@Override
+	public DigitalProduct getById(Long id) {
+		
+		QDigitalProduct qDigitalProduct = QDigitalProduct.digitalProduct;
+		QProduct qProduct = QProduct.product;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qDigitalProduct)
+			.innerJoin(qDigitalProduct.product, qProduct).fetch()
+			.innerJoin(qProduct.merchantStore).fetch()
+					.where(qDigitalProduct.id.eq(id));
+		
+		return query.uniqueResult(qDigitalProduct);
+	}
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/image/ProductImageDao.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/image/ProductImageDao.java
new file mode 100644
index 0000000..cb921f9
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/image/ProductImageDao.java
@@ -0,0 +1,10 @@
+package com.salesmanager.core.business.catalog.product.dao.image;
+
+import com.salesmanager.core.business.catalog.product.model.image.ProductImage;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDao;
+
+public interface ProductImageDao extends SalesManagerEntityDao<Long, ProductImage> {
+
+	ProductImage getProductImageById(Long id);
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/image/ProductImageDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/image/ProductImageDaoImpl.java
new file mode 100644
index 0000000..1a703d3
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/image/ProductImageDaoImpl.java
@@ -0,0 +1,39 @@
+package com.salesmanager.core.business.catalog.product.dao.image;
+
+import org.springframework.stereotype.Repository;
+
+import com.mysema.query.jpa.JPQLQuery;
+import com.mysema.query.jpa.impl.JPAQuery;
+import com.salesmanager.core.business.catalog.product.model.QProduct;
+import com.salesmanager.core.business.catalog.product.model.image.ProductImage;
+import com.salesmanager.core.business.catalog.product.model.image.QProductImage;
+import com.salesmanager.core.business.catalog.product.model.image.QProductImageDescription;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDaoImpl;
+
+@Repository("productImageDao")
+public class ProductImageDaoImpl extends SalesManagerEntityDaoImpl<Long, ProductImage> 
+	implements ProductImageDao {
+	
+	@Override
+	public ProductImage getProductImageById(Long id) {
+		
+		
+		QProductImage qProductImage = QProductImage.productImage1;
+		QProductImageDescription qProductImageDescription = QProductImageDescription.productImageDescription;
+		QProduct qProduct = QProduct.product;
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qProductImage)
+			.leftJoin(qProductImage.descriptions, qProductImageDescription).fetch()
+			.innerJoin(qProductImage.product,qProduct).fetch()
+			.innerJoin(qProduct.merchantStore).fetch()
+			.where(qProductImage.id.eq(id));
+		
+		return query.uniqueResult(qProductImage);
+		
+		
+		
+		
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/manufacturer/ManufacturerDao.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/manufacturer/ManufacturerDao.java
new file mode 100644
index 0000000..c61da63
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/manufacturer/ManufacturerDao.java
@@ -0,0 +1,21 @@
+package com.salesmanager.core.business.catalog.product.dao.manufacturer;
+
+import java.util.List;
+
+import com.salesmanager.core.business.catalog.product.model.manufacturer.Manufacturer;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDao;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+public interface ManufacturerDao extends SalesManagerEntityDao<Long, Manufacturer> {
+
+	List<Manufacturer> listByStore(MerchantStore store, Language language);
+
+	List<Manufacturer> listByStore(MerchantStore store);
+	
+	int getCountManufAttachedProducts(  Manufacturer manufacturer  );
+
+	List<Manufacturer> listByProductsByCategoriesId(MerchantStore store,
+			List<Long> ids, Language language);
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/manufacturer/ManufacturerDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/manufacturer/ManufacturerDaoImpl.java
new file mode 100644
index 0000000..9f72490
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/manufacturer/ManufacturerDaoImpl.java
@@ -0,0 +1,117 @@
+package com.salesmanager.core.business.catalog.product.dao.manufacturer;
+
+import java.util.List;
+
+import javax.persistence.Query;
+
+import org.springframework.stereotype.Repository;
+
+import com.mysema.query.jpa.JPQLQuery;
+import com.mysema.query.jpa.impl.JPAQuery;
+import com.salesmanager.core.business.catalog.product.model.manufacturer.Manufacturer;
+import com.salesmanager.core.business.catalog.product.model.manufacturer.QManufacturer;
+import com.salesmanager.core.business.catalog.product.model.manufacturer.QManufacturerDescription;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDaoImpl;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+@Repository("manufacturerDao")
+public class ManufacturerDaoImpl extends SalesManagerEntityDaoImpl<Long, Manufacturer>
+		implements ManufacturerDao {
+	
+	@Override
+	public int getCountManufAttachedProducts(  Manufacturer manufacturer  ){
+		StringBuilder countBuilderSelect = new StringBuilder();
+		countBuilderSelect.append("select count(distinct p) from Product as p");
+		
+		StringBuilder countBuilderWhere = new StringBuilder();
+		countBuilderWhere.append(" where p.manufacturer.id=:mId");
+		
+		Query countQ = super.getEntityManager().createQuery(
+				countBuilderSelect.toString() + countBuilderWhere.toString());
+
+		countQ.setParameter("mId", manufacturer.getId() );
+		
+		Number count = (Number) countQ.getSingleResult ();
+
+		return count.intValue();
+	}
+	
+	@Override
+	public List<Manufacturer> listByStore(MerchantStore store, Language language) {
+		QManufacturer qManufacturer = QManufacturer.manufacturer;
+		QManufacturerDescription qManufacturerDescription = QManufacturerDescription.manufacturerDescription;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qManufacturer)
+			.leftJoin(qManufacturer.descriptions, qManufacturerDescription).fetch()
+			.leftJoin(qManufacturer.merchantStore).fetch()
+			.where(qManufacturerDescription.language.id.eq(language.getId())
+			.and(qManufacturer.merchantStore.id.eq(store.getId())));
+		
+
+		
+		List<Manufacturer> manufacturers = query.list(qManufacturer);
+		return manufacturers;
+	}
+
+	public Manufacturer getById(Long id) {
+		QManufacturer qManufacturer = QManufacturer.manufacturer;
+		QManufacturerDescription qManufacturerDescription = QManufacturerDescription.manufacturerDescription;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qManufacturer)
+			.leftJoin(qManufacturer.descriptions, qManufacturerDescription).fetch()
+			.leftJoin(qManufacturer.merchantStore).fetch()
+			.where(qManufacturer.id.eq(id));
+		
+
+		
+		return query.uniqueResult(qManufacturer);
+	}
+	
+	@Override
+	public List<Manufacturer> listByStore(MerchantStore store) {
+		QManufacturer qManufacturer = QManufacturer.manufacturer;
+		QManufacturerDescription qManufacturerDescription = QManufacturerDescription.manufacturerDescription;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qManufacturer)
+			.leftJoin(qManufacturer.descriptions, qManufacturerDescription).fetch()
+			.leftJoin(qManufacturer.merchantStore).fetch()
+			.where(qManufacturer.merchantStore.id.eq(store.getId()));
+		
+
+		
+		List<Manufacturer> manufacturers = query.list(qManufacturer);
+		return manufacturers;
+	}
+	
+	
+	@SuppressWarnings("unchecked")
+	@Override
+	public List<Manufacturer> listByProductsByCategoriesId(MerchantStore store, List<Long> ids, Language language) {
+		StringBuilder builderSelect = new StringBuilder();
+		builderSelect.append("select distinct manufacturer from Product as p ");
+		builderSelect.append("join p.manufacturer manufacturer ");
+		builderSelect.append("join manufacturer.descriptions md ");
+		builderSelect.append("join p.categories categs ");
+		builderSelect.append("where categs.id in (:cid) ");
+		builderSelect.append("and md.language.id=:lang");
+
+		Query query = super.getEntityManager().createQuery(
+				builderSelect.toString());
+
+		query.setParameter("cid", ids);
+		query.setParameter("lang", language.getId());
+		
+		return query.getResultList();
+		
+	}
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/price/ProductPriceDao.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/price/ProductPriceDao.java
new file mode 100644
index 0000000..686277f
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/price/ProductPriceDao.java
@@ -0,0 +1,8 @@
+package com.salesmanager.core.business.catalog.product.dao.price;
+
+import com.salesmanager.core.business.catalog.product.model.price.ProductPrice;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDao;
+
+public interface ProductPriceDao extends SalesManagerEntityDao<Long, ProductPrice> {
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/price/ProductPriceDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/price/ProductPriceDaoImpl.java
new file mode 100644
index 0000000..71d12dd
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/price/ProductPriceDaoImpl.java
@@ -0,0 +1,37 @@
+package com.salesmanager.core.business.catalog.product.dao.price;
+
+import org.springframework.stereotype.Repository;
+
+import com.mysema.query.jpa.JPQLQuery;
+import com.mysema.query.jpa.impl.JPAQuery;
+import com.salesmanager.core.business.catalog.product.model.QProduct;
+import com.salesmanager.core.business.catalog.product.model.availability.QProductAvailability;
+import com.salesmanager.core.business.catalog.product.model.price.ProductPrice;
+import com.salesmanager.core.business.catalog.product.model.price.QProductPrice;
+import com.salesmanager.core.business.catalog.product.model.price.QProductPriceDescription;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDaoImpl;
+
+@Repository("productPriceDao")
+public class ProductPriceDaoImpl extends SalesManagerEntityDaoImpl<Long, ProductPrice> 
+	implements ProductPriceDao {
+	
+	@Override
+	public ProductPrice getById(Long id) {
+		QProductPrice qEntity = QProductPrice.productPrice;
+		QProductAvailability qAvailability = QProductAvailability.productAvailability;
+		QProductPriceDescription qEntityDescription = QProductPriceDescription.productPriceDescription;
+		QProduct qProduct = QProduct.product;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qEntity)
+			.innerJoin(qEntity.productAvailability,qAvailability).fetch()
+			.innerJoin(qAvailability.product,qProduct).fetch()
+			.leftJoin(qEntity.descriptions, qEntityDescription).fetch()
+			.innerJoin(qProduct.merchantStore).fetch()
+			.where(qEntity.id.eq(id));
+		
+		return query.uniqueResult(qEntity);
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/ProductDao.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/ProductDao.java
new file mode 100644
index 0000000..1d5ead0
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/ProductDao.java
@@ -0,0 +1,47 @@
+package com.salesmanager.core.business.catalog.product.dao;
+
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
+
+import com.salesmanager.core.business.catalog.product.model.Product;
+import com.salesmanager.core.business.catalog.product.model.ProductCriteria;
+import com.salesmanager.core.business.catalog.product.model.ProductList;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDao;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.language.model.Language;
+import com.salesmanager.core.business.tax.model.taxclass.TaxClass;
+
+public interface ProductDao extends SalesManagerEntityDao<Long, Product> {
+	
+	Product getProductForLocale(long productId, Language language, Locale locale);
+
+	@SuppressWarnings("rawtypes")
+	List<Product> getProductsForLocale(MerchantStore store, Set categoryIds, Language language,
+			Locale locale);
+
+	@SuppressWarnings("rawtypes")
+	List<Product> getProductsListByCategories(Set categoryIds);
+
+
+	/**
+	 * Method to be used for getting a list of products in a given language based on one to many criteria
+	 * @param store
+	 * @param language
+	 * @param criteria
+	 * @return
+	 */
+	ProductList listByStore(MerchantStore store, Language language, ProductCriteria criteria);
+
+	List<Product> listByStore(MerchantStore store);
+
+	List<Product> listByTaxClass(TaxClass taxClass);
+
+	List<Product> getProductsListByCategories(Set<Long> categoryIds,
+			Language language);
+
+	Product getBySeUrl(MerchantStore store, String seUrl, Locale locale);
+
+	Product getByCode(String productCode, Language language);
+	
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/ProductDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/ProductDaoImpl.java
new file mode 100644
index 0000000..8ab2d84
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/ProductDaoImpl.java
@@ -0,0 +1,986 @@
+package com.salesmanager.core.business.catalog.product.dao;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
+
+import javax.persistence.Query;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Repository;
+
+import com.salesmanager.core.business.catalog.product.model.Product;
+import com.salesmanager.core.business.catalog.product.model.ProductCriteria;
+import com.salesmanager.core.business.catalog.product.model.ProductList;
+import com.salesmanager.core.business.catalog.product.model.attribute.AttributeCriteria;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDaoImpl;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.language.model.Language;
+import com.salesmanager.core.business.tax.model.taxclass.TaxClass;
+import com.salesmanager.core.constants.Constants;
+
+@Repository("productDao")
+public class ProductDaoImpl extends SalesManagerEntityDaoImpl<Long, Product> implements ProductDao {
+
+	public ProductDaoImpl() {
+		super();
+	}
+	
+	@Override
+	public Product getBySeUrl(MerchantStore store,String seUrl, Locale locale) {
+		
+		
+		List regionList = new ArrayList();
+		regionList.add("*");
+		regionList.add(locale.getCountry());
+		
+
+		StringBuilder qs = new StringBuilder();
+		qs.append("select distinct p from Product as p ");
+		qs.append("join fetch p.availabilities pa ");
+		qs.append("join fetch p.descriptions pd ");
+		qs.append("join fetch p.merchantStore pm ");
+		qs.append("left join fetch pa.prices pap ");
+		qs.append("left join fetch pap.descriptions papd ");
+		
+		
+		//images
+		qs.append("left join fetch p.images images ");
+		//options
+		qs.append("left join fetch p.attributes pattr ");
+		qs.append("left join fetch pattr.productOption po ");
+		qs.append("left join fetch po.descriptions pod ");
+		qs.append("left join fetch pattr.productOptionValue pov ");
+		qs.append("left join fetch pov.descriptions povd ");
+		qs.append("left join fetch p.relationships pr ");
+		//other lefts
+		qs.append("left join fetch p.manufacturer manuf ");
+		qs.append("left join fetch manuf.descriptions manufd ");
+		qs.append("left join fetch p.type type ");
+		qs.append("left join fetch p.taxClass tx ");
+		
+		qs.append("where pa.region in (:lid) ");
+		qs.append("and pd.seUrl=:seUrl ");
+		qs.append("and p.available=true and p.dateAvailable<=:dt ");
+		qs.append("order by pattr.productOptionSortOrder ");
+
+
+    	String hql = qs.toString();
+		Query q = super.getEntityManager().createQuery(hql);
+
+
+    	q.setParameter("lid", regionList);
+    	q.setParameter("dt", new Date());
+    	q.setParameter("seUrl", seUrl);
+
+    	Product p = null;
+    	
+    	try {
+    		p = (Product)q.getSingleResult();
+    	} catch(javax.persistence.NoResultException ignore) {
+
+    	}
+    			
+    			
+
+
+		return p;
+		
+	}
+	
+	@SuppressWarnings("rawtypes")
+	@Override
+	public List<Product> getProductsForLocale(MerchantStore store, Set categoryIds, Language language, Locale locale) {
+		
+		ProductList products = this.getProductsListForLocale(store, categoryIds, language, locale, 0, -1);
+		
+		return products.getProducts();
+	}
+	
+	@SuppressWarnings("rawtypes")
+	@Override
+	public List<Product> getProductsListByCategories(Set categoryIds) {
+		
+
+		//List regionList = new ArrayList();
+		//regionList.add("*");
+		//regionList.add(locale.getCountry());
+		
+
+		//TODO Test performance 
+		/**
+		 * Testing in debug mode takes a long time with this query
+		 * running in normal mode is fine
+		 */
+
+		
+		StringBuilder qs = new StringBuilder();
+		qs.append("select distinct p from Product as p ");
+		qs.append("join fetch p.merchantStore merch ");
+		qs.append("join fetch p.availabilities pa ");
+		qs.append("left join fetch pa.prices pap ");
+		
+		qs.append("join fetch p.descriptions pd ");
+		qs.append("join fetch p.categories categs ");
+		
+		
+		
+		qs.append("left join fetch pap.descriptions papd ");
+		
+		
+		//images
+		qs.append("left join fetch p.images images ");
+		
+		//options (do not need attributes for listings)
+		qs.append("left join fetch p.attributes pattr ");
+		qs.append("left join fetch pattr.productOption po ");
+		qs.append("left join fetch po.descriptions pod ");
+		qs.append("left join fetch pattr.productOptionValue pov ");
+		qs.append("left join fetch pov.descriptions povd ");
+		
+		//other lefts
+		qs.append("left join fetch p.manufacturer manuf ");
+		qs.append("left join fetch p.type type ");
+		qs.append("left join fetch p.taxClass tx ");
+		
+		//qs.append("where pa.region in (:lid) ");
+		qs.append("where categs.id in (:cid)");
+
+
+
+    	String hql = qs.toString();
+		Query q = super.getEntityManager().createQuery(hql);
+
+    	q.setParameter("cid", categoryIds);
+
+
+    	
+    	@SuppressWarnings("unchecked")
+		List<Product> products =  q.getResultList();
+
+    	
+    	return products;
+
+
+	}
+	
+	@Override
+	public List<Product> getProductsListByCategories(Set<Long> categoryIds, Language language) {
+		
+
+		//List regionList = new ArrayList();
+		//regionList.add("*");
+		//regionList.add(locale.getCountry());
+		
+
+		//TODO Test performance 
+		/**
+		 * Testing in debug mode takes a long time with this query
+		 * running in normal mode is fine
+		 */
+
+		
+		StringBuilder qs = new StringBuilder();
+		qs.append("select distinct p from Product as p ");
+		qs.append("join fetch p.merchantStore merch ");
+		qs.append("join fetch p.availabilities pa ");
+		qs.append("left join fetch pa.prices pap ");
+		
+		qs.append("join fetch p.descriptions pd ");
+		qs.append("join fetch p.categories categs ");
+		
+		
+		
+		qs.append("left join fetch pap.descriptions papd ");
+		
+		
+		//images
+		qs.append("left join fetch p.images images ");
+		
+		//options (do not need attributes for listings)
+		qs.append("left join fetch p.attributes pattr ");
+		qs.append("left join fetch pattr.productOption po ");
+		qs.append("left join fetch po.descriptions pod ");
+		qs.append("left join fetch pattr.productOptionValue pov ");
+		qs.append("left join fetch pov.descriptions povd ");
+		
+		//other lefts
+		qs.append("left join fetch p.manufacturer manuf ");
+		qs.append("left join fetch manuf.descriptions manufd ");
+		qs.append("left join fetch p.type type ");
+		qs.append("left join fetch p.taxClass tx ");
+		
+		//qs.append("where pa.region in (:lid) ");
+		qs.append("where categs.id in (:cid) ");
+		//qs.append("and pd.language.id=:lang and papd.language.id=:lang and manufd.language.id=:lang ");
+		qs.append("and pd.language.id=:lang and papd.language.id=:lang ");
+		qs.append("and p.available=true and p.dateAvailable<=:dt ");
+
+
+
+    	String hql = qs.toString();
+		Query q = super.getEntityManager().createQuery(hql);
+
+    	q.setParameter("cid", categoryIds);
+    	q.setParameter("lang", language.getId());
+    	q.setParameter("dt", new Date());
+
+    	
+    	@SuppressWarnings("unchecked")
+		List<Product> products =  q.getResultList();
+
+    	
+    	return products;
+
+
+	}
+	
+	
+/*	@Override
+	public ProductList getProductListByCategories(ProductCriteria criteria, Set<Long> categoryIds, Language language) {
+		
+
+		//List regionList = new ArrayList();
+		//regionList.add("*");
+		//regionList.add(locale.getCountry());
+		
+
+		//TODO Test performance 
+		*//**
+		 * Testing in debug mode takes a long time with this query
+		 * running in normal mode is fine
+		 *//*
+
+		
+		StringBuilder qs = new StringBuilder();
+		qs.append("select p from Product as p ");
+		qs.append("join fetch p.merchantStore merch ");
+		qs.append("join fetch p.availabilities pa ");
+		qs.append("left join fetch pa.prices pap ");
+		
+		qs.append("join fetch p.descriptions pd ");
+		qs.append("join fetch p.categories categs ");
+		
+		
+		
+		qs.append("left join fetch pap.descriptions papd ");
+		
+		
+		//images
+		qs.append("left join fetch p.images images ");
+		
+		//options (do not need attributes for listings)
+		qs.append("left join fetch p.attributes pattr ");
+		qs.append("left join fetch pattr.productOption po ");
+		qs.append("left join fetch po.descriptions pod ");
+		qs.append("left join fetch pattr.productOptionValue pov ");
+		qs.append("left join fetch pov.descriptions povd ");
+		
+		//other lefts
+		qs.append("left join fetch p.manufacturer manuf ");
+		qs.append("left join fetch manuf.descriptions manufd ");
+		qs.append("left join fetch p.type type ");
+		qs.append("left join fetch p.taxClass tx ");
+		
+		//qs.append("where pa.region in (:lid) ");
+		qs.append("where categs.id in (:cid) ");
+		qs.append("and pd.language.id=:lang and papd.language.id=:lang ");
+		qs.append("and p.available=true and p.dateAvailable<=:dt ");
+
+
+
+    	String hql = qs.toString();
+		Query q = super.getEntityManager().createQuery(hql);
+
+    	q.setParameter("cid", categoryIds);
+    	q.setParameter("lang", language.getId());
+    	q.setParameter("dt", new Date());
+
+    	q.setFirstResult(criteria.getStartIndex());
+    	q.setMaxResults(criteria.getMaxCount());
+    	
+    	@SuppressWarnings("unchecked")
+		List<Product> products =  q.getResultList();
+
+    	ProductList productList = new ProductList();
+    	productList.setProducts(products);
+    	
+    	
+    	return productList;
+
+
+	}*/
+	
+
+	@Override
+	public List<Product> listByTaxClass(TaxClass taxClass) {
+
+		
+		/**
+		 * Testing in debug mode takes a long time with this query
+		 * running in normal mode is fine
+		 */
+
+		
+		StringBuilder qs = new StringBuilder();
+		qs.append("select p from Product as p ");
+		qs.append("join fetch p.merchantStore merch ");
+		qs.append("join fetch p.availabilities pa ");
+		qs.append("left join fetch pa.prices pap ");
+		
+		qs.append("join fetch p.descriptions pd ");
+		qs.append("join fetch p.categories categs ");
+		
+		
+		
+		qs.append("left join fetch pap.descriptions papd ");
+		
+		
+		//images
+		qs.append("left join fetch p.images images ");
+		
+		//options (do not need attributes for listings)
+		qs.append("left join fetch p.attributes pattr ");
+		qs.append("left join fetch pattr.productOption po ");
+		qs.append("left join fetch po.descriptions pod ");
+		qs.append("left join fetch pattr.productOptionValue pov ");
+		qs.append("left join fetch pov.descriptions povd ");
+		
+		//other lefts
+		qs.append("left join fetch p.manufacturer manuf ");
+		qs.append("left join fetch manuf.descriptions manufd ");
+		qs.append("left join fetch p.type type ");
+		qs.append("left join fetch p.taxClass tx ");
+		
+		//qs.append("where pa.region in (:lid) ");
+		qs.append("where tx.id=:tid");
+
+
+
+    	String hql = qs.toString();
+		Query q = super.getEntityManager().createQuery(hql);
+
+    	q.setParameter("tid", taxClass.getId());
+
+
+    	
+    	@SuppressWarnings("unchecked")
+		List<Product> products =  q.getResultList();
+
+    	
+    	return products;
+		
+		
+	}
+
+	
+	
+	
+	@Override
+	public List<Product> listByStore(MerchantStore store) {
+
+		
+		/**
+		 * Testing in debug mode takes a long time with this query
+		 * running in normal mode is fine
+		 */
+
+		
+		StringBuilder qs = new StringBuilder();
+		qs.append("select p from Product as p ");
+		qs.append("join fetch p.merchantStore merch ");
+		qs.append("join fetch p.availabilities pa ");
+		qs.append("left join fetch pa.prices pap ");
+		
+		qs.append("join fetch p.descriptions pd ");
+		qs.append("join fetch p.categories categs ");
+		
+		
+		
+		qs.append("left join fetch pap.descriptions papd ");
+		
+		
+		//images
+		qs.append("left join fetch p.images images ");
+		
+		//options (do not need attributes for listings)
+		qs.append("left join fetch p.attributes pattr ");
+		qs.append("left join fetch pattr.productOption po ");
+		qs.append("left join fetch po.descriptions pod ");
+		qs.append("left join fetch pattr.productOptionValue pov ");
+		qs.append("left join fetch pov.descriptions povd ");
+		
+		//other lefts
+		qs.append("left join fetch p.manufacturer manuf ");
+		qs.append("left join fetch manuf.descriptions manufd ");
+		qs.append("left join fetch p.type type ");
+		qs.append("left join fetch p.taxClass tx ");
+		
+		//qs.append("where pa.region in (:lid) ");
+		qs.append("where merch.id=:mid");
+
+
+
+    	String hql = qs.toString();
+		Query q = super.getEntityManager().createQuery(hql);
+
+    	q.setParameter("mid", store.getId());
+
+
+    	
+    	@SuppressWarnings("unchecked")
+		List<Product> products =  q.getResultList();
+
+    	
+    	return products;
+		
+		
+	}
+	
+	
+	/**
+	 * Used for all purpose !
+	 * @param store
+	 * @param first
+	 * @param max
+	 * @return
+	 */
+	@Override
+	public ProductList listByStore(MerchantStore store, Language language, ProductCriteria criteria) {
+
+		ProductList productList = new ProductList();
+
+        
+		StringBuilder countBuilderSelect = new StringBuilder();
+		countBuilderSelect.append("select count(distinct p) from Product as p");
+		
+		StringBuilder countBuilderWhere = new StringBuilder();
+		countBuilderWhere.append(" where p.merchantStore.id=:mId");
+		
+		if(!CollectionUtils.isEmpty(criteria.getProductIds())) {
+			countBuilderWhere.append(" and p.id in (:pId)");
+		}
+
+		if(!StringUtils.isBlank(criteria.getProductName())) {
+			countBuilderSelect.append(" INNER JOIN p.descriptions pd");
+			countBuilderWhere.append(" and pd.language.id=:lang and lower(pd.name) like:nm");
+		}
+		
+		
+		if(!CollectionUtils.isEmpty(criteria.getCategoryIds())) {
+			countBuilderSelect.append(" INNER JOIN p.categories categs");
+			countBuilderWhere.append(" and categs.id in (:cid)");
+		}
+		
+		if(criteria.getManufacturerId()!=null) {
+			countBuilderSelect.append(" INNER JOIN p.manufacturer manuf");
+			countBuilderWhere.append(" and manuf.id = :manufid");
+		}
+		
+		if(!StringUtils.isBlank(criteria.getCode())) {
+			
+			countBuilderWhere.append(" and lower(p.sku) like :sku");
+		}
+		
+		if(!CollectionUtils.isEmpty(criteria.getAttributeCriteria())) {
+		
+			countBuilderSelect.append(" INNER JOIN p.attributes pattr");
+			countBuilderSelect.append(" INNER JOIN pattr.productOption po");
+			countBuilderSelect.append(" INNER JOIN pattr.productOptionValue pov ");
+			countBuilderSelect.append(" INNER JOIN pov.descriptions povd ");
+			int count = 0;
+			for(AttributeCriteria attributeCriteria : criteria.getAttributeCriteria()) {
+				if(count==0) {
+					countBuilderWhere.append(" and po.code =:").append(attributeCriteria.getAttributeCode());
+					countBuilderWhere.append(" and povd.description like :").append("val").append(count).append(attributeCriteria.getAttributeCode());
+				} 
+				count++;
+			}
+			countBuilderWhere.append(" and povd.language.id=:lang");
+
+		}
+		
+		
+		if(criteria.getAvailable()!=null) {
+			if(criteria.getAvailable().booleanValue()) {
+				countBuilderWhere.append(" and p.available=true and p.dateAvailable<=:dt");
+			} else {
+				countBuilderWhere.append(" and p.available=false or p.dateAvailable>:dt");
+			}
+		}
+
+		Query countQ = super.getEntityManager().createQuery(
+				countBuilderSelect.toString() + countBuilderWhere.toString());
+
+		countQ.setParameter("mId", store.getId());
+		
+		
+		if(!CollectionUtils.isEmpty(criteria.getCategoryIds())) {
+			countQ.setParameter("cid", criteria.getCategoryIds());
+		}
+		
+
+		if(criteria.getAvailable()!=null) {
+			countQ.setParameter("dt", new Date());
+		}
+		
+		if(!StringUtils.isBlank(criteria.getCode())) {
+			countQ.setParameter("sku", new StringBuilder().append("%").append(criteria.getCode().toLowerCase()).append("%").toString());
+		}
+		
+		if(criteria.getManufacturerId()!=null) {
+			countQ.setParameter("manufid", criteria.getManufacturerId());
+		}
+		
+		if(!CollectionUtils.isEmpty(criteria.getAttributeCriteria())) {
+			int count = 0;
+			for(AttributeCriteria attributeCriteria : criteria.getAttributeCriteria()) {
+				countQ.setParameter(attributeCriteria.getAttributeCode(),attributeCriteria.getAttributeCode());
+				countQ.setParameter("val" + count + attributeCriteria.getAttributeCode(),"%" + attributeCriteria.getAttributeValue() + "%");
+				count ++;
+			}
+			countQ.setParameter("lang", language.getId());
+		}
+		
+		if(!StringUtils.isBlank(criteria.getProductName())) {
+			countQ.setParameter("nm", new StringBuilder().append("%").append(criteria.getProductName().toLowerCase()).append("%").toString());
+			countQ.setParameter("lang", language.getId());
+		}
+		
+		if(!CollectionUtils.isEmpty(criteria.getProductIds())) {
+			countQ.setParameter("pId", criteria.getProductIds());
+		}
+
+		Number count = (Number) countQ.getSingleResult ();
+
+		productList.setTotalCount(count.intValue());
+		
+        if(count.intValue()==0)
+        	return productList;
+
+		
+		StringBuilder qs = new StringBuilder();
+		qs.append("select distinct p from Product as p ");
+		qs.append("join fetch p.merchantStore merch ");
+		qs.append("join fetch p.availabilities pa ");
+		qs.append("left join fetch pa.prices pap ");
+		
+		qs.append("join fetch p.descriptions pd ");
+		qs.append("left join fetch p.categories categs ");
+		
+
+		//images
+		qs.append("left join fetch p.images images ");
+		
+
+		//other lefts
+		qs.append("left join fetch p.manufacturer manuf ");
+		qs.append("left join fetch manuf.descriptions manufd ");
+		qs.append("left join fetch p.type type ");
+		qs.append("left join fetch p.taxClass tx ");
+		
+		
+		//attributes
+		if(!CollectionUtils.isEmpty(criteria.getAttributeCriteria())) {
+			qs.append(" inner join p.attributes pattr");
+			qs.append(" inner join pattr.productOption po");
+			qs.append(" inner join po.descriptions pod");
+			qs.append(" inner join pattr.productOptionValue pov ");
+			qs.append(" inner join pov.descriptions povd");
+		} else {
+			qs.append(" left join fetch p.attributes pattr");
+			qs.append(" left join fetch pattr.productOption po");
+			qs.append(" left join fetch po.descriptions pod");
+			qs.append(" left join fetch pattr.productOptionValue pov");
+			qs.append(" left join fetch pov.descriptions povd");
+		}
+		
+		qs.append(" left join fetch p.relationships pr");
+		
+
+		qs.append(" where merch.id=:mId");
+		qs.append(" and pd.language.id=:lang");
+		
+		if(!CollectionUtils.isEmpty(criteria.getProductIds())) {
+			qs.append(" and p.id in (:pId)");
+		}
+		
+		if(!CollectionUtils.isEmpty(criteria.getCategoryIds())) {
+			qs.append(" and categs.id in (:cid)");
+		}
+		
+		if(criteria.getManufacturerId()!=null) {
+			qs.append(" and manuf.id = :manufid");
+		}
+		
+
+		if(criteria.getAvailable()!=null) {
+			if(criteria.getAvailable().booleanValue()) {
+				qs.append(" and p.available=true and p.dateAvailable<=:dt");
+			} else {
+				qs.append(" and p.available=false and p.dateAvailable>:dt");
+			}
+		}
+		
+		if(!StringUtils.isBlank(criteria.getProductName())) {
+			qs.append(" and lower(pd.name) like :nm");
+		}
+		
+		if(!StringUtils.isBlank(criteria.getCode())) {
+			qs.append(" and lower(p.sku) like :sku");
+		}
+		
+		if(!CollectionUtils.isEmpty(criteria.getAttributeCriteria())) {
+			int cnt = 0;
+			for(AttributeCriteria attributeCriteria : criteria.getAttributeCriteria()) {
+				qs.append(" and po.code =:").append(attributeCriteria.getAttributeCode());
+				qs.append(" and povd.description like :").append("val").append(cnt).append(attributeCriteria.getAttributeCode());
+				cnt++;
+			}
+			qs.append(" and povd.language.id=:lang");
+
+		}
+
+
+    	String hql = qs.toString();
+		Query q = super.getEntityManager().createQuery(hql);
+
+
+    	q.setParameter("lang", language.getId());
+    	q.setParameter("mId", store.getId());
+    	
+    	if(!CollectionUtils.isEmpty(criteria.getCategoryIds())) {
+    		q.setParameter("cid", criteria.getCategoryIds());
+    	}
+    	
+		if(!CollectionUtils.isEmpty(criteria.getProductIds())) {
+			q.setParameter("pId", criteria.getProductIds());
+		}
+		
+		if(criteria.getAvailable()!=null) {
+			q.setParameter("dt", new Date());
+		}
+		
+		if(criteria.getManufacturerId()!=null) {
+			q.setParameter("manufid", criteria.getManufacturerId());
+		}
+		
+		if(!StringUtils.isBlank(criteria.getCode())) {
+			q.setParameter("sku", new StringBuilder().append("%").append(criteria.getCode().toLowerCase()).append("%").toString());
+		}
+		
+		if(!CollectionUtils.isEmpty(criteria.getAttributeCriteria())) {
+			int cnt = 0;
+			for(AttributeCriteria attributeCriteria : criteria.getAttributeCriteria()) {
+				q.setParameter(attributeCriteria.getAttributeCode(),attributeCriteria.getAttributeCode());
+				q.setParameter("val" + cnt  + attributeCriteria.getAttributeCode(),"%" + attributeCriteria.getAttributeValue() + "%");
+				cnt++;
+			}
+		}
+		
+		if(!StringUtils.isBlank(criteria.getProductName())) {
+			q.setParameter("nm", new StringBuilder().append("%").append(criteria.getProductName().toLowerCase()).append("%").toString());
+		}
+    	
+    	if(criteria.getMaxCount()>0) {
+    		
+    		
+	    	q.setFirstResult(criteria.getStartIndex());
+	    	if(criteria.getMaxCount()<count.intValue()) {
+	    		q.setMaxResults(criteria.getMaxCount());
+	    	}
+	    	else {
+	    		q.setMaxResults(count.intValue());
+	    	}
+    	}
+    	
+    	@SuppressWarnings("unchecked")
+		List<Product> products =  q.getResultList();
+    	productList.setProducts(products);
+    	
+    	return productList;
+
+		
+		
+		
+	}
+	
+	
+	
+	/**
+	 * This query is used for category listings. All collections are not fully loaded, only the required objects
+	 * so the listing page can display everything related to all products
+	 */
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	private ProductList getProductsListForLocale(MerchantStore store, Set categoryIds, Language language, Locale locale, int first, int max) {
+		
+
+				List regionList = new ArrayList();
+				regionList.add(Constants.ALL_REGIONS);
+				if(locale!=null) {
+					regionList.add(locale.getCountry());
+				}
+				
+				ProductList productList = new ProductList();
+
+		        
+				Query countQ = super.getEntityManager().createQuery(
+							"select count(p) from Product as p INNER JOIN p.availabilities pa INNER JOIN p.categories categs where p.merchantStore.id=:mId and categs.id in (:cid) and pa.region in (:lid) and p.available=1 and p.dateAvailable<=:dt");
+							//"select p from Product as p join fetch p.availabilities pa join fetch p.categories categs where categs.id in (:cid) and pa.region in (:lid) and p.available=1 and p.dateAvailable<=:dt");
+				
+				countQ.setParameter("cid", categoryIds);
+				countQ.setParameter("lid", regionList);
+				countQ.setParameter("dt", new Date());
+				countQ.setParameter("mId", store.getId());
+				
+				//List<Product> ps =  countQ.getResultList();
+
+				Number count = (Number) countQ.getSingleResult ();
+
+				
+				productList.setTotalCount(count.intValue());
+				
+				if(count.intValue()==0)
+		        	return productList;
+		        
+		        
+
+				
+				StringBuilder qs = new StringBuilder();
+				qs.append("select p from Product as p ");
+				qs.append("join fetch p.merchantStore merch ");
+				qs.append("join fetch p.availabilities pa ");
+				qs.append("left join fetch pa.prices pap ");
+				
+				qs.append("join fetch p.descriptions pd ");
+				qs.append("join fetch p.categories categs ");
+			
+				
+				
+				//not necessary
+				//qs.append("join fetch pap.descriptions papd ");
+				
+				
+				//images
+				qs.append("left join fetch p.images images ");
+				
+				//options (do not need attributes for listings)
+				//qs.append("left join fetch p.attributes pattr ");
+				//qs.append("left join fetch pattr.productOption po ");
+				//qs.append("left join fetch po.descriptions pod ");
+				//qs.append("left join fetch pattr.productOptionValue pov ");
+				//qs.append("left join fetch pov.descriptions povd ");
+				
+				//other lefts
+				qs.append("left join fetch p.manufacturer manuf ");
+				qs.append("left join fetch manuf.descriptions manufd ");
+				qs.append("left join fetch p.type type ");
+				qs.append("left join fetch p.taxClass tx ");
+				
+				//qs.append("where pa.region in (:lid) ");
+				qs.append("where p.merchantStore.id=mId and categs.id in (:cid) and pa.region in (:lid) ");
+				//qs.append("and p.available=true and p.dateAvailable<=:dt and pd.language.id=:lang and manufd.language.id=:lang");
+				qs.append("and p.available=true and p.dateAvailable<=:dt and pd.language.id=:lang ");
+
+
+		    	String hql = qs.toString();
+				Query q = super.getEntityManager().createQuery(hql);
+
+		    	q.setParameter("cid", categoryIds);
+		    	q.setParameter("lid", regionList);
+		    	q.setParameter("dt", new Date());
+		    	q.setParameter("lang", language.getId());
+		    	q.setParameter("mId", store.getId());
+		    	
+		    	
+		    	q.setFirstResult(first);
+		    	if(max>0) {
+		    			int maxCount = first + max;
+
+		    			if(maxCount < count.intValue()) {
+		    				q.setMaxResults(maxCount);
+		    			} else {
+		    				q.setMaxResults(count.intValue());
+		    			}
+		    	}
+		    	
+		    	List<Product> products =  q.getResultList();
+		    	productList.setProducts(products);
+		    	
+		    	return productList;
+
+		
+	}
+	
+	@Override
+	public Product getProductForLocale(long productId, Language language, Locale locale) {
+
+
+				
+				List regionList = new ArrayList();
+				regionList.add("*");
+				regionList.add(locale.getCountry());
+				
+
+				StringBuilder qs = new StringBuilder();
+				qs.append("select distinct p from Product as p ");
+				qs.append("join fetch p.availabilities pa ");
+				qs.append("join fetch p.descriptions pd ");
+				qs.append("join fetch p.merchantStore pm ");
+				qs.append("left join fetch pa.prices pap ");
+				qs.append("left join fetch pap.descriptions papd ");
+				
+				
+				
+				
+				//images
+				qs.append("left join fetch p.images images ");
+				//options
+				qs.append("left join fetch p.attributes pattr ");
+				qs.append("left join fetch pattr.productOption po ");
+				qs.append("left join fetch po.descriptions pod ");
+				qs.append("left join fetch pattr.productOptionValue pov ");
+				qs.append("left join fetch pov.descriptions povd ");
+				qs.append("left join fetch p.relationships pr ");
+				//other lefts
+				qs.append("left join fetch p.manufacturer manuf ");
+				qs.append("left join fetch manuf.descriptions manufd ");
+				qs.append("left join fetch p.type type ");
+				qs.append("left join fetch p.taxClass tx ");
+				
+				qs.append("where p.id=:pid and pa.region in (:lid) ");
+				qs.append("and pd.language.id=:lang and papd.language.id=:lang ");
+				qs.append("and p.available=true and p.dateAvailable<=:dt ");
+				//this cannot be done on child elements from left join
+				//qs.append("and pod.languageId=:lang and povd.languageId=:lang");
+
+		    	String hql = qs.toString();
+				Query q = super.getEntityManager().createQuery(hql);
+
+		    	q.setParameter("pid", productId);
+		    	q.setParameter("lid", regionList);
+		    	q.setParameter("dt", new Date());
+		    	q.setParameter("lang", language.getId());
+
+		    	Product p = (Product)q.getSingleResult();
+
+
+				return p;
+				
+	}
+
+	@Override
+	public Product getById(Long productId) {
+		
+		try {
+			
+
+
+			StringBuilder qs = new StringBuilder();
+			qs.append("select distinct p from Product as p ");
+			qs.append("join fetch p.availabilities pa ");
+			qs.append("join fetch p.merchantStore merch ");
+			qs.append("join fetch p.descriptions pd ");
+			qs.append("left join fetch p.categories categs ");
+			qs.append("left join fetch pa.prices pap ");
+			qs.append("left join fetch pap.descriptions papd ");
+			qs.append("left join fetch categs.descriptions categsd ");
+			
+			//images
+			qs.append("left join fetch p.images images ");
+			//options
+			qs.append("left join fetch p.images images ");
+			qs.append("left join fetch p.attributes pattr ");
+			qs.append("left join fetch pattr.productOption po ");
+			qs.append("left join fetch po.descriptions pod ");
+			qs.append("left join fetch pattr.productOptionValue pov ");
+			qs.append("left join fetch pov.descriptions povd ");
+			qs.append("left join fetch p.relationships pr ");
+			//other lefts
+			qs.append("left join fetch p.manufacturer manuf ");
+			qs.append("left join fetch manuf.descriptions manufd ");
+			qs.append("left join fetch p.type type ");
+			qs.append("left join fetch p.taxClass tx ");
+			
+			qs.append("where p.id=:pid");
+	
+	
+	    	String hql = qs.toString();
+			Query q = super.getEntityManager().createQuery(hql);
+	
+	    	q.setParameter("pid", productId);
+	
+	
+	    	Product p = (Product)q.getSingleResult();
+	
+	
+			return p;
+		
+		} catch(javax.persistence.NoResultException ers) {
+			return null;
+		}
+		
+	}
+	
+	@Override
+	public Product getByCode(String productCode, Language language) {
+		
+		try {
+			
+
+
+			StringBuilder qs = new StringBuilder();
+			qs.append("select distinct p from Product as p ");
+			qs.append("join fetch p.availabilities pa ");
+			qs.append("join fetch p.descriptions pd ");
+			qs.append("join fetch p.merchantStore pm ");
+			qs.append("left join fetch pa.prices pap ");
+			qs.append("left join fetch pap.descriptions papd ");
+			
+			
+			
+			
+			//images
+			qs.append("left join fetch p.images images ");
+			//options
+			qs.append("left join fetch p.attributes pattr ");
+			qs.append("left join fetch pattr.productOption po ");
+			qs.append("left join fetch po.descriptions pod ");
+			qs.append("left join fetch pattr.productOptionValue pov ");
+			qs.append("left join fetch pov.descriptions povd ");
+			qs.append("left join fetch p.relationships pr ");
+			//other lefts
+			qs.append("left join fetch p.manufacturer manuf ");
+			qs.append("left join fetch manuf.descriptions manufd ");
+			qs.append("left join fetch p.type type ");
+			qs.append("left join fetch p.taxClass tx ");
+			
+			qs.append("where p.sku=:code ");
+			qs.append("and pd.language.id=:lang and papd.language.id=:lang");
+			//this cannot be done on child elements from left join
+			//qs.append("and pod.languageId=:lang and povd.languageId=:lang");
+
+	    	String hql = qs.toString();
+			Query q = super.getEntityManager().createQuery(hql);
+
+	    	q.setParameter("code", productCode);
+	    	q.setParameter("lang", language.getId());
+
+	    	Product p = (Product)q.getSingleResult();
+
+
+			return p;
+		
+		} catch(javax.persistence.NoResultException ers) {
+			return null;
+		}
+		
+	}
+}
+
+
+	
+	
\ No newline at end of file

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/relationship/ProductRelationshipDao.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/relationship/ProductRelationshipDao.java
new file mode 100644
index 0000000..c924b0f
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/relationship/ProductRelationshipDao.java
@@ -0,0 +1,31 @@
+package com.salesmanager.core.business.catalog.product.dao.relationship;
+
+import java.util.List;
+
+import com.salesmanager.core.business.catalog.product.model.Product;
+import com.salesmanager.core.business.catalog.product.model.relationship.ProductRelationship;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDao;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+public interface ProductRelationshipDao extends SalesManagerEntityDao<Long, ProductRelationship> {
+
+	List<ProductRelationship> getByType(MerchantStore store, String type, Product product, Language language);
+
+	List<ProductRelationship> getByType(MerchantStore store, String type,
+			Product product);
+
+	List<ProductRelationship> getByType(MerchantStore store, String type);
+
+	List<ProductRelationship> listByProducts(Product product);
+
+	List<ProductRelationship> getByType(MerchantStore store, String type,
+			Language language);
+
+	List<ProductRelationship> getGroups(MerchantStore store);
+
+	List<ProductRelationship> getByGroup(MerchantStore store, String group);
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/relationship/ProductRelationshipDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/relationship/ProductRelationshipDaoImpl.java
new file mode 100644
index 0000000..a987585
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/relationship/ProductRelationshipDaoImpl.java
@@ -0,0 +1,290 @@
+package com.salesmanager.core.business.catalog.product.dao.relationship;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.persistence.Query;
+
+import org.springframework.stereotype.Repository;
+
+import com.salesmanager.core.business.catalog.product.model.Product;
+import com.salesmanager.core.business.catalog.product.model.relationship.ProductRelationship;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDaoImpl;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+@Repository("productRelationshipDao")
+public class ProductRelationshipDaoImpl extends SalesManagerEntityDaoImpl<Long, ProductRelationship>
+		implements ProductRelationshipDao {
+	
+	@Override
+	public List<ProductRelationship> getByType(MerchantStore store, String type, Product product, Language language) {
+		//QDSL cannot interpret the following query, that is why it is in native format
+		
+		StringBuilder qs = new StringBuilder();
+		qs.append("select distinct pr from ProductRelationship as pr ");
+		qs.append("left join fetch pr.product p ");
+		qs.append("join fetch pr.relatedProduct rp ");
+		qs.append("left join fetch rp.descriptions rpd ");
+
+		qs.append("where pr.code=:code ");
+		qs.append("and p.id=:id ");
+		qs.append("and rpd.language.id=:langId");
+
+
+
+    	String hql = qs.toString();
+		Query q = super.getEntityManager().createQuery(hql);
+
+    	q.setParameter("code", type);
+    	q.setParameter("id", product.getId());
+    	q.setParameter("langId", language.getId());
+
+
+    	
+    	@SuppressWarnings("unchecked")
+		List<ProductRelationship> relations =  q.getResultList();
+
+    	
+    	return relations;
+		
+
+	}
+	
+	@Override
+	public List<ProductRelationship> getByType(MerchantStore store, String type, Language language) {
+		//QDSL cannot interpret the following query, that is why it is in native format
+		
+		StringBuilder qs = new StringBuilder();
+		qs.append("select distinct pr from ProductRelationship as pr ");
+		qs.append("left join fetch pr.product p ");
+		qs.append("join fetch pr.relatedProduct rp ");
+		
+		qs.append("left join fetch rp.attributes pattr ");
+		qs.append("left join fetch rp.descriptions rpd ");
+		qs.append("left join fetch rp.images pd ");
+		qs.append("left join fetch rp.merchantStore rpm ");
+		qs.append("left join fetch rpm.currency rpmc ");
+		qs.append("left join fetch rp.availabilities pa ");
+		qs.append("left join fetch rp.manufacturer m ");
+		qs.append("left join fetch m.descriptions md ");
+		qs.append("left join fetch pa.prices pap ");
+		qs.append("left join fetch pap.descriptions papd ");
+
+		qs.append("where pr.code=:code ");
+		qs.append("and rpd.language.id=:langId");
+
+
+
+    	String hql = qs.toString();
+		Query q = super.getEntityManager().createQuery(hql);
+
+    	q.setParameter("code", type);
+    	q.setParameter("langId", language.getId());
+
+
+    	
+    	@SuppressWarnings("unchecked")
+		List<ProductRelationship> relations =  q.getResultList();
+
+    	
+    	return relations;
+		
+
+	}
+	
+	@Override
+	public List<ProductRelationship> getByGroup(MerchantStore store, String group) {
+		//QDSL cannot interpret the following query, that is why it is in native format
+		
+		StringBuilder qs = new StringBuilder();
+		qs.append("select distinct pr from ProductRelationship as pr ");
+		qs.append("left join fetch pr.product p ");
+		qs.append("left join fetch pr.relatedProduct rp ");
+		
+		qs.append("left join fetch rp.attributes pattr ");
+		qs.append("left join fetch rp.descriptions rpd ");
+		qs.append("left join fetch rp.images pd ");
+		qs.append("left join fetch rp.merchantStore rpm ");
+		qs.append("left join fetch rpm.currency rpmc ");
+		qs.append("left join fetch rp.availabilities pa ");
+		qs.append("left join fetch pa.prices pap ");
+		qs.append("left join fetch pap.descriptions papd ");
+		qs.append("left join fetch rp.manufacturer manuf ");
+		qs.append("left join fetch manuf.descriptions manufd ");
+		qs.append("left join fetch rp.type type ");
+
+		qs.append("where pr.code=:code ");
+
+
+
+
+    	String hql = qs.toString();
+		Query q = super.getEntityManager().createQuery(hql);
+
+    	q.setParameter("code", group);
+
+
+
+    	
+    	@SuppressWarnings("unchecked")
+		List<ProductRelationship> relations =  q.getResultList();
+
+    	
+    	return relations;
+		
+
+	}
+	
+	@Override
+	public List<ProductRelationship> getGroups(MerchantStore store) {
+
+		StringBuilder qs = new StringBuilder();
+		qs.append("select distinct pr from ProductRelationship as pr ");
+		qs.append("where pr.store.id=:store ");
+		
+		qs.append("and pr.product=null");
+
+
+
+    	String hql = qs.toString();
+		Query q = super.getEntityManager().createQuery(hql);
+
+    	q.setParameter("store", store.getId());
+
+
+    	
+    	@SuppressWarnings("unchecked")
+		List<ProductRelationship> relations =  q.getResultList();
+    	
+    	Map<String,ProductRelationship> relationMap = new HashMap<String,ProductRelationship>();
+    	for(ProductRelationship relationship : relations) {
+    		if(!relationMap.containsKey(relationship.getCode())) {
+    			relationMap.put(relationship.getCode(), relationship);
+    		}
+    	}
+    	
+    	List<ProductRelationship> returnList = new ArrayList<ProductRelationship>(relationMap.values());
+
+    	
+    	return returnList;
+		
+
+	}
+	
+	
+	@Override
+	public List<ProductRelationship> getByType(MerchantStore store, String type) {
+		//QDSL cannot interpret the following query, that is why it is in native format
+		
+		StringBuilder qs = new StringBuilder();
+		qs.append("select distinct pr from ProductRelationship as pr ");
+		qs.append("left join fetch pr.product p ");
+		qs.append("join fetch pr.relatedProduct rp ");
+		qs.append("left join fetch rp.descriptions rpd ");
+
+		qs.append("where pr.code=:code");
+
+
+
+
+    	String hql = qs.toString();
+		Query q = super.getEntityManager().createQuery(hql);
+
+    	q.setParameter("code", type);
+
+
+    	@SuppressWarnings("unchecked")
+		List<ProductRelationship> relations =  q.getResultList();
+
+    	
+    	return relations;
+		
+
+	}
+	
+	@Override
+	public List<ProductRelationship> listByProducts(Product product) {
+		//QDSL cannot interpret the following query, that is why it is in native format
+		
+		StringBuilder qs = new StringBuilder();
+		qs.append("select pr from ProductRelationship as pr ");
+		qs.append("left join fetch pr.product p ");
+		qs.append("left join fetch pr.relatedProduct rp ");
+		qs.append("left join fetch rp.attributes pattr ");
+		qs.append("left join fetch p.descriptions pd ");
+		qs.append("left join fetch rp.descriptions rpd ");
+
+		qs.append("where p.id=:id");
+		qs.append(" or rp.id=:id");
+
+
+
+
+    	String hql = qs.toString();
+		Query q = super.getEntityManager().createQuery(hql);
+
+    	q.setParameter("id", product.getId());
+
+
+    	@SuppressWarnings("unchecked")
+		List<ProductRelationship> relations =  q.getResultList();
+
+    	
+    	return relations;
+		
+
+	}
+	
+	@Override
+	public List<ProductRelationship> getByType(MerchantStore store, String type, Product product) {
+		//QDSL cannot interpret the following query, that is why it is in native format
+		
+		
+		StringBuilder qs = new StringBuilder();
+		
+		qs.append("select distinct pr from ProductRelationship as pr ");
+		qs.append("left join fetch pr.product p ");
+		qs.append("left join fetch pr.relatedProduct rp ");
+		
+		qs.append("left join fetch rp.attributes pattr ");
+		qs.append("left join fetch rp.descriptions rpd ");
+		qs.append("left join fetch rp.images pd ");
+		qs.append("left join fetch rp.merchantStore rpm ");
+		qs.append("left join fetch rpm.currency rpmc ");
+		qs.append("left join fetch rp.availabilities pa ");
+		qs.append("left join fetch pa.prices pap ");
+		qs.append("left join fetch pap.descriptions papd ");
+		
+		qs.append("left join fetch rp.manufacturer manuf ");
+		qs.append("left join fetch manuf.descriptions manufd ");
+		qs.append("left join fetch rp.type type ");
+
+		qs.append("where pr.code=:code ");
+		qs.append("and p.id=:pId");
+
+
+
+
+    	String hql = qs.toString();
+		Query q = super.getEntityManager().createQuery(hql);
+
+    	q.setParameter("code", type);
+    	q.setParameter("pId", product.getId());
+
+
+		@SuppressWarnings("unchecked")
+		List<ProductRelationship> relations =  q.getResultList();
+
+    	
+    	return relations;
+		
+
+	}
+
+	
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/review/ProductReviewDao.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/review/ProductReviewDao.java
new file mode 100644
index 0000000..086bfcb
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/review/ProductReviewDao.java
@@ -0,0 +1,22 @@
+package com.salesmanager.core.business.catalog.product.dao.review;
+
+import java.util.List;
+
+import com.salesmanager.core.business.catalog.product.model.Product;
+import com.salesmanager.core.business.catalog.product.model.review.ProductReview;
+import com.salesmanager.core.business.customer.model.Customer;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDao;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+public interface ProductReviewDao extends SalesManagerEntityDao<Long, ProductReview> {
+
+	List<ProductReview> getByCustomer(Customer customer);
+	List<ProductReview> getByProduct(Product product);
+	List<ProductReview> getByProduct(Product product, Language language);
+	ProductReview getByProductAndCustomer(Long productId, Long customerId);
+
+
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/review/ProductReviewDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/review/ProductReviewDaoImpl.java
new file mode 100644
index 0000000..710065c
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/review/ProductReviewDaoImpl.java
@@ -0,0 +1,175 @@
+package com.salesmanager.core.business.catalog.product.dao.review;
+
+import java.util.List;
+
+import org.springframework.stereotype.Repository;
+
+import com.mysema.query.jpa.JPQLQuery;
+import com.mysema.query.jpa.impl.JPAQuery;
+import com.salesmanager.core.business.catalog.product.model.Product;
+import com.salesmanager.core.business.catalog.product.model.QProduct;
+import com.salesmanager.core.business.catalog.product.model.review.ProductReview;
+import com.salesmanager.core.business.catalog.product.model.review.QProductReview;
+import com.salesmanager.core.business.catalog.product.model.review.QProductReviewDescription;
+import com.salesmanager.core.business.customer.model.Customer;
+import com.salesmanager.core.business.customer.model.QCustomer;
+import com.salesmanager.core.business.customer.model.attribute.QCustomerAttribute;
+import com.salesmanager.core.business.customer.model.attribute.QCustomerOption;
+import com.salesmanager.core.business.customer.model.attribute.QCustomerOptionValue;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDaoImpl;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+@Repository("productReviewDao")
+public class ProductReviewDaoImpl extends SalesManagerEntityDaoImpl<Long, ProductReview>
+		implements ProductReviewDao {
+
+
+
+	@Override
+	public List<ProductReview> getByCustomer(Customer customer) {
+		
+		QProductReview qEntity = QProductReview.productReview;
+		QProductReviewDescription qDescription = QProductReviewDescription.productReviewDescription;
+		QCustomer qCustomer = QCustomer.customer;
+		QProduct qProduct = QProduct.product;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qEntity)
+		.join(qEntity.customer,qCustomer).fetch()
+		.join(qEntity.product,qProduct).fetch()
+		.leftJoin(qProduct.merchantStore).fetch()
+		.leftJoin(qEntity.descriptions,qDescription).fetch()
+		.where(qCustomer.id.eq(customer.getId()));
+		
+		return query.list(qEntity);
+		
+		
+		
+	}
+
+	@Override
+	public List<ProductReview> getByProduct(Product product) {
+		
+		
+		QProductReview qEntity = QProductReview.productReview;
+		QProductReviewDescription qDescription = QProductReviewDescription.productReviewDescription;
+		QProduct qProduct = QProduct.product;
+		QCustomer qCustomer = QCustomer.customer;
+		QCustomerAttribute qCustomerAttribute = QCustomerAttribute.customerAttribute;
+		QCustomerOption qCustomerOption = QCustomerOption.customerOption;
+		QCustomerOptionValue qCustomerOptionValue = QCustomerOptionValue.customerOptionValue;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qEntity)
+		.join(qEntity.customer, qCustomer).fetch()
+		.join(qCustomer.merchantStore).fetch()
+			.leftJoin(qCustomer.defaultLanguage).fetch()
+			.leftJoin(qCustomer.attributes,qCustomerAttribute).fetch()
+			.leftJoin(qCustomerAttribute.customerOption, qCustomerOption).fetch()
+			.leftJoin(qCustomerAttribute.customerOptionValue, qCustomerOptionValue).fetch()
+			.leftJoin(qCustomerOption.descriptions).fetch()
+			.leftJoin(qCustomerOptionValue.descriptions).fetch()
+		.join(qEntity.product,qProduct).fetch()
+		.leftJoin(qProduct.merchantStore).fetch()
+		.leftJoin(qEntity.descriptions,qDescription).fetch()
+		.where(qProduct.id.eq(product.getId()));
+		
+		return query.list(qEntity);
+		
+		
+	}
+	
+	
+	@Override
+	public ProductReview getByProductAndCustomer(Long productId, Long customerId) {
+		
+		
+		QProductReview qEntity = QProductReview.productReview;
+		QProductReviewDescription qDescription = QProductReviewDescription.productReviewDescription;
+		QProduct qProduct = QProduct.product;
+		QCustomer qCustomer = QCustomer.customer;
+		QCustomerAttribute qCustomerAttribute = QCustomerAttribute.customerAttribute;
+		QCustomerOption qCustomerOption = QCustomerOption.customerOption;
+		QCustomerOptionValue qCustomerOptionValue = QCustomerOptionValue.customerOptionValue;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qEntity)
+		.join(qEntity.customer, qCustomer).fetch()
+		.join(qCustomer.merchantStore).fetch()
+			.leftJoin(qCustomer.defaultLanguage).fetch()
+			.leftJoin(qCustomer.attributes,qCustomerAttribute).fetch()
+			.leftJoin(qCustomerAttribute.customerOption, qCustomerOption).fetch()
+			.leftJoin(qCustomerAttribute.customerOptionValue, qCustomerOptionValue).fetch()
+			.leftJoin(qCustomerOption.descriptions).fetch()
+			.leftJoin(qCustomerOptionValue.descriptions).fetch()
+		.join(qEntity.product,qProduct).fetch()
+		.leftJoin(qProduct.merchantStore).fetch()
+		.leftJoin(qEntity.descriptions,qDescription).fetch()
+		.where(qProduct.id.eq(productId).and(qCustomer.id.eq(customerId)));
+		
+		return query.uniqueResult(qEntity);
+		
+		
+	}
+	
+	@Override
+	public List<ProductReview> getByProduct(Product product, Language language) {
+		
+		
+		QProductReview qEntity = QProductReview.productReview;
+		QProductReviewDescription qDescription = QProductReviewDescription.productReviewDescription;
+		QProduct qProduct = QProduct.product;
+		QCustomer qCustomer = QCustomer.customer;
+		QCustomerAttribute qCustomerAttribute = QCustomerAttribute.customerAttribute;
+		QCustomerOption qCustomerOption = QCustomerOption.customerOption;
+		QCustomerOptionValue qCustomerOptionValue = QCustomerOptionValue.customerOptionValue;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qEntity)
+				.join(qEntity.customer, qCustomer).fetch()
+		.join(qCustomer.merchantStore).fetch()
+			.leftJoin(qCustomer.defaultLanguage).fetch()
+			.leftJoin(qCustomer.attributes,qCustomerAttribute).fetch()
+			.leftJoin(qCustomerAttribute.customerOption, qCustomerOption).fetch()
+			.leftJoin(qCustomerAttribute.customerOptionValue, qCustomerOptionValue).fetch()
+			.leftJoin(qCustomerOption.descriptions).fetch()
+			.leftJoin(qCustomerOptionValue.descriptions).fetch()
+		.join(qEntity.product,qProduct).fetch()
+		.leftJoin(qProduct.merchantStore).fetch()
+		.leftJoin(qEntity.descriptions,qDescription).fetch()
+		.where(qProduct.id.eq(product.getId())
+				.and(qDescription.language.id.eq(language.getId())));
+		
+		return query.list(qEntity);
+		
+		
+	}
+	
+	@Override
+	public ProductReview getById(Long id) {
+
+		QProductReview qEntity = QProductReview.productReview;
+		QProductReviewDescription qDescription = QProductReviewDescription.productReviewDescription;
+		QProduct qProduct = QProduct.product;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qEntity)
+			.join(qEntity.customer).fetch()
+			.join(qEntity.product,qProduct).fetch()
+			.leftJoin(qProduct.merchantStore).fetch()
+			.leftJoin(qEntity.descriptions,qDescription).fetch()
+			.where(qEntity.id.eq(id));
+		
+		return query.uniqueResult(qEntity);
+		
+		
+	}
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/type/ProductTypeDao.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/type/ProductTypeDao.java
new file mode 100644
index 0000000..7fe254d
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/type/ProductTypeDao.java
@@ -0,0 +1,8 @@
+package com.salesmanager.core.business.catalog.product.dao.type;
+
+import com.salesmanager.core.business.catalog.product.model.type.ProductType;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDao;
+
+public interface ProductTypeDao extends SalesManagerEntityDao<Long, ProductType> {
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/type/ProductTypeDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/type/ProductTypeDaoImpl.java
new file mode 100644
index 0000000..b49d8e0
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/dao/type/ProductTypeDaoImpl.java
@@ -0,0 +1,14 @@
+package com.salesmanager.core.business.catalog.product.dao.type;
+
+import org.springframework.stereotype.Repository;
+
+import com.salesmanager.core.business.catalog.product.model.type.ProductType;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDaoImpl;
+
+@Repository("productTypeDao")
+public class ProductTypeDaoImpl extends SalesManagerEntityDaoImpl<Long, ProductType>
+		implements ProductTypeDao {
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/attribute/AttributeCriteria.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/attribute/AttributeCriteria.java
new file mode 100644
index 0000000..f317615
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/attribute/AttributeCriteria.java
@@ -0,0 +1,26 @@
+package com.salesmanager.core.business.catalog.product.model.attribute;
+
+import java.io.Serializable;
+
+public class AttributeCriteria implements Serializable {
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	private String attributeCode;
+	private String attributeValue;
+	public void setAttributeCode(String attributeCode) {
+		this.attributeCode = attributeCode;
+	}
+	public String getAttributeCode() {
+		return attributeCode;
+	}
+	public void setAttributeValue(String attributeValue) {
+		this.attributeValue = attributeValue;
+	}
+	public String getAttributeValue() {
+		return attributeValue;
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/attribute/ProductAttribute.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/attribute/ProductAttribute.java
new file mode 100755
index 0000000..30b8f91
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/attribute/ProductAttribute.java
@@ -0,0 +1,241 @@
+package com.salesmanager.core.business.catalog.product.model.attribute;
+
+import java.math.BigDecimal;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+import javax.persistence.Transient;
+import javax.persistence.UniqueConstraint;
+
+import com.salesmanager.core.business.catalog.product.model.Product;
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.constants.SchemaConstant;
+
+@Entity
+@Table(name="PRODUCT_ATTRIBUTE", schema=SchemaConstant.SALESMANAGER_SCHEMA,
+	uniqueConstraints={
+		@UniqueConstraint(columnNames={
+				"OPTION_ID",
+				"OPTION_VALUE_ID",
+				"PRODUCT_ID"
+			})
+	}
+)
+public class ProductAttribute extends SalesManagerEntity<Long, ProductAttribute> {
+	private static final long serialVersionUID = -6537491946539803265L;
+	
+	@Id
+	@Column(name = "PRODUCT_ATTRIBUTE_ID", unique=true, nullable=false)
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT", pkColumnValue = "PRODUCT_ATTR_SEQ_NEXT_VAL")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Long id;
+
+	
+	@Column(name="PRODUCT_ATRIBUTE_PRICE")
+	private BigDecimal productAttributePrice;
+
+
+	@Column(name="PRODUCT_ATTRIBUTE_SORT_ORD")
+	private Integer productOptionSortOrder;
+	
+	@Column(name="PRODUCT_ATTRIBUTE_FREE")
+	private boolean productAttributeIsFree;
+	
+
+	@Column(name="PRODUCT_ATTRIBUTE_WEIGHT")
+	private BigDecimal productAttributeWeight;
+	
+	@Column(name="PRODUCT_ATTRIBUTE_DEFAULT")
+	private boolean attributeDefault=false;
+	
+	@Column(name="PRODUCT_ATTRIBUTE_REQUIRED")
+	private boolean attributeRequired=false;
+	
+	/**
+	 * a read only attribute is considered as a core attribute addition
+	 */
+	@Column(name="PRODUCT_ATTRIBUTE_FOR_DISP")
+	private boolean attributeDisplayOnly=false;
+	
+
+	@Column(name="PRODUCT_ATTRIBUTE_DISCOUNTED")
+	private boolean attributeDiscounted=false;
+	
+
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name="OPTION_ID", nullable=false)
+	private ProductOption productOption;
+	
+
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name="OPTION_VALUE_ID", nullable=false)
+	private ProductOptionValue productOptionValue;
+	
+	
+	/**
+	 * This transient object property
+	 * is a utility used only to submit from a free text
+	 */
+	@Transient
+	private String attributePrice = "0";
+	
+	
+	/**
+	 * This transient object property
+	 * is a utility used only to submit from a free text
+	 */
+	@Transient
+	private String attributeSortOrder = "0";
+	
+
+
+	/**
+	 * This transient object property
+	 * is a utility used only to submit from a free text
+	 */
+	@Transient
+	private String attributeAdditionalWeight = "0";
+	
+	public String getAttributePrice() {
+		return attributePrice;
+	}
+
+	public void setAttributePrice(String attributePrice) {
+		this.attributePrice = attributePrice;
+	}
+
+	@ManyToOne(targetEntity = Product.class)
+	@JoinColumn(name = "PRODUCT_ID", nullable = false)
+	private Product product;
+	
+	public ProductAttribute() {
+	}
+
+	@Override
+	public Long getId() {
+		return id;
+	}
+
+	@Override
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+
+
+	public Integer getProductOptionSortOrder() {
+		return productOptionSortOrder;
+	}
+
+	public void setProductOptionSortOrder(Integer productOptionSortOrder) {
+		this.productOptionSortOrder = productOptionSortOrder;
+	}
+
+	public boolean getProductAttributeIsFree() {
+		return productAttributeIsFree;
+	}
+
+	public void setProductAttributeIsFree(boolean productAttributeIsFree) {
+		this.productAttributeIsFree = productAttributeIsFree;
+	}
+
+	public BigDecimal getProductAttributeWeight() {
+		return productAttributeWeight;
+	}
+
+	public void setProductAttributeWeight(BigDecimal productAttributeWeight) {
+		this.productAttributeWeight = productAttributeWeight;
+	}
+
+	public boolean getAttributeDefault() {
+		return attributeDefault;
+	}
+
+	public void setAttributeDefault(boolean attributeDefault) {
+		this.attributeDefault = attributeDefault;
+	}
+
+	public boolean getAttributeRequired() {
+		return attributeRequired;
+	}
+
+	public void setAttributeRequired(boolean attributeRequired) {
+		this.attributeRequired = attributeRequired;
+	}
+
+	public boolean getAttributeDisplayOnly() {
+		return attributeDisplayOnly;
+	}
+
+	public void setAttributeDisplayOnly(boolean attributeDisplayOnly) {
+		this.attributeDisplayOnly = attributeDisplayOnly;
+	}
+
+	public boolean getAttributeDiscounted() {
+		return attributeDiscounted;
+	}
+
+	public void setAttributeDiscounted(boolean attributeDiscounted) {
+		this.attributeDiscounted = attributeDiscounted;
+	}
+
+	public ProductOption getProductOption() {
+		return productOption;
+	}
+
+	public void setProductOption(ProductOption productOption) {
+		this.productOption = productOption;
+	}
+
+	public ProductOptionValue getProductOptionValue() {
+		return productOptionValue;
+	}
+
+	public void setProductOptionValue(ProductOptionValue productOptionValue) {
+		this.productOptionValue = productOptionValue;
+	}
+
+	public Product getProduct() {
+		return product;
+	}
+
+	public void setProduct(Product product) {
+		this.product = product;
+	}
+	
+	
+	public String getAttributeSortOrder() {
+		return attributeSortOrder;
+	}
+
+	public void setAttributeSortOrder(String attributeSortOrder) {
+		this.attributeSortOrder = attributeSortOrder;
+	}
+
+	public String getAttributeAdditionalWeight() {
+		return attributeAdditionalWeight;
+	}
+
+	public void setAttributeAdditionalWeight(String attributeAdditionalWeight) {
+		this.attributeAdditionalWeight = attributeAdditionalWeight;
+	}
+	
+	public BigDecimal getProductAttributePrice() {
+		return productAttributePrice;
+	}
+
+	public void setProductAttributePrice(BigDecimal productAttributePrice) {
+		this.productAttributePrice = productAttributePrice;
+	}
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/attribute/ProductOption.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/attribute/ProductOption.java
new file mode 100755
index 0000000..e05353c
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/attribute/ProductOption.java
@@ -0,0 +1,149 @@
+package com.salesmanager.core.business.catalog.product.model.attribute;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+import javax.persistence.Transient;
+import javax.persistence.UniqueConstraint;
+import javax.validation.constraints.Pattern;
+
+import org.hibernate.annotations.Index;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.constants.SchemaConstant;
+
+
+@Entity
+@Table(name="PRODUCT_OPTION", schema=SchemaConstant.SALESMANAGER_SCHEMA, uniqueConstraints=
+	@UniqueConstraint(columnNames = {"MERCHANT_ID", "PRODUCT_OPTION_CODE"}))
+public class ProductOption extends SalesManagerEntity<Long, ProductOption> {
+	private static final long serialVersionUID = -2019269055342226086L;
+	
+	@Id
+	@Column(name="PRODUCT_OPTION_ID")
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT", pkColumnValue = "PRODUCT_OPTION_SEQ_NEXT_VAL")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Long id;
+	
+	@Column(name="PRODUCT_OPTION_SORT_ORD")
+	private Integer productOptionSortOrder;
+	
+	@Column(name="PRODUCT_OPTION_TYPE", length=10)
+	private String productOptionType;
+	
+
+	@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, mappedBy = "productOption")
+	private Set<ProductOptionDescription> descriptions = new HashSet<ProductOptionDescription>();
+	
+	@Transient
+	private List<ProductOptionDescription> descriptionsList = new ArrayList<ProductOptionDescription>();
+
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name="MERCHANT_ID", nullable=false)
+	private MerchantStore merchantStore;
+	
+	@Column(name="PRODUCT_OPTION_READ")
+	private boolean readOnly;
+	
+	@NotEmpty
+	@Pattern(regexp="^[a-zA-Z0-9_]*$")
+	@Column(name="PRODUCT_OPTION_CODE")
+	@Index(name="PRD_OPTION_CODE_IDX")
+	private String code;
+	
+	public ProductOption() {
+	}
+	
+	public Integer getProductOptionSortOrder() {
+		return productOptionSortOrder;
+	}
+	
+	public void setProductOptionSortOrder(Integer productOptionSortOrder) {
+		this.productOptionSortOrder = productOptionSortOrder;
+	}
+	
+	public String getProductOptionType() {
+		return productOptionType;
+	}
+
+	public void setProductOptionType(String productOptionType) {
+		this.productOptionType = productOptionType;
+	}
+	
+	public Set<ProductOptionDescription> getDescriptions() {
+		return descriptions;
+	}
+
+	public void setDescriptions(Set<ProductOptionDescription> descriptions) {
+		this.descriptions = descriptions;
+	}
+
+	@Override
+	public Long getId() {
+		return id;
+	}
+	
+	@Override
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+
+
+	public MerchantStore getMerchantStore() {
+		return merchantStore;
+	}
+
+	public void setMerchantStore(MerchantStore merchantStore) {
+		this.merchantStore = merchantStore;
+	}
+
+	public void setDescriptionsList(List<ProductOptionDescription> descriptionsList) {
+		this.descriptionsList = descriptionsList;
+	}
+
+	public List<ProductOptionDescription> getDescriptionsList() {
+		return descriptionsList;
+	}
+	
+
+	public List<ProductOptionDescription> getDescriptionsSettoList() {
+		if(descriptionsList==null || descriptionsList.size()==0) {
+			descriptionsList = new ArrayList<ProductOptionDescription>(this.getDescriptions());
+		} 
+		return descriptionsList;
+
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setReadOnly(boolean readOnly) {
+		this.readOnly = readOnly;
+	}
+
+	public boolean isReadOnly() {
+		return readOnly;
+	}
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/attribute/ProductOptionDescription.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/attribute/ProductOptionDescription.java
new file mode 100755
index 0000000..d458f2c
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/attribute/ProductOptionDescription.java
@@ -0,0 +1,51 @@
+package com.salesmanager.core.business.catalog.product.model.attribute;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
+
+import org.hibernate.annotations.Type;
+
+import com.salesmanager.core.business.common.model.Description;
+import com.salesmanager.core.constants.SchemaConstant;
+
+@Entity
+@Table(name="PRODUCT_OPTION_DESC", schema=SchemaConstant.SALESMANAGER_SCHEMA, uniqueConstraints={
+	@UniqueConstraint(columnNames={
+			"PRODUCT_OPTION_ID",
+			"LANGUAGE_ID"
+		})
+	}
+)
+public class ProductOptionDescription extends Description {
+	private static final long serialVersionUID = -3158504904707188465L;
+	
+	@ManyToOne(targetEntity = ProductOption.class)
+	@JoinColumn(name = "PRODUCT_OPTION_ID", nullable = false)
+	private ProductOption productOption;
+	
+	@Column(name="PRODUCT_OPTION_COMMENT")
+	@Type(type = "org.hibernate.type.StringClobType")
+	private String productOptionComment;
+	
+	public ProductOptionDescription() {
+	}
+	
+	public String getProductOptionComment() {
+		return productOptionComment;
+	}
+	public void setProductOptionComment(String productOptionComment) {
+		this.productOptionComment = productOptionComment;
+	}
+
+	public ProductOption getProductOption() {
+		return productOption;
+	}
+
+	public void setProductOption(ProductOption productOption) {
+		this.productOption = productOption;
+	}
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/attribute/ProductOptionType.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/attribute/ProductOptionType.java
new file mode 100644
index 0000000..1c1ab6b
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/attribute/ProductOptionType.java
@@ -0,0 +1,7 @@
+package com.salesmanager.core.business.catalog.product.model.attribute;
+
+public enum ProductOptionType {
+	
+	Text, Radio, Select, Checkbox
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/attribute/ProductOptionValue.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/attribute/ProductOptionValue.java
new file mode 100755
index 0000000..376a19c
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/attribute/ProductOptionValue.java
@@ -0,0 +1,160 @@
+package com.salesmanager.core.business.catalog.product.model.attribute;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+import javax.persistence.Transient;
+import javax.persistence.UniqueConstraint;
+import javax.validation.constraints.Pattern;
+
+import org.hibernate.annotations.Index;
+import org.hibernate.validator.constraints.NotEmpty;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.constants.SchemaConstant;
+
+
+@Entity
+@Table(name="PRODUCT_OPTION_VALUE", schema=SchemaConstant.SALESMANAGER_SCHEMA, uniqueConstraints=
+	@UniqueConstraint(columnNames = {"MERCHANT_ID", "PRODUCT_OPTION_VAL_CODE"}))
+public class ProductOptionValue extends SalesManagerEntity<Long, ProductOptionValue> {
+	private static final long serialVersionUID = 3736085877929910891L;
+
+	@Id
+	@Column(name="PRODUCT_OPTION_VALUE_ID")
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT", pkColumnValue = "PRODUCT_OPT_VAL_SEQ_NEXT_VAL")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Long id;
+	
+	@Column(name="PRODUCT_OPT_VAL_SORT_ORD")
+	private Integer productOptionValueSortOrder;
+	
+	@Column(name="PRODUCT_OPT_VAL_IMAGE")
+	private String productOptionValueImage;
+	
+	@Column(name="PRODUCT_OPT_FOR_DISP")
+	private boolean productOptionDisplayOnly=false;
+	
+	@NotEmpty
+	@Pattern(regexp="^[a-zA-Z0-9_]*$")
+	@Column(name="PRODUCT_OPTION_VAL_CODE")
+	@Index(name="PRD_OPTION_VAL_CODE_IDX")
+	private String code;
+	
+	@Transient
+	private MultipartFile image = null;
+	
+	@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, mappedBy = "productOptionValue")
+	private Set<ProductOptionValueDescription> descriptions = new HashSet<ProductOptionValueDescription>();
+	
+	@Transient
+	private List<ProductOptionValueDescription> descriptionsList = new ArrayList<ProductOptionValueDescription>();
+
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name="MERCHANT_ID", nullable=false)
+	private MerchantStore merchantStore;
+	
+	public ProductOptionValue() {
+	}
+
+	@Override
+	public Long getId() {
+		return id;
+	}
+
+	@Override
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Integer getProductOptionValueSortOrder() {
+		return productOptionValueSortOrder;
+	}
+
+	public void setProductOptionValueSortOrder(Integer productOptionValueSortOrder) {
+		this.productOptionValueSortOrder = productOptionValueSortOrder;
+	}
+
+	public String getProductOptionValueImage() {
+		return productOptionValueImage;
+	}
+
+	public void setProductOptionValueImage(String productOptionValueImage) {
+		this.productOptionValueImage = productOptionValueImage;
+	}
+
+	public Set<ProductOptionValueDescription> getDescriptions() {
+		return descriptions;
+	}
+
+	public void setDescriptions(Set<ProductOptionValueDescription> descriptions) {
+		this.descriptions = descriptions;
+	}
+
+	public MerchantStore getMerchantStore() {
+		return merchantStore;
+	}
+
+	public void setMerchantStore(MerchantStore merchantStore) {
+		this.merchantStore = merchantStore;
+	}
+
+	public void setDescriptionsList(List<ProductOptionValueDescription> descriptionsList) {
+		this.descriptionsList = descriptionsList;
+	}
+
+	public List<ProductOptionValueDescription> getDescriptionsList() {
+		return descriptionsList; 
+	}
+	
+	public List<ProductOptionValueDescription> getDescriptionsSettoList() {
+		if(descriptionsList==null || descriptionsList.size()==0) {
+			descriptionsList = new ArrayList<ProductOptionValueDescription>(this.getDescriptions());
+		} 
+		return descriptionsList;
+	}
+
+	public void setImage(MultipartFile image) {
+		this.image = image;
+	}
+
+	public MultipartFile getImage() {
+		return image;
+	}
+	
+	public boolean isProductOptionDisplayOnly() {
+		return productOptionDisplayOnly;
+	}
+
+	public void setProductOptionDisplayOnly(boolean productOptionDisplayOnly) {
+		this.productOptionDisplayOnly = productOptionDisplayOnly;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/attribute/ProductOptionValueDescription.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/attribute/ProductOptionValueDescription.java
new file mode 100644
index 0000000..08fab19
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/attribute/ProductOptionValueDescription.java
@@ -0,0 +1,38 @@
+package com.salesmanager.core.business.catalog.product.model.attribute;
+
+import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
+
+import com.salesmanager.core.business.common.model.Description;
+import com.salesmanager.core.constants.SchemaConstant;
+
+@Entity
+@Table(name = "PRODUCT_OPTION_VALUE_DESCRIPTION", schema=SchemaConstant.SALESMANAGER_SCHEMA, uniqueConstraints={
+	@UniqueConstraint(columnNames={
+			"PRODUCT_OPTION_VALUE_ID",
+			"LANGUAGE_ID"
+		})
+	}
+)
+public class ProductOptionValueDescription extends Description {
+	private static final long serialVersionUID = 7402155175956813576L;
+	
+	@ManyToOne(targetEntity = ProductOptionValue.class)
+	@JoinColumn(name = "PRODUCT_OPTION_VALUE_ID")
+	private ProductOptionValue productOptionValue;
+	
+	public ProductOptionValueDescription() {
+	}
+
+	public ProductOptionValue getProductOptionValue() {
+		return productOptionValue;
+	}
+
+	public void setProductOptionValue(ProductOptionValue productOptionValue) {
+		this.productOptionValue = productOptionValue;
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/availability/ProductAvailability.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/availability/ProductAvailability.java
new file mode 100755
index 0000000..c425f04
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/availability/ProductAvailability.java
@@ -0,0 +1,184 @@
+package com.salesmanager.core.business.catalog.product.model.availability;
+
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import javax.persistence.Transient;
+import javax.validation.constraints.NotNull;
+
+import com.salesmanager.core.business.catalog.product.model.Product;
+import com.salesmanager.core.business.catalog.product.model.price.ProductPrice;
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.constants.Constants;
+import com.salesmanager.core.constants.SchemaConstant;
+import com.salesmanager.core.utils.CloneUtils;
+
+
+@Entity
+@Table(name="PRODUCT_AVAILABILITY", schema=SchemaConstant.SALESMANAGER_SCHEMA)
+public class ProductAvailability extends SalesManagerEntity<Long, ProductAvailability> {
+	private static final long serialVersionUID = 7449264635180797762L;
+
+	@Id
+	@Column(name = "PRODUCT_AVAIL_ID", unique=true, nullable=false)
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT", pkColumnValue = "PRODUCT_AVAIL_SEQ_NEXT_VAL")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Long id;
+	
+
+	@ManyToOne(targetEntity = Product.class)
+	@JoinColumn(name = "PRODUCT_ID", nullable = false)
+	private Product product;
+	
+	@NotNull
+	@Column(name="QUANTITY")
+	private Integer productQuantity = 0;
+	
+	@Temporal(TemporalType.DATE)
+	@Column(name="DATE_AVAILABLE")
+	private Date productDateAvailable;
+	
+	@Column(name="REGION")
+	private String region = Constants.ALL_REGIONS;
+	
+	@Column(name="REGION_VARIANT")
+	private String regionVariant;
+	
+	@Column(name="STATUS")
+	private boolean productStatus = true;
+	
+	@Column(name="FREE_SHIPPING")
+	private boolean productIsAlwaysFreeShipping;
+	
+	@Column(name="QUANTITY_ORD_MIN")
+	private Integer productQuantityOrderMin = 0;
+	
+	@Column(name="QUANTITY_ORD_MAX")
+	private Integer productQuantityOrderMax = 0;
+	
+	@OneToMany(fetch = FetchType.LAZY, mappedBy="productAvailability", cascade = CascadeType.REMOVE)	
+	private Set<ProductPrice> prices = new HashSet<ProductPrice>();
+	
+	@Transient
+	public ProductPrice defaultPrice() {
+		
+		for(ProductPrice price : prices) {
+			if(price.isDefaultPrice()) {
+				return price;
+			}
+		}
+		return new ProductPrice();
+	}
+	
+	public ProductAvailability() {
+	}
+
+	public Integer getProductQuantity() {
+		return productQuantity;
+	}
+
+	public void setProductQuantity(Integer productQuantity) {
+		this.productQuantity = productQuantity;
+	}
+
+	public Date getProductDateAvailable() {
+		return CloneUtils.clone(productDateAvailable);
+	}
+
+	public void setProductDateAvailable(Date productDateAvailable) {
+		this.productDateAvailable = CloneUtils.clone(productDateAvailable);
+	}
+
+	public String getRegion() {
+		return region;
+	}
+
+	public void setRegion(String region) {
+		this.region = region;
+	}
+
+	public String getRegionVariant() {
+		return regionVariant;
+	}
+
+	public void setRegionVariant(String regionVariant) {
+		this.regionVariant = regionVariant;
+	}
+
+	public boolean getProductStatus() {
+		return productStatus;
+	}
+
+	public void setProductStatus(boolean productStatus) {
+		this.productStatus = productStatus;
+	}
+
+	public boolean getProductIsAlwaysFreeShipping() {
+		return productIsAlwaysFreeShipping;
+	}
+
+	public void setProductIsAlwaysFreeShipping(boolean productIsAlwaysFreeShipping) {
+		this.productIsAlwaysFreeShipping = productIsAlwaysFreeShipping;
+	}
+
+	public Integer getProductQuantityOrderMin() {
+		return productQuantityOrderMin;
+	}
+
+	public void setProductQuantityOrderMin(Integer productQuantityOrderMin) {
+		this.productQuantityOrderMin = productQuantityOrderMin;
+	}
+
+	public Integer getProductQuantityOrderMax() {
+		return productQuantityOrderMax;
+	}
+
+	public void setProductQuantityOrderMax(Integer productQuantityOrderMax) {
+		this.productQuantityOrderMax = productQuantityOrderMax;
+	}
+
+
+	@Override
+	public Long getId() {
+		return id;
+	}
+
+	@Override
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Product getProduct() {
+		return product;
+	}
+
+	public void setProduct(Product product) {
+		this.product = product;
+	}
+
+
+
+	public Set<ProductPrice> getPrices() {
+		return prices;
+	}
+
+	public void setPrices(Set<ProductPrice> prices) {
+		this.prices = prices;
+	}
+	
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/description/ProductDescription.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/description/ProductDescription.java
new file mode 100644
index 0000000..5d4774f
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/description/ProductDescription.java
@@ -0,0 +1,105 @@
+package com.salesmanager.core.business.catalog.product.model.description;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
+
+import com.salesmanager.core.business.catalog.product.model.Product;
+import com.salesmanager.core.business.common.model.Description;
+
+@Entity
+@Table(name = "PRODUCT_DESCRIPTION", schema="SALESMANAGER", uniqueConstraints={
+	@UniqueConstraint(columnNames={
+			"PRODUCT_ID",
+			"LANGUAGE_ID"
+		})
+	}
+)
+public class ProductDescription extends Description {
+	private static final long serialVersionUID = -7991123535661321865L;
+	
+	@ManyToOne(targetEntity = Product.class)
+	@JoinColumn(name = "PRODUCT_ID", nullable = false)
+	private Product product;
+	
+	@Column(name = "PRODUCT_HIGHLIGHT")
+	private String productHighlight;
+
+	@Column(name = "DOWNLOAD_LNK")
+	private String productExternalDl;
+
+	@Column(name = "SEF_URL")
+	private String seUrl;
+
+	@Column(name = "META_TITLE")
+	private String metatagTitle;
+
+	@Column(name = "META_KEYWORDS")
+	private String metatagKeywords;
+
+	@Column(name = "META_DESCRIPTION")
+	private String metatagDescription;
+
+	public ProductDescription() {
+	}
+
+	public String getProductHighlight() {
+		return productHighlight;
+	}
+
+	public void setProductHighlight(String productHighlight) {
+		this.productHighlight = productHighlight;
+	}
+
+	public String getProductExternalDl() {
+		return productExternalDl;
+	}
+
+	public void setProductExternalDl(String productExternalDl) {
+		this.productExternalDl = productExternalDl;
+	}
+
+	public String getSeUrl() {
+		return seUrl;
+	}
+
+	public void setSeUrl(String seUrl) {
+		this.seUrl = seUrl;
+	}
+
+	public String getMetatagTitle() {
+		return metatagTitle;
+	}
+
+	public void setMetatagTitle(String metatagTitle) {
+		this.metatagTitle = metatagTitle;
+	}
+
+	public String getMetatagKeywords() {
+		return metatagKeywords;
+	}
+
+	public void setMetatagKeywords(String metatagKeywords) {
+		this.metatagKeywords = metatagKeywords;
+	}
+
+	public String getMetatagDescription() {
+		return metatagDescription;
+	}
+
+	public void setMetatagDescription(String metatagDescription) {
+		this.metatagDescription = metatagDescription;
+	}
+
+	public Product getProduct() {
+		return product;
+	}
+
+	public void setProduct(Product product) {
+		this.product = product;
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/file/DigitalProduct.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/file/DigitalProduct.java
new file mode 100644
index 0000000..130b669
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/file/DigitalProduct.java
@@ -0,0 +1,76 @@
+package com.salesmanager.core.business.catalog.product.model.file;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+import javax.persistence.UniqueConstraint;
+
+import com.salesmanager.core.business.catalog.product.model.Product;
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.constants.SchemaConstant;
+
+
+/**
+ * Representation of a digital product
+ * @author csamson777
+ *
+ */
+@Entity
+@Table(name = "PRODUCT_DIGITAL", schema=SchemaConstant.SALESMANAGER_SCHEMA, uniqueConstraints=
+	@UniqueConstraint(columnNames = {"PRODUCT_ID", "FILE_NAME"}))
+public class DigitalProduct extends SalesManagerEntity<Long, DigitalProduct> {
+
+
+	private static final long serialVersionUID = 1L;
+	
+	
+	@Id
+	@Column(name = "PRODUCT_DIGITAL_ID")
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT", pkColumnValue = "PRODUCT_DGT_SEQ_NEXT_VAL")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Long id;
+	
+	
+	@ManyToOne(targetEntity = Product.class)
+	@JoinColumn(name = "PRODUCT_ID", nullable = false)
+	private Product product;
+
+
+	@Column(name="FILE_NAME",nullable=false)
+	private String productFileName;
+	
+
+	@Override
+	public Long getId() {
+		return id;
+	}
+
+	@Override
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getProductFileName() {
+		return productFileName;
+	}
+
+	public void setProductFileName(String productFileName) {
+		this.productFileName = productFileName;
+	}
+	
+	public Product getProduct() {
+		return product;
+	}
+
+	public void setProduct(Product product) {
+		this.product = product;
+	}
+
+	
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/file/ProductImageSize.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/file/ProductImageSize.java
new file mode 100755
index 0000000..6db38a9
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/file/ProductImageSize.java
@@ -0,0 +1,10 @@
+package com.salesmanager.core.business.catalog.product.model.file;
+
+public enum ProductImageSize {
+	
+	LARGE,
+	SMALL
+	
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/image/ProductImage.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/image/ProductImage.java
new file mode 100755
index 0000000..91d8664
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/image/ProductImage.java
@@ -0,0 +1,132 @@
+package com.salesmanager.core.business.catalog.product.model.image;
+
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+import javax.persistence.Transient;
+
+import com.salesmanager.core.business.catalog.product.model.Product;
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+
+@Entity
+@Table(name = "PRODUCT_IMAGE", schema="SALESMANAGER")
+public class ProductImage extends SalesManagerEntity<Long, ProductImage> {
+	private static final long serialVersionUID = 247514890386076337L;
+	
+	@Id
+	@Column(name = "PRODUCT_IMAGE_ID")
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT", pkColumnValue = "PRODUCT_IMG_SEQ_NEXT_VAL")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Long id;
+	
+	@OneToMany(fetch = FetchType.LAZY, mappedBy = "productImage", cascade = CascadeType.ALL)
+	private List<ProductImageDescription> descriptions = new ArrayList<ProductImageDescription>();
+
+	
+	@Column(name = "PRODUCT_IMAGE")
+	private String productImage;
+	
+	@Column(name = "DEFAULT_IMAGE")
+	private boolean defaultImage = true;
+	
+	@Column(name = "IMAGE_TYPE")
+	private int imageType;
+	
+	@Column(name = "IMAGE_CROP")
+	private boolean imageCrop;
+	
+	@ManyToOne(targetEntity = Product.class)
+	@JoinColumn(name = "PRODUCT_ID", nullable = false)
+	private Product product;
+	
+	@Transient
+	private InputStream image = null;
+	
+	//private MultiPartFile image
+
+	public ProductImage(){
+	}
+
+	public String getProductImage() {
+		return productImage;
+	}
+
+	public void setProductImage(String productImage) {
+		this.productImage = productImage;
+	}
+
+	public boolean isDefaultImage() {
+		return defaultImage;
+	}
+
+	public void setDefaultImage(boolean defaultImage) {
+		this.defaultImage = defaultImage;
+	}
+
+	public int getImageType() {
+		return imageType;
+	}
+
+	public void setImageType(int imageType) {
+		this.imageType = imageType;
+	}
+
+	public boolean isImageCrop() {
+		return imageCrop;
+	}
+
+	public void setImageCrop(boolean imageCrop) {
+		this.imageCrop = imageCrop;
+	}
+
+	@Override
+	public Long getId() {
+		return id;
+	}
+
+	@Override
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Product getProduct() {
+		return product;
+	}
+
+	public void setProduct(Product product) {
+		this.product = product;
+	}
+
+	public void setDescriptions(List<ProductImageDescription> descriptions) {
+		this.descriptions = descriptions;
+	}
+
+	public List<ProductImageDescription> getDescriptions() {
+		return descriptions;
+	}
+
+	public InputStream getImage() {
+		return image;
+	}
+
+	public void setImage(InputStream image) {
+		this.image = image;
+	}
+
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/image/ProductImageDescription.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/image/ProductImageDescription.java
new file mode 100644
index 0000000..c945f3e
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/image/ProductImageDescription.java
@@ -0,0 +1,48 @@
+package com.salesmanager.core.business.catalog.product.model.image;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
+
+import com.salesmanager.core.business.common.model.Description;
+import com.salesmanager.core.constants.SchemaConstant;
+
+@Entity
+@Table(name="PRODUCT_IMAGE_DESCRIPTION", schema=SchemaConstant.SALESMANAGER_SCHEMA, uniqueConstraints={
+		@UniqueConstraint(columnNames={
+			"PRODUCT_IMAGE_ID",
+			"LANGUAGE_ID"
+		})
+	}
+)
+public class ProductImageDescription extends Description {
+	private static final long serialVersionUID = 247514890386076337L;
+	
+	@ManyToOne(targetEntity = ProductImage.class)
+	@JoinColumn(name = "PRODUCT_IMAGE_ID", nullable = false)
+	private ProductImage productImage;
+	
+	@Column(name="ALT_TAG", length=100)
+	private String altTag;
+
+	public ProductImage getProductImage() {
+		return productImage;
+	}
+
+	public void setProductImage(ProductImage productImage) {
+		this.productImage = productImage;
+	}
+
+	public String getAltTag() {
+		return altTag;
+	}
+
+	public void setAltTag(String altTag) {
+		this.altTag = altTag;
+	}
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/manufacturer/Manufacturer.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/manufacturer/Manufacturer.java
new file mode 100644
index 0000000..7e79634
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/manufacturer/Manufacturer.java
@@ -0,0 +1,113 @@
+package com.salesmanager.core.business.catalog.product.model.manufacturer;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+
+import com.salesmanager.core.business.common.model.audit.AuditListener;
+import com.salesmanager.core.business.common.model.audit.AuditSection;
+import com.salesmanager.core.business.common.model.audit.Auditable;
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+
+@Entity
+@EntityListeners(value = AuditListener.class)
+@Table(name = "MANUFACTURER", schema="SALESMANAGER")
+public class Manufacturer extends SalesManagerEntity<Long, Manufacturer> implements Auditable {
+	private static final long serialVersionUID = 80693964563570099L;
+	
+	@Id
+	@Column(name = "MANUFACTURER_ID", unique=true, nullable=false)
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT", pkColumnValue = "MANUFACT_SEQ_NEXT_VAL")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Long id;
+	
+	@Embedded
+	private AuditSection auditSection = new AuditSection();
+	
+	@OneToMany(mappedBy = "manufacturer", cascade = CascadeType.ALL , fetch = FetchType.EAGER)
+	private Set<ManufacturerDescription> descriptions = new HashSet<ManufacturerDescription>();
+	
+	@Column(name = "MANUFACTURER_IMAGE")
+	private String image;
+	
+	@Column(name="SORT_ORDER")
+	private Integer order = new Integer(0);
+
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name="MERCHANT_ID", nullable=false)
+	private MerchantStore merchantStore;
+
+	public Manufacturer() {
+	}
+
+	@Override
+	public Long getId() {
+		return id;
+	}
+
+	@Override
+	public void setId(Long id) {
+		this.id = id;
+	}
+	
+	@Override
+	public AuditSection getAuditSection() {
+		return auditSection;
+	}
+	
+	@Override
+	public void setAuditSection(AuditSection auditSection) {
+		this.auditSection = auditSection;
+	}
+
+	public String getImage() {
+		return image;
+	}
+
+	public void setImage(String image) {
+		this.image = image;
+	}
+
+	public Set<ManufacturerDescription> getDescriptions() {
+		return descriptions;
+	}
+
+	public void setDescriptions(Set<ManufacturerDescription> descriptions) {
+		this.descriptions = descriptions;
+	}
+
+
+
+	public MerchantStore getMerchantStore() {
+		return merchantStore;
+	}
+
+	public void setMerchantStore(MerchantStore merchantStore) {
+		this.merchantStore = merchantStore;
+	}
+
+	public void setOrder(Integer order) {
+		this.order = order;
+	}
+
+	public Integer getOrder() {
+		return order;
+	}
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/manufacturer/ManufacturerDescription.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/manufacturer/ManufacturerDescription.java
new file mode 100644
index 0000000..8f82404
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/manufacturer/ManufacturerDescription.java
@@ -0,0 +1,72 @@
+package com.salesmanager.core.business.catalog.product.model.manufacturer;
+
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
+
+import com.salesmanager.core.business.common.model.Description;
+
+@Entity
+@Table(name = "MANUFACTURER_DESCRIPTION", schema="SALESMANAGER", uniqueConstraints={
+	@UniqueConstraint(columnNames={
+			"MANUFACTURER_ID",
+			"LANGUAGE_ID"
+		})
+	}
+)
+public class ManufacturerDescription extends Description {
+	private static final long serialVersionUID = -2164581613773995282L;
+	
+	@ManyToOne(targetEntity = Manufacturer.class)
+	@JoinColumn(name = "MANUFACTURER_ID", nullable = false)
+	private Manufacturer manufacturer;
+	
+	@Column(name = "MANUFACTURERS_URL")
+	private String url;
+	
+	@Column(name = "URL_CLICKED")
+	private Integer urlClicked;
+	
+	@Column(name = "DATE_LAST_CLICK")
+	private Date dateLastClick;
+	
+	public ManufacturerDescription() {
+	}
+
+	public String getUrl() {
+		return url;
+	}
+
+	public void setUrl(String url) {
+		this.url = url;
+	}
+
+	public Integer getUrlClicked() {
+		return urlClicked;
+	}
+
+	public void setUrlClicked(Integer urlClicked) {
+		this.urlClicked = urlClicked;
+	}
+
+	public Date getDateLastClick() {
+		return dateLastClick;
+	}
+
+	public void setDateLastClick(Date dateLastClick) {
+		this.dateLastClick = dateLastClick;
+	}
+
+	public Manufacturer getManufacturer() {
+		return manufacturer;
+	}
+
+	public void setManufacturer(Manufacturer manufacturer) {
+		this.manufacturer = manufacturer;
+	}
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/price/FinalPrice.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/price/FinalPrice.java
new file mode 100755
index 0000000..4caf675
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/price/FinalPrice.java
@@ -0,0 +1,107 @@
+package com.salesmanager.core.business.catalog.product.model.price;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Transient entity used to display
+ * different price information in the catalogue
+ * @author Carl Samson
+ *
+ */
+public class FinalPrice implements Serializable {
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	private BigDecimal discountedPrice = null;//final price if a discount is applied
+	private BigDecimal originalPrice = null;//original price
+	private BigDecimal finalPrice = null;//final price discount or not
+	private boolean discounted = false;
+	private int discountPercent = 0;
+	
+	private Date discountEndDate = null;
+	
+	private boolean defaultPrice;
+	private ProductPrice productPrice;
+	List<FinalPrice> additionalPrices;
+
+	public List<FinalPrice> getAdditionalPrices() {
+		return additionalPrices;
+	}
+
+	public void setAdditionalPrices(List<FinalPrice> additionalPrices) {
+		this.additionalPrices = additionalPrices;
+	}
+
+	public BigDecimal getOriginalPrice() {
+		return originalPrice;
+	}
+
+	public void setOriginalPrice(BigDecimal originalPrice) {
+		this.originalPrice = originalPrice;
+	}
+
+
+
+	public int getDiscountPercent() {
+		return discountPercent;
+	}
+
+	public void setDiscountPercent(int discountPercent) {
+		this.discountPercent = discountPercent;
+	}
+
+	public Date getDiscountEndDate() {
+		return discountEndDate;
+	}
+
+	public void setDiscountEndDate(Date discountEndDate) {
+		this.discountEndDate = discountEndDate;
+	}
+
+	public boolean isDiscounted() {
+		return discounted;
+	}
+
+	public void setDiscounted(boolean discounted) {
+		this.discounted = discounted;
+	}
+
+	public void setDiscountedPrice(BigDecimal discountedPrice) {
+		this.discountedPrice = discountedPrice;
+	}
+
+	public BigDecimal getDiscountedPrice() {
+		return discountedPrice;
+	}
+
+
+	public void setFinalPrice(BigDecimal finalPrice) {
+		this.finalPrice = finalPrice;
+	}
+
+	public BigDecimal getFinalPrice() {
+		return finalPrice;
+	}
+
+	public void setDefaultPrice(boolean defaultPrice) {
+		this.defaultPrice = defaultPrice;
+	}
+
+	public boolean isDefaultPrice() {
+		return defaultPrice;
+	}
+
+	public void setProductPrice(ProductPrice productPrice) {
+		this.productPrice = productPrice;
+	}
+
+	public ProductPrice getProductPrice() {
+		return productPrice;
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/price/ProductPrice.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/price/ProductPrice.java
new file mode 100644
index 0000000..78ee7fa
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/price/ProductPrice.java
@@ -0,0 +1,182 @@
+package com.salesmanager.core.business.catalog.product.model.price;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import javax.validation.constraints.Pattern;
+
+import org.hibernate.validator.constraints.NotEmpty;
+
+import com.salesmanager.core.business.catalog.product.model.availability.ProductAvailability;
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.constants.SchemaConstant;
+import com.salesmanager.core.utils.CloneUtils;
+
+@Entity
+@Table(name = "PRODUCT_PRICE", schema=SchemaConstant.SALESMANAGER_SCHEMA)
+public class ProductPrice extends SalesManagerEntity<Long, ProductPrice> {
+	private static final long serialVersionUID = -9186473817468772165L;
+	
+	private final static String DEFAULT_PRICE_CODE="base";
+
+	@Id
+	@Column(name = "PRODUCT_PRICE_ID")
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT", pkColumnValue = "PRODUCT_PRICE_SEQ_NEXT_VAL")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Long id;
+
+	@OneToMany(fetch = FetchType.LAZY, mappedBy = "productPrice", cascade = CascadeType.ALL)
+	private Set<ProductPriceDescription> descriptions = new HashSet<ProductPriceDescription>();
+
+	@NotEmpty
+	@Pattern(regexp="^[a-zA-Z0-9_]*$")
+	@Column(name = "PRODUCT_PRICE_CODE", nullable=false)
+	private String code = DEFAULT_PRICE_CODE;
+
+	@Column(name = "PRODUCT_PRICE_AMOUNT", nullable=false)
+	private BigDecimal productPriceAmount = new BigDecimal(0);
+
+	@Column(name = "PRODUCT_PRICE_TYPE", length=20)
+	@Enumerated(value = EnumType.STRING)
+	private ProductPriceType productPriceType = ProductPriceType.ONE_TIME;
+
+	@Column(name = "DEFAULT_PRICE")
+	private boolean defaultPrice = false;
+
+	@Temporal(TemporalType.DATE)
+	@Column(name = "PRODUCT_PRICE_SPECIAL_ST_DATE")
+	private Date productPriceSpecialStartDate;
+
+	@Temporal(TemporalType.DATE)
+	@Column(name = "PRODUCT_PRICE_SPECIAL_END_DATE")
+	private Date productPriceSpecialEndDate;
+
+	@Column(name = "PRODUCT_PRICE_SPECIAL_AMOUNT")
+	private BigDecimal productPriceSpecialAmount;
+	
+
+	@ManyToOne(targetEntity = ProductAvailability.class)
+	@JoinColumn(name = "PRODUCT_AVAIL_ID", nullable = false)
+	private ProductAvailability productAvailability;
+	
+
+	public ProductPrice() {
+	}
+	
+	@Override
+	public Long getId() {
+		return this.id;
+	}
+
+	@Override
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+
+
+
+	public BigDecimal getProductPriceAmount() {
+		return productPriceAmount;
+	}
+
+	public void setProductPriceAmount(BigDecimal productPriceAmount) {
+		this.productPriceAmount = productPriceAmount;
+	}
+
+
+	
+	public Date getProductPriceSpecialStartDate() {
+		return CloneUtils.clone(productPriceSpecialStartDate);
+	}
+
+	public void setProductPriceSpecialStartDate(
+			Date productPriceSpecialStartDate) {
+		this.productPriceSpecialStartDate = CloneUtils.clone(productPriceSpecialStartDate);
+	}
+
+	public Date getProductPriceSpecialEndDate() {
+		return CloneUtils.clone(productPriceSpecialEndDate);
+	}
+
+	public void setProductPriceSpecialEndDate(Date productPriceSpecialEndDate) {
+		this.productPriceSpecialEndDate = CloneUtils.clone(productPriceSpecialEndDate);
+	}
+
+
+
+	public BigDecimal getProductPriceSpecialAmount() {
+		return productPriceSpecialAmount;
+	}
+
+	public void setProductPriceSpecialAmount(
+			BigDecimal productPriceSpecialAmount) {
+		this.productPriceSpecialAmount = productPriceSpecialAmount;
+	}
+
+
+
+	public Set<ProductPriceDescription> getDescriptions() {
+		return descriptions;
+	}
+
+
+
+	public void setDescriptions(Set<ProductPriceDescription> descriptions) {
+		this.descriptions = descriptions;
+	}
+
+
+
+	public boolean isDefaultPrice() {
+		return defaultPrice;
+	}
+
+	public void setDefaultPrice(boolean defaultPrice) {
+		this.defaultPrice = defaultPrice;
+	}
+
+	public void setProductAvailability(ProductAvailability productAvailability) {
+		this.productAvailability = productAvailability;
+	}
+
+	public ProductAvailability getProductAvailability() {
+		return productAvailability;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setProductPriceType(ProductPriceType productPriceType) {
+		this.productPriceType = productPriceType;
+	}
+
+	public ProductPriceType getProductPriceType() {
+		return productPriceType;
+	}
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/price/ProductPriceDescription.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/price/ProductPriceDescription.java
new file mode 100644
index 0000000..65f94a8
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/price/ProductPriceDescription.java
@@ -0,0 +1,41 @@
+package com.salesmanager.core.business.catalog.product.model.price;
+
+import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
+
+import com.salesmanager.core.business.common.model.Description;
+import com.salesmanager.core.constants.SchemaConstant;
+
+@Entity
+@Table(name="PRODUCT_PRICE_DESCRIPTION", schema=SchemaConstant.SALESMANAGER_SCHEMA, uniqueConstraints={
+		@UniqueConstraint(columnNames={
+			"PRODUCT_PRICE_ID",
+			"LANGUAGE_ID"
+		})
+	}
+)
+public class ProductPriceDescription extends Description {
+	private static final long serialVersionUID = 270521409645392808L;
+	
+	public final static String DEFAULT_PRICE_DESCRIPTION = "DEFAULT";
+	
+	@ManyToOne(targetEntity = ProductPrice.class)
+	@JoinColumn(name = "PRODUCT_PRICE_ID", nullable = false)
+	private ProductPrice productPrice;
+	
+	public ProductPriceDescription() {
+	}
+
+	public ProductPrice getProductPrice() {
+		return productPrice;
+	}
+
+	public void setProductPrice(ProductPrice productPrice) {
+		this.productPrice = productPrice;
+	}
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/price/ProductPriceType.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/price/ProductPriceType.java
new file mode 100644
index 0000000..46115c3
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/price/ProductPriceType.java
@@ -0,0 +1,7 @@
+package com.salesmanager.core.business.catalog.product.model.price;
+
+public enum ProductPriceType {
+	
+	ONE_TIME, MONTHLY
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/Product.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/Product.java
new file mode 100755
index 0000000..57b7376
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/Product.java
@@ -0,0 +1,418 @@
+package com.salesmanager.core.business.catalog.product.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import javax.validation.constraints.Pattern;
+
+import org.hibernate.annotations.Cascade;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import com.salesmanager.core.business.catalog.category.model.Category;
+import com.salesmanager.core.business.catalog.product.model.attribute.ProductAttribute;
+import com.salesmanager.core.business.catalog.product.model.availability.ProductAvailability;
+import com.salesmanager.core.business.catalog.product.model.description.ProductDescription;
+import com.salesmanager.core.business.catalog.product.model.image.ProductImage;
+import com.salesmanager.core.business.catalog.product.model.manufacturer.Manufacturer;
+import com.salesmanager.core.business.catalog.product.model.relationship.ProductRelationship;
+import com.salesmanager.core.business.catalog.product.model.type.ProductType;
+import com.salesmanager.core.business.common.model.audit.AuditListener;
+import com.salesmanager.core.business.common.model.audit.AuditSection;
+import com.salesmanager.core.business.common.model.audit.Auditable;
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.tax.model.taxclass.TaxClass;
+import com.salesmanager.core.constants.SchemaConstant;
+
+
+@Entity
+@EntityListeners(value = AuditListener.class)
+@Table(name = "PRODUCT", schema=SchemaConstant.SALESMANAGER_SCHEMA)
+public class Product extends SalesManagerEntity<Long, Product> implements Auditable {
+	private static final long serialVersionUID = -6228066416290007047L;
+
+	@Id
+	@Column(name = "PRODUCT_ID", unique=true, nullable=false)
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT", pkColumnValue = "PRODUCT_SEQ_NEXT_VAL")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Long id;
+
+	@Embedded
+	private AuditSection auditSection = new AuditSection();
+
+	@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, mappedBy = "product")
+	private Set<ProductDescription> descriptions = new HashSet<ProductDescription>();
+	
+	@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.REMOVE, mappedBy="product", orphanRemoval = true)
+	private Set<ProductAvailability> availabilities = new HashSet<ProductAvailability>();
+
+	@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.REMOVE, mappedBy = "product")
+	private Set<ProductAttribute> attributes = new HashSet<ProductAttribute>();
+	
+	@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.REMOVE, mappedBy = "product")
+	private Set<ProductImage> images = new HashSet<ProductImage>();
+
+	@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.REMOVE, mappedBy = "product")
+	private Set<ProductRelationship> relationships = new HashSet<ProductRelationship>();
+	
+
+	
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name="MERCHANT_ID", nullable=false)
+	private MerchantStore merchantStore;
+	
+	@ManyToMany(fetch=FetchType.LAZY, cascade = {CascadeType.REFRESH})
+	@JoinTable(name = "PRODUCT_CATEGORY", schema=SchemaConstant.SALESMANAGER_SCHEMA, joinColumns = { 
+			@JoinColumn(name = "PRODUCT_ID", nullable = false, updatable = false) }
+			, 
+			inverseJoinColumns = { @JoinColumn(name = "CATEGORY_ID", 
+					nullable = false, updatable = false) }
+	)
+	@Cascade({
+		org.hibernate.annotations.CascadeType.DETACH,
+		org.hibernate.annotations.CascadeType.LOCK,
+		org.hibernate.annotations.CascadeType.REFRESH,
+		org.hibernate.annotations.CascadeType.REPLICATE
+		
+	})
+	private Set<Category> categories = new HashSet<Category>();
+	
+	@Column(name="DATE_AVAILABLE")
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date dateAvailable = new Date();
+	
+	
+	@Column(name="AVAILABLE")
+	private boolean available = true;
+	
+
+	@ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.REFRESH})
+	@JoinColumn(name="MANUFACTURER_ID", nullable=true)
+	private Manufacturer manufacturer;
+
+	@ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.REFRESH})
+	@JoinColumn(name="PRODUCT_TYPE_ID", nullable=true)
+	private ProductType type;
+
+	@ManyToOne(fetch = FetchType.LAZY, cascade = {CascadeType.REFRESH})
+	@JoinColumn(name="TAX_CLASS_ID", nullable=true)
+	private TaxClass taxClass;
+
+	@Column(name = "PRODUCT_VIRTUAL")
+	private boolean productVirtual = false;
+	
+	@Column(name = "PRODUCT_SHIP")
+	private boolean productShipeable = false;
+
+
+	@Column(name = "PRODUCT_FREE")
+	private boolean productIsFree;
+
+	@Column(name = "PRODUCT_LENGTH")
+	private BigDecimal productLength;
+
+	@Column(name = "PRODUCT_WIDTH")
+	private BigDecimal productWidth;
+
+	@Column(name = "PRODUCT_HEIGHT")
+	private BigDecimal productHeight;
+
+	@Column(name = "PRODUCT_WEIGHT")
+	private BigDecimal productWeight;
+
+	@Column(name = "REVIEW_AVG")
+	private BigDecimal productReviewAvg;
+
+	@Column(name = "REVIEW_COUNT")
+	private Integer productReviewCount;
+
+	@Column(name = "QUANTITY_ORDERED")
+	private Integer productOrdered;
+	
+	@Column(name = "SORT_ORDER")
+	private Integer sortOrder = new Integer(0);
+
+	@NotEmpty
+	@Pattern(regexp="^[a-zA-Z0-9_]*$")
+	@Column(name = "SKU")
+	private String sku;
+
+	public Product() {
+	}
+
+	@Override
+	public Long getId() {
+		return this.id;
+	}
+
+	@Override
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	@Override
+	public AuditSection getAuditSection() {
+		return auditSection;
+	}
+
+	@Override
+	public void setAuditSection(AuditSection auditSection) {
+		this.auditSection = auditSection;
+	}
+
+
+	public boolean isProductVirtual() {
+		return productVirtual;
+	}
+
+
+
+	public BigDecimal getProductLength() {
+		return productLength;
+	}
+
+	public void setProductLength(BigDecimal productLength) {
+		this.productLength = productLength;
+	}
+
+	public BigDecimal getProductWidth() {
+		return productWidth;
+	}
+
+	public void setProductWidth(BigDecimal productWidth) {
+		this.productWidth = productWidth;
+	}
+
+	public BigDecimal getProductHeight() {
+		return productHeight;
+	}
+
+	public void setProductHeight(BigDecimal productHeight) {
+		this.productHeight = productHeight;
+	}
+
+	public BigDecimal getProductWeight() {
+		return productWeight;
+	}
+
+	public void setProductWeight(BigDecimal productWeight) {
+		this.productWeight = productWeight;
+	}
+
+	public BigDecimal getProductReviewAvg() {
+		return productReviewAvg;
+	}
+
+	public void setProductReviewAvg(BigDecimal productReviewAvg) {
+		this.productReviewAvg = productReviewAvg;
+	}
+
+	public Integer getProductReviewCount() {
+		return productReviewCount;
+	}
+
+	public void setProductReviewCount(Integer productReviewCount) {
+		this.productReviewCount = productReviewCount;
+	}
+
+
+
+	public Integer getProductOrdered() {
+		return productOrdered;
+	}
+
+	public void setProductOrdered(Integer productOrdered) {
+		this.productOrdered = productOrdered;
+	}
+
+	public String getSku() {
+		return sku;
+	}
+
+	public void setSku(String sku) {
+		this.sku = sku;
+	}
+
+	public Set<ProductDescription> getDescriptions() {
+		return descriptions;
+	}
+
+	public void setDescriptions(Set<ProductDescription> descriptions) {
+		this.descriptions = descriptions;
+	}
+
+
+	public boolean getProductVirtual() {
+		return productVirtual;
+	}
+
+	public void setProductVirtual(boolean productVirtual) {
+		this.productVirtual = productVirtual;
+	}
+
+	public boolean getProductIsFree() {
+		return productIsFree;
+	}
+
+	public void setProductIsFree(boolean productIsFree) {
+		this.productIsFree = productIsFree;
+	}
+
+
+
+	public Set<ProductAttribute> getAttributes() {
+		return attributes;
+	}
+
+	public void setAttributes(Set<ProductAttribute> attributes) {
+		this.attributes = attributes;
+	}
+
+
+
+	public Manufacturer getManufacturer() {
+		return manufacturer;
+	}
+
+	public void setManufacturer(Manufacturer manufacturer) {
+		this.manufacturer = manufacturer;
+	}
+
+	public ProductType getType() {
+		return type;
+	}
+
+	public void setType(ProductType type) {
+		this.type = type;
+	}
+
+
+
+	public Set<ProductAvailability> getAvailabilities() {
+		return availabilities;
+	}
+
+	public void setAvailabilities(Set<ProductAvailability> availabilities) {
+		this.availabilities = availabilities;
+	}
+
+	public TaxClass getTaxClass() {
+		return taxClass;
+	}
+
+	public void setTaxClass(TaxClass taxClass) {
+		this.taxClass = taxClass;
+	}
+
+	public Set<ProductImage> getImages() {
+		return images;
+	}
+
+	public void setImages(Set<ProductImage> images) {
+		this.images = images;
+	}
+
+	public Set<ProductRelationship> getRelationships() {
+		return relationships;
+	}
+
+	public void setRelationships(Set<ProductRelationship> relationships) {
+		this.relationships = relationships;
+	}
+
+
+	public Set<Category> getCategories() {
+		return categories;
+	}
+
+	public void setCategories(Set<Category> categories) {
+		this.categories = categories;
+	}
+
+	public MerchantStore getMerchantStore() {
+		return merchantStore;
+	}
+
+	public void setMerchantStore(MerchantStore merchantStore) {
+		this.merchantStore = merchantStore;
+	}
+
+
+
+	public Date getDateAvailable() {
+		return dateAvailable;
+	}
+
+	public void setDateAvailable(Date dateAvailable) {
+		this.dateAvailable = dateAvailable;
+	}
+
+	public void setSortOrder(Integer sortOrder) {
+		this.sortOrder = sortOrder;
+	}
+
+	public Integer getSortOrder() {
+		return sortOrder;
+	}
+
+
+
+	public void setAvailable(boolean available) {
+		this.available = available;
+	}
+
+	public boolean isAvailable() {
+		return available;
+	}
+	
+	public boolean isProductShipeable() {
+		return productShipeable;
+	}
+
+	public void setProductShipeable(boolean productShipeable) {
+		this.productShipeable = productShipeable;
+	}
+
+	
+	public ProductDescription getProductDescription() {
+		if(this.getDescriptions()!=null && this.getDescriptions().size()>0) {
+			return this.getDescriptions().iterator().next();
+		}
+		return null;
+	}
+	
+	public ProductImage getProductImage() {
+		ProductImage productImage = null;
+		if(this.getImages()!=null && this.getImages().size()>0) {
+			for(ProductImage image : this.getImages()) {
+				productImage = image;
+				if(productImage.isDefaultImage()) {
+					break;
+				}
+			}
+		}
+		return productImage;
+	}
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/ProductCriteria.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/ProductCriteria.java
new file mode 100644
index 0000000..40b5ceb
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/ProductCriteria.java
@@ -0,0 +1,82 @@
+package com.salesmanager.core.business.catalog.product.model;
+
+import java.util.List;
+
+import com.salesmanager.core.business.catalog.product.model.attribute.AttributeCriteria;
+import com.salesmanager.core.business.common.model.Criteria;
+
+public class ProductCriteria extends Criteria {
+	
+	
+	private String productName;
+	private List<AttributeCriteria> attributeCriteria;
+
+	
+	private Boolean available = null;
+	
+	private List<Long> categoryIds;
+	private List<String> availabilities;
+	private List<Long> productIds;
+	
+	private Long manufacturerId = null;
+
+	public String getProductName() {
+		return productName;
+	}
+
+	public void setProductName(String productName) {
+		this.productName = productName;
+	}
+
+
+	public List<Long> getCategoryIds() {
+		return categoryIds;
+	}
+
+	public void setCategoryIds(List<Long> categoryIds) {
+		this.categoryIds = categoryIds;
+	}
+
+	public List<String> getAvailabilities() {
+		return availabilities;
+	}
+
+	public void setAvailabilities(List<String> availabilities) {
+		this.availabilities = availabilities;
+	}
+
+	public Boolean getAvailable() {
+		return available;
+	}
+
+	public void setAvailable(Boolean available) {
+		this.available = available;
+	}
+
+	public void setAttributeCriteria(List<AttributeCriteria> attributeCriteria) {
+		this.attributeCriteria = attributeCriteria;
+	}
+
+	public List<AttributeCriteria> getAttributeCriteria() {
+		return attributeCriteria;
+	}
+
+	public void setProductIds(List<Long> productIds) {
+		this.productIds = productIds;
+	}
+
+	public List<Long> getProductIds() {
+		return productIds;
+	}
+
+	public void setManufacturerId(Long manufacturerId) {
+		this.manufacturerId = manufacturerId;
+	}
+
+	public Long getManufacturerId() {
+		return manufacturerId;
+	}
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/ProductList.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/ProductList.java
new file mode 100644
index 0000000..5c6754c
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/ProductList.java
@@ -0,0 +1,25 @@
+package com.salesmanager.core.business.catalog.product.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.salesmanager.core.business.common.model.EntityList;
+
+public class ProductList extends EntityList {
+	
+
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 7267292601646149482L;
+	private List<Product> products = new ArrayList<Product>();
+	public List<Product> getProducts() {
+		return products;
+	}
+	public void setProducts(List<Product> products) {
+		this.products = products;
+	}
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/relationship/ProductRelationship.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/relationship/ProductRelationship.java
new file mode 100644
index 0000000..f91fd0d
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/relationship/ProductRelationship.java
@@ -0,0 +1,121 @@
+package com.salesmanager.core.business.catalog.product.model.relationship;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+
+import com.salesmanager.core.business.catalog.product.model.Product;
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.constants.SchemaConstant;
+
+@Entity
+@Table(name = "PRODUCT_RELATIONSHIP", schema=SchemaConstant.SALESMANAGER_SCHEMA)
+public class ProductRelationship extends SalesManagerEntity<Long, ProductRelationship> implements Serializable {
+	private static final long serialVersionUID = -9045331138054246299L;
+	
+	@Id
+	@Column(name = "PRODUCT_RELATIONSHIP_ID", unique=true, nullable=false)
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT", pkColumnValue = "PRODUCT_RELATION_SEQ_NEXT_VAL")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Long id;
+	
+	@ManyToOne(targetEntity = MerchantStore.class)
+	@JoinColumn(name="MERCHANT_ID",nullable=false)  
+	private MerchantStore store;
+	
+	@ManyToOne(targetEntity = Product.class)
+	@JoinColumn(name="PRODUCT_ID",updatable=false,nullable=true) 
+	private Product product = null;
+	
+	@ManyToOne(targetEntity = Product.class)
+	@JoinColumn(name="RELATED_PRODUCT_ID",updatable=false,nullable=true) 
+	private Product relatedProduct = null;
+	
+	@Column(name="CODE")
+	private String code;
+	
+	@Column(name="ACTIVE")
+	private boolean active = true;
+	
+	public Product getProduct() {
+		return product;
+	}
+
+
+
+	public void setProduct(Product product) {
+		this.product = product;
+	}
+
+
+
+	public Product getRelatedProduct() {
+		return relatedProduct;
+	}
+
+
+
+	public void setRelatedProduct(Product relatedProduct) {
+		this.relatedProduct = relatedProduct;
+	}
+
+
+
+	public String getCode() {
+		return code;
+	}
+
+
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+
+
+	public boolean isActive() {
+		return active;
+	}
+
+
+
+	public void setActive(boolean active) {
+		this.active = active;
+	}
+
+
+
+	public ProductRelationship() {
+	}
+
+
+
+	public MerchantStore getStore() {
+		return store;
+	}
+
+	public void setStore(MerchantStore store) {
+		this.store = store;
+	}
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/relationship/ProductRelationshipType.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/relationship/ProductRelationshipType.java
new file mode 100755
index 0000000..60937e5
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/relationship/ProductRelationshipType.java
@@ -0,0 +1,7 @@
+package com.salesmanager.core.business.catalog.product.model.relationship;
+
+public enum ProductRelationshipType {
+	
+	FEATURED_ITEM, RELATED_ITEM, BUNDLED_ITEM
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/review/ProductReview.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/review/ProductReview.java
new file mode 100644
index 0000000..1601785
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/review/ProductReview.java
@@ -0,0 +1,150 @@
+package com.salesmanager.core.business.catalog.product.model.review;
+
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+import com.salesmanager.core.business.catalog.product.model.Product;
+import com.salesmanager.core.business.common.model.audit.AuditListener;
+import com.salesmanager.core.business.common.model.audit.AuditSection;
+import com.salesmanager.core.business.common.model.audit.Auditable;
+import com.salesmanager.core.business.customer.model.Customer;
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.constants.SchemaConstant;
+
+@Entity
+@EntityListeners(value = AuditListener.class)
+@Table(name = "PRODUCT_REVIEW", schema=SchemaConstant.SALESMANAGER_SCHEMA)
+public class ProductReview extends SalesManagerEntity<Long, ProductReview> implements Auditable {
+	private static final long serialVersionUID = -7509351278087554383L;
+
+	@Id
+	@Column(name = "PRODUCT_REVIEW_ID", unique=true, nullable=false)
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT",
+	pkColumnValue = "PRODUCT_REVIEW_SEQ_NEXT_VAL")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Long id;
+	
+	@Embedded
+	private AuditSection audit = new AuditSection();
+	
+	@Column(name = "REVIEWS_RATING")
+	private Double reviewRating;
+	
+	@Column(name = "REVIEWS_READ")
+	private Long reviewRead;
+	
+	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name = "REVIEW_DATE")
+	private Date reviewDate;
+	
+	@Column(name = "STATUS")
+	private Integer status;
+
+	@ManyToOne
+	@JoinColumn(name="CUSTOMERS_ID")
+	private Customer customer;
+	
+	@OneToOne
+	@JoinColumn(name="PRODUCT_ID")
+	private Product product;
+
+	@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, mappedBy = "productReview")
+	private Set<ProductReviewDescription> descriptions = new HashSet<ProductReviewDescription>();
+	
+	public ProductReview() {
+	}
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Double getReviewRating() {
+		return reviewRating;
+	}
+
+	public void setReviewRating(Double reviewRating) {
+		this.reviewRating = reviewRating;
+	}
+
+	public Long getReviewRead() {
+		return reviewRead;
+	}
+
+	public void setReviewRead(Long reviewRead) {
+		this.reviewRead = reviewRead;
+	}
+
+	public Integer getStatus() {
+		return status;
+	}
+
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+
+	public Customer getCustomer() {
+		return customer;
+	}
+
+	public void setCustomer(Customer customer) {
+		this.customer = customer;
+	}
+
+	public Product getProduct() {
+		return product;
+	}
+
+	public void setProduct(Product product) {
+		this.product = product;
+	}
+
+	public Set<ProductReviewDescription> getDescriptions() {
+		return descriptions;
+	}
+
+	public void setDescriptions(Set<ProductReviewDescription> descriptions) {
+		this.descriptions = descriptions;
+	}
+	
+	@Override
+	public AuditSection getAuditSection() {
+		return audit;
+	}
+	
+	@Override
+	public void setAuditSection(AuditSection audit) {
+		this.audit = audit;
+	}
+	
+	public Date getReviewDate() {
+		return reviewDate;
+	}
+
+	public void setReviewDate(Date reviewDate) {
+		this.reviewDate = reviewDate;
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/review/ProductReviewDescription.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/review/ProductReviewDescription.java
new file mode 100644
index 0000000..4ba872b
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/review/ProductReviewDescription.java
@@ -0,0 +1,56 @@
+/*
+ * Licensed to csti consulting 
+ * You may obtain a copy of the License at
+ *
+ * http://www.csticonsulting.com
+ * Copyright (c) 2006-Aug 24, 2010 Consultation CS-TI inc. 
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.salesmanager.core.business.catalog.product.model.review;
+
+import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
+
+import com.salesmanager.core.business.common.model.Description;
+import com.salesmanager.core.business.reference.language.model.Language;
+import com.salesmanager.core.constants.SchemaConstant;
+
+@Entity
+@Table(name = "PRODUCT_REVIEW_DESCRIPTION", schema = SchemaConstant.SALESMANAGER_SCHEMA, uniqueConstraints={
+	@UniqueConstraint(columnNames={
+		"PRODUCT_REVIEW_ID",
+		"LANGUAGE_ID"
+	})
+})
+public class ProductReviewDescription extends Description {
+	private static final long serialVersionUID = -1957502640742695406L;
+
+	@ManyToOne(targetEntity = ProductReview.class)
+	@JoinColumn(name="PRODUCT_REVIEW_ID")
+	private ProductReview productReview;
+
+	public ProductReviewDescription() {
+	}
+
+	public ProductReviewDescription(Language language, String name) {
+		this.setLanguage(language);
+		this.setName(name);
+	}
+
+	public ProductReview getProductReview() {
+		return productReview;
+	}
+
+	public void setProductReview(ProductReview productReview) {
+		this.productReview = productReview;
+	}
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/type/ProductType.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/type/ProductType.java
new file mode 100644
index 0000000..018b824
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/model/type/ProductType.java
@@ -0,0 +1,84 @@
+package com.salesmanager.core.business.catalog.product.model.type;
+
+import javax.persistence.Column;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+
+
+import com.salesmanager.core.business.common.model.audit.AuditListener;
+import com.salesmanager.core.business.common.model.audit.AuditSection;
+import com.salesmanager.core.business.common.model.audit.Auditable;
+
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.constants.SchemaConstant;
+
+@Entity
+@EntityListeners(value = AuditListener.class)
+@Table(name = "PRODUCT_TYPE", schema=SchemaConstant.SALESMANAGER_SCHEMA)
+public class ProductType extends SalesManagerEntity<Long, ProductType> implements Auditable {
+	private static final long serialVersionUID = 65541494628227593L;
+	
+	public final static String GENERAL_TYPE = "GENERAL";
+	
+	@Id
+	@Column(name = "PRODUCT_TYPE_ID", unique=true, nullable=false)
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT", pkColumnValue = "PRD_TYPE_SEQ_NEXT_VAL")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Long id;
+	
+	@Embedded
+	private AuditSection auditSection = new AuditSection();
+	
+	@Column(name = "PRD_TYPE_CODE")
+	private String code;
+	
+	@Column(name = "PRD_TYPE_ADD_TO_CART")
+	private Boolean allowAddToCart;
+	
+	public ProductType() {
+	}
+	
+	@Override
+	public Long getId() {
+		return id;
+	}
+
+	@Override
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	@Override
+	public AuditSection getAuditSection() {
+		return auditSection;
+	}
+
+	@Override
+	public void setAuditSection(AuditSection auditSection) {
+		this.auditSection = auditSection;
+	}
+
+	public boolean isAllowAddToCart() {
+		return allowAddToCart;
+	}
+
+	public void setAllowAddToCart(boolean allowAddToCart) {
+		this.allowAddToCart = allowAddToCart;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/attribute/ProductAttributeService.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/attribute/ProductAttributeService.java
new file mode 100644
index 0000000..4e492d6
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/attribute/ProductAttributeService.java
@@ -0,0 +1,29 @@
+package com.salesmanager.core.business.catalog.product.service.attribute;
+
+import java.util.List;
+
+import com.salesmanager.core.business.catalog.product.model.Product;
+import com.salesmanager.core.business.catalog.product.model.attribute.ProductAttribute;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityService;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+public interface ProductAttributeService extends
+		SalesManagerEntityService<Long, ProductAttribute> {
+
+	void saveOrUpdate(ProductAttribute productAttribute)
+			throws ServiceException;
+	
+	List<ProductAttribute> getByOptionId(MerchantStore store,
+			Long id) throws ServiceException;
+
+	List<ProductAttribute> getByOptionValueId(MerchantStore store,
+			Long id) throws ServiceException;
+
+	List<ProductAttribute> getByProductId(MerchantStore store, Product product, Language language)
+			throws ServiceException;
+
+	List<ProductAttribute> getByAttributeIds(MerchantStore store, List<Long> ids)
+			throws ServiceException;
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/attribute/ProductAttributeServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/attribute/ProductAttributeServiceImpl.java
new file mode 100644
index 0000000..ebf245e
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/attribute/ProductAttributeServiceImpl.java
@@ -0,0 +1,92 @@
+package com.salesmanager.core.business.catalog.product.service.attribute;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.salesmanager.core.business.catalog.product.dao.attribute.ProductAttributeDao;
+import com.salesmanager.core.business.catalog.product.model.Product;
+import com.salesmanager.core.business.catalog.product.model.attribute.ProductAttribute;
+import com.salesmanager.core.business.catalog.product.model.price.ProductPrice;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityServiceImpl;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+@Service("productAttributeService")
+public class ProductAttributeServiceImpl extends
+		SalesManagerEntityServiceImpl<Long, ProductAttribute> implements ProductAttributeService {
+	
+	private ProductAttributeDao productAttributeDao;
+
+	@Autowired
+	public ProductAttributeServiceImpl(ProductAttributeDao productAttributeDao) {
+		super(productAttributeDao);
+		this.productAttributeDao = productAttributeDao;
+	}
+	
+	@Override
+	public ProductAttribute getById(Long id) {
+		
+		return productAttributeDao.getById(id);
+		
+	}
+	
+	
+	@Override
+	public List<ProductAttribute> getByOptionId(MerchantStore store,
+			Long id) throws ServiceException {
+		
+		return productAttributeDao.getByOptionId(store, id);
+		
+	}
+	
+	@Override
+	public List<ProductAttribute> getByAttributeIds(MerchantStore store,
+			List<Long> ids) throws ServiceException {
+		
+		return productAttributeDao.getByAttributeIds(store, ids);
+		
+	}
+	
+	@Override
+	public List<ProductAttribute> getByOptionValueId(MerchantStore store,
+			Long id) throws ServiceException {
+		
+		return productAttributeDao.getByOptionValueId(store, id);
+		
+	}
+	
+	/**
+	 * Returns all product attributes
+	 */
+	@Override
+	public List<ProductAttribute> getByProductId(MerchantStore store,
+			Product product, Language language) throws ServiceException {
+		return productAttributeDao.getByProduct(store, product, language);
+		
+	}
+
+
+	@Override
+	public void saveOrUpdate(ProductAttribute productAttribute)
+			throws ServiceException {
+		if(productAttribute.getId()!=null && productAttribute.getId()>0) {
+			productAttributeDao.update(productAttribute);
+		} else {
+			productAttributeDao.save(productAttribute);
+		}
+		
+	}
+	
+	@Override
+	public void delete(ProductAttribute attribute) throws ServiceException {
+		
+		//override method, this allows the error that we try to remove a detached instance
+		attribute = this.getById(attribute.getId());
+		super.delete(attribute);
+		
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/attribute/ProductOptionService.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/attribute/ProductOptionService.java
new file mode 100644
index 0000000..a0f709c
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/attribute/ProductOptionService.java
@@ -0,0 +1,32 @@
+package com.salesmanager.core.business.catalog.product.service.attribute;
+
+import java.util.List;
+
+import com.salesmanager.core.business.catalog.product.model.attribute.ProductOption;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityService;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+public interface ProductOptionService extends SalesManagerEntityService<Long, ProductOption> {
+
+	List<ProductOption> listByStore(MerchantStore store, Language language)
+			throws ServiceException;
+
+
+	List<ProductOption> getByName(MerchantStore store, String name,
+			Language language) throws ServiceException;
+
+	void saveOrUpdate(ProductOption entity) throws ServiceException;
+
+
+	List<ProductOption> listReadOnly(MerchantStore store, Language language)
+			throws ServiceException;
+
+
+	ProductOption getByCode(MerchantStore store, String optionCode);
+	
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/attribute/ProductOptionServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/attribute/ProductOptionServiceImpl.java
new file mode 100644
index 0000000..4fe12d7
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/attribute/ProductOptionServiceImpl.java
@@ -0,0 +1,105 @@
+package com.salesmanager.core.business.catalog.product.service.attribute;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.salesmanager.core.business.catalog.product.dao.attribute.ProductOptionDao;
+import com.salesmanager.core.business.catalog.product.model.attribute.ProductAttribute;
+import com.salesmanager.core.business.catalog.product.model.attribute.ProductOption;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityServiceImpl;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+@Service("productOptionService")
+public class ProductOptionServiceImpl extends
+		SalesManagerEntityServiceImpl<Long, ProductOption> implements ProductOptionService {
+
+	
+	private ProductOptionDao productOptionDao;
+	
+	@Autowired
+	private ProductAttributeService productAttributeService;
+	
+	@Autowired
+	public ProductOptionServiceImpl(
+			ProductOptionDao productOptionDao) {
+			super(productOptionDao);
+			this.productOptionDao = productOptionDao;
+	}
+	
+	@Override
+	public List<ProductOption> listByStore(MerchantStore store, Language language) throws ServiceException {
+		
+		
+		return productOptionDao.listByStore(store, language);
+		
+		
+	}
+	
+	@Override
+	public List<ProductOption> listReadOnly(MerchantStore store, Language language) throws ServiceException {
+
+		return productOptionDao.getReadOnly(store, language);
+		
+		
+	}
+	
+
+	
+	@Override
+	public List<ProductOption> getByName(MerchantStore store, String name, Language language) throws ServiceException {
+		
+		try {
+			return productOptionDao.getByName(store, name, language);
+		} catch (Exception e) {
+			throw new ServiceException(e);
+		}
+		
+		
+	}
+	
+	@Override
+	public void saveOrUpdate(ProductOption entity) throws ServiceException {
+		
+		
+		//save or update (persist and attach entities
+		if(entity.getId()!=null && entity.getId()>0) {
+			super.update(entity);
+		} else {
+			super.save(entity);
+		}
+		
+	}
+	
+	@Override
+	public void delete(ProductOption entity) throws ServiceException {
+		
+		//remove all attributes having this option
+		List<ProductAttribute> attributes = productAttributeService.getByOptionId(entity.getMerchantStore(), entity.getId());
+		
+		for(ProductAttribute attribute : attributes) {
+			productAttributeService.delete(attribute);
+		}
+		
+		ProductOption option = this.getById(entity.getId());
+		
+		//remove option
+		super.delete(option);
+		
+	}
+	
+	@Override
+	public ProductOption getByCode(MerchantStore store, String optionCode) {
+		return productOptionDao.getByCode(store, optionCode);
+	}
+	
+
+	
+
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/attribute/ProductOptionValueService.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/attribute/ProductOptionValueService.java
new file mode 100644
index 0000000..4a2854d
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/attribute/ProductOptionValueService.java
@@ -0,0 +1,29 @@
+package com.salesmanager.core.business.catalog.product.service.attribute;
+
+import java.util.List;
+
+import com.salesmanager.core.business.catalog.product.model.attribute.ProductOptionValue;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityService;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+public interface ProductOptionValueService extends SalesManagerEntityService<Long, ProductOptionValue> {
+
+	void saveOrUpdate(ProductOptionValue entity) throws ServiceException;
+
+	List<ProductOptionValue> getByName(MerchantStore store, String name,
+			Language language) throws ServiceException;
+
+	ProductOptionValue getById(MerchantStore store, Long id)
+			throws ServiceException;
+
+	List<ProductOptionValue> listByStore(MerchantStore store, Language language)
+			throws ServiceException;
+
+	List<ProductOptionValue> listByStoreNoReadOnly(MerchantStore store,
+			Language language) throws ServiceException;
+
+	ProductOptionValue getByCode(MerchantStore store, String optionValueCode);
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/attribute/ProductOptionValueServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/attribute/ProductOptionValueServiceImpl.java
new file mode 100644
index 0000000..1830556
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/attribute/ProductOptionValueServiceImpl.java
@@ -0,0 +1,110 @@
+package com.salesmanager.core.business.catalog.product.service.attribute;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.salesmanager.core.business.catalog.product.dao.attribute.ProductOptionValueDao;
+import com.salesmanager.core.business.catalog.product.model.attribute.ProductAttribute;
+import com.salesmanager.core.business.catalog.product.model.attribute.ProductOptionValue;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityServiceImpl;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+@Service("productOptionValueService")
+public class ProductOptionValueServiceImpl extends
+		SalesManagerEntityServiceImpl<Long, ProductOptionValue> implements
+		ProductOptionValueService {
+
+	@Autowired
+	private ProductAttributeService productAttributeService;
+	
+	private ProductOptionValueDao productOptionValueDao;
+	
+	@Autowired
+	public ProductOptionValueServiceImpl(
+			ProductOptionValueDao productOptionValueDao) {
+			super(productOptionValueDao);
+			this.productOptionValueDao = productOptionValueDao;
+	}
+	
+	
+	@Override
+	public List<ProductOptionValue> listByStore(MerchantStore store, Language language) throws ServiceException {
+		
+		return productOptionValueDao.listByStore(store, language);
+	}
+	
+	@Override
+	public List<ProductOptionValue> listByStoreNoReadOnly(MerchantStore store, Language language) throws ServiceException {
+		
+		return productOptionValueDao.listByStoreNoReadOnly(store, language);
+	}
+	
+	@Override
+	public ProductOptionValue getById(MerchantStore store, Long id) throws ServiceException {
+		
+		try {
+			return productOptionValueDao.getById(store, id);
+		} catch (Exception e) {
+			throw new ServiceException(e);
+		}
+		
+	}
+	
+	@Override
+	public List<ProductOptionValue> getByName(MerchantStore store, String name, Language language) throws ServiceException {
+		
+		try {
+			return productOptionValueDao.getByName(store, name, language);
+		} catch (Exception e) {
+			throw new ServiceException(e);
+		}
+		
+		
+	}
+	
+	@Override
+	public void saveOrUpdate(ProductOptionValue entity) throws ServiceException {
+		
+		
+		//save or update (persist and attach entities
+		if(entity.getId()!=null && entity.getId()>0) {
+
+			super.update(entity);
+			
+		} else {
+			
+			super.save(entity);
+			
+		}
+		
+	}
+	
+	
+	public void delete(ProductOptionValue entity) throws ServiceException {
+		
+		//remove all attributes having this option
+		List<ProductAttribute> attributes = productAttributeService.getByOptionValueId(entity.getMerchantStore(), entity.getId());
+		
+		for(ProductAttribute attribute : attributes) {
+			productAttributeService.delete(attribute);
+		}
+		
+		ProductOptionValue option = this.getById(entity.getMerchantStore(), entity.getId());
+		
+		//remove option
+		super.delete(option);
+		
+	}
+	
+	@Override
+	public ProductOptionValue getByCode(MerchantStore store, String optionValueCode) {
+		return productOptionValueDao.getByCode(store, optionValueCode);
+	}
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/availability/ProductAvailabilityService.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/availability/ProductAvailabilityService.java
new file mode 100644
index 0000000..cf9dbeb
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/availability/ProductAvailabilityService.java
@@ -0,0 +1,12 @@
+package com.salesmanager.core.business.catalog.product.service.availability;
+
+import com.salesmanager.core.business.catalog.product.model.availability.ProductAvailability;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityService;
+
+public interface ProductAvailabilityService extends
+		SalesManagerEntityService<Long, ProductAvailability> {
+
+	void saveOrUpdate(ProductAvailability availability) throws ServiceException;
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/availability/ProductAvailabilityServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/availability/ProductAvailabilityServiceImpl.java
new file mode 100644
index 0000000..7d693fd
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/availability/ProductAvailabilityServiceImpl.java
@@ -0,0 +1,42 @@
+package com.salesmanager.core.business.catalog.product.service.availability;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.salesmanager.core.business.catalog.product.dao.availability.ProductAvailabilityDao;
+import com.salesmanager.core.business.catalog.product.model.availability.ProductAvailability;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityServiceImpl;
+
+@Service("productAvailabilityService")
+public class ProductAvailabilityServiceImpl extends
+		SalesManagerEntityServiceImpl<Long, ProductAvailability> implements
+		ProductAvailabilityService {
+
+	
+	private ProductAvailabilityDao productAvailabilityDao;
+	
+	@Autowired
+	public ProductAvailabilityServiceImpl(
+			ProductAvailabilityDao productAvailabilityDao) {
+			super(productAvailabilityDao);
+			this.productAvailabilityDao = productAvailabilityDao;
+	}
+	
+	
+	@Override
+	public void saveOrUpdate(ProductAvailability availability) throws ServiceException {
+		
+		if(availability.getId()!=null && availability.getId()>0) {
+			
+			this.update(availability);
+			
+		} else {
+			this.create(availability);
+		}
+		
+	}
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/file/DigitalProductService.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/file/DigitalProductService.java
new file mode 100644
index 0000000..5deb29b
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/file/DigitalProductService.java
@@ -0,0 +1,24 @@
+package com.salesmanager.core.business.catalog.product.service.file;
+
+import com.salesmanager.core.business.catalog.product.model.Product;
+import com.salesmanager.core.business.catalog.product.model.file.DigitalProduct;
+import com.salesmanager.core.business.content.model.InputContentFile;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityService;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+
+
+public interface DigitalProductService extends SalesManagerEntityService<Long, DigitalProduct> {
+
+	void saveOrUpdate(DigitalProduct digitalProduct) throws ServiceException;
+
+	void addProductFile(Product product, DigitalProduct digitalProduct,
+			InputContentFile inputFile) throws ServiceException;
+
+
+
+	DigitalProduct getByProduct(MerchantStore store, Product product)
+			throws ServiceException;
+
+	
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/file/DigitalProductServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/file/DigitalProductServiceImpl.java
new file mode 100644
index 0000000..684bc6c
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/file/DigitalProductServiceImpl.java
@@ -0,0 +1,110 @@
+package com.salesmanager.core.business.catalog.product.service.file;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.Assert;
+
+import com.salesmanager.core.business.catalog.product.dao.file.DigitalProductDao;
+import com.salesmanager.core.business.catalog.product.model.Product;
+import com.salesmanager.core.business.catalog.product.model.file.DigitalProduct;
+import com.salesmanager.core.business.catalog.product.service.ProductService;
+import com.salesmanager.core.business.content.model.FileContentType;
+import com.salesmanager.core.business.content.model.InputContentFile;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityServiceImpl;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.modules.cms.content.StaticContentFileManager;
+
+@Service("digitalProductService")
+public class DigitalProductServiceImpl extends SalesManagerEntityServiceImpl<Long, DigitalProduct> 
+	implements DigitalProductService {
+	
+
+	private DigitalProductDao digitalProductDao;
+	
+    @Autowired
+    StaticContentFileManager productDownloadsFileManager;
+    
+    @Autowired
+    ProductService productService;
+
+	@Autowired
+	public DigitalProductServiceImpl(DigitalProductDao digitalProductDao) {
+		super(digitalProductDao);
+		this.digitalProductDao = digitalProductDao;
+	}
+	
+	@Override
+	public void addProductFile(Product product, DigitalProduct digitalProduct, InputContentFile inputFile) throws ServiceException {
+	
+		Assert.notNull(digitalProduct,"DigitalProduct cannot be null");
+		Assert.notNull(product,"Product cannot be null");
+		digitalProduct.setProduct(product);
+
+		try {
+			
+			Assert.notNull(inputFile.getFile(),"InputContentFile.file cannot be null");
+			
+			Assert.notNull(product.getMerchantStore(),"Product.merchantStore cannot be null");
+			this.saveOrUpdate(digitalProduct);
+			
+			productDownloadsFileManager.addFile(product.getMerchantStore().getCode(), inputFile);
+			
+			product.setProductVirtual(true);
+			productService.update(product);
+		
+		} catch (Exception e) {
+			throw new ServiceException(e);
+		} finally {
+			try {
+
+				if(inputFile.getFile()!=null) {
+					inputFile.getFile().close();
+				}
+
+			} catch(Exception ignore) {}
+		}
+		
+		
+	}
+	
+	@Override
+	public DigitalProduct getByProduct(MerchantStore store, Product product) throws ServiceException {
+		return digitalProductDao.getByProduct(store, product);
+	}
+	
+	@Override
+	public void delete(DigitalProduct digitalProduct) throws ServiceException {
+		
+		Assert.notNull(digitalProduct,"DigitalProduct cannot be null");
+		Assert.notNull(digitalProduct.getProduct(),"DigitalProduct.product cannot be null");
+		//refresh file
+		digitalProduct = this.getById(digitalProduct.getId());
+		super.delete(digitalProduct);
+		productDownloadsFileManager.removeFile(digitalProduct.getProduct().getMerchantStore().getCode(), FileContentType.PRODUCT, digitalProduct.getProductFileName());
+		digitalProduct.getProduct().setProductVirtual(false);
+		productService.update(digitalProduct.getProduct());
+	}
+	
+	
+	@Override
+	public void saveOrUpdate(DigitalProduct digitalProduct) throws ServiceException {
+		
+		Assert.notNull(digitalProduct,"DigitalProduct cannot be null");
+		Assert.notNull(digitalProduct.getProduct(),"DigitalProduct.product cannot be null");
+		if(digitalProduct.getId()==null || digitalProduct.getId().longValue()==0) {
+			super.save(digitalProduct);
+		} else {
+			super.create(digitalProduct);
+		}
+		
+		digitalProduct.getProduct().setProductVirtual(true);
+		productService.update(digitalProduct.getProduct());
+		
+		
+	}
+	
+
+	
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/image/ProductImageService.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/image/ProductImageService.java
new file mode 100644
index 0000000..877f831
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/image/ProductImageService.java
@@ -0,0 +1,66 @@
+package com.salesmanager.core.business.catalog.product.service.image;
+
+import java.util.List;
+
+import com.salesmanager.core.business.catalog.product.model.Product;
+import com.salesmanager.core.business.catalog.product.model.file.ProductImageSize;
+import com.salesmanager.core.business.catalog.product.model.image.ProductImage;
+import com.salesmanager.core.business.content.model.ImageContentFile;
+import com.salesmanager.core.business.content.model.OutputContentFile;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityService;
+
+
+public interface ProductImageService extends SalesManagerEntityService<Long, ProductImage> {
+	
+	
+	
+	/**
+	 * Add a ProductImage to the persistence and an entry to the CMS
+	 * @param product
+	 * @param productImage
+	 * @param file
+	 * @throws ServiceException
+	 */
+	void addProductImage(Product product, ProductImage productImage, ImageContentFile inputImage)
+			throws ServiceException;
+
+	/**
+	 * Get the image ByteArrayOutputStream and content description from CMS
+	 * @param productImage
+	 * @return
+	 * @throws ServiceException
+	 */
+	OutputContentFile getProductImage(ProductImage productImage, ProductImageSize size)
+			throws ServiceException;
+
+	/**
+	 * Returns all Images for a given product
+	 * @param product
+	 * @return
+	 * @throws ServiceException
+	 */
+	List<OutputContentFile> getProductImages(Product product)
+			throws ServiceException;
+
+	void removeProductImage(ProductImage productImage) throws ServiceException;
+
+	void saveOrUpdate(ProductImage productImage) throws ServiceException;
+
+	/**
+	 * Returns an image file from required identifier. This method is
+	 * used by the image servlet
+	 * @param store
+	 * @param product
+	 * @param fileName
+	 * @param size
+	 * @return
+	 * @throws ServiceException
+	 */
+	OutputContentFile getProductImage(String storeCode, String productCode,
+			String fileName, final ProductImageSize size) throws ServiceException;
+
+	void addProductImages(Product product, List<ProductImage> productImages)
+			throws ServiceException;
+	
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/image/ProductImageServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/image/ProductImageServiceImpl.java
new file mode 100644
index 0000000..9b29ef7
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/image/ProductImageServiceImpl.java
@@ -0,0 +1,206 @@
+package com.salesmanager.core.business.catalog.product.service.image;
+
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.Assert;
+
+import com.salesmanager.core.business.catalog.product.dao.image.ProductImageDao;
+import com.salesmanager.core.business.catalog.product.model.Product;
+import com.salesmanager.core.business.catalog.product.model.file.ProductImageSize;
+import com.salesmanager.core.business.catalog.product.model.image.ProductImage;
+import com.salesmanager.core.business.catalog.product.model.image.ProductImageDescription;
+import com.salesmanager.core.business.content.model.FileContentType;
+import com.salesmanager.core.business.content.model.ImageContentFile;
+import com.salesmanager.core.business.content.model.OutputContentFile;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityServiceImpl;
+import com.salesmanager.core.modules.cms.product.ProductFileManager;
+
+@Service("productImage")
+public class ProductImageServiceImpl extends SalesManagerEntityServiceImpl<Long, ProductImage> 
+	implements ProductImageService {
+	
+	private ProductImageDao productImageDao;
+
+	@Autowired
+	public ProductImageServiceImpl(ProductImageDao productImageDao) {
+		super(productImageDao);
+		this.productImageDao = productImageDao;
+	}
+	
+	@Autowired
+	private ProductFileManager productFileManager;
+	
+
+	
+	
+	public ProductImage getById(Long id) {
+		
+		
+		return productImageDao.getProductImageById(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);			
+			}
+		
+		} 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");
+
+
+			
+			productFileManager.addProductImage(productImage, inputImage);
+	
+			//insert ProductImage
+			this.saveOrUpdate(productImage);
+			
+
+		
+		} catch (Exception e) {
+			throw new ServiceException(e);
+		} finally {
+			try {
+				
+				//if(inputImage.getBufferedImage()!=null){
+				//	inputImage.getBufferedImage().flush();
+				//}
+				
+				if(inputImage.getFile()!=null) {
+					inputImage.getFile().close();
+				}
+
+			} catch(Exception ignore) {
+				
+			}
+		}
+		
+		
+	}
+	
+	@Override
+	public void saveOrUpdate(ProductImage productImage) throws ServiceException {
+		
+		
+		//save or update (persist and attach entities
+		if(productImage.getId()!=null && productImage.getId()>0) {
+
+			super.update(productImage);
+			
+		} else {
+			
+			List<ProductImageDescription> descriptions = productImage.getDescriptions();
+			productImage.setDescriptions(null);
+			super.save(productImage);
+			
+			if(descriptions!=null && descriptions.size()>0) {
+				for(ProductImageDescription description : descriptions) {
+					this.addProductImageDescription(productImage, description);
+				}
+			}
+			
+		}
+		
+	}
+	
+	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());
+		
+		OutputContentFile outputImage = productFileManager.getProductImage(pi);
+		
+		return outputImage;
+		
+	}
+	
+	@Override
+	public OutputContentFile getProductImage(final String storeCode, final String productCode, final String fileName, final ProductImageSize size) throws ServiceException {
+		OutputContentFile outputImage = productFileManager.getProductImage(storeCode, productCode, fileName, size);
+		return outputImage;
+		
+	}
+	
+	@Override
+	public List<OutputContentFile> getProductImages(Product product) throws ServiceException {
+		return productFileManager.getImages(product);
+	}
+	
+	@Override
+	public void removeProductImage(ProductImage productImage) throws ServiceException {
+
+		productFileManager.removeProductImage(productImage);
+		
+		ProductImage p = this.getById(productImage.getId());
+		
+		
+		this.delete(p);
+		
+	}
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/manufacturer/ManufacturerService.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/manufacturer/ManufacturerService.java
new file mode 100644
index 0000000..be7c120
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/manufacturer/ManufacturerService.java
@@ -0,0 +1,38 @@
+package com.salesmanager.core.business.catalog.product.service.manufacturer;
+
+import java.util.List;
+
+import com.salesmanager.core.business.catalog.product.model.manufacturer.Manufacturer;
+import com.salesmanager.core.business.catalog.product.model.manufacturer.ManufacturerDescription;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityService;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+public interface ManufacturerService extends SalesManagerEntityService<Long, Manufacturer> {
+
+	List<Manufacturer> listByStore(MerchantStore store, Language language)
+			throws ServiceException;
+
+	List<Manufacturer> listByStore(MerchantStore store) throws ServiceException;
+
+	void saveOrUpdate(Manufacturer manufacturer) throws ServiceException;
+	
+	void addManufacturerDescription(Manufacturer manufacturer, ManufacturerDescription description) throws ServiceException;
+	
+	int getCountManufAttachedProducts( Manufacturer manufacturer )  throws ServiceException;
+	
+	void delete(Manufacturer manufacturer) throws ServiceException;
+
+	/**
+	 * List manufacturers by products from a given list of categories
+	 * @param store
+	 * @param ids
+	 * @param language
+	 * @return
+	 * @throws ServiceException
+	 */
+	List<Manufacturer> listByProductsByCategoriesId(MerchantStore store,
+			List<Long> ids, Language language) throws ServiceException;
+	
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/manufacturer/ManufacturerServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/manufacturer/ManufacturerServiceImpl.java
new file mode 100644
index 0000000..77a1905
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/manufacturer/ManufacturerServiceImpl.java
@@ -0,0 +1,98 @@
+package com.salesmanager.core.business.catalog.product.service.manufacturer;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.salesmanager.core.business.catalog.product.dao.manufacturer.ManufacturerDao;
+import com.salesmanager.core.business.catalog.product.model.Product;
+import com.salesmanager.core.business.catalog.product.model.description.ProductDescription;
+import com.salesmanager.core.business.catalog.product.model.manufacturer.Manufacturer;
+import com.salesmanager.core.business.catalog.product.model.manufacturer.ManufacturerDescription;
+import com.salesmanager.core.business.customer.model.Customer;
+import com.salesmanager.core.business.customer.service.CustomerServiceImpl;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityServiceImpl;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.language.model.Language;
+import com.salesmanager.core.business.search.service.SearchService;
+
+
+
+@Service("manufacturerService")
+public class ManufacturerServiceImpl extends
+		SalesManagerEntityServiceImpl<Long, Manufacturer> implements ManufacturerService {
+
+	@Autowired
+	SearchService searchService;
+	
+	private static final Logger LOGGER = LoggerFactory.getLogger(ManufacturerServiceImpl.class);
+	private ManufacturerDao manufacturerDao;
+	
+	@Autowired
+	public ManufacturerServiceImpl(
+		ManufacturerDao manufacturerDao) {
+		super(manufacturerDao);
+		this.manufacturerDao = manufacturerDao;		
+	}
+	
+	@Override 
+	public void delete(Manufacturer manufacturer) throws ServiceException{
+		manufacturer =  this.getById(manufacturer.getId() );
+		super.delete( manufacturer );
+	}
+	
+	@Override
+	public int getCountManufAttachedProducts( Manufacturer manufacturer ) throws ServiceException {
+		return manufacturerDao.getCountManufAttachedProducts( manufacturer );
+	}
+	
+	
+	@Override
+	public List<Manufacturer> listByStore(MerchantStore store, Language language) throws ServiceException {
+		return manufacturerDao.listByStore(store, language);
+	}
+	
+	@Override
+	public List<Manufacturer> listByStore(MerchantStore store) throws ServiceException {
+		return manufacturerDao.listByStore(store);
+	}
+	
+	@Override
+	public List<Manufacturer> listByProductsByCategoriesId(MerchantStore store, List<Long> ids, Language language) throws ServiceException {
+		return manufacturerDao.listByProductsByCategoriesId(store, ids, language);
+	}
+
+	@Override
+	public void addManufacturerDescription(Manufacturer manufacturer, ManufacturerDescription description)
+			throws ServiceException {
+		
+		
+		if(manufacturer.getDescriptions()==null) {
+			manufacturer.setDescriptions(new HashSet<ManufacturerDescription>());
+		}
+		
+		manufacturer.getDescriptions().add(description);
+		description.setManufacturer(manufacturer);
+		update(manufacturer);
+	}
+	
+	@Override	
+	public void saveOrUpdate(Manufacturer manufacturer) throws ServiceException {
+
+		LOGGER.debug("Creating Manufacturer");
+		
+		if(manufacturer.getId()!=null && manufacturer.getId()>0) {
+		   super.update(manufacturer);  
+			
+		} else {						
+		   super.create(manufacturer);
+
+		}
+	}
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/price/ProductPriceService.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/price/ProductPriceService.java
new file mode 100644
index 0000000..ff00729
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/price/ProductPriceService.java
@@ -0,0 +1,15 @@
+package com.salesmanager.core.business.catalog.product.service.price;
+
+import com.salesmanager.core.business.catalog.product.model.price.ProductPrice;
+import com.salesmanager.core.business.catalog.product.model.price.ProductPriceDescription;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityService;
+
+public interface ProductPriceService extends SalesManagerEntityService<Long, ProductPrice> {
+
+	void addDescription(ProductPrice price, ProductPriceDescription description) throws ServiceException;
+
+	void saveOrUpdate(ProductPrice price) throws ServiceException;
+	
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/price/ProductPriceServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/price/ProductPriceServiceImpl.java
new file mode 100644
index 0000000..5752204
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/price/ProductPriceServiceImpl.java
@@ -0,0 +1,65 @@
+package com.salesmanager.core.business.catalog.product.service.price;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.salesmanager.core.business.catalog.product.dao.price.ProductPriceDao;
+import com.salesmanager.core.business.catalog.product.model.price.ProductPrice;
+import com.salesmanager.core.business.catalog.product.model.price.ProductPriceDescription;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityServiceImpl;
+
+@Service("productPrice")
+public class ProductPriceServiceImpl extends SalesManagerEntityServiceImpl<Long, ProductPrice> 
+	implements ProductPriceService {
+
+	@Autowired
+	public ProductPriceServiceImpl(ProductPriceDao productPriceDao) {
+		super(productPriceDao);
+	}
+
+	@Override
+	public void addDescription(ProductPrice price,
+			ProductPriceDescription description) throws ServiceException {
+		price.getDescriptions().add(description);
+		//description.setPrice(price);
+		update(price);
+	}
+	
+	
+	@Override
+	public void saveOrUpdate(ProductPrice price) throws ServiceException {
+		
+		if(price.getId()!=null && price.getId()>0) {
+			this.update(price);
+		} else {
+			
+			Set<ProductPriceDescription> descriptions = price.getDescriptions();
+			price.setDescriptions(new HashSet<ProductPriceDescription>());
+			this.create(price);
+			for(ProductPriceDescription description : descriptions) {
+				description.setProductPrice(price);
+				this.addDescription(price, description);
+			}
+			
+		}
+		
+		
+		
+	}
+	
+	@Override
+	public void delete(ProductPrice price) throws ServiceException {
+		
+		//override method, this allows the error that we try to remove a detached instance
+		price = this.getById(price.getId());
+		super.delete(price);
+		
+	}
+	
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/PricingService.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/PricingService.java
new file mode 100644
index 0000000..8a5ff43
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/PricingService.java
@@ -0,0 +1,102 @@
+package com.salesmanager.core.business.catalog.product.service;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Locale;
+
+import com.salesmanager.core.business.catalog.product.model.Product;
+import com.salesmanager.core.business.catalog.product.model.attribute.ProductAttribute;
+import com.salesmanager.core.business.catalog.product.model.price.FinalPrice;
+import com.salesmanager.core.business.customer.model.Customer;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.currency.model.Currency;
+
+
+/**
+ * Services for Product item price calculation. 
+ * @author Carl Samson
+ *
+ */
+public interface PricingService {
+
+	/**
+	 * Calculates the FinalPrice of a Product taking into account
+	 * all defined prices and possible rebates
+	 * @param product
+	 * @return
+	 * @throws ServiceException
+	 */
+	FinalPrice calculateProductPrice(Product product) throws ServiceException;
+
+	/**
+	 * Calculates the FinalPrice of a Product taking into account
+	 * all defined prices and possible rebates. It also applies other calculation
+	 * based on the customer
+	 * @param product
+	 * @param customer
+	 * @return
+	 * @throws ServiceException
+	 */
+	FinalPrice calculateProductPrice(Product product, Customer customer)
+			throws ServiceException;
+
+	/**
+	 * Calculates the FinalPrice of a Product taking into account
+	 * all defined prices and possible rebates. This method should be used to calculate
+	 * any additional prices based on the default attributes or based on the user selected attributes.
+	 * @param product
+	 * @param attributes
+	 * @return
+	 * @throws ServiceException
+	 */
+	FinalPrice calculateProductPrice(Product product,
+			List<ProductAttribute> attributes) throws ServiceException;
+
+	/**
+	 * Calculates the FinalPrice of a Product taking into account
+	 * all defined prices and possible rebates. This method should be used to calculate
+	 * any additional prices based on the default attributes or based on the user selected attributes.
+	 * It also applies other calculation based on the customer
+	 * @param product
+	 * @param attributes
+	 * @param customer
+	 * @return
+	 * @throws ServiceException
+	 */
+	FinalPrice calculateProductPrice(Product product,
+			List<ProductAttribute> attributes, Customer customer)
+			throws ServiceException;
+
+	/**
+	 * Method to be used to print a displayable formated amount to the end user
+	 * @param amount
+	 * @param store
+	 * @return
+	 * @throws ServiceException
+	 */
+	String getDisplayAmount(BigDecimal amount, MerchantStore store)
+			throws ServiceException;
+	
+	/**
+	 * Method to be used when building an amount formatted with the appropriate currency
+	 * @param amount
+	 * @param locale
+	 * @param currency
+	 * @param store
+	 * @return
+	 * @throws ServiceException
+	 */
+	String getDisplayAmount(BigDecimal amount, Locale locale, Currency currency, MerchantStore store)
+			throws ServiceException;
+	
+	/**
+	 * String format of the money amount without currency symbol
+	 * @param amount
+	 * @param store
+	 * @return
+	 * @throws ServiceException
+	 */
+	String getStringAmount(BigDecimal amount, MerchantStore store)
+			throws ServiceException;
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/PricingServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/PricingServiceImpl.java
new file mode 100644
index 0000000..af8c787
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/PricingServiceImpl.java
@@ -0,0 +1,94 @@
+package com.salesmanager.core.business.catalog.product.service;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Locale;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.salesmanager.core.business.catalog.product.model.Product;
+import com.salesmanager.core.business.catalog.product.model.attribute.ProductAttribute;
+import com.salesmanager.core.business.catalog.product.model.price.FinalPrice;
+import com.salesmanager.core.business.customer.model.Customer;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.currency.model.Currency;
+import com.salesmanager.core.utils.ProductPriceUtils;
+
+/**
+ * Contains all the logic required to calculate product price
+ * @author Carl Samson
+ *
+ */
+@Service("pricingService")
+public class PricingServiceImpl implements PricingService {
+	
+	private static final Logger LOGGER = LoggerFactory.getLogger(PricingServiceImpl.class);
+	
+
+	@Autowired
+	private ProductPriceUtils priceUtil;
+	
+	@Override
+	public FinalPrice calculateProductPrice(Product product) throws ServiceException {
+		return priceUtil.getFinalPrice(product);
+	}
+	
+	@Override
+	public FinalPrice calculateProductPrice(Product product, Customer customer) throws ServiceException {
+		/** TODO add rules for price calculation **/
+		return priceUtil.getFinalPrice(product);
+	}
+	
+	@Override
+	public FinalPrice calculateProductPrice(Product product, List<ProductAttribute> attributes) throws ServiceException {
+		return priceUtil.getFinalProductPrice(product, attributes);
+	}
+	
+	@Override
+	public FinalPrice calculateProductPrice(Product product, List<ProductAttribute> attributes, Customer customer) throws ServiceException {
+		/** TODO add rules for price calculation **/
+		return priceUtil.getFinalProductPrice(product, attributes);
+	}
+
+	@Override
+	public String getDisplayAmount(BigDecimal amount, MerchantStore store) throws ServiceException {
+		try {
+			String price= priceUtil.getStoreFormatedAmountWithCurrency(store,amount);
+			return price;
+		} catch (Exception e) {
+			LOGGER.error("An error occured when trying to format an amount " + amount.toString());
+			throw new ServiceException(e);
+		}
+	}
+	
+	@Override
+	public String getDisplayAmount(BigDecimal amount, Locale locale,
+			Currency currency, MerchantStore store) throws ServiceException {
+		try {
+			String price= priceUtil.getFormatedAmountWithCurrency(locale, currency, amount);
+			return price;
+		} catch (Exception e) {
+			LOGGER.error("An error occured when trying to format an amunt " + amount.toString() + " using locale " + locale.toString() + " and currency " + currency.toString());
+			throw new ServiceException(e);
+		}
+	}
+
+	@Override
+	public String getStringAmount(BigDecimal amount, MerchantStore store)
+			throws ServiceException {
+		try {
+			String price = priceUtil.getAdminFormatedAmount(store, amount);
+			return price;
+		} catch (Exception e) {
+			LOGGER.error("An error occured when trying to format an amount " + amount.toString());
+			throw new ServiceException(e);
+		}
+	}
+
+
+	
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/ProductService.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/ProductService.java
new file mode 100644
index 0000000..f7f707f
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/ProductService.java
@@ -0,0 +1,58 @@
+package com.salesmanager.core.business.catalog.product.service;
+
+import java.util.List;
+import java.util.Locale;
+
+import com.salesmanager.core.business.catalog.category.model.Category;
+import com.salesmanager.core.business.catalog.product.model.Product;
+import com.salesmanager.core.business.catalog.product.model.ProductCriteria;
+import com.salesmanager.core.business.catalog.product.model.ProductList;
+import com.salesmanager.core.business.catalog.product.model.description.ProductDescription;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityService;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.language.model.Language;
+import com.salesmanager.core.business.tax.model.taxclass.TaxClass;
+
+
+
+public interface ProductService extends SalesManagerEntityService<Long, Product> {
+
+	void addProductDescription(Product product, ProductDescription description) throws ServiceException;
+	
+	ProductDescription getProductDescription(Product product, Language language);
+	
+	Product getProductForLocale(long productId, Language language, Locale locale) throws ServiceException;
+	
+	List<Product> getProductsForLocale(Category category, Language language, Locale locale) throws ServiceException;
+
+	List<Product> getProducts(List<Long> categoryIds) throws ServiceException;
+
+
+
+	ProductList listByStore(MerchantStore store, Language language,
+			ProductCriteria criteria);
+
+
+
+	void saveOrUpdate(Product product) throws ServiceException;
+
+	List<Product> listByStore(MerchantStore store);
+
+	List<Product> listByTaxClass(TaxClass taxClass);
+
+	List<Product> getProducts(List<Long> categoryIds, Language language)
+			throws ServiceException;
+
+	Product getBySeUrl(MerchantStore store, String seUrl, Locale locale);
+
+	/**
+	 * Get a product by sku (code) field  and the language
+	 * @param productCode
+	 * @param language
+	 * @return
+	 */
+	Product getByCode(String productCode, Language language);
+	
+}
+	

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/ProductServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/ProductServiceImpl.java
new file mode 100644
index 0000000..60cb6d5
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/ProductServiceImpl.java
@@ -0,0 +1,401 @@
+package com.salesmanager.core.business.catalog.product.service;
+
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
+
+import org.apache.commons.lang.Validate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.salesmanager.core.business.catalog.category.model.Category;
+import com.salesmanager.core.business.catalog.category.service.CategoryService;
+import com.salesmanager.core.business.catalog.common.CatalogServiceHelper;
+import com.salesmanager.core.business.catalog.product.dao.ProductDao;
+import com.salesmanager.core.business.catalog.product.model.Product;
+import com.salesmanager.core.business.catalog.product.model.ProductCriteria;
+import com.salesmanager.core.business.catalog.product.model.ProductList;
+import com.salesmanager.core.business.catalog.product.model.attribute.ProductAttribute;
+import com.salesmanager.core.business.catalog.product.model.availability.ProductAvailability;
+import com.salesmanager.core.business.catalog.product.model.description.ProductDescription;
+import com.salesmanager.core.business.catalog.product.model.image.ProductImage;
+import com.salesmanager.core.business.catalog.product.model.price.ProductPrice;
+import com.salesmanager.core.business.catalog.product.model.relationship.ProductRelationship;
+import com.salesmanager.core.business.catalog.product.service.attribute.ProductAttributeService;
+import com.salesmanager.core.business.catalog.product.service.availability.ProductAvailabilityService;
+import com.salesmanager.core.business.catalog.product.service.image.ProductImageService;
+import com.salesmanager.core.business.catalog.product.service.price.ProductPriceService;
+import com.salesmanager.core.business.catalog.product.service.relationship.ProductRelationshipService;
+import com.salesmanager.core.business.content.model.FileContentType;
+import com.salesmanager.core.business.content.model.ImageContentFile;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityServiceImpl;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.language.model.Language;
+import com.salesmanager.core.business.search.service.SearchService;
+import com.salesmanager.core.business.tax.model.taxclass.TaxClass;
+import com.salesmanager.core.utils.CoreConfiguration;
+
+@Service("productService")
+public class ProductServiceImpl extends SalesManagerEntityServiceImpl<Long, Product> implements ProductService {
+	
+	private static final Logger LOGGER = LoggerFactory.getLogger(ProductServiceImpl.class);
+	
+	ProductDao productDao;
+	
+	@Autowired
+	CategoryService categoryService;
+	
+	@Autowired
+	ProductAvailabilityService productAvailabilityService;
+	
+	@Autowired
+	ProductPriceService productPriceService;
+	
+	
+	@Autowired
+	ProductAttributeService productAttributeService;
+	
+	@Autowired
+	ProductRelationshipService productRelationshipService;
+	
+	@Autowired
+	SearchService searchService;
+	
+	@Autowired
+	ProductImageService productImageService;
+	
+	@Autowired
+	CoreConfiguration configuration;
+	
+	@Autowired
+	public ProductServiceImpl(ProductDao productDao) {
+		super(productDao);
+		this.productDao = productDao;
+	}
+
+	@Override
+	public void addProductDescription(Product product, ProductDescription description)
+			throws ServiceException {
+		
+		
+		if(product.getDescriptions()==null) {
+			product.setDescriptions(new HashSet<ProductDescription>());
+		}
+		
+		product.getDescriptions().add(description);
+		description.setProduct(product);
+		update(product);
+		searchService.index(product.getMerchantStore(), product);
+	}
+	
+	@Override
+	public List<Product> getProducts(List<Long> categoryIds) throws ServiceException {
+		
+		@SuppressWarnings({ "unchecked", "rawtypes" })
+		Set ids = new HashSet(categoryIds);
+		return productDao.getProductsListByCategories(ids);
+		
+	}
+	
+	@Override
+	public List<Product> getProducts(List<Long> categoryIds, Language language) throws ServiceException {
+		
+		@SuppressWarnings({ "unchecked", "rawtypes" })
+		Set<Long> ids = new HashSet(categoryIds);
+		return productDao.getProductsListByCategories(ids, language);
+		
+	}
+	
+	//@Override
+/*	public ProductList getProductList(ProductCriteria criteria, List<Long> categoryIds, Language language) throws ServiceException {
+		
+		@SuppressWarnings({ "unchecked", "rawtypes" })
+		Set<Long> ids = new HashSet(categoryIds);
+		return productDao.getProductListByCategories(criteria, ids, language);
+		
+	}*/
+
+	@Override
+	public ProductDescription getProductDescription(Product product, Language language) {
+		for (ProductDescription description : product.getDescriptions()) {
+			if (description.getLanguage().equals(language)) {
+				return description;
+			}
+		}
+		return null;
+	}
+	
+	@Override
+	public Product getBySeUrl(MerchantStore store, String seUrl, Locale locale) {
+		return productDao.getBySeUrl(store, seUrl, locale);
+	}
+
+	@Override
+	public Product getProductForLocale(long productId, Language language, Locale locale)
+			throws ServiceException {
+		Product product =  productDao.getProductForLocale(productId, language, locale);
+		
+
+		CatalogServiceHelper.setToAvailability(product, locale);
+		CatalogServiceHelper.setToLanguage(product, language.getId());
+		return product;
+	}
+
+	@Override
+	public List<Product> getProductsForLocale(Category category,
+			Language language, Locale locale) throws ServiceException {
+		
+		if(category==null) {
+			throw new ServiceException("The category is null");
+		}
+		
+		//Get the category list
+		StringBuilder lineage = new StringBuilder().append(category.getLineage()).append(category.getId()).append("/");
+		List<Category> categories = categoryService.listByLineage(category.getMerchantStore(),lineage.toString());
+		Set<Long> categoryIds = new HashSet<Long>();
+		for(Category c : categories) {
+			
+			categoryIds.add(c.getId());
+			
+		}
+		
+		categoryIds.add(category.getId());
+		
+		//Get products
+		List<Product> products = productDao.getProductsForLocale(category.getMerchantStore(), categoryIds, language, locale);
+		
+		//Filter availability
+		
+		return products;
+	}
+	
+	@Override
+	public ProductList listByStore(MerchantStore store,
+			Language language, ProductCriteria criteria) {
+		
+		return productDao.listByStore(store, language, criteria);
+	}
+	
+	@Override
+	public List<Product> listByStore(MerchantStore store) {
+		
+		return productDao.listByStore(store);
+	}
+	
+	@Override
+	public List<Product> listByTaxClass(TaxClass taxClass) {
+		return productDao.listByTaxClass(taxClass);
+	}
+	
+	@Override
+	public Product getByCode(String productCode, Language language) {
+		return productDao.getByCode(productCode, language);
+	}
+		
+
+
+	
+
+	@Override
+	public void delete(Product product) throws ServiceException {
+		LOGGER.debug("Deleting product");
+		Validate.notNull(product, "Product cannot be null");
+		Validate.notNull(product.getMerchantStore(), "MerchantStore cannot be null in product");
+		product = this.getById(product.getId());//Prevents detached entity error
+		product.setCategories(null);
+		
+		Set<ProductImage> images = product.getImages();
+		
+		for(ProductImage image : images) {
+			productImageService.removeProductImage(image);
+		}
+		
+		product.setImages(null);
+		
+		//related - featured
+		List<ProductRelationship> relationships = productRelationshipService.listByProduct(product);
+		for(ProductRelationship relationship : relationships) {
+			productRelationshipService.delete(relationship);
+		}
+		
+		super.delete(product);
+		searchService.deleteIndex(product.getMerchantStore(), product);
+		
+	}
+	
+	@Override
+	public void create(Product product) throws ServiceException {
+		super.create(product);
+		searchService.index(product.getMerchantStore(), product);
+	}
+	
+
+	
+	@Override	
+	public void saveOrUpdate(Product product) throws ServiceException {
+
+		LOGGER.debug("Save or update product ");
+		Validate.notNull(product,"product cannot be null");
+		Validate.notNull(product.getAvailabilities(),"product must have at least one availability");
+		Validate.notEmpty(product.getAvailabilities(),"product must have at least one availability");
+
+		//List of original availabilities
+		Set<ProductAvailability> originalAvailabilities = null;
+		
+		//List of original attributes
+		Set<ProductAttribute> originalAttributes = null;
+		
+		//List of original reviews
+		Set<ProductRelationship> originalRelationships = null;
+		
+		//List of original images
+		Set<ProductImage> originalProductImages = null;
+		
+		
+		if(product.getId()!=null && product.getId()>0) {
+			LOGGER.debug("Update product",product.getId());
+			//get original product
+			Product originalProduct = this.getById(product.getId());
+			originalAvailabilities = originalProduct.getAvailabilities();
+			originalAttributes = originalProduct.getAttributes();
+			originalRelationships = originalProduct.getRelationships();
+			originalProductImages = originalProduct.getImages();
+		} else {
+			
+			Set<ProductDescription> productDescriptions = product.getDescriptions();
+			product.setDescriptions(null);
+			
+			super.create(product);
+			
+			for(ProductDescription productDescription : productDescriptions) {
+				addProductDescription(product,productDescription);
+			}
+		}
+
+		
+		LOGGER.debug("Creating availabilities");
+		
+		//get availabilities
+		Set<ProductAvailability> availabilities = product.getAvailabilities();
+		List<Long> newAvailabilityIds = new ArrayList<Long>();
+		if(availabilities!=null && availabilities.size()>0) {
+			for(ProductAvailability availability : availabilities) {
+				availability.setProduct(product);
+				productAvailabilityService.saveOrUpdate(availability);
+				newAvailabilityIds.add(availability.getId());
+				//check prices
+				Set<ProductPrice> prices = availability.getPrices();
+				if(prices!=null && prices.size()>0) {
+
+					for(ProductPrice price : prices) {
+						price.setProductAvailability(availability);
+						productPriceService.saveOrUpdate(price);
+					}
+				}	
+			}
+		}
+		
+		//cleanup old availability
+		if(originalAvailabilities!=null) {
+			for(ProductAvailability availability : originalAvailabilities) {
+				if(!newAvailabilityIds.contains(availability.getId())) {
+					productAvailabilityService.delete(availability);
+				}
+			}
+		}
+		
+		LOGGER.debug("Creating attributes");
+		List<Long> newAttributesIds = new ArrayList<Long>();
+		if(product.getAttributes()!=null && product.getAttributes().size()>0) {
+			Set<ProductAttribute> attributes = product.getAttributes();
+			for(ProductAttribute attribute : attributes) {
+				attribute.setProduct(product);
+				productAttributeService.saveOrUpdate(attribute);
+				newAttributesIds.add(attribute.getId());
+			}
+		}
+		
+		//cleanup old attributes
+		if(originalAttributes!=null) {
+			for(ProductAttribute attribute : originalAttributes) {
+				if(!newAttributesIds.contains(attribute.getId())) {
+					productAttributeService.delete(attribute);
+				}
+			}
+		}
+		
+		
+		LOGGER.debug("Creating relationships");
+		List<Long> newRelationshipIds = new ArrayList<Long>();
+		if(product.getRelationships()!=null && product.getRelationships().size()>0) {
+			Set<ProductRelationship> relationships = product.getRelationships();
+			for(ProductRelationship relationship : relationships) {
+				relationship.setProduct(product);
+				productRelationshipService.saveOrUpdate(relationship);
+				newRelationshipIds.add(relationship.getId());
+			}
+		}
+		//cleanup old relationships
+		if(originalRelationships!=null) {
+			for(ProductRelationship relationship : originalRelationships) {
+				if(!newRelationshipIds.contains(relationship.getId())) {
+					productRelationshipService.delete(relationship);
+				}
+			}
+		}
+		
+		
+		LOGGER.debug("Creating images");
+
+		//get images
+		List<Long> newImageIds = new ArrayList<Long>();
+		Set<ProductImage> images = product.getImages();
+		if(images!=null && images.size()>0) {
+			for(ProductImage image : images) {
+				if(image.getImage()!=null && (image.getId()==null || image.getId()==0L)) {
+					image.setProduct(product);
+					
+			        InputStream inputStream = image.getImage();
+			        ImageContentFile cmsContentImage = new ImageContentFile();
+			        cmsContentImage.setFileName( image.getProductImage() );
+			        cmsContentImage.setFile( inputStream );
+			        cmsContentImage.setFileContentType(FileContentType.PRODUCT);
+					
+					
+					productImageService.addProductImage(product, image, cmsContentImage);
+					newImageIds.add(image.getId());
+				} else {
+					productImageService.update(image);
+					newImageIds.add(image.getId());
+				}
+			}
+		}
+		
+		//cleanup old images
+		if(originalProductImages!=null) {
+			for(ProductImage image : originalProductImages) {
+				if(!newImageIds.contains(image.getId())) {
+					productImageService.delete(image);
+				}
+			}
+		}
+		
+		if(product.getId()!=null && product.getId()>0) {
+			super.update(product);
+		}
+		
+		searchService.index(product.getMerchantStore(), product);
+
+	}
+	
+	
+
+
+	
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/relationship/ProductRelationshipService.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/relationship/ProductRelationshipService.java
new file mode 100644
index 0000000..fa7ad61
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/relationship/ProductRelationshipService.java
@@ -0,0 +1,89 @@
+package com.salesmanager.core.business.catalog.product.service.relationship;
+
+import java.util.List;
+
+import com.salesmanager.core.business.catalog.product.model.Product;
+import com.salesmanager.core.business.catalog.product.model.relationship.ProductRelationship;
+import com.salesmanager.core.business.catalog.product.model.relationship.ProductRelationshipType;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityService;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+public interface ProductRelationshipService extends
+		SalesManagerEntityService<Long, ProductRelationship> {
+
+	void saveOrUpdate(ProductRelationship relationship) throws ServiceException;
+
+	/**
+	 * Get product relationship List for a given type (RELATED, FEATURED...) and language allows
+	 * to return the product description in the appropriate language
+	 * @param store
+	 * @param product
+	 * @param type
+	 * @param language
+	 * @return
+	 * @throws ServiceException
+	 */
+	List<ProductRelationship> getByType(MerchantStore store, Product product,
+			ProductRelationshipType type, Language language) throws ServiceException;
+
+	/**
+	 * Get product relationship List for a given type (RELATED, FEATURED...) and a given base product
+	 * @param store
+	 * @param product
+	 * @param type
+	 * @return
+	 * @throws ServiceException
+	 */
+	List<ProductRelationship> getByType(MerchantStore store, Product product,
+			ProductRelationshipType type)
+			throws ServiceException;
+
+	/**
+	 * Get product relationship List for a given type (RELATED, FEATURED...) 
+	 * @param store
+	 * @param type
+	 * @return
+	 * @throws ServiceException
+	 */
+	List<ProductRelationship> getByType(MerchantStore store,
+			ProductRelationshipType type) throws ServiceException;
+
+	List<ProductRelationship> listByProduct(Product product)
+			throws ServiceException;
+
+	List<ProductRelationship> getByType(MerchantStore store,
+			ProductRelationshipType type, Language language)
+			throws ServiceException;
+
+	/**
+	 * Get a list of relationship acting as groups of products
+	 * @param store
+	 * @return
+	 */
+	List<ProductRelationship> getGroups(MerchantStore store);
+
+	/**
+	 * Creates a product group
+	 * @param groupName
+	 * @throws ServiceException
+	 */
+	void addGroup(MerchantStore store, String groupName) throws ServiceException;
+
+	List<ProductRelationship> getByGroup(MerchantStore store, String groupName)
+			throws ServiceException;
+
+	void deleteGroup(MerchantStore store, String groupName)
+			throws ServiceException;
+
+	void deactivateGroup(MerchantStore store, String groupName)
+			throws ServiceException;
+
+	void activateGroup(MerchantStore store, String groupName)
+			throws ServiceException;
+
+	List<ProductRelationship> getByGroup(MerchantStore store, String groupName,
+			Language language) throws ServiceException;
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/relationship/ProductRelationshipServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/relationship/ProductRelationshipServiceImpl.java
new file mode 100644
index 0000000..9f2d265
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/relationship/ProductRelationshipServiceImpl.java
@@ -0,0 +1,147 @@
+package com.salesmanager.core.business.catalog.product.service.relationship;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.salesmanager.core.business.catalog.product.dao.relationship.ProductRelationshipDao;
+import com.salesmanager.core.business.catalog.product.model.Product;
+import com.salesmanager.core.business.catalog.product.model.relationship.ProductRelationship;
+import com.salesmanager.core.business.catalog.product.model.relationship.ProductRelationshipType;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityServiceImpl;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+@Service("productRelationshipService")
+public class ProductRelationshipServiceImpl extends
+		SalesManagerEntityServiceImpl<Long, ProductRelationship> implements
+		ProductRelationshipService {
+
+	
+	private ProductRelationshipDao productRelationshipDao;
+	
+	@Autowired
+	public ProductRelationshipServiceImpl(
+			ProductRelationshipDao productRelationshipDao) {
+			super(productRelationshipDao);
+			this.productRelationshipDao = productRelationshipDao;
+	}
+	
+	@Override
+	public void saveOrUpdate(ProductRelationship relationship) throws ServiceException {
+		
+		if(relationship.getId()!=null && relationship.getId()>0) {
+			
+			this.update(relationship);
+			
+		} else {
+			this.create(relationship);
+		}
+		
+	}
+	
+	
+	@Override
+	public void addGroup(MerchantStore store, String groupName) throws ServiceException {
+		ProductRelationship relationship = new ProductRelationship();
+		relationship.setCode(groupName);
+		relationship.setStore(store);
+		relationship.setActive(true);
+		this.save(relationship);
+	}
+	
+	@Override
+	public List<ProductRelationship> getGroups(MerchantStore store) {
+		return productRelationshipDao.getGroups(store);
+	}
+	
+	@Override
+	public void deleteGroup(MerchantStore store, String groupName) throws ServiceException {
+		List<ProductRelationship> entities = productRelationshipDao.getByGroup(store, groupName);
+		for(ProductRelationship relation : entities) {
+			this.delete(relation);
+		}
+	}
+	
+	@Override
+	public void deactivateGroup(MerchantStore store, String groupName) throws ServiceException {
+		List<ProductRelationship> entities = productRelationshipDao.getByGroup(store, groupName);
+		for(ProductRelationship relation : entities) {
+			relation.setActive(false);
+			this.saveOrUpdate(relation);
+		}
+	}
+	
+	@Override
+	public void activateGroup(MerchantStore store, String groupName) throws ServiceException {
+		List<ProductRelationship> entities = this.getByGroup(store, groupName);
+		for(ProductRelationship relation : entities) {
+			relation.setActive(true);
+			this.saveOrUpdate(relation);
+		}
+	}
+	
+	public void delete(ProductRelationship relationship) throws ServiceException {
+		
+		//throws detached exception so need to query first
+		relationship = this.getById(relationship.getId());
+		super.delete(relationship);
+		
+		
+	}
+	
+	@Override
+	public List<ProductRelationship> listByProduct(Product product) throws ServiceException {
+
+		return productRelationshipDao.listByProducts(product);
+
+	}
+	
+	
+	@Override
+	public List<ProductRelationship> getByType(MerchantStore store, Product product, ProductRelationshipType type, Language language) throws ServiceException {
+
+		return productRelationshipDao.getByType(store, type.name(), product, language);
+
+	}
+	
+	@Override
+	public List<ProductRelationship> getByType(MerchantStore store, ProductRelationshipType type, Language language) throws ServiceException {
+		return productRelationshipDao.getByType(store, type.name(), language);
+	}
+	
+	@Override
+	public List<ProductRelationship> getByType(MerchantStore store, ProductRelationshipType type) throws ServiceException {
+
+		return productRelationshipDao.getByType(store, type.name());
+
+	}
+	
+	@Override
+	public List<ProductRelationship> getByGroup(MerchantStore store, String groupName) throws ServiceException {
+
+		return productRelationshipDao.getByType(store, groupName);
+
+	}
+	
+	@Override
+	public List<ProductRelationship> getByGroup(MerchantStore store, String groupName, Language language) throws ServiceException {
+
+		return productRelationshipDao.getByType(store, groupName, language);
+
+	}
+	
+	@Override
+	public List<ProductRelationship> getByType(MerchantStore store, Product product, ProductRelationshipType type) throws ServiceException {
+		
+
+		return productRelationshipDao.getByType(store, type.name(), product);
+				
+		
+	}
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/review/ProductReviewService.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/review/ProductReviewService.java
new file mode 100644
index 0000000..bc6c031
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/review/ProductReviewService.java
@@ -0,0 +1,22 @@
+package com.salesmanager.core.business.catalog.product.service.review;
+
+import java.util.List;
+
+import com.salesmanager.core.business.catalog.product.model.Product;
+import com.salesmanager.core.business.catalog.product.model.review.ProductReview;
+import com.salesmanager.core.business.customer.model.Customer;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityService;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+public interface ProductReviewService extends
+		SalesManagerEntityService<Long, ProductReview> {
+	
+	
+	List<ProductReview> getByCustomer(Customer customer);
+	List<ProductReview> getByProduct(Product product);
+	List<ProductReview> getByProduct(Product product, Language language);
+	ProductReview getByProductAndCustomer(Long productId, Long customerId);
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/review/ProductReviewServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/review/ProductReviewServiceImpl.java
new file mode 100644
index 0000000..51b559a
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/review/ProductReviewServiceImpl.java
@@ -0,0 +1,95 @@
+package com.salesmanager.core.business.catalog.product.service.review;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import com.salesmanager.core.business.catalog.product.dao.review.ProductReviewDao;
+import com.salesmanager.core.business.catalog.product.model.Product;
+import com.salesmanager.core.business.catalog.product.model.review.ProductReview;
+import com.salesmanager.core.business.catalog.product.service.ProductService;
+import com.salesmanager.core.business.customer.model.Customer;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityServiceImpl;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+@Service("productReviewService")
+public class ProductReviewServiceImpl extends
+		SalesManagerEntityServiceImpl<Long, ProductReview> implements
+		ProductReviewService {
+
+
+	private ProductReviewDao productReviewDao;
+	
+	@Autowired
+	private ProductService productService;
+	
+	@Autowired
+	public ProductReviewServiceImpl(
+			ProductReviewDao productReviewDao) {
+			super(productReviewDao);
+			this.productReviewDao = productReviewDao;
+	}
+
+	@Override
+	public List<ProductReview> getByCustomer(Customer customer) {
+		return productReviewDao.getByCustomer(customer);
+	}
+
+	@Override
+	public List<ProductReview> getByProduct(Product product) {
+		return productReviewDao.getByProduct(product);
+	}
+	
+	@Override
+	public ProductReview getByProductAndCustomer(Long productId, Long customerId) {
+		return productReviewDao.getByProductAndCustomer(productId, customerId);
+	}
+	
+	@Override
+	public List<ProductReview> getByProduct(Product product, Language language) {
+		return productReviewDao.getByProduct(product, language);
+	}
+	
+	public void create(ProductReview review) throws ServiceException {
+		
+		//adjust score
+		
+		//refresh product
+		Product product = productService.getById(review.getProduct().getId());
+		
+		//ajust product rating
+		Integer count = 0;
+		if(product.getProductReviewCount()!=null) {
+			count = product.getProductReviewCount();
+		}
+				
+		
+		
+
+		BigDecimal averageRating = product.getProductReviewAvg();
+		if(averageRating==null) {
+			averageRating = new BigDecimal(0);
+		}
+		//get reviews
+
+		
+		BigDecimal totalRating = averageRating.multiply(new BigDecimal(count));
+		totalRating = totalRating.add(new BigDecimal(review.getReviewRating()));
+		
+		count = count + 1;
+		double avg = totalRating.doubleValue() / count.intValue();
+		
+		product.setProductReviewAvg(new BigDecimal(avg));
+		product.setProductReviewCount(count);
+		super.create(review);
+		
+		productService.update(product);
+		
+	}
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/type/ProductTypeService.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/type/ProductTypeService.java
new file mode 100644
index 0000000..fef6a47
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/type/ProductTypeService.java
@@ -0,0 +1,11 @@
+package com.salesmanager.core.business.catalog.product.service.type;
+
+import com.salesmanager.core.business.catalog.product.model.type.ProductType;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityService;
+
+public interface ProductTypeService extends SalesManagerEntityService<Long, ProductType> {
+
+	ProductType getProductType(String productTypeCode) throws ServiceException;
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/type/ProductTypeServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/type/ProductTypeServiceImpl.java
new file mode 100644
index 0000000..fe77059
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/catalog/product/service/type/ProductTypeServiceImpl.java
@@ -0,0 +1,34 @@
+package com.salesmanager.core.business.catalog.product.service.type;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.salesmanager.core.business.catalog.product.dao.type.ProductTypeDao;
+import com.salesmanager.core.business.catalog.product.model.type.ProductType;
+import com.salesmanager.core.business.catalog.product.model.type.ProductType_;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityServiceImpl;
+
+@Service("productTypeService")
+public class ProductTypeServiceImpl extends SalesManagerEntityServiceImpl<Long, ProductType>
+		implements ProductTypeService {
+
+	private ProductTypeDao productTypeDao;
+	
+	@Autowired
+	public ProductTypeServiceImpl(
+			ProductTypeDao productTypeDao) {
+			super(productTypeDao);
+			this.productTypeDao = productTypeDao;
+	}
+	
+	@Override
+	public ProductType getProductType(String productTypeCode) throws ServiceException {
+		
+		return getByField(ProductType_.code, productTypeCode);
+		
+	}
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/common/model/Address.java b/sm-core/src/main/java/com/salesmanager/core/business/common/model/Address.java
new file mode 100644
index 0000000..a8fe241
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/common/model/Address.java
@@ -0,0 +1,62 @@
+package com.salesmanager.core.business.common.model;
+
+import java.io.Serializable;
+
+
+public class Address implements Serializable {
+	
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	private String city;
+	private String postalCode;
+	private String stateProvince;
+	private String zone;//code
+	private String country;//code
+
+	public void setStateProvince(String stateProvince) {
+		this.stateProvince = stateProvince;
+	}
+
+	public void setCountry(String country) {
+		this.country = country;
+	}
+
+
+	public String getCity() {
+		return city;
+	}
+
+	public void setCity(String city) {
+		this.city = city;
+	}
+
+	public String getPostalCode() {
+		return postalCode;
+	}
+
+	public void setPostalCode(String postalCode) {
+		this.postalCode = postalCode;
+	}
+
+	public String getStateProvince() {
+		return stateProvince;
+	}
+
+	public String getCountry() {
+		return country;
+	}
+
+	public void setZone(String zone) {
+		this.zone = zone;
+	}
+
+	public String getZone() {
+		return zone;
+	}
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/common/model/audit/Auditable.java b/sm-core/src/main/java/com/salesmanager/core/business/common/model/audit/Auditable.java
new file mode 100644
index 0000000..58c0332
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/common/model/audit/Auditable.java
@@ -0,0 +1,8 @@
+package com.salesmanager.core.business.common.model.audit;
+
+public interface Auditable {
+	
+	AuditSection getAuditSection();
+	
+	void setAuditSection(AuditSection audit);
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/common/model/audit/AuditListener.java b/sm-core/src/main/java/com/salesmanager/core/business/common/model/audit/AuditListener.java
new file mode 100644
index 0000000..a4b7ebf
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/common/model/audit/AuditListener.java
@@ -0,0 +1,24 @@
+package com.salesmanager.core.business.common.model.audit;
+
+import java.util.Date;
+
+import javax.persistence.PrePersist;
+import javax.persistence.PreUpdate;
+
+public class AuditListener {
+	
+	@PrePersist
+	@PreUpdate
+	public void onSaveOrUpdate(Object o) {
+		if (o instanceof Auditable) {
+			Auditable audit = (Auditable) o;
+			AuditSection auditSection = audit.getAuditSection();
+			
+			auditSection.setDateModified(new Date());
+			if (auditSection.getDateCreated() == null) {
+				auditSection.setDateCreated(new Date());
+			}
+			audit.setAuditSection(auditSection);
+		}
+	}
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/common/model/audit/AuditSection.java b/sm-core/src/main/java/com/salesmanager/core/business/common/model/audit/AuditSection.java
new file mode 100644
index 0000000..438498b
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/common/model/audit/AuditSection.java
@@ -0,0 +1,57 @@
+package com.salesmanager.core.business.common.model.audit;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Embeddable;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+import com.salesmanager.core.utils.CloneUtils;
+
+@Embeddable
+//@org.hibernate.annotations.Entity(dynamicUpdate = true, dynamicInsert = true)
+public class AuditSection implements Serializable {
+
+
+	private static final long serialVersionUID = -1934446958975060889L;
+
+	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name = "DATE_CREATED")
+	private Date dateCreated;
+
+	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name = "DATE_MODIFIED")
+	private Date dateModified;
+
+	@Column(name = "UPDT_ID", length=20)
+	private String modifiedBy;
+	
+	public AuditSection() {
+	}
+
+	public Date getDateCreated() {
+		return CloneUtils.clone(dateCreated);
+	}
+
+	public void setDateCreated(Date dateCreated) {
+		this.dateCreated = CloneUtils.clone(dateCreated);
+	}
+
+	public Date getDateModified() {
+		return CloneUtils.clone(dateModified);
+	}
+
+	public void setDateModified(Date dateModified) {
+		this.dateModified = CloneUtils.clone(dateModified);
+	}
+
+	public String getModifiedBy() {
+		return modifiedBy;
+	}
+
+	public void setModifiedBy(String modifiedBy) {
+		this.modifiedBy = modifiedBy;
+	}
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/common/model/Billing.java b/sm-core/src/main/java/com/salesmanager/core/business/common/model/Billing.java
new file mode 100755
index 0000000..97be079
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/common/model/Billing.java
@@ -0,0 +1,139 @@
+package com.salesmanager.core.business.common.model;
+
+import javax.persistence.Column;
+import javax.persistence.Embeddable;
+import javax.persistence.FetchType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+
+import org.hibernate.validator.constraints.NotEmpty;
+
+import com.salesmanager.core.business.reference.country.model.Country;
+import com.salesmanager.core.business.reference.zone.model.Zone;
+
+@Embeddable
+public class Billing {
+	
+	@NotEmpty
+	@Column (name ="BILLING_LAST_NAME", length=64, nullable=false)
+	private String lastName;
+
+	@NotEmpty
+	@Column (name ="BILLING_FIRST_NAME", length=64, nullable=false)
+	private String firstName;
+	
+
+
+	@Column (name ="BILLING_COMPANY", length=100)
+	private String company;
+	
+	@Column (name ="BILLING_STREET_ADDRESS", length=256)
+	private String address;
+	
+	
+	@Column (name ="BILLING_CITY", length=100)
+	private String city;
+	
+	@Column (name ="BILLING_POSTCODE", length=20)
+	private String postalCode;
+	
+	@Column(name="BILLING_TELEPHONE", length=32)
+	private String telephone;
+	
+	@Column (name ="BILLING_STATE", length=100)
+	private String state;
+
+
+	@ManyToOne(fetch = FetchType.EAGER, targetEntity = Country.class)
+	@JoinColumn(name="BILLING_COUNTRY_ID", nullable=false)
+	private Country country;
+	
+	
+	@ManyToOne(fetch = FetchType.EAGER, targetEntity = Zone.class)
+	@JoinColumn(name="BILLING_ZONE_ID", nullable=true)
+	private Zone zone;
+
+
+
+	public String getCompany() {
+		return company;
+	}
+
+	public void setCompany(String company) {
+		this.company = company;
+	}
+
+	public String getAddress() {
+		return address;
+	}
+
+	public void setAddress(String address) {
+		this.address = address;
+	}
+
+	public String getCity() {
+		return city;
+	}
+
+	public void setCity(String city) {
+		this.city = city;
+	}
+
+	public String getPostalCode() {
+		return postalCode;
+	}
+
+	public void setPostalCode(String postalCode) {
+		this.postalCode = postalCode;
+	}
+	
+	public Country getCountry() {
+		return country;
+	}
+
+	public void setCountry(Country country) {
+		this.country = country;
+	}
+
+	public Zone getZone() {
+		return zone;
+	}
+
+	public void setZone(Zone zone) {
+		this.zone = zone;
+	}
+	
+	public String getState() {
+		return state;
+	}
+
+	public void setState(String state) {
+		this.state = state;
+	}
+
+	public void setTelephone(String telephone) {
+		this.telephone = telephone;
+	}
+
+	public String getTelephone() {
+		return telephone;
+	}
+	
+	
+	public String getLastName() {
+		return lastName;
+	}
+
+	public void setLastName(String lastName) {
+		this.lastName = lastName;
+	}
+	
+	public String getFirstName() {
+		return firstName;
+	}
+
+	public void setFirstName(String firstName) {
+		this.firstName = firstName;
+	}
+	
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/common/model/Criteria.java b/sm-core/src/main/java/com/salesmanager/core/business/common/model/Criteria.java
new file mode 100644
index 0000000..a800521
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/common/model/Criteria.java
@@ -0,0 +1,40 @@
+package com.salesmanager.core.business.common.model;
+
+public class Criteria {
+	
+	private int startIndex = 0;
+	private int maxCount = 0;
+	private String code;
+	
+	
+	private CriteriaOrderBy orderBy = CriteriaOrderBy.DESC;
+	
+	
+	public int getMaxCount() {
+		return maxCount;
+	}
+	public void setMaxCount(int maxCount) {
+		this.maxCount = maxCount;
+	}
+	public int getStartIndex() {
+		return startIndex;
+	}
+	public void setStartIndex(int startIndex) {
+		this.startIndex = startIndex;
+	}
+	public String getCode() {
+		return code;
+	}
+	public void setCode(String code) {
+		this.code = code;
+	}
+	public void setOrderBy(CriteriaOrderBy orderBy) {
+		this.orderBy = orderBy;
+	}
+	public CriteriaOrderBy getOrderBy() {
+		return orderBy;
+	}
+
+
+
+}
\ No newline at end of file

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/common/model/CriteriaOrderBy.java b/sm-core/src/main/java/com/salesmanager/core/business/common/model/CriteriaOrderBy.java
new file mode 100644
index 0000000..c9a8eb7
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/common/model/CriteriaOrderBy.java
@@ -0,0 +1,7 @@
+package com.salesmanager.core.business.common.model;
+
+public enum CriteriaOrderBy {
+
+	
+	ASC, DESC
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/common/model/Delivery.java b/sm-core/src/main/java/com/salesmanager/core/business/common/model/Delivery.java
new file mode 100755
index 0000000..5c3faf9
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/common/model/Delivery.java
@@ -0,0 +1,138 @@
+package com.salesmanager.core.business.common.model;
+
+import javax.persistence.Column;
+import javax.persistence.Embeddable;
+import javax.persistence.FetchType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToOne;
+
+import com.salesmanager.core.business.reference.country.model.Country;
+import com.salesmanager.core.business.reference.zone.model.Zone;
+
+@Embeddable
+public class Delivery {
+	
+	@Column (name ="DELIVERY_LAST_NAME", length=64)
+	private String lastName;
+
+
+
+
+	@Column (name ="DELIVERY_FIRST_NAME", length=64)
+	private String firstName;
+
+	
+
+
+	@Column (name ="DELIVERY_COMPANY", length=100)
+	private String company;
+	
+	@Column (name ="DELIVERY_STREET_ADDRESS", length=256)
+	private String address;
+
+	@Column (name ="DELIVERY_CITY", length=100)
+	private String city;
+	
+	@Column (name ="DELIVERY_POSTCODE", length=20)
+	private String postalCode;
+	
+	@Column (name ="DELIVERY_STATE", length=100)
+	private String state;
+	
+	@Column(name="DELIVERY_TELEPHONE", length=32)
+	private String telephone;
+	
+	@ManyToOne(fetch = FetchType.EAGER, targetEntity = Country.class)
+	@JoinColumn(name="DELIVERY_COUNTRY_ID", nullable=true)
+	private Country country;
+	
+
+	@ManyToOne(fetch = FetchType.EAGER, targetEntity = Zone.class)
+	@JoinColumn(name="DELIVERY_ZONE_ID", nullable=true)
+	private Zone zone;
+	
+
+
+	public String getCompany() {
+		return company;
+	}
+
+	public void setCompany(String company) {
+		this.company = company;
+	}
+
+	public String getAddress() {
+		return address;
+	}
+
+	public void setAddress(String address) {
+		this.address = address;
+	}
+
+	public String getCity() {
+		return city;
+	}
+
+	public void setCity(String city) {
+		this.city = city;
+	}
+
+	public String getPostalCode() {
+		return postalCode;
+	}
+
+	public void setPostalCode(String postalCode) {
+		this.postalCode = postalCode;
+	}
+
+	public Country getCountry() {
+		return country;
+	}
+
+	public void setCountry(Country country) {
+		this.country = country;
+	}
+
+	public Zone getZone() {
+		return zone;
+	}
+
+	public void setZone(Zone zone) {
+		this.zone = zone;
+	}
+	
+
+	public String getState() {
+		return state;
+	}
+
+	public void setState(String state) {
+		this.state = state;
+	}
+
+	public void setTelephone(String telephone) {
+		this.telephone = telephone;
+	}
+
+	public String getTelephone() {
+		return telephone;
+	}	
+	
+	public String getLastName() {
+		return lastName;
+	}
+
+	public void setLastName(String lastName) {
+		this.lastName = lastName;
+	}
+	
+	public String getFirstName() {
+		return firstName;
+	}
+
+	public void setFirstName(String firstName) {
+		this.firstName = firstName;
+	}
+	
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/common/model/Description.java b/sm-core/src/main/java/com/salesmanager/core/business/common/model/Description.java
new file mode 100644
index 0000000..59e917f
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/common/model/Description.java
@@ -0,0 +1,113 @@
+package com.salesmanager.core.business.common.model;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Embedded;
+import javax.persistence.EntityListeners;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.MappedSuperclass;
+import javax.persistence.TableGenerator;
+
+import org.hibernate.annotations.Type;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import com.salesmanager.core.business.common.model.audit.AuditListener;
+import com.salesmanager.core.business.common.model.audit.AuditSection;
+import com.salesmanager.core.business.common.model.audit.Auditable;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+@MappedSuperclass
+@EntityListeners(value = AuditListener.class)
+@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
+public class Description implements Auditable, Serializable {
+	private static final long serialVersionUID = -4335863941736710046L;
+	
+	@Id
+	@Column(name = "DESCRIPTION_ID")
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT", pkColumnValue = "DESCRIPTION_SEQ_NEXT_VAL")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Long id;
+	
+	@Embedded
+	private AuditSection auditSection = new AuditSection();
+	
+	@ManyToOne(optional = false)
+	@JoinColumn(name = "LANGUAGE_ID")
+	private Language language;
+	
+	@NotEmpty
+	@Column(name="NAME", nullable = false, length=120)
+	private String name;
+	
+	@Column(name="TITLE", length=100)
+	private String title;
+	
+	@Column(name="DESCRIPTION")
+	@Type(type = "org.hibernate.type.StringClobType")
+	private String description;
+	
+	public Description() {
+	}
+	
+	public Description(Language language, String name) {
+		this.setLanguage(language);
+		this.setName(name);
+	}
+	
+	@Override
+	public AuditSection getAuditSection() {
+		return auditSection;
+	}
+
+	@Override
+	public void setAuditSection(AuditSection auditSection) {
+		this.auditSection = auditSection;
+	}
+
+	public Language getLanguage() {
+		return language;
+	}
+
+	public void setLanguage(Language language) {
+		this.language = language;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/common/model/EntityList.java b/sm-core/src/main/java/com/salesmanager/core/business/common/model/EntityList.java
new file mode 100644
index 0000000..ce03d25
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/common/model/EntityList.java
@@ -0,0 +1,21 @@
+package com.salesmanager.core.business.common.model;
+
+import java.io.Serializable;
+
+public class EntityList implements Serializable {
+	
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 6135941880202635567L;
+	private int totalCount;
+	
+	public int getTotalCount() {
+		return totalCount;
+	}
+	public void setTotalCount(int totalCount) {
+		this.totalCount = totalCount;
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/common/model/OrderTotalItem.java b/sm-core/src/main/java/com/salesmanager/core/business/common/model/OrderTotalItem.java
new file mode 100644
index 0000000..b383e83
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/common/model/OrderTotalItem.java
@@ -0,0 +1,27 @@
+package com.salesmanager.core.business.common.model;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+public class OrderTotalItem implements Serializable {
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	private BigDecimal itemPrice;
+	private String itemCode;
+	public void setItemPrice(BigDecimal itemPrice) {
+		this.itemPrice = itemPrice;
+	}
+	public BigDecimal getItemPrice() {
+		return itemPrice;
+	}
+	public void setItemCode(String itemCode) {
+		this.itemCode = itemCode;
+	}
+	public String getItemCode() {
+		return itemCode;
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/content/dao/ContentDao.java b/sm-core/src/main/java/com/salesmanager/core/business/content/dao/ContentDao.java
new file mode 100755
index 0000000..82bf93e
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/content/dao/ContentDao.java
@@ -0,0 +1,50 @@
+package com.salesmanager.core.business.content.dao;
+
+import java.util.List;
+
+import com.salesmanager.core.business.content.model.Content;
+import com.salesmanager.core.business.content.model.ContentDescription;
+import com.salesmanager.core.business.content.model.ContentType;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDao;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+public interface ContentDao extends SalesManagerEntityDao<Long, Content> {
+
+	List<Content> listByType(ContentType contentType, MerchantStore store,
+			Language language) throws ServiceException;
+
+	List<Content> listByType(List<ContentType> contentType, MerchantStore store,
+			Language language) throws ServiceException;
+
+	Content getByCode(String code, MerchantStore store)
+			throws ServiceException;
+
+	Content getByCode(String code, MerchantStore store, Language language)
+			throws ServiceException;
+
+	List<Content> listByType(List<ContentType> contentType, MerchantStore store)
+			throws ServiceException;
+
+	List<Content> listByType(ContentType contentType, MerchantStore store)
+			throws ServiceException;
+
+	/**
+	 * List ContentDescription objects. Removes non visible content
+	 * @param contentType
+	 * @param store
+	 * @param language
+	 * @return
+	 * @throws ServiceException
+	 */
+	List<ContentDescription> listNameByType(List<ContentType> contentType,
+			MerchantStore store, Language language) throws ServiceException;
+
+	Content getByLanguage(Long id, Language language) throws ServiceException;
+
+	ContentDescription getBySeUrl(MerchantStore store, String seUrl);
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/content/dao/ContentDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/content/dao/ContentDaoImpl.java
new file mode 100755
index 0000000..a413671
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/content/dao/ContentDaoImpl.java
@@ -0,0 +1,266 @@
+package com.salesmanager.core.business.content.dao;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.stereotype.Repository;
+
+import com.mysema.query.jpa.JPQLQuery;
+import com.mysema.query.jpa.impl.JPAQuery;
+import com.salesmanager.core.business.content.model.Content;
+import com.salesmanager.core.business.content.model.ContentDescription;
+import com.salesmanager.core.business.content.model.ContentType;
+import com.salesmanager.core.business.content.model.QContent;
+import com.salesmanager.core.business.content.model.QContentDescription;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDaoImpl;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+@Repository("contentDao")
+public class ContentDaoImpl extends SalesManagerEntityDaoImpl<Long, Content> implements ContentDao {
+
+	public ContentDaoImpl() {
+		super();
+	}
+	
+	@Override
+	public List<Content> listByType(ContentType contentType, MerchantStore store, Language language) throws ServiceException {
+
+		QContent qContent = QContent.content;
+		QContentDescription qContentDescription = QContentDescription.contentDescription;
+		
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qContent)
+			.leftJoin(qContent.descriptions, qContentDescription).fetch()
+			.leftJoin(qContent.merchantStore).fetch()
+			.where(qContentDescription.language.id.eq(language.getId())
+			.and(qContent.merchantStore.id.eq(store.getId()))
+			.and(qContent.contentType.eq(contentType))
+			).orderBy(qContent.sortOrder.asc());
+		
+		List<Content> contents = query.list(qContent);
+		
+		return contents;
+	}
+	
+	@Override
+	public List<Content> listByType(ContentType contentType, MerchantStore store) throws ServiceException {
+
+		QContent qContent = QContent.content;
+		QContentDescription qContentDescription = QContentDescription.contentDescription;
+		
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qContent)
+			.leftJoin(qContent.descriptions, qContentDescription).fetch()
+			.leftJoin(qContent.merchantStore).fetch()
+			.where(qContent.merchantStore.id.eq(store.getId())
+			.and(qContent.contentType.eq(contentType))
+			).orderBy(qContent.sortOrder.asc());
+		
+		List<Content> contents = query.list(qContent);
+		
+		return contents;
+	}
+	
+	
+	@Override
+	public List<Content> listByType(List<ContentType> contentType, MerchantStore store, Language language) throws ServiceException {
+
+		QContent qContent = QContent.content;
+		QContentDescription qContentDescription = QContentDescription.contentDescription;
+		
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qContent)
+			.leftJoin(qContent.descriptions, qContentDescription).fetch()
+			.leftJoin(qContent.merchantStore).fetch()
+			.where(qContentDescription.language.id.eq(language.getId())
+			.and(qContent.merchantStore.id.eq(store.getId()))
+			.and(qContent.contentType.in(contentType))
+			).orderBy(qContent.sortOrder.asc());
+		
+		List<Content> contents = query.list(qContent);
+		
+		return contents;
+	}
+	
+	@Override
+	public List<ContentDescription> listNameByType(List<ContentType> contentType, MerchantStore store, Language language) throws ServiceException {
+
+		QContent qContent = QContent.content;
+		QContentDescription qContentDescription = QContentDescription.contentDescription;
+		
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		
+		query.from(qContent)
+			.leftJoin(qContent.descriptions, qContentDescription).fetch()
+			.leftJoin(qContent.merchantStore).fetch()
+			.where(qContentDescription.language.id.eq(language.getId())
+			.and(qContent.merchantStore.id.eq(store.getId()))
+			.and(qContent.contentType.in(contentType))
+			.and(qContent.visible.eq(true))
+		).orderBy(qContent.sortOrder.asc());
+		
+
+		
+		List<Content> contents = query.list(qContent);
+		
+		List<ContentDescription> descriptions = new ArrayList<ContentDescription>();
+		for(Content c : contents) {
+				String name = c.getDescription().getName();
+				String url = c.getDescription().getSeUrl();
+				ContentDescription contentDescription = new ContentDescription();
+				contentDescription.setName(name);
+				contentDescription.setSeUrl(url);
+				descriptions.add(contentDescription);
+		}
+		
+		return descriptions;
+	}
+	
+	@Override
+	public List<Content> listByType(List<ContentType> contentType, MerchantStore store) throws ServiceException {
+
+		QContent qContent = QContent.content;
+		QContentDescription qContentDescription = QContentDescription.contentDescription;
+		
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qContent)
+			.leftJoin(qContent.descriptions, qContentDescription).fetch()
+			.leftJoin(qContent.merchantStore).fetch()
+			.where(qContent.merchantStore.id.eq(store.getId())
+			.and(qContent.contentType.in(contentType))
+			).orderBy(qContent.sortOrder.asc());
+		
+		List<Content> contents = query.list(qContent);
+		
+		return contents;
+	}
+	
+	@Override
+	public Content getByCode(String code, MerchantStore store) throws ServiceException {
+
+		QContent qContent = QContent.content;
+		QContentDescription qContentDescription = QContentDescription.contentDescription;
+		
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qContent)
+			.leftJoin(qContent.descriptions, qContentDescription).fetch()
+			.leftJoin(qContent.merchantStore).fetch()
+			.where(qContent.merchantStore.id.eq(store.getId())
+			.and(qContent.code.eq(code))
+			);
+		
+		Content content = query.singleResult(qContent);
+		
+		return content;
+	}
+	
+	@Override
+	public Content getByLanguage(Long id, Language language) throws ServiceException {
+
+		QContent qContent = QContent.content;
+		QContentDescription qContentDescription = QContentDescription.contentDescription;
+		
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qContent)
+			.leftJoin(qContent.descriptions, qContentDescription).fetch()
+			.leftJoin(qContent.merchantStore).fetch()
+			.where(qContent.id.eq(id)
+			.and(qContentDescription.language.code.eq(language.getCode())));
+		
+		Content content = query.singleResult(qContent);
+		
+		return content;
+	}
+	
+	@Override
+	public Content getById(Long id) {
+
+		QContent qContent = QContent.content;
+		QContentDescription qContentDescription = QContentDescription.contentDescription;
+		
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qContent)
+			.leftJoin(qContent.descriptions, qContentDescription).fetch()
+			.leftJoin(qContent.merchantStore).fetch()
+			.where(qContent.id.eq(id)
+			);
+		
+		Content content = query.singleResult(qContent);
+		
+		return content;
+	}
+	
+	@Override
+	public Content getByCode(String code, MerchantStore store, Language language) throws ServiceException {
+
+		QContent qContent = QContent.content;
+		QContentDescription qContentDescription = QContentDescription.contentDescription;
+		
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qContent)
+			.leftJoin(qContent.descriptions, qContentDescription).fetch()
+			.leftJoin(qContent.merchantStore).fetch()
+			.where(qContentDescription.language.id.eq(language.getId())
+			.and(qContent.merchantStore.id.eq(store.getId())
+			.and(qContent.code.eq(code)))
+			);
+		
+		Content content = query.singleResult(qContent);
+		
+		return content;
+	}
+	
+	@Override
+	public ContentDescription getBySeUrl(MerchantStore store,String seUrl) {
+		
+		QContent qContent = QContent.content;
+		QContentDescription qContentDescription = QContentDescription.contentDescription;
+		
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		
+		query.from(qContent)
+			.leftJoin(qContent.descriptions, qContentDescription).fetch()
+			.leftJoin(qContent.merchantStore).fetch()
+			.where(qContentDescription.seUrl.eq(seUrl)
+			.and(qContent.merchantStore.id.eq(store.getId()))
+			.and(qContent.visible.eq(true))
+		);
+		
+
+		
+		Content content = query.uniqueResult(qContent);
+		
+
+		if(content!=null) {
+				return content.getDescription();
+		}
+		
+		return null;
+		
+		
+	}
+	
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/content/model/Content.java b/sm-core/src/main/java/com/salesmanager/core/business/content/model/Content.java
new file mode 100755
index 0000000..20b4be0
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/content/model/Content.java
@@ -0,0 +1,170 @@
+package com.salesmanager.core.business.content.model;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+import javax.persistence.UniqueConstraint;
+import javax.validation.Valid;
+
+import org.hibernate.validator.constraints.NotEmpty;
+
+import com.salesmanager.core.business.common.model.audit.AuditListener;
+import com.salesmanager.core.business.common.model.audit.AuditSection;
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.constants.SchemaConstant;
+
+
+@Entity
+@EntityListeners(value = AuditListener.class)
+@Table(name = "CONTENT", schema= SchemaConstant.SALESMANAGER_SCHEMA,uniqueConstraints=
+    @UniqueConstraint(columnNames = {"MERCHANT_ID", "CODE"}) )
+public class Content extends SalesManagerEntity<Long, Content> implements Serializable {
+
+	
+
+	private static final long serialVersionUID = 1772757159185494620L;
+	
+	@Id
+	@Column(name = "CONTENT_ID", unique=true, nullable=false)
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT", pkColumnValue = "CONTENT_SEQ_NEXT_VAL")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Long id;
+	
+	@Embedded
+	private AuditSection auditSection = new AuditSection();
+	
+	@Valid
+	@OneToMany(mappedBy="content", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+	private List<ContentDescription> descriptions = new ArrayList<ContentDescription>();
+	
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name="MERCHANT_ID", nullable=false)
+	private MerchantStore merchantStore;
+	
+	@NotEmpty
+	@Column(name="CODE", length=100, nullable=false)
+	private String code;
+	
+	@Column(name = "VISIBLE")
+	private boolean visible;
+	
+	@Column(name = "CONTENT_POSITION", length=10, nullable=true)
+	@Enumerated(value = EnumType.STRING)
+	private ContentPosition contentPosition;
+	
+	//Used for grouping
+	//BOX, SECTION, PAGE
+	@Column(name = "CONTENT_TYPE", length=10, nullable=true)
+	@Enumerated(value = EnumType.STRING)
+	private ContentType contentType; 
+	
+	@Column(name = "SORT_ORDER")
+	private Integer sortOrder = 0;
+	
+	@Override
+	public Long getId() {
+		return this.id;
+	}
+
+	@Override
+	public void setId(Long id) {
+		this.id = id;
+		
+	}
+
+	public void setAuditSection(AuditSection auditSection) {
+		this.auditSection = auditSection;
+	}
+
+	public AuditSection getAuditSection() {
+		return auditSection;
+	}
+
+	public MerchantStore getMerchantStore() {
+		return merchantStore;
+	}
+
+	public void setMerchantStore(MerchantStore merchantStore) {
+		this.merchantStore = merchantStore;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public boolean isVisible() {
+		return visible;
+	}
+
+	public void setVisible(boolean visible) {
+		this.visible = visible;
+	}
+
+
+
+	public List<ContentDescription> getDescriptions() {
+		return descriptions;
+	}
+
+	public void setDescriptions(List<ContentDescription> descriptions) {
+		this.descriptions = descriptions;
+	}
+
+	public void setContentType(ContentType contentType) {
+		this.contentType = contentType;
+	}
+
+	public ContentType getContentType() {
+		return contentType;
+	}
+	
+	public ContentDescription getDescription() {
+		
+		if(this.getDescriptions()!=null && this.getDescriptions().size()>0) {
+			return this.getDescriptions().get(0);
+		}
+		
+		return null;
+		
+	}
+
+	public void setSortOrder(Integer sortOrder) {
+		this.sortOrder = sortOrder;
+	}
+
+	public Integer getSortOrder() {
+		return sortOrder;
+	}
+
+	public void setContentPosition(ContentPosition contentPosition) {
+		this.contentPosition = contentPosition;
+	}
+
+	public ContentPosition getContentPosition() {
+		return contentPosition;
+	}
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/content/model/ContentDescription.java b/sm-core/src/main/java/com/salesmanager/core/business/content/model/ContentDescription.java
new file mode 100755
index 0000000..4efeaff
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/content/model/ContentDescription.java
@@ -0,0 +1,98 @@
+package com.salesmanager.core.business.content.model;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
+
+import com.salesmanager.core.business.common.model.Description;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+@Entity
+@Table(name="CONTENT_DESCRIPTION", schema="SALESMANAGER",uniqueConstraints={
+		@UniqueConstraint(columnNames={
+			"CONTENT_ID",
+			"LANGUAGE_ID"
+		})
+	}
+)
+public class ContentDescription extends Description implements Serializable {
+	
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -1252756716545768599L;
+
+	@ManyToOne(targetEntity = Content.class)
+	@JoinColumn(name = "CONTENT_ID", nullable = false)
+	private Content content;
+
+	@Column(name="SEF_URL", length=120)
+	private String seUrl;
+
+	
+	@Column(name="META_KEYWORDS")
+	private String metatagKeywords;
+	
+	@Column(name="META_TITLE")
+	private String metatagTitle;
+	
+	public String getMetatagTitle() {
+		return metatagTitle;
+	}
+
+	public void setMetatagTitle(String metatagTitle) {
+		this.metatagTitle = metatagTitle;
+	}
+
+	@Column(name="META_DESCRIPTION")
+	private String metatagDescription;
+	
+	public ContentDescription() {
+	}
+	
+	public ContentDescription(String name, Language language) {
+		this.setName(name);
+		this.setLanguage(language);
+		super.setId(0L);
+	}
+
+	public Content getContent() {
+		return content;
+	}
+
+	public void setContent(Content content) {
+		this.content = content;
+	}
+
+	public String getSeUrl() {
+		return seUrl;
+	}
+
+	public void setSeUrl(String seUrl) {
+		this.seUrl = seUrl;
+	}
+
+
+	public String getMetatagKeywords() {
+		return metatagKeywords;
+	}
+
+	public void setMetatagKeywords(String metatagKeywords) {
+		this.metatagKeywords = metatagKeywords;
+	}
+
+	public String getMetatagDescription() {
+		return metatagDescription;
+	}
+
+	public void setMetatagDescription(String metatagDescription) {
+		this.metatagDescription = metatagDescription;
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/content/model/ContentFile.java b/sm-core/src/main/java/com/salesmanager/core/business/content/model/ContentFile.java
new file mode 100644
index 0000000..36f3e48
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/content/model/ContentFile.java
@@ -0,0 +1,22 @@
+package com.salesmanager.core.business.content.model;
+
+public abstract class ContentFile {
+	
+	
+	private String fileName;
+	private String mimeType;
+	public void setMimeType(String mimeType) {
+		this.mimeType = mimeType;
+	}
+	public String getMimeType() {
+		return mimeType;
+	}
+	public void setFileName(String fileName) {
+		this.fileName = fileName;
+	}
+	public String getFileName() {
+		return fileName;
+	}
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/content/model/ContentPosition.java b/sm-core/src/main/java/com/salesmanager/core/business/content/model/ContentPosition.java
new file mode 100644
index 0000000..c9fdfb5
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/content/model/ContentPosition.java
@@ -0,0 +1,7 @@
+package com.salesmanager.core.business.content.model;
+
+public enum ContentPosition {
+	
+	LEFT, RIGHT
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/content/model/ContentType.java b/sm-core/src/main/java/com/salesmanager/core/business/content/model/ContentType.java
new file mode 100755
index 0000000..18f53d2
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/content/model/ContentType.java
@@ -0,0 +1,7 @@
+package com.salesmanager.core.business.content.model;
+
+public enum ContentType {
+	
+	BOX, PAGE, SECTION
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/content/model/FileContentType.java b/sm-core/src/main/java/com/salesmanager/core/business/content/model/FileContentType.java
new file mode 100644
index 0000000..d610aa4
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/content/model/FileContentType.java
@@ -0,0 +1,25 @@
+/**
+ * 
+ */
+package com.salesmanager.core.business.content.model;
+
+/**
+ * Enum defining type of static content.
+ * Currently following type of static content can be store and managed within 
+ * Shopizer CMS system
+ * <pre>
+ * 1. Static content like JS, CSS file etc
+ * 2. Digital Data (audio,video)
+ * </pre>
+ * 
+ * StaticContentType will be used to distinguish between Digital data and other type of static data
+ * stored with in the system.
+ * 
+ * @author Umesh Awasthi
+ * @since 1.2
+ *
+ */
+public enum FileContentType
+{
+  STATIC_FILE, IMAGE, LOGO, PRODUCT, PRODUCTLG, PROPERTY, MANUFACTURER, PRODUCT_DIGITAL
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/content/model/ImageContentFile.java b/sm-core/src/main/java/com/salesmanager/core/business/content/model/ImageContentFile.java
new file mode 100644
index 0000000..7524194
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/content/model/ImageContentFile.java
@@ -0,0 +1,22 @@
+package com.salesmanager.core.business.content.model;
+
+import java.io.Serializable;
+
+public class ImageContentFile extends InputContentFile implements Serializable {
+
+	
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -5321162403524229224L;
+	//private BufferedImage bufferedImage;
+
+	//public void setBufferedImage(BufferedImage bufferedImage) {
+	//	this.bufferedImage = bufferedImage;
+	//}
+
+	//public BufferedImage getBufferedImage() {
+	//	return bufferedImage;
+	//}
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/content/model/InputContentFile.java b/sm-core/src/main/java/com/salesmanager/core/business/content/model/InputContentFile.java
new file mode 100644
index 0000000..4cd71bc
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/content/model/InputContentFile.java
@@ -0,0 +1,26 @@
+package com.salesmanager.core.business.content.model;
+
+import java.io.InputStream;
+import java.io.Serializable;
+
+
+public class InputContentFile extends StaticContentFile implements Serializable 
+{
+
+    private static final long serialVersionUID = 1L;
+   
+    private InputStream file;
+   
+    
+    public InputStream getFile()
+    {
+        return file;
+    }
+    public void setFile( InputStream file )
+    {
+        this.file = file;
+    }
+   
+    
+    
+}
\ No newline at end of file

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/content/model/OutputContentFile.java b/sm-core/src/main/java/com/salesmanager/core/business/content/model/OutputContentFile.java
new file mode 100644
index 0000000..cd4bbe1
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/content/model/OutputContentFile.java
@@ -0,0 +1,26 @@
+package com.salesmanager.core.business.content.model;
+
+import java.io.ByteArrayOutputStream;
+import java.io.Serializable;
+
+/**
+ * Data class responsible for carrying out static content data from Infispan cache to 
+ * service layer.
+ * 
+ * @author Umesh Awasthi
+ * @since 1.2
+ */
+public class OutputContentFile extends StaticContentFile implements Serializable
+{
+    private static final long serialVersionUID = 1L;
+    private ByteArrayOutputStream file;
+    public ByteArrayOutputStream getFile()
+    {
+        return file;
+    }
+    public void setFile( ByteArrayOutputStream file )
+    {
+        this.file = file;
+    }
+    
+}
\ No newline at end of file

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/content/model/StaticContentFile.java b/sm-core/src/main/java/com/salesmanager/core/business/content/model/StaticContentFile.java
new file mode 100644
index 0000000..975116c
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/content/model/StaticContentFile.java
@@ -0,0 +1,18 @@
+package com.salesmanager.core.business.content.model;
+
+public abstract class StaticContentFile extends ContentFile {
+	
+	private FileContentType fileContentType;
+
+	public FileContentType getFileContentType() {
+		return fileContentType;
+	}
+
+	public void setFileContentType(FileContentType fileContentType) {
+		this.fileContentType = fileContentType;
+	}
+
+
+	
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/content/service/ContentService.java b/sm-core/src/main/java/com/salesmanager/core/business/content/service/ContentService.java
new file mode 100755
index 0000000..77d1412
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/content/service/ContentService.java
@@ -0,0 +1,149 @@
+package com.salesmanager.core.business.content.service;
+
+import java.util.List;
+
+import com.salesmanager.core.business.content.model.Content;
+import com.salesmanager.core.business.content.model.ContentDescription;
+import com.salesmanager.core.business.content.model.ContentType;
+import com.salesmanager.core.business.content.model.FileContentType;
+import com.salesmanager.core.business.content.model.InputContentFile;
+import com.salesmanager.core.business.content.model.OutputContentFile;
+
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityService;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+
+
+/**
+ * 
+ * Interface defining methods responsible for CMSContentService.
+ * ContentServive will be be entry point for CMS and take care of following functionalities.
+ * <li>Adding,removing Content images for given merchant store</li>
+ * <li>Get,Save,Update Content data for given merchant store</li>
+ *  
+ * @author Umesh Awasthhi
+ *
+ */
+public interface ContentService
+    extends SalesManagerEntityService<Long, Content>
+{
+
+    public List<Content> listByType( ContentType contentType, MerchantStore store, Language language )
+        throws ServiceException;
+
+    public List<Content> listByType( List<ContentType> contentType, MerchantStore store, Language language )
+        throws ServiceException;
+
+    Content getByCode( String code, MerchantStore store )
+        throws ServiceException;
+
+    void saveOrUpdate( Content content )
+        throws ServiceException;
+
+    Content getByCode( String code, MerchantStore store, Language language )
+        throws ServiceException;
+
+    /**
+     * Method responsible for storing content file for given Store.Files for given merchant store will be stored in
+     * Infinispan.
+     * 
+     * @param merchantStoreCode merchant store whose content images are being saved.
+     * @param contentFile content image being stored
+     * @throws ServiceException
+     */
+    void addContentFile( String merchantStoreCode, InputContentFile contentFile )
+        throws ServiceException;
+
+   
+    /**
+     * Method responsible for storing list of content image for given Store.Images for given merchant store will be stored in
+     * Infinispan.
+     * 
+     * @param merchantStoreCode  merchant store whose content images are being saved.
+     * @param contentImagesList list of content images being stored.
+     * @throws ServiceException
+     */
+    void addContentFiles(String merchantStoreCode,List<InputContentFile> contentFilesList) throws ServiceException;
+    
+    
+    /**
+     * Method to remove given content image.Images are stored in underlying system based on there name.
+     * Name will be used to search given image for removal
+     * @param imageContentType
+     * @param imageName
+     * @param merchantStoreCode merchant store code
+     * @throws ServiceException
+     */
+    public void removeFile( String merchantStoreCode, FileContentType fileContentType, String fileName) throws ServiceException;
+    
+    
+    /**
+     * Method to remove all images for a given merchant.It will take merchant store as an input and will
+     * remove all images associated with given merchant store.
+     * 
+     * @param merchantStoreCode
+     * @throws ServiceException
+     */
+    public void removeFiles( String merchantStoreCode ) throws ServiceException;
+    
+    /**
+     * Method responsible for fetching particular content image for a given merchant store. Requested image will be
+     * search in Infinispan tree cache and OutputContentImage will be sent, in case no image is found null will
+     * returned.
+     * 
+     * @param merchantStoreCode
+     * @param imageName
+     * @return {@link OutputContentImage}
+     * @throws ServiceException
+     */
+    public OutputContentFile getContentFile( String merchantStoreCode, FileContentType fileContentType, String fileName )
+        throws ServiceException;
+    
+    
+    /**
+     * Method to get list of all images associated with a given merchant store.In case of no image method will return an empty list.
+     * @param merchantStoreCode
+     * @param imageContentType
+     * @return list of {@link OutputContentImage}
+     * @throws ServiceException
+     */
+    public List<OutputContentFile> getContentFiles( String merchantStoreCode, FileContentType fileContentType )
+                    throws ServiceException;
+
+	
+    List<String> getContentFilesNames(String merchantStoreCode,
+			FileContentType fileContentType) throws ServiceException;
+
+    /**
+     * Add the store logo
+     * @param merchantStoreCode
+     * @param cmsContentImage
+     * @throws ServiceException
+     */
+	void addLogo(String merchantStoreCode, InputContentFile cmsContentImage)
+			throws ServiceException;
+
+	/**
+	 * Adds a property (option) image
+	 * @param merchantStoreId
+	 * @param cmsContentImage
+	 * @throws ServiceException
+	 */
+	void addOptionImage(String merchantStoreCode, InputContentFile cmsContentImage)
+			throws ServiceException;
+
+
+
+	List<Content> listByType(List<ContentType> contentType, MerchantStore store)
+			throws ServiceException;
+
+	List<ContentDescription> listNameByType(List<ContentType> contentType,
+			MerchantStore store, Language language) throws ServiceException;
+
+	Content getByLanguage(Long id, Language language) throws ServiceException;
+
+	ContentDescription getBySeUrl(MerchantStore store, String seUrl);
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/content/service/ContentServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/content/service/ContentServiceImpl.java
new file mode 100755
index 0000000..d8c53d3
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/content/service/ContentServiceImpl.java
@@ -0,0 +1,390 @@
+package com.salesmanager.core.business.content.service;
+
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.Assert;
+
+import com.salesmanager.core.business.content.dao.ContentDao;
+import com.salesmanager.core.business.content.model.Content;
+import com.salesmanager.core.business.content.model.ContentDescription;
+import com.salesmanager.core.business.content.model.ContentType;
+import com.salesmanager.core.business.content.model.FileContentType;
+import com.salesmanager.core.business.content.model.InputContentFile;
+import com.salesmanager.core.business.content.model.OutputContentFile;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityServiceImpl;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.language.model.Language;
+import com.salesmanager.core.modules.cms.content.StaticContentFileManager;
+
+@Service( "contentService" )
+public class ContentServiceImpl
+    extends SalesManagerEntityServiceImpl<Long, Content>
+    implements ContentService
+{
+
+    private static final Logger LOG = LoggerFactory.getLogger( ContentServiceImpl.class );
+
+    private final ContentDao contentDao;
+
+    @Autowired
+    StaticContentFileManager staticContentFileManager;
+    
+    @Autowired
+    StaticContentFileManager contentFileManager;
+
+    @Autowired
+    public ContentServiceImpl( final ContentDao contentDao )
+    {
+        super( contentDao );
+
+        this.contentDao = contentDao;
+    }
+
+    @Override
+    public List<Content> listByType( final ContentType contentType, final MerchantStore store, final Language language )
+        throws ServiceException
+    {
+
+        return contentDao.listByType( contentType, store, language );
+    }
+    
+    @Override
+    public void delete(Content content) throws ServiceException {
+    	
+    	Content c = this.getById(content.getId());
+    	super.delete(c);
+    	
+    	
+    }
+    
+    @Override
+    public Content getByLanguage(Long id, Language language) throws ServiceException {
+    	return contentDao.getByLanguage(id, language);
+    }
+    
+
+
+    @Override
+    public List<Content> listByType( final List<ContentType> contentType, final MerchantStore store, final Language language )
+        throws ServiceException
+    {
+
+
+        return contentDao.listByType( contentType, store, language );
+    }
+    
+    @Override
+    public List<ContentDescription> listNameByType( final List<ContentType> contentType, final MerchantStore store, final Language language )
+            throws ServiceException
+    {
+
+
+            return contentDao.listNameByType(contentType, store, language);
+    }
+    
+    @Override
+    public List<Content> listByType( final List<ContentType> contentType, final MerchantStore store )
+    throws ServiceException
+    {
+
+
+	    return contentDao.listByType( contentType, store );
+    }
+
+    @Override
+    public Content getByCode( final String code, final MerchantStore store )
+        throws ServiceException
+    {
+
+        return contentDao.getByCode( code, store );
+
+    }
+    
+    @Override
+    public Content getById( Long id ) {
+    	return contentDao.getById(id);
+    }
+
+    @Override
+    public void saveOrUpdate( final Content content )
+        throws ServiceException
+    {
+
+        // save or update (persist and attach entities
+        if ( content.getId() != null && content.getId() > 0 )
+        {
+            super.update( content );
+        }
+        else
+        {
+            super.save( content );
+        }
+
+    }
+
+    @Override
+    public Content getByCode( final String code, final MerchantStore store, final Language language )
+        throws ServiceException
+    {
+        return contentDao.getByCode( code, store, language );
+    }
+
+    /**
+     * Method responsible for adding content file for given merchant store in underlying Infinispan tree
+     * cache. It will take  {@link InputContentFile} and will store file for given merchant store according to its type.
+     * it can save an image or any type of file (pdf, css, js ...)
+     * @param merchantStoreCode Merchant store
+     * @param contentFile {@link InputContentFile} being stored
+     * @throws ServiceException service exception
+     */
+    @Override
+    public void addContentFile( final String merchantStoreCode, final InputContentFile contentFile )
+        throws ServiceException
+    {
+        Assert.notNull( merchantStoreCode, "Merchant store Id can not be null" );
+        Assert.notNull( contentFile, "InputContentFile image can not be null" );
+        Assert.notNull( contentFile.getFileContentType(), "InputContentFile.fileContentType can not be null" );
+        
+        if(contentFile.getFileContentType().name().equals(FileContentType.IMAGE.name())
+        		|| contentFile.getFileContentType().name().equals(FileContentType.STATIC_FILE.name())) {
+        	addFile(merchantStoreCode,contentFile);
+        } else {
+        	addImage(merchantStoreCode,contentFile);
+        }
+        
+       
+
+    }
+    
+    @Override
+    public void addLogo( final String merchantStoreCode, InputContentFile cmsContentImage )
+    throws ServiceException {
+    	
+    	
+		    Assert.notNull( merchantStoreCode, "Merchant store Id can not be null" );
+		    Assert.notNull( cmsContentImage, "CMSContent image can not be null" );
+
+		    
+		    cmsContentImage.setFileContentType(FileContentType.LOGO);
+		    addImage(merchantStoreCode,cmsContentImage);
+		   
+
+    }
+    
+    @Override
+    public void addOptionImage( final String merchantStoreCode, InputContentFile cmsContentImage )
+    throws ServiceException {
+    	
+    	
+		    Assert.notNull( merchantStoreCode, "Merchant store Id can not be null" );
+		    Assert.notNull( cmsContentImage, "CMSContent image can not be null" );
+		    cmsContentImage.setFileContentType(FileContentType.PROPERTY);
+		    addImage(merchantStoreCode,cmsContentImage);
+		   
+
+    }
+    
+    
+    private void addImage(final String merchantStoreCode, InputContentFile contentImage ) throws ServiceException {
+    	
+    	try
+	    {
+	        LOG.info( "Adding content image for merchant id {}", merchantStoreCode);
+	        contentFileManager.addFile( merchantStoreCode, contentImage );
+	        
+	    } catch ( Exception e )
+		 {
+		        LOG.error( "Error while trying to convert input stream to buffered image", e );
+		        throw new ServiceException( e );
+		
+		 } finally {
+			 
+			 try {
+				if(contentImage.getFile()!=null) {
+					contentImage.getFile().close();
+				}
+			} catch (Exception ignore) {}
+			 
+		 }
+
+    }
+    
+    private void addFile(final String merchantStoreCode, InputContentFile contentImage ) throws ServiceException {
+    	
+    	try
+	    {
+	        LOG.info( "Adding content file for merchant id {}", merchantStoreCode);
+	        staticContentFileManager.addFile(merchantStoreCode, contentImage);
+	        
+	    } catch ( Exception e )
+		 {
+		        LOG.error( "Error while trying to convert input stream to buffered image", e );
+		        throw new ServiceException( e );
+		
+		 } finally {
+			 
+			 try {
+				if(contentImage.getFile()!=null) {
+					contentImage.getFile().close();
+				}
+			} catch (Exception ignore) {}
+		 }
+
+    }
+
+
+
+    /**
+     * Method responsible for adding list of content images for given merchant store in underlying Infinispan tree
+     * cache. It will take list of {@link CMSContentImage} and will store them for given merchant store.
+     * 
+     * @param merchantStoreCode Merchant store
+     * @param contentImagesList list of {@link CMSContentImage} being stored
+     * @throws ServiceException service exception
+     */
+	@Override
+	public void addContentFiles(String merchantStoreCode,
+			List<InputContentFile> contentFilesList) throws ServiceException {
+		
+        Assert.notNull( merchantStoreCode, "Merchant store ID can not be null" );
+        Assert.notEmpty( contentFilesList, "File list can not be empty" );
+        LOG.info( "Adding total {} images for given merchant",contentFilesList.size() );
+		
+        LOG.info( "Adding content images for merchant...." );
+        //contentFileManager.addImages( merchantStoreCode, contentImagesList );
+        staticContentFileManager.addFiles(merchantStoreCode, contentFilesList);
+        
+        try {
+			for(InputContentFile file : contentFilesList) {
+				if(file.getFile()!=null) {
+					file.getFile().close();
+				}
+			}
+		} catch (Exception e) {
+			throw new ServiceException(e);
+		}
+		
+	}
+	
+    /**
+     * Method to remove given content image.Images are stored in underlying system based on there name.
+     * Name will be used to search given image for removal
+     * @param contentImage
+     * @param merchantStoreCode merchant store
+     * @throws ServiceException
+     */
+	@Override
+	public void removeFile(String merchantStoreCode,
+			FileContentType fileContentType, String fileName)
+			throws ServiceException {
+        Assert.notNull( merchantStoreCode, "Merchant Store Id can not be null" );
+        Assert.notNull( fileContentType, "Content file type can not be null" );
+        Assert.notNull( fileName, "Content Image type can not be null" );
+        
+        
+        //check where to remove the file
+        if(fileContentType.name().equals(FileContentType.IMAGE.name())
+        		|| fileContentType.name().equals(FileContentType.STATIC_FILE.name())) {
+        	staticContentFileManager.removeFile(merchantStoreCode, fileContentType, fileName);
+        } else {
+        	contentFileManager.removeFile( merchantStoreCode, fileContentType, fileName );
+        }
+		
+	}
+
+    /**
+     * Method to remove all images for a given merchant.It will take merchant store as an input and will
+     * remove all images associated with given merchant store.
+     * 
+     * @param merchantStoreCode
+     * @throws ServiceException
+     */
+	@Override
+	public void removeFiles(String merchantStoreCode) throws ServiceException {
+        Assert.notNull( merchantStoreCode, "Merchant Store Id can not be null" );
+        
+
+        
+        contentFileManager.removeFiles( merchantStoreCode );
+        staticContentFileManager.removeFiles(merchantStoreCode);
+		
+	}
+
+	
+    /**
+     * Implementation for getContentImage method defined in {@link ContentService} interface. Methods will return
+     * Content image with given image name for the Merchant store or will return null if no image with given name found
+     * for requested Merchant Store in Infinispan tree cache.
+     * 
+     * @param store Merchant merchantStoreCode
+     * @param imageName name of requested image
+     * @return {@link OutputContentImage}
+     * @throws ServiceException
+     */
+	@Override
+	public OutputContentFile getContentFile(String merchantStoreCode,
+			FileContentType fileContentType, String fileName)
+			throws ServiceException {
+        Assert.notNull( merchantStoreCode, "Merchant store ID can not be null" );
+        Assert.notNull( fileName, "File name can not be null" );
+        
+        if(fileContentType.name().equals(FileContentType.IMAGE.name())
+        		|| fileContentType.name().equals(FileContentType.STATIC_FILE.name())) {
+        	return staticContentFileManager.getFile(merchantStoreCode, fileContentType, fileName);
+        	
+        } else {
+        	return contentFileManager.getFile( merchantStoreCode, fileContentType, fileName );
+        }
+        
+
+	}
+
+    /**
+     * Implementation for getContentImages method defined in {@link ContentService} interface. Methods will return list of all
+     * Content image associated with given  Merchant store or will return empty list if no image is associated with
+     * given Merchant Store in Infinispan tree cache.
+     * 
+     * @param merchantStoreId Merchant store
+     * @return list of {@link OutputContentImage}
+     * @throws ServiceException
+     */
+	@Override
+	public List<OutputContentFile> getContentFiles(String merchantStoreCode,
+			FileContentType fileContentType) throws ServiceException {
+        Assert.notNull( merchantStoreCode, "Merchant store Id can not be null" );
+        return staticContentFileManager.getFiles(merchantStoreCode, fileContentType);
+	}
+
+    /**
+     * Returns the image names for a given merchant and store
+     * @param merchantStoreCode
+     * @param imageContentType
+     * @return images name list
+     * @throws ServiceException
+     */
+	@Override
+	public List<String> getContentFilesNames(String merchantStoreCode,
+			FileContentType fileContentType) throws ServiceException {
+        Assert.notNull( merchantStoreCode, "Merchant store Id can not be null" );
+        
+        if(fileContentType.name().equals(FileContentType.IMAGE.name())
+        		|| fileContentType.name().equals(FileContentType.STATIC_FILE.name())) {
+        	return staticContentFileManager.getFileNames(merchantStoreCode, fileContentType);
+        } else {
+        	return contentFileManager.getFileNames(merchantStoreCode, fileContentType);
+        }
+	}
+	
+	@Override
+	public ContentDescription getBySeUrl(MerchantStore store,String seUrl) {
+		return contentDao.getBySeUrl(store, seUrl);
+	}
+
+    
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/customer/CustomerRegistrationException.java b/sm-core/src/main/java/com/salesmanager/core/business/customer/CustomerRegistrationException.java
new file mode 100644
index 0000000..2fce46a
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/customer/CustomerRegistrationException.java
@@ -0,0 +1,33 @@
+package com.salesmanager.core.business.customer;
+
+
+
+/**
+ * <p>Exception thrown when system able register customer
+ * </p>
+ * 
+ * @author Umesh Awasthi
+ * @since 1.2
+ *
+ */
+public class CustomerRegistrationException extends Exception
+{
+
+    private static final long serialVersionUID = 879320340641131133L;
+    
+    public CustomerRegistrationException(final String msg, final Throwable cause)
+    {
+        super(msg, cause);
+    }
+
+    public CustomerRegistrationException(final String msg)
+    {
+        super(msg);
+    }
+    
+    public CustomerRegistrationException(Throwable t)
+    {
+        super(t);
+    }
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/customer/dao/attribute/CustomerAttributeDao.java b/sm-core/src/main/java/com/salesmanager/core/business/customer/dao/attribute/CustomerAttributeDao.java
new file mode 100644
index 0000000..cd3df64
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/customer/dao/attribute/CustomerAttributeDao.java
@@ -0,0 +1,21 @@
+package com.salesmanager.core.business.customer.dao.attribute;
+
+import java.util.List;
+
+import com.salesmanager.core.business.customer.model.attribute.CustomerAttribute;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDao;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+
+public interface CustomerAttributeDao extends SalesManagerEntityDao<Long, CustomerAttribute> {
+
+	CustomerAttribute getByOptionId(MerchantStore store, Long customerId, Long id);
+
+	List<CustomerAttribute> getByOptionValueId(MerchantStore store, Long id);
+
+	List<CustomerAttribute> getByOptionId(MerchantStore store, Long id);
+
+	List<CustomerAttribute> getByCustomerId(MerchantStore store, Long customerId);
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/customer/dao/attribute/CustomerAttributeDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/customer/dao/attribute/CustomerAttributeDaoImpl.java
new file mode 100644
index 0000000..dea06d2
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/customer/dao/attribute/CustomerAttributeDaoImpl.java
@@ -0,0 +1,140 @@
+package com.salesmanager.core.business.customer.dao.attribute;
+
+import java.util.List;
+
+import org.springframework.stereotype.Repository;
+
+import com.mysema.query.jpa.JPQLQuery;
+import com.mysema.query.jpa.impl.JPAQuery;
+import com.salesmanager.core.business.customer.model.QCustomer;
+import com.salesmanager.core.business.customer.model.attribute.CustomerAttribute;
+import com.salesmanager.core.business.customer.model.attribute.QCustomerAttribute;
+import com.salesmanager.core.business.customer.model.attribute.QCustomerOption;
+import com.salesmanager.core.business.customer.model.attribute.QCustomerOptionValue;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDaoImpl;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+
+@Repository("customerAttributeDao")
+public class CustomerAttributeDaoImpl extends SalesManagerEntityDaoImpl<Long, CustomerAttribute> 
+	implements CustomerAttributeDao {
+	
+	
+	@Override
+	public CustomerAttribute getById(Long id) {
+		QCustomerAttribute qCustomerAttribute = QCustomerAttribute.customerAttribute;
+		QCustomerOption qCustomerOption = QCustomerOption.customerOption;
+		QCustomerOptionValue qCustomerOptionValue = QCustomerOptionValue.customerOptionValue;
+		
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qCustomerAttribute)
+			.join(qCustomerAttribute.customer).fetch()
+			.leftJoin(qCustomerAttribute.customerOption, qCustomerOption).fetch()
+			.leftJoin(qCustomerAttribute.customerOptionValue, qCustomerOptionValue).fetch()
+			.leftJoin(qCustomerOption.descriptions).fetch()
+			.leftJoin(qCustomerOptionValue.descriptions).fetch()
+			.where(qCustomerAttribute.id.eq(id));
+		
+		return query.uniqueResult(qCustomerAttribute);
+
+	}
+	
+	@Override
+	public CustomerAttribute getByOptionId(MerchantStore store, Long customerId, Long id) {
+		QCustomerAttribute qCustomerAttribute = QCustomerAttribute.customerAttribute;
+		QCustomerOption qCustomerOption = QCustomerOption.customerOption;
+		QCustomer qCustomer = QCustomer.customer;
+		QCustomerOptionValue qCustomerOptionValue = QCustomerOptionValue.customerOptionValue;
+		
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qCustomerAttribute)
+		.join(qCustomerAttribute.customer,qCustomer).fetch()
+		.leftJoin(qCustomerAttribute.customerOption, qCustomerOption).fetch()
+		.leftJoin(qCustomerAttribute.customerOptionValue, qCustomerOptionValue).fetch()
+		.leftJoin(qCustomerOption.descriptions).fetch()
+		.leftJoin(qCustomerOptionValue.descriptions).fetch()
+		.where(qCustomerOption.merchantStore.id.eq(store.getId())
+				.and(qCustomerOption.id.eq(id))
+				.and(qCustomer.id.eq(customerId)));
+
+		
+		return query.uniqueResult(qCustomerAttribute);
+	}
+	
+	@Override
+	public List<CustomerAttribute> getByCustomerId(MerchantStore store, Long customerId) {
+		QCustomerAttribute qCustomerAttribute = QCustomerAttribute.customerAttribute;
+		QCustomerOption qCustomerOption = QCustomerOption.customerOption;
+		QCustomer qCustomer = QCustomer.customer;
+		QCustomerOptionValue qCustomerOptionValue = QCustomerOptionValue.customerOptionValue;
+		
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		
+		query.from(qCustomerAttribute)
+		.join(qCustomerAttribute.customer,qCustomer).fetch()
+		.leftJoin(qCustomerAttribute.customerOption, qCustomerOption).fetch()
+		.leftJoin(qCustomerAttribute.customerOptionValue, qCustomerOptionValue).fetch()
+		.leftJoin(qCustomerOption.descriptions).fetch()
+		.leftJoin(qCustomerOptionValue.descriptions).fetch()
+		.where(qCustomerOption.merchantStore.id.eq(store.getId())
+				.and(qCustomer.id.eq(customerId)));
+
+		System.out.println("done");
+		
+		return query.listDistinct(qCustomerAttribute);
+	}
+	
+	@Override
+	public List<CustomerAttribute> getByOptionValueId(MerchantStore store, Long id) {
+		QCustomerAttribute qCustomerAttribute = QCustomerAttribute.customerAttribute;
+		QCustomerOption qCustomerOption = QCustomerOption.customerOption;
+		QCustomerOptionValue qCustomerOptionValue = QCustomerOptionValue.customerOptionValue;
+		
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qCustomerAttribute)
+		.join(qCustomerAttribute.customer).fetch()
+		.leftJoin(qCustomerAttribute.customerOption, qCustomerOption).fetch()
+		.leftJoin(qCustomerAttribute.customerOptionValue, qCustomerOptionValue).fetch()
+		.leftJoin(qCustomerOption.descriptions).fetch()
+		.leftJoin(qCustomerOptionValue.descriptions).fetch()
+		.where(qCustomerOptionValue.merchantStore.id.eq(store.getId())
+				.and(qCustomerOptionValue.id.eq(id)));
+
+		
+		return query.list(qCustomerAttribute);
+	}
+	
+	@Override
+	public List<CustomerAttribute> getByOptionId(MerchantStore store, Long id) {
+		QCustomerAttribute qCustomerAttribute = QCustomerAttribute.customerAttribute;
+		QCustomerOption qCustomerOption = QCustomerOption.customerOption;
+		QCustomerOptionValue qCustomerOptionValue = QCustomerOptionValue.customerOptionValue;
+		
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qCustomerAttribute)
+		.join(qCustomerAttribute.customer).fetch()
+		.leftJoin(qCustomerAttribute.customerOption, qCustomerOption).fetch()
+		.leftJoin(qCustomerAttribute.customerOptionValue, qCustomerOptionValue).fetch()
+		.leftJoin(qCustomerOption.descriptions).fetch()
+		.leftJoin(qCustomerOptionValue.descriptions).fetch()
+		.where(qCustomerOptionValue.merchantStore.id.eq(store.getId())
+				.and(qCustomerOption.id.eq(id)));
+
+		
+		return query.list(qCustomerAttribute);
+	}
+
+
+	
+
+	
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/customer/dao/attribute/CustomerOptionDao.java b/sm-core/src/main/java/com/salesmanager/core/business/customer/dao/attribute/CustomerOptionDao.java
new file mode 100644
index 0000000..1dc0ed9
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/customer/dao/attribute/CustomerOptionDao.java
@@ -0,0 +1,28 @@
+package com.salesmanager.core.business.customer.dao.attribute;
+
+import java.util.List;
+
+import com.salesmanager.core.business.customer.model.attribute.CustomerOption;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDao;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+public interface CustomerOptionDao extends SalesManagerEntityDao<Long, CustomerOption> {
+
+	List<CustomerOption> listByStore(MerchantStore store, Language language);
+
+
+
+	void saveOrUpdate(CustomerOption entity) throws ServiceException;
+
+
+	/**
+	 * Get a unique CustomerOption by code
+	 * @param store
+	 * @param optionCode
+	 * @return
+	 */
+	CustomerOption getByCode(MerchantStore store, String optionCode);
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/customer/dao/attribute/CustomerOptionDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/customer/dao/attribute/CustomerOptionDaoImpl.java
new file mode 100644
index 0000000..312613a
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/customer/dao/attribute/CustomerOptionDaoImpl.java
@@ -0,0 +1,107 @@
+package com.salesmanager.core.business.customer.dao.attribute;
+
+import java.util.List;
+
+import org.springframework.stereotype.Repository;
+
+import com.mysema.query.jpa.JPQLQuery;
+import com.mysema.query.jpa.impl.JPAQuery;
+import com.salesmanager.core.business.customer.model.attribute.CustomerOption;
+import com.salesmanager.core.business.customer.model.attribute.QCustomerOption;
+import com.salesmanager.core.business.customer.model.attribute.QCustomerOptionDescription;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDaoImpl;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+@Repository("customerOptionDao")
+public class CustomerOptionDaoImpl extends SalesManagerEntityDaoImpl<Long, CustomerOption>
+		implements CustomerOptionDao {
+	
+	@Override
+	public List<CustomerOption> listByStore(MerchantStore store, Language language) {
+		
+
+		QCustomerOption qCustomerOption = QCustomerOption.customerOption;
+		QCustomerOptionDescription qCustomerOptionDescription = QCustomerOptionDescription.customerOptionDescription;
+		
+		
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qCustomerOption)
+			.leftJoin(qCustomerOption.descriptions, qCustomerOptionDescription).fetch()
+			.leftJoin(qCustomerOption.merchantStore).fetch()
+			.where(qCustomerOption.merchantStore.id.eq(store.getId())
+			.and(qCustomerOptionDescription.language.id.eq(language.getId())))
+			.orderBy(qCustomerOption.sortOrder.asc());
+		
+		return query.listDistinct(qCustomerOption);
+
+	}
+	
+	@Override
+	public CustomerOption getById(Long id) {
+		
+		
+		QCustomerOption qCustomerOption = QCustomerOption.customerOption;
+		QCustomerOptionDescription qCustomerOptionDescription = QCustomerOptionDescription.customerOptionDescription;
+		
+		
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qCustomerOption)
+			.leftJoin(qCustomerOption.descriptions, qCustomerOptionDescription).fetch()
+			.leftJoin(qCustomerOption.merchantStore).fetch()
+			.where(qCustomerOption.id.eq(id));
+		
+		return query.uniqueResult(qCustomerOption);
+		
+
+
+	}
+	
+	@Override
+	public CustomerOption getByCode(MerchantStore store, String optionCode) {
+		
+		
+		QCustomerOption qCustomerOption = QCustomerOption.customerOption;
+		QCustomerOptionDescription qCustomerOptionDescription = QCustomerOptionDescription.customerOptionDescription;
+		
+		
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qCustomerOption)
+			.leftJoin(qCustomerOption.descriptions, qCustomerOptionDescription).fetch()
+			.leftJoin(qCustomerOption.merchantStore).fetch()
+			.where(qCustomerOption.merchantStore.id.eq(store.getId())
+			.and(qCustomerOption.code.eq(optionCode)));
+		
+		return query.uniqueResult(qCustomerOption);
+		
+
+
+	}
+	
+
+	
+	@Override
+	public void saveOrUpdate(CustomerOption entity) throws ServiceException {
+
+		if(entity.getId()!=null && entity.getId()>0) {
+
+			super.update(entity);
+			
+		} else {
+			
+			super.save(entity);
+			
+		}
+		
+	}
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/customer/dao/attribute/CustomerOptionSetDao.java b/sm-core/src/main/java/com/salesmanager/core/business/customer/dao/attribute/CustomerOptionSetDao.java
new file mode 100644
index 0000000..0f1f9f5
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/customer/dao/attribute/CustomerOptionSetDao.java
@@ -0,0 +1,26 @@
+package com.salesmanager.core.business.customer.dao.attribute;
+
+import java.util.List;
+
+import com.salesmanager.core.business.customer.model.attribute.CustomerOptionSet;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDao;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+public interface CustomerOptionSetDao extends SalesManagerEntityDao<Long, CustomerOptionSet> {
+
+	List<CustomerOptionSet> getByOptionId(MerchantStore store, Long id);
+
+	List<CustomerOptionSet> listByStore(MerchantStore store, Language language);
+
+	CustomerOptionSet getById(Long customerOptionSetId);
+
+	List<CustomerOptionSet> getByOptionValueId(MerchantStore store, Long id);
+
+
+
+
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/customer/dao/attribute/CustomerOptionSetDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/customer/dao/attribute/CustomerOptionSetDaoImpl.java
new file mode 100644
index 0000000..8079ce9
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/customer/dao/attribute/CustomerOptionSetDaoImpl.java
@@ -0,0 +1,150 @@
+package com.salesmanager.core.business.customer.dao.attribute;
+
+import java.util.List;
+
+import org.springframework.stereotype.Repository;
+
+import com.mysema.query.jpa.JPQLQuery;
+import com.mysema.query.jpa.impl.JPAQuery;
+import com.salesmanager.core.business.customer.model.attribute.CustomerOptionSet;
+import com.salesmanager.core.business.customer.model.attribute.QCustomerOption;
+import com.salesmanager.core.business.customer.model.attribute.QCustomerOptionDescription;
+import com.salesmanager.core.business.customer.model.attribute.QCustomerOptionSet;
+import com.salesmanager.core.business.customer.model.attribute.QCustomerOptionValue;
+import com.salesmanager.core.business.customer.model.attribute.QCustomerOptionValueDescription;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDaoImpl;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+@Repository("customerOptionSetDao")
+public class CustomerOptionSetDaoImpl extends SalesManagerEntityDaoImpl<Long, CustomerOptionSet> implements CustomerOptionSetDao {
+	
+
+	@Override
+	public CustomerOptionSet getById(Long customerOptionSetId) {
+		QCustomerOptionSet qCustomerOptionSet= QCustomerOptionSet.customerOptionSet;
+		QCustomerOption qCustomerOption = QCustomerOption.customerOption;
+		QCustomerOptionValue qCustomerOptionValue = QCustomerOptionValue.customerOptionValue;
+		
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qCustomerOptionSet)
+			.join(qCustomerOptionSet.customerOption,qCustomerOption).fetch()
+			.join(qCustomerOptionSet.customerOptionValue,qCustomerOptionValue).fetch()
+			.join(qCustomerOption.merchantStore).fetch()
+			.join(qCustomerOptionValue.merchantStore).fetch()
+			.leftJoin(qCustomerOption.descriptions).fetch()
+			.leftJoin(qCustomerOptionValue.descriptions).fetch()
+			.where(qCustomerOptionSet.id.eq(customerOptionSetId)
+			);
+		
+		return query.uniqueResult(qCustomerOptionSet);
+
+
+	}
+	
+	@Override
+	public List<CustomerOptionSet> getByOptionId(MerchantStore store, Long id) {
+		QCustomerOptionSet qCustomerOptionSet= QCustomerOptionSet.customerOptionSet;
+		QCustomerOption qCustomerOption = QCustomerOption.customerOption;
+		QCustomerOptionValue qCustomerOptionValue = QCustomerOptionValue.customerOptionValue;
+		
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qCustomerOptionSet)
+			.join(qCustomerOptionSet.customerOption,qCustomerOption).fetch()
+			.join(qCustomerOption.merchantStore).fetch()
+			.join(qCustomerOptionSet.customerOptionValue,qCustomerOptionValue).fetch()
+			.join(qCustomerOptionValue.merchantStore).fetch()
+			.leftJoin(qCustomerOption.descriptions).fetch()
+			.leftJoin(qCustomerOptionValue.descriptions).fetch()
+			.where(qCustomerOption.id.eq(id)
+					.and(qCustomerOption.merchantStore.id.eq(store.getId())));
+
+		
+		return query.list(qCustomerOptionSet);
+	}
+	
+	@Override
+	public List<CustomerOptionSet> getByOptionValueId(MerchantStore store, Long id) {
+		QCustomerOptionSet qCustomerOptionSet= QCustomerOptionSet.customerOptionSet;
+		QCustomerOption qCustomerOption = QCustomerOption.customerOption;
+		QCustomerOptionValue qCustomerOptionValue = QCustomerOptionValue.customerOptionValue;
+		
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qCustomerOptionSet)
+			.join(qCustomerOptionSet.customerOption,qCustomerOption).fetch()
+			.join(qCustomerOption.merchantStore).fetch()
+			.join(qCustomerOptionSet.customerOptionValue,qCustomerOptionValue).fetch()
+			.join(qCustomerOptionValue.merchantStore).fetch()
+			.leftJoin(qCustomerOption.descriptions).fetch()
+			.leftJoin(qCustomerOptionValue.descriptions).fetch()
+			.where(qCustomerOptionValue.id.eq(id)
+					.and(qCustomerOption.merchantStore.id.eq(store.getId())));
+
+		
+		return query.list(qCustomerOptionSet);
+	}
+	
+	@Override
+	public List<CustomerOptionSet> listByStore(MerchantStore store, Language language) {
+
+		
+		QCustomerOptionSet qCustomerOptionSet= QCustomerOptionSet.customerOptionSet;
+		QCustomerOption qCustomerOption = QCustomerOption.customerOption;
+		QCustomerOptionDescription qCustomerOptionDescription = QCustomerOptionDescription.customerOptionDescription;
+		QCustomerOptionValue qCustomerOptionValue = QCustomerOptionValue.customerOptionValue;
+		QCustomerOptionValueDescription qCustomerOptionValueDescription = QCustomerOptionValueDescription.customerOptionValueDescription;
+		
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qCustomerOptionSet)
+			.join(qCustomerOptionSet.customerOption,qCustomerOption).fetch()
+			.join(qCustomerOptionSet.customerOptionValue,qCustomerOptionValue).fetch()
+			.leftJoin(qCustomerOption.descriptions,qCustomerOptionDescription).fetch()
+			.leftJoin(qCustomerOptionValue.descriptions,qCustomerOptionValueDescription).fetch()
+			.where(qCustomerOption.merchantStore.id.eq(store.getId())
+			.and(qCustomerOptionDescription.language.id.eq(language.getId()))
+			.and(qCustomerOptionValueDescription.language.id.eq(language.getId()))
+			).orderBy(qCustomerOptionSet.sortOrder.asc());
+
+		
+		return query.list(qCustomerOptionSet);
+		
+		
+		
+/*		StringBuilder qs = new StringBuilder();
+		qs.append("select distinct cos from CustomerOptionSet as cos ");
+		qs.append("join fetch cos.customerOption po ");
+		qs.append("join fetch cos.customerOptionValue ov ");
+		qs.append("join fetch po.merchantStore pm ");
+		qs.append("left join fetch po.descriptions pop ");
+		qs.append("left join fetch ov.descriptions ovd ");
+		qs.append("where pm.id =:mid ");
+		qs.append("and pop.language.id =:lid ");
+		qs.append("and ovd.language.id =:lid ");
+		qs.append("order by cos.sortOrder asc");
+		
+		String hql = qs.toString();
+		Query q = super.getEntityManager().createQuery(hql);
+
+
+    	q.setParameter("mid", store.getId());
+    	q.setParameter("lid", language.getId());
+
+		
+		@SuppressWarnings("unchecked")
+		List<CustomerOptionSet> returnList = q.getResultList();
+		return returnList;*/
+	}
+	
+
+	
+
+	
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/customer/dao/attribute/CustomerOptionValueDao.java b/sm-core/src/main/java/com/salesmanager/core/business/customer/dao/attribute/CustomerOptionValueDao.java
new file mode 100644
index 0000000..d7b9753
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/customer/dao/attribute/CustomerOptionValueDao.java
@@ -0,0 +1,18 @@
+package com.salesmanager.core.business.customer.dao.attribute;
+
+import java.util.List;
+
+import com.salesmanager.core.business.customer.model.attribute.CustomerOptionValue;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDao;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+public interface CustomerOptionValueDao extends SalesManagerEntityDao<Long, CustomerOptionValue> {
+
+	List<CustomerOptionValue> listByStore(MerchantStore store, Language language);
+
+	CustomerOptionValue getByCode(MerchantStore store, String optionValueCode);
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/customer/dao/attribute/CustomerOptionValueDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/customer/dao/attribute/CustomerOptionValueDaoImpl.java
new file mode 100644
index 0000000..88c1bbe
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/customer/dao/attribute/CustomerOptionValueDaoImpl.java
@@ -0,0 +1,92 @@
+package com.salesmanager.core.business.customer.dao.attribute;
+
+import java.util.List;
+
+import org.springframework.stereotype.Repository;
+
+import com.mysema.query.jpa.JPQLQuery;
+import com.mysema.query.jpa.impl.JPAQuery;
+import com.salesmanager.core.business.customer.model.attribute.CustomerOptionValue;
+import com.salesmanager.core.business.customer.model.attribute.QCustomerOptionValue;
+import com.salesmanager.core.business.customer.model.attribute.QCustomerOptionValueDescription;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDaoImpl;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+@Repository("customerOptionValueDao")
+public class CustomerOptionValueDaoImpl extends SalesManagerEntityDaoImpl<Long, CustomerOptionValue>
+		implements CustomerOptionValueDao {
+	
+	
+	@Override
+	public List<CustomerOptionValue> listByStore(MerchantStore store, Language language) {
+		
+		
+		QCustomerOptionValue qCustomerOptionValue = QCustomerOptionValue.customerOptionValue;
+		QCustomerOptionValueDescription qCustomerOptionValueDescription = QCustomerOptionValueDescription.customerOptionValueDescription;
+		
+
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qCustomerOptionValue)
+			.leftJoin(qCustomerOptionValue.descriptions, qCustomerOptionValueDescription).fetch()
+			.leftJoin(qCustomerOptionValue.merchantStore).fetch()
+			.where(qCustomerOptionValue.merchantStore.id.eq(store.getId())
+			.and(qCustomerOptionValueDescription.language.id.eq(language.getId())))
+			.orderBy(qCustomerOptionValue.sortOrder.asc());
+		
+		return query.listDistinct(qCustomerOptionValue);
+
+		
+	}
+	
+
+	
+
+	
+	@Override
+	public CustomerOptionValue getById(Long id) {
+		
+		
+		
+		QCustomerOptionValue qCustomerOptionValue = QCustomerOptionValue.customerOptionValue;
+		QCustomerOptionValueDescription qCustomerOptionValueDescription = QCustomerOptionValueDescription.customerOptionValueDescription;
+		
+		
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qCustomerOptionValue)
+			.leftJoin(qCustomerOptionValue.descriptions, qCustomerOptionValueDescription).fetch()
+			.leftJoin(qCustomerOptionValue.merchantStore).fetch()
+			.where(qCustomerOptionValue.id.eq(id));
+		
+		return query.uniqueResult(qCustomerOptionValue);
+
+	}
+	
+	@Override
+	public CustomerOptionValue getByCode(MerchantStore store, String optionValueCode) {
+		
+		
+		
+		QCustomerOptionValue qCustomerOptionValue = QCustomerOptionValue.customerOptionValue;
+		QCustomerOptionValueDescription qCustomerOptionValueDescription = QCustomerOptionValueDescription.customerOptionValueDescription;
+		
+		
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qCustomerOptionValue)
+			.leftJoin(qCustomerOptionValue.descriptions, qCustomerOptionValueDescription).fetch()
+			.leftJoin(qCustomerOptionValue.merchantStore).fetch()
+			.where(qCustomerOptionValue.merchantStore.id.eq(store.getId())
+			.and(qCustomerOptionValue.code.eq(optionValueCode)));
+		
+		return query.uniqueResult(qCustomerOptionValue);
+
+	}
+	
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/customer/dao/CustomerDAO.java b/sm-core/src/main/java/com/salesmanager/core/business/customer/dao/CustomerDAO.java
new file mode 100644
index 0000000..3688b10
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/customer/dao/CustomerDAO.java
@@ -0,0 +1,24 @@
+package com.salesmanager.core.business.customer.dao;
+
+import java.util.List;
+
+import com.salesmanager.core.business.customer.model.Customer;
+import com.salesmanager.core.business.customer.model.CustomerCriteria;
+import com.salesmanager.core.business.customer.model.CustomerList;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDao;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+
+public interface CustomerDAO extends SalesManagerEntityDao<Long, Customer> {
+	
+	public List<Customer> getByName(String name);
+
+	List<Customer> listByStore(MerchantStore store);
+
+	Customer getByNick(String nick);
+
+	CustomerList listByStore(MerchantStore store, CustomerCriteria criteria);
+
+	Customer getByNick(String nick, int storeId);
+	
+	
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/customer/dao/CustomerDAOImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/customer/dao/CustomerDAOImpl.java
new file mode 100644
index 0000000..69aa086
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/customer/dao/CustomerDAOImpl.java
@@ -0,0 +1,332 @@
+package com.salesmanager.core.business.customer.dao;
+
+import java.util.List;
+
+import javax.persistence.NoResultException;
+import javax.persistence.Query;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Repository;
+
+import com.mysema.query.BooleanBuilder;
+import com.mysema.query.jpa.JPQLQuery;
+import com.mysema.query.jpa.impl.JPAQuery;
+import com.salesmanager.core.business.customer.model.Customer;
+import com.salesmanager.core.business.customer.model.CustomerCriteria;
+import com.salesmanager.core.business.customer.model.CustomerList;
+import com.salesmanager.core.business.customer.model.QCustomer;
+import com.salesmanager.core.business.customer.model.attribute.QCustomerAttribute;
+import com.salesmanager.core.business.customer.model.attribute.QCustomerOption;
+import com.salesmanager.core.business.customer.model.attribute.QCustomerOptionValue;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDaoImpl;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.merchant.model.QMerchantStore;
+import com.salesmanager.core.business.reference.country.model.QCountry;
+import com.salesmanager.core.business.reference.zone.model.QZone;
+
+@Repository("customerDao")
+public class CustomerDAOImpl extends SalesManagerEntityDaoImpl<Long, Customer> implements CustomerDAO {
+
+	public CustomerDAOImpl() {
+		super();
+	}
+	
+	
+	@Override
+	public Customer getById(Long id){
+		QCustomer qCustomer = QCustomer.customer;
+		QCountry qCountry = QCountry.country;
+		QZone qZone = QZone.zone;
+		QCustomerAttribute qCustomerAttribute = QCustomerAttribute.customerAttribute;
+		QCustomerOption qCustomerOption = QCustomerOption.customerOption;
+		QCustomerOptionValue qCustomerOptionValue = QCustomerOptionValue.customerOptionValue;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qCustomer)
+			.join(qCustomer.merchantStore).fetch()
+			//.leftJoin(qCustomer.billing.country,qCountry).fetch()
+			//.leftJoin(qCustomer.billing.zone,qZone).fetch()
+			.leftJoin(qCustomer.defaultLanguage).fetch()
+			.leftJoin(qCustomer.attributes,qCustomerAttribute).fetch()
+			.leftJoin(qCustomerAttribute.customerOption, qCustomerOption).fetch()
+			.leftJoin(qCustomerAttribute.customerOptionValue, qCustomerOptionValue).fetch()
+			.leftJoin(qCustomerOption.descriptions).fetch()
+			.leftJoin(qCustomerOptionValue.descriptions).fetch()
+			.where(qCustomer.id.eq(id));
+		
+		return query.uniqueResult(qCustomer);
+	}
+	
+
+	
+	@Override
+	public List<Customer> getByName(String name){
+		QCustomer qCustomer = QCustomer.customer;
+		QCountry qCountry = QCountry.country;
+		QZone qZone = QZone.zone;
+		QCustomerAttribute qCustomerAttribute = QCustomerAttribute.customerAttribute;
+		QCustomerOption qCustomerOption = QCustomerOption.customerOption;
+		QCustomerOptionValue qCustomerOptionValue = QCustomerOptionValue.customerOptionValue;
+		
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qCustomer)
+			.join(qCustomer.merchantStore).fetch()
+			//.leftJoin(qCustomer.billing.country,qCountry).fetch()
+			//.leftJoin(qCustomer.billing.zone,qZone).fetch()
+			.leftJoin(qCustomer.defaultLanguage).fetch()
+			.leftJoin(qCustomer.attributes,qCustomerAttribute).fetch()
+			.leftJoin(qCustomerAttribute.customerOption, qCustomerOption).fetch()
+			.leftJoin(qCustomerAttribute.customerOptionValue, qCustomerOptionValue).fetch()
+			.leftJoin(qCustomerOption.descriptions).fetch()
+			.leftJoin(qCustomerOptionValue.descriptions).fetch()
+			.where(
+					qCustomer.billing.firstName.eq(name).or(qCustomer.billing.lastName.eq(name))
+					
+			);
+		
+		return query.list(qCustomer);
+	}
+	
+	@Override
+	public CustomerList listByStore(MerchantStore store, CustomerCriteria criteria) {
+		
+		
+		
+		CustomerList customerList = new CustomerList();
+		StringBuilder countBuilderSelect = new StringBuilder();
+		countBuilderSelect.append("select count(c) from Customer as c");
+		
+		StringBuilder countBuilderWhere = new StringBuilder();
+		countBuilderWhere.append(" where c.merchantStore.id=:mId");
+
+		if(!StringUtils.isBlank(criteria.getName())) {
+			countBuilderWhere.append(" and c.billing.firstName like:nm");
+			countBuilderWhere.append(" or c.billing.lastName like:nm");
+		}
+		
+		if(!StringUtils.isBlank(criteria.getFirstName())) {
+			countBuilderWhere.append(" and c..billing.firstName like:fn");
+		}
+		
+		if(!StringUtils.isBlank(criteria.getLastName())) {
+			countBuilderWhere.append(" and c.billing.lastName like:ln");
+		}
+		
+		if(!StringUtils.isBlank(criteria.getEmail())) {
+			countBuilderWhere.append(" and c.emailAddress like:email");
+		}
+		
+		if(!StringUtils.isBlank(criteria.getCountry())) {
+			countBuilderWhere.append(" and c.billing.country.isoCode like:country");
+		}
+
+		Query countQ = super.getEntityManager().createQuery(
+				countBuilderSelect.toString() + countBuilderWhere.toString());
+
+		countQ.setParameter("mId", store.getId());
+		
+
+		if(!StringUtils.isBlank(criteria.getName())) {
+			countQ.setParameter("nm",new StringBuilder().append("%").append(criteria.getName()).append("%").toString());
+		}
+		
+		if(!StringUtils.isBlank(criteria.getFirstName())) {
+			countQ.setParameter("fn",new StringBuilder().append("%").append(criteria.getFirstName()).append("%").toString());
+		}
+		
+		if(!StringUtils.isBlank(criteria.getLastName())) {
+			countQ.setParameter("ln",new StringBuilder().append("%").append(criteria.getLastName()).append("%").toString());
+		}
+		
+		if(!StringUtils.isBlank(criteria.getEmail())) {
+			countQ.setParameter("email",new StringBuilder().append("%").append(criteria.getEmail()).append("%").toString());
+		}
+		
+		if(!StringUtils.isBlank(criteria.getCountry())) {
+			countQ.setParameter("country",new StringBuilder().append("%").append(criteria.getCountry()).append("%").toString());
+		}
+		
+
+
+		Number count = (Number) countQ.getSingleResult ();
+
+		customerList.setTotalCount(count.intValue());
+		
+        if(count.intValue()==0)
+        	return customerList;
+		
+		
+		
+		QCustomer qCustomer = QCustomer.customer;
+		QCountry qCountry = QCountry.country;
+		QZone qZone = QZone.zone;
+		QCustomerAttribute qCustomerAttribute = QCustomerAttribute.customerAttribute;
+		QCustomerOption qCustomerOption = QCustomerOption.customerOption;
+		QCustomerOptionValue qCustomerOptionValue = QCustomerOptionValue.customerOptionValue;
+		
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qCustomer)
+			.join(qCustomer.merchantStore).fetch()
+			.leftJoin(qCustomer.defaultLanguage).fetch()
+			.leftJoin(qCustomer.attributes,qCustomerAttribute).fetch()
+			.leftJoin(qCustomerAttribute.customerOption, qCustomerOption).fetch()
+			.leftJoin(qCustomerAttribute.customerOptionValue, qCustomerOptionValue).fetch()
+			.leftJoin(qCustomerOption.descriptions).fetch()
+			.leftJoin(qCustomerOptionValue.descriptions).fetch();
+
+			query.where(qCustomer.merchantStore.id.eq(store.getId()));
+			BooleanBuilder pBuilder = null;
+
+		if(!StringUtils.isBlank(criteria.getName())) {
+			if(pBuilder==null) {
+				pBuilder = new BooleanBuilder();
+			}
+			pBuilder.and(qCustomer.billing.firstName.like(new StringBuilder().append("%").append(criteria.getName()).append("%").toString())
+					.or(qCustomer.billing.lastName.like(new StringBuilder().append("%").append(criteria.getName()).append("%").toString())));
+
+		}
+		
+		
+		if(!StringUtils.isBlank(criteria.getFirstName())) {
+			if(pBuilder==null) {
+				pBuilder = new BooleanBuilder();
+			}
+			pBuilder.and(qCustomer.billing.firstName.like(new StringBuilder().append("%").append(criteria.getFirstName()).append("%").toString()));
+		}
+		
+		if(!StringUtils.isBlank(criteria.getLastName())) {
+			if(pBuilder==null) {
+				pBuilder = new BooleanBuilder();
+			}
+			pBuilder.and(qCustomer.billing.lastName.like(new StringBuilder().append("%").append(criteria.getLastName()).append("%").toString()));
+		}
+		
+		if(!StringUtils.isBlank(criteria.getEmail())) {
+			if(pBuilder==null) {
+				pBuilder = new BooleanBuilder();
+			}
+			pBuilder.and(qCustomer.emailAddress.like(new StringBuilder().append("%").append(criteria.getEmail()).append("%").toString()));
+		}
+		
+		if(!StringUtils.isBlank(criteria.getCountry())) {
+			if(pBuilder==null) {
+				pBuilder = new BooleanBuilder();
+			}
+			pBuilder.and(qCustomer.billing.country.isoCode.like(new StringBuilder().append("%").append(criteria.getCountry()).append("%").toString()));
+		}
+		
+		if(pBuilder!=null) {
+			query.where(pBuilder);
+		}
+		
+
+		
+		if(criteria.getMaxCount()>0) {
+			query.limit(criteria.getMaxCount());
+			query.offset(criteria.getStartIndex());
+		}
+		
+		
+		customerList.setCustomers(query.list(qCustomer));
+
+		return customerList;
+		
+	}
+	
+
+	@Override
+	public Customer getByNick(String nick){
+		QCustomer qCustomer = QCustomer.customer;
+		QCountry qCountry = QCountry.country;
+		QZone qZone = QZone.zone;
+		QCustomerAttribute qCustomerAttribute = QCustomerAttribute.customerAttribute;
+		QCustomerOption qCustomerOption = QCustomerOption.customerOption;
+		QCustomerOptionValue qCustomerOptionValue = QCustomerOptionValue.customerOptionValue;
+		
+
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qCustomer)
+			.join(qCustomer.merchantStore).fetch()
+			//.leftJoin(qCustomer.billing.country,qCountry).fetch()
+			//.leftJoin(qCustomer.billing.zone,qZone).fetch()
+			.leftJoin(qCustomer.defaultLanguage).fetch()
+			.leftJoin(qCustomer.groups).fetch()
+			.leftJoin(qCustomer.attributes,qCustomerAttribute).fetch()
+			.leftJoin(qCustomerAttribute.customerOption, qCustomerOption).fetch()
+			.leftJoin(qCustomerAttribute.customerOptionValue, qCustomerOptionValue).fetch()
+			.leftJoin(qCustomerOption.descriptions).fetch()
+			.leftJoin(qCustomerOptionValue.descriptions).fetch()
+			.where(qCustomer.nick.eq(nick));
+		
+		return query.uniqueResult(qCustomer);
+	}
+	
+	@Override
+	public Customer getByNick(String nick, int storeId){
+		QCustomer qCustomer = QCustomer.customer;
+		QMerchantStore qMerchantStore = QMerchantStore.merchantStore;
+		QCountry qCountry = QCountry.country;
+		QZone qZone = QZone.zone;
+		QCustomerAttribute qCustomerAttribute = QCustomerAttribute.customerAttribute;
+		QCustomerOption qCustomerOption = QCustomerOption.customerOption;
+		QCustomerOptionValue qCustomerOptionValue = QCustomerOptionValue.customerOptionValue;
+		
+		try {
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qCustomer)
+			.join(qCustomer.merchantStore, qMerchantStore).fetch()
+			//.leftJoin(qCustomer.billing.country,qCountry).fetch()
+			//.leftJoin(qCustomer.billing.zone,qZone).fetch()
+			.leftJoin(qCustomer.defaultLanguage).fetch()
+			.leftJoin(qCustomer.groups).fetch()
+			.leftJoin(qCustomer.attributes,qCustomerAttribute).fetch()
+			.leftJoin(qCustomerAttribute.customerOption, qCustomerOption).fetch()
+			.leftJoin(qCustomerAttribute.customerOptionValue, qCustomerOptionValue).fetch()
+			.leftJoin(qCustomerOption.descriptions).fetch()
+			.leftJoin(qCustomerOptionValue.descriptions).fetch()
+			.where(qCustomer.nick.eq(nick).and(qMerchantStore.id.eq(storeId)));
+		
+		return query.uniqueResult(qCustomer);
+		
+		} catch(NoResultException nre) {
+			return null;
+		}
+	}
+	
+	@Override
+	public List<Customer> listByStore(MerchantStore store){
+		QCustomer qCustomer = QCustomer.customer;
+		QCountry qCountry = QCountry.country;
+		QZone qZone = QZone.zone;
+		QCustomerAttribute qCustomerAttribute = QCustomerAttribute.customerAttribute;
+		QCustomerOption qCustomerOption = QCustomerOption.customerOption;
+		QCustomerOptionValue qCustomerOptionValue = QCustomerOptionValue.customerOptionValue;
+		
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qCustomer)
+			.join(qCustomer.merchantStore).fetch()
+			//.leftJoin(qCustomer.billing.country,qCountry).fetch()
+			//.leftJoin(qCustomer.billing.zone,qZone).fetch()
+			.leftJoin(qCustomer.defaultLanguage).fetch()
+			.leftJoin(qCustomer.attributes,qCustomerAttribute).fetch()
+			.leftJoin(qCustomerAttribute.customerOption, qCustomerOption).fetch()
+			.leftJoin(qCustomerAttribute.customerOptionValue, qCustomerOptionValue).fetch()
+			.leftJoin(qCustomerOption.descriptions).fetch()
+			.leftJoin(qCustomerOptionValue.descriptions).fetch()
+			.where(qCustomer.merchantStore.id.eq(store.getId()));
+		
+		return query.list(qCustomer);
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/customer/exception/CustomerNotFoundException.java b/sm-core/src/main/java/com/salesmanager/core/business/customer/exception/CustomerNotFoundException.java
new file mode 100644
index 0000000..ccb3ff7
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/customer/exception/CustomerNotFoundException.java
@@ -0,0 +1,22 @@
+package com.salesmanager.core.business.customer.exception;
+
+public class CustomerNotFoundException extends Exception
+{
+
+   private static final long serialVersionUID = 132801185016247023L;
+
+    public CustomerNotFoundException(final String msg, final Throwable cause)
+    {
+        super(msg, cause);
+    }
+
+    public CustomerNotFoundException(final String msg)
+    {
+        super(msg);
+    }
+    
+    public CustomerNotFoundException(Throwable t)
+    {
+        super(t);
+    }
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/customer/model/attribute/CustomerAttribute.java b/sm-core/src/main/java/com/salesmanager/core/business/customer/model/attribute/CustomerAttribute.java
new file mode 100644
index 0000000..043e599
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/customer/model/attribute/CustomerAttribute.java
@@ -0,0 +1,104 @@
+package com.salesmanager.core.business.customer.model.attribute;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+import javax.persistence.UniqueConstraint;
+
+import com.salesmanager.core.business.customer.model.Customer;
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.constants.SchemaConstant;
+
+@Entity
+@Table(name="CUSTOMER_ATTRIBUTE", schema=SchemaConstant.SALESMANAGER_SCHEMA,
+	uniqueConstraints={
+		@UniqueConstraint(columnNames={
+				"OPTION_ID",
+				"CUSTOMER_ID"
+			})
+	}
+)
+public class CustomerAttribute extends SalesManagerEntity<Long, CustomerAttribute> {
+	private static final long serialVersionUID = -6537491946539803265L;
+	
+	@Id
+	@Column(name = "CUSTOMER_ATTRIBUTE_ID", unique=true, nullable=false)
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT", pkColumnValue = "CUST_ATTR_SEQ_NEXT_VAL")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Long id;
+
+
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name="OPTION_ID", nullable=false)
+	private CustomerOption customerOption;
+	
+
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name="OPTION_VALUE_ID", nullable=false)
+	private CustomerOptionValue customerOptionValue;
+	
+	@Column(name="CUSTOMER_ATTR_TXT_VAL")
+	private String textValue;
+
+
+	@ManyToOne(targetEntity = Customer.class)
+	@JoinColumn(name = "CUSTOMER_ID", nullable = false)
+	private Customer customer;
+	
+	public CustomerAttribute() {
+	}
+
+	@Override
+	public Long getId() {
+		return id;
+	}
+
+	@Override
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+
+
+	public CustomerOption getCustomerOption() {
+		return customerOption;
+	}
+
+	public void setCustomerOption(CustomerOption customerOption) {
+		this.customerOption = customerOption;
+	}
+
+	public CustomerOptionValue getCustomerOptionValue() {
+		return customerOptionValue;
+	}
+
+	public void setCustomerOptionValue(CustomerOptionValue customerOptionValue) {
+		this.customerOptionValue = customerOptionValue;
+	}
+
+
+	public Customer getCustomer() {
+		return customer;
+	}
+
+	public void setCustomer(Customer customer) {
+		this.customer = customer;
+	}
+
+	public void setTextValue(String textValue) {
+		this.textValue = textValue;
+	}
+
+	public String getTextValue() {
+		return textValue;
+	}
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/customer/model/attribute/CustomerOption.java b/sm-core/src/main/java/com/salesmanager/core/business/customer/model/attribute/CustomerOption.java
new file mode 100644
index 0000000..467e2f7
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/customer/model/attribute/CustomerOption.java
@@ -0,0 +1,182 @@
+package com.salesmanager.core.business.customer.model.attribute;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+import javax.persistence.Transient;
+import javax.persistence.UniqueConstraint;
+import javax.validation.Valid;
+import javax.validation.constraints.Pattern;
+
+import org.hibernate.annotations.Index;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.constants.SchemaConstant;
+
+
+@Entity
+@Table(name="CUSTOMER_OPTION", schema=SchemaConstant.SALESMANAGER_SCHEMA, uniqueConstraints=
+	@UniqueConstraint(columnNames = {"MERCHANT_ID", "CUSTOMER_OPT_CODE"}))
+public class CustomerOption extends SalesManagerEntity<Long, CustomerOption> {
+	private static final long serialVersionUID = -2019269055342226086L;
+	
+	@Id
+	@Column(name="CUSTOMER_OPTION_ID")
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT", pkColumnValue = "CUSTOMER_OPTION_SEQ_NEXT_VAL")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Long id;
+	
+	@Column(name="SORT_ORDER")
+	private Integer sortOrder = 0;
+	
+	@Column(name="CUSTOMER_OPTION_TYPE", length=10)
+	private String customerOptionType;
+	
+	@NotEmpty
+	@Pattern(regexp="^[a-zA-Z0-9_]*$")
+	@Column(name="CUSTOMER_OPT_CODE")
+	@Index(name="CUST_OPT_CODE_IDX")
+	private String code;
+	
+	@Column(name="CUSTOMER_OPT_ACTIVE")
+	private boolean active;
+	
+	@Column(name="CUSTOMER_OPT_PUBLIC")
+	private boolean publicOption;
+	
+	@Valid
+	@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, mappedBy = "customerOption")
+	private Set<CustomerOptionDescription> descriptions = new HashSet<CustomerOptionDescription>();
+	
+	@Transient
+	private List<CustomerOptionDescription> descriptionsList = new ArrayList<CustomerOptionDescription>();
+
+	
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name="MERCHANT_ID", nullable=false)
+	private MerchantStore merchantStore;
+	
+	public CustomerOption() {
+	}
+	
+
+	
+	public Set<CustomerOptionDescription> getDescriptions() {
+		return descriptions;
+	}
+
+	public void setDescriptions(Set<CustomerOptionDescription> descriptions) {
+		this.descriptions = descriptions;
+	}
+
+	@Override
+	public Long getId() {
+		return id;
+	}
+	
+	@Override
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+
+
+	public MerchantStore getMerchantStore() {
+		return merchantStore;
+	}
+
+	public void setMerchantStore(MerchantStore merchantStore) {
+		this.merchantStore = merchantStore;
+	}
+
+	public void setDescriptionsList(List<CustomerOptionDescription> descriptionsList) {
+		this.descriptionsList = descriptionsList;
+	}
+
+	public List<CustomerOptionDescription> getDescriptionsList() {
+		return descriptionsList;
+	}
+	
+
+	public List<CustomerOptionDescription> getDescriptionsSettoList() {
+		if(descriptionsList==null || descriptionsList.size()==0) {
+			descriptionsList = new ArrayList<CustomerOptionDescription>(this.getDescriptions());
+		} 
+		return descriptionsList;
+
+	}
+
+	public String getCustomerOptionType() {
+		return customerOptionType;
+	}
+
+
+
+	public void setCustomerOptionType(String customerOptionType) {
+		this.customerOptionType = customerOptionType;
+	}
+
+
+
+	public String getCode() {
+		return code;
+	}
+
+
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+
+
+	public boolean isActive() {
+		return active;
+	}
+
+
+
+	public void setActive(boolean active) {
+		this.active = active;
+	}
+
+
+
+	public boolean isPublicOption() {
+		return publicOption;
+	}
+
+
+
+	public void setPublicOption(boolean publicOption) {
+		this.publicOption = publicOption;
+	}
+
+
+
+	public void setSortOrder(Integer sortOrder) {
+		this.sortOrder = sortOrder;
+	}
+
+
+
+	public Integer getSortOrder() {
+		return sortOrder;
+	}
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/customer/model/attribute/CustomerOptionDescription.java b/sm-core/src/main/java/com/salesmanager/core/business/customer/model/attribute/CustomerOptionDescription.java
new file mode 100644
index 0000000..9d31fd6
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/customer/model/attribute/CustomerOptionDescription.java
@@ -0,0 +1,58 @@
+package com.salesmanager.core.business.customer.model.attribute;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
+
+import org.hibernate.annotations.Type;
+
+import com.salesmanager.core.business.common.model.Description;
+import com.salesmanager.core.constants.SchemaConstant;
+
+@Entity
+@Table(name="CUSTOMER_OPTION_DESC", schema=SchemaConstant.SALESMANAGER_SCHEMA, uniqueConstraints={
+	@UniqueConstraint(columnNames={
+			"CUSTOMER_OPTION_ID",
+			"LANGUAGE_ID"
+		})
+	}
+)
+public class CustomerOptionDescription extends Description {
+	private static final long serialVersionUID = -3158504904707188465L;
+	
+	@ManyToOne(targetEntity = CustomerOption.class)
+	@JoinColumn(name = "CUSTOMER_OPTION_ID", nullable = false)
+	private CustomerOption customerOption;
+	
+	@Column(name="CUSTOMER_OPTION_COMMENT")
+	@Type(type = "org.hibernate.type.StringClobType")
+	private String customerOptionComment;
+	
+
+	
+	public CustomerOptionDescription() {
+	}
+
+	public CustomerOption getCustomerOption() {
+		return customerOption;
+	}
+
+	public void setCustomerOption(CustomerOption customerOption) {
+		this.customerOption = customerOption;
+	}
+
+	public String getCustomerOptionComment() {
+		return customerOptionComment;
+	}
+
+	public void setCustomerOptionComment(String customerOptionComment) {
+		this.customerOptionComment = customerOptionComment;
+	}
+
+
+	
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/customer/model/attribute/CustomerOptionSet.java b/sm-core/src/main/java/com/salesmanager/core/business/customer/model/attribute/CustomerOptionSet.java
new file mode 100644
index 0000000..98d04ea
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/customer/model/attribute/CustomerOptionSet.java
@@ -0,0 +1,92 @@
+package com.salesmanager.core.business.customer.model.attribute;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+import javax.persistence.UniqueConstraint;
+
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.constants.SchemaConstant;
+
+@Entity
+@Table(name="CUSTOMER_OPTION_SET", schema=SchemaConstant.SALESMANAGER_SCHEMA,
+	uniqueConstraints={
+		@UniqueConstraint(columnNames={
+				"CUSTOMER_OPTION_ID",
+				"CUSTOMER_OPTION_VALUE_ID"
+			})
+	}
+)
+public class CustomerOptionSet extends SalesManagerEntity<Long, CustomerOptionSet> {
+
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	@Column(name = "CUSTOMER_OPTIONSET_ID", unique=true, nullable=false)
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT", pkColumnValue = "CUST_OPTSET_SEQ_NEXT_VAL")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Long id;
+	
+
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name="CUSTOMER_OPTION_ID", nullable=false)
+	private CustomerOption customerOption = null;
+
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name="CUSTOMER_OPTION_VALUE_ID", nullable=false)
+	private CustomerOptionValue customerOptionValue = null;
+	
+
+
+	@Column(name="SORT_ORDER")
+	private Integer sortOrder = new Integer(0);
+	
+
+
+	public int getSortOrder() {
+		return sortOrder;
+	}
+
+	public void setSortOrder(int sortOrder) {
+		this.sortOrder = sortOrder;
+	}
+
+	public void setCustomerOptionValue(CustomerOptionValue customerOptionValue) {
+		this.customerOptionValue = customerOptionValue;
+	}
+
+	public CustomerOptionValue getCustomerOptionValue() {
+		return customerOptionValue;
+	}
+
+	public void setCustomerOption(CustomerOption customerOption) {
+		this.customerOption = customerOption;
+	}
+
+	public CustomerOption getCustomerOption() {
+		return customerOption;
+	}
+
+	@Override
+	public Long getId() {
+		return id;
+	}
+
+	@Override
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/customer/model/attribute/CustomerOptionType.java b/sm-core/src/main/java/com/salesmanager/core/business/customer/model/attribute/CustomerOptionType.java
new file mode 100644
index 0000000..97ef780
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/customer/model/attribute/CustomerOptionType.java
@@ -0,0 +1,7 @@
+package com.salesmanager.core.business.customer.model.attribute;
+
+public enum CustomerOptionType {
+	
+	Text, Radio, Select, Checkbox
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/customer/model/attribute/CustomerOptionValue.java b/sm-core/src/main/java/com/salesmanager/core/business/customer/model/attribute/CustomerOptionValue.java
new file mode 100644
index 0000000..af34d60
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/customer/model/attribute/CustomerOptionValue.java
@@ -0,0 +1,154 @@
+package com.salesmanager.core.business.customer.model.attribute;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+import javax.persistence.Transient;
+import javax.persistence.UniqueConstraint;
+import javax.validation.Valid;
+import javax.validation.constraints.Pattern;
+
+import org.hibernate.annotations.Index;
+import org.hibernate.validator.constraints.NotEmpty;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.constants.SchemaConstant;
+
+
+@Entity
+@Table(name="CUSTOMER_OPTION_VALUE", schema=SchemaConstant.SALESMANAGER_SCHEMA, uniqueConstraints=
+	@UniqueConstraint(columnNames = {"MERCHANT_ID", "CUSTOMER_OPT_VAL_CODE"}))
+public class CustomerOptionValue extends SalesManagerEntity<Long, CustomerOptionValue> {
+	private static final long serialVersionUID = 3736085877929910891L;
+
+	@Id
+	@Column(name="CUSTOMER_OPTION_VALUE_ID")
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT", pkColumnValue = "CUSTOMER_OPT_VAL_SEQ_NEXT_VAL")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Long id;
+	
+	@Column(name="SORT_ORDER")
+	private Integer sortOrder = 0;
+	
+	@Column(name="CUSTOMER_OPT_VAL_IMAGE")
+	private String customerOptionValueImage;
+	
+	@NotEmpty
+	@Pattern(regexp="^[a-zA-Z0-9_]*$")
+	@Column(name="CUSTOMER_OPT_VAL_CODE")
+	@Index(name="CUST_OPT_VAL_CODE_IDX")
+	private String code;
+	
+	@Transient
+	private MultipartFile image = null;
+	
+	@Valid
+	@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, mappedBy = "customerOptionValue")
+	private Set<CustomerOptionValueDescription> descriptions = new HashSet<CustomerOptionValueDescription>();
+	
+	@Transient
+	private List<CustomerOptionValueDescription> descriptionsList = new ArrayList<CustomerOptionValueDescription>();
+
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name="MERCHANT_ID", nullable=false)
+	private MerchantStore merchantStore;
+
+	public CustomerOptionValue() {
+	}
+
+	@Override
+	public Long getId() {
+		return id;
+	}
+
+	@Override
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+
+	public Set<CustomerOptionValueDescription> getDescriptions() {
+		return descriptions;
+	}
+
+	public void setDescriptions(Set<CustomerOptionValueDescription> descriptions) {
+		this.descriptions = descriptions;
+	}
+
+	public MerchantStore getMerchantStore() {
+		return merchantStore;
+	}
+
+	public void setMerchantStore(MerchantStore merchantStore) {
+		this.merchantStore = merchantStore;
+	}
+
+	public void setDescriptionsList(List<CustomerOptionValueDescription> descriptionsList) {
+		this.descriptionsList = descriptionsList;
+	}
+
+	public List<CustomerOptionValueDescription> getDescriptionsList() {
+		return descriptionsList; 
+	}
+	
+	public List<CustomerOptionValueDescription> getDescriptionsSettoList() {
+		if(descriptionsList==null || descriptionsList.size()==0) {
+			descriptionsList = new ArrayList<CustomerOptionValueDescription>(this.getDescriptions());
+		} 
+		return descriptionsList;
+	}
+
+	public void setImage(MultipartFile image) {
+		this.image = image;
+	}
+
+	public MultipartFile getImage() {
+		return image;
+	}
+
+
+	public String getCustomerOptionValueImage() {
+		return customerOptionValueImage;
+	}
+
+	public void setCustomerOptionValueImage(String customerOptionValueImage) {
+		this.customerOptionValueImage = customerOptionValueImage;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+
+	public void setSortOrder(Integer sortOrder) {
+		this.sortOrder = sortOrder;
+	}
+
+	public Integer getSortOrder() {
+		return sortOrder;
+	}
+	
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/customer/model/attribute/CustomerOptionValueDescription.java b/sm-core/src/main/java/com/salesmanager/core/business/customer/model/attribute/CustomerOptionValueDescription.java
new file mode 100644
index 0000000..33f2308
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/customer/model/attribute/CustomerOptionValueDescription.java
@@ -0,0 +1,39 @@
+package com.salesmanager.core.business.customer.model.attribute;
+
+import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
+
+import com.salesmanager.core.business.common.model.Description;
+import com.salesmanager.core.constants.SchemaConstant;
+
+@Entity
+@Table(name = "CUSTOMER_OPT_VAL_DESCRIPTION", schema=SchemaConstant.SALESMANAGER_SCHEMA, uniqueConstraints={
+	@UniqueConstraint(columnNames={
+			"CUSTOMER_OPT_VAL_ID",
+			"LANGUAGE_ID"
+		})
+	}
+)
+public class CustomerOptionValueDescription extends Description {
+	private static final long serialVersionUID = 7402155175956813576L;
+	
+	@ManyToOne(targetEntity = CustomerOptionValue.class)
+	@JoinColumn(name = "CUSTOMER_OPT_VAL_ID")
+	private CustomerOptionValue customerOptionValue;
+	
+	
+	public CustomerOptionValueDescription() {
+	}
+
+	public CustomerOptionValue getCustomerOptionValue() {
+		return customerOptionValue;
+	}
+
+	public void setCustomerOptionValue(CustomerOptionValue customerOptionValue) {
+		this.customerOptionValue = customerOptionValue;
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/customer/model/Customer.java b/sm-core/src/main/java/com/salesmanager/core/business/customer/model/Customer.java
new file mode 100644
index 0000000..48e29f5
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/customer/model/Customer.java
@@ -0,0 +1,290 @@
+package com.salesmanager.core.business.customer.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import javax.persistence.Transient;
+import javax.validation.Valid;
+
+import org.hibernate.annotations.Cascade;
+import org.hibernate.validator.constraints.Email;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import com.salesmanager.core.business.catalog.product.model.review.ProductReview;
+import com.salesmanager.core.business.customer.model.attribute.CustomerAttribute;
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.language.model.Language;
+import com.salesmanager.core.business.user.model.Group;
+import com.salesmanager.core.constants.SchemaConstant;
+import com.salesmanager.core.utils.CloneUtils;
+
+@Entity
+@Table(name = "CUSTOMER", schema=SchemaConstant.SALESMANAGER_SCHEMA)
+public class Customer extends SalesManagerEntity<Long, Customer> {
+	private static final long serialVersionUID = -6966934116557219193L;
+	
+	@Id
+	@Column(name = "CUSTOMER_ID", unique=true, nullable=false)
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT",
+	pkColumnValue = "CUSTOMER_SEQ_NEXT_VAL")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Long id;
+	
+	@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.REMOVE, mappedBy = "customer")
+	private Set<CustomerAttribute> attributes = new HashSet<CustomerAttribute>();
+	
+	@Column(name="CUSTOMER_GENDER", length=1, nullable=true)
+	@Enumerated(value = EnumType.STRING)
+	private CustomerGender gender;
+
+
+	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="CUSTOMER_DOB")
+	private Date dateOfBirth;
+	
+	@Email
+	@NotEmpty
+	@Column(name="CUSTOMER_EMAIL_ADDRESS", length=96, nullable=false)
+	private String emailAddress;
+	
+	@Column(name="CUSTOMER_NICK", length=96)
+	private String nick;
+
+	@Column(name="CUSTOMER_COMPANY", length=100)
+	private String company;
+	
+
+	@Column(name="CUSTOMER_PASSWORD", length=50)
+	private String password;
+
+	
+	@Column(name="CUSTOMER_ANONYMOUS")
+	private boolean anonymous;
+	
+
+	
+	@ManyToOne(fetch = FetchType.LAZY, targetEntity = Language.class)
+	@JoinColumn(name = "LANGUAGE_ID", nullable=false)
+	private Language defaultLanguage;
+	
+
+
+	@OneToMany(mappedBy = "customer", targetEntity = ProductReview.class)
+	private List<ProductReview> reviews = new ArrayList<ProductReview>();
+	
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name="MERCHANT_ID", nullable=false)
+	private MerchantStore merchantStore;
+	
+
+	@Embedded
+	private com.salesmanager.core.business.common.model.Delivery delivery = null;
+	
+	@Valid
+	@Embedded
+	private com.salesmanager.core.business.common.model.Billing billing = null;
+	
+	
+	@ManyToMany(fetch=FetchType.LAZY, cascade = {CascadeType.REFRESH})
+	@JoinTable(name = "CUSTOMER_GROUP", schema=SchemaConstant.SALESMANAGER_SCHEMA, joinColumns = { 
+			@JoinColumn(name = "CUSTOMER_ID", nullable = false, updatable = false) }
+			, 
+			inverseJoinColumns = { @JoinColumn(name = "GROUP_ID", 
+					nullable = false, updatable = false) }
+	)
+	@Cascade({
+		org.hibernate.annotations.CascadeType.DETACH,
+		org.hibernate.annotations.CascadeType.LOCK,
+		org.hibernate.annotations.CascadeType.REFRESH,
+		org.hibernate.annotations.CascadeType.REPLICATE
+		
+	})
+	private List<Group> groups = new ArrayList<Group>();
+	
+	@Transient
+	private String showCustomerStateList;
+	
+	@Transient
+	private String showBillingStateList;
+	
+	@Transient
+	private String showDeliveryStateList;
+	
+	
+	public Customer() {
+	}
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+
+
+	public Date getDateOfBirth() {
+		return CloneUtils.clone(dateOfBirth);
+	}
+
+	public void setDateOfBirth(Date dateOfBirth) {
+		this.dateOfBirth = CloneUtils.clone(dateOfBirth);
+	}
+
+	public String getEmailAddress() {
+		return emailAddress;
+	}
+
+	public void setEmailAddress(String emailAddress) {
+		this.emailAddress = emailAddress;
+	}
+
+	public String getNick() {
+		return nick;
+	}
+
+	public void setNick(String nick) {
+		this.nick = nick;
+	}
+
+	public String getCompany() {
+		return company;
+	}
+
+	public void setCompany(String company) {
+		this.company = company;
+	}
+
+
+
+	public String getPassword() {
+		return password;
+	}
+
+	public void setPassword(String password) {
+		this.password = password;
+	}
+
+
+
+	public boolean isAnonymous() {
+		return anonymous;
+	}
+
+	public void setAnonymous(boolean anonymous) {
+		this.anonymous = anonymous;
+	}
+
+
+	public List<ProductReview> getReviews() {
+		return reviews;
+	}
+
+	public void setReviews(List<ProductReview> reviews) {
+		this.reviews = reviews;
+	}
+
+	public void setMerchantStore(MerchantStore merchantStore) {
+		this.merchantStore = merchantStore;
+	}
+
+	public MerchantStore getMerchantStore() {
+		return merchantStore;
+	}
+
+	public void setDelivery(com.salesmanager.core.business.common.model.Delivery delivery) {
+		this.delivery = delivery;
+	}
+
+	public com.salesmanager.core.business.common.model.Delivery getDelivery() {
+		return delivery;
+	}
+
+	public void setBilling(com.salesmanager.core.business.common.model.Billing billing) {
+		this.billing = billing;
+	}
+
+	public com.salesmanager.core.business.common.model.Billing getBilling() {
+		return billing;
+	}
+
+	public void setGroups(List<Group> groups) {
+		this.groups = groups;
+	}
+
+	public List<Group> getGroups() {
+		return groups;
+	}
+	public String getShowCustomerStateList() {
+		return showCustomerStateList;
+	}
+
+	public void setShowCustomerStateList(String showCustomerStateList) {
+		this.showCustomerStateList = showCustomerStateList;
+	}
+
+	public String getShowBillingStateList() {
+		return showBillingStateList;
+	}
+
+	public void setShowBillingStateList(String showBillingStateList) {
+		this.showBillingStateList = showBillingStateList;
+	}
+
+	public String getShowDeliveryStateList() {
+		return showDeliveryStateList;
+	}
+
+	public void setShowDeliveryStateList(String showDeliveryStateList) {
+		this.showDeliveryStateList = showDeliveryStateList;
+	}
+	
+	public Language getDefaultLanguage() {
+		return defaultLanguage;
+	}
+
+	public void setDefaultLanguage(Language defaultLanguage) {
+		this.defaultLanguage = defaultLanguage;
+	}
+
+	public void setAttributes(Set<CustomerAttribute> attributes) {
+		this.attributes = attributes;
+	}
+
+	public Set<CustomerAttribute> getAttributes() {
+		return attributes;
+	}
+
+	public void setGender(CustomerGender gender) {
+		this.gender = gender;
+	}
+
+	public CustomerGender getGender() {
+		return gender;
+	}
+	
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/customer/model/CustomerCriteria.java b/sm-core/src/main/java/com/salesmanager/core/business/customer/model/CustomerCriteria.java
new file mode 100644
index 0000000..7873a77
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/customer/model/CustomerCriteria.java
@@ -0,0 +1,43 @@
+package com.salesmanager.core.business.customer.model;
+
+import com.salesmanager.core.business.common.model.Criteria;
+
+public class CustomerCriteria extends Criteria {
+	
+	private String firstName;
+	private String lastName;
+	private String name;
+	private String email;
+	private String country;
+	public String getFirstName() {
+		return firstName;
+	}
+	public void setFirstName(String firstName) {
+		this.firstName = firstName;
+	}
+	public String getLastName() {
+		return lastName;
+	}
+	public void setLastName(String lastName) {
+		this.lastName = lastName;
+	}
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	public String getEmail() {
+		return email;
+	}
+	public void setEmail(String email) {
+		this.email = email;
+	}
+	public String getCountry() {
+		return country;
+	}
+	public void setCountry(String country) {
+		this.country = country;
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/customer/model/CustomerGender.java b/sm-core/src/main/java/com/salesmanager/core/business/customer/model/CustomerGender.java
new file mode 100644
index 0000000..46859fd
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/customer/model/CustomerGender.java
@@ -0,0 +1,7 @@
+package com.salesmanager.core.business.customer.model;
+
+public enum CustomerGender {
+	
+	M, F
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/customer/model/CustomerList.java b/sm-core/src/main/java/com/salesmanager/core/business/customer/model/CustomerList.java
new file mode 100644
index 0000000..707d652
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/customer/model/CustomerList.java
@@ -0,0 +1,22 @@
+package com.salesmanager.core.business.customer.model;
+
+import java.util.List;
+
+import com.salesmanager.core.business.common.model.EntityList;
+
+public class CustomerList extends EntityList {
+
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -3108842276158069739L;
+	private List<Customer> customers;
+	public void setCustomers(List<Customer> customers) {
+		this.customers = customers;
+	}
+	public List<Customer> getCustomers() {
+		return customers;
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/customer/service/attribute/CustomerAttributeService.java b/sm-core/src/main/java/com/salesmanager/core/business/customer/service/attribute/CustomerAttributeService.java
new file mode 100644
index 0000000..6ec476c
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/customer/service/attribute/CustomerAttributeService.java
@@ -0,0 +1,29 @@
+package com.salesmanager.core.business.customer.service.attribute;
+
+import java.util.List;
+
+import com.salesmanager.core.business.customer.model.Customer;
+import com.salesmanager.core.business.customer.model.attribute.CustomerAttribute;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityService;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+
+public interface CustomerAttributeService extends
+		SalesManagerEntityService<Long, CustomerAttribute> {
+
+	void saveOrUpdate(CustomerAttribute customerAttribute)
+			throws ServiceException;
+
+	CustomerAttribute getByCustomerOptionId(MerchantStore store,
+			Long customerId, Long id);
+
+	List<CustomerAttribute> getByCustomerOptionValueId(MerchantStore store,
+			Long id);
+
+	List<CustomerAttribute> getByOptionId(MerchantStore store, Long id);
+
+
+	List<CustomerAttribute> getByCustomer(MerchantStore store, Customer customer);
+	
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/customer/service/attribute/CustomerAttributeServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/customer/service/attribute/CustomerAttributeServiceImpl.java
new file mode 100644
index 0000000..e7c1291
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/customer/service/attribute/CustomerAttributeServiceImpl.java
@@ -0,0 +1,78 @@
+package com.salesmanager.core.business.customer.service.attribute;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.salesmanager.core.business.customer.dao.attribute.CustomerAttributeDao;
+import com.salesmanager.core.business.customer.model.Customer;
+import com.salesmanager.core.business.customer.model.attribute.CustomerAttribute;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityServiceImpl;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+
+@Service("customerAttributeService")
+public class CustomerAttributeServiceImpl extends
+		SalesManagerEntityServiceImpl<Long, CustomerAttribute> implements CustomerAttributeService {
+	
+	private CustomerAttributeDao customerAttributeDao;
+
+	@Autowired
+	public CustomerAttributeServiceImpl(CustomerAttributeDao customerAttributeDao) {
+		super(customerAttributeDao);
+		this.customerAttributeDao = customerAttributeDao;
+	}
+	
+
+
+
+
+	@Override
+	public void saveOrUpdate(CustomerAttribute customerAttribute)
+			throws ServiceException {
+		if(customerAttribute.getId()!=null && customerAttribute.getId()>0) {
+			customerAttributeDao.update(customerAttribute);
+		} else {
+			customerAttributeDao.save(customerAttribute);
+		}
+		
+	}
+	
+	@Override
+	public void delete(CustomerAttribute attribute) throws ServiceException {
+		
+		//override method, this allows the error that we try to remove a detached instance
+		attribute = this.getById(attribute.getId());
+		super.delete(attribute);
+		
+	}
+	
+
+
+	@Override
+	public CustomerAttribute getByCustomerOptionId(MerchantStore store, Long customerId, Long id) {
+		return customerAttributeDao.getByOptionId(store, customerId, id);
+	}
+
+
+
+	@Override
+	public List<CustomerAttribute> getByCustomer(MerchantStore store, Customer customer) {
+		return customerAttributeDao.getByCustomerId(store, customer.getId());
+	}
+
+
+	@Override
+	public List<CustomerAttribute> getByCustomerOptionValueId(MerchantStore store,
+			Long id) {
+		return customerAttributeDao.getByOptionValueId(store, id);
+	}
+	
+	@Override
+	public List<CustomerAttribute> getByOptionId(MerchantStore store,
+			Long id) {
+		return customerAttributeDao.getByOptionId(store, id);
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/customer/service/attribute/CustomerOptionService.java b/sm-core/src/main/java/com/salesmanager/core/business/customer/service/attribute/CustomerOptionService.java
new file mode 100644
index 0000000..0f43b22
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/customer/service/attribute/CustomerOptionService.java
@@ -0,0 +1,27 @@
+package com.salesmanager.core.business.customer.service.attribute;
+
+import java.util.List;
+
+import com.salesmanager.core.business.customer.model.attribute.CustomerOption;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityService;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+public interface CustomerOptionService extends SalesManagerEntityService<Long, CustomerOption> {
+
+	List<CustomerOption> listByStore(MerchantStore store, Language language)
+			throws ServiceException;
+
+
+
+	void saveOrUpdate(CustomerOption entity) throws ServiceException;
+
+
+
+	CustomerOption getByCode(MerchantStore store, String optionCode);
+
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/customer/service/attribute/CustomerOptionServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/customer/service/attribute/CustomerOptionServiceImpl.java
new file mode 100644
index 0000000..3cdc6e9
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/customer/service/attribute/CustomerOptionServiceImpl.java
@@ -0,0 +1,94 @@
+package com.salesmanager.core.business.customer.service.attribute;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.salesmanager.core.business.customer.dao.attribute.CustomerOptionDao;
+import com.salesmanager.core.business.customer.model.attribute.CustomerAttribute;
+import com.salesmanager.core.business.customer.model.attribute.CustomerOption;
+import com.salesmanager.core.business.customer.model.attribute.CustomerOptionSet;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityServiceImpl;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+@Service("customerOptionService")
+public class CustomerOptionServiceImpl extends
+		SalesManagerEntityServiceImpl<Long, CustomerOption> implements CustomerOptionService {
+
+	
+	private CustomerOptionDao customerOptionDao;
+	
+	@Autowired
+	private CustomerAttributeService customerAttributeService;
+	
+	@Autowired
+	private CustomerOptionSetService customerOptionSetService;
+	
+
+	@Autowired
+	public CustomerOptionServiceImpl(
+			CustomerOptionDao customerOptionDao) {
+			super(customerOptionDao);
+			this.customerOptionDao = customerOptionDao;
+	}
+	
+	@Override
+	public List<CustomerOption> listByStore(MerchantStore store, Language language) throws ServiceException {
+
+		return customerOptionDao.listByStore(store, language);
+
+	}
+	
+
+	@Override
+	public void saveOrUpdate(CustomerOption entity) throws ServiceException {
+		
+		
+		//save or update (persist and attach entities
+		if(entity.getId()!=null && entity.getId()>0) {
+			super.update(entity);
+		} else {
+			super.save(entity);
+		}
+		
+	}
+
+
+	@Override
+	public void delete(CustomerOption customerOption) throws ServiceException {
+		
+		//remove all attributes having this option
+		List<CustomerAttribute> attributes = customerAttributeService.getByOptionId(customerOption.getMerchantStore(), customerOption.getId());
+		
+		for(CustomerAttribute attribute : attributes) {
+			customerAttributeService.delete(attribute);
+		}
+		
+		CustomerOption option = this.getById(customerOption.getId());
+		
+		List<CustomerOptionSet> optionSets = customerOptionSetService.listByOption(customerOption, customerOption.getMerchantStore());
+		
+		for(CustomerOptionSet optionSet : optionSets) {
+			customerOptionSetService.delete(optionSet);
+		}
+		
+		//remove option
+		super.delete(option);
+		
+	}
+	
+	@Override
+	public CustomerOption getByCode(MerchantStore store, String optionCode) {
+		return customerOptionDao.getByCode(store, optionCode);
+	}
+	
+
+	
+
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/customer/service/attribute/CustomerOptionSetService.java b/sm-core/src/main/java/com/salesmanager/core/business/customer/service/attribute/CustomerOptionSetService.java
new file mode 100644
index 0000000..cf93835
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/customer/service/attribute/CustomerOptionSetService.java
@@ -0,0 +1,35 @@
+package com.salesmanager.core.business.customer.service.attribute;
+
+import java.util.List;
+
+import com.salesmanager.core.business.customer.model.attribute.CustomerOption;
+import com.salesmanager.core.business.customer.model.attribute.CustomerOptionSet;
+import com.salesmanager.core.business.customer.model.attribute.CustomerOptionValue;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityService;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+public interface CustomerOptionSetService extends SalesManagerEntityService<Long, CustomerOptionSet> {
+
+
+
+	void saveOrUpdate(CustomerOptionSet entity) throws ServiceException;
+
+
+
+
+	List<CustomerOptionSet> listByStore(MerchantStore store,
+			Language language) throws ServiceException;
+
+
+
+
+	List<CustomerOptionSet> listByOption(CustomerOption option,
+			MerchantStore store) throws ServiceException;
+	
+
+	List<CustomerOptionSet> listByOptionValue(CustomerOptionValue optionValue,
+			MerchantStore store) throws ServiceException;
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/customer/service/attribute/CustomerOptionSetServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/customer/service/attribute/CustomerOptionSetServiceImpl.java
new file mode 100644
index 0000000..76033c6
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/customer/service/attribute/CustomerOptionSetServiceImpl.java
@@ -0,0 +1,84 @@
+package com.salesmanager.core.business.customer.service.attribute;
+
+import java.util.List;
+
+import org.apache.commons.lang.Validate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.salesmanager.core.business.customer.dao.attribute.CustomerOptionSetDao;
+import com.salesmanager.core.business.customer.model.attribute.CustomerOption;
+import com.salesmanager.core.business.customer.model.attribute.CustomerOptionSet;
+import com.salesmanager.core.business.customer.model.attribute.CustomerOptionValue;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityServiceImpl;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+@Service("customerOptionSetService")
+public class CustomerOptionSetServiceImpl extends
+		SalesManagerEntityServiceImpl<Long, CustomerOptionSet> implements CustomerOptionSetService {
+
+
+	@Autowired
+	private CustomerOptionSetDao customerOptionSetDao;
+	
+
+	@Autowired
+	public CustomerOptionSetServiceImpl(
+			CustomerOptionSetDao customerOptionSetDao) {
+			super(customerOptionSetDao);
+			this.customerOptionSetDao = customerOptionSetDao;
+	}
+	
+
+	@Override
+	public List<CustomerOptionSet> listByOption(CustomerOption option, MerchantStore store) throws ServiceException {
+		Validate.notNull(store,"merchant store cannot be null");
+		Validate.notNull(option,"option cannot be null");
+		
+		return customerOptionSetDao.getByOptionId(store, option.getId());
+	}
+	
+	@Override
+	public void delete(CustomerOptionSet customerOptionSet) throws ServiceException {
+		customerOptionSet = customerOptionSetDao.getById(customerOptionSet.getId());
+		super.delete(customerOptionSet);
+	}
+	
+	@Override
+	public List<CustomerOptionSet> listByStore(MerchantStore store, Language language) throws ServiceException {
+		Validate.notNull(store,"merchant store cannot be null");
+
+		
+		return customerOptionSetDao.listByStore(store,language);
+	}
+
+
+	@Override
+	public void saveOrUpdate(CustomerOptionSet entity) throws ServiceException {
+		Validate.notNull(entity,"customer option set cannot be null");
+
+		if(entity.getId()>0) {
+			super.update(entity);
+		} else {
+			super.create(entity);
+		}
+		
+	}
+
+
+	@Override
+	public List<CustomerOptionSet> listByOptionValue(
+			CustomerOptionValue optionValue, MerchantStore store)
+			throws ServiceException {
+		return customerOptionSetDao.getByOptionValueId(store, optionValue.getId());
+	}
+
+
+	
+
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/customer/service/attribute/CustomerOptionValueService.java b/sm-core/src/main/java/com/salesmanager/core/business/customer/service/attribute/CustomerOptionValueService.java
new file mode 100644
index 0000000..0f6271e
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/customer/service/attribute/CustomerOptionValueService.java
@@ -0,0 +1,24 @@
+package com.salesmanager.core.business.customer.service.attribute;
+
+import java.util.List;
+
+import com.salesmanager.core.business.customer.model.attribute.CustomerOptionValue;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityService;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+public interface CustomerOptionValueService extends SalesManagerEntityService<Long, CustomerOptionValue> {
+
+
+
+	List<CustomerOptionValue> listByStore(MerchantStore store, Language language)
+			throws ServiceException;
+
+	void saveOrUpdate(CustomerOptionValue entity) throws ServiceException;
+
+	CustomerOptionValue getByCode(MerchantStore store, String optionValueCode);
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/customer/service/attribute/CustomerOptionValueServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/customer/service/attribute/CustomerOptionValueServiceImpl.java
new file mode 100644
index 0000000..0b4f649
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/customer/service/attribute/CustomerOptionValueServiceImpl.java
@@ -0,0 +1,94 @@
+package com.salesmanager.core.business.customer.service.attribute;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.salesmanager.core.business.customer.dao.attribute.CustomerOptionValueDao;
+import com.salesmanager.core.business.customer.model.attribute.CustomerAttribute;
+import com.salesmanager.core.business.customer.model.attribute.CustomerOptionSet;
+import com.salesmanager.core.business.customer.model.attribute.CustomerOptionValue;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityServiceImpl;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+@Service("customerOptionValueService")
+public class CustomerOptionValueServiceImpl extends
+		SalesManagerEntityServiceImpl<Long, CustomerOptionValue> implements
+		CustomerOptionValueService {
+
+	@Autowired
+	private CustomerAttributeService customerAttributeService;
+	
+	private CustomerOptionValueDao customerOptionValueDao;
+	
+	@Autowired
+	private CustomerOptionSetService customerOptionSetService;
+	
+	@Autowired
+	public CustomerOptionValueServiceImpl(
+			CustomerOptionValueDao customerOptionValueDao) {
+			super(customerOptionValueDao);
+			this.customerOptionValueDao = customerOptionValueDao;
+	}
+	
+	
+	@Override
+	public List<CustomerOptionValue> listByStore(MerchantStore store, Language language) throws ServiceException {
+		
+		return customerOptionValueDao.listByStore(store, language);
+	}
+	
+
+
+	
+	@Override
+	public void saveOrUpdate(CustomerOptionValue entity) throws ServiceException {
+		
+		
+		//save or update (persist and attach entities
+		if(entity.getId()!=null && entity.getId()>0) {
+
+			super.update(entity);
+			
+		} else {
+			
+			super.save(entity);
+			
+		}
+		
+	}
+	
+	
+	public void delete(CustomerOptionValue customerOptionValue) throws ServiceException {
+		
+		//remove all attributes having this option
+		List<CustomerAttribute> attributes = customerAttributeService.getByCustomerOptionValueId(customerOptionValue.getMerchantStore(), customerOptionValue.getId());
+		
+		for(CustomerAttribute attribute : attributes) {
+			customerAttributeService.delete(attribute);
+		}
+		
+		List<CustomerOptionSet> optionSets = customerOptionSetService.listByOptionValue(customerOptionValue, customerOptionValue.getMerchantStore());
+		
+		for(CustomerOptionSet optionSet : optionSets) {
+			customerOptionSetService.delete(optionSet);
+		}
+		
+		CustomerOptionValue option = super.getById(customerOptionValue.getId());
+		
+		//remove option
+		super.delete(option);
+		
+	}
+	
+	@Override
+	public CustomerOptionValue getByCode(MerchantStore store, String optionValueCode) {
+		return customerOptionValueDao.getByCode(store, optionValueCode);
+	}
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/customer/service/CustomerService.java b/sm-core/src/main/java/com/salesmanager/core/business/customer/service/CustomerService.java
new file mode 100644
index 0000000..386bdfd
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/customer/service/CustomerService.java
@@ -0,0 +1,38 @@
+package com.salesmanager.core.business.customer.service;
+
+
+import java.util.List;
+
+import com.salesmanager.core.business.common.model.Address;
+import com.salesmanager.core.business.customer.model.Customer;
+import com.salesmanager.core.business.customer.model.CustomerCriteria;
+import com.salesmanager.core.business.customer.model.CustomerList;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityService;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+
+public interface CustomerService  extends SalesManagerEntityService<Long, Customer> {
+
+	public List<Customer> getByName(String firstName);
+
+	List<Customer> listByStore(MerchantStore store);
+
+	Customer getByNick(String nick);
+	void saveOrUpdate(Customer customer) throws ServiceException ;
+
+	CustomerList listByStore(MerchantStore store, CustomerCriteria criteria);
+
+	Customer getByNick(String nick, int storeId);
+
+	/**
+	 * Return an {@link com.salesmanager.core.business.common.model.Address} object from the client IP address. Uses underlying GeoLocation module
+	 * @param store
+	 * @param ipAddress
+	 * @return
+	 * @throws ServiceException
+	 */
+	Address getCustomerAddress(MerchantStore store, String ipAddress)
+			throws ServiceException;
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/customer/service/CustomerServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/customer/service/CustomerServiceImpl.java
new file mode 100644
index 0000000..6e1fb02
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/customer/service/CustomerServiceImpl.java
@@ -0,0 +1,112 @@
+package com.salesmanager.core.business.customer.service;
+
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.salesmanager.core.business.common.model.Address;
+import com.salesmanager.core.business.customer.dao.CustomerDAO;
+import com.salesmanager.core.business.customer.model.Customer;
+import com.salesmanager.core.business.customer.model.CustomerCriteria;
+import com.salesmanager.core.business.customer.model.CustomerList;
+import com.salesmanager.core.business.customer.model.attribute.CustomerAttribute;
+import com.salesmanager.core.business.customer.service.attribute.CustomerAttributeService;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityServiceImpl;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.modules.utils.GeoLocation;
+
+@Service("customerService")
+public class CustomerServiceImpl extends SalesManagerEntityServiceImpl<Long, Customer> implements CustomerService {
+
+	private static final Logger LOGGER = LoggerFactory.getLogger(CustomerServiceImpl.class);
+	
+	private CustomerDAO customerDAO;
+	
+	@Autowired
+	private CustomerAttributeService customerAttributeService;
+	
+	@Autowired
+	private GeoLocation geoLocation;
+
+	
+	@Autowired
+	public CustomerServiceImpl(CustomerDAO customerDAO) {
+		super(customerDAO);
+		this.customerDAO = customerDAO;
+	}
+
+	@Override
+	public List<Customer> getByName(String firstName) {
+		return customerDAO.getByName(firstName);
+	}
+	
+	@Override
+	public Customer getById(Long id) {
+			return customerDAO.getById(id);		
+	}
+	
+	@Override
+	public Customer getByNick(String nick) {
+		return customerDAO.getByNick(nick);	
+	}
+	
+	@Override
+	public Customer getByNick(String nick, int storeId) {
+		return customerDAO.getByNick(nick, storeId);	
+	}
+	
+	@Override
+	public List<Customer> listByStore(MerchantStore store) {
+		return customerDAO.listByStore(store);
+	}
+	
+	@Override
+	public CustomerList listByStore(MerchantStore store, CustomerCriteria criteria) {
+		return customerDAO.listByStore(store,criteria);
+	}
+	
+	@Override
+	public Address getCustomerAddress(MerchantStore store, String ipAddress) throws ServiceException {
+		
+		try {
+			return geoLocation.getAddress(ipAddress);
+		} catch(Exception e) {
+			throw new ServiceException(e);
+		}
+		
+	}
+
+	@Override	
+	public void saveOrUpdate(Customer customer) throws ServiceException {
+
+		LOGGER.debug("Creating Customer");
+		
+		if(customer.getId()!=null && customer.getId()>0) {
+			super.update(customer);
+		} else {			
+		
+			super.create(customer);
+
+		}
+	}
+
+	public void delete(Customer customer) throws ServiceException {
+		customer = getById(customer.getId());
+		
+		//delete attributes
+		List<CustomerAttribute> attributes =customerAttributeService.getByCustomer(customer.getMerchantStore(), customer);
+		if(attributes!=null) {
+			for(CustomerAttribute attribute : attributes) {
+				customerAttributeService.delete(attribute);
+			}
+		}
+		customerDAO.delete(customer);
+
+	}
+	
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/generic/dao/SalesManagerEntityDao.java b/sm-core/src/main/java/com/salesmanager/core/business/generic/dao/SalesManagerEntityDao.java
new file mode 100644
index 0000000..b694983
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/generic/dao/SalesManagerEntityDao.java
@@ -0,0 +1,104 @@
+package com.salesmanager.core.business.generic.dao;
+
+import java.io.Serializable;
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
+import javax.persistence.criteria.Expression;
+import javax.persistence.criteria.Order;
+import javax.persistence.metamodel.SingularAttribute;
+
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.business.reference.country.model.Country;
+import com.salesmanager.core.business.reference.language.model.Language;
+import com.salesmanager.core.business.reference.zone.model.Zone;
+
+
+/**
+ * @param <E> type entity
+ */
+public interface SalesManagerEntityDao<K extends Serializable & Comparable<K>, E extends SalesManagerEntity<K, ?>> {
+
+	/**
+	 * @param clazz class
+	 * @param id id
+	 * @return entity
+	 */
+	E getEntity(Class<? extends E> clazz, K id);
+	
+	/**
+	 * @param id id
+	 * @return entity
+	 */
+	E getById(K id);
+	
+	/**
+	 * @param entity entity
+	 */
+	void save(E entity);
+	
+	/**
+	 * @param entity entity
+	 */
+	void update(E entity);
+	
+	/** 
+	 * @param entity entity
+	 */
+	void delete(E entity);
+	
+	/**
+	 * @param entity entity
+	 */
+	E refresh(E entity);
+	
+	/**
+	 * @return liste d'entitys
+	 */
+	List<E> list();
+	
+	/**
+	 * @return nombre d'entitys
+	 */
+	Long count();
+	
+	void flush();
+	
+	void clear();
+
+	/**
+	 * @param <V> type value
+	 * @param attribute
+	 * @param fieldValue
+	 * @return numbers of entities
+	 */
+	<V> Long countByField(SingularAttribute<? super E, V> attribute, V fieldValue);
+
+	/**
+	 * @param <V> type value
+	 * @param attribute
+	 * @param fieldValue
+	 * @return entities
+	 */
+	<V> List<E> listByField(SingularAttribute<? super E, V> attribute, V fieldValue);
+
+	/**
+	 * @param <V>
+	 * @param attribute
+	 * @param fieldValue
+	 * @return
+	 * @throws NoResultException
+	 * @throws {@link NonUniqueResultException}
+	 */
+	<V> E getByField(SingularAttribute<? super E, V> attribute, V fieldValue);
+
+	<T extends E> List<T> list(Class<T> objectClass, Expression<Boolean> filter, Integer limit, Integer offset, Order... orders);
+
+	Long count(Expression<Boolean> filter);
+	
+	EntityManager getEntityManager();
+
+	
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/generic/dao/SalesManagerEntityDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/generic/dao/SalesManagerEntityDaoImpl.java
new file mode 100644
index 0000000..ba7e2e9
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/generic/dao/SalesManagerEntityDaoImpl.java
@@ -0,0 +1,102 @@
+package com.salesmanager.core.business.generic.dao;
+
+import java.io.Serializable;
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.criteria.Expression;
+import javax.persistence.criteria.Order;
+import javax.persistence.metamodel.SingularAttribute;
+
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.business.generic.util.GenericEntityUtils;
+
+/**
+ * @param <T> entity type
+ */
+public abstract class SalesManagerEntityDaoImpl<K extends Serializable & Comparable<K>, E extends SalesManagerEntity<K, ?>>
+		extends SalesManagerJpaDaoSupport
+		implements SalesManagerEntityDao<K, E> {
+	
+	private Class<E> objectClass;
+	
+	@SuppressWarnings("unchecked")
+	public SalesManagerEntityDaoImpl() {
+		this.objectClass = (Class<E>) GenericEntityUtils.getGenericEntityClassFromComponentDefinition(getClass());
+	}
+	
+	protected final Class<E> getObjectClass() {
+		return objectClass;
+	}
+	
+	
+	public E getEntity(Class<? extends E> clazz, K id) {
+		return super.getEntity(getObjectClass(), id);
+	}
+	
+	
+	public E getById(K id) {
+		return super.getEntity(getObjectClass(), id);
+	}
+	
+	
+	public <V> E getByField(SingularAttribute<? super E, V> attribute, V fieldValue) {
+		return super.getByField(getObjectClass(), attribute, fieldValue);
+	}
+	
+	
+	public void update(E entity) {
+		super.update(entity);
+	}
+	
+	
+	public void save(E entity) {
+		super.save(entity);
+	}
+	
+	
+	public void delete(E entity) {
+		super.delete(entity);
+	}
+	
+	
+	public E refresh(E entity) {
+		return super.refresh(entity);
+	}
+	
+	
+	public List<E> list() {
+		return super.listEntity(getObjectClass());
+	}
+	
+	
+	public <V> List<E> listByField(SingularAttribute<? super E, V> attribute, V fieldValue) {
+		return super.listEntityByField(getObjectClass(), attribute, fieldValue);
+	}
+	
+	
+	public <T extends E> List<T> list(Class<T> objectClass, Expression<Boolean> filter, Integer limit, Integer offset, Order... orders) {
+		return super.listEntity(objectClass, filter, limit, offset, orders);
+	}
+	
+	
+	public Long count() {
+		return super.countEntity(getObjectClass());
+	}
+	
+	
+	public <V> Long countByField(SingularAttribute<? super E, V> attribute, V fieldValue) {
+		return super.countEntityByField(getObjectClass(), attribute, fieldValue);
+	}
+	
+	
+	public Long count(Expression<Boolean> filter) {
+		return super.countEntity(getObjectClass(), filter);
+	}
+	
+	
+	@Override
+	public EntityManager getEntityManager() {
+		return super.getEntityManager();
+	}
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/generic/dao/SalesManagerJpaDaoSupport.java b/sm-core/src/main/java/com/salesmanager/core/business/generic/dao/SalesManagerJpaDaoSupport.java
new file mode 100644
index 0000000..ab5c979
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/generic/dao/SalesManagerJpaDaoSupport.java
@@ -0,0 +1,221 @@
+package com.salesmanager.core.business.generic.dao;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.ListIterator;
+
+import javax.persistence.EntityManager;
+import javax.persistence.NoResultException;
+import javax.persistence.PersistenceContext;
+import javax.persistence.TypedQuery;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Expression;
+import javax.persistence.criteria.Order;
+import javax.persistence.criteria.Root;
+import javax.persistence.metamodel.SingularAttribute;
+
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+@Repository("entityDao")
+@Transactional
+public class SalesManagerJpaDaoSupport {
+
+	@PersistenceContext
+	private EntityManager entityManager;
+	
+	/**
+	 * Cree la requete et applique les conditions de limite / offset et retourne la {@link TypedQuery}
+	 * correspondante.
+	 * 
+	 * @param <T> le type de l'entite retournee
+	 * @param criteria
+	 * @param limit null si pas de limite
+	 * @param offset null si pas d'offset
+	 * @return la {@link TypedQuery} avec limite et offset le cas echeant
+	 */
+	protected <T> TypedQuery<T> buildTypedQuery(CriteriaQuery<T> criteria, Integer limit, Integer offset) {
+		TypedQuery<T> query = getEntityManager().createQuery(criteria);
+		if (offset != null) {
+			query.setFirstResult(offset);
+		}
+		if (limit != null) {
+			query.setMaxResults(limit);
+		}
+		return query;
+		
+	}
+	
+	protected void filterCriteriaQuery(CriteriaQuery<?> criteria, Expression<Boolean> filter) {
+		if (filter != null) {
+			criteria.where(filter);
+		}
+	}
+	
+	protected <T> Root<T> rootCriteriaQuery(CriteriaBuilder builder, CriteriaQuery<?> criteria, Class<T> objectClass) {
+		return criteria.from(objectClass);
+	}
+	
+	public <T, K> T getEntity(Class<T> clazz, K id) {
+		return getEntityManager().find(clazz, id);
+	}
+	
+	public <T, V> T getByField(Class<T> clazz, SingularAttribute<? super T, V> attribute, V fieldValue) {
+		CriteriaBuilder builder = getEntityManager().getCriteriaBuilder();
+		CriteriaQuery<T> criteria = builder.createQuery(clazz);
+		Root<T> root = criteria.from(clazz);
+		criteria.where(builder.equal(root.get(attribute), fieldValue));
+		
+		try {
+			return buildTypedQuery(criteria, null, null).getSingleResult();
+		} catch (NoResultException e) {
+			return null;
+		}
+	}
+	
+	protected <T> void update(T entity) {
+		if (!getEntityManager().contains(entity)) {
+			getEntityManager().merge(entity);
+			//throw new PersistenceException("Updated entity must be attached");
+		}
+		//TODO: http://blog.xebia.com/2009/03/23/jpa-implementation-patterns-saving-detached-entities/
+	}
+	
+	protected <T> void save(T entity) {
+		getEntityManager().persist(entity);
+	}
+	
+	protected <T> void delete(T entity) {
+		if (!getEntityManager().contains(entity)) {
+			getEntityManager().merge(entity);
+			//throw new PersistenceException("Failed to delete a detached entity");
+		}
+		getEntityManager().remove(entity);
+	}
+	
+	protected <T> T refresh(T entity) {
+		getEntityManager().refresh(entity);
+		
+		return entity;
+	}
+	
+	public void flush() {
+		getEntityManager().flush();
+	}
+	
+	public void clear() {
+		getEntityManager().clear();
+	}
+	
+	protected <T> List<T> listEntity(Class<T> objectClass, Expression<Boolean> filter, Integer limit, Integer offset, Order... orders) {
+		CriteriaBuilder builder = getEntityManager().getCriteriaBuilder();
+		CriteriaQuery<T> criteria = builder.createQuery(objectClass);
+		rootCriteriaQuery(builder, criteria, objectClass);
+		
+		if (filter != null) {
+			filterCriteriaQuery(criteria, filter);
+		}
+		if (orders != null && orders.length > 0) {
+			criteria.orderBy(orders);
+		}
+		TypedQuery<T> query = buildTypedQuery(criteria, limit, offset);
+		
+		List<T> entities = query.getResultList();
+		
+		if (orders == null || orders.length == 0) {
+			sort(entities);
+		}
+		
+		return entities;
+	}
+	
+	protected <T> List<T> listEntity(Class<T> objectClass) {
+		return listEntity(objectClass, null, null, null);
+	}
+	
+	protected <T> List<T> listEntity(Class<T> objectClass, Expression<Boolean> filter) {
+		return listEntity(objectClass, filter, null, null);
+	}
+	
+	protected <T, V> List<T> listEntityByField(Class<T> objectClass, SingularAttribute<? super T, V> attribute, V fieldValue) {
+		CriteriaBuilder builder = getEntityManager().getCriteriaBuilder();
+		CriteriaQuery<T> criteria = builder.createQuery(objectClass);
+		
+		Root<T> root = rootCriteriaQuery(builder, criteria, objectClass);
+		criteria.where(builder.equal(root.get(attribute), fieldValue));
+		
+		List<T> entities = buildTypedQuery(criteria, null, null).getResultList();
+		
+		sort(entities);
+		
+		return entities;
+	}
+	
+	protected <T> Long countEntity(Class<T> clazz) {
+		CriteriaBuilder builder = getEntityManager().getCriteriaBuilder();
+		CriteriaQuery<Long> criteria = builder.createQuery(Long.class);
+		Root<T> root = rootCriteriaQuery(builder, criteria, clazz);
+		
+		criteria.select(builder.count(root));
+		
+		return buildTypedQuery(criteria, null, null).getSingleResult();
+	}
+	
+	protected <T, V> Long countEntityByField(Class<T> clazz, SingularAttribute<? super T, V> attribute, V fieldValue) {
+		CriteriaBuilder builder = getEntityManager().getCriteriaBuilder();
+		CriteriaQuery<Long> criteria = builder.createQuery(Long.class);
+		
+		Root<T> root = rootCriteriaQuery(builder, criteria, clazz);
+		criteria.select(builder.count(root));
+		
+		Expression<Boolean> filter = builder.equal(root.get(attribute), fieldValue);
+		filterCriteriaQuery(criteria, filter);
+		
+		return buildTypedQuery(criteria, null, null).getSingleResult();
+	}
+	
+	protected <T> Long countEntity(Class<T> clazz, Expression<Boolean> filter) {
+		CriteriaBuilder builder = getEntityManager().getCriteriaBuilder();
+		CriteriaQuery<Long> criteria = builder.createQuery(Long.class);
+		
+		Root<T> root = rootCriteriaQuery(builder, criteria, clazz);
+		criteria.select(builder.count(root));
+		
+		filterCriteriaQuery(criteria, filter);
+		
+		return buildTypedQuery(criteria, null, null).getSingleResult();
+	}
+	
+	protected <E> E getSingleResultOrNull(CriteriaQuery<E> cq) {
+		try {
+			return getEntityManager().createQuery(cq).getSingleResult();
+		} catch (NoResultException e) {
+			return null;
+		}
+	}
+	
+	protected <E> E getSingleResultOrNull(TypedQuery<E> tq) {
+		try {
+			return tq.getSingleResult();
+		} catch (NoResultException e) {
+			return null;
+		}
+	}
+	
+	protected EntityManager getEntityManager() {
+		return entityManager;
+	}
+	
+	@SuppressWarnings("unchecked")
+	protected <T> void sort(List<T> entities) {
+		Object[] a = entities.toArray();
+		Arrays.sort(a);
+		ListIterator<T> i = entities.listIterator();
+		for (int j = 0; j < a.length; j++) {
+			i.next();
+			i.set((T) a[j]);
+		}
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/generic/exception/ConversionException.java b/sm-core/src/main/java/com/salesmanager/core/business/generic/exception/ConversionException.java
new file mode 100644
index 0000000..2537042
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/generic/exception/ConversionException.java
@@ -0,0 +1,31 @@
+/**
+ * 
+ */
+package com.salesmanager.core.business.generic.exception;
+
+/**
+ * @author Umesh A
+ *
+ */
+public class ConversionException extends Exception
+{
+  private static final long serialVersionUID = 687400310032876603L;
+  
+  public ConversionException(final String msg, final Throwable cause)
+  {
+      super(msg, cause);
+  }
+
+  public ConversionException(final String msg)
+  {
+      super(msg);
+  }
+  
+  public ConversionException(Throwable t)
+  {
+      super(t);
+  }
+  
+  
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/generic/exception/ServiceException.java b/sm-core/src/main/java/com/salesmanager/core/business/generic/exception/ServiceException.java
new file mode 100644
index 0000000..dccab11
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/generic/exception/ServiceException.java
@@ -0,0 +1,71 @@
+package com.salesmanager.core.business.generic.exception;
+
+/**
+ * <p>Exception générée par les services de l'application.</p>
+ */
+public class ServiceException extends Exception {
+
+	private static final long serialVersionUID = -6854945379036729034L;
+	private int exceptionType = 0;//regular error
+	
+
+
+
+	public final static int EXCEPTION_VALIDATION = 99;
+	public final static int EXCEPTION_PAYMENT_DECLINED = 100;
+	public final static int EXCEPTION_TRANSACTION_DECLINED = 101;
+	
+	private String messageCode = null;
+
+
+
+	public void setMessageCode(String messageCode) {
+		this.messageCode = messageCode;
+	}
+
+	public ServiceException() {
+		super();
+	}
+	
+	public ServiceException(String messageCode) {
+		super();
+		this.messageCode = messageCode;
+	}
+
+	public ServiceException(String message, Throwable cause) {
+		super(message, cause);
+	}
+
+	public ServiceException(Throwable cause) {
+		super(cause);
+	}
+	
+	public ServiceException(int exceptionType) {
+		super();
+		this.exceptionType = exceptionType;
+	}
+	
+	public ServiceException(int exceptionType, String message) {
+		super(message);
+		this.exceptionType = exceptionType;
+	}
+	
+	public ServiceException(int exceptionType, String message, String messageCode) {
+		super(message);
+		this.messageCode = messageCode;
+		this.exceptionType = exceptionType;
+	}
+	
+	public int getExceptionType() {
+		return exceptionType;
+	}
+	
+	public void setExceptionType(int exceptionType) {
+		this.exceptionType = exceptionType;
+	}
+	
+	public String getMessageCode() {
+		return messageCode;
+	}
+
+}
\ No newline at end of file

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/generic/model/SalesManagerEntity.java b/sm-core/src/main/java/com/salesmanager/core/business/generic/model/SalesManagerEntity.java
new file mode 100644
index 0000000..5c8662c
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/generic/model/SalesManagerEntity.java
@@ -0,0 +1,105 @@
+package com.salesmanager.core.business.generic.model;
+
+import java.io.Serializable;
+import java.text.Collator;
+import java.util.Locale;
+
+import org.hibernate.Hibernate;
+
+
+/**
+ * <p>Entité racine pour la persistence des objets via JPA.</p>
+ *
+ * @param <E> type de l'entité
+ */
+public abstract class SalesManagerEntity<K extends Serializable & Comparable<K>, E extends SalesManagerEntity<K, ?>>
+		implements Serializable, Comparable<E> {
+
+	private static final long serialVersionUID = -3988499137919577054L;
+	
+	public static final Collator DEFAULT_STRING_COLLATOR = Collator.getInstance(Locale.FRENCH);
+	
+	static {
+		DEFAULT_STRING_COLLATOR.setStrength(Collator.PRIMARY);
+	}
+	
+	/**
+	 * Retourne la valeur de l'identifiant unique.
+	 * 
+	 * @return id
+	 */
+	public abstract K getId();
+
+	/**
+	 * Définit la valeur de l'identifiant unique.
+	 * 
+	 * @param id id
+	 */
+	public abstract void setId(K id);
+	
+	/**
+	 * Indique si l'objet a déjà été persisté ou non
+	 * 
+	 * @return vrai si l'objet n'a pas encore été persisté
+	 */
+	public boolean isNew() {
+		return getId() == null;
+	}
+
+	
+	@SuppressWarnings("unchecked")
+	@Override
+	public boolean equals(Object object) {
+		if (object == null) {
+			return false;
+		}
+		if (object == this) {
+			return true;
+		}
+		
+		// l'objet peut être proxyfié donc on utilise Hibernate.getClass() pour sortir la vraie classe
+		if (Hibernate.getClass(object) != Hibernate.getClass(this)) {
+			return false;
+		}
+
+		SalesManagerEntity<K, E> entity = (SalesManagerEntity<K, E>) object; // NOSONAR : traité au-dessus mais wrapper Hibernate 
+		K id = getId();
+
+		if (id == null) {
+			return false;
+		}
+
+		return id.equals(entity.getId());
+	}
+
+	@Override
+	public int hashCode() {
+		int hash = 7;
+		
+		K id = getId();
+		hash = 31 * hash + ((id == null) ? 0 : id.hashCode());
+
+		return hash;
+	}
+
+	public int compareTo(E o) {
+		if (this == o) {
+			return 0;
+		}
+		return this.getId().compareTo(o.getId());
+	}
+
+	@Override
+	public String toString() {
+		StringBuilder builder = new StringBuilder();
+		builder.append("entity.");
+		builder.append(Hibernate.getClass(this).getSimpleName());
+		builder.append("<");
+		builder.append(getId());
+		builder.append("-");
+		builder.append(super.toString());
+		builder.append(">");
+		
+		return builder.toString();
+	}
+}
\ No newline at end of file

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/generic/service/SalesManagerEntityService.java b/sm-core/src/main/java/com/salesmanager/core/business/generic/service/SalesManagerEntityService.java
new file mode 100644
index 0000000..6aa7420
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/generic/service/SalesManagerEntityService.java
@@ -0,0 +1,92 @@
+package com.salesmanager.core.business.generic.service;
+
+import java.io.Serializable;
+import java.util.List;
+
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.business.user.model.User;
+
+/**
+ * <p>Service racine pour la gestion des entités.</p>
+ *
+ * @param <T> type d'entité
+ */
+public interface SalesManagerEntityService<K extends Serializable & Comparable<K>, E extends SalesManagerEntity<K, ?>> extends TransactionalAspectAwareService{
+
+	/**
+	 * Crée l'entité dans la base de données. Mis à part dans les tests pour faire des sauvegardes simples, utiliser
+	 * create() car il est possible qu'il y ait des listeners sur la création d'une entité.
+	 * 
+	 * @param entity entité
+	 */
+	void save(E entity) throws ServiceException;
+	
+	/**
+	 * Met à jour l'entité dans la base de données.
+	 * 
+	 * @param entity entité
+	 */
+	void update(E entity) throws ServiceException;
+	
+	/**
+	 * Crée l'entité dans la base de données.
+	 * 
+	 * @param entity entité
+	 */
+	void create(E entity) throws ServiceException;
+
+	/**
+	 * Supprime l'entité de la base de données
+	 * 
+	 * @param entity entité
+	 */
+	void delete(E entity) throws ServiceException;
+	
+	/**
+	 * Rafraîchit l'entité depuis la base de données
+	 * 
+	 * @param entity entité
+	 */
+	E refresh(E entity);
+	
+
+	/**
+	 * Retourne une entité à partir de son id.
+	 * 
+	 * @param id identifiant
+	 * @return entité
+	 */
+	E getById(K id);
+	
+	/**
+	 * Renvoie la liste de l'ensemble des entités de ce type.
+	 * 
+	 * @return liste d'entités
+	 */
+	List<E> list();
+	
+	/**
+	 * Retourne une entité à partir de sa classe et son id.
+	 * 
+	 * @param clazz classe
+	 * @param id identifiant
+	 * @return entité
+	 */
+	E getEntity(Class<? extends E> clazz, K id);
+	
+	/**
+	 * Compte le nombre d'entités de ce type présentes dans la base.
+	 * 
+	 * @return nombre d'entités
+	 */
+	Long count();
+	
+	/**
+	 * Flushe la session.
+	 */
+	void flush();
+
+	void clear();
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/generic/service/SalesManagerEntityServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/generic/service/SalesManagerEntityServiceImpl.java
new file mode 100644
index 0000000..17a7fdc
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/generic/service/SalesManagerEntityServiceImpl.java
@@ -0,0 +1,121 @@
+package com.salesmanager.core.business.generic.service;
+
+import java.io.Serializable;
+import java.util.List;
+
+import javax.persistence.metamodel.SingularAttribute;
+
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDao;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.business.generic.util.GenericEntityUtils;
+
+/**
+ * @param <T> entity type
+ */
+public abstract class SalesManagerEntityServiceImpl<K extends Serializable & Comparable<K>, E extends SalesManagerEntity<K, ?>>
+	implements SalesManagerEntityService<K, E> {
+	
+	/**
+	 * Classe de l'entité, déterminé à partir des paramètres generics.
+	 */
+	private Class<E> objectClass;
+
+	private SalesManagerEntityDao<K, E> genericDao;
+
+	@SuppressWarnings("unchecked")
+	public SalesManagerEntityServiceImpl(SalesManagerEntityDao<K, E> genericDao) {
+		this.genericDao = genericDao;
+		
+		this.objectClass = (Class<E>) GenericEntityUtils.getGenericEntityClassFromComponentDefinition(getClass());
+	}
+	
+	protected final Class<E> getObjectClass() {
+		return objectClass;
+	}
+
+	
+	public E getEntity(Class<? extends E> clazz, K id) {
+		return genericDao.getEntity(clazz, id);
+	}
+
+	
+	public E getById(K id) {
+		return genericDao.getById(id);
+	}
+
+	/**
+	 * @param fieldName condition field
+	 * @param fieldValue field value
+	 * @return entity
+	 */
+	protected <V> E getByField(SingularAttribute<? super E, V> fieldName, V fieldValue) {
+		return genericDao.getByField(fieldName, fieldValue);
+	}
+	
+	
+	public void save(E entity) throws ServiceException {
+		genericDao.save(entity);
+	}
+	
+	
+	public void create(E entity) throws ServiceException {
+		createEntity(entity);
+	}
+	
+	
+	protected void createEntity(E entity) throws ServiceException {
+		save(entity);
+	}
+	
+	
+	public final void update(E entity) throws ServiceException {
+		updateEntity(entity);
+	}
+	
+	protected void updateEntity(E entity) throws ServiceException {
+		genericDao.update(entity);
+	}
+	
+	
+	public void delete(E entity) throws ServiceException {
+		genericDao.delete(entity);
+	}
+	
+	
+	public void flush() {
+		genericDao.flush();
+	}
+	
+	
+	public void clear() {
+		genericDao.clear();
+	}
+	
+	
+	public E refresh(E entity) {
+		return genericDao.refresh(entity);
+	}
+
+	
+	public List<E> list() {
+		return genericDao.list();
+	}
+	
+	/**
+	 * Renvoie la liste des entités dont le champ donné en paramètre a la bonne valeur.
+	 * 
+	 * @param fieldName le champ sur lequel appliquer la condition
+	 * @param fieldValue valeur du champ
+	 * @return liste d'entités
+	 */
+	protected <V> List<E> listByField(SingularAttribute<? super E, V> fieldName, V fieldValue) {
+		return genericDao.listByField(fieldName, fieldValue);
+	}
+	
+	
+	public Long count() {
+		return genericDao.count();
+	}
+
+}
\ No newline at end of file

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/generic/service/TransactionalAspectAwareService.java b/sm-core/src/main/java/com/salesmanager/core/business/generic/service/TransactionalAspectAwareService.java
new file mode 100644
index 0000000..f7a6b0a
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/generic/service/TransactionalAspectAwareService.java
@@ -0,0 +1,12 @@
+package com.salesmanager.core.business.generic.service;
+
+/**
+ * Indique que le service doit être rendu transactionnel via un aspect.
+ * 
+ * Cela permet de simplifier la configuration Spring de la partie transactionnelle car
+ * il suffit alors de déclarer le pointcut de l'aspect sur
+ * this(com.salesmanager.core.business.generic.service.ITransactionalAspectAwareService)
+ */
+public interface TransactionalAspectAwareService {
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/generic/util/EntityManagerUtils.java b/sm-core/src/main/java/com/salesmanager/core/business/generic/util/EntityManagerUtils.java
new file mode 100644
index 0000000..84c5ce2
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/generic/util/EntityManagerUtils.java
@@ -0,0 +1,53 @@
+package com.salesmanager.core.business.generic.util;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.PersistenceContext;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.orm.jpa.EntityManagerFactoryUtils;
+import org.springframework.orm.jpa.EntityManagerHolder;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
+
+/**
+ * <p>Classe permettant de manipuler le EntityManager.</p>
+ * 
+ * <p>Utilisée dans les tests pour ouvrir la session au début d'un test et la fermet à la fin</p>
+ */
+@Component
+public class EntityManagerUtils {
+	
+	@Autowired
+	private EntityManagerFactory entityManagerFactory;
+	
+	@PersistenceContext
+	private EntityManager entityManager;
+	
+	/**
+	 * Mise en place du EntityManager
+	 */
+	public EntityManager openEntityManager() {
+		if (TransactionSynchronizationManager.hasResource(entityManagerFactory)) {
+			return ((EntityManagerHolder) TransactionSynchronizationManager.getResource(entityManagerFactory)).getEntityManager();
+		} else {
+			EntityManager entityManager = entityManagerFactory.createEntityManager();
+			TransactionSynchronizationManager.bindResource(entityManagerFactory, new EntityManagerHolder(entityManager));
+			return entityManager;
+		}
+	}
+	
+	/**
+	 * Suppression du EntityManager.
+	 */
+	public void closeEntityManager() {
+		if (TransactionSynchronizationManager.hasResource(entityManagerFactory)) {
+			EntityManagerHolder entityManagerHolder = (EntityManagerHolder) TransactionSynchronizationManager.unbindResource(entityManagerFactory);
+			EntityManagerFactoryUtils.closeEntityManager(entityManagerHolder.getEntityManager());
+		}
+	}
+	
+	public EntityManager getEntityManager() {
+		return entityManager;
+	}
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/generic/util/GenericEntityUtils.java b/sm-core/src/main/java/com/salesmanager/core/business/generic/util/GenericEntityUtils.java
new file mode 100644
index 0000000..7443d04
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/generic/util/GenericEntityUtils.java
@@ -0,0 +1,44 @@
+package com.salesmanager.core.business.generic.util;
+
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+
+public final class GenericEntityUtils {
+
+	public static Class<?> getGenericEntityClassFromComponentDefinition(Class<?> clazz) {
+		int retriesCount = 0;
+		
+		while(true) {
+			if (clazz.getGenericSuperclass() instanceof ParameterizedType) {
+				Type[] argumentTypes = ((ParameterizedType) clazz.getGenericSuperclass()).getActualTypeArguments();
+				
+				for (Type argumentType : argumentTypes) {
+					Class<?> argumentClass;
+					
+					if (argumentType instanceof ParameterizedType) {
+						argumentClass = (Class<?>) ((ParameterizedType) argumentType).getRawType();
+					} else {
+						argumentClass = (Class<?>) argumentType;
+					}
+					
+					if (SalesManagerEntity.class.isAssignableFrom(argumentClass)) {
+						return argumentClass;
+					}
+				}
+			}
+			
+			clazz = clazz.getSuperclass();
+			retriesCount ++;
+			
+			if (retriesCount > 5) {
+				throw new IllegalArgumentException("Unable to find a generic type extending GenericEntity.");
+			}
+		}
+	}
+	
+	private GenericEntityUtils() {
+	}
+	
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/merchant/dao/MerchantStoreDao.java b/sm-core/src/main/java/com/salesmanager/core/business/merchant/dao/MerchantStoreDao.java
new file mode 100644
index 0000000..8d5db68
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/merchant/dao/MerchantStoreDao.java
@@ -0,0 +1,17 @@
+package com.salesmanager.core.business.merchant.dao;
+
+import java.util.Collection;
+
+import com.salesmanager.core.business.catalog.product.model.Product;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDao;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+
+public interface MerchantStoreDao extends SalesManagerEntityDao<Integer, MerchantStore> {
+	
+	public Collection<Product> getProducts(MerchantStore merchantStore) throws ServiceException;
+	
+	public MerchantStore getMerchantStore(Integer merchantStoreId);
+
+	public MerchantStore getMerchantStore(String code) throws ServiceException;
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/merchant/dao/MerchantStoreDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/merchant/dao/MerchantStoreDaoImpl.java
new file mode 100644
index 0000000..5fc4cda
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/merchant/dao/MerchantStoreDaoImpl.java
@@ -0,0 +1,146 @@
+package com.salesmanager.core.business.merchant.dao;
+
+import java.util.Collection;
+
+import org.hibernate.Session;
+import org.hibernate.criterion.CriteriaSpecification;
+import org.springframework.stereotype.Repository;
+
+import com.mysema.query.jpa.JPQLQuery;
+import com.mysema.query.jpa.impl.JPAQuery;
+import com.salesmanager.core.business.catalog.product.model.Product;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDaoImpl;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.merchant.model.QMerchantStore;
+
+
+@Repository("merchantStoreDao")
+public class MerchantStoreDaoImpl extends SalesManagerEntityDaoImpl<Integer, MerchantStore> implements MerchantStoreDao {
+
+	public MerchantStoreDaoImpl() {
+		super();
+	}
+	
+	@Override
+	public Collection<Product> getProducts(MerchantStore merchantStore) throws ServiceException {
+		
+
+		
+
+		StringBuilder qs = new StringBuilder();
+	
+		
+		qs.append("from ProductMerchant as pm, Product as p ");
+		qs.append("join fetch p.availabilities pa ");
+		qs.append("join fetch p.descriptions pd ");
+		qs.append("join fetch pa.prices pap ");
+		qs.append("join fetch pap.descriptions papd ");
+		//images
+		qs.append("left join fetch p.images images ");
+		//options
+		qs.append("left join fetch p.attributes pattr ");
+		qs.append("left join fetch pattr.productOption po ");
+		qs.append("left join fetch po.descriptions pod ");
+		qs.append("left join fetch pattr.productOptionValue pov ");
+		qs.append("left join fetch pov.descriptions povd ");
+		
+		qs.append("where pm.merchantId=:mid ");
+		qs.append("and pm.productId=p.productId ");
+
+		
+		
+		
+		
+		// TODO : WTF?
+    	String hql = qs.toString();
+		//Query q = this.entityManager.createQuery(hql);
+    	
+		Session session = (Session)super.getEntityManager().getDelegate();
+		org.hibernate.Query q = session.createQuery(qs.toString());
+		q.setResultTransformer(CriteriaSpecification.DISTINCT_ROOT_ENTITY);
+
+		
+
+    	q.setInteger("mid", merchantStore.getId());
+    	//q.setParameterList("lid", regionList);
+    	//@TODO languageUtil
+    	//q.setParameter("lang", 1);
+		
+		Collection<Product> results = q.list();
+    	//MerchantStore s = (MerchantStore)q.getSingleResult();
+    	//Collection<Product> results = s.getProducts();
+
+		return results;
+
+		
+		
+		
+	}
+	
+	@Override
+	public MerchantStore getById(Integer id)  {
+		
+		QMerchantStore qMerchantStore = QMerchantStore.merchantStore;
+
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		query.from(qMerchantStore)
+			.innerJoin(qMerchantStore.defaultLanguage).fetch()
+			.leftJoin(qMerchantStore.currency).fetch()
+			.leftJoin(qMerchantStore.country).fetch()
+			.leftJoin(qMerchantStore.zone).fetch()
+			.leftJoin(qMerchantStore.languages).fetch()
+			.where(qMerchantStore.id.eq(id));
+		
+		return query.uniqueResult(qMerchantStore);
+		
+	}
+	
+	@Override
+	public MerchantStore getMerchantStore(String code)   throws ServiceException {
+	
+/*		
+		String q = "from MerchantStore m join fetch m.defaultLanguage left join fetch m.currency left join fetch m.country left join fetch m.zone left join fetch m.languages where m.code=:code";
+		
+		
+		Query queryQ = super.getEntityManager().createQuery(q);
+		queryQ.setParameter("code", code);
+		
+		return (MerchantStore)queryQ.getSingleResult();*/
+		//TODO add fetch
+		QMerchantStore qMerchantStore = QMerchantStore.merchantStore;
+
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		query.from(qMerchantStore)
+			.innerJoin(qMerchantStore.defaultLanguage).fetch()
+			.leftJoin(qMerchantStore.currency).fetch()
+			.leftJoin(qMerchantStore.country).fetch()
+			.leftJoin(qMerchantStore.zone).fetch()
+			.leftJoin(qMerchantStore.languages).fetch()
+			.where(qMerchantStore.code.eq(code));
+		
+		return query.uniqueResult(qMerchantStore);
+	}
+	
+	public MerchantStore getMerchantStore(Integer merchantStoreId) {
+		
+		
+		QMerchantStore qMerchantStore = QMerchantStore.merchantStore;
+
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		//TODO Zone country
+		query.from(qMerchantStore)
+			.innerJoin(qMerchantStore.defaultLanguage)
+			.leftJoin(qMerchantStore.currency)
+			.leftJoin(qMerchantStore.country)
+			.leftJoin(qMerchantStore.zone)
+			.leftJoin(qMerchantStore.languages)
+			.where(qMerchantStore.id.eq(merchantStoreId));
+		
+		return query.uniqueResult(qMerchantStore);
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/merchant/model/MerchantStore.java b/sm-core/src/main/java/com/salesmanager/core/business/merchant/model/MerchantStore.java
new file mode 100755
index 0000000..35e77dd
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/merchant/model/MerchantStore.java
@@ -0,0 +1,385 @@
+package com.salesmanager.core.business.merchant.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import javax.persistence.Transient;
+import javax.validation.constraints.Pattern;
+
+import org.hibernate.validator.constraints.Email;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.business.reference.country.model.Country;
+import com.salesmanager.core.business.reference.currency.model.Currency;
+import com.salesmanager.core.business.reference.language.model.Language;
+import com.salesmanager.core.business.reference.zone.model.Zone;
+import com.salesmanager.core.constants.MeasureUnit;
+import com.salesmanager.core.constants.SchemaConstant;
+import com.salesmanager.core.utils.CloneUtils;
+
+@Entity
+@Table(name = "MERCHANT_STORE", schema=SchemaConstant.SALESMANAGER_SCHEMA)
+public class MerchantStore extends SalesManagerEntity<Integer, MerchantStore> {
+	private static final long serialVersionUID = 7671103335743647655L;
+	
+	
+	public final static String DEFAULT_STORE = "DEFAULT";
+	
+	@Id
+	@Column(name = "MERCHANT_ID", unique=true, nullable=false)
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT",
+		pkColumnValue = "STORE_SEQ_NEXT_VAL")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Integer id;
+
+	@NotEmpty
+	@Column(name = "STORE_NAME", nullable=false, length=100)
+	private String storename;
+	
+	@NotEmpty
+	@Pattern(regexp="^[a-zA-Z0-9_]*$")
+	@Column(name = "STORE_CODE", nullable=false, unique=true, length=100)
+	private String code;
+	
+	@NotEmpty
+	@Column(name = "STORE_PHONE", length=50)
+	private String storephone;
+
+	@Column(name = "STORE_ADDRESS")
+	private String storeaddress;
+
+	@NotEmpty
+	@Column(name = "STORE_CITY", length=100)
+	private String storecity;
+
+	@NotEmpty
+	@Column(name = "STORE_POSTAL_CODE", length=15)
+	private String storepostalcode;
+
+	@ManyToOne(fetch = FetchType.LAZY, targetEntity = Country.class)
+	@JoinColumn(name="COUNTRY_ID", nullable=false, updatable=true)
+	private Country country;
+
+	@ManyToOne(fetch = FetchType.LAZY, targetEntity = Zone.class)
+	@JoinColumn(name="ZONE_ID", nullable=true, updatable=true)
+	private Zone zone;
+
+	@Column(name = "STORE_STATE_PROV", length=100)
+	private String storestateprovince;
+	
+	@Column(name = "WEIGHTUNITCODE", length=5)
+	private String weightunitcode = MeasureUnit.LB.name();
+
+	@Column(name = "SEIZEUNITCODE", length=5)
+	private String seizeunitcode = MeasureUnit.IN.name();
+
+	@Temporal(TemporalType.DATE)
+	@Column(name = "IN_BUSINESS_SINCE")
+	private Date inBusinessSince = new Date();
+	
+	@Transient
+	private String dateBusinessSince;
+
+	@ManyToOne(fetch = FetchType.LAZY, targetEntity = Language.class)
+	@JoinColumn(name = "LANGUAGE_ID", nullable=false)
+	private Language defaultLanguage;
+
+	@NotEmpty
+	@ManyToMany(fetch = FetchType.LAZY)
+	@JoinTable(name = "MERCHANT_LANGUAGE")
+	private List<Language> languages = new ArrayList<Language>();
+	
+	@Column(name = "USE_CACHE")
+	private boolean useCache = false;
+	
+	@Column(name="STORE_TEMPLATE", length=25)
+	private String storeTemplate;
+	
+	@Column(name="INVOICE_TEMPLATE", length=25)
+	private String invoiceTemplate;
+	
+	@Column(name="DOMAIN_NAME", length=80)
+	private String domainName;
+	
+	@Column(name="CONTINUESHOPPINGURL", length=150)
+	private String continueshoppingurl;
+	
+	@Email
+	@NotEmpty
+	@Column(name = "STORE_EMAIL", length=60, nullable=false)
+	private String storeEmailAddress;
+	
+	@Column(name="STORE_LOGO", length=100)
+	private String storeLogo;
+	
+	@ManyToOne(fetch = FetchType.LAZY, targetEntity = Currency.class)
+	@JoinColumn(name = "CURRENCY_ID", nullable=false)
+	private Currency currency;
+	
+	@Column(name = "CURRENCY_FORMAT_NATIONAL")
+	private boolean currencyFormatNational;
+	
+	public MerchantStore() {
+	}
+	
+	public boolean isUseCache() {
+		return useCache;
+	}
+
+	public void setUseCache(boolean useCache) {
+		this.useCache = useCache;
+	}
+	
+	@Override
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	@Override
+	public Integer getId() {
+		return this.id;
+	}
+	
+	public String getStorename() {
+		return storename;
+	}
+
+	public void setStorename(String storename) {
+		this.storename = storename;
+	}
+
+	public String getStorephone() {
+		return storephone;
+	}
+
+	public void setStorephone(String storephone) {
+		this.storephone = storephone;
+	}
+
+	public String getStoreaddress() {
+		return storeaddress;
+	}
+
+	public void setStoreaddress(String storeaddress) {
+		this.storeaddress = storeaddress;
+	}
+
+	public String getStorecity() {
+		return storecity;
+	}
+
+	public void setStorecity(String storecity) {
+		this.storecity = storecity;
+	}
+
+	public String getStorepostalcode() {
+		return storepostalcode;
+	}
+
+	public void setStorepostalcode(String storepostalcode) {
+		this.storepostalcode = storepostalcode;
+	}
+
+	public Country getCountry() {
+		return country;
+	}
+
+	public void setCountry(Country country) {
+		this.country = country;
+	}
+
+	public Zone getZone() {
+		return zone;
+	}
+
+	public void setZone(Zone zone) {
+		this.zone = zone;
+	}
+
+	public String getStorestateprovince() {
+		return storestateprovince;
+	}
+
+	public void setStorestateprovince(String storestateprovince) {
+		this.storestateprovince = storestateprovince;
+	}
+
+	public Currency getCurrency() {
+		return currency;
+	}
+
+	public void setCurrency(Currency currency) {
+		this.currency = currency;
+	}
+
+	public String getWeightunitcode() {
+		return weightunitcode;
+	}
+
+	public void setWeightunitcode(String weightunitcode) {
+		this.weightunitcode = weightunitcode;
+	}
+
+	public String getSeizeunitcode() {
+		return seizeunitcode;
+	}
+
+	public void setSeizeunitcode(String seizeunitcode) {
+		this.seizeunitcode = seizeunitcode;
+	}
+
+
+
+	public Date getInBusinessSince() {
+		return CloneUtils.clone(inBusinessSince);
+	}
+
+	public void setInBusinessSince(Date inBusinessSince) {
+		this.inBusinessSince = CloneUtils.clone(inBusinessSince);
+	}
+
+	public Language getDefaultLanguage() {
+		return defaultLanguage;
+	}
+
+	public void setDefaultLanguage(Language defaultLanguage) {
+		this.defaultLanguage = defaultLanguage;
+	}
+
+
+
+	public List<Language> getLanguages() {
+		return languages;
+	}
+
+	public void setLanguages(List<Language> languages) {
+		this.languages = languages;
+	}
+	
+	//reverse mappings
+/*	@SuppressWarnings("unused")
+	@ManyToMany(fetch = FetchType.LAZY, mappedBy = "stores", cascade = { CascadeType.REFRESH})
+	private Set<Manufacturer> manufacturers = new HashSet<Manufacturer>();*/
+	
+	
+/*	@SuppressWarnings("unused")
+	@ManyToMany(fetch = FetchType.LAZY, mappedBy = "stores", cascade = CascadeType.REMOVE)
+	private Set<TaxClass> taxClasses = new HashSet<TaxClass>();*/
+	
+/*	@SuppressWarnings("unused")
+	@ManyToMany(fetch = FetchType.LAZY, mappedBy = "stores", cascade = CascadeType.REMOVE)
+	private Set<ProductOption> productOptions = new HashSet<ProductOption>();*/
+	
+/*	@SuppressWarnings("unused")
+	@ManyToMany(fetch = FetchType.LAZY, mappedBy = "stores", cascade = CascadeType.REMOVE)
+	private Set<ProductOptionValue> productOptionValues = new HashSet<ProductOptionValue>();*/
+	
+/*	@SuppressWarnings("unused")
+	@ManyToMany(fetch = FetchType.LAZY, mappedBy = "stores", cascade = CascadeType.REMOVE)
+	private Set<Product> products = new HashSet<Product>();*/
+	
+
+/*	
+	//TODO ManyToMany
+	@SuppressWarnings("unused")
+	@OneToMany(mappedBy = "merchant", cascade = CascadeType.REMOVE)
+	private List<TaxRate> taxRates = new ArrayList<TaxRate>();*/
+	
+
+	
+	public String getStoreLogo() {
+		return storeLogo;
+	}
+
+	public void setStoreLogo(String storeLogo) {
+		this.storeLogo = storeLogo;
+	}
+
+	public String getStoreTemplate() {
+		return storeTemplate;
+	}
+
+	public void setStoreTemplate(String storeTemplate) {
+		this.storeTemplate = storeTemplate;
+	}
+
+	public String getInvoiceTemplate() {
+		return invoiceTemplate;
+	}
+
+	public void setInvoiceTemplate(String invoiceTemplate) {
+		this.invoiceTemplate = invoiceTemplate;
+	}
+
+	public String getDomainName() {
+		return domainName;
+	}
+
+	public void setDomainName(String domainName) {
+		this.domainName = domainName;
+	}
+
+	public String getContinueshoppingurl() {
+		return continueshoppingurl;
+	}
+
+	public void setContinueshoppingurl(String continueshoppingurl) {
+		this.continueshoppingurl = continueshoppingurl;
+	}
+
+	public String getStoreEmailAddress() {
+		return storeEmailAddress;
+	}
+
+	public void setStoreEmailAddress(String storeEmailAddress) {
+		this.storeEmailAddress = storeEmailAddress;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public void setDateBusinessSince(String dateBusinessSince) {
+		this.dateBusinessSince = dateBusinessSince;
+	}
+
+	public String getDateBusinessSince() {
+		return dateBusinessSince;
+	}
+
+	public void setCurrencyFormatNational(boolean currencyFormatNational) {
+		this.currencyFormatNational = currencyFormatNational;
+	}
+
+	public boolean isCurrencyFormatNational() {
+		return currencyFormatNational;
+	}
+
+
+
+
+
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/merchant/service/MerchantStoreService.java b/sm-core/src/main/java/com/salesmanager/core/business/merchant/service/MerchantStoreService.java
new file mode 100755
index 0000000..10524c2
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/merchant/service/MerchantStoreService.java
@@ -0,0 +1,20 @@
+package com.salesmanager.core.business.merchant.service;
+
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityService;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+
+public interface MerchantStoreService extends SalesManagerEntityService<Integer, MerchantStore>{
+	
+
+	//Collection<Product> getProducts(MerchantStore merchantStore) throws ServiceException;
+	
+	//MerchantStore getMerchantStore(Integer merchantStoreId) throws ServiceException;
+
+	MerchantStore getMerchantStore(String merchantStoreCode)
+			throws ServiceException;
+	
+	MerchantStore getByCode(String code) throws ServiceException ;
+
+	void saveOrUpdate(MerchantStore store) throws ServiceException;
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/merchant/service/MerchantStoreServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/merchant/service/MerchantStoreServiceImpl.java
new file mode 100755
index 0000000..e1417a8
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/merchant/service/MerchantStoreServiceImpl.java
@@ -0,0 +1,159 @@
+package com.salesmanager.core.business.merchant.service;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.salesmanager.core.business.catalog.category.model.Category;
+import com.salesmanager.core.business.catalog.category.service.CategoryService;
+import com.salesmanager.core.business.catalog.product.model.manufacturer.Manufacturer;
+import com.salesmanager.core.business.catalog.product.service.manufacturer.ManufacturerService;
+import com.salesmanager.core.business.catalog.product.service.type.ProductTypeService;
+import com.salesmanager.core.business.content.service.ContentService;
+import com.salesmanager.core.business.customer.model.Customer;
+import com.salesmanager.core.business.customer.service.CustomerService;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityServiceImpl;
+import com.salesmanager.core.business.merchant.dao.MerchantStoreDao;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.order.model.Order;
+import com.salesmanager.core.business.order.service.OrderService;
+import com.salesmanager.core.business.system.model.MerchantConfiguration;
+import com.salesmanager.core.business.system.service.MerchantConfigurationService;
+import com.salesmanager.core.business.tax.model.taxclass.TaxClass;
+import com.salesmanager.core.business.tax.service.TaxClassService;
+import com.salesmanager.core.business.user.model.User;
+import com.salesmanager.core.business.user.service.UserService;
+
+@Service("merchantService")
+public class MerchantStoreServiceImpl extends SalesManagerEntityServiceImpl<Integer, MerchantStore> 
+		implements MerchantStoreService {
+	
+
+		
+	@Autowired
+	protected ProductTypeService productTypeService;
+	
+	@Autowired
+	private TaxClassService taxClassService;
+	
+	@Autowired
+	private ContentService contentService;
+	
+	@Autowired
+	private MerchantConfigurationService merchantConfigurationService;
+	
+	@Autowired
+	private CategoryService categoryService;
+	
+	@Autowired
+	private UserService userService;
+	
+	@Autowired
+	private OrderService orderService;
+	
+	@Autowired
+	private CustomerService customerService;
+	
+	@Autowired
+	private ManufacturerService manufacturerService;
+	
+	private MerchantStoreDao merchantStoreDao;
+	
+	@Autowired
+	public MerchantStoreServiceImpl(MerchantStoreDao merchantStoreDao) {
+		super(merchantStoreDao);
+		this.merchantStoreDao = merchantStoreDao;
+	}
+
+	
+	//@Override
+	public MerchantStore getMerchantStore(String merchantStoreCode) throws ServiceException {
+		return merchantStoreDao.getMerchantStore(merchantStoreCode);
+	}
+	
+	@Override
+	public void saveOrUpdate(MerchantStore store) throws ServiceException {
+		
+		if(store.getId()==null) {
+			super.save(store);
+		} else {
+			super.update(store);
+		}
+	}
+	
+
+	
+	//@Override
+	//public Collection<Product> getProducts(MerchantStore merchantStore) throws ServiceException {
+		
+
+	//	return merchantStoreDao.getProducts(merchantStore);
+		
+		
+	//}
+
+	@Override
+	public MerchantStore getByCode(String code) throws ServiceException {
+		
+		return merchantStoreDao.getMerchantStore(code);
+	}
+	
+	@Override
+	public void delete(MerchantStore merchant) throws ServiceException {
+		
+		merchant = this.getById(merchant.getId());
+		
+		
+		//reference
+		List<Manufacturer> manufacturers = manufacturerService.listByStore(merchant);
+		for(Manufacturer manufacturer : manufacturers) {
+			manufacturerService.delete(manufacturer);
+		}
+		
+		List<MerchantConfiguration> configurations = merchantConfigurationService.listByStore(merchant);
+		for(MerchantConfiguration configuration : configurations) {
+			merchantConfigurationService.delete(configuration);
+		}
+		
+
+		//TODO taxService
+		List<TaxClass> taxClasses = taxClassService.listByStore(merchant);
+		for(TaxClass taxClass : taxClasses) {
+			taxClassService.delete(taxClass);
+		}
+		
+		//content
+		contentService.removeFiles(merchant.getCode());
+		//TODO staticContentService.removeImages
+		
+		//category / product
+		List<Category> categories = categoryService.listByStore(merchant);
+		for(Category category : categories) {
+			categoryService.delete(category);
+		}
+
+		//users
+		List<User> users = userService.listByStore(merchant);
+		for(User user : users) {
+			userService.delete(user);
+		}
+		
+		//customers
+		List<Customer> customers = customerService.listByStore(merchant);
+		for(Customer customer : customers) {
+			customerService.delete(customer);
+		}
+		
+		//orders
+		List<Order> orders = orderService.listByStore(merchant);
+		for(Order order : orders) {
+			orderService.delete(order);
+		}
+		
+		super.delete(merchant);
+		
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/order/dao/orderaccount/OrderAccountDao.java b/sm-core/src/main/java/com/salesmanager/core/business/order/dao/orderaccount/OrderAccountDao.java
new file mode 100644
index 0000000..3183e9e
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/order/dao/orderaccount/OrderAccountDao.java
@@ -0,0 +1,9 @@
+package com.salesmanager.core.business.order.dao.orderaccount;
+
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDao;
+import com.salesmanager.core.business.order.model.orderaccount.OrderAccount;
+
+public interface OrderAccountDao  extends SalesManagerEntityDao<Long, OrderAccount > {
+
+}
+

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/order/dao/orderaccount/OrderAccountDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/order/dao/orderaccount/OrderAccountDaoImpl.java
new file mode 100644
index 0000000..0a0b493
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/order/dao/orderaccount/OrderAccountDaoImpl.java
@@ -0,0 +1,15 @@
+package com.salesmanager.core.business.order.dao.orderaccount;
+
+import org.springframework.stereotype.Repository;
+
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDaoImpl;
+import com.salesmanager.core.business.order.model.orderaccount.OrderAccount;
+
+@Repository("orderAccountDao")
+public class OrderAccountDaoImpl extends SalesManagerEntityDaoImpl<Long, OrderAccount> implements OrderAccountDao {
+
+	public OrderAccountDaoImpl() {
+		super();
+	}
+	
+}
\ No newline at end of file

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/order/dao/OrderDao.java b/sm-core/src/main/java/com/salesmanager/core/business/order/dao/OrderDao.java
new file mode 100644
index 0000000..53e1c95
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/order/dao/OrderDao.java
@@ -0,0 +1,13 @@
+package com.salesmanager.core.business.order.dao;
+
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDao;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.order.model.Order;
+import com.salesmanager.core.business.order.model.OrderCriteria;
+import com.salesmanager.core.business.order.model.OrderList;
+
+public interface OrderDao extends SalesManagerEntityDao<Long, Order> {
+	
+	OrderList listByStore(MerchantStore store, OrderCriteria criteria);
+
+}
\ No newline at end of file

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/order/dao/OrderDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/order/dao/OrderDaoImpl.java
new file mode 100644
index 0000000..9855e0c
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/order/dao/OrderDaoImpl.java
@@ -0,0 +1,173 @@
+package com.salesmanager.core.business.order.dao;
+
+import javax.persistence.Query;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Repository;
+
+import com.mysema.query.BooleanBuilder;
+import com.mysema.query.jpa.JPQLQuery;
+import com.mysema.query.jpa.impl.JPAQuery;
+import com.salesmanager.core.business.common.model.CriteriaOrderBy;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDaoImpl;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.order.model.Order;
+import com.salesmanager.core.business.order.model.OrderCriteria;
+import com.salesmanager.core.business.order.model.OrderList;
+import com.salesmanager.core.business.order.model.QOrder;
+import com.salesmanager.core.business.order.model.QOrderTotal;
+import com.salesmanager.core.business.order.model.orderproduct.QOrderProduct;
+import com.salesmanager.core.business.order.model.orderproduct.QOrderProductAttribute;
+import com.salesmanager.core.business.order.model.orderstatus.QOrderStatusHistory;
+
+@Repository("orderDao")
+public class OrderDaoImpl  extends SalesManagerEntityDaoImpl<Long, Order> implements OrderDao {
+
+	public OrderDaoImpl() {
+		super();
+	}
+	
+	@Override
+	public Order getById(Long id) {
+		
+		
+		QOrder qOrder = QOrder.order;
+		QOrderProduct qOrderProduct = QOrderProduct.orderProduct;
+		QOrderTotal qOrderTotal = QOrderTotal.orderTotal;
+		QOrderStatusHistory qOrderStatusHistory = QOrderStatusHistory.orderStatusHistory;
+		QOrderProductAttribute qOrderProductAttribute = QOrderProductAttribute.orderProductAttribute;
+		//OrderAccount not loaded for now
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qOrder)
+			.join(qOrder.orderProducts, qOrderProduct).fetch()
+			.join(qOrder.orderTotal, qOrderTotal).fetch()
+			.leftJoin(qOrder.orderHistory, qOrderStatusHistory).fetch()
+			.leftJoin(qOrderProduct.downloads).fetch()
+			.leftJoin(qOrderProduct.orderAttributes,qOrderProductAttribute).fetch()
+			.leftJoin(qOrderProduct.prices).fetch()
+			.where(qOrder.id.eq(id));
+
+		
+		return query.uniqueResult(qOrder);
+		
+	}
+
+
+
+	@Override
+	public OrderList listByStore(MerchantStore store, OrderCriteria criteria) {
+
+		OrderList orderList = new OrderList();
+		StringBuilder countBuilderSelect = new StringBuilder();
+		countBuilderSelect.append("select count(o) from Order as o");
+		
+		StringBuilder countBuilderWhere = new StringBuilder();
+		countBuilderWhere.append(" where o.merchant.id=:mId");
+
+		if(!StringUtils.isBlank(criteria.getCustomerName())) {
+			countBuilderWhere.append(" and o.billing.firstName like:nm");
+			countBuilderWhere.append(" or o.billing.lastName like:nm");
+		}
+		
+		if(!StringUtils.isBlank(criteria.getPaymentMethod())) {
+			countBuilderWhere.append(" and o.paymentModuleCode like:pm");
+		}
+		
+		if(criteria.getCustomerId()!=null) {
+			countBuilderWhere.append(" and o.customerId =:cid");
+		}
+
+		Query countQ = super.getEntityManager().createQuery(
+				countBuilderSelect.toString() + countBuilderWhere.toString());
+
+		countQ.setParameter("mId", store.getId());
+		
+		if(!StringUtils.isBlank(criteria.getCustomerName())) {
+			countQ.setParameter("nm",new StringBuilder().append("%").append(criteria.getCustomerName()).append("%").toString());
+		}
+		
+		if(!StringUtils.isBlank(criteria.getPaymentMethod())) {
+			countQ.setParameter("pm",new StringBuilder().append("%").append(criteria.getPaymentMethod()).append("%").toString());
+		}
+		
+		if(criteria.getCustomerId()!=null) {
+			countQ.setParameter("cid", criteria.getCustomerId());
+		}
+		
+
+
+		Number count = (Number) countQ.getSingleResult ();
+
+		orderList.setTotalCount(count.intValue());
+		
+        if(count.intValue()==0)
+        	return orderList;
+		
+		
+		
+		QOrder qOrder = QOrder.order;
+		QOrderProduct qOrderProduct = QOrderProduct.orderProduct;
+		QOrderTotal qOrderTotal = QOrderTotal.orderTotal;
+		QOrderStatusHistory qOrderStatusHistory = QOrderStatusHistory.orderStatusHistory;
+		QOrderProductAttribute qOrderProductAttribute = QOrderProductAttribute.orderProductAttribute;
+		//OrderAccount not loaded for now
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qOrder)
+			.join(qOrder.orderProducts, qOrderProduct).fetch()
+			.join(qOrder.orderTotal, qOrderTotal).fetch()
+			.leftJoin(qOrder.orderHistory, qOrderStatusHistory).fetch()
+			.leftJoin(qOrderProduct.downloads).fetch()
+			.leftJoin(qOrderProduct.orderAttributes,qOrderProductAttribute).fetch()
+			.leftJoin(qOrderProduct.prices).fetch();
+			
+			query.where(qOrder.merchant.id.eq(store.getId()))
+			.orderBy(qOrder.id.desc());
+			BooleanBuilder pBuilder = null;
+
+		if(!StringUtils.isBlank(criteria.getCustomerName())) {
+			if(pBuilder==null) {
+				pBuilder = new BooleanBuilder();
+			}			pBuilder.and(qOrder.billing.firstName.like(new StringBuilder().append("%").append(criteria.getCustomerName()).append("%").toString())
+					.or(qOrder.billing.lastName.like(new StringBuilder().append("%").append(criteria.getCustomerName()).append("%").toString())));
+		}
+		
+		if(!StringUtils.isBlank(criteria.getPaymentMethod())) {
+			if(pBuilder==null) {
+				pBuilder = new BooleanBuilder();
+			}
+			pBuilder.and(qOrder.paymentModuleCode.stringValue().like(new StringBuilder().append("%").append(criteria.getPaymentMethod()).append("%").toString()));
+		}
+		
+		if(criteria.getCustomerId()!=null) {
+			if(pBuilder==null) {
+				pBuilder = new BooleanBuilder();
+			}
+			pBuilder.and(qOrder.customerId.eq(criteria.getCustomerId()));
+		}
+		
+		if(pBuilder!=null) {
+			query.where(pBuilder);
+		}
+		
+		if(criteria.getOrderBy().name().equals(CriteriaOrderBy.ASC)) {
+			query.orderBy(qOrder.datePurchased.asc());
+		} else {
+			query.orderBy(qOrder.datePurchased.desc());
+		}
+		
+		if(criteria.getMaxCount()>0) {
+			query.limit(criteria.getMaxCount());
+			query.offset(criteria.getStartIndex());
+		}
+		
+		
+		orderList.setOrders(query.list(qOrder));
+
+		return orderList;
+		
+	}
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/order/dao/orderproduct/OrderProductDao.java b/sm-core/src/main/java/com/salesmanager/core/business/order/dao/orderproduct/OrderProductDao.java
new file mode 100644
index 0000000..616f576
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/order/dao/orderproduct/OrderProductDao.java
@@ -0,0 +1,8 @@
+package com.salesmanager.core.business.order.dao.orderproduct;
+
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDao;
+import com.salesmanager.core.business.order.model.orderproduct.OrderProduct;
+
+public interface OrderProductDao extends SalesManagerEntityDao<Long, OrderProduct> {
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/order/dao/orderproduct/OrderProductDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/order/dao/orderproduct/OrderProductDaoImpl.java
new file mode 100644
index 0000000..770d2ee
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/order/dao/orderproduct/OrderProductDaoImpl.java
@@ -0,0 +1,15 @@
+package com.salesmanager.core.business.order.dao.orderproduct;
+
+import org.springframework.stereotype.Repository;
+
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDaoImpl;
+import com.salesmanager.core.business.order.model.orderproduct.OrderProduct;
+
+@Repository("orderProductDao")
+public class OrderProductDaoImpl extends SalesManagerEntityDaoImpl<Long, OrderProduct> implements OrderProductDao{
+
+	
+	public OrderProductDaoImpl() {
+		super();
+	}
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/order/dao/orderproduct/OrderProductDownloadDao.java b/sm-core/src/main/java/com/salesmanager/core/business/order/dao/orderproduct/OrderProductDownloadDao.java
new file mode 100644
index 0000000..dc9ff73
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/order/dao/orderproduct/OrderProductDownloadDao.java
@@ -0,0 +1,12 @@
+package com.salesmanager.core.business.order.dao.orderproduct;
+
+import java.util.List;
+
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDao;
+import com.salesmanager.core.business.order.model.orderproduct.OrderProductDownload;
+
+public interface OrderProductDownloadDao extends SalesManagerEntityDao<Long, OrderProductDownload> {
+
+	List<OrderProductDownload> getByOrderId(Long orderId);
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/order/dao/orderproduct/OrderProductDownloadDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/order/dao/orderproduct/OrderProductDownloadDaoImpl.java
new file mode 100644
index 0000000..0210992
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/order/dao/orderproduct/OrderProductDownloadDaoImpl.java
@@ -0,0 +1,59 @@
+package com.salesmanager.core.business.order.dao.orderproduct;
+
+import java.util.List;
+
+import org.springframework.stereotype.Repository;
+
+import com.mysema.query.jpa.JPQLQuery;
+import com.mysema.query.jpa.impl.JPAQuery;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDaoImpl;
+import com.salesmanager.core.business.order.model.QOrder;
+import com.salesmanager.core.business.order.model.orderproduct.OrderProductDownload;
+import com.salesmanager.core.business.order.model.orderproduct.QOrderProduct;
+import com.salesmanager.core.business.order.model.orderproduct.QOrderProductDownload;
+
+@Repository("orderProductDownloadDao")
+public class OrderProductDownloadDaoImpl extends SalesManagerEntityDaoImpl<Long, OrderProductDownload> implements OrderProductDownloadDao{
+
+	@Override
+	public OrderProductDownload getById(Long id) {
+		
+		QOrderProductDownload qOrderProductDownload = QOrderProductDownload.orderProductDownload;
+		QOrderProduct qOrderProduct = QOrderProduct.orderProduct;
+		QOrder qOrder = QOrder.order;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qOrderProductDownload)
+			.leftJoin(qOrderProductDownload.orderProduct, qOrderProduct).fetch()
+			.leftJoin(qOrderProduct.order, qOrder).fetch()
+			.leftJoin(qOrder.merchant).fetch()
+			.where(qOrderProductDownload.id.eq(id));
+		
+
+		
+		OrderProductDownload orderProduct = query.uniqueResult(qOrderProductDownload);
+		return orderProduct;
+	}
+	
+	@Override
+	public List<OrderProductDownload> getByOrderId(Long orderId) {
+		
+		QOrderProductDownload qOrderProductDownload = QOrderProductDownload.orderProductDownload;
+		QOrderProduct qOrderProduct = QOrderProduct.orderProduct;
+		QOrder qOrder = QOrder.order;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qOrderProductDownload)
+			.leftJoin(qOrderProductDownload.orderProduct, qOrderProduct).fetch()
+			.leftJoin(qOrderProduct.order, qOrder).fetch()
+			.leftJoin(qOrder.merchant).fetch()
+			.where(qOrder.id.eq(orderId));
+		
+
+		
+		return query.list(qOrderProductDownload);
+		
+	}
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/order/dao/OrderTotalDao.java b/sm-core/src/main/java/com/salesmanager/core/business/order/dao/OrderTotalDao.java
new file mode 100644
index 0000000..59b3981
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/order/dao/OrderTotalDao.java
@@ -0,0 +1,8 @@
+package com.salesmanager.core.business.order.dao;
+
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDao;
+import com.salesmanager.core.business.order.model.OrderTotal;
+
+public interface OrderTotalDao extends SalesManagerEntityDao<Long, OrderTotal > {
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/order/dao/OrderTotalDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/order/dao/OrderTotalDaoImpl.java
new file mode 100644
index 0000000..8d5208f
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/order/dao/OrderTotalDaoImpl.java
@@ -0,0 +1,15 @@
+package com.salesmanager.core.business.order.dao;
+
+import org.springframework.stereotype.Repository;
+
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDaoImpl;
+import com.salesmanager.core.business.order.model.OrderTotal;
+
+@Repository("orderTotalDao")
+public class OrderTotalDaoImpl extends SalesManagerEntityDaoImpl<Long, OrderTotal> implements OrderTotalDao {
+
+	public OrderTotalDaoImpl() {
+		super();
+	}
+	
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/order/model/filehistory/FileHistory.java b/sm-core/src/main/java/com/salesmanager/core/business/order/model/filehistory/FileHistory.java
new file mode 100644
index 0000000..23293f7
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/order/model/filehistory/FileHistory.java
@@ -0,0 +1,136 @@
+
+package com.salesmanager.core.business.order.model.filehistory;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import javax.persistence.UniqueConstraint;
+
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.constants.SchemaConstant;
+import com.salesmanager.core.utils.CloneUtils;
+
+@Entity
+@Table (name="FILE_HISTORY", schema=SchemaConstant.SALESMANAGER_SCHEMA, uniqueConstraints={
+		@UniqueConstraint(
+			columnNames={
+				"MERCHANT_ID",
+				"FILE_ID"
+			}
+		)
+	}
+)
+public class FileHistory implements Serializable {
+	private static final long serialVersionUID = 1321251632883237664L;
+	
+	@Id
+	@Column(name = "FILE_HISTORY_ID", unique = true, nullable = false)
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT",
+		pkColumnValue = "FILE_HISTORY_ID_NEXT_VALUE")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Long id;
+	
+	@ManyToOne(targetEntity = MerchantStore.class)
+	@JoinColumn(name = "MERCHANT_ID", nullable = false)
+	private MerchantStore store;
+	
+	@Column(name = "FILE_ID")
+	private Long fileId;
+
+	@Column ( name="FILESIZE", nullable=false )
+	private Integer filesize;
+	
+	@Temporal(TemporalType.TIMESTAMP )
+	@Column ( name="DATE_ADDED", length=0, nullable=false )
+	private Date dateAdded;
+	
+	@Temporal(TemporalType.TIMESTAMP)
+	@Column ( name="DATE_DELETED", length=0 )
+	private Date dateDeleted;
+	
+	@Temporal(TemporalType.TIMESTAMP)
+	@Column ( name="ACCOUNTED_DATE", length=0 )
+	private Date accountedDate;
+	
+	@Column ( name="DOWNLOAD_COUNT", nullable=false )
+	private Integer downloadCount;
+	
+	public FileHistory() {
+	}
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public MerchantStore getStore() {
+		return store;
+	}
+
+	public void setStore(MerchantStore store) {
+		this.store = store;
+	}
+
+	public Long getFileId() {
+		return fileId;
+	}
+
+	public void setFileId(Long fileId) {
+		this.fileId = fileId;
+	}
+
+	public Integer getFilesize() {
+		return filesize;
+	}
+
+	public void setFilesize(Integer filesize) {
+		this.filesize = filesize;
+	}
+
+	public Date getDateAdded() {
+		return CloneUtils.clone(dateAdded);
+	}
+
+	public void setDateAdded(Date dateAdded) {
+		this.dateAdded = CloneUtils.clone(dateAdded);
+	}
+
+	public Date getDateDeleted() {
+		return CloneUtils.clone(dateDeleted);
+	}
+
+	public void setDateDeleted(Date dateDeleted) {
+		this.dateDeleted = CloneUtils.clone(dateDeleted);
+	}
+
+	public Date getAccountedDate() {
+		return CloneUtils.clone(accountedDate);
+	}
+
+	public void setAccountedDate(Date accountedDate) {
+		this.accountedDate = CloneUtils.clone(accountedDate);
+	}
+
+	public Integer getDownloadCount() {
+		return downloadCount;
+	}
+
+	public void setDownloadCount(Integer downloadCount) {
+		this.downloadCount = downloadCount;
+	}
+
+}
\ No newline at end of file

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/order/model/Order.java b/sm-core/src/main/java/com/salesmanager/core/business/order/model/Order.java
new file mode 100644
index 0000000..641819c
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/order/model/Order.java
@@ -0,0 +1,365 @@
+package com.salesmanager.core.business.order.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.LinkedHashSet;
+import java.util.Locale;
+import java.util.Set;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import javax.validation.Valid;
+
+import org.hibernate.annotations.OrderBy;
+import org.hibernate.annotations.Type;
+
+import com.salesmanager.core.business.common.model.Billing;
+import com.salesmanager.core.business.common.model.Delivery;
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.order.model.orderproduct.OrderProduct;
+import com.salesmanager.core.business.order.model.orderstatus.OrderStatus;
+import com.salesmanager.core.business.order.model.orderstatus.OrderStatusHistory;
+import com.salesmanager.core.business.order.model.payment.CreditCard;
+import com.salesmanager.core.business.payments.model.PaymentType;
+import com.salesmanager.core.business.reference.currency.model.Currency;
+import com.salesmanager.core.constants.SchemaConstant;
+import com.salesmanager.core.utils.CloneUtils;
+
+@Entity
+@Table (name="ORDERS", schema = SchemaConstant.SALESMANAGER_SCHEMA)
+public class Order extends SalesManagerEntity<Long, Order> {
+	
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	@Column (name ="ORDER_ID" , unique=true , nullable=false )
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT",
+		pkColumnValue = "ORDER_ID_SEQ_NEXT_VAL")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Long id;
+	
+	@Column (name ="ORDER_STATUS")
+	@Enumerated(value = EnumType.STRING)
+	private OrderStatus status;
+	
+	@Temporal(TemporalType.TIMESTAMP)
+	@Column (name ="LAST_MODIFIED")
+	private Date lastModified;
+	
+	//the customer object can be detached. An order can exist and the customer deleted
+	@Column (name ="CUSTOMER_ID")
+	private Long customerId;
+	
+	@Temporal(TemporalType.DATE)
+	@Column (name ="DATE_PURCHASED")
+	private Date datePurchased;
+	
+	//used for an order payable on multiple installment
+	@Temporal(TemporalType.TIMESTAMP)
+	@Column (name ="ORDER_DATE_FINISHED")
+	private Date orderDateFinished;
+	
+	//What was the exchange rate
+	@Column (name ="CURRENCY_VALUE")
+	private BigDecimal currencyValue = new BigDecimal(1);//default 1-1
+	
+	@Column (name ="ORDER_TOTAL")
+	private BigDecimal total;
+
+	@Column (name ="IP_ADDRESS")
+	private String ipAddress;
+
+	@Column (name ="CHANNEL")
+	@Enumerated(value = EnumType.STRING)
+	private OrderChannel channel;
+
+	@Column (name ="ORDER_TYPE")
+	@Enumerated(value = EnumType.STRING)
+	private OrderType orderType = OrderType.ORDER;
+
+	@Column (name ="PAYMENT_TYPE")
+	@Enumerated(value = EnumType.STRING)
+	private PaymentType paymentType;
+	
+	@Column (name ="PAYMENT_MODULE_CODE")
+	private String paymentModuleCode;
+	
+	
+	@Column (name ="SHIPPING_MODULE_CODE")
+	private String shippingModuleCode;
+
+	
+	@Embedded
+	private Delivery delivery = null;
+	
+	@Valid
+	@Embedded
+	private Billing billing = null;
+	
+	@Embedded
+	private CreditCard creditCard = null;
+
+	
+	@ManyToOne(targetEntity = Currency.class)
+	@JoinColumn(name = "CURRENCY_ID")
+	private Currency currency;
+	
+	@Type(type="locale")  
+	@Column (name ="LOCALE")
+	private Locale locale; 
+	
+
+
+	@ManyToOne(targetEntity = MerchantStore.class)
+	@JoinColumn(name="MERCHANTID")
+	private MerchantStore merchant;
+	
+	//@OneToMany(mappedBy = "order")
+	//private Set<OrderAccount> orderAccounts = new HashSet<OrderAccount>();
+	
+	@OneToMany(mappedBy = "order", cascade = CascadeType.ALL)
+	private Set<OrderProduct> orderProducts = new LinkedHashSet<OrderProduct>();
+	
+	@OneToMany(mappedBy = "order", cascade = CascadeType.ALL)
+	@OrderBy(clause = "sort_order asc")
+	private Set<OrderTotal> orderTotal = new LinkedHashSet<OrderTotal>();
+	
+	@OneToMany(mappedBy = "order", cascade = CascadeType.ALL)
+	@OrderBy(clause = "ORDER_STATUS_HISTORY_ID asc")
+	private Set<OrderStatusHistory> orderHistory = new LinkedHashSet<OrderStatusHistory>();
+	
+	public Order() {
+	}
+	
+	@Column (name ="CUSTOMER_EMAIL_ADDRESS", length=50, nullable=false)
+	private String customerEmailAddress;
+
+
+	@Override
+	public Long getId() {
+		return id;
+	}
+	
+	@Override
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public OrderStatus getStatus() {
+		return status;
+	}
+
+	public void setStatus(OrderStatus status) {
+		this.status = status;
+	}
+
+	public Date getLastModified() {
+		return CloneUtils.clone(lastModified);
+	}
+
+	public void setLastModified(Date lastModified) {
+		this.lastModified = CloneUtils.clone(lastModified);
+	}
+
+	public Date getDatePurchased() {
+		return CloneUtils.clone(datePurchased);
+	}
+
+	public void setDatePurchased(Date datePurchased) {
+		this.datePurchased = CloneUtils.clone(datePurchased);
+	}
+
+	public Date getOrderDateFinished() {
+		return CloneUtils.clone(orderDateFinished);
+	}
+
+	public void setOrderDateFinished(Date orderDateFinished) {
+		this.orderDateFinished = CloneUtils.clone(orderDateFinished);
+	}
+
+	public BigDecimal getCurrencyValue() {
+		return currencyValue;
+	}
+
+	public void setCurrencyValue(BigDecimal currencyValue) {
+		this.currencyValue = currencyValue;
+	}
+
+	public BigDecimal getTotal() {
+		return total;
+	}
+
+	public void setTotal(BigDecimal total) {
+		this.total = total;
+	}
+
+
+	public String getIpAddress() {
+		return ipAddress;
+	}
+
+	public void setIpAddress(String ipAddress) {
+		this.ipAddress = ipAddress;
+	}
+
+
+	public String getPaymentModuleCode() {
+		return paymentModuleCode;
+	}
+
+	public void setPaymentModuleCode(String paymentModuleCode) {
+		this.paymentModuleCode = paymentModuleCode;
+	}
+
+
+
+	public String getShippingModuleCode() {
+		return shippingModuleCode;
+	}
+
+	public void setShippingModuleCode(String shippingModuleCode) {
+		this.shippingModuleCode = shippingModuleCode;
+	}
+
+
+
+	public Currency getCurrency() {
+		return currency;
+	}
+
+	public void setCurrency(Currency currency) {
+		this.currency = currency;
+	}
+
+	public MerchantStore getMerchant() {
+		return merchant;
+	}
+
+	public void setMerchant(MerchantStore merchant) {
+		this.merchant = merchant;
+	}
+
+	public Set<OrderProduct> getOrderProducts() {
+		return orderProducts;
+	}
+
+	public void setOrderProducts(Set<OrderProduct> orderProducts) {
+		this.orderProducts = orderProducts;
+	}
+
+	public Set<OrderTotal> getOrderTotal() {
+		return orderTotal;
+	}
+
+	public void setOrderTotal(Set<OrderTotal> orderTotal) {
+		this.orderTotal = orderTotal;
+	}
+
+	public Set<OrderStatusHistory> getOrderHistory() {
+		return orderHistory;
+	}
+
+	public void setOrderHistory(Set<OrderStatusHistory> orderHistory) {
+		this.orderHistory = orderHistory;
+	}
+
+
+	public void setDelivery(Delivery delivery) {
+		this.delivery = delivery;
+	}
+
+	public Delivery getDelivery() {
+		return delivery;
+	}
+
+	public void setBilling(Billing billing) {
+		this.billing = billing;
+	}
+
+	public Billing getBilling() {
+		return billing;
+	}
+
+	public Long getCustomerId() {
+		return customerId;
+	}
+
+	public void setCustomerId(Long customerId) {
+		this.customerId = customerId;
+	}
+	
+
+	public String getCustomerEmailAddress() {
+		return customerEmailAddress;
+	}
+
+	public void setCustomerEmailAddress(String customerEmailAddress) {
+		this.customerEmailAddress = customerEmailAddress;
+	}
+
+
+	public void setChannel(OrderChannel channel) {
+		this.channel = channel;
+	}
+
+
+	public OrderChannel getChannel() {
+		return channel;
+	}
+
+
+	public void setCreditCard(CreditCard creditCard) {
+		this.creditCard = creditCard;
+	}
+
+
+	public CreditCard getCreditCard() {
+		return creditCard;
+	}
+
+
+	public void setPaymentType(PaymentType paymentType) {
+		this.paymentType = paymentType;
+	}
+
+
+	public PaymentType getPaymentType() {
+		return paymentType;
+	}
+	
+	public OrderType getOrderType() {
+		return orderType;
+	}
+
+	public void setOrderType(OrderType orderType) {
+		this.orderType = orderType;
+	}
+	
+	public Locale getLocale() {
+		return locale;
+	}
+
+	public void setLocale(Locale locale) {
+		this.locale = locale;
+	}
+
+}
\ No newline at end of file

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/order/model/orderaccount/OrderAccount.java b/sm-core/src/main/java/com/salesmanager/core/business/order/model/orderaccount/OrderAccount.java
new file mode 100644
index 0000000..dec1522
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/order/model/orderaccount/OrderAccount.java
@@ -0,0 +1,106 @@
+package com.salesmanager.core.business.order.model.orderaccount;
+
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.business.order.model.Order;
+import com.salesmanager.core.constants.SchemaConstant;
+import com.salesmanager.core.utils.CloneUtils;
+
+@Entity
+@Table(name = "ORDER_ACCOUNT", schema = SchemaConstant.SALESMANAGER_SCHEMA)
+public class OrderAccount extends SalesManagerEntity<Long, OrderAccount> {
+private static final long serialVersionUID = -2429388347536330540L;
+
+	@Id
+	@Column(name = "ORDER_ACCOUNT_ID", unique = true, nullable = false)
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT", pkColumnValue = "ORDER_ACCOUNT_ID_NEXT_VALUE")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Long id;
+
+	@ManyToOne
+	@JoinColumn(name = "ORDER_ID", nullable = false)
+	private Order order;
+	
+	@Temporal(TemporalType.DATE)
+	@Column(name = "ORDER_ACCOUNT_START_DATE", nullable = false, length = 0)
+	private Date orderAccountStartDate;
+	
+	@Temporal(TemporalType.DATE)
+	@Column(name = "ORDER_ACCOUNT_END_DATE", length = 0)
+	private Date orderAccountEndDate;
+
+	@Column(name = "ORDER_ACCOUNT_BILL_DAY", nullable = false)
+	private Integer orderAccountBillDay;
+
+	@OneToMany(mappedBy = "orderAccount", cascade = CascadeType.ALL)
+	private Set<OrderAccountProduct> orderAccountProducts = new HashSet<OrderAccountProduct>();
+
+	public OrderAccount() {
+	}
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Order getOrder() {
+		return order;
+	}
+
+	public void setOrder(Order order) {
+		this.order = order;
+	}
+
+	public Date getOrderAccountStartDate() {
+		return CloneUtils.clone(orderAccountStartDate);
+	}
+
+	public void setOrderAccountStartDate(Date orderAccountStartDate) {
+		this.orderAccountStartDate = CloneUtils.clone(orderAccountStartDate);
+	}
+
+	public Date getOrderAccountEndDate() {
+		return CloneUtils.clone(orderAccountEndDate);
+	}
+
+	public void setOrderAccountEndDate(Date orderAccountEndDate) {
+		this.orderAccountEndDate = CloneUtils.clone(orderAccountEndDate);
+	}
+
+	public Integer getOrderAccountBillDay() {
+		return orderAccountBillDay;
+	}
+
+	public void setOrderAccountBillDay(Integer orderAccountBillDay) {
+		this.orderAccountBillDay = orderAccountBillDay;
+	}
+
+	public Set<OrderAccountProduct> getOrderAccountProducts() {
+		return orderAccountProducts;
+	}
+
+	public void setOrderAccountProducts(
+			Set<OrderAccountProduct> orderAccountProducts) {
+		this.orderAccountProducts = orderAccountProducts;
+	}
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/order/model/orderaccount/OrderAccountProduct.java b/sm-core/src/main/java/com/salesmanager/core/business/order/model/orderaccount/OrderAccountProduct.java
new file mode 100644
index 0000000..b8c997a
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/order/model/orderaccount/OrderAccountProduct.java
@@ -0,0 +1,166 @@
+package com.salesmanager.core.business.order.model.orderaccount;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+import com.salesmanager.core.business.order.model.orderproduct.OrderProduct;
+import com.salesmanager.core.constants.SchemaConstant;
+import com.salesmanager.core.utils.CloneUtils;
+
+@Entity
+@Table (name="ORDER_ACCOUNT_PRODUCT", schema=SchemaConstant.SALESMANAGER_SCHEMA )
+public class OrderAccountProduct implements Serializable {
+	private static final long serialVersionUID = -7437197293537758668L;
+
+	@Id
+	@Column (name="ORDER_ACCOUNT_PRODUCT_ID")
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT",
+		pkColumnValue = "ORDERACCOUNTPRODUCT_SEQ_NEXT_VAL")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Long orderAccountProductId;
+
+	@ManyToOne
+	@JoinColumn(name = "ORDER_ACCOUNT_ID" , nullable=false)
+	private OrderAccount orderAccount;
+	
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name = "ORDER_PRODUCT_ID" , nullable=false)
+	private OrderProduct orderProduct;
+
+	@Temporal(TemporalType.DATE)
+	@Column (name="ORDER_ACCOUNT_PRODUCT_ST_DT" , length=0 , nullable=false)
+	private Date orderAccountProductStartDate;
+
+	@Temporal(TemporalType.DATE)
+	@Column (name="ORDER_ACCOUNT_PRODUCT_END_DT", length=0)
+	private Date orderAccountProductEndDate;
+
+	@Temporal(TemporalType.TIMESTAMP)
+	@Column (name="ORDER_ACCOUNT_PRODUCT_EOT"  , length=0 )
+	private Date orderAccountProductEot;
+
+	@Temporal(TemporalType.DATE)
+	@Column (name="ORDER_ACCOUNT_PRODUCT_ACCNT_DT"  , length=0 )
+	private Date orderAccountProductAccountedDate;
+
+	@Temporal(TemporalType.TIMESTAMP)
+	@Column (name="ORDER_ACCOUNT_PRODUCT_L_ST_DT"  , length=0 )
+	private Date orderAccountProductLastStatusDate;
+
+	@Column (name="ORDER_ACCOUNT_PRODUCT_L_TRX_ST" , nullable=false )
+	private Integer orderAccountProductLastTransactionStatus;
+
+	@Column (name="ORDER_ACCOUNT_PRODUCT_PM_FR_TY" , nullable=false )
+	private Integer orderAccountProductPaymentFrequencyType;
+
+	@Column (name="ORDER_ACCOUNT_PRODUCT_STATUS" , nullable=false )
+	private Integer orderAccountProductStatus;
+
+	public OrderAccountProduct() {
+	}
+
+	public Long getOrderAccountProductId() {
+		return orderAccountProductId;
+	}
+
+	public void setOrderAccountProductId(Long orderAccountProductId) {
+		this.orderAccountProductId = orderAccountProductId;
+	}
+
+	public OrderAccount getOrderAccount() {
+		return orderAccount;
+	}
+
+	public void setOrderAccount(OrderAccount orderAccount) {
+		this.orderAccount = orderAccount;
+	}
+
+	public OrderProduct getOrderProduct() {
+		return orderProduct;
+	}
+
+	public void setOrderProduct(OrderProduct orderProduct) {
+		this.orderProduct = orderProduct;
+	}
+
+	public Date getOrderAccountProductStartDate() {
+		return CloneUtils.clone(orderAccountProductStartDate);
+	}
+
+	public void setOrderAccountProductStartDate(Date orderAccountProductStartDate) {
+		this.orderAccountProductStartDate = CloneUtils.clone(orderAccountProductStartDate);
+	}
+
+	public Date getOrderAccountProductEndDate() {
+		return CloneUtils.clone(orderAccountProductEndDate);
+	}
+
+	public void setOrderAccountProductEndDate(Date orderAccountProductEndDate) {
+		this.orderAccountProductEndDate = CloneUtils.clone(orderAccountProductEndDate);
+	}
+
+	public Date getOrderAccountProductEot() {
+		return CloneUtils.clone(orderAccountProductEot);
+	}
+
+	public void setOrderAccountProductEot(Date orderAccountProductEot) {
+		this.orderAccountProductEot = CloneUtils.clone(orderAccountProductEot);
+	}
+
+	public Date getOrderAccountProductAccountedDate() {
+		return CloneUtils.clone(orderAccountProductAccountedDate);
+	}
+
+	public void setOrderAccountProductAccountedDate(
+			Date orderAccountProductAccountedDate) {
+		this.orderAccountProductAccountedDate = CloneUtils.clone(orderAccountProductAccountedDate);
+	}
+
+	public Date getOrderAccountProductLastStatusDate() {
+		return CloneUtils.clone(orderAccountProductLastStatusDate);
+	}
+
+	public void setOrderAccountProductLastStatusDate(
+			Date orderAccountProductLastStatusDate) {
+		this.orderAccountProductLastStatusDate = CloneUtils.clone(orderAccountProductLastStatusDate);
+	}
+
+	public Integer getOrderAccountProductLastTransactionStatus() {
+		return orderAccountProductLastTransactionStatus;
+	}
+
+	public void setOrderAccountProductLastTransactionStatus(
+			Integer orderAccountProductLastTransactionStatus) {
+		this.orderAccountProductLastTransactionStatus = orderAccountProductLastTransactionStatus;
+	}
+
+	public Integer getOrderAccountProductPaymentFrequencyType() {
+		return orderAccountProductPaymentFrequencyType;
+	}
+
+	public void setOrderAccountProductPaymentFrequencyType(
+			Integer orderAccountProductPaymentFrequencyType) {
+		this.orderAccountProductPaymentFrequencyType = orderAccountProductPaymentFrequencyType;
+	}
+
+	public Integer getOrderAccountProductStatus() {
+		return orderAccountProductStatus;
+	}
+
+	public void setOrderAccountProductStatus(Integer orderAccountProductStatus) {
+		this.orderAccountProductStatus = orderAccountProductStatus;
+	}
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/order/model/OrderChannel.java b/sm-core/src/main/java/com/salesmanager/core/business/order/model/OrderChannel.java
new file mode 100644
index 0000000..c26c9d1
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/order/model/OrderChannel.java
@@ -0,0 +1,7 @@
+package com.salesmanager.core.business.order.model;
+
+public enum OrderChannel {
+	
+	ONLINE
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/order/model/OrderCriteria.java b/sm-core/src/main/java/com/salesmanager/core/business/order/model/OrderCriteria.java
new file mode 100755
index 0000000..b74948d
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/order/model/OrderCriteria.java
@@ -0,0 +1,35 @@
+package com.salesmanager.core.business.order.model;
+
+import com.salesmanager.core.business.common.model.Criteria;
+
+public class OrderCriteria extends Criteria {
+	
+	private String customerName;
+	private String paymentMethod;
+	private Long customerId;
+	public void setPaymentMethod(String paymentMethod) {
+		this.paymentMethod = paymentMethod;
+	}
+	public String getPaymentMethod() {
+		return paymentMethod;
+	}
+	public void setCustomerName(String customerName) {
+		this.customerName = customerName;
+	}
+	public String getCustomerName() {
+		return customerName;
+	}
+    public Long getCustomerId()
+    {
+        return customerId;
+    }
+    public void setCustomerId( Long customerId )
+    {
+        this.customerId = customerId;
+    }
+   
+	
+	
+	
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/order/model/OrderList.java b/sm-core/src/main/java/com/salesmanager/core/business/order/model/OrderList.java
new file mode 100644
index 0000000..a4ffe72
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/order/model/OrderList.java
@@ -0,0 +1,23 @@
+package com.salesmanager.core.business.order.model;
+
+import java.util.List;
+
+import com.salesmanager.core.business.common.model.EntityList;
+
+public class OrderList extends EntityList {
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -6645927228659963628L;
+	private List<Order> orders;
+
+	public void setOrders(List<Order> orders) {
+		this.orders = orders;
+	}
+
+	public List<Order> getOrders() {
+		return orders;
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/order/model/orderproduct/OrderProduct.java b/sm-core/src/main/java/com/salesmanager/core/business/order/model/orderproduct/OrderProduct.java
new file mode 100644
index 0000000..1e48b5e
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/order/model/orderproduct/OrderProduct.java
@@ -0,0 +1,140 @@
+package com.salesmanager.core.business.order.model.orderproduct;
+
+import java.math.BigDecimal;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.business.order.model.Order;
+import com.salesmanager.core.constants.SchemaConstant;
+
+@Entity
+@Table (name="ORDER_PRODUCT" , schema=SchemaConstant.SALESMANAGER_SCHEMA)
+public class OrderProduct extends SalesManagerEntity<Long, OrderProduct> {
+	private static final long serialVersionUID = 176131742783954627L;
+	
+	@Id
+	@Column (name="ORDER_PRODUCT_ID")
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT", pkColumnValue = "ORDER_PRODUCT_ID_NEXT_VALUE")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Long id;
+
+	@Column (name="PRODUCT_SKU")
+	private String sku;
+
+	@Column (name="PRODUCT_NAME" , length=64 , nullable=false)
+	private String productName;
+
+	@Column (name="PRODUCT_QUANTITY")
+	private int productQuantity;
+
+	@Column (name="ONETIME_CHARGE" , nullable=false )
+	private BigDecimal oneTimeCharge;
+
+
+	@ManyToOne(targetEntity = Order.class)
+	@JoinColumn(name = "ORDER_ID", nullable = false)
+	private Order order;
+
+	@OneToMany(mappedBy = "orderProduct", cascade = CascadeType.ALL)
+	private Set<OrderProductAttribute> orderAttributes = new HashSet<OrderProductAttribute>();
+
+	@OneToMany(mappedBy = "orderProduct", cascade = CascadeType.ALL)
+	private Set<OrderProductPrice> prices = new HashSet<OrderProductPrice>();
+
+	@OneToMany(mappedBy = "orderProduct", cascade = CascadeType.ALL)
+	private Set<OrderProductDownload> downloads = new HashSet<OrderProductDownload>();
+	
+	public OrderProduct() {
+	}
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+
+	public String getProductName() {
+		return productName;
+	}
+
+	public void setProductName(String productName) {
+		this.productName = productName;
+	}
+
+	public int getProductQuantity() {
+		return productQuantity;
+	}
+
+	public void setProductQuantity(int productQuantity) {
+		this.productQuantity = productQuantity;
+	}
+
+
+
+	public Order getOrder() {
+		return order;
+	}
+
+	public void setOrder(Order order) {
+		this.order = order;
+	}
+
+
+	public Set<OrderProductAttribute> getOrderAttributes() {
+		return orderAttributes;
+	}
+
+	public void setOrderAttributes(Set<OrderProductAttribute> orderAttributes) {
+		this.orderAttributes = orderAttributes;
+	}
+
+	public Set<OrderProductPrice> getPrices() {
+		return prices;
+	}
+
+	public void setPrices(Set<OrderProductPrice> prices) {
+		this.prices = prices;
+	}
+
+	public Set<OrderProductDownload> getDownloads() {
+		return downloads;
+	}
+
+	public void setDownloads(Set<OrderProductDownload> downloads) {
+		this.downloads = downloads;
+	}
+
+
+	public void setSku(String sku) {
+		this.sku = sku;
+	}
+
+	public String getSku() {
+		return sku;
+	}
+
+	public void setOneTimeCharge(BigDecimal oneTimeCharge) {
+		this.oneTimeCharge = oneTimeCharge;
+	}
+
+	public BigDecimal getOneTimeCharge() {
+		return oneTimeCharge;
+	}
+	
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/order/model/orderproduct/OrderProductAttribute.java b/sm-core/src/main/java/com/salesmanager/core/business/order/model/orderproduct/OrderProductAttribute.java
new file mode 100644
index 0000000..c0369e3
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/order/model/orderproduct/OrderProductAttribute.java
@@ -0,0 +1,132 @@
+package com.salesmanager.core.business.order.model.orderproduct;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+
+import com.salesmanager.core.constants.SchemaConstant;
+
+@Entity
+@Table (name="ORDER_PRODUCT_ATTRIBUTE" , schema=SchemaConstant.SALESMANAGER_SCHEMA)
+public class OrderProductAttribute implements Serializable {
+	private static final long serialVersionUID = 6037571119918073015L;
+
+	@Id
+	@Column (name="ORDER_PRODUCT_ATTRIBUTE_ID", nullable=false , unique=true )
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT", pkColumnValue = "ORDER_PRODUCT_ATTR_ID_NEXT_VAL")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Long id;
+
+	@Column ( name= "PRODUCT_ATTRIBUTE_PRICE" , nullable=false , precision=15 , scale=4 )
+	private BigDecimal productAttributePrice;
+
+	@Column ( name= "PRODUCT_ATTRIBUTE_IS_FREE" , nullable=false )
+	private boolean productAttributeIsFree;
+
+	@Column ( name= "PRODUCT_ATTRIBUTE_WEIGHT" , precision=15 , scale=4 )
+	private java.math.BigDecimal productAttributeWeight;
+	
+	@ManyToOne
+	@JoinColumn(name = "ORDER_PRODUCT_ID", nullable = false)
+	private OrderProduct orderProduct;
+	
+	@Column(name = "PRODUCT_OPTION_ID", nullable = false)
+	private Long productOptionId;
+
+
+	@Column(name = "PRODUCT_OPTION_VALUE_ID", nullable = false)
+	private Long productOptionValueId;
+	
+	@Column ( name= "PRODUCT_ATTRIBUTE_NAME")
+	private String productAttributeName;
+	
+	@Column ( name= "PRODUCT_ATTRIBUTE_VAL_NAME")
+	private String productAttributeValueName;
+
+	public OrderProductAttribute() {
+	}
+	
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+
+	public boolean isProductAttributeIsFree() {
+		return productAttributeIsFree;
+	}
+
+	public void setProductAttributeIsFree(boolean productAttributeIsFree) {
+		this.productAttributeIsFree = productAttributeIsFree;
+	}
+
+	public java.math.BigDecimal getProductAttributeWeight() {
+		return productAttributeWeight;
+	}
+
+	public void setProductAttributeWeight(
+			java.math.BigDecimal productAttributeWeight) {
+		this.productAttributeWeight = productAttributeWeight;
+	}
+
+	public OrderProduct getOrderProduct() {
+		return orderProduct;
+	}
+
+	public void setOrderProduct(OrderProduct orderProduct) {
+		this.orderProduct = orderProduct;
+	}
+
+	public String getProductAttributeName() {
+		return productAttributeName;
+	}
+
+	public void setProductAttributeName(String productAttributeName) {
+		this.productAttributeName = productAttributeName;
+	}
+
+	public String getProductAttributeValueName() {
+		return productAttributeValueName;
+	}
+
+	public void setProductAttributeValueName(String productAttributeValueName) {
+		this.productAttributeValueName = productAttributeValueName;
+	}
+
+	public BigDecimal getProductAttributePrice() {
+		return productAttributePrice;
+	}
+
+	public void setProductAttributePrice(BigDecimal productAttributePrice) {
+		this.productAttributePrice = productAttributePrice;
+	}
+
+	public Long getProductOptionId() {
+		return productOptionId;
+	}
+
+	public void setProductOptionId(Long productOptionId) {
+		this.productOptionId = productOptionId;
+	}
+
+	public Long getProductOptionValueId() {
+		return productOptionValueId;
+	}
+
+	public void setProductOptionValueId(Long productOptionValueId) {
+		this.productOptionValueId = productOptionValueId;
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/order/model/orderproduct/OrderProductDownload.java b/sm-core/src/main/java/com/salesmanager/core/business/order/model/orderproduct/OrderProductDownload.java
new file mode 100644
index 0000000..8d5395b
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/order/model/orderproduct/OrderProductDownload.java
@@ -0,0 +1,90 @@
+package com.salesmanager.core.business.order.model.orderproduct;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.constants.SchemaConstant;
+
+@Entity
+@Table (name="ORDER_PRODUCT_DOWNLOAD", schema=SchemaConstant.SALESMANAGER_SCHEMA)
+public class OrderProductDownload extends SalesManagerEntity<Long, OrderProductDownload> implements Serializable {
+	private static final long serialVersionUID = -8935511990745477240L;
+	
+	public final static int DEFAULT_DOWNLOAD_MAX_DAYS = 31;
+	
+	@Id
+	@Column (name="ORDER_PRODUCT_DOWNLOAD_ID")
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT", pkColumnValue = "ORDER_PRODUCT_DL_ID_NEXT_VALUE")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Long id;
+
+	@ManyToOne
+	@JoinColumn(name = "ORDER_PRODUCT_ID", nullable = false)
+	private OrderProduct orderProduct; 
+
+	@Column(name = "ORDER_PRODUCT_FILENAME", nullable = false)
+	private String orderProductFilename;
+	
+	@Column(name = "DOWNLOAD_MAXDAYS", nullable = false)
+	private Integer maxdays = DEFAULT_DOWNLOAD_MAX_DAYS;
+	
+	@Column(name = "DOWNLOAD_COUNT", nullable = false)
+	private Integer downloadCount;
+	
+
+	
+	public OrderProductDownload() {
+	}
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public OrderProduct getOrderProduct() {
+		return orderProduct;
+	}
+
+	public void setOrderProduct(OrderProduct orderProduct) {
+		this.orderProduct = orderProduct;
+	}
+
+	public String getOrderProductFilename() {
+		return orderProductFilename;
+	}
+
+	public void setOrderProductFilename(String orderProductFilename) {
+		this.orderProductFilename = orderProductFilename;
+	}
+
+	public Integer getMaxdays() {
+		return maxdays;
+	}
+
+	public void setMaxdays(Integer maxdays) {
+		this.maxdays = maxdays;
+	}
+
+	public Integer getDownloadCount() {
+		return downloadCount;
+	}
+
+	public void setDownloadCount(Integer downloadCount) {
+		this.downloadCount = downloadCount;
+	}
+
+
+}
\ No newline at end of file

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/order/model/orderproduct/OrderProductPrice.java b/sm-core/src/main/java/com/salesmanager/core/business/order/model/orderproduct/OrderProductPrice.java
new file mode 100644
index 0000000..b7a9094
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/order/model/orderproduct/OrderProductPrice.java
@@ -0,0 +1,138 @@
+package com.salesmanager.core.business.order.model.orderproduct;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+import com.salesmanager.core.constants.SchemaConstant;
+
+@Entity
+@Table (name="ORDER_PRODUCT_PRICE" , schema=SchemaConstant.SALESMANAGER_SCHEMA)
+public class OrderProductPrice implements Serializable {
+	private static final long serialVersionUID = 3734737890163564311L;
+
+	@Id
+	@Column (name="ORDER_PRODUCT_PRICE_ID")
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT",
+		pkColumnValue = "ORDER_PRD_PRICE_ID_NEXT_VAL")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Long id;
+
+	@ManyToOne
+	@JoinColumn(name = "ORDER_PRODUCT_ID", nullable = false)
+	private OrderProduct orderProduct;
+
+
+	@Column(name = "PRODUCT_PRICE_CODE", nullable = false , length=64 )
+	private String productPriceCode;
+
+	@Column(name = "PRODUCT_PRICE", nullable = false)
+	private BigDecimal productPrice;
+	
+	@Column(name = "PRODUCT_PRICE_SPECIAL")
+	private BigDecimal productPriceSpecial;
+	
+	@Temporal(TemporalType.TIMESTAMP)
+	@Column (name="PRD_PRICE_SPECIAL_ST_DT" , length=0)
+	private Date productPriceSpecialStartDate;
+	
+	@Temporal(TemporalType.TIMESTAMP)
+	@Column (name="PRD_PRICE_SPECIAL_END_DT" , length=0)
+	private Date productPriceSpecialEndDate;
+
+
+	@Column(name = "DEFAULT_PRICE", nullable = false)
+	private Boolean defaultPrice;
+
+
+	@Column(name = "PRODUCT_PRICE_NAME", nullable = true)
+	private String productPriceName;
+	
+	public OrderProductPrice() {
+	}
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Boolean getDefaultPrice() {
+		return defaultPrice;
+	}
+
+	public void setDefaultPrice(Boolean defaultPrice) {
+		this.defaultPrice = defaultPrice;
+	}
+
+	public String getProductPriceName() {
+		return productPriceName;
+	}
+
+	public void setProductPriceName(String productPriceName) {
+		this.productPriceName = productPriceName;
+	}
+
+	public OrderProduct getOrderProduct() {
+		return orderProduct;
+	}
+
+	public void setOrderProduct(OrderProduct orderProduct) {
+		this.orderProduct = orderProduct;
+	}
+
+	public void setProductPriceCode(String productPriceCode) {
+		this.productPriceCode = productPriceCode;
+	}
+
+	public String getProductPriceCode() {
+		return productPriceCode;
+	}
+
+	public void setProductPriceSpecialStartDate(
+			Date productPriceSpecialStartDate) {
+		this.productPriceSpecialStartDate = productPriceSpecialStartDate;
+	}
+
+	public Date getProductPriceSpecialStartDate() {
+		return productPriceSpecialStartDate;
+	}
+
+	public void setProductPriceSpecialEndDate(Date productPriceSpecialEndDate) {
+		this.productPriceSpecialEndDate = productPriceSpecialEndDate;
+	}
+
+	public Date getProductPriceSpecialEndDate() {
+		return productPriceSpecialEndDate;
+	}
+
+	public void setProductPriceSpecial(BigDecimal productPriceSpecial) {
+		this.productPriceSpecial = productPriceSpecial;
+	}
+
+	public BigDecimal getProductPriceSpecial() {
+		return productPriceSpecial;
+	}
+
+	public void setProductPrice(BigDecimal productPrice) {
+		this.productPrice = productPrice;
+	}
+
+	public BigDecimal getProductPrice() {
+		return productPrice;
+	}
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/order/model/orderstatus/OrderStatus.java b/sm-core/src/main/java/com/salesmanager/core/business/order/model/orderstatus/OrderStatus.java
new file mode 100644
index 0000000..ee45847
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/order/model/orderstatus/OrderStatus.java
@@ -0,0 +1,20 @@
+package com.salesmanager.core.business.order.model.orderstatus;
+
+public enum OrderStatus {
+	
+	ORDERED("ordered"),
+	PROCESSED("processed"),
+	DELIVERED("delivered"),
+	REFUNDED("refunded"),
+	;
+	
+	private String value;
+	
+	private OrderStatus(String value) {
+		this.value = value;
+	}
+	
+	public String getValue() {
+		return value;
+	}
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/order/model/orderstatus/OrderStatusHistory.java b/sm-core/src/main/java/com/salesmanager/core/business/order/model/orderstatus/OrderStatusHistory.java
new file mode 100644
index 0000000..b204a84
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/order/model/orderstatus/OrderStatusHistory.java
@@ -0,0 +1,107 @@
+package com.salesmanager.core.business.order.model.orderstatus;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+import org.hibernate.annotations.Type;
+
+import com.salesmanager.core.business.order.model.Order;
+import com.salesmanager.core.constants.SchemaConstant;
+import com.salesmanager.core.utils.CloneUtils;
+
+@Entity
+@Table (name="ORDER_STATUS_HISTORY" , schema=SchemaConstant.SALESMANAGER_SCHEMA)
+public class OrderStatusHistory implements Serializable {
+	private static final long serialVersionUID = 3438730310126102187L;
+	
+	@Id
+	@Column ( name="ORDER_STATUS_HISTORY_ID")
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT",
+		pkColumnValue = "STATUS_HIST_ID_NEXT_VALUE")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Long id;
+	
+	@ManyToOne(targetEntity = Order.class)
+	@JoinColumn(name = "ORDER_ID", nullable = false)
+	private Order order;
+	
+	@Enumerated(value = EnumType.STRING)
+	private OrderStatus status;
+	
+	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name = "DATE_ADDED", nullable = false)
+	private Date dateAdded;
+	
+	@Column(name = "CUSTOMER_NOTIFIED")
+	private java.lang.Integer customerNotified;
+	
+	@Column(name = "COMMENTS")
+	@Type(type = "org.hibernate.type.StringClobType")
+	private String comments;
+	
+	public OrderStatusHistory() {
+	}
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Order getOrder() {
+		return order;
+	}
+
+	public void setOrder(Order order) {
+		this.order = order;
+	}
+
+	public OrderStatus getStatus() {
+		return status;
+	}
+
+	public void setStatus(OrderStatus status) {
+		this.status = status;
+	}
+
+	public Date getDateAdded() {
+		return CloneUtils.clone(dateAdded);
+	}
+
+	public void setDateAdded(Date dateAdded) {
+		this.dateAdded = CloneUtils.clone(dateAdded);
+	}
+
+	public java.lang.Integer getCustomerNotified() {
+		return customerNotified;
+	}
+
+	public void setCustomerNotified(java.lang.Integer customerNotified) {
+		this.customerNotified = customerNotified;
+	}
+
+	public String getComments() {
+		return comments;
+	}
+
+	public void setComments(String comments) {
+		this.comments = comments;
+	}
+
+}
\ No newline at end of file

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/order/model/OrderSummary.java b/sm-core/src/main/java/com/salesmanager/core/business/order/model/OrderSummary.java
new file mode 100644
index 0000000..99fc69b
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/order/model/OrderSummary.java
@@ -0,0 +1,40 @@
+package com.salesmanager.core.business.order.model;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.salesmanager.core.business.shipping.model.ShippingSummary;
+import com.salesmanager.core.business.shoppingcart.model.ShoppingCartItem;
+
+
+/**
+ * This object is used as input object for many services
+ * such as order total calculation and tax calculation
+ * @author Carl Samson
+ *
+ */
+public class OrderSummary implements Serializable {
+	
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	private ShippingSummary shippingSummary;
+	private List<ShoppingCartItem> products = new ArrayList<ShoppingCartItem>();
+
+	public void setProducts(List<ShoppingCartItem> products) {
+		this.products = products;
+	}
+	public List<ShoppingCartItem> getProducts() {
+		return products;
+	}
+	public void setShippingSummary(ShippingSummary shippingSummary) {
+		this.shippingSummary = shippingSummary;
+	}
+	public ShippingSummary getShippingSummary() {
+		return shippingSummary;
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/order/model/OrderTotal.java b/sm-core/src/main/java/com/salesmanager/core/business/order/model/OrderTotal.java
new file mode 100644
index 0000000..a22c44d
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/order/model/OrderTotal.java
@@ -0,0 +1,155 @@
+package com.salesmanager.core.business.order.model;
+
+import java.math.BigDecimal;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+
+import org.hibernate.annotations.Type;
+
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.constants.SchemaConstant;
+
+
+/**
+ * Order line items related to an order.
+ * @author casams1
+ *
+ */
+
+@Entity
+@Table (name="ORDER_TOTAL" , schema=SchemaConstant.SALESMANAGER_SCHEMA)
+public class OrderTotal extends SalesManagerEntity<Long, OrderTotal> {
+	private static final long serialVersionUID = -5885315557404081674L;
+	
+	@Id
+	@Column(name = "ORDER_ACCOUNT_ID", unique=true, nullable=false)
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT", pkColumnValue = "ORDER_TOTAL_ID_NEXT_VALUE")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Long id;
+	
+	@Column (name ="CODE", nullable=false)
+	private String orderTotalCode;//SHIPPING, TAX
+	
+	@Column (name ="TITLE", nullable=true)
+	private String title;
+	
+	@Column (name ="TEXT", nullable=true)
+	@Type(type = "org.hibernate.type.StringClobType")
+	private String text;
+	
+	@Column (name ="VALUE", precision=15, scale=4, nullable=false )
+	private BigDecimal value;
+	
+	@Column (name ="MODULE", length=60 , nullable=true )
+	private String module;
+	
+	@Column (name ="ORDER_VALUE_TYPE")
+	@Enumerated(value = EnumType.STRING)
+	private OrderValueType orderValueType = OrderValueType.ONE_TIME;
+	
+	@Column (name ="ORDER_TOTAL_TYPE")
+	@Enumerated(value = EnumType.STRING)
+	private OrderTotalType orderTotalType = null;
+	
+	@Column (name ="SORT_ORDER", nullable=false)
+	private int sortOrder;
+	
+	@ManyToOne(targetEntity = Order.class)
+	@JoinColumn(name = "ORDER_ID", nullable=false)
+	private Order order;
+	
+	public OrderTotal() {
+	}
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+	public String getText() {
+		return text;
+	}
+
+	public void setText(String text) {
+		this.text = text;
+	}
+
+	public BigDecimal getValue() {
+		return value;
+	}
+
+	public void setValue(BigDecimal value) {
+		this.value = value;
+	}
+
+	public String getModule() {
+		return module;
+	}
+
+	public void setModule(String module) {
+		this.module = module;
+	}
+
+	public int getSortOrder() {
+		return sortOrder;
+	}
+
+	public void setSortOrder(int sortOrder) {
+		this.sortOrder = sortOrder;
+	}
+
+	public Order getOrder() {
+		return order;
+	}
+
+	public void setOrder(Order order) {
+		this.order = order;
+	}
+
+	public void setOrderTotalCode(String orderTotalCode) {
+		this.orderTotalCode = orderTotalCode;
+	}
+
+	public String getOrderTotalCode() {
+		return orderTotalCode;
+	}
+
+	public void setOrderValueType(OrderValueType orderValueType) {
+		this.orderValueType = orderValueType;
+	}
+
+	public OrderValueType getOrderValueType() {
+		return orderValueType;
+	}
+
+	public void setOrderTotalType(OrderTotalType orderTotalType) {
+		this.orderTotalType = orderTotalType;
+	}
+
+	public OrderTotalType getOrderTotalType() {
+		return orderTotalType;
+	}
+
+
+}
\ No newline at end of file

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/order/model/OrderTotalSummary.java b/sm-core/src/main/java/com/salesmanager/core/business/order/model/OrderTotalSummary.java
new file mode 100644
index 0000000..9339888
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/order/model/OrderTotalSummary.java
@@ -0,0 +1,56 @@
+package com.salesmanager.core.business.order.model;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * Output object after total calculation
+ * @author Carl Samson
+ *
+ */
+public class OrderTotalSummary implements Serializable {
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	private BigDecimal subTotal;//one time price for items
+	private BigDecimal total;//final price
+	private BigDecimal taxTotal;//total of taxes
+	
+	private List<OrderTotal> totals;//all other fees (tax, shipping ....)
+
+	public BigDecimal getSubTotal() {
+		return subTotal;
+	}
+
+	public void setSubTotal(BigDecimal subTotal) {
+		this.subTotal = subTotal;
+	}
+
+	public BigDecimal getTotal() {
+		return total;
+	}
+
+	public void setTotal(BigDecimal total) {
+		this.total = total;
+	}
+
+	public List<OrderTotal> getTotals() {
+		return totals;
+	}
+
+	public void setTotals(List<OrderTotal> totals) {
+		this.totals = totals;
+	}
+
+	public BigDecimal getTaxTotal() {
+		return taxTotal;
+	}
+
+	public void setTaxTotal(BigDecimal taxTotal) {
+		this.taxTotal = taxTotal;
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/order/model/OrderTotalType.java b/sm-core/src/main/java/com/salesmanager/core/business/order/model/OrderTotalType.java
new file mode 100644
index 0000000..32f905e
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/order/model/OrderTotalType.java
@@ -0,0 +1,7 @@
+package com.salesmanager.core.business.order.model;
+
+public enum OrderTotalType {
+	
+	SHIPPING, HANDLING, TAX, PRODUCT, SUBTOTAL, TOTAL, CREDIT, REFUND
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/order/model/OrderType.java b/sm-core/src/main/java/com/salesmanager/core/business/order/model/OrderType.java
new file mode 100644
index 0000000..39e1311
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/order/model/OrderType.java
@@ -0,0 +1,7 @@
+package com.salesmanager.core.business.order.model;
+
+public enum OrderType {
+	
+	ORDER, BOOKING
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/order/model/OrderValueType.java b/sm-core/src/main/java/com/salesmanager/core/business/order/model/OrderValueType.java
new file mode 100644
index 0000000..d716472
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/order/model/OrderValueType.java
@@ -0,0 +1,7 @@
+package com.salesmanager.core.business.order.model;
+
+public enum OrderValueType {
+	
+	ONE_TIME, MONTHLY
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/order/model/payment/CreditCard.java b/sm-core/src/main/java/com/salesmanager/core/business/order/model/payment/CreditCard.java
new file mode 100644
index 0000000..090a603
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/order/model/payment/CreditCard.java
@@ -0,0 +1,69 @@
+package com.salesmanager.core.business.order.model.payment;
+
+import javax.persistence.Column;
+import javax.persistence.Embeddable;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+
+import com.salesmanager.core.business.payments.model.CreditCardType;
+
+@Embeddable
+public class CreditCard {
+	
+	@Column (name ="CARD_TYPE")
+	@Enumerated(value = EnumType.STRING)
+	private CreditCardType cardType;
+	
+	@Column (name ="CC_OWNER")
+	private String ccOwner;
+	
+	@Column (name ="CC_NUMBER")
+	private String ccNumber;
+	
+	@Column (name ="CC_EXPIRES")
+	private String ccExpires;
+	
+	@Column (name ="CC_CVV")
+	private String ccCvv;
+
+	public String getCcOwner() {
+		return ccOwner;
+	}
+
+	public void setCcOwner(String ccOwner) {
+		this.ccOwner = ccOwner;
+	}
+
+	public String getCcNumber() {
+		return ccNumber;
+	}
+
+	public void setCcNumber(String ccNumber) {
+		this.ccNumber = ccNumber;
+	}
+
+	public String getCcExpires() {
+		return ccExpires;
+	}
+
+	public void setCcExpires(String ccExpires) {
+		this.ccExpires = ccExpires;
+	}
+
+	public String getCcCvv() {
+		return ccCvv;
+	}
+
+	public void setCcCvv(String ccCvv) {
+		this.ccCvv = ccCvv;
+	}
+
+	public void setCardType(CreditCardType cardType) {
+		this.cardType = cardType;
+	}
+
+	public CreditCardType getCardType() {
+		return cardType;
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/order/service/orderproduct/OrderProductDownloadService.java b/sm-core/src/main/java/com/salesmanager/core/business/order/service/orderproduct/OrderProductDownloadService.java
new file mode 100644
index 0000000..60d4adf
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/order/service/orderproduct/OrderProductDownloadService.java
@@ -0,0 +1,17 @@
+package com.salesmanager.core.business.order.service.orderproduct;
+
+import java.util.List;
+
+import com.salesmanager.core.business.generic.service.SalesManagerEntityService;
+import com.salesmanager.core.business.order.model.orderproduct.OrderProductDownload;
+
+public interface OrderProductDownloadService extends SalesManagerEntityService<Long, OrderProductDownload> {
+
+	/**
+	 * List {@link OrderProductDownload} by order id
+	 * @param orderId
+	 * @return
+	 */
+	List<OrderProductDownload> getByOrderId(Long orderId);
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/order/service/orderproduct/OrderProductDownloadServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/order/service/orderproduct/OrderProductDownloadServiceImpl.java
new file mode 100644
index 0000000..e46d150
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/order/service/orderproduct/OrderProductDownloadServiceImpl.java
@@ -0,0 +1,58 @@
+package com.salesmanager.core.business.order.service.orderproduct;
+
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.salesmanager.core.business.customer.service.CustomerService;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityServiceImpl;
+import com.salesmanager.core.business.order.dao.orderproduct.OrderProductDownloadDao;
+import com.salesmanager.core.business.order.model.orderproduct.OrderProductDownload;
+import com.salesmanager.core.business.payments.service.PaymentService;
+import com.salesmanager.core.business.payments.service.TransactionService;
+import com.salesmanager.core.business.shipping.service.ShippingService;
+import com.salesmanager.core.business.tax.service.TaxService;
+import com.salesmanager.core.modules.order.InvoiceModule;
+
+
+@Service("orderProductDownloadService")
+public class OrderProductDownloadServiceImpl  extends SalesManagerEntityServiceImpl<Long, OrderProductDownload> implements OrderProductDownloadService {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(OrderProductDownloadServiceImpl.class);
+
+    @Autowired
+    private InvoiceModule invoiceModule;
+
+    @Autowired
+    private ShippingService shippingService;
+    
+    @Autowired
+    private PaymentService paymentService;
+
+    @Autowired
+    private TaxService taxService;
+    
+    @Autowired
+    private CustomerService customerService;
+    
+    @Autowired
+    private TransactionService transactionService;
+
+    private final OrderProductDownloadDao orderProductDownloadDao;
+
+    @Autowired
+    public OrderProductDownloadServiceImpl(final OrderProductDownloadDao orderProductDownloadDao) {
+        super(orderProductDownloadDao);
+        this.orderProductDownloadDao = orderProductDownloadDao;
+    }
+    
+    @Override
+    public List<OrderProductDownload> getByOrderId(Long orderId) {
+    	return orderProductDownloadDao.getByOrderId(orderId);
+    }
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/order/service/OrderService.java b/sm-core/src/main/java/com/salesmanager/core/business/order/service/OrderService.java
new file mode 100644
index 0000000..0307ad5
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/order/service/OrderService.java
@@ -0,0 +1,108 @@
+package com.salesmanager.core.business.order.service;
+
+import java.io.ByteArrayOutputStream;
+import java.util.List;
+
+import com.salesmanager.core.business.customer.model.Customer;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityService;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.order.model.Order;
+import com.salesmanager.core.business.order.model.OrderCriteria;
+import com.salesmanager.core.business.order.model.OrderList;
+import com.salesmanager.core.business.order.model.OrderSummary;
+import com.salesmanager.core.business.order.model.OrderTotalSummary;
+import com.salesmanager.core.business.order.model.orderstatus.OrderStatusHistory;
+import com.salesmanager.core.business.payments.model.Payment;
+import com.salesmanager.core.business.payments.model.Transaction;
+import com.salesmanager.core.business.reference.language.model.Language;
+import com.salesmanager.core.business.shoppingcart.model.ShoppingCart;
+import com.salesmanager.core.business.shoppingcart.model.ShoppingCartItem;
+
+public interface OrderService extends SalesManagerEntityService<Long, Order> {
+
+    void addOrderStatusHistory(Order order, OrderStatusHistory history)
+                    throws ServiceException;
+
+    /**
+     * Can be used to calculates the final prices of all items contained in checkout page
+     * @param orderSummary
+     * @param customer
+     * @param store
+     * @param language
+     * @return
+     * @throws ServiceException
+     */
+    OrderTotalSummary caculateOrderTotal(OrderSummary orderSummary,
+                                         Customer customer, MerchantStore store, Language language)
+                                                         throws ServiceException;
+
+    /**
+     * Can be used to calculates the final prices of all items contained in a ShoppingCart
+     * @param orderSummary
+     * @param store
+     * @param language
+     * @return
+     * @throws ServiceException
+     */
+    OrderTotalSummary caculateOrderTotal(OrderSummary orderSummary,
+                                         MerchantStore store, Language language) throws ServiceException;
+
+
+    /**
+     * Can be used to calculates the final prices of all items contained in checkout page
+     * @param shoppingCart
+     * @param customer
+     * @param store
+     * @param language
+     * @return  @return {@link OrderTotalSummary}
+     * @throws ServiceException
+     */
+    OrderTotalSummary calculateShoppingCartTotal(final ShoppingCart shoppingCart,final Customer customer, final MerchantStore store, final Language language) throws ServiceException;
+
+    /**
+     * Can be used to calculates the final prices of all items contained in a ShoppingCart
+     * @param shoppingCart
+     * @param store
+     * @param language
+     * @return {@link OrderTotalSummary}
+     * @throws ServiceException
+     */
+    OrderTotalSummary calculateShoppingCartTotal(final ShoppingCart shoppingCart,final MerchantStore store, final Language language) throws ServiceException;
+
+    ByteArrayOutputStream generateInvoice(MerchantStore store, Order order,
+                                          Language language) throws ServiceException;
+
+    Order getOrder(Long id);
+
+    List<Order> listByStore(MerchantStore merchantStore);
+
+    
+
+    
+    
+    OrderList listByStore(MerchantStore store, OrderCriteria criteria);
+
+    void saveOrUpdate(Order order) throws ServiceException;
+
+	Order processOrder(Order order, Customer customer,
+			List<ShoppingCartItem> items, OrderTotalSummary summary,
+			Payment payment, MerchantStore store) throws ServiceException;
+
+	Order processOrder(Order order, Customer customer,
+			List<ShoppingCartItem> items, OrderTotalSummary summary,
+			Payment payment, Transaction transaction, MerchantStore store)
+			throws ServiceException;
+
+
+
+	
+	/**
+	 * Determines if an Order has download files
+	 * @param order
+	 * @return
+	 * @throws ServiceException
+	 */
+	boolean hasDownloadFiles(Order order) throws ServiceException;
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/order/service/OrderServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/order/service/OrderServiceImpl.java
new file mode 100644
index 0000000..146f3d6
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/order/service/OrderServiceImpl.java
@@ -0,0 +1,516 @@
+package com.salesmanager.core.business.order.service;
+
+import java.io.ByteArrayOutputStream;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.Validate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.salesmanager.core.business.catalog.product.model.price.FinalPrice;
+import com.salesmanager.core.business.customer.model.Customer;
+import com.salesmanager.core.business.customer.service.CustomerService;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityServiceImpl;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.order.dao.OrderDao;
+import com.salesmanager.core.business.order.model.Order;
+import com.salesmanager.core.business.order.model.OrderCriteria;
+import com.salesmanager.core.business.order.model.OrderList;
+import com.salesmanager.core.business.order.model.OrderSummary;
+import com.salesmanager.core.business.order.model.OrderTotal;
+import com.salesmanager.core.business.order.model.OrderTotalSummary;
+import com.salesmanager.core.business.order.model.OrderTotalType;
+import com.salesmanager.core.business.order.model.OrderValueType;
+import com.salesmanager.core.business.order.model.Order_;
+import com.salesmanager.core.business.order.model.orderproduct.OrderProduct;
+import com.salesmanager.core.business.order.model.orderstatus.OrderStatus;
+import com.salesmanager.core.business.order.model.orderstatus.OrderStatusHistory;
+import com.salesmanager.core.business.payments.model.Payment;
+import com.salesmanager.core.business.payments.model.Transaction;
+import com.salesmanager.core.business.payments.service.PaymentService;
+import com.salesmanager.core.business.payments.service.TransactionService;
+import com.salesmanager.core.business.reference.language.model.Language;
+import com.salesmanager.core.business.shipping.model.ShippingConfiguration;
+import com.salesmanager.core.business.shipping.service.ShippingService;
+import com.salesmanager.core.business.shoppingcart.model.ShoppingCart;
+import com.salesmanager.core.business.shoppingcart.model.ShoppingCartItem;
+import com.salesmanager.core.business.tax.model.TaxItem;
+import com.salesmanager.core.business.tax.service.TaxService;
+import com.salesmanager.core.constants.Constants;
+import com.salesmanager.core.modules.order.InvoiceModule;
+
+
+@Service("orderService")
+public class OrderServiceImpl  extends SalesManagerEntityServiceImpl<Long, Order> implements OrderService {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(OrderServiceImpl.class);
+
+    @Autowired
+    private InvoiceModule invoiceModule;
+
+    @Autowired
+    private ShippingService shippingService;
+    
+    @Autowired
+    private PaymentService paymentService;
+
+    @Autowired
+    private TaxService taxService;
+    
+    @Autowired
+    private CustomerService customerService;
+    
+    @Autowired
+    private TransactionService transactionService;
+
+    private final OrderDao orderDao;
+
+    @Autowired
+    public OrderServiceImpl(final OrderDao orderDao) {
+        super(orderDao);
+        this.orderDao = orderDao;
+    }
+
+    @Override
+    public void addOrderStatusHistory(final Order order, final OrderStatusHistory history) throws ServiceException {
+        order.getOrderHistory().add(history);
+        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 this.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 this.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");
+    	
+    	//first process payment
+    	Transaction processTransaction = paymentService.processPayment(customer, store, payment, items, order);
+    	//transactionService.save(processTransaction);
+    	
+    	if(order.getOrderHistory()==null || order.getOrderHistory().size()==0 || order.getStatus()==null) {
+    		OrderStatus status = order.getStatus();
+    		if(status==null) {
+    			status = OrderStatus.ORDERED;
+    			order.setStatus(status);
+    		}
+    		Set<OrderStatusHistory> statusHistorySet = new HashSet<OrderStatusHistory>();
+    		OrderStatusHistory statusHistory = new OrderStatusHistory();
+    		statusHistory.setStatus(status);
+    		statusHistory.setDateAdded(new Date());
+    		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);
+
+    	if(transaction!=null) {
+    		transaction.setOrder(order);
+    		if(transaction.getId()==null || transaction.getId()==0) {
+    			transactionService.create(transaction);
+    		} else {
+    			transactionService.update(transaction);
+    		}
+    	}
+    	
+    	if(processTransaction!=null) {
+    		processTransaction.setOrder(order);
+    		if(processTransaction.getId()==null || processTransaction.getId()==0) {
+    			transactionService.create(processTransaction);
+    		} else {
+    			transactionService.update(processTransaction);
+    		}
+    	}
+    	
+    	return order;
+    	
+    	
+    }
+
+    private OrderTotalSummary caculateOrder(final OrderSummary summary, final Customer customer, final MerchantStore store, final Language language) throws Exception {
+
+        OrderTotalSummary totalSummary = new OrderTotalSummary();
+        List<OrderTotal> orderTotals = new ArrayList<OrderTotal>();
+        Map<String,OrderTotal> otherPricesTotals = new HashMap<String,OrderTotal>();
+
+        ShippingConfiguration shippingConfiguration = null;
+
+        BigDecimal grandTotal = new BigDecimal(0);
+        grandTotal.setScale(2, RoundingMode.HALF_UP);
+
+        //price by item
+        /**
+         * qty * price
+         * subtotal
+         */
+        BigDecimal subTotal = new BigDecimal(0);
+        subTotal.setScale(2, RoundingMode.HALF_UP);
+        for(ShoppingCartItem item : summary.getProducts()) {
+
+            BigDecimal st = item.getItemPrice().multiply(new BigDecimal(item.getQuantity()));
+            item.setSubTotal(st);
+            subTotal = subTotal.add(st);
+            //Other prices
+            FinalPrice finalPrice = item.getFinalPrice();
+            if(finalPrice!=null) {
+                List<FinalPrice> otherPrices = finalPrice.getAdditionalPrices();
+                if(otherPrices!=null) {
+                    for(FinalPrice price : otherPrices) {
+                        if(!price.isDefaultPrice()) {
+                            OrderTotal itemSubTotal = otherPricesTotals.get(price.getProductPrice().getCode());
+
+                            if(itemSubTotal==null) {
+                                itemSubTotal = new OrderTotal();
+                                itemSubTotal.setModule(Constants.OT_ITEM_PRICE_MODULE_CODE);
+                                itemSubTotal.setText(Constants.OT_ITEM_PRICE_MODULE_CODE);
+                                itemSubTotal.setTitle(Constants.OT_ITEM_PRICE_MODULE_CODE);
+                                itemSubTotal.setOrderTotalCode(price.getProductPrice().getCode());
+                                itemSubTotal.setOrderTotalType(OrderTotalType.PRODUCT);
+                                itemSubTotal.setSortOrder(0);
+                                otherPricesTotals.put(price.getProductPrice().getCode(), itemSubTotal);
+                            }
+
+                            BigDecimal orderTotalValue = itemSubTotal.getValue();
+                            if(orderTotalValue==null) {
+                                orderTotalValue = new BigDecimal(0);
+                                orderTotalValue.setScale(2, RoundingMode.HALF_UP);
+                            }
+
+                            orderTotalValue = orderTotalValue.add(price.getFinalPrice());
+                            itemSubTotal.setValue(orderTotalValue);
+                            if(price.getProductPrice().getProductPriceType().name().equals(OrderValueType.ONE_TIME)) {
+                                subTotal = subTotal.add(price.getFinalPrice());
+                            }
+                        }
+                    }
+                }
+            }
+
+        }
+
+
+        totalSummary.setSubTotal(subTotal);
+        grandTotal=grandTotal.add(subTotal);
+
+        OrderTotal orderTotalSubTotal = new OrderTotal();
+        orderTotalSubTotal.setModule(Constants.OT_SUBTOTAL_MODULE_CODE);
+        orderTotalSubTotal.setOrderTotalType(OrderTotalType.SUBTOTAL);
+        orderTotalSubTotal.setOrderTotalCode("order.total.subtotal");
+        orderTotalSubTotal.setTitle(Constants.OT_SUBTOTAL_MODULE_CODE);
+        orderTotalSubTotal.setText("order.total.subtotal");
+        orderTotalSubTotal.setSortOrder(5);
+        orderTotalSubTotal.setValue(subTotal);
+
+        //TODO autowire a list of post processing modules for price calculation - drools, custom modules
+        //may affect the sub total
+
+        orderTotals.add(orderTotalSubTotal);
+
+
+        //shipping
+        if(summary.getShippingSummary()!=null) {
+
+
+	            OrderTotal shippingSubTotal = new OrderTotal();
+	            shippingSubTotal.setModule(Constants.OT_SHIPPING_MODULE_CODE);
+	            shippingSubTotal.setOrderTotalType(OrderTotalType.SHIPPING);
+	            shippingSubTotal.setOrderTotalCode("order.total.shipping");
+	            shippingSubTotal.setTitle(Constants.OT_SHIPPING_MODULE_CODE);
+	            shippingSubTotal.setText("order.total.shipping");
+	            shippingSubTotal.setSortOrder(10);
+	
+	            orderTotals.add(shippingSubTotal);
+
+            if(!summary.getShippingSummary().isFreeShipping()) {
+                shippingSubTotal.setValue(summary.getShippingSummary().getShipping());
+                grandTotal=grandTotal.add(summary.getShippingSummary().getShipping());
+            } else {
+                shippingSubTotal.setValue(new BigDecimal(0));
+                grandTotal=grandTotal.add(new BigDecimal(0));
+            }
+
+            //check handling fees
+            shippingConfiguration = shippingService.getShippingConfiguration(store);
+            if(summary.getShippingSummary().getHandling()!=null && summary.getShippingSummary().getHandling().doubleValue()>0) {
+                if(shippingConfiguration.getHandlingFees()!=null && shippingConfiguration.getHandlingFees().doubleValue()>0) {
+                    OrderTotal handlingubTotal = new OrderTotal();
+                    handlingubTotal.setModule(Constants.OT_HANDLING_MODULE_CODE);
+                    handlingubTotal.setOrderTotalType(OrderTotalType.HANDLING);
+                    handlingubTotal.setOrderTotalCode("order.total.handling");
+                    handlingubTotal.setTitle(Constants.OT_HANDLING_MODULE_CODE);
+                    handlingubTotal.setText("order.total.handling");
+                    handlingubTotal.setSortOrder(12);
+                    handlingubTotal.setValue(summary.getShippingSummary().getHandling());
+                    orderTotals.add(handlingubTotal);
+                    grandTotal=grandTotal.add(summary.getShippingSummary().getHandling());
+                }
+            }
+        }
+
+        //tax
+        List<TaxItem> taxes = taxService.calculateTax(summary, customer, store, language);
+        if(taxes!=null && taxes.size()>0) {
+        	BigDecimal totalTaxes = new BigDecimal(0);
+        	totalTaxes.setScale(2, RoundingMode.HALF_UP);
+            int taxCount = 20;
+            for(TaxItem tax : taxes) {
+
+                OrderTotal taxLine = new OrderTotal();
+                taxLine.setModule(Constants.OT_TAX_MODULE_CODE);
+                taxLine.setOrderTotalType(OrderTotalType.TAX);
+                taxLine.setOrderTotalCode(tax.getLabel());
+                taxLine.setSortOrder(taxCount);
+                taxLine.setTitle(Constants.OT_TAX_MODULE_CODE);
+                taxLine.setText(tax.getLabel());
+                taxLine.setValue(tax.getItemPrice());
+
+                totalTaxes = totalTaxes.add(tax.getItemPrice());
+                orderTotals.add(taxLine);
+                //grandTotal=grandTotal.add(tax.getItemPrice());
+
+                taxCount ++;
+
+            }
+            grandTotal = grandTotal.add(totalTaxes);
+            totalSummary.setTaxTotal(totalTaxes);
+        }
+
+        // grand total
+        OrderTotal orderTotal = new OrderTotal();
+        orderTotal.setModule(Constants.OT_TOTAL_MODULE_CODE);
+        orderTotal.setOrderTotalType(OrderTotalType.TOTAL);
+        orderTotal.setOrderTotalCode("order.total.total");
+        orderTotal.setTitle(Constants.OT_TOTAL_MODULE_CODE);
+        orderTotal.setText("order.total.total");
+        orderTotal.setSortOrder(300);
+        orderTotal.setValue(grandTotal);
+        orderTotals.add(orderTotal);
+
+        totalSummary.setTotal(grandTotal);
+        totalSummary.setTotals(orderTotals);
+        return totalSummary;
+
+    }
+
+
+    @Override
+    public OrderTotalSummary caculateOrderTotal(final OrderSummary orderSummary, final Customer customer, final MerchantStore store, final Language language) throws ServiceException {
+        Validate.notNull(orderSummary,"Order summary cannot be null");
+        Validate.notNull(orderSummary.getProducts(),"Order summary.products cannot be null");
+        Validate.notNull(store,"MerchantStore cannot be null");
+        Validate.notNull(customer,"Customer cannot be null");
+
+        try {
+            return caculateOrder(orderSummary, customer, store, language);
+        } catch (Exception e) {
+            throw new ServiceException(e);
+        }
+
+    }
+
+
+
+    @Override
+    public OrderTotalSummary caculateOrderTotal(final OrderSummary orderSummary, final MerchantStore store, final Language language) throws ServiceException {
+        Validate.notNull(orderSummary,"Order summary cannot be null");
+        Validate.notNull(orderSummary.getProducts(),"Order summary.products cannot be null");
+        Validate.notNull(store,"MerchantStore cannot be null");
+
+        try {
+            return caculateOrder(orderSummary, null, store, language);
+        } catch (Exception e) {
+            throw new ServiceException(e);
+        }
+
+    }
+
+    private OrderTotalSummary caculateShoppingCart( final ShoppingCart shoppingCart, final Customer customer, final MerchantStore store, final Language language) throws Exception {
+
+        
+    	
+    	
+    	
+    	OrderSummary orderSummary = new OrderSummary();
+    	
+    	List<ShoppingCartItem> itemsSet = new ArrayList<ShoppingCartItem>(shoppingCart.getLineItems());
+    	orderSummary.setProducts(itemsSet);
+    	
+    	
+    	return this.caculateOrder(orderSummary, customer, store, language);
+
+    }
+
+
+    /**
+     * <p>Method will be used to calculate Shopping cart total as well will update price for each
+     * line items.
+     * </p>
+     * @param shoppingCart
+     * @param customer
+     * @param store
+     * @param language
+     * @return {@link OrderTotalSummary}
+     * @throws ServiceException
+     * 
+     */
+    @Override
+    public OrderTotalSummary calculateShoppingCartTotal(
+                                                        final ShoppingCart shoppingCart, final Customer customer, final MerchantStore store,
+                                                        final Language language) throws ServiceException {
+        Validate.notNull(shoppingCart,"Order summary cannot be null");
+        Validate.notNull(customer,"Customery cannot be null");
+        Validate.notNull(store,"MerchantStore cannot be null.");
+        try {
+            return caculateShoppingCart(shoppingCart, customer, store, language);
+        } catch (Exception e) {
+            LOGGER.error( "Error while calculating shopping cart total" +e );
+            throw new ServiceException(e);
+        }
+
+    }
+
+
+
+
+    /**
+     * <p>Method will be used to calculate Shopping cart total as well will update price for each
+     * line items.
+     * </p>
+     * @param shoppingCart
+     * @param store
+     * @param language
+     * @return {@link OrderTotalSummary}
+     * @throws ServiceException
+     * 
+     */
+    @Override
+    public OrderTotalSummary calculateShoppingCartTotal(
+                                                        final ShoppingCart shoppingCart, final MerchantStore store, final Language language)
+                                                                        throws ServiceException {
+        Validate.notNull(shoppingCart,"Order summary cannot be null");
+        Validate.notNull(store,"MerchantStore cannot be null");
+
+        try {
+            return caculateShoppingCart(shoppingCart, null, store, language);
+        } catch (Exception e) {
+            LOGGER.error( "Error while calculating shopping cart total" +e );
+            throw new ServiceException(e);
+        }
+    }
+
+    @Override
+    public void delete(final Order order) throws ServiceException {
+
+
+        super.delete(order);
+    }
+
+
+    @Override
+    public ByteArrayOutputStream generateInvoice(final MerchantStore store, final Order order, final Language language) throws ServiceException {
+
+        Validate.notNull(order.getOrderProducts(),"Order products cannot be null");
+        Validate.notNull(order.getOrderTotal(),"Order totals cannot be null");
+
+        try {
+            ByteArrayOutputStream stream = invoiceModule.createInvoice(store, order, language);
+            return stream;
+        } catch(Exception e) {
+            throw new ServiceException(e);
+        }
+
+
+
+    }
+
+    @Override
+    public Order getOrder(final Long orderId ) {
+        return getById(orderId);
+    }
+
+
+
+    @Override
+    public List<Order> listByStore(final MerchantStore merchantStore) {
+        return listByField(Order_.merchant, merchantStore);
+    }
+
+    @Override
+    public OrderList listByStore(final MerchantStore store, final OrderCriteria criteria) {
+
+        return orderDao.listByStore(store, criteria);
+    }
+
+
+    @Override
+    public void saveOrUpdate(final Order order) throws ServiceException {
+
+        if(order.getId()!=null && order.getId()>0) {
+            LOGGER.debug("Updating Order");
+            super.update(order);
+
+        } else {
+            LOGGER.debug("Creating Order");
+            super.create(order);
+
+        }
+    }
+
+	@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;
+	}
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/payments/dao/TransactionDao.java b/sm-core/src/main/java/com/salesmanager/core/business/payments/dao/TransactionDao.java
new file mode 100644
index 0000000..9aa89cb
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/payments/dao/TransactionDao.java
@@ -0,0 +1,15 @@
+package com.salesmanager.core.business.payments.dao;
+
+import java.util.List;
+
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDao;
+import com.salesmanager.core.business.order.model.Order;
+import com.salesmanager.core.business.payments.model.Transaction;
+
+public interface TransactionDao extends SalesManagerEntityDao<Long, Transaction> {
+
+	List<Transaction> listByOrder(Order order);
+
+
+	
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/payments/dao/TransactionDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/payments/dao/TransactionDaoImpl.java
new file mode 100644
index 0000000..9fb2528
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/payments/dao/TransactionDaoImpl.java
@@ -0,0 +1,33 @@
+package com.salesmanager.core.business.payments.dao;
+
+import java.util.List;
+
+import org.springframework.stereotype.Repository;
+
+import com.mysema.query.jpa.JPQLQuery;
+import com.mysema.query.jpa.impl.JPAQuery;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDaoImpl;
+import com.salesmanager.core.business.order.model.Order;
+import com.salesmanager.core.business.payments.model.QTransaction;
+import com.salesmanager.core.business.payments.model.Transaction;
+
+@Repository("transactionDao")
+public class TransactionDaoImpl extends SalesManagerEntityDaoImpl<Long, Transaction>
+		implements TransactionDao {
+	
+	@Override
+	public List<Transaction> listByOrder(Order order){
+		QTransaction qTransaction = QTransaction.transaction;
+
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qTransaction)
+			.join(qTransaction.order).fetch()
+			.where(qTransaction.order.id.eq(order.getId()));
+		
+		return query.list(qTransaction);
+	}
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/payments/model/BasicPayment.java b/sm-core/src/main/java/com/salesmanager/core/business/payments/model/BasicPayment.java
new file mode 100644
index 0000000..41fbee4
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/payments/model/BasicPayment.java
@@ -0,0 +1,11 @@
+package com.salesmanager.core.business.payments.model;
+
+
+/**
+ * When the user performs a payment using money order or cheque
+ * @author Carl Samson
+ *
+ */
+public class BasicPayment extends Payment {
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/payments/model/CreditCardPayment.java b/sm-core/src/main/java/com/salesmanager/core/business/payments/model/CreditCardPayment.java
new file mode 100644
index 0000000..2a5d4b0
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/payments/model/CreditCardPayment.java
@@ -0,0 +1,53 @@
+package com.salesmanager.core.business.payments.model;
+
+/**
+ * When the user performs a payment using a credit card
+ * @author Carl Samson
+ *
+ */
+public class CreditCardPayment extends Payment {
+	
+	private String creditCardNumber;
+	private String credidCardValidationNumber;
+	private String expirationMonth;
+	private String expirationYear;
+	private String cardOwner;
+	private CreditCardType creditCard;
+	public String getCreditCardNumber() {
+		return creditCardNumber;
+	}
+	public void setCreditCardNumber(String creditCardNumber) {
+		this.creditCardNumber = creditCardNumber;
+	}
+	public String getCredidCardValidationNumber() {
+		return credidCardValidationNumber;
+	}
+	public void setCredidCardValidationNumber(String credidCardValidationNumber) {
+		this.credidCardValidationNumber = credidCardValidationNumber;
+	}
+	public String getExpirationMonth() {
+		return expirationMonth;
+	}
+	public void setExpirationMonth(String expirationMonth) {
+		this.expirationMonth = expirationMonth;
+	}
+	public String getExpirationYear() {
+		return expirationYear;
+	}
+	public void setExpirationYear(String expirationYear) {
+		this.expirationYear = expirationYear;
+	}
+	public String getCardOwner() {
+		return cardOwner;
+	}
+	public void setCardOwner(String cardOwner) {
+		this.cardOwner = cardOwner;
+	}
+	public CreditCardType getCreditCard() {
+		return creditCard;
+	}
+	public void setCreditCard(CreditCardType creditCard) {
+		this.creditCard = creditCard;
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/payments/model/CreditCardType.java b/sm-core/src/main/java/com/salesmanager/core/business/payments/model/CreditCardType.java
new file mode 100644
index 0000000..7c7699d
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/payments/model/CreditCardType.java
@@ -0,0 +1,7 @@
+package com.salesmanager.core.business.payments.model;
+
+public enum CreditCardType {
+	
+	AMEX, VISA, MASTERCARD, DINERS, DISCOVERY
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/payments/model/Payment.java b/sm-core/src/main/java/com/salesmanager/core/business/payments/model/Payment.java
new file mode 100644
index 0000000..785933b
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/payments/model/Payment.java
@@ -0,0 +1,44 @@
+package com.salesmanager.core.business.payments.model;
+
+import com.salesmanager.core.business.reference.currency.model.Currency;
+
+public class Payment {
+	
+	private PaymentType paymentType;
+	private TransactionType transactionType = TransactionType.AUTHORIZECAPTURE;
+	private String moduleName;
+	private Currency currency;
+
+	public void setPaymentType(PaymentType paymentType) {
+		this.paymentType = paymentType;
+	}
+
+	public PaymentType getPaymentType() {
+		return paymentType;
+	}
+
+	public void setTransactionType(TransactionType transactionType) {
+		this.transactionType = transactionType;
+	}
+
+	public TransactionType getTransactionType() {
+		return transactionType;
+	}
+
+	public void setModuleName(String moduleName) {
+		this.moduleName = moduleName;
+	}
+
+	public String getModuleName() {
+		return moduleName;
+	}
+
+	public Currency getCurrency() {
+		return currency;
+	}
+
+	public void setCurrency(Currency currency) {
+		this.currency = currency;
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/payments/model/PaymentMethod.java b/sm-core/src/main/java/com/salesmanager/core/business/payments/model/PaymentMethod.java
new file mode 100644
index 0000000..effca46
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/payments/model/PaymentMethod.java
@@ -0,0 +1,57 @@
+package com.salesmanager.core.business.payments.model;
+
+import java.io.Serializable;
+
+import com.salesmanager.core.business.system.model.IntegrationConfiguration;
+import com.salesmanager.core.business.system.model.IntegrationModule;
+
+/**
+ * Object to be used in store front with meta data and configuration
+ * informations required to display to the end user
+ * @author Carl Samson
+ *
+ */
+public class PaymentMethod implements Serializable {
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	private String paymentMethodCode;
+	private PaymentType paymentType;
+	private boolean defaultSelected;
+	private IntegrationModule module;
+	private IntegrationConfiguration informations;
+
+	public PaymentType getPaymentType() {
+		return paymentType;
+	}
+	public void setPaymentType(PaymentType paymentType) {
+		this.paymentType = paymentType;
+	}
+	public String getPaymentMethodCode() {
+		return paymentMethodCode;
+	}
+	public void setPaymentMethodCode(String paymentMethodCode) {
+		this.paymentMethodCode = paymentMethodCode;
+	}
+	public boolean isDefaultSelected() {
+		return defaultSelected;
+	}
+	public void setDefaultSelected(boolean defaultSelected) {
+		this.defaultSelected = defaultSelected;
+	}
+	public IntegrationModule getModule() {
+		return module;
+	}
+	public void setModule(IntegrationModule module) {
+		this.module = module;
+	}
+	public IntegrationConfiguration getInformations() {
+		return informations;
+	}
+	public void setInformations(IntegrationConfiguration informations) {
+		this.informations = informations;
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/payments/model/PaymentType.java b/sm-core/src/main/java/com/salesmanager/core/business/payments/model/PaymentType.java
new file mode 100644
index 0000000..0bbd1eb
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/payments/model/PaymentType.java
@@ -0,0 +1,7 @@
+package com.salesmanager.core.business.payments.model;
+
+public enum PaymentType {
+	
+	CREDITCARD, FREE, COD, MONEYORDER, PAYPAL
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/payments/model/PaypalPayment.java b/sm-core/src/main/java/com/salesmanager/core/business/payments/model/PaypalPayment.java
new file mode 100644
index 0000000..67b5880
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/payments/model/PaypalPayment.java
@@ -0,0 +1,31 @@
+package com.salesmanager.core.business.payments.model;
+
+/**
+ * When the user performs a payment using paypal
+ * @author Carl Samson
+ *
+ */
+public class PaypalPayment extends Payment {
+	
+	//express checkout
+	private String payerId;
+	private String paymentToken;
+	
+	public PaypalPayment() {
+		super.setPaymentType(PaymentType.PAYPAL);
+	}
+	
+	public void setPayerId(String payerId) {
+		this.payerId = payerId;
+	}
+	public String getPayerId() {
+		return payerId;
+	}
+	public void setPaymentToken(String paymentToken) {
+		this.paymentToken = paymentToken;
+	}
+	public String getPaymentToken() {
+		return paymentToken;
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/payments/model/Transaction.java b/sm-core/src/main/java/com/salesmanager/core/business/payments/model/Transaction.java
new file mode 100644
index 0000000..50eff18
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/payments/model/Transaction.java
@@ -0,0 +1,183 @@
+package com.salesmanager.core.business.payments.model;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.persistence.Column;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import javax.persistence.Transient;
+
+import org.codehaus.jackson.map.ObjectMapper;
+import org.hibernate.annotations.Type;
+import org.json.simple.JSONAware;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.salesmanager.core.business.common.model.audit.AuditListener;
+import com.salesmanager.core.business.common.model.audit.AuditSection;
+import com.salesmanager.core.business.common.model.audit.Auditable;
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.business.order.model.Order;
+import com.salesmanager.core.constants.SchemaConstant;
+
+
+@Entity
+@EntityListeners(value = AuditListener.class)
+@Table(name = "SM_TRANSACTION", schema= SchemaConstant.SALESMANAGER_SCHEMA)
+public class Transaction extends SalesManagerEntity<Long, Transaction> implements Serializable, Auditable, JSONAware {
+	
+	
+	private static final Logger LOGGER = LoggerFactory.getLogger(Transaction.class);
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	@Column(name = "TRANSACTION_ID")
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT", pkColumnValue = "TRANSACT_SEQ_NEXT_VAL")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Long id;
+	
+	@Embedded
+	private AuditSection auditSection = new AuditSection();
+
+	
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name="ORDER_ID", nullable=true)
+	private Order order;
+	
+	@Column(name="AMOUNT")
+	private BigDecimal amount;
+	
+	@Column(name="TRANSACTION_DATE")
+	@Temporal(TemporalType.TIMESTAMP)
+	private Date transactionDate;
+	
+	@Column(name="TRANSACTION_TYPE")
+	@Enumerated(value = EnumType.STRING)
+	private TransactionType transactionType;
+	
+	@Column(name="PAYMENT_TYPE")
+	@Enumerated(value = EnumType.STRING)
+	private PaymentType paymentType;
+	
+	@Column(name="DETAILS")
+	@Type(type = "org.hibernate.type.StringClobType")
+	private String details;
+	
+	@Transient
+	private Map<String,String> transactionDetails= new HashMap<String,String>();
+
+	@Override
+	public AuditSection getAuditSection() {
+		return this.auditSection;
+	}
+
+	@Override
+	public void setAuditSection(AuditSection audit) {
+		this.auditSection = audit;
+		
+	}
+
+	@Override
+	public Long getId() {
+		return this.id;
+	}
+
+	@Override
+	public void setId(Long id) {
+		this.id = id;
+		
+	}
+
+	public Order getOrder() {
+		return order;
+	}
+
+	public void setOrder(Order order) {
+		this.order = order;
+	}
+
+	public BigDecimal getAmount() {
+		return amount;
+	}
+
+	public void setAmount(BigDecimal amount) {
+		this.amount = amount;
+	}
+
+	public Date getTransactionDate() {
+		return transactionDate;
+	}
+
+	public void setTransactionDate(Date transactionDate) {
+		this.transactionDate = transactionDate;
+	}
+
+	public TransactionType getTransactionType() {
+		return transactionType;
+	}
+
+	public void setTransactionType(TransactionType transactionType) {
+		this.transactionType = transactionType;
+	}
+
+	public PaymentType getPaymentType() {
+		return paymentType;
+	}
+
+	public void setPaymentType(PaymentType paymentType) {
+		this.paymentType = paymentType;
+	}
+
+	public String getDetails() {
+		return details;
+	}
+
+	public void setDetails(String details) {
+		this.details = details;
+	}
+
+	public Map<String, String> getTransactionDetails() {
+		return transactionDetails;
+	}
+
+	public void setTransactionDetails(Map<String, String> transactionDetails) {
+		this.transactionDetails = transactionDetails;
+	}
+
+	@Override
+	public String toJSONString() {
+		
+		if(this.getTransactionDetails()!=null && this.getTransactionDetails().size()>0) {
+			ObjectMapper mapper = new ObjectMapper();
+			try {
+				return mapper.writeValueAsString(this.getTransactionDetails());
+			} catch (Exception e) {
+				LOGGER.error("Cannot parse transactions map",e);
+			}
+			
+		}
+		
+		return null;
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/payments/model/TransactionType.java b/sm-core/src/main/java/com/salesmanager/core/business/payments/model/TransactionType.java
new file mode 100644
index 0000000..3015853
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/payments/model/TransactionType.java
@@ -0,0 +1,7 @@
+package com.salesmanager.core.business.payments.model;
+
+public enum TransactionType {
+	
+	INIT, AUTHORIZE, CAPTURE, AUTHORIZECAPTURE, REFUND
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/payments/service/PaymentService.java b/sm-core/src/main/java/com/salesmanager/core/business/payments/service/PaymentService.java
new file mode 100644
index 0000000..ef7bc9c
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/payments/service/PaymentService.java
@@ -0,0 +1,103 @@
+package com.salesmanager.core.business.payments.service;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+import com.salesmanager.core.business.customer.model.Customer;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.order.model.Order;
+import com.salesmanager.core.business.payments.model.CreditCardType;
+import com.salesmanager.core.business.payments.model.Payment;
+import com.salesmanager.core.business.payments.model.PaymentMethod;
+import com.salesmanager.core.business.payments.model.Transaction;
+import com.salesmanager.core.business.shoppingcart.model.ShoppingCartItem;
+import com.salesmanager.core.business.system.model.IntegrationConfiguration;
+import com.salesmanager.core.business.system.model.IntegrationModule;
+import com.salesmanager.core.modules.integration.payment.model.PaymentModule;
+
+public interface PaymentService {
+
+
+
+	public List<IntegrationModule> getPaymentMethods(MerchantStore store)
+			throws ServiceException;
+
+	Map<String, IntegrationConfiguration> getPaymentModulesConfigured(
+			MerchantStore store) throws ServiceException;
+	
+	Transaction processPayment(Customer customer, MerchantStore store, Payment payment, List<ShoppingCartItem> items, Order order) throws ServiceException;
+	Transaction processRefund(Order order, Customer customer, MerchantStore store, BigDecimal amount) throws ServiceException;
+
+	/**
+	 * Get a specific Payment module by payment type CREDITCART, MONEYORDER ...
+	 * @param store
+	 * @param type (payment type)
+	 * @return IntegrationModule
+	 * @throws ServiceException
+	 */
+	IntegrationModule getPaymentMethodByType(MerchantStore store, String type)
+			throws ServiceException;
+	
+	/**
+	 * Get a specific Payment module by payment code (defined in integrationmoduel.json) paypal, authorizenet ..
+	 * @param store
+	 * @param name
+	 * @return IntegrationModule
+	 * @throws ServiceException
+	 */
+	IntegrationModule getPaymentMethodByCode(MerchantStore store, String name)
+			throws ServiceException;
+
+	/**
+	 * Saves a payment module configuration
+	 * @param configuration
+	 * @param store
+	 * @throws ServiceException
+	 */
+	void savePaymentModuleConfiguration(IntegrationConfiguration configuration,
+			MerchantStore store) throws ServiceException;
+
+	/**
+	 * Validates if the credit card input information are correct
+	 * @param number
+	 * @param type
+	 * @param month
+	 * @param date
+	 * @throws ServiceException
+	 */
+	void validateCreditCard(String number, CreditCardType creditCard, String month, String date)
+			throws ServiceException;
+
+	/**
+	 * Get the integration configuration
+	 * for a specific payment module
+	 * @param moduleCode
+	 * @param store
+	 * @return IntegrationConfiguration
+	 * @throws ServiceException
+	 */
+	IntegrationConfiguration getPaymentConfiguration(String moduleCode,
+			MerchantStore store) throws ServiceException;
+
+	void removePaymentModuleConfiguration(String moduleCode, MerchantStore store)
+			throws ServiceException;
+
+	Transaction processCapturePayment(Order order, Customer customer,
+			MerchantStore store)
+			throws ServiceException;
+
+	List<PaymentMethod> getAcceptedPaymentMethods(MerchantStore store)
+			throws ServiceException;
+
+	/**
+	 * Returns a PaymentModule based on the payment code
+	 * @param paymentModuleCode
+	 * @return PaymentModule
+	 * @throws ServiceException
+	 */
+	PaymentModule getPaymentModule(String paymentModuleCode)
+			throws ServiceException;
+
+}
\ No newline at end of file

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/payments/service/PaymentServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/payments/service/PaymentServiceImpl.java
new file mode 100644
index 0000000..3adc63a
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/payments/service/PaymentServiceImpl.java
@@ -0,0 +1,694 @@
+package com.salesmanager.core.business.payments.service;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.annotation.Resource;
+
+import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.salesmanager.core.business.customer.model.Customer;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.order.model.Order;
+import com.salesmanager.core.business.order.model.OrderTotal;
+import com.salesmanager.core.business.order.model.OrderTotalType;
+import com.salesmanager.core.business.order.model.orderstatus.OrderStatus;
+import com.salesmanager.core.business.order.model.orderstatus.OrderStatusHistory;
+import com.salesmanager.core.business.order.service.OrderService;
+import com.salesmanager.core.business.payments.model.CreditCardPayment;
+import com.salesmanager.core.business.payments.model.CreditCardType;
+import com.salesmanager.core.business.payments.model.Payment;
+import com.salesmanager.core.business.payments.model.PaymentMethod;
+import com.salesmanager.core.business.payments.model.PaymentType;
+import com.salesmanager.core.business.payments.model.Transaction;
+import com.salesmanager.core.business.payments.model.TransactionType;
+import com.salesmanager.core.business.shoppingcart.model.ShoppingCartItem;
+import com.salesmanager.core.business.system.model.IntegrationConfiguration;
+import com.salesmanager.core.business.system.model.IntegrationModule;
+import com.salesmanager.core.business.system.model.MerchantConfiguration;
+import com.salesmanager.core.business.system.service.MerchantConfigurationService;
+import com.salesmanager.core.business.system.service.ModuleConfigurationService;
+import com.salesmanager.core.constants.Constants;
+import com.salesmanager.core.modules.integration.IntegrationException;
+import com.salesmanager.core.modules.integration.payment.model.PaymentModule;
+import com.salesmanager.core.modules.utils.Encryption;
+import com.salesmanager.core.utils.reference.ConfigurationModulesLoader;
+
+@Service("paymentService")
+public class PaymentServiceImpl implements PaymentService {
+	
+	
+
+	private final static String PAYMENT_MODULES = "PAYMENT";
+	
+	@Autowired
+	private MerchantConfigurationService merchantConfigurationService;
+	
+	@Autowired
+	private ModuleConfigurationService moduleConfigurationService;
+	
+	@Autowired
+	private TransactionService transactionService;
+	
+	@Autowired
+	private OrderService orderService;
+	
+	@Autowired
+	@Resource(name="paymentModules")
+	private Map<String,PaymentModule> paymentModules;
+	
+	@Autowired
+	private Encryption encryption;
+	
+	@Override
+	public List<IntegrationModule> getPaymentMethods(MerchantStore store) throws ServiceException {
+		
+		List<IntegrationModule> modules =  moduleConfigurationService.getIntegrationModules(PAYMENT_MODULES);
+		List<IntegrationModule> returnModules = new ArrayList<IntegrationModule>();
+		
+		for(IntegrationModule module : modules) {
+			if(module.getRegionsSet().contains(store.getCountry().getIsoCode())
+					|| module.getRegionsSet().contains("*")) {
+				
+				returnModules.add(module);
+			}
+		}
+		
+		return returnModules;
+	}
+	
+	@Override
+	public List<PaymentMethod> getAcceptedPaymentMethods(MerchantStore store) throws ServiceException {
+		
+		Map<String,IntegrationConfiguration> modules =  this.getPaymentModulesConfigured(store);
+
+		List<PaymentMethod> returnModules = new ArrayList<PaymentMethod>();
+		
+		for(String module : modules.keySet()) {
+			IntegrationConfiguration config = modules.get(module);
+			if(config.isActive()) {
+				
+				IntegrationModule md = this.getPaymentMethodByCode(store, config.getModuleCode());
+				if(md==null) {
+					continue;
+				}
+				PaymentMethod paymentMethod = new PaymentMethod();
+				
+				paymentMethod.setDefaultSelected(config.isDefaultSelected());
+				paymentMethod.setPaymentMethodCode(config.getModuleCode());
+				paymentMethod.setModule(md);
+				paymentMethod.setInformations(config);
+				PaymentType type = PaymentType.COD;
+				if(md.getType().equalsIgnoreCase(PaymentType.CREDITCARD.name())) {
+					type = PaymentType.CREDITCARD;
+				} else 	if(md.getType().equalsIgnoreCase(PaymentType.FREE.name())) {
+					type = PaymentType.FREE;
+				} else 	if(md.getType().equalsIgnoreCase(PaymentType.MONEYORDER.name())) {
+					type = PaymentType.MONEYORDER;
+				} else 	if(md.getType().equalsIgnoreCase(PaymentType.PAYPAL.name())) {
+					type = PaymentType.PAYPAL;
+				}
+				paymentMethod.setPaymentType(type);
+				returnModules.add(paymentMethod);
+			}
+		}
+		
+		return returnModules;
+		
+		
+	}
+	
+	@Override
+	public IntegrationModule getPaymentMethodByType(MerchantStore store, String type) throws ServiceException {
+		List<IntegrationModule> modules =  getPaymentMethods(store);
+
+		for(IntegrationModule module : modules) {
+			if(module.getModule().equals(type)) {
+				
+				return module;
+			}
+		}
+		
+		return null;
+	}
+	
+	@Override
+	public IntegrationModule getPaymentMethodByCode(MerchantStore store,
+			String code) throws ServiceException {
+		List<IntegrationModule> modules =  getPaymentMethods(store);
+
+		for(IntegrationModule module : modules) {
+			if(module.getCode().equals(code)) {
+				
+				return module;
+			}
+		}
+		
+		return null;
+	}
+	
+	@Override
+	public IntegrationConfiguration getPaymentConfiguration(String moduleCode, MerchantStore store) throws ServiceException {
+
+		
+		Map<String,IntegrationConfiguration> configuredModules = getPaymentModulesConfigured(store);
+		if(configuredModules!=null) {
+			for(String key : configuredModules.keySet()) {
+				if(key.equals(moduleCode)) {
+					return configuredModules.get(key);	
+				}
+			}
+		}
+		
+		return null;
+		
+	}
+	
+
+	
+	@Override
+	public Map<String,IntegrationConfiguration> getPaymentModulesConfigured(MerchantStore store) throws ServiceException {
+		
+		try {
+		
+			Map<String,IntegrationConfiguration> modules = new HashMap<String,IntegrationConfiguration>();
+			MerchantConfiguration merchantConfiguration = merchantConfigurationService.getMerchantConfiguration(PAYMENT_MODULES, store);
+			if(merchantConfiguration!=null) {
+				
+				if(!StringUtils.isBlank(merchantConfiguration.getValue())) {
+					
+					String decrypted = encryption.decrypt(merchantConfiguration.getValue());
+					modules = ConfigurationModulesLoader.loadIntegrationConfigurations(decrypted);
+					
+					
+				}
+			}
+			return modules;
+		
+		} catch (Exception e) {
+			throw new ServiceException(e);
+		}
+	}
+	
+	@Override
+	public void savePaymentModuleConfiguration(IntegrationConfiguration configuration, MerchantStore store) throws ServiceException {
+		
+		//validate entries
+		try {
+			
+			String moduleCode = configuration.getModuleCode();
+			PaymentModule module = (PaymentModule)paymentModules.get(moduleCode);
+			if(module==null) {
+				throw new ServiceException("Payment module " + moduleCode + " does not exist");
+			}
+			module.validateModuleConfiguration(configuration, store);
+			
+		} catch (IntegrationException ie) {
+			throw ie;
+		}
+		
+		try {
+			Map<String,IntegrationConfiguration> modules = new HashMap<String,IntegrationConfiguration>();
+			MerchantConfiguration merchantConfiguration = merchantConfigurationService.getMerchantConfiguration(PAYMENT_MODULES, store);
+			if(merchantConfiguration!=null) {
+				if(!StringUtils.isBlank(merchantConfiguration.getValue())) {
+					
+					String decrypted = encryption.decrypt(merchantConfiguration.getValue());
+					
+					modules = ConfigurationModulesLoader.loadIntegrationConfigurations(decrypted);
+				}
+			} else {
+				merchantConfiguration = new MerchantConfiguration();
+				merchantConfiguration.setMerchantStore(store);
+				merchantConfiguration.setKey(PAYMENT_MODULES);
+			}
+			modules.put(configuration.getModuleCode(), configuration);
+			
+			String configs =  ConfigurationModulesLoader.toJSONString(modules);
+			
+			String encrypted = encryption.encrypt(configs);
+			merchantConfiguration.setValue(encrypted);
+			
+			merchantConfigurationService.saveOrUpdate(merchantConfiguration);
+			
+		} catch (Exception e) {
+			throw new ServiceException(e);
+		}
+   }
+	
+	@Override
+	public void removePaymentModuleConfiguration(String moduleCode, MerchantStore store) throws ServiceException {
+		
+		
+
+		try {
+			Map<String,IntegrationConfiguration> modules = new HashMap<String,IntegrationConfiguration>();
+			MerchantConfiguration merchantConfiguration = merchantConfigurationService.getMerchantConfiguration(PAYMENT_MODULES, store);
+			if(merchantConfiguration!=null) {
+
+				if(!StringUtils.isBlank(merchantConfiguration.getValue())) {
+					
+					String decrypted = encryption.decrypt(merchantConfiguration.getValue());
+					modules = ConfigurationModulesLoader.loadIntegrationConfigurations(decrypted);
+				}
+				
+				modules.remove(moduleCode);
+				String configs =  ConfigurationModulesLoader.toJSONString(modules);
+				
+				String encrypted = encryption.encrypt(configs);
+				merchantConfiguration.setValue(encrypted);
+				
+				merchantConfigurationService.saveOrUpdate(merchantConfiguration);
+				
+				
+			} 
+			
+			MerchantConfiguration configuration = merchantConfigurationService.getMerchantConfiguration(moduleCode, store);
+			
+			if(configuration!=null) {//custom module
+
+				merchantConfigurationService.delete(configuration);
+			}
+
+			
+		} catch (Exception e) {
+			throw new ServiceException(e);
+		}
+	
+	}
+	
+
+	
+
+
+	@Override
+	public Transaction processPayment(Customer customer,
+			MerchantStore store, Payment payment, List<ShoppingCartItem> items, Order order)
+			throws ServiceException {
+
+
+		Validate.notNull(customer);
+		Validate.notNull(store);
+		Validate.notNull(payment);
+		Validate.notNull(order);
+		Validate.notNull(order.getTotal());
+		
+		payment.setCurrency(store.getCurrency());
+		
+		BigDecimal amount = order.getTotal();
+
+		//must have a shipping module configured
+		Map<String, IntegrationConfiguration> modules = this.getPaymentModulesConfigured(store);
+		if(modules==null){
+			throw new ServiceException("No payment module configured");
+		}
+		
+		IntegrationConfiguration configuration = modules.get(payment.getModuleName());
+		
+		if(configuration==null) {
+			throw new ServiceException("Payment module " + payment.getModuleName() + " is not configured");
+		}
+		
+		if(!configuration.isActive()) {
+			throw new ServiceException("Payment module " + payment.getModuleName() + " is not active");
+		}
+		
+		String sTransactionType = configuration.getIntegrationKeys().get("transaction");
+		if(sTransactionType==null) {
+			sTransactionType = TransactionType.AUTHORIZECAPTURE.name();
+		}
+		
+
+		if(sTransactionType.equals(TransactionType.AUTHORIZE.name())) {
+			payment.setTransactionType(TransactionType.AUTHORIZE);
+		} else {
+			payment.setTransactionType(TransactionType.AUTHORIZECAPTURE);
+		} 
+		
+
+		PaymentModule module = this.paymentModules.get(payment.getModuleName());
+		
+		if(module==null) {
+			throw new ServiceException("Payment module " + payment.getModuleName() + " does not exist");
+		}
+		
+		if(payment instanceof CreditCardPayment) {
+			CreditCardPayment creditCardPayment = (CreditCardPayment)payment;
+			validateCreditCard(creditCardPayment.getCreditCardNumber(),creditCardPayment.getCreditCard(),creditCardPayment.getExpirationMonth(),creditCardPayment.getExpirationYear());
+		}
+		
+		IntegrationModule integrationModule = getPaymentMethodByCode(store,payment.getModuleName());
+		TransactionType transactionType = TransactionType.valueOf(sTransactionType);
+		if(transactionType==null) {
+			transactionType = payment.getTransactionType();
+			if(transactionType.equals(TransactionType.CAPTURE.name())) {
+				throw new ServiceException("This method does not allow to process capture transaction. Use processCapturePayment");
+			}
+		}
+		
+		Transaction transaction = null;
+		if(transactionType == TransactionType.AUTHORIZE)  {
+			transaction = module.authorize(store, customer, items, amount, payment, configuration, integrationModule);
+		} else if(transactionType == TransactionType.AUTHORIZECAPTURE)  {
+			transaction = module.authorizeAndCapture(store, customer, items, amount, payment, configuration, integrationModule);
+		} else if(transactionType == TransactionType.INIT)  {
+			transaction = module.initTransaction(store, customer, amount, payment, configuration, integrationModule);
+		}
+
+
+		if(transactionType != TransactionType.INIT) {
+			transactionService.create(transaction);
+		}
+		
+		if(transactionType == TransactionType.AUTHORIZECAPTURE)  {
+			order.setStatus(OrderStatus.ORDERED);
+			if(payment.getPaymentType().name()!=PaymentType.MONEYORDER.name()) {
+				order.setStatus(OrderStatus.PROCESSED);
+			}
+		}
+
+		return transaction;
+
+		
+
+	}
+	
+	@Override
+	public PaymentModule getPaymentModule(String paymentModuleCode) throws ServiceException {
+		return paymentModules.get(paymentModuleCode);
+	}
+	
+	@Override
+	public Transaction processCapturePayment(Order order, Customer customer,
+			MerchantStore store)
+			throws ServiceException {
+
+
+		Validate.notNull(customer);
+		Validate.notNull(store);
+		Validate.notNull(order);
+
+		
+
+		//must have a shipping module configured
+		Map<String, IntegrationConfiguration> modules = this.getPaymentModulesConfigured(store);
+		if(modules==null){
+			throw new ServiceException("No payment module configured");
+		}
+		
+		IntegrationConfiguration configuration = modules.get(order.getPaymentModuleCode());
+		
+		if(configuration==null) {
+			throw new ServiceException("Payment module " + order.getPaymentModuleCode() + " is not configured");
+		}
+		
+		if(!configuration.isActive()) {
+			throw new ServiceException("Payment module " + order.getPaymentModuleCode() + " is not active");
+		}
+		
+		
+		PaymentModule module = this.paymentModules.get(order.getPaymentModuleCode());
+		
+		if(module==null) {
+			throw new ServiceException("Payment module " + order.getPaymentModuleCode() + " does not exist");
+		}
+		
+
+		IntegrationModule integrationModule = getPaymentMethodByCode(store,order.getPaymentModuleCode());
+		
+		//TransactionType transactionType = payment.getTransactionType();
+
+			//get the previous transaction
+		Transaction trx = transactionService.getCapturableTransaction(order);
+		if(trx==null) {
+			throw new ServiceException("No capturable transaction for order id " + order.getId());
+		}
+		Transaction transaction = module.capture(store, customer, order, trx, configuration, integrationModule);
+		transaction.setOrder(order);
+		
+		
+
+		transactionService.create(transaction);
+		
+		
+		OrderStatusHistory orderHistory = new OrderStatusHistory();
+		orderHistory.setOrder(order);
+		orderHistory.setStatus(OrderStatus.PROCESSED);
+		orderHistory.setDateAdded(new Date());
+		
+		orderService.addOrderStatusHistory(order, orderHistory);
+		
+		order.setStatus(OrderStatus.PROCESSED);
+		orderService.saveOrUpdate(order);
+
+		return transaction;
+
+		
+
+	}
+
+	@Override
+	public Transaction processRefund(Order order, Customer customer,
+			MerchantStore store, BigDecimal amount)
+			throws ServiceException {
+		
+		
+		Validate.notNull(customer);
+		Validate.notNull(store);
+		Validate.notNull(amount);
+		Validate.notNull(order);
+		Validate.notNull(order.getOrderTotal());
+		
+		
+		BigDecimal orderTotal = order.getTotal();
+		
+		if(amount.doubleValue()>orderTotal.doubleValue()) {
+			throw new ServiceException("Invalid amount, the refunded amount is greater than the total allowed");
+		}
+
+		
+		String module = order.getPaymentModuleCode();
+		Map<String, IntegrationConfiguration> modules = this.getPaymentModulesConfigured(store);
+		if(modules==null){
+			throw new ServiceException("No payment module configured");
+		}
+		
+		IntegrationConfiguration configuration = modules.get(module);
+		
+		if(configuration==null) {
+			throw new ServiceException("Payment module " + module + " is not configured");
+		}
+		
+		PaymentModule paymentModule = this.paymentModules.get(module);
+		
+		if(paymentModule==null) {
+			throw new ServiceException("Payment module " + paymentModule + " does not exist");
+		}
+		
+		boolean partial = false;
+		if(amount.doubleValue()!=order.getTotal().doubleValue()) {
+			partial = true;
+		}
+		
+		IntegrationModule integrationModule = getPaymentMethodByCode(store,module);
+		
+		//get the associated transaction
+		Transaction refundable = transactionService.getRefundableTransaction(order);
+		
+		if(refundable==null) {
+			throw new ServiceException("No refundable transaction for this order");
+		}
+		
+		Transaction transaction = paymentModule.refund(partial, store, refundable, order, amount, configuration, integrationModule);
+		transaction.setOrder(order);
+		transactionService.create(transaction);
+		
+        OrderTotal refund = new OrderTotal();
+        refund.setModule(Constants.OT_REFUND_MODULE_CODE);
+        refund.setText(Constants.OT_REFUND_MODULE_CODE);
+        refund.setTitle(Constants.OT_REFUND_MODULE_CODE);
+        refund.setOrderTotalCode(Constants.OT_REFUND_MODULE_CODE);
+        refund.setOrderTotalType(OrderTotalType.REFUND);
+        refund.setValue(amount);
+        refund.setSortOrder(100);
+        refund.setOrder(order);
+        
+        order.getOrderTotal().add(refund);
+        
+		//update order total
+		orderTotal = orderTotal.subtract(amount);
+        
+        //update ordertotal refund
+        Set<OrderTotal> totals = order.getOrderTotal();
+        for(OrderTotal total : totals) {
+        	if(total.getModule().equals(Constants.OT_TOTAL_MODULE_CODE)) {
+        		total.setValue(orderTotal);
+        	}
+        }
+
+		
+
+		order.setTotal(orderTotal);
+		order.setStatus(OrderStatus.REFUNDED);
+		
+		
+		
+		OrderStatusHistory orderHistory = new OrderStatusHistory();
+		orderHistory.setOrder(order);
+		orderHistory.setStatus(OrderStatus.REFUNDED);
+		orderHistory.setDateAdded(new Date());
+        order.getOrderHistory().add(orderHistory);
+        
+        orderService.saveOrUpdate(order);
+
+		return transaction;
+	}
+	
+	@Override
+	public void validateCreditCard(String number, CreditCardType creditCard, String month, String date)
+	throws ServiceException {
+
+		try {
+			Integer.parseInt(month);
+			Integer.parseInt(date);
+		} catch (NumberFormatException nfe) {
+			ServiceException ex = new ServiceException(ServiceException.EXCEPTION_VALIDATION,"Invalid date format","messages.error.creditcard.dateformat");
+			throw ex;
+		}
+		
+		if (StringUtils.isBlank(number)) {
+			ServiceException ex = new ServiceException(ServiceException.EXCEPTION_VALIDATION,"Invalid card number","messages.error.creditcard.number");
+			throw ex;
+		}
+		
+		Matcher m = Pattern.compile("[^\\d\\s.-]").matcher(number);
+		
+		if (m.find()) {
+			ServiceException ex = new ServiceException(ServiceException.EXCEPTION_VALIDATION,"Invalid card number","messages.error.creditcard.number");
+			throw ex;
+		}
+		
+		Matcher matcher = Pattern.compile("[\\s.-]").matcher(number);
+		
+		number = matcher.replaceAll("");
+		validateCreditCardDate(Integer.parseInt(month), Integer.parseInt(date));
+		validateCreditCardNumber(number, creditCard);
+	}
+
+	private void validateCreditCardDate(int m, int y) throws ServiceException {
+		java.util.Calendar cal = new java.util.GregorianCalendar();
+		int monthNow = cal.get(java.util.Calendar.MONTH) + 1;
+		int yearNow = cal.get(java.util.Calendar.YEAR);
+		if (yearNow > y) {
+			ServiceException ex = new ServiceException(ServiceException.EXCEPTION_VALIDATION,"Invalid date format","messages.error.creditcard.dateformat");
+			throw ex;
+		}
+		// OK, change implementation
+		if (yearNow == y && monthNow > m) {
+			ServiceException ex = new ServiceException(ServiceException.EXCEPTION_VALIDATION,"Invalid date format","messages.error.creditcard.dateformat");
+			throw ex;
+		}
+	
+	}
+	
+	private void validateCreditCardNumber(String number, CreditCardType creditCard)
+	throws ServiceException {
+
+		//TODO implement
+		if(CreditCardType.MASTERCARD.equals(creditCard.name())) {
+			if (number.length() != 16
+					|| Integer.parseInt(number.substring(0, 2)) < 51
+					|| Integer.parseInt(number.substring(0, 2)) > 55) {
+				ServiceException ex = new ServiceException(ServiceException.EXCEPTION_VALIDATION,"Invalid card number","messages.error.creditcard.number");
+				throw ex;
+			}
+		}
+		
+		if(CreditCardType.VISA.equals(creditCard.name())) {
+			if ((number.length() != 13 && number.length() != 16)
+					|| Integer.parseInt(number.substring(0, 1)) != 4) {
+				ServiceException ex = new ServiceException(ServiceException.EXCEPTION_VALIDATION,"Invalid card number","messages.error.creditcard.number");
+				throw ex;
+			}
+		}
+		
+		if(CreditCardType.AMEX.equals(creditCard.name())) {
+			if (number.length() != 15
+					|| (Integer.parseInt(number.substring(0, 2)) != 34 && Integer
+							.parseInt(number.substring(0, 2)) != 37)) {
+				ServiceException ex = new ServiceException(ServiceException.EXCEPTION_VALIDATION,"Invalid card number","messages.error.creditcard.number");
+				throw ex;
+			}
+		}
+		
+		if(CreditCardType.DINERS.equals(creditCard.name())) {
+			if (number.length() != 14
+					|| ((Integer.parseInt(number.substring(0, 2)) != 36 && Integer
+							.parseInt(number.substring(0, 2)) != 38)
+							&& Integer.parseInt(number.substring(0, 3)) < 300 || Integer
+							.parseInt(number.substring(0, 3)) > 305)) {
+				ServiceException ex = new ServiceException(ServiceException.EXCEPTION_VALIDATION,"Invalid card number","messages.error.creditcard.number");
+				throw ex;
+			}
+		}
+		
+		if(CreditCardType.DISCOVERY.equals(creditCard.name())) {
+			if (number.length() != 16
+					|| Integer.parseInt(number.substring(0, 5)) != 6011) {
+				ServiceException ex = new ServiceException(ServiceException.EXCEPTION_VALIDATION,"Invalid card number","messages.error.creditcard.number");
+				throw ex;
+			}
+		}
+
+		luhnValidate(number);
+	}
+
+	// The Luhn algorithm is basically a CRC type
+	// system for checking the validity of an entry.
+	// All major credit cards use numbers that will
+	// pass the Luhn check. Also, all of them are based
+	// on MOD 10.
+	
+	private void luhnValidate(String numberString)
+			throws ServiceException {
+		char[] charArray = numberString.toCharArray();
+		int[] number = new int[charArray.length];
+		int total = 0;
+	
+		for (int i = 0; i < charArray.length; i++) {
+			number[i] = Character.getNumericValue(charArray[i]);
+		}
+	
+		for (int i = number.length - 2; i > -1; i -= 2) {
+			number[i] *= 2;
+	
+			if (number[i] > 9)
+				number[i] -= 9;
+		}
+	
+		for (int i = 0; i < number.length; i++)
+			total += number[i];
+	
+		if (total % 10 != 0) {
+			ServiceException ex = new ServiceException(ServiceException.EXCEPTION_VALIDATION,"Invalid card number","messages.error.creditcard.number");
+			throw ex;
+		}
+	
+	}
+
+
+	
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/payments/service/TransactionService.java b/sm-core/src/main/java/com/salesmanager/core/business/payments/service/TransactionService.java
new file mode 100644
index 0000000..c8ba2ff
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/payments/service/TransactionService.java
@@ -0,0 +1,27 @@
+package com.salesmanager.core.business.payments.service;
+
+import java.util.List;
+
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityService;
+import com.salesmanager.core.business.order.model.Order;
+import com.salesmanager.core.business.payments.model.Transaction;
+
+
+public interface TransactionService extends SalesManagerEntityService<Long, Transaction> {
+
+	/**
+	 * Obtain a previous transaction that has type authorize for a give order
+	 * @param order
+	 * @return
+	 * @throws ServiceException
+	 */
+	Transaction getCapturableTransaction(Order order) throws ServiceException;
+
+	Transaction getRefundableTransaction(Order order) throws ServiceException;
+
+	List<Transaction> listTransactions(Order order) throws ServiceException;
+
+
+
+}
\ No newline at end of file

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/payments/service/TransactionServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/payments/service/TransactionServiceImpl.java
new file mode 100644
index 0000000..c8ffa31
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/payments/service/TransactionServiceImpl.java
@@ -0,0 +1,157 @@
+package com.salesmanager.core.business.payments.service;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.codehaus.jackson.map.ObjectMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.mysql.jdbc.log.Log;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityServiceImpl;
+import com.salesmanager.core.business.order.model.Order;
+import com.salesmanager.core.business.payments.dao.TransactionDao;
+import com.salesmanager.core.business.payments.model.Transaction;
+import com.salesmanager.core.business.payments.model.TransactionType;
+
+@Service("transactionService")
+public class TransactionServiceImpl  extends SalesManagerEntityServiceImpl<Long, Transaction> implements TransactionService {
+	
+
+	TransactionDao transactionDao;
+	
+	@Autowired
+	public TransactionServiceImpl(TransactionDao transactionDao) {
+		super(transactionDao);
+		this.transactionDao = transactionDao;
+	}
+	
+	@Override
+	public void create(Transaction transaction) throws ServiceException {
+		
+		//parse JSON string
+		String transactionDetails = transaction.toJSONString();
+		if(!StringUtils.isBlank(transactionDetails)) {
+			transaction.setDetails(transactionDetails);
+		}
+		
+		super.create(transaction);
+		
+		
+	}
+	
+	@Override
+	public List<Transaction> listTransactions(Order order) throws ServiceException {
+		
+		List<Transaction> transactions = transactionDao.listByOrder(order);
+		ObjectMapper mapper = new ObjectMapper();
+		for(Transaction transaction : transactions) {
+				if(!StringUtils.isBlank(transaction.getDetails())) {
+					try {
+						@SuppressWarnings("unchecked")
+						Map<String,String> objects = mapper.readValue(transaction.getDetails(), Map.class);
+						transaction.setTransactionDetails(objects);
+					} catch (Exception e) {
+						throw new ServiceException(e);
+					}
+				}
+		}
+		
+		return transactions;
+	}
+
+	@Override
+	public Transaction getCapturableTransaction(Order order)
+			throws ServiceException {
+		List<Transaction> transactions = transactionDao.listByOrder(order);
+		ObjectMapper mapper = new ObjectMapper();
+		Transaction capturable = null;
+		for(Transaction transaction : transactions) {
+			if(transaction.getTransactionType().name().equals(TransactionType.AUTHORIZE.name())) {
+				if(!StringUtils.isBlank(transaction.getDetails())) {
+					try {
+						@SuppressWarnings("unchecked")
+						Map<String,String> objects = mapper.readValue(transaction.getDetails(), Map.class);
+						transaction.setTransactionDetails(objects);
+						capturable = transaction;
+					} catch (Exception e) {
+						throw new ServiceException(e);
+					}
+				}
+			}
+			if(transaction.getTransactionType().name().equals(TransactionType.CAPTURE.name())) {
+				break;
+			}
+			if(transaction.getTransactionType().name().equals(TransactionType.REFUND.name())) {
+				break;
+			}
+		}
+		
+		return capturable;
+	}
+	
+	@Override
+	public Transaction getRefundableTransaction(Order order)
+		throws ServiceException {
+		List<Transaction> transactions = transactionDao.listByOrder(order);
+		Map<String,Transaction> finalTransactions = new HashMap<String,Transaction>();
+		Transaction finalTransaction = null;
+		for(Transaction transaction : transactions) {
+			//System.out.println("Transaction type " + transaction.getTransactionType().name());
+			if(transaction.getTransactionType().name().equals(TransactionType.AUTHORIZECAPTURE.name())) {
+				finalTransactions.put(TransactionType.AUTHORIZECAPTURE.name(),transaction);
+				continue;
+			}
+			if(transaction.getTransactionType().name().equals(TransactionType.CAPTURE.name())) {
+				finalTransactions.put(TransactionType.CAPTURE.name(),transaction);
+				continue;
+			}
+			if(transaction.getTransactionType().name().equals(TransactionType.REFUND.name())) {
+				//check transaction id
+				Transaction previousRefund = finalTransactions.get(TransactionType.REFUND.name());
+				if(previousRefund!=null) {
+					Date previousDate = previousRefund.getTransactionDate();
+					Date currentDate = transaction.getTransactionDate();
+					if(previousDate.before(currentDate)) {
+						finalTransactions.put(TransactionType.REFUND.name(),transaction);
+						continue;
+					}
+				} else {
+					finalTransactions.put(TransactionType.REFUND.name(),transaction);
+					continue;
+				}
+			}
+		}
+		
+		if(finalTransactions.containsKey(TransactionType.AUTHORIZECAPTURE.name())) {
+			finalTransaction = finalTransactions.get(TransactionType.AUTHORIZECAPTURE.name());
+		}
+		
+		if(finalTransactions.containsKey(TransactionType.CAPTURE.name())) {
+			finalTransaction = finalTransactions.get(TransactionType.CAPTURE.name());
+		}
+		
+		//if(finalTransactions.containsKey(TransactionType.REFUND.name())) {
+		//	finalTransaction = finalTransactions.get(TransactionType.REFUND.name());
+		//}
+
+		
+		if(finalTransaction!=null && !StringUtils.isBlank(finalTransaction.getDetails())) {
+			try {
+				ObjectMapper mapper = new ObjectMapper();
+				@SuppressWarnings("unchecked")
+				Map<String,String> objects = mapper.readValue(finalTransaction.getDetails(), Map.class);
+				finalTransaction.setTransactionDetails(objects);
+			} catch (Exception e) {
+				throw new ServiceException(e);
+			}
+		}
+		
+		return finalTransaction;
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/reference/country/dao/CountryDao.java b/sm-core/src/main/java/com/salesmanager/core/business/reference/country/dao/CountryDao.java
new file mode 100644
index 0000000..44ddfc6
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/reference/country/dao/CountryDao.java
@@ -0,0 +1,12 @@
+package com.salesmanager.core.business.reference.country.dao;
+
+import java.util.List;
+
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDao;
+import com.salesmanager.core.business.reference.country.model.Country;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+public interface CountryDao extends SalesManagerEntityDao<Integer,Country> {
+
+	public List<Country> listByLanguage(Language language);
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/reference/country/dao/CountryDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/reference/country/dao/CountryDaoImpl.java
new file mode 100644
index 0000000..42b76c9
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/reference/country/dao/CountryDaoImpl.java
@@ -0,0 +1,36 @@
+package com.salesmanager.core.business.reference.country.dao;
+
+import java.util.List;
+
+import org.springframework.stereotype.Repository;
+
+import com.mysema.query.jpa.JPQLQuery;
+import com.mysema.query.jpa.impl.JPAQuery;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDaoImpl;
+import com.salesmanager.core.business.reference.country.model.Country;
+import com.salesmanager.core.business.reference.country.model.QCountry;
+import com.salesmanager.core.business.reference.country.model.QCountryDescription;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+@Repository("countryDao")
+public class CountryDaoImpl extends SalesManagerEntityDaoImpl<Integer, Country> implements CountryDao {
+
+	
+	@Override
+	public List<Country> listByLanguage(Language language) {
+		QCountry qCountry = QCountry.country;
+		QCountryDescription qDescription = QCountryDescription.countryDescription;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qCountry)
+			.leftJoin(qCountry.descriptions, qDescription).fetch()
+			.where(qDescription.language.id.eq(language.getId()))
+			.orderBy(qDescription.name.asc());
+		
+
+		
+		List<Country> countries = query.list(qCountry);
+		return countries;
+	}
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/reference/country/model/Country.java b/sm-core/src/main/java/com/salesmanager/core/business/reference/country/model/Country.java
new file mode 100644
index 0000000..6be29db
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/reference/country/model/Country.java
@@ -0,0 +1,130 @@
+package com.salesmanager.core.business.reference.country.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.persistence.Cacheable;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+import javax.persistence.Transient;
+
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.business.reference.geozone.model.GeoZone;
+import com.salesmanager.core.business.reference.zone.model.Zone;
+import com.salesmanager.core.constants.SchemaConstant;
+
+@Entity
+@Table(name = "COUNTRY", schema=SchemaConstant.SALESMANAGER_SCHEMA)
+@Cacheable
+public class Country extends SalesManagerEntity<Integer, Country> {
+	private static final long serialVersionUID = -7388011537255588035L;
+
+	@Id
+	@Column(name="COUNTRY_ID")
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT",
+	pkColumnValue = "COUNTRY_SEQ_NEXT_VAL")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Integer id;
+	
+	@OneToMany(mappedBy = "country", cascade = CascadeType.ALL)
+	private List<CountryDescription> descriptions = new ArrayList<CountryDescription>();
+	
+	@OneToMany(mappedBy = "country")
+	private List<Zone> zones = new ArrayList<Zone>();
+	
+	@ManyToOne(targetEntity = GeoZone.class)
+	@JoinColumn(name = "GEOZONE_ID")
+	private GeoZone geoZone;
+	
+	@Column(name = "COUNTRY_SUPPORTED")
+	private boolean supported = true;
+	
+	@Column(name = "COUNTRY_ISOCODE", unique=true, nullable = false)
+	private String isoCode;
+	
+	@Transient
+	private String name;
+	
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public Country() {
+	}
+	
+	public Country(String isoCode) {
+		this.setIsoCode(isoCode);
+	}
+	
+	public boolean getSupported() {
+		return supported;
+	}
+
+	public void setSupported(boolean supported) {
+		this.supported = supported;
+	}
+
+	public String getIsoCode() {
+		return isoCode;
+	}
+
+	public void setIsoCode(String isoCode) {
+		this.isoCode = isoCode;
+	}
+
+
+	@Override
+	public Integer getId() {
+		return id;
+	}
+
+	@Override
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public List<Zone> getZones() {
+		return zones;
+	}
+
+	public void setZones(List<Zone> zones) {
+		this.zones = zones;
+	}
+
+	public List<CountryDescription> getDescriptions() {
+		return descriptions;
+	}
+
+	public void setDescriptions(List<CountryDescription> descriptions) {
+		this.descriptions = descriptions;
+	}
+
+	public GeoZone getGeoZone() {
+		return geoZone;
+	}
+
+	public void setGeoZone(GeoZone geoZone) {
+		this.geoZone = geoZone;
+	}
+
+/*	public GeoZone getGeoZone() {
+		return geoZone;
+	}
+
+	public void setGeoZone(GeoZone geoZone) {
+		this.geoZone = geoZone;
+	}*/
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/reference/country/model/CountryDescription.java b/sm-core/src/main/java/com/salesmanager/core/business/reference/country/model/CountryDescription.java
new file mode 100644
index 0000000..c63c039
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/reference/country/model/CountryDescription.java
@@ -0,0 +1,43 @@
+package com.salesmanager.core.business.reference.country.model;
+
+import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
+
+import com.salesmanager.core.business.common.model.Description;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+@Entity
+@Table(name = "COUNTRY_DESCRIPTION", schema="SALESMANAGER", uniqueConstraints={
+	@UniqueConstraint(columnNames={
+			"COUNTRY_ID",
+			"LANGUAGE_ID"
+		})
+	}
+)
+public class CountryDescription extends Description {
+	private static final long serialVersionUID = 9048940117896071174L;
+	
+	@ManyToOne(targetEntity = Country.class)
+	@JoinColumn(name = "COUNTRY_ID", nullable = false)
+	private Country country;
+	
+	public CountryDescription() {
+	}
+	
+	public CountryDescription(Language language, String name) {
+		this.setLanguage(language);
+		this.setName(name);
+	}
+	
+	public Country getCountry() {
+		return country;
+	}
+
+	public void setCountry(Country country) {
+		this.country = country;
+	}
+	
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/reference/country/service/CountryService.java b/sm-core/src/main/java/com/salesmanager/core/business/reference/country/service/CountryService.java
new file mode 100644
index 0000000..09733a3
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/reference/country/service/CountryService.java
@@ -0,0 +1,25 @@
+package com.salesmanager.core.business.reference.country.service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityService;
+import com.salesmanager.core.business.reference.country.model.Country;
+import com.salesmanager.core.business.reference.country.model.CountryDescription;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+public interface CountryService extends SalesManagerEntityService<Integer, Country> {
+
+	public Country getByCode(String code) throws ServiceException;
+	
+	public void addCountryDescription(Country country, CountryDescription description) throws ServiceException;
+
+	public List<Country> getCountries(Language language) throws ServiceException;
+
+	Map<String, Country> getCountriesMap(Language language)
+			throws ServiceException;
+
+	List<Country> getCountries(List<String> isoCodes, Language language)
+			throws ServiceException;
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/reference/country/service/CountryServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/reference/country/service/CountryServiceImpl.java
new file mode 100644
index 0000000..c67609b
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/reference/country/service/CountryServiceImpl.java
@@ -0,0 +1,125 @@
+package com.salesmanager.core.business.reference.country.service;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityServiceImpl;
+import com.salesmanager.core.business.reference.country.dao.CountryDao;
+import com.salesmanager.core.business.reference.country.model.Country;
+import com.salesmanager.core.business.reference.country.model.CountryDescription;
+import com.salesmanager.core.business.reference.country.model.Country_;
+import com.salesmanager.core.business.reference.language.model.Language;
+import com.salesmanager.core.utils.CacheUtils;
+
+@Service("countryService")
+public class CountryServiceImpl extends SalesManagerEntityServiceImpl<Integer, Country>
+		implements CountryService {
+	
+	private static final Logger LOGGER = LoggerFactory.getLogger(CountryServiceImpl.class);
+	
+	private CountryDao countryDao;
+	
+	@Autowired
+	private CacheUtils cache;
+
+	
+	@Autowired
+	public CountryServiceImpl(CountryDao countryDao) {
+		super(countryDao);
+		this.countryDao = countryDao;
+	}
+	
+	public Country getByCode(String code) throws ServiceException {
+		return countryDao.getByField(Country_.isoCode, code);
+	}
+
+	@Override
+	public void addCountryDescription(Country country, CountryDescription description) throws ServiceException {
+		country.getDescriptions().add(description);
+		description.setCountry(country);
+		update(country);
+	}
+	
+	@Override
+	public Map<String,Country> getCountriesMap(Language language) throws ServiceException {
+		
+		List<Country> countries = this.getCountries(language);
+		
+		Map<String,Country> returnMap = new LinkedHashMap<String,Country>();
+		
+		for(Country country : countries) {
+			returnMap.put(country.getIsoCode(), country);
+		}
+		
+		return returnMap;
+	}
+	
+	
+	@Override
+	public List<Country> getCountries(final List<String> isoCodes, final Language language) throws ServiceException {
+		List<Country> countryList = getCountries(language);
+		List<Country> requestedCountryList = new ArrayList<Country>();
+		if(!CollectionUtils.isEmpty(countryList)) {
+			for(Country c : countryList) {
+				if(isoCodes.contains(c.getIsoCode())) {
+					requestedCountryList.add(c);
+				}
+			}
+		}
+		return requestedCountryList;
+	}
+	
+	
+	@SuppressWarnings("unchecked")
+	@Override
+	public List<Country> getCountries(Language language) throws ServiceException {
+		
+		List<Country> countries = null;
+		try {
+			
+			//CacheUtils cacheUtils = CacheUtils.getInstance();
+			
+			countries = (List<Country>) cache.getFromCache("COUNTRIES_" + language.getCode());
+
+		
+		
+			if(countries==null) {
+			
+				countries = countryDao.listByLanguage(language);
+			
+				//set names
+				for(Country country : countries) {
+					
+					CountryDescription description = country.getDescriptions().get(0);
+					country.setName(description.getName());
+					
+				}
+				
+				cache.putInCache(countries, "COUNTRIES_" + language.getCode());
+				
+			}
+			
+			
+		
+		
+		
+		} catch (Exception e) {
+			LOGGER.error("getCountries()", e);
+		}
+		
+		return countries;
+		
+		
+	}
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/reference/currency/dao/CurrencyDao.java b/sm-core/src/main/java/com/salesmanager/core/business/reference/currency/dao/CurrencyDao.java
new file mode 100644
index 0000000..67ae75a
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/reference/currency/dao/CurrencyDao.java
@@ -0,0 +1,8 @@
+package com.salesmanager.core.business.reference.currency.dao;
+
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDao;
+import com.salesmanager.core.business.reference.currency.model.Currency;
+
+public interface CurrencyDao extends SalesManagerEntityDao<Long, Currency> {
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/reference/currency/dao/CurrencyDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/reference/currency/dao/CurrencyDaoImpl.java
new file mode 100644
index 0000000..7118fe5
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/reference/currency/dao/CurrencyDaoImpl.java
@@ -0,0 +1,35 @@
+package com.salesmanager.core.business.reference.currency.dao;
+
+import java.util.List;
+
+import org.springframework.stereotype.Repository;
+
+import com.mysema.query.jpa.JPQLQuery;
+import com.mysema.query.jpa.impl.JPAQuery;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDaoImpl;
+import com.salesmanager.core.business.reference.currency.model.Currency;
+import com.salesmanager.core.business.reference.currency.model.QCurrency;
+
+@Repository("currencyDao")
+public class CurrencyDaoImpl extends SalesManagerEntityDaoImpl<Long, Currency> 
+	implements CurrencyDao {
+
+	
+	@Override
+	public List<Currency> list() {
+		QCurrency qCurrency = QCurrency.currency1;
+
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qCurrency)
+			.orderBy(qCurrency.code.asc());
+		
+
+		
+		List<Currency> currencies = query.list(qCurrency);
+		return currencies;
+	}
+	
+	
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/reference/currency/model/Currency.java b/sm-core/src/main/java/com/salesmanager/core/business/reference/currency/model/Currency.java
new file mode 100644
index 0000000..0e1912c
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/reference/currency/model/Currency.java
@@ -0,0 +1,90 @@
+package com.salesmanager.core.business.reference.currency.model;
+
+import java.io.Serializable;
+
+import javax.persistence.Cacheable;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.constants.SchemaConstant;
+
+@Entity
+@Table(name = "CURRENCY", schema = SchemaConstant.SALESMANAGER_SCHEMA)
+@Cacheable
+public class Currency extends SalesManagerEntity<Long, Currency> implements Serializable {
+	private static final long serialVersionUID = -999926410367685145L;
+	
+	@Id
+	@Column(name = "CURRENCY_ID")
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT", pkColumnValue = "CURRENCY_SEQ_NEXT_VAL")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Long id;
+	
+	@Column(name = "CURRENCY_CURRENCY_CODE" ,nullable = false, unique = true)
+	private java.util.Currency currency;
+	
+	@Column(name = "CURRENCY_SUPPORTED")
+	private Boolean supported = true;
+	
+	@Column(name = "CURRENCY_CODE", unique = true)
+	private String code;
+	
+	@Column(name = "CURRENCY_NAME", unique = true)
+	private String name;
+	
+	public Currency() {
+	}
+	
+	@Override
+	public Long getId() {
+		return id;
+	}
+
+	@Override
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public java.util.Currency getCurrency() {
+		return currency;
+	}
+
+	public void setCurrency(java.util.Currency currency) {
+		this.currency = currency;
+		this.code = currency.getCurrencyCode();
+	}
+
+	public Boolean getSupported() {
+		return supported;
+	}
+
+	public void setSupported(Boolean supported) {
+		this.supported = supported;
+	}
+	
+	public String getCode() {
+		if (currency.getCurrencyCode() != code) {
+			return currency.getCurrencyCode();
+		}
+		return code;
+	}
+	
+	public String getSymbol() {
+		return currency.getSymbol();
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/reference/currency/service/CurrencyService.java b/sm-core/src/main/java/com/salesmanager/core/business/reference/currency/service/CurrencyService.java
new file mode 100644
index 0000000..c7796bc
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/reference/currency/service/CurrencyService.java
@@ -0,0 +1,10 @@
+package com.salesmanager.core.business.reference.currency.service;
+
+import com.salesmanager.core.business.generic.service.SalesManagerEntityService;
+import com.salesmanager.core.business.reference.currency.model.Currency;
+
+public interface CurrencyService extends SalesManagerEntityService<Long, Currency> {
+
+	Currency getByCode(String code);
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/reference/currency/service/CurrencyServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/reference/currency/service/CurrencyServiceImpl.java
new file mode 100644
index 0000000..870cf4a
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/reference/currency/service/CurrencyServiceImpl.java
@@ -0,0 +1,25 @@
+package com.salesmanager.core.business.reference.currency.service;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.salesmanager.core.business.generic.service.SalesManagerEntityServiceImpl;
+import com.salesmanager.core.business.reference.currency.dao.CurrencyDao;
+import com.salesmanager.core.business.reference.currency.model.Currency;
+import com.salesmanager.core.business.reference.currency.model.Currency_;
+
+@Service("currencyService")
+public class CurrencyServiceImpl extends SalesManagerEntityServiceImpl<Long, Currency>
+	implements CurrencyService {
+	
+	@Autowired
+	public CurrencyServiceImpl(CurrencyDao currencyDao) {
+		super(currencyDao);
+	}
+	
+	@Override
+	public Currency getByCode(String code) {
+		return getByField(Currency_.code, code);
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/reference/geozone/model/GeoZone.java b/sm-core/src/main/java/com/salesmanager/core/business/reference/geozone/model/GeoZone.java
new file mode 100644
index 0000000..f957d1d
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/reference/geozone/model/GeoZone.java
@@ -0,0 +1,92 @@
+package com.salesmanager.core.business.reference.geozone.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.business.reference.country.model.Country;
+
+@Entity
+@Table(name = "GEOZONE", schema="SALESMANAGER")
+// TODO : create DAO / Service
+public class GeoZone extends SalesManagerEntity<Long, GeoZone> {
+	private static final long serialVersionUID = -5992008645857938825L;
+	
+	@Id
+	@Column(name = "GEOZONE_ID")
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT", pkColumnValue = "GEOZONE_SEQ_NEXT_VAL")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Long id;
+	
+	@OneToMany(mappedBy = "geoZone", cascade = CascadeType.ALL)
+	private List<GeoZoneDescription> descriptions = new ArrayList<GeoZoneDescription>();
+	
+	@OneToMany(mappedBy = "geoZone", targetEntity = Country.class)
+	private List<Country> countries = new ArrayList<Country>();
+	
+
+	
+	@Column(name = "GEOZONE_NAME")
+	private String name;
+	
+	@Column(name = "GEOZONE_CODE")
+	private String code;
+	
+	public GeoZone() {
+	}
+
+	@Override
+	public Long getId() {
+		return id;
+	}
+
+	@Override
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public List<Country> getCountries() {
+		return countries;
+	}
+
+	public void setCountries(List<Country> countries) {
+		this.countries = countries;
+	}
+
+	public List<GeoZoneDescription> getDescriptions() {
+		return descriptions;
+	}
+
+	public void setDescriptions(List<GeoZoneDescription> descriptions) {
+		this.descriptions = descriptions;
+	}
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/reference/geozone/model/GeoZoneDescription.java b/sm-core/src/main/java/com/salesmanager/core/business/reference/geozone/model/GeoZoneDescription.java
new file mode 100644
index 0000000..15925b6
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/reference/geozone/model/GeoZoneDescription.java
@@ -0,0 +1,36 @@
+package com.salesmanager.core.business.reference.geozone.model;
+
+import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
+
+import com.salesmanager.core.business.common.model.Description;
+
+@Entity
+@Table(name="GEOZONE_DESCRIPTION", schema="SALESMANAGER", uniqueConstraints={
+		@UniqueConstraint(columnNames={
+			"GEOZONE_ID",
+			"LANGUAGE_ID"
+		})
+	}
+)
+public class GeoZoneDescription extends Description {
+	private static final long serialVersionUID = 7759498146450786218L;
+	
+	@ManyToOne(targetEntity = GeoZone.class)
+	@JoinColumn(name = "GEOZONE_ID")
+	private GeoZone geoZone;
+	
+	public GeoZoneDescription() {
+	}
+
+	public GeoZone getGeoZone() {
+		return geoZone;
+	}
+
+	public void setGeoZone(GeoZone geoZone) {
+		this.geoZone = geoZone;
+	}
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/reference/init/service/InitializationDatabase.java b/sm-core/src/main/java/com/salesmanager/core/business/reference/init/service/InitializationDatabase.java
new file mode 100644
index 0000000..7c6266f
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/reference/init/service/InitializationDatabase.java
@@ -0,0 +1,11 @@
+package com.salesmanager.core.business.reference.init.service;
+
+import com.salesmanager.core.business.generic.exception.ServiceException;
+
+public interface InitializationDatabase {
+	
+	boolean isEmpty();
+	
+	void populate(String name) throws ServiceException;
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/reference/init/service/InitializationDatabaseImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/reference/init/service/InitializationDatabaseImpl.java
new file mode 100644
index 0000000..1f7c3f0
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/reference/init/service/InitializationDatabaseImpl.java
@@ -0,0 +1,269 @@
+package com.salesmanager.core.business.reference.init.service;
+
+import java.sql.Date;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.salesmanager.core.business.catalog.product.model.type.ProductType;
+import com.salesmanager.core.business.catalog.product.service.type.ProductTypeService;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.merchant.service.MerchantStoreService;
+import com.salesmanager.core.business.reference.country.model.Country;
+import com.salesmanager.core.business.reference.country.model.CountryDescription;
+import com.salesmanager.core.business.reference.country.service.CountryService;
+import com.salesmanager.core.business.reference.currency.model.Currency;
+import com.salesmanager.core.business.reference.currency.service.CurrencyService;
+import com.salesmanager.core.business.reference.language.model.Language;
+import com.salesmanager.core.business.reference.language.service.LanguageService;
+import com.salesmanager.core.business.reference.zone.model.Zone;
+import com.salesmanager.core.business.reference.zone.model.ZoneDescription;
+import com.salesmanager.core.business.reference.zone.service.ZoneService;
+import com.salesmanager.core.business.system.model.IntegrationModule;
+import com.salesmanager.core.business.system.service.ModuleConfigurationService;
+import com.salesmanager.core.business.tax.model.taxclass.TaxClass;
+import com.salesmanager.core.business.tax.service.TaxClassService;
+import com.salesmanager.core.constants.SchemaConstant;
+import com.salesmanager.core.utils.reference.IntegrationModulesLoader;
+import com.salesmanager.core.utils.reference.ZonesLoader;
+
+@Service("initializationDatabase")
+public class InitializationDatabaseImpl implements InitializationDatabase {
+	
+	private static final Logger LOGGER = LoggerFactory.getLogger(InitializationDatabaseImpl.class);
+	
+
+	
+	@Autowired
+	private ZoneService zoneService;
+	
+	@Autowired
+	private LanguageService languageService;
+	
+	@Autowired
+	private CountryService countryService;
+	
+	@Autowired
+	private CurrencyService currencyService;
+	
+	@Autowired
+	protected MerchantStoreService merchantService;
+		
+	@Autowired
+	protected ProductTypeService productTypeService;
+	
+	@Autowired
+	private TaxClassService taxClassService;
+	
+	@Autowired
+	private ZonesLoader zonesLoader;
+	
+	@Autowired
+	private IntegrationModulesLoader modulesLoader;
+	
+	@Autowired
+	private ModuleConfigurationService moduleConfigurationService;
+	
+
+	
+	private String name;
+	
+	public boolean isEmpty() {
+		return languageService.count() == 0;
+	}
+	
+	@Transactional
+	public void populate(String contextName) throws ServiceException {
+		this.name =  contextName;
+		
+		createLanguages();
+		createCountries();
+		createZones();
+		createCurrencies();
+		createSubReferences();
+		createModules();
+		createMerchant();
+
+
+	}
+	
+
+
+	private void createCurrencies() throws ServiceException {
+		LOGGER.info(String.format("%s : Populating Currencies ", name));
+
+		//Locale [] locales = Locale.getAvailableLocales();
+		//Locale l = locales[0];
+		
+		for (String code : SchemaConstant.CURRENCY_MAP.keySet()) {
+
+		      
+            try {
+            	java.util.Currency c = java.util.Currency.getInstance(code);
+            	
+            	if(c==null) {
+            		LOGGER.info(String.format("%s : Populating Currencies : no currency for code : %s", name, code));
+            	}
+            	
+            		//check if it exist
+            		
+	            	Currency currency = new Currency();
+	            	currency.setName(c.getCurrencyCode());
+	            	currency.setCurrency(c);
+	            	currencyService.create(currency);
+
+            //System.out.println(l.getCountry() + "   " + c.getSymbol() + "  " + c.getSymbol(l));
+            } catch (IllegalArgumentException e) {
+            	LOGGER.info(String.format("%s : Populating Currencies : no currency for code : %s", name, code));
+            }
+        }  
+	}
+
+	private void createCountries() throws ServiceException {
+		LOGGER.info(String.format("%s : Populating Countries ", name));
+		List<Language> languages = languageService.list();
+		for(String code : SchemaConstant.COUNTRY_ISO_CODE) {
+			Locale locale = SchemaConstant.LOCALES.get(code);
+			if (locale != null) {
+				Country country = new Country(code);
+				countryService.create(country);
+				
+				for (Language language : languages) {
+					String name = locale.getDisplayCountry(new Locale(language.getCode()));
+					CountryDescription description = new CountryDescription(language, name);
+					countryService.addCountryDescription(country, description);
+				}
+			}
+		}
+	}
+	
+	private void createZones() throws ServiceException {
+		LOGGER.info(String.format("%s : Populating Zones ", name));
+        try {
+
+    		  Map<String,Zone> zonesMap = new HashMap<String,Zone>();
+    		  zonesMap = zonesLoader.loadZones("reference/zoneconfig.json");
+              
+              for (Map.Entry<String, Zone> entry : zonesMap.entrySet()) {
+            	    String key = entry.getKey();
+            	    Zone value = entry.getValue();
+            	    if(value.getDescriptions()==null) {
+            	    	LOGGER.warn("This zone " + key + " has no descriptions");
+            	    	continue;
+            	    }
+            	    
+            	    List<ZoneDescription> zoneDescriptions = value.getDescriptions();
+            	    value.setDescriptons(null);
+
+            	    zoneService.create(value);
+            	    
+            	    for(ZoneDescription description : zoneDescriptions) {
+            	    	description.setZone(value);
+            	    	zoneService.addDescription(value, description);
+            	    }
+              }
+
+  		} catch (Exception e) {
+  		    
+  			throw new ServiceException(e);
+  		}
+
+	}
+
+	private void createLanguages() throws ServiceException {
+		LOGGER.info(String.format("%s : Populating Languages ", name));
+		for(String code : SchemaConstant.LANGUAGE_ISO_CODE) {
+			Language language = new Language(code);
+			languageService.create(language);
+		}
+	}
+	
+	private void createMerchant() throws ServiceException {
+		LOGGER.info(String.format("%s : Creating merchant ", name));
+		
+		Date date = new Date(System.currentTimeMillis());
+		
+		Language en = languageService.getByCode("en");
+		Country ca = countryService.getByCode("CA");
+		Currency currency = currencyService.getByCode("CAD");
+		Zone qc = zoneService.getByCode("QC");
+		
+		List<Language> supportedLanguages = new ArrayList<Language>();
+		supportedLanguages.add(en);
+		
+		//create a merchant
+		MerchantStore store = new MerchantStore();
+		store.setCountry(ca);
+		store.setCurrency(currency);
+		store.setDefaultLanguage(en);
+		store.setInBusinessSince(date);
+		store.setZone(qc);
+		store.setStorename("Default store");
+		store.setStorephone("888-888-8888");
+		store.setCode(MerchantStore.DEFAULT_STORE);
+		store.setStorecity("My city");
+		store.setStoreaddress("1234 Street address");
+		store.setStorepostalcode("H2H-2H2");
+		store.setStoreEmailAddress("test@test.com");
+		store.setDomainName("localhost:8080");
+		store.setStoreTemplate("bootstrap");
+		store.setLanguages(supportedLanguages);
+		
+		merchantService.create(store);
+		
+		
+		TaxClass taxclass = new TaxClass(TaxClass.DEFAULT_TAX_CLASS);
+		taxclass.setMerchantStore(store);
+		
+		taxClassService.create(taxclass);
+		
+		
+	}
+
+	private void createModules() throws ServiceException {
+		
+		try {
+			
+			List<IntegrationModule> modules = modulesLoader.loadIntegrationModules("reference/integrationmodules.json");
+            for (IntegrationModule entry : modules) {
+        	    moduleConfigurationService.create(entry);
+          }
+			
+			
+		} catch (Exception e) {
+			throw new ServiceException(e);
+		}
+		
+		
+	}
+	
+	private void createSubReferences() throws ServiceException {
+		
+		LOGGER.info(String.format("%s : Loading catalog sub references ", name));
+		
+
+		
+		ProductType productType = new ProductType();
+		productType.setCode(ProductType.GENERAL_TYPE);
+		productTypeService.create(productType);
+
+
+		
+		
+	}
+	
+
+	
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/reference/language/dao/LanguageDao.java b/sm-core/src/main/java/com/salesmanager/core/business/reference/language/dao/LanguageDao.java
new file mode 100644
index 0000000..fc0ff60
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/reference/language/dao/LanguageDao.java
@@ -0,0 +1,7 @@
+package com.salesmanager.core.business.reference.language.dao;
+
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDao;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+public interface LanguageDao extends SalesManagerEntityDao<Integer, Language> {
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/reference/language/dao/LanguageDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/reference/language/dao/LanguageDaoImpl.java
new file mode 100644
index 0000000..b80df29
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/reference/language/dao/LanguageDaoImpl.java
@@ -0,0 +1,10 @@
+package com.salesmanager.core.business.reference.language.dao;
+
+import org.springframework.stereotype.Repository;
+
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDaoImpl;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+@Repository("languageDao")
+public class LanguageDaoImpl extends SalesManagerEntityDaoImpl<Integer, Language> implements LanguageDao {
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/reference/language/model/Language.java b/sm-core/src/main/java/com/salesmanager/core/business/reference/language/model/Language.java
new file mode 100644
index 0000000..d359f59
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/reference/language/model/Language.java
@@ -0,0 +1,114 @@
+package com.salesmanager.core.business.reference.language.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.persistence.Cacheable;
+import javax.persistence.Column;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+
+import com.salesmanager.core.business.common.model.audit.AuditListener;
+import com.salesmanager.core.business.common.model.audit.AuditSection;
+import com.salesmanager.core.business.common.model.audit.Auditable;
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.constants.SchemaConstant;
+
+@Entity
+@EntityListeners(value = AuditListener.class)
+@Table(name = "LANGUAGE", schema=SchemaConstant.SALESMANAGER_SCHEMA)
+@Cacheable
+public class Language extends SalesManagerEntity<Integer, Language> implements Auditable {
+	private static final long serialVersionUID = -7676627812941330669L;
+	
+
+	
+	@Id
+	@Column(name="LANGUAGE_ID")
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT",
+	pkColumnValue = "LANG_SEQ_NEXT_VAL")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Integer id;
+	
+	@Embedded
+	private AuditSection auditSection = new AuditSection();
+
+	@Column(name="CODE", nullable = false)
+	private String code;
+	
+	@Column(name="SORT_ORDER")
+	private Integer sortOrder;
+	
+	@SuppressWarnings("unused")
+	@OneToMany(mappedBy = "defaultLanguage", targetEntity = MerchantStore.class)
+	private List<MerchantStore> storesDefaultLanguage;
+	
+	@SuppressWarnings("unused")
+	@ManyToMany(mappedBy = "languages", targetEntity = MerchantStore.class)
+	private List<MerchantStore> stores = new ArrayList<MerchantStore>();
+	
+	public Language() {
+	}
+	
+	public Language(String code) {
+		this.setCode(code);
+	}
+	
+	@Override
+	public Integer getId() {
+		return id;
+	}
+	
+	@Override
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public Integer getSortOrder() {
+		return sortOrder;
+	}
+
+	public void setSortOrder(Integer sortOrder) {
+		this.sortOrder = sortOrder;
+	}
+	
+	@Override
+	public AuditSection getAuditSection() {
+		return auditSection;
+	}
+	
+	@Override
+	public void setAuditSection(AuditSection auditSection) {
+		this.auditSection = auditSection;
+	}
+	
+	@Override
+	public boolean equals(Object obj) {
+		if (null == obj)
+			return false;
+		if (!(obj instanceof Language)) {
+			return false;
+		} else {
+			Language language = (Language) obj;
+			return (this.id == language.getId());
+		}
+	}
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/reference/language/service/LanguageService.java b/sm-core/src/main/java/com/salesmanager/core/business/reference/language/service/LanguageService.java
new file mode 100644
index 0000000..6296660
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/reference/language/service/LanguageService.java
@@ -0,0 +1,22 @@
+package com.salesmanager.core.business.reference.language.service;
+
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityService;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+public interface LanguageService extends SalesManagerEntityService<Integer, Language> {
+
+	Language getByCode(String code) throws ServiceException;
+
+	Map<String, Language> getLanguagesMap() throws ServiceException;
+
+	List<Language> getLanguages() throws ServiceException;
+
+	Locale toLocale(Language language);
+
+	Language toLanguage(Locale locale);
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/reference/language/service/LanguageServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/reference/language/service/LanguageServiceImpl.java
new file mode 100644
index 0000000..429ed17
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/reference/language/service/LanguageServiceImpl.java
@@ -0,0 +1,108 @@
+package com.salesmanager.core.business.reference.language.service;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityServiceImpl;
+import com.salesmanager.core.business.reference.language.dao.LanguageDao;
+import com.salesmanager.core.business.reference.language.model.Language;
+import com.salesmanager.core.business.reference.language.model.Language_;
+import com.salesmanager.core.utils.CacheUtils;
+
+@Service("languageService")
+public class LanguageServiceImpl extends SalesManagerEntityServiceImpl<Integer, Language>
+	implements LanguageService {
+	
+	private static final Logger LOGGER = LoggerFactory.getLogger(LanguageServiceImpl.class);
+	
+	@Autowired
+	private CacheUtils cache;
+	
+	@Autowired
+	public LanguageServiceImpl(LanguageDao languageDao) {
+		super(languageDao);
+	}
+	
+	@Override
+	public Language getByCode(String code) throws ServiceException {
+		return getByField(Language_.code, code);
+	}
+	
+	@Override
+	public Locale toLocale(Language language) {
+		return new Locale(language.getCode());
+	}
+	
+	@Override
+	public Language toLanguage(Locale locale) {
+		
+		try {
+			Language lang = getLanguagesMap().get(locale.getLanguage());
+			return lang;
+		} catch (Exception e) {
+			LOGGER.error("Cannot convert locale " + locale.getLanguage() + " to language");
+		}
+		
+		return null;
+
+	}
+	
+	@Override
+	public Map<String,Language> getLanguagesMap() throws ServiceException {
+		
+		List<Language> langs = this.getLanguages();
+
+		Map<String,Language> returnMap = new LinkedHashMap<String,Language>();
+		
+		for(Language lang : langs) {
+			
+			returnMap.put(lang.getCode(), lang);
+			
+		}
+		
+		return returnMap;
+		
+		
+	}
+	
+	
+	@Override
+	@SuppressWarnings("unchecked")
+	public List<Language> getLanguages() throws ServiceException {
+		
+		
+		List<Language> langs = null;
+		try {
+			
+			//CacheUtils cacheUtils = CacheUtils.getInstance();
+			
+			langs = (List<Language>) cache.getFromCache("LANGUAGES");
+
+		
+		
+			if(langs==null) {
+				langs = this.list();
+				cache.putInCache(langs, "LANGUAGES");
+			}
+			
+			
+		
+		
+		
+		} catch (Exception e) {
+			LOGGER.error("getCountries()", e);
+		}
+		
+		return langs;
+		
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/reference/zone/dao/ZoneDao.java b/sm-core/src/main/java/com/salesmanager/core/business/reference/zone/dao/ZoneDao.java
new file mode 100644
index 0000000..b0f1e0b
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/reference/zone/dao/ZoneDao.java
@@ -0,0 +1,17 @@
+package com.salesmanager.core.business.reference.zone.dao;
+
+import java.util.List;
+
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDao;
+import com.salesmanager.core.business.reference.country.model.Country;
+import com.salesmanager.core.business.reference.language.model.Language;
+import com.salesmanager.core.business.reference.zone.model.Zone;
+
+
+public interface ZoneDao extends SalesManagerEntityDao<Long,Zone> {
+
+	List<Zone> listByLanguageAndCountry(Country country, Language language);
+
+	List<Zone> listByLanguage(Language language);
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/reference/zone/dao/ZoneDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/reference/zone/dao/ZoneDaoImpl.java
new file mode 100644
index 0000000..9b48d28
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/reference/zone/dao/ZoneDaoImpl.java
@@ -0,0 +1,54 @@
+package com.salesmanager.core.business.reference.zone.dao;
+
+import java.util.List;
+
+import org.springframework.stereotype.Repository;
+
+import com.mysema.query.jpa.JPQLQuery;
+import com.mysema.query.jpa.impl.JPAQuery;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDaoImpl;
+import com.salesmanager.core.business.reference.country.model.Country;
+import com.salesmanager.core.business.reference.language.model.Language;
+import com.salesmanager.core.business.reference.zone.model.QZone;
+import com.salesmanager.core.business.reference.zone.model.QZoneDescription;
+import com.salesmanager.core.business.reference.zone.model.Zone;
+
+@Repository("zoneDao")
+public class ZoneDaoImpl extends SalesManagerEntityDaoImpl<Long, Zone> implements ZoneDao {
+	
+	@Override
+	public List<Zone> listByLanguageAndCountry(Country country, Language language) {
+		QZone qZone = QZone.zone;
+		QZoneDescription qDescription = QZoneDescription.zoneDescription;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qZone)
+			.leftJoin(qZone.descriptions, qDescription).fetch()
+			.where(qDescription.language.id.eq(language.getId())
+					.and(qZone.country.isoCode.eq(country.getIsoCode())))
+					.orderBy(qDescription.name.asc());
+		
+
+		
+		List<Zone> zones = query.list(qZone);
+		return zones;
+	}
+	
+	@Override
+	public List<Zone> listByLanguage(Language language) {
+		QZone qZone = QZone.zone;
+		QZoneDescription qDescription = QZoneDescription.zoneDescription;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qZone)
+			.leftJoin(qZone.descriptions, qDescription).fetch()
+			.where(qDescription.language.id.eq(language.getId()))
+					.orderBy(qDescription.name.asc());
+
+		List<Zone> zones = query.list(qZone);
+		return zones;
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/reference/zone/imports/ZoneLoader.java b/sm-core/src/main/java/com/salesmanager/core/business/reference/zone/imports/ZoneLoader.java
new file mode 100644
index 0000000..faf5221
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/reference/zone/imports/ZoneLoader.java
@@ -0,0 +1,31 @@
+package com.salesmanager.core.business.reference.zone.imports;
+
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.codehaus.jackson.map.ObjectMapper;
+import org.codehaus.jackson.type.TypeReference;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+public class ZoneLoader {
+	
+	private static final Logger LOGGER = LoggerFactory.getLogger(ZoneLoader.class);
+	
+	 public Map<String, List<ZoneTransient>> loadZoneConfigurations() {
+		
+		ObjectMapper mapper = new ObjectMapper();
+		InputStream in = this.getClass().getResourceAsStream("/reference/zoneconfig.json");
+		Map<String,List<ZoneTransient>> zoneConfigurations = new HashMap<String, List<ZoneTransient>>();
+		try {
+			zoneConfigurations = mapper.readValue(in, new TypeReference<HashMap<String,List<ZoneTransient>>>() { });
+		} catch (Exception e) {
+			LOGGER.error("Error import zones.", e);
+		}
+		
+		return zoneConfigurations;
+	 }
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/reference/zone/imports/ZoneTransient.java b/sm-core/src/main/java/com/salesmanager/core/business/reference/zone/imports/ZoneTransient.java
new file mode 100644
index 0000000..899d974
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/reference/zone/imports/ZoneTransient.java
@@ -0,0 +1,28 @@
+package com.salesmanager.core.business.reference.zone.imports;
+
+public class ZoneTransient {
+	
+	private String zoneCode;
+	private String zoneName;
+	private String countryCode;
+	
+	public String getZoneCode() {
+		return zoneCode;
+	}
+	public void setZoneCode(String zoneCode) {
+		this.zoneCode = zoneCode;
+	}
+	public String getZoneName() {
+		return zoneName;
+	}
+	public void setZoneName(String zoneName) {
+		this.zoneName = zoneName;
+	}
+	public String getCountryCode() {
+		return countryCode;
+	}
+	public void setCountryCode(String countryCode) {
+		this.countryCode = countryCode;
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/reference/zone/model/Zone.java b/sm-core/src/main/java/com/salesmanager/core/business/reference/zone/model/Zone.java
new file mode 100644
index 0000000..36401ac
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/reference/zone/model/Zone.java
@@ -0,0 +1,102 @@
+package com.salesmanager.core.business.reference.zone.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+import javax.persistence.Transient;
+
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.business.reference.country.model.Country;
+import com.salesmanager.core.constants.SchemaConstant;
+
+@Entity
+@Table(name = "ZONE", schema=SchemaConstant.SALESMANAGER_SCHEMA)
+public class Zone extends SalesManagerEntity<Long, Zone>{
+	private static final long serialVersionUID = 1L;
+	
+	@Id
+	@Column(name="ZONE_ID")
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT",
+	pkColumnValue = "ZONE_SEQ_NEXT_VAL")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Long id;
+	
+	@OneToMany(mappedBy = "zone", cascade = CascadeType.ALL)
+	private List<ZoneDescription> descriptions = new ArrayList<ZoneDescription>();
+	
+	@ManyToOne
+	@JoinColumn(name="COUNTRY_ID", nullable = false)
+	private Country country;
+	
+	@Transient
+	private String name;
+	
+
+	
+	@Column(name = "ZONE_CODE", unique=true, nullable = false)
+	private String code;
+	
+	public Zone() {
+	}
+	
+	public Zone(Country country, String name, String code) {
+		this.setCode(code);
+		this.setCountry(country);
+		this.setCode(name);
+	}
+	
+	public Country getCountry() {
+		return country;
+	}
+
+	public void setCountry(Country country) {
+		this.country = country;
+	}
+
+
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	@Override
+	public Long getId() {
+		return id;
+	}
+
+	@Override
+	public void setId(Long id) {
+		this.id = id;
+	}
+	public List<ZoneDescription> getDescriptions() {
+		return descriptions;
+	}
+
+	public void setDescriptons(List<ZoneDescription> descriptions) {
+		this.descriptions = descriptions;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/reference/zone/model/ZoneDescription.java b/sm-core/src/main/java/com/salesmanager/core/business/reference/zone/model/ZoneDescription.java
new file mode 100644
index 0000000..234d3da
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/reference/zone/model/ZoneDescription.java
@@ -0,0 +1,43 @@
+package com.salesmanager.core.business.reference.zone.model;
+
+import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
+
+import com.salesmanager.core.business.common.model.Description;
+import com.salesmanager.core.business.reference.language.model.Language;
+
+@Entity
+@Table(name="ZONE_DESCRIPTION", uniqueConstraints={
+		@UniqueConstraint(columnNames={
+			"ZONE_ID",
+			"LANGUAGE_ID"
+		})
+	}
+)
+public class ZoneDescription extends Description {
+	private static final long serialVersionUID = 6448836326562270923L;
+	
+	@ManyToOne(targetEntity = Zone.class)
+	@JoinColumn(name = "ZONE_ID", nullable = false)
+	private Zone zone;
+	
+	public ZoneDescription() {
+	}
+	
+	public ZoneDescription(Zone zone, Language language, String name) {
+		setZone(zone);
+		setLanguage(language);
+		setName(name);
+	}
+	
+	public Zone getZone() {
+		return zone;
+	}
+
+	public void setZone(Zone zone) {
+		this.zone = zone;
+	}
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/reference/zone/service/ZoneService.java b/sm-core/src/main/java/com/salesmanager/core/business/reference/zone/service/ZoneService.java
new file mode 100644
index 0000000..ce0daeb
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/reference/zone/service/ZoneService.java
@@ -0,0 +1,25 @@
+package com.salesmanager.core.business.reference.zone.service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityService;
+import com.salesmanager.core.business.reference.country.model.Country;
+import com.salesmanager.core.business.reference.language.model.Language;
+import com.salesmanager.core.business.reference.zone.model.Zone;
+import com.salesmanager.core.business.reference.zone.model.ZoneDescription;
+
+public interface ZoneService extends SalesManagerEntityService<Long, Zone> {
+	
+	Zone getByCode(String code);
+
+	void addDescription(Zone zone, ZoneDescription description) throws ServiceException;
+
+	List<Zone> getZones(Country country, Language language)
+			throws ServiceException;
+
+	Map<String, Zone> getZones(Language language) throws ServiceException;
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/reference/zone/service/ZoneServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/reference/zone/service/ZoneServiceImpl.java
new file mode 100644
index 0000000..7d16657
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/reference/zone/service/ZoneServiceImpl.java
@@ -0,0 +1,132 @@
+package com.salesmanager.core.business.reference.zone.service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityServiceImpl;
+import com.salesmanager.core.business.reference.country.model.Country;
+import com.salesmanager.core.business.reference.language.model.Language;
+import com.salesmanager.core.business.reference.zone.dao.ZoneDao;
+import com.salesmanager.core.business.reference.zone.model.Zone;
+import com.salesmanager.core.business.reference.zone.model.ZoneDescription;
+import com.salesmanager.core.business.reference.zone.model.Zone_;
+import com.salesmanager.core.constants.Constants;
+import com.salesmanager.core.utils.CacheUtils;
+
+@Service("zoneService")
+public class ZoneServiceImpl extends SalesManagerEntityServiceImpl<Long, Zone> implements
+		ZoneService {
+	
+	private final static String ZONE_CACHE_PREFIX = "ZONES_";
+
+	private ZoneDao zoneDao;
+	
+	@Autowired
+	private CacheUtils cache;
+	
+	private static final Logger LOGGER = LoggerFactory.getLogger(ZoneServiceImpl.class);
+
+	@Autowired
+	public ZoneServiceImpl(ZoneDao zoneDao) {
+		super(zoneDao);
+		this.zoneDao = zoneDao;
+	}
+
+	@Override
+	public Zone getByCode(String code) {
+		return getByField(Zone_.code, code);
+	}
+
+	@Override
+	public void addDescription(Zone zone, ZoneDescription description) throws ServiceException {
+		if (zone.getDescriptions()!=null) {
+				if(!zone.getDescriptions().contains(description)) {
+					zone.getDescriptions().add(description);
+					update(zone);
+				}
+		} else {
+			List<ZoneDescription> descriptions = new ArrayList<ZoneDescription>();
+			descriptions.add(description);
+			zone.setDescriptons(descriptions);
+			update(zone);
+		}
+	}
+	
+	@SuppressWarnings("unchecked")
+	@Override
+	public List<Zone> getZones(Country country, Language language) throws ServiceException {
+		
+		List<Zone> zones = null;
+		try {
+
+			String cacheKey = ZONE_CACHE_PREFIX + country.getIsoCode() + Constants.UNDERSCORE + language.getCode();
+			
+			zones = (List<Zone>) cache.getFromCache(cacheKey);
+
+		
+		
+			if(zones==null) {
+			
+				zones = zoneDao.listByLanguageAndCountry(country, language);
+			
+				//set names
+				for(Zone zone : zones) {
+					ZoneDescription description = zone.getDescriptions().get(0);
+					zone.setName(description.getName());
+					
+				}
+				cache.putInCache(zones, cacheKey);
+			}
+
+		} catch (Exception e) {
+			LOGGER.error("getZones()", e);
+		}
+		return zones;
+		
+		
+	}
+	
+	@Override
+	@SuppressWarnings("unchecked")
+	public Map<String, Zone> getZones(Language language) throws ServiceException {
+		
+		Map<String, Zone> zones = null;
+		try {
+
+			String cacheKey = ZONE_CACHE_PREFIX + language.getCode();
+			
+			zones = (Map<String, Zone>) cache.getFromCache(cacheKey);
+
+		
+		
+			if(zones==null) {
+				zones = new HashMap<String, Zone>();
+				List<Zone> zns = zoneDao.listByLanguage(language);
+			
+				//set names
+				for(Zone zone : zns) {
+					ZoneDescription description = zone.getDescriptions().get(0);
+					zone.setName(description.getName());
+					zones.put(zone.getCode(), zone);
+					
+				}
+				cache.putInCache(zones, cacheKey);
+			}
+
+		} catch (Exception e) {
+			LOGGER.error("getZones()", e);
+		}
+		return zones;
+		
+		
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/search/model/IndexProduct.java b/sm-core/src/main/java/com/salesmanager/core/business/search/model/IndexProduct.java
new file mode 100644
index 0000000..4e15b0c
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/search/model/IndexProduct.java
@@ -0,0 +1,148 @@
+package com.salesmanager.core.business.search.model;
+
+import java.util.List;
+
+import org.json.simple.JSONArray;
+import org.json.simple.JSONAware;
+import org.json.simple.JSONObject;
+
+public class IndexProduct implements JSONAware {
+	
+	private String name;
+	private Double price;
+	private List<String> categories;//category code
+	private String manufacturer;//id of the manufacturer
+	private boolean available;
+	private String description;
+	private List<String> tags;//keywords ?
+	private String highlight;
+	private String store;
+	private String lang;
+	private String id;//required by the search framework
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public String toJSONString() {
+		
+		
+		
+		
+		JSONObject obj = new JSONObject();
+		obj.put("name", this.getName());
+		obj.put("price", this.getPrice());
+		obj.put("description", this.getDescription());
+		obj.put("highlight", this.getHighlight());
+		obj.put("store", this.getStore());
+		obj.put("manufacturer", this.getManufacturer());
+		obj.put("lang", this.getLang());
+		obj.put("id", this.getId());
+		if(categories!=null) {
+			JSONArray categoriesArray = new JSONArray();
+			for(String category : categories) {
+				categoriesArray.add(category);
+			}
+			obj.put("categories", categoriesArray);
+		}
+		
+		if(tags!=null) {
+			JSONArray tagsArray = new JSONArray();
+			for(String tag : tags) {
+				tagsArray.add(tag);
+			}
+			obj.put("tags", tagsArray);
+		}
+		
+		return obj.toJSONString();
+
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+
+	public List<String> getCategories() {
+		return categories;
+	}
+
+	public void setCategories(List<String> categories) {
+		this.categories = categories;
+	}
+
+	public boolean isAvailable() {
+		return available;
+	}
+
+	public void setAvailable(boolean available) {
+		this.available = available;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	public List<String> getTags() {
+		return tags;
+	}
+
+	public void setTags(List<String> tags) {
+		this.tags = tags;
+	}
+
+	public String getHighlight() {
+		return highlight;
+	}
+
+	public void setHighlight(String highlight) {
+		this.highlight = highlight;
+	}
+
+	public void setPrice(Double price) {
+		this.price = price;
+	}
+
+	public Double getPrice() {
+		return price;
+	}
+
+	public void setStore(String store) {
+		this.store = store;
+	}
+
+	public String getStore() {
+		return store;
+	}
+
+	public void setLang(String lang) {
+		this.lang = lang;
+	}
+
+	public String getLang() {
+		return lang;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public void setManufacturer(String manufacturer) {
+		this.manufacturer = manufacturer;
+	}
+
+	public String getManufacturer() {
+		return manufacturer;
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/search/model/SearchEntry.java b/sm-core/src/main/java/com/salesmanager/core/business/search/model/SearchEntry.java
new file mode 100644
index 0000000..5b6ba57
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/search/model/SearchEntry.java
@@ -0,0 +1,22 @@
+package com.salesmanager.core.business.search.model;
+
+import java.util.List;
+
+public class SearchEntry {
+	
+	private IndexProduct indexProduct;//product as saved in the index
+	private List<String> highlights;
+	public void setHighlights(List<String> highlights) {
+		this.highlights = highlights;
+	}
+	public List<String> getHighlights() {
+		return highlights;
+	}
+	public void setIndexProduct(IndexProduct indexProduct) {
+		this.indexProduct = indexProduct;
+	}
+	public IndexProduct getIndexProduct() {
+		return indexProduct;
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/search/model/SearchFacet.java b/sm-core/src/main/java/com/salesmanager/core/business/search/model/SearchFacet.java
new file mode 100644
index 0000000..840f883
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/search/model/SearchFacet.java
@@ -0,0 +1,27 @@
+package com.salesmanager.core.business.search.model;
+
+public class SearchFacet {
+	
+	private String name;
+	private String key;
+	private long count;
+	public void setKey(String key) {
+		this.key = key;
+	}
+	public String getKey() {
+		return key;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	public String getName() {
+		return name;
+	}
+	public void setCount(long count) {
+		this.count = count;
+	}
+	public long getCount() {
+		return count;
+	};
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/search/model/SearchKeywords.java b/sm-core/src/main/java/com/salesmanager/core/business/search/model/SearchKeywords.java
new file mode 100644
index 0000000..0ef1d3e
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/search/model/SearchKeywords.java
@@ -0,0 +1,34 @@
+package com.salesmanager.core.business.search.model;
+
+import java.util.List;
+
+import org.json.simple.JSONArray;
+import org.json.simple.JSONAware;
+import org.json.simple.JSONObject;
+
+public class SearchKeywords implements JSONAware{
+	
+	private List<String> keywords;
+
+	public void setKeywords(List<String> keywords) {
+		this.keywords = keywords;
+	}
+
+	public List<String> getKeywords() {
+		return keywords;
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public String toJSONString() {
+		JSONArray jsonArray = new JSONArray();
+		for(String kw : keywords) {
+			JSONObject data = new JSONObject();
+			data.put("name", kw);
+			data.put("value", kw);
+			jsonArray.add(data);
+		}
+		return jsonArray.toJSONString();
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/search/model/SearchResponse.java b/sm-core/src/main/java/com/salesmanager/core/business/search/model/SearchResponse.java
new file mode 100644
index 0000000..986c87a
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/search/model/SearchResponse.java
@@ -0,0 +1,39 @@
+package com.salesmanager.core.business.search.model;
+
+import java.util.List;
+import java.util.Map;
+
+public class SearchResponse {
+	
+	private int totalCount = 0;//total number of entries
+	private int entryCount = 0;//number of entries asked
+	
+	private List<SearchEntry> entries;
+	private Map<String,List<SearchFacet>> facets;//facet key (example : category) & facet description (example : category code)
+	
+	public void setTotalCount(int totalCount) {
+		this.totalCount = totalCount;
+	}
+	public int getTotalCount() {
+		return totalCount;
+	}
+	public void setEntryCount(int entryCount) {
+		this.entryCount = entryCount;
+	}
+	public int getEntryCount() {
+		return entryCount;
+	}
+	public void setEntries(List<SearchEntry> entries) {
+		this.entries = entries;
+	}
+	public List<SearchEntry> getEntries() {
+		return entries;
+	}
+	public void setFacets(Map<String,List<SearchFacet>> facets) {
+		this.facets = facets;
+	}
+	public Map<String,List<SearchFacet>> getFacets() {
+		return facets;
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/search/service/SearchService.java b/sm-core/src/main/java/com/salesmanager/core/business/search/service/SearchService.java
new file mode 100644
index 0000000..7f63e2c
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/search/service/SearchService.java
@@ -0,0 +1,58 @@
+package com.salesmanager.core.business.search.service;
+
+import com.salesmanager.core.business.catalog.product.model.Product;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.search.model.SearchKeywords;
+import com.salesmanager.core.business.search.model.SearchResponse;
+
+public interface SearchService {
+	
+	/**
+	 * The indexing service for products. The index service must be invoked when a product is
+	 * created or updated
+	 * @param store
+	 * @param product
+	 * @throws ServiceException
+	 */
+	void index(MerchantStore store, Product product) throws ServiceException;
+
+	/**
+	 * Deletes an index in the appropriate language. Must be invoked when a product is deleted
+	 * @param store
+	 * @param product
+	 * @throws ServiceException
+	 */
+	void deleteIndex(MerchantStore store, Product product)
+			throws ServiceException;
+
+	/**
+	 * Similar keywords based on a a series of characters. Used in the auto-complete
+	 * functionality
+	 * @param collectionName
+	 * @param jsonString
+	 * @param entriesCount
+	 * @return
+	 * @throws ServiceException
+	 */
+	SearchKeywords searchForKeywords(String collectionName,
+			String jsonString, int entriesCount) throws ServiceException;
+
+	/**
+	 * Search products based on user entry
+	 * @param store
+	 * @param languageCode
+	 * @param jsonString
+	 * @param entriesCount
+	 * @param startIndex
+	 * @throws ServiceException
+	 */
+	SearchResponse search(MerchantStore store, String languageCode, String jsonString,
+			int entriesCount, int startIndex) throws ServiceException;
+
+	/**
+	 * Initializes search service in order to avoid lazy initialization
+	 */
+	void initService();
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/search/service/SearchServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/search/service/SearchServiceImpl.java
new file mode 100644
index 0000000..5065aa4
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/search/service/SearchServiceImpl.java
@@ -0,0 +1,316 @@
+package com.salesmanager.core.business.search.service;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.elasticsearch.common.text.Text;
+import org.elasticsearch.search.highlight.HighlightField;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.salesmanager.core.business.catalog.category.model.Category;
+import com.salesmanager.core.business.catalog.product.model.Product;
+import com.salesmanager.core.business.catalog.product.model.description.ProductDescription;
+import com.salesmanager.core.business.catalog.product.model.price.FinalPrice;
+import com.salesmanager.core.business.catalog.product.service.PricingService;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.search.model.IndexProduct;
+import com.salesmanager.core.business.search.model.SearchEntry;
+import com.salesmanager.core.business.search.model.SearchFacet;
+import com.salesmanager.core.business.search.model.SearchKeywords;
+import com.salesmanager.core.constants.Constants;
+import com.salesmanager.core.utils.CoreConfiguration;
+import com.shopizer.search.services.Facet;
+import com.shopizer.search.services.SearchHit;
+import com.shopizer.search.services.SearchRequest;
+import com.shopizer.search.services.SearchResponse;
+
+
+@Service("productSearchService")
+public class SearchServiceImpl implements SearchService {
+	
+	private static final Logger LOGGER = LoggerFactory.getLogger(SearchServiceImpl.class);
+	
+	
+	private final static String PRODUCT_INDEX_NAME = "product";
+	private final static String UNDERSCORE = "_";
+	private final static String INDEX_PRODUCTS = "INDEX_PRODUCTS";
+
+	@Autowired
+	private com.shopizer.search.services.SearchService searchService;
+	
+	@Autowired
+	private PricingService pricingService;
+	
+	@Autowired
+	private CoreConfiguration configuration;
+	
+	@Override
+	public void initService() {
+		searchService.initService();
+	}
+
+	@SuppressWarnings("rawtypes")
+	@Override
+	public void index(MerchantStore store, Product product)
+			throws ServiceException {
+		
+		/**
+		 * When a product is saved or updated the indexing process occurs
+		 * 
+		 * A product entity will have to be transformed to a bean ProductIndex
+		 * which contains the indices as described in product.json
+		 * 
+		 * {"product": {
+						"properties" :  {
+							"name" : {"type":"string","index":"analyzed"},
+							"price" : {"type":"string","index":"not_analyzed"},
+							"category" : {"type":"string","index":"not_analyzed"},
+							"lang" : {"type":"string","index":"not_analyzed"},
+							"available" : {"type":"string","index":"not_analyzed"},
+							"description" : {"type":"string","index":"analyzed","index_analyzer":"english"}, 
+							"tags" : {"type":"string","index":"not_analyzed"} 
+						 } 
+			            }
+			}
+		 *
+		 * productService saveOrUpdate as well as create and update will invoke
+		 * productSearchService.index	
+		 * 
+		 * A copy of properies between Product to IndexProduct
+		 * Then IndexProduct will be transformed to a json representation by the invocation
+		 * of .toJSONString on IndexProduct
+		 * 
+		 * Then index product
+		 * searchService.index(json, "product_<LANGUAGE_CODE>_<MERCHANT_CODE>", "product");
+		 * 
+		 * example ...index(json,"product_en_default",product)
+		 * 
+		 */
+		
+		if(configuration.getProperty(INDEX_PRODUCTS)==null || configuration.getProperty(INDEX_PRODUCTS).equals(Constants.FALSE)) {
+			return;
+		}
+		
+		FinalPrice price = pricingService.calculateProductPrice(product);
+
+		
+		Set<ProductDescription> descriptions = product.getDescriptions();
+		for(ProductDescription description : descriptions) {
+			
+			StringBuilder collectionName = new StringBuilder();
+			collectionName.append(PRODUCT_INDEX_NAME).append(UNDERSCORE).append(description.getLanguage().getCode()).append(UNDERSCORE).append(store.getCode().toLowerCase());
+			
+			IndexProduct index = new IndexProduct();
+
+			index.setId(String.valueOf(product.getId()));
+			index.setStore(store.getCode().toLowerCase());
+			index.setLang(description.getLanguage().getCode());
+			index.setAvailable(product.isAvailable());
+			index.setDescription(description.getDescription());
+			index.setName(description.getName());
+			if(product.getManufacturer()!=null) {
+				index.setManufacturer(String.valueOf(product.getManufacturer().getId()));
+			}
+			if(price!=null) {
+				index.setPrice(price.getFinalPrice().doubleValue());
+			}
+			index.setHighlight(description.getProductHighlight());
+			if(!StringUtils.isBlank(description.getMetatagKeywords())){
+				String[] tags = description.getMetatagKeywords().split(",");
+				@SuppressWarnings("unchecked")
+				List<String> tagsList = new ArrayList(Arrays.asList(tags));
+				index.setTags(tagsList);
+			}
+
+			
+			Set<Category> categories = product.getCategories();
+			if(!CollectionUtils.isEmpty(categories)) {
+				List<String> categoryList = new ArrayList<String>();
+				for(Category category : categories) {
+					categoryList.add(category.getCode());
+				}
+				index.setCategories(categoryList);
+			}
+			
+			String jsonString = index.toJSONString();
+			try {
+				searchService.index(jsonString, collectionName.toString(), new StringBuilder().append(PRODUCT_INDEX_NAME).append(UNDERSCORE).append(description.getLanguage().getCode()).toString());
+			} catch (Exception e) {
+				throw new ServiceException("Cannot index product id [" + product.getId() + "], " + e.getMessage() ,e);
+			}
+		}
+	}
+
+	@Override
+	public void deleteIndex(MerchantStore store, Product product) throws ServiceException {
+		
+		if(configuration.getProperty(INDEX_PRODUCTS)==null || configuration.getProperty(INDEX_PRODUCTS).equals(Constants.FALSE)) {
+			return;
+		}
+		
+		Set<ProductDescription> descriptions = product.getDescriptions();
+		for(ProductDescription description : descriptions) {
+			
+			StringBuilder collectionName = new StringBuilder();
+			collectionName.append(PRODUCT_INDEX_NAME).append(UNDERSCORE).append(description.getLanguage().getCode()).append(UNDERSCORE).append(store.getCode().toLowerCase());
+
+			try {
+				searchService.deleteObject(collectionName.toString(), new StringBuilder().append(PRODUCT_INDEX_NAME).append(UNDERSCORE).append(description.getLanguage().getCode()).toString(), String.valueOf(product.getId()));
+			} catch (Exception e) {
+				LOGGER.error("Cannot delete index for product id [" + product.getId() + "], ",e);
+			}
+		}
+	
+	}
+	
+	@Override
+	public SearchKeywords searchForKeywords(String collectionName, String jsonString, int entriesCount) throws ServiceException {
+		
+		/**
+		 * 	$('#search').searchAutocomplete({
+			url: '<%=request.getContextPath()%>/search/autocomplete/keyword_en'
+		  		//filter: function() { 
+				//return '\"filter\" : {\"numeric_range\" : {\"price\" : {\"from\" : \"22\",\"to\" : \"45\",\"include_lower\" : true,\"include_upper\" : true}}}';
+		  		//}
+     		});
+     		
+     	**/	
+     		
+		try {
+
+			SearchResponse response = searchService.searchAutoComplete(collectionName, jsonString, entriesCount);
+			
+			SearchKeywords keywords = new SearchKeywords();
+			keywords.setKeywords(Arrays.asList(response.getInlineSearchList()));
+			
+			return keywords;
+			
+		} catch (Exception e) {
+			LOGGER.error("Error while searching keywords " + jsonString,e);
+			throw new ServiceException(e);
+		}
+
+		
+	}
+	
+	@Override
+	public com.salesmanager.core.business.search.model.SearchResponse search(MerchantStore store, String languageCode, String jsonString, int entriesCount, int startIndex) throws ServiceException {
+		
+
+		try {
+			
+			StringBuilder collectionName = new StringBuilder();
+			collectionName.append(PRODUCT_INDEX_NAME).append(UNDERSCORE).append(languageCode).append(UNDERSCORE).append(store.getCode().toLowerCase());
+			
+			
+			SearchRequest request = new SearchRequest();
+			request.setCollection(collectionName.toString());
+			request.setSize(entriesCount);
+			request.setStart(startIndex);
+			request.setJson(jsonString);
+			
+			SearchResponse response =searchService.search(request);
+			
+			com.salesmanager.core.business.search.model.SearchResponse resp = new com.salesmanager.core.business.search.model.SearchResponse();
+			
+			
+			resp.setTotalCount(response.getCount());
+			
+			List<SearchEntry> entries = new ArrayList<SearchEntry>();
+			
+			Collection<SearchHit> hits = response.getSearchHits();
+			for(SearchHit hit : hits) {
+				
+				SearchEntry entry = new SearchEntry();
+				
+				Map<String,Object> metaEntries = hit.getMetaEntries();
+				IndexProduct indexProduct = new IndexProduct();
+				Map sourceEntries = (Map)metaEntries.get("source");
+				
+				indexProduct.setDescription((String)sourceEntries.get("description"));
+				indexProduct.setHighlight((String)sourceEntries.get("highlight"));
+				indexProduct.setId((String)sourceEntries.get("id"));
+				indexProduct.setLang((String)sourceEntries.get("lang"));
+				indexProduct.setName(((String)sourceEntries.get("name")));
+				indexProduct.setManufacturer(((String)sourceEntries.get("manufacturer")));
+				indexProduct.setPrice(((Double)sourceEntries.get("price")));
+				indexProduct.setStore(((String)sourceEntries.get("store")));
+				entry.setIndexProduct(indexProduct);
+				entries.add(entry);
+				
+				Map<String, HighlightField> fields = hit.getHighlightFields();
+				if(fields!=null) {
+					List<String> highlights = new ArrayList<String>();
+					for(HighlightField field : fields.values()) {
+						
+						Text[] text = field.getFragments();
+						//text[0]
+						String f = field.getName();
+						highlights.add(f);
+						
+						
+					}
+					
+					entry.setHighlights(highlights);
+				
+				}
+			}
+			
+			resp.setEntries(entries);
+			
+			Map<String,Facet> facets = response.getFacets();
+			if(facets!=null) {
+				Map<String,List<SearchFacet>> searchFacets = new HashMap<String,List<SearchFacet>>();
+				for(String key : facets.keySet()) {
+					
+					Facet f = facets.get(key);
+					
+					List<SearchFacet> fs = searchFacets.get(key);
+					if(fs==null) {
+						fs = new ArrayList<SearchFacet>();
+						searchFacets.put(key, fs);
+					}
+					
+					List<com.shopizer.search.services.Entry> facetEntries = f.getEntries();
+					for(com.shopizer.search.services.Entry facetEntry : facetEntries) {
+					
+						SearchFacet searchFacet = new SearchFacet();
+						searchFacet.setKey(facetEntry.getName());
+						searchFacet.setName(facetEntry.getName());
+						searchFacet.setCount(f.getEntries().size());
+						
+						fs.add(searchFacet);
+					
+					}
+					
+				}
+				
+				resp.setFacets(searchFacets);
+			
+			}
+			
+			
+			
+			return resp;
+			
+			
+		} catch (Exception e) {
+			LOGGER.error("Error while searching keywords " + jsonString,e);
+			throw new ServiceException(e);
+		}
+		
+	}
+	
+}
+

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/shipping/model/PackageDetails.java b/sm-core/src/main/java/com/salesmanager/core/business/shipping/model/PackageDetails.java
new file mode 100644
index 0000000..0464ac5
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/shipping/model/PackageDetails.java
@@ -0,0 +1,65 @@
+package com.salesmanager.core.business.shipping.model;
+
+public class PackageDetails {
+	
+	private double shippingWeight;
+	private double shippingMaxWeight;
+	private double shippingLength;
+	private double shippingHeight;
+	private double shippingWidth;
+	private int shippingQuantity;
+	private int treshold;
+	
+	private String itemName = "";
+	
+	
+	public String getItemName() {
+		return itemName;
+	}
+	public void setItemName(String itemName) {
+		this.itemName = itemName;
+	}
+	public double getShippingWeight() {
+		return shippingWeight;
+	}
+	public void setShippingWeight(double shippingWeight) {
+		this.shippingWeight = shippingWeight;
+	}
+	public double getShippingMaxWeight() {
+		return shippingMaxWeight;
+	}
+	public void setShippingMaxWeight(double shippingMaxWeight) {
+		this.shippingMaxWeight = shippingMaxWeight;
+	}
+	public double getShippingLength() {
+		return shippingLength;
+	}
+	public void setShippingLength(double shippingLength) {
+		this.shippingLength = shippingLength;
+	}
+	public double getShippingHeight() {
+		return shippingHeight;
+	}
+	public void setShippingHeight(double shippingHeight) {
+		this.shippingHeight = shippingHeight;
+	}
+	public double getShippingWidth() {
+		return shippingWidth;
+	}
+	public void setShippingWidth(double shippingWidth) {
+		this.shippingWidth = shippingWidth;
+	}
+	public int getShippingQuantity() {
+		return shippingQuantity;
+	}
+	public void setShippingQuantity(int shippingQuantity) {
+		this.shippingQuantity = shippingQuantity;
+	}
+	public int getTreshold() {
+		return treshold;
+	}
+	public void setTreshold(int treshold) {
+		this.treshold = treshold;
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/shipping/model/ShippingBasisType.java b/sm-core/src/main/java/com/salesmanager/core/business/shipping/model/ShippingBasisType.java
new file mode 100644
index 0000000..a28f2b5
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/shipping/model/ShippingBasisType.java
@@ -0,0 +1,7 @@
+package com.salesmanager.core.business.shipping.model;
+
+public enum ShippingBasisType {
+	
+	BILLING, SHIPPING
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/shipping/model/ShippingConfiguration.java b/sm-core/src/main/java/com/salesmanager/core/business/shipping/model/ShippingConfiguration.java
new file mode 100644
index 0000000..3b6101c
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/shipping/model/ShippingConfiguration.java
@@ -0,0 +1,359 @@
+package com.salesmanager.core.business.shipping.model;
+
+import java.math.BigDecimal;
+
+import org.json.simple.JSONAware;
+import org.json.simple.JSONObject;
+
+/**
+ * Object saved in the database maintaining various shipping options
+ * @author casams1
+ *
+ */
+public class ShippingConfiguration implements JSONAware {
+	
+	//enums
+	private ShippingType shippingType = ShippingType.NATIONAL;
+	private ShippingBasisType shippingBasisType = ShippingBasisType.SHIPPING;
+	private ShippingOptionPriceType shippingOptionPriceType = ShippingOptionPriceType.ALL;
+	private ShippingPackageType shippingPackageType = ShippingPackageType.ITEM;
+	private ShippingDescription shippingDescription = ShippingDescription.SHORT_DESCRIPTION;
+	private ShippingType freeShippingType = null;
+	
+	private int boxWidth = 0;
+	private int boxHeight = 0;
+	private int boxLength = 0;
+	private double boxWeight = 0;
+	private double maxWeight = 0;
+	
+	//free shipping
+	private boolean freeShippingEnabled = false;
+	private BigDecimal orderTotalFreeShipping = null;
+	
+	
+	private BigDecimal handlingFees = null;
+	private boolean taxOnShipping = false;
+	
+	
+	//JSON bindings
+	private String shipType;
+	private String shipBaseType;
+	private String shipOptionPriceType = ShippingOptionPriceType.ALL.name();
+	private String shipPackageType;
+	private String shipDescription;
+	private String shipFreeType;
+	
+	//Transient
+	private String orderTotalFreeShippingText = null;
+	private String handlingFeesText = null;
+	
+	
+	public String getShipType() {
+		return shipType;
+	}
+
+
+	public String getShipBaseType() {
+		return shipBaseType;
+	}
+
+
+	public String getShipOptionPriceType() {
+		return shipOptionPriceType;
+	}
+
+
+
+	public void setShippingOptionPriceType(ShippingOptionPriceType shippingOptionPriceType) {
+		this.shippingOptionPriceType = shippingOptionPriceType;
+		this.shipOptionPriceType = this.shippingOptionPriceType.name();
+	}
+
+
+	public ShippingOptionPriceType getShippingOptionPriceType() {
+		return shippingOptionPriceType;
+	}
+
+
+	public void setShippingBasisType(ShippingBasisType shippingBasisType) {
+		this.shippingBasisType = shippingBasisType;
+		this.shipBaseType = this.shippingBasisType.name();
+	}
+
+
+	public ShippingBasisType getShippingBasisType() {
+		return shippingBasisType;
+	}
+
+
+	public void setShippingType(ShippingType shippingType) {
+		this.shippingType = shippingType;
+		this.shipType = this.shippingType.name();
+	}
+
+
+	public ShippingType getShippingType() {
+		return shippingType;
+	}
+	
+	public ShippingPackageType getShippingPackageType() {
+		return shippingPackageType;
+	}
+
+
+	public void setShippingPackageType(ShippingPackageType shippingPackageType) {
+		this.shippingPackageType = shippingPackageType;
+		this.shipPackageType = shippingPackageType.name();
+	}
+	
+	
+	public String getShipPackageType() {
+		return shipPackageType;
+	}
+
+	
+	/** JSON bindding **/
+	public void setShipType(String shipType) {
+		this.shipType = shipType;
+		ShippingType sType = ShippingType.NATIONAL;
+		if(shipType.equals(ShippingType.INTERNATIONAL.name())) {
+			sType = ShippingType.INTERNATIONAL;
+		}
+		setShippingType(sType);
+	}
+
+
+	public void setShipOptionPriceType(String shipOptionPriceType) {
+		this.shipOptionPriceType = shipOptionPriceType;
+		ShippingOptionPriceType sType = ShippingOptionPriceType.ALL;
+		if(shipOptionPriceType.equals(ShippingOptionPriceType.HIGHEST.name())) {
+			sType = ShippingOptionPriceType.HIGHEST;
+		}
+		if(shipOptionPriceType.equals(ShippingOptionPriceType.LEAST.name())) {
+			sType = ShippingOptionPriceType.LEAST;
+		}
+		setShippingOptionPriceType(sType);
+	}
+
+
+	public void setShipBaseType(String shipBaseType) {
+		this.shipBaseType = shipBaseType;
+		ShippingBasisType sType = ShippingBasisType.SHIPPING;
+		if(shipBaseType.equals(ShippingBasisType.BILLING.name())) {
+			sType = ShippingBasisType.BILLING;
+		}
+		setShippingBasisType(sType);
+	}
+
+
+
+	public void setShipPackageType(String shipPackageType) {
+		this.shipPackageType = shipPackageType;
+		ShippingPackageType sType = ShippingPackageType.ITEM;
+		if(shipPackageType.equals(ShippingPackageType.BOX.name())) {
+			sType = ShippingPackageType.BOX;
+		}
+		this.setShippingPackageType(sType);
+	}
+	
+	public void setShipDescription(String shipDescription) {
+		this.shipDescription = shipDescription;
+		ShippingDescription sType = ShippingDescription.SHORT_DESCRIPTION;
+		if(shipDescription.equals(ShippingDescription.LONG_DESCRIPTION.name())) {
+			sType = ShippingDescription.LONG_DESCRIPTION;
+		}
+		this.setShippingDescription(sType);
+	}
+	
+	public void setShipFreeType(String shipFreeType) {
+		this.shipFreeType = shipFreeType;
+		ShippingType sType = ShippingType.NATIONAL;
+		if(shipFreeType.equals(ShippingType.INTERNATIONAL.name())) {
+			sType = ShippingType.INTERNATIONAL;
+		}
+		setFreeShippingType(sType);
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public String toJSONString() {
+		JSONObject data = new JSONObject();
+		data.put("shipBaseType", this.getShippingBasisType().name());
+		data.put("shipOptionPriceType", this.getShippingOptionPriceType().name());
+		data.put("shipType", this.getShippingType().name());
+		data.put("shipPackageType", this.getShippingPackageType().name());
+		if(shipFreeType!=null) {
+			data.put("shipFreeType", this.getFreeShippingType().name());
+		}
+		data.put("shipDescription", this.getShippingDescription().name());
+		
+		
+		data.put("boxWidth", this.getBoxWidth());
+		data.put("boxHeight", this.getBoxHeight());
+		data.put("boxLength", this.getBoxLength());
+		data.put("boxWeight", this.getBoxWeight());
+		data.put("maxWeight", this.getMaxWeight());
+		data.put("freeShippingEnabled", this.freeShippingEnabled);
+		data.put("orderTotalFreeShipping", this.orderTotalFreeShipping);
+		data.put("handlingFees", this.handlingFees);
+		data.put("taxOnShipping", this.taxOnShipping);
+		
+		
+		return data.toJSONString();
+	}
+
+
+	public int getBoxWidth() {
+		return boxWidth;
+	}
+
+
+	public void setBoxWidth(int boxWidth) {
+		this.boxWidth = boxWidth;
+	}
+
+
+	public int getBoxHeight() {
+		return boxHeight;
+	}
+
+
+	public void setBoxHeight(int boxHeight) {
+		this.boxHeight = boxHeight;
+	}
+
+
+	public int getBoxLength() {
+		return boxLength;
+	}
+
+
+	public void setBoxLength(int boxLength) {
+		this.boxLength = boxLength;
+	}
+
+
+	public double getBoxWeight() {
+		return boxWeight;
+	}
+
+
+	public void setBoxWeight(double boxWeight) {
+		this.boxWeight = boxWeight;
+	}
+
+
+	public double getMaxWeight() {
+		return maxWeight;
+	}
+
+
+	public void setMaxWeight(double maxWeight) {
+		this.maxWeight = maxWeight;
+	}
+
+
+	public boolean isFreeShippingEnabled() {
+		return freeShippingEnabled;
+	}
+
+
+	public void setFreeShippingEnabled(boolean freeShippingEnabled) {
+		this.freeShippingEnabled = freeShippingEnabled;
+	}
+
+
+	public BigDecimal getOrderTotalFreeShipping() {
+		return orderTotalFreeShipping;
+	}
+
+
+	public void setOrderTotalFreeShipping(BigDecimal orderTotalFreeShipping) {
+		this.orderTotalFreeShipping = orderTotalFreeShipping;
+	}
+
+
+	public void setHandlingFees(BigDecimal handlingFees) {
+		this.handlingFees = handlingFees;
+	}
+
+
+	public BigDecimal getHandlingFees() {
+		return handlingFees;
+	}
+
+
+	public void setTaxOnShipping(boolean taxOnShipping) {
+		this.taxOnShipping = taxOnShipping;
+	}
+
+
+	public boolean isTaxOnShipping() {
+		return taxOnShipping;
+	}
+
+
+
+
+
+	public String getShipDescription() {
+		return shipDescription;
+	}
+
+
+	public void setShippingDescription(ShippingDescription shippingDescription) {
+		this.shippingDescription = shippingDescription;
+	}
+
+
+	public ShippingDescription getShippingDescription() {
+		return shippingDescription;
+	}
+
+
+	public void setFreeShippingType(ShippingType freeShippingType) {
+		this.freeShippingType = freeShippingType;
+	}
+
+
+	public ShippingType getFreeShippingType() {
+		return freeShippingType;
+	}
+
+
+
+	public String getShipFreeType() {
+		return shipFreeType;
+	}
+
+
+	public void setOrderTotalFreeShippingText(String orderTotalFreeShippingText) {
+		this.orderTotalFreeShippingText = orderTotalFreeShippingText;
+	}
+
+
+	public String getOrderTotalFreeShippingText() {
+		return orderTotalFreeShippingText;
+	}
+
+
+	public void setHandlingFeesText(String handlingFeesText) {
+		this.handlingFeesText = handlingFeesText;
+	}
+
+
+	public String getHandlingFeesText() {
+		return handlingFeesText;
+	}
+
+
+
+
+
+
+
+
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/shipping/model/ShippingDescription.java b/sm-core/src/main/java/com/salesmanager/core/business/shipping/model/ShippingDescription.java
new file mode 100644
index 0000000..97b6f98
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/shipping/model/ShippingDescription.java
@@ -0,0 +1,7 @@
+package com.salesmanager.core.business.shipping.model;
+
+public enum ShippingDescription {
+
+	
+	SHORT_DESCRIPTION, LONG_DESCRIPTION
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/shipping/model/ShippingOption.java b/sm-core/src/main/java/com/salesmanager/core/business/shipping/model/ShippingOption.java
new file mode 100644
index 0000000..3cafa82
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/shipping/model/ShippingOption.java
@@ -0,0 +1,101 @@
+package com.salesmanager.core.business.shipping.model;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ShippingOption implements Serializable {
+	
+	private static final Logger LOGGER = LoggerFactory.getLogger(ShippingOption.class);
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	private BigDecimal optionPrice;
+
+	private String optionName;
+	private String optionCode;
+	private String optionDeliveryDate;
+	private String optionShippingDate;
+	private String optionPriceText;
+	private String optionId;
+	private String description;
+	
+	private String estimatedNumberOfDays;
+
+	
+
+	public BigDecimal getOptionPrice() {
+		
+		if(!StringUtils.isBlank(this.getOptionPriceText())) {
+			try {
+				this.optionPrice = new BigDecimal(this.getOptionPriceText());
+			} catch(Exception e) {
+				LOGGER.equals("Can't convert price text " + this.getOptionPriceText() + " to big decimal");
+			}
+		}
+		
+		return optionPrice;
+	}
+	
+	public void setOptionPrice(BigDecimal optionPrice) {
+		this.optionPrice = optionPrice;
+	}
+
+	public void setOptionCode(String optionCode) {
+		this.optionCode = optionCode;
+	}
+	public String getOptionCode() {
+		return optionCode;
+	}
+	public void setOptionName(String optionName) {
+		this.optionName = optionName;
+	}
+	public String getOptionName() {
+		return optionName;
+	}
+
+	public void setOptionPriceText(String optionPriceText) {
+		this.optionPriceText = optionPriceText;
+	}
+	public String getOptionPriceText() {
+		return optionPriceText;
+	}
+	public void setOptionId(String optionId) {
+		this.optionId = optionId;
+	}
+	public String getOptionId() {
+		return optionId;
+	}
+	public void setOptionDeliveryDate(String optionDeliveryDate) {
+		this.optionDeliveryDate = optionDeliveryDate;
+	}
+	public String getOptionDeliveryDate() {
+		return optionDeliveryDate;
+	}
+	public void setOptionShippingDate(String optionShippingDate) {
+		this.optionShippingDate = optionShippingDate;
+	}
+	public String getOptionShippingDate() {
+		return optionShippingDate;
+	}
+	public void setDescription(String description) {
+		this.description = description;
+	}
+	public String getDescription() {
+		return description;
+	}
+	public void setEstimatedNumberOfDays(String estimatedNumberOfDays) {
+		this.estimatedNumberOfDays = estimatedNumberOfDays;
+	}
+	public String getEstimatedNumberOfDays() {
+		return estimatedNumberOfDays;
+	}
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/shipping/model/ShippingOptionPriceType.java b/sm-core/src/main/java/com/salesmanager/core/business/shipping/model/ShippingOptionPriceType.java
new file mode 100644
index 0000000..91c9ed7
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/shipping/model/ShippingOptionPriceType.java
@@ -0,0 +1,7 @@
+package com.salesmanager.core.business.shipping.model;
+
+public enum ShippingOptionPriceType {
+	
+	LEAST, HIGHEST, ALL
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/shipping/model/ShippingPackageType.java b/sm-core/src/main/java/com/salesmanager/core/business/shipping/model/ShippingPackageType.java
new file mode 100644
index 0000000..215c842
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/shipping/model/ShippingPackageType.java
@@ -0,0 +1,7 @@
+package com.salesmanager.core.business.shipping.model;
+
+public enum ShippingPackageType {
+	
+	ITEM, BOX
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/shipping/model/ShippingProduct.java b/sm-core/src/main/java/com/salesmanager/core/business/shipping/model/ShippingProduct.java
new file mode 100644
index 0000000..f7c6b42
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/shipping/model/ShippingProduct.java
@@ -0,0 +1,27 @@
+package com.salesmanager.core.business.shipping.model;
+
+import com.salesmanager.core.business.catalog.product.model.Product;
+
+public class ShippingProduct {
+	
+	public ShippingProduct(Product product) {
+		this.product = product;
+
+	}
+	
+	private int quantity = 1;
+	private Product product;
+	public void setQuantity(int quantity) {
+		this.quantity = quantity;
+	}
+	public int getQuantity() {
+		return quantity;
+	}
+	public void setProduct(Product product) {
+		this.product = product;
+	}
+	public Product getProduct() {
+		return product;
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/shipping/model/ShippingQuote.java b/sm-core/src/main/java/com/salesmanager/core/business/shipping/model/ShippingQuote.java
new file mode 100644
index 0000000..2e70b13
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/shipping/model/ShippingQuote.java
@@ -0,0 +1,99 @@
+package com.salesmanager.core.business.shipping.model;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+public class ShippingQuote implements Serializable {
+	
+	
+	
+	
+
+
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	public final static String NO_SHIPPING_TO_SELECTED_COUNTRY = "NO_SHIPPING_TO_SELECTED_COUNTRY";
+	public final static String NO_SHIPPING_MODULE_CONFIGURED= "NO_SHIPPING_MODULE_CONFIGURED";
+	public final static String ERROR= "ERROR";
+
+	private String shippingModuleCode;
+	private List<ShippingOption> shippingOptions = null;
+	/** if an error occurs, this field will be populated from constants defined above **/
+	private String shippingReturnCode = null;
+	/** indicates if this quote is configured with free shipping **/
+	private boolean freeShipping;
+	/** the threshold amount for being free shipping **/
+	private BigDecimal freeShippingAmount;
+	/** handling fees to be added on top of shipping fees **/
+	private BigDecimal handlingFees;
+	/** apply tax on shipping **/
+	private boolean applyTaxOnShipping;
+	
+	private ShippingOption selectedShippingOption = null;
+	
+	private String quoteError = null;
+	
+	
+	
+	public void setShippingOptions(List<ShippingOption> shippingOptions) {
+		this.shippingOptions = shippingOptions;
+	}
+	public List<ShippingOption> getShippingOptions() {
+		return shippingOptions;
+	}
+	public void setShippingModuleCode(String shippingModuleCode) {
+		this.shippingModuleCode = shippingModuleCode;
+	}
+	public String getShippingModuleCode() {
+		return shippingModuleCode;
+	}
+	public void setShippingReturnCode(String shippingReturnCode) {
+		this.shippingReturnCode = shippingReturnCode;
+	}
+	public String getShippingReturnCode() {
+		return shippingReturnCode;
+	}
+	public void setFreeShipping(boolean freeShipping) {
+		this.freeShipping = freeShipping;
+	}
+	public boolean isFreeShipping() {
+		return freeShipping;
+	}
+	public void setFreeShippingAmount(BigDecimal freeShippingAmount) {
+		this.freeShippingAmount = freeShippingAmount;
+	}
+	public BigDecimal getFreeShippingAmount() {
+		return freeShippingAmount;
+	}
+	public void setHandlingFees(BigDecimal handlingFees) {
+		this.handlingFees = handlingFees;
+	}
+	public BigDecimal getHandlingFees() {
+		return handlingFees;
+	}
+	public void setApplyTaxOnShipping(boolean applyTaxOnShipping) {
+		this.applyTaxOnShipping = applyTaxOnShipping;
+	}
+	public boolean isApplyTaxOnShipping() {
+		return applyTaxOnShipping;
+	}
+	public void setSelectedShippingOption(ShippingOption selectedShippingOption) {
+		this.selectedShippingOption = selectedShippingOption;
+	}
+	public ShippingOption getSelectedShippingOption() {
+		return selectedShippingOption;
+	}
+	public String getQuoteError() {
+		return quoteError;
+	}
+	public void setQuoteError(String quoteError) {
+		this.quoteError = quoteError;
+	}
+	
+	
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/shipping/model/ShippingSummary.java b/sm-core/src/main/java/com/salesmanager/core/business/shipping/model/ShippingSummary.java
new file mode 100644
index 0000000..58b9e3e
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/shipping/model/ShippingSummary.java
@@ -0,0 +1,60 @@
+package com.salesmanager.core.business.shipping.model;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * Contains shipping fees according to user selections
+ * @author casams1
+ *
+ */
+public class ShippingSummary implements Serializable {
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	private BigDecimal shipping;
+	private BigDecimal handling;
+	private String shippingModule;
+	private String shippingOption;
+	private boolean freeShipping;
+	private boolean taxOnShipping;
+	public BigDecimal getShipping() {
+		return shipping;
+	}
+	public void setShipping(BigDecimal shipping) {
+		this.shipping = shipping;
+	}
+	public BigDecimal getHandling() {
+		return handling;
+	}
+	public void setHandling(BigDecimal handling) {
+		this.handling = handling;
+	}
+	public String getShippingModule() {
+		return shippingModule;
+	}
+	public void setShippingModule(String shippingModule) {
+		this.shippingModule = shippingModule;
+	}
+	public String getShippingOption() {
+		return shippingOption;
+	}
+	public void setShippingOption(String shippingOption) {
+		this.shippingOption = shippingOption;
+	}
+	public boolean isFreeShipping() {
+		return freeShipping;
+	}
+	public void setFreeShipping(boolean freeShipping) {
+		this.freeShipping = freeShipping;
+	}
+	public boolean isTaxOnShipping() {
+		return taxOnShipping;
+	}
+	public void setTaxOnShipping(boolean taxOnShipping) {
+		this.taxOnShipping = taxOnShipping;
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/shipping/model/ShippingType.java b/sm-core/src/main/java/com/salesmanager/core/business/shipping/model/ShippingType.java
new file mode 100644
index 0000000..af8bd46
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/shipping/model/ShippingType.java
@@ -0,0 +1,7 @@
+package com.salesmanager.core.business.shipping.model;
+
+public enum ShippingType {
+	
+	NATIONAL, INTERNATIONAL
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/shipping/service/ShippingService.java b/sm-core/src/main/java/com/salesmanager/core/business/shipping/service/ShippingService.java
new file mode 100755
index 0000000..9b5ccca
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/shipping/service/ShippingService.java
@@ -0,0 +1,198 @@
+package com.salesmanager.core.business.shipping.service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.salesmanager.core.business.common.model.Delivery;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.country.model.Country;
+import com.salesmanager.core.business.reference.language.model.Language;
+import com.salesmanager.core.business.shipping.model.PackageDetails;
+import com.salesmanager.core.business.shipping.model.ShippingConfiguration;
+import com.salesmanager.core.business.shipping.model.ShippingOption;
+import com.salesmanager.core.business.shipping.model.ShippingProduct;
+import com.salesmanager.core.business.shipping.model.ShippingQuote;
+import com.salesmanager.core.business.shipping.model.ShippingSummary;
+import com.salesmanager.core.business.shoppingcart.model.ShoppingCartItem;
+import com.salesmanager.core.business.system.model.CustomIntegrationConfiguration;
+import com.salesmanager.core.business.system.model.IntegrationConfiguration;
+import com.salesmanager.core.business.system.model.IntegrationModule;
+
+public interface ShippingService {
+
+	/**
+	 * Returns a list of supported countries (ship to country list) configured by merchant
+	 * when the merchant configured shipping National and has saved a list of ship to country
+	 * from the list
+	 * @param store
+	 * @return
+	 * @throws ServiceException
+	 */
+	public  List<String> getSupportedCountries(MerchantStore store)
+			throws ServiceException;
+
+	public  void setSupportedCountries(MerchantStore store,
+			List<String> countryCodes) throws ServiceException;
+
+	/**
+	 * Returns a list of available shipping modules
+	 * @param store
+	 * @return
+	 * @throws ServiceException
+	 */
+	public List<IntegrationModule> getShippingMethods(MerchantStore store)
+			throws ServiceException;
+
+	
+	/**
+	 * Returns a list of configured shipping modules for a given merchant
+	 * @param store
+	 * @return
+	 * @throws ServiceException
+	 */
+	Map<String, IntegrationConfiguration> getShippingModulesConfigured(
+			MerchantStore store) throws ServiceException;
+
+	/**
+	 * Adds a Shipping configuration
+	 * @param configuration
+	 * @param store
+	 * @throws ServiceException
+	 */
+	void saveShippingQuoteModuleConfiguration(IntegrationConfiguration configuration,
+			MerchantStore store) throws ServiceException;
+
+	/**
+	 * ShippingType (NATIONAL, INTERNATIONSL)
+	 * ShippingBasisType (SHIPPING, BILLING)
+	 * ShippingPriceOptionType (ALL, LEAST, HIGHEST)
+	 * Packages
+	 * Handling
+	 * @param store
+	 * @return
+	 * @throws ServiceException
+	 */
+	ShippingConfiguration getShippingConfiguration(MerchantStore store)
+			throws ServiceException;
+
+	/**
+	 * Saves ShippingConfiguration for a given MerchantStore
+	 * @param shippingConfiguration
+	 * @param store
+	 * @throws ServiceException
+	 */
+	void saveShippingConfiguration(ShippingConfiguration shippingConfiguration,
+			MerchantStore store) throws ServiceException;
+
+	void removeShippingQuoteModuleConfiguration(String moduleCode,
+			MerchantStore store) throws ServiceException;
+
+	/**
+	 * Provides detailed information on boxes that will be used
+	 * when getting a ShippingQuote
+	 * @param products
+	 * @param store
+	 * @return
+	 * @throws ServiceException
+	 */
+	List<PackageDetails> getPackagesDetails(List<ShippingProduct> products,
+			MerchantStore store) throws ServiceException;
+
+	/**
+	 * Get a list of ShippingQuote from a configured
+	 * shipping gateway. The quotes are displayed to the end user so he can pick
+	 * the ShippingOption he wants
+	 * @param store
+	 * @param customer
+	 * @param products
+	 * @param language
+	 * @return
+	 * @throws ServiceException
+	 */
+	ShippingQuote getShippingQuote(MerchantStore store, Delivery delivery,
+			List<ShippingProduct> products, Language language)
+			throws ServiceException;
+	
+
+	/**
+	 * Returns a shipping module configuration given a moduleCode
+	 * @param moduleCode
+	 * @param store
+	 * @return
+	 * @throws ServiceException
+	 */
+	IntegrationConfiguration getShippingConfiguration(String moduleCode,
+			MerchantStore store) throws ServiceException;
+	
+	/**
+	 * Retrieves the custom configuration for a given module
+	 * @param moduleCode
+	 * @param store
+	 * @return
+	 * @throws ServiceException
+	 */
+
+
+	CustomIntegrationConfiguration getCustomShippingConfiguration(
+			String moduleCode, MerchantStore store) throws ServiceException;
+
+	/**
+	 * Weight based configuration
+	 * @param moduleCode
+	 * @param shippingConfiguration
+	 * @param store
+	 * @throws ServiceException
+	 */
+	void saveCustomShippingConfiguration(String moduleCode,
+			CustomIntegrationConfiguration shippingConfiguration,
+			MerchantStore store) throws ServiceException;
+
+	/**
+	 * Removes a custom shipping quote
+	 * module
+	 * @param moduleCode
+	 * @param store
+	 * @throws ServiceException
+	 */
+	void removeCustomShippingQuoteModuleConfiguration(String moduleCode,
+			MerchantStore store) throws ServiceException;
+
+	/**
+	 * The {@link ShippingSummary} is built from the ShippingOption the user has selected
+	 * The ShippingSummary is used for order calculation
+	 * @param store
+	 * @param shippingQuote
+	 * @param selectedShippingOption
+	 * @return
+	 * @throws ServiceException
+	 */
+	ShippingSummary getShippingSummary(MerchantStore store, ShippingQuote shippingQuote, 
+			ShippingOption selectedShippingOption) throws ServiceException;
+
+	/**
+	 * Returns a list of supported countries (ship to country list) configured by merchant
+	 * If the merchant configured shipping National, then only store country will be in the list
+	 * If the merchant configured shipping International, then the list of accepted country is returned
+	 * from the list
+	 * @param store
+	 * @param language
+	 * @return
+	 * @throws ServiceException
+	 */
+	List<Country> getShipToCountryList(MerchantStore store, Language language)
+			throws ServiceException;
+	
+	/**
+	 * Determines if Shipping should be proposed to the customer
+	 * @param items
+	 * @param store
+	 * @return
+	 * @throws ServiceException
+	 */
+	boolean requiresShipping(List<ShoppingCartItem> items, MerchantStore store) throws ServiceException;
+
+
+
+
+}
\ No newline at end of file

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/shipping/service/ShippingServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/shipping/service/ShippingServiceImpl.java
new file mode 100755
index 0000000..cca2e23
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/shipping/service/ShippingServiceImpl.java
@@ -0,0 +1,750 @@
+package com.salesmanager.core.business.shipping.service;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+
+import javax.annotation.Resource;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Validate;
+import org.codehaus.jackson.map.ObjectMapper;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONValue;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.salesmanager.core.business.catalog.product.model.Product;
+import com.salesmanager.core.business.catalog.product.model.price.FinalPrice;
+import com.salesmanager.core.business.catalog.product.service.PricingService;
+import com.salesmanager.core.business.common.model.Delivery;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.country.model.Country;
+import com.salesmanager.core.business.reference.country.service.CountryService;
+import com.salesmanager.core.business.reference.language.model.Language;
+import com.salesmanager.core.business.reference.language.service.LanguageService;
+import com.salesmanager.core.business.shipping.model.PackageDetails;
+import com.salesmanager.core.business.shipping.model.ShippingConfiguration;
+import com.salesmanager.core.business.shipping.model.ShippingOption;
+import com.salesmanager.core.business.shipping.model.ShippingOptionPriceType;
+import com.salesmanager.core.business.shipping.model.ShippingPackageType;
+import com.salesmanager.core.business.shipping.model.ShippingProduct;
+import com.salesmanager.core.business.shipping.model.ShippingQuote;
+import com.salesmanager.core.business.shipping.model.ShippingSummary;
+import com.salesmanager.core.business.shipping.model.ShippingType;
+import com.salesmanager.core.business.shoppingcart.model.ShoppingCartItem;
+import com.salesmanager.core.business.system.model.CustomIntegrationConfiguration;
+import com.salesmanager.core.business.system.model.IntegrationConfiguration;
+import com.salesmanager.core.business.system.model.IntegrationModule;
+import com.salesmanager.core.business.system.model.MerchantConfiguration;
+import com.salesmanager.core.business.system.model.MerchantLog;
+import com.salesmanager.core.business.system.service.MerchantConfigurationService;
+import com.salesmanager.core.business.system.service.MerchantLogService;
+import com.salesmanager.core.business.system.service.ModuleConfigurationService;
+import com.salesmanager.core.constants.ShippingConstants;
+import com.salesmanager.core.modules.integration.IntegrationException;
+import com.salesmanager.core.modules.integration.shipping.model.Packaging;
+import com.salesmanager.core.modules.integration.shipping.model.ShippingQuoteModule;
+import com.salesmanager.core.modules.utils.Encryption;
+import com.salesmanager.core.utils.reference.ConfigurationModulesLoader;
+
+@Service("shippingService")
+public class ShippingServiceImpl implements ShippingService {
+
+	private static final Logger LOGGER = LoggerFactory.getLogger(ShippingServiceImpl.class);
+	
+	
+	private final static String SUPPORTED_COUNTRIES = "SUPPORTED_CNTR";
+	private final static String SHIPPING_MODULES = "SHIPPING";
+	
+	@Autowired
+	private MerchantConfigurationService merchantConfigurationService;
+	
+
+	@Autowired
+	private PricingService pricingService;
+	
+	@Autowired
+	private ModuleConfigurationService moduleConfigurationService;
+	
+	@Autowired
+	private Packaging packaging;
+	
+	@Autowired
+	private CountryService countryService;
+	
+	@Autowired
+	private LanguageService languageService;
+	
+	@Autowired
+	private Encryption encryption;
+	
+	@Autowired
+	private MerchantLogService merchantLogService;
+	
+	@Autowired
+	@Resource(name="shippingModules")
+	private Map<String,ShippingQuoteModule> shippingModules;
+	
+	@Override
+	public ShippingConfiguration getShippingConfiguration(MerchantStore store) throws ServiceException {
+
+		MerchantConfiguration configuration = merchantConfigurationService.getMerchantConfiguration(ShippingConstants.SHIPPING_CONFIGURATION, store);
+		
+		ShippingConfiguration shippingConfiguration = null;
+		
+		if(configuration!=null) {
+			String value = configuration.getValue();
+			
+			ObjectMapper mapper = new ObjectMapper();
+			try {
+				shippingConfiguration = mapper.readValue(value, ShippingConfiguration.class);
+			} catch(Exception e) {
+				throw new ServiceException("Cannot parse json string " + value);
+			}
+		}
+		return shippingConfiguration;
+		
+	}
+	
+	@Override
+	public IntegrationConfiguration getShippingConfiguration(String moduleCode, MerchantStore store) throws ServiceException {
+
+		
+		Map<String,IntegrationConfiguration> configuredModules = getShippingModulesConfigured(store);
+		if(configuredModules!=null) {
+			for(String key : configuredModules.keySet()) {
+				if(key.equals(moduleCode)) {
+					return configuredModules.get(key);	
+				}
+			}
+		}
+		
+		return null;
+		
+	}
+	
+	@Override
+	public CustomIntegrationConfiguration getCustomShippingConfiguration(String moduleCode, MerchantStore store) throws ServiceException {
+
+		
+		ShippingQuoteModule quoteModule = (ShippingQuoteModule)shippingModules.get(moduleCode);
+		if(quoteModule==null) {
+			return null;
+		}
+		return quoteModule.getCustomModuleConfiguration(store);
+		
+	}
+	
+	@Override
+	public void saveShippingConfiguration(ShippingConfiguration shippingConfiguration, MerchantStore store) throws ServiceException {
+		
+		MerchantConfiguration configuration = merchantConfigurationService.getMerchantConfiguration(ShippingConstants.SHIPPING_CONFIGURATION, store);
+
+		if(configuration==null) {
+			configuration = new MerchantConfiguration();
+			configuration.setMerchantStore(store);
+			configuration.setKey(ShippingConstants.SHIPPING_CONFIGURATION);
+		}
+		
+		String value = shippingConfiguration.toJSONString();
+		configuration.setValue(value);
+		merchantConfigurationService.saveOrUpdate(configuration);
+		
+	}
+	
+	@Override
+	public void saveCustomShippingConfiguration(String moduleCode, CustomIntegrationConfiguration shippingConfiguration, MerchantStore store) throws ServiceException {
+		
+		
+		ShippingQuoteModule quoteModule = (ShippingQuoteModule)shippingModules.get(moduleCode);
+		if(quoteModule==null) {
+			throw new ServiceException("Shipping module " + moduleCode + " does not exist");
+		}
+		
+		String configurationValue = shippingConfiguration.toJSONString();
+		
+		
+		try {
+
+			MerchantConfiguration configuration = merchantConfigurationService.getMerchantConfiguration(moduleCode, store);
+	
+			if(configuration==null) {
+
+				configuration = new MerchantConfiguration();
+				configuration.setKey(moduleCode);
+				configuration.setMerchantStore(store);
+			}
+			configuration.setValue(configurationValue);
+			merchantConfigurationService.saveOrUpdate(configuration);
+		
+		} catch (Exception e) {
+			throw new IntegrationException(e);
+		}
+
+		
+		
+	}
+	
+
+	@Override
+	public List<IntegrationModule> getShippingMethods(MerchantStore store) throws ServiceException {
+		
+		List<IntegrationModule> modules =  moduleConfigurationService.getIntegrationModules(SHIPPING_MODULES);
+		List<IntegrationModule> returnModules = new ArrayList<IntegrationModule>();
+		
+		for(IntegrationModule module : modules) {
+			if(module.getRegionsSet().contains(store.getCountry().getIsoCode())
+					|| module.getRegionsSet().contains("*")) {
+				
+				returnModules.add(module);
+			}
+		}
+		
+		return returnModules;
+	}
+	
+	@Override
+	public void saveShippingQuoteModuleConfiguration(IntegrationConfiguration configuration, MerchantStore store) throws ServiceException {
+		
+			//validate entries
+			try {
+				
+				String moduleCode = configuration.getModuleCode();
+				ShippingQuoteModule quoteModule = (ShippingQuoteModule)shippingModules.get(moduleCode);
+				if(quoteModule==null) {
+					throw new ServiceException("Shipping quote module " + moduleCode + " does not exist");
+				}
+				quoteModule.validateModuleConfiguration(configuration, store);
+				
+			} catch (IntegrationException ie) {
+				throw ie;
+			}
+			
+			try {
+				Map<String,IntegrationConfiguration> modules = new HashMap<String,IntegrationConfiguration>();
+				MerchantConfiguration merchantConfiguration = merchantConfigurationService.getMerchantConfiguration(SHIPPING_MODULES, store);
+				if(merchantConfiguration!=null) {
+					if(!StringUtils.isBlank(merchantConfiguration.getValue())) {
+						
+						String decrypted = encryption.decrypt(merchantConfiguration.getValue());
+						modules = ConfigurationModulesLoader.loadIntegrationConfigurations(decrypted);
+					}
+				} else {
+					merchantConfiguration = new MerchantConfiguration();
+					merchantConfiguration.setMerchantStore(store);
+					merchantConfiguration.setKey(SHIPPING_MODULES);
+				}
+				modules.put(configuration.getModuleCode(), configuration);
+				
+				String configs =  ConfigurationModulesLoader.toJSONString(modules);
+				
+				String encrypted = encryption.encrypt(configs);
+				merchantConfiguration.setValue(encrypted);
+				merchantConfigurationService.saveOrUpdate(merchantConfiguration);
+				
+			} catch (Exception e) {
+				throw new ServiceException(e);
+			}
+	}
+	
+	
+	@Override
+	public void removeShippingQuoteModuleConfiguration(String moduleCode, MerchantStore store) throws ServiceException {
+		
+		
+
+		try {
+			Map<String,IntegrationConfiguration> modules = new HashMap<String,IntegrationConfiguration>();
+			MerchantConfiguration merchantConfiguration = merchantConfigurationService.getMerchantConfiguration(SHIPPING_MODULES, store);
+			if(merchantConfiguration!=null) {
+				if(!StringUtils.isBlank(merchantConfiguration.getValue())) {
+					String decrypted = encryption.decrypt(merchantConfiguration.getValue());
+					modules = ConfigurationModulesLoader.loadIntegrationConfigurations(decrypted);
+				}
+				
+				modules.remove(moduleCode);
+				String configs =  ConfigurationModulesLoader.toJSONString(modules);
+				String encrypted = encryption.encrypt(configs);
+				merchantConfiguration.setValue(encrypted);
+				merchantConfigurationService.saveOrUpdate(merchantConfiguration);
+				
+				
+			} 
+			
+			MerchantConfiguration configuration = merchantConfigurationService.getMerchantConfiguration(moduleCode, store);
+			
+			if(configuration!=null) {//custom module
+
+				merchantConfigurationService.delete(configuration);
+			}
+
+			
+		} catch (Exception e) {
+			throw new ServiceException(e);
+		}
+	
+	}
+	
+	@Override
+	public void removeCustomShippingQuoteModuleConfiguration(String moduleCode, MerchantStore store) throws ServiceException {
+		
+		
+
+		try {
+			
+			removeShippingQuoteModuleConfiguration(moduleCode,store);
+			MerchantConfiguration merchantConfiguration = merchantConfigurationService.getMerchantConfiguration(moduleCode, store);
+			if(merchantConfiguration!=null) {
+				merchantConfigurationService.delete(merchantConfiguration);
+			} 
+			
+			
+		} catch (Exception e) {
+			throw new ServiceException(e);
+		}
+	
+	}
+	
+	@Override
+	public Map<String,IntegrationConfiguration> getShippingModulesConfigured(MerchantStore store) throws ServiceException {
+		try {
+			
+
+			Map<String,IntegrationConfiguration> modules = new HashMap<String,IntegrationConfiguration>();
+			MerchantConfiguration merchantConfiguration = merchantConfigurationService.getMerchantConfiguration(SHIPPING_MODULES, store);
+			if(merchantConfiguration!=null) {
+				if(!StringUtils.isBlank(merchantConfiguration.getValue())) {
+					String decrypted = encryption.decrypt(merchantConfiguration.getValue());
+					modules = ConfigurationModulesLoader.loadIntegrationConfigurations(decrypted);
+					
+				}
+			}
+			return modules;
+		
+		
+		} catch (Exception e) {
+			throw new ServiceException(e);
+		}
+		
+	}
+	
+	@Override
+	public ShippingSummary getShippingSummary(MerchantStore store, ShippingQuote shippingQuote, ShippingOption selectedShippingOption) throws ServiceException {
+		
+		ShippingSummary shippingSummary = new ShippingSummary();
+		shippingSummary.setFreeShipping(shippingQuote.isFreeShipping());
+		shippingSummary.setHandling(shippingQuote.getHandlingFees());
+		shippingSummary.setShipping(selectedShippingOption.getOptionPrice());
+		shippingSummary.setShippingModule(shippingQuote.getShippingModuleCode());
+		shippingSummary.setShippingOption(selectedShippingOption.getDescription());
+		
+		return shippingSummary;
+	}
+
+	@Override
+	public ShippingQuote getShippingQuote(MerchantStore store, Delivery delivery, List<ShippingProduct> products, Language language) throws ServiceException  {
+		
+		ShippingQuote shippingQuote = new ShippingQuote();
+		ShippingQuoteModule shippingQuoteModule = null;
+		
+		try {
+		
+			//get configuration
+			ShippingConfiguration shippingConfiguration = getShippingConfiguration(store);
+			ShippingType shippingType = ShippingType.INTERNATIONAL;
+			
+			if(shippingConfiguration==null) {
+				shippingConfiguration = new ShippingConfiguration();
+			}
+			
+			if(shippingConfiguration.getShippingType()!=null) {
+					shippingType = shippingConfiguration.getShippingType();
+			}
+
+			//look if customer country code excluded
+			Country shipCountry = delivery.getCountry();
+			if(shipCountry==null) {
+				throw new ServiceException("Delivery country is null");
+			}
+			
+			//a ship to country is required
+			Validate.notNull(shipCountry);
+			Validate.notNull(store.getCountry());
+			
+			if(shippingType.name().equals(ShippingType.NATIONAL.name())){
+				//customer country must match store country
+				if(!shipCountry.getIsoCode().equals(store.getCountry().getIsoCode())) {
+					shippingQuote.setShippingReturnCode(ShippingQuote.NO_SHIPPING_TO_SELECTED_COUNTRY + " " + shipCountry.getIsoCode());
+					return shippingQuote;
+				}
+			} else if(shippingType.name().equals(ShippingType.INTERNATIONAL.name())){
+				
+				//customer shipping country code must be in accepted list
+				List<String> supportedCountries = this.getSupportedCountries(store);
+				if(!supportedCountries.contains(shipCountry.getIsoCode())) {
+					shippingQuote.setShippingReturnCode(ShippingQuote.NO_SHIPPING_TO_SELECTED_COUNTRY + " " + shipCountry.getIsoCode());
+					return shippingQuote;
+				}
+			}
+			
+			//must have a shipping module configured
+			Map<String, IntegrationConfiguration> modules = this.getShippingModulesConfigured(store);
+			if(modules==null){
+				shippingQuote.setShippingReturnCode(ShippingQuote.NO_SHIPPING_MODULE_CONFIGURED);
+				return shippingQuote;
+			}
+
+			
+			/** uses this module name **/
+			String moduleName = null;
+			IntegrationConfiguration configuration = null;
+			for(String module : modules.keySet()) {
+				moduleName = module;
+				configuration = modules.get(module);
+				//use the first active module
+				if(configuration.isActive()) {
+					shippingQuoteModule = this.shippingModules.get(module);
+					break;
+				}
+			}
+			
+			if(shippingQuoteModule==null){
+				shippingQuote.setShippingReturnCode(ShippingQuote.NO_SHIPPING_MODULE_CONFIGURED);
+				return shippingQuote;
+			}
+			
+			/** merchant module configs **/
+			List<IntegrationModule> shippingMethods = this.getShippingMethods(store);
+			IntegrationModule shippingModule = null;
+			for(IntegrationModule mod : shippingMethods) {
+				if(mod.getCode().equals(moduleName)){
+					shippingModule = mod;
+					break;
+				}
+			}
+			
+			/** general module configs **/
+			if(shippingModule==null) {
+				shippingQuote.setShippingReturnCode(ShippingQuote.NO_SHIPPING_MODULE_CONFIGURED);
+				return shippingQuote;
+			}
+			
+			//calculate order total
+			BigDecimal orderTotal = calculateOrderTotal(products,store);
+			List<PackageDetails> packages = this.getPackagesDetails(products, store);
+			
+			//free shipping ?
+			if(shippingConfiguration.isFreeShippingEnabled()) {
+				BigDecimal freeShippingAmount = shippingConfiguration.getOrderTotalFreeShipping();
+				if(freeShippingAmount!=null) {
+					if(orderTotal.doubleValue()>freeShippingAmount.doubleValue()) {
+						if(shippingConfiguration.getFreeShippingType() == ShippingType.NATIONAL) {
+							if(store.getCountry().getIsoCode().equals(shipCountry.getIsoCode())) {
+								shippingQuote.setFreeShipping(true);
+								shippingQuote.setFreeShippingAmount(freeShippingAmount);
+								return shippingQuote;
+							}
+						} else {//international all
+							shippingQuote.setFreeShipping(true);
+							shippingQuote.setFreeShippingAmount(freeShippingAmount);
+							return shippingQuote;
+						}
+	
+					}
+				}
+			}
+			
+
+			//handling fees
+			BigDecimal handlingFees = shippingConfiguration.getHandlingFees();
+			if(handlingFees!=null) {
+				shippingQuote.setHandlingFees(handlingFees);
+			}
+			
+			//tax basis
+			shippingQuote.setApplyTaxOnShipping(shippingConfiguration.isTaxOnShipping());
+			
+
+			Locale locale = languageService.toLocale(language);
+
+			//invoke module
+			List<ShippingOption> shippingOptions = null;
+					
+			try {
+				shippingOptions = shippingQuoteModule.getShippingQuotes(packages, orderTotal, delivery, store, configuration, shippingModule, shippingConfiguration, locale);
+			} catch(Exception e) {
+				LOGGER.error("Error while calculating shipping", e);
+				merchantLogService.save(
+						new MerchantLog(store,
+								"Can't process " + shippingModule.getModule()
+								+ " -> "
+								+ e.getMessage()));
+				shippingQuote.setQuoteError(e.getMessage());
+				shippingQuote.setShippingReturnCode(ShippingQuote.ERROR);
+				return shippingQuote;
+			}
+			
+			if(shippingOptions==null) {
+				shippingQuote.setShippingReturnCode(ShippingQuote.NO_SHIPPING_TO_SELECTED_COUNTRY);
+			}
+			
+			
+			shippingQuote.setShippingModuleCode(moduleName);	
+			
+			//filter shipping options
+			ShippingOptionPriceType shippingOptionPriceType = shippingConfiguration.getShippingOptionPriceType();
+			ShippingOption selectedOption = null;
+			
+			if(shippingOptions!=null) {
+				
+				for(ShippingOption option : shippingOptions) {
+					if(selectedOption==null) {
+						selectedOption = option;
+					}
+					//set price text
+					String priceText = pricingService.getDisplayAmount(option.getOptionPrice(), store);
+					option.setOptionPriceText(priceText);
+				
+					if(StringUtils.isBlank(option.getOptionName())) {
+						
+						String countryName = delivery.getCountry().getName();
+						if(countryName == null) {
+							Map<String,Country> deliveryCountries = countryService.getCountriesMap(language);
+							Country dCountry = (Country)deliveryCountries.get(delivery.getCountry().getIsoCode());
+							if(dCountry!=null) {
+								countryName = dCountry.getName();
+							} else {
+								countryName = delivery.getCountry().getIsoCode();
+							}
+						}
+							option.setOptionName(countryName);		
+					}
+				
+					if(shippingOptionPriceType.name().equals(ShippingOptionPriceType.HIGHEST.name())) {
+
+						if (option.getOptionPrice()
+								.longValue() > selectedOption
+								.getOptionPrice()
+								.longValue()) {
+							selectedOption = option;
+						}
+					}
+
+				
+					if(shippingOptionPriceType.name().equals(ShippingOptionPriceType.LEAST.name())) {
+
+						if (option.getOptionPrice()
+								.longValue() < selectedOption
+								.getOptionPrice()
+								.longValue()) {
+							selectedOption = option;
+						}
+					}
+					
+				
+					if(shippingOptionPriceType.name().equals(ShippingOptionPriceType.ALL.name())) {
+	
+						if (option.getOptionPrice()
+								.longValue() < selectedOption
+								.getOptionPrice()
+								.longValue()) {
+							selectedOption = option;
+						}
+					}
+
+				}
+				
+				shippingQuote.setSelectedShippingOption(selectedOption);
+				
+				if(selectedOption!=null && !shippingOptionPriceType.name().equals(ShippingOptionPriceType.ALL.name())) {
+					shippingOptions = new ArrayList<ShippingOption>();
+					shippingOptions.add(selectedOption);
+				}
+			
+			}
+			
+			shippingQuote.setShippingOptions(shippingOptions);
+			
+		} catch (Exception e) {
+			throw new ServiceException(e);
+		}
+		
+		return shippingQuote;
+		
+	}
+
+	@Override
+	public List<String> getSupportedCountries(MerchantStore store) throws ServiceException {
+		
+		List<String> supportedCountries = new ArrayList<String>();
+		MerchantConfiguration configuration = merchantConfigurationService.getMerchantConfiguration(SUPPORTED_COUNTRIES, store);
+		
+		if(configuration!=null) {
+			
+			String countries = configuration.getValue();
+			if(!StringUtils.isBlank(countries)) {
+
+				Object objRegions=JSONValue.parse(countries); 
+				JSONArray arrayRegions=(JSONArray)objRegions;
+				@SuppressWarnings("rawtypes")
+				Iterator i = arrayRegions.iterator();
+				while(i.hasNext()) {
+					supportedCountries.add((String)i.next());
+				}
+			}
+			
+		}
+		
+		return supportedCountries;
+	}
+	
+	@Override
+	public List<Country> getShipToCountryList(MerchantStore store, Language language) throws ServiceException {
+		
+		
+		ShippingConfiguration shippingConfiguration = getShippingConfiguration(store);
+		ShippingType shippingType = ShippingType.INTERNATIONAL;
+		List<String> supportedCountries = new ArrayList<String>();
+		if(shippingConfiguration==null) {
+			shippingConfiguration = new ShippingConfiguration();
+		}
+		
+		if(shippingConfiguration.getShippingType()!=null) {
+				shippingType = shippingConfiguration.getShippingType();
+		}
+
+		
+		if(shippingType.name().equals(ShippingType.NATIONAL.name())){
+			
+			supportedCountries.add(store.getCountry().getIsoCode());
+			
+		} else {
+
+			MerchantConfiguration configuration = merchantConfigurationService.getMerchantConfiguration(SUPPORTED_COUNTRIES, store);
+			
+			if(configuration!=null) {
+				
+				String countries = configuration.getValue();
+				if(!StringUtils.isBlank(countries)) {
+
+					Object objRegions=JSONValue.parse(countries); 
+					JSONArray arrayRegions=(JSONArray)objRegions;
+					@SuppressWarnings("rawtypes")
+					Iterator i = arrayRegions.iterator();
+					while(i.hasNext()) {
+						supportedCountries.add((String)i.next());
+					}
+				}
+				
+			}
+
+		}
+		
+		return countryService.getCountries(supportedCountries, language);
+
+	}
+	
+
+	@Override
+	public void setSupportedCountries(MerchantStore store, List<String> countryCodes) throws ServiceException {
+		
+		
+		//transform a list of string to json entry
+		ObjectMapper mapper = new ObjectMapper();
+		
+		try {
+			String value  = mapper.writeValueAsString(countryCodes);
+			
+			MerchantConfiguration configuration = merchantConfigurationService.getMerchantConfiguration(SUPPORTED_COUNTRIES, store);
+			
+			if(configuration==null) {
+				configuration = new MerchantConfiguration();
+				configuration.
+				setKey(SUPPORTED_COUNTRIES);
+				configuration.setMerchantStore(store);
+			} 
+			
+			configuration.setValue(value);
+
+			merchantConfigurationService.saveOrUpdate(configuration);
+			
+		} catch (Exception e) {
+			throw new ServiceException(e);
+		}
+
+	}
+	
+
+	private BigDecimal calculateOrderTotal(List<ShippingProduct> products, MerchantStore store) throws Exception {
+		
+		BigDecimal total = new BigDecimal(0);
+		for(ShippingProduct shippingProduct : products) {
+			FinalPrice price = pricingService.calculateProductPrice(shippingProduct.getProduct());
+			
+			BigDecimal currentPrice = price.getFinalPrice();
+			currentPrice = currentPrice.multiply(new BigDecimal(shippingProduct.getQuantity()));
+			total = total.add(currentPrice);
+		}
+		
+		
+		return total;
+		
+		
+	}
+
+	@Override
+	public List<PackageDetails> getPackagesDetails(
+			List<ShippingProduct> products, MerchantStore store)
+			throws ServiceException {
+		
+		List<PackageDetails> packages = null;
+		
+		ShippingConfiguration shippingConfiguration = this.getShippingConfiguration(store);
+		//determine if the system has to use BOX or ITEM
+		ShippingPackageType shippingPackageType = ShippingPackageType.ITEM;
+		if(shippingConfiguration!=null) {
+			shippingPackageType = shippingConfiguration.getShippingPackageType();
+		}
+		
+		if(shippingPackageType.name().equals(ShippingPackageType.BOX.name())){
+			packages = packaging.getBoxPackagesDetails(products, store);
+		} else {
+			packages = packaging.getItemPackagesDetails(products, store);
+		}
+		
+		return packages;
+		
+	}
+
+	@Override
+	public boolean requiresShipping(List<ShoppingCartItem> items,
+			MerchantStore store) throws ServiceException {
+
+		boolean requiresShipping = false;
+		for(ShoppingCartItem item : items) {
+			Product product = item.getProduct();
+			if(!product.isProductVirtual() && product.isProductShipeable()) {
+				requiresShipping = true;
+			}
+		}
+
+		return requiresShipping;		
+	}
+	
+
+
+
+
+}
+
+
+

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/shoppingcart/dao/ShoppingCartDao.java b/sm-core/src/main/java/com/salesmanager/core/business/shoppingcart/dao/ShoppingCartDao.java
new file mode 100644
index 0000000..4c804dd
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/shoppingcart/dao/ShoppingCartDao.java
@@ -0,0 +1,34 @@
+package com.salesmanager.core.business.shoppingcart.dao;
+
+import com.salesmanager.core.business.customer.model.Customer;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDao;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.shoppingcart.model.ShoppingCart;
+
+public interface ShoppingCartDao extends SalesManagerEntityDao<Long, ShoppingCart> {
+
+	ShoppingCart getById(Long id, MerchantStore store);
+
+	ShoppingCart getByCustomer(Customer customer);
+
+	ShoppingCart getByCode(String code, MerchantStore store);
+
+	/**
+	 * Get a ShoppingCart object without collection objects
+	 * @param id
+	 * @return
+	 */
+	ShoppingCart getShoppingCartById(Long id);
+
+	/**
+	 * Get a ShoppingCart object without collection objects
+	 * @param code
+	 * @return
+	 */
+	ShoppingCart getShoppingCartByCode(String code);
+
+	public void removeShoppingCart(ShoppingCart cart);
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/shoppingcart/dao/ShoppingCartDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/shoppingcart/dao/ShoppingCartDaoImpl.java
new file mode 100644
index 0000000..b0ddde4
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/shoppingcart/dao/ShoppingCartDaoImpl.java
@@ -0,0 +1,160 @@
+package com.salesmanager.core.business.shoppingcart.dao;
+
+import java.util.List;
+
+import javax.persistence.NonUniqueResultException;
+
+import org.springframework.stereotype.Repository;
+
+import com.mysema.query.jpa.JPQLQuery;
+import com.mysema.query.jpa.impl.JPAQuery;
+import com.salesmanager.core.business.customer.model.Customer;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDaoImpl;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.shoppingcart.model.QShoppingCart;
+import com.salesmanager.core.business.shoppingcart.model.QShoppingCartItem;
+import com.salesmanager.core.business.shoppingcart.model.ShoppingCart;
+
+@Repository("shoppingCartDao")
+public class ShoppingCartDaoImpl extends SalesManagerEntityDaoImpl<Long, ShoppingCart>
+		implements ShoppingCartDao {
+
+
+	@Override
+	public ShoppingCart getById(final Long id) {
+
+		try {
+			QShoppingCart qShoppingCart = QShoppingCart.shoppingCart;
+			QShoppingCartItem qShoppingCartItem = QShoppingCartItem.shoppingCartItem;
+
+			JPQLQuery query = new JPAQuery (getEntityManager());
+
+			query.from(qShoppingCart)
+				.leftJoin(qShoppingCart.lineItems, qShoppingCartItem).fetch()
+				.leftJoin(qShoppingCartItem.attributes).fetch()
+				.leftJoin(qShoppingCart.merchantStore).fetch()
+				.where(qShoppingCart.id.eq(id));
+
+			return query.uniqueResult(qShoppingCart);
+		} catch(javax.persistence.NoResultException ers) {
+			return null;
+		}
+
+	}
+
+	@Override
+	public ShoppingCart getShoppingCartById(final Long id) {
+
+			QShoppingCart qShoppingCart = QShoppingCart.shoppingCart;
+
+			JPQLQuery query = new JPAQuery (getEntityManager());
+
+			query.from(qShoppingCart)
+				.leftJoin(qShoppingCart.merchantStore).fetch()
+				.where(qShoppingCart.id.eq(id));
+
+			return query.uniqueResult(qShoppingCart);
+
+	}
+
+	@Override
+	public ShoppingCart getShoppingCartByCode(final String code) {
+
+			QShoppingCart qShoppingCart = QShoppingCart.shoppingCart;
+
+			JPQLQuery query = new JPAQuery (getEntityManager());
+
+			query.from(qShoppingCart)
+				.leftJoin(qShoppingCart.merchantStore).fetch()
+				.where(qShoppingCart.shoppingCartCode.eq(code));
+
+			List<ShoppingCart> results = query.list(qShoppingCart);
+	        if (results.isEmpty()) return null;
+	        
+	        else if (results.size() >= 1) return results.get(0);
+	        return null;
+
+
+	}
+
+	@Override
+	public ShoppingCart getById(final Long id, final MerchantStore store) {
+
+		try {
+
+			QShoppingCart qShoppingCart = QShoppingCart.shoppingCart;
+			QShoppingCartItem qShoppingCartItem = QShoppingCartItem.shoppingCartItem;
+
+			JPQLQuery query = new JPAQuery (getEntityManager());
+
+			query.from(qShoppingCart)
+				.leftJoin(qShoppingCart.lineItems, qShoppingCartItem).fetch()
+				.leftJoin(qShoppingCartItem.attributes).fetch()
+				.leftJoin(qShoppingCart.merchantStore).fetch()
+				.where(qShoppingCart.id.eq(id)
+						.and(qShoppingCart.merchantStore.id.eq(store.getId())));
+
+			return query.uniqueResult(qShoppingCart);
+
+		} catch(javax.persistence.NoResultException ers) {
+			return null;
+		}
+
+	}
+
+	@Override
+	public ShoppingCart getByCode(final String code, final MerchantStore store) {
+
+
+			QShoppingCart qShoppingCart = QShoppingCart.shoppingCart;
+			QShoppingCartItem qShoppingCartItem = QShoppingCartItem.shoppingCartItem;
+
+			JPQLQuery query = new JPAQuery (getEntityManager());
+
+			query.from(qShoppingCart)
+				.leftJoin(qShoppingCart.lineItems, qShoppingCartItem).fetch()
+				.leftJoin(qShoppingCartItem.attributes).fetch()
+				.leftJoin(qShoppingCart.merchantStore).fetch()
+				.where(qShoppingCart.shoppingCartCode.eq(code)
+						.and(qShoppingCart.merchantStore.id.eq(store.getId())));
+
+			List<ShoppingCart> results = query.list(qShoppingCart);
+	        if (results.isEmpty()) return null;
+	        
+	        else if (results.size() >= 1) return results.get(0);
+	        return null;
+
+	}
+
+	@Override
+	public ShoppingCart getByCustomer(final Customer customer) {
+
+			QShoppingCart qShoppingCart = QShoppingCart.shoppingCart;
+			QShoppingCartItem qShoppingCartItem = QShoppingCartItem.shoppingCartItem;
+
+			JPQLQuery query = new JPAQuery (getEntityManager());
+
+			query.from(qShoppingCart)
+				.leftJoin(qShoppingCart.lineItems, qShoppingCartItem).fetch()
+				.leftJoin(qShoppingCartItem.attributes).fetch()
+				.leftJoin(qShoppingCart.merchantStore).fetch()
+				.where(qShoppingCart.customerId.eq(customer.getId()));
+			
+			List<ShoppingCart> results = query.list(qShoppingCart);
+	        if (results.isEmpty()) return null;
+	        
+	        else if (results.size() >= 1) return results.get(0);
+	        return null;
+
+	}
+
+    @Override
+    public void removeShoppingCart( final ShoppingCart cart )
+    {
+            ShoppingCart shoppingCart=getEntityManager().merge( cart );
+            getEntityManager().remove( shoppingCart );
+   }
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/shoppingcart/dao/ShoppingCartItemDao.java b/sm-core/src/main/java/com/salesmanager/core/business/shoppingcart/dao/ShoppingCartItemDao.java
new file mode 100644
index 0000000..3c88594
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/shoppingcart/dao/ShoppingCartItemDao.java
@@ -0,0 +1,10 @@
+package com.salesmanager.core.business.shoppingcart.dao;
+
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDao;
+import com.salesmanager.core.business.shoppingcart.model.ShoppingCartItem;
+
+public interface ShoppingCartItemDao extends SalesManagerEntityDao<Long, ShoppingCartItem> {
+
+
+	
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/shoppingcart/dao/ShoppingCartItemDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/shoppingcart/dao/ShoppingCartItemDaoImpl.java
new file mode 100644
index 0000000..9212f88
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/shoppingcart/dao/ShoppingCartItemDaoImpl.java
@@ -0,0 +1,14 @@
+package com.salesmanager.core.business.shoppingcart.dao;
+
+import org.springframework.stereotype.Repository;
+
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDaoImpl;
+import com.salesmanager.core.business.shoppingcart.model.ShoppingCartItem;
+
+@Repository("shoppingCartItemDao")
+public class ShoppingCartItemDaoImpl extends SalesManagerEntityDaoImpl<Long, ShoppingCartItem>
+		implements ShoppingCartItemDao {
+	
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/shoppingcart/model/ShoppingCart.java b/sm-core/src/main/java/com/salesmanager/core/business/shoppingcart/model/ShoppingCart.java
new file mode 100644
index 0000000..7635a7c
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/shoppingcart/model/ShoppingCart.java
@@ -0,0 +1,150 @@
+/**
+ * 
+ */
+package com.salesmanager.core.business.shoppingcart.model;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+import javax.persistence.Transient;
+
+import org.hibernate.annotations.Index;
+
+import com.salesmanager.core.business.common.model.audit.AuditListener;
+import com.salesmanager.core.business.common.model.audit.AuditSection;
+import com.salesmanager.core.business.common.model.audit.Auditable;
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.constants.SchemaConstant;
+
+/**
+ * <p>Shopping cart is responsible for storing and carrying
+ * shopping cart information.Shopping Cart consists of {@link ShoppingCartItem}
+ * which represents individual lines items associated with the shopping cart</p> 
+ * @author Umesh Awasthi
+ * version 2.0
+ *
+ */
+@Entity
+@EntityListeners(value = AuditListener.class)
+@Table(name = "SHOPPING_CART", schema=SchemaConstant.SALESMANAGER_SCHEMA)
+public class ShoppingCart extends SalesManagerEntity<Long, ShoppingCart> implements Auditable{
+
+	
+	private static final long serialVersionUID = 1L;
+	
+	@Embedded
+	private AuditSection auditSection = new AuditSection();
+	
+	@Id
+	@Column(name = "SHP_CART_ID", unique=true, nullable=false)
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT", pkColumnValue = "SHP_CRT_SEQ_NEXT_VAL")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Long id;
+	
+	/**
+	 * Will be used to fetch shopping cart model from the controller
+	 * this is a unique code that should be attributed from the client (UI)
+	 * 
+	 */
+	@Index(name="SHP_CART_CODE_IDX")
+	@Column(name = "SHP_CART_CODE", unique=true, nullable=false)
+	private String shoppingCartCode;
+	
+	@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, orphanRemoval=true, mappedBy = "shoppingCart")
+	private Set<ShoppingCartItem> lineItems = new HashSet<ShoppingCartItem>();
+	
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name="MERCHANT_ID", nullable=false)
+	private MerchantStore merchantStore;
+	
+	@Index(name="SHP_CART_CUSTOMER_IDX")
+	@Column(name = "CUSTOMER_ID", nullable = true)
+	private Long customerId;
+	
+	@Transient
+	private boolean obsolete = false;//when all items are obsolete
+    
+	@Override
+	public AuditSection getAuditSection() {
+		return auditSection;
+	}
+
+	@Override
+	public void setAuditSection(AuditSection audit) {
+		this.auditSection = audit;
+		
+	}
+	
+	@Override
+	public Long getId() {
+		return id;
+	}
+
+	@Override
+	public void setId(Long id) {
+		this.id = id;
+		
+	}
+	
+
+	public boolean isObsolete() {
+		return obsolete;
+	}
+
+	public void setObsolete(boolean obsolete) {
+		this.obsolete = obsolete;
+	}
+
+	public Set<ShoppingCartItem> getLineItems() {
+		return lineItems;
+	}
+
+	public void setLineItems(Set<ShoppingCartItem> lineItems) {
+		this.lineItems = lineItems;
+	}
+
+    public String getShoppingCartCode()
+    {
+        return shoppingCartCode;
+    }
+
+    public void setShoppingCartCode( String shoppingCartCode )
+    {
+        this.shoppingCartCode = shoppingCartCode;
+    }
+
+
+	public void setCustomerId(Long customerId) {
+		this.customerId = customerId;
+	}
+
+	public Long getCustomerId() {
+		return customerId;
+	}
+
+	public void setMerchantStore(MerchantStore merchantStore) {
+		this.merchantStore = merchantStore;
+	}
+
+	public MerchantStore getMerchantStore() {
+		return merchantStore;
+	}
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/shoppingcart/model/ShoppingCartAttributeItem.java b/sm-core/src/main/java/com/salesmanager/core/business/shoppingcart/model/ShoppingCartAttributeItem.java
new file mode 100644
index 0000000..717fbb4
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/shoppingcart/model/ShoppingCartAttributeItem.java
@@ -0,0 +1,115 @@
+package com.salesmanager.core.business.shoppingcart.model;
+
+import javax.persistence.Column;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+import javax.persistence.Transient;
+
+import com.salesmanager.core.business.catalog.product.model.attribute.ProductAttribute;
+import com.salesmanager.core.business.common.model.audit.AuditListener;
+import com.salesmanager.core.business.common.model.audit.AuditSection;
+import com.salesmanager.core.business.common.model.audit.Auditable;
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.constants.SchemaConstant;
+
+
+@Entity
+@EntityListeners(value = AuditListener.class)
+@Table(name = "SHOPPING_CART_ATTR_ITEM", schema=SchemaConstant.SALESMANAGER_SCHEMA)
+public class ShoppingCartAttributeItem extends SalesManagerEntity<Long, ShoppingCartAttributeItem> implements Auditable {
+
+
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	@Column(name = "SHP_CART_ATTR_ITEM_ID", unique=true, nullable=false)
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT", pkColumnValue = "SHP_CRT_ATTR_ITM_SEQ_NEXT_VAL")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Long id;
+
+	@Embedded
+	private AuditSection auditSection = new AuditSection();
+	
+
+	
+	@Column(name="PRODUCT_ATTR_ID", nullable=false)
+	private Long productAttributeId;
+	
+	@Transient
+	private ProductAttribute productAttribute;
+	
+
+	
+	@ManyToOne(targetEntity = ShoppingCartItem.class)
+	@JoinColumn(name = "SHP_CART_ITEM_ID", nullable = false)
+	private ShoppingCartItem shoppingCartItem;
+	
+	public ShoppingCartAttributeItem(ShoppingCartItem shoppingCartItem, ProductAttribute productAttribute) {
+		this.shoppingCartItem = shoppingCartItem;
+		this.productAttribute = productAttribute;
+		this.productAttributeId = productAttribute.getId();
+	}
+	
+	public ShoppingCartAttributeItem() {
+
+	}
+	
+	
+
+	public ShoppingCartItem getShoppingCartItem() {
+		return shoppingCartItem;
+	}
+
+	public void setShoppingCartItem(ShoppingCartItem shoppingCartItem) {
+		this.shoppingCartItem = shoppingCartItem;
+	}
+
+	@Override
+	public AuditSection getAuditSection() {
+		return auditSection;
+	}
+
+	@Override
+	public void setAuditSection(AuditSection audit) {
+		this.auditSection = audit;
+		
+	}
+
+	@Override
+	public Long getId() {
+		return id;
+	}
+
+	@Override
+	public void setId(Long id) {
+		this.id = id;
+		
+	}
+
+
+	public void setProductAttributeId(Long productAttributeId) {
+		this.productAttributeId = productAttributeId;
+	}
+
+	public Long getProductAttributeId() {
+		return productAttributeId;
+	}
+
+	public void setProductAttribute(ProductAttribute productAttribute) {
+		this.productAttribute = productAttribute;
+	}
+
+	public ProductAttribute getProductAttribute() {
+		return productAttribute;
+	}
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/shoppingcart/model/ShoppingCartItem.java b/sm-core/src/main/java/com/salesmanager/core/business/shoppingcart/model/ShoppingCartItem.java
new file mode 100644
index 0000000..9283bee
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/shoppingcart/model/ShoppingCartItem.java
@@ -0,0 +1,229 @@
+package com.salesmanager.core.business.shoppingcart.model;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+import javax.persistence.Transient;
+
+import com.salesmanager.core.business.catalog.product.model.Product;
+import com.salesmanager.core.business.catalog.product.model.price.FinalPrice;
+import com.salesmanager.core.business.common.model.audit.AuditListener;
+import com.salesmanager.core.business.common.model.audit.AuditSection;
+import com.salesmanager.core.business.common.model.audit.Auditable;
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.constants.SchemaConstant;
+
+
+@Entity
+@EntityListeners(value = AuditListener.class)
+@Table(name = "SHOPPING_CART_ITEM", schema=SchemaConstant.SALESMANAGER_SCHEMA)
+public class ShoppingCartItem extends SalesManagerEntity<Long, ShoppingCartItem> implements Auditable, Serializable {
+
+
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	@Column(name = "SHP_CART_ITEM_ID", unique=true, nullable=false)
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT", pkColumnValue = "SHP_CRT_ITM_SEQ_NEXT_VAL")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Long id;
+	
+	@ManyToOne(targetEntity = ShoppingCart.class)
+	@JoinColumn(name = "SHP_CART_ID", nullable = false)
+	private ShoppingCart shoppingCart;
+
+	@Column(name="QUANTITY")
+	private Integer quantity = new Integer(1);
+
+
+	@Embedded
+	private AuditSection auditSection = new AuditSection();
+	
+	@Column(name="PRODUCT_ID", nullable=false)
+	private Long productId;
+	
+	@Transient
+	private boolean productVirtual;
+
+	@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, orphanRemoval=true, mappedBy = "shoppingCartItem")
+	private Set<ShoppingCartAttributeItem> attributes = new HashSet<ShoppingCartAttributeItem>();
+	
+	@Transient
+	private BigDecimal itemPrice;//item final price including all rebates
+	
+	@Transient
+	private BigDecimal subTotal;//item final price * quantity
+	
+	@Transient
+	private FinalPrice finalPrice;//contains price details (raw prices)
+	
+
+	@Transient
+	private Product product;
+	
+	@Transient
+	private boolean obsolete = false;
+
+
+
+
+	public ShoppingCartItem(ShoppingCart shoppingCart, Product product) {
+		this.product = product;
+		this.productId = product.getId();
+		this.quantity = 1;
+		this.shoppingCart = shoppingCart;
+		
+	}
+	
+	public ShoppingCartItem(Product product) {
+		this.product = product;
+		this.productId = product.getId();
+		this.quantity = 1;
+
+	}
+	
+	public ShoppingCartItem() {
+		
+	}
+
+	@Override
+	public AuditSection getAuditSection() {
+		return auditSection;
+	}
+
+	@Override
+	public void setAuditSection(AuditSection audit) {
+		this.auditSection = audit;
+		
+	}
+
+	@Override
+	public Long getId() {
+		return id;
+	}
+
+	@Override
+	public void setId(Long id) {
+		this.id = id;
+		
+	}
+
+
+
+	public void setAttributes(Set<ShoppingCartAttributeItem> attributes) {
+	    this.attributes.clear();
+	    this.attributes.addAll( attributes );
+	    //this.attributes = attributes;
+	}
+
+	public Set<ShoppingCartAttributeItem> getAttributes() {
+		return attributes;
+	}
+
+	public void setItemPrice(BigDecimal itemPrice) {
+		this.itemPrice = itemPrice;
+	}
+
+	public BigDecimal getItemPrice() {
+		return itemPrice;
+	}
+
+	public void setQuantity(Integer quantity) {
+		this.quantity = quantity;
+	}
+
+	public Integer getQuantity() {
+		return quantity;
+	}
+
+
+
+	public ShoppingCart getShoppingCart() {
+		return shoppingCart;
+	}
+
+	public void setShoppingCart(ShoppingCart shoppingCart) {
+		this.shoppingCart = shoppingCart;
+	}
+
+	public void setProductId(Long productId) {
+		this.productId = productId;
+	}
+
+	public Long getProductId() {
+		return productId;
+	}
+
+	public void setProduct(Product product) {
+		this.product = product;
+	}
+
+	public Product getProduct() {
+		return product;
+	}
+	
+	public void addAttributes(ShoppingCartAttributeItem shoppingCartAttributeItem)
+	{
+	    this.attributes.add(shoppingCartAttributeItem);
+	}
+	
+	public void removeAttributes(ShoppingCartAttributeItem shoppingCartAttributeItem)
+	{
+	    this.attributes.remove(shoppingCartAttributeItem);
+	}
+
+	public void removeAllAttributes(){
+		this.attributes.removeAll(Collections.EMPTY_SET);
+	}
+
+	public void setSubTotal(BigDecimal subTotal) {
+		this.subTotal = subTotal;
+	}
+
+	public BigDecimal getSubTotal() {
+		return subTotal;
+	}
+
+	public void setFinalPrice(FinalPrice finalPrice) {
+		this.finalPrice = finalPrice;
+	}
+
+	public FinalPrice getFinalPrice() {
+		return finalPrice;
+	}
+	
+	public boolean isObsolete() {
+		return obsolete;
+	}
+
+	public void setObsolete(boolean obsolete) {
+		this.obsolete = obsolete;
+	}
+	
+
+	public boolean isProductVirtual() {
+		return productVirtual;
+	}
+
+	public void setProductVirtual(boolean productVirtual) {
+		this.productVirtual = productVirtual;
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/shoppingcart/service/ShoppingCartCalculationService.java b/sm-core/src/main/java/com/salesmanager/core/business/shoppingcart/service/ShoppingCartCalculationService.java
new file mode 100644
index 0000000..f5543d9
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/shoppingcart/service/ShoppingCartCalculationService.java
@@ -0,0 +1,43 @@
+/**
+ *
+ */
+package com.salesmanager.core.business.shoppingcart.service;
+
+import com.salesmanager.core.business.customer.model.Customer;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.order.model.OrderTotalSummary;
+import com.salesmanager.core.business.reference.language.model.Language;
+import com.salesmanager.core.business.shoppingcart.model.ShoppingCart;
+
+/**
+ * Interface declaring various methods used to calculate {@link ShoppingCart}
+ * object details.
+ * @author Umesh Awasthi
+ * @since 1.2
+ *
+ */
+public interface ShoppingCartCalculationService
+{
+    /**
+     * Method which will be used to calculate price for each line items as
+     * well Total and Sub-total for {@link ShoppingCart}.
+     * @param cartModel ShoopingCart mode representing underlying DB object
+     * @param customer
+     * @param store
+     * @param language
+     * @throws ServiceException
+     */
+    public OrderTotalSummary calculate(final ShoppingCart cartModel,final Customer customer, final MerchantStore store, final Language language) throws ServiceException;
+
+
+    /**
+     * Method which will be used to calculate price for each line items as
+     * well Total and Sub-total for {@link ShoppingCart}.
+     * @param cartModel ShoopingCart mode representing underlying DB object
+     * @param store
+     * @param language
+     * @throws ServiceException
+     */
+    public OrderTotalSummary calculate(final ShoppingCart cartModel, final MerchantStore store, final Language language) throws ServiceException;
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/shoppingcart/service/ShoppingCartCalculationServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/shoppingcart/service/ShoppingCartCalculationServiceImpl.java
new file mode 100644
index 0000000..d6d9375
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/shoppingcart/service/ShoppingCartCalculationServiceImpl.java
@@ -0,0 +1,123 @@
+/**
+ *
+ */
+package com.salesmanager.core.business.shoppingcart.service;
+
+import org.apache.commons.lang.Validate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.salesmanager.core.business.customer.model.Customer;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.order.model.OrderTotalSummary;
+import com.salesmanager.core.business.order.service.OrderService;
+import com.salesmanager.core.business.order.service.OrderServiceImpl;
+import com.salesmanager.core.business.reference.language.model.Language;
+import com.salesmanager.core.business.shoppingcart.model.ShoppingCart;
+import com.salesmanager.core.business.shoppingcart.model.ShoppingCartItem;
+/**
+ * <p>Implementation class responsible for calculating state of shopping cart.
+ * This class will take care of calculating price of each line items of shopping cart
+ * as well any discount including sub-total and total amount.
+ * </p>
+ *
+ * @author Umesh Awasthi
+ * @version 1.2
+ */
+@Service("shoppingCartCalculationService")
+public class ShoppingCartCalculationServiceImpl implements ShoppingCartCalculationService
+{
+
+
+    protected  final Logger LOG = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private ShoppingCartService shoppingCartService;
+
+    @Autowired
+    private OrderService orderService;
+
+
+
+    /**
+     * <p>Method used to recalculate state of shopping cart every time any change has been made
+     * to underlying {@link ShoppingCart} object in DB.</p>
+     * Following operations will be performed by this method.
+     *
+     * <li>Calculate price for each {@link ShoppingCartItem} and update it. </li>
+     * <p>
+     * This method is backbone method for all price calculation related to shopping cart.</p>
+     *
+     * @see OrderServiceImpl
+     *
+     * @param cartModel
+     * @param customer
+     * @param store
+     * @param language
+     * @throws ServiceException
+     */
+    @Override
+    public OrderTotalSummary calculate( final ShoppingCart cartModel ,final Customer customer, final MerchantStore store, final Language language ) throws ServiceException
+    {
+
+        Validate.notNull(cartModel,"cart cannot be null");
+        Validate.notNull(cartModel.getLineItems(),"Cart should have line items.");
+        Validate.notNull(store,"MerchantStore cannot be null");
+        Validate.notNull(customer,"Customer cannot be null");
+        OrderTotalSummary orderTotalSummary=orderService.calculateShoppingCartTotal( cartModel, customer,store, language );
+        updateCartModel(cartModel);
+        return orderTotalSummary;
+
+
+    }
+
+
+    /**
+     * <p>Method used to recalculate state of shopping cart every time any change has been made
+     * to underlying {@link ShoppingCart} object in DB.</p>
+     * Following operations will be performed by this method.
+     *
+     * <li>Calculate price for each {@link ShoppingCartItem} and update it. </li>
+     * <p>
+     * This method is backbone method for all price calculation related to shopping cart.</p>
+     *
+     * @see OrderServiceImpl
+     *
+     * @param cartModel
+     * @param store
+     * @param language
+     * @throws ServiceException
+     */
+    @Override
+    public OrderTotalSummary calculate( final ShoppingCart cartModel , final MerchantStore store, final Language language ) throws ServiceException
+    {
+
+        Validate.notNull(cartModel,"cart cannot be null");
+        Validate.notNull(cartModel.getLineItems(),"Cart should have line items.");
+        Validate.notNull(store,"MerchantStore cannot be null");
+        OrderTotalSummary orderTotalSummary=orderService.calculateShoppingCartTotal( cartModel, store, language );
+        updateCartModel(cartModel);
+        return orderTotalSummary;
+
+
+    }
+
+
+
+    public ShoppingCartService getShoppingCartService()
+    {
+        return shoppingCartService;
+    }
+
+
+    private void updateCartModel(final ShoppingCart cartModel) throws ServiceException{
+        shoppingCartService.saveOrUpdate( cartModel );
+    }
+
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/shoppingcart/service/ShoppingCartService.java b/sm-core/src/main/java/com/salesmanager/core/business/shoppingcart/service/ShoppingCartService.java
new file mode 100644
index 0000000..6c3cab8
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/shoppingcart/service/ShoppingCartService.java
@@ -0,0 +1,86 @@
+package com.salesmanager.core.business.shoppingcart.service;
+
+import java.util.List;
+
+import com.salesmanager.core.business.catalog.product.model.Product;
+import com.salesmanager.core.business.customer.model.Customer;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityService;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.shipping.model.ShippingProduct;
+import com.salesmanager.core.business.shoppingcart.model.ShoppingCart;
+import com.salesmanager.core.business.shoppingcart.model.ShoppingCartItem;
+
+
+public interface ShoppingCartService extends SalesManagerEntityService<Long, ShoppingCart> {
+
+	ShoppingCart getShoppingCart(Customer customer) throws ServiceException;
+
+	void saveOrUpdate(ShoppingCart shoppingCart) throws ServiceException;
+
+	ShoppingCart getById(Long id, MerchantStore store) throws ServiceException;
+
+	ShoppingCart getByCode(String code, MerchantStore store)
+			throws ServiceException;
+
+	ShoppingCart getByCustomer(Customer customer) throws ServiceException;
+
+	/**
+	 * Creates a list of ShippingProduct based on the ShoppingCart
+	 * if items are virtual return list will be null
+	 * @param cart
+	 * @return
+	 * @throws ServiceException
+	 */
+	List<ShippingProduct> createShippingProduct(ShoppingCart cart)
+			throws ServiceException;
+
+
+
+	/**
+	 * Looks if the items in the ShoppingCart are free of charges
+	 * @param cart
+	 * @return
+	 * @throws ServiceException
+	 */
+	boolean isFreeShoppingCart(ShoppingCart cart) throws ServiceException;
+	
+	boolean isFreeShoppingCart(List<ShoppingCartItem> items) throws ServiceException;
+
+	/**
+	 * Populates a ShoppingCartItem from a Product and attributes if any
+	 * @param product
+	 * @return
+	 * @throws ServiceException
+	 */
+	ShoppingCartItem populateShoppingCartItem(Product product)
+			throws ServiceException;
+	
+	void deleteCart(ShoppingCart cart) throws ServiceException;
+
+
+	void removeShoppingCart(ShoppingCart cart) throws ServiceException;
+
+	/**
+	 *
+	 * @param userShoppingModel
+	 * @param sessionCart
+	 * @param store
+	 * @return {@link ShoppingCart} merged Shopping Cart
+	 * @throws Exception
+	 */
+	public ShoppingCart mergeShoppingCarts(final ShoppingCart userShoppingCart,final ShoppingCart sessionCart,final MerchantStore store  ) throws Exception;
+
+	/**
+	 * Determines if the shopping cart requires shipping
+	 * @param cart
+	 * @return
+	 * @throws ServiceException
+	 */
+	boolean requiresShipping(ShoppingCart cart) throws ServiceException;
+
+
+
+
+
+}
\ No newline at end of file

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/shoppingcart/service/ShoppingCartServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/shoppingcart/service/ShoppingCartServiceImpl.java
new file mode 100644
index 0000000..bfdf486
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/shoppingcart/service/ShoppingCartServiceImpl.java
@@ -0,0 +1,542 @@
+package com.salesmanager.core.business.shoppingcart.service;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.Validate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.salesmanager.core.business.catalog.product.model.Product;
+import com.salesmanager.core.business.catalog.product.model.attribute.ProductAttribute;
+import com.salesmanager.core.business.catalog.product.model.price.FinalPrice;
+import com.salesmanager.core.business.catalog.product.service.PricingService;
+import com.salesmanager.core.business.catalog.product.service.ProductService;
+import com.salesmanager.core.business.catalog.product.service.attribute.ProductAttributeService;
+import com.salesmanager.core.business.customer.model.Customer;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityServiceImpl;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.shipping.model.ShippingProduct;
+import com.salesmanager.core.business.shoppingcart.dao.ShoppingCartDao;
+import com.salesmanager.core.business.shoppingcart.dao.ShoppingCartItemDao;
+import com.salesmanager.core.business.shoppingcart.model.ShoppingCart;
+import com.salesmanager.core.business.shoppingcart.model.ShoppingCartAttributeItem;
+import com.salesmanager.core.business.shoppingcart.model.ShoppingCartItem;
+
+@Service("shoppingCartService")
+public class ShoppingCartServiceImpl extends SalesManagerEntityServiceImpl<Long, ShoppingCart> implements ShoppingCartService {
+
+
+	private final ShoppingCartDao shoppingCartDao;
+
+	@Autowired
+	private ProductService productService;
+
+	@Autowired
+	private ShoppingCartItemDao shoppingCartItemDao;
+
+	@Autowired
+	private PricingService pricingService;
+
+	@Autowired
+    private ProductAttributeService productAttributeService;
+
+	private static final Logger LOGGER = LoggerFactory.getLogger(ShoppingCartServiceImpl.class);
+
+	@Autowired
+	public ShoppingCartServiceImpl(
+			final ShoppingCartDao shoppingCartDao) {
+		super(shoppingCartDao);
+		this.shoppingCartDao = shoppingCartDao;
+
+	}
+
+
+	/**
+	 * Retrieve a {@link ShoppingCart} cart for a given customer
+	 */
+	@Override
+    @Transactional
+	public ShoppingCart getShoppingCart(final Customer customer) throws ServiceException {
+
+		try {
+
+			ShoppingCart shoppingCart = shoppingCartDao.getByCustomer(customer);
+			populateShoppingCart(shoppingCart);
+			if(shoppingCart!=null && shoppingCart.isObsolete()) {
+				delete(shoppingCart);
+				return null;
+			} else {
+				return shoppingCart;
+			}
+
+
+		} catch (Exception e) {
+			throw new ServiceException(e);
+		}
+
+	}
+
+	/**
+	 * Save or update a {@link ShoppingCart} for a given customer
+	 */
+	@Override
+    public void saveOrUpdate(final ShoppingCart shoppingCart) throws ServiceException {
+		if(shoppingCart.getId()==null || shoppingCart.getId().longValue()==0) {
+			super.create(shoppingCart);
+		} else {
+			super.update(shoppingCart);
+		}
+	}
+
+	/**
+	 * Get a {@link ShoppingCart} for a given id and MerchantStore. Will update the shopping cart
+	 * prices and items based on the actual inventory. This method will remove the shopping cart if
+	 * no items are attached.
+	 */
+	@Override
+	@Transactional
+	public ShoppingCart getById(final Long id, final MerchantStore store) throws ServiceException {
+
+		try {
+			ShoppingCart shoppingCart = shoppingCartDao.getById(id, store);
+			if(shoppingCart==null) {
+				return null;
+			}
+			populateShoppingCart(shoppingCart);
+
+			if(shoppingCart.isObsolete()) {
+				delete(shoppingCart);
+				return null;
+			} else {
+				return shoppingCart;
+			}
+
+
+		} catch (Exception e) {
+			throw new ServiceException(e);
+		}
+
+
+	}
+
+	/**
+	 * Get a {@link ShoppingCart} for a given id. Will update the shopping cart
+	 * prices and items based on the actual inventory. This method will remove the shopping cart if
+	 * no items are attached.
+	 */
+	@Override
+	public ShoppingCart getById(final Long id) {
+
+
+		try {
+			ShoppingCart shoppingCart = shoppingCartDao.getById(id);
+			if(shoppingCart==null) {
+				return null;
+			}
+			populateShoppingCart(shoppingCart);
+
+
+			if(shoppingCart.isObsolete()) {
+				delete(shoppingCart);
+				return null;
+			} else {
+				return shoppingCart;
+			}
+			} catch (Exception e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+			return null;
+
+	}
+
+	/**
+	 * Get a {@link ShoppingCart} for a given code. Will update the shopping cart
+	 * prices and items based on the actual inventory. This method will remove the shopping cart if
+	 * no items are attached.
+	 */
+	@Override
+	@Transactional
+	public ShoppingCart getByCode(final String code, final MerchantStore store) throws ServiceException {
+
+		try {
+			ShoppingCart shoppingCart = shoppingCartDao.getByCode(code, store);
+			if(shoppingCart==null) {
+				return null;
+			}
+			populateShoppingCart(shoppingCart);
+
+
+			if(shoppingCart.isObsolete()) {
+				delete(shoppingCart);
+				return null;
+			} else {
+				return shoppingCart;
+			}
+
+		}catch(javax.persistence.NoResultException nre) {
+			return null;
+		} catch (RuntimeException e) {
+			throw new ServiceException(e);
+		} catch (Exception ee) {
+			throw new ServiceException(ee);
+		} catch (Throwable t) {
+			throw new ServiceException(t);
+		} 
+
+
+	}
+
+	@Override
+	public void deleteCart(final ShoppingCart shoppingCart) throws ServiceException {
+		ShoppingCart cart = this.getById(shoppingCart.getId());
+		if(cart!=null) {
+			super.delete(cart);
+		}
+	}
+
+
+	@Override
+	public ShoppingCart getByCustomer(final Customer customer) throws ServiceException {
+
+		try {
+			ShoppingCart shoppingCart = shoppingCartDao.getByCustomer(customer);
+			if(shoppingCart==null) {
+				return null;
+			}
+			return populateShoppingCart(shoppingCart);
+
+
+		} catch (Exception e) {
+			throw new ServiceException(e);
+		}
+	}
+
+	@Transactional(noRollbackFor={org.springframework.dao.EmptyResultDataAccessException.class})
+	private ShoppingCart populateShoppingCart(final ShoppingCart shoppingCart) throws Exception {
+
+		try {
+
+			boolean cartIsObsolete = true;
+			if(shoppingCart!=null) {
+
+				Set<ShoppingCartItem> items = shoppingCart.getLineItems();
+				if(items==null || items.size()==0) {
+					shoppingCart.setObsolete(true);
+					return shoppingCart;
+
+				}
+
+				//Set<ShoppingCartItem> shoppingCartItems = new HashSet<ShoppingCartItem>();
+				for(ShoppingCartItem item : items) {
+					LOGGER.debug("Populate item " + item.getId());
+					populateItem(item);
+					LOGGER.debug("Obsolete item ? " + item.isObsolete());
+					if(item.isObsolete()) {
+					} else {
+						cartIsObsolete = false;
+					}
+				}
+
+				//shoppingCart.setLineItems(shoppingCartItems);
+				boolean refreshCart = false;
+                Set<ShoppingCartItem> refreshedItems = new HashSet<ShoppingCartItem>();
+                for(ShoppingCartItem item : items) {
+                	if(!item.isObsolete()) {
+                		refreshedItems.add(item);
+                	} else {
+                		refreshCart = true;
+                	}
+                }
+
+                if(refreshCart) {
+                	shoppingCart.setLineItems(refreshedItems);
+                	update(shoppingCart);
+                }
+
+				if(cartIsObsolete) {
+					shoppingCart.setObsolete(true);
+				}
+				return shoppingCart;
+			}
+
+		} catch (Exception e) {
+			throw new ServiceException(e);
+		}
+
+		return shoppingCart;
+
+	}
+
+	@Override
+	public ShoppingCartItem populateShoppingCartItem(final Product product) throws ServiceException {
+		Validate.notNull(product, "Product should not be null");
+		Validate.notNull(product.getMerchantStore(), "Product.merchantStore should not be null");
+
+
+		ShoppingCartItem item = new ShoppingCartItem(product);
+
+		//Set<ProductAttribute> productAttributes = product.getAttributes();
+		//Set<ShoppingCartAttributeItem> attributesList = new HashSet<ShoppingCartAttributeItem>();
+		//if(!CollectionUtils.isEmpty(productAttributes)) {
+
+		//	for(ProductAttribute productAttribute : productAttributes) {
+		//			ShoppingCartAttributeItem attributeItem = new ShoppingCartAttributeItem();
+		//			attributeItem.setShoppingCartItem(item);
+		//			attributeItem.setProductAttribute(productAttribute);
+		//			attributeItem.setProductAttributeId(productAttribute.getId());
+		//			attributesList.add(attributeItem);
+
+		//	}
+
+		//	item.setAttributes(attributesList);
+		//}
+		
+		item.setProductVirtual(product.isProductVirtual());
+
+		//set item price
+		FinalPrice price = pricingService.calculateProductPrice(product);
+		item.setItemPrice(price.getFinalPrice());
+		return item;
+
+
+	}
+
+
+	private void populateItem(final ShoppingCartItem item) throws Exception {
+
+		Product product = null;
+
+		Long productId = item.getProductId();
+		product = productService.getById(productId);
+
+		if(product==null) {
+			item.setObsolete(true);
+			return;
+		}
+
+
+		item.setProduct(product);
+		
+		if(product.isProductVirtual()) {
+			item.setProductVirtual(true);
+		}
+
+		Set<ShoppingCartAttributeItem> attributes = item.getAttributes();
+		Set<ProductAttribute> productAttributes = product.getAttributes();
+		List<ProductAttribute> attributesList = new ArrayList<ProductAttribute>();
+		if(productAttributes!=null && productAttributes.size()>0 && attributes!=null && attributes.size()>0) {
+			for(ShoppingCartAttributeItem attribute : attributes) {
+				long attributeId = attribute.getProductAttributeId().longValue();
+				for(ProductAttribute productAttribute : productAttributes) {
+
+					if(productAttribute.getId().longValue()==attributeId) {
+						attribute.setProductAttribute(productAttribute);
+						attributesList.add(productAttribute);
+						break;
+					}
+
+				}
+
+			}
+		}
+
+		//set item price
+		FinalPrice price = pricingService.calculateProductPrice(product, attributesList);
+		item.setItemPrice(price.getFinalPrice());
+		item.setFinalPrice(price);
+
+
+
+		BigDecimal subTotal = item.getItemPrice().multiply(new BigDecimal(item.getQuantity().intValue()));
+		item.setSubTotal(subTotal);
+
+
+	}
+
+	@Override
+	public List<ShippingProduct> createShippingProduct(final ShoppingCart cart) throws ServiceException {
+		/**
+		 * Determines if products are virtual
+		 */
+		Set<ShoppingCartItem> items = cart.getLineItems();
+		List<ShippingProduct> shippingProducts = null;
+		for(ShoppingCartItem item : items) {
+			Product product = item.getProduct();
+			if(!product.isProductVirtual() && product.isProductShipeable()) {
+				if(shippingProducts==null) {
+					shippingProducts = new ArrayList<ShippingProduct>();
+				}
+				ShippingProduct shippingProduct = new ShippingProduct(product);
+				shippingProduct.setQuantity(item.getQuantity());
+				shippingProducts.add(shippingProduct);
+			}
+		}
+
+		return shippingProducts;
+
+	}
+
+
+	@Override
+	public boolean isFreeShoppingCart(final ShoppingCart cart) throws ServiceException {
+		/**
+		 * Determines if products are free
+		 */
+		Set<ShoppingCartItem> items = cart.getLineItems();
+		for(ShoppingCartItem item : items) {
+			Product product = item.getProduct();
+			FinalPrice finalPrice = pricingService.calculateProductPrice(product);
+			if(finalPrice.getFinalPrice().longValue()>0) {
+				return false;
+			}
+		}
+		
+		return true;
+
+	}
+	
+	@Override
+	public boolean requiresShipping(final ShoppingCart cart) throws ServiceException {
+		
+		Validate.notNull(cart,"Shopping cart cannot be null");
+		Validate.notNull(cart.getLineItems(),"ShoppingCart items cannot be null");
+		boolean requiresShipping = false;
+		for(ShoppingCartItem item : cart.getLineItems()) {
+			Product product = item.getProduct();
+			if(product.isProductShipeable()) {
+				requiresShipping = true;
+				break;
+			}
+		}
+		
+		return requiresShipping;
+		
+	}
+
+    @Override
+    public void  removeShoppingCart( final ShoppingCart cart )
+        throws ServiceException
+    {
+         shoppingCartDao.removeShoppingCart( cart );
+    }
+
+
+    @Override
+    public ShoppingCart mergeShoppingCarts( final ShoppingCart userShoppingModel, final ShoppingCart sessionCart,final MerchantStore store ) throws Exception
+    {
+        if(sessionCart.getCustomerId() !=null && sessionCart.getCustomerId() ==userShoppingModel.getCustomerId() ){
+            LOGGER.info( "Session Shopping cart belongs to same logged in user" );
+            if(CollectionUtils.isNotEmpty( userShoppingModel.getLineItems() ) && CollectionUtils.isNotEmpty( sessionCart.getLineItems() )){
+                return userShoppingModel;
+            }
+        }
+
+        LOGGER.info( "Starting merging shopping carts" );
+        if(CollectionUtils.isNotEmpty( sessionCart.getLineItems() )){
+            Set<ShoppingCartItem> shoppingCartItemsSet=getShoppingCartItems(sessionCart,store,userShoppingModel);
+            boolean duplicateFound = false;
+            if(CollectionUtils.isNotEmpty(shoppingCartItemsSet)) {
+                for(ShoppingCartItem sessionShoppingCartItem : shoppingCartItemsSet){
+                    if(CollectionUtils.isNotEmpty(userShoppingModel.getLineItems())){
+                        for(ShoppingCartItem cartItem : userShoppingModel.getLineItems()){
+                            if(cartItem.getProduct().getId().longValue()==sessionShoppingCartItem.getProduct().getId().longValue()) {
+                                if(CollectionUtils.isNotEmpty(cartItem.getAttributes())) {
+                                    if(!duplicateFound) {
+                                        LOGGER.info( "Dupliate item found..updating exisitng product quantity" );
+                                        cartItem.setQuantity(cartItem.getQuantity() + sessionShoppingCartItem.getQuantity());
+                                        duplicateFound = true;
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    if(!duplicateFound) {
+                        LOGGER.info( "New item found..adding item to Shopping cart" );
+                        userShoppingModel.getLineItems().add( sessionShoppingCartItem );
+                    }
+                }
+
+            }
+
+        }
+        LOGGER.info( "Shopping Cart merged successfully.....");
+        saveOrUpdate( userShoppingModel );
+        removeShoppingCart( sessionCart );
+
+        return userShoppingModel;
+    }
+
+
+
+    private Set<ShoppingCartItem> getShoppingCartItems( final ShoppingCart sessionCart,final MerchantStore store,final ShoppingCart cartModel )
+                    throws Exception
+                {
+
+                    Set<ShoppingCartItem> shoppingCartItemsSet=null;
+                    if(CollectionUtils.isNotEmpty( sessionCart.getLineItems() )){
+                        shoppingCartItemsSet=new HashSet<ShoppingCartItem>();
+                        for(ShoppingCartItem shoppingCartItem : sessionCart.getLineItems()){
+                            Product product = productService.getById( shoppingCartItem.getProductId() );
+                            if ( product == null )
+                            {
+                                throw new Exception( "Item with id " + shoppingCartItem.getProductId() + " does not exist" );
+                            }
+
+                            if ( product.getMerchantStore().getId().intValue() != store.getId().intValue() )
+                            {
+                                throw new Exception( "Item with id " + shoppingCartItem.getProductId() + " does not belong to merchant "
+                                    + store.getId() );
+                            }
+
+                            ShoppingCartItem item= populateShoppingCartItem( product );
+                            item.setQuantity( shoppingCartItem.getQuantity() );
+                            item.setShoppingCart( cartModel );
+
+                            List<ShoppingCartAttributeItem> cartAttributes = new ArrayList<ShoppingCartAttributeItem>( shoppingCartItem.getAttributes() );
+                            if(CollectionUtils.isNotEmpty( cartAttributes )){
+                                for(ShoppingCartAttributeItem shoppingCartAttributeItem :cartAttributes ){
+                                    ProductAttribute productAttribute =productAttributeService.getById( shoppingCartAttributeItem.getId() );
+                                    if ( productAttribute != null
+                                                    && productAttribute.getProduct().getId().longValue() == product.getId().longValue() ){
+
+                                        ShoppingCartAttributeItem attributeItem=new ShoppingCartAttributeItem(item,productAttribute);
+                                        if ( shoppingCartAttributeItem.getId() > 0 )
+                                        {
+                                            attributeItem.setId( shoppingCartAttributeItem.getId() );
+                                        }
+                                        item.addAttributes( attributeItem );
+
+                                    }
+                                }
+                            }
+
+                            shoppingCartItemsSet.add( item );
+                        }
+
+                    }
+                     return shoppingCartItemsSet;
+              }
+
+
+	@Override
+	public boolean isFreeShoppingCart(List<ShoppingCartItem> items)
+			throws ServiceException {
+		ShoppingCart cart = new ShoppingCart();
+		Set<ShoppingCartItem> cartItems = new HashSet<ShoppingCartItem>(items);
+		cart.setLineItems(cartItems);
+		return this.isFreeShoppingCart(cart);
+	}
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/system/dao/MerchantConfigurationDao.java b/sm-core/src/main/java/com/salesmanager/core/business/system/dao/MerchantConfigurationDao.java
new file mode 100755
index 0000000..008f5f0
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/system/dao/MerchantConfigurationDao.java
@@ -0,0 +1,21 @@
+package com.salesmanager.core.business.system.dao;
+
+import java.util.List;
+
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDao;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.system.model.MerchantConfiguration;
+import com.salesmanager.core.business.system.model.MerchantConfigurationType;
+
+public interface MerchantConfigurationDao extends SalesManagerEntityDao<Long, MerchantConfiguration> {
+
+	
+	
+	MerchantConfiguration getMerchantConfiguration(String key, MerchantStore store);
+
+	List<MerchantConfiguration> getMerchantConfigurations(MerchantStore store);
+
+	List<MerchantConfiguration> listByType(MerchantConfigurationType type,
+			MerchantStore store);
+	
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/system/dao/MerchantConfigurationDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/system/dao/MerchantConfigurationDaoImpl.java
new file mode 100755
index 0000000..55aa335
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/system/dao/MerchantConfigurationDaoImpl.java
@@ -0,0 +1,69 @@
+package com.salesmanager.core.business.system.dao;
+
+import java.util.List;
+
+import org.springframework.stereotype.Repository;
+
+import com.mysema.query.jpa.JPQLQuery;
+import com.mysema.query.jpa.impl.JPAQuery;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDaoImpl;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.system.model.MerchantConfiguration;
+import com.salesmanager.core.business.system.model.MerchantConfigurationType;
+import com.salesmanager.core.business.system.model.QMerchantConfiguration;
+
+@Repository("merchantConfigurationDao")
+public class MerchantConfigurationDaoImpl extends SalesManagerEntityDaoImpl<Long, MerchantConfiguration>
+		implements MerchantConfigurationDao {
+
+
+	@Override
+	public MerchantConfiguration getMerchantConfiguration(String key, MerchantStore store) {
+		
+		
+		
+		QMerchantConfiguration qMerchantConfiguration = QMerchantConfiguration.merchantConfiguration;
+
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		query.from(qMerchantConfiguration)
+			.innerJoin(qMerchantConfiguration.merchantStore).fetch()
+			.where(qMerchantConfiguration.merchantStore.id.eq(store.getId())
+			.and(qMerchantConfiguration.key.eq(key)));
+		
+		return query.uniqueResult(qMerchantConfiguration);
+
+	}
+	
+	@Override
+	public List<MerchantConfiguration> getMerchantConfigurations(MerchantStore store) {
+
+		QMerchantConfiguration qMerchantConfiguration = QMerchantConfiguration.merchantConfiguration;
+
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		query.from(qMerchantConfiguration)
+			.innerJoin(qMerchantConfiguration.merchantStore).fetch()
+			.where(qMerchantConfiguration.merchantStore.id.eq(store.getId()));
+		
+		return query.list(qMerchantConfiguration);
+
+	}
+	
+	@Override
+	public List<MerchantConfiguration> listByType(MerchantConfigurationType type, MerchantStore store) {
+		
+
+		QMerchantConfiguration qMerchantConfiguration = QMerchantConfiguration.merchantConfiguration;
+
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		query.from(qMerchantConfiguration)
+			.innerJoin(qMerchantConfiguration.merchantStore).fetch()
+			.where(qMerchantConfiguration.merchantStore.id.eq(store.getId())
+			.and(qMerchantConfiguration.merchantConfigurationType.eq(type)));
+		
+		return query.list(qMerchantConfiguration);
+
+	}
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/system/dao/MerchantLogDao.java b/sm-core/src/main/java/com/salesmanager/core/business/system/dao/MerchantLogDao.java
new file mode 100644
index 0000000..cff3990
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/system/dao/MerchantLogDao.java
@@ -0,0 +1,14 @@
+package com.salesmanager.core.business.system.dao;
+
+import java.util.List;
+
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDao;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.system.model.MerchantLog;
+
+public interface MerchantLogDao extends SalesManagerEntityDao<Long, MerchantLog> {
+
+
+	List<MerchantLog> listByMerchant(MerchantStore store);
+	
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/system/dao/MerchantLogDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/system/dao/MerchantLogDaoImpl.java
new file mode 100644
index 0000000..3f0ff64
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/system/dao/MerchantLogDaoImpl.java
@@ -0,0 +1,34 @@
+package com.salesmanager.core.business.system.dao;
+
+import java.util.List;
+
+import org.springframework.stereotype.Repository;
+
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDaoImpl;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.system.model.MerchantLog;
+
+@Repository("merchantLogDao")
+public class MerchantLogDaoImpl extends SalesManagerEntityDaoImpl<Long, MerchantLog>
+		implements MerchantLogDao {
+
+
+
+	
+	@Override
+	public List<MerchantLog> listByMerchant(MerchantStore store) {
+
+/*		QMerchantLog qMerchantLog = QMerchantLog.
+
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		query.from(qMerchantCnfiguration)
+			.innerJoin(qMerchantCnfiguration.merchantStore).fetch()
+			.where(qMerchantCnfiguration.merchantStore.id.eq(store.getId()));
+		
+		return query.list(qMerchantCnfiguration);*/
+		
+		return null;
+
+	}
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/system/dao/ModuleConfigurationDao.java b/sm-core/src/main/java/com/salesmanager/core/business/system/dao/ModuleConfigurationDao.java
new file mode 100755
index 0000000..a3c0100
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/system/dao/ModuleConfigurationDao.java
@@ -0,0 +1,14 @@
+package com.salesmanager.core.business.system.dao;
+
+import java.util.List;
+
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDao;
+import com.salesmanager.core.business.system.model.IntegrationModule;
+
+public interface ModuleConfigurationDao extends SalesManagerEntityDao<Long, IntegrationModule> {
+
+	List<IntegrationModule> getModulesConfiguration(String module);
+
+	IntegrationModule getByCode(String moduleCode);
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/system/dao/ModuleConfigurationDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/system/dao/ModuleConfigurationDaoImpl.java
new file mode 100755
index 0000000..db53779
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/system/dao/ModuleConfigurationDaoImpl.java
@@ -0,0 +1,52 @@
+package com.salesmanager.core.business.system.dao;
+
+import java.util.List;
+
+import org.springframework.stereotype.Repository;
+
+import com.mysema.query.jpa.JPQLQuery;
+import com.mysema.query.jpa.impl.JPAQuery;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDaoImpl;
+import com.salesmanager.core.business.system.model.IntegrationModule;
+import com.salesmanager.core.business.system.model.QIntegrationModule;
+
+@Repository("integrationModuleDao")
+public class ModuleConfigurationDaoImpl extends SalesManagerEntityDaoImpl<Long, IntegrationModule>
+		implements ModuleConfigurationDao {
+
+
+	@Override
+	public List<IntegrationModule> getModulesConfiguration(String module) {
+		
+		
+		
+		QIntegrationModule qIntegrationModule = QIntegrationModule.integrationModule;
+
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		query.from(qIntegrationModule)
+			.where(qIntegrationModule.module.eq(module));
+		
+		return query.list(qIntegrationModule);
+
+
+	}
+	
+	@Override
+	public IntegrationModule getByCode(String moduleCode) {
+		
+		
+		
+		QIntegrationModule qIntegrationModule = QIntegrationModule.integrationModule;
+
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		query.from(qIntegrationModule)
+			.where(qIntegrationModule.code.eq(moduleCode));
+		
+		return query.uniqueResult(qIntegrationModule);
+
+
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/system/dao/SystemConfigurationDao.java b/sm-core/src/main/java/com/salesmanager/core/business/system/dao/SystemConfigurationDao.java
new file mode 100644
index 0000000..7199265
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/system/dao/SystemConfigurationDao.java
@@ -0,0 +1,8 @@
+package com.salesmanager.core.business.system.dao;
+
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDao;
+import com.salesmanager.core.business.system.model.SystemConfiguration;
+
+public interface SystemConfigurationDao extends SalesManagerEntityDao<Long, SystemConfiguration> {
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/system/dao/SystemConfigurationDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/system/dao/SystemConfigurationDaoImpl.java
new file mode 100644
index 0000000..c513587
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/system/dao/SystemConfigurationDaoImpl.java
@@ -0,0 +1,14 @@
+package com.salesmanager.core.business.system.dao;
+
+import org.springframework.stereotype.Repository;
+
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDaoImpl;
+import com.salesmanager.core.business.system.model.SystemConfiguration;
+
+@Repository("systemConfigurationDao")
+public class SystemConfigurationDaoImpl extends SalesManagerEntityDaoImpl<Long, SystemConfiguration>
+		implements SystemConfigurationDao {
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/system/dao/SystemNotificationDao.java b/sm-core/src/main/java/com/salesmanager/core/business/system/dao/SystemNotificationDao.java
new file mode 100755
index 0000000..febef93
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/system/dao/SystemNotificationDao.java
@@ -0,0 +1,8 @@
+package com.salesmanager.core.business.system.dao;
+
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDao;
+import com.salesmanager.core.business.system.model.SystemNotification;
+
+public interface SystemNotificationDao extends SalesManagerEntityDao<Long, SystemNotification> {
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/system/dao/SystemNotificationDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/system/dao/SystemNotificationDaoImpl.java
new file mode 100755
index 0000000..554604e
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/system/dao/SystemNotificationDaoImpl.java
@@ -0,0 +1,14 @@
+package com.salesmanager.core.business.system.dao;
+
+import org.springframework.stereotype.Repository;
+
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDaoImpl;
+import com.salesmanager.core.business.system.model.SystemNotification;
+
+@Repository("systemNotificationDao")
+public class SystemNotificationDaoImpl extends SalesManagerEntityDaoImpl<Long, SystemNotification>
+		implements SystemNotificationDao {
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/system/model/CustomIntegrationConfiguration.java b/sm-core/src/main/java/com/salesmanager/core/business/system/model/CustomIntegrationConfiguration.java
new file mode 100644
index 0000000..365fb8e
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/system/model/CustomIntegrationConfiguration.java
@@ -0,0 +1,14 @@
+package com.salesmanager.core.business.system.model;
+
+import org.json.simple.JSONAware;
+
+/**
+ * Used as a marker interface to commit additional
+ * integration module information to the database
+ * @author casams1
+ *
+ */
+public interface CustomIntegrationConfiguration extends JSONAware{
+	
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/system/model/Environment.java b/sm-core/src/main/java/com/salesmanager/core/business/system/model/Environment.java
new file mode 100644
index 0000000..3eae1d8
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/system/model/Environment.java
@@ -0,0 +1,7 @@
+package com.salesmanager.core.business.system.model;
+
+public enum Environment {
+	
+	TEST, PRODUCTION
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/system/model/IntegrationConfiguration.java b/sm-core/src/main/java/com/salesmanager/core/business/system/model/IntegrationConfiguration.java
new file mode 100755
index 0000000..25e57a6
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/system/model/IntegrationConfiguration.java
@@ -0,0 +1,169 @@
+package com.salesmanager.core.business.system.model;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.codehaus.jackson.annotate.JsonProperty;
+import org.json.simple.JSONAware;
+import org.json.simple.JSONObject;
+
+/**
+ * Object used to contain the integration information with an external gateway
+ * Uses simple JSON to encode the object in JSON by implementing JSONAware
+ * and uses jackson JSON decode to parse JSON String to an Object
+ * @author csamson
+ *
+ */
+public class IntegrationConfiguration implements JSONAware {
+	
+
+	public final static String TEST_ENVIRONMENT = "TEST";
+	public final static String PRODUCTION_ENVIRONMENT = "PRODUCTION";
+	
+	private String moduleCode;
+	private boolean active;
+	private boolean defaultSelected;
+	//private boolean customModule;
+	private Map<String,String> integrationKeys= new HashMap<String,String>();
+	private Map<String,List<String>> integrationOptions= new HashMap<String,List<String>>();
+	private String environment;
+	
+	
+	public String getModuleCode() {
+		return moduleCode;
+	}
+	@JsonProperty("moduleCode")  
+	public void setModuleCode(String moduleCode) {
+		this.moduleCode = moduleCode;
+	}
+	public boolean isActive() {
+		return active;
+	}
+	@JsonProperty("active")
+	public void setActive(boolean active) {
+		this.active = active;
+	}
+	public Map<String, String> getIntegrationKeys() {
+		return integrationKeys;
+	}
+	@JsonProperty("integrationKeys")
+	public void setIntegrationKeys(Map<String, String> integrationKeys) {
+		this.integrationKeys = integrationKeys;
+	}
+
+	
+	protected String getJsonInfo() {
+		
+		StringBuilder returnString = new StringBuilder();
+		returnString.append("{");
+		returnString.append("\"moduleCode\"").append(":\"").append(this.getModuleCode()).append("\"");
+		returnString.append(",");
+		returnString.append("\"active\"").append(":").append(this.isActive());
+		returnString.append(",");
+		returnString.append("\"defaultSelected\"").append(":").append(this.isDefaultSelected());
+		returnString.append(",");
+		//returnString.append("\"customModule\"").append(":").append(this.isCustomModule());
+		//returnString.append(",");
+		returnString.append("\"environment\"").append(":\"").append(this.getEnvironment()).append("\"");
+		//returnString.append("}");
+		return returnString.toString();
+		
+	}
+	
+	
+	@SuppressWarnings("unchecked")
+	@Override
+	public String toJSONString() {
+		
+		
+		StringBuilder returnString = new StringBuilder();
+		returnString.append(getJsonInfo());
+
+		if(this.getIntegrationKeys().size()>0) {
+
+				JSONObject data = new JSONObject();
+				Set<String> keys = this.getIntegrationKeys().keySet();
+				for(String key : keys) {
+					data.put(key, this.getIntegrationKeys().get(key));
+				}
+				String dataField = data.toJSONString();
+
+				returnString.append(",").append("\"integrationKeys\"").append(":");
+				returnString.append(dataField.toString());
+
+				
+		 }
+		
+		
+		if(this.getIntegrationOptions()!=null && this.getIntegrationOptions().size()>0) {
+
+				//JSONObject data = new JSONObject();
+				StringBuilder optionDataEntries = new StringBuilder();
+				Set<String> keys = this.getIntegrationOptions().keySet();
+				int countOptions = 0;
+				for(String key : keys) {
+
+					List<String> values = this.getIntegrationOptions().get(key);
+					StringBuilder optionsEntries = new StringBuilder();
+					StringBuilder dataEntries = new StringBuilder();
+					
+					int count = 0;
+					for(String value : values) {
+						
+						dataEntries.append("\"").append(value).append("\"");
+						if(count<values.size()-1) {
+							dataEntries.append(",");
+						}
+						count++;
+					}
+					
+					optionsEntries.append("[").append(dataEntries.toString()).append("]");
+					
+					optionDataEntries.append("\"").append(key).append("\":").append(optionsEntries.toString());
+
+					if(countOptions<keys.size()-1) {
+						optionDataEntries.append(",");
+					}
+					countOptions ++;
+					
+				}
+				String dataField = optionDataEntries.toString();
+
+				returnString.append(",").append("\"integrationOptions\"").append(":{");
+				returnString.append(dataField.toString());
+				returnString.append("}");
+				
+		 }
+			
+
+		returnString.append("}");
+
+		
+		return returnString.toString();
+
+	}
+	public void setEnvironment(String environment) {
+		this.environment = environment;
+	}
+	public String getEnvironment() {
+		return environment;
+	}
+	public Map<String,List<String>> getIntegrationOptions() {
+		return integrationOptions;
+	}
+	public void setIntegrationOptions(Map<String,List<String>> integrationOptions) {
+		this.integrationOptions = integrationOptions;
+	}
+	public boolean isDefaultSelected() {
+		return defaultSelected;
+	}
+	public void setDefaultSelected(boolean defaultSelected) {
+		this.defaultSelected = defaultSelected;
+	}
+
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/system/model/IntegrationModule.java b/sm-core/src/main/java/com/salesmanager/core/business/system/model/IntegrationModule.java
new file mode 100755
index 0000000..8eb317e
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/system/model/IntegrationModule.java
@@ -0,0 +1,255 @@
+package com.salesmanager.core.business.system.model;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import javax.persistence.Column;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+import javax.persistence.Transient;
+
+import org.hibernate.annotations.Type;
+
+import com.salesmanager.core.business.common.model.audit.AuditListener;
+import com.salesmanager.core.business.common.model.audit.AuditSection;
+import com.salesmanager.core.business.common.model.audit.Auditable;
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.constants.SchemaConstant;
+
+@Entity
+@EntityListeners(value = AuditListener.class)
+@Table(name = "MODULE_CONFIGURATION", schema= SchemaConstant.SALESMANAGER_SCHEMA)
+
+
+public class IntegrationModule extends SalesManagerEntity<Long, IntegrationModule> implements Serializable, Auditable {
+
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -357523134800965997L;
+
+	@Id
+	@Column(name = "MODULE_CONF_ID")
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT", pkColumnValue = "MOD_CONF_SEQ_NEXT_VAL")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Long id;
+	
+	
+
+	@Column(name="MODULE")
+	private String module;
+	
+	@Column(name="CODE", nullable=false)
+	private String code;
+	
+	@Column(name="REGIONS")
+	private String regions;
+	
+	@Column(name="CONFIGURATION")
+	@Type(type = "org.hibernate.type.StringClobType")
+	private String configuration;
+	
+	@Column(name="DETAILS")
+	@Type(type = "org.hibernate.type.StringClobType")
+	private String configDetails;
+	
+	@Column(name="TYPE")
+	private String type;
+
+
+	@Column(name="IMAGE")
+	private String image;
+	
+	@Column(name="CUSTOM_IND")
+	private boolean customModule = false;
+	
+	@Transient
+	private Set<String> regionsSet = new HashSet<String>();
+	
+	/**
+	 * Contains a map of module config by environment (DEV,PROD)
+	 */
+	@Transient
+	private Map<String,ModuleConfig> moduleConfigs = new HashMap<String,ModuleConfig>();
+	
+	
+	@Transient
+	private Map<String,String> details = new HashMap<String,String>();
+
+	
+	public Map<String, String> getDetails() {
+		return details;
+	}
+
+
+
+	public void setDetails(Map<String, String> details) {
+		this.details = details;
+	}
+
+
+
+	@Embedded
+	private AuditSection auditSection = new AuditSection();
+
+
+
+	@Override
+	public AuditSection getAuditSection() {
+		return auditSection;
+	}
+
+
+
+	@Override
+	public void setAuditSection(AuditSection audit) {
+		this.auditSection = audit;
+		
+	}
+
+
+
+	@Override
+	public Long getId() {
+		return id;
+	}
+
+
+
+	@Override
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+
+
+	public String getModule() {
+		return module;
+	}
+
+
+
+	public void setModule(String module) {
+		this.module = module;
+	}
+
+
+
+	public String getRegions() {
+		return regions;
+	}
+
+
+
+	public void setRegions(String regions) {
+		this.regions = regions;
+	}
+
+
+
+	public String getConfiguration() {
+		return configuration;
+	}
+
+
+
+	public void setConfiguration(String configuration) {
+		this.configuration = configuration;
+	}
+
+
+
+	public void setRegionsSet(Set<String> regionsSet) {
+		this.regionsSet = regionsSet;
+	}
+
+
+
+	public Set<String> getRegionsSet() {
+		return regionsSet;
+	}
+
+
+
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+
+
+	public String getCode() {
+		return code;
+	}
+
+
+
+	public void setModuleConfigs(Map<String,ModuleConfig> moduleConfigs) {
+		this.moduleConfigs = moduleConfigs;
+	}
+
+
+
+	public Map<String,ModuleConfig> getModuleConfigs() {
+		return moduleConfigs;
+	}
+
+
+
+	public void setImage(String image) {
+		this.image = image;
+	}
+
+
+
+	public String getImage() {
+		return image;
+	}
+
+
+
+	public void setCustomModule(boolean customModule) {
+		this.customModule = customModule;
+	}
+
+
+
+	public boolean isCustomModule() {
+		return customModule;
+	}
+
+	public String getConfigDetails() {
+		return configDetails;
+	}
+
+
+
+	public void setConfigDetails(String configDetails) {
+		this.configDetails = configDetails;
+	}
+
+
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+
+
+	public String getType() {
+		return type;
+	}
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/system/model/MerchantConfig.java b/sm-core/src/main/java/com/salesmanager/core/business/system/model/MerchantConfig.java
new file mode 100644
index 0000000..ae5d8f6
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/system/model/MerchantConfig.java
@@ -0,0 +1,110 @@
+package com.salesmanager.core.business.system.model;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.json.simple.JSONAware;
+import org.json.simple.JSONObject;
+
+public class MerchantConfig implements Serializable, JSONAware {
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	private boolean displayCustomerSection =false;
+	private boolean displayContactUs =false;
+	private boolean displayStoreAddress = false;
+	private boolean displayAddToCartOnFeaturedItems = false;
+	
+	/** Store default search json config **/
+	private Map<String,Boolean> useDefaultSearchConfig= new HashMap<String,Boolean>();//language code | true or false
+	private Map<String,String> defaultSearchConfigPath= new HashMap<String,String>();//language code | file path
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public String toJSONString() {
+		JSONObject data = new JSONObject();
+		data.put("displayCustomerSection", this.isDisplayCustomerSection());
+		data.put("displayContactUs", this.isDisplayContactUs());
+		data.put("displayStoreAddress", this.isDisplayStoreAddress());
+		data.put("displayAddToCartOnFeaturedItems", this.isDisplayAddToCartOnFeaturedItems());
+		
+		if(useDefaultSearchConfig!=null) {
+			JSONObject obj = new JSONObject();
+			for(String key : useDefaultSearchConfig.keySet()) {
+				Boolean val = (Boolean)useDefaultSearchConfig.get(key);
+				if(val!=null) {
+					obj.put(key,val);
+				}
+			}
+			data.put("useDefaultSearchConfig", obj);
+		}
+		
+		if(defaultSearchConfigPath!=null) {
+			JSONObject obj = new JSONObject();
+			for(String key : defaultSearchConfigPath.keySet()) {
+				String val = (String)defaultSearchConfigPath.get(key);
+				if(!StringUtils.isBlank(val)) {
+					obj.put(key, val);
+				}
+			}
+			data.put("defaultSearchConfigPath", obj);
+		}
+		
+		
+		return data.toJSONString();
+	}
+
+	public void setDisplayCustomerSection(boolean displayCustomerSection) {
+		this.displayCustomerSection = displayCustomerSection;
+	}
+
+	public boolean isDisplayCustomerSection() {
+		return displayCustomerSection;
+	}
+
+	public void setDisplayContactUs(boolean displayContactUs) {
+		this.displayContactUs = displayContactUs;
+	}
+
+	public boolean isDisplayContactUs() {
+		return displayContactUs;
+	}
+
+	public boolean isDisplayStoreAddress() {
+		return displayStoreAddress;
+	}
+
+	public void setDisplayStoreAddress(boolean displayStoreAddress) {
+		this.displayStoreAddress = displayStoreAddress;
+	}
+
+	public void setUseDefaultSearchConfig(Map<String,Boolean> useDefaultSearchConfig) {
+		this.useDefaultSearchConfig = useDefaultSearchConfig;
+	}
+
+	public Map<String,Boolean> getUseDefaultSearchConfig() {
+		return useDefaultSearchConfig;
+	}
+
+	public void setDefaultSearchConfigPath(Map<String,String> defaultSearchConfigPath) {
+		this.defaultSearchConfigPath = defaultSearchConfigPath;
+	}
+
+	public Map<String,String> getDefaultSearchConfigPath() {
+		return defaultSearchConfigPath;
+	}
+
+	public void setDisplayAddToCartOnFeaturedItems(
+			boolean displayAddToCartOnFeaturedItems) {
+		this.displayAddToCartOnFeaturedItems = displayAddToCartOnFeaturedItems;
+	}
+
+	public boolean isDisplayAddToCartOnFeaturedItems() {
+		return displayAddToCartOnFeaturedItems;
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/system/model/MerchantConfiguration.java b/sm-core/src/main/java/com/salesmanager/core/business/system/model/MerchantConfiguration.java
new file mode 100755
index 0000000..6a9a5fc
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/system/model/MerchantConfiguration.java
@@ -0,0 +1,124 @@
+package com.salesmanager.core.business.system.model;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+import javax.persistence.UniqueConstraint;
+
+import org.hibernate.annotations.Type;
+
+import com.salesmanager.core.business.common.model.audit.AuditListener;
+import com.salesmanager.core.business.common.model.audit.AuditSection;
+import com.salesmanager.core.business.common.model.audit.Auditable;
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.constants.SchemaConstant;
+
+/**
+ * Merchant configuration information
+ * @author Carl Samson
+ *
+ */
+@Entity
+@EntityListeners(value = AuditListener.class)
+@Table(name = "MERCHANT_CONFIGURATION", schema= SchemaConstant.SALESMANAGER_SCHEMA, uniqueConstraints=
+	@UniqueConstraint(columnNames = {"MERCHANT_ID", "CONFIG_KEY"}))
+public class MerchantConfiguration extends SalesManagerEntity<Long, MerchantConfiguration> implements Serializable, Auditable {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 4246917986731953459L;
+
+	@Id
+	@Column(name = "MERCHANT_CONFIG_ID")
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT", pkColumnValue = "MERCH_CONF_SEQ_NEXT_VAL")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Long id;
+
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name="MERCHANT_ID", nullable=true)
+	private MerchantStore merchantStore;
+	
+	@Embedded
+	private AuditSection auditSection = new AuditSection();
+	
+	@Column(name="CONFIG_KEY")
+	private String key;
+
+	
+	@Column(name="VALUE")
+	@Type(type = "org.hibernate.type.StringClobType")
+	private String value;
+	
+	@Column(name="TYPE")
+	@Enumerated(value = EnumType.STRING)
+	private MerchantConfigurationType merchantConfigurationType = MerchantConfigurationType.INTEGRATION;
+
+	public void setKey(String key) {
+		this.key = key;
+	}
+
+	public String getKey() {
+		return key;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public AuditSection getAuditSection() {
+		return auditSection;
+	}
+
+	public void setAuditSection(AuditSection auditSection) {
+		this.auditSection = auditSection;
+	}
+
+	@Override
+	public Long getId() {
+		return id;
+	}
+
+	@Override
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+
+
+	public MerchantStore getMerchantStore() {
+		return merchantStore;
+	}
+
+	public void setMerchantStore(MerchantStore merchantStore) {
+		this.merchantStore = merchantStore;
+	}
+
+	public void setMerchantConfigurationType(MerchantConfigurationType merchantConfigurationType) {
+		this.merchantConfigurationType = merchantConfigurationType;
+	}
+
+	public MerchantConfigurationType getMerchantConfigurationType() {
+		return merchantConfigurationType;
+	}
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/system/model/MerchantConfigurationType.java b/sm-core/src/main/java/com/salesmanager/core/business/system/model/MerchantConfigurationType.java
new file mode 100644
index 0000000..a496272
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/system/model/MerchantConfigurationType.java
@@ -0,0 +1,9 @@
+package com.salesmanager.core.business.system.model;
+
+public enum MerchantConfigurationType {
+	
+	INTEGRATION,
+	SHOP,
+	CONFIG
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/system/model/MerchantLog.java b/sm-core/src/main/java/com/salesmanager/core/business/system/model/MerchantLog.java
new file mode 100644
index 0000000..bcf1c15
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/system/model/MerchantLog.java
@@ -0,0 +1,106 @@
+package com.salesmanager.core.business.system.model;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+
+import org.hibernate.annotations.Type;
+
+import com.salesmanager.core.business.common.model.audit.AuditListener;
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.constants.SchemaConstant;
+
+@Entity
+@EntityListeners(value = AuditListener.class)
+@Table(name = "MERCHANT_LOG", schema= SchemaConstant.SALESMANAGER_SCHEMA)
+public class MerchantLog extends SalesManagerEntity<Long, MerchantLog> implements Serializable {
+
+	
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	@Id
+	@Column(name = "MERCHANT_LOG_ID")
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT", pkColumnValue = "MOD_CONF_SEQ_NEXT_VAL")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Long id;
+	
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name="MERCHANT_ID", nullable=false)
+	private MerchantStore store;
+
+	@Column(name="MODULE", length=25, nullable=true)
+	private String module;
+	
+
+	@Column(name="LOG")
+	@Type(type = "org.hibernate.type.StringClobType")
+	private String log;
+	
+	public MerchantLog(MerchantStore store, String log) {
+		this.store = store;
+		this.log = log;
+	}
+	
+	public MerchantLog(MerchantStore store, String module, String log) {
+		this.store = store;
+		this.module = module;
+		this.log = log;
+	}
+
+
+	public Long getId() {
+		return id;
+	}
+
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+
+	public MerchantStore getStore() {
+		return store;
+	}
+
+
+	public void setStore(MerchantStore store) {
+		this.store = store;
+	}
+
+
+	public String getModule() {
+		return module;
+	}
+
+
+	public void setModule(String module) {
+		this.module = module;
+	}
+
+
+	public String getLog() {
+		return log;
+	}
+
+
+	public void setLog(String log) {
+		this.log = log;
+	}
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/system/model/Module.java b/sm-core/src/main/java/com/salesmanager/core/business/system/model/Module.java
new file mode 100755
index 0000000..98c1bb0
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/system/model/Module.java
@@ -0,0 +1,7 @@
+package com.salesmanager.core.business.system.model;
+
+public enum Module {
+	
+	PAYMENT, SHIPPING
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/system/model/ModuleConfig.java b/sm-core/src/main/java/com/salesmanager/core/business/system/model/ModuleConfig.java
new file mode 100755
index 0000000..138c721
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/system/model/ModuleConfig.java
@@ -0,0 +1,56 @@
+package com.salesmanager.core.business.system.model;
+
+public class ModuleConfig {
+
+	
+	private String scheme;
+	private String host;
+	private String port;
+	private String uri;
+	private String env;
+	private String config1;
+	private String config2;
+	public String getScheme() {
+		return scheme;
+	}
+	public void setScheme(String scheme) {
+		this.scheme = scheme;
+	}
+	public String getHost() {
+		return host;
+	}
+	public void setHost(String host) {
+		this.host = host;
+	}
+	public String getPort() {
+		return port;
+	}
+	public void setPort(String port) {
+		this.port = port;
+	}
+	public String getUri() {
+		return uri;
+	}
+	public void setUri(String uri) {
+		this.uri = uri;
+	}
+	public void setEnv(String env) {
+		this.env = env;
+	}
+	public String getEnv() {
+		return env;
+	}
+	public String getConfig1() {
+		return config1;
+	}
+	public void setConfig1(String config1) {
+		this.config1 = config1;
+	}
+	public String getConfig2() {
+		return config2;
+	}
+	public void setConfig2(String config2) {
+		this.config2 = config2;
+	}
+	
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/system/model/SystemConfiguration.java b/sm-core/src/main/java/com/salesmanager/core/business/system/model/SystemConfiguration.java
new file mode 100644
index 0000000..c32b7e0
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/system/model/SystemConfiguration.java
@@ -0,0 +1,80 @@
+package com.salesmanager.core.business.system.model;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+
+import com.salesmanager.core.business.common.model.audit.AuditListener;
+import com.salesmanager.core.business.common.model.audit.AuditSection;
+import com.salesmanager.core.business.common.model.audit.Auditable;
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.constants.SchemaConstant;
+
+/**
+ * Global system configuration information
+ * @author casams1
+ *
+ */
+@Entity
+@EntityListeners(value = AuditListener.class)
+@Table(name = "SYSTEM_CONFIGURATION", schema= SchemaConstant.SALESMANAGER_SCHEMA)
+public class SystemConfiguration extends SalesManagerEntity<Long, SystemConfiguration> implements Serializable, Auditable {
+	private static final long serialVersionUID = 6831573162350751684L;
+	
+	@Id
+	@Column(name = "SYSTEM_CONFIG_ID")
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT", pkColumnValue = "SYST_CONF_SEQ_NEXT_VAL")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Long id;
+	
+	@Column(name="CONFIG_KEY")
+	private String key;
+	
+	@Column(name="VALUE")
+	private String value;
+	
+	@Embedded
+	private AuditSection auditSection = new AuditSection();
+
+	public AuditSection getAuditSection() {
+		return auditSection;
+	}
+
+	public void setAuditSection(AuditSection auditSection) {
+		this.auditSection = auditSection;
+	}
+
+	@Override
+	public Long getId() {
+		return id;
+	}
+
+	@Override
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getKey() {
+		return key;
+	}
+
+	public void setKey(String key) {
+		this.key = key;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/system/model/SystemNotification.java b/sm-core/src/main/java/com/salesmanager/core/business/system/model/SystemNotification.java
new file mode 100755
index 0000000..b7f696e
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/system/model/SystemNotification.java
@@ -0,0 +1,138 @@
+package com.salesmanager.core.business.system.model;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import javax.persistence.UniqueConstraint;
+
+import com.salesmanager.core.business.common.model.audit.AuditListener;
+import com.salesmanager.core.business.common.model.audit.AuditSection;
+import com.salesmanager.core.business.common.model.audit.Auditable;
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.user.model.User;
+import com.salesmanager.core.constants.SchemaConstant;
+
+@Entity
+@EntityListeners(value = AuditListener.class)
+
+@Table(name = "SYSTEM_NOTIFICATION", schema= SchemaConstant.SALESMANAGER_SCHEMA,uniqueConstraints=
+    @UniqueConstraint(columnNames = {"MERCHANT_ID", "CONFIG_KEY"}) )
+public class SystemNotification extends SalesManagerEntity<Long, SystemNotification> implements Serializable, Auditable {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -6269172313628887000L;
+
+	@Id
+	@Column(name = "SYSTEM_NOTIF_ID")
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT", pkColumnValue = "SYST_NOTIF_SEQ_NEXT_VAL")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Long id;
+	
+	@Column(name="CONFIG_KEY")
+	private String key;
+	
+	@Column(name="VALUE")
+	private String value;
+	
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name="MERCHANT_ID", nullable=true)
+	private MerchantStore merchantStore;
+	
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name="USER_ID", nullable=true)
+	private User user;
+	
+	@Temporal(TemporalType.DATE)
+	@Column(name = "START_DATE")
+	private Date startDate;
+	
+	@Temporal(TemporalType.DATE)
+	@Column(name = "END_DATE")
+	private Date endDate;
+	
+	@Embedded
+	private AuditSection auditSection = new AuditSection();
+
+	public AuditSection getAuditSection() {
+		return auditSection;
+	}
+
+	public void setAuditSection(AuditSection auditSection) {
+		this.auditSection = auditSection;
+	}
+
+	@Override
+	public Long getId() {
+		return id;
+	}
+
+	@Override
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getKey() {
+		return key;
+	}
+
+	public void setKey(String key) {
+		this.key = key;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+	public void setStartDate(Date startDate) {
+		this.startDate = startDate;
+	}
+
+	public Date getStartDate() {
+		return startDate;
+	}
+
+	public void setMerchantStore(MerchantStore merchantStore) {
+		this.merchantStore = merchantStore;
+	}
+
+	public MerchantStore getMerchantStore() {
+		return merchantStore;
+	}
+
+	public void setEndDate(Date endDate) {
+		this.endDate = endDate;
+	}
+
+	public Date getEndDate() {
+		return endDate;
+	}
+
+	public void setUser(User user) {
+		this.user = user;
+	}
+
+	public User getUser() {
+		return user;
+	}
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/system/service/EmailService.java b/sm-core/src/main/java/com/salesmanager/core/business/system/service/EmailService.java
new file mode 100644
index 0000000..632f54b
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/system/service/EmailService.java
@@ -0,0 +1,17 @@
+package com.salesmanager.core.business.system.service;
+
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.modules.email.Email;
+import com.salesmanager.core.modules.email.EmailConfig;
+
+
+public interface EmailService {
+
+	public void sendHtmlEmail(MerchantStore store, Email email) throws ServiceException, Exception;
+	
+	public EmailConfig getEmailConfiguration(MerchantStore store) throws ServiceException;
+	
+	public void saveEmailConfiguration(EmailConfig emailConfig, MerchantStore store) throws ServiceException;
+	
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/system/service/EmailServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/system/service/EmailServiceImpl.java
new file mode 100644
index 0000000..15ccb51
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/system/service/EmailServiceImpl.java
@@ -0,0 +1,66 @@
+package com.salesmanager.core.business.system.service;
+
+import org.codehaus.jackson.map.ObjectMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.system.model.MerchantConfiguration;
+import com.salesmanager.core.constants.Constants;
+import com.salesmanager.core.modules.email.Email;
+import com.salesmanager.core.modules.email.EmailConfig;
+import com.salesmanager.core.modules.email.HtmlEmailSender;
+
+@Service("emailService")
+public class EmailServiceImpl implements EmailService {
+
+	@Autowired
+	private MerchantConfigurationService merchantConfigurationService;
+	
+	@Autowired
+	private HtmlEmailSender sender;
+	
+	@Override
+	public void sendHtmlEmail(MerchantStore store, Email email) throws ServiceException, Exception {
+
+		EmailConfig emailConfig = getEmailConfiguration(store);
+		
+		sender.setEmailConfig(emailConfig);
+		sender.send(email);
+	}
+
+	@Override
+	public EmailConfig getEmailConfiguration(MerchantStore store) throws ServiceException {
+		
+		MerchantConfiguration configuration = merchantConfigurationService.getMerchantConfiguration(Constants.EMAIL_CONFIG, store);
+		EmailConfig emailConfig = null;
+		if(configuration!=null) {
+			String value = configuration.getValue();
+			
+			ObjectMapper mapper = new ObjectMapper();
+			try {
+				emailConfig = mapper.readValue(value, EmailConfig.class);
+			} catch(Exception e) {
+				throw new ServiceException("Cannot parse json string " + value);
+			}
+		}
+		return emailConfig;
+	}
+	
+	
+	@Override
+	public void saveEmailConfiguration(EmailConfig emailConfig, MerchantStore store) throws ServiceException {
+		MerchantConfiguration configuration = merchantConfigurationService.getMerchantConfiguration(Constants.EMAIL_CONFIG, store);
+		if(configuration==null) {
+			configuration = new MerchantConfiguration();
+			configuration.setMerchantStore(store);
+			configuration.setKey(Constants.EMAIL_CONFIG);
+		}
+		
+		String value = emailConfig.toJSONString();
+		configuration.setValue(value);
+		merchantConfigurationService.saveOrUpdate(configuration);
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/system/service/MerchantConfigurationService.java b/sm-core/src/main/java/com/salesmanager/core/business/system/service/MerchantConfigurationService.java
new file mode 100755
index 0000000..2147f58
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/system/service/MerchantConfigurationService.java
@@ -0,0 +1,31 @@
+package com.salesmanager.core.business.system.service;
+
+import java.util.List;
+
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityService;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.system.model.MerchantConfig;
+import com.salesmanager.core.business.system.model.MerchantConfiguration;
+import com.salesmanager.core.business.system.model.MerchantConfigurationType;
+
+public interface MerchantConfigurationService extends
+		SalesManagerEntityService<Long, MerchantConfiguration> {
+	
+	MerchantConfiguration getMerchantConfiguration(String key, MerchantStore store) throws ServiceException;
+	
+	public void saveOrUpdate(MerchantConfiguration entity) throws ServiceException;
+
+	List<MerchantConfiguration> listByStore(MerchantStore store)
+			throws ServiceException;
+
+	List<MerchantConfiguration> listByType(MerchantConfigurationType type,
+			MerchantStore store) throws ServiceException;
+
+	MerchantConfig getMerchantConfig(MerchantStore store)
+			throws ServiceException;
+
+	void saveMerchantConfig(MerchantConfig config, MerchantStore store)
+			throws ServiceException;
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/system/service/MerchantConfigurationServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/system/service/MerchantConfigurationServiceImpl.java
new file mode 100755
index 0000000..4673bc3
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/system/service/MerchantConfigurationServiceImpl.java
@@ -0,0 +1,116 @@
+package com.salesmanager.core.business.system.service;
+
+import java.util.List;
+
+import org.codehaus.jackson.map.ObjectMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityServiceImpl;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.shipping.model.ShippingConfiguration;
+import com.salesmanager.core.business.system.dao.MerchantConfigurationDao;
+import com.salesmanager.core.business.system.model.MerchantConfig;
+import com.salesmanager.core.business.system.model.MerchantConfiguration;
+import com.salesmanager.core.business.system.model.MerchantConfigurationType;
+import com.salesmanager.core.constants.Constants;
+import com.salesmanager.core.constants.ShippingConstants;
+
+@Service("merchantConfigurationService")
+public class MerchantConfigurationServiceImpl extends
+		SalesManagerEntityServiceImpl<Long, MerchantConfiguration> implements
+		MerchantConfigurationService {
+
+	private MerchantConfigurationDao merchantConfigurationDao;
+	
+	@Autowired
+	public MerchantConfigurationServiceImpl(
+			MerchantConfigurationDao merchantConfigurationDao) {
+			super(merchantConfigurationDao);
+			this.merchantConfigurationDao = merchantConfigurationDao;
+	}
+	
+
+	@Override
+	public MerchantConfiguration getMerchantConfiguration(String key, MerchantStore store) throws ServiceException {
+		return merchantConfigurationDao.getMerchantConfiguration(key, store);
+	}
+	
+	@Override
+	public List<MerchantConfiguration> listByStore(MerchantStore store) throws ServiceException {
+		return merchantConfigurationDao.getMerchantConfigurations(store);
+	}
+	
+	@Override
+	public List<MerchantConfiguration> listByType(MerchantConfigurationType type, MerchantStore store) throws ServiceException {
+		return merchantConfigurationDao.listByType(type, store);
+	}
+	
+	@Override
+	public void saveOrUpdate(MerchantConfiguration entity) throws ServiceException {
+		
+
+		
+		if(entity.getId()!=null && entity.getId()>0) {
+			super.update(entity);
+		} else {
+			super.create(entity);
+
+		}
+	}
+	
+	
+	@Override
+	public void delete(MerchantConfiguration merchantConfiguration) throws ServiceException {
+		MerchantConfiguration config = merchantConfigurationDao.getById(merchantConfiguration.getId());
+		if(config!=null) {
+			super.delete(config);
+		}
+	}
+	
+	@Override
+	public MerchantConfig getMerchantConfig(MerchantStore store) throws ServiceException {
+
+		MerchantConfiguration configuration = merchantConfigurationDao.getMerchantConfiguration(Constants.MERCHANT_CONFIG, store);
+		
+		MerchantConfig config = null;
+		if(configuration!=null) {
+			String value = configuration.getValue();
+			
+			ObjectMapper mapper = new ObjectMapper();
+			try {
+				config = mapper.readValue(value, MerchantConfig.class);
+			} catch(Exception e) {
+				throw new ServiceException("Cannot parse json string " + value);
+			}
+		}
+		return config;
+		
+	}
+	
+	@Override
+	public void saveMerchantConfig(MerchantConfig config, MerchantStore store) throws ServiceException {
+		
+		MerchantConfiguration configuration = merchantConfigurationDao.getMerchantConfiguration(Constants.MERCHANT_CONFIG, store);
+
+		if(configuration==null) {
+			configuration = new MerchantConfiguration();
+			configuration.setMerchantStore(store);
+			configuration.setKey(Constants.MERCHANT_CONFIG);
+		}
+		
+		String value = config.toJSONString();
+		configuration.setValue(value);
+		if(configuration.getId()!=null && configuration.getId()>0) {
+			super.update(configuration);
+		} else {
+			super.create(configuration);
+
+		}
+		
+	}
+	
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/system/service/MerchantLogService.java b/sm-core/src/main/java/com/salesmanager/core/business/system/service/MerchantLogService.java
new file mode 100644
index 0000000..5906d18
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/system/service/MerchantLogService.java
@@ -0,0 +1,12 @@
+package com.salesmanager.core.business.system.service;
+
+import com.salesmanager.core.business.generic.service.SalesManagerEntityService;
+import com.salesmanager.core.business.system.model.MerchantLog;
+
+public interface MerchantLogService extends
+		SalesManagerEntityService<Long, MerchantLog> {
+
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/system/service/MerchantLogServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/system/service/MerchantLogServiceImpl.java
new file mode 100644
index 0000000..79738af
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/system/service/MerchantLogServiceImpl.java
@@ -0,0 +1,36 @@
+package com.salesmanager.core.business.system.service;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.salesmanager.core.business.generic.service.SalesManagerEntityServiceImpl;
+import com.salesmanager.core.business.system.dao.MerchantLogDao;
+import com.salesmanager.core.business.system.model.MerchantLog;
+
+@Service("merchantLogService")
+public class MerchantLogServiceImpl extends
+		SalesManagerEntityServiceImpl<Long, MerchantLog> implements
+		MerchantLogService {
+	
+	@SuppressWarnings("unused")
+	private static final Logger LOGGER = LoggerFactory.getLogger(MerchantLogServiceImpl.class);
+
+
+	
+	private MerchantLogDao merchantLogDao;
+	
+	@Autowired
+	public MerchantLogServiceImpl(
+			MerchantLogDao merchantLogDao) {
+			super(merchantLogDao);
+			this.merchantLogDao = merchantLogDao;
+	}
+
+
+
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/system/service/ModuleConfigurationService.java b/sm-core/src/main/java/com/salesmanager/core/business/system/service/ModuleConfigurationService.java
new file mode 100755
index 0000000..1ba92b7
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/system/service/ModuleConfigurationService.java
@@ -0,0 +1,17 @@
+package com.salesmanager.core.business.system.service;
+
+import java.util.List;
+
+import com.salesmanager.core.business.generic.service.SalesManagerEntityService;
+import com.salesmanager.core.business.system.model.IntegrationModule;
+
+public interface ModuleConfigurationService extends
+		SalesManagerEntityService<Long, IntegrationModule> {
+
+	List<IntegrationModule> getIntegrationModules(String module);
+
+	IntegrationModule getByCode(String moduleCode);
+	
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/system/service/ModuleConfigurationServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/system/service/ModuleConfigurationServiceImpl.java
new file mode 100755
index 0000000..f7b9522
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/system/service/ModuleConfigurationServiceImpl.java
@@ -0,0 +1,144 @@
+package com.salesmanager.core.business.system.service;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.json.simple.JSONArray;
+import org.json.simple.JSONValue;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.salesmanager.core.business.generic.service.SalesManagerEntityServiceImpl;
+import com.salesmanager.core.business.system.dao.ModuleConfigurationDao;
+import com.salesmanager.core.business.system.model.IntegrationModule;
+import com.salesmanager.core.business.system.model.ModuleConfig;
+import com.salesmanager.core.utils.CacheUtils;
+
+@Service("moduleConfigurationService")
+public class ModuleConfigurationServiceImpl extends
+		SalesManagerEntityServiceImpl<Long, IntegrationModule> implements
+		ModuleConfigurationService {
+	
+	private static final Logger LOGGER = LoggerFactory.getLogger(ModuleConfigurationServiceImpl.class);
+
+
+	
+	private ModuleConfigurationDao integrationModuleDao;
+	
+	@Autowired
+	private CacheUtils cache;
+	
+	@Autowired
+	public ModuleConfigurationServiceImpl(
+			ModuleConfigurationDao integrationModuleDao) {
+			super(integrationModuleDao);
+			this.integrationModuleDao = integrationModuleDao;
+	}
+	
+	@Override
+	public IntegrationModule getByCode(String moduleCode) {
+		return integrationModuleDao.getByCode(moduleCode);
+	}
+	
+	
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	@Override
+	public List<IntegrationModule> getIntegrationModules(String module) {
+		
+		
+		List<IntegrationModule> modules = null;
+		try {
+			
+			//CacheUtils cacheUtils = CacheUtils.getInstance();
+			modules = (List<IntegrationModule>) cache.getFromCache("INTEGRATION_M)" + module);
+			if(modules==null) {
+				modules = integrationModuleDao.getModulesConfiguration(module);
+				//set json objects
+				for(IntegrationModule mod : modules) {
+					
+					String regions = mod.getRegions();
+					if(regions!=null) {
+						Object objRegions=JSONValue.parse(regions); 
+						JSONArray arrayRegions=(JSONArray)objRegions;
+						Iterator i = arrayRegions.iterator();
+						while(i.hasNext()) {
+							mod.getRegionsSet().add((String)i.next());
+						}
+					}
+					
+					
+					String details = mod.getConfigDetails();
+					if(details!=null) {
+						
+						//Map objects = mapper.readValue(config, Map.class);
+
+						Map<String,String> objDetails= (Map<String, String>) JSONValue.parse(details); 
+						mod.setDetails(objDetails);
+
+						
+					}
+					
+					
+					String configs = mod.getConfiguration();
+					if(configs!=null) {
+						
+						//Map objects = mapper.readValue(config, Map.class);
+
+						Object objConfigs=JSONValue.parse(configs); 
+						JSONArray arrayConfigs=(JSONArray)objConfigs;
+						
+						Map<String,ModuleConfig> moduleConfigs = new HashMap<String,ModuleConfig>();
+						
+						Iterator i = arrayConfigs.iterator();
+						while(i.hasNext()) {
+							
+							Map values = (Map)i.next();
+							String env = (String)values.get("env");
+		            		ModuleConfig config = new ModuleConfig();
+		            		config.setScheme((String)values.get("scheme"));
+		            		config.setHost((String)values.get("host"));
+		            		config.setPort((String)values.get("port"));
+		            		config.setUri((String)values.get("uri"));
+		            		config.setEnv((String)values.get("env"));
+		            		if((String)values.get("config1")!=null) {
+		            			config.setConfig1((String)values.get("config1"));
+		            		}
+		            		if((String)values.get("config2")!=null) {
+		            			config.setConfig1((String)values.get("config2"));
+		            		}
+		            		
+		            		moduleConfigs.put(env, config);
+		            		
+		            		
+							
+						}
+						
+						mod.setModuleConfigs(moduleConfigs);
+						
+
+					}
+
+
+				}
+				cache.putInCache(modules, "INTEGRATION_M)" + module);
+			}
+
+		} catch (Exception e) {
+			LOGGER.error("getIntegrationModules()", e);
+		}
+		return modules;
+		
+		
+	}
+	
+	
+
+	
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/system/service/SystemConfigurationService.java b/sm-core/src/main/java/com/salesmanager/core/business/system/service/SystemConfigurationService.java
new file mode 100644
index 0000000..08d1d35
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/system/service/SystemConfigurationService.java
@@ -0,0 +1,12 @@
+package com.salesmanager.core.business.system.service;
+
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityService;
+import com.salesmanager.core.business.system.model.SystemConfiguration;
+
+public interface SystemConfigurationService extends
+		SalesManagerEntityService<Long, SystemConfiguration> {
+	
+	SystemConfiguration getByKey(String key) throws ServiceException;
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/system/service/SystemConfigurationServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/system/service/SystemConfigurationServiceImpl.java
new file mode 100644
index 0000000..03b295e
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/system/service/SystemConfigurationServiceImpl.java
@@ -0,0 +1,34 @@
+package com.salesmanager.core.business.system.service;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityServiceImpl;
+import com.salesmanager.core.business.system.dao.SystemConfigurationDao;
+import com.salesmanager.core.business.system.model.SystemConfiguration;
+import com.salesmanager.core.business.system.model.SystemConfiguration_;
+
+@Service("systemConfigurationService")
+public class SystemConfigurationServiceImpl extends
+		SalesManagerEntityServiceImpl<Long, SystemConfiguration> implements
+		SystemConfigurationService {
+
+	
+	private SystemConfigurationDao systemConfigurationDao;
+	
+	@Autowired
+	public SystemConfigurationServiceImpl(
+			SystemConfigurationDao systemConfigurationDao) {
+			super(systemConfigurationDao);
+			this.systemConfigurationDao = systemConfigurationDao;
+	}
+	
+	public SystemConfiguration getByKey(String key) throws ServiceException {
+		return super.getByField(SystemConfiguration_.key, key);
+	}
+	
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/tax/dao/taxclass/TaxClassDao.java b/sm-core/src/main/java/com/salesmanager/core/business/tax/dao/taxclass/TaxClassDao.java
new file mode 100644
index 0000000..ba767ee
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/tax/dao/taxclass/TaxClassDao.java
@@ -0,0 +1,17 @@
+package com.salesmanager.core.business.tax.dao.taxclass;
+
+import java.util.List;
+
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDao;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.tax.model.taxclass.TaxClass;
+
+public interface TaxClassDao  extends SalesManagerEntityDao<Long, TaxClass> {
+
+	List<TaxClass> listByStore(MerchantStore store);
+
+	TaxClass getByCode(String code);
+
+	TaxClass getByCode(String code, MerchantStore store);
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/tax/dao/taxclass/TaxClassDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/tax/dao/taxclass/TaxClassDaoImpl.java
new file mode 100644
index 0000000..2c5ca43
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/tax/dao/taxclass/TaxClassDaoImpl.java
@@ -0,0 +1,78 @@
+package com.salesmanager.core.business.tax.dao.taxclass;
+
+import java.util.List;
+
+import org.springframework.stereotype.Repository;
+
+import com.mysema.query.jpa.JPQLQuery;
+import com.mysema.query.jpa.impl.JPAQuery;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDaoImpl;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.tax.model.taxclass.QTaxClass;
+import com.salesmanager.core.business.tax.model.taxclass.TaxClass;
+
+@Repository("taxClassDao")
+public class TaxClassDaoImpl extends SalesManagerEntityDaoImpl<Long, TaxClass> implements TaxClassDao{
+	
+	public TaxClassDaoImpl() {
+		super();
+	}
+	
+	
+	@Override
+	public List<TaxClass> listByStore(MerchantStore store) {
+		QTaxClass qTax = QTaxClass.taxClass;
+
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qTax)
+			.leftJoin(qTax.merchantStore).fetch()
+			.where(qTax.merchantStore.id.eq(store.getId())
+			.or(qTax.merchantStore.isNull()));
+		
+		List<TaxClass> taxes = query.list(qTax);
+		return taxes;
+	}
+	
+	
+	@Override
+	public TaxClass getByCode(String code) {
+		QTaxClass qTax = QTaxClass.taxClass;
+
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qTax)
+			.leftJoin(qTax.merchantStore).fetch()
+			.where(qTax.code.eq(code));
+		
+		return query.uniqueResult(qTax);
+	}
+	
+	@Override
+	public TaxClass getByCode(String code, MerchantStore store) {
+		QTaxClass qTax = QTaxClass.taxClass;
+
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qTax)
+			.leftJoin(qTax.merchantStore).fetch()
+			.where(qTax.code.eq(code).and(qTax.merchantStore.id.eq(store.getId())));
+		
+		return query.uniqueResult(qTax);
+	}
+	
+	@Override
+	public TaxClass getById(Long id) {
+		QTaxClass qTax = QTaxClass.taxClass;
+
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qTax)
+			.leftJoin(qTax.merchantStore).fetch()
+			.where(qTax.id.eq(id));
+		
+		return query.uniqueResult(qTax);
+	}
+	
+	
+}
\ No newline at end of file

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/tax/dao/taxrate/TaxRateDao.java b/sm-core/src/main/java/com/salesmanager/core/business/tax/dao/taxrate/TaxRateDao.java
new file mode 100644
index 0000000..01acc69
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/tax/dao/taxrate/TaxRateDao.java
@@ -0,0 +1,28 @@
+package com.salesmanager.core.business.tax.dao.taxrate;
+
+import java.util.List;
+
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDao;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.country.model.Country;
+import com.salesmanager.core.business.reference.language.model.Language;
+import com.salesmanager.core.business.reference.zone.model.Zone;
+import com.salesmanager.core.business.tax.model.taxclass.TaxClass;
+import com.salesmanager.core.business.tax.model.taxrate.TaxRate;
+
+public interface TaxRateDao  extends SalesManagerEntityDao<Long, TaxRate> {
+
+	List<TaxRate> listByStore(MerchantStore store);
+
+	List<TaxRate> listByCountryZoneAndTaxClass(Country country, Zone zone,
+			TaxClass taxClass, MerchantStore store, Language language);
+
+	List<TaxRate> listByCountryStateProvinceAndTaxClass(Country country,
+			String stateProvince, TaxClass taxClass, MerchantStore store,
+			Language language);
+
+	TaxRate getByCode(String code, MerchantStore store);
+
+	List<TaxRate> listByStore(MerchantStore store, Language language);
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/tax/dao/taxrate/TaxRateDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/tax/dao/taxrate/TaxRateDaoImpl.java
new file mode 100644
index 0000000..2520eff
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/tax/dao/taxrate/TaxRateDaoImpl.java
@@ -0,0 +1,185 @@
+package com.salesmanager.core.business.tax.dao.taxrate;
+
+import java.util.List;
+
+import org.springframework.stereotype.Repository;
+
+import com.mysema.query.jpa.JPQLQuery;
+import com.mysema.query.jpa.impl.JPAQuery;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDaoImpl;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.country.model.Country;
+import com.salesmanager.core.business.reference.language.model.Language;
+import com.salesmanager.core.business.reference.zone.model.Zone;
+import com.salesmanager.core.business.tax.model.taxclass.TaxClass;
+import com.salesmanager.core.business.tax.model.taxrate.QTaxRate;
+import com.salesmanager.core.business.tax.model.taxrate.QTaxRateDescription;
+import com.salesmanager.core.business.tax.model.taxrate.TaxRate;
+
+@Repository("taxRateDao")
+public class TaxRateDaoImpl extends SalesManagerEntityDaoImpl<Long, TaxRate> implements TaxRateDao{
+	
+	public TaxRateDaoImpl() {
+		super();
+	}
+	
+	@Override
+	public List<TaxRate> listByStore(MerchantStore store) {
+		
+		
+		QTaxRate qTax = QTaxRate.taxRate1;
+		QTaxRateDescription qTaxDescription = QTaxRateDescription.taxRateDescription;
+
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qTax)
+			.leftJoin(qTax.merchantStore).fetch()
+			.leftJoin(qTax.descriptions,qTaxDescription).fetch()
+			.join(qTax.country).fetch()
+			.leftJoin(qTax.zone).fetch()
+			.leftJoin(qTax.parent).fetch()
+			.where(qTax.merchantStore.id.eq(store.getId())
+			).orderBy(qTax.taxPriority.asc());
+		
+		List<TaxRate> taxes = query.list(qTax);
+		return taxes;
+		
+		
+		
+	}
+	
+	@Override
+	public List<TaxRate> listByStore(MerchantStore store, Language language) {
+		
+		
+		QTaxRate qTax = QTaxRate.taxRate1;
+		QTaxRateDescription qTaxDescription = QTaxRateDescription.taxRateDescription;
+
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qTax)
+			.leftJoin(qTax.merchantStore).fetch()
+			.leftJoin(qTax.descriptions,qTaxDescription).fetch()
+			.join(qTax.country).fetch()
+			.leftJoin(qTax.zone).fetch()
+			.leftJoin(qTax.parent).fetch()
+			.where(qTax.merchantStore.id.eq(store.getId())
+			.and(qTaxDescription.language.id.eq(language.getId())))
+			.orderBy(qTax.taxPriority.asc());
+		
+		List<TaxRate> taxes = query.list(qTax);
+		return taxes;
+		
+		
+		
+	}
+	
+	@Override
+	public TaxRate getByCode(String code, MerchantStore store) {
+		
+		
+		QTaxRate qTax = QTaxRate.taxRate1;
+		QTaxRateDescription qTaxDescription = QTaxRateDescription.taxRateDescription;
+
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qTax)
+			.leftJoin(qTax.merchantStore).fetch()
+			.leftJoin(qTax.descriptions,qTaxDescription).fetch()
+			.join(qTax.country).fetch()
+			.leftJoin(qTax.zone).fetch()
+			.leftJoin(qTax.parent).fetch()
+			.where(qTax.merchantStore.id.eq(store.getId())
+			.and(qTax.code.eq(code))		
+			).orderBy(qTax.taxPriority.asc());
+		
+		TaxRate tax = query.uniqueResult(qTax);
+		return tax;
+		
+		
+		
+	}
+	
+	@Override
+	public TaxRate getById(Long id) {
+		
+		
+		QTaxRate qTax = QTaxRate.taxRate1;
+		QTaxRateDescription qTaxDescription = QTaxRateDescription.taxRateDescription;
+
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qTax)
+			.leftJoin(qTax.merchantStore).fetch()
+			.leftJoin(qTax.descriptions,qTaxDescription).fetch()
+			.join(qTax.country).fetch()
+			.leftJoin(qTax.zone).fetch()
+			.leftJoin(qTax.parent).fetch()
+			.where(qTax.id.eq(id)
+			).orderBy(qTax.taxPriority.asc());
+		
+		TaxRate tax = query.uniqueResult(qTax);
+		return tax;
+		
+		
+		
+	}
+	
+	@Override
+	public List<TaxRate> listByCountryZoneAndTaxClass(Country country, Zone zone, TaxClass taxClass, MerchantStore store, Language language) {
+		
+		
+		QTaxRate qTax = QTaxRate.taxRate1;
+		QTaxRateDescription qTaxDescription = QTaxRateDescription.taxRateDescription;
+
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qTax)
+			.leftJoin(qTax.merchantStore).fetch()
+			.leftJoin(qTax.descriptions,qTaxDescription).fetch()
+			.join(qTax.country).fetch()
+			.leftJoin(qTax.zone).fetch()
+			.leftJoin(qTax.parent).fetch()
+			.where(qTax.merchantStore.id.eq(store.getId())
+			.and(
+					qTax.isNotNull().and(qTax.zone.id.eq(zone.getId())).or(qTax.isNull())
+			)
+			.and(qTax.country.id.eq(country.getId())
+			.and(qTaxDescription.language.id.eq(language.getId())))
+			).orderBy(qTax.taxPriority.asc());
+		
+		List<TaxRate> taxes = query.list(qTax);
+		return taxes;
+
+	}
+	
+	
+	@Override
+	public List<TaxRate> listByCountryStateProvinceAndTaxClass(Country country, String stateProvince, TaxClass taxClass, MerchantStore store, Language language) {
+		
+		
+		QTaxRate qTax = QTaxRate.taxRate1;
+		QTaxRateDescription qTaxDescription = QTaxRateDescription.taxRateDescription;
+
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qTax)
+			.leftJoin(qTax.merchantStore).fetch()
+			.leftJoin(qTax.descriptions,qTaxDescription).fetch()
+			.join(qTax.country).fetch()
+			.leftJoin(qTax.parent).fetch()
+			.where(qTax.merchantStore.id.eq(store.getId())
+			.and(
+					qTax.stateProvince.eq(stateProvince)
+			)
+			.and(qTax.country.id.eq(country.getId())
+			.and(qTaxDescription.language.id.eq(language.getId())))
+			).orderBy(qTax.taxPriority.asc());
+		
+		List<TaxRate> taxes = query.list(qTax);
+		return taxes;
+
+	}
+	
+	
+}
\ No newline at end of file

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/tax/model/TaxBasisCalculation.java b/sm-core/src/main/java/com/salesmanager/core/business/tax/model/TaxBasisCalculation.java
new file mode 100644
index 0000000..ecbd64c
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/tax/model/TaxBasisCalculation.java
@@ -0,0 +1,7 @@
+package com.salesmanager.core.business.tax.model;
+
+public enum TaxBasisCalculation {
+	
+	STOREADDRESS, SHIPPINGADDRESS, BILLINGADDRESS
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/tax/model/taxclass/TaxClass.java b/sm-core/src/main/java/com/salesmanager/core/business/tax/model/taxclass/TaxClass.java
new file mode 100644
index 0000000..5b24f3a
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/tax/model/taxclass/TaxClass.java
@@ -0,0 +1,123 @@
+package com.salesmanager.core.business.tax.model.taxclass;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+import javax.persistence.UniqueConstraint;
+
+import org.hibernate.validator.constraints.NotEmpty;
+
+import com.salesmanager.core.business.catalog.product.model.Product;
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.tax.model.taxrate.TaxRate;
+import com.salesmanager.core.constants.SchemaConstant;
+
+@Entity
+@Table(name = "TAX_CLASS", schema = SchemaConstant.SALESMANAGER_SCHEMA,uniqueConstraints=
+    @UniqueConstraint(columnNames = {"MERCHANT_ID", "TAX_CLASS_CODE"}) )
+public class TaxClass extends SalesManagerEntity<Long, TaxClass> {
+	private static final long serialVersionUID = -325750148480212355L;
+	
+	public final static String DEFAULT_TAX_CLASS = "DEFAULT";
+	
+	public TaxClass(String code) {
+		this.code = code;
+		this.title = code;
+	}
+	
+	@Id
+	@Column(name = "TAX_CLASS_ID", unique=true, nullable=false)
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT", pkColumnValue = "TX_CLASS_SEQ_NEXT_VAL")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Long id;
+	
+	@NotEmpty
+	@Column(name="TAX_CLASS_CODE", nullable=false, length=10)
+	private String code;
+	
+	@NotEmpty
+	@Column(name = "TAX_CLASS_TITLE" , nullable=false , length=32 )
+	private String title;
+	
+
+
+	@OneToMany(mappedBy = "taxClass", targetEntity = Product.class)
+	private List<Product> products = new ArrayList<Product>();
+	
+
+/*	@ManyToMany(fetch=FetchType.LAZY, cascade = CascadeType.ALL)
+	@JoinTable(name = "MERCHANT_TAXCLASS", schema=SchemaConstant.SALESMANAGER_SCHEMA, joinColumns = { 
+			@JoinColumn(name = "TAX_CLASS_ID", nullable = false) }, 
+			inverseJoinColumns = { @JoinColumn(name = "MERCHANT_ID", 
+					nullable = false) })
+	private Set<MerchantStore> stores = new HashSet<MerchantStore>();*/
+	
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name="MERCHANT_ID", nullable=true)
+	private MerchantStore merchantStore;
+
+	
+	@OneToMany(mappedBy = "taxClass")
+	private List<TaxRate> taxRates = new ArrayList<TaxRate>();
+	
+	public TaxClass() {
+		super();
+	}
+	
+	@Override
+	public Long getId() {
+		return this.id;
+	}
+
+	@Override
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+
+	public String getTitle() {
+		return title;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public List<TaxRate> getTaxRates() {
+		return taxRates;
+	}
+
+	public void setTaxRates(List<TaxRate> taxRates) {
+		this.taxRates = taxRates;
+	}
+
+
+	public MerchantStore getMerchantStore() {
+		return merchantStore;
+	}
+
+	public void setMerchantStore(MerchantStore merchantStore) {
+		this.merchantStore = merchantStore;
+	}
+	
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/tax/model/TaxConfiguration.java b/sm-core/src/main/java/com/salesmanager/core/business/tax/model/TaxConfiguration.java
new file mode 100644
index 0000000..6fd726e
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/tax/model/TaxConfiguration.java
@@ -0,0 +1,53 @@
+package com.salesmanager.core.business.tax.model;
+
+import org.json.simple.JSONAware;
+import org.json.simple.JSONObject;
+
+/**
+ * Set of various tax configuration settings saved in MerchantConfiguration
+ * @author carl samson
+ *
+ */
+public class TaxConfiguration implements JSONAware {
+	
+	private TaxBasisCalculation taxBasisCalculation = TaxBasisCalculation.SHIPPINGADDRESS;
+	
+	private boolean collectTaxIfDifferentProvinceOfStoreCountry = true;
+	private boolean collectTaxIfDifferentCountryOfStoreCountry = false;
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public String toJSONString() {
+		JSONObject data = new JSONObject();
+		data.put("taxBasisCalculation", this.getTaxBasisCalculation().name());
+		
+		return data.toJSONString();
+	}
+
+	public void setTaxBasisCalculation(TaxBasisCalculation taxBasisCalculation) {
+		this.taxBasisCalculation = taxBasisCalculation;
+	}
+
+	public TaxBasisCalculation getTaxBasisCalculation() {
+		return taxBasisCalculation;
+	}
+
+	public void setCollectTaxIfDifferentProvinceOfStoreCountry(
+			boolean collectTaxIfDifferentProvinceOfStoreCountry) {
+		this.collectTaxIfDifferentProvinceOfStoreCountry = collectTaxIfDifferentProvinceOfStoreCountry;
+	}
+
+	public boolean isCollectTaxIfDifferentProvinceOfStoreCountry() {
+		return collectTaxIfDifferentProvinceOfStoreCountry;
+	}
+
+	public void setCollectTaxIfDifferentCountryOfStoreCountry(
+			boolean collectTaxIfDifferentCountryOfStoreCountry) {
+		this.collectTaxIfDifferentCountryOfStoreCountry = collectTaxIfDifferentCountryOfStoreCountry;
+	}
+
+	public boolean isCollectTaxIfDifferentCountryOfStoreCountry() {
+		return collectTaxIfDifferentCountryOfStoreCountry;
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/tax/model/TaxItem.java b/sm-core/src/main/java/com/salesmanager/core/business/tax/model/TaxItem.java
new file mode 100644
index 0000000..61440b9
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/tax/model/TaxItem.java
@@ -0,0 +1,32 @@
+package com.salesmanager.core.business.tax.model;
+
+import com.salesmanager.core.business.common.model.OrderTotalItem;
+import com.salesmanager.core.business.tax.model.taxrate.TaxRate;
+
+public class TaxItem extends OrderTotalItem {
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	private String label;
+	private TaxRate taxRate=null;
+
+	public void setLabel(String label) {
+		this.label = label;
+	}
+
+	public String getLabel() {
+		return label;
+	}
+
+	public void setTaxRate(TaxRate taxRate) {
+		this.taxRate = taxRate;
+	}
+
+	public TaxRate getTaxRate() {
+		return taxRate;
+	}
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/tax/model/taxrate/TaxRate.java b/sm-core/src/main/java/com/salesmanager/core/business/tax/model/taxrate/TaxRate.java
new file mode 100644
index 0000000..e08e5b2
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/tax/model/taxrate/TaxRate.java
@@ -0,0 +1,252 @@
+/*
+ * Licensed to csti consulting 
+ * You may obtain a copy of the License at
+ *
+ * http://www.csticonsulting.com
+ * Copyright (c) 2006-Aug 24, 2010 Consultation CS-TI inc. 
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.salesmanager.core.business.tax.model.taxrate;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+import javax.persistence.Transient;
+import javax.persistence.UniqueConstraint;
+import javax.validation.Valid;
+
+import org.hibernate.validator.constraints.NotEmpty;
+
+import com.salesmanager.core.business.common.model.audit.AuditListener;
+import com.salesmanager.core.business.common.model.audit.AuditSection;
+import com.salesmanager.core.business.common.model.audit.Auditable;
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.country.model.Country;
+import com.salesmanager.core.business.reference.zone.model.Zone;
+import com.salesmanager.core.business.tax.model.taxclass.TaxClass;
+import com.salesmanager.core.constants.SchemaConstant;
+
+@Entity
+@EntityListeners(value = AuditListener.class)
+@Table(name = "TAX_RATE" , schema = SchemaConstant.SALESMANAGER_SCHEMA,uniqueConstraints={
+		@UniqueConstraint(columnNames={
+				"TAX_CODE",
+				"MERCHANT_ID"
+			})
+		}
+	)
+public class TaxRate  extends SalesManagerEntity<Long, TaxRate> implements Auditable {
+	private static final long serialVersionUID = 3356827741612925066L;
+	
+	@Id
+	@Column(name = "TAX_RATE_ID")
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT", pkColumnValue = "TAX_RATE_ID_NEXT_VALUE")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Long id;
+	
+	@Embedded
+	private AuditSection auditSection = new AuditSection();
+	
+	@Column(name = "TAX_PRIORITY")
+	private Integer taxPriority = 0;
+	
+	@Column(name = "TAX_RATE" , nullable= false , precision=7, scale=4)
+	private BigDecimal taxRate;
+	
+	@NotEmpty
+	@Column(name = "TAX_CODE")
+	private String code;
+	
+
+	@Column(name = "PIGGYBACK")
+	private boolean piggyback;
+	
+	@ManyToOne
+	@JoinColumn(name = "TAX_CLASS_ID" , nullable=false)
+	private TaxClass taxClass;
+	
+
+	
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name="MERCHANT_ID", nullable=false)
+	private MerchantStore merchantStore;
+	
+	@Valid
+	@OneToMany(mappedBy = "taxRate", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+	private List<TaxRateDescription> descriptions = new ArrayList<TaxRateDescription>();
+	
+	@ManyToOne(fetch = FetchType.LAZY, targetEntity = Country.class)
+	@JoinColumn(name="COUNTRY_ID", nullable=false, updatable=true)
+	private Country country;
+
+	@OneToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name="ZONE_ID", nullable=true, updatable=true)
+	private Zone zone;
+
+	@Column(name = "STORE_STATE_PROV", length=100)
+	private String stateProvince;
+	
+	@ManyToOne
+	@JoinColumn(name = "PARENT_ID")
+	private TaxRate parent;
+	
+	@OneToMany(mappedBy = "parent", cascade = CascadeType.REMOVE, orphanRemoval = true)
+	private List<TaxRate> taxRates = new ArrayList<TaxRate>();
+	
+	@Transient
+	private String rateText;
+	
+	
+	public String getRateText() {
+		return rateText;
+	}
+
+	public void setRateText(String rateText) {
+		this.rateText = rateText;
+	}
+
+	public TaxRate() {
+	}
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+	
+	@Override
+	public AuditSection getAuditSection() {
+		return auditSection;
+	}
+	
+	@Override
+	public void setAuditSection(AuditSection auditSection) {
+		this.auditSection = auditSection;
+	}
+
+	public Integer getTaxPriority() {
+		return taxPriority;
+	}
+
+	public void setTaxPriority(Integer taxPriority) {
+		this.taxPriority = taxPriority;
+	}
+
+	public BigDecimal getTaxRate() {
+		return taxRate;
+	}
+
+	public void setTaxRate(BigDecimal taxRate) {
+		this.taxRate = taxRate;
+	}
+
+	public boolean isPiggyback() {
+		return piggyback;
+	}
+
+	public void setPiggyback(boolean piggyback) {
+		this.piggyback = piggyback;
+	}
+
+	public TaxClass getTaxClass() {
+		return taxClass;
+	}
+
+	public void setTaxClass(TaxClass taxClass) {
+		this.taxClass = taxClass;
+	}
+
+
+
+	public List<TaxRateDescription> getDescriptions() {
+		return descriptions;
+	}
+
+	public void setDescriptions(List<TaxRateDescription> descriptions) {
+		this.descriptions = descriptions;
+	}
+
+
+
+	public MerchantStore getMerchantStore() {
+		return merchantStore;
+	}
+
+	public void setMerchantStore(MerchantStore merchantStore) {
+		this.merchantStore = merchantStore;
+	}
+
+	public void setCountry(Country country) {
+		this.country = country;
+	}
+
+	public Country getCountry() {
+		return country;
+	}
+
+	public void setZone(Zone zone) {
+		this.zone = zone;
+	}
+
+	public Zone getZone() {
+		return zone;
+	}
+
+
+	public void setTaxRates(List<TaxRate> taxRates) {
+		this.taxRates = taxRates;
+	}
+
+	public List<TaxRate> getTaxRates() {
+		return taxRates;
+	}
+
+	public void setParent(TaxRate parent) {
+		this.parent = parent;
+	}
+
+	public TaxRate getParent() {
+		return parent;
+	}
+
+	public void setStateProvince(String stateProvince) {
+		this.stateProvince = stateProvince;
+	}
+
+	public String getStateProvince() {
+		return stateProvince;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getCode() {
+		return code;
+	}
+}
\ No newline at end of file

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/tax/model/taxrate/TaxRateDescription.java b/sm-core/src/main/java/com/salesmanager/core/business/tax/model/taxrate/TaxRateDescription.java
new file mode 100644
index 0000000..6265fca
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/tax/model/taxrate/TaxRateDescription.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to csti consulting 
+ * You may obtain a copy of the License at
+ *
+ * http://www.csticonsulting.com
+ * Copyright (c) 2006-Aug 24, 2010 Consultation CS-TI inc. 
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.salesmanager.core.business.tax.model.taxrate;
+
+import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
+
+import com.salesmanager.core.business.common.model.Description;
+import com.salesmanager.core.constants.SchemaConstant;
+
+
+@Entity
+@Table(name = "TAX_RATE_DESCRIPTION" , schema=SchemaConstant.SALESMANAGER_SCHEMA ,uniqueConstraints={
+		@UniqueConstraint(columnNames={
+				"TAX_RATE_ID",
+				"LANGUAGE_ID"
+			})
+		}
+	)
+public class TaxRateDescription extends Description {
+	private static final long serialVersionUID = -4752794805878361822L;
+
+	@ManyToOne(targetEntity = TaxRate.class)
+	@JoinColumn(name = "TAX_RATE_ID")
+	private TaxRate taxRate;
+	
+	public TaxRateDescription() {
+	}
+
+	public TaxRate getTaxRate() {
+		return taxRate;
+	}
+
+	public void setTaxRate(TaxRate taxRate) {
+		this.taxRate = taxRate;
+	}
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/tax/service/TaxClassService.java b/sm-core/src/main/java/com/salesmanager/core/business/tax/service/TaxClassService.java
new file mode 100644
index 0000000..988e347
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/tax/service/TaxClassService.java
@@ -0,0 +1,19 @@
+package com.salesmanager.core.business.tax.service;
+
+import java.util.List;
+
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityService;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.tax.model.taxclass.TaxClass;
+
+public interface TaxClassService extends SalesManagerEntityService<Long, TaxClass> {
+
+	public List<TaxClass> listByStore(MerchantStore store) throws ServiceException;
+
+	TaxClass getByCode(String code) throws ServiceException;
+
+	TaxClass getByCode(String code, MerchantStore store)
+			throws ServiceException;
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/tax/service/TaxClassServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/tax/service/TaxClassServiceImpl.java
new file mode 100644
index 0000000..7505048
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/tax/service/TaxClassServiceImpl.java
@@ -0,0 +1,56 @@
+package com.salesmanager.core.business.tax.service;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityServiceImpl;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.tax.dao.taxclass.TaxClassDao;
+import com.salesmanager.core.business.tax.model.taxclass.TaxClass;
+
+@Service("taxClassService")
+public class TaxClassServiceImpl extends SalesManagerEntityServiceImpl<Long, TaxClass>
+		implements TaxClassService {
+
+	private TaxClassDao taxClassDao;
+	
+	@Autowired
+	public TaxClassServiceImpl(TaxClassDao taxClassDao) {
+		super(taxClassDao);
+		
+		this.taxClassDao = taxClassDao;
+	}
+	
+	@Override
+	public List<TaxClass> listByStore(MerchantStore store) throws ServiceException {	
+		return taxClassDao.listByStore(store);
+	}
+	
+	@Override
+	public TaxClass getByCode(String code) throws ServiceException {
+		return taxClassDao.getByCode(code);
+	}
+	
+	@Override
+	public TaxClass getByCode(String code, MerchantStore store) throws ServiceException {
+		return taxClassDao.getByCode(code, store);
+	}
+	
+	@Override
+	public void delete(TaxClass taxClass) throws ServiceException {
+		
+		TaxClass t = this.getById(taxClass.getId());
+		super.delete(t);
+		
+	}
+	
+	@Override
+	public TaxClass getById(Long id) {
+		return taxClassDao.getById(id);
+	}
+	
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/tax/service/TaxRateService.java b/sm-core/src/main/java/com/salesmanager/core/business/tax/service/TaxRateService.java
new file mode 100644
index 0000000..db7e9af
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/tax/service/TaxRateService.java
@@ -0,0 +1,34 @@
+package com.salesmanager.core.business.tax.service;
+
+import java.util.List;
+
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityService;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.country.model.Country;
+import com.salesmanager.core.business.reference.language.model.Language;
+import com.salesmanager.core.business.reference.zone.model.Zone;
+import com.salesmanager.core.business.tax.model.taxclass.TaxClass;
+import com.salesmanager.core.business.tax.model.taxrate.TaxRate;
+
+public interface TaxRateService extends SalesManagerEntityService<Long, TaxRate> {
+
+	public List<TaxRate> listByStore(MerchantStore store) throws ServiceException;
+
+	List<TaxRate> listByCountryZoneAndTaxClass(Country country, Zone zone,
+			TaxClass taxClass, MerchantStore store, Language language)
+			throws ServiceException;
+
+	List<TaxRate> listByCountryStateProvinceAndTaxClass(Country country,
+			String stateProvince, TaxClass taxClass, MerchantStore store,
+			Language language) throws ServiceException;
+
+	 TaxRate getByCode(String code, MerchantStore store)
+			throws ServiceException;
+
+	List<TaxRate> listByStore(MerchantStore store, Language language)
+			throws ServiceException;
+	
+	
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/tax/service/TaxRateServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/tax/service/TaxRateServiceImpl.java
new file mode 100644
index 0000000..be56d0b
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/tax/service/TaxRateServiceImpl.java
@@ -0,0 +1,70 @@
+package com.salesmanager.core.business.tax.service;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityServiceImpl;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.country.model.Country;
+import com.salesmanager.core.business.reference.language.model.Language;
+import com.salesmanager.core.business.reference.zone.model.Zone;
+import com.salesmanager.core.business.tax.dao.taxrate.TaxRateDao;
+import com.salesmanager.core.business.tax.model.taxclass.TaxClass;
+import com.salesmanager.core.business.tax.model.taxrate.TaxRate;
+
+@Service("taxRateService")
+public class TaxRateServiceImpl extends SalesManagerEntityServiceImpl<Long, TaxRate>
+		implements TaxRateService {
+
+	private TaxRateDao taxRateDao;
+	
+	@Autowired
+	public TaxRateServiceImpl(TaxRateDao taxRateDao) {
+		super(taxRateDao);
+		
+		this.taxRateDao = taxRateDao;
+	}
+
+	@Override
+	public List<TaxRate> listByStore(MerchantStore store)
+			throws ServiceException {
+		return taxRateDao.listByStore(store);
+	}
+	
+	@Override
+	public List<TaxRate> listByStore(MerchantStore store, Language language)
+			throws ServiceException {
+		return taxRateDao.listByStore(store, language);
+	}
+	
+	
+	@Override
+	public TaxRate getByCode(String code, MerchantStore store)
+			throws ServiceException {
+		return taxRateDao.getByCode(code,store);
+	}
+	
+	@Override
+	public List<TaxRate> listByCountryZoneAndTaxClass(Country country, Zone zone, TaxClass taxClass, MerchantStore store, Language language) throws ServiceException {
+		return taxRateDao.listByCountryZoneAndTaxClass(country, zone, taxClass, store, language);
+	}
+	
+	@Override
+	public List<TaxRate> listByCountryStateProvinceAndTaxClass(Country country, String stateProvince, TaxClass taxClass, MerchantStore store, Language language) throws ServiceException {
+		return taxRateDao.listByCountryStateProvinceAndTaxClass(country, stateProvince, taxClass, store, language);
+	}
+	
+	@Override
+	public void delete(TaxRate taxRate) throws ServiceException {
+		
+		TaxRate t = this.getById(taxRate.getId());
+		super.delete(t);
+		
+	}
+		
+
+	
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/tax/service/TaxService.java b/sm-core/src/main/java/com/salesmanager/core/business/tax/service/TaxService.java
new file mode 100644
index 0000000..15d3ca3
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/tax/service/TaxService.java
@@ -0,0 +1,48 @@
+package com.salesmanager.core.business.tax.service;
+
+import java.util.List;
+import java.util.Locale;
+
+import com.salesmanager.core.business.customer.model.Customer;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.order.model.OrderSummary;
+import com.salesmanager.core.business.reference.language.model.Language;
+import com.salesmanager.core.business.tax.model.TaxConfiguration;
+import com.salesmanager.core.business.tax.model.TaxItem;
+
+
+public interface TaxService   {
+
+	/**
+	 * Retrieves tax configurations (TaxConfiguration) for a given MerchantStore
+	 * @param store
+	 * @return
+	 * @throws ServiceException
+	 */
+	TaxConfiguration getTaxConfiguration(MerchantStore store)
+			throws ServiceException;
+
+	/**
+	 * Saves ShippingConfiguration to MerchantConfiguration table
+	 * @param shippingConfiguration
+	 * @param store
+	 * @throws ServiceException
+	 */
+	void saveTaxConfiguration(TaxConfiguration shippingConfiguration,
+			MerchantStore store) throws ServiceException;
+
+	/**
+	 * Calculates tax over an OrderSummary
+	 * @param orderSummary
+	 * @param customer
+	 * @param store
+	 * @param locale
+	 * @return
+	 * @throws ServiceException
+	 */
+	List<TaxItem> calculateTax(OrderSummary orderSummary, Customer customer,
+			MerchantStore store, Language language) throws ServiceException;
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/tax/service/TaxServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/tax/service/TaxServiceImpl.java
new file mode 100644
index 0000000..1671534
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/tax/service/TaxServiceImpl.java
@@ -0,0 +1,305 @@
+package com.salesmanager.core.business.tax.service;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.apache.commons.lang3.StringUtils;
+import org.codehaus.jackson.map.ObjectMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.salesmanager.core.business.common.model.Billing;
+import com.salesmanager.core.business.common.model.Delivery;
+import com.salesmanager.core.business.customer.model.Customer;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.order.model.OrderSummary;
+import com.salesmanager.core.business.reference.country.model.Country;
+import com.salesmanager.core.business.reference.language.model.Language;
+import com.salesmanager.core.business.reference.language.service.LanguageService;
+import com.salesmanager.core.business.reference.zone.model.Zone;
+import com.salesmanager.core.business.shipping.model.ShippingSummary;
+import com.salesmanager.core.business.shipping.service.ShippingService;
+import com.salesmanager.core.business.shoppingcart.model.ShoppingCartItem;
+import com.salesmanager.core.business.system.model.MerchantConfiguration;
+import com.salesmanager.core.business.system.service.MerchantConfigurationService;
+import com.salesmanager.core.business.tax.model.TaxBasisCalculation;
+import com.salesmanager.core.business.tax.model.TaxConfiguration;
+import com.salesmanager.core.business.tax.model.TaxItem;
+import com.salesmanager.core.business.tax.model.taxclass.TaxClass;
+import com.salesmanager.core.business.tax.model.taxrate.TaxRate;
+
+@Service("taxService")
+public class TaxServiceImpl 
+		implements TaxService {
+	
+	private final static String TAX_CONFIGURATION = "TAX_CONFIG";
+	private final static String DEFAULT_TAX_CLASS = "DEFAULT";
+	
+	@Autowired
+	private MerchantConfigurationService merchantConfigurationService;
+	
+	@Autowired
+	private TaxRateService taxRateService;
+	
+	@Autowired
+	private LanguageService languageService;
+	
+	@Autowired
+	private ShippingService shippingService;
+	
+	@Autowired
+	private TaxClassService taxClassService;
+	
+	@Override
+	public TaxConfiguration getTaxConfiguration(MerchantStore store) throws ServiceException {
+		
+		
+		
+		MerchantConfiguration configuration = merchantConfigurationService.getMerchantConfiguration(TAX_CONFIGURATION, store);
+		TaxConfiguration taxConfiguration = null;
+		if(configuration!=null) {
+			String value = configuration.getValue();
+			
+			ObjectMapper mapper = new ObjectMapper();
+			try {
+				taxConfiguration = mapper.readValue(value, TaxConfiguration.class);
+			} catch(Exception e) {
+				throw new ServiceException("Cannot parse json string " + value);
+			}
+		}
+		return taxConfiguration;
+	}
+	
+	
+	@Override
+	public void saveTaxConfiguration(TaxConfiguration shippingConfiguration, MerchantStore store) throws ServiceException {
+		
+		MerchantConfiguration configuration = merchantConfigurationService.getMerchantConfiguration(TAX_CONFIGURATION, store);
+
+		if(configuration==null) {
+			configuration = new MerchantConfiguration();
+			configuration.setMerchantStore(store);
+			configuration.setKey(TAX_CONFIGURATION);
+		}
+		
+		String value = shippingConfiguration.toJSONString();
+		configuration.setValue(value);
+		merchantConfigurationService.saveOrUpdate(configuration);
+		
+	}
+	
+	@Override
+	public List<TaxItem> calculateTax(OrderSummary orderSummary, Customer customer, MerchantStore store, Language language) throws ServiceException {
+		
+
+		if(customer==null) {
+			return null;
+		}
+
+		List<ShoppingCartItem> items = orderSummary.getProducts();
+		
+		List<TaxItem> taxLines = new ArrayList<TaxItem>();
+		
+		if(items==null) {
+			return taxLines;
+		}
+		
+		//determine tax calculation basis
+		TaxConfiguration taxConfiguration = this.getTaxConfiguration(store);
+		if(taxConfiguration==null) {
+			taxConfiguration = new TaxConfiguration();
+			taxConfiguration.setTaxBasisCalculation(TaxBasisCalculation.SHIPPINGADDRESS);
+		}
+		
+		Country country = customer.getBilling().getCountry();
+		Zone zone = customer.getBilling().getZone();
+		String stateProvince = customer.getBilling().getState();
+		
+		TaxBasisCalculation taxBasisCalculation = taxConfiguration.getTaxBasisCalculation();
+		if(taxBasisCalculation.name().equals(TaxBasisCalculation.SHIPPINGADDRESS)){
+			Delivery shipping = customer.getDelivery();
+			if(shipping!=null) {
+				country = shipping.getCountry();
+				zone = shipping.getZone();
+				stateProvince = shipping.getState();
+			}
+		} else if(taxBasisCalculation.name().equals(TaxBasisCalculation.BILLINGADDRESS)){
+			Billing billing = customer.getBilling();
+			if(billing!=null) {
+				country = billing.getCountry();
+				zone = billing.getZone();
+				stateProvince = billing.getState();
+			}
+		} else if(taxBasisCalculation.name().equals(TaxBasisCalculation.STOREADDRESS)){
+			country = store.getCountry();
+			zone = store.getZone();
+			stateProvince = store.getStorestateprovince();
+		}
+		
+		//check other conditions
+		//do not collect tax on other provinces of same country
+		if(!taxConfiguration.isCollectTaxIfDifferentProvinceOfStoreCountry()) {
+			if((zone!=null && store.getZone()!=null) && (zone.getId().longValue() != store.getZone().getId().longValue())) {
+				return null;
+			}
+			if(!StringUtils.isBlank(stateProvince)) {
+				if(store.getZone()!=null) {
+					if(!store.getZone().getName().equals(stateProvince)) {
+						return null;
+					}
+				}
+				else if(!StringUtils.isBlank(store.getStorestateprovince())) {
+
+					if(!store.getStorestateprovince().equals(stateProvince)) {
+						return null;
+					}
+				}
+			}
+		}
+		
+		//collect tax in different countries
+		if(taxConfiguration.isCollectTaxIfDifferentCountryOfStoreCountry()) {
+			//use store country
+			country = store.getCountry();
+			zone = store.getZone();
+			stateProvince = store.getStorestateprovince();
+		}
+		
+		Map<Long,TaxClass> taxClasses =  new HashMap<Long,TaxClass>();
+			
+		//put items in a map by tax class id
+		Map<Long,BigDecimal> taxClassAmountMap = new HashMap<Long,BigDecimal>();
+		for(ShoppingCartItem item : items) {
+				
+				BigDecimal itemPrice = item.getItemPrice();
+				TaxClass taxClass = item.getProduct().getTaxClass();
+				int quantity = item.getQuantity();
+				itemPrice = itemPrice.multiply(new BigDecimal(quantity));
+				if(taxClass==null) {
+					taxClass = taxClassService.getByCode(DEFAULT_TAX_CLASS);
+				}
+				BigDecimal subTotal = taxClassAmountMap.get(taxClass.getId());
+				if(subTotal==null) {
+					subTotal = new BigDecimal(0);
+					subTotal.setScale(2, RoundingMode.HALF_UP);
+				}
+					
+				subTotal = subTotal.add(itemPrice);
+				taxClassAmountMap.put(taxClass.getId(), subTotal);
+				taxClasses.put(taxClass.getId(), taxClass);
+				
+		}
+		
+		//tax on shipping ?
+		//ShippingConfiguration shippingConfiguration = shippingService.getShippingConfiguration(store);	
+		
+		/** always calculate tax on shipping **/
+		//if(shippingConfiguration!=null) {
+			//if(shippingConfiguration.isTaxOnShipping()){
+				//use default tax class for shipping
+				TaxClass defaultTaxClass = taxClassService.getByCode(TaxClass.DEFAULT_TAX_CLASS);
+				//taxClasses.put(defaultTaxClass.getId(), defaultTaxClass);
+				BigDecimal amnt = taxClassAmountMap.get(defaultTaxClass.getId());
+				if(amnt==null) {
+					amnt = new BigDecimal(0);
+					amnt.setScale(2, RoundingMode.HALF_UP);
+				}
+				ShippingSummary shippingSummary = orderSummary.getShippingSummary();
+				if(shippingSummary!=null && shippingSummary.getShipping()!=null && shippingSummary.getShipping().doubleValue()>0) {
+					amnt = amnt.add(shippingSummary.getShipping());
+					if(shippingSummary.getHandling()!=null && shippingSummary.getHandling().doubleValue()>0) {
+						amnt = amnt.add(shippingSummary.getHandling());
+					}
+				}
+				taxClassAmountMap.put(defaultTaxClass.getId(), amnt);
+			//}
+		//}
+		
+		
+		List<TaxItem> taxItems = new ArrayList<TaxItem>();
+		
+		//iterate through the tax class and get appropriate rates
+		for(Long taxClassId : taxClassAmountMap.keySet()) {
+			
+			//get taxRate by tax class
+			List<TaxRate> taxRates = null; 
+			if(!StringUtils.isBlank(stateProvince)&& zone==null) {
+				taxRates = taxRateService.listByCountryStateProvinceAndTaxClass(country, stateProvince, taxClasses.get(taxClassId), store, language);
+			} else {
+				taxRates = taxRateService.listByCountryZoneAndTaxClass(country, zone, taxClasses.get(taxClassId), store, language);
+			}
+			
+			if(taxRates==null || taxRates.size()==0){
+				continue;
+			}
+			BigDecimal taxedItemValue = null;
+			BigDecimal totalTaxedItemValue = new BigDecimal(0);
+			totalTaxedItemValue.setScale(2, RoundingMode.HALF_UP);
+			BigDecimal beforeTaxeAmount = taxClassAmountMap.get(taxClassId);
+			for(TaxRate taxRate : taxRates) {
+				
+				double taxRateDouble = taxRate.getTaxRate().doubleValue();//5% ... 8% ...
+				
+
+				if(taxRate.isPiggyback()) {//(compound)
+					if(totalTaxedItemValue.doubleValue()>0) {
+						beforeTaxeAmount = totalTaxedItemValue;
+					}
+				} //else just use nominal taxing (combine)
+				
+				double value  = (beforeTaxeAmount.doubleValue() * taxRateDouble)/100;
+				double roundedValue = new BigDecimal(value).setScale(2, RoundingMode.HALF_UP).doubleValue();
+				taxedItemValue = new BigDecimal(roundedValue).setScale(2, RoundingMode.HALF_UP);
+				totalTaxedItemValue = beforeTaxeAmount.add(taxedItemValue);
+				
+				TaxItem taxItem = new TaxItem();
+				taxItem.setItemPrice(taxedItemValue);
+				taxItem.setLabel(taxRate.getDescriptions().get(0).getName());
+				taxItem.setTaxRate(taxRate);
+				taxItems.add(taxItem);
+				
+			}
+			
+		}
+		
+		
+		
+		Map<String,TaxItem> taxItemsMap = new TreeMap<String,TaxItem>();
+		//consolidate tax rates of same code
+		for(TaxItem taxItem : taxItems) {
+			
+			TaxRate taxRate = taxItem.getTaxRate();
+			if(!taxItemsMap.containsKey(taxRate.getCode())) {
+				taxItemsMap.put(taxRate.getCode(), taxItem);
+			} 
+			
+			TaxItem item = taxItemsMap.get(taxRate.getCode());
+			BigDecimal amount = item.getItemPrice();
+			amount = amount.add(taxItem.getItemPrice());			
+			
+		}
+		
+		if(taxItemsMap.size()==0) {
+			return null;
+		}
+			
+			
+		@SuppressWarnings("rawtypes")
+		Collection<TaxItem> values = taxItemsMap.values();
+		
+		
+		@SuppressWarnings("unchecked")
+		List<TaxItem> list = new ArrayList<TaxItem>(values);
+		return list;
+
+	}
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/user/dao/GroupDao.java b/sm-core/src/main/java/com/salesmanager/core/business/user/dao/GroupDao.java
new file mode 100755
index 0000000..39b287b
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/user/dao/GroupDao.java
@@ -0,0 +1,17 @@
+package com.salesmanager.core.business.user.dao;
+
+import java.util.List;
+import java.util.Set;
+
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDao;
+import com.salesmanager.core.business.user.model.Group;
+import com.salesmanager.core.business.user.model.GroupType;
+
+public interface GroupDao extends SalesManagerEntityDao<Integer, Group> {
+
+	List<Group> getGroupsListBypermissions(Set<Integer> ids);
+
+	List<Group> listGroup(GroupType groupType);
+
+	List<Group> listGroupByIds(Set<Integer> ids);
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/user/dao/GroupDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/user/dao/GroupDaoImpl.java
new file mode 100755
index 0000000..4f7582e
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/user/dao/GroupDaoImpl.java
@@ -0,0 +1,77 @@
+package com.salesmanager.core.business.user.dao;
+
+import java.util.List;
+import java.util.Set;
+
+import javax.persistence.Query;
+
+import org.springframework.stereotype.Repository;
+
+import com.mysema.query.jpa.JPQLQuery;
+import com.mysema.query.jpa.impl.JPAQuery;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDaoImpl;
+import com.salesmanager.core.business.user.model.Group;
+import com.salesmanager.core.business.user.model.GroupType;
+import com.salesmanager.core.business.user.model.QGroup;
+
+@Repository("groupDao")
+public class GroupDaoImpl extends SalesManagerEntityDaoImpl<Integer, Group> implements
+		GroupDao {
+
+	@SuppressWarnings("rawtypes")
+	@Override
+	public List<Group> getGroupsListBypermissions(Set permissionIds) {
+		StringBuilder qs = new StringBuilder();
+		qs.append("select g from Group as g ");
+		qs.append("join fetch g.permissions perms ");
+		qs.append("where perms.id in (:cid) ");
+
+
+
+    	String hql = qs.toString();
+		Query q = super.getEntityManager().createQuery(hql);
+
+    	q.setParameter("cid", permissionIds);
+	
+    	@SuppressWarnings("unchecked")
+		List<Group> groups =  q.getResultList();
+
+    	
+    	return groups;
+	}
+	
+	@Override
+	public List<Group> listGroupByIds(Set<Integer> ids) {
+		
+		StringBuilder qs = new StringBuilder();
+		qs.append("select distinct g from Group as g ");
+		qs.append("join fetch g.permissions perms ");
+		qs.append("where g.id in (:gid) ");
+		
+    	String hql = qs.toString();
+		Query q = super.getEntityManager().createQuery(hql);
+
+    	q.setParameter("gid", ids);
+	
+    	@SuppressWarnings("unchecked")
+		List<Group> groups =  q.getResultList();
+
+    	
+    	return groups;
+		
+	}
+
+	@Override
+	public List<Group> listGroup(GroupType groupType) {
+		QGroup qGroup = QGroup.group;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qGroup)
+			.where(qGroup.groupType.eq(groupType))
+			.orderBy(qGroup.id.asc());
+		
+		return query.listDistinct(qGroup);
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/user/dao/PermissionDao.java b/sm-core/src/main/java/com/salesmanager/core/business/user/dao/PermissionDao.java
new file mode 100755
index 0000000..9c86310
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/user/dao/PermissionDao.java
@@ -0,0 +1,23 @@
+package com.salesmanager.core.business.user.dao;
+
+import java.util.List;
+import java.util.Set;
+
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDao;
+import com.salesmanager.core.business.user.model.Permission;
+import com.salesmanager.core.business.user.model.PermissionCriteria;
+import com.salesmanager.core.business.user.model.PermissionList;
+
+public interface PermissionDao extends SalesManagerEntityDao<Integer, Permission> {
+
+	List<Permission> listPermission();
+
+	Permission getById(Integer permissionId);
+
+	List<Permission> getPermissionsListByGroups(Set permissionIds);
+
+	PermissionList listByCriteria(PermissionCriteria criteria);
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/user/dao/PermissionDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/user/dao/PermissionDaoImpl.java
new file mode 100755
index 0000000..115d119
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/user/dao/PermissionDaoImpl.java
@@ -0,0 +1,140 @@
+package com.salesmanager.core.business.user.dao;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+
+import javax.persistence.Query;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Repository;
+
+import com.mysema.query.jpa.JPQLQuery;
+import com.mysema.query.jpa.impl.JPAQuery;
+import com.salesmanager.core.business.catalog.product.model.Product;
+import com.salesmanager.core.business.catalog.product.model.ProductList;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDaoImpl;
+import com.salesmanager.core.business.user.model.Permission;
+import com.salesmanager.core.business.user.model.PermissionCriteria;
+import com.salesmanager.core.business.user.model.PermissionList;
+import com.salesmanager.core.business.user.model.QPermission;
+
+@Repository("permissionDao")
+public class PermissionDaoImpl extends SalesManagerEntityDaoImpl<Integer, Permission> implements
+		PermissionDao {
+
+	@Override
+	public List<Permission> listPermission() {
+		QPermission qPermission = QPermission.permission;
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qPermission)
+			.orderBy(qPermission.id.asc());
+		
+		return query.listDistinct(qPermission);
+		}
+
+	@Override
+	public Permission getById(Integer permissionId) {
+		QPermission qPermission = QPermission.permission;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qPermission)
+			.where(qPermission.id.eq(permissionId));
+		
+		return query.uniqueResult(qPermission);
+	}
+
+
+	@Override
+	public List<Permission> getPermissionsListByGroups(Set groupIds) {
+		StringBuilder qs = new StringBuilder();
+		qs.append("select distinct p from Permission as p ");
+		qs.append("join fetch p.groups grous ");
+		qs.append("where grous.id in (:cid)");
+
+    	String hql = qs.toString();
+		Query q = super.getEntityManager().createQuery(hql);
+
+    	q.setParameter("cid", groupIds);
+    	
+    	@SuppressWarnings("unchecked")
+		List<Permission> permissions =  q.getResultList();
+    	
+    	return permissions;
+	}
+
+	@Override
+	public PermissionList listByCriteria(PermissionCriteria criteria) {
+		PermissionList permissionList = new PermissionList();
+
+        
+		StringBuilder countBuilderSelect = new StringBuilder();
+		countBuilderSelect.append("select count(p) from Permission as p");
+		
+		StringBuilder countBuilderWhere = new StringBuilder();
+		
+		
+		if(criteria.getGroupIds()!=null && criteria.getGroupIds().size()>0) {
+			countBuilderSelect.append(" INNER JOIN p.groups grous");
+			countBuilderWhere.append(" where grous.id in (:cid)");
+		}
+		
+	
+		Query countQ = super.getEntityManager().createQuery(
+				countBuilderSelect.toString() + countBuilderWhere.toString());
+
+		if(criteria.getGroupIds()!=null && criteria.getGroupIds().size()>0) {
+			countQ.setParameter("cid", criteria.getGroupIds());
+		}
+		
+
+		Number count = (Number) countQ.getSingleResult ();
+
+		permissionList.setTotalCount(count.intValue());
+		
+        if(count.intValue()==0)
+        	return permissionList;
+
+		
+		StringBuilder qs = new StringBuilder();
+		qs.append("select p from Permission as p ");
+		qs.append("join fetch p.groups grous ");
+		
+		if(criteria.getGroupIds()!=null && criteria.getGroupIds().size()>0) {
+			qs.append(" where grous.id in (:cid)");
+		}
+		
+		qs.append(" order by p.id asc ");
+		
+    	String hql = qs.toString();
+		Query q = super.getEntityManager().createQuery(hql);
+
+
+    	if(criteria.getGroupIds()!=null && criteria.getGroupIds().size()>0) {
+    		q.setParameter("cid", criteria.getGroupIds());
+    	}
+    	
+    	if(criteria.getMaxCount()>0) {
+    		
+    		
+	    	q.setFirstResult(criteria.getStartIndex());
+	    	if(criteria.getMaxCount()<count.intValue()) {
+	    		q.setMaxResults(criteria.getMaxCount());
+	    		permissionList.setTotalCount(criteria.getMaxCount());
+	    	}
+	    	else {
+	    		q.setMaxResults(count.intValue());
+	    		permissionList.setTotalCount(count.intValue());
+	    	}
+    	}
+    	
+    	@SuppressWarnings("unchecked")
+		List<Permission> permissions =  q.getResultList();
+    	permissionList.setPermissions(permissions);
+    	
+    	return permissionList;
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/user/dao/UserDao.java b/sm-core/src/main/java/com/salesmanager/core/business/user/dao/UserDao.java
new file mode 100755
index 0000000..fd0928c
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/user/dao/UserDao.java
@@ -0,0 +1,19 @@
+package com.salesmanager.core.business.user.dao;
+
+import java.util.List;
+
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDao;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.user.model.User;
+
+public interface UserDao extends SalesManagerEntityDao<Long, User> {
+
+	User getByUserName(String userName);
+
+	List<User> listUser();
+
+	List<User> listUserByStore(MerchantStore store);
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/user/dao/UserDaoImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/user/dao/UserDaoImpl.java
new file mode 100755
index 0000000..0aad078
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/user/dao/UserDaoImpl.java
@@ -0,0 +1,90 @@
+package com.salesmanager.core.business.user.dao;
+
+import java.util.List;
+
+import org.springframework.stereotype.Repository;
+
+import com.mysema.query.jpa.JPQLQuery;
+import com.mysema.query.jpa.impl.JPAQuery;
+import com.salesmanager.core.business.generic.dao.SalesManagerEntityDaoImpl;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.user.model.QGroup;
+import com.salesmanager.core.business.user.model.QUser;
+import com.salesmanager.core.business.user.model.User;
+
+@Repository("userDao")
+public class UserDaoImpl extends SalesManagerEntityDaoImpl<Long, User> implements
+		UserDao {
+	
+	@Override
+	public User getByUserName(String userName) {
+		
+		
+		QUser qUser = QUser.user;
+		QGroup qGroup = QGroup.group;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qUser)
+			.innerJoin(qUser.groups, qGroup).fetch()
+			.innerJoin(qUser.merchantStore).fetch()
+			.leftJoin(qUser.defaultLanguage).fetch()
+			.where(qUser.adminName.eq(userName));
+		
+		
+
+		User user = query.uniqueResult(qUser);
+		return user;
+	}
+	
+	@Override
+	public User getById(Long id) {
+		
+		
+		QUser qUser = QUser.user;
+		QGroup qGroup = QGroup.group;
+		
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qUser)
+			.innerJoin(qUser.groups, qGroup).fetch()
+			.innerJoin(qUser.merchantStore).fetch()
+			.leftJoin(qUser.defaultLanguage).fetch()
+			.where(qUser.id.eq(id));
+		
+		
+
+		User user = query.uniqueResult(qUser);
+		return user;
+	}
+
+	@Override
+	public List<User> listUser() {
+		QUser qUser = QUser.user;
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qUser)
+			.innerJoin(qUser.groups).fetch()
+			.innerJoin(qUser.merchantStore).fetch()
+			.leftJoin(qUser.defaultLanguage).fetch()
+			.orderBy(qUser.id.asc());
+		
+		return query.listDistinct(qUser);
+	}
+	
+	@Override
+	public List<User> listUserByStore(MerchantStore store) {
+		QUser qUser = QUser.user;
+		JPQLQuery query = new JPAQuery (getEntityManager());
+		
+		query.from(qUser)
+			.innerJoin(qUser.groups).fetch()
+			.innerJoin(qUser.merchantStore).fetch()
+			.leftJoin(qUser.defaultLanguage).fetch()
+			.orderBy(qUser.id.asc())
+			.where(qUser.merchantStore.id.eq(store.getId()));
+		
+		return query.listDistinct(qUser);
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/user/model/Group.java b/sm-core/src/main/java/com/salesmanager/core/business/user/model/Group.java
new file mode 100755
index 0000000..82077e9
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/user/model/Group.java
@@ -0,0 +1,112 @@
+package com.salesmanager.core.business.user.model;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.persistence.Column;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+
+import org.hibernate.validator.constraints.NotEmpty;
+
+import com.salesmanager.core.business.common.model.audit.AuditListener;
+import com.salesmanager.core.business.common.model.audit.AuditSection;
+import com.salesmanager.core.business.common.model.audit.Auditable;
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.constants.SchemaConstant;
+
+
+@Entity
+@EntityListeners(value = AuditListener.class)
+@Table(name = "SM_GROUP", schema=SchemaConstant.SALESMANAGER_SCHEMA)
+public class Group extends SalesManagerEntity<Integer, Group> implements Auditable {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 3786127652573709701L;
+	@Id
+	@Column(name = "GROUP_ID", unique=true, nullable=false)
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT", pkColumnValue = "GROUP_SEQ_NEXT_VAL")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Integer id;
+	
+	public Group() {
+		
+	}
+	
+	@Column (name ="GROUP_TYPE")
+	@Enumerated(value = EnumType.STRING)
+	private GroupType groupType;
+	
+	@NotEmpty
+	@Column(name="GROUP_NAME", unique=true)
+	private String groupName;
+	
+	public Group(String groupName) {
+		this.groupName = groupName;
+	}
+	
+	@ManyToMany(mappedBy = "groups")
+	private Set<Permission> permissions = new HashSet<Permission>();	
+	
+	public Set<Permission> getPermissions() {
+		return permissions;
+	}
+
+	public void setPermissions(Set<Permission> permissions) {
+		this.permissions = permissions;
+	}
+
+	@Embedded
+	private AuditSection auditSection = new AuditSection();
+	
+	
+	@Override
+	public AuditSection getAuditSection() {
+		return this.auditSection;
+	}
+
+	@Override
+	public void setAuditSection(AuditSection audit) {
+			this.auditSection = audit;
+	}
+
+	@Override
+	public Integer getId() {
+		return this.id;
+	}
+
+	@Override
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public String getGroupName() {
+		return groupName;
+	}
+
+	public void setGroupName(String groupName) {
+		this.groupName = groupName;
+	}
+
+	public void setGroupType(GroupType groupType) {
+		this.groupType = groupType;
+	}
+
+	public GroupType getGroupType() {
+		return groupType;
+	}
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/user/model/GroupType.java b/sm-core/src/main/java/com/salesmanager/core/business/user/model/GroupType.java
new file mode 100644
index 0000000..2bcbfea
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/user/model/GroupType.java
@@ -0,0 +1,7 @@
+package com.salesmanager.core.business.user.model;
+
+public enum GroupType {
+	
+	ADMIN, CUSTOMER
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/user/model/Permission.java b/sm-core/src/main/java/com/salesmanager/core/business/user/model/Permission.java
new file mode 100755
index 0000000..d5e306e
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/user/model/Permission.java
@@ -0,0 +1,116 @@
+package com.salesmanager.core.business.user.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+
+import org.hibernate.annotations.Cascade;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import com.salesmanager.core.business.common.model.audit.AuditListener;
+import com.salesmanager.core.business.common.model.audit.AuditSection;
+import com.salesmanager.core.business.common.model.audit.Auditable;
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.constants.SchemaConstant;
+
+@Entity
+@EntityListeners(value = AuditListener.class)
+@Table(name = "PERMISSION", schema=SchemaConstant.SALESMANAGER_SCHEMA)
+public class Permission extends SalesManagerEntity<Integer, Permission> implements Auditable {
+
+	
+
+	private static final long serialVersionUID = 813468140197420748L;
+
+	@Id
+	@Column(name = "PERMISSION_ID", unique=true, nullable=false)
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT", pkColumnValue = "PERMISSION_SEQ_NEXT_VAL")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Integer id;
+	
+	public Permission() {
+		
+	}
+	
+	public Permission(String permissionName) {
+		this.permissionName = permissionName;
+	}
+	
+	
+	@NotEmpty
+	@Column(name="PERMISSION_NAME", unique=true)
+	private String permissionName;
+	
+	@ManyToMany(fetch=FetchType.LAZY, cascade = {CascadeType.REFRESH})
+	@JoinTable(name = "PERMISSION_GROUP", schema=SchemaConstant.SALESMANAGER_SCHEMA, joinColumns = { 
+			@JoinColumn(name = "PERMISSION_ID", nullable = false, updatable = false) }
+			, 
+			inverseJoinColumns = { @JoinColumn(name = "GROUP_ID", 
+					nullable = false, updatable = false) }
+	)
+	@Cascade({
+		org.hibernate.annotations.CascadeType.DETACH,
+		org.hibernate.annotations.CascadeType.LOCK,
+		org.hibernate.annotations.CascadeType.REFRESH,
+		org.hibernate.annotations.CascadeType.REPLICATE
+		
+	})
+	private List<Group> groups = new ArrayList<Group>();
+	
+	@Embedded
+	private AuditSection auditSection = new AuditSection();
+	
+	
+	@Override
+	public Integer getId() {
+		return this.id;
+	}
+
+	@Override
+	public void setId(Integer id) {
+		this.id = id;
+		
+	}
+
+	@Override
+	public AuditSection getAuditSection() {
+		return this.auditSection;
+	}
+
+	@Override
+	public void setAuditSection(AuditSection audit) {
+		this.auditSection = audit;
+		
+	}
+
+	public String getPermissionName() {
+		return permissionName;
+	}
+
+	public void setPermissionName(String permissionName) {
+		this.permissionName = permissionName;
+	}
+	
+	public void setGroups(List<Group> groups) {
+		this.groups = groups;
+	}
+
+	public List<Group> getGroups() {
+		return groups;
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/user/model/PermissionCriteria.java b/sm-core/src/main/java/com/salesmanager/core/business/user/model/PermissionCriteria.java
new file mode 100644
index 0000000..7717f94
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/user/model/PermissionCriteria.java
@@ -0,0 +1,54 @@
+package com.salesmanager.core.business.user.model;
+
+import java.util.List;
+import java.util.Set;
+
+import com.salesmanager.core.business.common.model.Criteria;
+
+public class PermissionCriteria extends Criteria {
+	
+	
+	private String permissionName;
+
+	
+	private Boolean available = null;
+	
+	private Set<Integer> groupIds;
+	
+	private List<String> availabilities;
+
+
+	public List<String> getAvailabilities() {
+		return availabilities;
+	}
+
+	public void setAvailabilities(List<String> availabilities) {
+		this.availabilities = availabilities;
+	}
+
+	public Boolean getAvailable() {
+		return available;
+	}
+
+	public void setAvailable(Boolean available) {
+		this.available = available;
+	}
+
+	public String getPermissionName() {
+		return permissionName;
+	}
+
+	public void setPermissionName(String permissionName) {
+		this.permissionName = permissionName;
+	}
+
+	public Set<Integer> getGroupIds() {
+		return groupIds;
+	}
+
+	public void setGroupIds(Set<Integer> groupIds) {
+		this.groupIds = groupIds;
+	}
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/user/model/PermissionList.java b/sm-core/src/main/java/com/salesmanager/core/business/user/model/PermissionList.java
new file mode 100644
index 0000000..89f78f2
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/user/model/PermissionList.java
@@ -0,0 +1,26 @@
+package com.salesmanager.core.business.user.model;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+public class PermissionList implements Serializable {
+	
+
+	private static final long serialVersionUID = -3122326940968441727L;
+	private int totalCount;
+	private List<Permission> permissions = new ArrayList<Permission>();
+	public int getTotalCount() {
+		return totalCount;
+	}
+	public void setTotalCount(int totalCount) {
+		this.totalCount = totalCount;
+	}
+	public List<Permission> getPermissions() {
+		return permissions;
+	}
+	public void setPermissions(List<Permission> permissions) {
+		this.permissions = permissions;
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/user/model/User.java b/sm-core/src/main/java/com/salesmanager/core/business/user/model/User.java
new file mode 100755
index 0000000..d0df6f1
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/user/model/User.java
@@ -0,0 +1,298 @@
+package com.salesmanager.core.business.user.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.TableGenerator;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+import org.hibernate.annotations.Cascade;
+import org.hibernate.validator.constraints.Email;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import com.salesmanager.core.business.common.model.audit.AuditListener;
+import com.salesmanager.core.business.common.model.audit.AuditSection;
+import com.salesmanager.core.business.generic.model.SalesManagerEntity;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.reference.language.model.Language;
+import com.salesmanager.core.business.common.model.audit.Auditable;
+import com.salesmanager.core.constants.SchemaConstant;
+
+@Entity
+@EntityListeners(value = AuditListener.class)
+@Table(name = "USER", schema=SchemaConstant.SALESMANAGER_SCHEMA)
+public class User extends SalesManagerEntity<Long, User> implements Auditable {
+	
+	
+	private static final long serialVersionUID = 5401059537544058710L;
+	
+	@Id
+	@Column(name = "USER_ID", unique=true, nullable=false)
+	@TableGenerator(name = "TABLE_GEN", table = "SM_SEQUENCER", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT", pkColumnValue = "USER_SEQ_NEXT_VAL")
+	@GeneratedValue(strategy = GenerationType.TABLE, generator = "TABLE_GEN")
+	private Long id;
+	
+	public User() {
+		
+	}
+	
+	public User(String userName,String password, String email) {
+		
+		this.adminName = userName;
+		this.adminPassword = password;
+		this.adminEmail = email;
+	}
+	
+	@NotEmpty
+	@Column(name="ADMIN_NAME", length=100, unique=true)
+	private String adminName;
+	
+	@ManyToMany(fetch=FetchType.LAZY, cascade = {CascadeType.REFRESH})
+	@JoinTable(name = "USER_GROUP", schema=SchemaConstant.SALESMANAGER_SCHEMA, joinColumns = { 
+			@JoinColumn(name = "USER_ID", nullable = false, updatable = false) }
+			, 
+			inverseJoinColumns = { @JoinColumn(name = "GROUP_ID", 
+					nullable = false, updatable = false) }
+	)
+	@Cascade({
+		org.hibernate.annotations.CascadeType.DETACH,
+		org.hibernate.annotations.CascadeType.LOCK,
+		org.hibernate.annotations.CascadeType.REFRESH,
+		org.hibernate.annotations.CascadeType.REPLICATE
+		
+	})
+	private List<Group> groups = new ArrayList<Group>();
+	
+	@NotEmpty
+	@Email
+	@Column(name="ADMIN_EMAIL")
+	private String adminEmail;
+	
+	@NotEmpty
+	@Column(name="ADMIN_PASSWORD", length=50)
+	private String adminPassword;
+	
+	@ManyToOne(fetch = FetchType.LAZY)
+	@JoinColumn(name="MERCHANT_ID", nullable=false)
+	private MerchantStore merchantStore;
+	
+	
+	@Column(name="ADMIN_FIRST_NAME")
+	private String firstName;
+	
+	@Column(name="ACTIVE")
+	private boolean active = true;
+	
+	
+	@Column(name="ADMIN_LAST_NAME")
+	private String lastName;
+	
+	@ManyToOne(fetch = FetchType.LAZY, targetEntity = Language.class)
+	@JoinColumn(name = "LANGUAGE_ID")
+	private Language defaultLanguage;
+	
+	
+	@Column(name="ADMIN_Q1")
+	private String question1;
+	
+	@Column(name="ADMIN_Q2")
+	private String question2;
+	
+	@Column(name="ADMIN_Q3")
+	private String question3;
+	
+	@Column(name="ADMIN_A1")
+	private String answer1;
+	
+	@Column(name="ADMIN_A2")
+	private String answer2;
+	
+	@Column(name="ADMIN_A3")
+	private String answer3;
+	
+	
+	@Embedded
+	private AuditSection auditSection = new AuditSection();
+	
+	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name = "LAST_ACCESS")
+	private Date lastAccess;
+	
+	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name = "LOGIN_ACCESS")
+	private Date loginTime;
+
+	@Override
+	public Long getId() {
+		return this.id;
+	}
+
+	@Override
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	@Override
+	public AuditSection getAuditSection() {
+		return auditSection;
+	}
+
+	@Override
+	public void setAuditSection(AuditSection audit) {
+		auditSection = audit;
+		
+	}
+
+	public String getAdminName() {
+		return adminName;
+	}
+
+	public void setAdminName(String adminName) {
+		this.adminName = adminName;
+	}
+
+	public String getAdminEmail() {
+		return adminEmail;
+	}
+
+	public void setAdminEmail(String adminEmail) {
+		this.adminEmail = adminEmail;
+	}
+
+	public String getAdminPassword() {
+		return adminPassword;
+	}
+
+	public void setAdminPassword(String adminPassword) {
+		this.adminPassword = adminPassword;
+	}
+
+	public String getFirstName() {
+		return firstName;
+	}
+
+	public void setFirstName(String firstName) {
+		this.firstName = firstName;
+	}
+
+	public String getLastName() {
+		return lastName;
+	}
+
+	public void setLastName(String lastName) {
+		this.lastName = lastName;
+	}
+
+	public Language getDefaultLanguage() {
+		return defaultLanguage;
+	}
+
+	public void setDefaultLanguage(Language defaultLanguage) {
+		this.defaultLanguage = defaultLanguage;
+	}
+
+	public String getQuestion1() {
+		return question1;
+	}
+
+	public void setQuestion1(String question1) {
+		this.question1 = question1;
+	}
+
+	public String getQuestion2() {
+		return question2;
+	}
+
+	public void setQuestion2(String question2) {
+		this.question2 = question2;
+	}
+
+	public String getQuestion3() {
+		return question3;
+	}
+
+	public void setQuestion3(String question3) {
+		this.question3 = question3;
+	}
+
+	public String getAnswer1() {
+		return answer1;
+	}
+
+	public void setAnswer1(String answer1) {
+		this.answer1 = answer1;
+	}
+
+	public String getAnswer2() {
+		return answer2;
+	}
+
+	public void setAnswer2(String answer2) {
+		this.answer2 = answer2;
+	}
+
+	public String getAnswer3() {
+		return answer3;
+	}
+
+	public void setAnswer3(String answer3) {
+		this.answer3 = answer3;
+	}
+
+	public void setGroups(List<Group> groups) {
+		this.groups = groups;
+	}
+
+	public List<Group> getGroups() {
+		return groups;
+	}
+
+	public MerchantStore getMerchantStore() {
+		return merchantStore;
+	}
+
+	public void setMerchantStore(MerchantStore merchantStore) {
+		this.merchantStore = merchantStore;
+	}
+
+	public void setActive(boolean active) {
+		this.active = active;
+	}
+
+	public boolean isActive() {
+		return active;
+	}
+
+	public void setLastAccess(Date lastAccess) {
+		this.lastAccess = lastAccess;
+	}
+
+	public Date getLastAccess() {
+		return lastAccess;
+	}
+
+	public void setLoginTime(Date loginTime) {
+		this.loginTime = loginTime;
+	}
+
+	public Date getLoginTime() {
+		return loginTime;
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/user/service/GroupService.java b/sm-core/src/main/java/com/salesmanager/core/business/user/service/GroupService.java
new file mode 100755
index 0000000..26b0408
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/user/service/GroupService.java
@@ -0,0 +1,17 @@
+package com.salesmanager.core.business.user.service;
+
+import java.util.List;
+import java.util.Set;
+
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityService;
+import com.salesmanager.core.business.user.model.Group;
+import com.salesmanager.core.business.user.model.GroupType;
+
+public interface GroupService extends SalesManagerEntityService<Integer, Group> {
+
+
+	List<Group> listGroup(GroupType groupType) throws ServiceException;
+	List<Group> listGroupByIds(Set<Integer> ids) throws ServiceException;
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/user/service/GroupServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/user/service/GroupServiceImpl.java
new file mode 100755
index 0000000..87947ab
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/user/service/GroupServiceImpl.java
@@ -0,0 +1,52 @@
+package com.salesmanager.core.business.user.service;
+
+import java.util.List;
+import java.util.Set;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityServiceImpl;
+import com.salesmanager.core.business.user.dao.GroupDao;
+import com.salesmanager.core.business.user.model.Group;
+import com.salesmanager.core.business.user.model.GroupType;
+
+@Service("groupService")
+public class GroupServiceImpl extends
+		SalesManagerEntityServiceImpl<Integer, Group> implements GroupService {
+
+	GroupDao groupDao;
+
+
+	@Autowired
+	public GroupServiceImpl(GroupDao groupDao) {
+		super(groupDao);
+		this.groupDao = groupDao;
+
+	}
+
+
+
+
+
+
+	@Override
+	public List<Group> listGroup(GroupType groupType) throws ServiceException {
+		try {
+			return groupDao.listGroup(groupType);
+		} catch (Exception e) {
+			throw new ServiceException(e);
+		}
+	}
+	
+	public List<Group> listGroupByIds(Set<Integer> ids) throws ServiceException {
+		try {
+			return groupDao.listGroupByIds(ids);
+		} catch (Exception e) {
+			throw new ServiceException(e);
+		}
+	}
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/user/service/PermissionService.java b/sm-core/src/main/java/com/salesmanager/core/business/user/service/PermissionService.java
new file mode 100755
index 0000000..ec7e750
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/user/service/PermissionService.java
@@ -0,0 +1,32 @@
+package com.salesmanager.core.business.user.service;
+
+import java.util.List;
+
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityService;
+import com.salesmanager.core.business.user.model.Group;
+import com.salesmanager.core.business.user.model.Permission;
+import com.salesmanager.core.business.user.model.PermissionCriteria;
+import com.salesmanager.core.business.user.model.PermissionList;
+
+public interface PermissionService extends SalesManagerEntityService<Integer, Permission> {
+
+	List<Permission> getByName();
+
+	List<Permission> listPermission()  throws ServiceException;
+
+	Permission getById(Integer permissionId);
+
+	void saveOrUpdate(Permission permission);
+
+//	void deletePermission(Permission permission) throws ServiceException;
+
+	List<Permission> getPermissions(List<Integer> groupIds) throws ServiceException;
+
+	void deletePermission(Permission permission) throws ServiceException;
+
+	PermissionList listByCriteria(PermissionCriteria criteria) throws ServiceException ;
+
+	void removePermission(Permission permission, Group group) throws ServiceException;
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/user/service/PermissionServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/user/service/PermissionServiceImpl.java
new file mode 100755
index 0000000..d8acfcf
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/user/service/PermissionServiceImpl.java
@@ -0,0 +1,106 @@
+package com.salesmanager.core.business.user.service;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.salesmanager.core.business.catalog.category.model.Category;
+import com.salesmanager.core.business.catalog.product.model.Product;
+import com.salesmanager.core.business.catalog.product.model.image.ProductImage;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityServiceImpl;
+import com.salesmanager.core.business.merchant.service.MerchantStoreService;
+import com.salesmanager.core.business.reference.language.service.LanguageService;
+import com.salesmanager.core.business.user.dao.PermissionDao;
+import com.salesmanager.core.business.user.model.Group;
+import com.salesmanager.core.business.user.model.Permission;
+import com.salesmanager.core.business.user.model.PermissionCriteria;
+import com.salesmanager.core.business.user.model.PermissionList;
+
+@Service("permissionService")
+public class PermissionServiceImpl extends
+		SalesManagerEntityServiceImpl<Integer, Permission> implements
+		PermissionService {
+
+	PermissionDao permissionDao;
+
+	@Autowired
+	private LanguageService languageService;
+
+	@Autowired
+	private MerchantStoreService merchantService;
+	
+	@Autowired
+	private GroupService groupService;
+
+	@Autowired
+	public PermissionServiceImpl(PermissionDao permissionDao) {
+		super(permissionDao);
+		this.permissionDao = permissionDao;
+
+	}
+
+	@Override
+	public List<Permission> getByName() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+
+	@Override
+	public Permission getById(Integer permissionId) {
+		return permissionDao.getById(permissionId);
+
+	}
+
+	@Override
+	public void saveOrUpdate(Permission permission) {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void deletePermission(Permission permission) throws ServiceException {
+		permission = this.getById(permission.getId());//Prevents detached entity error
+		permission.setGroups(null);
+		
+		this.delete(permission);
+	}
+	
+
+	@Override
+	public List<Permission> getPermissions(List<Integer> groupIds)
+			throws ServiceException {
+		@SuppressWarnings({ "unchecked", "rawtypes" })
+		Set ids = new HashSet(groupIds);
+		return permissionDao.getPermissionsListByGroups(ids);
+	}
+
+	@Override
+	public PermissionList listByCriteria(PermissionCriteria criteria)
+			throws ServiceException {
+		return permissionDao.listByCriteria(criteria);
+	}
+
+	@Override
+	public void removePermission(Permission permission,Group group) throws ServiceException {
+		permission = this.getById(permission.getId());//Prevents detached entity error
+	
+		permission.getGroups().remove(group);
+		
+		
+//		this.delete(permission);
+	}
+
+	@Override
+	public List<Permission> listPermission() throws ServiceException {
+		return permissionDao.listPermission();
+	}
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/user/service/UserService.java b/sm-core/src/main/java/com/salesmanager/core/business/user/service/UserService.java
new file mode 100755
index 0000000..b40003d
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/user/service/UserService.java
@@ -0,0 +1,28 @@
+package com.salesmanager.core.business.user.service;
+
+import java.util.List;
+
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityService;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.user.model.User;
+import com.salesmanager.core.modules.email.Email;
+
+public interface UserService extends SalesManagerEntityService<Long, User> {
+
+	User getByUserName(String userName) throws ServiceException;
+
+	List<User> listUser() throws ServiceException;
+	
+	/**
+	 * Create or update a User
+	 * @param user
+	 * @throws ServiceException
+	 */
+	void saveOrUpdate(User user) throws ServiceException;
+
+	List<User> listByStore(MerchantStore store) throws ServiceException;
+
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/user/service/UserServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/user/service/UserServiceImpl.java
new file mode 100755
index 0000000..a9788e0
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/user/service/UserServiceImpl.java
@@ -0,0 +1,77 @@
+package com.salesmanager.core.business.user.service;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.generic.service.SalesManagerEntityServiceImpl;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.system.service.EmailService;
+import com.salesmanager.core.business.user.dao.UserDao;
+import com.salesmanager.core.business.user.model.User;
+import com.salesmanager.core.modules.email.Email;
+
+
+public class UserServiceImpl extends SalesManagerEntityServiceImpl<Long, User>
+		implements UserService {
+
+
+	private UserDao userDao;
+	
+	@Autowired
+	public UserServiceImpl(UserDao userDao) {
+		super(userDao);
+		this.userDao = userDao;
+
+	}
+	
+	@Autowired
+	private EmailService emailService;
+	
+	@Override
+	public User getByUserName(String userName) throws ServiceException {
+		
+		return userDao.getByUserName(userName);
+		
+	}
+	
+	@Override
+	public void delete(User user) throws ServiceException {
+		
+		User u = this.getById(user.getId());
+		super.delete(u);
+		
+	}
+
+	@Override
+	public List<User> listUser() throws ServiceException {
+		try {
+			return userDao.listUser();
+		} catch (Exception e) {
+			throw new ServiceException(e);
+		}
+	}
+	
+	@Override
+	public List<User> listByStore(MerchantStore store) throws ServiceException {
+		try {
+			return userDao.listUserByStore(store);
+		} catch (Exception e) {
+			throw new ServiceException(e);
+		}
+	}
+
+	
+	@Override
+	public void saveOrUpdate(User user) throws ServiceException {
+		
+		if(user.getId()==null || user.getId().longValue()==0) {
+			userDao.save(user);
+		} else {
+			userDao.update(user);
+		}
+		
+	}
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/user/service/UserServiceLDAPImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/user/service/UserServiceLDAPImpl.java
new file mode 100644
index 0000000..fc84915
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/business/user/service/UserServiceLDAPImpl.java
@@ -0,0 +1,106 @@
+package com.salesmanager.core.business.user.service;
+
+import java.util.List;
+
+import com.salesmanager.core.business.generic.exception.ServiceException;
+import com.salesmanager.core.business.merchant.model.MerchantStore;
+import com.salesmanager.core.business.user.model.User;
+import com.salesmanager.core.modules.email.Email;
+
+public class UserServiceLDAPImpl implements UserService {
+
+	@Override
+	public void save(User entity) throws ServiceException {
+		throw new ServiceException("Not implemented");
+
+	}
+
+	@Override
+	public void update(User entity) throws ServiceException {
+		throw new ServiceException("Not implemented");
+
+	}
+
+	@Override
+	public void create(User entity) throws ServiceException {
+		throw new ServiceException("Not implemented");
+
+	}
+
+	@Override
+	public void delete(User entity) throws ServiceException {
+		throw new ServiceException("Not implemented");
+
+	}
+
+	@Override
+	public User refresh(User entity) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public User getById(Long id) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public List<User> list() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+
+
+	@Override
+	public Long count() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void flush() {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void clear() {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public User getByUserName(String userName) throws ServiceException {
+		// TODO Auto-generated method stub
+		throw new ServiceException("Not implemented");
+	}
+
+	@Override
+	public List<User> listUser() throws ServiceException {
+		// TODO Auto-generated method stub
+		throw new ServiceException("Not implemented");
+	}
+
+	@Override
+	public void saveOrUpdate(User user) throws ServiceException {
+		throw new ServiceException("Not implemented");
+
+	}
+
+	@Override
+	public List<User> listByStore(MerchantStore store)
+			throws ServiceException {
+		// TODO Auto-generated method stub
+		throw new ServiceException("Not implemented");
+	}
+
+	@Override
+	public User getEntity(Class<? extends User> clazz, Long id) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/constants/Constants.java b/sm-core/src/main/java/com/salesmanager/core/constants/Constants.java
new file mode 100644
index 0000000..8647615
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/constants/Constants.java
@@ -0,0 +1,34 @@
+package com.salesmanager.core.constants;
+
+import java.util.Currency;
+import java.util.Locale;
+
+public class Constants {
+	
+	public final static String TEST_ENVIRONMENT= "TEST";
+	public final static String PRODUCTION_ENVIRONMENT= "PRODUCTION";
+	public final static String SHOP_URI = "/shop";
+	
+	public static final String ALL_REGIONS = "*";
+	public final static String DEFAULT_DATE_FORMAT = "yyyy-MM-dd";
+	public final static String DEFAULT_DATE_FORMAT_YEAR = "yyyy";
+	
+	public final static String EMAIL_CONFIG = "EMAIL_CONFIG";
+	public final static String MERCHANT_CONFIG = "MERCHANT_CONFIG";
+	
+	public final static String UNDERSCORE = "_";
+	public final static String SLASH = "/";
+	public final static String TRUE = "true";
+	public final static String FALSE = "false";
+	public final static String OT_ITEM_PRICE_MODULE_CODE = "itemprice";
+	public final static String OT_SUBTOTAL_MODULE_CODE = "subtotal";
+	public final static String OT_TOTAL_MODULE_CODE = "total";
+	public final static String OT_SHIPPING_MODULE_CODE = "shipping";
+	public final static String OT_HANDLING_MODULE_CODE = "handling";
+	public final static String OT_TAX_MODULE_CODE = "tax";
+	public final static String OT_REFUND_MODULE_CODE = "refund";
+	
+	public final static Locale DEFAULT_LOCALE = Locale.US;
+	public final static Currency DEFAULT_CURRENCY = Currency.getInstance(Locale.US);
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/constants/MeasureUnit.java b/sm-core/src/main/java/com/salesmanager/core/constants/MeasureUnit.java
new file mode 100644
index 0000000..2d6607b
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/constants/MeasureUnit.java
@@ -0,0 +1,7 @@
+package com.salesmanager.core.constants;
+
+public enum MeasureUnit {
+	
+	KG, LB, CM, IN
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/constants/SchemaConstant.java b/sm-core/src/main/java/com/salesmanager/core/constants/SchemaConstant.java
new file mode 100644
index 0000000..8e842d6
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/constants/SchemaConstant.java
@@ -0,0 +1,268 @@
+package com.salesmanager.core.constants;
+
+import java.util.HashMap;
+import java.util.Locale;
+
+public class SchemaConstant {
+
+	public final static String SALESMANAGER_SCHEMA = "SALESMANAGER";
+
+	/**
+	 * Languages iso codes
+	 * 
+	 */
+	public static final String[] LANGUAGE_ISO_CODE = {"en", "fr"};
+
+	/**
+	 * Country iso codes
+	 */
+	public static final String[] COUNTRY_ISO_CODE = { "AF","AX","AL","DZ",
+		"AS","AD","AO","AI","AQ","AG","AR","AM","AW","AU","AT","AZ","BS","BH",
+		"BD","BB","BY","BE","BZ","BJ","BM","BT","BO","BA","BW","BV","BR","IO",
+		"BN","BG","BF","BI","KH","CM","CA","CV","KY","CF","TD","CL","CN","CX",
+		"CC","CO","KM","CG","CD","CK","CR","CI","HR","CU","CY","CZ","DK","DJ",
+		"DM","DO","EC","EG","SV","GQ","ER","EE","ET","FK","FO","FJ","FI","FR",
+		"GF","PF","TF","GA","GM","GE","DE","GH","GI","GR","GL","GD","GP","GU",
+		"GT","GG","GN","GW","GY","HT","HM","VA","HN","HK","HU","IS","IN","ID",
+		"IR","IQ","IE","IM","IL","IT","JM","JP","JE","JO","KZ","KE","KI","KP",
+		"KR","KW","KG","LA","LV","LB","LS","LR","LY","LI","LT","LU","MO","MK",
+		"MG","MW","MY","MV","ML","MT","MH","MQ","MR","MU","YT","MX","FM","MD",
+		"MC","MN","ME","MS","MA","MZ","MM","NA","NR","NP","NL","AN","NC","NZ",
+		"NI","NE","NG","NU","NF","MP","NO","OM","PK","PW","PS","PA","PG","PY",
+		"PE","PH","PN","PL","PT","PR","QA","RE","RO","RU","RW","SH","KN","LC",
+		"PM","VC","WS","SM","ST","SA","SN","RS","SC","SL","SG","SK","SI","SB",
+		"SO","ZA","GS","ES","LK","SD","SR","SJ","SZ","SE","CH","SY","TW","TJ",
+		"TZ","TH","TL","TG","TK","TO","TT","TN","TR","TM","TC","TV","UG","UA",
+		"AE","GB","US","UM","UY","UZ","VU","VE","VN","VG","VI","WF","EH",
+	    "YE","ZM","ZW" };
+
+	/**
+	 * Locale per country iso codes
+	 */
+	public static final HashMap<String, Locale> LOCALES = new HashMap<String, Locale>();
+
+	static {
+		for (Locale locale : Locale.getAvailableLocales()) {
+			LOCALES.put(locale.getCountry(), locale);
+		}
+	}
+	
+	/**
+	 * Currency codes with name
+	 */
+	public static final HashMap<String, String> CURRENCY_MAP = new HashMap<String, String>();
+	
+	static {
+		CURRENCY_MAP.put("AFN", "Afghani");
+		CURRENCY_MAP.put("EUR", "Euro");
+		CURRENCY_MAP.put("ALL", "Lek");
+		CURRENCY_MAP.put("DZD", "Algerian Dinar");
+		CURRENCY_MAP.put("USD", "US Dollar");
+		CURRENCY_MAP.put("AOA", "Kwanza");
+		CURRENCY_MAP.put("XCD", "East Caribbean Dollar");
+		CURRENCY_MAP.put("ARS", "Argentine Peso");
+		CURRENCY_MAP.put("AMD", "Armenian Dram");
+		CURRENCY_MAP.put("AWG", "Aruban Florin");
+		CURRENCY_MAP.put("AUD", "Australian Dollar");
+		CURRENCY_MAP.put("AZN", "Azerbaijanian Manat");
+		CURRENCY_MAP.put("BSD", "Bahamian Dollar");
+		CURRENCY_MAP.put("BHD", "Bahraini Dinar");
+		CURRENCY_MAP.put("BDT", "Taka");
+		CURRENCY_MAP.put("BBD", "Barbados Dollar");
+		CURRENCY_MAP.put("BYR", "Belarussian Ruble");
+		CURRENCY_MAP.put("BZD", "Belize Dollar");
+		CURRENCY_MAP.put("XOF", "CFA Franc BCEAO");
+		CURRENCY_MAP.put("BMD", "Bermudian Dollar");
+		CURRENCY_MAP.put("BTN", "Ngultrum");
+		CURRENCY_MAP.put("INR", "Indian Rupee");
+		CURRENCY_MAP.put("BOB", "Boliviano");
+		CURRENCY_MAP.put("BOV", "Mvdol");
+		CURRENCY_MAP.put("BAM", "Convertible Mark");
+		CURRENCY_MAP.put("BWP", "Pula");
+		CURRENCY_MAP.put("NOK", "Norwegian Krone");
+		CURRENCY_MAP.put("BRL", "Brazilian Real");
+		CURRENCY_MAP.put("BND", "Brunei Dollar");
+		CURRENCY_MAP.put("BGN", "Bulgarian Lev");
+		CURRENCY_MAP.put("XOF", "CFA Franc BCEAO");
+		CURRENCY_MAP.put("BIF", "Burundi Franc");
+		CURRENCY_MAP.put("KHR", "Riel");
+		CURRENCY_MAP.put("XAF", "CFA Franc BEAC");
+		CURRENCY_MAP.put("CAD", "Canadian Dollar");
+		CURRENCY_MAP.put("CVE", "Cape Verde Escudo");
+		CURRENCY_MAP.put("KYD", "Cayman Islands Dollar");
+		CURRENCY_MAP.put("CLF", "Unidades de fomento");
+		CURRENCY_MAP.put("CLP", "Chilean Peso");
+		CURRENCY_MAP.put("CNY", "Yuan Renminbi");
+		CURRENCY_MAP.put("COP", "Colombian Peso");
+		//CURRENCY_MAP.put("COU", "Unidad de Valor Real");
+		CURRENCY_MAP.put("KMF", "Comoro Franc");
+		CURRENCY_MAP.put("XAF", "CFA Franc BEAC");
+		CURRENCY_MAP.put("CDF", "Congolese Franc");
+		CURRENCY_MAP.put("NZD", "New Zealand Dollar");
+		CURRENCY_MAP.put("CRC", "Costa Rican Colon");
+		CURRENCY_MAP.put("XOF", "CFA Franc BCEAO");
+		CURRENCY_MAP.put("HRK", "Croatian Kuna");
+		//CURRENCY_MAP.put("CUC", "Peso Convertible");
+		CURRENCY_MAP.put("CUP", "Cuban Peso");
+		CURRENCY_MAP.put("ANG", "Netherlands Antillean Guilder");
+		CURRENCY_MAP.put("CZK", "Czech Koruna");
+		CURRENCY_MAP.put("DKK", "Danish Krone");
+		CURRENCY_MAP.put("DJF", "Djibouti Franc");
+		CURRENCY_MAP.put("XCD", "East Caribbean Dollar");
+		CURRENCY_MAP.put("DOP", "Dominican Peso");
+		CURRENCY_MAP.put("EGP", "Egyptian Pound");
+		CURRENCY_MAP.put("SVC", "El Salvador Colon");
+		CURRENCY_MAP.put("XAF", "CFA Franc BEAC");
+		CURRENCY_MAP.put("ERN", "Nakfa");
+		CURRENCY_MAP.put("ETB", "Ethiopian Birr");
+		CURRENCY_MAP.put("FKP", "Falkland Islands Pound");
+		CURRENCY_MAP.put("DKK", "Danish Krone");
+		CURRENCY_MAP.put("FJD", "Fiji Dollar");
+		CURRENCY_MAP.put("XPF", "CFP Franc");
+		CURRENCY_MAP.put("XAF", "CFA Franc BEAC");
+		CURRENCY_MAP.put("GMD", "Dalasi");
+		CURRENCY_MAP.put("GEL", "Lari");
+		CURRENCY_MAP.put("GHS", "Ghana Cedi");
+		CURRENCY_MAP.put("GIP", "Gibraltar Pound");
+		CURRENCY_MAP.put("DKK", "Danish Krone");
+		CURRENCY_MAP.put("XCD", "East Caribbean Dollar");
+		CURRENCY_MAP.put("GTQ", "Quetzal");
+		CURRENCY_MAP.put("GBP", "Pound Sterling");
+		CURRENCY_MAP.put("GNF", "Guinea Franc");
+		CURRENCY_MAP.put("XOF", "CFA Franc BCEAO");
+		CURRENCY_MAP.put("GYD", "Guyana Dollar");
+		CURRENCY_MAP.put("HTG", "Gourde");
+		CURRENCY_MAP.put("HNL", "Lempira");
+		CURRENCY_MAP.put("HKD", "Hong Kong Dollar");
+		CURRENCY_MAP.put("HUF", "Forint");
+		CURRENCY_MAP.put("ISK", "Iceland Krona");
+		CURRENCY_MAP.put("INR", "Indian Rupee");
+		CURRENCY_MAP.put("IDR", "Rupiah");
+		CURRENCY_MAP.put("XDR", "SDR (Special Drawing Right)");
+		CURRENCY_MAP.put("IRR", "Iranian Rial");
+		CURRENCY_MAP.put("IQD", "Iraqi Dinar");
+		CURRENCY_MAP.put("GBP", "Pound Sterling");
+		CURRENCY_MAP.put("ILS", "New Israeli Sheqel");
+		CURRENCY_MAP.put("JMD", "Jamaican Dollar");
+		CURRENCY_MAP.put("JPY", "Yen");
+		CURRENCY_MAP.put("GBP", "Pound Sterling");
+		CURRENCY_MAP.put("JOD", "Jordanian Dinar");
+		CURRENCY_MAP.put("KZT", "Tenge");
+		CURRENCY_MAP.put("KES", "Kenyan Shilling");
+		CURRENCY_MAP.put("AUD", "Australian Dollar");
+		CURRENCY_MAP.put("KPW", "North Korean Won");
+		CURRENCY_MAP.put("KRW", "Won");
+		CURRENCY_MAP.put("KWD", "Kuwaiti Dinar");
+		CURRENCY_MAP.put("KGS", "Som");
+		CURRENCY_MAP.put("LAK", "Kip");
+		CURRENCY_MAP.put("LVL", "Latvian Lats");
+		CURRENCY_MAP.put("LBP", "Lebanese Pound");
+		CURRENCY_MAP.put("LSL", "Loti");
+		CURRENCY_MAP.put("ZAR", "Rand");
+		CURRENCY_MAP.put("LRD", "Liberian Dollar");
+		CURRENCY_MAP.put("LYD", "Libyan Dinar");
+		CURRENCY_MAP.put("CHF", "Swiss Franc");
+		CURRENCY_MAP.put("LTL", "Lithuanian Litas");
+		CURRENCY_MAP.put("EUR", "Euro");
+		CURRENCY_MAP.put("MOP", "Pataca");
+		CURRENCY_MAP.put("MKD", "Denar");
+		CURRENCY_MAP.put("MGA", "Malagasy Ariary");
+		CURRENCY_MAP.put("MWK", "Kwacha");
+		CURRENCY_MAP.put("MYR", "Malaysian Ringgit");
+		CURRENCY_MAP.put("MVR", "Rufiyaa");
+		CURRENCY_MAP.put("XOF", "CFA Franc BCEAO");
+		CURRENCY_MAP.put("MRO", "Ouguiya");
+		CURRENCY_MAP.put("MUR", "Mauritius Rupee");
+		//CURRENCY_MAP.put("XUA", "ADB Unit of Account");
+		CURRENCY_MAP.put("MXN", "Mexican Peso");
+		CURRENCY_MAP.put("MXV", "Mexican Unidad de Inversion (UDI)");
+		CURRENCY_MAP.put("MDL", "Moldovan Leu");
+		CURRENCY_MAP.put("MNT", "Tugrik");
+		CURRENCY_MAP.put("XCD", "East Caribbean Dollar");
+		CURRENCY_MAP.put("MAD", "Moroccan Dirham");
+		CURRENCY_MAP.put("MZN", "Mozambique Metical");
+		CURRENCY_MAP.put("MMK", "Kyat");
+		CURRENCY_MAP.put("NAD", "Namibia Dollar");
+		CURRENCY_MAP.put("ZAR", "Rand");
+		CURRENCY_MAP.put("NPR", "Nepalese Rupee");
+		CURRENCY_MAP.put("XPF", "CFP Franc");
+		CURRENCY_MAP.put("NZD", "New Zealand Dollar");
+		CURRENCY_MAP.put("NIO", "Cordoba Oro");
+		CURRENCY_MAP.put("XOF", "CFA Franc BCEAO");
+		CURRENCY_MAP.put("NGN", "Naira");
+		CURRENCY_MAP.put("NZD", "New Zealand Dollar");
+		CURRENCY_MAP.put("AUD", "Australian Dollar");
+		CURRENCY_MAP.put("NOK", "Norwegian Krone");
+		CURRENCY_MAP.put("OMR", "Rial Omani");
+		CURRENCY_MAP.put("PKR", "Pakistan Rupee");
+		CURRENCY_MAP.put("PAB", "Balboa");
+		CURRENCY_MAP.put("PGK", "Kina");
+		CURRENCY_MAP.put("PYG", "Guarani");
+		CURRENCY_MAP.put("PEN", "Nuevo Sol");
+		CURRENCY_MAP.put("PHP", "Philippine Peso");
+		CURRENCY_MAP.put("NZD", "New Zealand Dollar");
+		CURRENCY_MAP.put("PLN", "Zloty");
+		CURRENCY_MAP.put("USD", "US Dollar");
+		CURRENCY_MAP.put("QAR", "Qatari Rial");
+		CURRENCY_MAP.put("RON", "New Romanian Leu");
+		CURRENCY_MAP.put("RUB", "Russian Ruble");
+		CURRENCY_MAP.put("RWF", "Rwanda Franc");
+		CURRENCY_MAP.put("SHP", "Saint Helena Pound");
+		CURRENCY_MAP.put("XCD", "East Caribbean Dollar");
+		CURRENCY_MAP.put("WST", "Tala");
+		CURRENCY_MAP.put("STD", "Dobra");
+		CURRENCY_MAP.put("SAR", "Saudi Riyal");
+		CURRENCY_MAP.put("XOF", "CFA Franc BCEAO");
+		CURRENCY_MAP.put("RSD", "Serbian Dinar");
+		CURRENCY_MAP.put("SCR", "Seychelles Rupee");
+		CURRENCY_MAP.put("SLL", "Leone");
+		CURRENCY_MAP.put("SGD", "Singapore Dollar");
+		CURRENCY_MAP.put("ANG", "Netherlands Antillean Guilder");
+		//CURRENCY_MAP.put("XSU", "Sucre");
+		CURRENCY_MAP.put("SBD", "Solomon Islands Dollar");
+		CURRENCY_MAP.put("SOS", "Somali Shilling");
+		CURRENCY_MAP.put("ZAR", "Rand");
+		//CURRENCY_MAP.put("SSP", "South Sudanese Pound");
+		CURRENCY_MAP.put("LKR", "Sri Lanka Rupee");
+		CURRENCY_MAP.put("SDG", "Sudanese Pound");
+		CURRENCY_MAP.put("SRD", "Surinam Dollar");
+		CURRENCY_MAP.put("NOK", "Norwegian Krone");
+		CURRENCY_MAP.put("SZL", "Lilangeni");
+		CURRENCY_MAP.put("SEK", "Swedish Krona");
+		//CURRENCY_MAP.put("CHE", "WIR Euro");
+		CURRENCY_MAP.put("CHF", "Swiss Franc");
+		//CURRENCY_MAP.put("CHW", "WIR Franc");
+		CURRENCY_MAP.put("SYP", "Syrian Pound");
+		CURRENCY_MAP.put("TWD", "New Taiwan Dollar");
+		CURRENCY_MAP.put("TJS", "Somoni");
+		CURRENCY_MAP.put("TZS", "Tanzanian Shilling");
+		CURRENCY_MAP.put("THB", "Baht");
+		CURRENCY_MAP.put("USD", "US Dollar");
+		CURRENCY_MAP.put("XOF", "CFA Franc BCEAO");
+		CURRENCY_MAP.put("NZD", "New Zealand Dollar");
+		CURRENCY_MAP.put("TTD", "Trinidad and Tobago Dollar");
+		CURRENCY_MAP.put("TND", "Tunisian Dinar");
+		CURRENCY_MAP.put("TRY", "Turkish Lira");
+		//CURRENCY_MAP.put("TMT", "Turkmenistan New Manat");
+		CURRENCY_MAP.put("AUD", "Australian Dollar");
+		CURRENCY_MAP.put("UGX", "Uganda Shilling");
+		CURRENCY_MAP.put("UAH", "Hryvnia");
+		CURRENCY_MAP.put("AED", "UAE Dirham");
+		CURRENCY_MAP.put("GBP", "Pound Sterling");
+		//CURRENCY_MAP.put("UYI", "Uruguay Peso en Unidades Indexadas (URUIURUI)");
+		CURRENCY_MAP.put("UYU", "Peso Uruguayo");
+		CURRENCY_MAP.put("UZS", "Uzbekistan Sum");
+		CURRENCY_MAP.put("VUV", "Vatu");
+		CURRENCY_MAP.put("VEF", "Bolivar Fuerte");
+		CURRENCY_MAP.put("VND", "Dong");
+		CURRENCY_MAP.put("USD", "US Dollar");
+		CURRENCY_MAP.put("XPF", "CFP Franc");
+		CURRENCY_MAP.put("MAD", "Moroccan Dirham");
+		CURRENCY_MAP.put("YER", "Yemeni Rial");
+		CURRENCY_MAP.put("ZMK", "Zambian Kwacha");
+		//CURRENCY_MAP.put("ZWL", "Zimbabwe Dollar");
+		
+
+
+	}
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/constants/ShippingConstants.java b/sm-core/src/main/java/com/salesmanager/core/constants/ShippingConstants.java
new file mode 100644
index 0000000..8384db4
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/constants/ShippingConstants.java
@@ -0,0 +1,10 @@
+package com.salesmanager.core.constants;
+
+
+public class ShippingConstants {
+	
+	public final static String SHIPPING_CONFIGURATION= "SHIPPING_CONFIG";
+	public final static String SHIPPING_NATIONAL = "NATIONAL";
+	public final static String SHIPPING_INTERNATIONAL = "INTERNATIONAL";
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/constants/SystemConstants.java b/sm-core/src/main/java/com/salesmanager/core/constants/SystemConstants.java
new file mode 100644
index 0000000..218be09
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/constants/SystemConstants.java
@@ -0,0 +1,11 @@
+package com.salesmanager.core.constants;
+
+public class SystemConstants {
+	
+	
+
+	public final static String SYSTEM_USER = "SYSTEM";
+	public final static String CONFIG_VALUE_TRUE = "true";
+	public final static String CONFIG_VALUE_FALSE = "false";
+
+}

diff --git a/sm-core/src/main/java/com/salesmanager/core/modules/cms/common/ImageGet.java b/sm-core/src/main/java/com/salesmanager/core/modules/cms/common/ImageGet.java
new file mode 100755
index 0000000..526df7b
--- /dev/null
+++ b/sm-core/src/main/java/com/salesmanager/core/modules/cms/common/ImageGet.java
@@ -0,0 +1,15 @@
+package com.salesmanager.core.modules.cms.common;
+
+import java.util.List;
+
+import com.salesmanager.core.business.content.model.FileContentType;
+import com.salesmanager.core.business.content.model.OutputContentFile;
+import com.salesmanager.core.business.generic.exception.ServiceException;
+
+public interface ImageGet
+{
+
+    public List<OutputContentFile> getImages( final String merchantStoreCode, FileContentType imageContentType )
+        throws ServiceException;
+
+}