bugs fix tanggal start end date alarm center
This commit is contained in:
@@ -19,8 +19,8 @@ class MemberAlarmCenterResources extends JsonResource
|
|||||||
'memberId' => $this->member_id,
|
'memberId' => $this->member_id,
|
||||||
'fullName' => $this->full_name,
|
'fullName' => $this->full_name,
|
||||||
'service' => $this->service_code,
|
'service' => $this->service_code,
|
||||||
'start_date' => $this->start_date,
|
'start_date' => $this->members_effective_date,
|
||||||
'end_date' => $this->end_date,
|
'end_date' => $this->members_expire_date,
|
||||||
'status' => $this->active,
|
'status' => $this->active,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -174,7 +174,16 @@ class CorporateMemberService
|
|||||||
|
|
||||||
$query->getQuery()->orderBy($orderBy, $request->order);
|
$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`")
|
->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);
|
->paginate($limit);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user