diff --git a/Modules/Internal/Http/Controllers/Api/ReportLogController.php b/Modules/Internal/Http/Controllers/Api/ReportLogController.php index 0049eb5e..117ba8a5 100644 --- a/Modules/Internal/Http/Controllers/Api/ReportLogController.php +++ b/Modules/Internal/Http/Controllers/Api/ReportLogController.php @@ -215,7 +215,7 @@ class ReportLogController extends Controller $approveByFgl = 'Import By Excel'; } else if ($row['final_log'] == 1 && $row['status_final_log'] == 'requested'){ $approveByFgl = '-'; - } else { + } else if ($row['final_log'] == 1) { $approveByFgl = Helper::userName($row['approved_final_log_by']); } diff --git a/Modules/Internal/Transformers/ReportLogResource.php b/Modules/Internal/Transformers/ReportLogResource.php index 7afa1209..e0340d1a 100644 --- a/Modules/Internal/Transformers/ReportLogResource.php +++ b/Modules/Internal/Transformers/ReportLogResource.php @@ -46,7 +46,7 @@ class ReportLogResource extends JsonResource $approveByFgl = 'Import By Excel'; } else if ($this->final_log == 1 && $this->status_final_log == 'requested'){ $approveByFgl = '-'; - } else { + } else if ($this->final_log == 1) { $approveByFgl = Helper::userName($this->approved_final_log_by); }