diff --git a/app/Http/Controllers/ContatosController.php b/app/Http/Controllers/ContatosController.php index 710cd55..a680ccf 100644 --- a/app/Http/Controllers/ContatosController.php +++ b/app/Http/Controllers/ContatosController.php @@ -39,8 +39,8 @@ class ContatosController extends Controller { $request->validate([ 'nome' => ['required'], - 'email' => ['required', 'email', 'unique:'.Agentes::class], - 'numero' => ['required'], + 'email' => ['required', 'email', Rule::unique('usuarios'), Rule::unique('contatos')], + 'contato' => ['required', Rule::unique('contatos')], 'status' => ['required'], ]); @@ -48,7 +48,7 @@ class ContatosController extends Controller $user = auth()->user(); $id_empresa = Helper::getIdEmpresa(); - $telefoneDesformatado = preg_replace('/[^0-9]/', '', $request->numero); + $telefoneDesformatado = preg_replace('/[^0-9]/', '', $request->contato); Contatos::create([ 'nome' => $request->nome, @@ -86,12 +86,12 @@ class ContatosController extends Controller $request->validate([ 'nome' => ['required'], 'email' => ['required', 'email', Rule::unique('usuarios')->ignore($id), Rule::unique('contatos')->ignore($id)], - 'numero' => ['required'], + 'contato' => ['required'], 'status' => ['required'], ]); $status = $request->status === "on" ? true : false; - $telefoneDesformatado = preg_replace('/[^0-9]/', '', $request->numero); + $telefoneDesformatado = preg_replace('/[^0-9]/', '', $request->contato); Contatos::where("id", $id) ->update([ diff --git a/public/js/views/contatos/atualizaContato.js b/public/js/views/contatos/atualizaContato.js index 1b997c0..a639e87 100644 --- a/public/js/views/contatos/atualizaContato.js +++ b/public/js/views/contatos/atualizaContato.js @@ -14,8 +14,8 @@ function atualizaContato(id_contato) { $(".modal-edit").find("input[name='email']").val(contato_data.email); $(".modal-edit").find("textarea[name='descricao']").val(contato_data.notes); - const numeroFormatado = $(".modal-edit").find("input[name='numero']").masked(contato_data.contato); - $(".modal-edit").find("input[name='numero']").val(numeroFormatado); + const numeroFormatado = $(".modal-edit").find("input[name='contato']").masked(contato_data.contato); + $(".modal-edit").find("input[name='contato']").val(numeroFormatado); if (contato_data.status) { $(".modal-edit").find(".container-radio"). diff --git a/resources/views/admin/contatos.blade.php b/resources/views/admin/contatos.blade.php index 0ab8704..2b47e20 100644 --- a/resources/views/admin/contatos.blade.php +++ b/resources/views/admin/contatos.blade.php @@ -45,7 +45,7 @@ @foreach($contatos as $contato) {{$contato->nome}} - {{$contato->contato}} + {{$contato->contato}} {{$contato->email}} {{ $contato->formated_date }} @if($contato->status) diff --git a/resources/views/components/modal/edit/modalEditContatos.blade.php b/resources/views/components/modal/edit/modalEditContatos.blade.php index 99ef912..6af220e 100644 --- a/resources/views/components/modal/edit/modalEditContatos.blade.php +++ b/resources/views/components/modal/edit/modalEditContatos.blade.php @@ -23,7 +23,7 @@
- +
@@ -32,7 +32,7 @@
- Sim + Sim Não
@@ -44,16 +44,15 @@
- +
- diff --git a/resources/views/components/modal/insert/modalContatos.blade.php b/resources/views/components/modal/insert/modalContatos.blade.php index b6044ba..5d5ac02 100644 --- a/resources/views/components/modal/insert/modalContatos.blade.php +++ b/resources/views/components/modal/insert/modalContatos.blade.php @@ -23,7 +23,7 @@
- +
@@ -52,7 +52,7 @@