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

@@ -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: ['*']
);