Fixes Delivery Options

Now have 3 delivery options for creating a new order, also fixed issue
of delivery cost resetting to 0 if we select delivery before product.