From abd8354e71695f7c8c95d96a0d00fa0362704353 Mon Sep 17 00:00:00 2001 From: Jose Sanchez <54992061+93jose93@users.noreply.github.com> Date: Tue, 22 Aug 2023 16:58:22 -0400 Subject: [PATCH] avance solo de la vista del formulario y validaciones del negocio --- .../Controllers/TypeBusinessController.php | 56 +++++++++-------- .../registro-form/assets/css/main.css | 4 +- .../registro-form/assets/css/theme-1.css | 2 +- resources/lang/es/validation.php | 5 +- .../views/business/index.blade.php | 60 ++++++++++++++++++- 5 files changed, 96 insertions(+), 31 deletions(-) diff --git a/app/Http/Controllers/TypeBusinessController.php b/app/Http/Controllers/TypeBusinessController.php index f6cabe93..c7d77165 100644 --- a/app/Http/Controllers/TypeBusinessController.php +++ b/app/Http/Controllers/TypeBusinessController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers; use App\Mail\VerificationEmail; +use App\Models\Category; use App\Models\Shop; use App\Models\User; use Illuminate\Http\Request; @@ -23,7 +24,10 @@ class TypeBusinessController extends Controller */ public function index() { - return view('frontend.registro-comercio.views.business.index'); + + $categories = Category::all(); + + return view('frontend.registro-comercio.views.business.index', compact('categories')); } @@ -47,41 +51,45 @@ class TypeBusinessController extends Controller { // Validación de los campos de registro $validator = Validator::make($request->all(), [ - 'email' => ['required', 'string', 'email', 'max:255', 'unique:'.User::class], + 'name' => ['required'], + 'address' => ['required'], + 'categories_id' => ['required'], + 'email' => ['required', 'string', 'email', 'max:255', 'unique:'.User::class, 'regex:/^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+.(com|do|net|com.do)$/'], 'password' => ['required', 'confirmed', Password::defaults()], + 'terms' => ['required'], // Agrega esta línea para hacer el campo 'terms' requerido 'g-recaptcha-response' => ['required', function ($attribute, $value, $fail) { $recaptcha = new Recaptcha(env('RECAPTCHA_SECRET_KEY')); $recaptcha->verify($value); }], ]); - if ($validator->fails()) { - // Si la validación falla, puedes redirigir o devolver una respuesta con los errores - return redirect()->back()->withErrors($validator)->withInput(); - } + // if ($validator->fails()) { + // // Si la validación falla, puedes redirigir o devolver una respuesta con los errores + // return redirect()->back()->withErrors($validator)->withInput(); + // } - $confirmation_code = Str::random(25); + // $confirmation_code = Str::random(25); - $user = new User(); - $user->email = $request->input('email'); - $user->password = Hash::make($request->input('password')); - $user->user_type = 'seller'; - $user->confirmation_code = $confirmation_code; - $user->save(); + // $user = new User(); + // $user->email = $request->input('email'); + // $user->password = Hash::make($request->input('password')); + // $user->user_type = 'seller'; + // $user->confirmation_code = $confirmation_code; + // $user->save(); - Mail::to($user->email)->send(new VerificationEmail($user)); + // Mail::to($user->email)->send(new VerificationEmail($user)); - // Intentar iniciar sesión automáticamente - if (Auth::attempt($request->only('email', 'password'))) { - if (Auth::user()->email_verified_at) { - // La cuenta está verificada, redirige a la página deseada - return redirect()->route('shop.view.signup.complete'); - } else { - // La cuenta no está verificada, redirige a la página de verificación de correo electrónico - return redirect()->route('shop.view.email.verification'); - } - } + // // Intentar iniciar sesión automáticamente + // if (Auth::attempt($request->only('email', 'password'))) { + // if (Auth::user()->email_verified_at) { + // // La cuenta está verificada, redirige a la página deseada + // return redirect()->route('shop.view.signup.complete'); + // } else { + // // La cuenta no está verificada, redirige a la página de verificación de correo electrónico + // return redirect()->route('shop.view.email.verification'); + // } + // } } /** diff --git a/public/assets/registrocomercio/registro-form/assets/css/main.css b/public/assets/registrocomercio/registro-form/assets/css/main.css index 2b6ff056..4459156c 100644 --- a/public/assets/registrocomercio/registro-form/assets/css/main.css +++ b/public/assets/registrocomercio/registro-form/assets/css/main.css @@ -196,10 +196,10 @@ a { a, a:hover, a:focus { - text-decoration: none; + /* text-decoration: none; display: inline-block; color: inherit; - outline: none; + outline: none; */ } textarea { diff --git a/public/assets/registrocomercio/registro-form/assets/css/theme-1.css b/public/assets/registrocomercio/registro-form/assets/css/theme-1.css index c8c8edf7..045c0cf9 100644 --- a/public/assets/registrocomercio/registro-form/assets/css/theme-1.css +++ b/public/assets/registrocomercio/registro-form/assets/css/theme-1.css @@ -586,7 +586,7 @@ font-weight: 700; color: #1c2437; font-family: "Roboto", sans-serif; - text-transform: uppercase; + /* text-transform: uppercase; */ } .ugf-content form .form-group .form-control { height: 60px; diff --git a/resources/lang/es/validation.php b/resources/lang/es/validation.php index b4cd5ec2..b7208163 100644 --- a/resources/lang/es/validation.php +++ b/resources/lang/es/validation.php @@ -170,7 +170,7 @@ return [ 'minute' => 'minuto', 'mobile' => 'móvil', 'month' => 'mes', - 'name' => 'Nombre', + 'name' => 'nombre', 'password' => 'contraseña', 'password_confirmation' => 'confirmación de la contraseña', 'phone' => 'teléfono', @@ -234,7 +234,8 @@ return [ 'nfc_amount' => 'Cantidad de comprobantes', 'nfc_next' => 'Próximo NFC a emitir', 'nfc_select' => 'Estado de NFC', - 'g-recaptcha-response' => 'reCAPTCHA' + 'g-recaptcha-response' => 'reCAPTCHA', + 'categories_id' => 'categoría' ], ]; \ No newline at end of file diff --git a/resources/views/frontend/registro-comercio/views/business/index.blade.php b/resources/views/frontend/registro-comercio/views/business/index.blade.php index 03a61c7d..96888e1c 100644 --- a/resources/views/frontend/registro-comercio/views/business/index.blade.php +++ b/resources/views/frontend/registro-comercio/views/business/index.blade.php @@ -218,6 +218,10 @@
+ +
Perfil de usuario
+
+
@@ -237,12 +241,64 @@
- + @error('password_confirmation')
{{ $message }}
@enderror
+
Datos del negocio
+
+ + +
+ + + @error('categories_id') +
{{ $message }}
+ @enderror +
+ +
+ + + + @error('name') +
{{ $message }}
+ @enderror +
+ + +
+ + + + @error('address') +
{{ $message }}
+ @enderror +
+ +
+
+ + +
+ @if ($errors->has('terms')) + + {{ $errors->first('terms') }} +

{{ $errors->first('terms') }}

+ + @endif +
+ +
@@ -273,7 +329,7 @@
- Utilice el correo electrónico en su lugar + Utilice el correo electrónico en su lugar