shopizer-developers

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/services/shoppingcart/ShoppingCartService.java b/sm-core/src/main/java/com/salesmanager/core/business/services/shoppingcart/ShoppingCartService.java
index 2eb20d3..6abd683 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/services/shoppingcart/ShoppingCartService.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/services/shoppingcart/ShoppingCartService.java
@@ -76,5 +76,11 @@ public interface ShoppingCartService extends SalesManagerEntityService<Long, Sho
 	 * @throws ServiceException
 	 */
 	boolean requiresShipping(ShoppingCart cart) throws ServiceException;
+	
+	/**
+	 * Removes a shopping cart item
+	 * @param item
+	 */
+	void deleteShoppingCartItem(Long id);
 
 }
\ No newline at end of file

diff --git a/sm-core/src/main/java/com/salesmanager/core/business/services/shoppingcart/ShoppingCartServiceImpl.java b/sm-core/src/main/java/com/salesmanager/core/business/services/shoppingcart/ShoppingCartServiceImpl.java
index 130e10f..8066a52 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/services/shoppingcart/ShoppingCartServiceImpl.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/services/shoppingcart/ShoppingCartServiceImpl.java
@@ -257,7 +257,7 @@ public class ShoppingCartServiceImpl extends SalesManagerEntityServiceImpl<Long,
 
 				//if (refreshCart) {
 					shoppingCart.setLineItems(refreshedItems);
-					update(shoppingCart);
+				    update(shoppingCart);
 				//}
 
 				if (cartIsObsolete) {
@@ -267,7 +267,7 @@ public class ShoppingCartServiceImpl extends SalesManagerEntityServiceImpl<Long,
 			}
 
 		} catch (Exception e) {
-			System.out.println(e.getMessage());
+			LOGGER.error(e.getMessage());
 			throw new ServiceException(e);
 		}
 
@@ -548,4 +548,9 @@ public class ShoppingCartServiceImpl extends SalesManagerEntityServiceImpl<Long,
 		return this.isFreeShoppingCart(cart);
 	}
 
+	@Override
+	public void deleteShoppingCartItem(Long id) {
+		shoppingCartItemRepository.delete(id);
+	}
+
 }

diff --git a/sm-core-model/src/main/java/com/salesmanager/core/model/shoppingcart/ShoppingCart.java b/sm-core-model/src/main/java/com/salesmanager/core/model/shoppingcart/ShoppingCart.java
index 64340ad..d671e09 100644
--- a/sm-core-model/src/main/java/com/salesmanager/core/model/shoppingcart/ShoppingCart.java
+++ b/sm-core-model/src/main/java/com/salesmanager/core/model/shoppingcart/ShoppingCart.java
@@ -63,7 +63,6 @@ public class ShoppingCart extends SalesManagerEntity<Long, ShoppingCart> impleme
 	@Column(name = "SHP_CART_CODE", unique=true, nullable=false)
 	private String shoppingCartCode;
 	
-	//@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, orphanRemoval=true, mappedBy = "shoppingCart")
 	@OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, mappedBy = "shoppingCart")
 	private Set<ShoppingCartItem> lineItems = new HashSet<ShoppingCartItem>();
 	

diff --git a/sm-shop/files/store/StoreRepository.dat b/sm-shop/files/store/StoreRepository.dat
index cad3dbb..686d8b4 100644
Binary files a/sm-shop/files/store/StoreRepository.dat and b/sm-shop/files/store/StoreRepository.dat differ

diff --git a/sm-shop/SALESMANAGER.h2.db b/sm-shop/SALESMANAGER.h2.db
index 5f0ba76..d958345 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 2365e10..b4dc221 100644
--- a/sm-shop/SALESMANAGER.lock.db
+++ b/sm-shop/SALESMANAGER.lock.db
@@ -1,4 +1,4 @@
 #FileLock
-#Fri Feb 17 09:01:31 EST 2017
-id=15a4c60b7d303a3fa14d7c54031772c260c5709972f
+#Tue Feb 28 15:18:45 EST 2017
+id=15a8660025edccba1f5768c4ce45b0bf2dccff5db5f
 method=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 33d15f5..172eba3 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
@@ -358,15 +358,17 @@ public class ShoppingCartFacadeImpl
                         new HashSet<com.salesmanager.core.model.shoppingcart.ShoppingCartItem>();
                     for ( com.salesmanager.core.model.shoppingcart.ShoppingCartItem shoppingCartItem : cartModel.getLineItems() )
                     {
-                        if ( shoppingCartItem.getId().longValue() != itemID.longValue() )
+                        //if ( shoppingCartItem.getId().longValue() != itemID.longValue() )
+                    	if ( shoppingCartItem.getId().longValue() == itemID.longValue() )
                         {
-                            shoppingCartItemSet.add( shoppingCartItem );
+                            //shoppingCartItemSet.add( shoppingCartItem );
+                    		shoppingCartService.deleteShoppingCartItem(itemID);
                         }
                     }
-                    cartModel.setLineItems( shoppingCartItemSet );
-                    shoppingCartService.saveOrUpdate( cartModel );
-
+                    //cartModel.setLineItems( shoppingCartItemSet );
+                    //shoppingCartService.saveOrUpdate( cartModel );
 
+                    cartModel = getCartModel( cartId,store );
 
 
                     ShoppingCartDataPopulator shoppingCartDataPopulator = new ShoppingCartDataPopulator();