diff --git a/src/components/DeliveryOrdersList.jsx b/src/components/DeliveryOrdersList.jsx index 4579497..ad79302 100644 --- a/src/components/DeliveryOrdersList.jsx +++ b/src/components/DeliveryOrdersList.jsx @@ -1,5 +1,6 @@ import { getDeliveryOrders } from "../api"; import React, { useState, useEffect } from "react"; +import { useNavigate } from "react-router-dom"; const DeliveryOrdersList = ({ totalOrderId, @@ -8,6 +9,7 @@ const DeliveryOrdersList = ({ }) => { const [deliveryOrders, setDeliveryOrders] = useState([]); const [loadingDeliveryOrders, setLoadingDeliveryOrders] = useState(true); + const navigate = useNavigate(); useEffect(() => { fetchDeliveryOrders(); @@ -19,12 +21,19 @@ const DeliveryOrdersList = ({ setDeliveryOrdersCount(orders.length); setDeliveryOrders(orders); } catch (error) { + if (error.response && error.response.status === 401) { + navigate("/login"); + } console.error("Ошибка при загрузке подзаказов:", error); } finally { setLoadingDeliveryOrders(false); } }; + const formatTimeInHours = (minutes) => { + return (minutes / 60).toFixed(2); + }; + return (
{loadingDeliveryOrders ? ( @@ -38,7 +47,13 @@ const DeliveryOrdersList = ({ className="card mb-1" onClick={() => onSubOrderClick(order.id)} > -
Подзаказ #{index + 1}
+
+

Подзаказ #{index + 1}

+

+ Время на подзаказ: + {formatTimeInHours(order.estimated_route_time_in_minutes)} час. +

+
)) )}