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

merge

Browse Source
This commit is contained in:
Linksehat Staging Server
2023-09-04 15:28:21 +07:00
parent 8011d117d6
commit 4df8409e60
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -655,11 +655,7 @@ class MemberEnrollmentService
'start' => $corporate->currentPolicy->start 'start' => $corporate->currentPolicy->start
]), 0, null, $row); ]), 0, null, $row);
} }
<<<<<<< HEAD
=======
>>>>>>> origin/staging
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',
@@ -811,11 +807,7 @@ class MemberEnrollmentService
->where('member_id', $row['member_id']) ->where('member_id', $row['member_id'])
->first(); ->first();
<<<<<<< HEAD
// Validate If Exist Member
=======
// // Validate If Exist Member // // Validate If Exist Member
>>>>>>> origin/staging
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'],