diff --git a/backend/src/routes/net-sales.js b/backend/src/routes/net-sales.js index e28569c..1fb7d74 100644 --- a/backend/src/routes/net-sales.js +++ b/backend/src/routes/net-sales.js @@ -40,13 +40,14 @@ export async function netSalesRoutes(fastify) { const startStr = batchStart.toISOString().slice(0, 10) const data = await fcFetch(`/forecast/revenue?start_date=${startStr}&days=${batchDays}&type=all&dow_align=true`) for (const d of (data?.data ?? [])) { + // forecast = otb + expected pickup for future dates; equals otb for past dates allDays.push({ date: d.date, - net_sales: parseFloat(d.total?.otb ?? 0), - py_sales: parseFloat(d.total?.prior_final ?? 0), - accom: parseFloat(d.accom?.otb ?? 0), - dry: parseFloat(d.dry?.otb ?? 0), - wet: parseFloat(d.wet?.otb ?? 0), + net_sales: parseFloat(d.total?.forecast ?? d.total?.otb ?? 0), + py_sales: parseFloat(d.total?.prior_final ?? 0), + accom: parseFloat(d.accom?.forecast ?? d.accom?.otb ?? 0), + dry: parseFloat(d.dry?.forecast ?? d.dry?.otb ?? 0), + wet: parseFloat(d.wet?.forecast ?? d.wet?.otb ?? 0), is_past: d.is_past ?? true, }) } diff --git a/frontend/src/pages/Monthly.tsx b/frontend/src/pages/Monthly.tsx index 37c6cd0..6afe5fb 100644 --- a/frontend/src/pages/Monthly.tsx +++ b/frontend/src/pages/Monthly.tsx @@ -303,14 +303,14 @@ export default function Monthly() { )}