app/Http/Controllers/Api/EmployerAuthController.php

@@ -234,6 +234,7 @@ public function register(Request $request)
                 $emiratesIdName = $emiratesIdInput['name'] ?? null;
                 $emiratesIdDob = $emiratesIdInput['date_of_birth'] ?? $emiratesIdInput['date of birth'] ?? $emiratesIdInput['dob'] ?? null;
                 $emiratesIdNationality = $emiratesIdInput['nationality'] ?? null;
+                $emiratesIdGender = $emiratesIdInput['gender'] ?? $emiratesIdInput['sex'] ?? null;
                 $emiratesIdIssueDate = $emiratesIdInput['issue_date'] ?? $emiratesIdInput['issue date'] ?? null;
                 $emiratesIdEmployer = $emiratesIdInput['employer'] ?? null;
                 $emiratesIdIssuePlace = $emiratesIdInput['issue_place'] ?? $emiratesIdInput['issue place'] ?? null;
@@ -269,6 +270,8 @@ public function register(Request $request)
                 'emirates_id_employer' => $emiratesIdEmployer,
                 'emirates_id_issue_place' => $emiratesIdIssuePlace,
                 'emirates_id_occupation' => $emiratesIdOccupation,
+                'emirates_id_nationality' => $emiratesIdNationality,
+                'emirates_id_gender' => $emiratesIdGender,
                 'address' => $request->address,
             ]);
 

app/Http/Controllers/Api/EmployerProfileController.php

@@ -39,11 +39,22 @@ public function getProfile(Request $request)
                 'email' => $employer->email,
                 'company_name' => $profile->company_name,
                 'phone' => $profile->phone,
+                'country' => $profile->country,
                 'language' => $profile->language ?? 'English',
                 'notifications' => (bool)($profile->notifications ?? true),
                 'verification_status' => $profile->verification_status ?? 'approved',
+                'emirates_id' => [
                     'emirates_id_number' => $profile->emirates_id_number,
-                'emirates_id_expiry' => $profile->emirates_id_expiry,
+                    'name'               => $profile->emirates_id_name,
+                    'date_of_birth'      => $profile->emirates_id_dob,
+                    'issue_date'         => $profile->emirates_id_issue_date,
+                    'expiry_date'        => $profile->emirates_id_expiry,
+                    'employer'           => $profile->emirates_id_employer,
+                    'issue_place'        => $profile->emirates_id_issue_place,
+                    'occupation'         => $profile->emirates_id_occupation,
+                    'nationality'        => $profile->emirates_id_nationality,
+                    'gender'             => $profile->emirates_id_gender,
+                ],
             ];
 
             return response()->json([
@@ -170,11 +181,22 @@ public function updateProfile(Request $request)
                 'email' => $employer->email,
                 'company_name' => $profile->company_name,
                 'phone' => $profile->phone,
+                'country' => $profile->country,
                 'language' => $profile->language,
                 'notifications' => (bool)$profile->notifications,
                 'verification_status' => $profile->verification_status ?? 'approved',
+                'emirates_id' => [
                     'emirates_id_number' => $profile->emirates_id_number,
-                'emirates_id_expiry' => $profile->emirates_id_expiry,
+                    'name'               => $profile->emirates_id_name,
+                    'date_of_birth'      => $profile->emirates_id_dob,
+                    'issue_date'         => $profile->emirates_id_issue_date,
+                    'expiry_date'        => $profile->emirates_id_expiry,
+                    'employer'           => $profile->emirates_id_employer,
+                    'issue_place'        => $profile->emirates_id_issue_place,
+                    'occupation'         => $profile->emirates_id_occupation,
+                    'nationality'        => $profile->emirates_id_nationality,
+                    'gender'             => $profile->emirates_id_gender,
+                ],
             ];
 
             return response()->json([

app/Http/Controllers/Api/SponsorAuthController.php

@@ -59,8 +59,13 @@ public function register(Request $request)
 
             $licenseExpiry = $request->license_expiry;
             $licenseInput = $request->input('license');
+            $licenseNumber = null;
             if (is_array($licenseInput)) {
-                $licenseExpiry = $licenseExpiry ?? ($licenseInput['expiry_date'] ?? $licenseInput['license_expiry'] ?? null);
+                $rawExpiry = $licenseInput['expiry_date'] ?? $licenseInput['license_expiry'] ?? null;
+                if ($rawExpiry) {
+                    $licenseExpiry = $licenseExpiry ?? \App\Services\OcrDocumentService::normaliseDate($rawExpiry);
+                }
+                $licenseNumber = $licenseInput['license_number'] ?? $licenseInput['license_no'] ?? $licenseInput['document_number'] ?? null;
             }
 
             $emiratesIdInput = $request->input('emirates_id');
@@ -80,6 +85,7 @@ public function register(Request $request)
                 $emiratesIdName = $emiratesIdInput['name'] ?? null;
                 $emiratesIdDob = $emiratesIdInput['date_of_birth'] ?? $emiratesIdInput['date of birth'] ?? $emiratesIdInput['dob'] ?? null;
                 $emiratesIdNationality = $emiratesIdInput['nationality'] ?? null;
+                $emiratesIdGender = $emiratesIdInput['gender'] ?? $emiratesIdInput['sex'] ?? null;
                 $emiratesIdIssueDate = $emiratesIdInput['issue_date'] ?? $emiratesIdInput['issue date'] ?? null;
                 $emiratesIdEmployer = $emiratesIdInput['employer'] ?? null;
                 $emiratesIdIssuePlace = $emiratesIdInput['issue_place'] ?? $emiratesIdInput['issue place'] ?? null;
@@ -92,7 +98,7 @@ public function register(Request $request)
             $apiToken = Str::random(80);
 
             $sponsor = DB::transaction(function () use (
-                $request, $email, $licensePath, $emiratesIdPath, $emiratesId, $apiToken, $licenseExpiry,
+                $request, $email, $licensePath, $emiratesIdPath, $emiratesId, $apiToken, $licenseExpiry, $licenseNumber, $licenseInput,
                 $emiratesIdExpiry, $emiratesIdName, $emiratesIdDob, $emiratesIdIssueDate, $emiratesIdEmployer,
                 $emiratesIdIssuePlace, $emiratesIdOccupation
             ) {
@@ -110,6 +116,8 @@ public function register(Request $request)
                     'emirates_id_file'  => $emiratesIdPath,
                     'emirates_id'       => $emiratesId,
                     'license_expiry'    => $licenseExpiry,
+                    'license_number'    => $licenseNumber,
+                    'license_data'      => $licenseInput,
                     'status'            => 'active',
                     'is_verified'       => false,
                     'subscription_status' => 'none',
@@ -122,6 +130,8 @@ public function register(Request $request)
                     'emirates_id_employer' => $emiratesIdEmployer,
                     'emirates_id_issue_place' => $emiratesIdIssuePlace,
                     'emirates_id_occupation' => $emiratesIdOccupation,
+                    'emirates_id_nationality' => $emiratesIdNationality,
+                    'emirates_id_gender' => $emiratesIdGender,
                 ]);
             });
 
@@ -137,7 +147,38 @@ public function register(Request $request)
                 'success' => true,
                 'message' => 'Sponsor account registered successfully. Your license is pending admin review.',
                 'data'    => [
-                    'sponsor' => $sponsor->makeHidden(['password', 'api_token']),
+                    'sponsor' => [
+                        'id'                => $sponsor->id,
+                        'full_name'         => $sponsor->full_name,
+                        'organization_name' => $sponsor->organization_name,
+                        'mobile'            => $sponsor->mobile,
+                        'email'             => $sponsor->email,
+                        'nationality'       => $sponsor->nationality,
+                        'city'              => $sponsor->city,
+                        'address'           => $sponsor->address,
+                        'country_code'      => $sponsor->country_code,
+                        'is_verified'       => $sponsor->is_verified,
+                        'status'            => $sponsor->status,
+                        'license_file'      => $sponsor->license_file ? asset($sponsor->license_file) : null,
+                        'emirates_id_file'  => $sponsor->emirates_id_file ? asset($sponsor->emirates_id_file) : null,
+                        'license_expiry'    => $sponsor->license_expiry ? $sponsor->license_expiry->toDateString() : null,
+                        'license_number'    => $sponsor->license_number,
+                        'license'           => $sponsor->license_data,
+                        'validity'          => $sponsor->license_expiry ? ($sponsor->license_expiry->isFuture() ? 'Valid' : 'Expired') : 'Pending Review',
+                        'joined_at'         => $sponsor->created_at->toIso8601String(),
+                        'emirates_id' => [
+                            'emirates_id_number' => $sponsor->emirates_id,
+                            'name'               => $sponsor->emirates_id_name,
+                            'date_of_birth'      => $sponsor->emirates_id_dob,
+                            'issue_date'         => $sponsor->emirates_id_issue_date,
+                            'expiry_date'        => $sponsor->emirates_id_expiry,
+                            'employer'           => $sponsor->emirates_id_employer,
+                            'issue_place'        => $sponsor->emirates_id_issue_place,
+                            'occupation'         => $sponsor->emirates_id_occupation,
+                            'nationality'        => $sponsor->emirates_id_nationality,
+                            'gender'             => $sponsor->emirates_id_gender,
+                        ],
+                    ],
                     'token'   => $apiToken,
                 ]
             ], 201);
@@ -213,7 +254,36 @@ public function login(Request $request)
             'success' => true,
             'message' => 'Login successful.',
             'data'    => [
-                'sponsor' => $sponsor->makeHidden(['password', 'api_token']),
+                'sponsor' => [
+                    'id'                => $sponsor->id,
+                    'full_name'         => $sponsor->full_name,
+                    'organization_name' => $sponsor->organization_name,
+                    'mobile'            => $sponsor->mobile,
+                    'email'             => $sponsor->email,
+                    'nationality'       => $sponsor->nationality,
+                    'city'              => $sponsor->city,
+                    'address'           => $sponsor->address,
+                    'country_code'      => $sponsor->country_code,
+                    'is_verified'       => $sponsor->is_verified,
+                    'status'            => $sponsor->status,
+                    'license_file'      => $sponsor->license_file ? asset($sponsor->license_file) : null,
+                    'emirates_id_file'  => $sponsor->emirates_id_file ? asset($sponsor->emirates_id_file) : null,
+                    'license_expiry'    => $sponsor->license_expiry ? $sponsor->license_expiry->toDateString() : null,
+                    'license_number'    => $sponsor->license_number,
+                    'license'           => $sponsor->license_data,
+                    'validity'          => $sponsor->license_expiry ? ($sponsor->license_expiry->isFuture() ? 'Valid' : 'Expired') : 'Pending Review',
+                    'joined_at'         => $sponsor->created_at->toIso8601String(),
+                    'emirates_id' => [
+                        'emirates_id_number' => $sponsor->emirates_id,
+                        'name'               => $sponsor->emirates_id_name,
+                        'date_of_birth'      => $sponsor->emirates_id_dob,
+                        'issue_date'         => $sponsor->emirates_id_issue_date,
+                        'expiry_date'        => $sponsor->emirates_id_expiry,
+                        'employer'           => $sponsor->emirates_id_employer,
+                        'issue_place'        => $sponsor->emirates_id_issue_place,
+                        'occupation'         => $sponsor->emirates_id_occupation,
+                    ],
+                ],
                 'token'   => $apiToken,
             ]
         ], 200);
@@ -257,10 +327,13 @@ public function uploadLicense(Request $request)
             $licenseFile = $request->file('license_file');
             $ocrLicense = \App\Services\OcrDocumentService::extractSponsorLicenseData($licenseFile);
             $extractedExpiry = $ocrLicense['expiry_date'];
+            $extractedNumber = $ocrLicense['license_number'];
 
             $sponsor->update([
                 'license_file' => null,
                 'license_expiry' => $extractedExpiry,
+                'license_number' => $extractedNumber,
+                'license_data' => $ocrLicense,
             ]);
 
             return response()->json([

app/Http/Controllers/Api/SponsorController.php

@@ -66,8 +66,22 @@ public function getDashboard(Request $request)
                         'license_file'      => $sponsor->license_file ? asset($sponsor->license_file) : null,
                         'emirates_id_file'  => $sponsor->emirates_id_file ? asset($sponsor->emirates_id_file) : null,
                         'license_expiry'    => $sponsor->license_expiry ? $sponsor->license_expiry->toDateString() : null,
+                        'license_number'    => $sponsor->license_number,
+                        'license'           => $sponsor->license_data,
                         'validity'          => $sponsor->license_expiry ? ($sponsor->license_expiry->isFuture() ? 'Valid' : 'Expired') : 'Pending Review',
                         'joined_at'         => $sponsor->created_at->toIso8601String(),
+                        'emirates_id' => [
+                            'emirates_id_number' => $sponsor->emirates_id,
+                            'name'               => $sponsor->emirates_id_name,
+                            'date_of_birth'      => $sponsor->emirates_id_dob,
+                            'issue_date'         => $sponsor->emirates_id_issue_date,
+                            'expiry_date'        => $sponsor->emirates_id_expiry,
+                            'employer'           => $sponsor->emirates_id_employer,
+                            'issue_place'        => $sponsor->emirates_id_issue_place,
+                            'occupation'         => $sponsor->emirates_id_occupation,
+                            'nationality'        => $sponsor->emirates_id_nationality,
+                            'gender'             => $sponsor->emirates_id_gender,
+                        ],
                     ],
                     'recent_charity_events' => $recentEvents,
                     'total_events'          => Announcement::where(function ($q) use ($sponsorId) {
@@ -320,8 +334,22 @@ public function getProfile(Request $request)
                     'license_file'      => $sponsor->license_file ? asset($sponsor->license_file) : null,
                     'emirates_id_file'  => $sponsor->emirates_id_file ? asset($sponsor->emirates_id_file) : null,
                     'license_expiry'    => $sponsor->license_expiry ? $sponsor->license_expiry->toDateString() : null,
+                    'license_number'    => $sponsor->license_number,
+                    'license'           => $sponsor->license_data,
                     'validity'          => $sponsor->license_expiry ? ($sponsor->license_expiry->isFuture() ? 'Valid' : 'Expired') : 'Pending Review',
                     'joined_at'         => $sponsor->created_at->toIso8601String(),
+                    'emirates_id' => [
+                        'emirates_id_number' => $sponsor->emirates_id,
+                        'name'               => $sponsor->emirates_id_name,
+                        'date_of_birth'      => $sponsor->emirates_id_dob,
+                        'issue_date'         => $sponsor->emirates_id_issue_date,
+                        'expiry_date'        => $sponsor->emirates_id_expiry,
+                        'employer'           => $sponsor->emirates_id_employer,
+                        'issue_place'        => $sponsor->emirates_id_issue_place,
+                        'occupation'         => $sponsor->emirates_id_occupation,
+                        'nationality'        => $sponsor->emirates_id_nationality,
+                        'gender'             => $sponsor->emirates_id_gender,
+                    ],
                 ]
             ]
         ], 200);

app/Models/EmployerProfile.php

@@ -29,6 +29,8 @@ class EmployerProfile extends Model
         'emirates_id_employer',
         'emirates_id_issue_place',
         'emirates_id_occupation',
+        'emirates_id_nationality',
+        'emirates_id_gender',
         'address',
         'property_type',
         'profile_photo_url',

app/Models/Sponsor.php

@@ -43,6 +43,10 @@ class Sponsor extends Authenticatable
         'emirates_id_employer',
         'emirates_id_issue_place',
         'emirates_id_occupation',
+        'emirates_id_nationality',
+        'emirates_id_gender',
+        'license_number',
+        'license_data',
     ];
 
     protected $hidden = [
@@ -57,6 +61,7 @@ class Sponsor extends Authenticatable
         'subscription_end_date' => 'datetime',
         'last_login_at' => 'datetime',
         'license_expiry' => 'datetime',
+        'license_data' => 'array',
     ];
 
     public function hasActiveSubscription(): bool

app/Services/OcrDocumentService.php

@@ -162,7 +162,7 @@ public static function extractPassportData(UploadedFile $file): array
      *           "2023-04-11"   →  "2023-04-11"  (pass-through)
      *           "11 APR 2023"  →  "2023-04-11"
      */
-    private static function normaliseDate(string $raw): string
+    public static function normaliseDate(string $raw): string
     {
         $raw = trim($raw);
         if (empty($raw)) {

database/migrations/2026_06_24_203706_add_license_number_to_sponsors_table.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('sponsors', function (Blueprint $table) {
+            $table->string('license_number')->nullable()->after('license_expiry');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('sponsors', function (Blueprint $table) {
+            $table->dropColumn('license_number');
+        });
+    }
+};

database/migrations/2026_06_24_203838_add_license_data_to_sponsors_table.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('sponsors', function (Blueprint $table) {
+            $table->json('license_data')->nullable()->after('license_number');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('sponsors', function (Blueprint $table) {
+            $table->dropColumn('license_data');
+        });
+    }
+};

database/migrations/2026_06_24_211116_add_emirates_id_nationality_to_tables.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('sponsors', function (Blueprint $table) {
+            $table->string('emirates_id_nationality')->nullable()->after('emirates_id_name');
+        });
+        Schema::table('employer_profiles', function (Blueprint $table) {
+            $table->string('emirates_id_nationality')->nullable()->after('emirates_id_name');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('sponsors', function (Blueprint $table) {
+            $table->dropColumn('emirates_id_nationality');
+        });
+        Schema::table('employer_profiles', function (Blueprint $table) {
+            $table->dropColumn('emirates_id_nationality');
+        });
+    }
+};

database/migrations/2026_06_24_211842_add_emirates_id_gender_to_tables.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('sponsors', function (Blueprint $table) {
+            $table->string('emirates_id_gender')->nullable()->after('emirates_id_nationality');
+        });
+        Schema::table('employer_profiles', function (Blueprint $table) {
+            $table->string('emirates_id_gender')->nullable()->after('emirates_id_nationality');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('sponsors', function (Blueprint $table) {
+            $table->dropColumn('emirates_id_gender');
+        });
+        Schema::table('employer_profiles', function (Blueprint $table) {
+            $table->dropColumn('emirates_id_gender');
+        });
+    }
+};

public/swagger.json

@@ -1,4 +1,4 @@
-{
+{
     "openapi": "3.0.0",
     "info": {
         "title": "Migrant Mobile API",
@@ -63,17 +63,30 @@
                                         "type": "object",
                                         "description": "Optional JSON object containing extracted organization/trade license details.",
                                         "properties": {
-                                            "license_number": {
+                                            "document_type": { "type": "string", "example": "dubai_commercial_license" },
-                                                "type": "string",
+                                            "country": { "type": "string", "example": "United Arab Emirates" },
-                                                "example": "123456"
+                                            "authority": { "type": "string", "example": "Dubai Economy and Tourism" },
-                                            },
+                                            "license_no": { "type": "string", "example": "1426961" },
-                                            "organization_name": {
+                                            "company_name": { "type": "string", "example": "NEST CLIMATE TECHNICAL SERVICES L.L.C" },
-                                                "type": "string",
+                                            "business_name": { "type": "string", "example": "NEST CLIMATE TECHNICAL SERVICES L.L.C" },
-                                                "example": "Al-Rashidi Charitable Foundation"
+                                            "license_category": { "type": "string", "example": "Dep. of Economic Development" },
-                                            },
+                                            "legal_type": { "type": "string", "example": "Limited Liability Company(LLC)" },
-                                            "expiry_date": {
+                                            "issue_date": { "type": "string", "example": "22/10/2024" },
-                                                "type": "string",
+                                            "expiry_date": { "type": "string", "example": "21/10/2026" },
-                                                "example": "2028-06-12"
+                                            "main_license_no": { "type": "string", "example": "1426961" },
+                                            "register_no": { "type": "string", "example": "2436760" },
+                                            "dcci_no": { "type": "string", "example": "570232" },
+                                            "members": {
+                                                "type": "array",
+                                                "items": {
+                                                    "type": "object",
+                                                    "properties": {
+                                                        "person_no": { "type": "string", "example": "1709285" },
+                                                        "name": { "type": "string", "example": "SEYED ABDUL RAHMAN SHERIF NISAR" },
+                                                        "nationality": { "type": "string", "example": "India" },
+                                                        "role": { "type": "string", "example": "Manager" }
+                                                    }
+                                                }
                                             }
                                         }
                                     },
@@ -93,6 +106,10 @@
                                                 "type": "string",
                                                 "example": "NPL"
                                             },
+                                            "gender": {
+                                                "type": "string",
+                                                "example": "Male"
+                                            },
                                             "date_of_birth": {
                                                 "type": "string",
                                                 "example": "1988-03-22"
@@ -5277,6 +5294,39 @@
                         "type": "string",
                         "example": "fcm_token_example"
                     },
+                    "license": {
+                        "type": "object",
+                        "properties": {
+                            "document_type": { "type": "string", "example": "dubai_commercial_license" },
+                            "country": { "type": "string", "example": "United Arab Emirates" },
+                            "authority": { "type": "string", "example": "Dubai Economy and Tourism" },
+                            "license_no": { "type": "string", "example": "1426961" },
+                            "company_name": { "type": "string", "example": "NEST CLIMATE TECHNICAL SERVICES L.L.C" },
+                            "business_name": { "type": "string", "example": "NEST CLIMATE TECHNICAL SERVICES L.L.C" },
+                            "license_category": { "type": "string", "example": "Dep. of Economic Development" },
+                            "legal_type": { "type": "string", "example": "Limited Liability Company(LLC)" },
+                            "issue_date": { "type": "string", "example": "22/10/2024" },
+                            "expiry_date": { "type": "string", "example": "21/10/2026" },
+                            "main_license_no": { "type": "string", "example": "1426961" },
+                            "register_no": { "type": "string", "example": "2436760" },
+                            "dcci_no": { "type": "string", "example": "570232" }
+                        }
+                    },
+                    "emirates_id": {
+                        "type": "object",
+                        "properties": {
+                            "emirates_id_number": { "type": "string", "example": "784-1988-5310327-2" },
+                            "name": { "type": "string", "example": "KRISHNA PRASAD" },
+                            "date_of_birth": { "type": "string", "example": "1988-03-22" },
+                            "issue_date": { "type": "string", "example": "2023-04-11" },
+                            "expiry_date": { "type": "string", "example": "2028-04-11" },
+                            "employer": { "type": "string", "example": "Federal Authority" },
+                            "issue_place": { "type": "string", "example": "Abu Dhabi" },
+                            "occupation": { "type": "string", "example": "Manager" },
+                            "nationality": { "type": "string", "example": "NPL" },
+                            "gender": { "type": "string", "example": "Male" }
+                        }
+                    },
                     "created_at": {
                         "type": "string",
                         "format": "date-time"