From 2e6a760e404a4f641c3ce92fc3643e599b9b1906 Mon Sep 17 00:00:00 2001
From: andrei
Date: Tue, 8 Oct 2024 10:31:02 +0500
Subject: [PATCH] ._.
---
src/components/DeliveryOrdersList.jsx | 8 ++++++++
src/pages/DeliveryOrderDetails.jsx | 2 +-
src/pages/Home.jsx | 2 +-
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/components/DeliveryOrdersList.jsx b/src/components/DeliveryOrdersList.jsx
index c56f071..40069bc 100644
--- a/src/components/DeliveryOrdersList.jsx
+++ b/src/components/DeliveryOrdersList.jsx
@@ -52,6 +52,13 @@ const DeliveryOrdersList = ({
return (minutes / 60).toFixed(2) + " час.";
};
+ const formatPrice = (price) => {
+ if (!price) {
+ return "не указана";
+ }
+ return `${Math.round(price)} ₽`;
+ };
+
const calculateRoutes = async () => {
const ordersToCalculate = deliveryOrders.filter(
(order) => !order.estimated_route_time_in_minutes
@@ -161,6 +168,7 @@ const DeliveryOrdersList = ({
Прогнозируемое время этапа:{" "}
{formatTimeInHours(order.estimated_route_time_in_minutes)}
+ Стоимость: {formatPrice(order.price)}
{calculatingRoutes.includes(order.id) && (
diff --git a/src/pages/DeliveryOrderDetails.jsx b/src/pages/DeliveryOrderDetails.jsx
index c729c8c..0866abf 100644
--- a/src/pages/DeliveryOrderDetails.jsx
+++ b/src/pages/DeliveryOrderDetails.jsx
@@ -207,7 +207,7 @@ const DeliveryOrderDetails = () => {
- | {totalCost} руб. |
+ {totalCost} ₽ |
{truckName}
diff --git a/src/pages/Home.jsx b/src/pages/Home.jsx
index 9f6c56d..39e3d1d 100644
--- a/src/pages/Home.jsx
+++ b/src/pages/Home.jsx
@@ -132,7 +132,7 @@ const Home = () => {
| {order.status_name || "Неизвестный статус"} |
{order.count_robots} |
{deliveryOrdersCount || 0} |
- {order.price || 0} руб. |
+ {order.price || 0} ₽ |