order courier

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;

src/app/[name]/(Dialogs)/order/track/[id]/page.tsx

@@ -145,6 +145,24 @@ function OrderTrackingPage() {
                   <span className="text-sm text-muted-foreground">نوع ارسال</span>
                   <span className="text-sm font-semibold">{orderDetail.data?.deliveryMethod?.description}</span>
                 </div>
+                {orderDetail.data.courier && (
+                  <>
+                    <div className="flex justify-between items-center h-16 border-b border-border">
+                      <span className="text-sm text-muted-foreground">نام پیک</span>
+                      <span className="text-sm font-semibold">{orderDetail.data.courier.fullName}</span>
+                    </div>
+                    <div className="flex justify-between items-center h-16 border-b border-border">
+                      <span className="text-sm text-muted-foreground">شماره تماس پیک</span>
+                      <a
+                        href={`tel:${orderDetail.data.courier.phone}`}
+                        className="text-sm font-semibold text-primary"
+                        dir="ltr"
+                      >
+                        {orderDetail.data.courier.phone}
+                      </a>
+                    </div>
+                  </>
+                )}
                 {orderDetail.data.carAddress && (
                   <div className="flex justify-between items-center h-16 border-b border-border">
                     <div className="text-sm text-muted-foreground mb-1">اطلاعات خودرو</div>

src/app/[name]/(Main)/order/history/page.tsx

@@ -99,6 +99,12 @@ function OrdersIndex() {
                             <CalendarIcon size={16} />
                             <p>{formattedDate}</p>
                         </div>
+                        {order.courier && (
+                            <div className='mt-2 flex gap-2'>
+                                <p className='text-disabled-text'>پیک:</p>
+                                <p>{order.courier.fullName} - <span dir='ltr'>{order.courier.phone}</span></p>
+                            </div>
+                        )}
                     </div>
 
                     <hr className='mx-4 mt-6 text-disabled3 border-2 dark:border-neutral-500' />
@@ -185,6 +191,12 @@ function OrdersIndex() {
                             <CalendarIcon size={16} />
                             <p>{formattedDate}</p>
                         </div>
+                        {order.courier && (
+                            <div className='mt-2 flex gap-2'>
+                                <p className='text-disabled-text'>پیک:</p>
+                                <p>{order.courier.fullName} - <span dir='ltr'>{order.courier.phone}</span></p>
+                            </div>
+                        )}
                     </div>
 
                     <hr className='mx-4 mt-6 text-disabled3 border-2 dark:border-neutral-500' />

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;