Bug 15774: Add additional fields to order baskets