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

Merge pull request #76 from witelgroup/feature/ChangeModeSeeCartable

Browse Source 
create form request ane new item for harim
This commit is contained in:
Amir Ghasempoor
2025-10-22 13:31:09 +03:30
committed by GitHub
parent d8c0643bde e72d6eb308
commit 9348cafaeb
24 changed files with 86 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/V3/Dashboard/Harim/GeneralManagerController.php
View File

@@ -32,9 +32,9 @@ class GeneralManagerController extends Controller
public function index(Request $request): JsonResponse
{
$query = Harim::query()
->where('edareh_shahri_id', '=', auth()->user()->edarate_shahri_id);
->where('province_id', '=', auth()->user()->province_id);
$data = DataTableFacade::run(
$data = DataTableFacade::run(
$query,
$request,
allowedFilters: ['*'],

27
app/Http/Controllers/V3/Dashboard/Harim/HarimOfficeController.php
View File

@@ -8,6 +8,7 @@ use App\Facades\DataTable\DataTableFacade;
use App\Http\Controllers\Controller;
use App\Http\Requests\V3\Dashboard\Harim\HarimOffice\FileRejectedRequest;
use App\Http\Requests\V3\Dashboard\Harim\HarimOffice\FileAcceptedRequest;
use App\Http\Requests\V3\Dashboard\Harim\HarimOffice\ReferRequest;
use App\Http\Requests\V3\Dashboard\Harim\HarimOffice\RejectRequest;
use App\Http\Requests\V3\Dashboard\Harim\HarimOffice\ShowRequest;
use App\Http\Requests\V3\Dashboard\Harim\HarimOffice\NeedRoadAccessRequest;
@@ -26,7 +27,7 @@ class HarimOfficeController extends Controller
public function index(Request $request): JsonResponse
{
$query = Harim::query()
->where('edareh_shahri_id', '=', auth()->user()->edarate_shahri_id);
->where('province_id', '=', auth()->user()->province_id);
$data = DataTableFacade::run(
$query,
@@ -64,6 +65,30 @@ class HarimOfficeController extends Controller
return $this->successResponse();
}
public function referRequest(ReferRequest $request, Harim $harim): JsonResponse
{
DB::transaction(function () use ($request,$harim) {
$action = HarimAction::REFER->value;
$harim->histories()->create([
'expert_id' => auth()->user()->id,
'previous_state_id' => $harim->state_id,
'previous_state_name' => $harim->state_name,
'expert_description' => $request->expert_description,
'action_id' => $action,
'action_name' => HarimAction::name($action),
]);
$state = HarimStates::BARESI_EDARE_SHAHRESTAN->value;
$harim->update([
'state_id' => $state,
'state_name' => HarimStates::name($state),
]);
});
return $this->successResponse();
}
public function needRoadAccess(NeedRoadAccessRequest $request, Harim $harim): JsonResponse
{

2
app/Http/Controllers/V3/Dashboard/Harim/TechnicalDeputyController.php
View File

@@ -23,7 +23,7 @@ class TechnicalDeputyController extends Controller
public function index(Request $request): JsonResponse
{
$query = Harim::query()
->where('edareh_shahri_id', '=', auth()->user()->edarate_shahri_id);
->where('province_id', '=', auth()->user()->province_id);
$data = DataTableFacade::run(
$query,

2
app/Http/Requests/V3/Dashboard/Harim/Deputy/ConfirmRequest.php
View File

@@ -12,7 +12,7 @@ class ConfirmRequest extends FormRequest
*/
public function authorize(): bool
{
return $this->harim->edareh_shahri_id == auth()->user()->edarate_shahri_id &&
return $this->harim->province_id == auth()->user()->province_id &&
$this->harim->state_id == HarimStates::BARESI_TAVASOT_MOAVEN->value;
}

2
app/Http/Requests/V3/Dashboard/Harim/Deputy/ConfirmRoadAccessRequest.php
View File

@@ -13,7 +13,7 @@ class ConfirmRoadAccessRequest extends FormRequest
*/
public function authorize(): bool
{
return $this->harim->edareh_shahri_id == auth()->user()->edarate_shahri_id &&
return $this->harim->province_id == auth()->user()->province_id &&
$this->harim->state_id == HarimStates::BARESI_FILE_APLODE_SHODE_TAVASOTE_MOAVEN->value;
}

2
app/Http/Requests/V3/Dashboard/Harim/Deputy/ReferRequest.php
View File

@@ -12,7 +12,7 @@ class ReferRequest extends FormRequest
*/
public function authorize(): bool
{
return $this->harim->edareh_shahri_id == auth()->user()->edarate_shahri_id &&
return $this->harim->province_id == auth()->user()->province_id &&
$this->harim->state_id == HarimStates::BARESI_TAVASOT_MOAVEN->value;
}

2
app/Http/Requests/V3/Dashboard/Harim/Deputy/ReferRoadAccessRequest.php
View File

@@ -12,7 +12,7 @@ class ReferRoadAccessRequest extends FormRequest
*/
public function authorize(): bool
{
return $this->harim->edareh_shahri_id == auth()->user()->edarate_shahri_id &&
return $this->harim->province_id == auth()->user()->province_id &&
$this->harim->state_id == HarimStates::BARESI_FILE_APLODE_SHODE_TAVASOTE_MOAVEN->value;
}

2
app/Http/Requests/V3/Dashboard/Harim/Deputy/ShowRequest.php
View File

@@ -12,7 +12,7 @@ class ShowRequest extends FormRequest
*/
public function authorize(): bool
{
return $this->harim->edareh_shahri_id == auth()->user()->edarate_shahri_id;
return $this->harim->province_id == auth()->user()->province_id;
}
/**

2
app/Http/Requests/V3/Dashboard/Harim/GeneralManager/ConfirmGuaranteeLetterNeedRequest.php
View File

@@ -12,7 +12,7 @@ class ConfirmGuaranteeLetterNeedRequest extends FormRequest
*/
public function authorize(): bool
{
return $this->harim->edareh_shahri_id == auth()->user()->edarate_shahri_id &&
return $this->harim->province_id == auth()->user()->province_id &&
$this->harim->state_id == HarimStates::BARESI_TAVASOT_MODIR_KOL->value;
}

2
app/Http/Requests/V3/Dashboard/Harim/GeneralManager/ConfirmNoRoadAccessNeedRequest.php
View File

@@ -12,7 +12,7 @@ class ConfirmNoRoadAccessNeedRequest extends FormRequest
*/
public function authorize(): bool
{
return $this->harim->edareh_shahri_id == auth()->user()->edarate_shahri_id &&
return $this->harim->province_id == auth()->user()->province_id &&
$this->harim->state_id == HarimStates::BARESI_TAVASOT_MODIR_KOL->value;
}

2
app/Http/Requests/V3/Dashboard/Harim/GeneralManager/ConfirmRoadAccessEditNeedRequest.php
View File

@@ -12,7 +12,7 @@ class ConfirmRoadAccessEditNeedRequest extends FormRequest
*/
public function authorize(): bool
{
return $this->harim->edareh_shahri_id == auth()->user()->edarate_shahri_id &&
return $this->harim->province_id == auth()->user()->province_id &&
$this->harim->state_id == HarimStates::BARESI_FILE_APLODE_SHODE_TAVASOTE_MODIR_KOL->value;
}

2
app/Http/Requests/V3/Dashboard/Harim/GeneralManager/ConfirmRoadAccessNeedRequest.php
View File

@@ -12,7 +12,7 @@ class ConfirmRoadAccessNeedRequest extends FormRequest
*/
public function authorize(): bool
{
return $this->harim->edareh_shahri_id == auth()->user()->edarate_shahri_id &&
return $this->harim->province_id == auth()->user()->province_id &&
$this->harim->state_id == HarimStates::BARESI_TAVASOT_MODIR_KOL->value;
}

5
app/Http/Requests/V3/Dashboard/Harim/GeneralManager/ReferFileRequest.php
View File

@@ -3,6 +3,7 @@
namespace App\Http\Requests\V3\Dashboard\Harim\GeneralManager;
use App\Enums\HarimStates;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class ReferFileRequest extends FormRequest
@@ -12,14 +13,14 @@ class ReferFileRequest extends FormRequest
*/
public function authorize(): bool
{
return $this->harim->edareh_shahri_id == auth()->user()->edarate_shahri_id &&
return $this->harim->province_id == auth()->user()->province_id &&
$this->harim->state_id == HarimStates::BARESI_FILE_APLODE_SHODE_TAVASOTE_MODIR_KOL->value;
}
/**
* Get the validation rules that apply to the request.
*
* @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
* @return array<string, ValidationRule|array|string>
*/
public function rules(): array
{

5
app/Http/Requests/V3/Dashboard/Harim/GeneralManager/ReferRequest.php
View File

@@ -3,6 +3,7 @@
namespace App\Http\Requests\V3\Dashboard\Harim\GeneralManager;
use App\Enums\HarimStates;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class ReferRequest extends FormRequest
@@ -12,14 +13,14 @@ class ReferRequest extends FormRequest
*/
public function authorize(): bool
{
return $this->harim->edareh_shahri_id == auth()->user()->edarate_shahri_id &&
return $this->harim->province_id == auth()->user()->province_id &&
$this->harim->state_id == HarimStates::BARESI_TAVASOT_MODIR_KOL->value;
}
/**
* Get the validation rules that apply to the request.
*
* @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
* @return array<string, ValidationRule|array|string>
*/
public function rules(): array
{

5
app/Http/Requests/V3/Dashboard/Harim/GeneralManager/RejectRequest.php
View File

@@ -3,6 +3,7 @@
namespace App\Http\Requests\V3\Dashboard\Harim\GeneralManager;
use App\Enums\HarimStates;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class RejectRequest extends FormRequest
@@ -12,14 +13,14 @@ class RejectRequest extends FormRequest
*/
public function authorize(): bool
{
return $this->harim->edareh_shahri_id == auth()->user()->edarate_shahri_id &&
return $this->harim->province_id == auth()->user()->province_id &&
$this->harim->state_id == HarimStates::BARESI_TAVASOT_MODIR_KOL->value;
}
/**
* Get the validation rules that apply to the request.
*
* @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
* @return array<string, ValidationRule|array|string>
*/
public function rules(): array
{

2
app/Http/Requests/V3/Dashboard/Harim/GeneralManager/ShowRequest.php
View File

@@ -12,7 +12,7 @@ class ShowRequest extends FormRequest
*/
public function authorize(): bool
{
return $this->harim->edareh_shahri_id == auth()->user()->edarate_shahri_id;
return $this->harim->province_id == auth()->user()->province_id;
}
/**

2
app/Http/Requests/V3/Dashboard/Harim/HarimOffice/FileAcceptedRequest.php
View File

@@ -12,7 +12,7 @@ class FileAcceptedRequest extends FormRequest
*/
public function authorize(): bool
{
return $this->harim->edareh_shahri_id == auth()->user()->edarate_shahri_id &&
return $this->harim->province_id == auth()->user()->province_id &&
$this->harim->state_id == HarimStates::BARESI_FILE_APLODE_SHODE_TAVASOTE_DAFTAR_HARIM->value;
}

2
app/Http/Requests/V3/Dashboard/Harim/HarimOffice/FileRejectedRequest.php
View File

@@ -12,7 +12,7 @@ class FileRejectedRequest extends FormRequest
*/
public function authorize(): bool
{
return $this->harim->edareh_shahri_id == auth()->user()->edarate_shahri_id &&
return $this->harim->province_id == auth()->user()->province_id &&
$this->harim->state_id == HarimStates::BARESI_FILE_APLODE_SHODE_TAVASOTE_DAFTAR_HARIM->value;
}

2
app/Http/Requests/V3/Dashboard/Harim/HarimOffice/NeedRoadAccessRequest.php
View File

@@ -12,7 +12,7 @@ class NeedRoadAccessRequest extends FormRequest
*/
public function authorize(): bool
{
return $this->harim->edareh_shahri_id == auth()->user()->edarate_shahri_id &&
return $this->harim->province_id == auth()->user()->province_id &&
$this->harim->state_id == HarimStates::BARESI_TAVASOT_DAFTAR_HARIM->value;
}

31
app/Http/Requests/V3/Dashboard/Harim/HarimOffice/ReferRequest.php Normal file
View File

@@ -0,0 +1,31 @@
<?php
namespace App\Http\Requests\V3\Dashboard\Harim\HarimOffice;
use App\Enums\HarimStates;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class ReferRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*/
public function authorize(): bool
{
return $this->harim->province_id === auth()->user()->province_id &&
$this->harim->state_id === HarimStates::BARESI_TAVASOT_DAFTAR_HARIM->value;
}
/**
* Get the validation rules that apply to the request.
*
* @return array<string, ValidationRule|array|string>
*/
public function rules(): array
{
return [
'expert_description' => 'required|string',
];
}
}

2
app/Http/Requests/V3/Dashboard/Harim/HarimOffice/RejectRequest.php
View File

@@ -12,7 +12,7 @@ class RejectRequest extends FormRequest
*/
public function authorize(): bool
{
return $this->harim->edareh_shahri_id == auth()->user()->edarate_shahri_id &&
return $this->harim->province_id == auth()->user()->province_id &&
$this->harim->state_id == HarimStates::BARESI_TAVASOT_DAFTAR_HARIM->value;
}

2
app/Http/Requests/V3/Dashboard/Harim/HarimOffice/ShowRequest.php
View File

@@ -13,7 +13,7 @@ class ShowRequest extends FormRequest
*/
public function authorize(): bool
{
return $this->harim->edareh_shahri_id == auth()->user()->edarate_shahri_id;
return $this->harim->province_id == auth()->user()->province_id;
}

2
app/Http/Requests/V3/Dashboard/Harim/HarimOffice/WithoutRoadAccessRequest.php
View File

@@ -12,7 +12,7 @@ class WithoutRoadAccessRequest extends FormRequest
*/
public function authorize(): bool
{
return $this->harim->edareh_shahri_id == auth()->user()->edarate_shahri_id &&
return $this->harim->province_id == auth()->user()->province_id &&
$this->harim->state_id == HarimStates::BARESI_TAVASOT_DAFTAR_HARIM->value;
}

1
routes/v3.php
View File

@@ -550,6 +550,7 @@ Route::prefix('harim')
Route::post('/file_accepted/{harim}', 'fileAccepted')->name('fileAccepted');
Route::post('/file_rejected/{harim}', 'fileRejected')->name('fileRejected');
Route::get('/{harim}', 'show')->name('show');
Route::post('/refer_request/{harim}', 'referRequest')->name('referRequest');
});
Route::prefix('technical_deputy')