RMS/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve confilict

Browse Source
This commit is contained in:
joddyabott
2025-10-01 11:56:20 +03:30
parent 1473ab2264
commit 7a86e7a136
1 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Http/Controllers/V3/RahdaranController.php
View File

@@ -7,13 +7,11 @@ use App\Http\Controllers\Controller;
use App\Http\Requests\V3\Rahdaran\StoreRequest; use App\Http\Requests\V3\Rahdaran\StoreRequest;
use App\Http\Requests\V3\Rahdaran\UpdateRequest; use App\Http\Requests\V3\Rahdaran\UpdateRequest;
use App\Http\Traits\ApiResponse; use App\Http\Traits\ApiResponse;
use App\Models\EdarateShahri;
use App\Models\Province; use App\Models\Province;
use App\Models\Rahdaran; use App\Models\Rahdaran;
use Illuminate\Database\QueryException; use Illuminate\Database\QueryException;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
class RahdaranController extends Controller class RahdaranController extends Controller
{ {
@@ -21,16 +19,8 @@ class RahdaranController extends Controller
public function index(Request $request): JsonResponse 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( return response()->json(DataTableFacade::run(
$query, Rahdaran::query(),
$request, $request,
allowedFilters: ['*'], allowedFilters: ['*'],
allowedSortings: ['*']) allowedSortings: ['*'])
@@ -40,7 +30,6 @@ class RahdaranController extends Controller
public function store(StoreRequest $request): JsonResponse public function store(StoreRequest $request): JsonResponse
{ {
$province = Province::query()->find($request->input('province_id')); $province = Province::query()->find($request->input('province_id'));
$edareh = EdarateShahri::query()->find($request->input('edareh_shahri_id'));
Rahdaran::query()->create([ Rahdaran::query()->create([
'name' => $request->name, 'name' => $request->name,
@@ -49,7 +38,6 @@ class RahdaranController extends Controller
'province_id' => $province->id, 'province_id' => $province->id,
'province_name' => $province->name_fa, 'province_name' => $province->name_fa,
'edareh_shahri_id' => $request->edareh_shahri_id, 'edareh_shahri_id' => $request->edareh_shahri_id,
'edareh_shahri_name' => $edareh->name_fa,
'is_driver' => $request->is_driver, 'is_driver' => $request->is_driver,
]); ]);
@@ -64,7 +52,6 @@ class RahdaranController extends Controller
public function update(UpdateRequest $request, Rahdaran $rahdaran): JsonResponse public function update(UpdateRequest $request, Rahdaran $rahdaran): JsonResponse
{ {
$province = Province::query()->find($request->input('province_id')); $province = Province::query()->find($request->input('province_id'));
$edareh = EdarateShahri::query()->find($request->input('edareh_shahri_id'));
$rahdaran->update([ $rahdaran->update([
'name' =>$request->name, 'name' =>$request->name,
@@ -73,7 +60,6 @@ class RahdaranController extends Controller
'province_id' => $province->id, 'province_id' => $province->id,
'province_name' => $province->name_fa, 'province_name' => $province->name_fa,
'edareh_shahri_id' => $request->edareh_shahri_id, 'edareh_shahri_id' => $request->edareh_shahri_id,
'edareh_shahri_name' => $edareh->name_fa,
'is_driver' => $request->is_driver, 'is_driver' => $request->is_driver,
]); ]);