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-02 15:09:57 +07:00
parent 25a3ace8e2 adf97d049a
commit 3769c05ac2
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Modules/Internal/Transformers/ReportLogResource.php
View File

@@ -50,13 +50,22 @@ class ReportLogResource extends JsonResource
$approveByFgl = Helper::userName($this->approved_final_log_by);
}
$approveByGl = '-';
if ($this->import_system) {
$approveByGl = 'Import By Excel';
} else if ($this->status == 'requested'){
$approveByGl = '-';
} else {
$approveByGl = Helper::userName($this->approved_by);
}
$data = [
'id' => $this->id,
'code' => $this->code,
'created_at' => $formattedDateTime,
'created_final_at' => $created_final_at,
'submission_date' => $this->approved_at,
'approved_by' => $this->approved_by ? Helper::userName($this->approved_by) : '-',
'approved_by' => $approveByGl,
'approved_final_log_at' => $this->approved_final_log_at,
'approved_final_log_by' => $approveByFgl,
'service_name' => $this->service ? $this->service->name : '',