fix webservice ant change the other part of code

This commit is contained in:
2025-08-30 10:23:45 +03:30
parent 7eef833e44
commit 7ccf6dfd8f
4 changed files with 11 additions and 12 deletions

View File

@@ -63,16 +63,18 @@ class PanjareVahedController extends Controller
'province' => $city->province()->first()->name_fa, '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; $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_id' => $state,
'state_name' => HarimStates::name($state), 'state_name' => HarimStates::name($state),
'panjare_vahed_id' => $request->panjare_vahed_id,
'access_road' => $request->access_road, 'access_road' => $request->access_road,
]); ]);
return $this->successResponse(); return $this->successResponse();
} }
} }

View File

@@ -24,10 +24,7 @@ class RoadMaintenanceStationController extends Controller
public function index(Request $request): JsonResponse public function index(Request $request): JsonResponse
{ {
$user = auth()->user(); $user = auth()->user();
auth()->user()->addActivityComplete(1019); $user->addActivityComplete(1019);
$allowedFilters = ['*'];
$allowedSortings = ['*'];
$province = $request->province; $province = $request->province;
$status = $request->status; $status = $request->status;
@@ -38,15 +35,15 @@ class RoadMaintenanceStationController extends Controller
->when($type, fn ($query, $type) => $query->where('type', $type)) ->when($type, fn ($query, $type) => $query->where('type', $type))
->when($province, fn($query, $province) => $query->where('province_id', $province)); ->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); $query->where('province_id', $user->province_id);
} }
$data = DataTableFacade::run( $data = DataTableFacade::run(
$query, $query,
$request, $request,
allowedFilters: $allowedFilters, allowedFilters: ['*'],
allowedSortings: $allowedSortings allowedSortings: ['*']
); );

View File

@@ -24,7 +24,7 @@ class GetAccessRoadRequest extends FormRequest
{ {
return [ return [
'panjare_vahed_id' => 'required|string', 'panjare_vahed_id' => 'required|string',
'access_road' => 'required|string', 'access_road' => 'required',
]; ];
} }
} }

View File

@@ -565,7 +565,7 @@ Route::prefix('harim')
->name('panjarevahed.') ->name('panjarevahed.')
->controller(PanjarevahedController::class) ->controller(PanjarevahedController::class)
->group(function () { ->group(function () {
Route::post('/get_access_road/{harim}','getAccessRoad')->name('getAccessRoad'); Route::post('/get_access_road','getAccessRoad')->name('getAccessRoad');
}); });
}); });