From 7a86e7a136415d9ab42379f4f9ca7af658e4afd1 Mon Sep 17 00:00:00 2001
From: joddyabott <faezehzafarbakhsh@gmail.com>
Date: Wed, 1 Oct 2025 11:56:20 +0330
Subject: [PATCH] resolve confilict

---
 app/Http/Controllers/V3/RahdaranController.php | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/app/Http/Controllers/V3/RahdaranController.php b/app/Http/Controllers/V3/RahdaranController.php
index 412b7ac3..5ef3ba42 100644
--- a/app/Http/Controllers/V3/RahdaranController.php
+++ b/app/Http/Controllers/V3/RahdaranController.php
@@ -7,13 +7,11 @@ use App\Http\Controllers\Controller;
 use App\Http\Requests\V3\Rahdaran\StoreRequest;
 use App\Http\Requests\V3\Rahdaran\UpdateRequest;
 use App\Http\Traits\ApiResponse;
-use App\Models\EdarateShahri;
 use App\Models\Province;
 use App\Models\Rahdaran;
 use Illuminate\Database\QueryException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
 
 class RahdaranController extends Controller
 {
@@ -21,16 +19,8 @@ class RahdaranController extends Controller
 
     public function index(Request $request): JsonResponse
     {
-        $user = Auth::user();
-        $query = $user->hasPermissionTo('manage-rahdaran-country') ?
-            Rahdaran::query() :
-            ($user->hasPermissionTo('manage-rahdaran-province') ?
-                Rahdaran::query()->where('province_id', '=', $user->province_id) :
-                Rahdaran::query()->where('edareh_shahri_id', '=', $user->edarate_shahri_id)
-            );
-
         return response()->json(DataTableFacade::run(
-            $query,
+            Rahdaran::query(),
             $request,
             allowedFilters: ['*'],
             allowedSortings: ['*'])
@@ -40,7 +30,6 @@ class RahdaranController extends Controller
     public function store(StoreRequest $request): JsonResponse
     {
         $province = Province::query()->find($request->input('province_id'));
-        $edareh = EdarateShahri::query()->find($request->input('edareh_shahri_id'));
 
         Rahdaran::query()->create([
             'name' => $request->name,
@@ -49,7 +38,6 @@ class RahdaranController extends Controller
             'province_id' => $province->id,
             'province_name' => $province->name_fa,
             'edareh_shahri_id' => $request->edareh_shahri_id,
-            'edareh_shahri_name' => $edareh->name_fa,
             'is_driver' => $request->is_driver,
         ]);
 
@@ -64,7 +52,6 @@ class RahdaranController extends Controller
     public function update(UpdateRequest $request, Rahdaran $rahdaran): JsonResponse
     {
         $province = Province::query()->find($request->input('province_id'));
-        $edareh = EdarateShahri::query()->find($request->input('edareh_shahri_id'));
 
         $rahdaran->update([
             'name' =>$request->name,
@@ -73,7 +60,6 @@ class RahdaranController extends Controller
             'province_id' => $province->id,
             'province_name' => $province->name_fa,
             'edareh_shahri_id' => $request->edareh_shahri_id,
-            'edareh_shahri_name' => $edareh->name_fa,
             'is_driver' => $request->is_driver,
         ]);