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

Merge branch 'origin/production' of https://dev.sismedika.online/febio/aso into origin/production

Browse Source
This commit is contained in:
Linksehat Staging Server
2024-01-13 14:27:12 +07:00
parent bc7225e8cd 30fc2201bd
commit 5baa18bf5f
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/Client/Http/Controllers/Api/CorporateMemberController.php
View File

@@ -196,7 +196,7 @@ class CorporateMemberController extends Controller
})
->find($member_id);
return response()->json(['full_name' => $data->full_name, 'paginations' => Helper::paginateResources(DataListClaimMemberResource::collection($data->requestLogs()->paginate($per_page)))]);
return response()->json(['full_name' => $data->full_name ?? null, 'paginations' => Helper::paginateResources(DataListClaimMemberResource::collection($data->requestLogs()->paginate($per_page)))]);
}
public function serviceMonitoring(int $corporate_id, int $request_log_id)

22
app/Services/CorporateMemberService.php
View File

@@ -153,11 +153,11 @@ class CorporateMemberService
// dd($request);
return Member::query()
->joinCorporateEmployees('left')
->joinMemberPlans('left')
->joinPlans('left')
->with(['currentPlan', 'person'])
->where('corporate_employees.corporate_id', $corporateId)
// ->joinCorporateEmployees('left')
// ->joinMemberPlans('left')
// ->joinPlans('left')
// ->with(['currentPlan', 'person'])
// ->where('corporate_employees.corporate_id', $corporateId)
->when($request->input('search'), function (Builder $query, $search) {
$query->where(function (Builder $query) use ($search) {
$query->orWhere('members.member_id', 'like', "%" . $search . "%")
@@ -180,10 +180,10 @@ class CorporateMemberService
$orderBy = match ($request->input('orderBy')) {
'memberId' => 'member_id',
'fullName' => 'name',
'status' => 'active',
// 'status' => 'active',
'start_date' => 'member_plans.start',
'end_date' => 'member_plans.end',
'service' => 'plans.service_code',
// 'service' => 'plans.service_code',
default => ''
};
@@ -197,11 +197,11 @@ class CorporateMemberService
'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'
// '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`")
->groupBy('member_id')
// ->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`")
// ->groupBy('member_id')
->paginate($limit);
}