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 09:52:37 +07:00
parent 64cca9bca0 53763674fd
commit 85749e4743
7 changed files with 86 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Modules/Internal/Transformers/OrganizationResource.php
View File

@@ -31,6 +31,7 @@ class OrganizationResource extends JsonResource
'district_id' => $this->currentAddress->district_id ?? null,
'village_id' => $this->currentAddress->village_id ?? null,
'postal_code' => $this->currentAddress->postal_code ?? null,
'corporate_id_partner' => $this->corporate_id_partner ?? null,
'active' => $this->status == 'active' ? 1 : 0,
];

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

@@ -40,13 +40,16 @@ class ReportLogResource extends JsonResource
$created_final_at = null;
}
if ($this->approved_at){
$durationGl = Helper::differenceTime($formattedDateTime, $this->approved_at);
$durationGl = Helper::differenceTime($formattedDateTime, $this->submission_date);
$approveByFgl = '-';
if ($this->import_system) {
$approveByFgl = 'Import By Excel';
} else if ($this->final_log == 1 && $this->status_final_log == 'requested'){
$approveByFgl = '-';
} else {
$durationGl = 0;
$approveByFgl = Helper::userName($this->approved_final_log_by);
}
$data = [
'id' => $this->id,
'code' => $this->code,
@@ -55,7 +58,7 @@ class ReportLogResource extends JsonResource
'submission_date' => $this->approved_at ? $this->approved_at : null,
'approved_by' => Helper::userName($this->approved_by),
'approved_final_log_at' => $this->approved_final_log_at,
'approved_final_log_by' => $this->final_log == 1 ? Helper::userName($this->approved_final_log_by) : '-',
'approved_final_log_by' => $approveByFgl,
'service_name' => $this->service ? $this->service->name : '',
'provider' => $provider ? $provider->name : '-',
'document_qty' => count($documentQty),