Fix reseller package selection when older batches are exhausted

app/Http/Controllers/Api/Tenant/EventController.php

@@ -247,11 +247,13 @@ class EventController extends Controller
         $tenant->refresh();
         $event->load(['eventType', 'tenant', 'eventPackages.package', 'eventPackages.addons']);
 
+        $activeResellerPackage = $tenant->getActiveResellerPackage();
+
         return response()->json([
             'message' => 'Event created successfully',
             'data' => new EventResource($event),
             'package' => $event->eventPackage ? $event->eventPackage->package->name : 'None',
-            'remaining_events' => $tenant->activeResellerPackage ? $tenant->activeResellerPackage->remaining_events : 0,
+            'remaining_events' => $activeResellerPackage?->remaining_events ?? 0,
         ], 201);
     }
 

app/Http/Controllers/Api/Tenant/TenantAdminTokenController.php

@@ -119,8 +119,6 @@ class TenantAdminTokenController extends Controller
             ], 404);
         }
 
-        $tenant->loadMissing('activeResellerPackage');
-
         $user = $request->user();
         $abilities = $user?->currentAccessToken()?->abilities ?? [];
 
@@ -131,7 +129,7 @@ class TenantAdminTokenController extends Controller
             $fullName = trim($first.' '.$last) ?: null;
         }
 
-        $activePackage = $tenant->activeResellerPackage;
+        $activePackage = $tenant->getActiveResellerPackage();
 
         return response()->json([
             'id' => $tenant->id,

app/Http/Controllers/Api/TenantPackageController.php

@@ -37,7 +37,7 @@ class TenantPackageController extends Controller
             $this->hydratePackageSnapshot($package, $eventPackage);
         });
 
-        $activePackage = $tenant->activeResellerPackage?->load('package');
+        $activePackage = $tenant->getActiveResellerPackage();
 
         if (! ($activePackage instanceof TenantPackage)) {
             $activePackage = $packages->firstWhere('active', true);