Changes to OrderService to more fully support Order Item Attributes

This fixes bugs related to additional charges not being applied to an order item, and unique order item customizations being added as additional quantities to other order items.