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

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

Browse Source
This commit is contained in:
Linksehat Staging Server
2024-01-06 16:31:30 +07:00
parent 4b412fa5d2 c99bb1cc91
commit 899f1436e5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Services/CorporateMemberService.php
View File

@@ -165,10 +165,10 @@ class CorporateMemberService
}); });
}) })
->when($request->input('start_date'), function (Builder $query, $start) { ->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) { ->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) { ->when($request->input('division'), function (Builder $query, $value) {
$query->where('corporate_employees.division_id', $value); $query->where('corporate_employees.division_id', $value);