update
This commit is contained in:
@@ -211,7 +211,7 @@ class ReportLogController extends Controller
|
|||||||
$approveByFgl = 'Import By Excel';
|
$approveByFgl = 'Import By Excel';
|
||||||
} else if ($row['final_log'] == 1 && $row['status_final_log'] == 'requested'){
|
} else if ($row['final_log'] == 1 && $row['status_final_log'] == 'requested'){
|
||||||
$approveByFgl = '-';
|
$approveByFgl = '-';
|
||||||
} else {
|
} else if ($row['final_log'] == 1) {
|
||||||
$approveByFgl = Helper::userName($row['approved_final_log_by']);
|
$approveByFgl = Helper::userName($row['approved_final_log_by']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ class ReportLogResource extends JsonResource
|
|||||||
$approveByFgl = 'Import By Excel';
|
$approveByFgl = 'Import By Excel';
|
||||||
} else if ($this->final_log == 1 && $this->status_final_log == 'requested'){
|
} else if ($this->final_log == 1 && $this->status_final_log == 'requested'){
|
||||||
$approveByFgl = '-';
|
$approveByFgl = '-';
|
||||||
} else {
|
} else if ($this->final_log == 1) {
|
||||||
$approveByFgl = Helper::userName($this->approved_final_log_by);
|
$approveByFgl = Helper::userName($this->approved_final_log_by);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user