remake delivery_date field
remake delivery_date field