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

This commit is contained in:
Linksehat Staging Server
2024-01-06 16:31:30 +07:00

View File

@@ -165,10 +165,10 @@ class CorporateMemberService
});
})
->when($request->input('start_date'), function (Builder $query, $start) {
$query->where('members_effective_date.start', '>=', $start);
$query->where('members.members_effective_date', '>=', $start);
})
->when($request->input('end_date'), function (Builder $query, $end) {
$query->where('members_expire_date.end', '<', $end);
$query->where('members.members_expire_date', '<', $end);
})
->when($request->input('division'), function (Builder $query, $value) {
$query->where('corporate_employees.division_id', $value);