Merge remote-tracking branch 'origin/staging' into origin/production

app/Services/CorporateMemberService.php

@@ -165,10 +165,10 @@ class CorporateMemberService
                 });
             })
             ->when($request->input('start_date'), function (Builder $query, $start) {
-                $query->where('member_plans.start', '>=', $start);
+                $query->where('members_effective_date.start', '>=', $start);
             })
             ->when($request->input('end_date'), function (Builder $query, $end) {
-                $query->where('member_plans.end', '<', $end);
+                $query->where('members_expire_date.end', '<', $end);
             })
             ->when($request->input('division'), function (Builder $query, $value) {
                 $query->where('corporate_employees.division_id', $value);
@@ -190,7 +190,16 @@ class CorporateMemberService
 
                 $query->getQuery()->orderBy($orderBy, $request->order);
             })
-            ->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'])
+            ->select([
+                'members.id',
+                'members.person_id',
+                'members.member_id',
+                'members.name',
+                'members.members_effective_date', // Use the actual property name
+                'members.members_expire_date',      // Use the actual property name
+                '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);
     }