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:18:37 +07:00
parent 910622f5d6 254e9e0624
commit 0ed5ad7e48
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/Internal/Http/Controllers/Api/ReportLogController.php
View File

@@ -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']);
}

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

@@ -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);
}