From 86d2c0e9f6acca567f08974d502088e573cb0226 Mon Sep 17 00:00:00 2001 From: Ale Date: Thu, 31 Mar 2022 17:48:08 -0300 Subject: [PATCH 01/10] Se ven los productos en una tabla al clickear en la chismosa --- app/Http/Controllers/ChismosaController.php | 24 ++++++ public/js/app.js | 4 +- public/js/chismosa.js | 82 +++++++++++++++++++++ resources/views/chismosa.blade.php | 13 ++++ routes/web.php | 4 +- 5 files changed, 124 insertions(+), 3 deletions(-) create mode 100644 app/Http/Controllers/ChismosaController.php create mode 100644 public/js/chismosa.js create mode 100644 resources/views/chismosa.blade.php diff --git a/app/Http/Controllers/ChismosaController.php b/app/Http/Controllers/ChismosaController.php new file mode 100644 index 0000000..f576b7d --- /dev/null +++ b/app/Http/Controllers/ChismosaController.php @@ -0,0 +1,24 @@ +middleware(['auth','subpedido']); + } + + + public function show() + { + return view('chismosa'); + } +} diff --git a/public/js/app.js b/public/js/app.js index 0d46c60..17ed606 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -8,7 +8,7 @@ Vue.component('nav-bar', {

- +

$

@@ -35,7 +35,7 @@ Vue.component('nav-bar', { data() { return { isActive: false, - subpedido: null + subpedido: null } }, methods: { diff --git a/public/js/chismosa.js b/public/js/chismosa.js new file mode 100644 index 0000000..95aab20 --- /dev/null +++ b/public/js/chismosa.js @@ -0,0 +1,82 @@ +Vue.component('chismosa', { + template: ` +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ProdCant$EditarX
BTR{{ this.subpedido.bonos_de_transporte }}{{ this.subpedido.subtotal_bonos_de_transporte }}
Total total{{ this.subpedido.total }}
+
+ `, + data() { + return { + subpedido: { + productos:[] + }, + } + }, + computed: { + /* TODO: tener el camino que se había hecho antes de abrir la chismosa para volver atrás */ + miga: function() { + return { + nombre: "Chismosa de " + this.subpedido.nombre, + href: "/chismosa" + } + } + }, + beforeCreate() { + axios.get("/subpedidos/obtener_sesion").then(response => { + this.subpedido = response.data.subpedido; + this.fetchSubpedido(); + Event.$emit("migas-agregar",this.miga); + }); + }, + methods: { + fetchSubpedido() { + axios.get("/api/subpedidos/" + this.subpedido.id) + .then(response => { + this.subpedido = response.data.data; + }); + } + } +}); + +Vue.component('producto-row', { + template: ` + + {{ this.producto.nombre }} + {{ this.producto.pivot.cantidad }} + {{ this.producto.pivot.total }} + ACÁ VA BOTON PA EDITAR + ACÁ VA BOTON PA BORRAR + + `, + props: { + producto: Object + } +}) diff --git a/resources/views/chismosa.blade.php b/resources/views/chismosa.blade.php new file mode 100644 index 0000000..6760876 --- /dev/null +++ b/resources/views/chismosa.blade.php @@ -0,0 +1,13 @@ +@extends('layouts.app') + +@section('stylesheets') + +@endsection + +@section('content') + +@endsection + +@section('scripts') + +@endsection diff --git a/routes/web.php b/routes/web.php index 8a4a4a0..3c3d0e0 100644 --- a/routes/web.php +++ b/routes/web.php @@ -19,13 +19,15 @@ Auth::routes(['register' => false]); Route::get('/productos', 'ProductoController@index')->name('productos.index'); +Route::get('/chismosa', 'ChismosaController@show')->name('chismosa.show'); + Route::middleware('auth')->group( function() { Route::name('subpedidos.')->prefix("subpedidos")->group( function() { Route::get('/', function() { return view('subpedidos_create'); })->name('create'); - + Route::post('guardar_sesion', function() { $r = request(); if (!isset($r["subpedido"])) { From 53b998f1e579826294a78cd1abbaebb28471e9b6 Mon Sep 17 00:00:00 2001 From: nat Date: Thu, 7 Apr 2022 16:56:58 -0300 Subject: [PATCH 02/10] Estilos de botones de editar y borrar en la chismosa --- public/css/app.css | 8 ++++++++ public/js/chismosa.js | 24 ++++++++++++++++-------- resources/views/auth/login.blade.php | 1 + resources/views/layouts/app.blade.php | 2 +- 4 files changed, 26 insertions(+), 9 deletions(-) diff --git a/public/css/app.css b/public/css/app.css index 1a9b028..6c75867 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -6,3 +6,11 @@ p.navbar-item:empty { color: #cc0f35; } + +.help { + font-size: 1rem; +} + +table.table td { + vertical-align: middle; +} \ No newline at end of file diff --git a/public/js/chismosa.js b/public/js/chismosa.js index 95aab20..5242668 100644 --- a/public/js/chismosa.js +++ b/public/js/chismosa.js @@ -1,14 +1,14 @@ Vue.component('chismosa', { template: `
- +
- + - - + + @@ -69,14 +69,22 @@ Vue.component('chismosa', { Vue.component('producto-row', { template: ` - + - - + + `, props: { producto: Object } -}) +}) \ No newline at end of file diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index ff04508..d06446a 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -5,6 +5,7 @@ {{ config('app.name', 'Compras del MPS') }} +
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index f5bff45..45c938a 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -10,7 +10,7 @@ {{ session("subpedido_nombre") ? "Pedido de " . session("subpedido_nombre") . " - " . config('app.name', 'Compras del MPS') : config('app.name', 'Compras del MPS')}} - + From 381402241153c5b18504d5c4df8f06dc3ff315b6 Mon Sep 17 00:00:00 2001 From: nat Date: Mon, 11 Apr 2022 22:17:10 -0300 Subject: [PATCH 03/10] favicon --- public/assets/favicon.png | Bin 0 -> 3125 bytes resources/views/layouts/app.blade.php | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 public/assets/favicon.png diff --git a/public/assets/favicon.png b/public/assets/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..3549bbd9bf99a7db0fa7559df288b09d232745c2 GIT binary patch literal 3125 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 P00000NkvXXu0mjfGDrHz literal 0 HcmV?d00001 diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 45c938a..960f525 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -8,9 +8,10 @@ {{ session("subpedido_nombre") ? "Pedido de " . session("subpedido_nombre") . " - " . config('app.name', 'Compras del MPS') : config('app.name', 'Compras del MPS')}} + - + From fba73636de0777019461a6d2b625b74327dde5af Mon Sep 17 00:00:00 2001 From: nat Date: Mon, 11 Apr 2022 22:53:26 -0300 Subject: [PATCH 04/10] Editar producto en chismossa --- public/js/chismosa.js | 12 +++++++++++- resources/views/chismosa.blade.php | 2 ++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/public/js/chismosa.js b/public/js/chismosa.js index 5242668..7b85c05 100644 --- a/public/js/chismosa.js +++ b/public/js/chismosa.js @@ -63,6 +63,11 @@ Vue.component('chismosa', { this.subpedido = response.data.data; }); } + }, + mounted() { + Event.$on('sync-subpedido', () => { + this.fetchSubpedido(); + }); } }); @@ -72,7 +77,7 @@ Vue.component('producto-row', {
-
ProdCantC $EditarX
{{ this.producto.nombre }}{{ this.producto.nombre }} {{ this.producto.pivot.cantidad }} {{ this.producto.pivot.total }}ACÁ VA BOTON PA EDITARACÁ VA BOTON PA BORRAR
{{ this.producto.nombre }} {{ this.producto.pivot.cantidad }} {{ this.producto.pivot.total }}