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

update

Browse Source
This commit is contained in:
Linksehat Staging Server
2023-12-29 17:47:11 +07:00
parent 6b57919bba
commit 1aa984b7eb
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -699,7 +699,6 @@ class MemberEnrollmentService
// $query->where('corporate_id', $corporate->id); // $query->where('corporate_id', $corporate->id);
// }) // })
->first(); ->first();
// Validate If Exist Member // Validate If Exist Member
if ($member) { if ($member) {
$person = Person::updateOrCreate( $person = Person::updateOrCreate(
@@ -710,7 +709,7 @@ class MemberEnrollmentService
'name' => $row['name'] ?? null, 'name' => $row['name'] ?? null,
// 'birth_date' => $this->dateParser($row['date_of_birth']), // 'birth_date' => $this->dateParser($row['date_of_birth']),
'birth_date' => $row['date_of_birth'], 'birth_date' => $row['date_of_birth'],
'gender' => Helper::genderPerson($row['sex']), 'gender' => Helper::genderNormalization($row['sex']),
'language' => $row['language'] ?? null, 'language' => $row['language'] ?? null,
'race' => $row['race'] ?? null, 'race' => $row['race'] ?? null,
'phone' => $row['telephone_mobile'] ?? null 'phone' => $row['telephone_mobile'] ?? null
@@ -764,17 +763,16 @@ class MemberEnrollmentService
DB::beginTransaction(); DB::beginTransaction();
$member->fill($member_data); $member->fill($member_data);
if ($member->save()) { if ($member->save()) {
$person = Person::create([ $person = Person::create([
'name' => $row['name'], 'name' => $row['name'],
'birth_date' => $row['date_of_birth'], 'birth_date' => $row['date_of_birth'],
'gender' => Helper::genderPerson($row['sex']), 'gender' => Helper::genderNormalization($row['sex']),
'language' => $row['language'] ?? null, 'language' => $row['language'] ?? null,
'race' => $row['race'] ?? null, 'race' => $row['race'] ?? null,
'phone' => $row['telephone_mobile'], 'phone' => $row['telephone_mobile'],
]); ]);
$member->person_id = $person->id; $member->person_id = $person->id;
$member->save();
$memberPolicy = new MemberPolicy(); $memberPolicy = new MemberPolicy();
$memberPolicy->fill([ $memberPolicy->fill([
@@ -784,6 +782,7 @@ class MemberEnrollmentService
'end' => $this->dateParser($row['member_expiry_date']), 'end' => $this->dateParser($row['member_expiry_date']),
'status' => 'active' 'status' => 'active'
]); ]);
$memberPolicy->save(); $memberPolicy->save();
if (!empty($row['division_name'])) { if (!empty($row['division_name'])) {

5
app/Helpers/Helper.php
View File

@@ -15,6 +15,7 @@ class Helper
{ {
public static function genderNormalization($anyGenderCode) public static function genderNormalization($anyGenderCode)
{ {
if ($anyGenderCode == 'M') { if ($anyGenderCode == 'M') {
return 'Male'; return 'Male';
} else if ($anyGenderCode == 'F') { } else if ($anyGenderCode == 'F') {
@@ -24,7 +25,7 @@ class Helper
} else if ($anyGenderCode == 'U') { } else if ($anyGenderCode == 'U') {
return 'Unknown'; return 'Unknown';
} else { } else {
return null; return '-';
} }
} }
@@ -52,7 +53,7 @@ class Helper
} else if ($anyGenderCode == 'U') { } else if ($anyGenderCode == 'U') {
return 'unknown'; return 'unknown';
} else { } else {
return null; return '-';
} }
} }

2
app/Models/Person.php
View File

@@ -151,6 +151,6 @@ class Person extends Model
public function updatePerson() public function updatePerson()
{ {
$this -> update ( $data ); $this-> update ( $data );
} }
} }