diff --git a/src/app/[name]/(Dialogs)/order/checkout/types/Types.ts b/src/app/[name]/(Dialogs)/order/checkout/types/Types.ts index d7a047b..907908e 100644 --- a/src/app/[name]/(Dialogs)/order/checkout/types/Types.ts +++ b/src/app/[name]/(Dialogs)/order/checkout/types/Types.ts @@ -456,6 +456,12 @@ export interface OrderDetailUserAddress { postalCode: string; } +export interface OrderDetailCourier { + id: string; + fullName: string; + phone: string; +} + export interface OrderDetail { id: string; createdAt: string; @@ -464,6 +470,7 @@ export interface OrderDetail { user: OrderDetailUser; restaurant: OrderDetailRestaurant; deliveryMethod: OrderDetailDeliveryMethod; + courier?: OrderDetailCourier | null; userAddress: OrderDetailUserAddress | null; carAddress: OrderDetailCarAddress | null; paymentMethod: OrderDetailPaymentMethod; diff --git a/src/app/[name]/(Dialogs)/order/track/[id]/page.tsx b/src/app/[name]/(Dialogs)/order/track/[id]/page.tsx index 6e98063..923b91b 100644 --- a/src/app/[name]/(Dialogs)/order/track/[id]/page.tsx +++ b/src/app/[name]/(Dialogs)/order/track/[id]/page.tsx @@ -145,6 +145,24 @@ function OrderTrackingPage() { نوع ارسال {orderDetail.data?.deliveryMethod?.description} + {orderDetail.data.courier && ( + <> +
+ نام پیک + {orderDetail.data.courier.fullName} +
+
+ شماره تماس پیک + + {orderDetail.data.courier.phone} + +
+ + )} {orderDetail.data.carAddress && (
اطلاعات خودرو
diff --git a/src/app/[name]/(Main)/order/history/page.tsx b/src/app/[name]/(Main)/order/history/page.tsx index 8dbc99a..f285df7 100644 --- a/src/app/[name]/(Main)/order/history/page.tsx +++ b/src/app/[name]/(Main)/order/history/page.tsx @@ -99,6 +99,12 @@ function OrdersIndex() {

{formattedDate}

+ {order.courier && ( +
+

پیک:

+

{order.courier.fullName} - {order.courier.phone}

+
+ )}
@@ -185,6 +191,12 @@ function OrdersIndex() {

{formattedDate}

+ {order.courier && ( +
+

پیک:

+

{order.courier.fullName} - {order.courier.phone}

+
+ )}
diff --git a/src/app/[name]/(Main)/order/history/types/Types.ts b/src/app/[name]/(Main)/order/history/types/Types.ts index 7ce67db..47f7e12 100644 --- a/src/app/[name]/(Main)/order/history/types/Types.ts +++ b/src/app/[name]/(Main)/order/history/types/Types.ts @@ -78,6 +78,12 @@ export interface HistoryOrderDeliveryMethod { order: number; } +export interface HistoryOrderCourier { + id: string; + fullName: string; + phone: string; +} + export interface HistoryOrderUserAddress { phone: string; address: string; @@ -166,6 +172,7 @@ export interface HistoryOrder { user: HistoryOrderUser; restaurant: HistoryOrderRestaurant; deliveryMethod: HistoryOrderDeliveryMethod; + courier?: HistoryOrderCourier | null; userAddress: HistoryOrderUserAddress | null; carAddress: HistoryOrderUserAddress | null; paymentMethod: HistoryOrderPaymentMethod;