From 4aa72ebef6f1c500fa8225462b1507bb6d961671 Mon Sep 17 00:00:00 2001 From: sayliraut Date: Wed, 17 Jul 2024 15:13:37 +0530 Subject: [PATCH] changes --- .../Admin/ManageSubAdminController.php | 24 ++++++++++--------- .../Middleware/RestaurantJwtMiddleware.php | 7 ------ .../RestaurantApi_Service.php | 2 ++ resources/lang/en/auth.php | 1 + .../customer_restaurants.blade.php | 2 +- .../view_customer_details_pdf.blade.php | 2 +- 6 files changed, 18 insertions(+), 20 deletions(-) diff --git a/app/Http/Controllers/Admin/ManageSubAdminController.php b/app/Http/Controllers/Admin/ManageSubAdminController.php index a7a81ae..32f7adc 100644 --- a/app/Http/Controllers/Admin/ManageSubAdminController.php +++ b/app/Http/Controllers/Admin/ManageSubAdminController.php @@ -13,13 +13,15 @@ use Illuminate\Support\Facades\Log; use Exception; use Illuminate\Support\Facades\Mail; use App\Mail\Add_Subadmin; + class ManageSubAdminController extends Controller { - public function index(){ + public function index() + { $sub_admins_module = ManageModule::latest()->get(); $sub_admins_data = IamPrincipal::where('principal_type_xid', 2)->latest()->get(); - return view('Admin.pages.manage_users.manage_sub_admin.manage_subadmin',compact('sub_admins_data','sub_admins_module')); + return view('Admin.pages.manage_users.manage_sub_admin.manage_subadmin', compact('sub_admins_data', 'sub_admins_module')); } public function create() @@ -40,12 +42,15 @@ class ManageSubAdminController extends Controller */ try { + // $existingEmail = IamPrincipal::where('email_address', $request->input('sub_admin_email'))->first(); + + // if ($existingEmail) { + // return jsonResponseWithErrorMessage(__('auth.email_already_used'), 500); + // } // DB::beginTransaction(); - - $sub_admin = new IamPrincipal(); $sub_admin->first_name = $request->input('sub_admin_name'); - $sub_admin->last_name=$request->input('sub_admin_lname'); + $sub_admin->last_name = $request->input('sub_admin_lname'); $sub_admin->user_name = 'sub_admin'; $sub_admin->principal_type_xid = 2; $sub_admin->principal_source_xid = Auth::guard('admin')->user()->principal_source_xid; @@ -62,12 +67,11 @@ class ManageSubAdminController extends Controller $sub_admin_permission->principal_xid = $sub_admin->id; $sub_admin_permission->manage_modules_xid = $moduleId; $sub_admin_permission->save(); - } - $mailData =[ - 'username'=>$request->input('sub_admin_name'), - 'password'=>$request->input('password'), + $mailData = [ + 'username' => $request->input('sub_admin_name'), + 'password' => $request->input('password'), ]; @@ -188,6 +192,4 @@ class ManageSubAdminController extends Controller $test = ManageModuleLink::where('principal_xid', $testing_admin_id)->get('manage_modules_xid')->toArray(); return response()->json(['success' => true, 'data' => $test]); } - - } diff --git a/app/Http/Middleware/RestaurantJwtMiddleware.php b/app/Http/Middleware/RestaurantJwtMiddleware.php index 166bcc4..d2ecddd 100644 --- a/app/Http/Middleware/RestaurantJwtMiddleware.php +++ b/app/Http/Middleware/RestaurantJwtMiddleware.php @@ -35,16 +35,9 @@ class RestaurantJwtMiddleware $user = JWTAuth::setToken($token)->authenticate(); // Check if the user is of restaurant type - Log::info("Restaurant Jwt"); - - Log::info($user); - if (!$user ||$user->principal_type_xid != 4) { return response()->json(['status' => 'error', 'status_code' => 401, 'message' => 'Unauthorized access'], 401); } - Log::info("Restaurant Jwt"); - - Log::info($user->principal_type_xid); Session::flash('RestToken', $token); } catch (JWTException $e) { diff --git a/app/Services/APIs/RestaurantService/RestaurantApi_Service.php b/app/Services/APIs/RestaurantService/RestaurantApi_Service.php index 08405b4..3e86b06 100644 --- a/app/Services/APIs/RestaurantService/RestaurantApi_Service.php +++ b/app/Services/APIs/RestaurantService/RestaurantApi_Service.php @@ -68,6 +68,8 @@ class RestaurantApi_Service 'user_detail' => $userDetail, 'restaurant_details' => $restaurantDetails, 'is_active' => $isActive, + 'message' => "", + ]; if (!$isActive) { diff --git a/resources/lang/en/auth.php b/resources/lang/en/auth.php index c5a1587..b29d34e 100644 --- a/resources/lang/en/auth.php +++ b/resources/lang/en/auth.php @@ -113,6 +113,7 @@ return [ 'redeem_not_allowed_yet' => 'Please wait before redeeming the next voucher.', 'state_limit_reached' => 'You have reached the maximum limit for redeeming vouchers.', 'restaurant_limit_reached' => 'You have reached the maximum limit for redeeming vouchers.', + 'email_already_used' => 'The email address is already in use.', ]; diff --git a/resources/views/Admin/pages/manage_users/manage_customer/customer_restaurants.blade.php b/resources/views/Admin/pages/manage_users/manage_customer/customer_restaurants.blade.php index 241881b..d3cab10 100644 --- a/resources/views/Admin/pages/manage_users/manage_customer/customer_restaurants.blade.php +++ b/resources/views/Admin/pages/manage_users/manage_customer/customer_restaurants.blade.php @@ -51,7 +51,7 @@ height="50px" width="80px"> @if (!is_null($redeemDetail->redeem_date)) - {{ \Carbon\Carbon::parse($redeemDetail->redeem_date)->format('d/m/y H:i:s') }} + {{ \Carbon\Carbon::parse($redeemDetail->redeem_date)->format('m/d/y H:i:s') }} @else No date @endif diff --git a/resources/views/Admin/pages/manage_users/manage_customer/view_customer_details_pdf.blade.php b/resources/views/Admin/pages/manage_users/manage_customer/view_customer_details_pdf.blade.php index aea42f7..18386a0 100644 --- a/resources/views/Admin/pages/manage_users/manage_customer/view_customer_details_pdf.blade.php +++ b/resources/views/Admin/pages/manage_users/manage_customer/view_customer_details_pdf.blade.php @@ -49,7 +49,7 @@
Date of Birth: - {{ \Carbon\Carbon::parse($customers_data->date_of_birth)->format('d-m-Y') }} + {{ \Carbon\Carbon::parse($customers_data->date_of_birth)->format('m-d-Y') }}
Phone Number: