- {startDate ? t("activeNextCharge", { date: shortDate(startDate) }) : t("active")} + {next ? t("activeNextCharge", { date: shortDate(next) }) : t("active")}
); } @@ -78,7 +89,7 @@ export default async function DashboardBillingPage() { interval: t(`interval.${intervalKeyOf(sub.interval)}`), })} - {statusNode(state, sub.startDate, b.id)} + {statusNode(sub, state, b.id)} ) : ({t("noPlan")}
diff --git a/app/(control)/dashboard/page.tsx b/app/(control)/dashboard/page.tsx index 17214ad..d8e8480 100644 --- a/app/(control)/dashboard/page.tsx +++ b/app/(control)/dashboard/page.tsx @@ -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: `{tp("processing")}
; -} - 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. @@ -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 ( -{isOwner ? t("ownerIntro") : t("intro")}
-- {tp("welcomeKicker")} -
-{whereItStands}
} -- {tp("amountLine", { - amount: eur(sub.amountCents), - interval: tp(`interval.${intervalKeyOf(sub.interval)}`), - })} -
- {planAction({ - state, - billingId: b.id, - isOwner, - locale, - restaurant, - tp, - })} -{t("ownerAllSet")}
- ) - ) : ( - <> -{t("empty")}
- ) : ( - - )} - - )} -{t("ownerIntro")}
+{tp("noPlan")}
+ ) : ( + cards.map(({ billing, domain, history, stage }) => ( ++ {nextCharge ? t("activeNextCharge", { date: shortDate(nextCharge) }) : t("active")} +
+ ); + } + return{t("inactive")}
; +} + +export default async function OwnerPlanCard(props: OwnerPlanCardProps) { + const { locale, billingId, restaurant, ownerName, subscription, firstPayments, history } = props; + const t = await getTranslations({ locale, namespace: "control.plan" }); + const state = planState(subscription ?? undefined, [...firstPayments]); + + return ( ++ {t("welcomeKicker")} +
++ {t("amountLine", { + amount: eur(subscription.amountCents), + interval: t(`interval.${intervalKeyOf(subscription.interval)}`), + })} +
+ {planAction({ + state, + billingId, + locale, + restaurant, + nextCharge: nextChargeDate(subscription.startDate, subscription.interval, new Date()), + t, + })} + + ) : ( +{t("noPlan")}
+ )} + +{tp("processing")}
; +} + +export default async function PartnerDashboard({ + locale, + partnerName, + billings, + clients, +}: { + readonly locale: string; + readonly partnerName: string; + readonly billings: PartnerBilling[]; + readonly clients: PartnerClient[]; +}) { + const t = await getTranslations({ locale, namespace: "control.dashboard" }); + const tp = await getTranslations({ locale, namespace: "control.plan" }); + + // Plans that still need the payer's attention: 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"; + }); + + return ( +{t("intro")}
++ {tp("welcomeKicker")} +
+{whereItStands}
++ {tp("amountLine", { + amount: eur(sub.amountCents), + interval: tp(`interval.${intervalKeyOf(sub.interval)}`), + })} +
+ {planAction({ state: planState(sub, b.payments), billingId: b.id, tp })} +{t("empty")}
+ ) : ( + + )} ++ {t("readyKicker")} +
+{t("readyTitle")}
+{t("readyBody", { domain })}
+ +{t("setPasswordWhy")}
++ {t("waitingKicker")} +
+{t(`${key}Title`)}
+{t(`${key}Body`)}
+