link to billing page

messages/en-US.json

@@ -18,6 +18,8 @@
     "componentsMember": "You're a member of {count, plural, =0 {no organization} one {one organization} other {# organizations}}.",
     "componentsInvalidKey": "Invalid or expired license keys detected. Follow license terms to continue using all features.",
     "dismiss": "Dismiss",
+    "subscriptionViolationMessage": "You're beyond your limits for your current plan. Correct the problem by removing sites, users, or other resources to stay within your plan.",
+    "subscriptionViolationViewBilling": "View billing",
     "componentsLicenseViolation": "License Violation: This server is using {usedSites} sites which exceeds its licensed limit of {maxSites} sites. Follow license terms to continue using all features.",
     "componentsSupporterMessage": "Thank you for supporting Pangolin as a {tier}!",
     "inviteErrorNotValid": "We're sorry, but it looks like the invite you're trying to access has not been accepted or is no longer valid.",
@@ -1961,6 +1963,12 @@
     "orgAuthNoAccount": "Don't have an account?",
     "subscriptionRequiredToUse": "A subscription is required to use this feature.",
     "mustUpgradeToUse": "You must upgrade your subscription to use this feature.",
+    "subscriptionRequiredTierToUse": "This feature requires <tierLink>{tier}</tierLink> or higher.",
+    "upgradeToTierToUse": "Upgrade to <tierLink>{tier}</tierLink> or higher to use this feature.",
+    "subscriptionTierTier1": "Home",
+    "subscriptionTierTier2": "Team",
+    "subscriptionTierTier3": "Business",
+    "subscriptionTierEnterprise": "Enterprise",
     "idpDisabled": "Identity providers are disabled.",
     "orgAuthPageDisabled": "Organization auth page is disabled.",
     "domainRestartedDescription": "Domain verification restarted successfully",

server/db/pg/schema/privateSchema.ts

@@ -140,6 +140,7 @@ export const limits = pgTable("limits", {
         })
         .notNull(),
     value: real("value"),
+    override: boolean("override").default(false),
     description: text("description")
 });
 

server/db/sqlite/schema/privateSchema.ts

@@ -129,6 +129,7 @@ export const limits = sqliteTable("limits", {
         })
         .notNull(),
     value: real("value"),
+    override: integer("override", { mode: "boolean" }).default(false),
     description: text("description")
 });
 

server/lib/billing/features.ts

@@ -57,7 +57,7 @@ export function getFeatureIdByMetricId(
 export type FeaturePriceSet = Partial<Record<FeatureId, string>>;
 
 export const homeLabFeaturePriceSet: FeaturePriceSet = {
-    [FeatureId.TIER1]: "price_1SxgpPDCpkOb237Bfo4rIsoT"
+    [FeatureId.TIER1]: "price_1SzVE3D3Ee2Ir7Wm6wT5Dl3G"
 };
 
 export const homeLabFeaturePriceSetSandbox: FeaturePriceSet = {
@@ -76,7 +76,7 @@ export function getHomeLabFeaturePriceSet(): FeaturePriceSet {
 }
 
 export const tier2FeaturePriceSet: FeaturePriceSet = {
-    [FeatureId.USERS]: "price_1SxaEHDCpkOb237BD9lBkPiR"
+    [FeatureId.USERS]: "price_1SzVCcD3Ee2Ir7Wmn6U3KvPN"
 };
 
 export const tier2FeaturePriceSetSandbox: FeaturePriceSet = {
@@ -95,7 +95,7 @@ export function getStarterFeaturePriceSet(): FeaturePriceSet {
 }
 
 export const tier3FeaturePriceSet: FeaturePriceSet = {
-    [FeatureId.USERS]: "price_1SxaEODCpkOb237BiXdCBSfs"
+    [FeatureId.USERS]: "price_1SzVDKD3Ee2Ir7WmPtOKNusv"
 };
 
 export const tier3FeaturePriceSetSandbox: FeaturePriceSet = {

server/lib/billing/limitsService.ts

@@ -2,6 +2,7 @@ import { db, limits } from "@server/db";
 import { and, eq } from "drizzle-orm";
 import { LimitSet } from "./limitSet";
 import { FeatureId } from "./features";
+import logger from "@server/logger";
 
 class LimitService {
     async applyLimitSetToOrg(orgId: string, limitSet: LimitSet): Promise<void> {
@@ -13,6 +14,21 @@ class LimitService {
             for (const [featureId, entry] of limitEntries) {
                 const limitId = `${orgId}-${featureId}`;
                 const { value, description } = entry;
+                // get the limit first
+                const [limit] = await trx
+                    .select()
+                    .from(limits)
+                    .where(eq(limits.limitId, limitId))
+                    .limit(1);
+
+                // check if its overriden
+                if (limit && limit.override) {
+                    logger.debug(
+                        `Skipping limit ${limitId} for org ${orgId} since it is overridden...`
+                    );
+                    continue;
+                }
+
                 await trx
                     .insert(limits)
                     .values({ limitId, orgId, featureId, value, description });

server/private/lib/config.ts

@@ -125,13 +125,6 @@ export class PrivateConfig {
                 this.rawPrivateConfig.server.reo_client_id;
         }
 
-        if (this.rawPrivateConfig.stripe?.s3Bucket) {
-            process.env.S3_BUCKET = this.rawPrivateConfig.stripe.s3Bucket;
-        }
-
-        if (this.rawPrivateConfig.stripe?.s3Region) {
-            process.env.S3_REGION = this.rawPrivateConfig.stripe.s3Region;
-        }
         if (this.rawPrivateConfig.flags.use_pangolin_dns) {
             process.env.USE_PANGOLIN_DNS =
                 this.rawPrivateConfig.flags.use_pangolin_dns.toString();

server/private/lib/readConfigFile.ts

@@ -176,9 +176,9 @@ export const privateConfigSchema = z.object({
                 .string()
                 .optional()
                 .transform(getEnvOrYaml("STRIPE_WEBHOOK_SECRET")),
-            s3Bucket: z.string(),
-            s3Region: z.string().default("us-east-1"),
-            localFilePath: z.string().optional()
+            // s3Bucket: z.string(),
+            // s3Region: z.string().default("us-east-1"),
+            // localFilePath: z.string().optional()
         })
         .optional()
 });

server/private/routers/billing/createCheckoutSession.ts

@@ -105,6 +105,7 @@ export async function createCheckoutSession(
             line_items: lineItems,
             customer: customer.customerId,
             mode: "subscription",
+            allow_promotion_codes: true,
             success_url: `${config.getRawConfig().app.dashboard_url}/${orgId}/settings/billing?success=true&session_id={CHECKOUT_SESSION_ID}`,
             cancel_url: `${config.getRawConfig().app.dashboard_url}/${orgId}/settings/billing?canceled=true`
         });

server/private/routers/billing/getOrgSubscriptions.ts

@@ -23,6 +23,8 @@ import logger from "@server/logger";
 import { fromZodError } from "zod-validation-error";
 import { OpenAPITags, registry } from "@server/openApi";
 import { GetOrgSubscriptionResponse } from "@server/routers/billing/types";
+import { usageService } from "@server/lib/billing/usageService";
+import { build } from "@server/build";
 
 // Import tables for billing
 import {
@@ -70,9 +72,19 @@ export async function getOrgSubscriptions(
             throw err;
         }
 
+        let limitsExceeded = false;
+        if (build === "saas") {
+            try {
+                limitsExceeded = await usageService.checkLimitSet(orgId);
+            } catch (err) {
+                logger.error("Error checking limits for org %s: %s", orgId, err);
+            }
+        }
+
         return response<GetOrgSubscriptionResponse>(res, {
             data: {
-                subscriptions
+                subscriptions,
+                ...(build === "saas" ? { limitsExceeded } : {})
             },
             success: true,
             error: false,

server/private/routers/generatedLicense/generateNewEnterpriseLicense.ts

@@ -126,6 +126,7 @@ export async function generateNewEnterpriseLicense(
             ], // Start with the standard feature set that matches the free limits
             customer: customer.customerId,
             mode: "subscription",
+            allow_promotion_codes: true,
             success_url: `${config.getRawConfig().app.dashboard_url}/${orgId}/settings/license?success=true&session_id={CHECKOUT_SESSION_ID}`,
             cancel_url: `${config.getRawConfig().app.dashboard_url}/${orgId}/settings/license?canceled=true`
         });

server/routers/billing/types.ts

@@ -2,6 +2,8 @@ import { Limit, Subscription, SubscriptionItem, Usage } from "@server/db";
 
 export type GetOrgSubscriptionResponse = {
     subscriptions: Array<{ subscription: Subscription; items: SubscriptionItem[] }>;
+    /** When build === saas, true if org has exceeded plan limits (sites, users, etc.) */
+    limitsExceeded?: boolean;
 };
 
 export type GetOrgUsageResponse = {

server/routers/org/updateOrg.ts

@@ -120,7 +120,7 @@ export async function updateOrg(
             // Determine max allowed retention days based on tier
             let maxRetentionDays: number | null = null;
             if (!tier) {
-                maxRetentionDays = 0;
+                maxRetentionDays = 3;
             } else if (tier === "tier1") {
                 maxRetentionDays = 7;
             } else if (tier === "tier2") {

src/app/[orgId]/layout.tsx

@@ -19,6 +19,7 @@ import OrgPolicyResult from "@app/components/OrgPolicyResult";
 import UserProvider from "@app/providers/UserProvider";
 import { Layout } from "@app/components/Layout";
 import ApplyInternalRedirect from "@app/components/ApplyInternalRedirect";
+import SubscriptionViolation from "@app/components/SubscriptionViolation";
 
 export default async function OrgLayout(props: {
     children: React.ReactNode;
@@ -108,6 +109,7 @@ export default async function OrgLayout(props: {
         >
             <ApplyInternalRedirect orgId={orgId} />
             {props.children}
+            {build === "saas" && <SubscriptionViolation />}
             <SetLastOrgCookie orgId={orgId} />
         </SubscriptionStatusProvider>
     );

src/app/[orgId]/settings/general/security/page.tsx

@@ -137,7 +137,7 @@ function LogRetentionSectionForm({ org }: SectionFormProps) {
 
     const router = useRouter();
     const t = useTranslations();
-    const { isPaidUser, hasSaasSubscription } = usePaidStatus();
+    const { isPaidUser, subscriptionTier } = usePaidStatus();
 
     const [, formAction, loadingSave] = useActionState(performSave, null);
     const { env } = useEnvContext();
@@ -219,13 +219,31 @@ function LogRetentionSectionForm({ org }: SectionFormProps) {
                                                 <SelectContent>
                                                     {LOG_RETENTION_OPTIONS.filter(
                                                         (option) => {
-                                                            if (
-                                                                hasSaasSubscription &&
-                                                                option.value >
-                                                                    30
-                                                            ) {
+                                                            let maxDays: number;
+
+                                                            if (!subscriptionTier) {
+                                                                // No tier
+                                                                maxDays = 3;
+                                                            } else if (subscriptionTier == "enterprise") {
+                                                                // Enterprise - no limit
+                                                                return true;
+                                                            } else if (subscriptionTier == "tier3") {
+                                                                maxDays = 90;
+                                                            } else if (subscriptionTier == "tier2") {
+                                                                maxDays = 30;
+                                                            } else if (subscriptionTier == "tier1") {
+                                                                maxDays = 7;
+                                                            } else {
+                                                                // Default to most restrictive
+                                                                maxDays = 3;
+                                                            }
+
+                                                            // Filter out options that exceed the max
+                                                            // Special values: -1 (forever) and 9001 (end of year) should be filtered
+                                                            if (option.value < 0 || option.value > maxDays) {
                                                                 return false;
                                                             }
+
                                                             return true;
                                                         }
                                                     ).map((option) => (
@@ -294,7 +312,36 @@ function LogRetentionSectionForm({ org }: SectionFormProps) {
                                                                 />
                                                             </SelectTrigger>
                                                             <SelectContent>
-                                                                {LOG_RETENTION_OPTIONS.map(
+                                                                {LOG_RETENTION_OPTIONS.filter(
+                                                                    (option) => {
+                                                                        let maxDays: number;
+
+                                                                        if (!subscriptionTier) {
+                                                                            // No tier
+                                                                            maxDays = 3;
+                                                                        } else if (subscriptionTier == "enterprise") {
+                                                                            // Enterprise - no limit
+                                                                            return true;
+                                                                        } else if (subscriptionTier == "tier3") {
+                                                                            maxDays = 90;
+                                                                        } else if (subscriptionTier == "tier2") {
+                                                                            maxDays = 30;
+                                                                        } else if (subscriptionTier == "tier1") {
+                                                                            maxDays = 7;
+                                                                        } else {
+                                                                            // Default to most restrictive
+                                                                            maxDays = 3;
+                                                                        }
+
+                                                                        // Filter out options that exceed the max
+                                                                        // Special values: -1 (forever) and 9001 (end of year) should be filtered
+                                                                        if (option.value < 0 || option.value > maxDays) {
+                                                                            return false;
+                                                                        }
+
+                                                                        return true;
+                                                                    }
+                                                                ).map(
                                                                     (
                                                                         option
                                                                     ) => (
@@ -362,7 +409,36 @@ function LogRetentionSectionForm({ org }: SectionFormProps) {
                                                                 />
                                                             </SelectTrigger>
                                                             <SelectContent>
-                                                                {LOG_RETENTION_OPTIONS.map(
+                                                                {LOG_RETENTION_OPTIONS.filter(
+                                                                    (option) => {
+                                                                        let maxDays: number;
+
+                                                                        if (!subscriptionTier) {
+                                                                            // No tier
+                                                                            maxDays = 3;
+                                                                        } else if (subscriptionTier == "enterprise") {
+                                                                            // Enterprise - no limit
+                                                                            return true;
+                                                                        } else if (subscriptionTier == "tier3") {
+                                                                            maxDays = 90;
+                                                                        } else if (subscriptionTier == "tier2") {
+                                                                            maxDays = 30;
+                                                                        } else if (subscriptionTier == "tier1") {
+                                                                            maxDays = 7;
+                                                                        } else {
+                                                                            // Default to most restrictive
+                                                                            maxDays = 3;
+                                                                        }
+
+                                                                        // Filter out options that exceed the max
+                                                                        // Special values: -1 (forever) and 9001 (end of year) should be filtered
+                                                                        if (option.value < 0 || option.value > maxDays) {
+                                                                            return false;
+                                                                        }
+
+                                                                        return true;
+                                                                    }
+                                                                ).map(
                                                                     (
                                                                         option
                                                                     ) => (

src/app/[orgId]/settings/logs/access/page.tsx

@@ -618,9 +618,9 @@ export default function GeneralPage() {
                 isRefreshing={isRefreshing}
                 onExport={() => startTransition(exportData)}
                 isExporting={isExporting}
-                isExportDisabled={
-                    !isPaidUser(tierMatrix.accessLogs) || build === "oss"
-                }
+                // isExportDisabled={ // not disabling this because the user should be able to click the button and get the feedback about needing to upgrade the plan
+                //     !isPaidUser(tierMatrix.accessLogs) || build === "oss"
+                // }
                 onDateRangeChange={handleDateRangeChange}
                 dateRange={{
                     start: dateRange.startDate,

src/app/[orgId]/settings/logs/action/page.tsx

@@ -472,9 +472,9 @@ export default function GeneralPage() {
                 onRefresh={refreshData}
                 isRefreshing={isRefreshing}
                 onExport={() => startTransition(exportData)}
-                isExportDisabled={
-                    !isPaidUser(tierMatrix.logExport) || build === "oss"
-                }
+                // isExportDisabled={ // not disabling this because the user should be able to click the button and get the feedback about needing to upgrade the plan
+                //     !isPaidUser(tierMatrix.logExport) || build === "oss"
+                // }
                 isExporting={isExporting}
                 onDateRangeChange={handleDateRangeChange}
                 dateRange={{

src/components/PaidFeaturesAlert.tsx

@@ -3,17 +3,54 @@
 import { Card, CardContent } from "@app/components/ui/card";
 import { build } from "@server/build";
 import { usePaidStatus } from "@app/hooks/usePaidStatus";
-import { ExternalLink, KeyRound, Sparkles } from "lucide-react";
+import { ExternalLink, KeyRound } from "lucide-react";
 import { useTranslations } from "next-intl";
 import Link from "next/link";
 import { useEnvContext } from "@app/hooks/useEnvContext";
 import { Tier } from "@server/types/Tiers";
+import { useParams } from "next/navigation";
+
+const TIER_ORDER: Tier[] = ["tier1", "tier2", "tier3", "enterprise"];
+
+const TIER_TRANSLATION_KEYS: Record<Tier, "subscriptionTierTier1" | "subscriptionTierTier2" | "subscriptionTierTier3" | "subscriptionTierEnterprise"> = {
+    tier1: "subscriptionTierTier1",
+    tier2: "subscriptionTierTier2",
+    tier3: "subscriptionTierTier3",
+    enterprise: "subscriptionTierEnterprise"
+};
+
+function getRequiredTier(tiers: Tier[]): Tier | null {
+    if (tiers.length === 0) return null;
+    let min: Tier | null = null;
+    for (const tier of tiers) {
+        const idx = TIER_ORDER.indexOf(tier);
+        if (idx === -1) continue;
+        if (min === null || TIER_ORDER.indexOf(min) > idx) {
+            min = tier;
+        }
+    }
+    return min;
+}
 
 const bannerClassName =
-    "mb-6 border-primary/30 bg-linear-to-br from-primary/10 via-background to-background overflow-hidden";
+    "mb-6 border-purple-500/30 bg-linear-to-br from-purple-500/10 via-background to-background overflow-hidden";
 const bannerContentClassName = "py-3 px-4";
 const bannerRowClassName =
     "flex items-center gap-2.5 text-sm text-muted-foreground";
+const bannerIconClassName = "size-4 shrink-0 text-purple-500";
+
+function getTierLinkRenderer(billingHref: string) {
+    return function tierLinkRenderer(chunks: React.ReactNode) {
+        return (
+            <Link
+                href={billingHref}
+                className="inline-flex items-center gap-1 font-medium text-purple-600 underline"
+            >
+                {chunks}
+            </Link>
+        );
+    };
+}
 
 type Props = {
     tiers: Tier[];
@@ -21,8 +58,14 @@ type Props = {
 
 export function PaidFeaturesAlert({ tiers }: Props) {
     const t = useTranslations();
-    const { hasSaasSubscription, hasEnterpriseLicense, isActive } = usePaidStatus();
+    const params = useParams();
+    const orgId = params?.orgId as string | undefined;
+    const { hasSaasSubscription, hasEnterpriseLicense, isActive, subscriptionTier } = usePaidStatus();
     const { env } = useEnvContext();
+    const requiredTier = getRequiredTier(tiers);
+    const requiredTierName = requiredTier ? t(TIER_TRANSLATION_KEYS[requiredTier]) : null;
+    const billingHref = orgId ? `/${orgId}/settings/billing` : "https://pangolin.net/pricing";
+    const tierLinkRenderer = getTierLinkRenderer(billingHref);
 
     if (env.flags.disableEnterpriseFeatures) {
         return null;
@@ -34,8 +77,22 @@ export function PaidFeaturesAlert({ tiers }: Props) {
                 <Card className={bannerClassName}>
                     <CardContent className={bannerContentClassName}>
                         <div className={bannerRowClassName}>
-                            <KeyRound className="size-4 shrink-0 text-primary" />
-                            <span>{isActive ? t("mustUpgradeToUse") : t("subscriptionRequiredToUse")}</span>
+                            <KeyRound className={bannerIconClassName} />
+                            <span>
+                                {requiredTierName
+                                    ? isActive
+                                        ? t.rich("upgradeToTierToUse", {
+                                            tier: requiredTierName,
+                                            tierLink: tierLinkRenderer
+                                        })
+                                        : t.rich("subscriptionRequiredTierToUse", {
+                                            tier: requiredTierName,
+                                            tierLink: tierLinkRenderer
+                                        })
+                                    : isActive
+                                      ? t("mustUpgradeToUse")
+                                      : t("subscriptionRequiredToUse")}
+                            </span>
                         </div>
                     </CardContent>
                 </Card>
@@ -45,7 +102,7 @@ export function PaidFeaturesAlert({ tiers }: Props) {
                 <Card className={bannerClassName}>
                     <CardContent className={bannerContentClassName}>
                         <div className={bannerRowClassName}>
-                            <KeyRound className="size-4 shrink-0 text-primary" />
+                            <KeyRound className={bannerIconClassName} />
                             <span>{t("licenseRequiredToUse")}</span>
                         </div>
                     </CardContent>
@@ -53,10 +110,10 @@ export function PaidFeaturesAlert({ tiers }: Props) {
             ) : null}
 
             {build === "oss" && !hasEnterpriseLicense ? (
-                <Card className="mb-6 border-purple-500/30 bg-linear-to-br from-purple-500/10 via-background to-background overflow-hidden">
+                <Card className={bannerClassName}>
                     <CardContent className={bannerContentClassName}>
                         <div className={bannerRowClassName}>
-                            <KeyRound className="size-4 shrink-0 text-purple-500" />
+                            <KeyRound className={bannerIconClassName} />
                             <span>
                                 {t.rich("ossEnterpriseEditionRequired", {
                                     enterpriseEditionLink: (chunks) => (

src/components/SubscriptionViolation.tsx

@@ -0,0 +1,50 @@
+"use client";
+
+import { Button } from "@app/components/ui/button";
+import { useSubscriptionStatusContext } from "@app/hooks/useSubscriptionStatusContext";
+import { useState } from "react";
+import Link from "next/link";
+import { useParams } from "next/navigation";
+import { useTranslations } from "next-intl";
+
+export default function SubscriptionViolation() {
+    const context = useSubscriptionStatusContext();
+    const [isDismissed, setIsDismissed] = useState(false);
+    const params = useParams();
+    const orgId = params?.orgId as string | undefined;
+    const t = useTranslations();
+
+    if (!context?.limitsExceeded || isDismissed) return null;
+
+    const billingHref = orgId ? `/${orgId}/settings/billing` : "/";
+
+    return (
+        <div className="fixed bottom-0 left-0 right-0 w-full bg-amber-600 text-white p-4 text-center z-50">
+            <div className="flex flex-wrap justify-center items-center gap-2 sm:gap-4">
+                <p className="text-sm sm:text-base">
+                    {t("subscriptionViolationMessage")}
+                </p>
+                <div className="flex items-center gap-2">
+                    <Button
+                        variant="secondary"
+                        size="sm"
+                        className="bg-white/20 hover:bg-white/30 text-white border-0"
+                        asChild
+                    >
+                        <Link href={billingHref}>
+                            {t("subscriptionViolationViewBilling")}
+                        </Link>
+                    </Button>
+                    <Button
+                        variant="ghost"
+                        size="sm"
+                        className="hover:bg-white/20 text-white"
+                        onClick={() => setIsDismissed(true)}
+                    >
+                        {t("dismiss")}
+                    </Button>
+                </div>
+            </div>
+        </div>
+    );
+}

src/contexts/subscriptionStatusContext.ts

@@ -8,6 +8,8 @@ type SubscriptionStatusContextType = {
     getTier: () => { tier: Tier | null; active: boolean };
     isSubscribed: () => boolean;
     subscribed: boolean;
+    /** True when org has exceeded plan limits (sites, users, etc.). Only set when build === saas. */
+    limitsExceeded: boolean;
 };
 
 const SubscriptionStatusContext = createContext<

src/providers/SubscriptionStatusProvider.tsx

@@ -68,6 +68,8 @@ export function SubscriptionStatusProvider({
 
     const [subscribed, setSubscribed] = useState<boolean>(isSubscribed());
 
+    const limitsExceeded = subscriptionStatusState?.limitsExceeded ?? false;
+
     return (
         <SubscriptionStatusContext.Provider
             value={{
@@ -75,7 +77,8 @@ export function SubscriptionStatusProvider({
                 updateSubscriptionStatus,
                 getTier,
                 isSubscribed,
-                subscribed
+                subscribed,
+                limitsExceeded
             }}
         >
             {children}