fixed adding delivery details for gogovan and drop-off
Merge branch 'master' into Accept-Item-type-component-views