diff --git a/src/features/order/lib/type.ts b/src/features/order/lib/type.ts
index cb9c62d..5d10ceb 100644
--- a/src/features/order/lib/type.ts
+++ b/src/features/order/lib/type.ts
@@ -38,6 +38,8 @@ export interface Order {
items: Item[];
created_at: string;
long: number;
+ delivery_date: string;
+ delivery_time: string;
lat: number;
}
diff --git a/src/features/order/ui/OrderDetail.tsx b/src/features/order/ui/OrderDetail.tsx
index 8ce5fcf..892e2d1 100644
--- a/src/features/order/ui/OrderDetail.tsx
+++ b/src/features/order/ui/OrderDetail.tsx
@@ -4,6 +4,7 @@ import formatPrice from "@/shared/lib/formatPrice";
import { Map, Placemark, YMaps } from "@pbe/react-yandex-maps";
import {
Calendar,
+ Clock3,
MapIcon,
MessageSquare,
Package,
@@ -126,6 +127,26 @@ const OrderDetail = ({ detail, setDetail, order }: Props) => {
)}
+ {order.delivery_date && (
+
+
+
+ Yetkazish sanasi
+
+
{order.delivery_date}
+
+ )}
+
+ {order.delivery_time && (
+
+
+
+ Yetkazish vaqti
+
+
{order.delivery_time}
+
+ )}
+
diff --git a/src/features/order/ui/OrderTable.tsx b/src/features/order/ui/OrderTable.tsx
index 219b423..20e1fdd 100644
--- a/src/features/order/ui/OrderTable.tsx
+++ b/src/features/order/ui/OrderTable.tsx
@@ -109,6 +109,8 @@ const OrderTable = ({
Foydalanuvchi
Umumiy narx
Izoh
+ Yetkazish sanasi
+ Yetkazish soati
Holat
Harakatlar
@@ -121,6 +123,8 @@ const OrderTable = ({
{order.user.username}
{formatPrice(order.total_price, true)}
{order.comment || "-"}
+ {order?.delivery_date || "-"}
+ {order?.delivery_time || "-"}