From 7fa516b99b3485cacc186a2b5bb4e3efee684df6 Mon Sep 17 00:00:00 2001 From: kshitige Date: Mon, 3 Jun 2024 13:41:23 +0530 Subject: [PATCH 1/2] fix changes --- app/Http/Controllers/AuthController.php | 8 ++++---- resources/views/Admin/view-sub-admin.blade.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php index 62dd725..cc62e3d 100644 --- a/app/Http/Controllers/AuthController.php +++ b/app/Http/Controllers/AuthController.php @@ -761,7 +761,8 @@ class AuthController extends Controller 'title' => 'Mail from ItSolutionStuff.com', 'body' => 'This is for testing email using smtp.' ]; - + Mail::to($validated['email2'])->send(new OtpMail($mailData, $otp)); + $insertOtp = RegistrationOtp::insertGetId([ 'contact_number'=>$request->contact_number2, // 'contact_otp'=>$mobile_otp, @@ -770,7 +771,6 @@ class AuthController extends Controller 'email_otp'=>$otp, 'email_expire_at'=>Carbon::now()->addMinutes('2'), ]); - Mail::to($validated['email2'])->send(new OtpMail($mailData, $otp)); // $this->thirdPartyOTP($validated['contact_number2'], $mobile_otp); // Mail::to('yadavritikesh29@gmail.com')->send(new OtpMail($mailData, $otp)); return response()->json(['status' => 200, 'message' => 'OTP has been sent to your email']); @@ -818,7 +818,7 @@ class AuthController extends Controller if ($userEmailOtpData) { $otp = rand(1000,9999); $this->thirdPartyOTP($userEmailOtpData->contact_number, $otp); - RegistrationOtp::where('email', $emailToAdd)->update(['contact_otp'=>$otp,'contact_expire_at'=>Carbon::now()->addMinutes(2)]); + RegistrationOtp::where('email', $emailToAdd)->update(['contact_otp'=>$ ,'contact_expire_at'=>Carbon::now()->addMinutes(2)]); return response()->json(['status' => 200, 'message' => 'Email OTP verified Successfully']); } } @@ -883,7 +883,7 @@ class AuthController extends Controller if ($userEmailOtpData) { $otp = rand(1000,9999); $this->thirdPartyOTP($userEmailOtpData->contact_number, $otp); - RegistrationOtp::where('email', $emailToAdd)->update(['contact_otp'=>rand(1000,9999),'contact_expire_at'=>Carbon::now()->addMinutes(2)]); + RegistrationOtp::where('email', $emailToAdd)->update(['contact_otp'=>$otp,'contact_expire_at'=>Carbon::now()->addMinutes(2)]); return response()->json(['status' => 200, 'message' => 'Email OTP verified Successfully']); } } diff --git a/resources/views/Admin/view-sub-admin.blade.php b/resources/views/Admin/view-sub-admin.blade.php index 4503e22..57c1e2d 100644 --- a/resources/views/Admin/view-sub-admin.blade.php +++ b/resources/views/Admin/view-sub-admin.blade.php @@ -343,7 +343,7 @@ {{-- --}} -
From 9b07450dff6e6d03b0cdd2f9316ec2c2a098d414 Mon Sep 17 00:00:00 2001 From: kshitige Date: Mon, 3 Jun 2024 19:30:09 +0530 Subject: [PATCH 2/2] subadmin changes --- .../Admin/ManageSubAdminController.php | 2 +- resources/views/Admin/add-sub-admin.blade.php | 20 +++---- .../views/Admin/view-sub-admin.blade.php | 56 +++++++++---------- 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/app/Http/Controllers/Admin/ManageSubAdminController.php b/app/Http/Controllers/Admin/ManageSubAdminController.php index 9d4e1c6..f4a6832 100644 --- a/app/Http/Controllers/Admin/ManageSubAdminController.php +++ b/app/Http/Controllers/Admin/ManageSubAdminController.php @@ -223,4 +223,4 @@ class ManageSubAdminController extends Controller $accessPage = Iam_App_Resource_Action_Link::where('user_xid', $id)->pluck('app_resource_xid'); return view('Admin.edit-sub-admin', ['user' => $user, 'accessPage' => $accessPage, 'id' => $id]); } -} +} \ No newline at end of file diff --git a/resources/views/Admin/add-sub-admin.blade.php b/resources/views/Admin/add-sub-admin.blade.php index 0540e0b..0a58d05 100644 --- a/resources/views/Admin/add-sub-admin.blade.php +++ b/resources/views/Admin/add-sub-admin.blade.php @@ -1,4 +1,4 @@ -@extends('Admin.layouts.master') + @extends('Admin.layouts.master') @section('style')