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

Merge branch 'staging' of itcorp.primaya.id:rajif/aso into staging

Browse Source
This commit is contained in:
Linksehat Staging Server
2023-07-27 10:47:22 +07:00
parent aed9d5d4ad b2ae4a63c4
commit 5092569f48
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -565,6 +565,7 @@ class MemberEnrollmentService
"policy_in_force" => $row['policy_in_force'] ?? null, "policy_in_force" => $row['policy_in_force'] ?? null,
"start_no_claim" => $row['start_no_claim'] ?? null, "start_no_claim" => $row['start_no_claim'] ?? null,
"end_no_claim" => $row['end_no_claim'] ?? null, "end_no_claim" => $row['end_no_claim'] ?? null,
"plan_id" => $row['plan_id'] ?? null,
"members_effective_date" => $row['member_effective_date'] ?? null, "members_effective_date" => $row['member_effective_date'] ?? null,
"members_expire_date" => $row['member_expiry_date'] ?? null, "members_expire_date" => $row['member_expiry_date'] ?? null,
@@ -575,7 +576,6 @@ class MemberEnrollmentService
"telephone_res" => $row['telephone_res'] ?? null, "telephone_res" => $row['telephone_res'] ?? null,
"telephone_office" => $row['telephone_office'] ?? null, "telephone_office" => $row['telephone_office'] ?? null,
]; ];
// $this->validateRow($row); // $this->validateRow($row);
if (!isset($corporate->currentPolicy) || $corporate->currentPolicy->code != $row['policy_number']) { if (!isset($corporate->currentPolicy) || $corporate->currentPolicy->code != $row['policy_number']) {
throw new ImportRowException(__('enrollment.POLICY_NUMBER_NOT_MATCH', [ throw new ImportRowException(__('enrollment.POLICY_NUMBER_NOT_MATCH', [
@@ -648,6 +648,7 @@ class MemberEnrollmentService
'start' => $corporate->currentPolicy->start 'start' => $corporate->currentPolicy->start
]), 0, null, $row); ]), 0, null, $row);
} }
if ($members_expire_date >= $corporate->currentPolicy->end && ($members_expire_date != $corporate->currentPolicy->end)) { if ($members_expire_date >= $corporate->currentPolicy->end && ($members_expire_date != $corporate->currentPolicy->end)) {
throw new ImportRowException(__('enrollment.LESS_THAN', [ throw new ImportRowException(__('enrollment.LESS_THAN', [
'date_param' => 'Member Expired Date', 'date_param' => 'Member Expired Date',
@@ -657,6 +658,7 @@ class MemberEnrollmentService
]), 0, null, $row); ]), 0, null, $row);
} }
if ($members_expire_date <= $member_effective_date && ($members_expire_date != $member_effective_date)) { if ($members_expire_date <= $member_effective_date && ($members_expire_date != $member_effective_date)) {
throw new ImportRowException(__('enrollment.MORE_THAN', [ throw new ImportRowException(__('enrollment.MORE_THAN', [
'date_param' => 'Member Expired Date', 'date_param' => 'Member Expired Date',