mohanmd/migrant-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: mohanmd:bb22b8d227a1ef9c31d28c652c28142547d90f5c
Branches Tags
mohanmd:master
mohanmd:mohan
mohanmd:pavithra
..
compare: mohanmd:46014465531f1d881c2c91c4f647fdd6dc1fd2aa
Branches Tags
mohanmd:mohan
mohanmd:master
mohanmd:pavithra

No commits in common. "bb22b8d227a1ef9c31d28c652c28142547d90f5c" and "46014465531f1d881c2c91c4f647fdd6dc1fd2aa" have entirely different histories.
bb22b8d227 ... 4601446553

6 changed files with 8 additions and 49 deletions
Show Stats Expand all files Collapse all files

17
app/Http/Controllers/Api/EmployerAuthController.php
View File

@ -234,8 +234,6 @@ public function register(Request $request)
$emiratesIdEmployer = null; $emiratesIdEmployer = null;
$emiratesIdIssuePlace = null; $emiratesIdIssuePlace = null;
$emiratesIdOccupation = null; $emiratesIdOccupation = null;
$emiratesIdCardNumber = null;
$emiratesIdGender = null;
if (is_array($emiratesIdInput)) { if (is_array($emiratesIdInput)) {
$emiratesIdNumber = $emiratesIdInput['emirates_id_number'] ?? $emiratesIdInput['id_number'] ?? $emiratesIdInput['id number'] ?? $emiratesIdInput['card_number'] ?? null; $emiratesIdNumber = $emiratesIdInput['emirates_id_number'] ?? $emiratesIdInput['id_number'] ?? $emiratesIdInput['id number'] ?? $emiratesIdInput['card_number'] ?? null;
@ -249,9 +247,8 @@ public function register(Request $request)
$emiratesIdGender = $emiratesIdInput['gender'] ?? $emiratesIdInput['sex'] ?? null; $emiratesIdGender = $emiratesIdInput['gender'] ?? $emiratesIdInput['sex'] ?? null;
$emiratesIdIssueDate = $emiratesIdInput['issue_date'] ?? $emiratesIdInput['issue date'] ?? null; $emiratesIdIssueDate = $emiratesIdInput['issue_date'] ?? $emiratesIdInput['issue date'] ?? null;
$emiratesIdEmployer = $emiratesIdInput['employer'] ?? null; $emiratesIdEmployer = $emiratesIdInput['employer'] ?? null;
$emiratesIdIssuePlace = $emiratesIdInput['issue_place'] ?? $emiratesIdInput['issue place'] ?? $emiratesIdInput['issuing_place'] ?? null; $emiratesIdIssuePlace = $emiratesIdInput['issue_place'] ?? $emiratesIdInput['issue place'] ?? null;
$emiratesIdOccupation = $emiratesIdInput['occupation'] ?? $emiratesIdInput['occuption'] ?? null; $emiratesIdOccupation = $emiratesIdInput['occupation'] ?? $emiratesIdInput['occuption'] ?? null;
$emiratesIdCardNumber = $emiratesIdInput['card_number'] ?? null;
} }
// Create inactive User // Create inactive User
@ -285,7 +282,6 @@ public function register(Request $request)
'emirates_id_occupation' => $emiratesIdOccupation, 'emirates_id_occupation' => $emiratesIdOccupation,
'emirates_id_nationality' => $emiratesIdNationality, 'emirates_id_nationality' => $emiratesIdNationality,
'emirates_id_gender' => $emiratesIdGender, 'emirates_id_gender' => $emiratesIdGender,
'emirates_id_card_number' => $emiratesIdCardNumber,
'address' => $request->address, 'address' => $request->address,
]); ]);
@ -306,17 +302,6 @@ public function register(Request $request)
'status' => 'inactive', 'status' => 'inactive',
'fcm_token' => $request->fcm_token, 'fcm_token' => $request->fcm_token,
'emirates_id' => $emiratesIdNumber, 'emirates_id' => $emiratesIdNumber,
'emirates_id_card_number' => $emiratesIdCardNumber,
'emirates_id_name' => $emiratesIdName,
'emirates_id_dob' => $emiratesIdDob,
'emirates_id_issue_date' => $emiratesIdIssueDate,
'emirates_id_expiry' => $emiratesIdExpiry,
'emirates_id_employer' => $emiratesIdEmployer,
'emirates_id_issue_place' => $emiratesIdIssuePlace,
'emirates_id_occupation' => $emiratesIdOccupation,
'emirates_id_nationality' => $emiratesIdNationality,
'emirates_id_gender' => $emiratesIdGender,
'nationality' => $emiratesIdNationality,
'address' => $request->address, 'address' => $request->address,
]); ]);

4
app/Http/Controllers/Api/EmployerProfileController.php
View File

@ -53,8 +53,6 @@ public function getProfile(Request $request)
'occupation' => $profile->emirates_id_occupation, 'occupation' => $profile->emirates_id_occupation,
'nationality' => $profile->emirates_id_nationality, 'nationality' => $profile->emirates_id_nationality,
'gender' => $profile->emirates_id_gender, 'gender' => $profile->emirates_id_gender,
'card_number' => $profile->emirates_id_card_number,
'country' => 'United Arab Emirates',
], ],
]; ];
@ -281,8 +279,6 @@ public function updateProfile(Request $request)
'occupation' => $profile->emirates_id_occupation, 'occupation' => $profile->emirates_id_occupation,
'nationality' => $profile->emirates_id_nationality, 'nationality' => $profile->emirates_id_nationality,
'gender' => $profile->emirates_id_gender, 'gender' => $profile->emirates_id_gender,
'card_number' => $profile->emirates_id_card_number,
'country' => 'United Arab Emirates',
], ],
]; ];

12
app/Http/Controllers/Api/SponsorAuthController.php
View File

@ -85,8 +85,6 @@ public function register(Request $request)
$emiratesIdEmployer = null; $emiratesIdEmployer = null;
$emiratesIdIssuePlace = null; $emiratesIdIssuePlace = null;
$emiratesIdOccupation = null; $emiratesIdOccupation = null;
$emiratesIdGender = null;
$emiratesIdCardNumber = null;
if (is_array($emiratesIdInput)) { if (is_array($emiratesIdInput)) {
$emiratesId = $emiratesIdInput['emirates_id_number'] ?? $emiratesIdInput['id_number'] ?? $emiratesIdInput['id number'] ?? $emiratesIdInput['card_number'] ?? null; $emiratesId = $emiratesIdInput['emirates_id_number'] ?? $emiratesIdInput['id_number'] ?? $emiratesIdInput['id number'] ?? $emiratesIdInput['card_number'] ?? null;
@ -102,7 +100,6 @@ public function register(Request $request)
$emiratesIdEmployer = $emiratesIdInput['employer'] ?? null; $emiratesIdEmployer = $emiratesIdInput['employer'] ?? null;
$emiratesIdIssuePlace = $emiratesIdInput['issue_place'] ?? $emiratesIdInput['issue place'] ?? null; $emiratesIdIssuePlace = $emiratesIdInput['issue_place'] ?? $emiratesIdInput['issue place'] ?? null;
$emiratesIdOccupation = $emiratesIdInput['occupation'] ?? $emiratesIdInput['occuption'] ?? null; $emiratesIdOccupation = $emiratesIdInput['occupation'] ?? $emiratesIdInput['occuption'] ?? null;
$emiratesIdCardNumber = $emiratesIdInput['card_number'] ?? null;
} }
$emiratesIdPath = null; $emiratesIdPath = null;
@ -113,7 +110,7 @@ public function register(Request $request)
$sponsor = DB::transaction(function () use ( $sponsor = DB::transaction(function () use (
$request, $email, $licensePath, $emiratesIdPath, $emiratesId, $apiToken, $licenseExpiry, $licenseNumber, $licenseInput, $request, $email, $licensePath, $emiratesIdPath, $emiratesId, $apiToken, $licenseExpiry, $licenseNumber, $licenseInput,
$emiratesIdExpiry, $emiratesIdName, $emiratesIdDob, $emiratesIdIssueDate, $emiratesIdEmployer, $emiratesIdExpiry, $emiratesIdName, $emiratesIdDob, $emiratesIdIssueDate, $emiratesIdEmployer,
$emiratesIdIssuePlace, $emiratesIdOccupation, $emiratesIdNationality, $emiratesIdGender, $emiratesIdCardNumber $emiratesIdIssuePlace, $emiratesIdOccupation, $emiratesIdNationality, $emiratesIdGender
) { ) {
return Sponsor::create([ return Sponsor::create([
'full_name' => $request->full_name, 'full_name' => $request->full_name,
@ -145,7 +142,6 @@ public function register(Request $request)
'emirates_id_occupation' => $emiratesIdOccupation, 'emirates_id_occupation' => $emiratesIdOccupation,
'emirates_id_nationality' => $emiratesIdNationality, 'emirates_id_nationality' => $emiratesIdNationality,
'emirates_id_gender' => $emiratesIdGender, 'emirates_id_gender' => $emiratesIdGender,
'emirates_id_card_number' => $emiratesIdCardNumber,
]); ]);
}); });
@ -191,8 +187,6 @@ public function register(Request $request)
'occupation' => $sponsor->emirates_id_occupation, 'occupation' => $sponsor->emirates_id_occupation,
'nationality' => $sponsor->emirates_id_nationality, 'nationality' => $sponsor->emirates_id_nationality,
'gender' => $sponsor->emirates_id_gender, 'gender' => $sponsor->emirates_id_gender,
'card_number' => $sponsor->emirates_id_card_number,
'country' => 'United Arab Emirates',
], ],
], ],
'token' => $apiToken, 'token' => $apiToken,
@ -298,10 +292,6 @@ public function login(Request $request)
'employer' => $sponsor->emirates_id_employer, 'employer' => $sponsor->emirates_id_employer,
'issue_place' => $sponsor->emirates_id_issue_place, 'issue_place' => $sponsor->emirates_id_issue_place,
'occupation' => $sponsor->emirates_id_occupation, 'occupation' => $sponsor->emirates_id_occupation,
'nationality' => $sponsor->emirates_id_nationality,
'gender' => $sponsor->emirates_id_gender,
'card_number' => $sponsor->emirates_id_card_number,
'country' => 'United Arab Emirates',
], ],
], ],
'token' => $apiToken, 'token' => $apiToken,

5
app/Http/Controllers/Api/SponsorController.php
View File

@ -349,8 +349,6 @@ public function getProfile(Request $request)
'occupation' => $sponsor->emirates_id_occupation, 'occupation' => $sponsor->emirates_id_occupation,
'nationality' => $sponsor->emirates_id_nationality, 'nationality' => $sponsor->emirates_id_nationality,
'gender' => $sponsor->emirates_id_gender, 'gender' => $sponsor->emirates_id_gender,
'card_number' => $sponsor->emirates_id_card_number,
'country' => 'United Arab Emirates',
], ],
] ]
] ]
@ -386,7 +384,7 @@ private function buildSponsorResponse(Sponsor $sponsor): array
$emiratesIdData = [ $emiratesIdData = [
'emirates_id_number' => $sponsor->emirates_id, 'emirates_id_number' => $sponsor->emirates_id,
'name' => $sponsor->emirates_id_name, 'name' => $sponsor->emirates_id_name,
'nationality' => $sponsor->emirates_id_nationality, 'nationality' => $sponsor->nationality,
'date_of_birth' => $sponsor->emirates_id_dob, 'date_of_birth' => $sponsor->emirates_id_dob,
'expiry_date' => $sponsor->emirates_id_expiry, 'expiry_date' => $sponsor->emirates_id_expiry,
'issue_date' => $sponsor->emirates_id_issue_date, 'issue_date' => $sponsor->emirates_id_issue_date,
@ -395,7 +393,6 @@ private function buildSponsorResponse(Sponsor $sponsor): array
'occupation' => $sponsor->emirates_id_occupation, 'occupation' => $sponsor->emirates_id_occupation,
'card_number' => $sponsor->emirates_id_card_number, 'card_number' => $sponsor->emirates_id_card_number,
'gender' => $sponsor->emirates_id_gender, 'gender' => $sponsor->emirates_id_gender,
'country' => 'United Arab Emirates',
]; ];
} }

3
app/Models/Sponsor.php
View File

@ -108,7 +108,7 @@ public function toArray()
$emiratesIdData = [ $emiratesIdData = [
'emirates_id_number' => $this->emirates_id, 'emirates_id_number' => $this->emirates_id,
'name' => $this->emirates_id_name, 'name' => $this->emirates_id_name,
'nationality' => $this->emirates_id_nationality, 'nationality' => $this->nationality,
'date_of_birth' => $this->emirates_id_dob, 'date_of_birth' => $this->emirates_id_dob,
'expiry_date' => $this->emirates_id_expiry, 'expiry_date' => $this->emirates_id_expiry,
'issue_date' => $this->emirates_id_issue_date, 'issue_date' => $this->emirates_id_issue_date,
@ -117,7 +117,6 @@ public function toArray()
'occupation' => $this->emirates_id_occupation, 'occupation' => $this->emirates_id_occupation,
'card_number' => $this->emirates_id_card_number, 'card_number' => $this->emirates_id_card_number,
'gender' => $this->emirates_id_gender, 'gender' => $this->emirates_id_gender,
'country' => 'United Arab Emirates',
]; ];
} }

8
database/migrations/2026_06_23_175000_add_card_number_and_gender_to_employer_profiles_and_sponsors.php
View File

@ -12,21 +12,13 @@
public function up(): void public function up(): void
{ {
Schema::table('employer_profiles', function (Blueprint $table) { Schema::table('employer_profiles', function (Blueprint $table) {
if (!Schema::hasColumn('employer_profiles', 'emirates_id_card_number')) {
$table->string('emirates_id_card_number')->nullable(); $table->string('emirates_id_card_number')->nullable();
}
if (!Schema::hasColumn('employer_profiles', 'emirates_id_gender')) {
$table->string('emirates_id_gender')->nullable(); $table->string('emirates_id_gender')->nullable();
}
}); });
Schema::table('sponsors', function (Blueprint $table) { Schema::table('sponsors', function (Blueprint $table) {
if (!Schema::hasColumn('sponsors', 'emirates_id_card_number')) {
$table->string('emirates_id_card_number')->nullable(); $table->string('emirates_id_card_number')->nullable();
}
if (!Schema::hasColumn('sponsors', 'emirates_id_gender')) {
$table->string('emirates_id_gender')->nullable(); $table->string('emirates_id_gender')->nullable();
}
}); });
} }