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-01 10:54:43 +07:00
parent 525d7db795 5e38fdf154
commit 2845588300
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,7 +40,7 @@ class ReportLogResource extends JsonResource
$created_final_at = null; $created_final_at = null;
} }
$durationGl = Helper::differenceTime($formattedDateTime, $this->submission_date); $durationGl = Helper::differenceTime($formattedDateTime, $this->approved_at);
$approveByFgl = '-'; $approveByFgl = '-';
if ($this->import_system) { if ($this->import_system) {
$approveByFgl = 'Import By Excel'; $approveByFgl = 'Import By Excel';
@@ -55,8 +55,8 @@ class ReportLogResource extends JsonResource
'code' => $this->code, 'code' => $this->code,
'created_at' => $formattedDateTime, 'created_at' => $formattedDateTime,
'created_final_at' => $created_final_at, 'created_final_at' => $created_final_at,
'submission_date' => $this->approved_at ? $this->approved_at : null, 'submission_date' => $this->approved_at,
'approved_by' => Helper::userName($this->approved_by), 'approved_by' => $this->approved_by ? Helper::userName($this->approved_by) : '-',
'approved_final_log_at' => $this->approved_final_log_at, 'approved_final_log_at' => $this->approved_final_log_at,
'approved_final_log_by' => $approveByFgl, 'approved_final_log_by' => $approveByFgl,
'service_name' => $this->service ? $this->service->name : '', 'service_name' => $this->service ? $this->service->name : '',