@ -55,10 +55,9 @@ class AdministratorController extends BaseController
'" data-email="' . $user->email .
'" data-active="' . $user->active .
'" onclick="GetUserByIdForEdit(this)">< i class = "fas fa-edit" > < / i > < / a > ';
//$iconDelete = '< form action = "adminuser/deleteuser" method = "POST" class = "d-inline-block" data-toggle = "tooltip" title = "Delete User" > < input type = "hidden" name = "id" value = "' . $user->id . '" / > < a type = "submit" onclick = "return DeleteUserByID()" class = "ml-3" > < i class = "fas fa-trash" > < / i > < / a > < / form > ';
$iconDelete = '< a href = "/adminuser/deleteuser/' . $user->id . '" onclick = "return confirm(\'Are you sure you want to delete this user?\')" class = "ml-3" > < i class = "fas fa-trash" > < / i > < / a > ';
$iconUserGroup = '< a href = "/adminuser/editusergroup/' . $user->id . '" class = "ml-3" data-toggle = "tooltip" title = "Change User Group" > < i class = "fas fa-users" > < / i > < / a > ';
$iconUserPermission = '< a href = "/adminuser/edituserpermission/' . $user->id . '" class = "ml-3" data-toggle = "tooltip" title = "Change User Permission" > < i class = "fas fa-lock" > < / i > < / a > ';
$iconDelete = '< form action = "adminuser/deleteuser" method = "POST" class = "d-inline-block" data-toggle = "tooltip" title = "Delete User" > < input type = "hidden" name = "id" value = "' . $user->id . '" / > < a type = "submit" onclick = "return DeleteUserByID()" class = "ml-3" > < i class = "fas fa-trash" > < / i > < / a > < / form > ';
$iconUserGroup = '< a href = "adminuser/editusergroup/' . $user->id . '" class = "ml-3" data-toggle = "tooltip" title = "Change User Group" > < i class = "fas fa-users" > < / i > < / a > ';
$iconUserPermission = '< a href = "adminuser/edituserpermission/' . $user->id . '" class = "ml-3" data-toggle = "tooltip" title = "Change User Permission" > < i class = "fas fa-lock" > < / i > < / a > ';
$iconChangePass = '< a href = "#" class = "ml-3" ' .
'data-id="' . $user->id .
'" data-displayname="' . $user->display_name .
@ -187,10 +186,11 @@ class AdministratorController extends BaseController
return redirect()->to('/adminuser')->with('message', 'User updated successfully.');
}
public function deleteUser($userid )
public function deleteUser()
{
$users = auth()->getProvider();
$result = $users->delete($userid, true);
$user = auth()->getProvider()->findById($this->request->getPost('id'));
$result = $user->delete($user->id, false);
if($result)
return redirect()->to('/adminuser')->with('message', 'User updated successfully.');
@ -220,7 +220,7 @@ class AdministratorController extends BaseController
'employee_id' => $employee->company_issued_id,
'display_name' => $employee->first_name." ".$employee->last_name,
]);
if($users->save($user))
{
// To get the complete user object with ID, we need to get from the database