Merge branch 'staging' of itcorp.primaya.id:rajif/aso into staging
This commit is contained in:
@@ -11,6 +11,7 @@ use App\Models\CorporatePolicy;
|
||||
use App\Models\CorporatePlan;
|
||||
use App\Models\Member;
|
||||
use App\Models\MemberPolicy;
|
||||
use App\Models\MemberPlan;
|
||||
use App\Models\Person;
|
||||
use App\Models\Plan;
|
||||
use Box\Spout\Writer\Common\Creator\WriterEntityFactory;
|
||||
@@ -649,31 +650,31 @@ class MemberEnrollmentService
|
||||
]), 0, null, $row);
|
||||
}
|
||||
|
||||
if ($members_expire_date >= $corporate->currentPolicy->end && ($members_expire_date != $corporate->currentPolicy->end)) {
|
||||
throw new ImportRowException(__('enrollment.LESS_THAN', [
|
||||
'date_param' => 'Member Expired Date',
|
||||
'date' => $members_expire_date,
|
||||
'date_param2' => 'END Period Date',
|
||||
'end' => $corporate->currentPolicy->end
|
||||
]), 0, null, $row);
|
||||
}
|
||||
// if ($members_expire_date >= $corporate->currentPolicy->end && ($members_expire_date != $corporate->currentPolicy->end)) {
|
||||
// throw new ImportRowException(__('enrollment.LESS_THAN', [
|
||||
// 'date_param' => 'Member Expired Date',
|
||||
// 'date' => $members_expire_date,
|
||||
// 'date_param2' => 'END Period Date',
|
||||
// 'end' => $corporate->currentPolicy->end
|
||||
// ]), 0, null, $row);
|
||||
// }
|
||||
|
||||
|
||||
if ($members_expire_date <= $member_effective_date && ($members_expire_date != $member_effective_date)) {
|
||||
throw new ImportRowException(__('enrollment.MORE_THAN', [
|
||||
'date_param' => 'Member Expired Date',
|
||||
'date' => $members_expire_date,
|
||||
'date_param2' => 'Member Effective Date',
|
||||
'start' => $member_effective_date
|
||||
]), 0, null, $row);
|
||||
}
|
||||
// if ($members_expire_date <= $member_effective_date && ($members_expire_date != $member_effective_date)) {
|
||||
// throw new ImportRowException(__('enrollment.MORE_THAN', [
|
||||
// 'date_param' => 'Member Expired Date',
|
||||
// 'date' => $members_expire_date,
|
||||
// 'date_param2' => 'Member Effective Date',
|
||||
// 'start' => $member_effective_date
|
||||
// ]), 0, null, $row);
|
||||
// }
|
||||
|
||||
|
||||
if($corporate->code != $row['corporate_id']){
|
||||
throw new ImportRowException(__('enrollment.CORPORATE_CODE_NOT_MATCH', [
|
||||
'corporate_id' => $row['corporate_id']
|
||||
]), 0, null, $row);
|
||||
}
|
||||
// if($corporate->code != $row['corporate_id']){
|
||||
// throw new ImportRowException(__('enrollment.CORPORATE_CODE_NOT_MATCH', [
|
||||
// 'corporate_id' => $row['corporate_id']
|
||||
// ]), 0, null, $row);
|
||||
// }
|
||||
|
||||
switch ($row['record_mode']) {
|
||||
case "1": // New Member
|
||||
@@ -792,18 +793,19 @@ class MemberEnrollmentService
|
||||
}
|
||||
break;
|
||||
case "2": // Member Information Update (Without Replacement Card)
|
||||
$this->validateRow($row);
|
||||
|
||||
// $this->validateRow($row);
|
||||
$member = Member::query()
|
||||
->where('member_id', $row['member_id'])
|
||||
->first();
|
||||
|
||||
// Validate If Exist Member
|
||||
if (!$member) {
|
||||
throw new ImportRowException(__('enrollment.MEMBER_NOT_FOUND', [
|
||||
'member_id' => $row['member_id'],
|
||||
'policy_id' => $row['policy_number']
|
||||
]), 0, null, $row);
|
||||
}
|
||||
// // Validate If Exist Member
|
||||
// if (!$member) {
|
||||
// throw new ImportRowException(__('enrollment.MEMBER_NOT_FOUND', [
|
||||
// 'member_id' => $row['member_id'],
|
||||
// 'policy_id' => $row['policy_number']
|
||||
// ]), 0, null, $row);
|
||||
// }
|
||||
try {
|
||||
$memberPolicy = MemberPolicy::query()
|
||||
->where('policy_id', $row['policy_number'])
|
||||
@@ -811,6 +813,17 @@ class MemberEnrollmentService
|
||||
->with('member')
|
||||
->first();
|
||||
|
||||
// Pengecekan jika ada perubahan di plan
|
||||
$plan = Plan::query()
|
||||
->where('code', $row['plan_id'])
|
||||
->first();
|
||||
if ($plan){
|
||||
$memberPlan = MemberPlan::query()
|
||||
->where('member_id', $member->id)
|
||||
->first();
|
||||
$memberPlan->plan_id = $plan->id;
|
||||
$memberPlan->save();
|
||||
}
|
||||
if (!$memberPolicy) {
|
||||
throw new ImportRowException(__('enrollment.MEMBER_NOT_EXISTS', [
|
||||
'member_id' => $row['member_id'],
|
||||
|
||||
Reference in New Issue
Block a user