From e966c83fd39c40845fbf1fe6b8670587b18dd457 Mon Sep 17 00:00:00 2001 From: vickytechkey Date: Sun, 11 Oct 2026 12:28:25 +0530 Subject: [PATCH] fix: multi-carrier shipping label support for Delhivery & require assigned carrier before label generation --- src/components/orders/OrderDetailView.tsx | 8 +- src/pages/dashboard/OrdersPage.tsx | 216 +++++++++++----------- 2 files changed, 115 insertions(+), 109 deletions(-) diff --git a/src/components/orders/OrderDetailView.tsx b/src/components/orders/OrderDetailView.tsx index 9ca4392..40da23c 100644 --- a/src/components/orders/OrderDetailView.tsx +++ b/src/components/orders/OrderDetailView.tsx @@ -86,9 +86,11 @@ export const OrderDetailView: React.FC = ({ order, onBack, - + {order.awbNumber && order.awbNumber !== 'Pending' && order.awbNumber !== 'N/A' && order.status !== 'new' && order.status !== 'accepted' && ( + + )} diff --git a/src/pages/dashboard/OrdersPage.tsx b/src/pages/dashboard/OrdersPage.tsx index 8d160a3..57250a3 100644 --- a/src/pages/dashboard/OrdersPage.tsx +++ b/src/pages/dashboard/OrdersPage.tsx @@ -173,6 +173,10 @@ export const OrdersPage: React.FC = () => { }; const handleFetchPrintLabel = async (ord: OrderItem) => { + if (!ord.awbNumber || ord.awbNumber === 'Pending' || ord.awbNumber === 'N/A' || ord.status === 'new' || ord.status === 'accepted') { + alert('Shipping label can only be generated after a carrier is assigned to the order. Please mark the order Ready to Ship first.'); + return; + } setIsLoading(true); try { const res = await getOrderLabel(ord.id); @@ -551,14 +555,6 @@ export const OrdersPage: React.FC = () => { > Accept - - - -
-
- - {/* Header Bar */} -
- SHADOWFAX 360 - - {selectedOrderForLabel.package_details?.payment_mode || selectedOrderForLabel.payment_mode || (selectedOrderForLabel.package_details?.collectible_amount === 0 ? 'PREPAID' : 'COD')} - - Tradhox -
+ {selectedOrderForLabel && (() => { + const carrierStr = (selectedOrderForLabel.carrier || '').toLowerCase(); + const awbStr = String(selectedOrderForLabel.awb_number || '').trim(); + const isDelhivery = carrierStr.includes('delhivery') || (/^(698|179|139|142|12|14)/.test(awbStr) && awbStr.length >= 12); + const payMode = selectedOrderForLabel.package_details?.payment_mode || selectedOrderForLabel.payment_mode || (selectedOrderForLabel.package_details?.collectible_amount === 0 ? 'PREPAID' : 'COD'); + const sortCode = selectedOrderForLabel.sort_code || (isDelhivery ? 'CHE/TMP' : 'S46'); + const destHub = selectedOrderForLabel.destination_hub || (isDelhivery ? 'Chennai' : 'BLR/CTL'); - {/* Top Barcode & AWB */} -
- {selectedOrderForLabel.barcode_url ? ( - AWB Barcode - ) : ( -
- ||||||| | ||||| |||| || |||||| | ||||| |||| -
- )} -
- #Box: 1 - {selectedOrderForLabel.awb_number || 'SF42056592007'} - BLR/CTL + return ( +
+
setSelectedOrderForLabel(null)}>
+
+
+

+ {isDelhivery ? 'Delhivery B2C Official Shipping Label (4x6)' : 'Shadowfax 360 Official Shipping Label (4x6)'} +

+ +
+
+
+ + {/* Header Bar */} +
+ + {isDelhivery ? 'DELHIVERY SURFACE' : 'SHADOWFAX 360'} + + + {payMode} + + Tradhox
-
- {/* Huge Black Banner */} -
- SF360 -
+ {/* Top Barcode & AWB */} +
+ {selectedOrderForLabel.barcode_url ? ( + AWB Barcode + ) : ( +
+ ||||||| | ||||| |||| || |||||| | ||||| |||| +
+ )} +
+ #Box: 1 + {awbStr || 'Pending'} + {destHub} +
+
- {/* QR Code & Sorting Hub Code */} -
- 2D QR Code - S46 -
+ {/* Huge Carrier Banner */} +
+ {isDelhivery ? 'DELHIVERY B2C' : 'SF360'} +
- {/* Seller & Customer Details */} -
-
Seller: {selectedOrderForLabel.sender?.name || 'tradhox'} (Ph: {selectedOrderForLabel.sender?.phone || '9123456789'})
-
(Seller GSTIN: 33AWRPV3071D1ZC)
-
{selectedOrderForLabel.sender?.address || '154-sabestian illam, irumbuliyur, arul nagar, east tambaram'}
-
Customer: {selectedOrderForLabel.recipient?.name || 'Customer'} (Ph: {selectedOrderForLabel.recipient?.phone || 'N/A'})
-
{selectedOrderForLabel.recipient?.address || 'Customer Address Line 1, Bengaluru - 560038'}
-
+ {/* QR Code & Sorting Hub Code */} +
+ 2D QR Code +
+ {sortCode} + ROUTING HUB +
+
- {/* Client Order ID Barcode */} -
- Order ID Barcode -
COID: {selectedOrderForLabel.order_id || '3-14'}
-
+ {/* Seller & Customer Details */} +
+
Seller: {selectedOrderForLabel.sender?.name || 'test store'} (Ph: {selectedOrderForLabel.sender?.phone || '9600494039'})
+
(Seller GSTIN: 33AWRPV3071D1ZC)
+
{selectedOrderForLabel.sender?.address || '154-sabestian illam, irumbuliyur, arul nagar, east tambaram'}
+
Customer (Ship To): {selectedOrderForLabel.recipient?.name || 'Customer'} (Ph: {selectedOrderForLabel.recipient?.phone || 'N/A'})
+
{selectedOrderForLabel.recipient?.address || 'Customer Address'}
+
- {/* Return Origin */} -
- Return Address: {selectedOrderForLabel.sender?.address || '154-sabestian illam, irumbuliyur, arul nagar, east tambaram, Chennai-600059'} -
+ {/* Client Order ID Barcode */} +
+ Order ID Barcode +
COID: {selectedOrderForLabel.order_id || ''}
+
- {/* Declaration */} -
- Declaration: Contents of this package are being purchased for personal purpose and not for resale -
+ {/* Return Origin */} +
+ Return Address: {selectedOrderForLabel.sender?.address || '154-sabestian illam, irumbuliyur, arul nagar, east tambaram, Chennai-600059'} +
-
-
-
- -
- - -
-
+ {/* Declaration */} +
+ Declaration: Contents of this package are being purchased for personal purpose and not for resale +
+ + + + + - - )} + ); + })()} {/* MODAL: Live Shipment Tracking */} {trackingInfo && (