Ultra teams: dashboard team pages, sidebar improvements, pricing & notification updates

simonhamp · claude · simonhamp · commit 4fff89414f31 · 2026-03-27T11:54:50.000Z
- Add per-team detail page showing membership benefits and accessible plugins
- Show each team by name in sidebar and dropdown menu (supports multiple teams)
- Collapse sidebar groups by default with spacing between sections
- Add pro-rata pricing breakdown to add-seats modal
- Show billing-interval-specific pricing (monthly or yearly, not both)
- Add Ultra link with New badge to public nav, mobile menu, and footer
- Replace third-party plugin discounts with 90% marketplace revenue messaging
- Fix missing validation message when team seat limit is hit
- Fix team members incorrectly getting subscriber-tier pricing
- Add plugin access check for team owner's purchased plugins
- Update cancellation FAQ with plugin retention details
- Add tests for team detail page, plugin access, and pricing

Co-Authored-By: Claude Opus 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/app/Http/Controllers/TeamController.php b/app/Http/Controllers/TeamController.php
@@ -2,6 +2,12 @@
 
 namespace App\Http\Controllers;
 
+use App\Enums\PluginStatus;
+use App\Enums\PluginType;
+use App\Enums\TeamUserStatus;
+use App\Models\Plugin;
+use App\Models\Team;
+use App\Models\TeamUser;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
@@ -64,4 +70,45 @@ public function update(Request $request): RedirectResponse
 
         return back()->with('success', 'Team name updated.');
     }
+
+    public function show(Team $team): View|RedirectResponse
+    {
+        $user = Auth::user();
+
+        // Team owners should use the manage page
+        if ($user->ownedTeam && $user->ownedTeam->id === $team->id) {
+            return to_route('customer.team.index');
+        }
+
+        // Verify user is an active member of this team
+        $membership = TeamUser::query()
+            ->where('team_id', $team->id)
+            ->where('user_id', $user->id)
+            ->where('status', TeamUserStatus::Active)
+            ->first();
+
+        if (! $membership) {
+            abort(403);
+        }
+
+        // Official plugins (free for Ultra team members)
+        $officialPlugins = Plugin::query()
+            ->where('is_official', true)
+            ->where('is_active', true)
+            ->where('status', PluginStatus::Approved)
+            ->where('type', PluginType::Paid)
+            ->get();
+
+        // Plugins the team owner has purchased
+        $ownerPlugins = $team->owner
+            ->pluginLicenses()
+            ->active()
+            ->with('plugin')
+            ->get()
+            ->pluck('plugin')
+            ->filter()
+            ->unique('id');
+
+        return view('customer.team.show', compact('team', 'membership', 'officialPlugins', 'ownerPlugins'));
+    }
 }
diff --git a/app/Http/Controllers/TeamUserController.php b/app/Http/Controllers/TeamUserController.php
@@ -53,7 +53,9 @@ public function invite(InviteTeamUserRequest $request): RedirectResponse
         }
 
         if ($team->isOverIncludedLimit()) {
-            return back()->with('show_add_seats', true);
+            return back()
+                ->with('error', 'You have no available seats. Add extra seats to invite more members.')
+                ->with('show_add_seats', true);
         }
 
         $member = $team->users()->create([
diff --git a/app/Livewire/TeamManager.php b/app/Livewire/TeamManager.php
@@ -5,6 +5,7 @@
 use App\Enums\Subscription;
 use App\Enums\TeamUserStatus;
 use App\Models\Team;
+use Carbon\Carbon;
 use Flux;
 use Livewire\Component;
 
@@ -123,8 +124,46 @@ public function render()
         $activeMembers = $this->team->users->where('status', TeamUserStatus::Active);
         $pendingInvitations = $this->team->users->where('status', TeamUserStatus::Pending);
 
-        $extraSeatPriceYearly = config('subscriptions.plans.max.extra_seat_price_yearly', 4);
-        $extraSeatPriceMonthly = config('subscriptions.plans.max.extra_seat_price_monthly', 5);
+        $owner = $this->team->owner;
+        $subscription = $owner->subscription();
+        $planPriceId = $subscription?->stripe_price;
+
+        if ($subscription && ! $planPriceId) {
+            foreach ($subscription->items as $item) {
+                if (! Subscription::isExtraSeatPrice($item->stripe_price)) {
+                    $planPriceId = $item->stripe_price;
+                    break;
+                }
+            }
+        }
+
+        $isMonthly = $planPriceId === config('subscriptions.plans.max.stripe_price_id_monthly');
+        $extraSeatPrice = $isMonthly
+            ? config('subscriptions.plans.max.extra_seat_price_monthly', 5)
+            : config('subscriptions.plans.max.extra_seat_price_yearly', 4) * 12;
+        $extraSeatInterval = $isMonthly ? 'mo' : 'yr';
+
+        // Calculate pro-rata fraction for the current billing period
+        $proRataFraction = 1.0;
+        $renewalDate = null;
+
+        if ($subscription) {
+            try {
+                $stripeSubscription = $subscription->asStripeSubscription();
+                $periodStart = Carbon::createFromTimestamp($stripeSubscription->current_period_start);
+                $periodEnd = Carbon::createFromTimestamp($stripeSubscription->current_period_end);
+                $totalDays = $periodStart->diffInDays($periodEnd);
+                $remainingDays = now()->diffInDays($periodEnd, false);
+
+                if ($totalDays > 0 && $remainingDays > 0) {
+                    $proRataFraction = round($remainingDays / $totalDays, 4);
+                }
+
+                $renewalDate = $periodEnd->format('M j, Y');
+            } catch (\Exception) {
+                // Fall back to showing full price without pro-rata
+            }
+        }
 
         $removableSeats = min(
             $this->team->extra_seats,
@@ -134,8 +173,10 @@ public function render()
         return view('livewire.team-manager', [
             'activeMembers' => $activeMembers,
             'pendingInvitations' => $pendingInvitations,
-            'extraSeatPriceYearly' => $extraSeatPriceYearly,
-            'extraSeatPriceMonthly' => $extraSeatPriceMonthly,
+            'extraSeatPrice' => $extraSeatPrice,
+            'extraSeatInterval' => $extraSeatInterval,
+            'proRataFraction' => $proRataFraction,
+            'renewalDate' => $renewalDate,
             'removableSeats' => max(0, $removableSeats),
         ]);
     }
diff --git a/app/Models/User.php b/app/Models/User.php
@@ -154,6 +154,19 @@ public function activeTeamMembership(): ?TeamUser
             ->first();
     }
 
+    /**
+     * @return \Illuminate\Database\Eloquent\Collection<int, TeamUser>
+     */
+    public function activeTeamMemberships(): \Illuminate\Database\Eloquent\Collection
+    {
+        return TeamUser::query()
+            ->where('user_id', $this->id)
+            ->where('status', TeamUserStatus::Active)
+            ->whereHas('team', fn ($query) => $query->where('is_suspended', false))
+            ->with('team')
+            ->get();
+    }
+
     public function hasProductAccessViaTeam(Product $product): bool
     {
         $membership = $this->activeTeamMembership();
@@ -291,7 +304,7 @@ public function getEligiblePriceTiers(): array
     {
         $tiers = [PriceTier::Regular];
 
-        if ($this->subscribed() || $this->isUltraTeamMember()) {
+        if ($this->subscribed()) {
             $tiers[] = PriceTier::Subscriber;
         }
 
@@ -390,6 +403,13 @@ public function hasPluginAccess(Plugin $plugin): bool
             return true;
         }
 
+        // Team members get access to plugins the team owner has purchased
+        $teamOwner = $this->getTeamOwner();
+
+        if ($teamOwner && $teamOwner->pluginLicenses()->forPlugin($plugin)->active()->exists()) {
+            return true;
+        }
+
         return false;
     }
 
diff --git a/app/Notifications/MaxToUltraAnnouncement.php b/app/Notifications/MaxToUltraAnnouncement.php
@@ -29,6 +29,7 @@ public function toMail($notifiable): MailMessage
             ->line('- **Teams** - invite up to 10 collaborators to share your plugin access')
             ->line('- **Free official plugins** - every NativePHP-published plugin, included with your subscription')
             ->line('- **Plugin Dev Kit** - tools and resources to build and publish your own plugins')
+            ->line('- **90% Marketplace revenue** - keep up to 90% of earnings on paid plugins you publish')
             ->line('- **Priority support** - get help faster when you need it')
             ->line('- **Early access** - be first to try new features and plugins')
             ->line('- **Exclusive content** - tutorials, guides, and deep dives just for Ultra members')
diff --git a/app/Notifications/TeamInvitation.php b/app/Notifications/TeamInvitation.php
@@ -35,7 +35,6 @@ public function toMail(object $notifiable): MailMessage
             ->line("**{$ownerName}** ({$team->owner->email}) has invited you to join **{$team->name}** on NativePHP.")
             ->line('As a team member, you will receive:')
             ->line('- Free access to all first-party NativePHP plugins')
-            ->line('- Subscriber-tier pricing on third-party plugins')
             ->line('- Access to the Plugin Dev Kit GitHub repository')
             ->action('Accept Invitation', route('team.invitation.accept', $this->teamUser->invitation_token))
             ->line('If you did not expect this invitation, you can safely ignore this email.');
diff --git a/app/Notifications/TeamUserRemoved.php b/app/Notifications/TeamUserRemoved.php
@@ -32,7 +32,7 @@ public function toMail(object $notifiable): MailMessage
             ->subject("You have been removed from {$teamName}")
             ->greeting('Hello!')
             ->line("You have been removed from **{$teamName}** on NativePHP.")
-            ->line('Your team benefits, including free plugin access and subscriber-tier pricing, have been revoked.')
+            ->line('Your team benefits, including free plugin access, have been revoked.')
             ->action('View Plans', route('pricing'))
             ->line('If you believe this was a mistake, please contact the team owner.');
     }
diff --git a/app/Notifications/UltraLicenseHolderPromotion.php b/app/Notifications/UltraLicenseHolderPromotion.php
@@ -31,6 +31,7 @@ public function toMail($notifiable): MailMessage
             ->line('- **Teams** - invite up to 10 collaborators to share your plugin access')
             ->line('- **Free official plugins** - every NativePHP-published plugin, included with your subscription')
             ->line('- **Plugin Dev Kit** - tools and resources to build and publish your own plugins')
+            ->line('- **90% Marketplace revenue** - keep up to 90% of earnings on paid plugins you publish')
             ->line('- **Priority support** - get help faster when you need it')
             ->line('- **Early access** - be first to try new features and plugins')
             ->line('- **Exclusive content** - tutorials, guides, and deep dives just for Ultra members')
diff --git a/app/Notifications/UltraUpgradePromotion.php b/app/Notifications/UltraUpgradePromotion.php
@@ -31,6 +31,7 @@ public function toMail($notifiable): MailMessage
             ->line('- **Teams** - invite up to 10 collaborators to share your plugin access')
             ->line('- **Free official plugins** - every NativePHP-published plugin, included with your subscription')
             ->line('- **Plugin Dev Kit** - tools and resources to build and publish your own plugins')
+            ->line('- **90% Marketplace revenue** - keep up to 90% of earnings on paid plugins you publish')
             ->line('- **Priority support** - get help faster when you need it')
             ->line('- **Early access** - be first to try new features and plugins')
             ->line('- **Exclusive content** - tutorials, guides, and deep dives just for Ultra members')
diff --git a/resources/views/components/dashboard-menu.blade.php b/resources/views/components/dashboard-menu.blade.php
@@ -48,10 +48,26 @@ class="absolute right-0 z-10 mt-2 w-48 origin-top-right rounded-md bg-white py-1
         <a href="{{ route('customer.integrations') }}" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:text-gray-300 dark:hover:bg-gray-700">
             Integrations
         </a>
-        @if(auth()->user()->hasActiveUltraSubscription() || auth()->user()->ownedTeam)
-            <a href="{{ route('customer.team.index') }}" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:text-gray-300 dark:hover:bg-gray-700">
-                Team
-            </a>
+        @if(auth()->user()->hasActiveUltraSubscription() || auth()->user()->isUltraTeamMember())
+            @php
+                $ownedTeam = auth()->user()->ownedTeam;
+                $teamMemberships = auth()->user()->activeTeamMemberships();
+            @endphp
+            @if($ownedTeam)
+                <a href="{{ route('customer.team.index') }}" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:text-gray-300 dark:hover:bg-gray-700">
+                    {{ $ownedTeam->name }}
+                </a>
+            @endif
+            @foreach($teamMemberships as $membership)
+                <a href="{{ route('customer.team.show', $membership->team) }}" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:text-gray-300 dark:hover:bg-gray-700">
+                    {{ $membership->team->name }}
+                </a>
+            @endforeach
+            @if(! $ownedTeam && $teamMemberships->isEmpty() && auth()->user()->hasActiveUltraSubscription())
+                <a href="{{ route('customer.team.index') }}" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:text-gray-300 dark:hover:bg-gray-700">
+                    Create Team
+                </a>
+            @endif
         @endif
         <a href="{{ route('customer.billing-portal') }}" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:text-gray-300 dark:hover:bg-gray-700">
             Manage Subscription
diff --git a/resources/views/components/footer.blade.php b/resources/views/components/footer.blade.php
@@ -231,6 +231,17 @@ class="inline-block px-px py-1.5 transition duration-300 will-change-transform h
                             Sponsor
                         </a>
                     </li>
+                    <li>
+                        <a
+                            href="{{ route('pricing') }}"
+                            class="inline-block px-px py-1.5 transition duration-300 will-change-transform hover:translate-x-1 hover:text-gray-700 dark:hover:text-gray-300"
+                        >
+                            <span class="inline-flex items-center gap-1.5">
+                                Ultra
+                                <span class="rounded-full bg-emerald-500 px-1.5 py-px text-[10px] font-bold leading-tight text-white">New</span>
+                            </span>
+                        </a>
+                    </li>
                     <li>
                         <a
                             href="{{ route('build-my-app') }}"
diff --git a/resources/views/components/layouts/dashboard.blade.php b/resources/views/components/layouts/dashboard.blade.php
@@ -111,7 +111,7 @@ class="min-h-screen bg-white font-poppins antialiased dark:bg-zinc-900 dark:text
                     Purchase History
                 </flux:sidebar.item>
 
-                <flux:sidebar.group expandable heading="Community" class="grid">
+                <flux:sidebar.group expandable :expanded="false" heading="Community" class="mt-4 grid">
                     <flux:sidebar.item href="{{ route('customer.showcase.index') }}" :current="request()->routeIs('customer.showcase.*')">
                         Showcase
                     </flux:sidebar.item>
@@ -121,15 +121,33 @@ class="min-h-screen bg-white font-poppins antialiased dark:bg-zinc-900 dark:text
                 </flux:sidebar.group>
 
                 @if(auth()->user()->hasActiveUltraSubscription() || auth()->user()->isUltraTeamMember())
-                    <flux:sidebar.group expandable heading="Team" class="grid">
-                        <flux:sidebar.item href="{{ route('customer.team.index') }}" :current="request()->routeIs('customer.team.*')">
-                            {{ auth()->user()->ownedTeam ? 'Manage' : 'Create Team' }}
-                        </flux:sidebar.item>
+                    @php
+                        $ownedTeam = auth()->user()->ownedTeam;
+                        $teamMemberships = auth()->user()->activeTeamMemberships();
+                    @endphp
+                    <flux:sidebar.group expandable :expanded="false" heading="Teams" class="mt-4 grid">
+                        @if($ownedTeam)
+                            <flux:sidebar.item href="{{ route('customer.team.index') }}" :current="request()->routeIs('customer.team.index')">
+                                {{ $ownedTeam->name }}
+                            </flux:sidebar.item>
+                        @endif
+
+                        @foreach($teamMemberships as $membership)
+                            <flux:sidebar.item href="{{ route('customer.team.show', $membership->team) }}" :current="request()->routeIs('customer.team.show') && request()->route('team')?->id === $membership->team->id">
+                                {{ $membership->team->name }}
+                            </flux:sidebar.item>
+                        @endforeach
+
+                        @if(! $ownedTeam && $teamMemberships->isEmpty() && auth()->user()->hasActiveUltraSubscription())
+                            <flux:sidebar.item href="{{ route('customer.team.index') }}" :current="request()->routeIs('customer.team.index')">
+                                Create Team
+                            </flux:sidebar.item>
+                        @endif
                     </flux:sidebar.group>
                 @endif
 
                 @feature(App\Features\ShowPlugins::class)
-                    <flux:sidebar.group expandable heading="Developer" class="grid">
+                    <flux:sidebar.group expandable :expanded="false" heading="Developer" class="mt-4 grid">
                         <flux:sidebar.item href="{{ route('customer.developer.onboarding') }}" :current="request()->routeIs('customer.developer.onboarding', 'customer.developer.dashboard')">
                             Hub
                         </flux:sidebar.item>
diff --git a/resources/views/components/navbar/mobile-menu.blade.php b/resources/views/components/navbar/mobile-menu.blade.php
@@ -139,7 +139,10 @@ class="size-4 shrink-0"
                             />
                         @endif
 
-                        <div>Ultra</div>
+                        <div class="inline-flex items-center gap-2">
+                            Ultra
+                            <span class="rounded-full bg-emerald-500 px-1.5 py-px text-[10px] font-bold leading-tight text-white">New</span>
+                        </div>
                     </a>
                 </div>
 
diff --git a/resources/views/components/navigation-bar.blade.php b/resources/views/components/navigation-bar.blade.php
@@ -178,7 +178,10 @@ class="size-[3px] rotate-45 rounded-xs bg-gray-400 transition duration-200 dark:
                     ])
                     aria-current="{{ request()->routeIs('pricing') ? 'page' : 'false' }}"
                 >
-                    Ultra
+                    <span class="inline-flex items-center gap-1.5">
+                        Ultra
+                        <span class="rounded-full bg-emerald-500 px-1.5 py-px text-[10px] font-bold leading-tight text-white">New</span>
+                    </span>
                 </a>
 
                 {{-- Decorative circle --}}
diff --git a/resources/views/customer/team/index.blade.php b/resources/views/customer/team/index.blade.php
@@ -57,7 +57,6 @@
                         <flux:heading size="sm">Your benefits include:</flux:heading>
                         <ul class="mt-2 list-inside list-disc space-y-1 text-sm text-zinc-500 dark:text-zinc-400">
                             <li>Free access to all first-party NativePHP plugins</li>
-                            <li>Subscriber-tier pricing on third-party plugins</li>
                             <li>Access to the Plugin Dev Kit GitHub repository</li>
                         </ul>
                     </div>
diff --git a/resources/views/customer/team/show.blade.php b/resources/views/customer/team/show.blade.php
diff --git a/resources/views/livewire/mobile-pricing.blade.php b/resources/views/livewire/mobile-pricing.blade.php
diff --git a/resources/views/livewire/team-manager.blade.php b/resources/views/livewire/team-manager.blade.php
diff --git a/resources/views/pricing.blade.php b/resources/views/pricing.blade.php
diff --git a/routes/web.php b/routes/web.php
diff --git a/tests/Feature/TeamManagementTest.php b/tests/Feature/TeamManagementTest.php
diff --git a/tests/Feature/UltraPluginAccessTest.php b/tests/Feature/UltraPluginAccessTest.php

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,9 @@ public function invite(InviteTeamUserRequest $request): RedirectResponse`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`if ($team->isOverIncludedLimit()) {`
`56`		`- return back()->with('show_add_seats', true);`
	`56`	`+ return back()`
	`57`	`+ ->with('error', 'You have no available seats. Add extra seats to invite more members.')`
	`58`	`+ ->with('show_add_seats', true);`
`57`	`59`	`}`
`58`	`60`
`59`	`61`	`$member = $team->users()->create([`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function toMail(object $notifiable): MailMessage`
`32`	`32`	`->subject("You have been removed from {$teamName}")`
`33`	`33`	`->greeting('Hello!')`
`34`	`34`	`->line("You have been removed from {$teamName} on NativePHP.")`
`35`		`- ->line('Your team benefits, including free plugin access and subscriber-tier pricing, have been revoked.')`
	`35`	`+ ->line('Your team benefits, including free plugin access, have been revoked.')`
`36`	`36`	`->action('View Plans', route('pricing'))`
`37`	`37`	`->line('If you believe this was a mistake, please contact the team owner.');`
`38`	`38`	`}`