Added display for extra charges, eg: sf bag charge
put back pickup/delivery icons on order confirmation page
Display delivery charge only to dtype=delivery