feat(sales): EOI queue route + invoice→deposit auto-advance + won/lost outcomes
Three independent strengthenings of the sales spine that the prior coherence
sweep made it possible to do cleanly.
1. EOI queue page
- Sidebar entry under Documents → "EOI queue".
- Route /[port]/documents/eoi renders DocumentsHub with the existing
eoi_queue tab pre-selected (filters in-flight EOIs only).
- .gitignore: tightened root-only `eoi/` ignore so the documents/eoi
route is no longer silently excluded.
2. Invoice ↔ deposit link
- invoices.interestId (FK, ON DELETE SET NULL) + invoices.kind
('general' | 'deposit'). Indexed on (port_id, interest_id).
- createInvoiceSchema requires interestId when kind === 'deposit';
the service validates the linked interest belongs to the same port
before insert.
- recordPayment auto-advances pipelineStage to deposit_10pct (via
advanceStageIfBehind) when a paid invoice is kind=deposit and has
an interestId. No-op if the interest is already further along.
- "Create deposit invoice" link added to the Deposit milestone on the
interest detail. Links to /invoices/new?interestId=…&kind=deposit;
the form prefills the billing entity from the linked interest's
client and shows a context banner.
3. Won / lost terminal outcomes
- interests.outcome ('won' | 'lost_other_marina' | 'lost_unqualified'
| 'lost_no_response' | 'cancelled') + outcomeReason text +
outcomeAt timestamp. Indexed on (port_id, outcome).
- setInterestOutcome / clearInterestOutcome services + POST/DELETE
/api/v1/interests/:id/outcome endpoints (gated by change_stage
permission). Setting an outcome moves the interest to `completed`
in the same write; clearing reopens to `in_communication` (or a
caller-specified stage).
- Mark Won / Mark Lost icon buttons on the interest detail header,
plus an outcome badge that replaces the stage pill once a terminal
outcome is set, plus a Reopen button.
- Funnel + dashboard math updated to exclude lost/cancelled outcomes
from active calculations (KPIs.activeInterests, pipelineValueUsd,
getPipelineCounts, computePipelineFunnel, getRevenueForecast).
The funnel now also returns a `lost` summary so callers can
surface leakage without polluting conversion percentages.
Schema changes shipped via 0019_lazy_vampiro.sql; applied to dev DB
manually via psql because drizzle-kit push hits a pre-existing zod
parsing issue on the companies index. Dev server may need a restart
to flush prepared-statement caches.
tsc clean. vitest 832/832 pass. ESLint clean on every file touched.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -249,7 +249,7 @@ export async function createInvoice(portId: string, data: CreateInvoiceInput, me
|
||||
|
||||
// Calculate subtotal from line items
|
||||
const lineItemsData = data.lineItems ?? [];
|
||||
const subtotal = lineItemsData.reduce((sum, li) => sum + li.quantity * li.unitPrice, 0);
|
||||
const subtotal = lineItemsData.reduce((sum, li) => sum + (li.quantity ?? 1) * li.unitPrice, 0);
|
||||
|
||||
// BR-042: net10 discount — read from systemSettings
|
||||
let discountPct = 0;
|
||||
@@ -294,6 +294,20 @@ export async function createInvoice(portId: string, data: CreateInvoiceInput, me
|
||||
}
|
||||
}
|
||||
|
||||
// Sanity-check the optional interest link: must belong to the same port.
|
||||
// Foreign-port ids fail with ValidationError before the insert.
|
||||
if (data.interestId) {
|
||||
const { interests } = await import('@/lib/db/schema/interests');
|
||||
const [interestRow] = await tx
|
||||
.select({ portId: interests.portId })
|
||||
.from(interests)
|
||||
.where(eq(interests.id, data.interestId))
|
||||
.limit(1);
|
||||
if (!interestRow || interestRow.portId !== portId) {
|
||||
throw new ValidationError('interestId not found in this port');
|
||||
}
|
||||
}
|
||||
|
||||
const [newInvoice] = await tx
|
||||
.insert(invoices)
|
||||
.values({
|
||||
@@ -315,6 +329,8 @@ export async function createInvoice(portId: string, data: CreateInvoiceInput, me
|
||||
total: String(total),
|
||||
status: 'draft',
|
||||
paymentStatus: 'unpaid',
|
||||
interestId: data.interestId ?? null,
|
||||
kind: data.kind ?? 'general',
|
||||
notes: data.notes ?? null,
|
||||
createdBy: meta.userId,
|
||||
})
|
||||
@@ -328,9 +344,9 @@ export async function createInvoice(portId: string, data: CreateInvoiceInput, me
|
||||
lineItemsData.map((li, idx) => ({
|
||||
invoiceId: newInvoice.id,
|
||||
description: li.description,
|
||||
quantity: String(li.quantity),
|
||||
quantity: String(li.quantity ?? 1),
|
||||
unitPrice: String(li.unitPrice),
|
||||
total: String(li.quantity * li.unitPrice),
|
||||
total: String((li.quantity ?? 1) * li.unitPrice),
|
||||
sortOrder: idx,
|
||||
})),
|
||||
);
|
||||
@@ -393,11 +409,29 @@ export async function updateInvoice(
|
||||
if (data.paymentTerms !== undefined) updateData.paymentTerms = data.paymentTerms;
|
||||
if (data.currency !== undefined) updateData.currency = data.currency;
|
||||
if (data.notes !== undefined) updateData.notes = data.notes;
|
||||
if (data.interestId !== undefined) {
|
||||
if (data.interestId !== null) {
|
||||
const { interests } = await import('@/lib/db/schema/interests');
|
||||
const [interestRow] = await tx
|
||||
.select({ portId: interests.portId })
|
||||
.from(interests)
|
||||
.where(eq(interests.id, data.interestId))
|
||||
.limit(1);
|
||||
if (!interestRow || interestRow.portId !== portId) {
|
||||
throw new ValidationError('interestId not found in this port');
|
||||
}
|
||||
}
|
||||
updateData.interestId = data.interestId;
|
||||
}
|
||||
if (data.kind !== undefined) updateData.kind = data.kind;
|
||||
|
||||
// Recalculate totals if line items changed
|
||||
if (data.lineItems !== undefined) {
|
||||
const lineItemsData = data.lineItems;
|
||||
const subtotal = lineItemsData.reduce((sum, li) => sum + li.quantity * li.unitPrice, 0);
|
||||
const subtotal = lineItemsData.reduce(
|
||||
(sum, li) => sum + (li.quantity ?? 1) * li.unitPrice,
|
||||
0,
|
||||
);
|
||||
|
||||
const paymentTerms = data.paymentTerms ?? existing.paymentTerms;
|
||||
let discountPct = 0;
|
||||
@@ -434,9 +468,9 @@ export async function updateInvoice(
|
||||
lineItemsData.map((li, idx) => ({
|
||||
invoiceId: id,
|
||||
description: li.description,
|
||||
quantity: String(li.quantity),
|
||||
quantity: String(li.quantity ?? 1),
|
||||
unitPrice: String(li.unitPrice),
|
||||
total: String(li.quantity * li.unitPrice),
|
||||
total: String((li.quantity ?? 1) * li.unitPrice),
|
||||
sortOrder: idx,
|
||||
})),
|
||||
);
|
||||
@@ -693,6 +727,20 @@ export async function recordPayment(
|
||||
amount: Number(existing.total),
|
||||
});
|
||||
|
||||
// Deposit invoices linked to a sales interest auto-advance the pipeline.
|
||||
// Only advances forward — no-op if the interest has already moved past
|
||||
// deposit_10pct (e.g. straight-to-contract flows).
|
||||
if (updated.kind === 'deposit' && updated.interestId) {
|
||||
const { advanceStageIfBehind } = await import('@/lib/services/interests.service');
|
||||
void advanceStageIfBehind(
|
||||
updated.interestId,
|
||||
portId,
|
||||
'deposit_10pct',
|
||||
meta,
|
||||
`Deposit invoice ${existing.invoiceNumber} paid`,
|
||||
);
|
||||
}
|
||||
|
||||
return updated;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user