From ac4cc64cb643b5ad1e4fdbd9907662b63f519b90 Mon Sep 17 00:00:00 2001 From: mohanmd Date: Tue, 23 Jun 2026 17:56:11 +0530 Subject: [PATCH] web changes --- .../Employer/EmployerAuthController.php | 4 + .../Employer/ProfileController.php | 6 ++ app/Models/EmployerProfile.php | 2 + app/Models/Sponsor.php | 2 + ...nder_to_employer_profiles_and_sponsors.php | 38 +++++++++ resources/js/Pages/Admin/Employers/Index.jsx | 80 ++++++++++--------- resources/js/Pages/Admin/Workers/Index.jsx | 4 +- 7 files changed, 95 insertions(+), 41 deletions(-) create mode 100644 database/migrations/2026_06_23_175000_add_card_number_and_gender_to_employer_profiles_and_sponsors.php diff --git a/app/Http/Controllers/Employer/EmployerAuthController.php b/app/Http/Controllers/Employer/EmployerAuthController.php index 1c652ed..87144c5 100644 --- a/app/Http/Controllers/Employer/EmployerAuthController.php +++ b/app/Http/Controllers/Employer/EmployerAuthController.php @@ -480,6 +480,8 @@ public function createPassword(Request $request) 'emirates_id_employer' => $pending['emirates_id_employer'] ?? null, 'emirates_id_issue_place' => $pending['emirates_id_issue_place'] ?? null, 'emirates_id_occupation' => $pending['emirates_id_occupation'] ?? null, + 'emirates_id_card_number' => $pending['emirates_id_card_number'] ?? null, + 'emirates_id_gender' => $pending['emirates_id_gender'] ?? null, 'nationality' => $pending['emirates_id_nationality'] ?? null, 'address' => $pending['address'] ?? null, ]); @@ -510,6 +512,8 @@ public function createPassword(Request $request) 'emirates_id_employer' => $pending['emirates_id_employer'] ?? null, 'emirates_id_issue_place' => $pending['emirates_id_issue_place'] ?? null, 'emirates_id_occupation' => $pending['emirates_id_occupation'] ?? null, + 'emirates_id_card_number' => $pending['emirates_id_card_number'] ?? null, + 'emirates_id_gender' => $pending['emirates_id_gender'] ?? null, 'nationality' => $pending['emirates_id_nationality'] ?? null, ]); diff --git a/app/Http/Controllers/Employer/ProfileController.php b/app/Http/Controllers/Employer/ProfileController.php index 147ea82..aee3269 100644 --- a/app/Http/Controllers/Employer/ProfileController.php +++ b/app/Http/Controllers/Employer/ProfileController.php @@ -51,6 +51,8 @@ private function buildProfileData($user, $profile) 'employer' => $profile->emirates_id_employer ?? 'Msj International Technical Services L.L.C UAE', 'issue_place' => $profile->emirates_id_issue_place ?? 'Dubai', 'occupation' => $profile->emirates_id_occupation ?? 'Electrician', + 'card_number' => $profile->emirates_id_card_number ?? '151023946', + 'gender' => $profile->emirates_id_gender ?? 'M', ], 'fcm_token' => $user->fcm_token ?? 'fcm_token_example', 'address' => $profile->address ?? 'Villa 45, Street 12', @@ -83,6 +85,8 @@ public function index(Request $request) 'emirates_id_employer' => 'Msj International Technical Services L.L.C UAE', 'emirates_id_issue_place' => 'Dubai', 'emirates_id_occupation' => 'Electrician', + 'emirates_id_card_number' => '151023946', + 'emirates_id_gender' => 'M', 'address' => 'Villa 45, Street 12', ]); } @@ -115,6 +119,8 @@ public function edit(Request $request) 'emirates_id_employer' => 'Msj International Technical Services L.L.C UAE', 'emirates_id_issue_place' => 'Dubai', 'emirates_id_occupation' => 'Electrician', + 'emirates_id_card_number' => '151023946', + 'emirates_id_gender' => 'M', 'address' => 'Villa 45, Street 12', ]); } diff --git a/app/Models/EmployerProfile.php b/app/Models/EmployerProfile.php index 06bbaf1..bf3df69 100644 --- a/app/Models/EmployerProfile.php +++ b/app/Models/EmployerProfile.php @@ -29,6 +29,8 @@ class EmployerProfile extends Model 'emirates_id_employer', 'emirates_id_issue_place', 'emirates_id_occupation', + 'emirates_id_card_number', + 'emirates_id_gender', 'address', 'property_type', 'profile_photo_url', diff --git a/app/Models/Sponsor.php b/app/Models/Sponsor.php index e624722..76bdb8b 100644 --- a/app/Models/Sponsor.php +++ b/app/Models/Sponsor.php @@ -43,6 +43,8 @@ class Sponsor extends Authenticatable 'emirates_id_employer', 'emirates_id_issue_place', 'emirates_id_occupation', + 'emirates_id_card_number', + 'emirates_id_gender', ]; protected $hidden = [ diff --git a/database/migrations/2026_06_23_175000_add_card_number_and_gender_to_employer_profiles_and_sponsors.php b/database/migrations/2026_06_23_175000_add_card_number_and_gender_to_employer_profiles_and_sponsors.php new file mode 100644 index 0000000..c520317 --- /dev/null +++ b/database/migrations/2026_06_23_175000_add_card_number_and_gender_to_employer_profiles_and_sponsors.php @@ -0,0 +1,38 @@ +string('emirates_id_card_number')->nullable(); + $table->string('emirates_id_gender')->nullable(); + }); + + Schema::table('sponsors', function (Blueprint $table) { + $table->string('emirates_id_card_number')->nullable(); + $table->string('emirates_id_gender')->nullable(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('employer_profiles', function (Blueprint $table) { + $table->dropColumn(['emirates_id_card_number', 'emirates_id_gender']); + }); + + Schema::table('sponsors', function (Blueprint $table) { + $table->dropColumn(['emirates_id_card_number', 'emirates_id_gender']); + }); + } +}; diff --git a/resources/js/Pages/Admin/Employers/Index.jsx b/resources/js/Pages/Admin/Employers/Index.jsx index d2001d6..996e65b 100644 --- a/resources/js/Pages/Admin/Employers/Index.jsx +++ b/resources/js/Pages/Admin/Employers/Index.jsx @@ -286,9 +286,8 @@ export default function EmployersIndex({ employers: initialEmployers, sponsors, handleSort('name')} className="font-bold text-slate-500 text-[10px] uppercase tracking-widest h-14 pl-8 cursor-pointer select-none"> Employer {sortField === 'name' && (sortOrder === 'desc' ? '↓' : '↑')} - Company Name Subscription Plan - Verification Status + Country handleSort('status')} className="font-bold text-slate-500 text-[10px] uppercase tracking-widest h-14 cursor-pointer select-none"> Status {sortField === 'status' && (sortOrder === 'desc' ? '↓' : '↑')} @@ -310,11 +309,6 @@ export default function EmployersIndex({ employers: initialEmployers, sponsors, - -
- {emp.employer_profile?.company_name || 'N/A'} -
- - - {emp.employer_profile?.verification_status || 'pending'} + + {emp.employer_profile?.country || 'United Arab Emirates'} @@ -410,7 +402,7 @@ export default function EmployersIndex({ employers: initialEmployers, sponsors, )) ) : ( - + No employers found. @@ -478,10 +470,6 @@ export default function EmployersIndex({ employers: initialEmployers, sponsors, Employer Profile
-
- Company / Household - {selectedEmployer?.employer_profile?.company_name || 'N/A'} -
Email Address {selectedEmployer?.email || 'N/A'} @@ -535,28 +523,52 @@ export default function EmployersIndex({ employers: initialEmployers, sponsors,

- Emirates ID & Document Extracted Details + Emirates ID Details

- Emirates ID Number - {selectedEmployer?.employer_profile?.emirates_id_number || 'Not Extracted / Pending'} + ID Number + {selectedEmployer?.employer_profile?.emirates_id_number || 'N/A'}
- Emirates ID Expiry - {formatDate(selectedEmployer?.employer_profile?.emirates_id_expiry)} + Card Number + {selectedEmployer?.employer_profile?.emirates_id_card_number || 'N/A'}
- Verification Status - - {selectedEmployer?.employer_profile?.verification_status || 'Pending'} - + Full Name + {selectedEmployer?.employer_profile?.emirates_id_name || 'N/A'}
- Trade License Expiry - {formatDate(selectedEmployer?.sponsor?.license_expiry)} + Date of Birth + {selectedEmployer?.employer_profile?.emirates_id_dob || 'N/A'} +
+
+ Nationality + {selectedEmployer?.employer_profile?.nationality || 'N/A'} +
+
+ Gender + {selectedEmployer?.employer_profile?.emirates_id_gender || 'N/A'} +
+
+ Issue Date + {selectedEmployer?.employer_profile?.emirates_id_issue_date || 'N/A'} +
+
+ Expiry Date + {selectedEmployer?.employer_profile?.emirates_id_expiry || 'N/A'} +
+
+ Occupation + {selectedEmployer?.employer_profile?.emirates_id_occupation || 'N/A'} +
+
+ Employer + {selectedEmployer?.employer_profile?.emirates_id_employer || 'N/A'} +
+
+ Issuing Place + {selectedEmployer?.employer_profile?.emirates_id_issue_place || 'N/A'}
@@ -590,15 +602,7 @@ export default function EmployersIndex({ employers: initialEmployers, sponsors, required />
-
- - setEditForm({ ...editForm, company_name: e.target.value })} - /> -
+
diff --git a/resources/js/Pages/Admin/Workers/Index.jsx b/resources/js/Pages/Admin/Workers/Index.jsx index 2db3492..140c505 100644 --- a/resources/js/Pages/Admin/Workers/Index.jsx +++ b/resources/js/Pages/Admin/Workers/Index.jsx @@ -250,9 +250,7 @@ export default function WorkerManagement({ workers }) { className="w-full pl-10 pr-4 py-2.5 bg-slate-50 border border-slate-100 rounded-xl text-sm focus:bg-white focus:ring-4 focus:ring-[#0F6E56]/10 outline-none transition-all font-medium" />
- +