From 7f02b4cd4f46c03dcc42df0bcc7da160db29b0ff Mon Sep 17 00:00:00 2001 From: vickytechkey Date: Mon, 12 Oct 2026 18:25:39 +0530 Subject: [PATCH] feat: add api service module for backend communication and authentication --- .../orders/ReschedulePickupView.tsx | 365 ++++++++++++++++-- src/context/SellerContext.tsx | 21 +- src/pages/dashboard/OrdersPage.tsx | 23 +- src/services/api.ts | 22 ++ 4 files changed, 389 insertions(+), 42 deletions(-) diff --git a/src/components/orders/ReschedulePickupView.tsx b/src/components/orders/ReschedulePickupView.tsx index 254ac47..8aae42c 100644 --- a/src/components/orders/ReschedulePickupView.tsx +++ b/src/components/orders/ReschedulePickupView.tsx @@ -9,7 +9,11 @@ import { CheckCircle2, Calendar, Truck, - Edit + Edit, + Info, + ShieldCheck, + Check, + Lock } from 'lucide-react'; import { OrderItem } from '../../types/seller'; import { useSeller } from '../../context/SellerContext'; @@ -21,14 +25,36 @@ interface ReschedulePickupViewProps { } export const ReschedulePickupView: React.FC = ({ onBack, onTabChange, order }) => { - const { orders, onboarding, user } = useSeller(); + const { orders, onboarding, user, reschedulePickup } = useSeller(); const readyOrders = orders.filter(o => o.status === 'ready_to_ship'); const locationName = onboarding.tradeName || onboarding.city || user?.storeName || user?.name || 'Artisan Workshop Hub'; - const [reason, setReason] = useState('curing'); - const [otherReasonText, setOtherReasonText] = useState(''); - const [slot, setSlot] = useState('morning'); - const [dateType, setDateType] = useState('tomorrow'); + // Target single order or first ready_to_ship order + const targetOrder = order || readyOrders[0] || null; + + // Resolve Carrier Identity + const courier = String(targetOrder?.courierPartner || '').toUpperCase(); + const awb = String(targetOrder?.awbNumber || '').toUpperCase(); + + const isDelhivery = courier.includes('DELHI') || awb.startsWith('DELHI') || awb.startsWith('698') || /^\d{10,14}$/.test(awb); + const isEkart = !isDelhivery && (courier.includes('EKART') || awb.startsWith('EKART') || awb.startsWith('ELIT') || awb.startsWith('500')); + const isShadowfax = !isDelhivery && !isEkart; + + const carrierDisplayName = isDelhivery ? 'Delhivery Logistics' : (isEkart ? 'Ekart Logistics' : 'Shadowfax Logistics'); + + // Compute tomorrow's date format YYYY-MM-DD + const tomorrow = new Date(Date.now() + 86400000); + const tomorrowStr = tomorrow.toISOString().split('T')[0]; + const todayStr = new Date().toISOString().split('T')[0]; + + const [pickupDate, setPickupDate] = useState(tomorrowStr); + const [slot, setSlot] = useState('afternoon'); + const [reason, setReason] = useState('curing'); + const [otherReasonText, setOtherReasonText] = useState(''); + const [driverNotes, setDriverNotes] = useState(''); + const [isSubmitting, setIsSubmitting] = useState(false); + const [submitSuccess, setSubmitSuccess] = useState(null); + const [submitError, setSubmitError] = useState(null); const reasons = [ { id: 'curing', label: 'Handcrafts Still Drying / Finishing', desc: 'Extra time needed for kiln curing or natural dye drying.' }, @@ -39,12 +65,52 @@ export const ReschedulePickupView: React.FC = ({ onBa { id: 'other', label: 'Other Reason', desc: 'Briefly let the logistics team know what changed.' } ]; - const slots = [ - { id: 'morning', label: 'Morning (10:00 AM – 1:00 PM)', desc: 'Delhivery Express & Air Linehaul', tag: 'Fastest Delivery' }, - { id: 'afternoon', label: 'Afternoon (2:00 PM – 5:00 PM)', desc: 'Standard ground carrier sweep', tag: 'Standard', tagBg: 'transparent' }, - { id: 'evening', label: 'Evening (5:00 PM – 7:00 PM)', desc: 'Regional depot consolidation run', tag: 'Evening Run', tagBg: 'transparent' } + const delhiverySlots = [ + { id: 'morning', label: 'Morning Slot', time: '10:00 AM – 1:00 PM', value: '10:00:00', desc: 'Early pickup for priority flight & express linehaul', tag: 'Express Cutoff', tagColor: '#0284c7' }, + { id: 'afternoon', label: 'Afternoon Slot', time: '2:00 PM – 5:00 PM', value: '14:00:00', desc: 'Standard warehouse dispatch & ground linehaul', tag: 'Recommended', tagColor: '#16a34a' }, + { id: 'evening', label: 'Evening Slot', time: '5:00 PM – 7:00 PM', value: '17:00:00', desc: 'Regional consolidation run before depot departure', tag: 'Late Run', tagColor: '#9333ea' } ]; + const handleConfirmSchedule = async () => { + setIsSubmitting(true); + setSubmitError(null); + setSubmitSuccess(null); + + const targetOrderId = targetOrder?.id || (readyOrders[0]?.id); + if (!targetOrderId) { + setSubmitError('No ready to ship order selected for scheduling.'); + setIsSubmitting(false); + return; + } + + const effectiveTime = isDelhivery + ? (slot === 'morning' ? '10:00:00' : slot === 'evening' ? '17:00:00' : '14:00:00') + : (isEkart ? 'Standard Hub Sweep' : 'Automated Cutoff Sweep'); + + const effectiveReason = reason === 'other' ? (otherReasonText || 'Other merchant reason') : (reasons.find(r => r.id === reason)?.label || reason); + + const payload = { + pickup_date: pickupDate, + pickup_time: effectiveTime, + reason: effectiveReason, + notes: driverNotes || effectiveReason, + package_count: targetOrder ? 1 : readyOrders.length + }; + + try { + const res = await reschedulePickup(targetOrderId, payload); + const msg = res?.message || `Courier pickup confirmed for ${pickupDate}!`; + setSubmitSuccess(msg); + setTimeout(() => { + onBack(); + }, 1500); + } catch (e: any) { + setSubmitError(e.message || 'Failed to schedule pickup with courier.'); + } finally { + setIsSubmitting(false); + } + }; + return (
@@ -61,13 +127,31 @@ export const ReschedulePickupView: React.FC = ({ onBa
-

Reschedule Courier Pickup

-

Choose a new pickup date and time that fits your workshop schedule.

+
+

Schedule Courier Pickup

+ {/* Carrier Badge */} + + {carrierDisplayName} + +
+

+ {isDelhivery && 'Delhivery supports custom pickup date and hour slots. Choose your preferred arrival window.'} + {isEkart && 'Ekart Logistics allows choosing a preferred dispatch date. Sweeps occur during standard daily runs.'} + {isShadowfax && 'Shadowfax operates automated warehouse sweeps based on registered dispatch cutoff times.'} +

- Batch of {readyOrders.length} Order{readyOrders.length === 1 ? '' : 's'} ready + {targetOrder ? ( + <>Order {targetOrder.orderNumber} ({targetOrder.awbNumber || 'Ready'}) + ) : ( + <>Batch of {readyOrders.length} Order{readyOrders.length === 1 ? '' : 's'} + )}
@@ -83,7 +167,7 @@ export const ReschedulePickupView: React.FC = ({ onBa Handover + +
+ + {isShadowfax && ( +

+ Shadowfax sweep schedules run on standard morning cut-off windows for origin pincode. +

+ )} + + + {/* 2B: Time Slot Selector */} +
+
+ + {!isDelhivery && ( + + Managed by carrier logistics + + )} +
+ + {isDelhivery ? ( + /* Delhivery: Fully Interactive Slot Options */ +
+ {delhiverySlots.map((s) => { + const isSelected = slot === s.id; + return ( +
+
setSlot(s.id)} + > +
+
+ + {s.tag} + + {isSelected ? : } +
+

{s.label}

+

{s.time}

+

{s.desc}

+
+
+
+ ); + })} +
+ ) : isEkart ? ( + /* Ekart: Date Enabled, Fixed Daily Sweeps */ +
+
+ +
+

+ Ekart Standard Hub Sweep Routine +

+

+ Ekart picks up packages during regular daily runs (Morning: 10:00 AM – 1:00 PM and Evening: 4:00 PM – 7:00 PM) for the selected date {pickupDate}. +

+
+
+
+ ) : ( + /* Shadowfax: Automated Cutoff */ +
+
+ +
+

+ Shadowfax Automated Pickup Cycle +

+

+ Shadowfax allocates field executives dynamically per order SLA. The dispatch window is automatically locked and confirmed with carrier dispatch HQ. +

+
+
+
+ )} +
+ + + {/* Step 3: Instructions for Driver */} +
+
+ Step 3 +

3. Instructions for Driver (Optional)

setDriverNotes(e.target.value)} style={{ background: 'transparent', border: 'none', outline: 'none', width: '100%', color: '#1c1b1b', fontSize: '13px' }} />
@@ -174,52 +434,85 @@ export const ReschedulePickupView: React.FC = ({ onBa
+ {/* Right Column: Summary Card */}
- Reschedule Summary + Pickup Summary
- Consignment + Assigned Courier - {order ? '1 Package' : `${readyOrders.length} Package${readyOrders.length === 1 ? '' : 's'}`} + {carrierDisplayName}
+
+ Consignment + + {targetOrder ? `Order #${targetOrder.orderNumber}` : `${readyOrders.length} Ready Packages`} + +
+ {targetOrder?.awbNumber && targetOrder.awbNumber !== 'Pending' && ( +
+ AWB Tracking + + {targetOrder.awbNumber} + +
+ )}
Pickup Location {locationName}
- Selected New Slot + Scheduled Date - {dateType === 'tomorrow' ? 'Tomorrow' : 'Custom'},
{slot === 'morning' ? '10:00 AM – 1:00 PM' : slot === 'afternoon' ? '2:00 PM – 5:00 PM' : '5:00 PM – 7:00 PM'} + {pickupDate} +
+
+
+ Arrival Window + + {isDelhivery + ? (slot === 'morning' ? '10:00 AM – 1:00 PM' : slot === 'evening' ? '5:00 PM – 7:00 PM' : '2:00 PM – 5:00 PM') + : (isEkart ? 'Standard Daily Hub Sweep' : 'Automated Cutoff Sweep')}
- +
- Tradhox Artisan Promise -

100% protection on courier adjustments. No penalties for handmade delays.

+ Tradhox Seller Protection +

Carrier sweeps are audited live in the shipping microservice. Dispatch SLAs are protected.

- -

- Buyer notifications will be automatically updated with the revised dispatch schedule. + Carrier dispatch and tracking manifests will automatically update with this arrival schedule.

diff --git a/src/context/SellerContext.tsx b/src/context/SellerContext.tsx index 1a3a2bb..75538bf 100644 --- a/src/context/SellerContext.tsx +++ b/src/context/SellerContext.tsx @@ -35,7 +35,7 @@ interface SellerContextType { trackOrder: (orderId: string, awb?: string) => Promise; cancelOrderPickup: (orderId: string, reason?: string) => Promise; getOrderLabel: (orderId: string) => Promise; - reschedulePickup: (orderId: string, slot: string, reason: string) => void; + reschedulePickup: (orderId: string, payload: any) => Promise; // Returns & Reverse Shipping with QC returnsList: any[]; @@ -580,10 +580,21 @@ export const SellerProvider: React.FC<{ children: React.ReactNode }> = ({ childr } }; - const reschedulePickup = (orderId: string, slot: string, _reason: string) => { - setOrders(prev => - prev.map(ord => (ord.id === orderId ? { ...ord, pickupSlot: slot } : ord)) - ); + const reschedulePickup = async (orderId: string, payload: any, legacyReason?: string) => { + let reqData: any; + if (typeof payload === 'string') { + const tomorrowStr = new Date(Date.now() + 86400000).toISOString().split('T')[0]; + reqData = { + pickup_date: tomorrowStr, + pickup_time: payload, + notes: legacyReason || '' + }; + } else { + reqData = payload; + } + const res = await api.scheduleOrderPickup(orderId, reqData); + await fetchData(); + return res; }; const actionReturn = async (returnId: string, action: 'Approved' | 'Rejected') => { diff --git a/src/pages/dashboard/OrdersPage.tsx b/src/pages/dashboard/OrdersPage.tsx index e99d8ab..a2a2bff 100644 --- a/src/pages/dashboard/OrdersPage.tsx +++ b/src/pages/dashboard/OrdersPage.tsx @@ -29,6 +29,7 @@ export const OrdersPage: React.FC = () => { const [showManifest, setShowManifest] = useState(false); const [showReschedule, setShowReschedule] = useState(false); + const [selectedOrderForReschedule, setSelectedOrderForReschedule] = useState(null); const [showReportDamage, setShowReportDamage] = useState(false); // Modals state @@ -257,19 +258,27 @@ export const OrdersPage: React.FC = () => { if (showReschedule) { return ( setShowReschedule(false)} + order={selectedOrderForReschedule || orders.find(o => o.status === 'ready_to_ship')} + onBack={() => { + setShowReschedule(false); + setSelectedOrderForReschedule(null); + }} onTabChange={(tab) => { if (tab === 'overall') { setShowReschedule(false); + setSelectedOrderForReschedule(null); setActiveTab('all'); } else if (tab === 'ready_for_pickup') { setShowReschedule(false); + setSelectedOrderForReschedule(null); setActiveTab('ready_to_ship'); } else if (tab === 'handover') { setShowReschedule(false); + setSelectedOrderForReschedule(null); setShowManifest(true); } else if (tab === 'report_damage') { setShowReschedule(false); + setSelectedOrderForReschedule(null); setShowReportDamage(true); } }} @@ -308,6 +317,7 @@ export const OrdersPage: React.FC = () => { onBack={() => setActiveOrder(null)} onPrintLabel={() => handleFetchPrintLabel(activeOrder)} onReschedule={() => { + setSelectedOrderForReschedule(activeOrder); setActiveOrder(null); setShowReschedule(true); }} @@ -622,6 +632,17 @@ export const OrdersPage: React.FC = () => { ) : ord.status === 'ready_to_ship' ? ( <> +