diff --git a/Modules/Internal/Transformers/ReportLogResource.php b/Modules/Internal/Transformers/ReportLogResource.php index 9690188b..0beb1c83 100644 --- a/Modules/Internal/Transformers/ReportLogResource.php +++ b/Modules/Internal/Transformers/ReportLogResource.php @@ -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 : '',