shopizer-uncached

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 3360b57..26963ff 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
-#Tue Jan 17 10:34:20 EST 2017
+#Mon Jan 23 09:10:37 EST 2017
 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 f3e1ab4..aa9e6bc 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
-#Tue Jan 17 10:34:21 EST 2017
+#Mon Jan 23 09:10:38 EST 2017
 version=2.0.5-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=shopizer-shipping-distance-processor

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 cf40b76..d0692af 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
-#Tue Jan 17 10:34:10 EST 2017
+#Mon Jan 23 09:10:44 EST 2017
 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 388f0b7..c8df29d 100644
Binary files a/sm-shop/SALESMANAGER.h2.db and b/sm-shop/SALESMANAGER.h2.db differ

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ProductController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ProductController.java
index 9e0d6c8..002b2e3 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ProductController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/ProductController.java
@@ -96,6 +96,21 @@ public class ProductController {
 	}
 	
 	@PreAuthorize("hasRole('PRODUCTS')")
+	@RequestMapping(value="/admin/products/viewEditProduct.html", method=RequestMethod.GET)
+	public String displayProductEdit(@RequestParam("sku") String sku, Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
+		
+		Language language = (Language)request.getAttribute("LANGUAGE");
+		Product dbProduct = productService.getByCode(sku, language);
+		
+		long productId = -1;//non existent
+		if(dbProduct!=null) {
+			productId = dbProduct.getId();
+		}
+		
+		return displayProduct(productId,model,request,response);
+	}
+	
+	@PreAuthorize("hasRole('PRODUCTS')")
 	@RequestMapping(value="/admin/products/createProduct.html", method=RequestMethod.GET)
 	public String displayProductCreate(Model model, HttpServletRequest request, HttpServletResponse response) throws Exception {
 		return displayProduct(null,model,request,response);
@@ -1014,9 +1029,6 @@ public class ProductController {
 		Menu currentMenu = (Menu)menus.get("catalogue");
 		model.addAttribute("currentMenu",currentMenu);
 		model.addAttribute("activeMenus",activeMenus);
-		//
-		
+		//	
 	}
-	
-
-}
+}
\ No newline at end of file

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/shoppingCart/facade/ShoppingCartFacadeImpl.java b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/shoppingCart/facade/ShoppingCartFacadeImpl.java
index 6f6806f..33d15f5 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/shoppingCart/facade/ShoppingCartFacadeImpl.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/shoppingCart/facade/ShoppingCartFacadeImpl.java
@@ -222,7 +222,6 @@ public class ShoppingCartFacadeImpl
         if ( CustomerId != null )
         {
             cartModel.setCustomerId( CustomerId );
-            ;
         }
         shoppingCartService.create( cartModel );
         return cartModel;

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/shoppingCart/ShoppingCartController.java b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/shoppingCart/ShoppingCartController.java
index 41c6152..afbae2a 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/shoppingCart/ShoppingCartController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/shoppingCart/ShoppingCartController.java
@@ -179,7 +179,7 @@ public class ShoppingCartController extends AbstractController {
 
 
 		/**
-		 * my concern is with the following :
+		 *  Tested with the following :
 		 * 	what if you add item in the shopping cart as an anonymous user
 		 *  later on you log in to process with checkout but the system retrieves a previous shopping cart saved in the database for that customer
 		 *  in that case we need to synchronize both carts and the original one (the one with the customer id) supercedes the current cart in session
@@ -194,16 +194,7 @@ public class ShoppingCartController extends AbstractController {
 		//from FinalPrice get final price which is the calculated price given attributes and discounts
 		//set each item price in ShoppingCartItem.price
 
-		//add new item shoppingCartService.create
 
-		//create JSON representation of the shopping cart
-
-		//return the JSON structure in AjaxResponse
-
-		
-
-		//AjaxResponse resp = new AjaxResponse();
-		//resp.setStatus(AjaxResponse.RESPONSE_STATUS_SUCCESS);
 		return shoppingCart;
 
 	}

diff --git a/sm-shop/src/main/webapp/pages/admin/orders/order.jsp b/sm-shop/src/main/webapp/pages/admin/orders/order.jsp
index a484729..e5213d3 100644
--- a/sm-shop/src/main/webapp/pages/admin/orders/order.jsp
+++ b/sm-shop/src/main/webapp/pages/admin/orders/order.jsp
@@ -584,7 +584,7 @@ function captureOrder(orderId){
 			            	<c:set var="total" value="${orderProduct.oneTimeCharge * orderProduct.productQuantity }" />
 			            	
 							<tr> 
-								<td colspan="2"> <c:out value="${orderProduct.productName}" /></td> 
+								<td colspan="2"> <c:out value="${orderProduct.productName}" /> - <a href="<c:url value="/admin/products/viewEditProduct.html?sku=${orderProduct.sku}"/>"><c:out value="${orderProduct.sku}" /></a></td> 
 								<td ><c:out value="${orderProduct.productQuantity}" /></td> 
 			            		<td><strong><sm:monetary value="${orderProduct.oneTimeCharge}" currency="${order.order.currency}"/></strong> </td>
 								<td><strong><sm:monetary value="${total}" currency="${order.order.currency}"/></strong></td> 
@@ -709,9 +709,4 @@ function captureOrder(orderId){
     <div class="modal-footer">
            <button class="btn btn-primary close-modal" id="closeModal" data-dismiss="modal" aria-hidden="true"><s:message code="button.label.close" text="Close" /></button>
     </div>
-</div>
-
-
-
-
-     			     
\ No newline at end of file
+</div
\ No newline at end of file