improvement uat 1

app/Services/CorporateMemberService.php

@@ -95,7 +95,7 @@ class CorporateMemberService
             // ->joinClaimRequests('right')
             ->joinCorporateEmployees('left')
             ->joinCorporateDivisions('left')
-            ->with('currentPlan')
+            ->with('currentPlans')
             ->withSum('claims', 'total_claim')
             ->whereHas('employeds', function (Builder $corporateEmployee) use ($corporateId) {
                 $corporateEmployee->where('corporate_id', $corporateId);
@@ -125,7 +125,7 @@ class CorporateMemberService
                 }
             })
             // ->select(['members.id', 'members.person_id', 'members.member_id', 'members.name', 'corporate_divisions.name AS division_name', 'members.active', 'claim_requests.id', 'claim_requests.member_id', 'claim_requests.submission_date'])
-            ->select(['members.id', 'members.person_id', 'members.member_id', 'members.name', 'corporate_divisions.name AS division_name', 'members.active'])
+            ->select(['members.id', 'members.person_id', 'members.member_id', 'members.name', 'corporate_divisions.name AS division_name', 'members.active', ])
             ->paginate($limit);
     }
 
@@ -174,7 +174,7 @@ class CorporateMemberService
 
                 $query->getQuery()->orderBy($orderBy, $request->order);
             })
-            ->select(['members.id', 'members.person_id', 'members.member_id', 'members.name', 'member_plans.start AS start_date',  'member_plans.end AS end_date', 'plans.active', 'plans.service_code'])
+            ->select(['members.id', 'members.person_id', 'members.member_id', 'members.name', 'members.members_effective_date AS start_date',  'members.members_expire_date AS end_date', 'plans.active', 'plans.service_code'])
             ->selectRaw("(select sum(`claims`.`total_claim`) from `claims` where `members`.`id` = `claims`.`member_id` AND `claims`.`deleted_at` IS NULL) AS `claims_sum_total_claim`")
             ->paginate($limit);
     }