diff --git a/app/Http/Controllers/V3/Dashboard/Reports/RoadItemsReportController.php b/app/Http/Controllers/V3/Dashboard/Reports/RoadItemsReportController.php index 098fc85d..3196ff73 100644 --- a/app/Http/Controllers/V3/Dashboard/Reports/RoadItemsReportController.php +++ b/app/Http/Controllers/V3/Dashboard/Reports/RoadItemsReportController.php @@ -74,7 +74,7 @@ class RoadItemsReportController extends Controller $provinces = Province::all(['id', 'name_fa']); return $this->successResponse([ - 'activities' => $activities, + 'activities' => $activities['data'], 'provinces' => $provinces, ]); } @@ -85,7 +85,7 @@ class RoadItemsReportController extends Controller $edarateShahri = EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']); return $this->successResponse([ - 'activities' => $activities, + 'activities' => $activities['data'], 'edarateShahri' => $edarateShahri, ]); } diff --git a/app/Services/DataTable/DataTableInput.php b/app/Services/DataTable/DataTableInput.php index 64a3f290..8464e878 100644 --- a/app/Services/DataTable/DataTableInput.php +++ b/app/Services/DataTable/DataTableInput.php @@ -26,7 +26,7 @@ class DataTableInput { } - public function getStart(): int + public function getStart(): ?int { return $this->start; }