Fixed Pick up date validation - part 2