Merge branch 'main' into eap-ending

# Conflicts:
#	resources/views/components/eap-banner.blade.php

Author: steven-fox

app/Enums/Subscription.php

@@ -55,7 +55,10 @@ public function name(): string
 
     public function stripePriceId(): string
     {
-        return config("subscriptions.plans.{$this->value}.stripe_price_id");
+        // EAP ends June 1st at midnight UTC
+        return now()->isBefore('2025-06-01 00:00:00')
+            ? config("subscriptions.plans.{$this->value}.stripe_price_id_eap")
+            : config("subscriptions.plans.{$this->value}.stripe_price_id");
     }
 
     public function stripePaymentLink(): string

app/Livewire/MobilePricing.php

@@ -24,8 +24,15 @@ public function handlePurchaseRequest(array $data)
         return $this->createCheckoutSession($data['plan'], $user);
     }
 
-    public function createCheckoutSession(string $plan, ?User $user = null)
+    public function createCheckoutSession(?string $plan, ?User $user = null)
     {
+        // This method is somehow getting called without a plan being passed in.
+        // Not sure how (probably folks hacking or a bot thing),
+        // but we will just return early when this happens.
+        if (! $plan) {
+            return;
+        }
+
         // If a user isn't passed into this method, Livewire will instantiate
         // a new User. So we need to check that the user exists before using it,
         // and then use the authenticated user as a fallback.

phpunit.xml

@@ -33,6 +33,9 @@
         <env name="STRIPE_MINI_PRICE_ID" value="price_mini"/>
         <env name="STRIPE_PRO_PRICE_ID" value="price_pro"/>
         <env name="STRIPE_MAX_PRICE_ID" value="price_max"/>
+        <env name="STRIPE_MINI_PRICE_ID_EAP" value="price_mini_eap"/>
+        <env name="STRIPE_PRO_PRICE_ID_EAP" value="price_pro_eap"/>
+        <env name="STRIPE_MAX_PRICE_ID_EAP" value="price_max_eap"/>
         <env name="STRIPE_MINI_PAYMENT_LINK" value="https://buy.stripe.com/test_mini"/>
         <env name="STRIPE_PRO_PAYMENT_LINK" value="https://buy.stripe.com/test_pro"/>
         <env name="STRIPE_MAX_PAYMENT_LINK" value="https://buy.stripe.com/test_max"/>