ellecio2/elcaribe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #12 from lapieza-dev/alejandro

Browse Source 
Alejandro a  main
This commit is contained in:
Jose Sanchez
2023-08-21 16:16:23 -04:00
committed by GitHub
parent 84904eca6a 5670afb7d2
commit 13175827a4
17 changed files with 540 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -1 +1 @@
/vendor

14
app/Http/Controllers/ShopViewsController.php
View File

@@ -54,14 +54,14 @@ class ShopViewsController extends Controller
} */
/* Paso 3 informacion personal */
/* public function personal_account() {
// public function personal_account() {
return view('frontend.registro-comercio.views.personal-account');
} */
// return view('frontend.registro-comercio.views.personal-account');
// }
/* Paso 4 informacion de la tienda */
/* public function personal_shop() {
// /* Paso 4 informacion de la tienda */
// public function personal_shop() {
return view('frontend.registro-comercio.views.personal-shop');
} */
// return view('frontend.registro-comercio.views.personal-shop');
// }
}

39
app/Http/Controllers/TypeBusinessController.php
View File

@@ -3,6 +3,7 @@
namespace App\Http\Controllers;
use App\Mail\VerificationEmail;
use App\Models\Shop;
use App\Models\User;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
@@ -127,4 +128,42 @@ class TypeBusinessController extends Controller
{
//
}
public function business_complete_index()
{
$user = auth()->user();
return view('frontend.registro-comercio.views.business.business_complete', compact('user'));
}
public function business_complete_store(Request $request, Shop $shop)
{
// Validación de los campos
$validator = Validator::make($request->all(), [
'name' => ['required'],
'address' => ['required'],
]);
// Si la validación falla, puedes redirigir de vuelta con los errores
if ($validator->fails()) {
return redirect()->back()->withErrors($validator)->withInput();
}
// Guardar los campos en el modelo Shop
$shop->user_id = $request->user()->id;
$shop->name = $request->name;
$shop->address = $request->address;
// Aquí puedes guardar otros campos si los tienes
// Guardar el modelo Shop en la base de datos
$shop->save();
// Marcar el campo "shop_verified_at" como verificado en el modelo User
$request->user()->shop_verified_at = now(); // Puedes usar la función "now()" para establecer la fecha y hora actual
// Guardar el modelo User en la base de datos
$request->user()->save();
return redirect()->route('seller.dashboard');
}
}

40
app/Http/Controllers/TypeWorkshopController.php
View File

@@ -3,7 +3,9 @@
namespace App\Http\Controllers;
use App\Mail\VerificationEmail;
use App\Models\Shop;
use App\Models\User;
use App\Models\Workshop;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Hash;
@@ -126,4 +128,42 @@ class TypeWorkshopController extends Controller
{
//
}
public function workshop_complete_index()
{
$user = auth()->user();
return view('frontend.registro-comercio.views.workshops.workshop_complete', compact('user'));
}
public function workshop_complete_store(Request $request, Workshop $workshop)
{
// Validación de los campos
$validator = Validator::make($request->all(), [
'name' => ['required'],
'address' => ['required'],
]);
// Si la validación falla, puedes redirigir de vuelta con los errores
if ($validator->fails()) {
return redirect()->back()->withErrors($validator)->withInput();
}
// Guardar los campos en el modelo Workshop
$workshop->name = $request->name;
$workshop->address = $request->address;
// Aquí puedes guardar otros campos si los tienes
// Guardar el modelo Workshop en la base de datos
$workshop->save();
// Asignar el ID del taller al campo "workshop_id" en el modelo User
// Marcar el campo "shop_verified_at" como verificado en el modelo User
$request->user()->shop_verified_at = now(); // Puedes usar la función "now()" para establecer la fecha y hora actual
$request->user()->workshop_id = $workshop->id;
$request->user()->save();
return redirect()->route('workshop.dashboard');
}
}

8
app/Models/Shop.php
View File

@@ -9,6 +9,8 @@ class Shop extends Model
protected $with = ['user'];
protected $fillable = ['name', 'address', 'user_id'];
public function user()
{
return $this->belongsTo(User::class);
@@ -20,4 +22,10 @@ class Shop extends Model
public function followers(){
return $this->hasMany(FollowSeller::class);
}
//URL AMIGABLES
public function getRouteKeyName()
{
return 'slug';
}
}

5
app/Models/User.php
View File

@@ -149,4 +149,9 @@ class User extends Authenticatable implements MustVerifyEmail
return $this->hasMany(Upload::class);
}
public function workshop()
{
return $this->hasOne(Workshop::class);
}
}

18
app/Models/Workshop.php Normal file
View File

@@ -0,0 +1,18 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
class Workshop extends Model
{
use HasFactory;
protected $fillable = ['name', 'address'];
public function user()
{
return $this->belongsTo(User::class);
}
}

141
resources/views/frontend/registro-comercio/views/business/business_complete.blade.php Normal file
View File

@@ -0,0 +1,141 @@
<html lang="en">
<head>
<!-- Required meta tags -->
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="csrf-token" content="{{ csrf_token() }}">
<title>La Pieza.DO | Registro</title>
<!-- Bootstrap CSS -->
<link rel="stylesheet"
href="{{ static_asset('assets/registrocomercio/registro-form/assets/css/bootstrap.min.css') }}">
<!-- External Css -->
<link rel="stylesheet"
href="{{ static_asset('assets/registrocomercio/registro-form/assets/css/line-awesome.min.css') }}">
<link rel="stylesheet"
href="{{ static_asset('assets/registrocomercio/registro-form/assets/css/owl.carousel.min.css') }}" />
<link rel="stylesheet"
href="https://maxst.icons8.com/vue-static/landings/line-awesome/font-awesome-line-awesome/css/all.min.css">
<link rel="stylesheet"
href="https://maxst.icons8.com/vue-static/landings/line-awesome/line-awesome/1.3.0/css/line-awesome.min.css">
<!-- Custom Css -->
<link rel="stylesheet" type="text/css"
href="{{ static_asset('assets/registrocomercio/registro-form/assets/css/main.css') }}">
<link rel="stylesheet" type="text/css"
href="{{ static_asset('assets/registrocomercio/registro-form/assets/css/theme-1.css') }}">
<!-- Fonts -->
<link href="https://fonts.googleapis.com/css2?family=Roboto:wght@400;700&display=swap" rel="stylesheet">
<!-- Favicon -->
<link rel="icon"
href="{{ static_asset('assets/registrocomercio/registro-form/assets/images/favicon.png') }}">
<link rel="apple-touch-icon"
href="{{ static_asset('assets/registrocomercio/registro-form/assets/images/apple-touch-icon.png') }}">
<link rel="apple-touch-icon" sizes="72x72"
href="{{ static_asset('assets/registrocomercio/registro-form/assets/images/icon-72x72.png') }}">
<link rel="apple-touch-icon" sizes="114x114"
href="{{ static_asset('assets/registrocomercio/registro-form/assets/images/icon-114x114.png') }}">
</head>
<body>
<div class="ugf-wrapper theme-bg">
<div class="ugf-content-block">
<div class="logo">
</div>
<div class="container-md">
<div class="row">
<div class="ol-12 col-lg-7 offset-lg-5 p-sm-0 mx-auto">
<div class="ugf-content pt270">
<h2>Bienvenido</h2>
<p>¡Gracias por registrarte! Para poder completar tu registro,<br> necesitamos que agregues los siguientes campos de negocio:</p>
<form class="form-flex email-form was-validated" id="emailGroup" method="POST" action="{{ route('register.business.business_complete_store') }}">
@csrf
<!-- Agrega el campo hidden para enviar el usuario -->
<input type="hidden" name="user" value="{{ $user }}">
<div class="container">
<div class="form-row col-md-9">
<div class="form-group mb-4">
<label for="name" id="nameLabel">Nombre de la tienda</label>
<input type="text" name="name" id="name" placeholder="Nombre" class="form-control name @error('name') is-invalid @enderror" value="{{ old('name') }}">
@error('name')
<div class="invalid-feedback">{{ $message }}</div>
@enderror
</div>
<div class="form-group mb-4">
<label for="address" id="addressLabel">Dirección</label>
<input type="text" name="address" id="address" placeholder="Dirección" class="form-control address @error('address') is-invalid @enderror" value="{{ old('address') }}">
@error('address')
<div class="invalid-feedback">{{ $message }}</div>
@enderror
</div>
<div class="form-group mb-12 d-flex">
<button style="-ms-flex: 0 0 230px; flex: 0 0 230px;" id="" class="btn btn-primary btn-lg btn-block"><span>Registra su tienda</span> <i class="las la-arrow-right"></i></button>
</div>
</div>
</div>
</form>
<div id="result"></div>
</div>
</div>
</div>
</div>
<div class="alternet-access">
<p><a href="{{ route('logout') }}">Cerrar sesión</a></p>
</div>
</div>
{{-- <div class="ugf-sidebar flex-bottom ugf-sidebar-bg-2 sidebar-steps">
<div class="steps">
<div class="step">
<span>1</span>
<p>Tipo de Cuenta</p>
</div>
<div class="step step-onprocess">
<span>2</span>
<p>Verificación de Inicio</p>
</div>
<div class="step">
<span>3</span>
<p>Confirmación de Datos</p>
</div>
</div>
</div> --}}
</div>
<!-- Optional JavaScript -->
<!-- jQuery first, then Popper.js, then Bootstrap JS -->
{{-- <script src="{{ static_asset('assets/registrocomercio/registro-form/assets/js/jquery.min.js') }}"></script> --}}
<script src="https://code.jquery.com/jquery-3.7.0.min.js"
integrity="sha256-2Pmvv0kuTBOenSvLm6bvfBSSHrUJ+3A7x6P5Ebd07/g=" crossorigin="anonymous"></script>
<script src="{{ static_asset('assets/registrocomercio/registro-form/assets/js/popper.min.js') }}"></script>
<script src="{{ static_asset('assets/registrocomercio/registro-form/assets/js/bootstrap.min.js') }}"></script>
<script src="{{ static_asset('assets/registrocomercio/registro-form/assets/js/owl.carousel.min.js') }}"></script>
<script src="{{ static_asset('assets/registrocomercio/registro-form/assets/js/custom.js') }}"></script>
</body>
</html>
<script>
</script>

2
resources/views/frontend/registro-comercio/views/business/index.blade.php
View File

@@ -221,7 +221,7 @@
<div class="form-group mb-4">
<label for="email" id="emailLabel">Correo Electrónico</label>
<input type="email" name="email" id="email" placeholder="{{ __('Email') }}" class="form-control email @error('email') is-invalid @enderror" value="{{ old('email') }}">
<a id="phoneLink" style="text-decoration: underline; margin-left: 250px;" href="#" class="mb-3">Utilice el número de teléfono en su lugar</a>
<a id="phoneLink" style="text-decoration: underline;" href="#" class="mb-3">Utilice el número de teléfono en su lugar</a>
@error('email')
<div class="invalid-feedback">{{ $message }}</div>
@enderror

2
resources/views/frontend/registro-comercio/views/buyers/index.blade.php
View File

@@ -224,7 +224,7 @@
<div class="form-group mb-4">
<label for="email" id="emailLabel">Correo Electrónico</label>
<input type="email" name="email" id="email" placeholder="{{ __('Email') }}" class="form-control email @error('email') is-invalid @enderror" value="{{ old('email') }}">
<a id="phoneLink" style="text-decoration: underline; margin-left: 250px;" href="#" class="mb-3">Utilice el número de teléfono en su lugar</a>
<a id="phoneLink" style="text-decoration: underline;" href="#" class="mb-3">Utilice el número de teléfono en su lugar</a>
@error('email')
<div class="invalid-feedback">{{ $message }}</div>
@enderror

30
resources/views/frontend/registro-comercio/views/email-verification.blade.php
View File

@@ -78,9 +78,32 @@
Correo verificado correctamente.
</div>
@if($user->user_type == 'customer')
<script>
setTimeout(function() {
window.location.href = "{{ route('dashboard') }}";
}, 3000); // Cambia el valor 3000 a la cantidad de milisegundos que deseas que se redirija automáticamente
</script>
@elseif($user->user_type == 'seller')
<script>
setTimeout(function() {
window.location.href = "{{ route('register.business.business_complete_index') }}";
}, 3000); // Cambia el valor 3000 a la cantidad de milisegundos que deseas que se redirija automáticamente
</script>
@elseif($user->user_type == 'repair')
<script>
setTimeout(function() {
window.location.href = "{{ route('register.workshops.workshop_complete_index') }}";
}, 3000); // Cambia el valor 3000 a la cantidad de milisegundos que deseas que se redirija automáticamente
</script>
@endif
@endif
{{-- @if($user->user_type == 'customer')
<a style="display: inline-block;
padding: 10px 20px;
@@ -106,8 +129,7 @@
text-decoration: none;
border-radius: 4px" href="{{ route('workshop.dashboard') }}">Continuar</a>
@endif
@endif
@endif --}}

48
resources/views/frontend/registro-comercio/views/signup-complete.blade.php
View File

@@ -58,14 +58,54 @@
<p>Bienvenido a La Pieza.DO, en breve nuestro departamento de servicios te enviara un email con todos
los detalles de tu cuenta y la confirmación de tu registro.</p>
@if($user->user_type == 'customer')
{{-- @if($user->user_type == 'customer')
<a id="panel-link" class="btn" href="{{ route('dashboard') }}">Ir al Panel</a>
@elseif($user->user_type == 'seller')
<a id="panel-link" class="btn" href="{{ route('seller.dashboard') }}">Ir al Panel</a>
@elseif($user->user_type == 'repair')
<a id="panel-link" class="btn" href="{{ route('workshop.dashboard') }}">Ir al Panel</a>
@endif
@endif --}}
{{-- @if($user->user_type == 'customer')
<script>
setTimeout(function() {
window.location.href = "{{ route('dashboard') }}";
}, 3000); // Cambia el valor 3000 a la cantidad de milisegundos que deseas que se redirija automáticamente
</script>
@elseif($user->user_type == 'seller')
<script>
setTimeout(function() {
window.location.href = "{{ route('seller.dashboard') }}";
}, 3000); // Cambia el valor 3000 a la cantidad de milisegundos que deseas que se redirija automáticamente
</script>
@elseif($user->user_type == 'repair')
<script>
setTimeout(function() {
window.location.href = "{{ route('workshop.dashboard') }}";
}, 3000); // Cambia el valor 3000 a la cantidad de milisegundos que deseas que se redirija automáticamente
</script>
@endif --}}
@if($user->user_type == 'customer')
<script>
setTimeout(function() {
window.location.href = "{{ route('dashboard') }}";
}, 3000);
</script>
@elseif($user->user_type == 'seller')
<script>
setTimeout(function() {
window.location.href = "{{ route('register.business.business_complete_index') }}";
}, 3000);
</script>
@elseif($user->user_type == 'repair')
<script>
setTimeout(function() {
window.location.href = "{{ route('register.workshop.workshop_complete_index') }}";
}, 3000);
</script>
@endif
</div>
</div>
@@ -88,8 +128,4 @@
</body>
<script>
</script>
</html>

2
resources/views/frontend/registro-comercio/views/workshops/index.blade.php
View File

@@ -222,7 +222,7 @@
<div class="form-group mb-4">
<label for="email" id="emailLabel">Correo Electrónico</label>
<input type="email" name="email" id="email" placeholder="{{ __('Email') }}" class="form-control email @error('email') is-invalid @enderror" value="{{ old('email') }}">
<a id="phoneLink" style="text-decoration: underline; margin-left: 250px;" href="#" class="mb-3">Utilice el número de teléfono en su lugar</a>
<a id="phoneLink" style="text-decoration: underline;" href="#" class="mb-3">Utilice el número de teléfono en su lugar</a>
@error('email')
<div class="invalid-feedback">{{ $message }}</div>
@enderror

141
resources/views/frontend/registro-comercio/views/workshops/workshop_complete.blade.php Normal file
View File

@@ -0,0 +1,141 @@
<html lang="en">
<head>
<!-- Required meta tags -->
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="csrf-token" content="{{ csrf_token() }}">
<title>La Pieza.DO | Registro</title>
<!-- Bootstrap CSS -->
<link rel="stylesheet"
href="{{ static_asset('assets/registrocomercio/registro-form/assets/css/bootstrap.min.css') }}">
<!-- External Css -->
<link rel="stylesheet"
href="{{ static_asset('assets/registrocomercio/registro-form/assets/css/line-awesome.min.css') }}">
<link rel="stylesheet"
href="{{ static_asset('assets/registrocomercio/registro-form/assets/css/owl.carousel.min.css') }}" />
<link rel="stylesheet"
href="https://maxst.icons8.com/vue-static/landings/line-awesome/font-awesome-line-awesome/css/all.min.css">
<link rel="stylesheet"
href="https://maxst.icons8.com/vue-static/landings/line-awesome/line-awesome/1.3.0/css/line-awesome.min.css">
<!-- Custom Css -->
<link rel="stylesheet" type="text/css"
href="{{ static_asset('assets/registrocomercio/registro-form/assets/css/main.css') }}">
<link rel="stylesheet" type="text/css"
href="{{ static_asset('assets/registrocomercio/registro-form/assets/css/theme-1.css') }}">
<!-- Fonts -->
<link href="https://fonts.googleapis.com/css2?family=Roboto:wght@400;700&display=swap" rel="stylesheet">
<!-- Favicon -->
<link rel="icon"
href="{{ static_asset('assets/registrocomercio/registro-form/assets/images/favicon.png') }}">
<link rel="apple-touch-icon"
href="{{ static_asset('assets/registrocomercio/registro-form/assets/images/apple-touch-icon.png') }}">
<link rel="apple-touch-icon" sizes="72x72"
href="{{ static_asset('assets/registrocomercio/registro-form/assets/images/icon-72x72.png') }}">
<link rel="apple-touch-icon" sizes="114x114"
href="{{ static_asset('assets/registrocomercio/registro-form/assets/images/icon-114x114.png') }}">
</head>
<body>
<div class="ugf-wrapper theme-bg">
<div class="ugf-content-block">
<div class="logo">
</div>
<div class="container-md">
<div class="row">
<div class="ol-12 col-lg-7 offset-lg-5 p-sm-0 mx-auto">
<div class="ugf-content pt270">
<h2>Bienvenido</h2>
<p>¡Gracias por registrarte! Para poder completar tu registro,<br> necesitamos que agregues los siguientes campos de taller:</p>
<form class="form-flex email-form was-validated" id="emailGroup" method="POST" action="{{ route('register.workshop.workshop_complete_store') }}">
@csrf
<!-- Agrega el campo hidden para enviar el usuario -->
<input type="hidden" name="user" value="{{ $user }}">
<div class="container">
<div class="form-row col-md-9">
<div class="form-group mb-4">
<label for="name" id="nameLabel">Nombre del taller</label>
<input type="text" name="name" id="name" placeholder="Nombre" class="form-control name @error('name') is-invalid @enderror" value="{{ old('name') }}">
@error('name')
<div class="invalid-feedback">{{ $message }}</div>
@enderror
</div>
<div class="form-group mb-4">
<label for="address" id="addressLabel">Dirección</label>
<input type="text" name="address" id="address" placeholder="Dirección" class="form-control address @error('address') is-invalid @enderror" value="{{ old('address') }}">
@error('address')
<div class="invalid-feedback">{{ $message }}</div>
@enderror
</div>
<div class="form-group mb-12 d-flex">
<button style="-ms-flex: 0 0 230px; flex: 0 0 230px;" id="" class="btn btn-primary btn-lg btn-block"><span>Registrar taller</span> <i class="las la-arrow-right"></i></button>
</div>
</div>
</div>
</form>
<div id="result"></div>
</div>
</div>
</div>
</div>
<div class="alternet-access">
<p><a href="{{ route('logout') }}">Cerrar sesión</a></p>
</div>
</div>
{{-- <div class="ugf-sidebar flex-bottom ugf-sidebar-bg-2 sidebar-steps">
<div class="steps">
<div class="step">
<span>1</span>
<p>Tipo de Cuenta</p>
</div>
<div class="step step-onprocess">
<span>2</span>
<p>Verificación de Inicio</p>
</div>
<div class="step">
<span>3</span>
<p>Confirmación de Datos</p>
</div>
</div>
</div> --}}
</div>
<!-- Optional JavaScript -->
<!-- jQuery first, then Popper.js, then Bootstrap JS -->
{{-- <script src="{{ static_asset('assets/registrocomercio/registro-form/assets/js/jquery.min.js') }}"></script> --}}
<script src="https://code.jquery.com/jquery-3.7.0.min.js"
integrity="sha256-2Pmvv0kuTBOenSvLm6bvfBSSHrUJ+3A7x6P5Ebd07/g=" crossorigin="anonymous"></script>
<script src="{{ static_asset('assets/registrocomercio/registro-form/assets/js/popper.min.js') }}"></script>
<script src="{{ static_asset('assets/registrocomercio/registro-form/assets/js/bootstrap.min.js') }}"></script>
<script src="{{ static_asset('assets/registrocomercio/registro-form/assets/js/owl.carousel.min.js') }}"></script>
<script src="{{ static_asset('assets/registrocomercio/registro-form/assets/js/custom.js') }}"></script>
</body>
</html>
<script>
</script>

30
resources/views/seller/profile/index.blade.php
View File

@@ -82,7 +82,12 @@
<label class="col-md-3 col-form-label">{{ translate('Cash Payment') }}</label>
<div class="col-md-9">
<label class="aiz-switch aiz-switch-success mb-3">
<input value="1" name="cash_on_delivery_status" type="checkbox" @if ($user->shop->cash_on_delivery_status == 1) checked @endif>
{{-- <input value="1" name="cash_on_delivery_status" type="checkbox" @if ($user->shop->cash_on_delivery_status == 1) checked @endif> --}}
@if(isset($user) && isset($user->shop) && $user->shop->cash_on_delivery_status == 1)
<input value="1" name="cash_on_delivery_status" type="checkbox" checked>
@else
<input value="1" name="cash_on_delivery_status" type="checkbox">
@endif
<span class="slider round"></span>
</label>
</div>
@@ -91,7 +96,13 @@
<label class="col-md-3 col-form-label">{{ translate('Bank Payment') }}</label>
<div class="col-md-9">
<label class="aiz-switch aiz-switch-success mb-3">
<input value="1" name="bank_payment_status" type="checkbox" @if ($user->shop->bank_payment_status == 1) checked @endif>
{{-- <input value="1" name="bank_payment_status" type="checkbox" @if ($user->shop->bank_payment_status == 1) checked @endif> --}}
@if(isset($user) && isset($user->shop) && $user->shop->bank_payment_status == 1)
<input value="1" name="bank_payment_status" type="checkbox" checked>
@else
<input value="1" name="bank_payment_status" type="checkbox">
@endif
<span class="slider round"></span>
</label>
</div>
@@ -99,7 +110,11 @@
<div class="row">
<label class="col-md-3 col-form-label" for="bank_name">{{ translate('Bank Name') }}</label>
<div class="col-md-9">
{{-- <input type="text" name="bank_name" value="{{ $user->shop->bank_name }}" id="bank_name" class="form-control mb-3" placeholder="{{ translate('Bank Name')}}"> --}}
@if(isset($user) && isset($user->shop) && isset($user->shop->bank_name))
<input type="text" name="bank_name" value="{{ $user->shop->bank_name }}" id="bank_name" class="form-control mb-3" placeholder="{{ translate('Bank Name')}}">
@endif
@error('phone')
<small class="form-text text-danger">{{ $message }}</small>
@enderror
@@ -108,7 +123,10 @@
<div class="row">
<label class="col-md-3 col-form-label" for="bank_acc_name">{{ translate('Bank Account Name') }}</label>
<div class="col-md-9">
{{-- <input type="text" name="bank_acc_name" value="{{ $user->shop->bank_acc_name }}" id="bank_acc_name" class="form-control mb-3" placeholder="{{ translate('Bank Account Name')}}"> --}}
@if(isset($user) && isset($user->shop) && isset($user->shop->bank_acc_name))
<input type="text" name="bank_acc_name" value="{{ $user->shop->bank_acc_name }}" id="bank_acc_name" class="form-control mb-3" placeholder="{{ translate('Bank Account Name')}}">
@endif
@error('bank_acc_name')
<small class="form-text text-danger">{{ $message }}</small>
@enderror
@@ -117,7 +135,10 @@
<div class="row">
<label class="col-md-3 col-form-label" for="bank_acc_no">{{ translate('Bank Account Number') }}</label>
<div class="col-md-9">
<input type="text" name="bank_acc_no" value="{{ $user->shop->bank_acc_no }}" id="bank_acc_no" class="form-control mb-3" placeholder="{{ translate('Bank Account Number')}}">
{{-- <input type="text" name="bank_acc_no" value="{{ $user->shop->bank_acc_no }}" id="bank_acc_no" class="form-control mb-3" placeholder="{{ translate('Bank Account Number')}}"> --}}
@if(isset($user) && isset($user->shop) && isset($user->shop->bank_acc_no))
<input ... type="text" name="bank_acc_no" value="{{ $user->shop->bank_acc_no }}" id="bank_acc_no" class="form-control mb-3" placeholder="{{ translate('Bank Account Number')}}">
@endif
@error('bank_acc_no')
<small class="form-text text-danger">{{ $message }}</small>
@enderror
@@ -126,7 +147,8 @@
<div class="row">
<label class="col-md-3 col-form-label" for="bank_routing_no">{{ translate('Bank Routing Number') }}</label>
<div class="col-md-9">
<input type="number" name="bank_routing_no" value="{{ $user->shop->bank_routing_no }}" id="bank_routing_no" lang="en" class="form-control mb-3" placeholder="{{ translate('Bank Routing Number')}}">
{{-- <input type="number" name="bank_routing_no" value="{{ $user->shop->bank_routing_no }}" id="bank_routing_no" lang="en" class="form-control mb-3" placeholder="{{ translate('Bank Routing Number')}}"> --}}
<input type="number" name="bank_routing_no" value="{{ optional($user->shop)->bank_routing_no }}" id="bank_routing_no" lang="en" class="form-control mb-3" placeholder="{{ translate('Bank Routing Number')}}">
@error('bank_routing_no')
<small class="form-text text-danger">{{ $message }}</small>
@enderror

13
routes/web.php
View File

@@ -91,6 +91,7 @@ Route::prefix('register')->group(function () {
// Route::get('buyer/{buyer}/edit', [TypeBuyerController::class, 'edit'])->name('register.buyer.edit');
// Route::put('buyer/{buyer}', [TypeBuyerController::class, 'update'])->name('register.buyer.update');
// Route::delete('buyer/{buyer}', [TypeBuyerController::class, 'destroy'])->name('register.buyer.destroy');
});
@@ -108,10 +109,13 @@ Route::prefix('register')->group(function () {
// Route::get('register/business/{id}/edit', [TypeBusinessController::class, 'edit'])->name('register.business.edit');
// Route::put('register/business/{id}', [TypeBusinessController::class, 'update'])->name('register.business.update');
// Route::delete('register/business/{id}', [TypeBusinessController::class, 'destroy'])->name('register.business.destroy');
Route::get('business_complete', [TypeBusinessController::class, 'business_complete_index'])->name('register.business.business_complete_index');
Route::post('business_store', [TypeBusinessController::class, 'business_complete_store'])->name('register.business.business_complete_store');
});
//esto es para registrar a los usuario de tipo TALLER
Route::resource('register/workshop', TypeWorkshopController::class);
// Route::resource('register/workshop', TypeWorkshopController::class);
Route::prefix('register')->group(function () {
@@ -124,6 +128,9 @@ Route::prefix('register')->group(function () {
// Route::get('workshop/{id}/edit', [TypeWorkshopController::class, 'edit'])->name('register.workshop.edit');
// Route::put('workshop/{id}', [TypeWorkshopController::class, 'update'])->name('register.workshop.update');
// Route::delete('workshop/{id}', [TypeWorkshopController::class, 'destroy'])->name('register.workshop.destroy');
Route::get('workshop_complete', [TypeWorkshopController::class, 'workshop_complete_index'])->name('register.workshop.workshop_complete_index');
Route::post('workshop_store', [TypeWorkshopController::class, 'workshop_complete_store'])->name('register.workshop.workshop_complete_store');
});
//Esto es para verifica la cuenta del usuario que recien se registra
@@ -351,8 +358,8 @@ Route::group(['middleware' => ['user', 'verified', 'unbanned']], function () {
Route::get('/dashboard', 'dashboard')->name('dashboard')->middleware(['prevent-back-history']);
Route::get('/profile', 'profile')->name('profile');
//
// Route::post('/new-user-verification', 'new_verify')->name('user.new.verify');
//esto se esta usando en perfil de usuario , no es de verificar cuenta
Route::post('/new-user-verification', 'new_verify')->name('user.new.verify');
Route::post('/new-user-email', 'update_email')->name('user.change.email');
Route::post('/user/update-profile', 'userProfileUpdate')->name('user.profile.update');
});

34
vendor/laravel/framework/src/Illuminate/Auth/Middleware/EnsureEmailIsVerified.php vendored
View File

@@ -19,12 +19,34 @@ class EnsureEmailIsVerified
*/
public function handle($request, Closure $next, $redirectToRoute = null)
{
if (! $request->user() ||
($request->user() instanceof MustVerifyEmail &&
! $request->user()->hasVerifiedEmail())) {
return $request->expectsJson()
? abort(403, 'Your email address is not verified.')
: Redirect::guest(URL::route($redirectToRoute ?: 'verification.notice'));
$user = $request->user();
// if ($user && $user->user_type == 'customer' && !$user->email_verified_at) {
// return redirect()->route('shop.view.email.verification');
// } elseif ($user && $user->user_type == 'seller' && !$user->email_verified_at) {
// return redirect()->route('shop.view.email.verification');
// } elseif ($user && $user->user_type == 'repair' && !$user->email_verified_at) {
// return redirect()->route('shop.view.email.verification');
// }
if ($user && $user->user_type == 'customer' && !$user->email_verified_at) {
return redirect()->route('shop.view.email.verification');
} elseif ($user && $user->user_type == 'seller' && !$user->email_verified_at) {
return redirect()->route('shop.view.email.verification');
} elseif ($user && $user->user_type == 'repair' && !$user->email_verified_at) {
return redirect()->route('shop.view.email.verification');
} elseif ($user && $user->user_type == 'seller' && $user->email_verified_at && !$user->shop_verified_at) {
return redirect()->route('register.business.business_complete_index');
} elseif ($user && $user->user_type == 'repair' && $user->email_verified_at && !$user->shop_verified_at) {
return redirect()->route('register.workshop.workshop_complete_index');
}
return $next($request);