Fix on Calendar when pickupdate and deliverydate is null