diff --git a/app/Http/Controllers/Admin/EventController.php b/app/Http/Controllers/Admin/EventController.php index ebb54ee9..e7f65678 100644 --- a/app/Http/Controllers/Admin/EventController.php +++ b/app/Http/Controllers/Admin/EventController.php @@ -61,18 +61,22 @@ public function index(Request $request) $params['order'] = $request->input('order'); break; case 'id': - default: $params['order'] = 'id'; break; + default: + $params['order'] = 'starts_at'; + break; } - switch ($request->input('order_direction', 'asc')) { + switch ($request->input('order_direction', 'desc')) { case 'desc': $params['order_direction'] = 'desc'; break; case 'asc': - default: $params['order_direction'] = 'asc'; + break; + default: + $params['order_direction'] = 'desc'; } $query = $query->orderBy($params['order'], $params['order_direction']); diff --git a/app/Models/Event.php b/app/Models/Event.php index 518d0c57..c2fe520c 100644 --- a/app/Models/Event.php +++ b/app/Models/Event.php @@ -99,6 +99,11 @@ public function seatGroups(): HasMany return $this->hasMany(SeatGroup::class); } + public function isOld(): bool + { + return $this->ends_at < date("Y-m-d H:i:s"); + } + public function getAvailableEventMappings(?EventMapping $existing = null): array { $allProviders = TicketProvider::all(); diff --git a/resources/views/admin/events/index.blade.php b/resources/views/admin/events/index.blade.php index 1f6460ce..c02276c3 100644 --- a/resources/views/admin/events/index.blade.php +++ b/resources/views/admin/events/index.blade.php @@ -103,7 +103,12 @@ @foreach($events as $event) + @if($event->isOld()) + + @else + @endif + {{ $event->id }} {{ $event->name }} @@ -124,8 +129,8 @@ @endforeach - - + + @include('partials._pagination', [ 'page' => $events