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

Merge branch 'staging' of https://dev.sismedika.online/febio/aso into staging

Browse Source
This commit is contained in:
Tb Fajri
2024-02-22 15:28:42 +07:00
parent 0e7d9467ce f2365922fc
commit abc1c92c50
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/Client/Http/Controllers/Api/ClaimController.php
View File

@@ -312,7 +312,7 @@ class ClaimController extends Controller
->leftJoin('members', 'members.id', '=', 'request_logs.member_id') ->leftJoin('members', 'members.id', '=', 'request_logs.member_id')
->leftJoin('corporate_employees','corporate_employees.member_id','=','members.id') ->leftJoin('corporate_employees','corporate_employees.member_id','=','members.id')
->where('corporate_employees.corporate_id', '=', $corporate_id) ->where('corporate_employees.corporate_id', '=', $corporate_id)
->where('request_logs.status_final_log', '=', 'approved') // ->where('request_logs.status_final_log', '=', 'approved')
->where('request_logs.deleted_at', '=', null) ->where('request_logs.deleted_at', '=', null)
->when($start != 'all' && $end != 'all', function ($query) use ($start, $end) { ->when($start != 'all' && $end != 'all', function ($query) use ($start, $end) {
$query->where('request_logs.submission_date', '>=', $start) $query->where('request_logs.submission_date', '>=', $start)
@@ -350,7 +350,7 @@ class ClaimController extends Controller
'request_logs.catatan', 'request_logs.catatan',
'tot_bill' 'tot_bill'
) )
->orderBy('request_logs.submission_date') ->orderBy('request_logs.submission_date', 'desc')
->get(); ->get();
if (isset($data) && count($data) > 0) if (isset($data) && count($data) > 0)
@@ -528,7 +528,7 @@ class ClaimController extends Controller
$penjamin, $penjamin,
!empty($dataMember->nama_perusahaan) ? $dataMember->nama_perusahaan : '', !empty($dataMember->nama_perusahaan) ? $dataMember->nama_perusahaan : '',
!empty($dataMember->no_polis) ? $dataMember->no_polis : '', !empty($dataMember->no_polis) ? $dataMember->no_polis : '',
'', '0',
'', '',
'', '',
'', '',