commit client portal

This commit is contained in:
Muhammad Fajar
2023-09-27 15:39:20 +07:00
parent 3f54e07fb5
commit 2f7a450d28
11 changed files with 1830 additions and 1650 deletions

View File

@@ -34,7 +34,7 @@ class CorporateMemberService
'division' => 'corporate_divisions.name',
default => ''
};
if ($request->order){
if ($request->order) {
$query->getQuery()->orderBy($orderBy, $request->order);
}
})
@@ -48,7 +48,6 @@ class CorporateMemberService
$limit = $request->has('perPage') ? $request->input('perPage') : 10;
return Member::query()
->joinClaimRequests('right')
->joinCorporateEmployees('left')
->joinCorporateDivisions('left')
->with('currentPlan')
@@ -62,11 +61,6 @@ class CorporateMemberService
->orWhere('members.name', 'like', "%" . $search . "%");
});
})
->when($request->input('division'), function (Builder $division, $value) {
$division->whereHas('division', function (Builder $corporateEmployee) use ($value) {
$corporateEmployee->where('division_id', $value);
});
})
->when($request->has('orderBy'), function (Builder $query) use ($request) {
$orderBy = match ($request->orderBy) {
'memberId' => 'member_id',
@@ -80,7 +74,7 @@ class CorporateMemberService
$query->getQuery()->orderBy('corporate_divisions.name', $request->order);
}
})
->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'])
->paginate($limit);
}
@@ -122,8 +116,8 @@ class CorporateMemberService
->paginate($limit);
}
public function getAllEncounter(int $corporateId){
public function getAllEncounter(int $corporateId)
{
return Encounter::query()->select(['id'])->paginate(10);
}
}