diff --git a/app/Http/Requests/V3/Dashboard/UserManagement/FullStoreRequest.php b/app/Http/Requests/V3/Dashboard/UserManagement/FullStoreRequest.php index dd605e04..9878c4ce 100644 --- a/app/Http/Requests/V3/Dashboard/UserManagement/FullStoreRequest.php +++ b/app/Http/Requests/V3/Dashboard/UserManagement/FullStoreRequest.php @@ -24,8 +24,14 @@ class FullStoreRequest extends FormRequest public function rules(): array { return [ - 'edarate_ostani_id' => 'exists:edarate_ostani,id|integer|prohibited_if:edarate_shahri_id', - 'edarate_shahri_id' => 'exists:edarate_shahri,id|integer|prohibited_if:edarate_ostani_id', + 'edarate_ostani_id' => [ + 'nullable','integer', 'exists:edarate_ostani,id', + Rule::prohibitedIf(fn () => filled($this->input('edarate_shahri_id'))), + ], + 'edarate_shahri_id' => [ + 'nullable','integer', 'exists:edarate_shahri,id', + Rule::prohibitedIf(fn () => filled($this->input('edarate_ostani_id'))), + ], 'province_id' => 'required|exists:provinces,id', 'city_id' => 'exists:cities,id', 'username' => 'required|unique:users,username', diff --git a/app/Http/Requests/V3/Dashboard/UserManagement/LimitStoreRequest.php b/app/Http/Requests/V3/Dashboard/UserManagement/LimitStoreRequest.php index 2a1fde8f..7a25fc13 100644 --- a/app/Http/Requests/V3/Dashboard/UserManagement/LimitStoreRequest.php +++ b/app/Http/Requests/V3/Dashboard/UserManagement/LimitStoreRequest.php @@ -4,6 +4,7 @@ namespace App\Http\Requests\V3\Dashboard\UserManagement; use Illuminate\Contracts\Validation\ValidationRule; use Illuminate\Foundation\Http\FormRequest; +use Illuminate\Validation\Rule; class LimitStoreRequest extends FormRequest { @@ -23,8 +24,14 @@ class LimitStoreRequest extends FormRequest public function rules(): array { return [ - 'edarate_ostani_id' => 'exists:edarate_ostani,id|integer|prohibited_if:edarate_shahri_id', - 'edarate_shahri_id' => 'exists:edarate_shahri,id|integer|prohibited_if:edarate_ostani_id', + 'edarate_ostani_id' => [ + 'nullable','integer', 'exists:edarate_ostani,id', + Rule::prohibitedIf(fn () => filled($this->input('edarate_shahri_id'))), + ], + 'edarate_shahri_id' => [ + 'nullable','integer', 'exists:edarate_shahri,id', + Rule::prohibitedIf(fn () => filled($this->input('edarate_ostani_id'))), + ], 'province_id' => 'required|exists:provinces,id', 'city_id' => 'exists:cities,id', 'username' => 'required|unique:users,username', diff --git a/app/Http/Requests/V3/Dashboard/UserManagement/UpdateRequest.php b/app/Http/Requests/V3/Dashboard/UserManagement/UpdateRequest.php index 188a55e7..e3d1fa51 100644 --- a/app/Http/Requests/V3/Dashboard/UserManagement/UpdateRequest.php +++ b/app/Http/Requests/V3/Dashboard/UserManagement/UpdateRequest.php @@ -25,8 +25,14 @@ class UpdateRequest extends FormRequest { return [ 'province_id' => 'required|exists:provinces,id', - 'edarate_ostani_id' => 'exists:edarate_ostani,id|integer|prohibited_if:edarate_shahri_id', - 'edarate_shahri_id' => 'exists:edarate_shahri,id|integer|prohibited_if:edarate_ostani_id', + 'edarate_ostani_id' => [ + 'nullable','integer', 'exists:edarate_ostani,id', + Rule::prohibitedIf(fn () => filled($this->input('edarate_shahri_id'))), + ], + 'edarate_shahri_id' => [ + 'nullable','integer', 'exists:edarate_shahri,id', + Rule::prohibitedIf(fn () => filled($this->input('edarate_ostani_id'))), + ], 'city_id' => 'exists:cities,id', 'username' => [Rule::unique('users', 'username')->ignore($this->user->id)], 'national_code' => ['required', Rule::unique('users', 'national_code')->ignore($this->user->id)],