update

frontend/src/lib/wonBillingEmailFormat.js

@@ -0,0 +1,61 @@
+/**
+ * Matches backend/app/main.py helpers used in _notify_tenant_admins_deal_won (won-deal email body).
+ */
+
+export function wonCurrencyLabel(raw) {
+    const c = String(raw || 'USD').trim().toUpperCase();
+    return c === 'CAD' ? 'CAD' : 'USD';
+}
+
+export function fmtWonMoney(amount, currencyRaw) {
+    const lab = wonCurrencyLabel(currencyRaw);
+    const sym = lab === 'CAD' ? 'CA$' : '$';
+    let n = Number(amount);
+    if (!Number.isFinite(n)) n = 0;
+    const s = n.toLocaleString('en-US', { minimumFractionDigits: 2, maximumFractionDigits: 2 });
+    return `${sym}${s} ${lab}`;
+}
+
+export function wonBillingIntervalLabel(raw) {
+    const s = String(raw || 'monthly').trim().toLowerCase();
+    if (['one_time', 'onetime', 'one-time', 'non-recurring'].includes(s)) return 'One-time';
+    if (['quarterly', 'quarter', 'every 3 months'].includes(s)) return 'Every 3 months';
+    if (['annual', 'year', 'yearly', 'every year'].includes(s)) return 'Every year';
+    return 'Every month';
+}
+
+/** Python {:g}-style qty for line display */
+export function fmtQtyG(qf) {
+    if (!Number.isFinite(qf)) return '0';
+    return Number.isInteger(qf) ? String(qf) : String(qf);
+}
+
+/**
+ * One numbered line item line, same text as the admin email (excluding leading newline).
+ */
+export function wonEmailLineItemBodyLine(index1, li) {
+    const ps = String(li.product_service || '').trim();
+    const cur = wonCurrencyLabel(li.currency);
+    let qf = Number(li.qty);
+    let rf = Number(li.rate);
+    let af = Number(li.amount);
+    if (!Number.isFinite(qf)) qf = 0;
+    if (!Number.isFinite(rf)) rf = 0;
+    if (!Number.isFinite(af)) af = 0;
+    const cadence = wonBillingIntervalLabel(li.billing_interval);
+    return `  ${index1}. ${ps}  |  ${cadence}  |  Qty ${fmtQtyG(qf)} × ${fmtWonMoney(rf, cur)} = ${fmtWonMoney(af, cur)}`;
+}
+
+export function wonEmailSubtotalLine(lines, subtotal) {
+    const st = Number(subtotal);
+    const sum = Number.isFinite(st) ? st : 0;
+    if (!lines?.length) {
+        return `Subtotal: ${sum.toLocaleString('en-US', { minimumFractionDigits: 2, maximumFractionDigits: 2 })}`;
+    }
+    const distinct = new Set(lines.map((li) => wonCurrencyLabel(li.currency)));
+    if (distinct.size === 1) {
+        const only = distinct.values().next().value;
+        return `Subtotal: ${fmtWonMoney(sum, only)}`;
+    }
+    return `Subtotal (numeric sum of line amounts; USD and CAD lines are not converted between currencies): ${sum.toLocaleString('en-US', { minimumFractionDigits: 2, maximumFractionDigits: 2 })}`;
+}

frontend/src/pages/Deals.jsx

@@ -17,6 +17,7 @@ import { SearchableCountryPicker } from '@/components/workspace/SearchableCountr
 import { cn } from '@/lib/utils';
 import { OwnerAvatarCircle, ownerDisplayLabel } from '@/lib/ownerAvatar';
 import { flagEmojiFromCode, getAllCountries, matchCountry } from '@/lib/countries';
+import { wonEmailLineItemBodyLine, wonEmailSubtotalLine } from '@/lib/wonBillingEmailFormat';
 
 const STAGES = [
     { value: 'new', label: 'New', className: 'bg-slate-800 text-white' },
@@ -121,6 +122,48 @@ function revenueTypeSelectValue(deal) {
     return REVENUE_TYPES.some((t) => t.value === v) ? v : 'arr';
 }
 
+/** Same structure and copy as the won-deal admin email (main.py _notify_tenant_admins_deal_won). */
+function WonBillingEmailSnapshot({ deal, workspaceName }) {
+    const lines = deal.won_line_items || [];
+    const subtotal = lines.reduce((a, li) => a + (Number(li.amount) || 0), 0);
+    const s = (v) => String(v ?? '').trim();
+    const ws = (workspaceName || '').trim() || 'Workspace';
+    return (
+        <div className="mt-3 space-y-1.5 rounded-md border border-emerald-100 bg-emerald-50/60 p-3 text-xs text-slate-700">
+            <p className="font-semibold text-emerald-900">Won — billing snapshot</p>
+            <p>A deal was marked Won in workspace &quot;{ws}&quot;.</p>
+            <p className="pt-1">Deal ID: {deal.id}</p>
+            <p>Deal name: {s(deal.name) || 'Deal'}</p>
+            <p>PO number: {s(deal.won_po_number)}</p>
+            <p>Customer legal name: {s(deal.won_customer_legal_name)}</p>
+            <p>Customer address:</p>
+            <p className="whitespace-pre-wrap text-slate-700">{s(deal.won_customer_address)}</p>
+            <p>Contact person: {s(deal.won_contact_person_name)}</p>
+            {s(deal.won_channel_partner_name) ? (
+                <p>Channel partner: {s(deal.won_channel_partner_name)}</p>
+            ) : null}
+            <p className="pt-1">Note to customer:</p>
+            <p className="whitespace-pre-wrap text-slate-700">{s(deal.won_note_to_customer)}</p>
+            <p className="pt-1">Note to our accounts:</p>
+            <p className="whitespace-pre-wrap text-slate-700">{s(deal.won_note_to_accounts)}</p>
+            <p className="pt-1">Products / services (line items):</p>
+            <ul className="list-none space-y-0.5 pl-0 text-slate-700">
+                {lines.map((li, i) => (
+                    <li key={i}>
+                        <p className="whitespace-pre-wrap leading-relaxed text-slate-800">
+                            {wonEmailLineItemBodyLine(i + 1, li)}
+                        </p>
+                        {s(li.description) ? (
+                            <p className="whitespace-pre-wrap text-slate-600">{`      Description: ${s(li.description)}`}</p>
+                        ) : null}
+                    </li>
+                ))}
+            </ul>
+            <p className="pt-1 font-semibold tabular-nums text-slate-900">{wonEmailSubtotalLine(lines, subtotal)}</p>
+        </div>
+    );
+}
+
 function focusFirstEditableInRow(tr) {
     if (!tr) return;
     const el = tr.querySelector('input:not([type="checkbox"]):not([type="hidden"]), textarea');
@@ -904,6 +947,14 @@ export default function Deals() {
     const isAdmin = me?.current_role === 'admin';
     const currentUserId = me?.user_id ?? null;
 
+    const workspaceLabel = useMemo(() => {
+        const tid = me?.current_tenant_id;
+        const list = me?.tenants;
+        if (tid == null || !Array.isArray(list)) return 'Workspace';
+        const t = list.find((x) => x.id === tid);
+        return (t?.name || '').trim() || 'Workspace';
+    }, [me]);
+
     const refreshMe = useCallback(() => {
         apiFetch('/api/auth/me')
             .then((r) => (r.ok ? r.json() : null))
@@ -1894,59 +1945,10 @@ export default function Deals() {
                                         </p>
                                     ) : null}
                                     {dealDetail.stage === 'won' && dealDetail.won_po_number ? (
-                                        <div className="mt-3 space-y-1.5 rounded-md border border-emerald-100 bg-emerald-50/60 p-3 text-xs text-slate-700">
-                                            <p className="font-semibold text-emerald-900">Won — billing snapshot</p>
-                                            <p>
-                                                <span className="font-medium text-slate-800">PO:</span>{' '}
-                                                {dealDetail.won_po_number}
-                                            </p>
-                                            <p>
-                                                <span className="font-medium text-slate-800">Legal name:</span>{' '}
-                                                {dealDetail.won_customer_legal_name}
-                                            </p>
-                                            <p>
-                                                <span className="font-medium text-slate-800">Address:</span>{' '}
-                                                <span className="whitespace-pre-wrap">{dealDetail.won_customer_address}</span>
-                                            </p>
-                                            <p>
-                                                <span className="font-medium text-slate-800">Contact:</span>{' '}
-                                                {dealDetail.won_contact_person_name}
-                                            </p>
-                                            {dealDetail.won_channel_partner_name ? (
-                                                <p>
-                                                    <span className="font-medium text-slate-800">Channel partner:</span>{' '}
-                                                    {dealDetail.won_channel_partner_name}
-                                                </p>
-                                            ) : null}
-                                            <p className="pt-1 text-slate-600">
-                                                <span className="font-medium text-slate-800">Note (customer):</span>{' '}
-                                                {dealDetail.won_note_to_customer}
-                                            </p>
-                                            <p className="text-slate-600">
-                                                <span className="font-medium text-slate-800">Note (accounts):</span>{' '}
-                                                {dealDetail.won_note_to_accounts}
-                                            </p>
-                                            <ul className="list-inside list-disc pt-1 text-slate-600">
-                                                {(dealDetail.won_line_items || []).map((li, i) => (
-                                                    <li key={i}>
-                                                        {li.product_service}{' '}
-                                                        <span className="tabular-nums">
-                                                            (×{li.qty} @ {li.rate} = {li.amount})
-                                                        </span>
-                                                    </li>
-                                                ))}
-                                            </ul>
-                                            <p className="pt-1 font-semibold text-slate-900 tabular-nums">
-                                                Subtotal:{' '}
-                                                {(dealDetail.won_line_items || []).reduce(
-                                                    (a, li) => a + (Number(li.amount) || 0),
-                                                    0
-                                                ).toLocaleString('en-US', {
-                                                    style: 'currency',
-                                                    currency: 'USD',
-                                                })}
-                                            </p>
-                                        </div>
+                                        <WonBillingEmailSnapshot
+                                            deal={dealDetail}
+                                            workspaceName={workspaceLabel}
+                                        />
                                     ) : null}
                                 </div>
                                 <div onClick={(e) => e.stopPropagation()}>

frontend/src/pages/SalesDashboard.jsx

@@ -49,25 +49,16 @@ function startOfQuarter(d) {
 }
 
 /** Dashboard date filter: open pipeline deals by created_at; Won deals by won_at when present. */
-/** Latest roll-forward row + merged one-time from quarterly API payload. */
+/** Latest roll-forward row + one-time total from quarterly API payload. */
 function revenueSnapshotFromQuarters(quarters) {
     const qs = quarters || [];
     const cols = qs.length <= 6 ? qs : qs.slice(-6);
     const row = cols.length ? cols[cols.length - 1] : null;
     let oneTimeSum = 0;
-    const mergedDeals = [];
-    const seen = new Set();
     for (const q of cols) {
         oneTimeSum += Number(q.one_time_usd_quarter) || 0;
-        for (const d of q.one_time_deals || []) {
-            const id = d.deal_id;
-            if (id != null && !seen.has(id)) {
-                seen.add(id);
-                mergedDeals.push(d);
-            }
-        }
     }
-    return { row, oneTimeSum, mergedDeals, hasData: Boolean(row) };
+    return { row, oneTimeSum, hasData: Boolean(row) };
 }
 
 function dealInDashboardPeriod(deal, period) {
@@ -932,30 +923,11 @@ export default function SalesDashboard() {
                                             </tbody>
                                         </table>
                                     </div>
-                                    {revenueBoardSnapshot.mergedDeals.length === 0 ? (
+                                    {revenueBoardSnapshot.oneTimeSum === 0 ? (
                                         <p className="mt-3 text-xs text-slate-500">
                                             No one-time revenue in this scope.
                                         </p>
-                                    ) : (
-                                        <div className="mt-4 rounded-lg border border-slate-100 bg-slate-50/80 px-3 py-2 text-xs text-slate-700">
-                                            <p className="font-semibold text-slate-800">
-                                                Detail ({dashboardPeriodLabel}
-                                                {isAdmin && ownerFilter !== 'all'
-                                                    ? ` · ${ownerFilterLabel}`
-                                                    : ''}
-                                                )
-                                            </p>
-                                            <ul className="mt-2 list-disc space-y-1 pl-5">
-                                                {revenueBoardSnapshot.mergedDeals.map((d) => (
-                                                    <li key={d.deal_id}>
-                                                        <span className="font-medium">{d.name || 'Deal'}</span>
-                                                        {' · '}
-                                                        {fmtMoney(d.amount_usd)}
-                                                    </li>
-                                                ))}
-                                            </ul>
-                                        </div>
-                                    )}
+                                    ) : null}
                                 </CardShell>
                             </div>
                         </div>