Added logic to removeItem routine to recursively search bundles and discrete items for children items and remove them. Fixes BroadleafCommerce/QA#1184

Author: danielcolgrove

core/broadleaf-framework/src/main/java/org/broadleafcommerce/core/order/service/OrderServiceImpl.java

@@ -625,21 +625,33 @@ public Order removeItem(Long orderId, Long orderItemId, boolean priceOrder) thro
             if (oi == null) {
                 throw new WorkflowException(new ItemNotFoundException());
             }
-            if (CollectionUtils.isNotEmpty(oi.getChildOrderItems())) {
-                List<Long> childrenToRemove = new ArrayList<Long>();
-                for (OrderItem childOrderItem : oi.getChildOrderItems()) {
-                    childrenToRemove.add(childOrderItem.getId());
-                }
-                for (Long childToRemove : childrenToRemove) {
-                    removeItemInternal(orderId, childToRemove, false);
+            List<Long> childrenToRemove = new ArrayList<Long>();
+            if (oi instanceof BundleOrderItem) {
+                List<DiscreteOrderItem> bundledItems = ((BundleOrderItem) oi).getDiscreteOrderItems();
+                for (DiscreteOrderItem doi : bundledItems) {
+                    findAllChildrenToRemove(childrenToRemove, doi);
                 }
+            } else {
+                findAllChildrenToRemove(childrenToRemove, oi);
             }
+            for (Long childToRemove : childrenToRemove) {
+                removeItemInternal(orderId, childToRemove, false);
+            }                    
 
             return removeItemInternal(orderId, orderItemId, priceOrder);
         } catch (WorkflowException e) {
             throw new RemoveFromCartException("Could not remove from cart", getCartOperationExceptionRootCause(e));
         }
     }
+
+    protected void findAllChildrenToRemove(List<Long> childrenToRemove, OrderItem orderItem){
+        if (CollectionUtils.isNotEmpty(orderItem.getChildOrderItems())) {
+            for (OrderItem childOrderItem : orderItem.getChildOrderItems()) {
+                findAllChildrenToRemove(childrenToRemove, childOrderItem);
+                childrenToRemove.add(childOrderItem.getId());
+            }
+        }
+    }
 
     protected Order removeItemInternal(Long orderId, Long orderItemId, boolean priceOrder) throws WorkflowException {
         OrderItemRequestDTO orderItemRequestDTO = new OrderItemRequestDTO();