From 7ccf6dfd8f0c427f8f4199f0aebb03ad308e4212 Mon Sep 17 00:00:00 2001
From: joddyabott <faezehzafarbakhsh@gmail.com>
Date: Sat, 30 Aug 2025 10:23:45 +0330
Subject: [PATCH] fix webservice ant change the other part of code

---
 .../V3/Dashboard/Harim/PanjareVahedController.php     |  8 +++++---
 .../V3/Dashboard/RoadMaintenanceStationController.php | 11 ++++-------
 .../Harim/PanjareVahed/GetAccessRoadRequest.php       |  2 +-
 routes/v3.php                                         |  2 +-
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/app/Http/Controllers/V3/Dashboard/Harim/PanjareVahedController.php b/app/Http/Controllers/V3/Dashboard/Harim/PanjareVahedController.php
index 35eaf0c8..1629d876 100644
--- a/app/Http/Controllers/V3/Dashboard/Harim/PanjareVahedController.php
+++ b/app/Http/Controllers/V3/Dashboard/Harim/PanjareVahedController.php
@@ -63,16 +63,18 @@ class PanjareVahedController extends Controller
             'province' => $city->province()->first()->name_fa,
         ]);
     }
-    public function getAccessRoad(GetAccessRoadRequest $request, Harim $harim)
+    public function getAccessRoad(GetAccessRoadRequest $request)
     {
         $state = HarimStates::BARESI_FILE_APLODE_SHODE_TAVASOTE_DAFTAR_HARIM->value;
 
-        $harim->update([
+        Harim::query()
+            ->firstWhere('panjare_vahed_id', '=', $request->panjare_vahed_id)
+            ->update([
             'state_id' => $state,
             'state_name' => HarimStates::name($state),
-            'panjare_vahed_id' => $request->panjare_vahed_id,
             'access_road' => $request->access_road,
         ]);
+
         return $this->successResponse();
     }
 }
diff --git a/app/Http/Controllers/V3/Dashboard/RoadMaintenanceStationController.php b/app/Http/Controllers/V3/Dashboard/RoadMaintenanceStationController.php
index dc14f995..35344404 100644
--- a/app/Http/Controllers/V3/Dashboard/RoadMaintenanceStationController.php
+++ b/app/Http/Controllers/V3/Dashboard/RoadMaintenanceStationController.php
@@ -24,10 +24,7 @@ class RoadMaintenanceStationController extends Controller
     public function index(Request $request): JsonResponse
     {
         $user = auth()->user();
-        auth()->user()->addActivityComplete(1019);
-
-        $allowedFilters = ['*'];
-        $allowedSortings = ['*'];
+        $user->addActivityComplete(1019);
 
         $province = $request->province;
         $status = $request->status;
@@ -38,15 +35,15 @@ class RoadMaintenanceStationController extends Controller
             ->when($type, fn ($query, $type) => $query->where('type', $type))
             ->when($province, fn($query, $province) => $query->where('province_id', $province));
 
-        if ($user->hasPermissionTo('show-tollhouse-province')) {
+        if ($user->hasPermissionTo('show-tollhouse-province') && !$user->hasPermissionTo('show-tollhouse')) {
             $query->where('province_id', $user->province_id);
         }
 
         $data = DataTableFacade::run(
             $query,
             $request,
-            allowedFilters: $allowedFilters,
-            allowedSortings: $allowedSortings
+            allowedFilters: ['*'],
+            allowedSortings: ['*']
         );
 
 
diff --git a/app/Http/Requests/V3/Dashboard/Harim/PanjareVahed/GetAccessRoadRequest.php b/app/Http/Requests/V3/Dashboard/Harim/PanjareVahed/GetAccessRoadRequest.php
index 5c64b50c..d10967e2 100644
--- a/app/Http/Requests/V3/Dashboard/Harim/PanjareVahed/GetAccessRoadRequest.php
+++ b/app/Http/Requests/V3/Dashboard/Harim/PanjareVahed/GetAccessRoadRequest.php
@@ -24,7 +24,7 @@ class GetAccessRoadRequest extends FormRequest
     {
         return [
             'panjare_vahed_id' => 'required|string',
-            'access_road' => 'required|string',
+            'access_road' => 'required',
         ];
     }
 }
diff --git a/routes/v3.php b/routes/v3.php
index 175f144e..1dcb42c3 100644
--- a/routes/v3.php
+++ b/routes/v3.php
@@ -565,7 +565,7 @@ Route::prefix('harim')
             ->name('panjarevahed.')
             ->controller(PanjarevahedController::class)
             ->group(function () {
-                Route::post('/get_access_road/{harim}','getAccessRoad')->name('getAccessRoad');
+                Route::post('/get_access_road','getAccessRoad')->name('getAccessRoad');
             });
     });