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-02-19 10:34:35 +07:00
parent 4781bb146e 15a99b95b9
commit 35cffa9928
6 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/Internal/Http/Controllers/Api/DailyMonitoringController.php
View File

@@ -35,15 +35,12 @@ class DailyMonitoringController extends Controller
];
}
/**
* Member List
*/
public function GetMemberList(Request $request)
{
$memberList = DB::table('request_logs')
->leftJoin('members', 'request_logs.member_id', '=', 'members.id')
->leftJoin('organizations', 'organizations.id', '=', 'request_logs.organization_id')
->select('members.member_id','members.name','members.members_effective_date AS startdate','members.members_expire_date AS enddate', 'request_logs.submission_date as addmision_date', 'organizations.name as provider' )
->select('members.member_id','members.name','members.members_effective_date AS startdate','members.members_expire_date AS enddate', 'request_logs.submission_date as addmision_date', 'organizations.name as provider', 'request_logs.organization_id' )
->where('request_logs.service_code', 'IP')
->where('request_logs.deleted_at', null)
->when($request->search, function ($q, $search) {
@@ -80,6 +77,7 @@ class DailyMonitoringController extends Controller
->where('request_logs.deleted_at', null)
// ->where('request_logs.status_final_log', 'approved')
->where("request_logs.member_id", "=", $memberDetail->id)
->where("request_logs.organization_id", "=", $request->organization_id)
->when($request->search, function ($q, $search) {
$q->where('request_logs.code', 'LIKE', "%".$search."%");
})