Merge remote-tracking branch 'origin/main' into ultra

# Conflicts:
#	app/Livewire/Customer/Plugins/Create.php
#	app/Models/User.php
#	resources/views/livewire/customer/licenses.blade.php
#	resources/views/livewire/customer/licenses/show.blade.php
#	resources/views/livewire/customer/plugins/create.blade.php

Author: simonhamp

app/Filament/Resources/ArticleResource.php

@@ -12,8 +12,8 @@
 use Filament\Forms\Components\MarkdownEditor;
 use Filament\Forms\Components\Textarea;
 use Filament\Forms\Components\TextInput;
-use Filament\Forms\Set;
 use Filament\Resources\Resource;
+use Filament\Schemas\Components\Utilities\Set;
 use Filament\Schemas\Schema;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Table;

app/Filament/Resources/PluginBundleResource.php

@@ -42,7 +42,7 @@ public static function form(Schema $schema): Schema
                             ->required()
                             ->maxLength(255)
                             ->live(onBlur: true)
-                            ->afterStateUpdated(function (string $state, Forms\Set $set): void {
+                            ->afterStateUpdated(function (string $state, Schemas\Components\Utilities\Set $set): void {
                                 $set('slug', Str::slug($state));
                             }),
 

app/Filament/Resources/PluginResource.php

@@ -154,6 +154,18 @@ public static function form(Schema $schema): Schema
                     ])
                     ->visible(fn (?Plugin $record) => $record?->review_checks !== null),
 
+                Schemas\Components\Section::make('Developer Submission Details')
+                    ->schema([
+                        Forms\Components\Placeholder::make('support_channel_display')
+                            ->label('Support Channel')
+                            ->content(fn (?Plugin $record) => $record?->support_channel ?? 'Not provided'),
+
+                        Forms\Components\Placeholder::make('notes_display')
+                            ->label('Notes')
+                            ->content(fn (?Plugin $record) => $record?->notes ?? 'Not provided'),
+                    ])
+                    ->visible(fn (?Plugin $record) => $record !== null),
+
                 Schemas\Components\Section::make('Submission Info')
                     ->schema([
                         Forms\Components\Select::make('user_id')

app/Filament/Resources/ProductResource.php

@@ -40,7 +40,7 @@ public static function form(Schema $schema): Schema
                             ->required()
                             ->maxLength(255)
                             ->live(onBlur: true)
-                            ->afterStateUpdated(function (string $state, Forms\Set $set): void {
+                            ->afterStateUpdated(function (string $state, Schemas\Components\Utilities\Set $set): void {
                                 $set('slug', Str::slug($state));
                             }),
 

app/Filament/Resources/ShowcaseResource.php

@@ -72,7 +72,7 @@ public static function form(Schema $schema): Schema
                             ->live(),
 
                         Schemas\Components\Fieldset::make('Mobile Links')
-                            ->visible(fn (Forms\Get $get) => $get('has_mobile'))
+                            ->visible(fn (Schemas\Components\Utilities\Get $get) => $get('has_mobile'))
                             ->schema([
                                 Forms\Components\TextInput::make('app_store_url')
                                     ->label('App Store URL')
@@ -86,7 +86,7 @@ public static function form(Schema $schema): Schema
                             ]),
 
                         Schemas\Components\Fieldset::make('Desktop Downloads')
-                            ->visible(fn (Forms\Get $get) => $get('has_desktop'))
+                            ->visible(fn (Schemas\Components\Utilities\Get $get) => $get('has_desktop'))
                             ->schema([
                                 Forms\Components\TextInput::make('windows_download_url')
                                     ->label('Windows Download URL')

app/Filament/Resources/WallOfLoveSubmissionResource.php

@@ -83,14 +83,14 @@ public static function form(Schema $schema): Schema
                         Forms\Components\Toggle::make('promoted')
                             ->label('Promoted to Homepage')
                             ->helperText('Promoted submissions appear in the feedback section on the homepage.')
-                            ->visible(fn (Forms\Get $get) => $get('is_approved'))
+                            ->visible(fn (Schemas\Components\Utilities\Get $get) => $get('is_approved'))
                             ->live(),
 
                         Forms\Components\Textarea::make('promoted_testimonial')
                             ->label('Promoted Testimonial (optional override)')
                             ->helperText('Leave empty to use the original testimonial, or enter a clipped version for the homepage.')
                             ->rows(4)
-                            ->visible(fn (Forms\Get $get) => $get('is_approved') && $get('promoted')),
+                            ->visible(fn (Schemas\Components\Utilities\Get $get) => $get('is_approved') && $get('promoted')),
                     ])
                     ->columns(1),
             ]);

app/Http/Controllers/DeveloperOnboardingController.php

@@ -8,28 +8,11 @@
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Validation\Rule;
-use Illuminate\View\View;
 
 class DeveloperOnboardingController extends Controller
 {
     public function __construct(protected StripeConnectService $stripeConnectService) {}
 
-    public function show(Request $request): View|RedirectResponse
-    {
-        $user = $request->user();
-        $developerAccount = $user->developerAccount;
-
-        if ($developerAccount && $developerAccount->hasCompletedOnboarding() && $developerAccount->hasAcceptedCurrentTerms()) {
-            return to_route('customer.developer.dashboard')
-                ->with('message', 'Your developer account is already set up.');
-        }
-
-        return view('customer.developer.onboarding', [
-            'developerAccount' => $developerAccount,
-            'hasExistingAccount' => $developerAccount !== null,
-        ]);
-    }
-
     public function start(Request $request): RedirectResponse
     {
         $request->validate([
@@ -131,35 +114,4 @@ public function refresh(Request $request): RedirectResponse
                 ->with('error', 'Unable to refresh onboarding. Please try again.');
         }
     }
-
-    public function dashboard(Request $request): View|RedirectResponse
-    {
-        $user = $request->user();
-        $developerAccount = $user->developerAccount;
-
-        if (! $developerAccount || ! $developerAccount->hasCompletedOnboarding()) {
-            return to_route('customer.developer.onboarding');
-        }
-
-        $this->stripeConnectService->refreshAccountStatus($developerAccount);
-
-        $plugins = $user->plugins()->withCount('licenses')->get();
-        $payouts = $developerAccount->payouts()->with('pluginLicense.plugin')->latest()->limit(10)->get();
-
-        $totalEarnings = $developerAccount->payouts()
-            ->where('status', 'transferred')
-            ->sum('developer_amount');
-
-        $pendingEarnings = $developerAccount->payouts()
-            ->where('status', 'pending')
-            ->sum('developer_amount');
-
-        return view('customer.developer.dashboard', [
-            'developerAccount' => $developerAccount,
-            'plugins' => $plugins,
-            'payouts' => $payouts,
-            'totalEarnings' => $totalEarnings,
-            'pendingEarnings' => $pendingEarnings,
-        ]);
-    }
 }

app/Jobs/HandleInvoicePaidJob.php

@@ -562,7 +562,11 @@ private function createPluginLicense(User $user, Plugin $plugin, int $amount): P
 
         // Create payout record for developer if applicable
         if ($plugin->developerAccount && $plugin->developerAccount->canReceivePayouts() && $amount > 0) {
-            $split = PluginPayout::calculateSplit($amount);
+            $platformFeePercent = ($user->hasMaxTierAccess() && ! $plugin->isOfficial())
+                ? 0
+                : PluginPayout::PLATFORM_FEE_PERCENT;
+
+            $split = PluginPayout::calculateSplit($amount, $platformFeePercent);
 
             PluginPayout::create([
                 'plugin_license_id' => $license->id,
@@ -600,7 +604,11 @@ private function createBundlePluginLicense(User $user, Plugin $plugin, PluginBun
 
         // Create proportional payout for developer
         if ($plugin->developerAccount && $plugin->developerAccount->canReceivePayouts() && $allocatedAmount > 0) {
-            $split = PluginPayout::calculateSplit($allocatedAmount);
+            $platformFeePercent = ($user->hasMaxTierAccess() && ! $plugin->isOfficial())
+                ? 0
+                : PluginPayout::PLATFORM_FEE_PERCENT;
+
+            $split = PluginPayout::calculateSplit($allocatedAmount, $platformFeePercent);
 
             PluginPayout::create([
                 'plugin_license_id' => $license->id,

app/Livewire/Customer/Plugins/Create.php

@@ -26,6 +26,10 @@ class Create extends Component
 
     public string $repository = '';
 
+    public string $notes = '';
+
+    public string $supportChannel = '';
+
     /** @var array<int, array{id: int, full_name: string, name: string, owner: string, private: bool}> */
     public array $repositories = [];
 
@@ -133,6 +137,8 @@ function ($attribute, $value, $fail): void {
                 },
             ],
             'pluginType' => ['required', 'string', 'in:free,paid'],
+            'notes' => ['nullable', 'string', 'max:5000'],
+            'supportChannel' => ['nullable', 'string', 'max:255'],
         ], [
             'repository.required' => 'Please select a repository for your plugin.',
             'repository.regex' => 'Please enter a valid repository in the format vendor/repo-name.',
@@ -181,6 +187,8 @@ function ($attribute, $value, $fail): void {
             'type' => $this->pluginType,
             'status' => PluginStatus::Pending,
             'developer_account_id' => $developerAccountId,
+            'notes' => $this->notes ?: null,
+            'support_channel' => $this->supportChannel ?: null,
         ]);
 
         $webhookSecret = $plugin->generateWebhookSecret();

app/Models/Plugin.php

@@ -166,10 +166,15 @@ public function activePrice(): HasOne
     /**
      * Get the best (lowest) active price for a user based on their eligible tiers.
      * Returns null if no price exists for the user's eligible tiers.
+     * Third-party plugins never offer subscriber discounts — always regular price.
      */
     public function getBestPriceForUser(?User $user): ?PluginPrice
     {
-        $eligibleTiers = $user ? $user->getEligiblePriceTiers() : [PriceTier::Regular];
+        if (! $this->isOfficial()) {
+            $eligibleTiers = [PriceTier::Regular];
+        } else {
+            $eligibleTiers = $user ? $user->getEligiblePriceTiers() : [PriceTier::Regular];
+        }
 
         // Get the lowest active price for the user's eligible tiers
         $bestPrice = $this->prices()