diff --git a/src/pages/DeliveryOrderDetails.jsx b/src/pages/DeliveryOrderDetails.jsx index 09157ac..d0d2071 100644 --- a/src/pages/DeliveryOrderDetails.jsx +++ b/src/pages/DeliveryOrderDetails.jsx @@ -101,6 +101,10 @@ const DeliveryOrderDetails = () => { const accessories = await getDeliveryAccessories(deliveryOrderId); setDeliveryAccessories(accessories); + if (accessories.length > 0) { + setAccessoryPeriod(accessories[0].accessory_period); + } + if (totalOrder) { const totalWeightCalculated = accessories.reduce((acc, accessory) => { return ( @@ -115,7 +119,6 @@ const DeliveryOrderDetails = () => { const coords = await Promise.all( accessories.map(async (accessory) => { - setAccessoryPeriod(accessory.period); if (accessory.latitude && accessory.longitude) { return { city: accessory.city_name, @@ -191,18 +194,19 @@ const DeliveryOrderDetails = () => { } }; - const calculateRecommendedDepartureTime = () => { - if (!totalOrder || !orderDuration || !accessoryPeriod) return null; + const calculateRecommendedDepartureTime = () => { + if (!totalOrder || !orderDuration || !accessoryPeriod) return null; - console.log(totalOrder, orderDuration, accessoryPeriod); - const periodInMilliseconds = accessoryPeriod * 24 * 60 * 60 * 1000; - const orderDurationInMilliseconds = orderDuration * 60 * 1000; - const deadlineDate = new Date(totalOrder.deadline); - const recommendedDepartureTime = new Date( - deadlineDate - periodInMilliseconds - orderDurationInMilliseconds - ); - return recommendedDepartureTime.toLocaleString("ru-RU"); - }; + const periodInMilliseconds = (accessoryPeriod + 1) * 24 * 60 * 60 * 1000; + const orderDurationInMilliseconds = orderDuration * 60 * 1000; + const deadlineDate = new Date(totalOrder.deadline); + + const recommendedDepartureTime = new Date( + deadlineDate - periodInMilliseconds - orderDurationInMilliseconds + ); + + return recommendedDepartureTime.toLocaleDateString("ru-RU"); + }; const handleBack = () => { navigate("/"); @@ -228,7 +232,7 @@ const DeliveryOrderDetails = () => { Тип транспортного средства Количество транспортных средств Прогнозируемое время этапа - Рекомендуемое время отправления + Рекомендуемая дата отправления @@ -254,7 +258,9 @@ const DeliveryOrderDetails = () => { )} - {calculateRecommendedDepartureTime()} + + {calculateRecommendedDepartureTime()} +