From 50de318be027bd91a0a41a4e99a67afcab0cff09 Mon Sep 17 00:00:00 2001 From: sayaliparab Date: Mon, 17 Jun 2024 20:10:46 +0530 Subject: [PATCH] changes --- .../Admin/ManageCustomerController.php | 6 +- app/Models/IamPrincipal.php | 62 ++++++++++--------- .../view_customer_details.blade.php | 7 ++- 3 files changed, 43 insertions(+), 32 deletions(-) diff --git a/app/Http/Controllers/Admin/ManageCustomerController.php b/app/Http/Controllers/Admin/ManageCustomerController.php index 97efa0b..c6a0dd7 100644 --- a/app/Http/Controllers/Admin/ManageCustomerController.php +++ b/app/Http/Controllers/Admin/ManageCustomerController.php @@ -59,7 +59,11 @@ class ManageCustomerController extends Controller try { - $customers_data = IamPrincipal::findOrFail($id); + $customers_data = IamPrincipal::with('state','contactMessages')->findOrFail($id); + if ($customers_data->contactMessages->isEmpty()) { + Log::info('No contact messages found for customer with ID: ' . $id); + } + // return $customers_data; return view('Admin.pages.manage_users.manage_customer.view_customer_details', compact('customers_data')); } catch (Exception $e) { Log::error("Manage Voucher Page Not Load " . $e->getMessage()); diff --git a/app/Models/IamPrincipal.php b/app/Models/IamPrincipal.php index f4c89dc..8b4590f 100644 --- a/app/Models/IamPrincipal.php +++ b/app/Models/IamPrincipal.php @@ -1,6 +1,7 @@ hasMany(ManageModuleLink::class,'principal_xid', 'id'); + return $this->hasMany(ManageModuleLink::class, 'principal_xid', 'id'); } public function feedbacks() @@ -130,35 +131,35 @@ class IamPrincipal extends Authenticatable implements JWTSubject 'password' => 'hashed', ]; - public function getPermissionGranted($id,$module) + public function getPermissionGranted($id, $module) { // $id is used as authuser id // $moudle is the slug of sidebar module - $isSubAdmin = IamPrincipal::where('id',$id)->where('principal_type_xid',2)->first(); - // 'is_admin',1 is for checking the login user is subadmin or not + $isSubAdmin = IamPrincipal::where('id', $id)->where('principal_type_xid', 2)->first(); + // 'is_admin',1 is for checking the login user is subadmin or not - $isMainAdmin = IamPrincipal::where('id',$id)->where('principal_type_xid',1)->first(); - if($isMainAdmin){ - return true; - }elseif($isSubAdmin){ - //search for module - $isModule = ManageModule::where('slug',$module)->first(); - if($isModule){ - $isSubAdminModuleLink = ManageModuleLink::where('principal_xid',$id) - ->where('manage_modules_xid',$isModule->id)->first(); - // dd($id,$module,$isSubAdmin->id,$isModule,$isSubAdminModuleLink); - if($isSubAdminModuleLink){ - return true; - }else{ - return false; - } - }else{ - return false; - } - }else{ - return false; - } + $isMainAdmin = IamPrincipal::where('id', $id)->where('principal_type_xid', 1)->first(); + if ($isMainAdmin) { + return true; + } elseif ($isSubAdmin) { + //search for module + $isModule = ManageModule::where('slug', $module)->first(); + if ($isModule) { + $isSubAdminModuleLink = ManageModuleLink::where('principal_xid', $id) + ->where('manage_modules_xid', $isModule->id)->first(); + // dd($id,$module,$isSubAdmin->id,$isModule,$isSubAdminModuleLink); + if ($isSubAdminModuleLink) { + return true; + } else { + return false; + } + } else { + return false; + } + } else { + return false; + } } // public function orders() @@ -184,8 +185,11 @@ class IamPrincipal extends Authenticatable implements JWTSubject // } public function restaurant() -{ - return $this->hasMany(ManageRestaurant::class, 'id', 'restaurant_xid'); -} - + { + return $this->hasMany(ManageRestaurant::class, 'id', 'restaurant_xid'); + } + public function contactMessages() + { + return $this->hasMany(ManageContactus::class, 'principal_xid', 'id'); + } } diff --git a/resources/views/Admin/pages/manage_users/manage_customer/view_customer_details.blade.php b/resources/views/Admin/pages/manage_users/manage_customer/view_customer_details.blade.php index f59f934..3ceb673 100644 --- a/resources/views/Admin/pages/manage_users/manage_customer/view_customer_details.blade.php +++ b/resources/views/Admin/pages/manage_users/manage_customer/view_customer_details.blade.php @@ -80,6 +80,7 @@ $currentPage = 'manage-customer'; Location : Email ID : + Contact History : Onboarded date : {{-- Location : --}} {{-- Start Date : --}} @@ -88,8 +89,10 @@ $currentPage = 'manage-customer'; {{ $customers_data->state->name}} {{ $customers_data->email_address }} - {{ \Carbon\Carbon::parse($customers_data->created_at)->format('d-m-y') }} - + @foreach($customers_data->contactMessages as $messages) + {{$messages->message}} + @endforeach + {{ \Carbon\Carbon::parse($customers_data->created_at)->format('d-m-y') }} {{ $customers_data->country_xid }} {{-- 03/07/2023 --}}