Add takeaway and delivery fields

Fixes #2483