Merge remote-tracking branch 'origin/staging' into origin/production

2024-02-01 10:18:37 +07:00
parent 910622f5d6 254e9e0624
commit 0ed5ad7e48
2 changed files with 2 additions and 2 deletions
--- 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);
        }