Merge branch 'staging' of https://dev.sismedika.online/febio/aso into staging
This commit is contained in:
@@ -312,7 +312,7 @@ class ClaimController extends Controller
|
||||
->leftJoin('members', 'members.id', '=', 'request_logs.member_id')
|
||||
->leftJoin('corporate_employees','corporate_employees.member_id','=','members.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)
|
||||
->when($start != 'all' && $end != 'all', function ($query) use ($start, $end) {
|
||||
$query->where('request_logs.submission_date', '>=', $start)
|
||||
@@ -350,7 +350,7 @@ class ClaimController extends Controller
|
||||
'request_logs.catatan',
|
||||
'tot_bill'
|
||||
)
|
||||
->orderBy('request_logs.submission_date')
|
||||
->orderBy('request_logs.submission_date', 'desc')
|
||||
->get();
|
||||
|
||||
if (isset($data) && count($data) > 0)
|
||||
@@ -528,7 +528,7 @@ class ClaimController extends Controller
|
||||
$penjamin,
|
||||
!empty($dataMember->nama_perusahaan) ? $dataMember->nama_perusahaan : '',
|
||||
!empty($dataMember->no_polis) ? $dataMember->no_polis : '',
|
||||
'',
|
||||
'0',
|
||||
'',
|
||||
'',
|
||||
'',
|
||||
|
||||
Reference in New Issue
Block a user