diff --git a/app/Http/Controllers/Admin/AdminLoginController.php b/app/Http/Controllers/Admin/AdminLoginController.php index eca7330..496ff84 100644 --- a/app/Http/Controllers/Admin/AdminLoginController.php +++ b/app/Http/Controllers/Admin/AdminLoginController.php @@ -68,7 +68,7 @@ class AdminLoginController extends Controller 'last_login' => now() ]); // $redirectPage = Iam_App_Resource_Action_Link::where('user_xid',$user->id)->first(); - return response()->json(['status' => 200, 'message' => 'Welcome!']); + return response()->json(['status' => 200, 'message' => 'Welcome!','return_to_page'=>$user->role == 1 ? route('dashboard'):route('welcome-to-dashboard')]); } return response()->json(['status' => 401, 'message' => 'OTP has expired!']); } else { diff --git a/resources/views/Admin/login/otp.blade.php b/resources/views/Admin/login/otp.blade.php index 0882b40..0c72e63 100644 --- a/resources/views/Admin/login/otp.blade.php +++ b/resources/views/Admin/login/otp.blade.php @@ -200,7 +200,8 @@ // window.location.href='/dashboard'; setTimeout(() => { // location.reload(); - window.location.href = "{{route('welcome-to-dashboard')}}"; + // window.location.href = "{{route('welcome-to-dashboard')}}"; + window.location.href = result.return_to_page; }, 1000); } if (result.status == 400) {