From c82e3063c55c3c352ae25dedfc1183ca0836169c Mon Sep 17 00:00:00 2001 From: Tb Fajri Date: Fri, 19 Jan 2024 09:49:21 +0700 Subject: [PATCH 1/3] add division recode mode 2 --- .../Services/MemberEnrollmentService.php | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/Modules/Internal/Services/MemberEnrollmentService.php b/Modules/Internal/Services/MemberEnrollmentService.php index 177ad4cc..e23d2e2e 100644 --- a/Modules/Internal/Services/MemberEnrollmentService.php +++ b/Modules/Internal/Services/MemberEnrollmentService.php @@ -951,6 +951,34 @@ class MemberEnrollmentService // Hapus Member plan terkait $delete = MemberPlan::where('member_id', $member->id)->delete(); //Update plan + + if (!empty($row['division_name'])) { + $division_id = CorporateDivision::query()->where('code', $row['division_name'])->pluck('id')->first(); + + if (empty($division_id)) { + $division = CorporateDivision::query()->updateOrCreate(['name' => $row['division_name'], 'code' => $row['division_name']], [ + 'corporate_id' => $corporate->id, + 'name' => $row['division_name'], + 'code' => $row['division_name'], + ]); + + $division_id = $division->id; + } + } + + // Bisa disini penyebab data dobel + $member->employeds()->updateOrCreate([ + 'division_id' => $division->id + ],[ + 'corporate_id' => $corporate->id, + 'branch_code' => $row['branch_code'], + 'division_id' => $division_id ?? null, + 'nik' => $row['nik'], + 'status' => $row['employment_status'] + ]); + // Bisa disini penyebab data dobel + + $plans = explode(",",$row['plan_id']); if (count($plans) > 0) { foreach($plans as $d){ From ce3257e9cb2da1345fdf1b894043afe5ec15ec03 Mon Sep 17 00:00:00 2001 From: Tb Fajri Date: Fri, 19 Jan 2024 09:55:05 +0700 Subject: [PATCH 2/3] update division --- .../Services/MemberEnrollmentService.php | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Modules/Internal/Services/MemberEnrollmentService.php b/Modules/Internal/Services/MemberEnrollmentService.php index e23d2e2e..b18e8f29 100644 --- a/Modules/Internal/Services/MemberEnrollmentService.php +++ b/Modules/Internal/Services/MemberEnrollmentService.php @@ -964,19 +964,19 @@ class MemberEnrollmentService $division_id = $division->id; } + + // Bisa disini penyebab data dobel + $member->employeds()->updateOrCreate([ + 'division_id' => $division->id + ],[ + 'corporate_id' => $corporate->id, + 'branch_code' => $row['branch_code'], + 'division_id' => $division_id ?? null, + 'nik' => $row['nik'], + 'status' => $row['employment_status'] + ]); + // Bisa disini penyebab data dobel } - - // Bisa disini penyebab data dobel - $member->employeds()->updateOrCreate([ - 'division_id' => $division->id - ],[ - 'corporate_id' => $corporate->id, - 'branch_code' => $row['branch_code'], - 'division_id' => $division_id ?? null, - 'nik' => $row['nik'], - 'status' => $row['employment_status'] - ]); - // Bisa disini penyebab data dobel $plans = explode(",",$row['plan_id']); From abc6c3371785f13d3d65a9f48c0a98afe744de9b Mon Sep 17 00:00:00 2001 From: Tb Fajri Date: Fri, 19 Jan 2024 09:57:22 +0700 Subject: [PATCH 3/3] update --- Modules/Internal/Services/MemberEnrollmentService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/Internal/Services/MemberEnrollmentService.php b/Modules/Internal/Services/MemberEnrollmentService.php index b18e8f29..80b874ae 100644 --- a/Modules/Internal/Services/MemberEnrollmentService.php +++ b/Modules/Internal/Services/MemberEnrollmentService.php @@ -967,7 +967,7 @@ class MemberEnrollmentService // Bisa disini penyebab data dobel $member->employeds()->updateOrCreate([ - 'division_id' => $division->id + 'division_id' => $division_id ],[ 'corporate_id' => $corporate->id, 'branch_code' => $row['branch_code'],