From 441007e66bf55adde30c387db3095c156b8e2cd8 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Thu, 19 Jun 2025 21:29:48 -0300
Subject: [PATCH 01/91] Agregado modelo, tabla, y columna en subpedidos para
 tipo pedido

---
 app/Subpedido.php                             |  7 +++-
 app/TipoPedido.php                            | 10 +++++
 ...06_20_001436_create_tipo_pedidos_table.php | 42 +++++++++++++++++++
 3 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 app/TipoPedido.php
 create mode 100644 database/migrations/2025_06_20_001436_create_tipo_pedidos_table.php

diff --git a/app/Subpedido.php b/app/Subpedido.php
index 26e38e4..6faad84 100644
--- a/app/Subpedido.php
+++ b/app/Subpedido.php
@@ -12,7 +12,7 @@ use App\Filtros\FiltroDeSubpedido;
 
 class Subpedido extends Model
 {
-    protected $fillable = ['grupo_de_compra_id', 'aprobado', 'nombre', 'devoluciones_total', 'devoluciones_notas'];
+    protected $fillable = ['grupo_de_compra_id', 'aprobado', 'nombre', 'devoluciones_total', 'devoluciones_notas', 'tipo_pedido_id'];
 
     public function productos(): BelongsToMany
     {
@@ -24,6 +24,11 @@ class Subpedido extends Model
         return $this->belongsTo(GrupoDeCompra::class);
     }
 
+    public function tipoPedido(): BelongsTo
+    {
+        return $this->belongsTo(TipoPedido::class);
+    }
+
     // Permite que se apliquen los filtros al hacer una request (por ejemplo, de búsqueda)
     public function scopeFiltrar($query, FiltroDeSubpedido $filtros): Builder
     {
diff --git a/app/TipoPedido.php b/app/TipoPedido.php
new file mode 100644
index 0000000..310761a
--- /dev/null
+++ b/app/TipoPedido.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class TipoPedido extends Model
+{
+    protected $fillable = ["nombre"];
+}
diff --git a/database/migrations/2025_06_20_001436_create_tipo_pedidos_table.php b/database/migrations/2025_06_20_001436_create_tipo_pedidos_table.php
new file mode 100644
index 0000000..72ad947
--- /dev/null
+++ b/database/migrations/2025_06_20_001436_create_tipo_pedidos_table.php
@@ -0,0 +1,42 @@
+<?php
+
+use App\TipoPedido;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateTipoPedidosTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('tipo_pedidos', function (Blueprint $table) {
+            $table->id();
+            $table->string("nombre");
+            $table->timestamps();
+        });
+
+        $hogar = TipoPedido::firstOrCreate(['nombre' => 'hogar']);
+
+        Schema::table('subpedidos', function (Blueprint $table) use ($hogar) {
+            $table->foreignId('tipo_pedido_id')->default($hogar->id);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('tipo_pedidos');
+        Schema::table('subpedidos', function (Blueprint $table) {
+            $table->dropColumn('tipo_pedido_id');
+        });
+    }
+}

From 2a2ea0687588b32108900c694a44469d8176c867 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Thu, 19 Jun 2025 21:30:00 -0300
Subject: [PATCH 02/91] =?UTF-8?q?Agregada=20informaci=C3=B3n=20de=20tipo?=
 =?UTF-8?q?=20en=20SubpedidoResource.php?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Resources/SubpedidoResource.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/Http/Resources/SubpedidoResource.php b/app/Http/Resources/SubpedidoResource.php
index 89b911e..fa59252 100644
--- a/app/Http/Resources/SubpedidoResource.php
+++ b/app/Http/Resources/SubpedidoResource.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Resources;
 
+use App\TipoPedido;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -19,6 +20,7 @@ class SubpedidoResource extends JsonResource
         foreach ($productos as $producto) {
             $producto['pivot']['total'] = number_format($producto->pivot->cantidad * $producto->precio, 2);
         }
+        $tipo = TipoPedido::find($this->tipo_pedido_id);
         return [
             'id' => $this->id,
             'nombre' => $this->nombre,
@@ -29,7 +31,8 @@ class SubpedidoResource extends JsonResource
             'cantidad_transporte' => number_format($this->cantidadTransporte()),
             'total_sin_devoluciones' => number_format($this->totalSinDevoluciones(),2),
             'devoluciones_total' => number_format($this->devoluciones_total,2),
-            'devoluciones_notas' => $this->devoluciones_notas
+            'devoluciones_notas' => $this->devoluciones_notas,
+            'tipo' => ['id' => $tipo->id, 'nombre' => $tipo->nombre],
         ];
     }
 }

From bcadd1f1ae476159f31e97959205af57530fb414 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Thu, 19 Jun 2025 22:25:50 -0300
Subject: [PATCH 03/91] Agregado estilo faltante

---
 resources/js/components/login/input/user/UserInput.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/resources/js/components/login/input/user/UserInput.vue b/resources/js/components/login/input/user/UserInput.vue
index 9b1fc35..9c7146e 100644
--- a/resources/js/components/login/input/user/UserInput.vue
+++ b/resources/js/components/login/input/user/UserInput.vue
@@ -1,12 +1,17 @@
 <script>
+import { mapGetters } from "vuex";
+
 export default {
     name: "UserInput",
+    computed: {
+        ...mapGetters("login", ["estilos"]),
+    }
 }
 </script>
 
 <template>
     <div class="field">
-        <label class="label">Usuario</label>
+        <label class="label" :class="estilos.texto">Usuario</label>
         <div class="field has-addons">
             <div class="control">
                 <input required class="input" type="text" name="name" placeholder="Usuario">

From 7526ab300c6ca8c05af9e81dbd1e8d862923c6ab Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Thu, 19 Jun 2025 22:32:16 -0300
Subject: [PATCH 04/91] Mejoras de estilo y logica de login de ollas

---
 resources/js/store/modules/login.js | 83 ++++++++++++++++++++---------
 resources/sass/app.scss             |  5 ++
 2 files changed, 64 insertions(+), 24 deletions(-)

diff --git a/resources/js/store/modules/login.js b/resources/js/store/modules/login.js
index f416e5b..87b5d72 100644
--- a/resources/js/store/modules/login.js
+++ b/resources/js/store/modules/login.js
@@ -50,6 +50,14 @@ const getters = {
     textos() {
         let rol = getters.urlRol();
         switch (rol) {
+            case 'pedido':
+                return {
+                    titulo: "Pedidos MPS",
+                    subtitlo: "aplicación de pedidos",
+                    password: "Contraseña",
+                    ayuda: "Si no la sabés, consultá a la comisión informática",
+                    label: "Seleccioná tu región"
+                };
             case 'admin':
                 return {
                     titulo: "Administración de Pedidos MPS",
@@ -66,11 +74,11 @@ const getters = {
                     ayuda: "Si no la sabés, consultá a la comisión informática",
                     label: "Usuario"
                 };
-            case 'pedido':
+            case 'ollas':
                 return {
-                    titulo: "Pedidos MPS",
-                    subtitlo: "aplicación de pedidos",
-                    password: "Contraseña",
+                    titulo: "Ollas MPS",
+                    subtitlo: "aplicación de pedidos de ollas",
+                    password: "Contraseña de ollas del barrio",
                     ayuda: "Si no la sabés, consultá a la comisión informática",
                     label: "Seleccioná tu región"
                 };
@@ -81,23 +89,29 @@ const getters = {
     estilos() {
         let rol = getters.urlRol();
         switch (rol) {
-            case 'admin':
-                return {
-                    fondo: "has-background-danger",
-                    texto: "has-text-white",
-                    botones: "is-warning",
-                };
-            case 'comisiones':
-                return {
-                    fondo: "has-background-warning",
-                    texto: "",
-                    botones: "is-dark"
-                };
             case 'pedido':
                 return {
                     fondo: "",
                     texto: "",
-                    botones: "is-danger"
+                    botones: "danger-dark-button"
+                };
+            case 'admin':
+                return {
+                    fondo: "has-background-danger-dark",
+                    texto: "has-text-white",
+                    botones: "is-dark",
+                };
+            case 'comisiones':
+                return {
+                    fondo: "has-background-grey-light",
+                    texto: "",
+                    botones: "is-dark"
+                };
+            case 'ollas':
+                return {
+                    fondo: "has-background-dark",
+                    texto: "has-text-white",
+                    botones: "danger-dark-button",
                 };
             default:
                 throw new Error("Url inválida");
@@ -106,27 +120,48 @@ const getters = {
     opcionesLogin() {
         let rol = getters.urlRol();
         switch (rol) {
+            case 'pedido':
+                return [
+                    { nombre: "Administración", href: "/admin" },
+                    { nombre: "Ollas", href: "/ollas" },
+                    { nombre: "Comisiones", href: "/comisiones" },
+                ];
             case 'admin':
                 return [
                     { nombre: "Pedidos", href: "/" },
-                    { nombre: "Comisiones", href: "/comisiones" }
+                    { nombre: "Ollas", href: "/ollas" },
+                    { nombre: "Comisiones", href: "/comisiones" },
                 ];
             case 'comisiones':
                 return [
                     { nombre: "Pedidos", href: "/" },
-                    { nombre: "Administración", href: "/admin" }
-                ];
-            case 'pedido':
-                return [
+                    { nombre: "Ollas", href: "/ollas" },
                     { nombre: "Administración", href: "/admin" },
-                    { nombre: "Comisiones", href: "/comisiones" }
+                ];
+            case 'ollas':
+                return [
+                    { nombre: "Pedidos", href: "/" },
+                    { nombre: "Administración", href: "/admin" },
+                    { nombre: "Comisiones", href: "/comisiones" },
                 ];
             default:
                 throw new Error("Url inválida");
         }
     },
     nombre() {
-        return `${state.grupo_de_compra_elegido}${ getters.urlRol() === 'admin' ? '_admin' : ''}`;
+        let rol = getters.urlRol();
+        switch (rol) {
+            case 'pedido':
+                return state.grupo_de_compra_elegido;
+            case 'admin':
+                return `${state.grupo_de_compra_elegido}_admin`;
+            case 'ollas':
+                return `${state.grupo_de_compra_elegido}_ollas`;
+            case 'comisiones':
+                return "";
+            default:
+                throw new Error("Url inválida");
+        }
     }
 };
 
diff --git a/resources/sass/app.scss b/resources/sass/app.scss
index a31bd11..87de580 100644
--- a/resources/sass/app.scss
+++ b/resources/sass/app.scss
@@ -43,6 +43,11 @@ table.table td {
 	max-height: 100% !important;
 }
 
+.danger-dark-button {
+    background-color: $danger-dark;
+    border-color: transparent;
+    color: #fff;
+}
 /*
   Author: Aseem Lalfakawma <alalfakawma.github.io>
   This SCSS mixin will allow sizing of table columns in Bulma CSS Framework.

From c56f67ca85d45faf86956b122c2ec2f194a5b705 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Thu, 19 Jun 2025 22:32:39 -0300
Subject: [PATCH 05/91] Rutas de login de ollas

---
 app/Http/Controllers/OllasController.php | 11 +++++++++++
 app/Http/Middleware/Authenticate.php     |  8 ++++++--
 routes/web.php                           |  6 ++++++
 3 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 app/Http/Controllers/OllasController.php

diff --git a/app/Http/Controllers/OllasController.php b/app/Http/Controllers/OllasController.php
new file mode 100644
index 0000000..7ac5dcb
--- /dev/null
+++ b/app/Http/Controllers/OllasController.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Http\Controllers;
+
+class OllasController extends Controller
+{
+    public function show()
+    {
+        return view('auth/login');
+    }
+}
diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php
index 7eabcdf..5ae0330 100644
--- a/app/Http/Middleware/Authenticate.php
+++ b/app/Http/Middleware/Authenticate.php
@@ -3,16 +3,17 @@
 namespace App\Http\Middleware;
 
 use Illuminate\Auth\Middleware\Authenticate as Middleware;
+use Illuminate\Http\Request;
 
 class Authenticate extends Middleware
 {
     /**
      * Get the path the user should be redirected to when they are not authenticated.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param  Request  $request
      * @return string|null
      */
-    protected function redirectTo($request)
+    protected function redirectTo($request): string
     {
         if (!$request->expectsJson()) {
             $path = $request->path();
@@ -20,7 +21,10 @@ class Authenticate extends Middleware
                     return route('admin.login');
             if (preg_match('~^comisiones.*~i', $path))
                     return route('comisiones.login');
+            if (preg_match('~^ollas.*~i', $path))
+                    return route('ollas.login');
             return route('login');
         }
+        return '';
     }
 }
diff --git a/routes/web.php b/routes/web.php
index f5bc448..5377b34 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -56,3 +56,9 @@ Route::middleware(['auth', 'role:comision'])->group( function() {
     Route::post('/comisiones/canasta', 'ComisionesController@cargarCanasta')->name('comisiones.canasta');
     Route::post('/comisiones/saldos', 'ComisionesController@cargarSaldos')->name('comisiones.saldos');
 });
+
+Route::get('/ollas/login', 'OllasController@show')->name('ollas.login');
+
+Route::middleware(['auth', 'role:olla'])->group( function() {
+    Route::get('/ollas', 'RouteController@main')->name('ollas');
+});

From b68d22380edb6122c298ae9b0adf04e9628a68e6 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Thu, 19 Jun 2025 22:47:52 -0300
Subject: [PATCH 06/91] Logica de tipo simplificada

---
 app/Http/Resources/SubpedidoResource.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/Http/Resources/SubpedidoResource.php b/app/Http/Resources/SubpedidoResource.php
index fa59252..ec3483f 100644
--- a/app/Http/Resources/SubpedidoResource.php
+++ b/app/Http/Resources/SubpedidoResource.php
@@ -20,7 +20,6 @@ class SubpedidoResource extends JsonResource
         foreach ($productos as $producto) {
             $producto['pivot']['total'] = number_format($producto->pivot->cantidad * $producto->precio, 2);
         }
-        $tipo = TipoPedido::find($this->tipo_pedido_id);
         return [
             'id' => $this->id,
             'nombre' => $this->nombre,
@@ -32,7 +31,10 @@ class SubpedidoResource extends JsonResource
             'total_sin_devoluciones' => number_format($this->totalSinDevoluciones(),2),
             'devoluciones_total' => number_format($this->devoluciones_total,2),
             'devoluciones_notas' => $this->devoluciones_notas,
-            'tipo' => ['id' => $tipo->id, 'nombre' => $tipo->nombre],
+            'tipo' => [
+                'id' => $this->tipo_pedido_id,
+                'nombre' => TipoPedido::find($this->tipo_pedido_id)->nombre
+            ],
         ];
     }
 }

From 06d80eed5a2b63bda4293f490adb45746b727d8f Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Thu, 19 Jun 2025 22:48:24 -0300
Subject: [PATCH 07/91] Agregado tipo_id a store subpedido

---
 app/Http/Controllers/Api/SubpedidoController.php | 16 ++++++++++++++--
 resources/js/components/pedidos/PedidoSelect.vue |  3 ++-
 resources/js/store/modules/pedido.js             |  7 ++-----
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/Api/SubpedidoController.php b/app/Http/Controllers/Api/SubpedidoController.php
index 7e6b266..43ac4ba 100644
--- a/app/Http/Controllers/Api/SubpedidoController.php
+++ b/app/Http/Controllers/Api/SubpedidoController.php
@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api;
 
 use App\Http\Controllers\Controller;
 use App\Producto;
+use App\TipoPedido;
 use Illuminate\Http\Request;
 use App\Filtros\FiltroDeSubpedido;
 use App\Subpedido;
@@ -28,12 +29,19 @@ class SubpedidoController extends Controller
     public function store(Request  $request)
     {
         $validado = $this->validateSubpedido();
-        if (Subpedido::where("nombre",$validado["nombre"])->where("grupo_de_compra_id",$validado["grupo_de_compra_id"])->get()->count()) {
+
+        if (Subpedido::where("nombre", $validado["nombre"])
+                    ->where("grupo_de_compra_id", $validado["grupo_de_compra_id"])
+                    ->get()
+                    ->count()
+        ) {
             throw new HttpException(400, "Ya existe un subpedido con este nombre");
         }
+
         $s = new Subpedido();
         $s->nombre = $validado["nombre"];
         $s->grupo_de_compra_id = $validado["grupo_de_compra_id"];
+        $s->tipo_pedido_id = $validado["tipo_id"];
         $s->save();
         return $this->show($s);
     }
@@ -45,7 +53,11 @@ class SubpedidoController extends Controller
             'grupo_de_compra_id'    => [
                 'required',
                 Rule::in(GrupoDeCompra::all()->pluck('id')),
-            ]
+            ],
+            'tipo_id'                  => [
+                'required',
+                Rule::in(TipoPedido::all()->pluck('id')),
+            ],
         ]);
     }
 
diff --git a/resources/js/components/pedidos/PedidoSelect.vue b/resources/js/components/pedidos/PedidoSelect.vue
index cb2bc60..2fa35fe 100644
--- a/resources/js/components/pedidos/PedidoSelect.vue
+++ b/resources/js/components/pedidos/PedidoSelect.vue
@@ -105,7 +105,8 @@ export default {
             else
                 await this.crearPedido({
                     nombre: this.searchString,
-                    grupo_de_compra_id: this.grupo_de_compra.id
+                    grupo_de_compra_id: this.grupo_de_compra.id,
+                    tipo_id: 1,
                 });
         },
     }
diff --git a/resources/js/store/modules/pedido.js b/resources/js/store/modules/pedido.js
index 651d752..1f6542b 100644
--- a/resources/js/store/modules/pedido.js
+++ b/resources/js/store/modules/pedido.js
@@ -55,11 +55,8 @@ const actions = {
     async guardarSesion(_, { pedido_id }) {
         await axios.post("/pedido/sesion", { id: pedido_id });
     },
-    async crearPedido({ commit, dispatch }, { nombre, grupo_de_compra_id }) {
-        const response = await axios.post("/api/subpedidos", {
-            nombre: nombre,
-            grupo_de_compra_id: grupo_de_compra_id
-        });
+    async crearPedido({ commit, dispatch }, req) {
+        const response = await axios.post("/api/subpedidos", req);
         dispatch("guardarSesion", { pedido_id: response.data.data.id});
         commit('setPedido', response.data.data);
     },

From 6501e76507572c988fefb6c5547a8214485c90be Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Thu, 19 Jun 2025 22:49:49 -0300
Subject: [PATCH 08/91] Formato

---
 app/Http/Controllers/Api/SubpedidoController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Api/SubpedidoController.php b/app/Http/Controllers/Api/SubpedidoController.php
index 43ac4ba..a6b7dbf 100644
--- a/app/Http/Controllers/Api/SubpedidoController.php
+++ b/app/Http/Controllers/Api/SubpedidoController.php
@@ -54,7 +54,7 @@ class SubpedidoController extends Controller
                 'required',
                 Rule::in(GrupoDeCompra::all()->pluck('id')),
             ],
-            'tipo_id'                  => [
+            'tipo_id'               => [
                 'required',
                 Rule::in(TipoPedido::all()->pluck('id')),
             ],

From 07a71098f47da772d111523dd5717b32e266ba0c Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Thu, 19 Jun 2025 22:51:47 -0300
Subject: [PATCH 09/91] Definido pedidos main con containers de categorias,
 productos, chismosa, etc

---
 resources/js/components/pedidos/Body.vue      | 29 ++-----------
 .../js/components/pedidos/PedidosMain.vue     | 41 +++++++++++++++++++
 2 files changed, 45 insertions(+), 25 deletions(-)
 create mode 100644 resources/js/components/pedidos/PedidosMain.vue

diff --git a/resources/js/components/pedidos/Body.vue b/resources/js/components/pedidos/Body.vue
index 7e85e18..3a38318 100644
--- a/resources/js/components/pedidos/Body.vue
+++ b/resources/js/components/pedidos/Body.vue
@@ -1,41 +1,20 @@
 <template>
     <div id="pedidos-body" class="pb-6 mb-6">
         <pedido-select v-if="!pedidoDefinido"/>
-        <div v-else>
-            <nav-migas/>
-            <div class="columns">
-                <div class="column" :class="{ 'is-two-thirds-desktop is-hidden-touch': show_chismosa }">
-                    <cartel-pedido-aprobado/>
-                    <canasta/>
-                </div>
-                <div class="column is-full-touch" v-if="show_chismosa">
-                    <chismosa/>
-                </div>
-            </div>
-        </div>
+        <pedidos-main v-else/>
     </div>
 </template>
 
 <script>
-import { mapActions, mapGetters, mapState } from "vuex";
-import CartelPedidoAprobado from "./CartelPedidoAprobado.vue";
+import { mapGetters } from "vuex";
 import PedidoSelect from "./PedidoSelect.vue";
-import Canasta from "./Canasta.vue";
-import NavMigas from "./NavMigas.vue";
-import Chismosa from "./Chismosa.vue";
+import PedidosMain from "./PedidosMain.vue";
 
 export default {
     name: "PedidosBody",
-    components: { Chismosa, NavMigas, CartelPedidoAprobado, PedidoSelect, Canasta },
+    components: { PedidosMain, PedidoSelect },
     computed: {
         ...mapGetters('pedido', ["pedidoDefinido"]),
-        ...mapState('ui', ["show_chismosa"]),
     },
-    methods: {
-        ...mapActions('productos', ["init"]),
-    },
-    async mounted() {
-        await this.init();
-    }
 }
 </script>
diff --git a/resources/js/components/pedidos/PedidosMain.vue b/resources/js/components/pedidos/PedidosMain.vue
new file mode 100644
index 0000000..3f31a55
--- /dev/null
+++ b/resources/js/components/pedidos/PedidosMain.vue
@@ -0,0 +1,41 @@
+<script>
+import { defineComponent } from "vue";
+import Canasta from "./Canasta.vue";
+import Chismosa from "./Chismosa.vue";
+import CartelPedidoAprobado from "./CartelPedidoAprobado.vue";
+import NavMigas from "./NavMigas.vue";
+import { mapActions, mapState } from "vuex";
+
+export default defineComponent({
+    name: "PedidosMain",
+    components: { NavMigas, CartelPedidoAprobado, Chismosa, Canasta },
+    computed: {
+        ...mapState('ui', ["show_chismosa"]),
+    },
+    methods: {
+        ...mapActions('productos', ["init"]),
+    },
+    async mounted() {
+        await this.init();
+    }
+})
+</script>
+
+<template>
+    <div>
+        <nav-migas/>
+        <div class="columns">
+            <div class="column" :class="{ 'is-two-thirds-desktop is-hidden-touch': show_chismosa }">
+                <cartel-pedido-aprobado/>
+                <canasta/>
+            </div>
+            <div class="column is-full-touch" v-if="show_chismosa">
+                <chismosa/>
+            </div>
+        </div>
+    </div>
+</template>
+
+<style scoped>
+
+</style>

From eddf2776d0a68f3e9aec6d16293eb0482239f2f1 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Thu, 19 Jun 2025 23:11:35 -0300
Subject: [PATCH 10/91] parametro para tipo de sesion en guardar_sesion

---
 resources/js/store/modules/pedido.js | 33 +++++++++++++++-------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/resources/js/store/modules/pedido.js b/resources/js/store/modules/pedido.js
index 1f6542b..0040063 100644
--- a/resources/js/store/modules/pedido.js
+++ b/resources/js/store/modules/pedido.js
@@ -52,26 +52,31 @@ const actions = {
         const response = await axios.get('/user/grupo_de_compra');
         commit('setGrupoDeCompra', response.data.grupo_de_compra);
     },
-    async guardarSesion(_, { pedido_id }) {
-        await axios.post("/pedido/sesion", { id: pedido_id });
+    async guardarSesion(_, { pedido_id, tipo_sesion }) {
+        const body = { id: pedido_id };
+        await axios.post(`/${tipo_sesion}/sesion`, body);
     },
-    async crearPedido({ commit, dispatch }, req) {
-        const response = await axios.post("/api/subpedidos", req);
-        dispatch("guardarSesion", { pedido_id: response.data.data.id});
+    async crearPedido({ commit, dispatch }, { nombre, grupo_de_compra_id, tipo_id }) {
+        const body = { nombre, grupo_de_compra_id, tipo_id };
+        const response = await axios.post("/api/subpedidos", body);
+
+        let tipo_sesion = 'pedido';
+        if (tipo_id !== 1)
+            tipo_sesion = 'ollas';
+
+        dispatch("guardarSesion", { pedido_id: response.data.data.id, tipo_sesion: tipo_sesion });
         commit('setPedido', response.data.data);
     },
     async elegirPedido({ commit, dispatch }, { pedido_id }) {
         const response = await axios.get(`/api/subpedidos/${pedido_id}`);
-        dispatch("guardarSesion", { pedido_id: pedido_id})
+        const body = { pedido_id: pedido_id, tipo_sesion: 'pedido' };
+        dispatch("guardarSesion", body)
         commit('setPedido', response.data.data);
     },
     async modificarChismosa({ commit, dispatch }, { producto_id, cantidad, notas }) {
+        const body = { cantidad: cantidad, producto_id: producto_id, notas: notas };
         try {
-            const response = await axios.post("/api/subpedidos/" + state.pedido_id + "/sync", {
-                cantidad: cantidad,
-                producto_id: producto_id,
-                notas: notas,
-            });
+            const response = await axios.post("/api/subpedidos/" + state.pedido_id + "/sync", body);
             commit('setPedido', response.data.data);
             dispatch("ui/toast", { mensaje: 'Pedido modificado con éxito' }, { root: true });
         } catch (error) {
@@ -79,11 +84,9 @@ const actions = {
         }
     },
     async modificarDevoluciones({ commit, dispatch }, { monto, notas }) {
+        const body = { total: monto, notas: notas };
         try {
-            const response = await axios.post("api/subpedidos/" + state.pedido_id + "/sync_devoluciones", {
-                total: monto,
-                notas: notas,
-            });
+            const response = await axios.post("api/subpedidos/" + state.pedido_id + "/sync_devoluciones", body);
             commit('setPedido', response.data.data);
             dispatch("ui/toast", { mensaje: 'Devoluciones modificadas con éxito' }, { root: true });
         } catch (error) {

From db714a209cd37d3f9c2d254a18220f5c5e496353 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Thu, 19 Jun 2025 23:16:57 -0300
Subject: [PATCH 11/91] quitado parametro tipo_id

---
 resources/js/store/modules/pedido.js | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/resources/js/store/modules/pedido.js b/resources/js/store/modules/pedido.js
index 0040063..200c5bf 100644
--- a/resources/js/store/modules/pedido.js
+++ b/resources/js/store/modules/pedido.js
@@ -52,24 +52,19 @@ const actions = {
         const response = await axios.get('/user/grupo_de_compra');
         commit('setGrupoDeCompra', response.data.grupo_de_compra);
     },
-    async guardarSesion(_, { pedido_id, tipo_sesion }) {
+    async guardarSesion(_, { pedido_id }) {
         const body = { id: pedido_id };
-        await axios.post(`/${tipo_sesion}/sesion`, body);
+        await axios.post("/pedido/sesion", body);
     },
     async crearPedido({ commit, dispatch }, { nombre, grupo_de_compra_id, tipo_id }) {
         const body = { nombre, grupo_de_compra_id, tipo_id };
         const response = await axios.post("/api/subpedidos", body);
-
-        let tipo_sesion = 'pedido';
-        if (tipo_id !== 1)
-            tipo_sesion = 'ollas';
-
-        dispatch("guardarSesion", { pedido_id: response.data.data.id, tipo_sesion: tipo_sesion });
+        dispatch("guardarSesion", { pedido_id: response.data.data.id});
         commit('setPedido', response.data.data);
     },
     async elegirPedido({ commit, dispatch }, { pedido_id }) {
         const response = await axios.get(`/api/subpedidos/${pedido_id}`);
-        const body = { pedido_id: pedido_id, tipo_sesion: 'pedido' };
+        const body = { pedido_id: pedido_id};
         dispatch("guardarSesion", body)
         commit('setPedido', response.data.data);
     },

From d890d405bd6c414ecc744f82227449410d4b6091 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Thu, 19 Jun 2025 23:28:15 -0300
Subject: [PATCH 12/91] =?UTF-8?q?Cambiada=20validaci=C3=B3n=20para=20chequ?=
 =?UTF-8?q?ear=20nombre=20solamente=20en=20pedidos=20del=20mismo=20tipo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Api/SubpedidoController.php   | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/app/Http/Controllers/Api/SubpedidoController.php b/app/Http/Controllers/Api/SubpedidoController.php
index a6b7dbf..8c24612 100644
--- a/app/Http/Controllers/Api/SubpedidoController.php
+++ b/app/Http/Controllers/Api/SubpedidoController.php
@@ -26,24 +26,25 @@ class SubpedidoController extends Controller
         return SubpedidoResource::collection(Subpedido::filtrar($filtros)->get());
     }
 
-    public function store(Request  $request)
+    public function store(Request $request)
     {
         $validado = $this->validateSubpedido();
 
-        if (Subpedido::where("nombre", $validado["nombre"])
-                    ->where("grupo_de_compra_id", $validado["grupo_de_compra_id"])
+        if (Subpedido::where([
+                        "nombre" => $validado["nombre"],
+                        "tipo_pedido_id" => $validado["tipo_pedido_id"],
+                        "grupo_de_compra_id" => $validado["grupo_de_compra_id"]])
                     ->get()
-                    ->count()
-        ) {
-            throw new HttpException(400, "Ya existe un subpedido con este nombre");
-        }
+                    ->count())
+            throw new HttpException(400, "Ya existe un pedido con este nombre");
 
-        $s = new Subpedido();
-        $s->nombre = $validado["nombre"];
-        $s->grupo_de_compra_id = $validado["grupo_de_compra_id"];
-        $s->tipo_pedido_id = $validado["tipo_id"];
-        $s->save();
-        return $this->show($s);
+        $pedido = new Subpedido();
+        $pedido->nombre = $validado["nombre"];
+        $pedido->grupo_de_compra_id = $validado["grupo_de_compra_id"];
+        $pedido->tipo_pedido_id = $validado["tipo_id"];
+        $pedido->save();
+
+        return $this->show($pedido);
     }
 
     protected function validateSubpedido(): array

From 6627118dceaa5ba3b4f509bb3e750387a401cb88 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Thu, 19 Jun 2025 23:29:38 -0300
Subject: [PATCH 13/91] Formato

---
 app/Filtros/FiltroDeSubpedido.php                | 4 +++-
 app/Http/Controllers/Api/SubpedidoController.php | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Filtros/FiltroDeSubpedido.php b/app/Filtros/FiltroDeSubpedido.php
index c889860..eef2388 100644
--- a/app/Filtros/FiltroDeSubpedido.php
+++ b/app/Filtros/FiltroDeSubpedido.php
@@ -8,7 +8,9 @@ class FiltroDeSubpedido extends Filtro
 {
     public function grupoDeCompra(String $valor)
     {
-        if (!is_numeric($valor)) { throw new TypeError();}
+        if (!is_numeric($valor))
+            throw new TypeError();
+
         $this->builder->where('grupo_de_compra_id', intval($valor));
     }
 }
diff --git a/app/Http/Controllers/Api/SubpedidoController.php b/app/Http/Controllers/Api/SubpedidoController.php
index 8c24612..beea4f0 100644
--- a/app/Http/Controllers/Api/SubpedidoController.php
+++ b/app/Http/Controllers/Api/SubpedidoController.php
@@ -13,7 +13,6 @@ use App\Http\Resources\SubpedidoResource;
 use Illuminate\Validation\Rule;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 
-
 class SubpedidoController extends Controller
 {
     public function index(FiltroDeSubpedido $filtros, Request $request)

From 639f6cff776f2467ded194604b9d1e5d2df3b6d0 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Thu, 19 Jun 2025 23:37:44 -0300
Subject: [PATCH 14/91] Formato

---
 app/Filtros/Filtro.php | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/app/Filtros/Filtro.php b/app/Filtros/Filtro.php
index 737f27b..b78e038 100644
--- a/app/Filtros/Filtro.php
+++ b/app/Filtros/Filtro.php
@@ -46,17 +46,24 @@ class Filtro extends Model
             //Obtener nombre del método  (snake_case a camelCase)
             $metodo = str_replace('_', '', lcfirst(ucwords($filtro, '_')));
 
-            if(!method_exists($this, $metodo)) { continue; }
+            if (!method_exists($this, $metodo))
+                continue;
 
             //Llamar métodos sin argumentos
-            if ($valor === null|| (is_a($valor,'String') && trim($valor)=='')){ $this->$metodo(); continue; }
+            if ($valor === null || (is_a($valor,'String') && trim($valor)=='')) {
+                $this->$metodo();
+                continue;
+            }
 
             //Llamar métodos con argumentos
             try {
                 $this->$metodo($valor);
-            } catch (Throwable $th) {
-                if (is_a($th,'TypeError') ) { throw new HttpException(400, sprintf($this->MENSAJES_ERROR['ARGUMENTO'],$filtro)); }
-                throw $th;
+            } catch (Throwable $error) {
+                if (is_a($error,'TypeError')) {
+                    $mensaje = sprintf($this->MENSAJES_ERROR['ARGUMENTO'], $filtro);
+                    throw new HttpException(400, $mensaje);
+                }
+                throw $error;
             }
 
         }
@@ -66,12 +73,16 @@ class Filtro extends Model
     //Buscar un término en el nombre
     public function nombre(String $valor)
     {
-        $this->builder->where('nombre', "LIKE", "%" . $valor . "%")->orderByRaw("IF(nombre = '$valor',2,IF(nombre LIKE '$valor%',1,0)) DESC");
+        $this->builder
+             ->where('nombre', "LIKE", "%" . $valor . "%")
+             ->orderByRaw("IF(nombre = '$valor',2,IF(nombre LIKE '$valor%',1,0)) DESC");
     }
 
     public function alfabetico(String $order = 'asc')
     {
-        if(!in_array($order,['asc','desc'])) { throw new TypeError(); }
+        if (!in_array($order,['asc','desc']))
+            throw new TypeError();
+
         $this->builder->orderBy('nombre', $order);
     }
 }

From 53414643a686943379a24519565254e91cf6cc88 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Thu, 19 Jun 2025 23:52:29 -0300
Subject: [PATCH 15/91] =?UTF-8?q?Ruta,=20controlador=20y=20m=C3=A9todo=20p?=
 =?UTF-8?q?ara=20pedido=20de=20ollas?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/OllasController.php | 21 ++++++++++++++++++++
 routes/api.php                               |  4 ++++
 2 files changed, 25 insertions(+)
 create mode 100644 app/Http/Controllers/Api/OllasController.php

diff --git a/app/Http/Controllers/Api/OllasController.php b/app/Http/Controllers/Api/OllasController.php
new file mode 100644
index 0000000..2f852fb
--- /dev/null
+++ b/app/Http/Controllers/Api/OllasController.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\GrupoDeCompra;
+use App\Http\Controllers\Controller;
+use App\Http\Resources\SubpedidoResource;
+use App\TipoPedido;
+
+class OllasController extends Controller
+{
+    public function pedido(GrupoDeCompra $gdc)
+    {
+        $tipoOlla = TipoPedido::firstOrCreate(['nombre' => 'olla']);
+        $pedido = $gdc->subpedidos()->firstOrCreate([
+            'nombre' => 'Pedido de Olla de ' . $gdc->nombre,
+            'tipo_pedido_id' => $tipoOlla->id,
+        ]);
+        return response()->json(new SubpedidoResource($pedido));
+    }
+}
diff --git a/routes/api.php b/routes/api.php
index 0f12e05..0eaef54 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -48,4 +48,8 @@ Route::middleware('api')->group(function() {
 	Route::prefix('productos')->group(function () {
         Route::get('/','Api\ProductoController@index');
 	});
+
+    Route::prefix('ollas')->group(function() {
+        Route::get('/{gdc}','Api\OllasController@pedido');
+    });
 });

From 0397810260dc87dc964c358d922d39e384ab63c5 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 20 Jun 2025 00:27:23 -0300
Subject: [PATCH 16/91] Movida logica de burger a modulo ui

---
 resources/js/store/modules/ui.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/resources/js/store/modules/ui.js b/resources/js/store/modules/ui.js
index 7dec3f2..a20e3cb 100644
--- a/resources/js/store/modules/ui.js
+++ b/resources/js/store/modules/ui.js
@@ -2,6 +2,7 @@ const state = {
     show_chismosa: false,
     show_devoluciones: false,
     show_tags: true,
+    burger_activa: false,
     tags_interactuada: false,
     migas: [{ nombre: 'Pedidos', action: 'pedido/resetear' }],
     canasta_actual: null,
@@ -18,10 +19,12 @@ const mutations = {
         state.show_devoluciones = !state.show_devoluciones;
     },
     toggleTags(state, manual) {
-        if (manual)
-            state.tags_interactuada = true;
+        state.tags_interactuada = manual;
         state.show_tags = !state.show_tags;
     },
+    toggleBurger(state) {
+      state.burger_activa = !state.burger_activa;
+    },
     addMiga(state, miga) {
         state.migas.push(miga);
     },

From cdbe38e41b7e94ccfac6fc2b973696833da10ece Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 20 Jun 2025 00:27:35 -0300
Subject: [PATCH 17/91] Ruta y control para nombre de user

---
 app/Http/Controllers/UserController.php | 5 +++++
 routes/web.php                          | 1 +
 2 files changed, 6 insertions(+)

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 62243c5..62d8101 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -11,6 +11,11 @@ use Illuminate\Support\Facades\Auth;
 
 class UserController extends Controller
 {
+    public function user(Request $request)
+    {
+        return ['user' => $request->user()->name];
+    }
+
     public function rol(Request $request) {
         return ["rol" => UserRole::find($request->user()->role_id)->nombre];
     }
diff --git a/routes/web.php b/routes/web.php
index 5377b34..ea6af16 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -24,6 +24,7 @@ Auth::routes(['register' => false]);
 Route::get('/', 'RouteController@home')->name('home');
 
 Route::middleware(['auth'])->group(function () {
+    Route::get('/user', 'UserController@user')->name('user');
     Route::get('/user/rol', 'UserController@rol')->name('user.rol');
     Route::get('/user/grupo_de_compra', 'UserController@grupoDeCompra');
 });

From 5a9d7cb54b6e2ad657d0769985e5c36cf95e78bd Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 20 Jun 2025 01:05:15 -0300
Subject: [PATCH 18/91] Getter de barrio

---
 resources/js/store/modules/admin.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/js/store/modules/admin.js b/resources/js/store/modules/admin.js
index 26dbd52..ad140df 100644
--- a/resources/js/store/modules/admin.js
+++ b/resources/js/store/modules/admin.js
@@ -61,6 +61,9 @@ const getters = {
     grupoDeCompraDefinido() {
       return state.lastFetch !== null;
     },
+    barrio() {
+        return state.nombre?.replace('_admin','') ?? '';
+    },
     hayPedidos() {
         return state.pedidos?.length > 0;
     },

From bb27698e80459bb28d80f4dc69a55b2aea9212a4 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 20 Jun 2025 01:05:29 -0300
Subject: [PATCH 19/91] Contenidos de NavBar

---
 resources/js/components/admin/AdminNavBar.vue | 28 +++++++++++++++
 .../comisiones/ComisionesNavBar.vue           | 34 ++++++++++++++++++
 resources/js/components/ollas/OllasNavBar.vue | 36 +++++++++++++++++++
 .../js/components/pedidos/PedidosNavBar.vue   | 34 ++++++++++++++++++
 4 files changed, 132 insertions(+)
 create mode 100644 resources/js/components/admin/AdminNavBar.vue
 create mode 100644 resources/js/components/comisiones/ComisionesNavBar.vue
 create mode 100644 resources/js/components/ollas/OllasNavBar.vue
 create mode 100644 resources/js/components/pedidos/PedidosNavBar.vue

diff --git a/resources/js/components/admin/AdminNavBar.vue b/resources/js/components/admin/AdminNavBar.vue
new file mode 100644
index 0000000..10754fa
--- /dev/null
+++ b/resources/js/components/admin/AdminNavBar.vue
@@ -0,0 +1,28 @@
+<script>
+import { mapGetters, mapMutations, mapState } from "vuex";
+import Burger from "../comunes/Burger.vue";
+
+export default {
+    name: "AdminNavBar",
+    components: { Burger },
+    computed: {
+        ...mapState('ui', ["burger_activa"]),
+        ...mapGetters('admin', ["barrio"])
+    },
+    methods: {
+        ...mapMutations('ui', ["toggleBurger"]),
+    },
+}
+</script>
+
+<template>
+    <div class="navbar-item hide-below-1024">
+        <p>
+            {{`Barrio: ${barrio}`}}
+        </p>
+        <burger/>
+    </div>
+</template>
+
+<style scoped>
+</style>
diff --git a/resources/js/components/comisiones/ComisionesNavBar.vue b/resources/js/components/comisiones/ComisionesNavBar.vue
new file mode 100644
index 0000000..0659967
--- /dev/null
+++ b/resources/js/components/comisiones/ComisionesNavBar.vue
@@ -0,0 +1,34 @@
+<script>
+import { mapMutations, mapState } from "vuex";
+import Burger from "../comunes/Burger.vue";
+
+export default {
+    name: "ComisionesNavBar",
+    components: { Burger },
+    computed: {
+        ...mapState('ui', ["burger_activa"])
+    },
+    methods: {
+        ...mapMutations('ui', ["toggleBurger"]),
+    },
+    data() {
+        return {
+            nombre: '',
+        }
+    },
+    async mounted() {
+        const response = await axios.get('/user');
+        this.nombre = response.data.user;
+    }
+}
+</script>
+
+<template>
+    <div class="navbar-item hide-below-1024">
+        <p>{{ nombre }}</p>
+        <burger/>
+    </div>
+</template>
+
+<style scoped>
+</style>
diff --git a/resources/js/components/ollas/OllasNavBar.vue b/resources/js/components/ollas/OllasNavBar.vue
new file mode 100644
index 0000000..5ccb8c9
--- /dev/null
+++ b/resources/js/components/ollas/OllasNavBar.vue
@@ -0,0 +1,36 @@
+<script>
+import { mapGetters, mapMutations, mapState } from "vuex";
+import Burger from "../comunes/Burger.vue";
+import ChismosaDropdown from "../pedidos/ChismosaDropdown.vue";
+
+export default {
+    name: "OllasNavBar",
+    components: { Burger, ChismosaDropdown },
+    computed: {
+        ...mapGetters('pedido', ["pedidoDefinido"]),
+        ...mapState('pedido', ["nombre", "grupo_de_compra"]),
+        ...mapState('ui', ["burger_activa"])
+    },
+    methods: {
+        ...mapMutations('ui', ["toggleBurger"]),
+    }
+}
+</script>
+
+<template>
+    <div>
+        <div class="navbar-item hide-below-1024">
+            <p v-if="pedidoDefinido">{{ nombre }}</p>
+            <p v-else>{{ grupo_de_compra.nombre }}</p>
+        </div>
+        <chismosa-dropdown
+            v-if="pedidoDefinido"
+            class="hide-above-1023"
+            ariaControls="mobile"/>
+        <burger/>
+    </div>
+</template>
+
+<style scoped>
+
+</style>
diff --git a/resources/js/components/pedidos/PedidosNavBar.vue b/resources/js/components/pedidos/PedidosNavBar.vue
new file mode 100644
index 0000000..1424d52
--- /dev/null
+++ b/resources/js/components/pedidos/PedidosNavBar.vue
@@ -0,0 +1,34 @@
+<script>
+import { mapGetters, mapMutations, mapState } from "vuex";
+import ChismosaDropdown from "./ChismosaDropdown.vue";
+import Burger from "../comunes/Burger.vue";
+
+export default {
+    name: "PedidosNavBar",
+    components: { Burger, ChismosaDropdown },
+    computed: {
+        ...mapGetters('pedido', ["pedidoDefinido"]),
+        ...mapState('pedido', ["nombre", "grupo_de_compra"]),
+        ...mapState('ui', ["burger_activa"])
+    },
+    methods: {
+        ...mapMutations('ui', ["toggleBurger"]),
+    }
+}
+</script>
+
+<template>
+    <div class="navbar-item hide-below-1024">
+        <p v-if="pedidoDefinido">
+            {{ `Barrio: ${grupo_de_compra.nombre} - Núcleo: ${nombre}` }}
+        </p>
+        <chismosa-dropdown
+            v-if="pedidoDefinido"
+            class="hide-above-1023"
+            ariaControls="mobile"/>
+        <burger/>
+    </div>
+</template>
+
+<style scoped>
+</style>

From 2356fe597a70951fb3a459af2873634c0a63a37a Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 20 Jun 2025 01:05:44 -0300
Subject: [PATCH 20/91] Componentes para items de NavBar

---
 resources/js/components/comunes/Burger.vue   | 30 ++++++++++++++
 resources/js/components/pedidos/Buscador.vue | 42 ++++++++++++++++++++
 2 files changed, 72 insertions(+)
 create mode 100644 resources/js/components/comunes/Burger.vue
 create mode 100644 resources/js/components/pedidos/Buscador.vue

diff --git a/resources/js/components/comunes/Burger.vue b/resources/js/components/comunes/Burger.vue
new file mode 100644
index 0000000..bea3367
--- /dev/null
+++ b/resources/js/components/comunes/Burger.vue
@@ -0,0 +1,30 @@
+<script>
+import { mapMutations, mapState } from "vuex";
+
+export default {
+    name: "Burger",
+    computed: {
+        ...mapState('ui', ["burger_activa"])
+    },
+    methods: {
+        ...mapMutations('ui', ["toggleBurger"]),
+    }
+}
+</script>
+
+<template>
+    <a role="button"
+       class="navbar-burger"
+       :class="{'is-active': burger_activa}"
+       aria-label="menu"
+       aria-expanded="false"
+       data-target="nav-bar"
+       @click="toggleBurger">
+        <span aria-hidden="true"></span>
+        <span aria-hidden="true"></span>
+        <span aria-hidden="true"></span>
+    </a>
+</template>
+
+<style scoped>
+</style>
diff --git a/resources/js/components/pedidos/Buscador.vue b/resources/js/components/pedidos/Buscador.vue
new file mode 100644
index 0000000..739674f
--- /dev/null
+++ b/resources/js/components/pedidos/Buscador.vue
@@ -0,0 +1,42 @@
+<script>
+import { mapActions, mapMutations } from "vuex";
+
+export default {
+    name: "Buscador",
+    methods: {
+        ...mapActions('productos', ["filtrarProductos"]),
+        ...mapMutations('ui', ["addMiga", "popUltimaBusqueda", "toggleBurger"]),
+        buscar() {
+            if (this.burger_activa)
+                this.toggleBurger();
+            this.filtrarProductos({ filtro: "nombre", valor: this.searchString });
+            this.popUltimaBusqueda();
+            this.addMiga({ nombre: this.searchString });
+        }
+    },
+    data() {
+        return {
+            searchString: "",
+        }
+    },
+}
+</script>
+
+<template>
+    <div class="navbar-item field has-addons mt-1 mr-3 mb-1">
+        <a class="button is-small has-text-dark-grey" @click.capture="buscar">
+                        <span class="icon">
+                          <i class="fas fa-search"></i>
+                        </span>
+        </a>
+        <input class="input is-small"
+               type="text"
+               placeholder="Harina"
+               v-model="searchString"
+               @keyup.enter="buscar">
+    </div>
+</template>
+
+<style scoped>
+
+</style>

From 4bbab3a8f983ddc3515810bca72745bbee6d4504 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 20 Jun 2025 01:06:45 -0300
Subject: [PATCH 21/91] Usando componentes extraidos + estilos generalizados

---
 resources/js/components/comunes/NavBar.vue | 110 ++++++---------------
 resources/sass/app.scss                    |  24 +++++
 2 files changed, 53 insertions(+), 81 deletions(-)

diff --git a/resources/js/components/comunes/NavBar.vue b/resources/js/components/comunes/NavBar.vue
index e6a95d3..242f335 100644
--- a/resources/js/components/comunes/NavBar.vue
+++ b/resources/js/components/comunes/NavBar.vue
@@ -1,43 +1,26 @@
 <template>
-    <nav id="nav-bar" class="navbar is-danger is-fixed-top" role="navigation" aria-label="main navigation">
+    <nav id="nav-bar"
+         class="navbar is-danger is-fixed-top"
+         role="navigation"
+         aria-label="main navigation">
         <div class="navbar-brand">
             <a class="navbar-item" href="https://mps.org.uy">
-                <img src="/assets/logoMPS.png" height="28">
-            </a>
-            <div class="navbar-item hide-below-1024" v-if="pedidoDefinido">
-                <p>{{ `Barrio: ${grupo_de_compra.nombre} - Núcleo: ${nombre}` }}</p>
-            </div>
-            <chismosa-dropdown
-                v-if="pedidoDefinido"
-                class="hide-above-1023"
-                ariaControls="mobile"
-            />
-            <a role="button" class="navbar-burger" :class="{'is-active':burgerActiva}" aria-label="menu"
-               aria-expanded="false" data-target="nav-bar" @click="toggleBurger">
-                <span aria-hidden="true"></span>
-                <span aria-hidden="true"></span>
-                <span aria-hidden="true"></span>
+                <img src="/assets/logoMPS.png" height="28" alt="Logo del MPS">
             </a>
+            <pedidos-nav-bar v-if="rol === 'barrio'"/>
+            <ollas-nav-bar v-else-if="rol === 'ollas'"/>
+            <admin-nav-bar v-else-if="rol === 'admin_barrio'"/>
+            <comisiones-nav-bar v-else/>
         </div>
-        <div class="navbar-menu" :class="{'is-active':burgerActiva}">
+        <div class="navbar-menu"
+             :class="{'is-active': burger_activa}">
             <div class="navbar-end">
-                <div v-if="pedidoDefinido" class="navbar-item field has-addons mt-1 mr-3 mb-1">
-                    <a class="button is-small has-text-dark-grey" @click.capture="buscar">
-                <span class="icon">
-                  <i class="fas fa-search"></i>
-                </span>
-                    </a>
-                    <input class="input is-small" type="text" placeholder="Harina" v-model="searchString"
-                           @keyup.enter="buscar">
-                </div>
-                <chismosa-dropdown
-                    v-if="pedidoDefinido"
-                    class="hide-below-1024"
-                    ariaControls="wide">
-                </chismosa-dropdown>
+                <buscador v-if="pedidoDefinido"/>
+                <chismosa-dropdown v-if="pedidoDefinido"
+                                   class="hide-below-1024"
+                                   ariaControls="wide"/>
                 <div class="block navbar-item">
-                    <a onclick="event.preventDefault(); document.getElementById('logout-form').submit();"
-                       class="text-a">
+                    <a @click="logOut" class="text-a">
                         Cerrar sesión
                     </a>
                 </div>
@@ -48,63 +31,28 @@
 
 <script>
 import ChismosaDropdown from '../pedidos/ChismosaDropdown.vue';
-import { mapActions, mapGetters, mapMutations, mapState } from "vuex";
+import { mapGetters, mapState } from "vuex";
+import PedidosNavBar from "../pedidos/PedidosNavBar.vue";
+import ComisionesNavBar from "../comisiones/ComisionesNavBar.vue";
+import AdminNavBar from "../admin/AdminNavBar.vue";
+import OllasNavBar from "../ollas/OllasNavBar.vue";
+import Buscador from "../pedidos/Buscador.vue";
 
 export default {
-    components: { ChismosaDropdown },
-    data() {
-        return {
-            burgerActiva: false,
-            searchString: "",
-            nombreCanasta: "",
-            fechaCanasta: "",
-        }
-    },
+    components: { Buscador, OllasNavBar, AdminNavBar, ComisionesNavBar, PedidosNavBar, ChismosaDropdown },
     computed: {
         ...mapGetters('pedido', ["pedidoDefinido"]),
-        ...mapState('pedido', ["nombre"]),
-        ...mapState('pedido', ["grupo_de_compra"]),
+        ...mapState('login', ["rol"]),
+        ...mapState('ui', ["burger_activa"])
     },
     methods: {
-        ...mapActions('productos', ["filtrarProductos"]),
-        ...mapMutations('ui', ["addMiga", "popUltimaBusqueda"]),
-        toggleBurger() {
-            this.burgerActiva = !this.burgerActiva
+        logOut() {
+            event.preventDefault();
+            document.getElementById('logout-form').submit();
         },
-        buscar() {
-            if (this.burgerActiva)
-                this.toggleBurger();
-            this.filtrarProductos({ filtro: "nombre", valor: this.searchString });
-            this.popUltimaBusqueda();
-            this.addMiga({ nombre: this.searchString });
-        }
-    },
+    }
 };
 </script>
 
 <style>
-
-p.navbar-item:empty {
-    display: none;
-}
-
-#nav-bar {
-    z-index: 10;
-}
-
-.text-a {
-    color: inherit;
-}
-
-@media (max-width: 1023px) {
-    .hide-below-1024 {
-        display: none !important;
-    }
-}
-
-@media (min-width: 1024px) {
-    .hide-above-1023 {
-        display: none !important;
-    }
-}
 </style>
diff --git a/resources/sass/app.scss b/resources/sass/app.scss
index 87de580..a7ae300 100644
--- a/resources/sass/app.scss
+++ b/resources/sass/app.scss
@@ -48,6 +48,30 @@ table.table td {
     border-color: transparent;
     color: #fff;
 }
+
+p.navbar-item:empty {
+    display: none;
+}
+
+#nav-bar {
+    z-index: 10;
+}
+
+.text-a {
+    color: inherit;
+}
+
+@media (max-width: 1023px) {
+    .hide-below-1024 {
+        display: none !important;
+    }
+}
+
+@media (min-width: 1024px) {
+    .hide-above-1023 {
+        display: none !important;
+    }
+}
 /*
   Author: Aseem Lalfakawma <alalfakawma.github.io>
   This SCSS mixin will allow sizing of table columns in Bulma CSS Framework.

From 8b86cddb3379c0affd9a1612f80a123c7d056af1 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 20 Jun 2025 01:20:29 -0300
Subject: [PATCH 22/91] Agregado rol de ollas y usuarios para cada barrio

---
 .../2025_06_20_040800_user_role_ollas.php     | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 database/migrations/2025_06_20_040800_user_role_ollas.php

diff --git a/database/migrations/2025_06_20_040800_user_role_ollas.php b/database/migrations/2025_06_20_040800_user_role_ollas.php
new file mode 100644
index 0000000..eaeb1d7
--- /dev/null
+++ b/database/migrations/2025_06_20_040800_user_role_ollas.php
@@ -0,0 +1,40 @@
+<?php
+
+use App\GrupoDeCompra;
+use App\User;
+use App\UserRole;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\Hash;
+
+class UserRoleOllas extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        $ollasRol = UserRole::firstOrCreate(['nombre' => 'ollas']);
+        $barrios = GrupoDeCompra::all();
+        foreach ($barrios as $barrio) {
+            $barrio->users()->firstOrCreate([
+                'name' => $barrio->nombre . '_ollas',
+                'password' => Hash::make('123'),
+                'role_id' => $ollasRol->id
+            ]);
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        $ollasRol = UserRole::where('nombre', 'ollas')->firstOrFail();
+        User::where('role_id', $ollasRol->id)->delete();
+        $ollasRol->delete();
+    }
+}

From b61fdb1fff58f65780eec5645f34933d40096d0b Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 20 Jun 2025 01:20:46 -0300
Subject: [PATCH 23/91] Agregado has many users

---
 app/GrupoDeCompra.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/GrupoDeCompra.php b/app/GrupoDeCompra.php
index 782d16c..273237d 100644
--- a/app/GrupoDeCompra.php
+++ b/app/GrupoDeCompra.php
@@ -23,6 +23,11 @@ class GrupoDeCompra extends Model
         return $this->hasMany(Subpedido::class);
     }
 
+    public function users(): HasMany
+    {
+        return $this->hasMany(User::class);
+    }
+
     public function toggleDevoluciones(): bool
     {
         $this->devoluciones_habilitadas = !$this->devoluciones_habilitadas;

From 5e69a04d35dba53348376de2938f99a6d66913ec Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 20 Jun 2025 01:32:23 -0300
Subject: [PATCH 24/91] Simplificada

---
 resources/js/components/ollas/OllasNavBar.vue | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/resources/js/components/ollas/OllasNavBar.vue b/resources/js/components/ollas/OllasNavBar.vue
index 5ccb8c9..fe9c5ab 100644
--- a/resources/js/components/ollas/OllasNavBar.vue
+++ b/resources/js/components/ollas/OllasNavBar.vue
@@ -8,12 +8,12 @@ export default {
     components: { Burger, ChismosaDropdown },
     computed: {
         ...mapGetters('pedido', ["pedidoDefinido"]),
-        ...mapState('pedido', ["nombre", "grupo_de_compra"]),
+        ...mapState('pedido', ["nombre"]),
         ...mapState('ui', ["burger_activa"])
     },
     methods: {
         ...mapMutations('ui', ["toggleBurger"]),
-    }
+    },
 }
 </script>
 
@@ -21,7 +21,6 @@ export default {
     <div>
         <div class="navbar-item hide-below-1024">
             <p v-if="pedidoDefinido">{{ nombre }}</p>
-            <p v-else>{{ grupo_de_compra.nombre }}</p>
         </div>
         <chismosa-dropdown
             v-if="pedidoDefinido"
@@ -32,5 +31,4 @@ export default {
 </template>
 
 <style scoped>
-
 </style>

From 54d1e6ab36cd3c198c1ad96436a9eb584c44588b Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 20 Jun 2025 01:32:38 -0300
Subject: [PATCH 25/91] Agregados casos de ollas

---
 app/Http/Controllers/RouteController.php | 3 +++
 app/Http/Controllers/UserController.php  | 1 +
 2 files changed, 4 insertions(+)

diff --git a/app/Http/Controllers/RouteController.php b/app/Http/Controllers/RouteController.php
index e5b4a57..17893b5 100644
--- a/app/Http/Controllers/RouteController.php
+++ b/app/Http/Controllers/RouteController.php
@@ -15,6 +15,7 @@ class RouteController extends Controller
         $barrio = UserRole::where('nombre', 'barrio')->first();
         $admin = UserRole::where('nombre', 'admin_barrio')->first();
         $comision = UserRole::where('nombre', 'comision')->first();
+        $ollas = UserRole::where('nombre', 'ollas')->first();
 
         switch ($request->user()->role_id) {
             case $barrio->id:
@@ -23,6 +24,8 @@ class RouteController extends Controller
                 return redirect('/admin');
             case $comision->id:
                 return redirect('/comisiones');
+            case $ollas->id:
+                return redirect('/ollas');
             default:
                 abort(400, 'Rol de usuario invalido');
         }
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 62d8101..0b271ac 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -26,6 +26,7 @@ class UserController extends Controller
         $result = [ 'grupo_de_compra' => null, ];
         $grupo_de_compra = GrupoDeCompra::find($user->grupo_de_compra_id);
         switch (UserRole::findOrFail($user->role_id)->nombre) {
+            case 'ollas':
             case 'barrio':
                 $result['grupo_de_compra'] = new GrupoDeCompraPedidoResource($grupo_de_compra);
                 break;

From 9062faf24e50fc4b1cb897876625c50e43e9ce2d Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 20 Jun 2025 01:32:46 -0300
Subject: [PATCH 26/91] Arreglado rol

---
 routes/web.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routes/web.php b/routes/web.php
index ea6af16..e77342a 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -60,6 +60,6 @@ Route::middleware(['auth', 'role:comision'])->group( function() {
 
 Route::get('/ollas/login', 'OllasController@show')->name('ollas.login');
 
-Route::middleware(['auth', 'role:olla'])->group( function() {
+Route::middleware(['auth', 'role:ollas'])->group( function() {
     Route::get('/ollas', 'RouteController@main')->name('ollas');
 });

From 0009d4b123e31f7d2ff50a4be88e6a4f0bb538dd Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 20 Jun 2025 01:37:26 -0300
Subject: [PATCH 27/91] Agregado OllasBody que carga pedido de ollas

---
 resources/js/components/AppMain.vue         |  4 +++-
 resources/js/components/ollas/OllasBody.vue | 26 +++++++++++++++++++++
 resources/js/store/modules/pedido.js        |  5 ++++
 3 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 resources/js/components/ollas/OllasBody.vue

diff --git a/resources/js/components/AppMain.vue b/resources/js/components/AppMain.vue
index 09780fc..bddee51 100644
--- a/resources/js/components/AppMain.vue
+++ b/resources/js/components/AppMain.vue
@@ -5,9 +5,10 @@ import ComisionesBody from "./comisiones/Body.vue";
 import AdminBody from "./admin/Body.vue";
 import PedidosBody from "./pedidos/Body.vue";
 import InfoTags from "./comunes/InfoTags.vue";
+import OllasBody from "./ollas/OllasBody.vue";
 export default {
     name: 'Main',
-    components: { InfoTags, ComisionesBody, AdminBody, PedidosBody, NavBar },
+    components: { OllasBody, InfoTags, ComisionesBody, AdminBody, PedidosBody, NavBar },
     computed: {
         ...mapState("login", ["rol"]),
     },
@@ -26,6 +27,7 @@ export default {
         <pedidos-body v-if="rol === 'barrio'"/>
         <admin-body v-else-if="rol === 'admin_barrio'"/>
         <comisiones-body v-else-if="rol === 'comision'"/>
+        <ollas-body v-else-if="rol === 'ollas'"/>
         <info-tags/>
     </div>
 </template>
diff --git a/resources/js/components/ollas/OllasBody.vue b/resources/js/components/ollas/OllasBody.vue
new file mode 100644
index 0000000..a8fd747
--- /dev/null
+++ b/resources/js/components/ollas/OllasBody.vue
@@ -0,0 +1,26 @@
+<script>
+import PedidosMain from "../pedidos/PedidosMain.vue";
+import { mapActions } from "vuex";
+
+export default {
+    name: "OllasBody",
+    components: { PedidosMain },
+    methods: {
+        ...mapActions('pedido', ["getPedidoDeOllas", "getGrupoDeCompra"]),
+    },
+    async mounted() {
+        await this.getGrupoDeCompra();
+        await this.getPedidoDeOllas();
+    },
+}
+</script>
+
+<template>
+    <div id="ollas-body" class="pb-6 mb-6">
+        <pedidos-main></pedidos-main>
+    </div>
+</template>
+
+<style scoped>
+
+</style>
diff --git a/resources/js/store/modules/pedido.js b/resources/js/store/modules/pedido.js
index 200c5bf..9150a16 100644
--- a/resources/js/store/modules/pedido.js
+++ b/resources/js/store/modules/pedido.js
@@ -94,6 +94,11 @@ const actions = {
         dispatch("ui/resetear", null, { root: true });
         commit('reset');
     },
+    async getPedidoDeOllas({ commit }) {
+        const response = await axios.get(`/api/ollas/${state.grupo_de_compra.id}`);
+        console.log(response);
+        commit('setPedido', response.data);
+    },
 };
 
 const getters = {

From 0ce7b00e90623282a0385fd17889b56c8712d585 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 20 Jun 2025 01:37:36 -0300
Subject: [PATCH 28/91] Formato

---
 resources/js/components/ollas/OllasNavBar.vue | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/resources/js/components/ollas/OllasNavBar.vue b/resources/js/components/ollas/OllasNavBar.vue
index fe9c5ab..b836d74 100644
--- a/resources/js/components/ollas/OllasNavBar.vue
+++ b/resources/js/components/ollas/OllasNavBar.vue
@@ -18,10 +18,8 @@ export default {
 </script>
 
 <template>
-    <div>
-        <div class="navbar-item hide-below-1024">
-            <p v-if="pedidoDefinido">{{ nombre }}</p>
-        </div>
+    <div class="navbar-item hide-below-1024">
+        <p v-if="pedidoDefinido">{{ nombre }}</p>
         <chismosa-dropdown
             v-if="pedidoDefinido"
             class="hide-above-1023"

From 09fce4e96a0b155fc2eed36f66ec5911c29f207e Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 20 Jun 2025 01:48:42 -0300
Subject: [PATCH 29/91] Agregado filtro de tipo pedido

---
 app/Filtros/FiltroDeSubpedido.php                | 8 ++++++++
 resources/js/components/pedidos/PedidoSelect.vue | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/Filtros/FiltroDeSubpedido.php b/app/Filtros/FiltroDeSubpedido.php
index eef2388..fafdbdc 100644
--- a/app/Filtros/FiltroDeSubpedido.php
+++ b/app/Filtros/FiltroDeSubpedido.php
@@ -13,4 +13,12 @@ class FiltroDeSubpedido extends Filtro
 
         $this->builder->where('grupo_de_compra_id', intval($valor));
     }
+
+    public function tipoPedido(String $valor)
+    {
+        if (!is_numeric($valor))
+            throw new TypeError();
+
+        $this->builder->where('tipo_pedido_id', intval($valor));
+    }
 }
diff --git a/resources/js/components/pedidos/PedidoSelect.vue b/resources/js/components/pedidos/PedidoSelect.vue
index 2fa35fe..4d84e3b 100644
--- a/resources/js/components/pedidos/PedidoSelect.vue
+++ b/resources/js/components/pedidos/PedidoSelect.vue
@@ -88,7 +88,8 @@ export default {
             const response = await axios.get('/api/subpedidos/',{
                 params: {
                     nombre: nombre,
-                    grupo_de_compra: this.grupo_de_compra.id
+                    grupo_de_compra: this.grupo_de_compra.id,
+                    tipo_pedido: 1,
                 }
             });
             this.pedidos = response.data;

From 8649ff5bbd0915e20e2c4d863a279508f8faba88 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 20 Jun 2025 01:50:17 -0300
Subject: [PATCH 30/91] Cambio nombre

---
 app/Http/Controllers/Api/OllasController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Api/OllasController.php b/app/Http/Controllers/Api/OllasController.php
index 2f852fb..542c5ba 100644
--- a/app/Http/Controllers/Api/OllasController.php
+++ b/app/Http/Controllers/Api/OllasController.php
@@ -13,7 +13,7 @@ class OllasController extends Controller
     {
         $tipoOlla = TipoPedido::firstOrCreate(['nombre' => 'olla']);
         $pedido = $gdc->subpedidos()->firstOrCreate([
-            'nombre' => 'Pedido de Olla de ' . $gdc->nombre,
+            'nombre' => 'Pedido de Ollas de ' . $gdc->nombre,
             'tipo_pedido_id' => $tipoOlla->id,
         ]);
         return response()->json(new SubpedidoResource($pedido));

From db056e7d34071ba5c3a65db9dabff1b4f29a389a Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 20 Jun 2025 02:00:48 -0300
Subject: [PATCH 31/91] Migas para ollas

---
 resources/js/components/ollas/OllasBody.vue |  4 +++-
 resources/js/store/modules/ui.js            | 10 ++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/resources/js/components/ollas/OllasBody.vue b/resources/js/components/ollas/OllasBody.vue
index a8fd747..33a572c 100644
--- a/resources/js/components/ollas/OllasBody.vue
+++ b/resources/js/components/ollas/OllasBody.vue
@@ -1,16 +1,18 @@
 <script>
 import PedidosMain from "../pedidos/PedidosMain.vue";
-import { mapActions } from "vuex";
+import { mapActions, mapMutations } from "vuex";
 
 export default {
     name: "OllasBody",
     components: { PedidosMain },
     methods: {
         ...mapActions('pedido', ["getPedidoDeOllas", "getGrupoDeCompra"]),
+        ...mapMutations('ui', ["migasOllas"])
     },
     async mounted() {
         await this.getGrupoDeCompra();
         await this.getPedidoDeOllas();
+        this.migasOllas();
     },
 }
 </script>
diff --git a/resources/js/store/modules/ui.js b/resources/js/store/modules/ui.js
index a20e3cb..8c83afb 100644
--- a/resources/js/store/modules/ui.js
+++ b/resources/js/store/modules/ui.js
@@ -35,7 +35,10 @@ const mutations = {
     reset(state) {
         state.show_chismosa = false;
         state.show_devoluciones = false;
-    }
+    },
+    migasOllas(state) {
+        state.migas.reverse().pop();
+    },
 };
 
 const actions = {
@@ -53,7 +56,7 @@ const actions = {
         }
 
         dispatch(miga.action, miga.arguments ?? null, { root: true });
-        state.migas = dropWhile(state.migas.reverse(),(m => m.nombre !== miga.nombre)).reverse();
+        state.migas = dropWhile(state.migas.reverse(), (m => m.nombre !== miga.nombre)).reverse();
     },
     toast(_, { mensaje }) {
         return window.bulmaToast.toast({
@@ -72,6 +75,9 @@ const actions = {
     resetear({ commit }) {
         commit("reset");
     },
+    migasOllas({ commit }) {
+        commit("migasOllas");
+    },
 };
 
 export default {

From 208cb31b5311cfdcaea9b582f51cd9ee696914c0 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 20 Jun 2025 17:03:00 -0300
Subject: [PATCH 32/91] Manejo de erroes

---
 app/Http/Controllers/AdminController.php      | 8 +++++++-
 app/Http/Controllers/ComisionesController.php | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php
index a280c84..48a2faf 100644
--- a/app/Http/Controllers/AdminController.php
+++ b/app/Http/Controllers/AdminController.php
@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use App\GrupoDeCompra;
 use League\Csv\Exception;
+use Mpdf\MpdfException;
 
 class AdminController extends Controller
 {
@@ -17,7 +18,12 @@ class AdminController extends Controller
     }
 
     public function exportarPedidosAPdf(GrupoDeCompra $gdc) {
-        $gdc->exportarPedidosAPdf();
+        try {
+            $gdc->exportarPedidosAPdf();
+            return response();
+        } catch (MpdfException $e) {
+            return response()->json(['message' => $e->getMessage()], 500);
+        }
     }
 
     public function exportarPedidoACSV(GrupoDeCompra $gdc)
diff --git a/app/Http/Controllers/ComisionesController.php b/app/Http/Controllers/ComisionesController.php
index 6c5d555..769d6b7 100644
--- a/app/Http/Controllers/ComisionesController.php
+++ b/app/Http/Controllers/ComisionesController.php
@@ -10,6 +10,7 @@ use App\Producto;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use League\Csv\Exception;
+use Mpdf\MpdfException;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
 
 class ComisionesController
@@ -54,7 +55,12 @@ class ComisionesController
     }
 
     public function pdf() {
-        GrupoDeCompra::exportarPedidosBarrialesAPdf();
+        try {
+            GrupoDeCompra::exportarPedidosBarrialesAPdf();
+            return response();
+        } catch (MpdfException $e) {
+            return response()->json(['message' => $e->getMessage()], 500);
+        }
     }
 
     public function cargarCanasta(Request $request): JsonResponse

From 8fb810c73f427349df30dc43c8f9ea89fe36a83b Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 20 Jun 2025 17:03:35 -0300
Subject: [PATCH 33/91] =?UTF-8?q?Omitiendo=20pedido=20de=20ollas=20de=20m?=
 =?UTF-8?q?=C3=A9todos=20que=20trabajan=20con=20pedidos?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/GrupoDeCompra.php | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/app/GrupoDeCompra.php b/app/GrupoDeCompra.php
index 273237d..3395925 100644
--- a/app/GrupoDeCompra.php
+++ b/app/GrupoDeCompra.php
@@ -12,6 +12,7 @@ use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 use League\Csv\Exception;
+use Mpdf\MpdfException;
 
 class GrupoDeCompra extends Model
 {
@@ -37,7 +38,14 @@ class GrupoDeCompra extends Model
 
     public function pedidosAprobados()
     {
-        return $this->subpedidos->where('aprobado', 1);
+        return $this->pedidosHogares()
+                    ->where('aprobado', 1);
+    }
+
+    public function pedidosHogares()
+    {
+        return $this->subpedidos
+            ->where('tipo_pedido_id', '=', 1);
     }
 
     public function totalARecaudar()
@@ -120,11 +128,15 @@ class GrupoDeCompra extends Model
         return TransporteHelper::cantidadTransporte($this->totalCentralesQuePaganTransporte());
     }
 
+    /**
+     * @throws MpdfException
+     */
     public function exportarPedidosAPdf()
     {
         $subpedidos = $this->pedidosAprobados();
         $fecha = now()->format('Y-m-d');
-        PdfHelper::exportarPedidos($this->nombre . '-' . $fecha . '.pdf', $subpedidos);
+        $filepath = $this->nombre . '-' . $fecha . '.pdf';
+        PdfHelper::exportarPedidos($filepath, $subpedidos);
     }
 
     function pedidoParaPdf(): array
@@ -154,11 +166,15 @@ class GrupoDeCompra extends Model
         return $view->render();
     }
 
+    /**
+     * @throws MpdfException
+     */
     public static function exportarPedidosBarrialesAPdf()
     {
         $barrios = GrupoDeCompra::barriosMenosPrueba()->get();
         $fecha = now()->format('Y-m-d');
-        PdfHelper::exportarPedidos('pedidos_por_barrio-' . $fecha . '.pdf', $barrios);
+        $filepath = 'pedidos_por_barrio-' . $fecha . '.pdf';
+        PdfHelper::exportarPedidos($filepath, $barrios);
     }
 
     static function filaVacia(string $product, int $columns): array

From db87c38e3b504beb607ed851e5c1f0e3ffebf49e Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 20 Jun 2025 17:03:52 -0300
Subject: [PATCH 34/91] Devolviendo solamente pedidos de hogares

---
 app/Http/Resources/GrupoDeCompraResource.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Resources/GrupoDeCompraResource.php b/app/Http/Resources/GrupoDeCompraResource.php
index b67e14b..82f2120 100644
--- a/app/Http/Resources/GrupoDeCompraResource.php
+++ b/app/Http/Resources/GrupoDeCompraResource.php
@@ -19,7 +19,7 @@ class GrupoDeCompraResource extends JsonResource
             'id' => $this->id,
             'nombre' => $this->nombre,
             'devoluciones_habilitadas' => $this->devoluciones_habilitadas,
-            'pedidos' => SubpedidoResource::collection($this->subpedidos),
+            'pedidos' => SubpedidoResource::collection($this->pedidosHogares()),
             'total_a_recaudar' => number_format($this->totalARecaudar(),2),
             'saldo' => number_format($this->saldo, 2, ".", ""),
             'total_sin_devoluciones' => number_format($this->totalSinDevoluciones(),2),

From cc6b0f5a6ede04afd5147080969de412cb8db110 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 20 Jun 2025 17:04:23 -0300
Subject: [PATCH 35/91] Formato + omitiendo pedidos de ollas de metodos que
 trabajan con pedidos

---
 app/Producto.php | 51 +++++++++++++++++++++++++++++-------------------
 1 file changed, 31 insertions(+), 20 deletions(-)

diff --git a/app/Producto.php b/app/Producto.php
index 5617617..554c24b 100644
--- a/app/Producto.php
+++ b/app/Producto.php
@@ -19,15 +19,10 @@ class Producto extends Model
 
     public function subpedidos(): BelongsToMany
     {
-        return $this->belongsToMany(Subpedido::class, 'productos_subpedidos')->withPivot(["cantidad", "notas"]);
+        return $this->belongsToMany(Subpedido::class, 'productos_subpedidos')
+                    ->withPivot(["cantidad", "notas"]);
     }
 
-    public static function noBarriales()
-    {
-        return self::where('nombre', 'not like', '%barrial%');
-    }
-
-    // Este método permite que se apliquen los filtros al hacer una request (por ejemplo, de búsqueda)
     public function scopeFiltrar($query, FiltroDeProducto $filtros): Builder
     {
         return $filtros->aplicar($query);
@@ -35,7 +30,9 @@ class Producto extends Model
 
     public static function getPaginar(Request $request): int
     {
-        return $request->has('paginar') && intval($request->input('paginar')) ? intval($request->input('paginar')) : self::all()->count();
+        return $request->has('paginar') && intval($request->input('paginar')) ?
+            intval($request->input('paginar')) :
+            self::all()->count();
     }
 
     public static function productosFilaID()
@@ -53,19 +50,29 @@ class Producto extends Model
         return self::noBarriales()->pluck('nombre', 'id')->all();
     }
 
+    public static function noBarriales()
+    {
+        return self::where('nombre', 'not like', '%barrial%');
+    }
+
     static public function cantidadesPorBarrio(): Collection
     {
-        $barrios = GrupoDeCompra::barriosMenosPrueba()
-            ->pluck('id', 'nombre');
+        $barrios = GrupoDeCompra::barriosMenosPrueba()->pluck('id', 'nombre');
 
         $columnasBarrios = $barrios->map(function ($id, $nombre) {
-            return DB::raw("SUM(CASE WHEN subpedidos.grupo_de_compra_id = $id AND subpedidos.aprobado = 1 THEN producto_subpedido.cantidad ELSE 0 END) as `$nombre`");
+            return DB::raw("
+                SUM(CASE WHEN subpedidos.grupo_de_compra_id = $id
+                    AND subpedidos.aprobado = 1
+                    AND subpedidos.tipo_pedido_id = 1
+                    THEN producto_subpedido.cantidad
+                    ELSE 0 END)
+                as `$nombre`");
         })->toArray();
 
-        return DB::table('productos')
-            ->where('productos.nombre', 'not like', '%barrial%')
+        return self::noBarriales()
             ->leftJoin('producto_subpedido', 'productos.id', '=', 'producto_subpedido.producto_id')
             ->leftJoin('subpedidos', 'subpedidos.id', '=', 'producto_subpedido.subpedido_id')
+            ->where('subpedidos.tipo_pedido_id', '=', 1)
             ->select(array_merge(
                 ['productos.fila as fila'],
                 ['productos.nombre as producto'],
@@ -82,8 +89,7 @@ class Producto extends Model
     static public function planillaTotales()
     {
         $headers = ['Producto'];
-        $barrios = GrupoDeCompra::barriosMenosPrueba()
-            ->pluck('nombre')->toArray();
+        $barrios = GrupoDeCompra::barriosMenosPrueba()->pluck('nombre')->toArray();
         $headers = array_merge($headers, $barrios);
 
         $cantidadesPorBarrio = self::cantidadesPorBarrio();
@@ -109,21 +115,23 @@ class Producto extends Model
             $ultimaFila = $fila;
         }
 
-        foreach ($transportePorBarrio as $key => $cantidad) {
+        foreach ($transportePorBarrio as $cantidad) {
             $planilla[$filaTransporte][] = $cantidad;
         }
 
         $fecha = now()->format('Y-m-d');
-        CsvHelper::generarCsv('csv/exports/pedidos-por-barrio- ' . $fecha  . '.csv', $planilla, $headers);
+        $filePath = 'csv/exports/pedidos-por-barrio- ' . $fecha . '.csv';
+        CsvHelper::generarCsv($filePath, $planilla, $headers);
     }
 
     public static function notasPorBarrio(): Collection
     {
-        return DB::table('productos')
+        return self::noBarriales()
             ->join('producto_subpedido', 'productos.id', '=', 'producto_subpedido.producto_id')
             ->join('subpedidos', 'producto_subpedido.subpedido_id', '=', 'subpedidos.id')
             ->join('grupos_de_compra', 'subpedidos.grupo_de_compra_id', '=', 'grupos_de_compra.id')
             ->where('productos.requiere_notas', 1)
+            ->where('subpedidos.tipo_pedido_id', '=', 1)
             ->select(
                 'productos.nombre as producto',
                 'grupos_de_compra.nombre as barrio',
@@ -145,13 +153,16 @@ class Producto extends Model
         foreach ($notasPorBarrio as $producto => $notasGrupo) {
             $fila = [$producto];
             foreach ($barrios as $barrio) {
-                $notas = $notasGrupo->where('barrio', $barrio)->pluck('notas')->implode('; ');
+                $notas = $notasGrupo->where('barrio', $barrio)
+                                    ->pluck('notas')
+                                    ->implode('; ');
                 $fila[] = $notas ?: '';
             }
             $planilla[] = $fila;
         }
 
         $fecha = now()->format('Y-m-d');
-        CsvHelper::generarCsv('csv/exports/notas-por-barrio-' . $fecha . '.csv', $planilla, $headers);
+        $filePath = 'csv/exports/notas-por-barrio-' . $fecha . '.csv';
+        CsvHelper::generarCsv($filePath, $planilla, $headers);
     }
 }

From b1b764fd7c3e002d36f8218dd57be491be2acc0f Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 20 Jun 2025 17:33:29 -0300
Subject: [PATCH 36/91] Agregado slot a PedidosMain en vez de cartel aprobado
 fijo

---
 resources/js/components/pedidos/Body.vue        | 9 +++++++--
 resources/js/components/pedidos/PedidosMain.vue | 5 ++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/resources/js/components/pedidos/Body.vue b/resources/js/components/pedidos/Body.vue
index 3a38318..cf3afe6 100644
--- a/resources/js/components/pedidos/Body.vue
+++ b/resources/js/components/pedidos/Body.vue
@@ -1,7 +1,11 @@
 <template>
     <div id="pedidos-body" class="pb-6 mb-6">
         <pedido-select v-if="!pedidoDefinido"/>
-        <pedidos-main v-else/>
+        <pedidos-main v-else>
+            <template v-slot:cartel>
+                <cartel-pedido-aprobado/>
+            </template>
+        </pedidos-main>
     </div>
 </template>
 
@@ -9,10 +13,11 @@
 import { mapGetters } from "vuex";
 import PedidoSelect from "./PedidoSelect.vue";
 import PedidosMain from "./PedidosMain.vue";
+import CartelPedidoAprobado from "./CartelPedidoAprobado.vue";
 
 export default {
     name: "PedidosBody",
-    components: { PedidosMain, PedidoSelect },
+    components: { CartelPedidoAprobado, PedidosMain, PedidoSelect },
     computed: {
         ...mapGetters('pedido', ["pedidoDefinido"]),
     },
diff --git a/resources/js/components/pedidos/PedidosMain.vue b/resources/js/components/pedidos/PedidosMain.vue
index 3f31a55..fdcf5f9 100644
--- a/resources/js/components/pedidos/PedidosMain.vue
+++ b/resources/js/components/pedidos/PedidosMain.vue
@@ -2,13 +2,12 @@
 import { defineComponent } from "vue";
 import Canasta from "./Canasta.vue";
 import Chismosa from "./Chismosa.vue";
-import CartelPedidoAprobado from "./CartelPedidoAprobado.vue";
 import NavMigas from "./NavMigas.vue";
 import { mapActions, mapState } from "vuex";
 
 export default defineComponent({
     name: "PedidosMain",
-    components: { NavMigas, CartelPedidoAprobado, Chismosa, Canasta },
+    components: { NavMigas, Chismosa, Canasta },
     computed: {
         ...mapState('ui', ["show_chismosa"]),
     },
@@ -26,7 +25,7 @@ export default defineComponent({
         <nav-migas/>
         <div class="columns">
             <div class="column" :class="{ 'is-two-thirds-desktop is-hidden-touch': show_chismosa }">
-                <cartel-pedido-aprobado/>
+                <slot name="cartel"></slot>
                 <canasta/>
             </div>
             <div class="column is-full-touch" v-if="show_chismosa">

From 5d7d533083ec7f4035754cddc648220db374de67 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 20 Jun 2025 17:34:46 -0300
Subject: [PATCH 37/91] Agregado input para cantidad de ollas

---
 .../js/components/ollas/CantidadOllas.vue     | 49 +++++++++++++++++++
 resources/js/components/ollas/OllasBody.vue   |  9 +++-
 2 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 resources/js/components/ollas/CantidadOllas.vue

diff --git a/resources/js/components/ollas/CantidadOllas.vue b/resources/js/components/ollas/CantidadOllas.vue
new file mode 100644
index 0000000..c2a66c2
--- /dev/null
+++ b/resources/js/components/ollas/CantidadOllas.vue
@@ -0,0 +1,49 @@
+<script>
+import { mapActions, mapGetters, mapState } from "vuex";
+export default {
+    name: "CantidadOllas",
+    data() {
+        return {
+            cantidadControl: 0,
+        }
+    },
+    methods: {
+        decrementar() {
+            this.cantidadControl -= 1;
+        },
+        incrementar() {
+            this.cantidadControl += 1;
+        },
+    }
+}
+</script>
+
+<template>
+    <div class="notification has-text-centered">
+        <label class="label">Cantidad de ollas:</label>
+        <div class="field has-addons is-justify-content-center contador">
+            <div class="control">
+                <button class="button is-small"
+                        :disabled="cantidadControl < 1"
+                        @click.capture="decrementar">
+                    <i class="fa fa-solid fa-minus"></i>
+                </button>
+            </div>
+            <div class="control">
+                <input id="cantidad"
+                       v-model="cantidadControl"
+                       class="input is-small"
+                       type="number"
+                       style="text-align: center">
+            </div>
+            <div class="control">
+                <button class="button is-small" @click="incrementar">
+                    <i class="fa fa-solid fa-plus"></i>
+                </button>
+            </div>
+        </div>
+    </div>
+</template>
+
+<style scoped>
+</style>
diff --git a/resources/js/components/ollas/OllasBody.vue b/resources/js/components/ollas/OllasBody.vue
index 33a572c..1e221d7 100644
--- a/resources/js/components/ollas/OllasBody.vue
+++ b/resources/js/components/ollas/OllasBody.vue
@@ -1,10 +1,11 @@
 <script>
 import PedidosMain from "../pedidos/PedidosMain.vue";
 import { mapActions, mapMutations } from "vuex";
+import CantidadOllas from "./CantidadOllas.vue";
 
 export default {
     name: "OllasBody",
-    components: { PedidosMain },
+    components: { CantidadOllas, PedidosMain },
     methods: {
         ...mapActions('pedido', ["getPedidoDeOllas", "getGrupoDeCompra"]),
         ...mapMutations('ui', ["migasOllas"])
@@ -19,7 +20,11 @@ export default {
 
 <template>
     <div id="ollas-body" class="pb-6 mb-6">
-        <pedidos-main></pedidos-main>
+        <pedidos-main>
+            <template v-slot:cartel>
+                <cantidad-ollas/>
+            </template>
+        </pedidos-main>
     </div>
 </template>
 

From ee96d89e556878bd80f3210282c2c54a67d7ffb0 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 20 Jun 2025 17:42:41 -0300
Subject: [PATCH 38/91] Limpieza

---
 resources/js/components/ollas/CantidadOllas.vue | 1 -
 resources/js/components/pedidos/NavMigas.vue    | 6 +-----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/resources/js/components/ollas/CantidadOllas.vue b/resources/js/components/ollas/CantidadOllas.vue
index c2a66c2..bd85682 100644
--- a/resources/js/components/ollas/CantidadOllas.vue
+++ b/resources/js/components/ollas/CantidadOllas.vue
@@ -1,5 +1,4 @@
 <script>
-import { mapActions, mapGetters, mapState } from "vuex";
 export default {
     name: "CantidadOllas",
     data() {
diff --git a/resources/js/components/pedidos/NavMigas.vue b/resources/js/components/pedidos/NavMigas.vue
index f8e9cd8..a76e77f 100644
--- a/resources/js/components/pedidos/NavMigas.vue
+++ b/resources/js/components/pedidos/NavMigas.vue
@@ -1,6 +1,6 @@
 <template>
     <nav class="breadcrumb is-centered has-background-danger-light is-fixed-top"
-         aria-label="breadcrumbs" v-show="visible">
+         aria-label="breadcrumbs">
         <ul class="mt-4">
             <li v-for="(miga, i) in migas" :key="i" :class="{'is-active': i === migaActiva}">
                 <a @click="clickMiga({ miga: miga })"
@@ -17,15 +17,11 @@ import { mapActions, mapMutations, mapState } from "vuex";
 
 export default {
     methods: {
-        ...mapActions('productos', ["getProductos"]),
         ...mapActions('ui', ["clickMiga"]),
         ...mapMutations('ui', ["addMiga"]),
     },
     computed: {
         ...mapState('ui', ["migas"]),
-        visible() {
-            return this.migas.length > 0;
-        },
         migaActiva() {
             return this.migas.length - 1;
         },

From 6d6d8d4387f342518fd86baaf71ae390dab8ed2e Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Mon, 23 Jun 2025 16:18:28 -0300
Subject: [PATCH 39/91] Cambio de nombre y movida burger

---
 .../{AdminNavBar.vue => AdminNavBarBrand.vue} |  5 +----
 ...esNavBar.vue => ComisionesNavBarBrand.vue} |  5 +----
 resources/js/components/comunes/NavBar.vue    | 20 ++++++++++---------
 .../{OllasNavBar.vue => OllasNavBarBrand.vue} |  6 ++----
 ...didosNavBar.vue => PedidosNavBarBrand.vue} |  6 ++----
 5 files changed, 17 insertions(+), 25 deletions(-)
 rename resources/js/components/admin/{AdminNavBar.vue => AdminNavBarBrand.vue} (79%)
 rename resources/js/components/comisiones/{ComisionesNavBar.vue => ComisionesNavBarBrand.vue} (82%)
 rename resources/js/components/ollas/{OllasNavBar.vue => OllasNavBarBrand.vue} (83%)
 rename resources/js/components/pedidos/{PedidosNavBar.vue => PedidosNavBarBrand.vue} (85%)

diff --git a/resources/js/components/admin/AdminNavBar.vue b/resources/js/components/admin/AdminNavBarBrand.vue
similarity index 79%
rename from resources/js/components/admin/AdminNavBar.vue
rename to resources/js/components/admin/AdminNavBarBrand.vue
index 10754fa..bd27811 100644
--- a/resources/js/components/admin/AdminNavBar.vue
+++ b/resources/js/components/admin/AdminNavBarBrand.vue
@@ -1,10 +1,8 @@
 <script>
 import { mapGetters, mapMutations, mapState } from "vuex";
-import Burger from "../comunes/Burger.vue";
 
 export default {
-    name: "AdminNavBar",
-    components: { Burger },
+    name: "AdminNavBarBrand",
     computed: {
         ...mapState('ui', ["burger_activa"]),
         ...mapGetters('admin', ["barrio"])
@@ -20,7 +18,6 @@ export default {
         <p>
             {{`Barrio: ${barrio}`}}
         </p>
-        <burger/>
     </div>
 </template>
 
diff --git a/resources/js/components/comisiones/ComisionesNavBar.vue b/resources/js/components/comisiones/ComisionesNavBarBrand.vue
similarity index 82%
rename from resources/js/components/comisiones/ComisionesNavBar.vue
rename to resources/js/components/comisiones/ComisionesNavBarBrand.vue
index 0659967..eed7d60 100644
--- a/resources/js/components/comisiones/ComisionesNavBar.vue
+++ b/resources/js/components/comisiones/ComisionesNavBarBrand.vue
@@ -1,10 +1,8 @@
 <script>
 import { mapMutations, mapState } from "vuex";
-import Burger from "../comunes/Burger.vue";
 
 export default {
-    name: "ComisionesNavBar",
-    components: { Burger },
+    name: "ComisionesNavBarBrand",
     computed: {
         ...mapState('ui', ["burger_activa"])
     },
@@ -26,7 +24,6 @@ export default {
 <template>
     <div class="navbar-item hide-below-1024">
         <p>{{ nombre }}</p>
-        <burger/>
     </div>
 </template>
 
diff --git a/resources/js/components/comunes/NavBar.vue b/resources/js/components/comunes/NavBar.vue
index 242f335..d255c34 100644
--- a/resources/js/components/comunes/NavBar.vue
+++ b/resources/js/components/comunes/NavBar.vue
@@ -7,10 +7,11 @@
             <a class="navbar-item" href="https://mps.org.uy">
                 <img src="/assets/logoMPS.png" height="28" alt="Logo del MPS">
             </a>
-            <pedidos-nav-bar v-if="rol === 'barrio'"/>
-            <ollas-nav-bar v-else-if="rol === 'ollas'"/>
-            <admin-nav-bar v-else-if="rol === 'admin_barrio'"/>
-            <comisiones-nav-bar v-else/>
+            <pedidos-nav-bar-brand v-if="rol === 'barrio'"/>
+            <ollas-nav-bar-brand v-else-if="rol === 'ollas'"/>
+            <admin-nav-bar-brand v-else-if="rol === 'admin_barrio'"/>
+            <comisiones-nav-bar-brand v-else/>
+            <burger/>
         </div>
         <div class="navbar-menu"
              :class="{'is-active': burger_activa}">
@@ -32,14 +33,15 @@
 <script>
 import ChismosaDropdown from '../pedidos/ChismosaDropdown.vue';
 import { mapGetters, mapState } from "vuex";
-import PedidosNavBar from "../pedidos/PedidosNavBar.vue";
-import ComisionesNavBar from "../comisiones/ComisionesNavBar.vue";
-import AdminNavBar from "../admin/AdminNavBar.vue";
-import OllasNavBar from "../ollas/OllasNavBar.vue";
+import PedidosNavBarBrand from "../pedidos/PedidosNavBarBrand.vue";
+import ComisionesNavBarBrand from "../comisiones/ComisionesNavBarBrand.vue";
+import AdminNavBarBrand from "../admin/AdminNavBarBrand.vue";
+import OllasNavBarBrand from "../ollas/OllasNavBarBrand.vue";
 import Buscador from "../pedidos/Buscador.vue";
+import Burger from "./Burger.vue";
 
 export default {
-    components: { Buscador, OllasNavBar, AdminNavBar, ComisionesNavBar, PedidosNavBar, ChismosaDropdown },
+    components: { Burger, Buscador, OllasNavBarBrand, AdminNavBarBrand, ComisionesNavBarBrand, PedidosNavBarBrand, ChismosaDropdown },
     computed: {
         ...mapGetters('pedido', ["pedidoDefinido"]),
         ...mapState('login', ["rol"]),
diff --git a/resources/js/components/ollas/OllasNavBar.vue b/resources/js/components/ollas/OllasNavBarBrand.vue
similarity index 83%
rename from resources/js/components/ollas/OllasNavBar.vue
rename to resources/js/components/ollas/OllasNavBarBrand.vue
index b836d74..88dd53e 100644
--- a/resources/js/components/ollas/OllasNavBar.vue
+++ b/resources/js/components/ollas/OllasNavBarBrand.vue
@@ -1,11 +1,10 @@
 <script>
 import { mapGetters, mapMutations, mapState } from "vuex";
-import Burger from "../comunes/Burger.vue";
 import ChismosaDropdown from "../pedidos/ChismosaDropdown.vue";
 
 export default {
-    name: "OllasNavBar",
-    components: { Burger, ChismosaDropdown },
+    name: "OllasNavBarBrand",
+    components: { ChismosaDropdown },
     computed: {
         ...mapGetters('pedido', ["pedidoDefinido"]),
         ...mapState('pedido', ["nombre"]),
@@ -24,7 +23,6 @@ export default {
             v-if="pedidoDefinido"
             class="hide-above-1023"
             ariaControls="mobile"/>
-        <burger/>
     </div>
 </template>
 
diff --git a/resources/js/components/pedidos/PedidosNavBar.vue b/resources/js/components/pedidos/PedidosNavBarBrand.vue
similarity index 85%
rename from resources/js/components/pedidos/PedidosNavBar.vue
rename to resources/js/components/pedidos/PedidosNavBarBrand.vue
index 1424d52..bcc5130 100644
--- a/resources/js/components/pedidos/PedidosNavBar.vue
+++ b/resources/js/components/pedidos/PedidosNavBarBrand.vue
@@ -1,11 +1,10 @@
 <script>
 import { mapGetters, mapMutations, mapState } from "vuex";
 import ChismosaDropdown from "./ChismosaDropdown.vue";
-import Burger from "../comunes/Burger.vue";
 
 export default {
-    name: "PedidosNavBar",
-    components: { Burger, ChismosaDropdown },
+    name: "PedidosNavBarBrand",
+    components: { ChismosaDropdown },
     computed: {
         ...mapGetters('pedido', ["pedidoDefinido"]),
         ...mapState('pedido', ["nombre", "grupo_de_compra"]),
@@ -26,7 +25,6 @@ export default {
             v-if="pedidoDefinido"
             class="hide-above-1023"
             ariaControls="mobile"/>
-        <burger/>
     </div>
 </template>
 

From 5020d406bf55fb08500e4cc2da3d6588e0a9272c Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Mon, 23 Jun 2025 16:20:15 -0300
Subject: [PATCH 40/91] formato

---
 resources/js/components/comunes/NavBar.vue   | 3 +--
 resources/js/components/pedidos/Buscador.vue | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/resources/js/components/comunes/NavBar.vue b/resources/js/components/comunes/NavBar.vue
index d255c34..1f5bda2 100644
--- a/resources/js/components/comunes/NavBar.vue
+++ b/resources/js/components/comunes/NavBar.vue
@@ -13,8 +13,7 @@
             <comisiones-nav-bar-brand v-else/>
             <burger/>
         </div>
-        <div class="navbar-menu"
-             :class="{'is-active': burger_activa}">
+        <div class="navbar-menu" :class="{'is-active': burger_activa}">
             <div class="navbar-end">
                 <buscador v-if="pedidoDefinido"/>
                 <chismosa-dropdown v-if="pedidoDefinido"
diff --git a/resources/js/components/pedidos/Buscador.vue b/resources/js/components/pedidos/Buscador.vue
index 739674f..24e1ba1 100644
--- a/resources/js/components/pedidos/Buscador.vue
+++ b/resources/js/components/pedidos/Buscador.vue
@@ -25,9 +25,9 @@ export default {
 <template>
     <div class="navbar-item field has-addons mt-1 mr-3 mb-1">
         <a class="button is-small has-text-dark-grey" @click.capture="buscar">
-                        <span class="icon">
-                          <i class="fas fa-search"></i>
-                        </span>
+            <span class="icon">
+              <i class="fas fa-search"></i>
+            </span>
         </a>
         <input class="input is-small"
                type="text"

From 05dc58710d3159fb0bf2dcc1232154d8a548e75f Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Mon, 23 Jun 2025 16:34:07 -0300
Subject: [PATCH 41/91] estilos

---
 resources/js/store/modules/login.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/store/modules/login.js b/resources/js/store/modules/login.js
index 87b5d72..2825640 100644
--- a/resources/js/store/modules/login.js
+++ b/resources/js/store/modules/login.js
@@ -103,7 +103,7 @@ const getters = {
                 };
             case 'comisiones':
                 return {
-                    fondo: "has-background-grey-light",
+                    fondo: "",
                     texto: "",
                     botones: "is-dark"
                 };

From aaeee70c9e8bc882fdd70754ed9aac7c7e077b7c Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Mon, 23 Jun 2025 16:37:44 -0300
Subject: [PATCH 42/91] eliminada carpeta no uasda

---
 resources/csv/exports/.gitignore | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 resources/csv/exports/.gitignore

diff --git a/resources/csv/exports/.gitignore b/resources/csv/exports/.gitignore
deleted file mode 100644
index e69de29..0000000

From f520578525978d245fb3df736ff68e016f3ce08f Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Mon, 23 Jun 2025 16:55:20 -0300
Subject: [PATCH 43/91] Solo barrios con pedidos aprobados

---
 app/GrupoDeCompra.php |  9 ++++++---
 app/Producto.php      | 12 +++++++-----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/GrupoDeCompra.php b/app/GrupoDeCompra.php
index 3395925..0ebac9f 100644
--- a/app/GrupoDeCompra.php
+++ b/app/GrupoDeCompra.php
@@ -171,7 +171,7 @@ class GrupoDeCompra extends Model
      */
     public static function exportarPedidosBarrialesAPdf()
     {
-        $barrios = GrupoDeCompra::barriosMenosPrueba()->get();
+        $barrios = GrupoDeCompra::barriosMenosPruebaConPedidosAprobados()->get();
         $fecha = now()->format('Y-m-d');
         $filepath = 'pedidos_por_barrio-' . $fecha . '.pdf';
         PdfHelper::exportarPedidos($filepath, $barrios);
@@ -292,9 +292,12 @@ class GrupoDeCompra extends Model
         return array($records, $i, $cantidad);
     }
 
-    public static function barriosMenosPrueba(): Builder
+    public static function barriosMenosPruebaConPedidosAprobados(): Builder
     {
         return self::where('nombre', '<>', 'PRUEBA')
+            ->whereHas('subpedidos', function ($query) {
+                $query->where('aprobado', true);
+            })
             ->orderBy('region')
             ->orderBy('nombre');
     }
@@ -302,7 +305,7 @@ class GrupoDeCompra extends Model
     public static function transportePorBarrio(): array
     {
         $result = [];
-        $barrios = GrupoDeCompra::barriosMenosPrueba()->get();
+        $barrios = GrupoDeCompra::barriosMenosPruebaConPedidosAprobados()->get();
 
         foreach ($barrios as $barrio) {
             $result[] = $barrio->cantidadTransporte();
diff --git a/app/Producto.php b/app/Producto.php
index 554c24b..f46a5b5 100644
--- a/app/Producto.php
+++ b/app/Producto.php
@@ -57,7 +57,7 @@ class Producto extends Model
 
     static public function cantidadesPorBarrio(): Collection
     {
-        $barrios = GrupoDeCompra::barriosMenosPrueba()->pluck('id', 'nombre');
+        $barrios = GrupoDeCompra::barriosMenosPruebaConPedidosAprobados()->pluck('id', 'nombre');
 
         $columnasBarrios = $barrios->map(function ($id, $nombre) {
             return DB::raw("
@@ -69,7 +69,8 @@ class Producto extends Model
                 as `$nombre`");
         })->toArray();
 
-        return self::noBarriales()
+        return DB::table('productos')
+            ->where('productos.nombre', 'not like', '%barrial%')
             ->leftJoin('producto_subpedido', 'productos.id', '=', 'producto_subpedido.producto_id')
             ->leftJoin('subpedidos', 'subpedidos.id', '=', 'producto_subpedido.subpedido_id')
             ->where('subpedidos.tipo_pedido_id', '=', 1)
@@ -89,7 +90,7 @@ class Producto extends Model
     static public function planillaTotales()
     {
         $headers = ['Producto'];
-        $barrios = GrupoDeCompra::barriosMenosPrueba()->pluck('nombre')->toArray();
+        $barrios = GrupoDeCompra::barriosMenosPruebaConPedidosAprobados()->pluck('nombre')->toArray();
         $headers = array_merge($headers, $barrios);
 
         $cantidadesPorBarrio = self::cantidadesPorBarrio();
@@ -126,7 +127,8 @@ class Producto extends Model
 
     public static function notasPorBarrio(): Collection
     {
-        return self::noBarriales()
+        return DB::table('productos')
+            ->where('productos.nombre', 'not like', '%barrial%')
             ->join('producto_subpedido', 'productos.id', '=', 'producto_subpedido.producto_id')
             ->join('subpedidos', 'producto_subpedido.subpedido_id', '=', 'subpedidos.id')
             ->join('grupos_de_compra', 'subpedidos.grupo_de_compra_id', '=', 'grupos_de_compra.id')
@@ -143,7 +145,7 @@ class Producto extends Model
 
     static public function planillaNotas() {
         $headers = ['Producto'];
-        $barrios = GrupoDeCompra::barriosMenosPrueba()
+        $barrios = GrupoDeCompra::barriosMenosPruebaConPedidosAprobados()
             ->pluck('nombre')->toArray();
         $headers = array_merge($headers, $barrios);
 

From d87091846db1ff9b5d876cbc3fcc7ffdf448a765 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Mon, 23 Jun 2025 19:11:49 -0300
Subject: [PATCH 44/91] Agregados metodos, ruta, y csv para parametros de la
 aplicacion

---
 app/Helpers/CsvHelper.php                     | 83 +++++++++++++++----
 app/Http/Controllers/ComisionesController.php | 39 +++++++++
 resources/csv/parametros.csv                  |  3 +
 routes/api.php                                |  2 +
 routes/web.php                                |  1 +
 5 files changed, 113 insertions(+), 15 deletions(-)
 create mode 100644 resources/csv/parametros.csv

diff --git a/app/Helpers/CsvHelper.php b/app/Helpers/CsvHelper.php
index c27ff6d..c8d8c5a 100644
--- a/app/Helpers/CsvHelper.php
+++ b/app/Helpers/CsvHelper.php
@@ -2,6 +2,7 @@
 
 namespace App\Helpers;
 
+use App\Http\Controllers\ComisionesController;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Log;
 use Iterator;
@@ -13,15 +14,13 @@ use League\Csv\Writer;
 
 class CsvHelper
 {
+
     /**
      * @throws Exception
      */
     public static function getRecords($filePath, $message): Iterator {
-        $csv = Reader::createFromPath($filePath);
         try {
-            $csv->setDelimiter("|");
-            $csv->setEnclosure("'");
-            $csv->setHeaderOffset(0);
+            $csv = self::getReader($filePath);
             return $csv->getRecords();
         } catch (InvalidArgument|Exception $e) {
             Log::error($e->getMessage());
@@ -29,20 +28,74 @@ class CsvHelper
         }
     }
 
-    public static function generarCsv($filePath, $contenido, $headers = null): void
+    /**
+     * @throws Exception
+     */
+    public static function cambiarParametro(string $id, string $valor): void
     {
-        if (!File::exists(storage_path('csv/exports'))) {
-            File::makeDirectory(storage_path('csv/exports'), 0755, true);
-        }
-
         try {
-            $writer = Writer::createFromPath(storage_path($filePath), 'w');
-            if ($headers) {
-                $writer->insertOne($headers);
+            $updated = false;
+            $filePath = resource_path(ComisionesController::PARAMETROS_PATH);
+            $csv = self::getReader($filePath);
+            $headers = $csv->getHeader();
+            $records = array_map(fn($r) => (array) $r, iterator_to_array($csv->getRecords()));
+
+            foreach ($records as &$record) {
+                if ($record['id'] === $id) {
+                    $record['valor'] = $valor;
+                    $updated = true;
+                    break;
+                }
             }
-            $writer->insertAll($contenido);
-        } catch (CannotInsertRecord $e) {
-            Log::error($e->getMessage(), $e->getTrace());
+            unset($record);
+
+            if (!$updated)
+                throw new Exception("Parametro '{$id}' no encontrado.");
+
+            self::generarCsv($filePath, $records, $headers, "|", "'", false);
+        } catch (CannotInsertRecord | InvalidArgument $e) {
+            Log::error("Error al actualizar csv: " . $e->getMessage());
+            throw new Exception("Error al actualizar csv", $e);
         }
     }
+
+    /**
+     * @throws InvalidArgument
+     * @throws CannotInsertRecord
+     */
+    public static function generarCsv($filePath, $contenido, $headers = null, $delimiter = null, $enclosure = null, $export = true): void
+    {
+        $path = $filePath;
+
+        if ($export) {
+            if (!File::exists(storage_path('csv/exports')))
+                File::makeDirectory(storage_path('csv/exports'), 0755, true);
+            $path = storage_path($filePath);
+        }
+
+        $writer = Writer::createFromPath($path, 'w');
+        if ($delimiter)
+            $writer->setDelimiter($delimiter);
+        if ($enclosure)
+            $writer->setEnclosure($enclosure);
+        if ($headers)
+            $writer->insertOne($headers);
+
+        $writer->insertAll($contenido);
+    }
+
+    /**
+     * @param string $filePath
+     * @return Reader
+     * @throws InvalidArgument
+     * @throws Exception
+     */
+    private static function getReader(string $filePath): Reader
+    {
+        $csv = Reader::createFromPath($filePath);
+        $csv->setDelimiter("|");
+        $csv->setEnclosure("'");
+        $csv->setHeaderOffset(0);
+        return $csv;
+    }
 }
diff --git a/app/Http/Controllers/ComisionesController.php b/app/Http/Controllers/ComisionesController.php
index 769d6b7..c8af381 100644
--- a/app/Http/Controllers/ComisionesController.php
+++ b/app/Http/Controllers/ComisionesController.php
@@ -15,6 +15,7 @@ use Symfony\Component\HttpFoundation\BinaryFileResponse;
 
 class ComisionesController
 {
+    const PARAMETROS_PATH = 'csv/parametros.csv';
     const CANASTAS_PATH = 'csv/canastas/';
     const BARRIO = "Barrio";
     const SALDO = "Saldo";
@@ -110,4 +111,42 @@ class ComisionesController
 
         return response()->json(GrupoDeCompraResource::collection(GrupoDeCompra::all()));
     }
+
+    public function obtenerParametros()
+    {
+        try {
+            $records = self::parametrosRecords();
+            $result = [];
+            foreach ($records as $record)
+                $result[] = $record;
+            return response()->json($result);
+        } catch (Exception $e) {
+            return response()->json(['message' => $e->getMessage()], 500);
+        }
+    }
+
+    public function modificarParametros(string $parametro_id, Request $request) {
+        try {
+            if (collect(self::parametrosRecords())
+                ->contains('id', $parametro_id)) {
+                $valid = $request->validate([
+                    'valor' => ['required', 'numeric', 'gte:0'],
+                ]);
+                CsvHelper::cambiarParametro($parametro_id, $valid['valor']);
+                return response()->noContent();
+            }
+            return response()->json(['message' => 'Parametro no encontrado.'], 404);
+        } catch (Exception $e) {
+            return response()->json(['message' => $e->getMessage()], 500);
+        }
+    }
+
+    /**
+     * @throws Exception
+     */
+    private static function parametrosRecords(): array
+    {
+        $records = CsvHelper::getRecords(resource_path(self::PARAMETROS_PATH), "No se pudo leer el archivo.");
+        return iterator_to_array($records);
+    }
 }
diff --git a/resources/csv/parametros.csv b/resources/csv/parametros.csv
new file mode 100644
index 0000000..297e2ca
--- /dev/null
+++ b/resources/csv/parametros.csv
@@ -0,0 +1,3 @@
+id|nombre|valor
+bono-transporte|'Bono de transporte'|15
+monto-olla|'Monto por olla'|1200
diff --git a/routes/api.php b/routes/api.php
index 0eaef54..9043edc 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -52,4 +52,6 @@ Route::middleware('api')->group(function() {
     Route::prefix('ollas')->group(function() {
         Route::get('/{gdc}','Api\OllasController@pedido');
     });
+
+    Route::get('/parametros', 'ComisionesController@obtenerParametros');
 });
diff --git a/routes/web.php b/routes/web.php
index e77342a..324eda0 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -56,6 +56,7 @@ Route::middleware(['auth', 'role:comision'])->group( function() {
     Route::get('/comisiones/canasta/ejemplo', 'ComisionesController@descargarCanastaEjemplo')->name('comisiones.canasta.ejemplo');
     Route::post('/comisiones/canasta', 'ComisionesController@cargarCanasta')->name('comisiones.canasta');
     Route::post('/comisiones/saldos', 'ComisionesController@cargarSaldos')->name('comisiones.saldos');
+    Route::put('/comisiones/parametros/{parametro_id}', 'ComisionesController@modificarParametros');
 });
 
 Route::get('/ollas/login', 'OllasController@show')->name('ollas.login');

From e37aa25b3dc5b126c48dc63fabbdae8ee68798b8 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Mon, 23 Jun 2025 19:12:19 -0300
Subject: [PATCH 45/91] Agregados seccion, fila, y logica para obtener y
 modificar parametros desde comisiones

---
 resources/js/components/comisiones/Body.vue   |  9 ++-
 .../comisiones/parametros/FilaParametro.vue   | 71 +++++++++++++++++++
 .../parametros/ParametrosSeccion.vue          | 41 +++++++++++
 resources/js/store/modules/comisiones.js      | 26 +++++++
 4 files changed, 146 insertions(+), 1 deletion(-)
 create mode 100644 resources/js/components/comisiones/parametros/FilaParametro.vue
 create mode 100644 resources/js/components/comisiones/parametros/ParametrosSeccion.vue

diff --git a/resources/js/components/comisiones/Body.vue b/resources/js/components/comisiones/Body.vue
index 56287e4..3614c64 100644
--- a/resources/js/components/comisiones/Body.vue
+++ b/resources/js/components/comisiones/Body.vue
@@ -18,6 +18,11 @@
              :class="seccionActiva === 'saldos-comisiones-seccion' ? 'is-active' : 'is-hidden'">
             <saldos-seccion/>
         </div>
+        <div class="block pb-6"
+             id="parametros-comisiones-seccion"
+             :class="seccionActiva === 'parametros-comisiones-seccion' ? 'is-active' : 'is-hidden'">
+            <parametros-seccion/>
+        </div>
     </div>
 </template>
 
@@ -27,11 +32,12 @@ import DropdownDescargar from "./DropdownDescargar.vue";
 import InputFileButton from "../comunes/InputFileButton.vue";
 import CanastaSeccion from "./canasta/CanastaSeccion.vue";
 import SaldosSeccion from "./saldos/SaldosSeccion.vue";
-import { mapActions } from "vuex";
+import ParametrosSeccion from "./parametros/ParametrosSeccion.vue";
 
 export default {
     name: "ComisionesBody",
     components: {
+        ParametrosSeccion,
         SaldosSeccion,
         CanastaSeccion,
         TabsSecciones,
@@ -44,6 +50,7 @@ export default {
                 { id: "pedidos-comisiones", nombre: "Pedidos" },
                 { id: "canasta-comisiones", nombre: "Canasta" },
                 { id: "saldos-comisiones", nombre: "Saldos" },
+                { id: "parametros-comisiones", nombre: "Parámetros" },
             ],
             tabActiva: "pedidos-comisiones",
             seccionActiva: "pedidos-comisiones-seccion",
diff --git a/resources/js/components/comisiones/parametros/FilaParametro.vue b/resources/js/components/comisiones/parametros/FilaParametro.vue
new file mode 100644
index 0000000..99add70
--- /dev/null
+++ b/resources/js/components/comisiones/parametros/FilaParametro.vue
@@ -0,0 +1,71 @@
+<script>
+import {mapActions, mapGetters} from "vuex";
+
+export default {
+    props: {
+        parametro: {
+            type: Object,
+            required: true,
+        }
+    },
+    data() {
+        return {
+            control: this.parametro.valor,
+        };
+    },
+    computed: {
+        hayCambios() {
+            return this.control !== this.parametro.valor;
+        }
+    },
+    methods: {
+        ...mapActions("comisiones", ["cambiarParametro"]),
+        modificar() {
+            this.cambiarParametro({
+                parametro_id: this.parametro.id,
+                valor: this.control,
+            });
+        }
+    }
+}
+</script>
+
+<template>
+    <tr>
+        <td>{{ parametro.nombre }}</td>
+        <td>
+            <div class="field">
+                <input :type="parametro.tipo"
+                       :id="'input-' + parametro.id"
+                       v-model="control"
+                       class="has-text-right">
+            </div>
+        </td>
+        <td class="has-text-centered">
+            <div class="control">
+                <button class="button is-small is-success"
+                        @click="modificar"
+                        :disabled="!hayCambios">
+                        <span class="icon">
+                            <i class="fas fa-check"></i>
+                        </span>
+                </button>
+            </div>
+        </td>
+        <td class="has-text-centered">
+            <div class="control">
+                <button class="button is-small is-danger"
+                        @click="control = parametro.valor"
+                        :disabled="!hayCambios">
+                        <span class="icon">
+                            <i class="fa fa-undo" aria-hidden="true"></i>
+                        </span>
+                </button>
+            </div>
+        </td>
+    </tr>
+</template>
+
+<style scoped>
+
+</style>
diff --git a/resources/js/components/comisiones/parametros/ParametrosSeccion.vue b/resources/js/components/comisiones/parametros/ParametrosSeccion.vue
new file mode 100644
index 0000000..dbdc80f
--- /dev/null
+++ b/resources/js/components/comisiones/parametros/ParametrosSeccion.vue
@@ -0,0 +1,41 @@
+<script>
+import FilaCaracteristica from "../../admin/FilaCaracteristica.vue";
+import FilaParametro from "./FilaParametro.vue";
+import { mapActions, mapState } from "vuex";
+
+export default {
+    name:"ParametrosSeccion",
+    components: { FilaParametro, FilaCaracteristica },
+    methods: {
+        ...mapActions("comisiones", ["getParametros"]),
+    },
+    computed: {
+        ...mapState("comisiones", ["parametros"]),
+    },
+    async mounted() {
+        await this.getParametros();
+    },
+}
+</script>
+
+<template>
+    <table class="table is-striped is-bordered">
+        <thead>
+            <tr>
+                <th> Parámetro </th>
+                <th> Valor $ </th>
+                <th> Cambiar </th>
+                <th> Deshacer </th>
+            </tr>
+        </thead>
+        <tbody>
+            <fila-parametro v-for="(p,i) in parametros"
+                            :key="i"
+                            :parametro="p"/>
+        </tbody>
+    </table>
+</template>
+
+<style scoped>
+
+</style>
diff --git a/resources/js/store/modules/comisiones.js b/resources/js/store/modules/comisiones.js
index 4857cc0..414e84c 100644
--- a/resources/js/store/modules/comisiones.js
+++ b/resources/js/store/modules/comisiones.js
@@ -3,6 +3,7 @@ import axios from "axios";
 const state = {
     lastFetch: undefined,
     grupos_de_compra: [],
+    parametros: [],
 };
 
 const mutations = {
@@ -10,6 +11,15 @@ const mutations = {
         state.grupos_de_compra = data;
         state.lastFetch = new Date();
     },
+    setParametros(state, parametros) {
+        state.parametros = parametros;
+        state.parametros.forEach(
+            p => p.valor = Number.parseInt(p.valor)
+        );
+    },
+    actualizarParametro(state, { parametro_id, valor }) {
+        state.parametros.find(p => p.id === parametro_id).valor = valor;
+    },
     setSaldo(state, { gdc_id, saldo }) {
         const barrio = state.grupos_de_compra.find(gdc => gdc.id === gdc_id);
         const i = state.grupos_de_compra.indexOf(barrio);
@@ -22,6 +32,22 @@ const actions = {
         const response = await axios.get('/api/grupos-de-compra/saldos');
         commit('setGruposDeCompra', response.data);
     },
+    async getParametros({ commit }) {
+        const response = await axios.get('/api/parametros');
+        commit('setParametros', response.data);
+    },
+    async cambiarParametro({ commit, dispatch }, { parametro_id, valor }) {
+        try {
+            await axios.put(
+                `/comisiones/parametros/${parametro_id}`,
+                { valor: valor }
+            );
+            commit('actualizarParametro', { parametro_id, valor });
+            dispatch("ui/toast", { mensaje: 'Parámetro modificado con éxito' }, { root: true });
+        } catch (error) {
+            dispatch("ui/error", { error: error }, { root: true });
+        }
+    },
     async setSaldo({ commit, dispatch }, { gdc_id, saldo }) {
         try {
             await axios.post(

From 3c140550067c5dbf43734598918e4814ae524c92 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Mon, 23 Jun 2025 19:12:29 -0300
Subject: [PATCH 46/91] Manejo de errores

---
 app/Producto.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/Producto.php b/app/Producto.php
index f46a5b5..f365f0d 100644
--- a/app/Producto.php
+++ b/app/Producto.php
@@ -11,7 +11,9 @@ use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
+use League\Csv\CannotInsertRecord;
 use League\Csv\Exception;
+use League\Csv\InvalidArgument;
 
 class Producto extends Model
 {
@@ -143,6 +145,10 @@ class Producto extends Model
             ->groupBy('producto');
     }
 
+    /**
+     * @throws InvalidArgument
+     * @throws CannotInsertRecord
+     */
     static public function planillaNotas() {
         $headers = ['Producto'];
         $barrios = GrupoDeCompra::barriosMenosPruebaConPedidosAprobados()

From b6cd844ffddcb3996c9fac5a95161e32ecb0af97 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Mon, 23 Jun 2025 19:36:03 -0300
Subject: [PATCH 47/91] Cambio null por [] en productos

---
 resources/js/store/modules/pedido.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/resources/js/store/modules/pedido.js b/resources/js/store/modules/pedido.js
index 9150a16..a6405a9 100644
--- a/resources/js/store/modules/pedido.js
+++ b/resources/js/store/modules/pedido.js
@@ -5,7 +5,7 @@ const state = {
     grupo_de_compra: null,
     pedido_id: null,
     nombre: null,
-    productos: null,
+    productos: [],
     aprobado: null,
     total: null,
     total_transporte: null,
@@ -96,7 +96,6 @@ const actions = {
     },
     async getPedidoDeOllas({ commit }) {
         const response = await axios.get(`/api/ollas/${state.grupo_de_compra.id}`);
-        console.log(response);
         commit('setPedido', response.data);
     },
 };

From 8fa3f7828068409ef6fb982ee8941bd042f3367c Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Mon, 23 Jun 2025 19:45:23 -0300
Subject: [PATCH 48/91] Agregado modulo de ollas y logica para calcular monto
 total

---
 .../js/components/ollas/CantidadOllas.vue     | 21 ++++------
 .../js/components/ollas/OllasNavBarBrand.vue  | 11 ++++--
 resources/js/store/index.js                   |  2 +
 resources/js/store/modules/ollas.js           | 39 +++++++++++++++++++
 4 files changed, 57 insertions(+), 16 deletions(-)
 create mode 100644 resources/js/store/modules/ollas.js

diff --git a/resources/js/components/ollas/CantidadOllas.vue b/resources/js/components/ollas/CantidadOllas.vue
index bd85682..d4dcbfb 100644
--- a/resources/js/components/ollas/CantidadOllas.vue
+++ b/resources/js/components/ollas/CantidadOllas.vue
@@ -1,18 +1,13 @@
 <script>
+import { mapMutations, mapState } from "vuex";
+
 export default {
     name: "CantidadOllas",
-    data() {
-        return {
-            cantidadControl: 0,
-        }
-    },
     methods: {
-        decrementar() {
-            this.cantidadControl -= 1;
-        },
-        incrementar() {
-            this.cantidadControl += 1;
-        },
+        ...mapMutations("ollas", ["incrementar", "decrementar"]),
+    },
+    computed: {
+        ...mapState("ollas", ["cantidad_de_ollas"])
     }
 }
 </script>
@@ -23,14 +18,14 @@ export default {
         <div class="field has-addons is-justify-content-center contador">
             <div class="control">
                 <button class="button is-small"
-                        :disabled="cantidadControl < 1"
+                        :disabled="cantidad_de_ollas < 1"
                         @click.capture="decrementar">
                     <i class="fa fa-solid fa-minus"></i>
                 </button>
             </div>
             <div class="control">
                 <input id="cantidad"
-                       v-model="cantidadControl"
+                       v-model="cantidad_de_ollas"
                        class="input is-small"
                        type="number"
                        style="text-align: center">
diff --git a/resources/js/components/ollas/OllasNavBarBrand.vue b/resources/js/components/ollas/OllasNavBarBrand.vue
index 88dd53e..e9bc8ec 100644
--- a/resources/js/components/ollas/OllasNavBarBrand.vue
+++ b/resources/js/components/ollas/OllasNavBarBrand.vue
@@ -1,5 +1,5 @@
 <script>
-import { mapGetters, mapMutations, mapState } from "vuex";
+import { mapActions, mapGetters, mapMutations, mapState } from "vuex";
 import ChismosaDropdown from "../pedidos/ChismosaDropdown.vue";
 
 export default {
@@ -7,18 +7,23 @@ export default {
     components: { ChismosaDropdown },
     computed: {
         ...mapGetters('pedido', ["pedidoDefinido"]),
+        ...mapGetters('ollas', ["montoTotal"]),
+        ...mapState('ui', ["burger_activa"]),
         ...mapState('pedido', ["nombre"]),
-        ...mapState('ui', ["burger_activa"])
     },
     methods: {
+        ...mapActions('ollas', ["getMontoPorOlla"]),
         ...mapMutations('ui', ["toggleBurger"]),
     },
+    async mounted() {
+        await this.getMontoPorOlla();
+    }
 }
 </script>
 
 <template>
     <div class="navbar-item hide-below-1024">
-        <p v-if="pedidoDefinido">{{ nombre }}</p>
+        <p v-if="pedidoDefinido">{{ `${nombre} - Monto total: ${montoTotal}` }}</p>
         <chismosa-dropdown
             v-if="pedidoDefinido"
             class="hide-above-1023"
diff --git a/resources/js/store/index.js b/resources/js/store/index.js
index 210c418..68b1e1d 100644
--- a/resources/js/store/index.js
+++ b/resources/js/store/index.js
@@ -6,6 +6,7 @@ import login from "./modules/login";
 import pedido from "./modules/pedido";
 import productos from "./modules/productos";
 import ui from "./modules/ui";
+import ollas from "./modules/ollas";
 
 Vue.use(Vuex);
 
@@ -17,5 +18,6 @@ export default new Vuex.Store({
         pedido,
         productos,
         ui,
+        ollas,
     },
 });
diff --git a/resources/js/store/modules/ollas.js b/resources/js/store/modules/ollas.js
new file mode 100644
index 0000000..5184a31
--- /dev/null
+++ b/resources/js/store/modules/ollas.js
@@ -0,0 +1,39 @@
+import axios from "axios";
+
+const state = {
+    monto_por_olla: undefined,
+    cantidad_de_ollas: 0,
+};
+
+const mutations = {
+    setMontoPorOlla(state, parametros) {
+        state.monto_por_olla = Number.parseInt(parametros.find(p => p.id === 'monto-olla').valor);
+    },
+    incrementar(state) {
+        state.cantidad_de_ollas += 1;
+    },
+    decrementar(state) {
+        state.cantidad_de_ollas -= 1;
+    },
+};
+
+const actions = {
+    async getMontoPorOlla({ commit }) {
+        const response = await axios.get('/api/parametros');
+        commit('setMontoPorOlla', response.data);
+    },
+};
+
+const getters = {
+    montoTotal() {
+        return state.monto_por_olla * state.cantidad_de_ollas;
+    }
+};
+
+export default {
+    namespaced: true,
+    state,
+    mutations,
+    actions,
+    getters,
+};

From 5c059057b91022c8aff641a8edaf18ba3d925a61 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Mon, 23 Jun 2025 20:12:44 -0300
Subject: [PATCH 49/91] formato

---
 resources/js/components/pedidos/ChismosaDropdown.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/js/components/pedidos/ChismosaDropdown.vue b/resources/js/components/pedidos/ChismosaDropdown.vue
index cb91a74..0a687fd 100644
--- a/resources/js/components/pedidos/ChismosaDropdown.vue
+++ b/resources/js/components/pedidos/ChismosaDropdown.vue
@@ -2,10 +2,10 @@
     <div class="dropdown is-right navbar-item" :class="{'is-active': show_chismosa}">
         <div class="dropdown-trigger">
             <a class="text-a" aria-haspopup="true" :aria-controls="ariaControls" @click.capture="toggleChismosa">
-            <span class="icon is-small mr-1">
-                <img src="/assets/chismosa.png">
-            </span>
-            <span v-text="'$' + total"></span>
+                <span class="icon is-small mr-1">
+                    <img src="/assets/chismosa.png">
+                </span>
+                <span v-text="'$' + total"/>
             </a>
         </div>
     </div>

From 309ce637c850d950abfd988cbd2c87dfc136adf9 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Mon, 23 Jun 2025 20:13:45 -0300
Subject: [PATCH 50/91] Tipado de totales

---
 resources/js/store/modules/pedido.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/js/store/modules/pedido.js b/resources/js/store/modules/pedido.js
index a6405a9..dfcdd7d 100644
--- a/resources/js/store/modules/pedido.js
+++ b/resources/js/store/modules/pedido.js
@@ -25,11 +25,11 @@ const mutations = {
         state.nombre = pedido.nombre;
         state.productos = pedido.productos;
         state.aprobado = pedido.aprobado;
-        state.total = pedido.total;
-        state.total_transporte = pedido.total_transporte;
-        state.cantidad_transporte = pedido.cantidad_transporte;
-        state.total_sin_devoluciones = pedido.total_sin_devoluciones;
-        state.devoluciones_total = pedido.devoluciones_total;
+        state.total = Number.parseFloat(pedido.total.replace(',',''));
+        state.total_transporte = Number.parseInt(pedido.total_transporte.replace(',',''));
+        state.cantidad_transporte = Number.parseInt(pedido.cantidad_transporte.replace(',',''));
+        state.total_sin_devoluciones = Number.parseFloat(pedido.total_sin_devoluciones.replace(',',''));
+        state.devoluciones_total = Number.parseFloat(pedido.devoluciones_total.replace(',',''));
         state.devoluciones_notas = pedido.devoluciones_notas;
     },
     reset(state) {

From 60c327f74bcad752139be974c728723987be7561 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Mon, 23 Jun 2025 20:44:40 -0300
Subject: [PATCH 51/91] Agregado aviso de monto superado

---
 resources/js/components/comunes/NavBar.vue | 13 ++++++++++++-
 resources/js/store/modules/ollas.js        |  3 +++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/resources/js/components/comunes/NavBar.vue b/resources/js/components/comunes/NavBar.vue
index 1f5bda2..ae2b2e4 100644
--- a/resources/js/components/comunes/NavBar.vue
+++ b/resources/js/components/comunes/NavBar.vue
@@ -14,6 +14,13 @@
             <burger/>
         </div>
         <div class="navbar-menu" :class="{'is-active': burger_activa}">
+            <div class="navbar-start is-flex is-justify-content-center is-flex-grow-1">
+                <div v-if="mostrarAviso" class="is-flex is-align-items-center navbar-item">
+                    <span class="tag is-warning is-size-6">
+                        Monto superado
+                    </span>
+                </div>
+            </div>
             <div class="navbar-end">
                 <buscador v-if="pedidoDefinido"/>
                 <chismosa-dropdown v-if="pedidoDefinido"
@@ -43,8 +50,12 @@ export default {
     components: { Burger, Buscador, OllasNavBarBrand, AdminNavBarBrand, ComisionesNavBarBrand, PedidosNavBarBrand, ChismosaDropdown },
     computed: {
         ...mapGetters('pedido', ["pedidoDefinido"]),
+        ...mapGetters('ollas', ["montoSuperado"]),
         ...mapState('login', ["rol"]),
-        ...mapState('ui', ["burger_activa"])
+        ...mapState('ui', ["burger_activa"]),
+        mostrarAviso() {
+            return this.pedidoDefinido && this.rol === 'ollas' && this.montoSuperado;
+        }
     },
     methods: {
         logOut() {
diff --git a/resources/js/store/modules/ollas.js b/resources/js/store/modules/ollas.js
index 5184a31..e91e2dc 100644
--- a/resources/js/store/modules/ollas.js
+++ b/resources/js/store/modules/ollas.js
@@ -27,6 +27,9 @@ const actions = {
 const getters = {
     montoTotal() {
         return state.monto_por_olla * state.cantidad_de_ollas;
+    },
+    montoSuperado: (state, getters, rootState) => {
+        return rootState.pedido.total > getters.montoTotal;
     }
 };
 

From 200c38cb29032f443e8e61bb846903eb851d7103 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Mon, 23 Jun 2025 20:44:51 -0300
Subject: [PATCH 52/91] Agregada columna y campo cantidad_ollas

---
 app/Subpedido.php                             | 10 +++++-
 ...25_06_23_233548_cantidad_ollas_pedidos.php | 32 +++++++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 database/migrations/2025_06_23_233548_cantidad_ollas_pedidos.php

diff --git a/app/Subpedido.php b/app/Subpedido.php
index 6faad84..378b832 100644
--- a/app/Subpedido.php
+++ b/app/Subpedido.php
@@ -12,7 +12,15 @@ use App\Filtros\FiltroDeSubpedido;
 
 class Subpedido extends Model
 {
-    protected $fillable = ['grupo_de_compra_id', 'aprobado', 'nombre', 'devoluciones_total', 'devoluciones_notas', 'tipo_pedido_id'];
+    protected $fillable = [
+        'grupo_de_compra_id',
+        'aprobado',
+        'nombre',
+        'devoluciones_total',
+        'devoluciones_notas',
+        'tipo_pedido_id',
+        'cantidad_ollas'
+    ];
 
     public function productos(): BelongsToMany
     {
diff --git a/database/migrations/2025_06_23_233548_cantidad_ollas_pedidos.php b/database/migrations/2025_06_23_233548_cantidad_ollas_pedidos.php
new file mode 100644
index 0000000..3ae2bd0
--- /dev/null
+++ b/database/migrations/2025_06_23_233548_cantidad_ollas_pedidos.php
@@ -0,0 +1,32 @@
+<?php
+
+use App\Subpedido;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CantidadOllasPedidos extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('subpedidos', function (Blueprint $table) {
+            $table->integer('cantidad_ollas')->nullable();
+        });
+        Subpedido::where('tipo_pedido', 1)->update(['cantidad_ollas' => 0]);
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}

From 0e42cf2c144cb1f5eabd797da763193010bc557f Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Mon, 23 Jun 2025 20:49:57 -0300
Subject: [PATCH 53/91] Agregado drop

---
 .../migrations/2025_06_23_233548_cantidad_ollas_pedidos.php   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/database/migrations/2025_06_23_233548_cantidad_ollas_pedidos.php b/database/migrations/2025_06_23_233548_cantidad_ollas_pedidos.php
index 3ae2bd0..7d79a9e 100644
--- a/database/migrations/2025_06_23_233548_cantidad_ollas_pedidos.php
+++ b/database/migrations/2025_06_23_233548_cantidad_ollas_pedidos.php
@@ -27,6 +27,8 @@ class CantidadOllasPedidos extends Migration
      */
     public function down()
     {
-        //
+        Schema::table('subpedidos', function (Blueprint $table) {
+            $table->dropColumn('cantidad_ollas');
+        });
     }
 }

From d86d52a4782e9861c6c38275d2c06e71b58a27ae Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Mon, 23 Jun 2025 21:15:30 -0300
Subject: [PATCH 54/91] Creado PedidoOllasResource

---
 app/Http/Resources/PedidoOllasResource.php | 30 ++++++++++++++++++++++
 app/Subpedido.php                          |  6 ++++-
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 app/Http/Resources/PedidoOllasResource.php

diff --git a/app/Http/Resources/PedidoOllasResource.php b/app/Http/Resources/PedidoOllasResource.php
new file mode 100644
index 0000000..3af1d40
--- /dev/null
+++ b/app/Http/Resources/PedidoOllasResource.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\TipoPedido;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class PedidoOllasResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request): array
+    {
+        $productos = $this->productos;
+        foreach ($productos as $producto) {
+            $producto['pivot']['total'] = number_format($producto->pivot->cantidad * $producto->precio, 2);
+        }
+        return [
+            'id' => $this->id,
+            'nombre' => $this->nombre,
+            'productos' => $productos,
+            'total' => number_format($this->totalCentralesSinTransporte(),2),
+            'cantidad_de_ollas' => $this->cantidad_ollas,
+        ];
+    }
+}
diff --git a/app/Subpedido.php b/app/Subpedido.php
index 378b832..df989af 100644
--- a/app/Subpedido.php
+++ b/app/Subpedido.php
@@ -65,7 +65,11 @@ class Subpedido extends Model
 
     public function totalCentral()
     {
-        return $this->totalCentralesQueNoPaganTransporte() + $this->totalCentralesQuePaganTransporte() + $this->totalTransporte();
+        return $this->totalCentralesSinTransporte() + $this->totalTransporte();
+    }
+
+    public function totalCentralesSinTransporte() {
+        return $this->totalCentralesQueNoPaganTransporte() + $this->totalCentralesQuePaganTransporte();
     }
 
     public function totalCentralesQueNoPaganTransporte()

From e58e19bfe117b2f2d3f177059093a16705b0edd2 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Mon, 23 Jun 2025 21:16:00 -0300
Subject: [PATCH 55/91] Adaptada logica para usar PedidoOllasResource

---
 app/Http/Controllers/Api/OllasController.php |  4 +-
 resources/js/store/modules/pedido.js         | 42 +++++++++++++-------
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/app/Http/Controllers/Api/OllasController.php b/app/Http/Controllers/Api/OllasController.php
index 542c5ba..46afedf 100644
--- a/app/Http/Controllers/Api/OllasController.php
+++ b/app/Http/Controllers/Api/OllasController.php
@@ -4,7 +4,7 @@ namespace App\Http\Controllers\Api;
 
 use App\GrupoDeCompra;
 use App\Http\Controllers\Controller;
-use App\Http\Resources\SubpedidoResource;
+use App\Http\Resources\PedidoOllasResource;
 use App\TipoPedido;
 
 class OllasController extends Controller
@@ -16,6 +16,6 @@ class OllasController extends Controller
             'nombre' => 'Pedido de Ollas de ' . $gdc->nombre,
             'tipo_pedido_id' => $tipoOlla->id,
         ]);
-        return response()->json(new SubpedidoResource($pedido));
+        return response()->json(new PedidoOllasResource($pedido));
     }
 }
diff --git a/resources/js/store/modules/pedido.js b/resources/js/store/modules/pedido.js
index dfcdd7d..801a0f5 100644
--- a/resources/js/store/modules/pedido.js
+++ b/resources/js/store/modules/pedido.js
@@ -3,16 +3,17 @@ import axios from "axios";
 const state = {
     lastFetch: null,
     grupo_de_compra: null,
-    pedido_id: null,
-    nombre: null,
+    pedido_id: 0,
+    nombre: "",
     productos: [],
-    aprobado: null,
-    total: null,
-    total_transporte: null,
-    cantidad_transporte: null,
-    total_sin_devoluciones: null,
-    devoluciones_total: null,
-    devoluciones_notas: null,
+    aprobado: false,
+    total: 0,
+    total_transporte: 0,
+    cantidad_transporte: 0,
+    total_sin_devoluciones: 0,
+    devoluciones_total: 0,
+    devoluciones_notas: "",
+    cantidad_de_ollas: 0,
 };
 
 const mutations = {
@@ -26,12 +27,25 @@ const mutations = {
         state.productos = pedido.productos;
         state.aprobado = pedido.aprobado;
         state.total = Number.parseFloat(pedido.total.replace(',',''));
-        state.total_transporte = Number.parseInt(pedido.total_transporte.replace(',',''));
-        state.cantidad_transporte = Number.parseInt(pedido.cantidad_transporte.replace(',',''));
-        state.total_sin_devoluciones = Number.parseFloat(pedido.total_sin_devoluciones.replace(',',''));
-        state.devoluciones_total = Number.parseFloat(pedido.devoluciones_total.replace(',',''));
+        state.total_transporte = Number.parseInt(pedido.total_transporte?.replace(',',''));
+        state.cantidad_transporte = Number.parseInt(pedido.cantidad_transporte?.replace(',',''));
+        state.total_sin_devoluciones = Number.parseFloat(pedido.total_sin_devoluciones?.replace(',',''));
+        state.devoluciones_total = Number.parseFloat(pedido.devoluciones_total?.replace(',',''));
         state.devoluciones_notas = pedido.devoluciones_notas;
     },
+    setPedidoDeOllas(state, pedido) {
+        state.lastFetch = new Date();
+        state.pedido_id = pedido.id;
+        state.nombre = pedido.nombre;
+        state.productos = pedido.productos;
+        state.total = Number.parseFloat(pedido.total.replace(',',''));
+        delete state.aprobado;
+        delete state.total_transporte;
+        delete state.cantidad_transporte;
+        delete state.total_sin_devoluciones;
+        delete state.devoluciones_total;
+        delete state.devoluciones_notas;
+    },
     reset(state) {
         state.lastFetch = null;
         state.pedido_id = null;
@@ -96,7 +110,7 @@ const actions = {
     },
     async getPedidoDeOllas({ commit }) {
         const response = await axios.get(`/api/ollas/${state.grupo_de_compra.id}`);
-        commit('setPedido', response.data);
+        commit('setPedidoDeOllas', response.data);
     },
 };
 

From d261506775027aa842c9b144a2220405856e54f6 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Mon, 23 Jun 2025 22:48:51 -0300
Subject: [PATCH 56/91] Arreglada columna

---
 .../migrations/2025_06_23_233548_cantidad_ollas_pedidos.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/database/migrations/2025_06_23_233548_cantidad_ollas_pedidos.php b/database/migrations/2025_06_23_233548_cantidad_ollas_pedidos.php
index 7d79a9e..d4d4393 100644
--- a/database/migrations/2025_06_23_233548_cantidad_ollas_pedidos.php
+++ b/database/migrations/2025_06_23_233548_cantidad_ollas_pedidos.php
@@ -17,7 +17,7 @@ class CantidadOllasPedidos extends Migration
         Schema::table('subpedidos', function (Blueprint $table) {
             $table->integer('cantidad_ollas')->nullable();
         });
-        Subpedido::where('tipo_pedido', 1)->update(['cantidad_ollas' => 0]);
+        Subpedido::where('tipo_pedido_id', 1)->update(['cantidad_ollas' => 0]);
     }
 
     /**

From 5a1d95c636a47a3e12fcc2c8d28ecb4d72697d45 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Mon, 23 Jun 2025 22:49:02 -0300
Subject: [PATCH 57/91] Api de ollas movido a web

---
 app/Http/Controllers/Api/OllasController.php | 21 ---------------
 app/Http/Controllers/OllasController.php     | 28 ++++++++++++++++++++
 routes/api.php                               |  4 ---
 routes/web.php                               |  6 +++--
 4 files changed, 32 insertions(+), 27 deletions(-)
 delete mode 100644 app/Http/Controllers/Api/OllasController.php

diff --git a/app/Http/Controllers/Api/OllasController.php b/app/Http/Controllers/Api/OllasController.php
deleted file mode 100644
index 46afedf..0000000
--- a/app/Http/Controllers/Api/OllasController.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Api;
-
-use App\GrupoDeCompra;
-use App\Http\Controllers\Controller;
-use App\Http\Resources\PedidoOllasResource;
-use App\TipoPedido;
-
-class OllasController extends Controller
-{
-    public function pedido(GrupoDeCompra $gdc)
-    {
-        $tipoOlla = TipoPedido::firstOrCreate(['nombre' => 'olla']);
-        $pedido = $gdc->subpedidos()->firstOrCreate([
-            'nombre' => 'Pedido de Ollas de ' . $gdc->nombre,
-            'tipo_pedido_id' => $tipoOlla->id,
-        ]);
-        return response()->json(new PedidoOllasResource($pedido));
-    }
-}
diff --git a/app/Http/Controllers/OllasController.php b/app/Http/Controllers/OllasController.php
index 7ac5dcb..f565f16 100644
--- a/app/Http/Controllers/OllasController.php
+++ b/app/Http/Controllers/OllasController.php
@@ -2,10 +2,38 @@
 
 namespace App\Http\Controllers;
 
+use App\GrupoDeCompra;
+use App\Http\Resources\PedidoOllasResource;
+use App\TipoPedido;
+use Illuminate\Http\Request;
+
 class OllasController extends Controller
 {
     public function show()
     {
         return view('auth/login');
     }
+
+    public function pedido(GrupoDeCompra $gdc)
+    {
+        $tipoOlla = TipoPedido::firstOrCreate(['nombre' => 'olla']);
+        $pedido = $gdc->subpedidos()->firstOrCreate([
+            'nombre' => 'Pedido de Ollas de ' . $gdc->nombre,
+            'tipo_pedido_id' => $tipoOlla->id,
+        ]);
+        return response()->json(new PedidoOllasResource($pedido));
+    }
+
+    public function actualizarCantidadOllas(GrupoDeCompra $gdc, Request $request)
+    {
+        $valid = $request->validate([
+            'cantidad' => 'required|numeric|min:0',
+        ]);
+        $pedido = $gdc->subpedidos()->where([
+            'nombre' => 'Pedido de Ollas de ' . $gdc->nombre
+        ])->first();
+        $pedido->cantidad_ollas = $valid['cantidad'];
+        $pedido->save();
+        return response()->noContent();
+    }
 }
diff --git a/routes/api.php b/routes/api.php
index 9043edc..e6220ba 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -49,9 +49,5 @@ Route::middleware('api')->group(function() {
         Route::get('/','Api\ProductoController@index');
 	});
 
-    Route::prefix('ollas')->group(function() {
-        Route::get('/{gdc}','Api\OllasController@pedido');
-    });
-
     Route::get('/parametros', 'ComisionesController@obtenerParametros');
 });
diff --git a/routes/web.php b/routes/web.php
index 324eda0..24e8858 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -61,6 +61,8 @@ Route::middleware(['auth', 'role:comision'])->group( function() {
 
 Route::get('/ollas/login', 'OllasController@show')->name('ollas.login');
 
-Route::middleware(['auth', 'role:ollas'])->group( function() {
-    Route::get('/ollas', 'RouteController@main')->name('ollas');
+Route::middleware(['auth', 'role:ollas'])->prefix('ollas')->group( function() {
+    Route::get('/', 'RouteController@main')->name('ollas');
+    Route::get('/{gdc}','OllasController@pedido');
+    Route::put('/{gdc}/cantidad','OllasController@actualizarCantidadOllas');
 });

From a0ee4131c8b0d6a848644724ae100ff94b64299c Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Mon, 23 Jun 2025 22:49:28 -0300
Subject: [PATCH 58/91] =?UTF-8?q?Agregada=20l=C3=B3gica=20de=20cantidad=20?=
 =?UTF-8?q?de=20ollas?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/components/ollas/CantidadOllas.vue     | 48 +++++++++++++++----
 resources/js/store/modules/ollas.js           | 18 ++++---
 resources/js/store/modules/pedido.js          |  6 ++-
 3 files changed, 51 insertions(+), 21 deletions(-)

diff --git a/resources/js/components/ollas/CantidadOllas.vue b/resources/js/components/ollas/CantidadOllas.vue
index d4dcbfb..b814545 100644
--- a/resources/js/components/ollas/CantidadOllas.vue
+++ b/resources/js/components/ollas/CantidadOllas.vue
@@ -1,14 +1,42 @@
 <script>
-import { mapMutations, mapState } from "vuex";
+import { mapActions, mapMutations, mapState } from "vuex";
 
 export default {
-    name: "CantidadOllas",
-    methods: {
-        ...mapMutations("ollas", ["incrementar", "decrementar"]),
+  name: "CantidadOllas",
+  methods: {
+    ...mapActions("ollas", ["actualizarCantidadOllas"]),
+    ...mapMutations("pedido", ["setCantidadOllas"]),
+    incrementar() {
+      this.control += 1;
+      this.actualizarDebounced();
     },
-    computed: {
-        ...mapState("ollas", ["cantidad_de_ollas"])
+    decrementar() {
+      this.control -= 1;
+      this.actualizarDebounced();
+    },
+    async actualizarDebounced() {
+      const params = { cantidad: this.control };
+      clearTimeout(this.debounceTimer);
+      this.debounceTimer = setTimeout(() => {
+        this.setCantidadOllas(params);
+        this.actualizarCantidadOllas(params);
+      }, 500);
     }
+  },
+  computed: {
+      ...mapState("pedido", ["cantidad_de_ollas"])
+  },
+  data() {
+    return {
+      debounceTimer: null,
+      control: 0,
+    };
+  },
+  watch: {
+    cantidad_de_ollas() {
+      this.control = this.cantidad_de_ollas;
+    }
+  },
 }
 </script>
 
@@ -18,17 +46,17 @@ export default {
         <div class="field has-addons is-justify-content-center contador">
             <div class="control">
                 <button class="button is-small"
-                        :disabled="cantidad_de_ollas < 1"
+                        :disabled="control < 1"
                         @click.capture="decrementar">
                     <i class="fa fa-solid fa-minus"></i>
                 </button>
             </div>
             <div class="control">
                 <input id="cantidad"
-                       v-model="cantidad_de_ollas"
-                       class="input is-small"
+                       v-model="control"
+                       class="input is-small has-text-centered"
                        type="number"
-                       style="text-align: center">
+                       @input="actualizarDebounced">
             </div>
             <div class="control">
                 <button class="button is-small" @click="incrementar">
diff --git a/resources/js/store/modules/ollas.js b/resources/js/store/modules/ollas.js
index e91e2dc..02d32ee 100644
--- a/resources/js/store/modules/ollas.js
+++ b/resources/js/store/modules/ollas.js
@@ -2,19 +2,12 @@ import axios from "axios";
 
 const state = {
     monto_por_olla: undefined,
-    cantidad_de_ollas: 0,
 };
 
 const mutations = {
     setMontoPorOlla(state, parametros) {
         state.monto_por_olla = Number.parseInt(parametros.find(p => p.id === 'monto-olla').valor);
     },
-    incrementar(state) {
-        state.cantidad_de_ollas += 1;
-    },
-    decrementar(state) {
-        state.cantidad_de_ollas -= 1;
-    },
 };
 
 const actions = {
@@ -22,13 +15,18 @@ const actions = {
         const response = await axios.get('/api/parametros');
         commit('setMontoPorOlla', response.data);
     },
+    async actualizarCantidadOllas({ rootState }, { cantidad: cantidad}) {
+        const barrio = rootState.pedido.grupo_de_compra.id;
+        const params = { cantidad : cantidad };
+        await axios.put(`/ollas/${barrio}/cantidad`, params);
+    }
 };
 
 const getters = {
-    montoTotal() {
-        return state.monto_por_olla * state.cantidad_de_ollas;
+    montoTotal(state, _, rootState) {
+        return state.monto_por_olla * rootState.pedido.cantidad_de_ollas;
     },
-    montoSuperado: (state, getters, rootState) => {
+    montoSuperado: (_, getters, rootState) => {
         return rootState.pedido.total > getters.montoTotal;
     }
 };
diff --git a/resources/js/store/modules/pedido.js b/resources/js/store/modules/pedido.js
index 801a0f5..2de28bd 100644
--- a/resources/js/store/modules/pedido.js
+++ b/resources/js/store/modules/pedido.js
@@ -39,6 +39,7 @@ const mutations = {
         state.nombre = pedido.nombre;
         state.productos = pedido.productos;
         state.total = Number.parseFloat(pedido.total.replace(',',''));
+        state.cantidad_de_ollas = Number.parseInt(pedido.cantidad_de_ollas);
         delete state.aprobado;
         delete state.total_transporte;
         delete state.cantidad_transporte;
@@ -58,6 +59,9 @@ const mutations = {
         state.total_sin_devoluciones = null;
         state.devoluciones_total = null;
         state.devoluciones_notas = null;
+    },
+    setCantidadOllas(state, { cantidad }) {
+        state.cantidad_de_ollas = cantidad;
     }
 };
 
@@ -109,7 +113,7 @@ const actions = {
         commit('reset');
     },
     async getPedidoDeOllas({ commit }) {
-        const response = await axios.get(`/api/ollas/${state.grupo_de_compra.id}`);
+        const response = await axios.get(`/ollas/${state.grupo_de_compra.id}`);
         commit('setPedidoDeOllas', response.data);
     },
 };

From e49c0432315679742edfe158c040561d7aa50855 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Mon, 23 Jun 2025 22:49:49 -0300
Subject: [PATCH 59/91] Estilo

---
 resources/js/components/comunes/NavBar.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/resources/js/components/comunes/NavBar.vue b/resources/js/components/comunes/NavBar.vue
index ae2b2e4..a84edb1 100644
--- a/resources/js/components/comunes/NavBar.vue
+++ b/resources/js/components/comunes/NavBar.vue
@@ -15,7 +15,7 @@
         </div>
         <div class="navbar-menu" :class="{'is-active': burger_activa}">
             <div class="navbar-start is-flex is-justify-content-center is-flex-grow-1">
-                <div v-if="mostrarAviso" class="is-flex is-align-items-center navbar-item">
+                <div v-if="mostrarAviso" class="is-absolute-center is-flex is-align-items-center navbar-item">
                     <span class="tag is-warning is-size-6">
                         Monto superado
                     </span>
@@ -67,4 +67,9 @@ export default {
 </script>
 
 <style>
+.is-absolute-center {
+    position: absolute;
+    left: 50%;
+    transform: translateX(-50%);
+}
 </style>

From 7c8c5ad60d029b1953d9547054a43c1c085d3536 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Mon, 23 Jun 2025 22:53:32 -0300
Subject: [PATCH 60/91] Estilo

---
 resources/js/components/ollas/CantidadOllas.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/components/ollas/CantidadOllas.vue b/resources/js/components/ollas/CantidadOllas.vue
index b814545..4cffeba 100644
--- a/resources/js/components/ollas/CantidadOllas.vue
+++ b/resources/js/components/ollas/CantidadOllas.vue
@@ -54,7 +54,7 @@ export default {
             <div class="control">
                 <input id="cantidad"
                        v-model="control"
-                       class="input is-small has-text-centered"
+                       class="input is-small has-text-centered m-0 p-0"
                        type="number"
                        @input="actualizarDebounced">
             </div>

From 7c2f59207291f9b616fe29a4162b01115224a974 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Mon, 23 Jun 2025 23:00:42 -0300
Subject: [PATCH 61/91] Estilo

---
 resources/js/components/pedidos/NavMigas.vue | 2 +-
 resources/sass/app.scss                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/js/components/pedidos/NavMigas.vue b/resources/js/components/pedidos/NavMigas.vue
index a76e77f..ef0ec9c 100644
--- a/resources/js/components/pedidos/NavMigas.vue
+++ b/resources/js/components/pedidos/NavMigas.vue
@@ -1,5 +1,5 @@
 <template>
-    <nav class="breadcrumb is-centered has-background-danger-light is-fixed-top"
+    <nav class="breadcrumb is-centered has-background-danger-light is-fixed-top mb-0"
          aria-label="breadcrumbs">
         <ul class="mt-4">
             <li v-for="(miga, i) in migas" :key="i" :class="{'is-active': i === migaActiva}">
diff --git a/resources/sass/app.scss b/resources/sass/app.scss
index a7ae300..918402e 100644
--- a/resources/sass/app.scss
+++ b/resources/sass/app.scss
@@ -18,7 +18,7 @@ form, #root, #login-form {
 }
 
 main.has-top-padding {
-	padding-top: 4.5rem !important;
+	padding-top: 4rem !important;
 }
 
 table.table td {

From 86bf66ebcd5ed2b5ddf0c1a3686dfcb40118af3b Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Mon, 23 Jun 2025 23:15:57 -0300
Subject: [PATCH 62/91] =?UTF-8?q?Cambiada=20informaci=C3=B3n=20de=20total?=
 =?UTF-8?q?=20a=20chismosa?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/js/components/ollas/OllasNavBarBrand.vue   |  2 +-
 resources/js/components/pedidos/ChismosaDropdown.vue | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/resources/js/components/ollas/OllasNavBarBrand.vue b/resources/js/components/ollas/OllasNavBarBrand.vue
index e9bc8ec..d0af167 100644
--- a/resources/js/components/ollas/OllasNavBarBrand.vue
+++ b/resources/js/components/ollas/OllasNavBarBrand.vue
@@ -23,7 +23,7 @@ export default {
 
 <template>
     <div class="navbar-item hide-below-1024">
-        <p v-if="pedidoDefinido">{{ `${nombre} - Monto total: ${montoTotal}` }}</p>
+        <p v-if="pedidoDefinido">{{ `${nombre}` }}</p>
         <chismosa-dropdown
             v-if="pedidoDefinido"
             class="hide-above-1023"
diff --git a/resources/js/components/pedidos/ChismosaDropdown.vue b/resources/js/components/pedidos/ChismosaDropdown.vue
index 0a687fd..8aad7f7 100644
--- a/resources/js/components/pedidos/ChismosaDropdown.vue
+++ b/resources/js/components/pedidos/ChismosaDropdown.vue
@@ -5,7 +5,7 @@
                 <span class="icon is-small mr-1">
                     <img src="/assets/chismosa.png">
                 </span>
-                <span v-text="'$' + total"/>
+                <span v-text="textoChismosa"/>
             </a>
         </div>
     </div>
@@ -13,7 +13,7 @@
 
 <script>
 import Chismosa from './Chismosa.vue'
-import { mapMutations, mapState } from "vuex";
+import { mapGetters, mapMutations, mapState } from "vuex";
 export default {
     components: {
         Chismosa
@@ -27,6 +27,13 @@ export default {
     computed: {
         ...mapState('pedido',["total"]),
         ...mapState('ui',["show_chismosa"]),
+        ...mapState('login', ["rol"]),
+        ...mapGetters('ollas', ["montoTotal"]),
+        textoChismosa() {
+            if (this.rol === 'ollas')
+                return `$${this.total} / $${this.montoTotal}`;
+            return `$${this.total}`;
+        },
     },
     methods: {
         ...mapMutations('ui',["toggleChismosa"]),

From c84ab5f4756436f29292fb1ce45a352432e93530 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Mon, 23 Jun 2025 23:36:41 -0300
Subject: [PATCH 63/91] Estilo

---
 resources/js/store/modules/login.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/js/store/modules/login.js b/resources/js/store/modules/login.js
index 2825640..1cbfffb 100644
--- a/resources/js/store/modules/login.js
+++ b/resources/js/store/modules/login.js
@@ -103,9 +103,9 @@ const getters = {
                 };
             case 'comisiones':
                 return {
-                    fondo: "",
-                    texto: "",
-                    botones: "is-dark"
+                    fondo: "has-background-dark",
+                    texto: "has-text-white",
+                    botones: "is-white",
                 };
             case 'ollas':
                 return {

From b1fb744684adc500b796d2c56233010ccc6aaa6a Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Mon, 23 Jun 2025 23:47:15 -0300
Subject: [PATCH 64/91] Simplificado

---
 resources/sass/app.scss | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/resources/sass/app.scss b/resources/sass/app.scss
index 918402e..3db0826 100644
--- a/resources/sass/app.scss
+++ b/resources/sass/app.scss
@@ -13,7 +13,7 @@ html, body {
     height: 100%;
 }
 
-form, #root, #login-form {
+form, #root, #login-form, #main {
     height: 100%;
 }
 
@@ -35,10 +35,6 @@ table.table td {
 	z-index: 30;
 }
 
-#main {
-	height: 100%;
-}
-
 .container {
 	max-height: 100% !important;
 }

From e7a8d89a290a409fc7b52407553a3365c149fcf2 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Wed, 25 Jun 2025 14:53:55 -0300
Subject: [PATCH 65/91] Cambio cantidad ollas, ahora es una solapa toggleable
 que baja desde las migas

---
 .../js/components/ollas/CantidadOllas.vue     | 189 ++++++++++++------
 resources/js/components/ollas/OllasBody.vue   |  12 +-
 .../js/components/pedidos/PedidosMain.vue     |   4 +-
 3 files changed, 134 insertions(+), 71 deletions(-)

diff --git a/resources/js/components/ollas/CantidadOllas.vue b/resources/js/components/ollas/CantidadOllas.vue
index 4cffeba..c287c5d 100644
--- a/resources/js/components/ollas/CantidadOllas.vue
+++ b/resources/js/components/ollas/CantidadOllas.vue
@@ -1,71 +1,138 @@
+<template>
+    <div class="ollas-box mt-0 py-0">
+        <div class="header-row">
+            <span v-if="visible" class="label">Cantidad de ollas:</span>
+            <span v-else class="label">Cantidad de ollas: {{ control }}</span>
+        </div>
+        <transition name="slide-fade">
+            <div v-if="visible" class="field my-1 has-addons is-justify-content-center">
+                <div class="control">
+                    <button class="button is-small" :disabled="control < 1" @click="decrementar">
+                        <i class="fas fa-minus" />
+                    </button>
+                </div>
+                <div class="control">
+                    <input
+                        type="number"
+                        min="0"
+                        v-model.number="control"
+                        @input="actualizarDebounced"
+                        class="input is-small input-centered"
+                    />
+                </div>
+                <div class="control">
+                    <button class="button is-small" @click="incrementar">
+                        <i class="fas fa-plus" />
+                    </button>
+                </div>
+            </div>
+        </transition>
+        <span class="icon-toggle mt-2 mb-0 pb-0" @click="visible = !visible">
+          <i :class="iconoToggle"/>
+        </span>
+    </div>
+</template>
+
 <script>
 import { mapActions, mapMutations, mapState } from "vuex";
 
 export default {
-  name: "CantidadOllas",
-  methods: {
-    ...mapActions("ollas", ["actualizarCantidadOllas"]),
-    ...mapMutations("pedido", ["setCantidadOllas"]),
-    incrementar() {
-      this.control += 1;
-      this.actualizarDebounced();
+    name: "CantidadOllas",
+    data() {
+        return {
+            control: 0,
+            visible: true,
+            debounceTimer: null,
+        };
     },
-    decrementar() {
-      this.control -= 1;
-      this.actualizarDebounced();
+    computed: {
+        ...mapState("pedido", ["cantidad_de_ollas"]),
+        iconoToggle() {
+            return this.visible? 'fas fa-angle-up' : 'fas fa-angle-down'
+        }
     },
-    async actualizarDebounced() {
-      const params = { cantidad: this.control };
-      clearTimeout(this.debounceTimer);
-      this.debounceTimer = setTimeout(() => {
-        this.setCantidadOllas(params);
-        this.actualizarCantidadOllas(params);
-      }, 500);
-    }
-  },
-  computed: {
-      ...mapState("pedido", ["cantidad_de_ollas"])
-  },
-  data() {
-    return {
-      debounceTimer: null,
-      control: 0,
-    };
-  },
-  watch: {
-    cantidad_de_ollas() {
-      this.control = this.cantidad_de_ollas;
-    }
-  },
-}
+    watch: {
+        cantidad_de_ollas(newVal) {
+            this.control = newVal;
+        },
+    },
+    methods: {
+        ...mapActions("ollas", ["actualizarCantidadOllas"]),
+        ...mapMutations("pedido", ["setCantidadOllas"]),
+        incrementar() {
+            this.control++;
+            this.actualizarDebounced();
+        },
+        decrementar() {
+            if (this.control > 0) {
+                this.control--;
+                this.actualizarDebounced();
+            }
+        },
+        actualizarDebounced() {
+            clearTimeout(this.debounceTimer);
+            const params = { cantidad: this.control };
+            this.debounceTimer = setTimeout(() => {
+                this.setCantidadOllas(params);
+                this.actualizarCantidadOllas(params);
+            }, 500);
+        },
+    },
+    mounted() {
+        this.control = this.cantidad_de_ollas;
+    },
+};
 </script>
 
-<template>
-    <div class="notification has-text-centered">
-        <label class="label">Cantidad de ollas:</label>
-        <div class="field has-addons is-justify-content-center contador">
-            <div class="control">
-                <button class="button is-small"
-                        :disabled="control < 1"
-                        @click.capture="decrementar">
-                    <i class="fa fa-solid fa-minus"></i>
-                </button>
-            </div>
-            <div class="control">
-                <input id="cantidad"
-                       v-model="control"
-                       class="input is-small has-text-centered m-0 p-0"
-                       type="number"
-                       @input="actualizarDebounced">
-            </div>
-            <div class="control">
-                <button class="button is-small" @click="incrementar">
-                    <i class="fa fa-solid fa-plus"></i>
-                </button>
-            </div>
-        </div>
-    </div>
-</template>
-
 <style scoped>
+.ollas-box {
+    position: relative;
+    left: 0;
+    right: 0;
+    top: -1.5rem;
+    z-index: 2;
+    padding: 1rem 1.5rem;
+    background: white;
+    box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1);
+    border-radius: 10px;
+    width: fit-content;
+    margin: 1rem auto;
+    text-align: center;
+}
+
+.header-row {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    gap: 0.5rem;
+}
+
+.label {
+    font-weight: 600;
+}
+
+.input-centered {
+    width: 60px;
+    text-align: center;
+}
+
+.icon-toggle {
+    cursor: pointer;
+    color: #888;
+    transition: color 0.2s;
+}
+.icon-toggle:hover {
+    color: #000;
+}
+
+/* Animation */
+.slide-fade-enter-active,
+.slide-fade-leave-active {}
+.slide-fade-enter-from,
+.slide-fade-leave-to {
+    opacity: 0;
+    transform: translateY(-10px);
+    max-height: 0;
+    overflow: hidden;
+}
 </style>
diff --git a/resources/js/components/ollas/OllasBody.vue b/resources/js/components/ollas/OllasBody.vue
index 1e221d7..dc27abd 100644
--- a/resources/js/components/ollas/OllasBody.vue
+++ b/resources/js/components/ollas/OllasBody.vue
@@ -1,11 +1,10 @@
 <script>
 import PedidosMain from "../pedidos/PedidosMain.vue";
 import { mapActions, mapMutations } from "vuex";
-import CantidadOllas from "./CantidadOllas.vue";
 
 export default {
     name: "OllasBody",
-    components: { CantidadOllas, PedidosMain },
+    components: { PedidosMain },
     methods: {
         ...mapActions('pedido', ["getPedidoDeOllas", "getGrupoDeCompra"]),
         ...mapMutations('ui', ["migasOllas"])
@@ -19,15 +18,10 @@ export default {
 </script>
 
 <template>
-    <div id="ollas-body" class="pb-6 mb-6">
-        <pedidos-main>
-            <template v-slot:cartel>
-                <cantidad-ollas/>
-            </template>
-        </pedidos-main>
+    <div id="ollas-body" class="mt-0 mb-6 pb-0 pb-6">
+        <pedidos-main/>
     </div>
 </template>
 
 <style scoped>
-
 </style>
diff --git a/resources/js/components/pedidos/PedidosMain.vue b/resources/js/components/pedidos/PedidosMain.vue
index fdcf5f9..63b7188 100644
--- a/resources/js/components/pedidos/PedidosMain.vue
+++ b/resources/js/components/pedidos/PedidosMain.vue
@@ -4,10 +4,11 @@ import Canasta from "./Canasta.vue";
 import Chismosa from "./Chismosa.vue";
 import NavMigas from "./NavMigas.vue";
 import { mapActions, mapState } from "vuex";
+import CantidadOllas from "../ollas/CantidadOllas.vue";
 
 export default defineComponent({
     name: "PedidosMain",
-    components: { NavMigas, Chismosa, Canasta },
+    components: { CantidadOllas, NavMigas, Chismosa, Canasta },
     computed: {
         ...mapState('ui', ["show_chismosa"]),
     },
@@ -23,6 +24,7 @@ export default defineComponent({
 <template>
     <div>
         <nav-migas/>
+        <cantidad-ollas/>
         <div class="columns">
             <div class="column" :class="{ 'is-two-thirds-desktop is-hidden-touch': show_chismosa }">
                 <slot name="cartel"></slot>

From 6d55b77a95aeec3469163cd6b645ec8f49044c20 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Sun, 29 Jun 2025 16:36:11 -0300
Subject: [PATCH 66/91] Cambio estilo comisiones

---
 resources/js/store/modules/login.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/js/store/modules/login.js b/resources/js/store/modules/login.js
index 1cbfffb..f74d2e3 100644
--- a/resources/js/store/modules/login.js
+++ b/resources/js/store/modules/login.js
@@ -103,9 +103,9 @@ const getters = {
                 };
             case 'comisiones':
                 return {
-                    fondo: "has-background-dark",
+                    fondo: "has-background-grey",
                     texto: "has-text-white",
-                    botones: "is-white",
+                    botones: "danger-dark-button",
                 };
             case 'ollas':
                 return {

From 9c234107e8418de4494f1213c88c7cf1baa4554b Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Sun, 29 Jun 2025 17:28:10 -0300
Subject: [PATCH 67/91] Solo mostrar input the cantidad de ollas para pedidos
 de ollas

---
 resources/js/components/pedidos/PedidosMain.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/js/components/pedidos/PedidosMain.vue b/resources/js/components/pedidos/PedidosMain.vue
index 63b7188..12fdab2 100644
--- a/resources/js/components/pedidos/PedidosMain.vue
+++ b/resources/js/components/pedidos/PedidosMain.vue
@@ -11,6 +11,7 @@ export default defineComponent({
     components: { CantidadOllas, NavMigas, Chismosa, Canasta },
     computed: {
         ...mapState('ui', ["show_chismosa"]),
+        ...mapState('login', ["rol"])
     },
     methods: {
         ...mapActions('productos', ["init"]),
@@ -24,7 +25,7 @@ export default defineComponent({
 <template>
     <div>
         <nav-migas/>
-        <cantidad-ollas/>
+        <cantidad-ollas v-if="rol === 'ollas'"/>
         <div class="columns">
             <div class="column" :class="{ 'is-two-thirds-desktop is-hidden-touch': show_chismosa }">
                 <slot name="cartel"></slot>

From 20c7d33aced6dfafd8a7604f118db7c434ab6003 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Sun, 29 Jun 2025 17:28:25 -0300
Subject: [PATCH 68/91] Formato

---
 app/Producto.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Producto.php b/app/Producto.php
index f365f0d..5ce7d15 100644
--- a/app/Producto.php
+++ b/app/Producto.php
@@ -59,7 +59,8 @@ class Producto extends Model
 
     static public function cantidadesPorBarrio(): Collection
     {
-        $barrios = GrupoDeCompra::barriosMenosPruebaConPedidosAprobados()->pluck('id', 'nombre');
+        $barrios = GrupoDeCompra::barriosMenosPruebaConPedidosAprobados()
+            ->pluck('id', 'nombre');
 
         $columnasBarrios = $barrios->map(function ($id, $nombre) {
             return DB::raw("

From 3a6face6bacf2db6d2ec948bc5a96f19e6c2fc7d Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Sun, 29 Jun 2025 17:34:09 -0300
Subject: [PATCH 69/91] Cerrando error al mandar version corregida

---
 resources/js/components/pedidos/ProductoCantidad.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/js/components/pedidos/ProductoCantidad.vue b/resources/js/components/pedidos/ProductoCantidad.vue
index b321bb5..8deebec 100644
--- a/resources/js/components/pedidos/ProductoCantidad.vue
+++ b/resources/js/components/pedidos/ProductoCantidad.vue
@@ -117,6 +117,7 @@ export default {
                 this.notas_warning_visible = true;
                 return;
             }
+            this.notas_warning_visible = false;
             await this.modificarChismosa({
                 producto_id: this.producto_id,
                 cantidad: this.cantidadControl,

From 11d8bd1920e80cd0d2540e713fefc9d4bcd2ea51 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Sun, 29 Jun 2025 17:34:49 -0300
Subject: [PATCH 70/91] Arreglo nombre de campo

---
 app/Http/Controllers/Api/SubpedidoController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Api/SubpedidoController.php b/app/Http/Controllers/Api/SubpedidoController.php
index beea4f0..e340e01 100644
--- a/app/Http/Controllers/Api/SubpedidoController.php
+++ b/app/Http/Controllers/Api/SubpedidoController.php
@@ -31,7 +31,7 @@ class SubpedidoController extends Controller
 
         if (Subpedido::where([
                         "nombre" => $validado["nombre"],
-                        "tipo_pedido_id" => $validado["tipo_pedido_id"],
+                        "tipo_pedido_id" => $validado["tipo_id"],
                         "grupo_de_compra_id" => $validado["grupo_de_compra_id"]])
                     ->get()
                     ->count())

From e521b4521fa039c2d691454131b68ad77266c0d2 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Sun, 29 Jun 2025 17:50:08 -0300
Subject: [PATCH 71/91] Removido whereHas porque rompe el metodo

---
 app/GrupoDeCompra.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/GrupoDeCompra.php b/app/GrupoDeCompra.php
index 0ebac9f..f6dad45 100644
--- a/app/GrupoDeCompra.php
+++ b/app/GrupoDeCompra.php
@@ -295,9 +295,6 @@ class GrupoDeCompra extends Model
     public static function barriosMenosPruebaConPedidosAprobados(): Builder
     {
         return self::where('nombre', '<>', 'PRUEBA')
-            ->whereHas('subpedidos', function ($query) {
-                $query->where('aprobado', true);
-            })
             ->orderBy('region')
             ->orderBy('nombre');
     }

From f96160118418d65910bf38a9a6f1dab575ac0c2b Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Sun, 29 Jun 2025 20:05:10 -0300
Subject: [PATCH 72/91] Cambio nombre

---
 app/GrupoDeCompra.php | 6 +++---
 app/Producto.php      | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/GrupoDeCompra.php b/app/GrupoDeCompra.php
index f6dad45..3395925 100644
--- a/app/GrupoDeCompra.php
+++ b/app/GrupoDeCompra.php
@@ -171,7 +171,7 @@ class GrupoDeCompra extends Model
      */
     public static function exportarPedidosBarrialesAPdf()
     {
-        $barrios = GrupoDeCompra::barriosMenosPruebaConPedidosAprobados()->get();
+        $barrios = GrupoDeCompra::barriosMenosPrueba()->get();
         $fecha = now()->format('Y-m-d');
         $filepath = 'pedidos_por_barrio-' . $fecha . '.pdf';
         PdfHelper::exportarPedidos($filepath, $barrios);
@@ -292,7 +292,7 @@ class GrupoDeCompra extends Model
         return array($records, $i, $cantidad);
     }
 
-    public static function barriosMenosPruebaConPedidosAprobados(): Builder
+    public static function barriosMenosPrueba(): Builder
     {
         return self::where('nombre', '<>', 'PRUEBA')
             ->orderBy('region')
@@ -302,7 +302,7 @@ class GrupoDeCompra extends Model
     public static function transportePorBarrio(): array
     {
         $result = [];
-        $barrios = GrupoDeCompra::barriosMenosPruebaConPedidosAprobados()->get();
+        $barrios = GrupoDeCompra::barriosMenosPrueba()->get();
 
         foreach ($barrios as $barrio) {
             $result[] = $barrio->cantidadTransporte();
diff --git a/app/Producto.php b/app/Producto.php
index 5ce7d15..b0ab3a4 100644
--- a/app/Producto.php
+++ b/app/Producto.php
@@ -59,7 +59,7 @@ class Producto extends Model
 
     static public function cantidadesPorBarrio(): Collection
     {
-        $barrios = GrupoDeCompra::barriosMenosPruebaConPedidosAprobados()
+        $barrios = GrupoDeCompra::barriosMenosPrueba()
             ->pluck('id', 'nombre');
 
         $columnasBarrios = $barrios->map(function ($id, $nombre) {
@@ -93,7 +93,7 @@ class Producto extends Model
     static public function planillaTotales()
     {
         $headers = ['Producto'];
-        $barrios = GrupoDeCompra::barriosMenosPruebaConPedidosAprobados()->pluck('nombre')->toArray();
+        $barrios = GrupoDeCompra::barriosMenosPrueba()->pluck('nombre')->toArray();
         $headers = array_merge($headers, $barrios);
 
         $cantidadesPorBarrio = self::cantidadesPorBarrio();
@@ -152,7 +152,7 @@ class Producto extends Model
      */
     static public function planillaNotas() {
         $headers = ['Producto'];
-        $barrios = GrupoDeCompra::barriosMenosPruebaConPedidosAprobados()
+        $barrios = GrupoDeCompra::barriosMenosPrueba()
             ->pluck('nombre')->toArray();
         $headers = array_merge($headers, $barrios);
 

From eaae5d02eac0fa3a56c722b18150c95bd641bf26 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Sun, 29 Jun 2025 22:26:05 -0300
Subject: [PATCH 73/91] Cambio de timezone

---
 config/app.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/app.php b/config/app.php
index 8409e00..87ed196 100644
--- a/config/app.php
+++ b/config/app.php
@@ -67,7 +67,7 @@ return [
     |
     */
 
-    'timezone' => 'UTC',
+    'timezone' => 'America/Montevideo',
 
     /*
     |--------------------------------------------------------------------------

From f6f565b6bd502bc358c060189c77679afac5dfe5 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Sun, 29 Jun 2025 22:26:53 -0300
Subject: [PATCH 74/91] Agregado helper para exportar pedidos en csv

---
 app/Helpers/PedidosExportHelper.php           | 199 ++++++++++++++++++
 app/Http/Controllers/AdminController.php      |   5 +-
 app/Http/Controllers/ComisionesController.php |   3 +-
 3 files changed, 204 insertions(+), 3 deletions(-)
 create mode 100644 app/Helpers/PedidosExportHelper.php

diff --git a/app/Helpers/PedidosExportHelper.php b/app/Helpers/PedidosExportHelper.php
new file mode 100644
index 0000000..0808130
--- /dev/null
+++ b/app/Helpers/PedidosExportHelper.php
@@ -0,0 +1,199 @@
+<?php
+
+namespace App\Helpers;
+
+use App\GrupoDeCompra;
+use Closure;
+use Illuminate\Database\Query\Expression;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\DB;
+use League\Csv\CannotInsertRecord;
+use League\Csv\Exception;
+use League\Csv\InvalidArgument;
+
+class PedidosExportHelper
+{
+    /**
+     * @throws InvalidArgument
+     * @throws CannotInsertRecord
+     * @throws Exception
+     */
+    static public function pedidosBarriales()
+    {
+        $filePath = "csv/exports/pedidos-por-barrio-" . now()->format('Y-m-d') . ".csv";
+        $barrios = GrupoDeCompra::barriosMenosPrueba()->get();
+        self::exportarCSV(
+            $filePath,
+            $barrios,
+            self::generarContenidoCSV(
+                $barrios,
+                fn ($grupoId) =>
+                "subpedidos.grupo_de_compra_id = $grupoId
+                    AND subpedidos.aprobado = 1
+                    AND subpedidos.tipo_pedido_id = 1"
+            )
+        );
+    }
+
+    /**
+     * @throws InvalidArgument
+     * @throws CannotInsertRecord
+     * @throws Exception
+     */
+    static public function pedidoTotalDeBarrio(GrupoDeCompra $grupo)
+    {
+        $filePath = "csv/exports/" . $grupo->nombre . "-" . now()->format('Y-m-d') . ".csv";
+
+        $falsoBarrio = new GrupoDeCompra(['nombre' => 'Total']);
+        $falsoBarrio->id = $grupo->id;
+        $header = collect([$falsoBarrio]);
+
+        self::exportarCSV(
+            $filePath,
+            $header,
+            self::generarContenidoCSV(
+                $header,
+                fn($grupoId) => "subpedidos.grupo_de_compra_id = $grupoId
+                                    AND subpedidos.aprobado = 1"
+            ),
+        );
+    }
+
+    /**
+     * @throws InvalidArgument
+     * @throws CannotInsertRecord
+     * @throws Exception
+     */
+    static public function pedidosDeBarrio(GrupoDeCompra $grupo)
+    {
+        $filePath = "csv/exports/" . $grupo->nombre . "-completo-" . now()->format('Y-m-d') . ".csv";
+        $subpedidos = $grupo->subpedidos()->where('aprobado', true)->get();
+        self::exportarCSV(
+            $filePath,
+            $subpedidos,
+            self::generarContenidoCSV(
+                $subpedidos,
+                fn ($subpedidoId) => "subpedidos.id = $subpedidoId",
+            )
+        );
+    }
+
+    /**
+     * @throws InvalidArgument
+     * @throws CannotInsertRecord
+     * @throws Exception
+     */
+    private static function exportarCSV(
+        string     $filename,
+        Collection $headers,
+        Collection $contenido
+    ): void {
+        $nombresColumnas = $headers->pluck('nombre')->toArray();
+        $columnas = array_merge(['Producto'], $nombresColumnas);
+        $filaTransporte = TransporteHelper::filaTransporte();
+        $planilla = [];
+        $ultimaFila = 1;
+
+        foreach ($contenido as $fila) {
+            $filaActual = $fila->fila;
+            while ($filaActual - $ultimaFila > 1) {
+                $ultimaFila++;
+                $planilla[$ultimaFila] = [$ultimaFila === $filaTransporte ? 'Bono de transporte' : '---'];
+            }
+            $planilla[$filaActual] = [$fila->producto];
+            foreach ($nombresColumnas as $nombre)
+                $planilla[$filaActual][] = $fila->$nombre ?? 0;
+
+            $ultimaFila = $filaActual;
+        }
+
+        $planilla[$filaTransporte] = array_merge(['Bono de transporte'], self::cantidadesTransporte($nombresColumnas, $contenido));
+
+        ksort($planilla);
+        CsvHelper::generarCsv($filename, $planilla, $columnas);
+    }
+
+    /**
+     * @param Collection $headers
+     * @param Closure $filtroCallback
+     * <br>
+     * Ejemplo de uso:
+     * ``
+     *      PedidosExportHelper::generarContenidoCSV(GrupoDeCompra::barriosMenosPrueba(),
+     *              fn($gdc_id) => "subpedidos.grupo_de_compra_id = $gdc_id");
+     * ``
+     * @return Collection
+     * Los elementos son de la forma
+     * {
+     *     fila: int (fila del producto),
+     *     producto: string (nombre del producto),
+     *     precio: float (precio del producto),
+     *     paga_transporte: bool (1 o 0, calculado a partir de bono y categoria),
+     *     barrio_1: string (cantidad pedida por barrio_1),
+     *     ...
+     *     barrio_n: string (cantidad pedida por barrio_n)
+     * }
+     */
+    public static function generarContenidoCSV(
+        Collection $headers,
+        Closure    $filtroCallback
+    ): Collection {
+        $expresionesColumnas = $headers->map(function ($header) use ($filtroCallback) {
+            $id = $header['id'];
+            $nombre = $header['nombre'];
+            $filtro = $filtroCallback($id);
+            return DB::raw("
+                SUM(CASE WHEN $filtro THEN producto_subpedido.cantidad ELSE 0 END) as `$nombre`
+            ");
+        })->toArray();
+
+        $query = DB::table('productos')
+            ->where('productos.nombre', 'not like', '%barrial%')
+            ->leftJoin('producto_subpedido', 'productos.id', '=', 'producto_subpedido.producto_id')
+            ->leftJoin('subpedidos', 'subpedidos.id', '=', 'producto_subpedido.subpedido_id');
+
+        $columnasProducto = [
+            'productos.fila as fila',
+            'productos.nombre as producto',
+            'productos.precio as precio',
+            self::pagaTransporte(),
+        ];
+
+        return $query->select(array_merge(
+            $columnasProducto,
+            $expresionesColumnas
+        ))->groupBy('productos.fila', 'productos.id', 'productos.nombre')
+          ->orderBy('productos.fila')
+          ->get();
+    }
+
+    /**
+     * @return Expression
+     */
+    public static function pagaTransporte(): Expression
+    {
+        return DB::raw('CASE WHEN productos.bono OR productos.categoria LIKE "%SUBSIDIADO%" THEN 0 ELSE 1 END as paga_transporte');
+    }
+
+    /**
+     * @param array $nombresColumnas
+     * @param Collection $contenido
+     * @return array
+     */
+    public static function cantidadesTransporte(array $nombresColumnas, Collection $contenido): array
+    {
+        $transporte = [];
+        foreach ($nombresColumnas as $nombre) {
+            $suma = 0;
+            foreach ($contenido as $fila) {
+                if ($fila->paga_transporte) {
+                    $cantidad = $fila->$nombre ?? 0;
+                    $precio = $fila->precio ?? 0;
+                    $suma += $cantidad * $precio;
+                }
+            }
+            $transporte[] = TransporteHelper::cantidadTransporte($suma);
+        }
+        return $transporte;
+    }
+}
diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php
index 48a2faf..5b788af 100644
--- a/app/Http/Controllers/AdminController.php
+++ b/app/Http/Controllers/AdminController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\GrupoDeCompra;
+use App\Helpers\PedidosExportHelper;
 use League\Csv\Exception;
 use Mpdf\MpdfException;
 
@@ -29,7 +30,7 @@ class AdminController extends Controller
     public function exportarPedidoACSV(GrupoDeCompra $gdc)
     {
         try {
-            $gdc->exportarPedidoEnCSV();
+            PedidosExportHelper::pedidoTotalDeBarrio($gdc);
         } catch (Exception $e) {
             return response()->json(['message' => $e->getMessage()]);
         }
@@ -46,7 +47,7 @@ class AdminController extends Controller
     public function exportarPedidoConNucleosACSV(GrupoDeCompra $gdc)
     {
         try {
-            $gdc->exportarPedidoConNucleosEnCSV();
+            PedidosExportHelper::pedidosDeBarrio($gdc);
         } catch (Exception $e) {
             return response()->json(['message' => $e->getMessage()]);
         }
diff --git a/app/Http/Controllers/ComisionesController.php b/app/Http/Controllers/ComisionesController.php
index c8af381..b0c3c80 100644
--- a/app/Http/Controllers/ComisionesController.php
+++ b/app/Http/Controllers/ComisionesController.php
@@ -5,6 +5,7 @@ namespace App\Http\Controllers;
 use App\GrupoDeCompra;
 use App\Helpers\CanastaHelper;
 use App\Helpers\CsvHelper;
+use App\Helpers\PedidosExportHelper;
 use App\Http\Resources\GrupoDeCompraResource;
 use App\Producto;
 use Illuminate\Http\JsonResponse;
@@ -28,7 +29,7 @@ class ComisionesController
     public function descargarPedidos()
     {
         try {
-            Producto::planillaTotales();
+            PedidosExportHelper::pedidosBarriales();
         } catch (Exception $e) {
             return response()->json(['message' => $e->getMessage()], 500);
         }

From bc70e28127fac7ea6687692fbc85bbfcbf86d903 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Sun, 29 Jun 2025 22:29:21 -0300
Subject: [PATCH 75/91] =?UTF-8?q?Agregado=20m=C3=A9todo=20para=20pedidos?=
 =?UTF-8?q?=20de=20ollas?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Helpers/PedidosExportHelper.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/app/Helpers/PedidosExportHelper.php b/app/Helpers/PedidosExportHelper.php
index 0808130..7e4fd6d 100644
--- a/app/Helpers/PedidosExportHelper.php
+++ b/app/Helpers/PedidosExportHelper.php
@@ -34,6 +34,26 @@ class PedidosExportHelper
             )
         );
     }
+    /**
+     * @throws InvalidArgument
+     * @throws CannotInsertRecord
+     * @throws Exception
+     */
+    static public function pedidosDeOllas()
+    {
+        $filePath = "csv/exports/pedidos-de-ollas-" . now()->format('Y-m-d') . ".csv";
+        $barrios = GrupoDeCompra::barriosMenosPrueba()->get();
+        self::exportarCSV(
+            $filePath,
+            $barrios,
+            self::generarContenidoCSV(
+                $barrios,
+                fn ($grupoId) =>
+                "subpedidos.grupo_de_compra_id = $grupoId
+                    AND subpedidos.tipo_pedido_id = 2"
+            )
+        );
+    }
 
     /**
      * @throws InvalidArgument

From 546eceaefd3110bf4af7eb7b6cfa7d91fe6b1334 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Sun, 29 Jun 2025 22:32:37 -0300
Subject: [PATCH 76/91] Metodo y ruta para pedidos de ollas

---
 app/Http/Controllers/ComisionesController.php | 17 +++++++++++++++++
 routes/web.php                                |  1 +
 2 files changed, 18 insertions(+)

diff --git a/app/Http/Controllers/ComisionesController.php b/app/Http/Controllers/ComisionesController.php
index b0c3c80..cb9e709 100644
--- a/app/Http/Controllers/ComisionesController.php
+++ b/app/Http/Controllers/ComisionesController.php
@@ -43,6 +43,23 @@ class ComisionesController
         return response()->download($files[0]);
     }
 
+    public function descargarPedidosDeOllas()
+    {
+        try {
+            PedidosExportHelper::pedidosDeOllas();
+        } catch (Exception $e) {
+            return response()->json(['message' => $e->getMessage()], 500);
+        }
+        $pattern = storage_path('csv/exports/pedidos-de-ollas-*.csv');
+        $files = glob($pattern);
+
+        usort($files, function ($a, $b) {
+            return filemtime($b) <=> filemtime($a);
+        });
+
+        return response()->download($files[0]);
+    }
+
     public function descargarNotas(): BinaryFileResponse
     {
         Producto::planillaNotas();
diff --git a/routes/web.php b/routes/web.php
index 24e8858..969c0e1 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -53,6 +53,7 @@ Route::middleware(['auth', 'role:comision'])->group( function() {
     Route::get('/comisiones/pedidos/descargar', 'ComisionesController@descargarPedidos')->name('comisiones.pedidos.descargar');
     Route::get('/comisiones/pedidos/notas', 'ComisionesController@descargarNotas')->name('comisiones.pedidos.descargar');
     Route::get('/comisiones/pedidos/pdf', 'ComisionesController@pdf')->name('comisiones.pedidos.pdf');
+    Route::get('/comisiones/pedidos/ollas', 'ComisionesController@descargarPedidosDeOllas')->name('comisiones.pedidos.ollas');
     Route::get('/comisiones/canasta/ejemplo', 'ComisionesController@descargarCanastaEjemplo')->name('comisiones.canasta.ejemplo');
     Route::post('/comisiones/canasta', 'ComisionesController@cargarCanasta')->name('comisiones.canasta');
     Route::post('/comisiones/saldos', 'ComisionesController@cargarSaldos')->name('comisiones.saldos');

From 21d28c6a5b6cd8eb17ccb8346a64db88f0a04b5a Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Sun, 29 Jun 2025 22:33:59 -0300
Subject: [PATCH 77/91] Agregado pedidos de ollas

---
 resources/js/components/comisiones/DropdownDescargar.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/resources/js/components/comisiones/DropdownDescargar.vue b/resources/js/components/comisiones/DropdownDescargar.vue
index dc119a8..9e6be43 100644
--- a/resources/js/components/comisiones/DropdownDescargar.vue
+++ b/resources/js/components/comisiones/DropdownDescargar.vue
@@ -15,14 +15,17 @@
             <div class="dropdown-menu" id="dropdown-menu" role="menu">
                 <div class="dropdown-content">
                     <a href="/comisiones/pedidos/descargar" class="dropdown-item">
-                        Pedidos por barrio
+                        Pedidos por barrio en csv
                     </a>
                     <a href="/comisiones/pedidos/notas" class="dropdown-item">
-                        Notas por barrio
+                        Notas por barrio en csv
                     </a>
                     <a href="/comisiones/pedidos/pdf" class="dropdown-item">
                         Pedidos por barrio en pdf
                     </a>
+                    <a href="/comisiones/pedidos/ollas" class="dropdown-item">
+                        Pedidos de ollas en csv
+                    </a>
                 </div>
             </div>
         </div>

From c7834fa9d26a28913db23179cfe89d58d88076ab Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Sun, 29 Jun 2025 22:40:36 -0300
Subject: [PATCH 78/91] =?UTF-8?q?Eliminados=20m=C3=A9todos=20no=20usados?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/GrupoDeCompra.php | 127 ------------------------------------------
 app/Producto.php      |  71 -----------------------
 2 files changed, 198 deletions(-)

diff --git a/app/GrupoDeCompra.php b/app/GrupoDeCompra.php
index 3395925..75c693a 100644
--- a/app/GrupoDeCompra.php
+++ b/app/GrupoDeCompra.php
@@ -177,121 +177,6 @@ class GrupoDeCompra extends Model
         PdfHelper::exportarPedidos($filepath, $barrios);
     }
 
-    static function filaVacia(string $product, int $columns): array
-    {
-        $fila = [$product];
-        for ($i = 1; $i <= $columns; $i++) {
-            $fila[$i] = "0";
-        }
-        return $fila;
-    }
-
-    //Asume que los productos están gruadados en orden de fila
-
-    /**
-     * @throws Exception
-     */
-    public static function obtenerTemplateDeFilasVacias(int $columns): array
-    {
-        $productosFilaID = Producto::productosFilaID();
-        $productosIDNombre = Producto::productosIDNombre();
-        $num_fila = 1;
-        $template = [];
-        foreach ($productosFilaID as $fila => $id) {
-            for ($i = $num_fila; $i < $fila; $i++) {
-                $template[$i] = GrupoDeCompra::filaVacia("", $columns);
-            }
-            $template[$fila] = GrupoDeCompra::filaVacia($productosIDNombre[$id], $columns);
-            $num_fila = $fila + 1;
-        }
-        $template[TransporteHelper::filaTransporte()] = GrupoDeCompra::filaVacia("Bonos de transporte", $columns);
-        return $template;
-    }
-
-    /**
-     * @throws Exception
-     */
-    public function exportarPedidoEnCSV()
-    {
-        $records = $this->generarColumnaCantidades();
-
-        $fecha = now()->format('Y-m-d');
-        CsvHelper::generarCsv('csv/exports/' . $this->nombre . '-' . $fecha . '.csv', $records);
-    }
-
-    /**
-     * @throws Exception
-     */
-    public function generarColumnaCantidades(): array
-    {
-        $productos_en_pedido = $this->productosPedidos();
-
-        //si no hay pedidos aprobados, salir
-        if ($productos_en_pedido->count() == 0) {
-            Log::debug("El grupo de compra " . $this->nombre . " no tiene pedidos aprobados.");
-            return [];
-        }
-
-        $records = $this->obtenerTemplateDeFilasVacias(1);
-        $productos_id_fila = Producto::productosIDFila();
-        foreach ($productos_en_pedido as $id => $producto_pedido) {
-            $fila = $productos_id_fila[$id];
-            $records[$fila][1] = $producto_pedido->cantidad_pedida;
-        }
-
-        $records[TransporteHelper::filaTransporte()][1] = $this->cantidadTransporte();
-
-        return $records;
-    }
-
-    /**
-     * @throws Exception
-     */
-    public function exportarPedidoConNucleosEnCSV()
-    {
-        $productos_en_pedido = $this->productosPedidos();
-
-        // si no hay pedidos aprobados, salir
-        if ($productos_en_pedido->count() == 0) {
-            Log::debug("El grupo de compra " . $this->nombre . " no tiene pedidos aprobados.");
-            return;
-        }
-
-        $pedidos = $this->pedidosAprobados();
-        // Generar tabla vacía con una columna por núcleo
-        $records = $this->obtenerTemplateDeFilasVacias($pedidos->count());
-        $productos_id_fila = Producto::productosIDFila();
-
-        foreach ($productos_en_pedido as $id => $producto_pedido) {
-            $fila = $productos_id_fila[$id];
-            $i = 1;
-            // Poner cantidad de cada producto para cada núcleo
-            foreach ($pedidos as $pedido) {
-                list($records, $i, $_) = $this->agregarCantidad($pedido, $id, $records, $fila, $i);
-            }
-        }
-        // Insertar lista de núcleos en la primera fila
-        $nucleos = [""];
-        $i = 1;
-        foreach ($pedidos as $pedido) {
-            $nucleos[$i] = $pedido->nombre;
-            $i++;
-        }
-        array_splice($records, 0, 0, array($nucleos));
-
-        $fecha = now()->format('Y-m-d');
-        CsvHelper::generarCsv('csv/exports/' . $this->nombre . '-completo-' . $fecha . '.csv', $records);
-    }
-
-    public function agregarCantidad($pedido, $id, array $records, $fila, int $i): array
-    {
-        $producto = $pedido->productos()->find($id);
-        $cantidad = $producto == NULL ? 0 : $producto->pivot->cantidad;
-        $records[$fila][$i] = $cantidad;
-        $i++;
-        return array($records, $i, $cantidad);
-    }
-
     public static function barriosMenosPrueba(): Builder
     {
         return self::where('nombre', '<>', 'PRUEBA')
@@ -299,18 +184,6 @@ class GrupoDeCompra extends Model
             ->orderBy('nombre');
     }
 
-    public static function transportePorBarrio(): array
-    {
-        $result = [];
-        $barrios = GrupoDeCompra::barriosMenosPrueba()->get();
-
-        foreach ($barrios as $barrio) {
-            $result[] = $barrio->cantidadTransporte();
-        }
-
-        return $result;
-    }
-
     public function productosPedidos($excluirBonos = false, $orderBy = 'producto_nombre'): Collection
     {
         $query = DB::table('pedidos_aprobados')
diff --git a/app/Producto.php b/app/Producto.php
index b0ab3a4..0deffa6 100644
--- a/app/Producto.php
+++ b/app/Producto.php
@@ -57,77 +57,6 @@ class Producto extends Model
         return self::where('nombre', 'not like', '%barrial%');
     }
 
-    static public function cantidadesPorBarrio(): Collection
-    {
-        $barrios = GrupoDeCompra::barriosMenosPrueba()
-            ->pluck('id', 'nombre');
-
-        $columnasBarrios = $barrios->map(function ($id, $nombre) {
-            return DB::raw("
-                SUM(CASE WHEN subpedidos.grupo_de_compra_id = $id
-                    AND subpedidos.aprobado = 1
-                    AND subpedidos.tipo_pedido_id = 1
-                    THEN producto_subpedido.cantidad
-                    ELSE 0 END)
-                as `$nombre`");
-        })->toArray();
-
-        return DB::table('productos')
-            ->where('productos.nombre', 'not like', '%barrial%')
-            ->leftJoin('producto_subpedido', 'productos.id', '=', 'producto_subpedido.producto_id')
-            ->leftJoin('subpedidos', 'subpedidos.id', '=', 'producto_subpedido.subpedido_id')
-            ->where('subpedidos.tipo_pedido_id', '=', 1)
-            ->select(array_merge(
-                ['productos.fila as fila'],
-                ['productos.nombre as producto'],
-                $columnasBarrios
-            ))
-            ->groupBy('productos.fila', 'productos.id', 'productos.nombre')
-            ->orderBy('productos.fila')
-            ->get();
-    }
-
-    /**
-     * @throws Exception
-     */
-    static public function planillaTotales()
-    {
-        $headers = ['Producto'];
-        $barrios = GrupoDeCompra::barriosMenosPrueba()->pluck('nombre')->toArray();
-        $headers = array_merge($headers, $barrios);
-
-        $cantidadesPorBarrio = self::cantidadesPorBarrio();
-        $transportePorBarrio = GrupoDeCompra::transportePorBarrio();
-        $planilla = [];
-        $ultimaFila = 1;
-        $filaTransporte = TransporteHelper::filaTransporte();
-
-        foreach ($cantidadesPorBarrio as $productoCantidades) {
-            $fila = $productoCantidades->fila;
-            while ($fila - $ultimaFila > 1) {
-                $ultimaFila++;
-                if ($ultimaFila == $filaTransporte) {
-                    $planilla[$ultimaFila] = ['Bono de transporte'];
-                } else {
-                    $planilla[$ultimaFila] = ['---'];
-                }
-            }
-            $planilla[$fila] = [$productoCantidades->producto];
-            foreach ($barrios as $barrio) {
-                $planilla[$fila][] = $productoCantidades->$barrio ?? 0;
-            }
-            $ultimaFila = $fila;
-        }
-
-        foreach ($transportePorBarrio as $cantidad) {
-            $planilla[$filaTransporte][] = $cantidad;
-        }
-
-        $fecha = now()->format('Y-m-d');
-        $filePath = 'csv/exports/pedidos-por-barrio- ' . $fecha . '.csv';
-        CsvHelper::generarCsv($filePath, $planilla, $headers);
-    }
-
     public static function notasPorBarrio(): Collection
     {
         return DB::table('productos')

From 9f4afd1bac446785ec3c27ea477a8cb50c956885 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Sun, 29 Jun 2025 23:07:21 -0300
Subject: [PATCH 79/91] Agregado monto transporte

---
 resources/csv/parametros.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/csv/parametros.csv b/resources/csv/parametros.csv
index 297e2ca..ebd8fda 100644
--- a/resources/csv/parametros.csv
+++ b/resources/csv/parametros.csv
@@ -1,3 +1,4 @@
 id|nombre|valor
 bono-transporte|'Bono de transporte'|15
+monto-transporte|'Monto para bono de transporte'|500
 monto-olla|'Monto por olla'|1200

From 08bdbe0ee127536bab156c2fb4907ca2d1982a74 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Tue, 1 Jul 2025 19:30:36 -0300
Subject: [PATCH 80/91] Usando parametros para transporte

---
 app/Helpers/TransporteHelper.php              | 40 +++++++++++++++++--
 app/Http/Controllers/ComisionesController.php |  4 +-
 2 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/app/Helpers/TransporteHelper.php b/app/Helpers/TransporteHelper.php
index 046b4b8..7cc7eb6 100644
--- a/app/Helpers/TransporteHelper.php
+++ b/app/Helpers/TransporteHelper.php
@@ -4,21 +4,29 @@ namespace App\Helpers;
 
 use App\CanastaLog;
 use Illuminate\Support\Facades\Log;
+use InvalidArgumentException;
 use League\Csv\Exception;
 
 class TransporteHelper
 {
-    const COSTO_TRANSPORTE = 15;
-    const MONTO_TRANSPORTE = 500;
+    private const COSTO_TRANSPORTE = "bono-transporte";
+    private const MONTO_TRANSPORTE = "monto-transporte";
+    private static ?array $parametros = null;
 
+    /**
+     * @throws Exception
+     */
     public static function cantidadTransporte($monto)
     {
-        return ceil($monto / self::MONTO_TRANSPORTE);
+        return ceil($monto / self::getParametro(self::MONTO_TRANSPORTE));
     }
 
+    /**
+     * @throws Exception
+     */
     public static function totalTransporte($monto)
     {
-        return self::cantidadTransporte($monto) * self::COSTO_TRANSPORTE;
+        return self::cantidadTransporte($monto) * self::getParametro(self::COSTO_TRANSPORTE);
     }
 
     /**
@@ -41,4 +49,28 @@ class TransporteHelper
         Log::error($error);
         throw new Exception($error);
     }
+
+    /**
+     * @throws Exception
+     */
+    public static function getParametro(string $id): int
+    {
+        if (self::$parametros === null) {
+            $records = CsvHelper::getRecords(resource_path('csv/parametros.csv'), "No se pudo leer el archivo.");
+            self::$parametros = [];
+            foreach ($records as $row) {
+                self::$parametros[$row['id']] = $row;
+            }
+        }
+
+        if (!isset(self::$parametros[$id])) {
+            throw new InvalidArgumentException("Parámetro '$id' no encontrado.");
+        }
+
+        return (int) self::$parametros[$id]['valor'];
+    }
+
+    public static function resetParametros(): void {
+        self::$parametros = null;
+    }
 }
diff --git a/app/Http/Controllers/ComisionesController.php b/app/Http/Controllers/ComisionesController.php
index cb9e709..f4150aa 100644
--- a/app/Http/Controllers/ComisionesController.php
+++ b/app/Http/Controllers/ComisionesController.php
@@ -6,6 +6,7 @@ use App\GrupoDeCompra;
 use App\Helpers\CanastaHelper;
 use App\Helpers\CsvHelper;
 use App\Helpers\PedidosExportHelper;
+use App\Helpers\TransporteHelper;
 use App\Http\Resources\GrupoDeCompraResource;
 use App\Producto;
 use Illuminate\Http\JsonResponse;
@@ -130,7 +131,7 @@ class ComisionesController
         return response()->json(GrupoDeCompraResource::collection(GrupoDeCompra::all()));
     }
 
-    public function obtenerParametros()
+    public function obtenerParametros(): JsonResponse
     {
         try {
             $records = self::parametrosRecords();
@@ -151,6 +152,7 @@ class ComisionesController
                     'valor' => ['required', 'numeric', 'gte:0'],
                 ]);
                 CsvHelper::cambiarParametro($parametro_id, $valid['valor']);
+                TransporteHelper::resetParametros();
                 return response()->noContent();
             }
             return response()->json(['message' => 'Parametro no encontrado.'], 404);

From 929191f17377c5c09f0508e303f568978d783df4 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Wed, 2 Jul 2025 00:33:27 -0300
Subject: [PATCH 81/91] Agregados mensajes para exito y error al cambiar la
 cantidad de ollas

---
 resources/js/store/modules/ollas.js  | 13 +++++++++----
 resources/js/store/modules/pedido.js |  3 ++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/resources/js/store/modules/ollas.js b/resources/js/store/modules/ollas.js
index 02d32ee..31a3ca0 100644
--- a/resources/js/store/modules/ollas.js
+++ b/resources/js/store/modules/ollas.js
@@ -15,10 +15,15 @@ const actions = {
         const response = await axios.get('/api/parametros');
         commit('setMontoPorOlla', response.data);
     },
-    async actualizarCantidadOllas({ rootState }, { cantidad: cantidad}) {
-        const barrio = rootState.pedido.grupo_de_compra.id;
-        const params = { cantidad : cantidad };
-        await axios.put(`/ollas/${barrio}/cantidad`, params);
+    async actualizarCantidadOllas({ rootState, dispatch }, { cantidad: cantidad}) {
+        try {
+            const barrio = rootState.pedido.grupo_de_compra.id;
+            const params = { cantidad : cantidad };
+            await axios.put(`/ollas/${barrio}/cantidad`, params);
+            dispatch("ui/toast", { mensaje: 'Cantidad modificada con éxito' }, { root: true });
+        } catch (error) {
+            dispatch("ui/error", { error: { message: "Cantidad inválida" } }, { root: true });
+        }
     }
 };
 
diff --git a/resources/js/store/modules/pedido.js b/resources/js/store/modules/pedido.js
index 2de28bd..ab5a80f 100644
--- a/resources/js/store/modules/pedido.js
+++ b/resources/js/store/modules/pedido.js
@@ -61,7 +61,8 @@ const mutations = {
         state.devoluciones_notas = null;
     },
     setCantidadOllas(state, { cantidad }) {
-        state.cantidad_de_ollas = cantidad;
+        if (cantidad >= 0)
+            state.cantidad_de_ollas = cantidad;
     }
 };
 

From a74f89f6842b5611aeb6de5a1f9047447d75710e Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Tue, 8 Jul 2025 21:05:12 -0300
Subject: [PATCH 82/91] Agregado seeder de usuarios de ollas

---
 database/seeds/DatabaseSeeder.php     |  1 +
 database/seeds/UsuarioOllasSeeder.php | 33 +++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 database/seeds/UsuarioOllasSeeder.php

diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php
index 57f6ac4..2e58402 100644
--- a/database/seeds/DatabaseSeeder.php
+++ b/database/seeds/DatabaseSeeder.php
@@ -24,5 +24,6 @@ class DatabaseSeeder extends Seeder
         $this->call(CanastaSeeder::class);
         $this->call(GrupoDeCompraSeeder::class);
         $this->call(UserSeeder::class);
+        $this->call(UsuarioOllasSeeder::class);
     }
 }
diff --git a/database/seeds/UsuarioOllasSeeder.php b/database/seeds/UsuarioOllasSeeder.php
new file mode 100644
index 0000000..20d3960
--- /dev/null
+++ b/database/seeds/UsuarioOllasSeeder.php
@@ -0,0 +1,33 @@
+<?php
+
+use App\GrupoDeCompra;
+use App\User;
+use App\UserRole;
+use Illuminate\Database\Seeder;
+
+class UsuarioOllasSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        $barrios = GrupoDeCompra::all();
+        $usersToInsert = [];
+        $ollas_id = UserRole::where('nombre', 'ollas')->first()->id;
+        $pedidos_id = UserRole::where('nombre', 'barrio')->first()->id;
+
+        foreach ($barrios as $barrio) {
+            $usersToInsert[] = DatabaseSeeder::addTimestamps([
+                'name' => $barrio->nombre . '_ollas',
+                'password' => User::where(['grupo_de_compra_id' => $barrio->id, 'role_id' => $pedidos_id])->first()->password,
+                'role_id' => $ollas_id,
+            ]);
+        }
+
+        foreach (array_chunk($usersToInsert,DatabaseSeeder::CHUNK_SIZE) as $chunk)
+            User::insert($chunk);
+    }
+}

From 53dc4d735e196c2d8d61e9d9c06f4697a7cb9cd2 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Tue, 8 Jul 2025 21:05:20 -0300
Subject: [PATCH 83/91] npm install

---
 package-lock.json | 25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6badddb..2370676 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1648,19 +1648,6 @@
             "hasInstallScript": true,
             "optional": true,
             "dependencies": {
-                "@parcel/watcher-android-arm64": "2.5.1",
-                "@parcel/watcher-darwin-arm64": "2.5.1",
-                "@parcel/watcher-darwin-x64": "2.5.1",
-                "@parcel/watcher-freebsd-x64": "2.5.1",
-                "@parcel/watcher-linux-arm-glibc": "2.5.1",
-                "@parcel/watcher-linux-arm-musl": "2.5.1",
-                "@parcel/watcher-linux-arm64-glibc": "2.5.1",
-                "@parcel/watcher-linux-arm64-musl": "2.5.1",
-                "@parcel/watcher-linux-x64-glibc": "2.5.1",
-                "@parcel/watcher-linux-x64-musl": "2.5.1",
-                "@parcel/watcher-win32-arm64": "2.5.1",
-                "@parcel/watcher-win32-ia32": "2.5.1",
-                "@parcel/watcher-win32-x64": "2.5.1",
                 "detect-libc": "^1.0.3",
                 "is-glob": "^4.0.3",
                 "micromatch": "^4.0.5",
@@ -2056,7 +2043,6 @@
             "dependencies": {
                 "@babel/parser": "^7.23.5",
                 "postcss": "^8.4.14",
-                "prettier": "^1.18.2 || ^2.0.0",
                 "source-map": "^0.6.1"
             },
             "optionalDependencies": {
@@ -2102,7 +2088,6 @@
                 "merge-source-map": "^1.1.0",
                 "postcss": "^7.0.36",
                 "postcss-selector-parser": "^6.0.2",
-                "prettier": "^1.18.2 || ^2.0.0",
                 "source-map": "~0.6.1",
                 "vue-template-es2015-compiler": "^1.9.0"
             },
@@ -3555,7 +3540,6 @@
                 "anymatch": "^2.0.0",
                 "async-each": "^1.0.1",
                 "braces": "^2.3.2",
-                "fsevents": "^1.2.7",
                 "glob-parent": "^3.1.0",
                 "inherits": "^2.0.3",
                 "is-binary-path": "^1.0.0",
@@ -7975,9 +7959,6 @@
             "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
             "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
             "dev": true,
-            "dependencies": {
-                "graceful-fs": "^4.1.6"
-            },
             "optionalDependencies": {
                 "graceful-fs": "^4.1.6"
             }
@@ -11334,7 +11315,6 @@
             "integrity": "sha512-d0NoFH4v6SjEK7BoX810Jsrhj7IQSYHAHLi/iSpgqKc7LaIDshFRlSg5LOymf9FqQhxEHs2W5ZQXlvy0KD45Uw==",
             "dev": true,
             "dependencies": {
-                "@parcel/watcher": "^2.4.1",
                 "chokidar": "^4.0.0",
                 "immutable": "^5.0.2",
                 "source-map-js": ">=0.6.2 <2.0.0"
@@ -13424,10 +13404,8 @@
             "integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==",
             "dev": true,
             "dependencies": {
-                "chokidar": "^3.4.1",
                 "graceful-fs": "^4.1.2",
-                "neo-async": "^2.5.0",
-                "watchpack-chokidar2": "^2.0.1"
+                "neo-async": "^2.5.0"
             },
             "optionalDependencies": {
                 "chokidar": "^3.4.1",
@@ -13493,7 +13471,6 @@
             "dependencies": {
                 "anymatch": "~3.1.2",
                 "braces": "~3.0.2",
-                "fsevents": "~2.3.2",
                 "glob-parent": "~5.1.2",
                 "is-binary-path": "~2.1.0",
                 "is-glob": "~4.0.1",

From e9a6def7c1f3f9c9844ef21920269b8c32a1a543 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Tue, 8 Jul 2025 21:08:19 -0300
Subject: [PATCH 84/91] Arreglado seeder

---
 database/seeds/UsuarioOllasSeeder.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/database/seeds/UsuarioOllasSeeder.php b/database/seeds/UsuarioOllasSeeder.php
index 20d3960..07dff75 100644
--- a/database/seeds/UsuarioOllasSeeder.php
+++ b/database/seeds/UsuarioOllasSeeder.php
@@ -24,6 +24,7 @@ class UsuarioOllasSeeder extends Seeder
                 'name' => $barrio->nombre . '_ollas',
                 'password' => User::where(['grupo_de_compra_id' => $barrio->id, 'role_id' => $pedidos_id])->first()->password,
                 'role_id' => $ollas_id,
+                'grupo_de_compra_id' => $barrio->id,
             ]);
         }
 

From 7a7cd678ad2b7cd0c7fccbbcdb0fe8e651b1a9c3 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Tue, 8 Jul 2025 21:20:11 -0300
Subject: [PATCH 85/91] Creando tipo pedido ollas en la migracion

---
 .../migrations/2025_06_20_001436_create_tipo_pedidos_table.php   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/database/migrations/2025_06_20_001436_create_tipo_pedidos_table.php b/database/migrations/2025_06_20_001436_create_tipo_pedidos_table.php
index 72ad947..e40bdbc 100644
--- a/database/migrations/2025_06_20_001436_create_tipo_pedidos_table.php
+++ b/database/migrations/2025_06_20_001436_create_tipo_pedidos_table.php
@@ -21,6 +21,7 @@ class CreateTipoPedidosTable extends Migration
         });
 
         $hogar = TipoPedido::firstOrCreate(['nombre' => 'hogar']);
+        TipoPedido::firstOrCreate(['nombre' => 'olla']);
 
         Schema::table('subpedidos', function (Blueprint $table) use ($hogar) {
             $table->foreignId('tipo_pedido_id')->default($hogar->id);

From b0ac8f538c8813262954abf0ee839aa9839a60a1 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Tue, 8 Jul 2025 21:20:34 -0300
Subject: [PATCH 86/91] Quitado codigo para settear en 0 la cantidad de ollas
 al crear la columna

---
 .../migrations/2025_06_23_233548_cantidad_ollas_pedidos.php     | 2 --
 1 file changed, 2 deletions(-)

diff --git a/database/migrations/2025_06_23_233548_cantidad_ollas_pedidos.php b/database/migrations/2025_06_23_233548_cantidad_ollas_pedidos.php
index d4d4393..ef944f9 100644
--- a/database/migrations/2025_06_23_233548_cantidad_ollas_pedidos.php
+++ b/database/migrations/2025_06_23_233548_cantidad_ollas_pedidos.php
@@ -1,6 +1,5 @@
 <?php
 
-use App\Subpedido;
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
@@ -17,7 +16,6 @@ class CantidadOllasPedidos extends Migration
         Schema::table('subpedidos', function (Blueprint $table) {
             $table->integer('cantidad_ollas')->nullable();
         });
-        Subpedido::where('tipo_pedido_id', 1)->update(['cantidad_ollas' => 0]);
     }
 
     /**

From d7c3ed857c18a361ca126f8a9ae977fa005304ad Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Tue, 8 Jul 2025 21:20:41 -0300
Subject: [PATCH 87/91] Import

---
 app/Http/Resources/GrupoDeCompraPedidoResource.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Http/Resources/GrupoDeCompraPedidoResource.php b/app/Http/Resources/GrupoDeCompraPedidoResource.php
index ea725f7..f369571 100644
--- a/app/Http/Resources/GrupoDeCompraPedidoResource.php
+++ b/app/Http/Resources/GrupoDeCompraPedidoResource.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Resources;
 
+use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class GrupoDeCompraPedidoResource extends JsonResource
@@ -9,7 +10,7 @@ class GrupoDeCompraPedidoResource extends JsonResource
     /**
      * Transform the resource into an array.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param  Request  $request
      * @return array
      */
     public function toArray($request): array {

From 87c3bb207f01d01d9367ace2eb75e88a121ef680 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Tue, 8 Jul 2025 21:21:02 -0300
Subject: [PATCH 88/91] Inicializando pedido de ollas con 0 ollas

---
 app/Http/Controllers/OllasController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Http/Controllers/OllasController.php b/app/Http/Controllers/OllasController.php
index f565f16..2b64615 100644
--- a/app/Http/Controllers/OllasController.php
+++ b/app/Http/Controllers/OllasController.php
@@ -20,6 +20,7 @@ class OllasController extends Controller
         $pedido = $gdc->subpedidos()->firstOrCreate([
             'nombre' => 'Pedido de Ollas de ' . $gdc->nombre,
             'tipo_pedido_id' => $tipoOlla->id,
+            'cantidad_ollas' => 0,
         ]);
         return response()->json(new PedidoOllasResource($pedido));
     }

From 148e54356c58572290d9eebc2efa83f04c1c6ccc Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Tue, 8 Jul 2025 21:38:20 -0300
Subject: [PATCH 89/91] =?UTF-8?q?Contrase=C3=B1a=20hardcodeada?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 database/seeds/UsuarioOllasSeeder.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/database/seeds/UsuarioOllasSeeder.php b/database/seeds/UsuarioOllasSeeder.php
index 07dff75..479d079 100644
--- a/database/seeds/UsuarioOllasSeeder.php
+++ b/database/seeds/UsuarioOllasSeeder.php
@@ -4,6 +4,7 @@ use App\GrupoDeCompra;
 use App\User;
 use App\UserRole;
 use Illuminate\Database\Seeder;
+use Illuminate\Support\Facades\Hash;
 
 class UsuarioOllasSeeder extends Seeder
 {
@@ -22,7 +23,7 @@ class UsuarioOllasSeeder extends Seeder
         foreach ($barrios as $barrio) {
             $usersToInsert[] = DatabaseSeeder::addTimestamps([
                 'name' => $barrio->nombre . '_ollas',
-                'password' => User::where(['grupo_de_compra_id' => $barrio->id, 'role_id' => $pedidos_id])->first()->password,
+                'password' => Hash::make('123'),
                 'role_id' => $ollas_id,
                 'grupo_de_compra_id' => $barrio->id,
             ]);

From 7f59b9a2ff1b5a7afdfdb6f3453f5bfbf4995b30 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Tue, 8 Jul 2025 21:42:45 -0300
Subject: [PATCH 90/91] Borrada variable no usada

---
 database/seeds/UsuarioOllasSeeder.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/database/seeds/UsuarioOllasSeeder.php b/database/seeds/UsuarioOllasSeeder.php
index 479d079..dff4acf 100644
--- a/database/seeds/UsuarioOllasSeeder.php
+++ b/database/seeds/UsuarioOllasSeeder.php
@@ -18,7 +18,6 @@ class UsuarioOllasSeeder extends Seeder
         $barrios = GrupoDeCompra::all();
         $usersToInsert = [];
         $ollas_id = UserRole::where('nombre', 'ollas')->first()->id;
-        $pedidos_id = UserRole::where('nombre', 'barrio')->first()->id;
 
         foreach ($barrios as $barrio) {
             $usersToInsert[] = DatabaseSeeder::addTimestamps([

From cc6fe6878a26e3a3522d2cb3b1b3c820c479d8c8 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Tue, 8 Jul 2025 22:46:09 -0300
Subject: [PATCH 91/91] Agregada cantidad de ollas a planilla de ollas

---
 app/Helpers/PedidosExportHelper.php | 37 ++++++++++++++++++++++++-----
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/app/Helpers/PedidosExportHelper.php b/app/Helpers/PedidosExportHelper.php
index 7e4fd6d..b8672f2 100644
--- a/app/Helpers/PedidosExportHelper.php
+++ b/app/Helpers/PedidosExportHelper.php
@@ -3,6 +3,7 @@
 namespace App\Helpers;
 
 use App\GrupoDeCompra;
+use App\TipoPedido;
 use Closure;
 use Illuminate\Database\Query\Expression;
 use Illuminate\Support\Collection;
@@ -43,18 +44,42 @@ class PedidosExportHelper
     {
         $filePath = "csv/exports/pedidos-de-ollas-" . now()->format('Y-m-d') . ".csv";
         $barrios = GrupoDeCompra::barriosMenosPrueba()->get();
+
+        $contenido = self::generarContenidoCSV($barrios,
+            fn($grupoId) => "subpedidos.grupo_de_compra_id = $grupoId
+                    AND subpedidos.tipo_pedido_id = 2");
+        $ollas = self::cantidadDeOllasParaCSV($barrios, $contenido);
+
         self::exportarCSV(
             $filePath,
             $barrios,
-            self::generarContenidoCSV(
-                $barrios,
-                fn ($grupoId) =>
-                "subpedidos.grupo_de_compra_id = $grupoId
-                    AND subpedidos.tipo_pedido_id = 2"
-            )
+            $contenido->concat([$ollas])
         );
     }
 
+    /**
+     * @throws Exception
+     */
+    public static function cantidadDeOllasParaCSV(Collection $barrios, Collection $contenido)
+    {
+        $tipo_olla = TipoPedido::where('nombre', 'olla')->first()->id;
+
+        $parametros = collect(CsvHelper::getRecords(resource_path("csv/parametros.csv"), "No se pudo leer el archivo."));
+        $fila = [
+            "producto" => "Cantidad de ollas",
+            "precio" => $parametros->where('id','monto-olla')->pluck('valor')->first(),
+            "paga_transporte" => false,
+            "fila" => $contenido->last()->fila + 1,
+        ];
+
+        foreach ($barrios as $barrio) {
+            $pedido = $barrio->subpedidos()->where('tipo_pedido_id', $tipo_olla)->first();
+            $fila[$barrio->nombre] = $pedido->cantidad_ollas;
+        }
+
+        return (object) $fila;
+    }
+
     /**
      * @throws InvalidArgument
      * @throws CannotInsertRecord