//We only care about the discrete order items

            List<DiscreteOrderItem> itemsToAdd = new ArrayList<DiscreteOrderItem>(((BundleOrderItem) orderItem).getDiscreteOrderItems());

            for (DiscreteOrderItem doi : itemsToAdd) {

                FulfillmentGroup fulfillmentGroup = null;

                if (type == null) {

                    //Use the fulfillment group with a null type

                    fulfillmentGroup = nullFulfillmentTypeGroup;

                } else {

                    if (FulfillmentType.PHYSICAL_PICKUP_OR_SHIP.equals(type)) {

                        //This is really a special case. "PICKUP_OR_SHIP" is convenient to allow a sku to be picked up or shipped.

                        //However, it is ambiguous when actually trying to create a fulfillment group. So we default to "PHYSICAL_SHIP".

                        type = FulfillmentType.PHYSICAL_SHIP;

                    }

                   

                    //Use the fulfillment group with the specified type

                    fulfillmentGroup = fulfillmentGroups.get(type);

                }

               

                //If the null type or specified type, above were null, then we need to create a new fulfillment group

                boolean createdFulfillmentGroup = false;

                if (fulfillmentGroup == null) {

                    fulfillmentGroup = fulfillmentGroupService.createEmptyFulfillmentGroup();

                    //Set the type

                    fulfillmentGroup.setType(type);

                    fulfillmentGroup.setOrder(order);

                    order.getFulfillmentGroups().add(fulfillmentGroup);

                   

                    createdFulfillmentGroup = true;

                }

               

                fulfillmentGroup = addItemToFulfillmentGroup(order, doi, doi.getQuantity() * orderItem.getQuantity(), fulfillmentGroup);

                order = fulfillmentGroup.getOrder();

               

                // If we had to create a new fulfillment group, then ensure that this will operate correctly for the next set

                // of fulfillment groups

                if (createdFulfillmentGroup) {

                    if (type == null) {

                        nullFulfillmentTypeGroup = fulfillmentGroup;

                    } else {

                        fulfillmentGroups.put(type, fulfillmentGroup);

                    }

                }

            }

        } else if (orderItem instanceof DiscreteOrderItem) {

            DiscreteOrderItem doi = (DiscreteOrderItem)orderItem;

            FulfillmentGroup fulfillmentGroup = null;

            if (type == null) {

                //Use the fulfillment group with a null type

                fulfillmentGroup = nullFulfillmentTypeGroup;

            } else {

                if (FulfillmentType.PHYSICAL_PICKUP_OR_SHIP.equals(type)) {

    public List<FulfillmentOptionWrapper> findFulfillmentOptions(HttpServletRequest request, String fulfillmentType) {

        ArrayList<FulfillmentOptionWrapper> out = new ArrayList<FulfillmentOptionWrapper>();

        List<FulfillmentOption> options = null;

        if (type != null) {

            options = fulfillmentOptionService.readAllFulfillmentOptionsByFulfillmentType(type);

        } else {

            options = fulfillmentOptionService.readAllFulfillmentOptions();

        }