From 697fd9e2fc8989a8fa7a7f7dfb53a151d8c80fdc Mon Sep 17 00:00:00 2001 From: faezehzafarbakhsh Date: Sun, 19 Oct 2025 15:17:15 +0330 Subject: [PATCH] change something form harim controller --- .../V3/Dashboard/Harim/DetailController.php | 11 +---------- .../V3/Dashboard/Harim/PanjareVahedController.php | 6 ++++++ .../Harim/PanjareVahed/GetAccessRoadRequest.php | 1 + .../Harim/PanjareVahed/GetFinalPolygonsRequest.php | 1 + .../Dashboard/Harim/PanjareVahed/GetRejectRequest.php | 1 + 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/Http/Controllers/V3/Dashboard/Harim/DetailController.php b/app/Http/Controllers/V3/Dashboard/Harim/DetailController.php index 76c2e94c..8ac02b8e 100644 --- a/app/Http/Controllers/V3/Dashboard/Harim/DetailController.php +++ b/app/Http/Controllers/V3/Dashboard/Harim/DetailController.php @@ -15,15 +15,6 @@ class DetailController extends Controller public function states(Request $request): JsonResponse { - $query = HarimState::query()->select(['id', 'name']); - - $data = DataTableFacade::run( - $query, - $request, - allowedFilters: ['*'], - allowedSortings: ['*'], - ); - - return response()->json($data); + return $this->successResponse(HarimState::query()->get(['id', 'name'])); } } diff --git a/app/Http/Controllers/V3/Dashboard/Harim/PanjareVahedController.php b/app/Http/Controllers/V3/Dashboard/Harim/PanjareVahedController.php index 466eb884..fa583bc1 100644 --- a/app/Http/Controllers/V3/Dashboard/Harim/PanjareVahedController.php +++ b/app/Http/Controllers/V3/Dashboard/Harim/PanjareVahedController.php @@ -85,6 +85,8 @@ class PanjareVahedController extends Controller 'state_id' => $state, 'state_name' => HarimStates::name($state), 'access_road' => json_encode($request->access_road), + 'data' => $request->data['data'], + 'token' => $request->data['token'], ]); return response()->json([ @@ -103,6 +105,8 @@ class PanjareVahedController extends Controller $harim->update([ 'state_id' => $state, 'state_name' => HarimStates::name($state), + 'data' => $request->data['data'], + 'token' => $request->data['token'], ]); return response()->json([ @@ -124,6 +128,8 @@ class PanjareVahedController extends Controller 'state_name' => HarimStates::name($state), 'final_area' => json_encode($request->final_area), 'final_plan' => json_encode($request->final_plan), + 'data' => $request->data['data'], + 'token' => $request->data['token'], ]); return response()->json([ diff --git a/app/Http/Requests/V3/Dashboard/Harim/PanjareVahed/GetAccessRoadRequest.php b/app/Http/Requests/V3/Dashboard/Harim/PanjareVahed/GetAccessRoadRequest.php index 09758ca8..388856f2 100644 --- a/app/Http/Requests/V3/Dashboard/Harim/PanjareVahed/GetAccessRoadRequest.php +++ b/app/Http/Requests/V3/Dashboard/Harim/PanjareVahed/GetAccessRoadRequest.php @@ -27,6 +27,7 @@ class GetAccessRoadRequest extends FormRequest 'access_road' => 'required|array', 'access_road.type' => 'required|string', 'access_road.coordinates' => 'required|array', + 'data' => 'required|array', ]; } } diff --git a/app/Http/Requests/V3/Dashboard/Harim/PanjareVahed/GetFinalPolygonsRequest.php b/app/Http/Requests/V3/Dashboard/Harim/PanjareVahed/GetFinalPolygonsRequest.php index 0080dd86..37bb54f3 100644 --- a/app/Http/Requests/V3/Dashboard/Harim/PanjareVahed/GetFinalPolygonsRequest.php +++ b/app/Http/Requests/V3/Dashboard/Harim/PanjareVahed/GetFinalPolygonsRequest.php @@ -30,6 +30,7 @@ class GetFinalPolygonsRequest extends FormRequest 'final_plan' => 'required|array', 'final_plan.type' => 'required|string', 'final_plan.coordinates' => 'required|array', + 'data' => 'required|array', ]; } } diff --git a/app/Http/Requests/V3/Dashboard/Harim/PanjareVahed/GetRejectRequest.php b/app/Http/Requests/V3/Dashboard/Harim/PanjareVahed/GetRejectRequest.php index 701cf5b1..e5a4ace5 100644 --- a/app/Http/Requests/V3/Dashboard/Harim/PanjareVahed/GetRejectRequest.php +++ b/app/Http/Requests/V3/Dashboard/Harim/PanjareVahed/GetRejectRequest.php @@ -24,6 +24,7 @@ class GetRejectRequest extends FormRequest { return [ 'request_id' => 'required|exists:harims,panjare_vahed_id', + 'data' => 'required|array', ]; } }