diff --git a/app/Console/Commands/MakeUserCommand.php b/app/Console/Commands/MakeUserCommand.php index 0932f9f2..fb1366fe 100644 --- a/app/Console/Commands/MakeUserCommand.php +++ b/app/Console/Commands/MakeUserCommand.php @@ -101,6 +101,8 @@ class MakeUserCommand extends Command ['Referral code', $user->referral_code], ]); + $user->syncRoles(1); + return 1; } } diff --git a/app/Http/Middleware/isMod.php b/app/Http/Middleware/isMod.php index 8c5453a2..51d6db85 100644 --- a/app/Http/Middleware/isMod.php +++ b/app/Http/Middleware/isMod.php @@ -18,7 +18,7 @@ class isMod */ public function handle(Request $request, Closure $next) { - if (Auth::user() && Auth::user()->role == 'moderator' || Auth::user() && Auth::user()->hasRole("Admin")) { + if (Auth::user() && Auth::user()->role == 'moderator' || Auth::user() && Auth::user()->hasRole(1)) { return $next($request); } diff --git a/routes/web.php b/routes/web.php index f13a33a9..c7c6a9de 100644 --- a/routes/web.php +++ b/routes/web.php @@ -113,7 +113,7 @@ Route::middleware(['auth', 'checkSuspended'])->group(function () { Route::post('ticket/new', [TicketsController::class, 'store'])->middleware(['throttle:ticket-new'])->name('ticket.new.store'); Route::get('ticket/show/{ticket_id}', [TicketsController::class, 'show'])->name('ticket.show'); Route::post('ticket/reply', [TicketsController::class, 'reply'])->middleware(['throttle:ticket-reply'])->name('ticket.reply'); - Route::post('ticket/close/{ticket_id}', [TicketsController::class, 'close'])->name('ticket.close'); + Route::post('ticket/status/{ticket_id}', [TicketsController::class, 'changeStatus'])->name('ticket.changeStatus'); //admin diff --git a/themes/default/views/admin/users/show.blade.php b/themes/default/views/admin/users/show.blade.php index 5d2da412..3ab0d62e 100644 --- a/themes/default/views/admin/users/show.blade.php +++ b/themes/default/views/admin/users/show.blade.php @@ -74,18 +74,9 @@
- role == 'moderator') - badge-info - @elseif ($user->role == 'client') - badge-success - @else - badge-secondary @endif - "> - {{ $user->role }} - + @foreach ($user->roles as $role) + {{$role->name}} + @endforeach
diff --git a/themes/default/views/moderator/ticket/show.blade.php b/themes/default/views/moderator/ticket/show.blade.php index 18c69e2f..3bec1feb 100644 --- a/themes/default/views/moderator/ticket/show.blade.php +++ b/themes/default/views/moderator/ticket/show.blade.php @@ -112,15 +112,9 @@ src="https://www.gravatar.com/avatar/{{ md5(strtolower($ticket->user->email)) }}?s=25" class="user-image" alt="User Image"> {{ $ticket->user->name }} - @if($ticket->user->role === "member") - Member - @elseif ($ticket->user->role === "client") - Client - @elseif ($ticket->user->role === "moderator") - Moderator - @elseif ($ticket->user->hasRole("Admin")) - Admin - @endif + @foreach ($ticket->user->roles as $role) + {{$role->name}} + @endforeach {{ $ticket->created_at->diffForHumans() }} @@ -135,15 +129,9 @@ src="https://www.gravatar.com/avatar/{{ md5(strtolower($ticketcomment->user->email)) }}?s=25" class="user-image" alt="User Image"> {{ $ticketcomment->user->name }} - @if($ticketcomment->user->role === "member") - Member - @elseif ($ticketcomment->user->role === "client") - Client - @elseif ($ticketcomment->user->role === "moderator") - Moderator - @elseif ($ticketcomment->user->hasRole("Admin")) - Admin - @endif + @foreach ($ticketcomment->user->roles as $role) + {{$role->name}} + @endforeach {{ $ticketcomment->created_at->diffForHumans() }} diff --git a/themes/default/views/ticket/show.blade.php b/themes/default/views/ticket/show.blade.php index 663b25f3..5a936afa 100644 --- a/themes/default/views/ticket/show.blade.php +++ b/themes/default/views/ticket/show.blade.php @@ -112,15 +112,9 @@ src="https://www.gravatar.com/avatar/{{ md5(strtolower($ticket->user->email)) }}?s=25" class="user-image" alt="User Image"> {{ $ticket->user->name }} - @if($ticket->user->role === "member") - Member - @elseif ($ticket->user->role === "client") - Client - @elseif ($ticket->user->role === "moderator") - Moderator - @elseif ($ticket->user->hasRole("Admin")) - Admin - @endif + @foreach ($ticket->user->roles as $role) + {{$role->name}} + @endforeach {{ $ticket->created_at->diffForHumans() }} @@ -136,15 +130,9 @@ src="https://www.gravatar.com/avatar/{{ md5(strtolower($ticketcomment->user->email)) }}?s=25" class="user-image" alt="User Image"> {{ $ticketcomment->user->name }} - @if($ticketcomment->user->role === "member") - Member - @elseif ($ticketcomment->user->role === "client") - Client - @elseif ($ticketcomment->user->role === "moderator") - Moderator - @elseif ($ticketcomment->user->hasRole("Admin")) - Admin - @endif + @foreach ($ticketcomment->user->roles as $role) + {{$role->name}} + @endforeach {{ $ticketcomment->created_at->diffForHumans() }}