Fix bug, add order delivery date input