From ad952166cdd30b2b711577a77e3a1e1c0be33b87 Mon Sep 17 00:00:00 2001 From: iFixKart Dev Date: Mon, 16 Nov 2026 14:58:29 +0530 Subject: [PATCH] feat(admin): implement Ready for Delivery workflow with Shiprocket dispatch and optimize catalog queries --- app/(admin)/migration/page.tsx | 18 ++- app/(admin)/orders/page.tsx | 172 +++++++++++++++++++---- app/(admin)/products/(list)/page.tsx | 34 ++++- components/dashboard/useDashboardData.ts | 2 +- 4 files changed, 193 insertions(+), 33 deletions(-) diff --git a/app/(admin)/migration/page.tsx b/app/(admin)/migration/page.tsx index e08b98b..0f2b62d 100644 --- a/app/(admin)/migration/page.tsx +++ b/app/(admin)/migration/page.tsx @@ -302,10 +302,22 @@ export default function MigrationPage() { setElapsedSeconds(0); toast.success(`Import job #${String(activeId).slice(0, 8)} enqueued! Telemetry active.`); - // Connect SSE Live Stream + // Connect SSE Live Stream with one-time single-use ticket if (activeId) { - const token = getAuthToken(); - const sseUrl = `${apiBase}/jobs/${activeId}/stream${token ? `?token=${encodeURIComponent(token)}` : ''}`; + let sseUrl = `${apiBase}/jobs/${activeId}/stream`; + try { + const ticketRes = await authFetch(`${apiBase}/sse-ticket`, { method: 'POST' }); + if (ticketRes.ok) { + const ticketData = await ticketRes.json(); + if (ticketData?.ticket) { + sseUrl = `${apiBase}/jobs/${activeId}/stream?ticket=${encodeURIComponent(ticketData.ticket)}`; + } + } + } catch { + const token = getAuthToken(); + if (token) sseUrl = `${apiBase}/jobs/${activeId}/stream?token=${encodeURIComponent(token)}`; + } + const eventSource = new EventSource(sseUrl); eventSource.onmessage = (event) => { try { diff --git a/app/(admin)/orders/page.tsx b/app/(admin)/orders/page.tsx index 4f85117..ed6692e 100644 --- a/app/(admin)/orders/page.tsx +++ b/app/(admin)/orders/page.tsx @@ -64,6 +64,10 @@ interface AdminOrderDetailResponse { billing_address_json: string | null; tracking_number: string | null; courier_name: string | null; + shipping_label_url?: string | null; + package_weight?: number | null; + logistics_provider?: string | null; + pickup_scheduled?: boolean; created_at: string; items: OrderItemDetail[]; history: StatusHistorySchema[]; @@ -115,6 +119,7 @@ interface AdminOrderListResponse { coupon_code?: string | null; status: string; payment_status: string; + shipping_label_url?: string | null; created_at: string; } @@ -134,7 +139,7 @@ function statusKey(status?: string) { function isOpenStatus(status?: string) { const s = statusKey(status); - return s === 'PENDING' || s === 'CONFIRMED' || s === 'PROCESSING'; + return s === 'PENDING' || s === 'CONFIRMED' || s === 'PROCESSING' || s === 'READY_FOR_DELIVERY'; } function isShippedStatus(status?: string) { @@ -151,9 +156,13 @@ function isCancelledStatus(status?: string) { } function statusBadgeClass(status?: string) { - if (isDeliveredStatus(status)) return 'bg-success text-white'; - if (isCancelledStatus(status)) return 'bg-destructive text-white'; - if (isShippedStatus(status)) return 'bg-primary text-white'; + const k = statusKey(status); + if (k === 'DELIVERED') return 'bg-emerald-600 text-white'; + if (k === 'CANCELLED') return 'bg-destructive text-white'; + if (k === 'SHIPPED') return 'bg-blue-600 text-white'; + if (k === 'OUT_FOR_DELIVERY') return 'bg-purple-600 text-white'; + if (k === 'READY_FOR_DELIVERY') return 'bg-amber-600 text-white'; + if (k === 'CONFIRMED' || k === 'ORDER_CONFIRMED') return 'bg-teal-600 text-white'; return 'bg-warning text-white'; } @@ -172,6 +181,8 @@ export default function OrderIntelligencePage() { const [verifiedItems, setVerifiedItems] = useState([]); const [showStatusForm, setShowStatusForm] = useState(false); const [newStatus, setNewStatus] = useState('PROCESSING'); + const [logisticsProvider, setLogisticsProvider] = useState<'SHIPROCKET' | 'LOCAL_DELIVERY'>('SHIPROCKET'); + const [packageWeight, setPackageWeight] = useState('0.5'); const [trackingNo, setTrackingNo] = useState(''); const [courier, setCourier] = useState(''); const [changeReason, setChangeReason] = useState(''); @@ -742,9 +753,20 @@ export default function OrderIntelligencePage() { const handleOpenStatusForm = () => { if (!detailData) return; - setNewStatus(detailData.status); + const curKey = (detailData.status || '').toUpperCase(); + if (['PENDING', 'ORDER_CREATED', 'PAYMENT_PENDING'].includes(curKey)) { + setNewStatus('PENDING'); + } else if (['CONFIRMED', 'ORDER_CONFIRMED', 'PROCESSING'].includes(curKey)) { + setNewStatus('CONFIRMED'); + } else if (curKey === 'READY_FOR_DELIVERY') { + setNewStatus('READY_FOR_DELIVERY'); + } else { + setNewStatus(detailData.status); + } setTrackingNo(detailData.tracking_number || ''); setCourier(detailData.courier_name || ''); + setPackageWeight(detailData.package_weight ? String(detailData.package_weight) : '0.5'); + setLogisticsProvider((detailData.logistics_provider as any) || 'SHIPROCKET'); setChangeReason(''); // Pre-fill partNumbersMap @@ -762,17 +784,27 @@ export default function OrderIntelligencePage() { if (!detailData) return; setUpdating(true); try { - await apiFetch(`/api/v1/admin/orders/${detailData.order_id}/status`, { + const payload: any = { + status: newStatus, + tracking_number: trackingNo || null, + courier_name: courier || null, + reason: changeReason || null, + part_numbers_mapping: Object.keys(partNumbersMap).length > 0 ? partNumbersMap : undefined, + }; + + if (newStatus === 'READY_FOR_DELIVERY') { + payload.logistics_provider = logisticsProvider; + payload.package_weight = parseFloat(packageWeight) || 0.5; + } + + const res = await apiFetch(`/api/v1/admin/orders/${detailData.order_id}/status`, { method: 'PUT', - body: JSON.stringify({ - status: newStatus, - tracking_number: trackingNo || null, - courier_name: courier || null, - reason: changeReason || null, - part_numbers_mapping: Object.keys(partNumbersMap).length > 0 ? partNumbersMap : undefined, - }), + body: JSON.stringify(payload), }); - toast.success('Order status saved'); + toast.success(res?.message || 'Order status saved'); + if (res?.shipping_label_url) { + toast.info('Shipping slip generated! Click "Print Shipping Slip" to print.'); + } setShowStatusForm(false); handleInspectOrder(detailData.order_id); fetchOrders(); @@ -1067,12 +1099,52 @@ export default function OrderIntelligencePage() { {!showStatusForm && ( - +
+ {detailData.shipping_label_url && ( + + + Print Shipping Slip + + )} + +
)} + {detailData.tracking_number && ( +
+
+ +
+
+ {detailData.courier_name || 'Carrier'}: {detailData.tracking_number} +
+
+ Status: {(detailData.status || '').replace('_', ' ')} +
+
+
+ {detailData.shipping_label_url && ( + + + Print Slip + + )} +
+ )} +
@@ -1127,17 +1199,65 @@ export default function OrderIntelligencePage() { { + const curKey = (detailData.status || '').toUpperCase(); + const isPendingState = ['PENDING', 'ORDER_CREATED', 'PAYMENT_PENDING'].includes(curKey); + if (isPendingState) { + return [ + { value: 'PENDING', label: 'Pending' }, + { value: 'CONFIRMED', label: 'Confirmed' }, + { value: 'CANCELLED', label: 'Cancelled' }, + ]; + } + return [ + { value: 'CONFIRMED', label: 'Confirmed' }, + { value: 'READY_FOR_DELIVERY', label: 'Ready for delivery' }, + { value: 'CANCELLED', label: 'Cancelled' }, + ]; + })()} /> +

+ Note: 'Shipped', 'Out for delivery', and 'Delivered' are automatically synced from Shiprocket upon courier pickup. +

+ + {newStatus === 'READY_FOR_DELIVERY' && ( +
+
+ + setLogisticsProvider(val as any)} + options={[ + { value: 'SHIPROCKET', label: 'Shiprocket (Automated Pickup & Tracking)' }, + { value: 'LOCAL_DELIVERY', label: 'Local / Store Delivery (Manual Handover)' }, + ]} + /> +
+
+ + setPackageWeight(e.target.value)} + className={inputClass} + required + /> +

+ Actual physical scale weight for courier billing and manifest verification. +

+
+ {logisticsProvider === 'SHIPROCKET' && ( +
+ ⚡ Automated Pickup Trigger: Confirming will immediately create the order in Shiprocket, assign the AWB number, generate the printable shipping label slip, and schedule carrier pickup at the shop location. +
+ )} +
+ )} {newStatus === 'SHIPPED' && ( <>
diff --git a/app/(admin)/products/(list)/page.tsx b/app/(admin)/products/(list)/page.tsx index 48223da..4135599 100644 --- a/app/(admin)/products/(list)/page.tsx +++ b/app/(admin)/products/(list)/page.tsx @@ -339,7 +339,12 @@ export default function ProductsPage() { return () => clearTimeout(timer); }, [searchQuery]); + const isInitialSearchMount = useRef(true); useEffect(() => { + if (isInitialSearchMount.current) { + isInitialSearchMount.current = false; + return; + } setServerPage(1); fetchData(1); }, [debouncedSearch]); @@ -1196,8 +1201,31 @@ export default function ProductsPage() { ); }; + const getProductDisplayImage = (p: ProductResponse): string => { + if (p.images && p.images.length > 0) { + const primary = p.images.find((img) => (img as any).is_primary); + if (primary?.image_url) return primary.image_url; + if (p.images[0]?.image_url) return p.images[0].image_url; + } + if ((p as any).thumbnail_url) return (p as any).thumbnail_url; + if (p.variants && p.variants.length > 0) { + for (const v of p.variants) { + if (v.images && v.images.length > 0) { + const primary = v.images.find((img) => img.is_primary); + if (primary?.image_url) return primary.image_url; + } + } + for (const v of p.variants) { + if (v.images && v.images.length > 0 && v.images[0]?.image_url) { + return v.images[0].image_url; + } + } + } + return ''; + }; + const renderProductAvatar = (p: ProductResponse) => { - const rawUrl = p.images?.[0]?.image_url || (p as any).thumbnail_url || p.variants?.[0]?.images?.[0]?.image_url; + const rawUrl = getProductDisplayImage(p); const imgUrl = getMediaUrl(rawUrl); return (
@@ -1960,9 +1988,9 @@ export default function ProductsPage() {
- {(p.images?.[0]?.image_url || (p as any).thumbnail_url || p.variants?.[0]?.images?.[0]?.image_url) ? ( + {getProductDisplayImage(p) ? ( {p.name} { e.currentTarget.style.display = 'none'; }} diff --git a/components/dashboard/useDashboardData.ts b/components/dashboard/useDashboardData.ts index d0ef346..3b3e241 100644 --- a/components/dashboard/useDashboardData.ts +++ b/components/dashboard/useDashboardData.ts @@ -46,7 +46,7 @@ export function useDashboardData() { const [statsRes, ordersRes, productsRes, categoriesRes, brandsRes, sessionsRes] = await Promise.allSettled([ adminService.getDashboardStats().catch(() => null), apiFetch('/api/v1/admin/orders').catch(() => []), - apiFetch('/api/v1/catalog/products/all?limit=200').catch(() => []), + apiFetch('/api/v1/catalog/products/all?limit=25').catch(() => []), apiFetch('/api/v1/catalog/categories/all').catch(() => []), apiFetch('/api/v1/catalog/brands/all').catch(() => []), adminService.listSessions(0, 50).catch(() => ({ sessions: [] })),