refactor delivery date formatting
Merge branch 'Development' into merging