diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php
index 9fdb25c..43aeba2 100755
--- a/app/Http/Controllers/AdminController.php
+++ b/app/Http/Controllers/AdminController.php
@@ -138,7 +138,7 @@ public function SendTestMail(Request $request)
$id = $request->id;
$status = $request->verify;
- if ($status == '-') {
+ if ($status == "true") {
$verify = '0000-00-00 00:00:00';
} else {
$verify = NULL;
diff --git a/app/Http/Livewire/UserTable.php b/app/Http/Livewire/UserTable.php
index ad6fa63..2e3dd9c 100644
--- a/app/Http/Livewire/UserTable.php
+++ b/app/Http/Livewire/UserTable.php
@@ -67,8 +67,13 @@ class UserTable extends DataTableComponent
if ($row->role == 'admin' && $row->email_verified_at != '') {
return '
-
';
} else {
+ if($row->email_verified_at == ''){
+ $verifyLinkBool = 'true';
+ } else {
+ $verifyLinkBool = 'false';
+ }
$verifyLink = route('verifyUser', [
- 'verify' => '-' . $row->email_verified_at,
+ 'verify' => $verifyLinkBool,
'id' => $row->id
]);
if ($row->email_verified_at == '') {
diff --git a/routes/web.php b/routes/web.php
index d12dc0a..cb41d75 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -153,7 +153,7 @@ Route::group([
Route::get('/admin/deleteLink/{id}', [AdminController::class, 'deleteLinkUser'])->name('deleteLinkUser');
Route::get('/admin/users/block/{block}/{id}', [AdminController::class, 'blockUser'])->name('blockUser');
Route::get('/admin/users/verify/{verify}/{id}', [AdminController::class, 'verifyCheckUser'])->name('verifyCheckUser');
- Route::get('/admin/users/verify/-{verify}/{id}', [AdminController::class, 'verifyUser'])->name('verifyUser');
+ Route::get('/admin/users/verify-mail/{verify}/{id}', [AdminController::class, 'verifyUser'])->name('verifyUser');
Route::get('/admin/edit-user/{id}', [AdminController::class, 'showUser'])->name('showUser');
Route::post('/admin/edit-user/{id}', [AdminController::class, 'editUser'])->name('editUser');
Route::get('/admin/new-user', [AdminController::class, 'createNewUser'])->name('createNewUser')->middleware('max.users');