fixe issues with shipping date and time