shopizer-developers

diff --git a/shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties b/shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties
index 00dd120..9ad7209 100644
--- a/shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties
+++ b/shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Thu Dec 22 09:09:24 EST 2016
+#Fri Dec 23 10:43:40 EST 2016
 version=2.0.5-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=shopizer-canadapost

diff --git a/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties b/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties
index 773018a..d4b9819 100644
--- a/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties
+++ b/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Thu Dec 22 09:09:26 EST 2016
+#Fri Dec 23 10:43:41 EST 2016
 version=2.0.5-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=shopizer-shipping-distance-processor

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/repositories/order/OrderRepositoryImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/repositories/order/OrderRepositoryImpl.java
index 052fa18..5ebc895 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/repositories/order/OrderRepositoryImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/repositories/order/OrderRepositoryImpl.java
@@ -27,7 +27,7 @@ public class OrderRepositoryImpl implements OrderRepositoryCustom {
 		StringBuilder objectBuilderSelect = new StringBuilder();
 		
 		String countBaseQuery = "select count(o) from Order as o";
-		String baseQuery = "select o from Order as o";
+		String baseQuery = "select o from Order as o left join fetch o.orderTotal ot left join fetch o.orderProducts op left join fetch op.orderAttributes opo left join fetch op.prices opp";
 		countBuilderSelect.append(countBaseQuery);
 		objectBuilderSelect.append(baseQuery);
 		

diff --git a/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties b/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties
index 861ba85..01673fe 100644
--- a/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties
+++ b/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Thu Dec 22 09:09:30 EST 2016
+#Fri Dec 23 10:43:45 EST 2016
 version=2.0.5-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=sm-search

diff --git a/sm-shop/SALESMANAGER.h2.db b/sm-shop/SALESMANAGER.h2.db
index 29175b1..babc5b9 100644
Binary files a/sm-shop/SALESMANAGER.h2.db and b/sm-shop/SALESMANAGER.h2.db differ

diff --git a/sm-shop/SALESMANAGER.lock.db b/sm-shop/SALESMANAGER.lock.db
index e7a5486..4bca7e1 100644
--- a/sm-shop/SALESMANAGER.lock.db
+++ b/sm-shop/SALESMANAGER.lock.db
@@ -1,4 +1,4 @@
 #FileLock
-#Thu Dec 22 17:00:36 EST 2016
-id=159288cd18fe9c6c525439a3349263fa56c75d49eb2
+#Fri Dec 23 12:38:06 EST 2016
+id=1592cc2dbc0ba7143519bb7c59e78079a6b2e1b6e2d
 method=file

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/CustomerAccountController.java b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/CustomerAccountController.java
index b5594b7..5f33b9a 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/CustomerAccountController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/customer/CustomerAccountController.java
@@ -53,7 +53,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.util.*;
-//import com.salesmanager.web.shop.controller.data.CountryData;
 
 /**
  * Entry point for logged in customers
@@ -143,7 +142,7 @@ public class CustomerAccountController extends AbstractController {
 	}
 	
 	
-	@RequestMapping(value="/accountSummary.html", method=RequestMethod.GET)
+	@RequestMapping(value="/accountSummary.json", method=RequestMethod.GET)
 	public @ResponseBody ReadableCustomer customerInformation(@RequestParam String userName, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
 	
 	

diff --git a/sm-shop/src/main/webapp/pages/shop/common/customer/customerProfileMenu.jsp b/sm-shop/src/main/webapp/pages/shop/common/customer/customerProfileMenu.jsp
index 19b0e2f..8d2260b 100644
--- a/sm-shop/src/main/webapp/pages/shop/common/customer/customerProfileMenu.jsp
+++ b/sm-shop/src/main/webapp/pages/shop/common/customer/customerProfileMenu.jsp
@@ -23,5 +23,5 @@ response.setDateHeader ("Expires", -1);
 									    </a>
 									 </li>
 									 <li><a href="<c:url value="/shop/customer/password.html"/>"><i class="fa fa-angle-right"></i> <s:message code="menu.change-password" text="Change password"/></a></li>
-									 <li><a href="<c:url value="/shop/customer/j_spring_security_logout"/>"><i class="fa fa-angle-right"></i> <s:message code="button.label.logout" text="Logout"/></a></li>
+									 <li><a href="<c:url value="/shop/customer/logout"/>"><i class="fa fa-angle-right"></i> <s:message code="button.label.logout" text="Logout"/></a></li>
 								</ul>
\ No newline at end of file

diff --git a/sm-shop/src/main/webapp/pages/shop/templates/bootstrap/sections/header.jsp b/sm-shop/src/main/webapp/pages/shop/templates/bootstrap/sections/header.jsp
index a4f9bf8..6b04f62 100644
--- a/sm-shop/src/main/webapp/pages/shop/templates/bootstrap/sections/header.jsp
+++ b/sm-shop/src/main/webapp/pages/shop/templates/bootstrap/sections/header.jsp
@@ -67,7 +67,7 @@ response.setDateHeader ("Expires", -1);
 									</li>
 									<li class="divider"></li>
 									<li>
-										<a onClick="javascript:location.href='<c:url value="/shop/customer/j_spring_security_logout" />';" href="#"><i class="fa fa-power-off"></i><s:message code="button.label.logout" text="Logout"/></a>
+										<a onClick="javascript:location.href='<c:url value="/shop/customer/logout" />';" href="#"><i class="fa fa-power-off"></i><s:message code="button.label.logout" text="Logout"/></a>
 									</li>
 								</ul>
 							</li>

diff --git a/sm-shop/src/main/webapp/pages/shop/templates/bootstrap3/sections/header.jsp b/sm-shop/src/main/webapp/pages/shop/templates/bootstrap3/sections/header.jsp
index ba77966..7e256db 100644
--- a/sm-shop/src/main/webapp/pages/shop/templates/bootstrap3/sections/header.jsp
+++ b/sm-shop/src/main/webapp/pages/shop/templates/bootstrap3/sections/header.jsp
@@ -80,7 +80,7 @@ response.setDateHeader ("Expires", -1);
 												</li>
 												<li class="divider"></li>
 												<li>
-													<a onClick="javascript:location.href='<c:url value="/shop/customer/j_spring_security_logout" />';" href="#"><i class="fa fa-power-off"></i><s:message code="button.label.logout" text="Logout"/></a>
+													<a onClick="javascript:location.href='<c:url value="/shop/customer/logout" />';" href="#"><i class="fa fa-power-off"></i><s:message code="button.label.logout" text="Logout"/></a>
 												</li>
 											</ul>	
 									</div>

diff --git a/sm-shop/src/main/webapp/pages/shop/templates/exoticamobilia/sections/header.jsp b/sm-shop/src/main/webapp/pages/shop/templates/exoticamobilia/sections/header.jsp
index 150cfb4..f146a55 100644
--- a/sm-shop/src/main/webapp/pages/shop/templates/exoticamobilia/sections/header.jsp
+++ b/sm-shop/src/main/webapp/pages/shop/templates/exoticamobilia/sections/header.jsp
@@ -168,7 +168,7 @@ $(document).ready(function() {
 					<a onClick="javascript:location.href='<c:url value="/shop/customer/dashboard.html" />';" href="#"><i class="fa fa-user"></i><s:message code="label.customer.myaccount" text="My account"/></a>
 				</li>
 				<li>
-					<a onClick="javascript:location.href='<c:url value="/shop/customer/j_spring_security_logout" />';" href="#"><i class="fa fa-power-off"></i><s:message code="button.label.logout" text="Logout"/></a>
+					<a onClick="javascript:location.href='<c:url value="/shop/customer/logout" />';" href="#"><i class="fa fa-power-off"></i><s:message code="button.label.logout" text="Logout"/></a>
 				</li>
 		</ul>
 </script>

diff --git a/sm-shop/src/main/webapp/resources/js/shop-account.js b/sm-shop/src/main/webapp/resources/js/shop-account.js
index f77864d..4d0d08c 100644
--- a/sm-shop/src/main/webapp/resources/js/shop-account.js
+++ b/sm-shop/src/main/webapp/resources/js/shop-account.js
@@ -27,7 +27,7 @@
 
 
 function displayUserAccount(userName){
-	url = getContextPath() + '/shop/customer/accountSummary.html?userName='+userName;
+	url = getContextPath() + '/shop/customer/accountSummary.json?userName='+userName;
 	$.ajax({  
 		 type: 'GET',  
 		 url: url,  
@@ -38,7 +38,7 @@ function displayUserAccount(userName){
 			 
 		 },
 		 success: function(customer) {
-			 log('Return');
+			 log('From account summary');
 			 if(customer!=null) {
 				 //display user
 				 //alert("Supports customer loggin " + supportsCustomerLogin());

diff --git a/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties b/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties
index 3375e83..c33fbd9 100644
--- a/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties
+++ b/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Thu Dec 22 16:39:46 EST 2016
+#Fri Dec 23 12:26:07 EST 2016
 version=2.0.5-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=sm-shop