Only show prepaid badges if creation is possible

Author: Balenty

app/Http/Controllers/WelcomeController.php

@@ -2,9 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Models\Badge\Badge;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Gate;
 use Inertia\Inertia;
 
 class WelcomeController extends Controller
@@ -16,7 +14,7 @@ public function __invoke()
         $event = \App\Models\Event::getActiveEvent();
 
         $prepaidBadgesLeft = 0;
-        if ($event && Auth::check() && Gate::allows('create', Badge::class)) {
+        if ($event && Auth::check()) {
             $user = Auth::user();
             $prepaidBadgesLeft = $user->getPrepaidBadgesLeft($event->id);
         }

app/Models/User.php

@@ -14,6 +14,7 @@
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
+use Illuminate\Support\Facades\Gate;
 
 class User extends Authenticatable implements Customer, FilamentUser, Wallet, WalletFloat
 {
@@ -104,6 +105,11 @@ public function getPrepaidBadgesLeft($eventId = null): int
             return 0;
         }
 
+        // Check if Badges can be created (e.g. order deadline is over)
+        if (! Gate::allows('create', Badge::class)) {
+            return 0;
+        }
+
         $prepaidBadges = $eventUser->prepaid_badges;
         $orderedBadges = $this->badges()
             ->whereHas('fursuit.event', function ($query) use ($event) {