Merge remote-tracking branch 'origin/staging' into origin/production
This commit is contained in:
@@ -222,10 +222,10 @@ class CorporateMemberService
|
|||||||
});
|
});
|
||||||
})
|
})
|
||||||
->when($request->input('start_date'), function (Builder $query, $start_date) {
|
->when($request->input('start_date'), function (Builder $query, $start_date) {
|
||||||
$query->where('members.members_effective_date', '>=', $start_date);
|
$query->where('request_logs.submission_date', '>=', $start_date);
|
||||||
})
|
})
|
||||||
->when($request->input('end_date'), function (Builder $query, $end_date) {
|
->when($request->input('end_date'), function (Builder $query, $end_date) {
|
||||||
$query->where('members.members_expire_date', '<', $end_date);
|
$query->where('request_logs.submission_date', '<', $end_date);
|
||||||
})
|
})
|
||||||
->when($request->input('division'), function (Builder $query, $value) {
|
->when($request->input('division'), function (Builder $query, $value) {
|
||||||
$query->where('corporate_employees.division_id', $value);
|
$query->where('corporate_employees.division_id', $value);
|
||||||
|
|||||||
Reference in New Issue
Block a user