Skip to content

release: payment-triggered provisioning + the owner dashboard (O3 + O4 part 1) #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mahmutkaya merged 3 commits into from
Jul 30, 2026
Merged

release: payment-triggered provisioning + the owner dashboard (O3 + O4 part 1) #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4d0731a
docs(adr-012): the merge chains provisioning, and the PR body says so…
mahmutkaya Jul 30, 2026
d662e36
feat(provisioning): a settled first payment opens the registry PR its…
mahmutkaya Jul 30, 2026
602b0d1
feat(control): show the owner their app and their plan (O4 part 1) (#…
mahmutkaya Jul 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions app/(control)/dashboard/billing/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@ import { requirePartner } from "@/lib/rbac";
import { controlLocale } from "@/lib/control-locale";
import { db } from "@/lib/db";
import { eur, shortDate } from "@/lib/format";
import { intervalKeyOf, planState, type PlanState } from "@/lib/billing-display";
import {
intervalKeyOf,
nextChargeDate,
planState,
type PlanState,
} from "@/lib/billing-display";
import StartPaymentButton from "@/components/control/StartPaymentButton";

export default async function DashboardBillingPage() {
Expand All @@ -12,11 +17,17 @@ export default async function DashboardBillingPage() {
const t = await getTranslations({ locale, namespace: "control.plan" });

// Plan-status node via if/else (avoids a nested ternary — Sonar S3358).
const statusNode = (state: PlanState, startDate: Date | null, billingId: string) => {
//
// `nextChargeDate` rather than the raw `startDate` this used to print: that column is
// the FIRST recurring charge and is never advanced, so from month two onward it named
// a date in the past (see lib/billing-display.ts). Same defect, same fix, on both the
// reseller's page and the owner's card.
const statusNode = (sub: { startDate: Date | null; interval: string }, state: PlanState, billingId: string) => {
if (state === "active") {
const next = nextChargeDate(sub.startDate, sub.interval, new Date());
return (
<p className="font-label text-craft-success-text dark:text-craft-success">
{startDate ? t("activeNextCharge", { date: shortDate(startDate) }) : t("active")}
{next ? t("activeNextCharge", { date: shortDate(next) }) : t("active")}
</p>
);
}
Expand Down Expand Up @@ -78,7 +89,7 @@ export default async function DashboardBillingPage() {
interval: t(`interval.${intervalKeyOf(sub.interval)}`),
})}
</p>
{statusNode(state, sub.startDate, b.id)}
{statusNode(sub, state, b.id)}
</>
) : (
<p className="font-label text-muted-foreground">{t("noPlan")}</p>
Expand Down
198 changes: 33 additions & 165 deletions app/(control)/dashboard/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,75 +1,26 @@
import { getTranslations } from "next-intl/server";
import { requirePartnerOrOwner } from "@/lib/rbac";
import { controlLocale } from "@/lib/control-locale";
import { db } from "@/lib/db";
import { eur, shortDate } from "@/lib/format";
import { intervalKeyOf, planState, type PlanState } from "@/lib/billing-display";
import ClientForm from "@/components/control/ClientForm";
import ClientStatusBadge from "@/components/control/ClientStatusBadge";
import StartPaymentButton from "@/components/control/StartPaymentButton";
import ActivatingPanel from "@/components/control/ActivatingPanel";
import OwnerDashboard from "@/components/control/OwnerDashboard";
import PartnerDashboard from "@/components/control/PartnerDashboard";

/**
* Which "where is my restaurant" line the welcome hero shows — or none.
* Extracted so the choice reads as a decision instead of a nested ternary
* (Sonar S3358).
* `/dashboard` — shared by the reseller (PARTNER) and the restaurant owner (OWNER),
* who want almost nothing in common.
*
* Returns null for an owner who is already activating: `<ActivatingPanel />`
* says what is happening in full, and the hero's "start your subscription"
* nudge directly contradicts a panel that opens with "your first payment went
* through". A line that argues with the line below it is worse than no line.
*/
function liveSinceLine(
liveSince: Date | null,
restaurant: string,
isOwner: boolean,
activating: boolean,
tp: (key: string, values?: Record<string, string>) => string,
): string | null {
if (liveSince) return tp("liveSince", { restaurant, date: shortDate(liveSince) });
if (!isOwner) return tp("liveSinceUnknown", { restaurant });
return activating ? null : tp("notLiveYet", { restaurant });
}

/**
* What the payer can do about this plan right now. Written as guard clauses
* rather than a chain of ternaries (Sonar S3358), mirroring `statusNode` in
* `/dashboard/billing`.
* A partner reads a pipeline: many clients, each a row, the plans needing attention
* pulled to the top. An owner has exactly one plan and one question — *where is my
* restaurant app and how do I get into it?* Until O4 they shared one render, and the
* owner's half of it was a single sentence ("nothing to do here right now") with no
* amount, no next-charge date and no mention of their app at all.
*
* `state` is only ever "pay" or "processing" here — the caller's filter admits
* exactly those two — so "processing" is the mandate-validation window. An owner
* gets it spelled out; a partner keeps the terse line, because a reseller reads
* this queue as a pipeline and is not the one who just watched money leave their
* account. Neither branch renders a pay button in that window: a second payment
* is the trap it sets.
* The two views are now separate components; this page owns only the guard, the
* locale, and the one query both need.
*/
function planAction(args: {
state: PlanState;
billingId: string;
isOwner: boolean;
locale: string;
restaurant: string;
tp: (key: string) => string;
}) {
const { state, billingId, isOwner, locale, restaurant, tp } = args;
if (state === "pay") {
return (
<div className="grid gap-2">
<StartPaymentButton billingId={billingId} />
<span className="font-label text-sm text-muted-foreground">{tp("firstChargeNote")}</span>
</div>
);
}
if (isOwner) return <ActivatingPanel locale={locale} restaurant={restaurant} />;
return <p className="font-label text-muted-foreground">{tp("processing")}</p>;
}

export default async function DashboardPage() {
const user = await requirePartnerOrOwner();
const isOwner = user.role === "OWNER";
const locale = await controlLocale();
const t = await getTranslations({ locale, namespace: "control.dashboard" });
const tp = await getTranslations({ locale, namespace: "control.plan" });

// Billings scoped to the caller: an OWNER pays via payerUserId (ADR-004); a
// PARTNER via their CRM clients.
Expand All @@ -78,116 +29,33 @@ export default async function DashboardPage() {
include: {
client: true,
subscriptions: { orderBy: { createdAt: "desc" } },
// Only first payments distinguish "pay" from "processing" (planState);
// scope + bound so the unboundedly-growing recurring history is never
// pulled into this request path.
// Only first payments distinguish "pay" from "processing" (planState); scope +
// bound so the unboundedly-growing recurring history is never pulled into this
// request path. KEEP THIS SCOPED now that an owner also sees a history list:
// widening it to "the 10 newest payments" would push the `first` payment out of
// the window once a plan has ten recurring charges, and planState would then
// read a paid, activating plan as "pay" — a pay button shown to somebody who
// already paid. OwnerDashboard fetches the history separately, and bounds it
// separately, for exactly that reason.
payments: { where: { sequenceType: "first" }, orderBy: { createdAt: "desc" }, take: 20 },
},
orderBy: { createdAt: "desc" },
});
// Plans that still need the payer's attention (welcome hero): awaiting a
// payment, or a payment being processed.
const awaiting = billings.filter((b) => {
const st = planState(b.subscriptions[0], b.payments);
return st === "pay" || st === "processing";
});
// Reseller CRM — partners only; an owner has no clients.
const clients = isOwner
? []
: await db.client.findMany({ where: { partnerId: user.id }, orderBy: { updatedAt: "desc" } });

return (
<div className="grid gap-10">
<div>
<h1 className="font-display font-bold text-5xl">{isOwner ? t("ownerTitle") : t("title")}</h1>
<p className="mt-2 text-muted-foreground">{isOwner ? t("ownerIntro") : t("intro")}</p>
</div>

{awaiting.map((b) => {
const sub = b.subscriptions[0];
if (!sub) return null;
// Owner billings carry no CRM client; the slug identifies the restaurant.
const restaurant = b.client?.restaurantName ?? b.tenantSlug;
const state = planState(sub, b.payments);
// `liveSince` is set by the founder at onboarding, so for a reseller plan
// (defined AFTER the tenant is live) its absence just means "date
// unknown" — the tenant is live either way. A self-serve owner is the
// opposite case: they signed up minutes ago and nothing has been
// provisioned, so telling them their restaurant "is live" is simply false.
const whereItStands = liveSinceLine(
b.liveSince,
restaurant,
isOwner,
state === "processing",
tp,
);
return (
<section key={b.id} className="hand-drawn-border bg-card p-6 sm:p-8 grid gap-4">
<p className="font-label text-xs uppercase tracking-[0.15em] text-primary">
{tp("welcomeKicker")}
</p>
<h2 className="font-display font-bold text-4xl">
{tp("welcomeTitle", { name: user.name })}
</h2>
{whereItStands && <p className="text-muted-foreground">{whereItStands}</p>}
<p className="font-hand text-3xl font-bold">
{tp("amountLine", {
amount: eur(sub.amountCents),
interval: tp(`interval.${intervalKeyOf(sub.interval)}`),
})}
</p>
{planAction({
state,
billingId: b.id,
isOwner,
locale,
restaurant,
tp,
})}
</section>
);
})}

{isOwner ? (
awaiting.length === 0 && (
<p className="font-hand text-2xl text-muted-foreground">{t("ownerAllSet")}</p>
)
) : (
<>
<section className="hand-drawn-border bg-card p-6">
<h2 className="font-hand text-3xl font-bold">{t("addClient")}</h2>
<div className="mt-4">
<ClientForm />
</div>
</section>
if (isOwner) {
return <OwnerDashboard locale={locale} ownerName={user.name} billings={billings} />;
}

{clients.length === 0 ? (
<p className="font-hand text-2xl text-muted-foreground">{t("empty")}</p>
) : (
<ul className="grid gap-4">
{clients.map((c) => (
<li key={c.id}>
<a
href={`/dashboard/clients/${c.id}`}
className="hand-drawn-border bg-card p-5 flex flex-wrap items-center justify-between gap-3 hover:rotate-[-0.3deg] transition-transform"
>
<span className="min-w-0">
<span className="font-hand text-2xl font-bold block truncate">
{c.restaurantName}
</span>
<span className="font-label text-sm text-muted-foreground">
{[c.city, c.contactName].filter(Boolean).join(" · ") || "—"} ·{" "}
{t("updated", { date: shortDate(c.updatedAt) })}
</span>
</span>
<ClientStatusBadge status={c.status} />
</a>
</li>
))}
</ul>
)}
</>
)}
</div>
const clients = await db.client.findMany({
where: { partnerId: user.id },
orderBy: { updatedAt: "desc" },
});
return (
<PartnerDashboard
locale={locale}
partnerName={user.name}
billings={billings}
clients={clients}
/>
);
}
12 changes: 7 additions & 5 deletions app/api/signup/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,15 @@ const FOUNDER_FALLBACK_NOTES: Record<SelfServeFallback, string> = {
async function mintAccount(
outcome: Extract<SelfServeOutcome, { kind: "account" }>,
who: { email: string; contactName: string; restaurantName: string },
signupRequestId: string,
): Promise<{ account: boolean; founderOutcome: string }> {
let minted;
try {
minted = await createSelfServeAccount({
...who,
slug: outcome.slug,
amountCents: outcome.amountCents,
signupRequestId,
});
} catch (e) {
if (!(e instanceof SlugRaceLostError)) throw e;
Expand Down Expand Up @@ -189,11 +191,11 @@ export async function POST(request: Request) {
// ── Mint the account when the decision says so ──────────────────────────
const { account, founderOutcome } =
outcome.kind === "account"
? await mintAccount(outcome, {
email,
contactName: data.contactName,
restaurantName: data.restaurantName,
})
? await mintAccount(
outcome,
{ email, contactName: data.contactName, restaurantName: data.restaurantName },
signup.id,
)
: { account: false, founderOutcome: FOUNDER_FALLBACK_NOTES[outcome.reason] };

// ── Tell the founder what happened ─────────────────────────────────────
Expand Down
Loading
Loading