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 11:30:09 +07:00
parent 6ced3a0f9f 24a4710318
commit bff6c1bc61
1 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -650,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
@@ -800,12 +800,12 @@ class MemberEnrollmentService
->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);
// }
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'])