diff --git a/src/pages/DeliveryOrderDetails.jsx b/src/pages/DeliveryOrderDetails.jsx
index e44a130..a364d8c 100644
--- a/src/pages/DeliveryOrderDetails.jsx
+++ b/src/pages/DeliveryOrderDetails.jsx
@@ -99,10 +99,26 @@ const DeliveryOrderDetails = () => {
city: accessory.city_name,
latitude: accessory.latitude,
longitude: accessory.longitude,
+ accessory_name:
+ accessory.accessory_name +
+ Math.round(
+ (accessory.accessory_volume * accessory.count) / 100
+ ) +
+ "шт.",
};
} else {
const coords = await getCoordinates(accessory.city_name);
- return { city: accessory.city_name, ...coords };
+ return {
+ city: accessory.city_name,
+ accessory_name:
+ accessory.accessory_name +
+ ": " +
+ Math.round(
+ (accessory.accessory_volume * accessory.count) / 100
+ ) +
+ "шт.",
+ ...coords,
+ };
}
})
);
@@ -195,7 +211,9 @@ const DeliveryOrderDetails = () => {
const { days, hours, minutes } = formatDuration(
deliveryOrder?.estimated_route_time_in_minutes
);
- return `${days} дн. ${hours} ч.`;
+ return days > 0
+ ? `${days} дн. ${hours} ч.`
+ : `${hours} ч.`;
})()}
>
)}
@@ -258,7 +276,11 @@ const DeliveryOrderDetails = () => {
})
}
>
- {coord.city}
+
+ {coord.city}
+
+ {coord.accessory_name}
+
))}
{
})
}
>
- {DELIVERY_CITY.name}
+
+ {DELIVERY_CITY.name}
+
+ Конечный пункт
+
{route.length > 0 && (