Replace hasMaxTierAccess() with hasActiveUltraSubscription() for Ultra-aware platform fee logic

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: simonhamp

app/Jobs/HandleInvoicePaidJob.php

@@ -562,7 +562,7 @@ 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) {
-            $platformFeePercent = ($user->hasMaxTierAccess() && ! $plugin->isOfficial())
+            $platformFeePercent = ($user->hasActiveUltraSubscription() && ! $plugin->isOfficial())
                 ? 0
                 : PluginPayout::PLATFORM_FEE_PERCENT;
 
@@ -604,7 +604,7 @@ private function createBundlePluginLicense(User $user, Plugin $plugin, PluginBun
 
         // Create proportional payout for developer
         if ($plugin->developerAccount && $plugin->developerAccount->canReceivePayouts() && $allocatedAmount > 0) {
-            $platformFeePercent = ($user->hasMaxTierAccess() && ! $plugin->isOfficial())
+            $platformFeePercent = ($user->hasActiveUltraSubscription() && ! $plugin->isOfficial())
                 ? 0
                 : PluginPayout::PLATFORM_FEE_PERCENT;
 

app/Models/User.php

@@ -283,25 +283,6 @@ public function hasUltraAccess(): bool
         return ! $subscription->is_comped;
     }
 
-    public function hasMaxTierAccess(): bool
-    {
-        if ($this->hasMaxAccess()) {
-            return true;
-        }
-
-        $subscription = $this->subscription();
-
-        if ($subscription?->active()) {
-            try {
-                return Subscription::fromStripePriceId($subscription->stripe_price) === Subscription::Max;
-            } catch (\RuntimeException) {
-                return false;
-            }
-        }
-
-        return false;
-    }
-
     /**
      * Check if user was an Early Access Program customer.
      * EAP customers purchased before June 1, 2025.

tests/Feature/MaxSubscriberPayoutTest.php

@@ -25,6 +25,13 @@ class MaxSubscriberPayoutTest extends TestCase
 
     private const PRO_PRICE_ID = 'price_1RoZeVAyFo6rlwXqtnOViUCf';
 
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        config(['subscriptions.plans.max.stripe_price_id' => self::MAX_PRICE_ID]);
+    }
+
     private function createStripeInvoice(string $cartId, string $customerId): Invoice
     {
         $invoice = Invoice::constructFrom([

tests/Feature/PluginSubmissionNotesTest.php

@@ -32,18 +32,19 @@ private function fakeGitHubForPlugin(string $repoSlug, array $extraComposerData
         ], $extraComposerData));
 
         Http::fake([
-            "{$base}/contents/README.md" => Http::response([
+            "{$base}/contents/README.md*" => Http::response([
                 'content' => base64_encode("# {$repoSlug}"),
                 'encoding' => 'base64',
             ]),
-            "{$base}/contents/composer.json" => Http::response([
+            "{$base}/contents/composer.json*" => Http::response([
                 'content' => base64_encode($composerJson),
                 'encoding' => 'base64',
             ]),
-            "{$base}/contents/nativephp.json" => Http::response([], 404),
+            "{$base}/contents/nativephp.json*" => Http::response([], 404),
             "{$base}/contents/LICENSE*" => Http::response([], 404),
             "{$base}/releases/latest" => Http::response([], 404),
             "{$base}/tags*" => Http::response([]),
+            "{$base}/hooks" => Http::response(['id' => 1]),
             "https://raw.githubusercontent.com/{$repoSlug}/*" => Http::response('', 404),
             $base => Http::response(['default_branch' => 'main']),
             "{$base}/git/trees/main*" => Http::response([
@@ -62,6 +63,7 @@ private function createUserWithGitHub(): User
     {
         $user = User::factory()->create([
             'github_id' => '12345',
+            'github_token' => encrypt('fake-token'),
         ]);
         DeveloperAccount::factory()->withAcceptedTerms()->create([
             'user_id' => $user->id,

tests/Feature/TierBasedPricingTest.php

@@ -35,8 +35,9 @@ protected function setUp(): void
 
         Feature::define(ShowPlugins::class, true);
 
-        // Set config for mini price ID used in tests
+        // Set config for price IDs used in tests
         config(['subscriptions.plans.mini.stripe_price_id' => self::MINI_PRICE_ID]);
+        config(['subscriptions.plans.max.stripe_price_id' => self::MAX_PRICE_ID]);
     }
 
     /**
@@ -184,56 +185,42 @@ public function user_with_subscription_and_eap_license_qualifies_for_both_tiers(
     }
 
     // ========================================
-    // Max Tier Access Tests
+    // Ultra Subscription Access Tests
     // ========================================
 
     #[Test]
-    public function user_with_max_subscription_has_max_tier_access(): void
+    public function user_with_max_subscription_has_active_ultra_subscription(): void
     {
         $user = User::factory()->create();
         $this->createSubscription($user, self::MAX_PRICE_ID);
 
-        $this->assertTrue($user->hasMaxTierAccess());
+        $this->assertTrue($user->hasActiveUltraSubscription());
     }
 
     #[Test]
-    public function user_with_pro_subscription_does_not_have_max_tier_access(): void
+    public function user_with_pro_subscription_does_not_have_active_ultra_subscription(): void
     {
         $user = User::factory()->create();
         $this->createSubscription($user, self::PRO_PRICE_ID);
 
-        $this->assertFalse($user->hasMaxTierAccess());
+        $this->assertFalse($user->hasActiveUltraSubscription());
     }
 
     #[Test]
-    public function user_with_mini_subscription_does_not_have_max_tier_access(): void
+    public function user_with_mini_subscription_does_not_have_active_ultra_subscription(): void
     {
         $user = User::factory()->create();
         $this->createSubscription($user, self::MINI_PRICE_ID);
 
-        $this->assertFalse($user->hasMaxTierAccess());
+        $this->assertFalse($user->hasActiveUltraSubscription());
     }
 
     #[Test]
-    public function user_without_subscription_does_not_have_max_tier_access(): void
+    public function user_without_subscription_does_not_have_active_ultra_subscription(): void
     {
         $user = User::factory()->create();
 
-        $this->assertFalse($user->hasMaxTierAccess());
-    }
-
-    #[Test]
-    public function user_with_max_anystack_license_has_max_tier_access(): void
-    {
-        $user = User::factory()->create();
-        License::factory()
-            ->for($user)
-            ->max()
-            ->active()
-            ->withoutSubscriptionItem()
-            ->create();
-
-        $this->assertTrue($user->hasMaxTierAccess());
+        $this->assertFalse($user->hasActiveUltraSubscription());
     }
 
     // ========================================