From 726cf2e1921275cc31f5fe660030338620cb389a Mon Sep 17 00:00:00 2001 From: Tb Fajri Date: Mon, 22 May 2023 15:00:35 +0700 Subject: [PATCH] update validasi member --- .../Internal/Services/MemberEnrollmentService.php | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/Modules/Internal/Services/MemberEnrollmentService.php b/Modules/Internal/Services/MemberEnrollmentService.php index 85bd0e8a..6184b807 100755 --- a/Modules/Internal/Services/MemberEnrollmentService.php +++ b/Modules/Internal/Services/MemberEnrollmentService.php @@ -371,6 +371,12 @@ class MemberEnrollmentService } if ($row['record_type'] == 'D') { + $member = Member::query() + ->where('member_id', $row['principal_id']) + // ->whereHas('employeds', function ($query) use ($corporate) { + // $query->where('corporate_id', $corporate->id); + // }) + ->first(); if (empty($row['principal_id'])) { throw new ImportRowException(__('enrollment.PRINCIPAL_ID_REQUIRED'), 0, null, $row); } @@ -383,6 +389,10 @@ class MemberEnrollmentService if ($row['principal_id'] == $row['member_id']){ throw new ImportRowException(__('enrollment.PRINCIPAL_ID_NOT_SAME_MEMBER_ID'), 0, null, $row); } + if ($member) { + throw new ImportRowException(__('enrollment.PRINCIPAL_ID_NOT_SAME_MEMBER_ID'), 0, null, $row); + } + } // TODO RECORD BCA ONLY @@ -718,7 +728,6 @@ class MemberEnrollmentService try { DB::beginTransaction(); - // dd($member_data); $member->fill($member_data); if ($member->save()) { @@ -755,7 +764,7 @@ class MemberEnrollmentService $division_id = $division->id; } } - + // Bisa disini penyebab data dobel $member->employeds()->create([ 'corporate_id' => $corporate->id, 'branch_code' => $row['branch_code'], @@ -763,7 +772,7 @@ class MemberEnrollmentService 'nik' => $row['nik'], 'status' => $row['employment_status'] ]); - + // Bisa disini penyebab data dobel $member->memberPlans()->create([ 'plan_id' => $plan->id, 'status' => 'active',