update kolom approve gl
This commit is contained in:
@@ -49,13 +49,22 @@ class ReportLogResource extends JsonResource
|
|||||||
$approveByFgl = Helper::userName($this->approved_final_log_by);
|
$approveByFgl = Helper::userName($this->approved_final_log_by);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$approveByGl = '-';
|
||||||
|
if ($this->import_system) {
|
||||||
|
$approveByGl = 'Import By Excel';
|
||||||
|
} else if ($this->status == 'requested'){
|
||||||
|
$approveByGl = '-';
|
||||||
|
} else {
|
||||||
|
$approveByGl = Helper::userName($this->approved_by);
|
||||||
|
}
|
||||||
|
|
||||||
$data = [
|
$data = [
|
||||||
'id' => $this->id,
|
'id' => $this->id,
|
||||||
'code' => $this->code,
|
'code' => $this->code,
|
||||||
'created_at' => $formattedDateTime,
|
'created_at' => $formattedDateTime,
|
||||||
'created_final_at' => $created_final_at,
|
'created_final_at' => $created_final_at,
|
||||||
'submission_date' => $this->approved_at,
|
'submission_date' => $this->approved_at,
|
||||||
'approved_by' => Helper::userName($this->approved_by),
|
'approved_by' => $approveByGl,
|
||||||
'approved_final_log_at' => $this->approved_final_log_at,
|
'approved_final_log_at' => $this->approved_final_log_at,
|
||||||
'approved_final_log_by' => $approveByFgl,
|
'approved_final_log_by' => $approveByFgl,
|
||||||
'service_name' => $this->service ? $this->service->name : '',
|
'service_name' => $this->service ? $this->service->name : '',
|
||||||
|
|||||||
Reference in New Issue
Block a user