From e7012d697d9299a0b50646a1e11cb75f142f4abd Mon Sep 17 00:00:00 2001
From: andrei <andrei@duvakin.ru>
Date: Tue, 8 Oct 2024 08:52:09 +0500
Subject: [PATCH] ._.

---
 src/pages/DeliveryOrderDetails.jsx | 34 ++++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 4 deletions(-)

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 = () => {
                       })
                     }
                   >
-                    <Popup>{coord.city}</Popup>
+                    <Popup>
+                      {coord.city}
+                      <br />
+                      {coord.accessory_name}
+                    </Popup>
                   </Marker>
                 ))}
                 <Marker
@@ -273,7 +295,11 @@ const DeliveryOrderDetails = () => {
                     })
                   }
                 >
-                  <Popup>{DELIVERY_CITY.name}</Popup>
+                  <Popup>
+                    {DELIVERY_CITY.name}
+                    <br />
+                    Конечный пункт
+                  </Popup>
                 </Marker>
                 {route.length > 0 && (
                   <Polyline positions={route} color="blue" />