**What** - update the create and edit shipping option flows to support pickup (shipping) option - modify "mark as delivered" for pickup case --- CLOSES CMRC-906 CMRC-907
**What** - update the create and edit shipping option flows to support pickup (shipping) option - modify "mark as delivered" for pickup case --- CLOSES CMRC-906 CMRC-907