From 7f0538ac3c7b3e027b2143ce227d4b3e504db8ba Mon Sep 17 00:00:00 2001 From: guilherme guia Date: Thu, 24 Aug 2023 14:40:28 -0400 Subject: [PATCH] =?UTF-8?q?Corre=C3=A7=C3=A3o=20de=20bugs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/AgentesController.php | 14 ----- .../ConfigAtendimentoController.php | 16 ------ app/Http/Controllers/DashboardController.php | 6 +- app/Http/Controllers/EmpresaController.php | 5 -- app/Http/Controllers/FilasController.php | 20 ------- app/Http/Controllers/PausasController.php | 47 +--------------- app/Http/Controllers/ProfileController.php | 56 +++++++++++++++++++ app/Http/Controllers/RedirectController.php | 7 +-- .../Controllers/RedirectOptionController.php | 1 - app/Http/Controllers/RelatoriosController.php | 15 ----- .../Controllers/SystemMessageController.php | 23 -------- app/Http/Requests/ProfileUpdateRequest.php | 2 +- app/Models/NumberChanel.php | 2 +- .../views/admin/agentesLogados.blade.php | 5 +- resources/views/admin/pausas.blade.php | 7 +-- resources/views/auth/login.blade.php | 24 ++------ .../update-profile-information-form.blade.php | 6 +- routes/web.php | 1 - 18 files changed, 78 insertions(+), 179 deletions(-) diff --git a/app/Http/Controllers/AgentesController.php b/app/Http/Controllers/AgentesController.php index 2f67819..28edb7e 100644 --- a/app/Http/Controllers/AgentesController.php +++ b/app/Http/Controllers/AgentesController.php @@ -105,7 +105,6 @@ class AgentesController extends Controller } } - public function edit($id) { if (empty($id)) { @@ -113,8 +112,6 @@ class AgentesController extends Controller } $userData = Agentes::find($id); - - $response = [ 'status' => true, 'data' => $userData @@ -123,8 +120,6 @@ class AgentesController extends Controller return response()->json($response); } - - public function destroy($id) { if (empty($id)) { @@ -138,17 +133,14 @@ class AgentesController extends Controller return redirect('users')->with('status', 'desativado com sucesso'); } - public function update(Request $request, $id) { - $request->validate([ "nome" => ['required'], "status" => ['required'], ]); - if (empty($id) || empty($request->nome)) { return redirect('users'); } @@ -160,14 +152,10 @@ class AgentesController extends Controller ->get() ->first(); - if ($agente_matricula->matricula != $request->matricula) { - $isMatriculaRegister = Agentes::where('matricula', $request->matricula)->get()->count(); - if ($isMatriculaRegister > 0) { - return redirect('/users/editar/' . $id)->with('status', ' matricula vinculada com outro agente'); } @@ -186,8 +174,6 @@ class AgentesController extends Controller ]); } - - return redirect('users')->with('status', 'atualizado com sucesso'); } } diff --git a/app/Http/Controllers/ConfigAtendimentoController.php b/app/Http/Controllers/ConfigAtendimentoController.php index a0b77d7..cff3823 100644 --- a/app/Http/Controllers/ConfigAtendimentoController.php +++ b/app/Http/Controllers/ConfigAtendimentoController.php @@ -7,28 +7,17 @@ use Illuminate\Http\Request; class ConfigAtendimentoController extends Controller { - /** - * Display a listing of the resource. - */ public function index() { $user = auth()->user(); - $id_empresa = $user->empresa->first()->id; - $configAtendimento = ConfigAtendimento::where('id_empresa', $id_empresa)->first(); return view('admin.configs', compact('configAtendimento')); } - /** - * Show the form for creating a new resource. - */ public function create(Request $request) { - // - - $request->validate([ "qtde_atendimento" => ['required'], "timeout_cliente" => ['required'], @@ -36,13 +25,10 @@ class ConfigAtendimentoController extends Controller "id_empresa" => ['required'] ]); - if (empty($request->qtde_atendimento) || empty($request->timeout_cliente) || empty($request->timeout_agente) || empty($request->id_empresa)) { return redirect('configs'); } - - ConfigAtendimento::where('id_empresa', '=', $request->id_empresa) ->update([ "quantidade_simutaneo" => $request->qtde_atendimento, @@ -52,6 +38,4 @@ class ConfigAtendimentoController extends Controller return redirect('configs'); } - - } diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php index 801c242..fbff79e 100644 --- a/app/Http/Controllers/DashboardController.php +++ b/app/Http/Controllers/DashboardController.php @@ -34,9 +34,9 @@ class DashboardController extends Controller $atendimentosStatusData = DB::table('usuarios as u') ->join('usuario_empresa as ue', 'ue.id_usuario', '=', 'u.id') ->join('eventos_atendimento as ea', 'ea.id_usuario', '=', 'u.id') - ->select('b.evento', DB::raw('count(b.evento) as qtde_usados')) - ->where('a.id_empresa', $id_empresa) - ->groupBy('b.evento') + ->select('ea.evento', DB::raw('count(ea.evento) as qtde_usados')) + ->where('ue.id_empresa', $id_empresa) + ->groupBy('ea.evento') ->get(); $filasMaisUsadas = DB::table('queues as q') diff --git a/app/Http/Controllers/EmpresaController.php b/app/Http/Controllers/EmpresaController.php index 269f7a5..9a24c4f 100644 --- a/app/Http/Controllers/EmpresaController.php +++ b/app/Http/Controllers/EmpresaController.php @@ -20,7 +20,6 @@ class EmpresaController extends Controller return view('admin.empresas', compact('empresas')); } - public function store(Request $request) { if (Gate::denies('is_permission')) { @@ -63,7 +62,6 @@ class EmpresaController extends Controller return response()->json($response); } - public function update(Request $request, $id) { if (!$id) { @@ -95,11 +93,8 @@ class EmpresaController extends Controller 'email' => $request->email, 'cnpj' => $cnpjSemMascara, ]); - } return redirect()->back()->with('status', 'Atualizado com sucesso'); } - - } diff --git a/app/Http/Controllers/FilasController.php b/app/Http/Controllers/FilasController.php index 8376ba9..dad65a5 100644 --- a/app/Http/Controllers/FilasController.php +++ b/app/Http/Controllers/FilasController.php @@ -13,8 +13,6 @@ class FilasController extends Controller public function index(Request $request) { $selected = (object) ['isSelected' => false, 'isAtivo' => 'ativo']; - - // $filas = filas::where('is_ativa', true)->get(); $filas = filas::class; $user = auth()->user(); @@ -31,7 +29,6 @@ class FilasController extends Controller $filas = $filas::where('is_ativa', true); } - if ($request->pesquisa) { $pesquisa = strtolower($request->pesquisa); @@ -45,13 +42,11 @@ class FilasController extends Controller public function create(Request $request) { - $request->validate([ 'nome' => ['string', 'required'], 'motivo' => ['required'] ]); - $is_ativa = $request->motivo === 'on' ? true : false; if (empty($request->nome)) { @@ -62,8 +57,6 @@ class FilasController extends Controller return redirect('filas')->with('status', 'Fila já cadastrada'); } - - // se tornar reativo $user = auth()->user(); $id_empresa = $user->empresa->first()->id; @@ -74,11 +67,9 @@ class FilasController extends Controller 'is_ativa' => $is_ativa ]); - return redirect('filas')->with('status', 'Fila cadastrada'); } - public function edit($id) { @@ -87,7 +78,6 @@ class FilasController extends Controller } $setor = Filas::find($id); - $response = [ 'data' => $setor, ]; @@ -97,8 +87,6 @@ class FilasController extends Controller public function update(Request $request, $id) { - - if (empty($id)) { return redirect('filas'); } @@ -112,13 +100,11 @@ class FilasController extends Controller 'status' => ['required'] ]); - $isFilaRegister = Filas::select('nome') ->where('id', $id) ->get() ->first(); - $is_ativa = $request->status === 'on' ? true : false; if ($isFilaRegister->nome != strtoupper($request->nome)) { @@ -141,24 +127,18 @@ class FilasController extends Controller return redirect('filas')->with('status', 'Fila Editada'); } - public function destroy($id) { $pesquisa = Filas::where('id', '=', $id); - - $setor = $pesquisa->get(); $rowCount = $setor->count(); - if ($rowCount > 0) { $pesquisa->update([ 'is_ativa' => false ]); } - // filas::where('id', '=', $id)->delete(); - return redirect('filas')->with('status', 'Fila desativada'); } } diff --git a/app/Http/Controllers/PausasController.php b/app/Http/Controllers/PausasController.php index 0d2e655..92983f4 100644 --- a/app/Http/Controllers/PausasController.php +++ b/app/Http/Controllers/PausasController.php @@ -6,56 +6,40 @@ use App\Models\Pausas; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Gate; -use Symfony\Component\VarDumper\Caster\RedisCaster; class PausasController extends Controller { - // - public function index(Request $request) { $selected = (object) ['isSelected' => false, 'isAtivo' => 'ativo']; - $pausas = Pausas::class; - - $is_ativo = $request->situacao === 'on' ? true : false; $user = auth()->user(); $id_empresa = $user->empresa->first()->id; - if ($request->status) { - $status = $request->status == 'ativo' ? true : false; - $selected = (object) ['isSelected' => true, 'isAtivo' => $request->status]; - $pausas = $pausas::where('is_ativo', $status); + } else { $pausas = $pausas::where('is_ativo', true); } - if ($request->pesquisa) { $pesquisa = strtolower($request->pesquisa); $pausas->where(DB::raw('LOWER(motivos_pausas.motivo)'), 'like', "%$pesquisa%"); } - - $pausas = $pausas->where('id_empresa', $id_empresa)->OrderBy('motivo', 'asc')->get(); return view('admin.pausas', compact('pausas', 'selected')); } - - public function create(Request $request) { - - if (Gate::denies('is_permission')) { return redirect('users'); } @@ -64,7 +48,6 @@ class PausasController extends Controller return redirect('pausas'); } - $request->validate([ 'motivo' => ['string', 'required'], 'situacao' => ['required'], @@ -74,7 +57,6 @@ class PausasController extends Controller $id_empresa = $user->empresa->first()->id; - $isPausaExists = DB::table('motivos_pausas')->where([ ['motivo', strtoupper($request->motivo)], ['id_empresa', $id_empresa] @@ -84,17 +66,14 @@ class PausasController extends Controller return redirect('pausas')->with('status', 'Pausa já cadastrada'); } - $is_ativo = $request->situacao === 'on' ? true : false; - Pausas::create([ 'motivo' => strtoupper($request->motivo), 'id_empresa' => $id_empresa, 'is_ativo' => $is_ativo ]); - return redirect('pausas')->with('status', 'Pausa cadastrada'); } @@ -106,28 +85,22 @@ class PausasController extends Controller $pausa = Pausas::find($id); - $response = [ 'data' => $pausa ]; return response()->json($response); - } public function update(Request $request, $id) { - - if (empty($id)) { return redirect('pausas'); } - if (empty($request->motivo) || empty($request->status)) { return redirect('pausas'); } - $request->validate([ 'motivo' => ['string', 'required'], @@ -140,24 +113,16 @@ class PausasController extends Controller ->first(); $is_ativo = $request->status === 'on' ? true : false; - - if ($isPausaRegister->motivo != $request->motivo) { - - $user = auth()->user(); - $id_empresa = $user->empresa->first()->id; - - + $isPausaExists = DB::table('motivos_pausas')->where([ ['motivo', strtoupper($request->motivo)], ['id_empresa', $id_empresa] ])->exists(); - - if ($isPausaExists) { return redirect('pausas')->with('status', 'Pausa já cadastrada'); } @@ -173,23 +138,15 @@ class PausasController extends Controller ]); } - - return redirect('pausas')->with('status', 'Pausa atualizada'); } - - public function destroy($id) { - $pesquisa = Pausas::where('id', '=', $id); - - $setor = $pesquisa->get(); $rowCount = $setor->count(); - if ($rowCount > 0) { $pesquisa->update([ 'is_ativo' => false diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index e69de29..7506d03 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -0,0 +1,56 @@ + $request->user(), + ]); + } + + /** + * Update the user's profile information. + */ + public function update(ProfileUpdateRequest $request): RedirectResponse + { + $request->user()->fill($request->validated()); + + $request->user()->save(); + + return Redirect::route('profile.edit')->with('status', 'profile-updated'); + } + + /** + * Delete the user's account. + */ + public function destroy(Request $request): RedirectResponse + { + $request->validateWithBag('userDeletion', [ + 'password' => ['required', 'current_password'], + ]); + + $user = $request->user(); + + Auth::logout(); + + $user->delete(); + + $request->session()->invalidate(); + $request->session()->regenerateToken(); + + return Redirect::to('/'); + } +} \ No newline at end of file diff --git a/app/Http/Controllers/RedirectController.php b/app/Http/Controllers/RedirectController.php index 275236c..5cc2669 100644 --- a/app/Http/Controllers/RedirectController.php +++ b/app/Http/Controllers/RedirectController.php @@ -2,7 +2,7 @@ namespace App\Http\Controllers; -use App\Models\numberChanel; +use App\Models\NumberChannel; use App\Models\Redirect; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; @@ -21,7 +21,7 @@ class RedirectController extends Controller ->where('nc.id_empresa', $id_empresa) ->get(); - $numberChannels = numberChanel::where('id_empresa', $id_empresa)->get(); + $numberChannels = NumberChannel::where('id_empresa', $id_empresa)->get(); return view('admin.redirects', compact('redirects', 'numberChannels')); } @@ -69,7 +69,7 @@ class RedirectController extends Controller $redirectData = Redirect::find($id); $user = auth()->user(); $id_empresa = $user->empresa->first()->id; - $numberChannels = numberChanel::where('id_empresa', $id_empresa)->get(); + $numberChannels = NumberChannel::where('id_empresa', $id_empresa)->get(); $response = [ 'data' => [ 'status' => true, @@ -95,7 +95,6 @@ class RedirectController extends Controller 'initial' => ['required'], 'channel' => ['required'], ]); - $status = $request->status === "on" ? true : false; $initial = $request->initial === "on" ? true : false; diff --git a/app/Http/Controllers/RedirectOptionController.php b/app/Http/Controllers/RedirectOptionController.php index b3bfb83..08f651c 100644 --- a/app/Http/Controllers/RedirectOptionController.php +++ b/app/Http/Controllers/RedirectOptionController.php @@ -88,7 +88,6 @@ class RedirectOptionController extends Controller private function agent() { - $user = auth()->user(); $id_empresa = $user->empresa->first()->id; diff --git a/app/Http/Controllers/RelatoriosController.php b/app/Http/Controllers/RelatoriosController.php index 31046f0..c9696c4 100644 --- a/app/Http/Controllers/RelatoriosController.php +++ b/app/Http/Controllers/RelatoriosController.php @@ -11,11 +11,8 @@ use PhpParser\Node\Stmt\Nop; class RelatoriosController extends Controller { - // - public function index(Request $request) { - $filas = Filas::where('is_ativa', true); $user = auth()->user(); @@ -31,27 +28,15 @@ class RelatoriosController extends Controller return view('admin.relatorios', compact('filas')); } - - public function agentesLogados($id_fila) { $user = auth()->user(); - $id_empresa = $user->empresa->first()->id; - $fila = Filas::where('id', $id_fila)->where('id_empresa', $id_empresa)->first(); $agentesNaFila = Supervisor::where('fila', $fila->nome)->get(); - - - // SELECT s.nome, COALESCE(COUNT(a.id), 0) AS total_atendimentos - // FROM supervisor as s - // LEFT JOIN atendimento as a ON s.id_usuario = a.id_usuario AND date(a.data_reg) = '2023-04-11' - // where s.fila = 'FALSIFICADA' - // GROUP BY s.id - $agentesNaFila = DB::table('supervisor as s') ->leftJoin('atendimento as a', function ($join) { $data_atual = date('Y-m-d'); diff --git a/app/Http/Controllers/SystemMessageController.php b/app/Http/Controllers/SystemMessageController.php index 822c513..553294e 100644 --- a/app/Http/Controllers/SystemMessageController.php +++ b/app/Http/Controllers/SystemMessageController.php @@ -7,12 +7,8 @@ use Illuminate\Http\Request; class SystemMessageController extends Controller { - /** - * Display a listing of the resource. - */ public function index() { - // , compact('steps', 'numberChannels') $user = auth()->user(); $id_empresa = $user->empresa->first()->id; @@ -24,9 +20,6 @@ class SystemMessageController extends Controller return view('admin.systemMessage', compact('systemMessages')); } - /** - * Show the form for creating a new resource. - */ public function create(Request $request) { @@ -41,14 +34,10 @@ class SystemMessageController extends Controller 'ordem' => ['required'] ]); - - - if (empty($request->texto) || empty($request->momento)) { return redirect('systemMessage')->with('status', 'erro ao cadastrar system message'); } - SystemMessage::create([ 'texto' => $request->texto, 'momento' => $request->momento, @@ -56,7 +45,6 @@ class SystemMessageController extends Controller 'id_empresa' => $id_empresa, ]); - return redirect('systemMessage'); } @@ -76,9 +64,6 @@ class SystemMessageController extends Controller ]; - // dd($response); - - // echo json_encode($response); return response()->json($response); } public function update(Request $request, $id) @@ -88,13 +73,10 @@ class SystemMessageController extends Controller "momento" => ['required'], "ordem" => ['required'], ]); - - if (empty($id) || empty($request->texto) || empty($request->momento)) { return redirect('systemMessage'); } - SystemMessage::where("id", $id) ->update([ @@ -103,20 +85,15 @@ class SystemMessageController extends Controller 'momento' => $request->momento ]); - return redirect('systemMessage')->with('status', 'atualizado com sucesso'); } public function destroy($id) { - $pesquisa = SystemMessage::where('id', '=', $id); - - $systemMessage = $pesquisa->get(); $rowCount = $systemMessage->count(); - if ($rowCount > 0) { $pesquisa->delete(); } diff --git a/app/Http/Requests/ProfileUpdateRequest.php b/app/Http/Requests/ProfileUpdateRequest.php index 327ce6f..2ef7ab3 100644 --- a/app/Http/Requests/ProfileUpdateRequest.php +++ b/app/Http/Requests/ProfileUpdateRequest.php @@ -16,7 +16,7 @@ class ProfileUpdateRequest extends FormRequest public function rules(): array { return [ - 'name' => ['string', 'max:255'], + 'nome' => ['string', 'max:255'], 'email' => ['email', 'max:255', Rule::unique(User::class)->ignore($this->user()->id)], ]; } diff --git a/app/Models/NumberChanel.php b/app/Models/NumberChanel.php index 76214fc..db800eb 100644 --- a/app/Models/NumberChanel.php +++ b/app/Models/NumberChanel.php @@ -5,7 +5,7 @@ namespace App\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; -class numberChanel extends Model +class NumberChannel extends Model { use HasFactory; diff --git a/resources/views/admin/agentesLogados.blade.php b/resources/views/admin/agentesLogados.blade.php index 9dfec3e..ab82d70 100644 --- a/resources/views/admin/agentesLogados.blade.php +++ b/resources/views/admin/agentesLogados.blade.php @@ -11,7 +11,7 @@

Agentes na Fila - {{$fila->nome}}

-
+
diff --git a/resources/views/admin/pausas.blade.php b/resources/views/admin/pausas.blade.php index 9566f0a..8647f2d 100644 --- a/resources/views/admin/pausas.blade.php +++ b/resources/views/admin/pausas.blade.php @@ -29,21 +29,16 @@ @if($selected->isAtivo == 'ativo') - @else - @endif @else @endif - - - - +
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 9032af3..573b909 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -6,46 +6,34 @@
-
- @csrf - -
-
- -
- -
+ {{--
-
- -
- - - - +
--}} - @if (Route::has('password.request')) +
+ + {{-- @if (Route::has('password.request')) Esqueceu sua Senha? - @endif + @endif --}}
\ No newline at end of file diff --git a/resources/views/profile/partials/update-profile-information-form.blade.php b/resources/views/profile/partials/update-profile-information-form.blade.php index 4961583..ff5a412 100644 --- a/resources/views/profile/partials/update-profile-information-form.blade.php +++ b/resources/views/profile/partials/update-profile-information-form.blade.php @@ -18,9 +18,9 @@ @method('patch')
- - - + + +
diff --git a/routes/web.php b/routes/web.php index 33a4147..07b7c8c 100644 --- a/routes/web.php +++ b/routes/web.php @@ -84,7 +84,6 @@ Route::middleware(['auth', 'verified'])->group(function () { Route::middleware('auth')->group(function () { Route::get('/profile', [ProfileController::class, 'edit'])->name('profile.edit'); Route::patch('/profile', [ProfileController::class, 'update'])->name('profile.update'); - Route::delete('/profile', [ProfileController::class, 'destroy'])->name('profile.destroy'); }); require __DIR__ . '/auth.php';