diff --git a/app/Http/Controllers/V3/Dashboard/Reports/RoadPatrolReportController.php b/app/Http/Controllers/V3/Dashboard/Reports/RoadPatrolReportController.php index 3ce39b0c..d45967b6 100644 --- a/app/Http/Controllers/V3/Dashboard/Reports/RoadPatrolReportController.php +++ b/app/Http/Controllers/V3/Dashboard/Reports/RoadPatrolReportController.php @@ -29,7 +29,7 @@ class RoadPatrolReportController extends Controller $provinces = Province::all(['id', 'name_fa']); return $this->successResponse([ - 'activities' => $activities, + 'activities' => $activities['data'], 'provinces' => $provinces ]); } @@ -46,7 +46,7 @@ class RoadPatrolReportController extends Controller $edarateShahri = EdarateShahri::query()->where('province_id', '=', $provinceId)->get(['id', 'name_fa']); return $this->successResponse([ - 'activities' => $activities, + 'activities' => $activities['data'], 'edarateShahri' => $edarateShahri, ]); } diff --git a/app/Services/Reports/RoadPatrolReportService.php b/app/Services/Reports/RoadPatrolReportService.php index 1dda5f91..c7051116 100644 --- a/app/Services/Reports/RoadPatrolReportService.php +++ b/app/Services/Reports/RoadPatrolReportService.php @@ -118,7 +118,7 @@ class RoadPatrolReportService ); return [ - 'activities' => $activities, + 'data' => $activities, 'fromDate' => $fromDate, 'toDate' => $toDate ]; @@ -181,7 +181,7 @@ class RoadPatrolReportService ); return [ - 'activities' => $activities, + 'data' => $activities, 'fromDate' => $fromDate, 'toDate' => $toDate ];