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-12 15:27:46 +07:00
parent 3d9fe45989 7474d199e4
commit be99463417
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

@@ -209,7 +209,7 @@ class ReportLogController extends Controller
foreach ($dataRequestLog as $index => $row){
$serviceName = Helper::serviceName($row['service_code']);
$provider = Organization::where('id', $row['organization_id'])->first();
$documentQty = File::where(['fileable_type' => 'App\Models\RequestLog', 'fileable_id' => $row['id']])->get()->toArray();
$documentQty = File::where(['fileable_type' => 'App\Models\RequestLog', 'fileable_id' => $row['id'], 'deleted_at' => null])->get()->toArray();
$parsedDateTime = Carbon::parse($row['created_at']);
// $parsedDateTime->tz = 'Asia/Makassar';
$formattedDateTime = $parsedDateTime->format('Y-m-d H:i:s');

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

@@ -25,7 +25,7 @@ class ReportLogResource extends JsonResource
return [Str::slug($file->type, '_') => $file];
});
$provider = Organization::where('id', $this->organization_id)->first();
$documentQty = File::where(['fileable_type' => 'App\Models\RequestLog', 'fileable_id' => $this->id])->get()->toArray();
$documentQty = File::where(['fileable_type' => 'App\Models\RequestLog', 'fileable_id' => $this->id, 'deleted_at' => null])->get()->toArray();
$parsedDateTime = Carbon::parse($this->created_at);
// $parsedDateTime->tz = 'Asia/Makassar';
$formattedDateTime = $parsedDateTime->format('Y-m-d H:i:s');