From 4a6c9f0fa8fd173d2cc555dcc75319d039d7ff88 Mon Sep 17 00:00:00 2001
From: sayaliparab <sayali00015@gmail.com>
Date: Mon, 17 Jun 2024 16:39:13 +0530
Subject: [PATCH] Subadmin

---
 .../Admin/ManageSubAdminController.php            |  2 ++
 public/assets/js/admin/manage_sub_admin/add.js    |  9 +++++++++
 public/assets/js/admin/manage_sub_admin/edit.js   |  8 ++++++++
 .../manage_sub_admin/create.blade.php             | 15 ++++++++++++++-
 .../manage_users/manage_sub_admin/edit.blade.php  |  8 +++++++-
 .../manage_sub_admin/manage_subadmin.blade.php    |  6 +++++-
 6 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Admin/ManageSubAdminController.php b/app/Http/Controllers/Admin/ManageSubAdminController.php
index ad36bbe..a7a81ae 100644
--- a/app/Http/Controllers/Admin/ManageSubAdminController.php
+++ b/app/Http/Controllers/Admin/ManageSubAdminController.php
@@ -45,6 +45,7 @@ class ManageSubAdminController extends Controller
 
             $sub_admin = new IamPrincipal();
             $sub_admin->first_name = $request->input('sub_admin_name');
+            $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;
@@ -131,6 +132,7 @@ class ManageSubAdminController extends Controller
             $sub_admin = IamPrincipal::find($request->sub_admin_id);
             $sub_admin->user_name = 'sub_admin';
             $sub_admin->first_name = $request->input('sub_admin_name');
+            $sub_admin->last_name = $request->input('sub_admin_lname');
             $sub_admin->principal_type_xid = 2;
             $sub_admin->principal_source_xid = Auth::guard('admin')->user()->principal_source_xid;
             $sub_admin->email_address = $request->input('sub_admin_email');
diff --git a/public/assets/js/admin/manage_sub_admin/add.js b/public/assets/js/admin/manage_sub_admin/add.js
index 32bffaf..a222f34 100644
--- a/public/assets/js/admin/manage_sub_admin/add.js
+++ b/public/assets/js/admin/manage_sub_admin/add.js
@@ -11,6 +11,11 @@ $(document).on("click", "#add_sub_admin_form_btn", function (e) {
                 required: true,
                 lettersOnly: true
 
+            },
+            sub_admin_lname: {
+                required: true,
+                lettersOnly: true
+
             },
             sub_admin_email: {
                 required: true,
@@ -28,6 +33,10 @@ $(document).on("click", "#add_sub_admin_form_btn", function (e) {
             sub_admin_name: {
                 required: 'Please enter this filed',
 
+            },
+            sub_admin_lname: {
+                required: 'Please enter this filed',
+
             },
             sub_admin_email: {
                 required: 'Please enter this filed',
diff --git a/public/assets/js/admin/manage_sub_admin/edit.js b/public/assets/js/admin/manage_sub_admin/edit.js
index 7d33c6d..fd07102 100644
--- a/public/assets/js/admin/manage_sub_admin/edit.js
+++ b/public/assets/js/admin/manage_sub_admin/edit.js
@@ -1,4 +1,5 @@
 $('#update_admin_btn').on("click", function (e) {
+    // alert('sdhjgf');
     $('#update_sub_admin').validate({
         ignore: [],
         debug: false,
@@ -6,6 +7,10 @@ $('#update_admin_btn').on("click", function (e) {
             sub_admin_name: {
                 required: true
             },
+            sub_admin_lname: {
+                required: true,
+
+            },
             sub_admin_email: {
                 required: true
             }
@@ -14,6 +19,9 @@ $('#update_admin_btn').on("click", function (e) {
             sub_admin_name: {
                 required: 'Please enter this filed'
             },
+            ssub_admin_lname: {
+                required: 'Please enter this filed'
+            },
             sub_admin_email: {
                 required: 'Please enter this filed'
             }
diff --git a/resources/views/Admin/pages/manage_users/manage_sub_admin/create.blade.php b/resources/views/Admin/pages/manage_users/manage_sub_admin/create.blade.php
index 1920555..4a40b2a 100644
--- a/resources/views/Admin/pages/manage_users/manage_sub_admin/create.blade.php
+++ b/resources/views/Admin/pages/manage_users/manage_sub_admin/create.blade.php
@@ -41,12 +41,25 @@
                                 <div class="row">
                                     <div class="col-md-6">
                                         <div class="form-group ">
-                                            <label for="company-name" class="label">Name</label>
+                                            <label for="company-name" class="label">First Name</label>
                                             <input type="text" class="form-control" name="sub_admin_name">
                                             <span class="error-message" id="first_name_error"></span>
+                                        
+    
+                                           
+                                        </div>
+
+                                    </div>
+
+                                    <div class="col-md-6">
+                                        <div class="form-group ">
+                                            <label for="company-name" class="label">Last Name</label>
+                                            <input type="text" class="form-control" name="sub_admin_lname">
+                                            <span class="error-message" id="last_name_error"></span>
 
                                         </div>
                                     </div>
+
                                     <div class="col-md-6">
                                         <div class="form-group ">
                                             <label for="company-name" class="label">Email ID</label>
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 2a45a88..b943ea1 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
@@ -29,10 +29,16 @@
                             <div class="row">
                                 <div class="col-md-6">
                                     <div class="form-group ">
-                                        <label for="company-name" class="label">Name</label>
+                                        <label for="company-name" class="label">First Name</label>
                                         <input type="text" class="form-control" value="{{$edit_sub_admin->first_name}}" name="sub_admin_name">
                                     </div>
                                 </div>
+                                <div class="col-md-6">
+                                    <div class="form-group ">
+                                        <label for="company-name" class="label">Last Name</label>
+                                        <input type="text" class="form-control" value="{{$edit_sub_admin->last_name}}" name="sub_admin_lname">
+                                    </div>
+                                </div>
                                 <div class="col-md-6">
                                     <div class="form-group ">
                                         <label for="company-name" class="label">Email ID</label>
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 bb20949..ea8a8de 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
@@ -31,7 +31,9 @@
                                         </div>
                                     </th> --}}
                                     <th class="text-start">Sr no</th>
-                                    <th class="text-start">Name</th>
+                                    <th class="text-start">First Name</th>
+                                    <th class="text-start">Last Name</th>
+
                                     <th class="text-start">Email Id</th>
                                     <th class="text-start">Last Login</th>
                                     <th class="text-start">Permission</th>
@@ -48,6 +50,8 @@
                                         </td> --}}
                                         <td class="text-start">1</td>
                                         <td class="text-start">{{ $sub_admins->first_name }}</td>
+                                        <td class="text-start">{{ $sub_admins->last_name }}</td>
+
                                         <td class="text-start">{{ $sub_admins->email_address }}</td>
                                         <td class="text-start">{{ \Carbon\Carbon::parse($sub_admins->created_at)->format('d/m/y') }}</td>
                                         <td class="text-start">