diff --git a/app/Enums/HarimStates.php b/app/Enums/HarimStates.php index 8f73c4c0..46605887 100644 --- a/app/Enums/HarimStates.php +++ b/app/Enums/HarimStates.php @@ -8,18 +8,19 @@ enum HarimStates: int case BARESI_TAVASOT_DAFTAR_HARIM = 2; case BARESI_TAVASOT_MOAVEN = 3; case BARESI_TAVASOT_MODIR_KOL = 4; - case BARESI_FILE_APLODE_SHODE_TAVASOTE_DAFTAR_HARIM = 5; - case BARESI_FILE_APLODE_SHODE_TAVASOTE_MOAVEN = 6; - case BARESI_FILE_APLODE_SHODE_TAVASOTE_MODIR_KOL = 7; - case ERSAL_ZEMANAT_NAME_TAVASOTE_KARBAR =8; + case BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_DAFTAR_HARIM = 5; + case BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_MOAVEN = 6; + case BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_MODIR_KOL = 7; + case ARSE_VA_AYAN_NAHAI =8; case ERSAL_BE_PANJAREH_VAHED_NIAZ_BE_RAH_DASTRASI = 9; case EMKAN_PAZIR_NEMEBASHAD = 10; case ERSAL_BE_PANJAREH_VAHED_BEDONEH_NIAZ_BE_RAH_DASTRASI = 11; - case UPDATE_FILE_BARGOZARE_SHODE = 12; - case TAEDE_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_DAFTAR_HARIM = 13; - case TAEDE_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_TAVASOTE_MOAVEN = 14; - case TAEDE_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_MODIR_KOL = 15; + case UPDATE_RAHE_DASTRASI_BARGOZARE_SHODE = 12; + case BARESI_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_DAFTAR_HARIM = 13; + case BARESI_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_MOAVEN = 14; + case BARESI_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_MODIR_KOL = 15; case MOKHALEFAT_BA_DASTGAH = 16; + case ETMAM_FARAYAND = 17; public static function name(int $state): string { @@ -28,18 +29,19 @@ enum HarimStates: int 2 => "بررسی توسط ادارات حریم", 3 => "بررسی توسط معاون ", 4 => "بررسی توسط مدیر کل", - 5 => "بررسی فایل آپلود شده توسط اداره حریم", - 6 => "بررسی فایل آپلود شده توسط معاون", - 7 => "بررسی فایل آپلود شده توسط مدیر", + 5 => "بررسی راه دسترسی آپلود شده توسط اداره حریم", + 6 => "بررسی راه دسترسی آپلود شده توسط معاون", + 7 => "بررسی راه دسترسی آپلود شده توسط مدیر", 8 => "ارسال ضمانت نامه توسط کاربر", 9 => "ارسال به پنجره واحد (نیاز به راه دسترسی)", 10 => "امکان پذیر نمی باشد", 11 => "ارسال به پنجره واحد (بدون نیاز به راه دسترسی)", - 12 => "بازبینی فایل بارگذاری شده", + 12 => "بازبینی راه دسترسی بارگذاری شده", 13 => "تائید عرصه و اعیان ارسال شده توسط اداره حریم", 14 => "تائید عرصه و اعیان ارسال شده توسط معاون", 15 => "تائید عرصه و اعیان ارسال شده توسط مدیر", - 16 => "مخالفت با درخواست" + 16 => "مخالفت با درخواست", + 17 => "اتمام فرایند" ]; return $mapArray[$state]; diff --git a/app/Enums/HarimTerafic.php b/app/Enums/HarimTraffic.php similarity index 92% rename from app/Enums/HarimTerafic.php rename to app/Enums/HarimTraffic.php index f841223d..8f36c605 100644 --- a/app/Enums/HarimTerafic.php +++ b/app/Enums/HarimTraffic.php @@ -2,7 +2,7 @@ namespace App\Enums; -enum HarimTerafic : string +enum HarimTraffic : string { case SABOK = 'سبک'; case MOTEVASET = 'متوسط'; diff --git a/app/Http/Controllers/V3/Dashboard/Harim/GeneralManagerController.php b/app/Http/Controllers/V3/Dashboard/Harim/GeneralManagerController.php index de8b903c..9266b34f 100644 --- a/app/Http/Controllers/V3/Dashboard/Harim/GeneralManagerController.php +++ b/app/Http/Controllers/V3/Dashboard/Harim/GeneralManagerController.php @@ -13,9 +13,11 @@ use App\Facades\DataTable\DataTableFacade; use App\Http\Controllers\Controller; use App\Http\Requests\V3\Dashboard\Harim\GeneralManager\ConfirmGuaranteeLetterNeedRequest; use App\Http\Requests\V3\Dashboard\Harim\GeneralManager\ConfirmNoRoadAccessNeedRequest; +use App\Http\Requests\V3\Dashboard\Harim\GeneralManager\ConfirmPaymentRequest; use App\Http\Requests\V3\Dashboard\Harim\GeneralManager\ConfirmRoadAccessEditNeedRequest; use App\Http\Requests\V3\Dashboard\Harim\GeneralManager\ConfirmRoadAccessNeedRequest; use App\Http\Requests\V3\Dashboard\Harim\GeneralManager\ReferFileRequest; +use App\Http\Requests\V3\Dashboard\Harim\GeneralManager\ReferPaymentRequest; use App\Http\Requests\V3\Dashboard\Harim\GeneralManager\ReferRequest; use App\Http\Requests\V3\Dashboard\Harim\GeneralManager\RejectRequest; use App\Http\Requests\V3\Dashboard\Harim\GeneralManager\ShowRequest; @@ -24,6 +26,8 @@ use App\Models\Harim; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; +use Throwable; + class GeneralManagerController extends Controller { @@ -44,6 +48,9 @@ class GeneralManagerController extends Controller return response()->json($data); } + /** + * @throws Throwable + */ public function rejectRequest(RejectRequest $request, Harim $harim): JsonResponse { DB::transaction(function () use ($request, $harim) { @@ -71,6 +78,9 @@ class GeneralManagerController extends Controller return $this->successResponse(); } + /** + * @throws Throwable + */ public function referRequest(ReferRequest $request, Harim $harim): JsonResponse { DB::transaction(function () use ($request, $harim) { @@ -96,6 +106,9 @@ class GeneralManagerController extends Controller return $this->successResponse(); } + /** + * @throws Throwable + */ public function referFile(ReferFileRequest $request, Harim $harim): JsonResponse { DB::transaction(function () use ($request, $harim) { @@ -110,7 +123,7 @@ class GeneralManagerController extends Controller 'action_name' => HarimAction::name($action), ]); - $state = HarimStates::BARESI_FILE_APLODE_SHODE_TAVASOTE_MOAVEN->value; + $state = HarimStates::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_MOAVEN->value; $harim->update([ 'state_id' => $state, @@ -121,6 +134,9 @@ class GeneralManagerController extends Controller return $this->successResponse(); } + /** + * @throws Throwable + */ public function confirmRoadAccessNeed(ConfirmRoadAccessNeedRequest $request, Harim $harim): JsonResponse { DB::transaction(function () use ($request, $harim) { @@ -148,6 +164,9 @@ class GeneralManagerController extends Controller return $this->successResponse(); } + /** + * @throws Throwable + */ public function confirmNoRoadAccessNeed(ConfirmNoRoadAccessNeedRequest $request, Harim $harim): JsonResponse { DB::transaction(function () use ($request, $harim) { @@ -176,6 +195,9 @@ class GeneralManagerController extends Controller return $this->successResponse(); } + /** + * @throws Throwable + */ public function confirmRoadAccessEditNeed(ConfirmRoadAccessEditNeedRequest $request, Harim $harim): JsonResponse { DB::transaction(function () use ($request, $harim) { @@ -190,7 +212,7 @@ class GeneralManagerController extends Controller 'action_name' => HarimAction::name($action), ]); - $state = HarimStates::UPDATE_FILE_BARGOZARE_SHODE->value; + $state = HarimStates::UPDATE_RAHE_DASTRASI_BARGOZARE_SHODE->value; $harim->update([ 'state_id' => $state, @@ -203,6 +225,9 @@ class GeneralManagerController extends Controller return $this->successResponse(); } + /** + * @throws \Throwable + */ public function confirmGuaranteeLetterNeed(ConfirmGuaranteeLetterNeedRequest $request, Harim $harim): JsonResponse { DB::transaction(function () use ($request, $harim) { @@ -217,7 +242,7 @@ class GeneralManagerController extends Controller 'action_name' => HarimAction::name($action), ]); - $state = HarimStates::ERSAL_ZEMANAT_NAME_TAVASOTE_KARBAR->value; + $state = HarimStates::ARSE_VA_AYAN_NAHAI->value; $harim->update([ 'state_id' => $state, @@ -234,4 +259,61 @@ class GeneralManagerController extends Controller { return $this->successResponse($harim->load('histories')); } + + /** + * @throws Throwable + */ + public function referPaymentRequest(ReferPaymentRequest $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, + 'export_description' => $request->export_description, + 'action_id' => $action, + 'action_name' => HarimAction::name($action), + ]); + + $state = HarimStates::BARESI_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_MOAVEN->value; + + $harim->update([ + 'state_id' => $state, + 'state_name' => HarimStates::name($state), + ]); + }); + + return $this->successResponse(); + } + + /** + * @throws Throwable + */ + public function confirmPayment(ConfirmPaymentRequest $request, Harim $harim): JsonResponse + { + DB::transaction(function () use ($request, $harim) { + $action = HarimAction::CONFIRM->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::ETMAM_FARAYAND->value; + + $harim->update([ + 'state_id' => $state, + 'state_name' => HarimStates::name($state), + ]); + }); + + return $this->successResponse(); + } + } diff --git a/app/Http/Controllers/V3/Dashboard/Harim/HarimOfficeController.php b/app/Http/Controllers/V3/Dashboard/Harim/HarimOfficeController.php index 9eaa7460..8d112444 100644 --- a/app/Http/Controllers/V3/Dashboard/Harim/HarimOfficeController.php +++ b/app/Http/Controllers/V3/Dashboard/Harim/HarimOfficeController.php @@ -6,6 +6,7 @@ use App\Enums\HarimAction; use App\Enums\HarimStates; use App\Facades\DataTable\DataTableFacade; use App\Http\Controllers\Controller; +use App\Http\Requests\V3\Dashboard\Harim\HarimOffice\ComputingPaymentRequest; use App\Http\Requests\V3\Dashboard\Harim\HarimOffice\FileAcceptedRequest; use App\Http\Requests\V3\Dashboard\Harim\HarimOffice\FileRejectedRequest; use App\Http\Requests\V3\Dashboard\Harim\HarimOffice\NeedRoadAccessRequest; @@ -19,6 +20,8 @@ use App\Models\Province; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; +use Throwable; + class HarimOfficeController extends Controller { @@ -39,6 +42,9 @@ class HarimOfficeController extends Controller return response()->json($data); } + /** + * @throws Throwable + */ public function rejectRequest(RejectRequest $request, Harim $harim): JsonResponse { DB::transaction(function () use ($request, $harim) { @@ -64,6 +70,9 @@ class HarimOfficeController extends Controller return $this->successResponse(); } + /** + * @throws Throwable + */ public function referRequest(ReferRequest $request, Harim $harim): JsonResponse { DB::transaction(function () use ($request, $harim) { @@ -89,6 +98,9 @@ class HarimOfficeController extends Controller return $this->successResponse(); } + /** + * @throws Throwable + */ public function needRoadAccess(NeedRoadAccessRequest $request, Harim $harim): JsonResponse { DB::transaction(function () use ($request, $harim) { @@ -116,6 +128,9 @@ class HarimOfficeController extends Controller return $this->successResponse(); } + /** + * @throws Throwable + */ public function withoutRoadAccess(WithoutRoadAccessRequest $request, Harim $harim): JsonResponse { DB::transaction(function () use ($request, $harim) { @@ -143,6 +158,9 @@ class HarimOfficeController extends Controller return $this->successResponse(); } + /** + * @throws Throwable + */ public function fileAccepted(FileAcceptedRequest $request, Harim $harim): JsonResponse { DB::transaction(function () use ($request, $harim) { @@ -156,7 +174,7 @@ class HarimOfficeController extends Controller 'action_name' => HarimAction::name($action), ]); - $state = HarimStates::BARESI_FILE_APLODE_SHODE_TAVASOTE_MOAVEN->value; + $state = HarimStates::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_MOAVEN->value; $harim->update([ 'state_id' => $state, @@ -168,6 +186,9 @@ class HarimOfficeController extends Controller return $this->successResponse(); } + /** + * @throws Throwable + */ public function fileRejected(FileRejectedRequest $request, Harim $harim): JsonResponse { DB::transaction(function () use ($request, $harim) { @@ -181,7 +202,7 @@ class HarimOfficeController extends Controller 'action_name' => HarimAction::name($action), ]); - $state = HarimStates::BARESI_FILE_APLODE_SHODE_TAVASOTE_MOAVEN->value; + $state = HarimStates::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_MOAVEN->value; $harim->update([ 'state_id' => $state, @@ -208,4 +229,36 @@ class HarimOfficeController extends Controller 'province_name' => $province->name_fa, ]); } + + /** + * @throws Throwable + */ + public function computingPayment(ComputingPaymentRequest $request, Harim $harim): JsonResponse + { + DB::transaction(function () use ($request, $harim) { + $action = HarimAction::CONFIRM->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_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_MOAVEN->value; + + $harim->update([ + 'traffic' => $request->traffic, + 'position' => $request->position, + 'final_plan_space' => $request->final_plan_space, + 'road_type' => $request->road_type, + 'payment_amount' => $request->payment_amount, + 'state_id' => $state, + 'state_name' => HarimStates::name($state), + ]); + }); + + return $this->successResponse(); + } } diff --git a/app/Http/Controllers/V3/Dashboard/Harim/TechnicalDeputyController.php b/app/Http/Controllers/V3/Dashboard/Harim/TechnicalDeputyController.php index 3a1fcdbc..79158594 100644 --- a/app/Http/Controllers/V3/Dashboard/Harim/TechnicalDeputyController.php +++ b/app/Http/Controllers/V3/Dashboard/Harim/TechnicalDeputyController.php @@ -6,8 +6,10 @@ use App\Enums\HarimAction; use App\Enums\HarimStates; use App\Facades\DataTable\DataTableFacade; use App\Http\Controllers\Controller; +use App\Http\Requests\V3\Dashboard\Harim\Deputy\ConfirmPaymentRequest; use App\Http\Requests\V3\Dashboard\Harim\Deputy\ConfirmRequest; use App\Http\Requests\V3\Dashboard\Harim\Deputy\ConfirmRoadAccessRequest; +use App\Http\Requests\V3\Dashboard\Harim\Deputy\ReferPaymentRequest; use App\Http\Requests\V3\Dashboard\Harim\Deputy\ReferRequest; use App\Http\Requests\V3\Dashboard\Harim\Deputy\ReferRoadAccessRequest; use App\Http\Requests\V3\Dashboard\Harim\Deputy\ShowRequest; @@ -16,6 +18,8 @@ use App\Models\Harim; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; +use Throwable; + class TechnicalDeputyController extends Controller { @@ -36,6 +40,9 @@ class TechnicalDeputyController extends Controller return response()->json($data); } + /** + * @throws \Throwable + */ public function confirmRequest(ConfirmRequest $request, Harim $harim): JsonResponse { DB::transaction(function () use ($request, $harim) { @@ -61,6 +68,9 @@ class TechnicalDeputyController extends Controller return $this->successResponse(); } + /** + * @throws Throwable + */ public function referRequest(ReferRequest $request, Harim $harim): JsonResponse { DB::transaction(function () use ($request, $harim) { @@ -86,6 +96,9 @@ class TechnicalDeputyController extends Controller return $this->successResponse(); } + /** + * @throws \Throwable + */ public function confirmRoadAccess(ConfirmRoadAccessRequest $request, Harim $harim): JsonResponse { DB::transaction(function () use ($request, $harim) { @@ -99,7 +112,7 @@ class TechnicalDeputyController extends Controller 'action_name' => HarimAction::name($action), ]); - $state = HarimStates::BARESI_FILE_APLODE_SHODE_TAVASOTE_MODIR_KOL->value; + $state = HarimStates::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_MODIR_KOL->value; $harim->update([ 'state_id' => $state, @@ -110,6 +123,10 @@ class TechnicalDeputyController extends Controller return $this->successResponse(); } + + /** + * @throws \Throwable + */ public function referRoadAccess(ReferRoadAccessRequest $request, Harim $harim): JsonResponse { DB::transaction(function () use ($request, $harim) { @@ -123,7 +140,7 @@ class TechnicalDeputyController extends Controller 'action_name' => HarimAction::name($action), ]); - $state = HarimStates::BARESI_FILE_APLODE_SHODE_TAVASOTE_DAFTAR_HARIM->value; + $state = HarimStates::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_DAFTAR_HARIM->value; $harim->update([ 'state_id' => $state, diff --git a/app/Http/Requests/V3/Dashboard/Harim/Deputy/ConfirmPaymentRequest.php b/app/Http/Requests/V3/Dashboard/Harim/Deputy/ConfirmPaymentRequest.php new file mode 100644 index 00000000..2acd1e16 --- /dev/null +++ b/app/Http/Requests/V3/Dashboard/Harim/Deputy/ConfirmPaymentRequest.php @@ -0,0 +1,31 @@ +harim->province_id == auth()->user()->province_id && + $this->harim->state_id == HarimStates::BARESI_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_MOAVEN->value; + } + + /** + * Get the validation rules that apply to the request. + * + * @return array + */ + public function rules(): array + { + return [ + 'expert_description' => 'required|string', + ]; + } +} diff --git a/app/Http/Requests/V3/Dashboard/Harim/Deputy/ConfirmRoadAccessRequest.php b/app/Http/Requests/V3/Dashboard/Harim/Deputy/ConfirmRoadAccessRequest.php index 667b6e72..24f31d15 100644 --- a/app/Http/Requests/V3/Dashboard/Harim/Deputy/ConfirmRoadAccessRequest.php +++ b/app/Http/Requests/V3/Dashboard/Harim/Deputy/ConfirmRoadAccessRequest.php @@ -14,7 +14,7 @@ class ConfirmRoadAccessRequest extends FormRequest public function authorize(): bool { return $this->harim->province_id == auth()->user()->province_id && - $this->harim->state_id == HarimStates::BARESI_FILE_APLODE_SHODE_TAVASOTE_MOAVEN->value; + $this->harim->state_id == HarimStates::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_MOAVEN->value; } /** diff --git a/app/Http/Requests/V3/Dashboard/Harim/Deputy/ReferPaymentRequest.php b/app/Http/Requests/V3/Dashboard/Harim/Deputy/ReferPaymentRequest.php new file mode 100644 index 00000000..9755727d --- /dev/null +++ b/app/Http/Requests/V3/Dashboard/Harim/Deputy/ReferPaymentRequest.php @@ -0,0 +1,31 @@ +harim->province_id == auth()->user()->province_id && + $this->harim->state_id == HarimStates::BARESI_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_MOAVEN->value; + } + + /** + * Get the validation rules that apply to the request. + * + * @return array + */ + public function rules(): array + { + return [ + 'expert_description' => 'required|string', + ]; + } +} diff --git a/app/Http/Requests/V3/Dashboard/Harim/Deputy/ReferRoadAccessRequest.php b/app/Http/Requests/V3/Dashboard/Harim/Deputy/ReferRoadAccessRequest.php index 6226908a..37cc6560 100644 --- a/app/Http/Requests/V3/Dashboard/Harim/Deputy/ReferRoadAccessRequest.php +++ b/app/Http/Requests/V3/Dashboard/Harim/Deputy/ReferRoadAccessRequest.php @@ -14,7 +14,7 @@ class ReferRoadAccessRequest extends FormRequest public function authorize(): bool { return $this->harim->province_id == auth()->user()->province_id && - $this->harim->state_id == HarimStates::BARESI_FILE_APLODE_SHODE_TAVASOTE_MOAVEN->value; + $this->harim->state_id == HarimStates::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_MOAVEN->value; } /** diff --git a/app/Http/Requests/V3/Dashboard/Harim/GeneralManager/ConfirmPaymentRequest.php b/app/Http/Requests/V3/Dashboard/Harim/GeneralManager/ConfirmPaymentRequest.php new file mode 100644 index 00000000..9bab48f7 --- /dev/null +++ b/app/Http/Requests/V3/Dashboard/Harim/GeneralManager/ConfirmPaymentRequest.php @@ -0,0 +1,31 @@ +harim->province_id == auth()->user()->province_id && + $this->harim->state_id == HarimStates::BARESI_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_MODIR_KOL->value; + } + + /** + * Get the validation rules that apply to the request. + * + * @return array + */ + public function rules(): array + { + return [ + 'expert_description' => 'required|string', + ]; + } +} diff --git a/app/Http/Requests/V3/Dashboard/Harim/GeneralManager/ConfirmRoadAccessEditNeedRequest.php b/app/Http/Requests/V3/Dashboard/Harim/GeneralManager/ConfirmRoadAccessEditNeedRequest.php index 70da1e2d..eaa004d3 100644 --- a/app/Http/Requests/V3/Dashboard/Harim/GeneralManager/ConfirmRoadAccessEditNeedRequest.php +++ b/app/Http/Requests/V3/Dashboard/Harim/GeneralManager/ConfirmRoadAccessEditNeedRequest.php @@ -14,7 +14,7 @@ class ConfirmRoadAccessEditNeedRequest extends FormRequest public function authorize(): bool { return $this->harim->province_id == auth()->user()->province_id && - $this->harim->state_id == HarimStates::BARESI_FILE_APLODE_SHODE_TAVASOTE_MODIR_KOL->value; + $this->harim->state_id == HarimStates::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_MODIR_KOL->value; } /** diff --git a/app/Http/Requests/V3/Dashboard/Harim/GeneralManager/ReferFileRequest.php b/app/Http/Requests/V3/Dashboard/Harim/GeneralManager/ReferFileRequest.php index 4ab18be5..351b3f99 100644 --- a/app/Http/Requests/V3/Dashboard/Harim/GeneralManager/ReferFileRequest.php +++ b/app/Http/Requests/V3/Dashboard/Harim/GeneralManager/ReferFileRequest.php @@ -14,7 +14,7 @@ class ReferFileRequest extends FormRequest public function authorize(): bool { return $this->harim->province_id == auth()->user()->province_id && - $this->harim->state_id == HarimStates::BARESI_FILE_APLODE_SHODE_TAVASOTE_MODIR_KOL->value; + $this->harim->state_id == HarimStates::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_MODIR_KOL->value; } /** diff --git a/app/Http/Requests/V3/Dashboard/Harim/GeneralManager/ReferPaymentRequest.php b/app/Http/Requests/V3/Dashboard/Harim/GeneralManager/ReferPaymentRequest.php new file mode 100644 index 00000000..c7175dd3 --- /dev/null +++ b/app/Http/Requests/V3/Dashboard/Harim/GeneralManager/ReferPaymentRequest.php @@ -0,0 +1,31 @@ +harim->province_id == auth()->user()->province_id && + $this->harim->state_id == HarimStates::BARESI_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_MODIR_KOL->value; + } + + /** + * Get the validation rules that apply to the request. + * + * @return array + */ + public function rules(): array + { + return [ + 'expert_description' => 'required|string', + ]; + } +} diff --git a/app/Http/Requests/V3/Dashboard/Harim/HarimOffice/ComputingPaymentRequest.php b/app/Http/Requests/V3/Dashboard/Harim/HarimOffice/ComputingPaymentRequest.php new file mode 100644 index 00000000..c2e9a406 --- /dev/null +++ b/app/Http/Requests/V3/Dashboard/Harim/HarimOffice/ComputingPaymentRequest.php @@ -0,0 +1,36 @@ +harim->province_id === auth()->user()->province_id && + $this->harim->state_id === HarimStates::BARESI_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_DAFTAR_HARIM->value; + } + + /** + * Get the validation rules that apply to the request. + * + * @return array + */ + public function rules(): array + { + return [ + 'traffic' => 'required|numeric|decimal:1', + 'road_type' => 'required|numeric|decimal:1', + 'position' => 'required|numeric|decimal:1', + 'final_area_space' => 'required|numeric|decimal:2', + 'payment_amount' => 'required|numeric|decimal:2', + 'expert_description' => 'required|string', + ]; + } +} diff --git a/app/Http/Requests/V3/Dashboard/Harim/HarimOffice/FileAcceptedRequest.php b/app/Http/Requests/V3/Dashboard/Harim/HarimOffice/FileAcceptedRequest.php index 38d5397b..0a4c5145 100644 --- a/app/Http/Requests/V3/Dashboard/Harim/HarimOffice/FileAcceptedRequest.php +++ b/app/Http/Requests/V3/Dashboard/Harim/HarimOffice/FileAcceptedRequest.php @@ -14,7 +14,7 @@ class FileAcceptedRequest extends FormRequest public function authorize(): bool { return $this->harim->province_id == auth()->user()->province_id && - $this->harim->state_id == HarimStates::BARESI_FILE_APLODE_SHODE_TAVASOTE_DAFTAR_HARIM->value; + $this->harim->state_id == HarimStates::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_DAFTAR_HARIM->value; } /** diff --git a/app/Http/Requests/V3/Dashboard/Harim/HarimOffice/FileRejectedRequest.php b/app/Http/Requests/V3/Dashboard/Harim/HarimOffice/FileRejectedRequest.php index 5c3f386d..8e2f1901 100644 --- a/app/Http/Requests/V3/Dashboard/Harim/HarimOffice/FileRejectedRequest.php +++ b/app/Http/Requests/V3/Dashboard/Harim/HarimOffice/FileRejectedRequest.php @@ -14,7 +14,7 @@ class FileRejectedRequest extends FormRequest public function authorize(): bool { return $this->harim->province_id == auth()->user()->province_id && - $this->harim->state_id == HarimStates::BARESI_FILE_APLODE_SHODE_TAVASOTE_DAFTAR_HARIM->value; + $this->harim->state_id == HarimStates::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_DAFTAR_HARIM->value; } /** diff --git a/database/migrations/2025_11_08_093438_add_trafic_position_road_type_to_harims_table.php b/database/migrations/2025_11_08_093438_add_trafic_position_road_type_to_harims_table.php new file mode 100644 index 00000000..52d42ac3 --- /dev/null +++ b/database/migrations/2025_11_08_093438_add_trafic_position_road_type_to_harims_table.php @@ -0,0 +1,32 @@ +decimal('traffic',total: 3,places: 1)->nullable(); + $table->decimal('road_type', total: 3,places: 1)->nullable(); + $table->decimal('position', total: 3,places: 1)->nullable(); + $table->decimal('final_area_space')->nullable(); + $table->decimal('forbidden_area_space')->nullable(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('harims', function (Blueprint $table) { + $table->dropColumn('traffic', 'road_type', 'position'); + }); + } +};