update

backend/app/database.py

@@ -166,6 +166,7 @@ class CrmDeal(Base):
     owner_user_id = Column(Integer, ForeignKey("users.id"), nullable=True, index=True)
     owner_initials = Column(String, default="")  # display cache; derived from User when owner_user_id set
     deal_value = Column(Integer, nullable=True)  # whole USD (nullable)
+    revenue_type = Column(String, default="arr")  # arr|qrr|mrr|one_time
     contact_display = Column(String, default="")  # primary person label
     account_name = Column(String, default="")
     expected_close_date = Column(DateTime, nullable=True)
@@ -258,6 +259,15 @@ def run_migrations(connection_engine):
             dcols = [c["name"] for c in insp.get_columns("crm_deals")]
             if "owner_user_id" not in dcols:
                 conn.execute(text("ALTER TABLE crm_deals ADD COLUMN owner_user_id INTEGER"))
+            if "revenue_type" not in dcols:
+                conn.execute(
+                    text("ALTER TABLE crm_deals ADD COLUMN revenue_type TEXT DEFAULT 'arr'")
+                )
+                conn.execute(
+                    text(
+                        "UPDATE crm_deals SET revenue_type = 'arr' WHERE revenue_type IS NULL OR revenue_type = ''"
+                    )
+                )
 
 
 # Create tables then migrate legacy SQLite schemas

backend/app/main.py

@@ -186,6 +186,7 @@ DEAL_STAGE_ALLOWED = frozenset({
     "won",
     "lost",
 })
+DEAL_REVENUE_TYPE_ALLOWED = frozenset({"arr", "qrr", "mrr", "one_time"})
 SMARTLEAD_IMPORT_FILE_ID = "smartlead-imports"
 MANUAL_CONTACT_FILE_ID = "manual-contacts"
 DEMO_CONTACTS_FILE_ID = "demo-contacts-crm"
@@ -547,6 +548,9 @@ def _deal_to_dict(d: CrmDeal) -> dict:
             ecd = d.expected_close_date.date().isoformat()
         except Exception:
             ecd = d.expected_close_date.isoformat()
+    rt = (getattr(d, "revenue_type", None) or "arr").strip().lower()
+    if rt not in DEAL_REVENUE_TYPE_ALLOWED:
+        rt = "arr"
     return {
         "id": d.id,
         "name": d.name or "",
@@ -554,6 +558,7 @@ def _deal_to_dict(d: CrmDeal) -> dict:
         "owner_user_id": d.owner_user_id,
         "owner_initials": d.owner_initials or "",
         "deal_value": d.deal_value,
+        "revenue_type": rt,
         "contact_display": d.contact_display or "",
         "account_name": d.account_name or "",
         "expected_close_date": ecd,
@@ -2527,6 +2532,7 @@ async def deals_from_leads(body: BulkLeadIdsRequest, t: TenantContext = Depends(
             owner_user_id=t.user_id,
             owner_initials=_user_initials_from_user(inviter),
             deal_value=None,
+            revenue_type="arr",
             contact_display=person or (lead.email or ""),
             account_name=lead.company_name or "",
             expected_close_date=datetime.utcnow() + timedelta(days=60),
@@ -2626,6 +2632,7 @@ async def create_deal(body: CrmDealCreateRequest, t: TenantContext = Depends(get
         owner_user_id=t.user_id,
         owner_initials=_user_initials_from_user(creator),
         deal_value=None,
+        revenue_type="arr",
         contact_display="",
         account_name="",
         expected_close_date=None,
@@ -2743,6 +2750,14 @@ async def patch_deal(deal_id: int, body: CrmDealPatchRequest, t: TenantContext =
         row.stage = data["stage"]
     if "deal_value" in data:
         row.deal_value = data["deal_value"]
+    if "revenue_type" in data:
+        rt = _safe_str(data["revenue_type"]).lower()
+        if rt not in DEAL_REVENUE_TYPE_ALLOWED:
+            raise HTTPException(
+                status_code=400,
+                detail=f"revenue_type must be one of: {sorted(DEAL_REVENUE_TYPE_ALLOWED)}",
+            )
+        row.revenue_type = rt
     if "close_probability" in data:
         row.close_probability = max(0, min(100, int(data["close_probability"])))
     if "country" in data:

backend/app/models.py

@@ -102,6 +102,7 @@ class CrmDealPatchRequest(BaseModel):
     # Admin: set to a workspace member's user id, or null for unassigned. Member: may set to own id only to claim an unassigned deal.
     owner_user_id: Optional[int] = None
     deal_value: Optional[int] = None
+    revenue_type: Optional[str] = None  # arr|qrr|mrr|one_time
     close_probability: Optional[int] = None
     expected_close_date: Optional[str] = None  # ISO date or datetime
     country: Optional[str] = None

frontend/src/pages/Deals.jsx

@@ -101,6 +101,18 @@ function closeProbabilitySelectValue(p) {
     return String(Math.min(100, Math.max(10, Math.round(n / 10) * 10)));
 }
 
+const REVENUE_TYPES = [
+    { value: 'arr', label: 'ARR' },
+    { value: 'qrr', label: 'QRR' },
+    { value: 'mrr', label: 'MRR' },
+    { value: 'one_time', label: 'One-Time' },
+];
+
+function revenueTypeSelectValue(deal) {
+    const v = (deal?.revenue_type ?? 'arr').toString().toLowerCase();
+    return REVENUE_TYPES.some((t) => t.value === v) ? v : 'arr';
+}
+
 function focusFirstEditableInRow(tr) {
     if (!tr) return;
     const el = tr.querySelector('input:not([type="checkbox"]):not([type="hidden"]), textarea');
@@ -154,7 +166,7 @@ function GroupedDealTbody({
     return (
         <tbody className="border-b border-slate-200">
             <tr className={barClassName}>
-                <td colSpan={12} className="px-3 py-2.5">
+                <td colSpan={13} className="px-3 py-2.5">
                     {headerContent}
                 </td>
             </tr>
@@ -177,12 +189,16 @@ function GroupedDealTbody({
                     Group total
                 </td>
                 <td className="px-3 py-2 font-semibold tabular-nums">{fmtMoney(sumDeal)}</td>
-                <td colSpan={4} />
+                <td className="px-3 py-2 text-center text-slate-400" aria-hidden>
+                    —
+                </td>
+                <td colSpan={3} />
+                <td className="px-3 py-2" />
                 <td className="px-3 py-2 font-semibold tabular-nums">{fmtMoney(sumForecast)}</td>
                 <td colSpan={2} />
             </tr>
             <tr>
-                <td colSpan={12} className="px-3 py-1.5">
+                <td colSpan={13} className="px-3 py-1.5">
                     <Button
                         type="button"
                         variant="ghost"
@@ -583,6 +599,30 @@ function DealRow({
                     inputClassName="min-w-[9rem] w-full max-w-full tabular-nums text-right text-sm py-1"
                 />
             </td>
+            <td className="px-3 py-2 align-top max-w-[7.5rem]" onClick={(e) => e.stopPropagation()}>
+                <Select
+                    value={revenueTypeSelectValue(deal)}
+                    onValueChange={(v) => patchDeal(deal.id, { revenue_type: v })}
+                >
+                    <SelectTrigger
+                        className={cn(
+                            'h-8 w-[min(100%,7.25rem)] border-slate-200 shadow-none text-xs',
+                            '[&>svg]:h-3.5 [&>svg]:w-3.5 [&>svg]:opacity-60'
+                        )}
+                    >
+                        <span className="truncate font-medium tabular-nums">
+                            {REVENUE_TYPES.find((t) => t.value === revenueTypeSelectValue(deal))?.label}
+                        </span>
+                    </SelectTrigger>
+                    <SelectContent className="min-w-[8.5rem]">
+                        {REVENUE_TYPES.map((t) => (
+                            <SelectItem key={t.value} value={t.value}>
+                                {t.label}
+                            </SelectItem>
+                        ))}
+                    </SelectContent>
+                </Select>
+            </td>
             <td className="px-3 py-2 align-top max-w-[180px]">
                 {tableEditRowId === deal.id ? (
                     <EditableCell
@@ -980,6 +1020,7 @@ export default function Deals() {
         setDealPanelForm({
             name: dealDetail.name || '',
             deal_value: dealDetail.deal_value != null ? String(dealDetail.deal_value) : '',
+            revenue_type: revenueTypeSelectValue(dealDetail),
             close_prob: closeProbabilitySelectValue(dealDetail.close_probability),
             expected_close: isoToDateInput(dealDetail.expected_close_date),
             contact_display: dealDetail.contact_display || '',
@@ -1004,6 +1045,7 @@ export default function Deals() {
             await patchDeal(dealDetail.id, {
                 name: dealPanelForm.name.trim() || 'Untitled deal',
                 deal_value,
+                revenue_type: dealPanelForm.revenue_type,
                 close_probability,
                 expected_close_date: dealPanelForm.expected_close.trim() ? dealPanelForm.expected_close.trim() : null,
                 contact_display: dealPanelForm.contact_display.trim(),
@@ -1116,7 +1158,7 @@ export default function Deals() {
                             </div>
                         </div>
                     ) : (
-                        <table className="w-full text-sm min-w-[960px]">
+                        <table className="w-full text-sm min-w-[1040px]">
                             <thead>
                                 <tr className="bg-slate-50 text-left text-slate-600 border-b border-slate-200">
                                     <th className="px-2 py-2 w-[4.25rem]" aria-label="Select and table edit" />
@@ -1124,6 +1166,7 @@ export default function Deals() {
                                     <th className="px-3 py-2 font-medium">Stage</th>
                                     <th className="px-3 py-2 font-medium">Owner</th>
                                     <th className="px-3 py-2 font-medium">Deal value</th>
+                                    <th className="px-3 py-2 font-medium">Revenue</th>
                                     <th className="px-3 py-2 font-medium">Contacts</th>
                                     <th className="px-3 py-2 font-medium">Accounts</th>
                                     <th className="px-3 py-2 font-medium">Expected close</th>
@@ -1304,6 +1347,34 @@ export default function Deals() {
                                         placeholder="—"
                                     />
                                 </div>
+                                <div>
+                                    <label className="block text-xs font-medium text-slate-500 mb-1">
+                                        Revenue
+                                    </label>
+                                    <Select
+                                        value={dealPanelForm.revenue_type}
+                                        onValueChange={(v) =>
+                                            setDealPanelForm((f) => ({ ...f, revenue_type: v }))
+                                        }
+                                    >
+                                        <SelectTrigger className="h-10 border-slate-200 bg-white shadow-sm text-sm">
+                                            <span className="font-medium">
+                                                {
+                                                    REVENUE_TYPES.find(
+                                                        (t) => t.value === dealPanelForm.revenue_type
+                                                    )?.label
+                                                }
+                                            </span>
+                                        </SelectTrigger>
+                                        <SelectContent>
+                                            {REVENUE_TYPES.map((t) => (
+                                                <SelectItem key={t.value} value={t.value}>
+                                                    {t.label}
+                                                </SelectItem>
+                                            ))}
+                                        </SelectContent>
+                                    </Select>
+                                </div>
                                 <div>
                                     <label className="block text-xs font-medium text-slate-500 mb-1">
                                         Close probability