From 901ed5d0ade6bb1fb587e3563587a297a36758cb Mon Sep 17 00:00:00 2001
From: sayliraut <sayliraut29@gmail.com>
Date: Fri, 7 Jun 2024 13:26:20 +0530
Subject: [PATCH 1/5] changes

---
 resources/views/Admin/layouts/master.blade.php              | 4 ++--
 .../manage_customer/archive_manage_customer.blade.php       | 6 +++---
 .../pages/manage_users/manage_customer/customer.blade.php   | 2 +-
 .../manage_customer/customer_restaurants.blade.php          | 2 +-
 .../manage_users/manage_customer/edit_customer.blade.php    | 2 +-
 .../manage_customer/view_customer_details.blade.php         | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/resources/views/Admin/layouts/master.blade.php b/resources/views/Admin/layouts/master.blade.php
index b2b0002..1c21682 100644
--- a/resources/views/Admin/layouts/master.blade.php
+++ b/resources/views/Admin/layouts/master.blade.php
@@ -112,7 +112,7 @@
                 <div class="dropdown-container">
                     <ul>
                         <li class="tooltip-element <?php
-                        if ($currentPage == 'manage-patient') {
+                        if ($currentPage == 'manage-customer') {
                             echo 'active';
                         }
                         ?>" data-tooltip="1">
@@ -195,7 +195,7 @@
                 </a>
             </li> --}}
             @endif
-                @if (Auth::guard('admin')->user()->getPermissionGranted(Auth::guard('admin')->user()->id, 'manage-contact-us'))
+            @if (Auth::guard('admin')->user()->getPermissionGranted(Auth::guard('admin')->user()->id, 'manage-contact-us'))
                 <li class="tooltip-element <?php
                 if ($currentPage == 'manage-contact-us') {
                     echo 'active';
diff --git a/resources/views/Admin/pages/manage_users/manage_customer/archive_manage_customer.blade.php b/resources/views/Admin/pages/manage_users/manage_customer/archive_manage_customer.blade.php
index ec5ac4f..4f9da31 100644
--- a/resources/views/Admin/pages/manage_users/manage_customer/archive_manage_customer.blade.php
+++ b/resources/views/Admin/pages/manage_users/manage_customer/archive_manage_customer.blade.php
@@ -2,7 +2,7 @@
 
 @section('content')
 @php
-  $currentPage = 'manage-patient';
+  $currentPage = 'manage-customer';
 @endphp
 
 <div class="layout-px-spacing">
@@ -17,7 +17,7 @@
                                     <h6 class="card-title p-0">Archive Manage Customers</h6>
                                 </a>
                             </div>
-                            
+
                         </div>
                     </div>
                     <div class="col-xl-12 col-lg-12 col-sm-12  layout-spacing">
@@ -52,7 +52,7 @@
                                             </a>
                                         </td>
                                     </tr>
-                                    @endforeach  
+                                    @endforeach
                                 </tbody>
                             </table>
                         </div>
diff --git a/resources/views/Admin/pages/manage_users/manage_customer/customer.blade.php b/resources/views/Admin/pages/manage_users/manage_customer/customer.blade.php
index 562c368..3ed96d7 100644
--- a/resources/views/Admin/pages/manage_users/manage_customer/customer.blade.php
+++ b/resources/views/Admin/pages/manage_users/manage_customer/customer.blade.php
@@ -2,7 +2,7 @@
 
 @section('content')
     @php
-        $currentPage = 'manage-patient';
+        $currentPage = 'manage-customer';
     @endphp
     <style>
         /* CSS for action icons */
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 3373ed4..880741e 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
@@ -2,7 +2,7 @@
 
 @section('content')
     @php
-        $currentPage = 'manage-customer-restaurant';
+        $currentPage = 'manage-customer';
 
         $requestValue = request('id');
 
diff --git a/resources/views/Admin/pages/manage_users/manage_customer/edit_customer.blade.php b/resources/views/Admin/pages/manage_users/manage_customer/edit_customer.blade.php
index db96b56..b240402 100644
--- a/resources/views/Admin/pages/manage_users/manage_customer/edit_customer.blade.php
+++ b/resources/views/Admin/pages/manage_users/manage_customer/edit_customer.blade.php
@@ -2,7 +2,7 @@
 
 @section('content')
     @php
-        $currentPage = 'manage-patient';
+        $currentPage = 'manage-customer';
     @endphp
     <style>
         .error-message {
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 cd4ffdc..f59f934 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
@@ -2,7 +2,7 @@
 
 @section('content')
 @php
-$currentPage = 'manage-patient';
+$currentPage = 'manage-customer';
 @endphp
 <div class="layout-px-spacing">
     <div class="middle-content container-xxl p-0">
@@ -118,4 +118,4 @@ $currentPage = 'manage-patient';
 
 @section('section_script')
 <script src="{{ asset('assets/js/admin/manage_customer/main.js') }}"></script>
-@endsection
\ No newline at end of file
+@endsection

From 3aebb18bf94c0c646590b4d4bbec66103fc94acd Mon Sep 17 00:00:00 2001
From: sayliraut <sayliraut29@gmail.com>
Date: Fri, 7 Jun 2024 13:35:40 +0530
Subject: [PATCH 2/5] change

---
 .../views/Admin/layouts/master.blade.php      | 28 ++++++-------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/resources/views/Admin/layouts/master.blade.php b/resources/views/Admin/layouts/master.blade.php
index 1c21682..115298a 100644
--- a/resources/views/Admin/layouts/master.blade.php
+++ b/resources/views/Admin/layouts/master.blade.php
@@ -108,14 +108,11 @@
                     </div>
                     <i class="fa fa-angle-down mr-3" aria-hidden="true"></i>
                 </button>
-
-                <div class="dropdown-container">
+                <div class="dropdown-container"
+                    style="{{ $currentPage == 'manage-customer' || $currentPage == 'manage-restaurant_app' || $currentPage == 'sub-admins' ? 'display: block;' : 'display: none;' }}">
                     <ul>
-                        <li class="tooltip-element <?php
-                        if ($currentPage == 'manage-customer') {
-                            echo 'active';
-                        }
-                        ?>" data-tooltip="1">
+                        <li class="tooltip-element {{ $currentPage == 'manage-customer' ? 'active' : '' }}"
+                            data-tooltip="1">
                             <a href="{{ route('manage.customer') }}" data-active="1">
                                 <div class="icons">
                                     <img src="{{ asset('public/assets/img/single-user.svg') }}" />
@@ -124,11 +121,8 @@
                             </a>
                         </li>
 
-                        <li class="tooltip-element <?php
-                        if ($currentPage == 'manage-restaurant_app') {
-                            echo 'active';
-                        }
-                        ?>" data-tooltip="1">
+                        <li class="tooltip-element {{ $currentPage == 'manage-restaurant_app' ? 'active' : '' }}"
+                            data-tooltip="1">
                             <a href="{{ route('restraunt_users') }}" data-active="1">
                                 <div class="icons">
                                     <img src="{{ asset('public/assets/img/restraunt.svg') }}" />
@@ -137,19 +131,15 @@
                             </a>
                         </li>
 
-                        <li class="tooltip-element <?php
-                        if ($currentPage == 'sub-admins') {
-                            echo 'active';
-                        }
-                        ?>" data-tooltip="1">
+                        <li class="tooltip-element {{ $currentPage == 'sub-admins' ? 'active' : '' }}"
+                            data-tooltip="1">
                             <a href="{{ route('manage.subAdmin') }}" data-active="1">
                                 <div class="icons">
                                     <img src="{{ asset('public/assets/img/Group 57906.svg') }}">
-                                    <span class=" text">Sub Admins</span>
+                                    <span class="text">Sub Admins</span>
                                 </div>
                             </a>
                         </li>
-
                     </ul>
                 </div>
             @endif

From e8d2b0ae7ab4831371ad6df8e1f8620f51ba94e7 Mon Sep 17 00:00:00 2001
From: sayliraut <sayliraut29@gmail.com>
Date: Fri, 7 Jun 2024 13:58:46 +0530
Subject: [PATCH 3/5] change

---
 .../Admin/pages/manage_users/manage_sub_admin/edit.blade.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/Admin/pages/manage_users/manage_sub_admin/edit.blade.php b/resources/views/Admin/pages/manage_users/manage_sub_admin/edit.blade.php
index ef5df8d..2a45a88 100644
--- a/resources/views/Admin/pages/manage_users/manage_sub_admin/edit.blade.php
+++ b/resources/views/Admin/pages/manage_users/manage_sub_admin/edit.blade.php
@@ -11,7 +11,7 @@
                     <div class="col-md-4">
                         <!-- <h6 class="card-title">Edit Manage Customers</h6> -->
                         <a class="d-flex align-items-center justify-content-center pl-2"
-                            href="">
+                            href="{{ route('manage.subAdmin') }}">
                             <img class="back-btn" src="{{ asset('public/assets/img/left-arrow.svg')}}">
                             <h6 class="card-title p-0">Edit Sub Admins</h6>
                         </a>

From 08cab5c569c5b9b989d31e015270763c67973ad6 Mon Sep 17 00:00:00 2001
From: sayliraut <sayliraut29@gmail.com>
Date: Fri, 7 Jun 2024 14:43:42 +0530
Subject: [PATCH 4/5] change

---
 .../manage_sub_admin/manage_subadmin.blade.php            | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/views/Admin/pages/manage_users/manage_sub_admin/manage_subadmin.blade.php b/resources/views/Admin/pages/manage_users/manage_sub_admin/manage_subadmin.blade.php
index e42791c..bb20949 100644
--- a/resources/views/Admin/pages/manage_users/manage_sub_admin/manage_subadmin.blade.php
+++ b/resources/views/Admin/pages/manage_users/manage_sub_admin/manage_subadmin.blade.php
@@ -24,12 +24,12 @@
                         <div class="widget-content widget-content-area br-8 position-btn" style="overflow: auto;">
                             <table id="zero-config" class="table dt-table-hover sub_admin_table" style="width:100%">
                                 <thead class="text-center">
-                                    <th class="w-10px pe-2">
+                                    {{-- <th class="w-10px pe-2">
                                         <div class="form-check form-check-sm form-check-custom form-check-solid me-3">
                                             <input class="form-check-input" type="checkbox" data-kt-check="true"
                                                 data-kt-check-target="#kt_table_users .form-check-input" value="1" />
                                         </div>
-                                    </th>
+                                    </th> --}}
                                     <th class="text-start">Sr no</th>
                                     <th class="text-start">Name</th>
                                     <th class="text-start">Email Id</th>
@@ -41,11 +41,11 @@
                                 <tbody class="text-center">
                                     @foreach ( $sub_admins_data as $sub_admins)
                                     <tr>
-                                        <td>
+                                        {{-- <td>
                                             <div class="form-check form-check-sm form-check-custom form-check-solid">
                                                 <input class="form-check-input" type="checkbox" value="1" />
                                             </div>
-                                        </td>
+                                        </td> --}}
                                         <td class="text-start">1</td>
                                         <td class="text-start">{{ $sub_admins->first_name }}</td>
                                         <td class="text-start">{{ $sub_admins->email_address }}</td>

From 876c61774bde62acd04101d402b4f2fff97a92ef Mon Sep 17 00:00:00 2001
From: sayliraut <sayliraut29@gmail.com>
Date: Fri, 7 Jun 2024 14:55:50 +0530
Subject: [PATCH 5/5] change

---
 app/Http/Controllers/Admin/LoginController.php | 4 +++-
 app/Http/Middleware/CheckStatus.php            | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Admin/LoginController.php b/app/Http/Controllers/Admin/LoginController.php
index 58f3592..1a34be4 100644
--- a/app/Http/Controllers/Admin/LoginController.php
+++ b/app/Http/Controllers/Admin/LoginController.php
@@ -39,7 +39,9 @@ class LoginController extends Controller
             'password' => 'required|string',
         ]);
 
-        $user = IamPrincipal::where('email_address', $validatedData['email'])->first();
+        $user = IamPrincipal::where('email_address', $validatedData['email'])
+            ->whereIn('principal_type_xid', [1, 2])
+            ->first();
 
         if ($user) {
             if (Hash::check($validatedData['password'], $user->password)) {
diff --git a/app/Http/Middleware/CheckStatus.php b/app/Http/Middleware/CheckStatus.php
index eb2dee0..7d0c1fa 100644
--- a/app/Http/Middleware/CheckStatus.php
+++ b/app/Http/Middleware/CheckStatus.php
@@ -4,6 +4,7 @@ namespace App\Http\Middleware;
 
 use Closure;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
 use Symfony\Component\HttpFoundation\Response;
 
 class CheckStatus
@@ -17,7 +18,8 @@ class CheckStatus
     {
 
         $admin = auth()->guard('admin')->user();
-        if ($admin && $admin->is_active == 1) {
+        Log::info($admin);
+        if ($admin && $admin->is_active == 1 && ($admin->principal_type_xid == 1 || $admin->principal_type_xid == 2)) {
             return $next($request);
         } else {
             return redirect('/')->with('error_msg', 'You must be logged in..');