New Pricing changes

OpnForm · JhumanJ · Mar 28, 2026 · Jan 28, 2026 · Jan 29, 2026 · Jan 29, 2026
commit ff28195573b9f24a88e06502f1d0b3991748cb4d
diff --git a/api/app/Http/Resources/FormResource.php b/api/app/Http/Resources/FormResource.php
@@ -51,6 +51,7 @@ public function toArray($request)
        return array_merge(parent::toArray($request), $ownerData, [
            'settings' => $this->settings ?? new \stdClass(),
            'is_pro' => $this->workspaceIsPro(),
+            'is_business' => $this->workspaceIsBusiness(),
            'is_trialing' => $this->workspaceIsTrialing(),
            'workspace_id' => $this->workspace_id,
            'workspace' => $this->userIsFormOwner()
@@ -111,6 +112,11 @@ private function workspaceIsPro()
        return $this->workspace->is_pro ?? $this->is_pro;
    }

+    private function workspaceIsBusiness()
+    {
+        return $this->workspace->is_business ?? $this->is_business;
+    }
+
    private function workspaceIsTrialing()
    {
        return $this->workspace->is_trialing;

diff --git a/api/app/Http/Resources/UserResource.php b/api/app/Http/Resources/UserResource.php
@@ -21,6 +21,7 @@ public function toArray($request)

            // Legacy - kept for backward compatibility (derive from plan_tier in frontend)
            'is_pro' => $this->is_pro,
+            'is_business' => $this->is_business,
            'is_subscribed' => $this->is_subscribed,

            'admin' => $this->admin,

diff --git a/api/app/Models/Forms/Form.php b/api/app/Models/Forms/Form.php
@@ -195,6 +195,13 @@ public function getIsProAttribute()
        });
    }

+    public function getIsBusinessAttribute()
+    {
+        return $this->remember('is_business', 15 * 60, function (): ?bool {
+            return $this->workspace?->is_business === true;
+        });
+    }
+
    public function getShareUrlAttribute()
    {
        if ($this->custom_domain) {

diff --git a/api/app/Models/User.php b/api/app/Models/User.php
@@ -96,6 +96,7 @@ protected function casts()
        'has_forms',
        'is_subscribed',
        'is_pro',
+        'is_business',
        'active_license',
        'plan_tier',
    ];
@@ -203,6 +204,22 @@ public function getIsProAttribute()
        });
    }

+    public function getIsBusinessAttribute()
+    {
+        return $this->remember('is_business', 5 * 60, function (): bool {
+            // Use loaded relationship if available to avoid queries
+            if ($this->relationLoaded('workspaces')) {
+                return $this->workspaces->some(function ($workspace) {
+                    return $workspace->is_business;
+                });
+            }
+
+            return $this->workspaces()->get()->some(function ($workspace) {
+                return $workspace->is_business;
+            });
+        });
+    }
+
    /**
     * Get the user's current plan tier.
     * This is the SINGLE source of truth for plan status.

diff --git a/api/app/Models/Workspace.php b/api/app/Models/Workspace.php
@@ -21,6 +21,8 @@ class Workspace extends Model implements CachableAttributes

    public const MAX_DOMAIN_PRO = 1;

+    private const CACHE_TTL = 15 * 60;
+
    protected $fillable = [
        'name',
        'icon',
@@ -37,6 +39,7 @@ class Workspace extends Model implements CachableAttributes
    protected $appends = [
        'plan_tier',
        'is_pro',
+        'is_business',
        'is_trialing',
        'is_enterprise',
        'users_count',
@@ -55,6 +58,7 @@ protected function casts(): array
    protected $cachableAttributes = [
        'plan_tier',
        'is_pro',
+        'is_business',
        'is_trialing',
        'is_enterprise',
        'is_risky',
@@ -65,13 +69,27 @@ protected function casts(): array
        'users_count',
    ];

+    /**
+     * Flush workspace cache and also flush owners' cache (is_pro depends on workspace tier).
+     */
+    public function flush(): bool
+    {
+        $result = parent::flush();
+
+        foreach ($this->owners as $owner) {
+            $owner->flush();
+        }
+
+        return $result;
+    }
+
    public function getMaxFileSizeAttribute()
    {
        if (!pricing_enabled()) {
            return self::MAX_FILE_SIZE_PRO;
        }

-        return $this->remember('max_file_size', 15 * 60, function (): int {
+        return $this->remember('max_file_size', self::CACHE_TTL, function (): int {
            // 1. Check workspace-level override
            $overrideLimit = $this->plan_overrides['limits']['file_upload_size'] ?? null;
            if ($overrideLimit !== null) {
@@ -98,7 +116,7 @@ public function getCustomDomainCountLimitAttribute()
            return null;
        }

-        return $this->remember('custom_domain_count', 15 * 60, function (): ?int {
+        return $this->remember('custom_domain_count', self::CACHE_TTL, function (): ?int {
            // 1. Check workspace-level override
            $overrideLimit = $this->plan_overrides['limits']['custom_domain_count'] ?? null;
            if ($overrideLimit !== null) {
@@ -140,20 +158,33 @@ public function getIsProAttribute()
            return true;    // If no paid plan so TRUE for ALL
        }

-        return $this->remember('is_pro', 15 * 60, function (): bool {
+        return $this->remember('is_pro', self::CACHE_TTL, function (): bool {
            $tier = app(\App\Service\Plan\PlanService::class)->computeWorkspaceTier($this);

            return in_array($tier, ['pro', 'business', 'enterprise']);
        });
    }

+    public function getIsBusinessAttribute()
+    {
+        if (!pricing_enabled()) {
+            return true;    // If no paid plan so TRUE for ALL
+        }
+
+        return $this->remember('is_business', self::CACHE_TTL, function (): bool {
+            $tier = app(\App\Service\Plan\PlanService::class)->computeWorkspaceTier($this);
+
+            return in_array($tier, ['business', 'enterprise']);
+        });
+    }
+
    public function getIsTrialingAttribute()
    {
        if (!pricing_enabled()) {
            return false;    // If no paid plan so FALSE for ALL
        }

-        return $this->remember('is_trialing', 15 * 60, function (): bool {
+        return $this->remember('is_trialing', self::CACHE_TTL, function (): bool {
            // Make sure at least one owner is trialing
            $owners = $this->relationLoaded('users')
                ? $this->users->where('pivot.role', 'admin')
@@ -179,7 +210,7 @@ public function getIsEnterpriseAttribute()
            return true;    // If no paid plan so TRUE for ALL
        }

-        return $this->remember('is_enterprise', 15 * 60, function (): bool {
+        return $this->remember('is_enterprise', self::CACHE_TTL, function (): bool {
            $tier = app(\App\Service\Plan\PlanService::class)->computeWorkspaceTier($this);

            return $tier === 'enterprise';
@@ -188,7 +219,7 @@ public function getIsEnterpriseAttribute()

    public function getIsRiskyAttribute()
    {
-        return $this->remember('is_risky', 15 * 60, function (): bool {
+        return $this->remember('is_risky', self::CACHE_TTL, function (): bool {
            foreach ($this->owners as $owner) {
                if (!$owner->is_risky) {
                    return false;
@@ -205,7 +236,7 @@ public function getIsYearlyPlanAttribute()
            return false;
        }

-        return $this->remember('is_yearly_plan', 15 * 60, function (): bool {
+        return $this->remember('is_yearly_plan', self::CACHE_TTL, function (): bool {
            $owners = $this->relationLoaded('users')
                ? $this->users->where('pivot.role', 'admin')
                : $this->owners()->get();
@@ -225,7 +256,7 @@ public function getIsYearlyPlanAttribute()

    public function getSubmissionsCountAttribute()
    {
-        return $this->remember('submissions_count', 15 * 60, function (): int {
+        return $this->remember('submissions_count', self::CACHE_TTL, function (): int {
            $total = 0;
            // Use loaded relationship if available to avoid queries
            $forms = $this->relationLoaded('forms')
@@ -242,7 +273,7 @@ public function getSubmissionsCountAttribute()

    public function getUsersCountAttribute()
    {
-        return $this->remember('users_count', 15 * 60, function (): int {
+        return $this->remember('users_count', self::CACHE_TTL, function (): int {
            // Use loaded relationship if available to avoid queries
            if ($this->relationLoaded('users')) {
                return $this->users->count();
@@ -349,7 +380,7 @@ public function isReadonlyUser(?User $user)
     */
    public function hasFeature(string $feature): bool
    {
-        return $this->remember('has_feature_' . $feature, 15 * 60, function () use ($feature): bool {
+        return $this->remember('has_feature_' . $feature, self::CACHE_TTL, function () use ($feature): bool {
            return app(\App\Service\Plan\PlanService::class)->workspaceHasFeature($this, $feature);
        });
    }

diff --git a/client/components/dashboard/WorkspaceDropdown.vue b/client/components/dashboard/WorkspaceDropdown.vue
@@ -137,7 +137,7 @@ const isDropdownOpen = ref(false)
 // Computed text for workspace plan
 const workspacePlanText = computed(() => {
  if (!workspace.value) return ''
-  return workspace.value.is_pro ? 'Pro Plan' : 'Free Plan'
+  return workspace.value.is_business ? 'Business Plan' : workspace.value.is_pro ? 'Pro Plan' : 'Free Plan'
 })

 // Computed text for member count

diff --git a/client/components/layouts/AppSidebar.vue b/client/components/layouts/AppSidebar.vue
@@ -127,10 +127,23 @@ const navigationSections = computed(() => [
        onClick: () => {
          useAmplitude().logEvent('app_sidebar_upgrade_click')
          openSubscriptionModal({
+            plan: 'pro',
            modal_title: 'Upgrade to Pro plan',
          })
        },
        color: 'primary' // Override default color
+      })] : []),
+      ...(workspace.value && workspace.value.is_pro && !workspace.value.is_business && !isSelfHosted.value ? [createNavItem({
+        label: 'Upgrade to Business',
+        icon: 'i-heroicons-sparkles-solid',
+        onClick: () => {
+          useAmplitude().logEvent('app_sidebar_upgrade_click')
+          openSubscriptionModal({
+            plan: 'business',
+            modal_title: 'Upgrade to Business plan',
+          })
+        },
+        color: 'primary' // Override default color
      })] : [])
    ]
  },

diff --git a/client/components/open/forms/components/form-components/FormCustomSeo.vue b/client/components/open/forms/components/form-components/FormCustomSeo.vue
@@ -6,6 +6,7 @@
          <h3 class="text-lg font-medium text-neutral-900">
            SEO & Social Sharing - Meta <PlanTag
            class="ml-2"
+            required-tier="business"
            upgrade-modal-title="Upgrade to Enhance Your Form's SEO"
            upgrade-modal-description="Explore advanced SEO features in the editor on our Free plan. Upgrade to fully implement custom meta tags, Open Graph data, and improved search visibility. Boost your form's online presence and attract more respondents with our premium SEO toolkit."
          />

diff --git a/client/components/open/forms/components/form-components/FormSubmissionSettings.vue b/client/components/open/forms/components/form-components/FormSubmissionSettings.vue
@@ -129,6 +129,7 @@
          </span>
          <PlanTag
            class="ml-1"
+            required-tier="enterprise"
            upgrade-modal-title="Upgrade to collect IP addresses"
            upgrade-modal-description="Automatically capture submitter IP addresses to gain valuable insights into your form traffic. Analyze geographic patterns, detect suspicious activity, and enhance your form security with detailed submission analytics."
          />

diff --git a/client/components/open/tables/OpenTable.vue b/client/components/open/tables/OpenTable.vue
@@ -323,7 +323,7 @@ const sortedData = computed(() => {
 const filteredTableData = computed(() => props.data || [])

 const hasStatus = computed(() => {
-  return props.form?.is_pro && (props.form.enable_partial_submissions ?? false)
+  return props.form?.is_business && (props.form.enable_partial_submissions ?? false)
 })

 // Since UTable only renders when form exists, no need for safe wrappers

diff --git a/client/components/pages/pricing/SubscriptionModal.vue b/client/components/pages/pricing/SubscriptionModal.vue
@@ -46,10 +46,7 @@
              <section class="flex flex-col w-full max-w-[800px] max-md:max-w-full">
                <div class="bg-white max-md:max-w-full">
                  <div class="flex gap-2 max-md:flex-col max-md:gap-0">
-                    <article
-                      v-if="!isSubscribed"
-                      class="flex flex-col w-6/12 max-md:ml-0 max-md:w-full m-auto"
-                    >
+                    <article class="flex flex-col w-6/12 max-md:ml-0 max-md:w-full m-auto">
                      <div
                        class="flex flex-col grow justify-between p-6 w-full rounded-2xl max-md:px-5 max-md:mt-2"
                        :class="planCardClass"
@@ -76,7 +73,7 @@
                          </div>
                        </div>
                        <TrackClick
-                          v-if="!user?.is_subscribed"
+                          v-if="['free', 'pro'].includes(user?.plan_tier)"
                          name="upgrade_modal_start_trial"
                          :properties="{ plan: currentPlan, period: isYearly ? 'yearly' : 'monthly' }"
                          class="w-full"
@@ -161,7 +158,7 @@
              </div>
              <div class="flex-grow w-full max-w-sm">
                <div
-                  v-if="!isSubscribed"
+                  v-if="['free', 'pro'].includes(user?.plan_tier)"
                  class="rounded-md p-4 border flex flex-col my-4 gap-1"
                  :class="confirmationBoxClass"
                >

diff --git a/client/composables/components/tables/useTableState.js b/client/composables/components/tables/useTableState.js
@@ -306,7 +306,7 @@ export function useTableState(form, withActions = false) {
      const cols = orderedColumns.value && Array.isArray(orderedColumns.value) ? [...orderedColumns.value] : []

      // Add status column if needed
-      if (form.value?.is_pro && (form.value.enable_partial_submissions ?? false)) {
+      if (form.value?.is_business && (form.value.enable_partial_submissions ?? false)) {
        cols.push({
          id: 'status',
          accessorKey: 'status',

diff --git a/client/pages/forms/[slug]/index.vue b/client/pages/forms/[slug]/index.vue
@@ -191,7 +191,7 @@ onBeforeRouteLeave(() => {
 })

 const pageMeta = computed(() => {
-  if (form.value && form.value.is_pro && form.value.seo_meta) {
+  if (form.value && form.value.is_business && form.value.seo_meta) {
    return form.value.seo_meta
  }
  return {}