diff --git a/Modules/Internal/Services/MemberEnrollmentService.php b/Modules/Internal/Services/MemberEnrollmentService.php index cd9b9c6a..32a41612 100644 --- a/Modules/Internal/Services/MemberEnrollmentService.php +++ b/Modules/Internal/Services/MemberEnrollmentService.php @@ -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'])