feat(reporting): money-math sweep — Step 1 PRE-DEPLOY-PLAN
Single coherent commit completing § 1.1 (hot-path correctness) plus
§ 1.1.4.5 (multi-berth EOI mooring fix). Numbers users see are now
self-consistent across dashboard / kanban / hot deals / PDF reports.
## Active-interest sweep (canonical predicate everywhere)
Routed every "active interest" filter through `activeInterestsWhere`
(commit b966d81 helper). The helper enforces port-scoping + archivedAt
IS NULL + outcome IS NULL — strict definition, won is closed.
Touched sites:
- src/lib/services/reminders.service.ts:digestPort — no longer fires
reminders for won/lost/cancelled deals
- src/lib/services/berths.service.ts:getLatestInterestStageByBerth
- src/lib/services/client-archive-dossier.service.ts (next-in-line
others lookup)
- src/lib/services/client-archive.service.ts (remaining-under-offer
recount before flipping berth back to available)
- src/lib/services/client-restore.service.ts (yacht-usage check)
- src/lib/services/interests.service.ts:listInterestsForBoard +
getInterestStageCounts + the "others on same berth" lookup —
kanban / board now exclude terminal deals
- src/lib/services/report-generators.ts: fetchPipelineData,
fetchRevenueData stage breakdowns, top-N interests
## Pipeline-value currency conversion
`getKpis()` now fetches the port's defaultCurrency from `ports` and
converts each berth's `priceCurrency`→port-default via
`currency.service`. Returns `pipelineValue` + `pipelineValueCurrency`
instead of the lying `pipelineValueUsd`. Missing rates fall through to
raw amount summing (so the tile still shows an approximate number) —
behind a follow-up to surface a "rates incomplete" indicator.
3 consumers updated: KpiCards, PipelineValueTile, ActiveDealsTile.
## Occupancy = sold only
Both the dashboard KPI tile and the revenue-report PDF occupancy data
now count only `berth.status='sold'`. `under_offer` is a hold, not
occupation. The analytics timeline switches from
`berth_reservations`-derived to a cumulative-won-deals derivation via
`interests.outcome='won' AND outcome_at::date <= day` — same source of
truth, historical shape preserved.
## Revenue PDF two-card layout
Added `totalForecast` + `pipelineWeights` to `RevenueData`. Summary
section now renders both:
- "Completed revenue (won)" — money in the bank
- "Forecast revenue (pipeline-weighted)" — expected pipeline value
Pipeline weights resolve from `system_settings.pipeline_weights`
(per-port admin override) and fall back to STAGE_WEIGHTS defaults. PDF
and dashboard forecast tiles reconcile.
## Multi-berth EOI mooring (4.5)
Documenso `Berth Number` form field now carries the formatBerthRange
output for BOTH single- and multi-berth EOIs. Single-berth output is
byte-identical to the legacy primary-only path
(`formatBerthRange(['A1']) === 'A1'`). Multi-berth EOIs now render
the full range ("A1-A3, B5") in the existing field instead of being
silently dropped against a nonexistent `Berth Range` field.
Dropped:
- `'Berth Range'` from the Documenso formValues payload + TS type
- `setBerthRange()` helper from fill-eoi-form.ts (now redundant)
- The "missing Berth Range AcroForm field" warning log
Updated CLAUDE.md to reflect — no Documenso admin template change
needed.
## Tests
- Updated `documenso-payload.test.ts` — new fixture asserts
formatBerthRange output flows into Berth Number; multi-berth case
added.
- Updated `analytics-service.test.ts:computeOccupancyTimeline` —
fixture creates a won interest instead of a reservation.
- Updated `alerts-engine.test.ts:interest.stale` — fixture stage
switched from dead `'in_communication'` to canonical `'qualified'`.
- Updated `report-templates.test.tsx:revenue` — fixture carries
`totalForecast` + `pipelineWeights` to match new RevenueData.
1373/1373 vitest pass. tsc + eslint clean.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -89,28 +89,6 @@ function setText(form: ReturnType<PDFDocument['getForm']>, name: string, value:
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Special-cased setter for the multi-berth `Berth Range` field. When the
|
||||
* caller has a non-empty range and the AcroForm field is missing, we log
|
||||
* a warning so the deployment gap is observable (the in-app pathway is
|
||||
* intentionally tolerant of older PDF templates, but ops needs to know
|
||||
* when ranges are silently dropped — otherwise a customer's multi-berth
|
||||
* EOI ships with only the primary mooring visible).
|
||||
*/
|
||||
function setBerthRange(form: ReturnType<PDFDocument['getForm']>, value: string): void {
|
||||
try {
|
||||
form.getTextField('Berth Range').setText(value);
|
||||
} catch {
|
||||
if (value && value.trim().length > 0) {
|
||||
logger.warn(
|
||||
{ berthRange: value },
|
||||
'EOI in-app PDF template is missing the "Berth Range" AcroForm field — ' +
|
||||
'multi-berth bundle range string was dropped. Update the source template.',
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function setCheckbox(
|
||||
form: ReturnType<PDFDocument['getForm']>,
|
||||
name: string,
|
||||
@@ -155,14 +133,12 @@ export async function fillEoiFormFields(
|
||||
setText(form, 'Length', context.yacht?.lengthFt ?? '');
|
||||
setText(form, 'Width', context.yacht?.widthFt ?? '');
|
||||
setText(form, 'Draft', context.yacht?.draftFt ?? '');
|
||||
setText(form, 'Berth Number', context.berth?.mooringNumber ?? '');
|
||||
// Multi-berth EOI: compact range string from the interest's EOI bundle.
|
||||
// The AcroForm field may be absent on an older template revision —
|
||||
// when the context HAS a non-empty range string but the field is
|
||||
// missing we surface a structured warning so the deployment gap is
|
||||
// observable (the CRM dataset has multi-berth bundles but the live
|
||||
// PDF template needs the field added before they render correctly).
|
||||
setBerthRange(form, context.eoiBerthRange);
|
||||
// Berth Number = compact range for multi-berth, primary mooring for
|
||||
// single-berth (formatBerthRange(['A1']) === 'A1' so single-berth is
|
||||
// byte-identical to the legacy primary-only path). The dedicated
|
||||
// `Berth Range` AcroForm field was retired 2026-05-14 — the source
|
||||
// PDF only carries `Berth Number`.
|
||||
setText(form, 'Berth Number', context.eoiBerthRange || (context.berth?.mooringNumber ?? ''));
|
||||
|
||||
setCheckbox(form, 'Purchase', true);
|
||||
setCheckbox(form, 'Lease_10', false);
|
||||
|
||||
@@ -49,7 +49,8 @@ export function RevenueReportPdf({
|
||||
amount: Number(data.stageRevenue[stage] ?? 0),
|
||||
}));
|
||||
const chartData: BarDatum[] = rows.map((r) => ({ label: stageLabel(r.stage), value: r.amount }));
|
||||
const total = Number(data.totalCompleted);
|
||||
const totalCompleted = Number(data.totalCompleted);
|
||||
const totalForecast = Number(data.totalForecast);
|
||||
const subtotal = rows.reduce((s, r) => s + r.amount, 0);
|
||||
const meta = dateFrom || dateTo ? `Range: ${dateFrom ?? '—'} → ${dateTo ?? 'today'}` : 'All time';
|
||||
|
||||
@@ -60,12 +61,18 @@ export function RevenueReportPdf({
|
||||
docMeta={meta}
|
||||
logoBuffer={logoBuffer}
|
||||
>
|
||||
<Section title="Summary">
|
||||
<Section
|
||||
title="Revenue summary"
|
||||
subtitle="Completed = money changed hands. Forecast = active pipeline weighted by stage probability."
|
||||
>
|
||||
<KeyValueGrid
|
||||
rows={[
|
||||
{ label: 'Total completed', value: fmtAmount(total, currency) },
|
||||
{ label: 'Pipeline value (open)', value: fmtAmount(subtotal - total, currency) },
|
||||
{ label: 'Total stages', value: rows.length },
|
||||
{ label: 'Completed revenue (won)', value: fmtAmount(totalCompleted, currency) },
|
||||
{
|
||||
label: 'Forecast revenue (pipeline-weighted)',
|
||||
value: fmtAmount(totalForecast, currency),
|
||||
},
|
||||
{ label: 'Pipeline value (open, gross)', value: fmtAmount(subtotal, currency) },
|
||||
{ label: 'Currency', value: currency },
|
||||
]}
|
||||
/>
|
||||
|
||||
Reference in New Issue
Block a user