diff --git a/src/pages/orders/order-detail/OrderDetailPage.tsx b/src/pages/orders/order-detail/OrderDetailPage.tsx index 149c47d..97f0603 100644 --- a/src/pages/orders/order-detail/OrderDetailPage.tsx +++ b/src/pages/orders/order-detail/OrderDetailPage.tsx @@ -94,8 +94,8 @@ const OrderDetailPage = () => { const { mutate: updateStatus, isPending: isUpdating } = useUpdateOrderStatus(); const { data: shippingMethods = [] } = useShippingMethods(); const order = data?.order; - - const shippingMethod = order?.shipping_method_id + + const shippingMethod = order?.shipping_method_id ? shippingMethods.find(method => method.id === order.shipping_method_id) : null; const handleStatusUpdate = () => { @@ -182,8 +182,8 @@ const OrderDetailPage = () => {
#{order?.order_number || 'نامشخص'}
-{order?.created_at ? formatDate(order.created_at) : 'نامشخص'}
-{order?.invoice_id || 'نامشخص'}
-{order?.user_id || 'نامشخص'}
-{order?.updated_at ? formatDate(order.updated_at) : 'نامشخص'}
-{order.tracking_number}
-{formatDate(order.estimated_delivery)}
-- {shippingMethod - ? shippingMethod.name - : shippingMethods.length === 0 - ? `شناسه: ${order.shipping_method_id} (در حال بارگذاری...)` - : `شناسه: ${order.shipping_method_id}` - } -
-- {typeof order.selected_delivery_slot === 'object' - ? `${order.selected_delivery_slot.date || ''} ${order.selected_delivery_slot.from_hour || ''}:${order.selected_delivery_slot.to_hour || ''}` - : String(order.selected_delivery_slot) - } -
-#{order?.order_number || 'نامشخص'}
- {order.notes} +
{order?.created_at ? formatDate(order.created_at) : 'نامشخص'}
+{order?.invoice_id || 'نامشخص'}
+{order?.user_id || 'نامشخص'}
+{order?.updated_at ? formatDate(order.updated_at) : 'نامشخص'}
+{order.tracking_number}
+{formatDate(order.estimated_delivery)}
++ {shippingMethod + ? shippingMethod.name + : shippingMethods.length === 0 + ? `شناسه: ${order.shipping_method_id} (در حال بارگذاری...)` + : `شناسه: ${order.shipping_method_id}` + } +
++ {typeof order.selected_delivery_slot === 'object' + ? `${order.selected_delivery_slot.date || ''} ${order.selected_delivery_slot.from_hour || ''}:${order.selected_delivery_slot.to_hour || ''}` + : String(order.selected_delivery_slot) + }
+ {order.notes} +
- محصولی در این سفارش یافت نشد -
- )} ++ محصولی در این سفارش یافت نشد +
+ )} +