tbfajri/aso
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/staging' into origin/production

Browse Source
This commit is contained in:
Linksehat Staging Server
2024-01-06 15:05:32 +07:00
parent ece4e796da 7db0af3bef
commit 931245cae9
4 changed files with 97 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Modules/Internal/Services/MemberEnrollmentService.php
View File

@@ -340,8 +340,10 @@ class MemberEnrollmentService
if ($date_from_row instanceof DateTime) {
return $date_from_row->format('Y-m-d');
} else {
} else if ($date_from_row != null) {
return date('Y-m-d', strtotime($date_from_row));
} else {
return null;
}
}
@@ -728,7 +730,7 @@ class MemberEnrollmentService
],
[
'name' => $row['name'] ?? null,
'birth_date' => $this->dateParser($row['date_of_birth']),
'birth_date' => $this->dateParser($row['date_of_birth']) ?? null,
'gender' => Helper::genderNormalization($row['sex']),
'language' => $row['language'] ?? null,
'race' => $row['race'] ?? null,
@@ -785,7 +787,7 @@ class MemberEnrollmentService
if ($member->save()) {
$person = Person::create([
'name' => $row['name'],
'birth_date' => $this->dateParser($row['date_of_birth']),
'birth_date' => $this->dateParser($row['date_of_birth']) ?? null,
'gender' => Helper::genderNormalization($row['sex']) ?? '-',
'language' => $row['language'] ?? null,
'race' => $row['race'] ?? null,
@@ -906,6 +908,7 @@ class MemberEnrollmentService
$member->gender = Helper::genderPerson($row['sex']);
$member->relation_with_principal = $row['relationship_with_principal'];
$member->marital_status = $row['marital_status'];
$member->birth_date = $this->dateParser($row['date_of_birth']);
$member->save();
try {
@@ -937,7 +940,7 @@ class MemberEnrollmentService
// $memberPlan->plan_id = $plan->id;
// $memberPlan->save();
// }
// Hapus Member plan terkait
$member->memberPlans()->delete();
//Update plan
@@ -999,7 +1002,7 @@ class MemberEnrollmentService
'sNamaPeserta' => $row['name'],
'dStartDate' => $row['member_effective_date'],
'dExpireDate' => $row['member_expiry_date'],
'dTanggalLahir' => $row['date_of_birth'],
'dTanggalLahir' => $row['date_of_birth'] ? $this->dateParser($row['date_of_birth']) : null,
// 'nNoKTP' => $row['nric'] ?? ,
]
);