diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php index 8971430..143311d 100644 --- a/app/Http/Controllers/Auth/ResetPasswordController.php +++ b/app/Http/Controllers/Auth/ResetPasswordController.php @@ -38,6 +38,9 @@ class ResetPasswordController extends Controller $user = User::where('username', $request->username)->first(); // sendSMSVerification($user->phone); + $phone_code = rand(10000, 99999); + $verification = Verification::where(['username' => $user->phone])->first(); + $verification ? $verification->update(['code' => $phone_code]) : Verification::create(['username' => $user->phone, 'code' => $phone_code]); return response()->json([ 'step' => 1, diff --git a/app/Nova/User.php b/app/Nova/User.php index 2e7db6a..5a35d00 100644 --- a/app/Nova/User.php +++ b/app/Nova/User.php @@ -92,11 +92,11 @@ class User extends Resource NovaInputmask::make(__('Phone'), 'phone') ->mask('+(\\9\\93)-99-99-99-99') ->storeRawValue() - ->rules('required', 'integer', 'between:61000000, 71999999'), + ->rules('nullable', 'integer', 'between:61000000, 71999999'), Text::make(__('Email'), 'email') ->sortable() - ->rules('required', 'email', 'max:254') + ->rules('nullable', 'email', 'max:254') ->creationRules('unique:users,email') ->updateRules('unique:users,email,{{resourceId}}'), diff --git a/resources/views/vendor/nova/pages/reset-password.blade.php b/resources/views/vendor/nova/pages/reset-password.blade.php index d2dc54b..523c962 100644 --- a/resources/views/vendor/nova/pages/reset-password.blade.php +++ b/resources/views/vendor/nova/pages/reset-password.blade.php @@ -49,7 +49,13 @@ {{ __('Verification code') }} - + @@ -87,6 +93,7 @@ async function resetPassword(event) { const response = await postData(event.target.action, getFormData(event)) if (response.errors) { + console.log(response.errors); loopObject(response.errors, item => addValidationClasses(item)) } else { removeValidationClasess()