diff --git a/Modules/Internal/Http/Controllers/Api/ReportLogController.php b/Modules/Internal/Http/Controllers/Api/ReportLogController.php index 1e04ab65..2fecc3c2 100644 --- a/Modules/Internal/Http/Controllers/Api/ReportLogController.php +++ b/Modules/Internal/Http/Controllers/Api/ReportLogController.php @@ -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/Jakarta'; $formattedDateTime = $parsedDateTime->format('Y-m-d H:i:s'); diff --git a/Modules/Internal/Transformers/ReportLogResource.php b/Modules/Internal/Transformers/ReportLogResource.php index ec7820bf..d5b4e615 100644 --- a/Modules/Internal/Transformers/ReportLogResource.php +++ b/Modules/Internal/Transformers/ReportLogResource.php @@ -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); $formattedDateTime = $parsedDateTime->format('Y-m-d H:i:s');