Add extra field for shipment date, and change the criteria so that ETA can be any date after shipment date