registrar usuario de tipo comprador, comente algunas cosas del codigo

This commit is contained in:
Jose Sanchez
2023-08-15 10:37:30 -04:00
parent 223db091b0
commit 31b2e896ad
38 changed files with 3718 additions and 649 deletions

View File

@@ -44,134 +44,134 @@ class RegisterController extends Controller
*
* @var string
*/
protected $redirectTo = '/';
// protected $redirectTo = '/';
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
$this->middleware('guest');
}
// /**
// * Create a new controller instance.
// *
// * @return void
// */
// public function __construct()
// {
// $this->middleware('guest');
// }
/**
* Get a validator for an incoming registration request.
*
* @param array $data
* @return \Illuminate\Contracts\Validation\Validator
*/
protected function validator(array $data)
{
return Validator::make($data, [
'name' => 'required|string|max:255',
'password' => 'required|string|min:6|confirmed',
'g-recaptcha-response' => [
Rule::when(get_setting('google_recaptcha') == 1, ['required', new Recaptcha()], ['sometimes'])
]
]);
}
// /**
// * Get a validator for an incoming registration request.
// *
// * @param array $data
// * @return \Illuminate\Contracts\Validation\Validator
// */
// protected function validator(array $data)
// {
// return Validator::make($data, [
// 'name' => 'required|string|max:255',
// 'password' => 'required|string|min:6|confirmed',
// 'g-recaptcha-response' => [
// Rule::when(get_setting('google_recaptcha') == 1, ['required', new Recaptcha()], ['sometimes'])
// ]
// ]);
// }
/**
* Create a new user instance after a valid registration.
*
* @param array $data
* @return \App\Models\User
*/
protected function create(array $data)
{
if (filter_var($data['email'], FILTER_VALIDATE_EMAIL)) {
$user = User::create([
'name' => $data['name'],
'email' => $data['email'],
'password' => Hash::make($data['password']),
]);
}
else {
if (addon_is_activated('otp_system')){
$user = User::create([
'name' => $data['name'],
'phone' => '+'.$data['country_code'].$data['phone'],
'password' => Hash::make($data['password']),
'verification_code' => rand(100000, 999999)
]);
// /**
// * Create a new user instance after a valid registration.
// *
// * @param array $data
// * @return \App\Models\User
// */
// protected function create(array $data)
// {
// if (filter_var($data['email'], FILTER_VALIDATE_EMAIL)) {
// $user = User::create([
// 'name' => $data['name'],
// 'email' => $data['email'],
// 'password' => Hash::make($data['password']),
// ]);
// }
// else {
// if (addon_is_activated('otp_system')){
// $user = User::create([
// 'name' => $data['name'],
// 'phone' => '+'.$data['country_code'].$data['phone'],
// 'password' => Hash::make($data['password']),
// 'verification_code' => rand(100000, 999999)
// ]);
$otpController = new OTPVerificationController;
$otpController->send_code($user);
}
}
// $otpController = new OTPVerificationController;
// $otpController->send_code($user);
// }
// }
if(session('temp_user_id') != null){
Cart::where('temp_user_id', session('temp_user_id'))
->update([
'user_id' => $user->id,
'temp_user_id' => null
]);
// if(session('temp_user_id') != null){
// Cart::where('temp_user_id', session('temp_user_id'))
// ->update([
// 'user_id' => $user->id,
// 'temp_user_id' => null
// ]);
Session::forget('temp_user_id');
}
// Session::forget('temp_user_id');
// }
if(Cookie::has('referral_code')){
$referral_code = Cookie::get('referral_code');
$referred_by_user = User::where('referral_code', $referral_code)->first();
if($referred_by_user != null){
$user->referred_by = $referred_by_user->id;
$user->save();
}
}
// if(Cookie::has('referral_code')){
// $referral_code = Cookie::get('referral_code');
// $referred_by_user = User::where('referral_code', $referral_code)->first();
// if($referred_by_user != null){
// $user->referred_by = $referred_by_user->id;
// $user->save();
// }
// }
return $user;
}
// return $user;
// }
public function register(Request $request)
{
if (filter_var($request->email, FILTER_VALIDATE_EMAIL)) {
if(User::where('email', $request->email)->first() != null){
flash(translate('Email or Phone already exists.'));
return back();
}
}
elseif (User::where('phone', '+'.$request->country_code.$request->phone)->first() != null) {
flash(translate('Phone already exists.'));
return back();
}
// public function register(Request $request)
// {
// if (filter_var($request->email, FILTER_VALIDATE_EMAIL)) {
// if(User::where('email', $request->email)->first() != null){
// flash(translate('Email or Phone already exists.'));
// return back();
// }
// }
// elseif (User::where('phone', '+'.$request->country_code.$request->phone)->first() != null) {
// flash(translate('Phone already exists.'));
// return back();
// }
$this->validator($request->all())->validate();
// $this->validator($request->all())->validate();
$user = $this->create($request->all());
// $user = $this->create($request->all());
$this->guard()->login($user);
// $this->guard()->login($user);
if($user->email != null){
if(BusinessSetting::where('type', 'email_verification')->first()->value != 1){
$user->email_verified_at = date('Y-m-d H:m:s');
$user->save();
flash(translate('Registration successful.'))->success();
}
else {
try {
$user->sendEmailVerificationNotification();
flash(translate('Registration successful. Please verify your email.'))->success();
} catch (\Throwable $th) {
$user->delete();
flash(translate('Registration failed. Please try again later.'))->error();
}
}
}
// if($user->email != null){
// if(BusinessSetting::where('type', 'email_verification')->first()->value != 1){
// $user->email_verified_at = date('Y-m-d H:m:s');
// $user->save();
// flash(translate('Registration successful.'))->success();
// }
// else {
// try {
// $user->sendEmailVerificationNotification();
// flash(translate('Registration successful. Please verify your email.'))->success();
// } catch (\Throwable $th) {
// $user->delete();
// flash(translate('Registration failed. Please try again later.'))->error();
// }
// }
// }
return $this->registered($request, $user)
?: redirect($this->redirectPath());
}
// return $this->registered($request, $user)
// ?: redirect($this->redirectPath());
// }
protected function registered(Request $request, $user)
{
if ($user->email == null) {
return redirect()->route('verification');
}elseif(session('link') != null){
return redirect(session('link'));
}else {
return redirect()->route('home');
}
}
// protected function registered(Request $request, $user)
// {
// if ($user->email == null) {
// return redirect()->route('verification');
// }elseif(session('link') != null){
// return redirect(session('link'));
// }else {
// return redirect()->route('home');
// }
// }
}

View File

@@ -8,95 +8,31 @@ use App\Models\User;
use Carbon\Carbon;
use Illuminate\Http\Request;
use App\Http\Controllers\OTPVerificationController;
class VerificationController extends Controller
{
/*
|--------------------------------------------------------------------------
| Email Verification Controller
|--------------------------------------------------------------------------
|
| This controller is responsible for handling email verification for any
| user that recently registered with the application. Emails may also
| be re-sent if the user didn't receive the original email message.
|
*/
use VerifiesEmails;
public function verify(Request $request, $id, $hash)
{
// Aquí debes implementar la lógica para verificar el token y marcar el correo electrónico como verificado
// Puedes usar el $id y $hash para buscar el usuario en la base de datos y realizar la verificación
/**
* Where to redirect users after verification.
*
* @var string
*/
protected $redirectTo = '/';
// Ejemplo de implementación:
$user = User::find($id);
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
//$this->middleware('auth');
$this->middleware('signed')->only('verify');
$this->middleware('throttle:6,1')->only('verify', 'resend');
if ($user && hash_equals($hash, $user->confirmation_code)) {
$user->email_verified_at = now();
$user->save();
// Inicia sesión al usuario si lo deseas
auth()->login($user);
// Redirige al usuario a la página de éxito o a donde desees
return redirect()->route('shop.view.signup.complete');
}
/**
* Show the email verification notice.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function show(Request $request)
{
if ($request->user()->email != null) {
return $request->user()->hasVerifiedEmail()
? redirect($this->redirectPath())
: view('auth.verify');
}
else {
$otpController = new OTPVerificationController;
$otpController->send_code($request->user());
return redirect()->route('verification');
}
}
// Si la verificación falla, puedes redirigir al usuario a una página de error o mostrar un mensaje de error
return redirect()->route('shop.view.email.verification');
}
/**
* Resend the email verification notification.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function resend(Request $request)
{
if ($request->user()->hasVerifiedEmail()) {
return redirect($this->redirectPath());
}
$request->user()->sendEmailVerificationNotification();
return back()->with('resent', true);
}
public function verification_confirmation($code){
$user = User::where('verification_code', $code)->first();
if($user != null){
$user->email_verified_at = Carbon::now();
$user->save();
auth()->login($user, true);
flash(translate('Your email has been verified successfully'))->success();
}
else {
flash(translate('Sorry, we could not verifiy you. Please try again'))->error();
}
if($user->user_type == 'seller') {
return redirect()->route('seller.dashboard');
}
return redirect()->route('dashboard');
}
}
}

View File

@@ -69,29 +69,29 @@ class HomeController extends Controller
return view('frontend.user_login');
}
public function registration(Request $request)
{
if (Auth::check()) {
return redirect()->route('home');
}
if ($request->has('referral_code') && addon_is_activated('affiliate_system')) {
try {
$affiliate_validation_time = AffiliateConfig::where('type', 'validation_time')->first();
$cookie_minute = 30 * 24;
if ($affiliate_validation_time) {
$cookie_minute = $affiliate_validation_time->value * 60;
}
// public function registration(Request $request)
// {
// if (Auth::check()) {
// return redirect()->route('home');
// }
// if ($request->has('referral_code') && addon_is_activated('affiliate_system')) {
// try {
// $affiliate_validation_time = AffiliateConfig::where('type', 'validation_time')->first();
// $cookie_minute = 30 * 24;
// if ($affiliate_validation_time) {
// $cookie_minute = $affiliate_validation_time->value * 60;
// }
Cookie::queue('referral_code', $request->referral_code, $cookie_minute);
$referred_by_user = User::where('referral_code', $request->referral_code)->first();
// Cookie::queue('referral_code', $request->referral_code, $cookie_minute);
// $referred_by_user = User::where('referral_code', $request->referral_code)->first();
$affiliateController = new AffiliateController;
$affiliateController->processAffiliateStats($referred_by_user->id, 1, 0, 0, 0);
} catch (\Exception $e) {
}
}
return view('frontend.user_registration');
}
// $affiliateController = new AffiliateController;
// $affiliateController->processAffiliateStats($referred_by_user->id, 1, 0, 0, 0);
// } catch (\Exception $e) {
// }
// }
// return view('frontend.user_registration');
// }
public function cart_login(Request $request)
{
@@ -590,37 +590,37 @@ class HomeController extends Controller
return back();
}
public function send_email_change_verification_mail($request, $email)
{
$response['status'] = 0;
$response['message'] = 'Unknown';
// public function send_email_change_verification_mail($request, $email)
// {
// $response['status'] = 0;
// $response['message'] = 'Unknown';
$verification_code = Str::random(32);
// $verification_code = Str::random(32);
$array['subject'] = translate('Email Verification');
$array['from'] = env('MAIL_FROM_ADDRESS');
$array['content'] = translate('Verify your account');
$array['link'] = route('email_change.callback') . '?new_email_verificiation_code=' . $verification_code . '&email=' . $email;
$array['sender'] = Auth::user()->name;
$array['details'] = translate("Email Second");
// $array['subject'] = translate('Email Verification');
// $array['from'] = env('MAIL_FROM_ADDRESS');
// $array['content'] = translate('Verify your account');
// $array['link'] = route('email_change.callback') . '?new_email_verificiation_code=' . $verification_code . '&email=' . $email;
// $array['sender'] = Auth::user()->name;
// $array['details'] = translate("Email Second");
$user = Auth::user();
$user->new_email_verificiation_code = $verification_code;
$user->save();
// $user = Auth::user();
// $user->new_email_verificiation_code = $verification_code;
// $user->save();
try {
Mail::to($email)->queue(new SecondEmailVerifyMailManager($array));
// try {
// Mail::to($email)->queue(new SecondEmailVerifyMailManager($array));
$response['status'] = 1;
$response['message'] = translate("Your verification mail has been Sent to your email.");
} catch (\Exception $e) {
// return $e->getMessage();
$response['status'] = 0;
$response['message'] = $e->getMessage();
}
// $response['status'] = 1;
// $response['message'] = translate("Your verification mail has been Sent to your email.");
// } catch (\Exception $e) {
// // return $e->getMessage();
// $response['status'] = 0;
// $response['message'] = $e->getMessage();
// }
return $response;
}
// return $response;
// }
public function email_change_callback(Request $request)
{

View File

@@ -2,14 +2,15 @@
namespace App\Http\Controllers;
use Auth;
use Illuminate\Http\Request;
class ShopViewsController extends Controller
{
public function index() {
// public function index() {
return view('frontend.registro-comercio.index');
}
// return view('frontend.registro-comercio.index');
// }
/* Paso 1 - Elegir tipo de cuenta */
public function account_type() {
@@ -18,15 +19,18 @@ class ShopViewsController extends Controller
}
/* Paso 2 - Registro de correo */
public function register_email() {
// public function register_email() {
return view('frontend.registro-comercio.views.register-email');
}
// return view('frontend.registro-comercio.views.register-email');
// }
/* Paso 3 - Verificacion de correo */
public function verification_email() {
public function verification_email() {
$user = Auth::user(); // Obtener el usuario autenticado
return view('frontend.registro-comercio.views.email-verification')->with('user', $user);
return view('frontend.registro-comercio.views.email-verification');
}
/* Paso 4 - Cuenta creada correctamente */

View File

@@ -0,0 +1,84 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Http\Request;
class TypeBusinessController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
*/
public function index()
{
return view('frontend.registro-comercio.views.business.index');
}
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
*/
public function create()
{
//
}
/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
{
//
}
/**
* Display the specified resource.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function show($id)
{
//
}
/**
* Show the form for editing the specified resource.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function edit($id)
{
//
}
/**
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param int $id
* @return \Illuminate\Http\Response
*/
public function update(Request $request, $id)
{
//
}
/**
* Remove the specified resource from storage.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function destroy($id)
{
//
}
}

View File

@@ -0,0 +1,131 @@
<?php
namespace App\Http\Controllers;
use App\Mail\VerificationEmail;
use App\Models\User;
use Auth;
use \ReCaptcha\ReCaptcha;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Mail;
use Illuminate\Support\Facades\Validator;
use Illuminate\Validation\Rules\Password;
use Str;
class TypeBuyerController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
*/
public function index()
{
return view('frontend.registro-comercio.views.buyers.index');
}
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
*/
public function create()
{
}
/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function store(Request $request, User $user)
{
// Validación de los campos de registro
$validator = Validator::make($request->all(), [
'email' => ['required', 'string', 'email', 'max:255', 'unique:'.User::class],
'password' => ['required', 'confirmed', Password::defaults()],
'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();
}
$confirmation_code = Str::random(25);
$user = new User;
$user->email = $request->input('email');
$user->password = Hash::make($request->input('password'));
$user->user_type = 'customer';
$user->confirmation_code = $confirmation_code;
$user->save();
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');
}
}
}
/**
* Display the specified resource.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function show($id)
{
//
}
/**
* Show the form for editing the specified resource.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function edit($id)
{
//
}
/**
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param int $id
* @return \Illuminate\Http\Response
*/
public function update(Request $request, $id)
{
//
}
/**
* Remove the specified resource from storage.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function destroy($id)
{
//
}
}

View File

@@ -0,0 +1,84 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Http\Request;
class TypeWorkshopController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
*/
public function index()
{
return view('frontend.registro-comercio.views.workshops.index');
}
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
*/
public function create()
{
//
}
/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
{
//
}
/**
* Display the specified resource.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function show($id)
{
//
}
/**
* Show the form for editing the specified resource.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function edit($id)
{
//
}
/**
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param int $id
* @return \Illuminate\Http\Response
*/
public function update(Request $request, $id)
{
//
}
/**
* Remove the specified resource from storage.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function destroy($id)
{
//
}
}

View File

@@ -14,47 +14,47 @@ use App\Notifications\EmailVerificationNotification;
class UserController extends Controller
{
public function register_email(Request $request)
{
// Validar los datos recibidos en la solicitud
$request->validate([
'email' => 'required|email',
]);
// public function register_email(Request $request)
// {
// // Validar los datos recibidos en la solicitud
// $request->validate([
// 'email' => 'required|email',
// ]);
// Buscar el usuario por su dirección de correo electrónico
$user = User::where('email', $request->email)->first();
if ($user && $user->email_verified_at != NULL) {
// Si el usuario ya existe y su campo "verification_code" es verdadero, no enviar nuevamente
return response()->json(['message' => 'La cuenta ya existe'], 400);
}
// // Buscar el usuario por su dirección de correo electrónico
// $user = User::where('email', $request->email)->first();
// if ($user && $user->email_verified_at != NULL) {
// // Si el usuario ya existe y su campo "verification_code" es verdadero, no enviar nuevamente
// return response()->json(['message' => 'La cuenta ya existe'], 400);
// }
if (!$user) {
// Si el usuario no existe, generar un código de verificación aleatorio de 6 dígitos numéricos
$verificationCode = rand(10000, 99999);
// if (!$user) {
// // Si el usuario no existe, generar un código de verificación aleatorio de 6 dígitos numéricos
// $verificationCode = rand(10000, 99999);
// Crear un nuevo usuario con el correo electrónico y el código de verificación
$user = User::create([
'email' => $request->email,
'verification_code' => $verificationCode,
]);
// // Crear un nuevo usuario con el correo electrónico y el código de verificación
// $user = User::create([
// 'email' => $request->email,
// 'verification_code' => $verificationCode,
// ]);
// Guardar el correo en sesión
session(['registered_email' => $request->email]);
} else {
// Si el usuario ya existe pero no se ha enviado el código, generar un nuevo código
$verificationCode = rand(10000, 99999);
// // Guardar el correo en sesión
// session(['registered_email' => $request->email]);
// } else {
// // Si el usuario ya existe pero no se ha enviado el código, generar un nuevo código
// $verificationCode = rand(10000, 99999);
// Actualizar el código de verificación y el campo "verification_code"
$user->verification_code = $verificationCode;
$user->save();
}
// // Actualizar el código de verificación y el campo "verification_code"
// $user->verification_code = $verificationCode;
// $user->save();
// }
// Enviar la notificación al correo del usuario con el código de verificación
$user->notify(new EmailVerificationNotification($verificationCode));
// // Enviar la notificación al correo del usuario con el código de verificación
// $user->notify(new EmailVerificationNotification($verificationCode));
// Devolver una respuesta (opcional)
return response()->json(['message' => 'Usuario creado correctamente'], 201);
}
// // Devolver una respuesta (opcional)
// return response()->json(['message' => 'Usuario creado correctamente'], 201);
// }
@@ -85,43 +85,43 @@ class UserController extends Controller
// Devolver una respuesta (opcional)
return response()->json(['message' => 'Usuario creado correctamente'], 201); */
public function verify_code(Request $request)
{
// Validar el correo electrónico
$request->validate([
'email' => 'required|email',
'codes' => 'required'
]);
// public function verify_code(Request $request)
// {
// // Validar el correo electrónico
// $request->validate([
// 'email' => 'required|email',
// 'codes' => 'required'
// ]);
// Verificar si el correo electrónico coincide con el almacenado en la sesión
/* if ($request->email !== session('registered_email')) {
return response()->json(['message' => 'Correo no coincide'], 400);
} */
// // Verificar si el correo electrónico coincide con el almacenado en la sesión
// /* if ($request->email !== session('registered_email')) {
// return response()->json(['message' => 'Correo no coincide'], 400);
// } */
// Buscar el usuario por su dirección de correo electrónico
$user = User::where('email', $request->email)->first();
// // Buscar el usuario por su dirección de correo electrónico
// $user = User::where('email', $request->email)->first();
// Verificar si el usuario y el código coinciden
if ($user && $user->verification_code === $request->codes) {
// Cambiar la lógica aquí para redireccionar o retornar otro mensaje
$user->email_verified_at = now();
$temporaryPassword = Str::random(8);
$user->password = Hash::make($temporaryPassword);
// // Verificar si el usuario y el código coinciden
// if ($user && $user->verification_code === $request->codes) {
// // Cambiar la lógica aquí para redireccionar o retornar otro mensaje
// $user->email_verified_at = now();
// $temporaryPassword = Str::random(8);
// $user->password = Hash::make($temporaryPassword);
if ($request->account_type == "seller") {
$user->user_type = "seller";
}
// if ($request->account_type == "seller") {
// $user->user_type = "seller";
// }
$user->save();
// $user->save();
// Enviar la notificación con las credenciales
$user->notify(new UserCredentialsNotification($temporaryPassword));
// // Enviar la notificación con las credenciales
// $user->notify(new UserCredentialsNotification($temporaryPassword));
return response()->json(['message' => 'Código verificado correctamente']);
} else {
return response()->json(['message' => 'Código no coincide'], 400);
}
}
// return response()->json(['message' => 'Código verificado correctamente']);
// } else {
// return response()->json(['message' => 'Código no coincide'], 400);
// }
// }
}
/* public function register_email(Request $request)