From 7e822be4437be78a2f3d9a028ba5347a88d4a504 Mon Sep 17 00:00:00 2001 From: 1Day Date: Fri, 12 Aug 2022 11:59:20 +0200 Subject: [PATCH 1/2] spelling. Reason updating. --- .../Moderation/TicketsController.php | 23 ++++++++++++------- resources/views/layouts/main.blade.php | 20 ++++++++++++++-- .../moderator/ticket/blacklist.blade.php | 4 ++-- 3 files changed, 35 insertions(+), 12 deletions(-) diff --git a/app/Http/Controllers/Moderation/TicketsController.php b/app/Http/Controllers/Moderation/TicketsController.php index a5ef8e78..ff76abcb 100644 --- a/app/Http/Controllers/Moderation/TicketsController.php +++ b/app/Http/Controllers/Moderation/TicketsController.php @@ -95,7 +95,7 @@ class TicketsController extends Controller switch ($tickets->status) { case 'Open': $badgeColor = 'badge-success'; - break; + break; case 'Closed': $badgeColor = 'badge-danger'; break; @@ -126,7 +126,11 @@ class TicketsController extends Controller $user = User::where('id', $request->user_id)->first(); $check = TicketBlacklist::where('user_id', $user->id)->first(); if($check){ - return redirect()->back()->with('error', __('Target User already in blacklist')); + $check->reason = $request->reason; + $check->status = "True"; + $check->save(); + + return redirect()->back()->with('info', __('Target User already in blacklist. Reason updated')); } TicketBlacklist::create(array( "user_id" => $user->id, @@ -136,6 +140,7 @@ class TicketsController extends Controller return redirect()->back()->with('success', __('Successfully add User to blacklist, User name: ' . $user->name)); } + public function blacklistDelete($id) { $blacklist = TicketBlacklist::where('id', $id)->first(); $blacklist->delete(); @@ -166,14 +171,16 @@ class TicketsController extends Controller ->editColumn('status', function (TicketBlacklist $blacklist) { switch ($blacklist->status) { case 'True': - $badgeColor = 'badge-success'; - break; - default: + $text = "Blocked"; $badgeColor = 'badge-danger'; break; + default: + $text = "Unblocked"; + $badgeColor = 'badge-success'; + break; } - return '' . $blacklist->status . ''; + return '' . $text . ''; }) ->editColumn('reason', function (TicketBlacklist $blacklist) { return $blacklist->reason; @@ -198,5 +205,5 @@ class TicketsController extends Controller ->rawColumns(['user', 'status', 'reason', 'created_at', 'actions']) ->make(true); } - -} + +} diff --git a/resources/views/layouts/main.blade.php b/resources/views/layouts/main.blade.php index 11eeabbc..55fa3ceb 100644 --- a/resources/views/layouts/main.blade.php +++ b/resources/views/layouts/main.blade.php @@ -245,8 +245,8 @@ @endif @@ -467,6 +467,22 @@ } }) @endif + @if (Session::has('info')) + Swal.fire({ + icon: 'info', + title: '{{ Session::get('info') }}', + position: 'top-end', + showConfirmButton: false, + background: '#343a40', + toast: true, + timer: 3000, + timerProgressBar: true, + didOpen: (toast) => { + toast.addEventListener('mouseenter', Swal.stopTimer) + toast.addEventListener('mouseleave', Swal.resumeTimer) + } + }) + @endif diff --git a/resources/views/moderator/ticket/blacklist.blade.php b/resources/views/moderator/ticket/blacklist.blade.php index 8c96dbe0..a1c2c2c1 100644 --- a/resources/views/moderator/ticket/blacklist.blade.php +++ b/resources/views/moderator/ticket/blacklist.blade.php @@ -75,8 +75,8 @@
- - + +