update

backend/app/database.py

@@ -190,6 +190,7 @@ class CrmDeal(Base):
     won_note_to_customer = Column(Text, default="")
     won_note_to_accounts = Column(Text, default="")
     won_line_items = Column(JSON, nullable=True)
+    won_at = Column(DateTime, nullable=True)  # first transition to won (for quarterly attribution)
     created_at = Column(DateTime, default=datetime.utcnow)
     updated_at = Column(DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
 
@@ -304,6 +305,13 @@ def run_migrations(connection_engine):
                 conn.execute(text("ALTER TABLE crm_deals ADD COLUMN won_note_to_accounts TEXT DEFAULT ''"))
             if "won_line_items" not in dcols:
                 conn.execute(text("ALTER TABLE crm_deals ADD COLUMN won_line_items TEXT"))
+            if "won_at" not in dcols:
+                conn.execute(text("ALTER TABLE crm_deals ADD COLUMN won_at DATETIME"))
+                conn.execute(
+                    text(
+                        "UPDATE crm_deals SET won_at = updated_at WHERE stage = 'won' AND won_at IS NULL"
+                    )
+                )
 
 
 # Create tables then migrate legacy SQLite schemas

backend/app/deal_revenue.py

@@ -0,0 +1,296 @@
+"""
+ARR/MRR in CAD from won deal line items — same methodology as the manual spreadsheet:
+per-line amount × interval factor (×12 / ×4 / ×1), USD→CAD, sum → ARR; MRR = ARR/12.
+"""
+
+from __future__ import annotations
+
+import os
+from dataclasses import dataclass
+from datetime import datetime, timedelta
+from typing import Any, Optional
+
+INTERVAL_ANNUAL_MULT = {
+    "monthly": 12,
+    "quarterly": 4,
+    "annual": 1,
+}
+
+
+def usd_to_cad_rate() -> float:
+    raw = os.environ.get("USD_TO_CAD_RATE", "1.38").strip()
+    try:
+        x = float(raw)
+        return x if x > 0 else 1.38
+    except (TypeError, ValueError):
+        return 1.38
+
+
+def _norm_interval(raw: Any) -> str:
+    if not raw:
+        return "monthly"
+    s = str(raw).strip().lower()
+    if s in ("quarterly", "quarter", "every 3 months"):
+        return "quarterly"
+    if s in ("annual", "year", "yearly", "every year"):
+        return "annual"
+    return "monthly"
+
+
+def _norm_currency(raw: Any) -> str:
+    if raw and str(raw).strip().upper() == "CAD":
+        return "CAD"
+    return "USD"
+
+
+def line_amount_native(line: dict[str, Any]) -> float:
+    if line.get("amount") is not None:
+        try:
+            return round(float(line["amount"]), 2)
+        except (TypeError, ValueError):
+            pass
+    try:
+        q = float(line.get("qty") or 0)
+        r = float(line.get("rate") or 0)
+        return round(q * r, 2)
+    except (TypeError, ValueError):
+        return 0.0
+
+
+def line_arr_cad(line: dict[str, Any], rate_usd_cad: float) -> float:
+    """Annual recurring revenue in CAD for one line."""
+    amt = line_amount_native(line)
+    interval = _norm_interval(line.get("billing_interval"))
+    mult = INTERVAL_ANNUAL_MULT.get(interval, 12)
+    annual_native = amt * mult
+    cur = _norm_currency(line.get("currency"))
+    if cur == "CAD":
+        return annual_native
+    return annual_native * rate_usd_cad
+
+
+def deal_subtotal_cad_onetime(lines: list[dict[str, Any]], rate_usd_cad: float) -> float:
+    total = 0.0
+    for line in lines:
+        amt = line_amount_native(line)
+        cur = _norm_currency(line.get("currency"))
+        if cur == "CAD":
+            total += amt
+        else:
+            total += amt * rate_usd_cad
+    return round(total, 2)
+
+
+def deal_recurring_arr_cad(revenue_type: str, lines: list[dict[str, Any]], rate_usd_cad: float) -> float:
+    rt = (revenue_type or "arr").strip().lower()
+    if rt == "one_time":
+        return 0.0
+    return round(sum(line_arr_cad(li, rate_usd_cad) for li in lines), 2)
+
+
+def deal_recurring_mrr_cad(revenue_type: str, lines: list[dict[str, Any]], rate_usd_cad: float) -> float:
+    arr = deal_recurring_arr_cad(revenue_type, lines, rate_usd_cad)
+    return round(arr / 12.0, 2)
+
+
+@dataclass(frozen=True)
+class QuarterSpec:
+    year: int
+    quarter: int  # 1–4
+
+    @property
+    def label(self) -> str:
+        return f"Q{self.quarter} {self.year}"
+
+    def start_dt(self) -> datetime:
+        m = (self.quarter - 1) * 3 + 1
+        return datetime(self.year, m, 1)
+
+    def end_dt(self) -> datetime:
+        sm = (self.quarter - 1) * 3 + 1
+        em = sm + 2
+        if em == 12:
+            return datetime(self.year, 12, 31, 23, 59, 59)
+        next_month = datetime(self.year, em + 1, 1)
+        return next_month - timedelta(microseconds=1)
+
+
+def quarter_for_datetime(dt: datetime) -> QuarterSpec:
+    q = (dt.month - 1) // 3 + 1
+    return QuarterSpec(dt.year, q)
+
+
+def iter_quarters(a: QuarterSpec, b: QuarterSpec) -> list[QuarterSpec]:
+    """Inclusive range from a to b (assumes a <= b)."""
+    out: list[QuarterSpec] = []
+    y, q = a.year, a.quarter
+    while (y, q) <= (b.year, b.quarter):
+        out.append(QuarterSpec(y, q))
+        q += 1
+        if q > 4:
+            q = 1
+            y += 1
+    return out
+
+
+def _parse_won_at(val: Any) -> Optional[datetime]:
+    if val is None:
+        return None
+    if isinstance(val, datetime):
+        if val.tzinfo is not None:
+            return val.replace(tzinfo=None)
+        return val
+    if isinstance(val, str):
+        try:
+            s = val.strip()
+            if s.endswith("Z"):
+                s = s[:-1] + "+00:00"
+            dt = datetime.fromisoformat(s.replace("Z", "+00:00"))
+            if dt.tzinfo is not None:
+                return dt.replace(tzinfo=None)
+            return dt
+        except ValueError:
+            return None
+    return None
+
+
+def build_quarterly_board(
+    deals: list[dict[str, Any]],
+    rate_usd_cad: Optional[float] = None,
+    max_quarters: int = 10,
+) -> dict[str, Any]:
+    """
+    deals: each dict needs keys revenue_type, won_line_items (list), won_at (optional ISO/datetime).
+    """
+    r = rate_usd_cad if rate_usd_cad is not None else usd_to_cad_rate()
+
+    if not deals:
+        return {
+            "usd_to_cad_rate": r,
+            "currency_display": "CAD",
+            "quarters": [],
+        }
+
+    normalized: list[dict[str, Any]] = []
+    for d in deals:
+        lines = d.get("won_line_items") or []
+        if not isinstance(lines, list):
+            lines = []
+        rt = (d.get("revenue_type") or "arr").strip().lower()
+        if rt not in ("arr", "qrr", "mrr", "one_time"):
+            rt = "arr"
+        won_at = _parse_won_at(d.get("won_at"))
+        normalized.append(
+            {
+                "id": d.get("id"),
+                "name": d.get("name") or "",
+                "revenue_type": rt,
+                "won_line_items": lines,
+                "won_at": won_at,
+            }
+        )
+
+    now = datetime.utcnow()
+    current_q = quarter_for_datetime(now)
+
+    starts = [quarter_for_datetime(x["won_at"]) for x in normalized if x["won_at"]]
+    if starts:
+        first_q = min(starts, key=lambda q: (q.year, q.quarter))
+    else:
+        first_q = current_q
+
+    quarters = iter_quarters(first_q, current_q)
+    if len(quarters) > max_quarters:
+        quarters = quarters[-max_quarters:]
+
+    rows: list[dict[str, Any]] = []
+    prev_total_mrr = 0.0
+    prev_total_contracts = 0
+
+    for qs in quarters:
+        start = qs.start_dt()
+        end = qs.end_dt()
+
+        def in_quarter(won_at: Optional[datetime]) -> bool:
+            if not won_at:
+                return False
+            return start <= won_at <= end
+
+        new_mrr = 0.0
+        new_contracts = 0
+        one_time_cad = 0.0
+        one_time_deals: list[dict[str, Any]] = []
+
+        total_mrr_end = 0.0
+        total_contracts_end = 0
+
+        for deal in normalized:
+            lines = deal["won_line_items"]
+            rt = deal["revenue_type"]
+            won_at = deal["won_at"]
+
+            if rt == "one_time":
+                if won_at and won_at <= end:
+                    ot = deal_subtotal_cad_onetime(lines, r)
+                    if in_quarter(won_at):
+                        one_time_cad += ot
+                        one_time_deals.append(
+                            {
+                                "deal_id": deal["id"],
+                                "name": deal["name"],
+                                "amount_cad": ot,
+                                "won_at": won_at.isoformat() if won_at else None,
+                            }
+                        )
+                continue
+
+            mrr = deal_recurring_mrr_cad(rt, lines, r)
+            if won_at is None or won_at > end:
+                continue
+            total_mrr_end += mrr
+            total_contracts_end += 1
+
+            if in_quarter(won_at):
+                new_mrr += mrr
+                new_contracts += 1
+
+        existing_mrr = prev_total_mrr
+        existing_contracts = prev_total_contracts
+
+        portfolio_check = round(existing_mrr + new_mrr, 2)
+        rows.append(
+            {
+                "label": qs.label,
+                "year": qs.year,
+                "quarter": qs.quarter,
+                "start": start.isoformat(),
+                "end": end.isoformat(),
+                "mrr": {
+                    "existing": round(existing_mrr, 2),
+                    "new": round(new_mrr, 2),
+                    "total": round(total_mrr_end, 2),
+                },
+                "arr_cad": {
+                    "existing": round(existing_mrr * 12, 2),
+                    "new": round(new_mrr * 12, 2),
+                    "total": round(total_mrr_end * 12, 2),
+                },
+                "contracts": {
+                    "existing": existing_contracts,
+                    "new": new_contracts,
+                    "total": total_contracts_end,
+                },
+                "one_time_cad_quarter": round(one_time_cad, 2),
+                "one_time_deals": one_time_deals,
+                "portfolio_matches_rollforward": abs(portfolio_check - round(total_mrr_end, 2)) < 0.02,
+            }
+        )
+
+        prev_total_mrr = total_mrr_end
+        prev_total_contracts = total_contracts_end
+
+    return {
+        "usd_to_cad_rate": r,
+        "currency_display": "CAD",
+        "quarters": rows,
+    }

backend/app/main.py

@@ -56,6 +56,7 @@ from .smartlead_client import SmartleadClient
 from .auth_routes import router as auth_router
 from .tenant_deps import TenantContext, get_tenant_context
 from .tenant_routes import router as tenant_router
+from .deal_revenue import build_quarterly_board, usd_to_cad_rate
 
 app = FastAPI()
 
@@ -592,6 +593,7 @@ def _deal_to_dict(d: CrmDeal) -> dict:
         "won_note_to_customer": _safe_str(getattr(d, "won_note_to_customer", None) or ""),
         "won_note_to_accounts": _safe_str(getattr(d, "won_note_to_accounts", None) or ""),
         "won_line_items": _won_line_items_list(d),
+        "won_at": d.won_at.isoformat() if getattr(d, "won_at", None) else None,
     }
 
 
@@ -619,6 +621,7 @@ def _clear_won_billing_fields(row: CrmDeal) -> None:
     row.won_note_to_customer = ""
     row.won_note_to_accounts = ""
     row.won_line_items = None
+    row.won_at = None
 
 
 async def _notify_tenant_admins_deal_won(
@@ -2755,6 +2758,44 @@ async def list_deals(
     return {"total": total, "deals": deals_out}
 
 
+@app.get("/api/deals/quarterly-recurring-metrics")
+async def quarterly_recurring_metrics(
+    owner_user_id: Optional[int] = Query(None),
+    max_quarters: int = Query(12, ge=1, le=24),
+    t: TenantContext = Depends(get_tenant_context),
+):
+    """
+    Won deals → recurring ARR/MRR (CAD) by calendar quarter: Existing / New / Total roll-forward,
+    plus one-time CAD recognized in quarter (revenue_type one_time). Uses USD_TO_CAD_RATE env (default 1.38).
+    """
+    db = t.db
+    q = db.query(CrmDeal).filter(
+        CrmDeal.tenant_id == t.tenant_id,
+        CrmDeal.stage == "won",
+    )
+    if t.role != "admin":
+        q = q.filter(or_(CrmDeal.owner_user_id == t.user_id, CrmDeal.owner_user_id.is_(None)))
+    elif owner_user_id is not None:
+        q = q.filter(CrmDeal.owner_user_id == int(owner_user_id))
+    rows = q.all()
+    deals_payload = []
+    for r in rows:
+        deals_payload.append(
+            {
+                "id": r.id,
+                "name": r.name or "",
+                "revenue_type": (getattr(r, "revenue_type", None) or "arr"),
+                "won_line_items": _won_line_items_list(r),
+                "won_at": getattr(r, "won_at", None),
+            }
+        )
+    return build_quarterly_board(
+        deals_payload,
+        rate_usd_cad=usd_to_cad_rate(),
+        max_quarters=max_quarters,
+    )
+
+
 @app.post("/api/deals")
 async def create_deal(body: CrmDealCreateRequest, t: TenantContext = Depends(get_tenant_context)):
     stage = (body.stage or "new").strip().lower() or "new"
@@ -2973,6 +3014,8 @@ async def patch_deal(deal_id: int, body: CrmDealPatchRequest, t: TenantContext =
                         "qty": float(li.qty),
                         "rate": float(li.rate),
                         "amount": amt,
+                        "billing_interval": li.billing_interval,
+                        "currency": li.currency,
                     }
                 )
             row.won_po_number = _safe_str(wb.po_number).strip()
@@ -2987,6 +3030,8 @@ async def patch_deal(deal_id: int, body: CrmDealPatchRequest, t: TenantContext =
             row.lost_price_discount_pct = None
             row.lost_chose_product_name = ""
             row.stage = "won"
+            if prev_stage != "won":
+                row.won_at = datetime.utcnow()
             did_mark_won_this_request = True
         else:
             if prev_stage == "lost":

backend/app/models.py

@@ -1,5 +1,5 @@
 from pydantic import BaseModel, Field, field_validator
-from typing import Optional, List, Dict
+from typing import Optional, List, Dict, Literal
 from datetime import datetime
 
 
@@ -102,6 +102,9 @@ class WonLineItemIn(BaseModel):
     description: str = Field(default="", max_length=4000)
     qty: float = Field(..., gt=0, le=1_000_000)
     rate: float = Field(..., ge=0, le=1_000_000_000)
+    # Recurring revenue / spreadsheet columns: amount per interval × annualization (matches manual ARR sheet).
+    billing_interval: Literal["monthly", "quarterly", "annual"] = "monthly"
+    currency: Literal["CAD", "USD"] = "USD"
 
     @field_validator("product_service", mode="before")
     @classmethod
@@ -117,6 +120,28 @@ class WonLineItemIn(BaseModel):
             return ""
         return v.strip() if isinstance(v, str) else v
 
+    @field_validator("billing_interval", mode="before")
+    @classmethod
+    def norm_interval(cls, v):
+        if v is None:
+            return "monthly"
+        s = v.strip().lower() if isinstance(v, str) else "monthly"
+        if s in ("month", "monthly", "every month", "m"):
+            return "monthly"
+        if s in ("quarter", "quarterly", "every 3 months", "q"):
+            return "quarterly"
+        if s in ("year", "annual", "yearly", "every year", "a"):
+            return "annual"
+        return "monthly"
+
+    @field_validator("currency", mode="before")
+    @classmethod
+    def norm_currency(cls, v):
+        if v is None:
+            return "USD"
+        s = v.strip().upper() if isinstance(v, str) else "USD"
+        return s if s in ("CAD", "USD") else "USD"
+
 
 class WonBillingPayload(BaseModel):
     """Billing / PO details required when setting a deal to Won (invoicing)."""

frontend/src/components/workspace/WonBillingModal.jsx

@@ -3,6 +3,7 @@ import { ChevronDown, ChevronUp, GripVertical, Loader2, Trash2 } from 'lucide-re
 import { Button } from '@/components/ui/button';
 import { Input } from '@/components/ui/input';
 import { Textarea } from '@/components/ui/textarea';
+import { Select, SelectContent, SelectItem, SelectTrigger } from '@/components/ui/select';
 
 function newLineRow() {
     return {
@@ -11,6 +12,8 @@ function newLineRow() {
         description: '',
         qty: '1',
         rate: '0',
+        billing_interval: 'monthly',
+        currency: 'USD',
     };
 }
 
@@ -137,6 +140,8 @@ export default function WonBillingModal({ dealName, busy, onCancel, onSubmit, gm
                 description: row.description.trim(),
                 qty: q,
                 rate: r,
+                billing_interval: row.billing_interval || 'monthly',
+                currency: row.currency || 'USD',
             });
         }
         onSubmit({
@@ -274,13 +279,15 @@ export default function WonBillingModal({ dealName, busy, onCancel, onSubmit, gm
                         </div>
                     </div>
                     <div className="overflow-x-auto rounded-lg border border-slate-200">
-                        <table className="w-full min-w-[640px] border-collapse text-sm">
+                        <table className="w-full min-w-[960px] border-collapse text-sm">
                             <thead>
                                 <tr className="border-b border-slate-200 bg-slate-50 text-left text-xs font-semibold text-slate-600">
                                     <th className="w-8 px-1 py-2" aria-hidden />
                                     <th className="w-8 px-1 py-2 text-center">#</th>
                                     <th className="min-w-[140px] px-2 py-2">Product / service</th>
                                     <th className="min-w-[120px] px-2 py-2">Description</th>
+                                    <th className="min-w-[130px] px-2 py-2">Billing interval</th>
+                                    <th className="w-24 px-2 py-2">Currency</th>
                                     <th className="w-20 px-2 py-2 text-right">Qty</th>
                                     <th className="w-24 px-2 py-2 text-right">Rate</th>
                                     <th className="w-28 px-2 py-2 text-right">Amount</th>
@@ -342,6 +349,45 @@ export default function WonBillingModal({ dealName, busy, onCancel, onSubmit, gm
                                                     placeholder="Description"
                                                 />
                                             </td>
+                                            <td className="px-2 py-1">
+                                                <Select
+                                                    value={row.billing_interval || 'monthly'}
+                                                    onValueChange={(v) =>
+                                                        updateLine(row.id, { billing_interval: v })
+                                                    }
+                                                >
+                                                    <SelectTrigger className="h-8 bg-white text-xs">
+                                                        <span className="truncate">
+                                                            {row.billing_interval === 'quarterly'
+                                                                ? 'Every 3 mo'
+                                                                : row.billing_interval === 'annual'
+                                                                  ? 'Every year'
+                                                                  : 'Every month'}
+                                                        </span>
+                                                    </SelectTrigger>
+                                                    <SelectContent>
+                                                        <SelectItem value="monthly">Every month</SelectItem>
+                                                        <SelectItem value="quarterly">Every 3 months</SelectItem>
+                                                        <SelectItem value="annual">Every year</SelectItem>
+                                                    </SelectContent>
+                                                </Select>
+                                            </td>
+                                            <td className="px-2 py-1">
+                                                <Select
+                                                    value={row.currency || 'USD'}
+                                                    onValueChange={(v) =>
+                                                        updateLine(row.id, { currency: v })
+                                                    }
+                                                >
+                                                    <SelectTrigger className="h-8 bg-white text-xs">
+                                                        {row.currency || 'USD'}
+                                                    </SelectTrigger>
+                                                    <SelectContent>
+                                                        <SelectItem value="USD">USD</SelectItem>
+                                                        <SelectItem value="CAD">CAD</SelectItem>
+                                                    </SelectContent>
+                                                </Select>
+                                            </td>
                                             <td className="px-2 py-1">
                                                 <Input
                                                     value={row.qty}

frontend/src/pages/SalesDashboard.jsx

@@ -106,6 +106,17 @@ function fmtMoneyCompact(n) {
     }).format(n);
 }
 
+/** Dashboard quarterly board (matches spreadsheet ARR methodology; amounts in CAD). */
+function fmtCad(n) {
+    if (n == null || n === '' || Number.isNaN(n)) return '—';
+    return new Intl.NumberFormat('en-CA', {
+        style: 'currency',
+        currency: 'CAD',
+        minimumFractionDigits: 0,
+        maximumFractionDigits: 0,
+    }).format(n);
+}
+
 function monthKeyFromDealDate(iso) {
     if (!iso || typeof iso !== 'string') return null;
     const m = iso.slice(0, 7);
@@ -342,6 +353,8 @@ export default function SalesDashboard() {
     const [tenantMembers, setTenantMembers] = useState([]);
     const [ownerFilter, setOwnerFilter] = useState('all');
     const [dashboardPeriod, setDashboardPeriod] = useState(DASHBOARD_PERIOD_ALL);
+    const [quarterlyBoard, setQuarterlyBoard] = useState(null);
+    const [quarterlyLoading, setQuarterlyLoading] = useState(true);
 
     const isAdmin = me?.current_role === 'admin';
 
@@ -387,6 +400,30 @@ export default function SalesDashboard() {
         fetchDeals();
     }, [fetchDeals]);
 
+    useEffect(() => {
+        let cancelled = false;
+        const params = new URLSearchParams();
+        params.set('max_quarters', '12');
+        if (isAdmin && ownerFilter !== 'all') {
+            params.set('owner_user_id', ownerFilter);
+        }
+        setQuarterlyLoading(true);
+        apiFetch(`/api/deals/quarterly-recurring-metrics?${params.toString()}`)
+            .then((r) => (r.ok ? r.json() : null))
+            .then((data) => {
+                if (!cancelled) setQuarterlyBoard(data);
+            })
+            .catch(() => {
+                if (!cancelled) setQuarterlyBoard(null);
+            })
+            .finally(() => {
+                if (!cancelled) setQuarterlyLoading(false);
+            });
+        return () => {
+            cancelled = true;
+        };
+    }, [isAdmin, ownerFilter, me?.user_id]);
+
     useEffect(() => {
         if (!isAdmin) setOwnerFilter('all');
     }, [isAdmin]);
@@ -571,6 +608,12 @@ export default function SalesDashboard() {
                 ? 'This year'
                 : 'All time';
 
+    const quarterColumns = useMemo(() => {
+        const qs = quarterlyBoard?.quarters || [];
+        if (qs.length <= 6) return qs;
+        return qs.slice(-6);
+    }, [quarterlyBoard]);
+
     const dateRangeSub =
         dashboardPeriod === DASHBOARD_PERIOD_ALL
             ? 'All deals in view'
@@ -676,6 +719,193 @@ export default function SalesDashboard() {
                         />
                     </div>
 
+                    <div className="rounded-xl border border-indigo-100 bg-indigo-50/50 px-4 py-3 text-sm text-slate-700">
+                        <p className="font-semibold text-slate-900">Quarterly recurring revenue (board)</p>
+                        <p className="mt-1 text-xs leading-relaxed text-slate-600">
+                            Uses <strong className="font-medium text-slate-800">won</strong> deals only. Each PO line
+                            contributes MRR in CAD from amount × interval (monthly ×12, quarterly ×4, yearly ×1) and
+                            USD→CAD using the server rate below.{' '}
+                            <strong className="font-medium text-slate-800">Existing</strong> MRR is the recurring total
+                            carried from the prior quarter; <strong className="font-medium text-slate-800">New</strong>{' '}
+                            is won in that quarter. Deals with type{' '}
+                            <strong className="font-medium text-slate-800">One-time</strong> are listed separately.
+                            Attribution uses the <strong className="font-medium text-slate-800">won date</strong>{' '}
+                            (set when the deal is marked won).
+                        </p>
+                    </div>
+
+                    {quarterlyLoading ? (
+                        <div className="flex items-center justify-center gap-2 py-10 text-slate-600">
+                            <Loader2 className="h-5 w-5 animate-spin shrink-0" aria-hidden />
+                            Loading quarterly metrics…
+                        </div>
+                    ) : quarterColumns.length > 0 ? (
+                        <div className="space-y-4">
+                            <p className="text-xs text-slate-500">
+                                USD→CAD rate (env):{' '}
+                                <span className="font-mono tabular-nums">
+                                    {quarterlyBoard?.usd_to_cad_rate ?? '—'}
+                                </span>
+                            </p>
+                            <div className="grid grid-cols-1 gap-4 xl:grid-cols-2">
+                                <CardShell
+                                    title="Recurring MRR (CAD)"
+                                    hint="Roll-forward like your deck: Total = portfolio at quarter end; Existing = prior quarter total; New = sum of MRR from deals won in the quarter."
+                                    className="min-h-0"
+                                >
+                                    <div className="overflow-x-auto -m-1 p-1">
+                                        <table className="w-full min-w-[340px] text-sm">
+                                            <thead>
+                                                <tr className="border-b border-slate-200 text-left text-xs font-semibold text-slate-600">
+                                                    <th className="py-2 pr-3"> </th>
+                                                    {quarterColumns.map((q) => (
+                                                        <th key={q.label} className="px-2 py-2 text-right whitespace-nowrap">
+                                                            {q.label}
+                                                        </th>
+                                                    ))}
+                                                </tr>
+                                            </thead>
+                                            <tbody className="tabular-nums">
+                                                <tr className="border-b border-slate-100">
+                                                    <td className="py-2 pr-3 font-medium text-slate-800">TOTAL</td>
+                                                    {quarterColumns.map((q) => (
+                                                        <td key={q.label} className="px-2 py-2 text-right font-semibold">
+                                                            {fmtCad(q.mrr?.total)}
+                                                        </td>
+                                                    ))}
+                                                </tr>
+                                                <tr className="border-b border-slate-100">
+                                                    <td className="py-2 pr-3 text-slate-600">EXISTING</td>
+                                                    {quarterColumns.map((q) => (
+                                                        <td key={q.label} className="px-2 py-2 text-right text-slate-700">
+                                                            {fmtCad(q.mrr?.existing)}
+                                                        </td>
+                                                    ))}
+                                                </tr>
+                                                <tr>
+                                                    <td className="py-2 pr-3 text-slate-600">NEW</td>
+                                                    {quarterColumns.map((q) => (
+                                                        <td key={q.label} className="px-2 py-2 text-right text-slate-700">
+                                                            {fmtCad(q.mrr?.new)}
+                                                        </td>
+                                                    ))}
+                                                </tr>
+                                            </tbody>
+                                        </table>
+                                    </div>
+                                    <p className="mt-3 text-xs text-slate-500">
+                                        ARR (CAD) = MRR × 12 (same rows available as{' '}
+                                        <span className="font-medium text-slate-700">arr_cad</span> in the API).
+                                    </p>
+                                </CardShell>
+                                <CardShell
+                                    title="Recurring contracts"
+                                    hint="Count of recurring (non–one-time) won deals in the portfolio at quarter end; New = deals whose won date falls in the quarter."
+                                    className="min-h-0"
+                                >
+                                    <div className="overflow-x-auto -m-1 p-1">
+                                        <table className="w-full min-w-[340px] text-sm">
+                                            <thead>
+                                                <tr className="border-b border-slate-200 text-left text-xs font-semibold text-slate-600">
+                                                    <th className="py-2 pr-3"> </th>
+                                                    {quarterColumns.map((q) => (
+                                                        <th key={q.label} className="px-2 py-2 text-right whitespace-nowrap">
+                                                            {q.label}
+                                                        </th>
+                                                    ))}
+                                                </tr>
+                                            </thead>
+                                            <tbody className="tabular-nums">
+                                                <tr className="border-b border-slate-100">
+                                                    <td className="py-2 pr-3 font-medium text-slate-800">TOTAL</td>
+                                                    {quarterColumns.map((q) => (
+                                                        <td key={q.label} className="px-2 py-2 text-right font-semibold">
+                                                            {q.contracts?.total ?? '—'}
+                                                        </td>
+                                                    ))}
+                                                </tr>
+                                                <tr className="border-b border-slate-100">
+                                                    <td className="py-2 pr-3 text-slate-600">EXISTING</td>
+                                                    {quarterColumns.map((q) => (
+                                                        <td key={q.label} className="px-2 py-2 text-right text-slate-700">
+                                                            {q.contracts?.existing ?? '—'}
+                                                        </td>
+                                                    ))}
+                                                </tr>
+                                                <tr>
+                                                    <td className="py-2 pr-3 text-slate-600">NEW</td>
+                                                    {quarterColumns.map((q) => (
+                                                        <td key={q.label} className="px-2 py-2 text-right text-slate-700">
+                                                            {q.contracts?.new ?? '—'}
+                                                        </td>
+                                                    ))}
+                                                </tr>
+                                            </tbody>
+                                        </table>
+                                    </div>
+                                </CardShell>
+                            </div>
+                            <CardShell
+                                title="One-time revenue (CAD)"
+                                hint="Deals with revenue type One-time: invoice subtotal converted to CAD, recognized in the quarter the deal was marked won."
+                                className="min-h-0"
+                            >
+                                <div className="overflow-x-auto -m-1 p-1">
+                                    <table className="w-full min-w-[280px] text-sm">
+                                        <thead>
+                                            <tr className="border-b border-slate-200 text-left text-xs font-semibold text-slate-600">
+                                                <th className="py-2 pr-3">Quarter</th>
+                                                <th className="py-2 text-right">One-time (CAD)</th>
+                                            </tr>
+                                        </thead>
+                                        <tbody className="tabular-nums">
+                                            {quarterColumns.map((q) => (
+                                                <tr key={q.label} className="border-b border-slate-100">
+                                                    <td className="py-2 pr-3 text-slate-800">{q.label}</td>
+                                                    <td className="py-2 text-right">
+                                                        {fmtCad(q.one_time_cad_quarter)}
+                                                    </td>
+                                                </tr>
+                                            ))}
+                                        </tbody>
+                                    </table>
+                                </div>
+                                {(() => {
+                                    const last = quarterColumns[quarterColumns.length - 1];
+                                    const deals = last?.one_time_deals || [];
+                                    if (!deals.length) {
+                                        return (
+                                            <p className="mt-3 text-xs text-slate-500">
+                                                No one-time deals in the latest shown quarter.
+                                            </p>
+                                        );
+                                    }
+                                    return (
+                                        <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">
+                                                Latest quarter detail ({last?.label})
+                                            </p>
+                                            <ul className="mt-2 list-disc space-y-1 pl-5">
+                                                {deals.map((d) => (
+                                                    <li key={d.deal_id}>
+                                                        <span className="font-medium">{d.name || 'Deal'}</span>
+                                                        {' · '}
+                                                        {fmtCad(d.amount_cad)}
+                                                    </li>
+                                                ))}
+                                            </ul>
+                                        </div>
+                                    );
+                                })()}
+                            </CardShell>
+                        </div>
+                    ) : (
+                        <p className="rounded-xl border border-dashed border-slate-200 bg-slate-50/50 px-4 py-8 text-center text-sm text-slate-600">
+                            No closed-won deals yet — quarterly MRR / contracts will appear after you mark deals won
+                            (with billing lines and billing interval per line).
+                        </p>
+                    )}
+
                     <CardShell
                         title="Pipeline conversion"
                         hint="Uses the global date range (deal created date) and team scope from the top of the page. Bars: blue through Negotiation, green for Won. Shaded bands connect stages. Step % = next ÷ previous. Conversion to Won = Won ÷ New."