|
|
@ -64,6 +64,8 @@ function mapBackendOrderToPanel(raw: any): CustomTripOrderItem { |
|
|
const rawServices = Array.isArray(raw.services) ? raw.services : [] |
|
|
const rawServices = Array.isArray(raw.services) ? raw.services : [] |
|
|
const originCity = raw.origin_city || raw.originCity || '' |
|
|
const originCity = raw.origin_city || raw.originCity || '' |
|
|
const destinations: string[] = Array.isArray(raw.destinations) ? raw.destinations : [] |
|
|
const destinations: string[] = Array.isArray(raw.destinations) ? raw.destinations : [] |
|
|
|
|
|
const rawStartDate: string | null = raw.start_date || raw.startDate || null |
|
|
|
|
|
const rawTravelDateText: string = raw.travel_date_text || raw.travelDateText || '' |
|
|
|
|
|
|
|
|
let legs = rawLegs.map((leg: any, idx: number) => { |
|
|
let legs = rawLegs.map((leg: any, idx: number) => { |
|
|
const isReturn = Boolean( |
|
|
const isReturn = Boolean( |
|
|
@ -145,7 +147,7 @@ function mapBackendOrderToPanel(raw: any): CustomTripOrderItem { |
|
|
}) |
|
|
}) |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
let curDate = legs[0].departureDate || getDefaultStartDateIso(raw.created) |
|
|
|
|
|
|
|
|
let curDate = legs[0].departureDate || rawStartDate || getDefaultStartDateIso(raw.created) |
|
|
legs = legs.map((l, idx) => { |
|
|
legs = legs.map((l, idx) => { |
|
|
const fromCity = idx === 0 ? originCity || l.fromCity : legs[idx - 1].toCity || l.fromCity |
|
|
const fromCity = idx === 0 ? originCity || l.fromCity : legs[idx - 1].toCity || l.fromCity |
|
|
if (l.isReturn) { |
|
|
if (l.isReturn) { |
|
|
@ -224,6 +226,8 @@ function mapBackendOrderToPanel(raw: any): CustomTripOrderItem { |
|
|
factorId: raw.factor_id ?? null, |
|
|
factorId: raw.factor_id ?? null, |
|
|
factorNumber: raw.factor_number ?? null, |
|
|
factorNumber: raw.factor_number ?? null, |
|
|
status: (raw.status || 'PENDING') as CustomTripOrderStatus, |
|
|
status: (raw.status || 'PENDING') as CustomTripOrderStatus, |
|
|
|
|
|
startDate: rawStartDate || legs[0]?.departureDate || stays[0]?.check_in || null, |
|
|
|
|
|
travelDateText: rawTravelDateText || '', |
|
|
created: raw.created || new Date().toISOString(), |
|
|
created: raw.created || new Date().toISOString(), |
|
|
detail: cleanLegacyDetail(raw.detail), |
|
|
detail: cleanLegacyDetail(raw.detail), |
|
|
adminNotes: raw.admin_notes || raw.adminNotes || '', |
|
|
adminNotes: raw.admin_notes || raw.adminNotes || '', |
|
|
@ -267,6 +271,8 @@ export async function updateCustomTripOrder( |
|
|
priceEstimate?: number |
|
|
priceEstimate?: number |
|
|
adminNotes?: string |
|
|
adminNotes?: string |
|
|
originCity?: string |
|
|
originCity?: string |
|
|
|
|
|
startDate?: string | null |
|
|
|
|
|
travelDateText?: string |
|
|
legs?: { |
|
|
legs?: { |
|
|
fromCity: string |
|
|
fromCity: string |
|
|
toCity: string |
|
|
toCity: string |
|
|
@ -289,6 +295,13 @@ export async function updateCustomTripOrder( |
|
|
if (data.originCity) { |
|
|
if (data.originCity) { |
|
|
itineraryPayload.origin_city = data.originCity |
|
|
itineraryPayload.origin_city = data.originCity |
|
|
} |
|
|
} |
|
|
|
|
|
const effectiveStartDate = data.startDate || data.legs?.[0]?.departureDate || null |
|
|
|
|
|
if (effectiveStartDate) { |
|
|
|
|
|
itineraryPayload.start_date = String(effectiveStartDate).slice(0, 10) |
|
|
|
|
|
} |
|
|
|
|
|
if (data.travelDateText !== undefined) { |
|
|
|
|
|
itineraryPayload.travel_date_text = data.travelDateText |
|
|
|
|
|
} |
|
|
if (Array.isArray(data.legs) && data.legs.length > 0) { |
|
|
if (Array.isArray(data.legs) && data.legs.length > 0) { |
|
|
itineraryPayload.legs = data.legs.map((leg, idx) => ({ |
|
|
itineraryPayload.legs = data.legs.map((leg, idx) => ({ |
|
|
sequence: idx + 1, |
|
|
sequence: idx + 1, |
|
|
|