fix logic in calculation of pickup date