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

This commit is contained in:
Linksehat Staging Server
2023-07-27 11:30:09 +07:00

View File

@@ -650,31 +650,31 @@ class MemberEnrollmentService
]), 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',
// 'date' => $members_expire_date, 'date' => $members_expire_date,
// 'date_param2' => 'END Period Date', 'date_param2' => 'END Period Date',
// 'end' => $corporate->currentPolicy->end 'end' => $corporate->currentPolicy->end
// ]), 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',
// 'date' => $members_expire_date, 'date' => $members_expire_date,
// 'date_param2' => 'Member Effective Date', 'date_param2' => 'Member Effective Date',
// 'start' => $member_effective_date 'start' => $member_effective_date
// ]), 0, null, $row); ]), 0, null, $row);
// } }
// if($corporate->code != $row['corporate_id']){ if($corporate->code != $row['corporate_id']){
// throw new ImportRowException(__('enrollment.CORPORATE_CODE_NOT_MATCH', [ throw new ImportRowException(__('enrollment.CORPORATE_CODE_NOT_MATCH', [
// 'corporate_id' => $row['corporate_id'] 'corporate_id' => $row['corporate_id']
// ]), 0, null, $row); ]), 0, null, $row);
// } }
switch ($row['record_mode']) { switch ($row['record_mode']) {
case "1": // New Member case "1": // New Member
@@ -800,12 +800,12 @@ class MemberEnrollmentService
->first(); ->first();
// // Validate If Exist Member // // Validate If Exist Member
// if (!$member) { if (!$member) {
// throw new ImportRowException(__('enrollment.MEMBER_NOT_FOUND', [ throw new ImportRowException(__('enrollment.MEMBER_NOT_FOUND', [
// 'member_id' => $row['member_id'], 'member_id' => $row['member_id'],
// 'policy_id' => $row['policy_number'] 'policy_id' => $row['policy_number']
// ]), 0, null, $row); ]), 0, null, $row);
// } }
try { try {
$memberPolicy = MemberPolicy::query() $memberPolicy = MemberPolicy::query()
->where('policy_id', $row['policy_number']) ->where('policy_id', $row['policy_number'])