From 254e9e06248debd32e5a6c98c0c25f46cb82fd21 Mon Sep 17 00:00:00 2001 From: Tb Fajri Date: Thu, 1 Feb 2024 10:16:29 +0700 Subject: [PATCH] update --- Modules/Internal/Http/Controllers/Api/ReportLogController.php | 2 +- Modules/Internal/Transformers/ReportLogResource.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/Internal/Http/Controllers/Api/ReportLogController.php b/Modules/Internal/Http/Controllers/Api/ReportLogController.php index 3c20bc72..bd6cebc0 100644 --- a/Modules/Internal/Http/Controllers/Api/ReportLogController.php +++ b/Modules/Internal/Http/Controllers/Api/ReportLogController.php @@ -211,7 +211,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 1967bbda..4d0fc117 100644 --- a/Modules/Internal/Transformers/ReportLogResource.php +++ b/Modules/Internal/Transformers/ReportLogResource.php @@ -45,7 +45,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); }