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

Update Member Import

Browse Source
This commit is contained in:
Dell
2022-07-25 10:20:35 +07:00
parent 42e4129a79
commit 1edd8157c7
71 changed files with 1917 additions and 2743 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/Internal/Http/Controllers/Api/CorporatePlanController.php
View File

@@ -53,6 +53,7 @@ class CorporatePlanController extends Controller
'corporate_id' => $corporate_id,
'code' => $request->code,
'name' => $request->name,
'description' => $request->description
]);
return $newCorporatePlan;
@@ -101,6 +102,7 @@ class CorporatePlanController extends Controller
'code' => $request->code,
'name' => $request->name,
'active' => $request->active,
'description' => $request->description
])->save();
return $corporatePlan;

5
Modules/Internal/Http/Controllers/Api/MemberController.php
View File

@@ -29,6 +29,9 @@ class MemberController extends Controller
$benefits = Member::query()
->filter($request->all())
// ->where('corporate_id', $corporate_id)
->whereHas('employeds', function ($query) use ($corporate_id) {
$query->where('corporate_id', $corporate_id);
})
->paginate(20)
->appends($request->all());
@@ -101,7 +104,7 @@ class MemberController extends Controller
$request->validate([
'file' => 'required|file|mimes:xls,xlsx,csv,txt',
]);
$corporate = Corporate::findOrFail($corporate_id);
$corporate = Corporate::findOrFail($corporate_id)->load('currentPolicy');
$file_name = now()->getPreciseTimestamp(3).'-'.$request->file('file')->getClientOriginalName();
$file = $request->file('file')->storeAs('temp', $file_name);

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

@@ -146,14 +146,24 @@ class MemberEnrollmentService
"bpjs_class" => $row['bpjs_class'],
];
if ($corporate->currentPolicy->code != $row['policy_number']) {
throw new ImportRowException(__('enrollment.POLICY_NUMBER_NOT_MATCH', [
'policy_id' => $row['policy_number']
]), 0, null, $row);
}
switch ($row['record_mode']) {
case "1": // New Member
$member = Member::query()
->where('member_id', $row['member_id'])
// ->whereHas('employeds', function ($query) use ($corporate) {
// $query->where('corporate_id', $corporate->id);
// })
->first();
if ($member) {
throw new ImportRowException(__('enrollment.MEMBER_EXISTS', [
throw new ImportRowException(__('enrollment.MEMBER_UNIQUE', [
'member_id' => $row['member_id'],
'policy_id' => $row['policy_number']
]), 0, null, $row);
@@ -180,10 +190,10 @@ class MemberEnrollmentService
if ($member->save()) {
$memberPolicy = new MemberPolicy();
$memberPolicy->fill([
'member_id' => $member->id,
'member_id' => $member->member_id,
'policy_id' => $row['policy_number'],
'start' => Carbon::parse($row['member_effective_date']),
'end' => Carbon::parse($row['member_expiry_date']),
'start' => Carbon::parse(strtotime($row['member_effective_date'])),
'end' => Carbon::parse(strtotime($row['member_expiry_date'])),
'status' => 'active'
]);
$memberPolicy->save();
@@ -285,7 +295,7 @@ class MemberEnrollmentService
throw new ImportRowException(__('enrollment.MEMBER_EXPIRY_DATE_NO_CHANGE'), 0, null, $row);
}
if (Carbon::parse($row['member_effective_date']) > Carbon::parse($row['end_date'])) {
if (Carbon::parse(strtotime($row['member_effective_date'])) > Carbon::parse($row['end_date'])) {
throw new ImportRowException(__('enrollment.MEMBER_EXPIRY_DATE_INVALID'), 0, null, $row);
}
@@ -312,12 +322,12 @@ class MemberEnrollmentService
]), 0, null, $row);
}
if (Carbon::parse($row['member_effective_date']) > Carbon::parse($row['member_expiry_date'])) {
if (Carbon::parse(strtotime($row['member_effective_date'])) > Carbon::parse(strtotime($row['member_expiry_date']))) {
throw new ImportRowException(__('enrollment.MEMBER_EXPIRY_DATE_INVALID'), 0, null, $row);
}
if (Carbon::parse($memberPolicy->end) > Carbon::parse($row['member_expiry_date']
|| $memberPolicy->end > Carbon::parse($row['member_expiry_date']))) {
if (Carbon::parse($memberPolicy->end) > Carbon::parse(strtotime($row['member_expiry_date'])
|| $memberPolicy->end > Carbon::parse(strtotime($row['member_expiry_date'])))) {
throw new ImportRowException(__('enrollment.MEMBER_RENEWAL_STILL_ACTIVE'), 0, null, $row);
}
@@ -352,12 +362,12 @@ class MemberEnrollmentService
]), 0, null, $row);
}
if (Carbon::parse($row['member_effective_date']) > Carbon::parse($row['member_expiry_date'])) {
if (Carbon::parse(strtotime($row['member_effective_date'])) > Carbon::parse(strtotime($row['member_expiry_date']))) {
throw new ImportRowException(__('enrollment.MEMBER_EXPIRY_DATE_INVALID'), 0, null, $row);
}
if (Carbon::parse($memberPolicy->end) > Carbon::parse($row['member_expiry_date']
|| $memberPolicy->end > Carbon::parse($row['member_expiry_date']))) {
if (Carbon::parse($memberPolicy->end) > Carbon::parse(strtotime($row['member_expiry_date'])
|| $memberPolicy->end > Carbon::parse(strtotime($row['member_expiry_date'])))) {
throw new ImportRowException(__('enrollment.MEMBER_RENEWAL_STILL_ACTIVE'), 0, null, $row);
}
@@ -445,11 +455,11 @@ class MemberEnrollmentService
]), 0, null, $row);
}
if (Carbon::parse($row['member_effective_date']) < now() || Carbon::parse($row['member_expiry_date']) < now()) {
if (Carbon::parse(strtotime($row['member_effective_date'])) < now() || Carbon::parse(strtotime($row['member_expiry_date'])) < now()) {
throw new ImportRowException(__('enrollment.MEMBER_EXPIRY_MUST_BE_AFTER_TODAY'), 0, null, $row);
}
if (Carbon::parse($row['member_effective_date']) > Carbon::parse($row['member_expiry_date'])) {
if (Carbon::parse(strtotime($row['member_effective_date'])) > Carbon::parse(strtotime($row['member_expiry_date']))) {
throw new ImportRowException(__('enrollment.MEMBER_EXPIRY_DATE_INVALID'), 0, null, $row);
}
@@ -521,7 +531,7 @@ class MemberEnrollmentService
throw new ImportRowException(__("enrollment.MODE_UNAVAILABLE"), 0, null, $row);
}
} catch (\Exception $e) {
throw new ImportRowException($e->getMessage(), (int) $e->getCode(), $e, $row);
throw $e; //new ImportRowException($e->getMessage(), (int) $e->getCode(), $e, $row);
}
}