🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
subscription override (#744)
Bill Yang0c7ebbca524b
diff --git a/client/src/app/settings/organization/subscription/page.tsx b/client/src/app/settings/organization/subscription/page.tsxindex 5a8c9bcdd..067c3a549 100644--- a/client/src/app/settings/organization/subscription/page.tsx+++ b/client/src/app/settings/organization/subscription/page.tsx@@ -9,6 +9,7 @@ import { TrialPlan } from "../../../../components/subscription/TrialPlan";import { ExpiredTrialPlan } from "../../../../components/subscription/ExpiredTrialPlan";import { useSetPageTitle } from "../../../../hooks/useSetPageTitle";import { FreePlan } from "../../../../components/subscription/FreePlan";+import { OverridePlan } from "../../../../components/subscription/OverridePlan";import { Building } from "lucide-react";import { authClient } from "@/lib/auth";import { AppSumoPlan } from "../../../../components/subscription/AppSumoPlan";@@ -68,6 +69,10 @@ export default function OrganizationSubscriptionPage() {return <AppSumoPlan />;}+ if (activeSubscription.isOverride) {+ return <OverridePlan />;+ }+return <PaidPlan />;};diff --git a/client/src/components/subscription/OverridePlan.tsx b/client/src/components/subscription/OverridePlan.tsxnew file mode 100644index 000000000..5b0105907--- /dev/null+++ b/client/src/components/subscription/OverridePlan.tsx@@ -0,0 +1,96 @@+import { authClient } from "@/lib/auth";+import { AlertTriangle, Shield } from "lucide-react";+import { DateTime } from "luxon";+import { DEFAULT_EVENT_LIMIT } from "../../lib/subscription/constants";+import { useStripeSubscription } from "../../lib/subscription/useStripeSubscription";+import { Alert, AlertDescription, AlertTitle } from "../ui/alert";+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "../ui/card";+import { Progress } from "../ui/progress";+import { UsageChart } from "../UsageChart";++export function OverridePlan() {+ const { data: subscription } = useStripeSubscription();+ const { data: activeOrg } = authClient.useActiveOrganization();++ const organizationId = activeOrg?.id;++ const endDate = DateTime.now().toISODate();+ const startDate = DateTime.now().minus({ days: 30 }).toISODate();++ if (!subscription) return null;++ const currentUsage = subscription?.monthlyEventCount || 0;+ const limit = subscription?.eventLimit || DEFAULT_EVENT_LIMIT;++ const percentageUsed = Math.min((currentUsage / limit) * 100, 100);+ const isNearLimit = percentageUsed > 80;+ const isLimitExceeded = currentUsage >= limit;++ const formatPlanName = (name: string) => {+ const isPro = name.includes("pro");+ const eventMatch = name.match(/(\d+)(k|m)/i);+ if (!eventMatch) return name;++ const num = parseInt(eventMatch[1]);+ const unit = eventMatch[2].toLowerCase();+ const events = unit === "m" ? `${num}M` : `${num}K`;++ return `${isPro ? "Pro" : "Standard"} ${events}`;+ };++ return (+ <div className="space-y-6">+ <Card>+ <CardHeader>+ <CardTitle className="flex items-center gap-2">+ <Shield className="h-5 w-5" />+ {formatPlanName(subscription.planName)} Plan+ </CardTitle>+ <CardDescription>+ You have a custom plan with up to {subscription?.eventLimit.toLocaleString()} events per month.+ </CardDescription>+ </CardHeader>+ <CardContent>+ <div className="space-y-6">+ {isLimitExceeded ? (+ <Alert className="bg-red-50 dark:bg-red-900/20 border-red-200 dark:border-red-800">+ <AlertTriangle className="h-4 w-4 text-red-500 dark:text-red-400" />+ <AlertTitle>Event Limit Exceeded</AlertTitle>+ <AlertDescription>+ You have exceeded your monthly event limit. Please contact support for assistance.+ </AlertDescription>+ </Alert>+ ) : (+ isNearLimit && (+ <Alert className="bg-amber-50 dark:bg-amber-900/20 border-amber-200 dark:border-amber-800">+ <AlertTriangle className="h-4 w-4 text-amber-500 dark:text-amber-400" />+ <AlertTitle>Approaching Limit</AlertTitle>+ <AlertDescription>+ You are approaching your monthly event limit. Please contact support if you need more capacity.+ </AlertDescription>+ </Alert>+ )+ )}++ <div className="space-y-2">+ <h3 className="font-medium mb-2">Usage</h3>+ <div className="space-y-4">+ <div>+ <div className="flex justify-between mb-1">+ <span className="text-sm">Events</span>+ <span className="text-sm">+ {currentUsage.toLocaleString()} / {limit.toLocaleString()}+ </span>+ </div>+ <Progress value={percentageUsed} className={isNearLimit ? "bg-amber-100 dark:bg-amber-900" : ""} />+ </div>+ </div>+ </div>++ {organizationId && <UsageChart organizationId={organizationId} startDate={startDate} endDate={endDate} />}+ </div>+ </CardContent>+ </Card>+ </div>+ );+}diff --git a/client/src/lib/subscription/useStripeSubscription.ts b/client/src/lib/subscription/useStripeSubscription.tsindex 3b16648f9..de31d06b8 100644--- a/client/src/lib/subscription/useStripeSubscription.ts+++ b/client/src/lib/subscription/useStripeSubscription.ts@@ -17,6 +17,7 @@ export interface SubscriptionData {trialDaysRemaining?: number;message?: string; // For expired trial messageisPro?: boolean;+ isOverride?: boolean;}export function useStripeSubscription(): UseQueryResult<SubscriptionData, Error> {diff --git a/server/src/api/stripe/getSubscription.ts b/server/src/api/stripe/getSubscription.tsindex 82f283be6..088982afb 100644--- a/server/src/api/stripe/getSubscription.ts+++ b/server/src/api/stripe/getSubscription.ts@@ -37,6 +37,22 @@ export async function getSubscriptionInner(organizationId: string) {const subscription = await getBestSubscription(organizationId, org.stripeCustomerId);// Format response based on subscription source+ if (subscription.source === "override") {+ return {+ id: null,+ planName: subscription.planName,+ status: subscription.status,+ currentPeriodEnd: getStartOfNextMonth(),+ currentPeriodStart: getStartOfMonth(),+ eventLimit: subscription.eventLimit,+ monthlyEventCount: org.monthlyEventCount || 0,+ interval: subscription.interval,+ cancelAtPeriodEnd: subscription.cancelAtPeriodEnd,+ isPro: subscription.isPro,+ isOverride: true,+ };+ }+if (subscription.source === "appsumo") {return {id: null,diff --git a/server/src/db/postgres/schema.ts b/server/src/db/postgres/schema.tsindex ff417b03c..8bf7fde7c 100644--- a/server/src/db/postgres/schema.ts+++ b/server/src/db/postgres/schema.ts@@ -133,6 +133,7 @@ export const organization = pgTable(stripeCustomerId: text(),monthlyEventCount: integer().default(0),overMonthlyLimit: boolean().default(false),+ planOverride: text(), // Plan name override (e.g., "pro1m", "standard500k")},table => [unique("organization_slug_unique").on(table.slug)]);diff --git a/server/src/lib/subscriptionUtils.ts b/server/src/lib/subscriptionUtils.tsindex 469b8377c..1652f511a 100644--- a/server/src/lib/subscriptionUtils.ts+++ b/server/src/lib/subscriptionUtils.ts@@ -1,7 +1,8 @@-import { sql } from "drizzle-orm";+import { eq, sql } from "drizzle-orm";import { DateTime } from "luxon";import Stripe from "stripe";import { db } from "../db/postgres/postgres.js";+import { organization } from "../db/postgres/schema.js";import { APPSUMO_TIER_LIMITS, DEFAULT_EVENT_LIMIT, getStripePrices, StripePlan } from "./const.js";import { stripe } from "./stripe.js";@@ -40,7 +41,19 @@ export interface FreeSubscriptionInfo {status: "free";}-export type SubscriptionInfo = AppSumoSubscriptionInfo | StripeSubscriptionInfo | FreeSubscriptionInfo;+export interface OverrideSubscriptionInfo {+ source: "override";+ planName: string;+ eventLimit: number;+ replayLimit: number;+ periodStart: string;+ status: "active";+ interval: "month" | "year";+ cancelAtPeriodEnd: false;+ isPro: boolean;+}++export type SubscriptionInfo = AppSumoSubscriptionInfo | StripeSubscriptionInfo | FreeSubscriptionInfo | OverrideSubscriptionInfo;/*** Gets the first day of the current month in YYYY-MM-DD format@@ -84,6 +97,48 @@ export async function getAppSumoSubscription(organizationId: string): Promise<Ap}}+/**+ * Gets plan override subscription info for an organization+ * @returns Override subscription info or null if no override set+ */+export async function getOverrideSubscription(organizationId: string): Promise<OverrideSubscriptionInfo | null> {+ try {+ const orgResult = await db+ .select({ planOverride: organization.planOverride })+ .from(organization)+ .where(eq(organization.id, organizationId))+ .limit(1);++ const org = orgResult[0];+ if (!org?.planOverride) {+ return null;+ }++ // Look up plan details from the plan name+ const planDetails = getStripePrices().find((plan: StripePlan) => plan.name === org.planOverride);++ if (!planDetails) {+ console.error("Plan override not found in price list:", org.planOverride);+ return null;+ }++ return {+ source: "override",+ planName: planDetails.name,+ eventLimit: planDetails.limits.events,+ replayLimit: planDetails.limits.replays,+ periodStart: getStartOfMonth(),+ status: "active",+ interval: planDetails.interval,+ cancelAtPeriodEnd: false,+ isPro: planDetails.name.includes("pro"),+ };+ } catch (error) {+ console.error("Error checking plan override:", error);+ return null;+ }+}+/*** Gets Stripe subscription info for an organization* @returns Stripe subscription info or null if no active subscription found@@ -169,14 +224,20 @@ export async function getStripeSubscription(}/**- * Gets the best subscription for an organization (highest event limit)- * Checks both AppSumo and Stripe subscriptions and returns the one with the higher limit- * @returns The subscription with the highest event limit, or free tier if none found+ * Gets the best subscription for an organization+ * Priority: Override > AppSumo/Stripe (highest limit) > Free+ * @returns The active subscription, or free tier if none found*/export async function getBestSubscription(organizationId: string,stripeCustomerId: string | null): Promise<SubscriptionInfo> {+ // Check override first - always wins+ const overrideSub = await getOverrideSubscription(organizationId);+ if (overrideSub) {+ return overrideSub;+ }+// Get both subscription typesconst [appsumoSub, stripeSub] = await Promise.all([getAppSumoSubscription(organizationId),