._.
This commit is contained in:
parent
2e926e7999
commit
4658593894
@ -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,
|
||||
@ -194,14 +197,15 @@ const DeliveryOrderDetails = () => {
|
||||
const calculateRecommendedDepartureTime = () => {
|
||||
if (!totalOrder || !orderDuration || !accessoryPeriod) return null;
|
||||
|
||||
console.log(totalOrder, orderDuration, accessoryPeriod);
|
||||
const periodInMilliseconds = accessoryPeriod * 24 * 60 * 60 * 1000;
|
||||
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.toLocaleString("ru-RU");
|
||||
|
||||
return recommendedDepartureTime.toLocaleDateString("ru-RU");
|
||||
};
|
||||
|
||||
const handleBack = () => {
|
||||
@ -228,7 +232,7 @@ const DeliveryOrderDetails = () => {
|
||||
<th scope="col">Тип транспортного средства</th>
|
||||
<th scope="col">Количество транспортных средств</th>
|
||||
<th scope="col">Прогнозируемое время этапа</th>
|
||||
<th scope="col">Рекомендуемое время отправления</th>
|
||||
<th scope="col">Рекомендуемая дата отправления</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@ -254,7 +258,9 @@ const DeliveryOrderDetails = () => {
|
||||
</>
|
||||
)}
|
||||
</td>
|
||||
<td>{calculateRecommendedDepartureTime()}</td>
|
||||
<td>
|
||||
{calculateRecommendedDepartureTime()}
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user