From bed975e944369ca4c77d7b9c16f5f0086034fcc0 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Wed, 14 May 2025 23:24:36 -0300
Subject: [PATCH 001/111] Agregada tabla y modelo para roles de usuario

---
 app/UserRole.php                              | 10 +++++
 ...5_05_15_021941_create_user_roles_table.php | 41 +++++++++++++++++++
 2 files changed, 51 insertions(+)
 create mode 100644 app/UserRole.php
 create mode 100644 database/migrations/2025_05_15_021941_create_user_roles_table.php

diff --git a/app/UserRole.php b/app/UserRole.php
new file mode 100644
index 0000000..67f69f6
--- /dev/null
+++ b/app/UserRole.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class UserRole extends Model
+{
+    protected $fillable = ["nombre"];
+}
diff --git a/database/migrations/2025_05_15_021941_create_user_roles_table.php b/database/migrations/2025_05_15_021941_create_user_roles_table.php
new file mode 100644
index 0000000..e4de28c
--- /dev/null
+++ b/database/migrations/2025_05_15_021941_create_user_roles_table.php
@@ -0,0 +1,41 @@
+<?php
+
+use App\UserRole;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+class CreateUserRolesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('user_roles', function (Blueprint $table) {
+            $table->id();
+            $table->string('nombre');
+            $table->timestamps();
+        });
+
+        $tipos = ["barrio", "admin_barrio", "comision"];
+        foreach ($tipos as $tipo) {
+            UserRole::create([
+                "nombre" => $tipo,
+            ]);
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('user_roles');
+    }
+}
-- 
2.48.1


From fc367c05a3ad56d9fa2277d8f06a9241168cd165 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Thu, 15 May 2025 00:32:08 -0300
Subject: [PATCH 002/111] Agregado role_id a User

---
 app/User.php                                  |  2 +-
 .../2025_05_15_023829_agregar_rol_a_user.php  | 43 +++++++++++++++++++
 database/seeds/GrupoDeCompraSeeder.php        | 39 ++++++++---------
 database/seeds/UserSeeder.php                 |  9 ++--
 4 files changed, 66 insertions(+), 27 deletions(-)
 create mode 100644 database/migrations/2025_05_15_023829_agregar_rol_a_user.php

diff --git a/app/User.php b/app/User.php
index 5f45a74..64ea860 100644
--- a/app/User.php
+++ b/app/User.php
@@ -16,7 +16,7 @@ class User extends Authenticatable
      * @var array
      */
     protected $fillable = [
-        'name', 'email', 'password',
+        'name', 'email', 'password', 'role_id',
     ];
 
     /**
diff --git a/database/migrations/2025_05_15_023829_agregar_rol_a_user.php b/database/migrations/2025_05_15_023829_agregar_rol_a_user.php
new file mode 100644
index 0000000..d6e0673
--- /dev/null
+++ b/database/migrations/2025_05_15_023829_agregar_rol_a_user.php
@@ -0,0 +1,43 @@
+<?php
+
+use App\User;
+use App\UserRole;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AgregarRolAUser extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->foreignId('role_id');
+        });
+
+        $barrio = UserRole::where('nombre', 'barrio')->first();
+        $admin_barrio = UserRole::where('nombre', 'admin_barrio')->first();
+        $comision = UserRole::where('nombre', 'comision')->first();
+        User::all()->each(function($user) use ($barrio, $comision, $admin_barrio) {
+            $user->role_id = $user->is_admin ? $admin_barrio->id :
+                ($user->is_compras ? $comision->id : $barrio->id);
+            $user->save();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('user', function (Blueprint $table) {
+            $table->dropForeign('role_id');
+        });
+    }
+}
diff --git a/database/seeds/GrupoDeCompraSeeder.php b/database/seeds/GrupoDeCompraSeeder.php
index 9e163ef..b714316 100644
--- a/database/seeds/GrupoDeCompraSeeder.php
+++ b/database/seeds/GrupoDeCompraSeeder.php
@@ -1,8 +1,10 @@
 <?php
 
-use App\Helpers\CsvHelper as CsvHelperAlias;
+use App\Helpers\CsvHelper;
+use App\GrupoDeCompra;
+use App\User;
+use App\UserRole;
 use Illuminate\Database\Seeder;
-use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
 
 class GrupoDeCompraSeeder extends Seeder
@@ -14,9 +16,10 @@ class GrupoDeCompraSeeder extends Seeder
      */
     public function run()
     {
-        $registros = CsvHelperAlias::getRecords('csv/barrios.csv');
+        $registros = CsvHelper::getRecords('csv/barrios.csv');
         $gdcToInsert = [];
         $usersToInsert = [];
+        $roles = UserRole::where('nombre', 'barrio')->orWhere('nombre', 'barrio_admin')->get();
 
         foreach($registros as $key => $registro){
             $gdcToInsert[] = [
@@ -27,29 +30,21 @@ class GrupoDeCompraSeeder extends Seeder
                 'referente_finanzas'   => $registro['referente']
             ];
 
-            $usersToInsert[] = [
-                'name' => $registro['barrio'],
-                'password' => Hash::make("123"),
-                "is_admin" => 0,
-                'grupo_de_compra_id' => $key
-            ];
-
-            $usersToInsert[] = [
-                'name' => $registro['barrio'] . "_admin",
-                'password' => Hash::make("123"),
-                "is_admin" => 1,
-                'grupo_de_compra_id' => $key
-            ];
+            foreach($roles as $role) {
+                $usersToInsert[] = [
+                    'name' => $registro['barrio'],
+                    'password' => Hash::make("123"),
+                    'role_id' => $role->id,
+                    'grupo_de_compra_id' => $key,
+                    'is_admin' => $role->nombre != 'barrio' ? 0 : 1,
+                ];
+            }
         }
 
         foreach (array_chunk($gdcToInsert,DatabaseSeeder::CHUNK_SIZE) as $chunk)
-        {
-            DB::table('grupos_de_compra')->insert($chunk);
-        }
+            GrupoDeCompra::insert($chunk);
 
         foreach (array_chunk($usersToInsert,DatabaseSeeder::CHUNK_SIZE) as $chunk)
-        {
-            DB::table('users')->insert($chunk);
-        }
+            User::insert($chunk);
     }
 }
diff --git a/database/seeds/UserSeeder.php b/database/seeds/UserSeeder.php
index f2164c1..4ed365d 100644
--- a/database/seeds/UserSeeder.php
+++ b/database/seeds/UserSeeder.php
@@ -1,5 +1,7 @@
 <?php
 
+use App\User;
+use App\UserRole;
 use Illuminate\Database\Seeder;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
@@ -16,16 +18,15 @@ class UserSeeder extends Seeder
         $usersToInsert = [];
 
         $usersToInsert[] = [
-            'name' => 'compras',
+            'name' => 'comi',
             'password' => Hash::make("123"),
+            'role_id' => UserRole::where('nombre', 'comision')->first()->id,
             'is_admin' => 0,
             'is_compras' => 1
         ];
 
 
         foreach (array_chunk($usersToInsert,DatabaseSeeder::CHUNK_SIZE) as $chunk)
-        {
-            DB::table('users')->insert($chunk);
-        }
+            User::insert($chunk);
     }
 }
-- 
2.48.1


From f8b487cebd07707cda00034920fdb5b8f87c803b Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Thu, 15 May 2025 00:52:12 -0300
Subject: [PATCH 003/111] Tablas simplificadas

---
 .../2025_05_15_033316_simplificar_users.php   | 45 +++++++++++++++++++
 .../2025_05_15_033711_simplificar_barrios.php | 40 +++++++++++++++++
 ...025_05_15_034325_simplificar_productos.php | 44 ++++++++++++++++++
 ..._034910_simplificar_producto_subpedido.php | 32 +++++++++++++
 4 files changed, 161 insertions(+)
 create mode 100644 database/migrations/2025_05_15_033316_simplificar_users.php
 create mode 100644 database/migrations/2025_05_15_033711_simplificar_barrios.php
 create mode 100644 database/migrations/2025_05_15_034325_simplificar_productos.php
 create mode 100644 database/migrations/2025_05_15_034910_simplificar_producto_subpedido.php

diff --git a/database/migrations/2025_05_15_033316_simplificar_users.php b/database/migrations/2025_05_15_033316_simplificar_users.php
new file mode 100644
index 0000000..b97e20a
--- /dev/null
+++ b/database/migrations/2025_05_15_033316_simplificar_users.php
@@ -0,0 +1,45 @@
+<?php
+
+use App\User;
+use App\UserRole;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class SimplificarUsers extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn(['is_admin', 'is_compras']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->boolean('is_admin')->default(false);
+            $table->boolean('is_compras')->default(false);
+        });
+
+        $admin_barrio = UserRole::where('nombre', 'admin_barrio')->first();
+        $comision = UserRole::where('nombre', 'comision')->first();
+        foreach (User::all() as $user) {
+            if ($user->role_id == $admin_barrio->id)
+                $user->is_admin = true;
+            if ($user->role_id == $comision->id)
+                $user->is_compras = true;
+            $user->save();
+        }
+    }
+}
diff --git a/database/migrations/2025_05_15_033711_simplificar_barrios.php b/database/migrations/2025_05_15_033711_simplificar_barrios.php
new file mode 100644
index 0000000..f7d4e6e
--- /dev/null
+++ b/database/migrations/2025_05_15_033711_simplificar_barrios.php
@@ -0,0 +1,40 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class SimplificarBarrios extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('grupos_de_compra', function (Blueprint $table) {
+            $table->dropColumn([
+                'cantidad_de_nucleos',
+                'telefono',
+                'correo',
+                'referente_finanzas',
+            ]);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('grupos_de_compra', function (Blueprint $table) {
+            $table->double('cantidad_de_nucleos');
+            $table->string('telefono');
+            $table->string('correo');
+            $table->string('referente_finanzas');
+        });
+    }
+}
diff --git a/database/migrations/2025_05_15_034325_simplificar_productos.php b/database/migrations/2025_05_15_034325_simplificar_productos.php
new file mode 100644
index 0000000..079b389
--- /dev/null
+++ b/database/migrations/2025_05_15_034325_simplificar_productos.php
@@ -0,0 +1,44 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class SimplificarProductos extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('productos', function (Blueprint $table) {
+            $table->dropColumn([
+                'presentacion',
+                'stock',
+                'imagen_id',
+                'descripcion',
+                'apto_veganxs',
+                'apto_celiacxs',
+            ]);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('productos', function (Blueprint $table) {
+            $table->integer('presentacion')->nullable();
+            $table->integer('stock')->nullable();
+            $table->foreignId('imagen_id')->nullable();
+            $table->string('descripcion')->nullable();
+            $table->boolean('apto_veganxs')->nullable();
+            $table->boolean('apto_celiacxs')->nullable();
+        });
+    }
+}
diff --git a/database/migrations/2025_05_15_034910_simplificar_producto_subpedido.php b/database/migrations/2025_05_15_034910_simplificar_producto_subpedido.php
new file mode 100644
index 0000000..ce6245f
--- /dev/null
+++ b/database/migrations/2025_05_15_034910_simplificar_producto_subpedido.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class SimplificarProductoSubpedido extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('producto_subpedido', function (Blueprint $table) {
+            $table->dropColumn('total');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('producto_subpedido', function (Blueprint $table) {
+            $table->double('total');
+        });
+    }
+}
-- 
2.48.1


From 50d77b010867da32456f71766434bf4b20f30185 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Thu, 15 May 2025 01:12:49 -0300
Subject: [PATCH 004/111] Asignacion simplificada

---
 database/migrations/2025_05_15_033316_simplificar_users.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/database/migrations/2025_05_15_033316_simplificar_users.php b/database/migrations/2025_05_15_033316_simplificar_users.php
index b97e20a..649a912 100644
--- a/database/migrations/2025_05_15_033316_simplificar_users.php
+++ b/database/migrations/2025_05_15_033316_simplificar_users.php
@@ -35,10 +35,8 @@ class SimplificarUsers extends Migration
         $admin_barrio = UserRole::where('nombre', 'admin_barrio')->first();
         $comision = UserRole::where('nombre', 'comision')->first();
         foreach (User::all() as $user) {
-            if ($user->role_id == $admin_barrio->id)
-                $user->is_admin = true;
-            if ($user->role_id == $comision->id)
-                $user->is_compras = true;
+            $user->is_admin = $user->role_id == $admin_barrio->id;
+            $user->is_compras = $user->role_id == $comision->id;
             $user->save();
         }
     }
-- 
2.48.1


From 2faea3b0079a0b892ca8986e358332fd2fc74972 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Thu, 15 May 2025 01:13:09 -0300
Subject: [PATCH 005/111] Modelos simplificados

---
 app/GrupoDeCompra.php | 4 +---
 app/Subpedido.php     | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/GrupoDeCompra.php b/app/GrupoDeCompra.php
index 3a0fe18..c744346 100644
--- a/app/GrupoDeCompra.php
+++ b/app/GrupoDeCompra.php
@@ -14,10 +14,8 @@ use Illuminate\Support\Facades\Log;
 
 class GrupoDeCompra extends Model
 {
-    public $timestamps = false;
-    protected $fillable = ["nombre", "region", "telefono", "correo", "referente_finanzas", "cantidad_de_nucleos", "fila", "devoluciones_habilitadas"];
+    protected $fillable = ["nombre", "region", "devoluciones_habilitadas"];
     protected $table = 'grupos_de_compra';
-    protected $hidden = ['password'];
 
     public function subpedidos(): HasMany
     {
diff --git a/app/Subpedido.php b/app/Subpedido.php
index 0370020..a0c6b5c 100644
--- a/app/Subpedido.php
+++ b/app/Subpedido.php
@@ -12,7 +12,6 @@ use App\Filtros\FiltroDeSubpedido;
 
 class Subpedido extends Model
 {
-    public $timestamps = false;
     protected $fillable = ['grupo_de_compra_id', 'aprobado', 'nombre', 'devoluciones_total', 'devoluciones_notas'];
 
     public function productos(): BelongsToMany
-- 
2.48.1


From eb3e4730bf6f0ce6e67fa746ac037067c462d40f Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Thu, 15 May 2025 01:13:38 -0300
Subject: [PATCH 006/111] Agregado es solidaio y eliminado proveedor

---
 app/Producto.php                              | 12 +---
 app/Proveedor.php                             | 18 ------
 ...2025_05_15_035305_agregar_es_solidario.php | 38 ++++++++++++
 .../2025_05_15_035807_eliminar_proveedor.php  | 59 +++++++++++++++++++
 4 files changed, 100 insertions(+), 27 deletions(-)
 delete mode 100644 app/Proveedor.php
 create mode 100644 database/migrations/2025_05_15_035305_agregar_es_solidario.php
 create mode 100644 database/migrations/2025_05_15_035807_eliminar_proveedor.php

diff --git a/app/Producto.php b/app/Producto.php
index 9b412c3..2a8406b 100644
--- a/app/Producto.php
+++ b/app/Producto.php
@@ -15,21 +15,15 @@ use Illuminate\Support\Facades\DB;
 
 class Producto extends Model
 {
-    public $timestamps = false;
-    protected $fillable = ["nombre", "precio", "presentacion", "stock", "categoria"];
+    protected $fillable = ["nombre", "precio", "categoria"];
     static int $paginarPorDefecto = 10;
 
     public function subpedidos(): BelongsToMany
     {
-        return $this->belongsToMany('App\Subpedido', 'productos_subpedidos')->withPivot(["cantidad", "notas"]);
+        return $this->belongsToMany(Subpedido::class, 'productos_subpedidos')->withPivot(["cantidad", "notas"]);
     }
 
-    public function proveedor(): BelongsTo
-    {
-        return $this->belongsTo('App\Proveedor');
-    }
-
-    //Este método permite que se apliquen los filtros al hacer una request (por ejemplo, de búsqueda)
+    // 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);
diff --git a/app/Proveedor.php b/app/Proveedor.php
deleted file mode 100644
index 07dbc40..0000000
--- a/app/Proveedor.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace App;
-
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\HasMany;
-
-class Proveedor extends Model
-{
-  public $timestamps = false;
-  protected $fillable = [ "nombre","direccion","telefono","correo","comentario" ];
-  protected $table = 'proveedores';
-
-  public function productos(): HasMany
-  {
-    return $this->hasMany('App\Producto');
-  }
-}
diff --git a/database/migrations/2025_05_15_035305_agregar_es_solidario.php b/database/migrations/2025_05_15_035305_agregar_es_solidario.php
new file mode 100644
index 0000000..e4797c4
--- /dev/null
+++ b/database/migrations/2025_05_15_035305_agregar_es_solidario.php
@@ -0,0 +1,38 @@
+<?php
+
+use App\Producto;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AgregarEsSolidario extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('productos', function (Blueprint $table) {
+            $table->boolean('es_solidario')->default(false);
+        });
+
+        foreach (Producto::all() as $producto) {
+            $producto->es_solidario = $producto->proveedor_id != null;
+            $producto->save();
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('productos', function (Blueprint $table) {
+            $table->dropColumn('es_solidario');
+        });
+    }
+}
diff --git a/database/migrations/2025_05_15_035807_eliminar_proveedor.php b/database/migrations/2025_05_15_035807_eliminar_proveedor.php
new file mode 100644
index 0000000..52c4210
--- /dev/null
+++ b/database/migrations/2025_05_15_035807_eliminar_proveedor.php
@@ -0,0 +1,59 @@
+<?php
+
+use App\Producto;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+class EliminarProveedor extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('productos', function (Blueprint $table) {
+            $table->dropColumn('proveedor_id');
+        });
+        Schema::dropIfExists('proveedores');
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::create('proveedores', function (Blueprint $table) {
+            $table->id();
+            $table->string('nombre');
+            $table->string('direccion')->nullable();
+            $table->string('telefono')->nullable();
+            $table->string('correo')->nullable();
+            $table->boolean('economia_solidaria')->nullable();
+            $table->boolean('nacional')->nullable();
+            $table->text('detalles_de_pago')->nullable();
+            $table->text('comentario')->nullable();
+            $table->timestamps();
+        });
+
+        Schema::table('productos', function (Blueprint $table) {
+            $table->foreignId('proveedor_id')->nullable();
+        });
+
+        $proveedor_id = DB::table('proveedores')->insertGetId([
+            ['nombre' => 'Proveedor de economía solidaria',
+                'economia_solidaria' => 1,
+                'nacional' => 1]
+        ]);
+
+        foreach (Producto::all() as $producto) {
+            $producto->proveedor_id = $producto->es_solidario ? $proveedor_id : null;
+            $producto->save();
+        }
+    }
+}
-- 
2.48.1


From 2245eb49390bbd6a6d3e8477666a5b6bb4746451 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Thu, 15 May 2025 01:16:54 -0300
Subject: [PATCH 007/111] Eliminado admin

---
 app/Admin.php                                 | 10 ------
 .../2025_05_15_041404_eliminar_admin.php      | 35 +++++++++++++++++++
 2 files changed, 35 insertions(+), 10 deletions(-)
 delete mode 100644 app/Admin.php
 create mode 100644 database/migrations/2025_05_15_041404_eliminar_admin.php

diff --git a/app/Admin.php b/app/Admin.php
deleted file mode 100644
index 9745b32..0000000
--- a/app/Admin.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace App;
-
-use Illuminate\Database\Eloquent\Model;
-
-class Admin extends Model
-{
-    //
-}
diff --git a/database/migrations/2025_05_15_041404_eliminar_admin.php b/database/migrations/2025_05_15_041404_eliminar_admin.php
new file mode 100644
index 0000000..cee52ed
--- /dev/null
+++ b/database/migrations/2025_05_15_041404_eliminar_admin.php
@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class EliminarAdmin extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::dropIfExists('admins');
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::create('admins', function (Blueprint $table) {
+            $table->id();
+            $table->string('nombre');
+            $table->foreignId('grupo_de_compra_id');
+            $table->string('email');
+            $table->string('contrasena');
+            $table->timestamps();
+        });
+    }
+}
-- 
2.48.1


From b330d991c664baa99b2fca44d843a914770fcfa9 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Thu, 15 May 2025 19:38:47 -0300
Subject: [PATCH 008/111] Agregado y registrado middleware para usar UserRole

---
 app/Http/Kernel.php               |  2 ++
 app/Http/Middleware/CheckRole.php | 25 +++++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 app/Http/Middleware/CheckRole.php

diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 243f1f2..ddef983 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -2,6 +2,7 @@
 
 namespace App\Http;
 
+use App\Http\Middleware\CheckRole;
 use Illuminate\Foundation\Http\Kernel as HttpKernel;
 use Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful;
 
@@ -58,6 +59,7 @@ class Kernel extends HttpKernel
         'auth' => \App\Http\Middleware\Authenticate::class,
         'admin' => \App\Http\Middleware\Admin::class,
         'compras' => \App\Http\Middleware\Compras::class,
+        'role' => \App\Http\Middleware\CheckRole::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
         'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
         'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
diff --git a/app/Http/Middleware/CheckRole.php b/app/Http/Middleware/CheckRole.php
new file mode 100644
index 0000000..daaf84c
--- /dev/null
+++ b/app/Http/Middleware/CheckRole.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use App\UserRole;
+use Closure;
+use Illuminate\Http\Request;
+
+class CheckRole
+{
+    /**
+     * Handle the incoming request.
+     *
+     * @param Request  $request
+     * @param Closure $next
+     * @param string  $role
+     * @return mixed
+     */
+    public function handle($request, Closure $next, $role)
+    {
+        $role_id = UserRole::where('nombre', $role)->first()->id;
+        return $request->user()->role_id == $role_id ? $next($request)
+            : response('No tenés permiso para esto.', 403);
+    }
+}
-- 
2.48.1


From de1bae86203bda73e7e25eb0842eeac645dd97a5 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Thu, 15 May 2025 19:39:17 -0300
Subject: [PATCH 009/111] Simplificado ProductoResource

---
 app/Http/Resources/ProductoResource.php | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/Http/Resources/ProductoResource.php b/app/Http/Resources/ProductoResource.php
index 677af54..bf6eb8f 100644
--- a/app/Http/Resources/ProductoResource.php
+++ b/app/Http/Resources/ProductoResource.php
@@ -20,13 +20,8 @@ class ProductoResource extends JsonResource
             'nombre' => $this->nombre,
             'precio' => $this->precio,
             'categoria' => $this->categoria,
-            'proveedor' => optional($this->proveedor)->nombre,
-            'economia_solidaria' => optional($this->proveedor)->economia_solidaria,
-            'nacional' => optional($this->proveedor)->nacional,
-            'imagen' => optional($this->poster)->url(),
-            'descripcion' => $this->descripcion,
-            'apto_veganxs' => $this->apto_veganxs,
-            'apto_celiacxs'  => $this->apto_celiacxs,
+            'economia_solidaria' => $this->es_solidario,
+            'nacional' => $this->es_solidario,
             'requiere_notas' => $this->requiere_notas,
         ];
     }
-- 
2.48.1


From 2e78d39f12cbdf7287a2e031a183e9cb41a74f2e Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Thu, 15 May 2025 19:45:30 -0300
Subject: [PATCH 010/111] Reemplazo de logica de proovedor por es_solidario

---
 app/Helpers/CanastaHelper.php | 38 ++++++++---------------------------
 1 file changed, 8 insertions(+), 30 deletions(-)

diff --git a/app/Helpers/CanastaHelper.php b/app/Helpers/CanastaHelper.php
index 7a80fee..84a6ab0 100644
--- a/app/Helpers/CanastaHelper.php
+++ b/app/Helpers/CanastaHelper.php
@@ -3,14 +3,12 @@
 namespace App\Helpers;
 
 use App\Producto;
-use App\Proveedor;
 use App\CanastaLog;
 use DatabaseSeeder;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
 
-
 class CanastaHelper
 {
     const TIPO = "Tipo";
@@ -39,23 +37,16 @@ class CanastaHelper
         $categoria = '';
 
         foreach($registros as $i => $registro) {
-            // saltear filas que no tienen tipo
-            if (self::noTieneTipo($registro)) {
-                var_dump("no hay tipo en la fila " . $i);
+            // saltear bono de transporte y filas que no tienen tipo
+            if (self::noTieneTipo($registro) || $registro[self::TIPO] == "T")
                 continue;
-            }
-
-            // saltear bono de transporte
-            if ($registro[self::TIPO] == "T"){
-                continue;
-            }
 
             // obtener categoria si no hay producto
             if ($registro[self::PRODUCTO] == '') {
                 // no es la pregunta de la copa?
                 if (!Str::contains($registro[self::TIPO],"¿"))
                     $categoria = $registro[self::TIPO];
-                continue;
+                continue; // saltear si es la pregunta de la copa
             }
 
             // completar producto
@@ -64,33 +55,20 @@ class CanastaHelper
                 'categoria'     => $categoria,
                 'nombre'        => trim(str_replace('*', '',$registro[self::PRODUCTO])),
                 'precio'        => $registro[self::PRECIO],
-                'proveedor_id'  => self::obtenerProveedor($registro[self::PRODUCTO]),
+                'es_solidario'  => Str::contains($registro[self::PRODUCTO],"*"),
                 'bono'          => preg_match(self::REGEX_BONO, $registro[self::TIPO]),
                 'requiere_notas'=> $registro[self::TIPO] == self::PRODUCTO_TALLE_COLOR,
             ];
         }
 
-        foreach (array_chunk($toInsert,DatabaseSeeder::CHUNK_SIZE) as $chunk) {
-            DB::table('productos')->insert($chunk);
-        }
+        foreach (array_chunk($toInsert,DatabaseSeeder::CHUNK_SIZE) as $chunk)
+            Producto::insert($chunk);
 
         self::agregarBonoBarrial();
 
         self::log($archivo, self::CANASTA_CARGADA);
     }
 
-    private static function obtenerProveedor($nombre) {
-        $result = null;
-        if (Str::contains($nombre,"*")){
-            $result = Proveedor::firstOrCreate([
-                'nombre' => 'Proveedor de economía solidaria',
-                'economia_solidaria' => 1,
-                'nacional' => 1
-            ])->id;
-        }
-        return $result;
-    }
-
     /**
      * @param $path
      * @param $descripcion
@@ -122,13 +100,13 @@ class CanastaHelper
                 return Str::contains($c, 'BONO');
             });
 
-        DB::table('productos')->insert([
+        Producto::create([
             'fila' => 420,
             'nombre' => "Bono barrial",
             'precio' => 20,
             'categoria' => $categoria,
             'bono' => 1,
-            'proveedor_id'  => null,
+            'es_solidario'  => 0,
             'requiere_notas'=> false,
         ]);
     }
-- 
2.48.1


From a9e9966c937b9fa1f43c1ce99f97b8a8b4d0804d Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Thu, 15 May 2025 20:19:07 -0300
Subject: [PATCH 011/111] Refactor de login y home para que dependan del
 UserRole

---
 app/Http/Controllers/Auth/LoginController.php |  9 +-----
 app/Http/Controllers/RouteController.php      | 30 +++++++++++++++++++
 app/Http/Middleware/Authenticate.php          |  8 ++++-
 resources/views/auth/admin_login.blade.php    |  2 +-
 resources/views/auth/compras_login.blade.php  |  2 +-
 resources/views/auth/login.blade.php          |  2 +-
 routes/web.php                                | 19 ++++++------
 7 files changed, 50 insertions(+), 22 deletions(-)
 create mode 100644 app/Http/Controllers/RouteController.php

diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index c4092fa..f8386c0 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -31,14 +31,7 @@ class LoginController extends Controller
 
     protected function authenticated(Request $request, $user)
     {
-        if ($user->is_compras) {
-            return redirect('compras/pedidos');
-        } else if ($user->is_admin) {
-            session(['admin_gdc' => $user->grupo_de_compra_id]);
-            return redirect('admin/pedidos');
-        } else {
-            return redirect('/');
-        }
+        return redirect('/');
     }
 
     /**
diff --git a/app/Http/Controllers/RouteController.php b/app/Http/Controllers/RouteController.php
new file mode 100644
index 0000000..8802251
--- /dev/null
+++ b/app/Http/Controllers/RouteController.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\UserRole;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+
+class RouteController extends Controller
+{
+    function home(Request $request) {
+        if (!Auth::check())
+            return redirect('/login');
+
+        $barrio = UserRole::where('nombre', 'barrio')->first();
+        $admin = UserRole::where('nombre', 'admin_barrio')->first();
+        $comision = UserRole::where('nombre', 'comision')->first();
+
+        switch ($request->user()->role_id) {
+            case $barrio->id:
+                return redirect('/productos');
+            case $admin->id:
+                return redirect('/admin');
+            case $comision->id:
+                return redirect('/compras');
+            default:
+                abort(400, 'Rol de usuario invalido');
+        }
+    }
+}
diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php
index 704089a..e499bdc 100644
--- a/app/Http/Middleware/Authenticate.php
+++ b/app/Http/Middleware/Authenticate.php
@@ -3,6 +3,7 @@
 namespace App\Http\Middleware;
 
 use Illuminate\Auth\Middleware\Authenticate as Middleware;
+use Illuminate\Support\Facades\Auth;
 
 class Authenticate extends Middleware
 {
@@ -14,7 +15,12 @@ class Authenticate extends Middleware
      */
     protected function redirectTo($request)
     {
-        if (! $request->expectsJson()) {
+        if (!$request->expectsJson()) {
+            $path = $request->path();
+            if (preg_match('~^admin.*~i', $path))
+                    return route('admin.login');
+            if (preg_match('~^compras.*~i', $path))
+                    return route('compras.login');
             return route('login');
         }
     }
diff --git a/resources/views/auth/admin_login.blade.php b/resources/views/auth/admin_login.blade.php
index f1d4a07..c288df8 100644
--- a/resources/views/auth/admin_login.blade.php
+++ b/resources/views/auth/admin_login.blade.php
@@ -22,7 +22,7 @@
         </div>
         @enderror
         <comunes-region-select v-bind:admin="true"></comunes-region-select>
-        <form method="post" action="login">
+        <form method="post" action="/login">
             @csrf
             <comunes-barrio-select v-bind:admin="true"></comunes-barrio-select>
             <admin-login></admin-login>
diff --git a/resources/views/auth/compras_login.blade.php b/resources/views/auth/compras_login.blade.php
index 6217038..ba28780 100644
--- a/resources/views/auth/compras_login.blade.php
+++ b/resources/views/auth/compras_login.blade.php
@@ -22,7 +22,7 @@
               Contraseña incorrecta, intentalo nuevamente.
             </div>
           @enderror
-          <form method="post" action="login">
+          <form method="post" action="/login">
             @csrf
               <compras-login></compras-login>
           </form>
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 822042a..8425226 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -24,7 +24,7 @@
             </div>
           @enderror
           <comunes-region-select></comunes-region-select>
-          <form method="post" action="login">
+          <form method="post" action="/login">
             @csrf
             <comunes-barrio-select></comunes-barrio-select>
             <pedidos-login></pedidos-login>
diff --git a/routes/web.php b/routes/web.php
index 87ab4af..38ad6b1 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -20,13 +20,11 @@ if (App::environment('production')) {
     URL::forceScheme('https');
 }
 
-Route::get('/', 'ProductoController@index')->name('productos');
+Route::get('/', 'RouteController@home')->name('home');
 
 Auth::routes(['register' => false]);
 
-Route::get('/productos', 'ProductoController@index')->name('productos.index');
-
-Route::get('/admin', 'AdminController@show')->name('admin_login.show');
+Route::get('/admin/login', 'AdminController@show')->name('admin.login');
 
 Route::get('/admin/obtener_sesion', function() {
     return [
@@ -34,8 +32,8 @@ Route::get('/admin/obtener_sesion', function() {
     ];
 })->name('admin_obtener_sesion');
 
-Route::middleware(['auth', 'admin'])->group( function () {
-	Route::get('/admin/pedidos', 'AdminController@index')->name('admin_login.index');
+Route::middleware(['auth', 'role:admin_barrio'])->group( function () {
+	Route::get('/admin', 'AdminController@index')->name('admin.pedidos');
 
 	Route::get('/admin/exportar-planillas-a-pdf/{gdc}', 'AdminController@exportarPedidosAPdf');
 
@@ -44,7 +42,8 @@ Route::middleware(['auth', 'admin'])->group( function () {
 	Route::get('/admin/exportar-pedido-con-nucleos-a-csv/{gdc}', 'AdminController@exportarPedidoConNucleosACSV');
 });
 
-Route::middleware('auth')->group( function() {
+Route::middleware(['auth', 'role:barrio'])->group( function() {
+    Route::get('/productos', 'ProductoController@index')->name('productos.index');
 
 	Route::name('subpedidos.')->prefix("subpedidos")->group( function() {
 		Route::get('/', function() {
@@ -77,10 +76,10 @@ Route::middleware('auth')->group( function() {
 	});
 });
 
-Route::get('/compras', 'ComprasController@show')->name('compras_login.show');
+Route::get('/compras/login', 'ComprasController@show')->name('compras.login');
 
-Route::middleware(['compras'])->group( function() {
-    Route::get('/compras/pedidos', 'ComprasController@indexPedidos')->name('compras.pedidos');
+Route::middleware(['auth', 'role:comision'])->group( function() {
+    Route::get('/compras', 'ComprasController@indexPedidos')->name('compras.pedidos');
     Route::get('/compras/pedidos/descargar', 'ComprasController@descargarPedidos')->name('compras.pedidos.descargar');
     Route::get('/compras/pedidos/notas', 'ComprasController@descargarNotas')->name('compras.pedidos.descargar');
     Route::get('/compras/pedidos/pdf', 'ComprasController@pdf')->name('compras.pedidos.pdf');
-- 
2.48.1


From f0f046d3cb3779aa5fd3b83e8c5af08c2b668694 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 16 May 2025 14:46:14 -0300
Subject: [PATCH 012/111] Quitadas referencias a proveedor

---
 resources/js/components/pedidos/ProductoCard.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/resources/js/components/pedidos/ProductoCard.vue b/resources/js/components/pedidos/ProductoCard.vue
index 45eff38..b1f6740 100644
--- a/resources/js/components/pedidos/ProductoCard.vue
+++ b/resources/js/components/pedidos/ProductoCard.vue
@@ -56,8 +56,7 @@ export default {
                     <p class="title is-6">
                         {{ producto.nombre }}
                     </p>
-                    <p class="subtitle is-7" v-text="producto.proveedor"></p>
-                    <span class="subtitle is-7 hidden-from-tablet" v-if="enChismosa !== 0">{{ enChismosa }} en chismosa</span>
+                    <span class="subtitle is-7 hidden-from-tablet" v-if="enChismosa">{{ enChismosa }} en chismosa</span>
                 </div>
                 <div class="column is-one-quarter has-text-right">
                     <p class="has-text-weight-bold has-text-primary">
-- 
2.48.1


From 8ad179c61c8426f478b449dcfc828b32b22afd5b Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 16 May 2025 14:53:02 -0300
Subject: [PATCH 013/111] Quitadas import no usado

---
 app/Producto.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/Producto.php b/app/Producto.php
index 2a8406b..da18d78 100644
--- a/app/Producto.php
+++ b/app/Producto.php
@@ -7,7 +7,6 @@ use App\Helpers\CsvHelper;
 use App\Helpers\TransporteHelper;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
-- 
2.48.1


From 0b445ee1c554e21ed4397cf705b96c84a7f0a787 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 16 May 2025 14:53:23 -0300
Subject: [PATCH 014/111] Cambio en referencia

---
 resources/js/components/pedidos/ProductoCard.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/resources/js/components/pedidos/ProductoCard.vue b/resources/js/components/pedidos/ProductoCard.vue
index b1f6740..b2012b9 100644
--- a/resources/js/components/pedidos/ProductoCard.vue
+++ b/resources/js/components/pedidos/ProductoCard.vue
@@ -1,6 +1,9 @@
 <script>
+import ProductoCantidad from "./ProductoCantidad.vue";
+
 export default {
     name: "ProductoCard",
+    components: { ProductoCantidad },
     props: {
         producto: Object
     },
@@ -70,7 +73,7 @@ export default {
             </div>
             <footer class="columns">
                 <div class="column is-three-quarters">
-                    <pedidos-producto-cantidad :producto="producto"></pedidos-producto-cantidad>
+                    <producto-cantidad :producto="producto"></producto-cantidad>
                 </div>
                 <div class="column">
                     <p class="subtitle is-7 is-hidden-mobile" v-if="enChismosa > 0">{{ enChismosa }} en chismosa</p>
-- 
2.48.1


From 44465c27837f917e9020a8a073019c1063cc6fa9 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 16 May 2025 14:53:35 -0300
Subject: [PATCH 015/111] Quitado total de pivot y de sync subpedido

---
 app/Subpedido.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/Subpedido.php b/app/Subpedido.php
index a0c6b5c..29d001e 100644
--- a/app/Subpedido.php
+++ b/app/Subpedido.php
@@ -16,7 +16,7 @@ class Subpedido extends Model
 
     public function productos(): BelongsToMany
     {
-        return $this->belongsToMany('App\Producto')->withPivot(["cantidad", "total", "notas"]);
+        return $this->belongsToMany('App\Producto')->withPivot(["cantidad", "notas"]);
     }
 
     public function grupoDeCompra(): BelongsTo
@@ -99,7 +99,6 @@ class Subpedido extends Model
             $this->productos()->syncWithoutDetaching([
                 $producto->id => [
                     'cantidad' => $cantidad,
-                    'total' => $cantidad * $producto->precio,
                     'notas' => $notas,
                 ]
             ]);
-- 
2.48.1


From 8799446e5709735431077f2729992022da74d8b7 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 16 May 2025 15:03:40 -0300
Subject: [PATCH 016/111] Calculando total por producto

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

diff --git a/app/Http/Resources/SubpedidoResource.php b/app/Http/Resources/SubpedidoResource.php
index 98fd733..1976cd1 100644
--- a/app/Http/Resources/SubpedidoResource.php
+++ b/app/Http/Resources/SubpedidoResource.php
@@ -15,11 +15,15 @@ class SubpedidoResource extends JsonResource
      */
     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,
             'grupo_de_compra' => $this->grupoDeCompra,
-            'productos' => $this->productos,
+            'productos' => $productos,
             'aprobado' => (bool) $this->aprobado,
             'total' => number_format($this->total(),2),
             'total_transporte' => number_format($this->totalTransporte()),
-- 
2.48.1


From 025b9239c3347025e3dceb62b0ab06735caf7757 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 16 May 2025 15:03:51 -0300
Subject: [PATCH 017/111] Quitado redondeo

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

diff --git a/resources/js/components/pedidos/ProductoRow.vue b/resources/js/components/pedidos/ProductoRow.vue
index 5020d9c..30ae0ab 100644
--- a/resources/js/components/pedidos/ProductoRow.vue
+++ b/resources/js/components/pedidos/ProductoRow.vue
@@ -2,13 +2,16 @@
 	<tr>
             <td>{{ this.producto.nombre }}</td>
             <td class="has-text-right">
-                <pedidos-producto-cantidad :producto="producto"></pedidos-producto-cantidad>
+                <producto-cantidad :producto="producto"></producto-cantidad>
             </td>
-            <td class="has-text-right">{{ Math.ceil(this.producto.pivot.total) }}</td>
+            <td class="has-text-right">{{ this.producto.pivot.total }}</td>
     </tr>
 </template>
 <script>
+    import ProductoCantidad from "./ProductoCantidad.vue";
+
     export default {
+        components: { ProductoCantidad },
 		props: {
 	        producto: Object
 	    },
-- 
2.48.1


From ac6fc6bc0e64ec08868faad528772a798de44c3d Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 16 May 2025 15:04:00 -0300
Subject: [PATCH 018/111] Cambio referencia

---
 resources/js/components/pedidos/Chismosa.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/resources/js/components/pedidos/Chismosa.vue b/resources/js/components/pedidos/Chismosa.vue
index bcab963..c7c8e93 100644
--- a/resources/js/components/pedidos/Chismosa.vue
+++ b/resources/js/components/pedidos/Chismosa.vue
@@ -34,7 +34,7 @@
                 </tr>
                 </tfoot>
                 <tbody>
-                <pedidos-producto-row v-for="producto in productos" :producto="producto" :key="producto.id"></pedidos-producto-row>
+                <producto-row v-for="producto in productos" :producto="producto" :key="producto.id"></producto-row>
                 </tbody>
             </table>
             <p class="has-text-centered" v-show="!mostrar_tabla">
@@ -45,7 +45,10 @@
 </template>
 
 <script>
+    import ProductoRow from "./ProductoRow.vue";
+
     export default {
+        components: {ProductoRow},
         data() {
             return {
                 mostrar_tabla: false,
-- 
2.48.1


From 6e0238eef7b2574d4cd40e5412834ec5ffcbf138 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 16 May 2025 15:12:37 -0300
Subject: [PATCH 019/111] Quitados is_compras, is_admin de seeders

---
 database/seeds/GrupoDeCompraSeeder.php | 4 ----
 database/seeds/UserSeeder.php          | 3 ---
 2 files changed, 7 deletions(-)

diff --git a/database/seeds/GrupoDeCompraSeeder.php b/database/seeds/GrupoDeCompraSeeder.php
index b714316..e4f4dc2 100644
--- a/database/seeds/GrupoDeCompraSeeder.php
+++ b/database/seeds/GrupoDeCompraSeeder.php
@@ -25,9 +25,6 @@ class GrupoDeCompraSeeder extends Seeder
             $gdcToInsert[] = [
                 'nombre'        => $registro['barrio'],
                 'region'        => $registro['region'],
-                'telefono'      => $registro['telefono'],
-                'correo'        => $registro['correo'],
-                'referente_finanzas'   => $registro['referente']
             ];
 
             foreach($roles as $role) {
@@ -36,7 +33,6 @@ class GrupoDeCompraSeeder extends Seeder
                     'password' => Hash::make("123"),
                     'role_id' => $role->id,
                     'grupo_de_compra_id' => $key,
-                    'is_admin' => $role->nombre != 'barrio' ? 0 : 1,
                 ];
             }
         }
diff --git a/database/seeds/UserSeeder.php b/database/seeds/UserSeeder.php
index 4ed365d..1f5533b 100644
--- a/database/seeds/UserSeeder.php
+++ b/database/seeds/UserSeeder.php
@@ -3,7 +3,6 @@
 use App\User;
 use App\UserRole;
 use Illuminate\Database\Seeder;
-use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
 
 class UserSeeder extends Seeder
@@ -21,8 +20,6 @@ class UserSeeder extends Seeder
             'name' => 'comi',
             'password' => Hash::make("123"),
             'role_id' => UserRole::where('nombre', 'comision')->first()->id,
-            'is_admin' => 0,
-            'is_compras' => 1
         ];
 
 
-- 
2.48.1


From ea8611771b60d4ee22a7682fe8109f7570f98ed3 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 16 May 2025 16:00:03 -0300
Subject: [PATCH 020/111] Agregadas timestamps

---
 app/Helpers/CanastaHelper.php          |  4 ++--
 app/Subpedido.php                      | 10 +++++++---
 database/seeds/DatabaseSeeder.php      |  9 +++++++++
 database/seeds/GrupoDeCompraSeeder.php | 13 +++++++------
 database/seeds/UserSeeder.php          |  4 ++--
 5 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/app/Helpers/CanastaHelper.php b/app/Helpers/CanastaHelper.php
index 84a6ab0..7b4c37d 100644
--- a/app/Helpers/CanastaHelper.php
+++ b/app/Helpers/CanastaHelper.php
@@ -50,7 +50,7 @@ class CanastaHelper
             }
 
             // completar producto
-            $toInsert[] = [
+            $toInsert[] = DatabaseSeeder::addTimestamps([
                 'fila'          => $i,
                 'categoria'     => $categoria,
                 'nombre'        => trim(str_replace('*', '',$registro[self::PRODUCTO])),
@@ -58,7 +58,7 @@ class CanastaHelper
                 'es_solidario'  => Str::contains($registro[self::PRODUCTO],"*"),
                 'bono'          => preg_match(self::REGEX_BONO, $registro[self::TIPO]),
                 'requiere_notas'=> $registro[self::TIPO] == self::PRODUCTO_TALLE_COLOR,
-            ];
+            ]);
         }
 
         foreach (array_chunk($toInsert,DatabaseSeeder::CHUNK_SIZE) as $chunk)
diff --git a/app/Subpedido.php b/app/Subpedido.php
index 29d001e..26e38e4 100644
--- a/app/Subpedido.php
+++ b/app/Subpedido.php
@@ -16,12 +16,12 @@ class Subpedido extends Model
 
     public function productos(): BelongsToMany
     {
-        return $this->belongsToMany('App\Producto')->withPivot(["cantidad", "notas"]);
+        return $this->belongsToMany(Producto::class)->withPivot(["cantidad", "notas"]);
     }
 
     public function grupoDeCompra(): BelongsTo
     {
-        return $this->belongsTo('App\GrupoDeCompra');
+        return $this->belongsTo(GrupoDeCompra::class);
     }
 
     // Permite que se apliquen los filtros al hacer una request (por ejemplo, de búsqueda)
@@ -91,7 +91,7 @@ class Subpedido extends Model
         return TransporteHelper::cantidadTransporte($this->totalCentralesQuePaganTransporte());
     }
 
-    //Actualiza el pedido, agregando o quitando del subpedido según sea necesario. Debe ser llamado desde el controlador de subpedidos, luego de validar que los parámetros $producto y $cantidad son correctos. También calcula el subtotal por producto.
+    // Actualiza el pedido, agregando o quitando del subpedido según sea necesario. Debe ser llamado desde el controlador de subpedidos, luego de validar que los parámetros $producto y $cantidad son correctos. También calcula el subtotal por producto.
     public function syncProducto(Producto $producto, int $cantidad, string $notas)
     {
         if ($cantidad) {
@@ -106,11 +106,15 @@ class Subpedido extends Model
             //si la cantidad es 0, se elimina el producto del subpedido
             $this->productos()->detach($producto->id);
         }
+
+        $this->updated_at = now();
+        $this->save();
     }
 
     public function toggleAprobacion(bool $aprobacion)
     {
         $this->aprobado = $aprobacion;
+        $this->update(['aprobado' => $aprobacion]);
         $this->save();
     }
 
diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php
index 845fa72..57f6ac4 100644
--- a/database/seeds/DatabaseSeeder.php
+++ b/database/seeds/DatabaseSeeder.php
@@ -1,10 +1,19 @@
 <?php
 
 use Illuminate\Database\Seeder;
+use Illuminate\Support\Facades\DB;
 
 class DatabaseSeeder extends Seeder
 {
 	const CHUNK_SIZE = 100;
+
+    static function addTimestamps($object) {
+        $now = DB::raw('CURRENT_TIMESTAMP');
+        $object['created_at'] = $now;
+        $object['updated_at'] = $now;
+        return $object;
+    }
+
     /**
      * Seed the application's database.
      *
diff --git a/database/seeds/GrupoDeCompraSeeder.php b/database/seeds/GrupoDeCompraSeeder.php
index e4f4dc2..ae06746 100644
--- a/database/seeds/GrupoDeCompraSeeder.php
+++ b/database/seeds/GrupoDeCompraSeeder.php
@@ -19,21 +19,22 @@ class GrupoDeCompraSeeder extends Seeder
         $registros = CsvHelper::getRecords('csv/barrios.csv');
         $gdcToInsert = [];
         $usersToInsert = [];
-        $roles = UserRole::where('nombre', 'barrio')->orWhere('nombre', 'barrio_admin')->get();
+        $roles = UserRole::where('nombre', 'barrio')->orWhere('nombre', 'admin_barrio')->get();
 
         foreach($registros as $key => $registro){
-            $gdcToInsert[] = [
+            $gdcToInsert[] = DatabaseSeeder::addTimestamps([
                 'nombre'        => $registro['barrio'],
                 'region'        => $registro['region'],
-            ];
+            ]);
 
             foreach($roles as $role) {
-                $usersToInsert[] = [
-                    'name' => $registro['barrio'],
+                $nombre = $registro['barrio'] . ($role->nombre == 'barrio' ? '' : '_admin');
+                $usersToInsert[] = DatabaseSeeder::addTimestamps([
+                    'name' => $nombre,
                     'password' => Hash::make("123"),
                     'role_id' => $role->id,
                     'grupo_de_compra_id' => $key,
-                ];
+                ]);
             }
         }
 
diff --git a/database/seeds/UserSeeder.php b/database/seeds/UserSeeder.php
index 1f5533b..35bc3b9 100644
--- a/database/seeds/UserSeeder.php
+++ b/database/seeds/UserSeeder.php
@@ -16,11 +16,11 @@ class UserSeeder extends Seeder
     {
         $usersToInsert = [];
 
-        $usersToInsert[] = [
+        $usersToInsert[] = DatabaseSeeder::addTimestamps([
             'name' => 'comi',
             'password' => Hash::make("123"),
             'role_id' => UserRole::where('nombre', 'comision')->first()->id,
-        ];
+        ]);
 
 
         foreach (array_chunk($usersToInsert,DatabaseSeeder::CHUNK_SIZE) as $chunk)
-- 
2.48.1


From 1e7afc034ea32b6edabd0c5b51f8b98cf1a52457 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 16 May 2025 16:11:49 -0300
Subject: [PATCH 021/111] Quitadas dependencias no usadas

---
 app/Http/Controllers/Auth/LoginController.php | 1 -
 app/Http/Middleware/Authenticate.php          | 1 -
 2 files changed, 2 deletions(-)

diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index f8386c0..6d96912 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -6,7 +6,6 @@ use App\Http\Controllers\Controller;
 use App\Providers\RouteServiceProvider;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
 
 class LoginController extends Controller
 {
diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php
index e499bdc..265a157 100644
--- a/app/Http/Middleware/Authenticate.php
+++ b/app/Http/Middleware/Authenticate.php
@@ -3,7 +3,6 @@
 namespace App\Http\Middleware;
 
 use Illuminate\Auth\Middleware\Authenticate as Middleware;
-use Illuminate\Support\Facades\Auth;
 
 class Authenticate extends Middleware
 {
-- 
2.48.1


From 6bcb22ea00bd50ae406f83b5fa5fe01bac62edd6 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 16 May 2025 16:15:30 -0300
Subject: [PATCH 022/111] Eliminados middlewares no usados + reorden

---
 app/Http/Middleware/Admin.php   | 20 ----------
 app/Http/Middleware/Compras.php | 29 --------------
 routes/web.php                  | 70 ++++++++++++++++-----------------
 3 files changed, 35 insertions(+), 84 deletions(-)
 delete mode 100644 app/Http/Middleware/Admin.php
 delete mode 100644 app/Http/Middleware/Compras.php

diff --git a/app/Http/Middleware/Admin.php b/app/Http/Middleware/Admin.php
deleted file mode 100644
index df3fdb1..0000000
--- a/app/Http/Middleware/Admin.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Closure;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Http\Request;
-
-class Admin
-{
-    public function handle(Request $request, Closure $next)
-    {
-        $user = Auth::user();
-        if ($user->is_admin) {
-            return $next($request);
-        } else {
-            return response('Necesitás ser admin para hacer esto', 403);
-        }
-    }
-}
diff --git a/app/Http/Middleware/Compras.php b/app/Http/Middleware/Compras.php
deleted file mode 100644
index a9d9f6b..0000000
--- a/app/Http/Middleware/Compras.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Closure;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-
-class Compras
-{
-    /**
-     * Handle an incoming request.
-     *
-     * @param Request $request
-     * @param Closure $next
-     * @return mixed
-     */
-    public function handle(Request $request, Closure $next)
-    {
-        if (!Auth::check())
-            return redirect()->route('compras_login.show');
-
-        if (Auth::user()->is_compras) {
-            return $next($request);
-        } else {
-            return response('Necesitás ser de comisión compras para hacer esto', 403);
-        }
-    }
-}
diff --git a/routes/web.php b/routes/web.php
index 38ad6b1..b5a9882 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -20,9 +20,43 @@ if (App::environment('production')) {
     URL::forceScheme('https');
 }
 
+Auth::routes(['register' => false]);
+
 Route::get('/', 'RouteController@home')->name('home');
 
-Auth::routes(['register' => false]);
+Route::middleware(['auth', 'role:barrio'])->group( function() {
+    Route::get('/productos', 'ProductoController@index')->name('productos.index');
+
+    Route::name('subpedidos.')->prefix("subpedidos")->group( function() {
+        Route::get('/', function() {
+            return view('subpedidos_create');
+        })->name('create');
+
+        Route::post('guardar_sesion', function() {
+            $r = request();
+            if (!isset($r["subpedido"])) {
+                throw new HttpException(400, "La request necesita un subpedido para guardar en sesión");
+            }
+            if (!isset($r["grupo_de_compra_id"])) {
+                throw new HttpException(400, "La request necesita un grupo de compra para guardar en sesión");
+            }
+            session(["subpedido_nombre" => $r["subpedido"]["nombre"]]);
+            session(["subpedido_id" => $r["subpedido"]["id"]]);
+            session(["gdc" => $r["grupo_de_compra_id"]]);
+            return "Subpedido guardado en sesión";
+        })->name('guardarSesion');
+
+        Route::get('obtener_sesion', function() {
+            return [
+                'subpedido' => [
+                    'nombre' => session("subpedido_nombre"),
+                    'id' => session("subpedido_id")
+                ],
+                'gdc' => session("gdc")
+            ];
+        })->name('obtenerSesion');
+    });
+});
 
 Route::get('/admin/login', 'AdminController@show')->name('admin.login');
 
@@ -42,40 +76,6 @@ Route::middleware(['auth', 'role:admin_barrio'])->group( function () {
 	Route::get('/admin/exportar-pedido-con-nucleos-a-csv/{gdc}', 'AdminController@exportarPedidoConNucleosACSV');
 });
 
-Route::middleware(['auth', 'role:barrio'])->group( function() {
-    Route::get('/productos', 'ProductoController@index')->name('productos.index');
-
-	Route::name('subpedidos.')->prefix("subpedidos")->group( function() {
-		Route::get('/', function() {
-			return view('subpedidos_create');
-		})->name('create');
-
-		Route::post('guardar_sesion', function() {
-			$r = request();
-			if (!isset($r["subpedido"])) {
-	            throw new HttpException(400, "La request necesita un subpedido para guardar en sesión");
-	        }
-            if (!isset($r["grupo_de_compra_id"])) {
-                throw new HttpException(400, "La request necesita un grupo de compra para guardar en sesión");
-            }
-	        session(["subpedido_nombre" => $r["subpedido"]["nombre"]]);
-	        session(["subpedido_id" => $r["subpedido"]["id"]]);
-	        session(["gdc" => $r["grupo_de_compra_id"]]);
-	        return "Subpedido guardado en sesión";
-		})->name('guardarSesion');
-
-		Route::get('obtener_sesion', function() {
-            return [
-                'subpedido' => [
-                    'nombre' => session("subpedido_nombre"),
-                    'id' => session("subpedido_id")
-                ],
-                'gdc' => session("gdc")
-            ];
-		})->name('obtenerSesion');
-	});
-});
-
 Route::get('/compras/login', 'ComprasController@show')->name('compras.login');
 
 Route::middleware(['auth', 'role:comision'])->group( function() {
-- 
2.48.1


From 60a6f3e7818407361d9a2dc3581ea2be1255e523 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 16 May 2025 16:36:29 -0300
Subject: [PATCH 023/111] Quitados metodos no usados

---
 resources/js/app.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/resources/js/app.js b/resources/js/app.js
index c2bf1a6..51be45f 100644
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -26,6 +26,7 @@ Vue.prototype.$rootMiga = {
   nombre: "Categorías",
   href: "/productos"
 }
+
 /**
  * Global methods
  */
@@ -40,12 +41,6 @@ Vue.prototype.$toast = function(mensaje, duration = 2000) {
     position: 'bottom-center',
   });
 }
-Vue.prototype.$limpiarFloat = function(unFloat) {
-  return parseFloat(unFloat.replace(/,/g, ''))
-}
-Vue.prototype.$limpiarInt = function(unInt) {
-  return parseInt(unInt.replace(/,/g, ''))
-}
 
 /**
  * Next, we will create a fresh Vue application instance and attach it to
-- 
2.48.1


From e047b0a23c4fa7c946efe4f515932ea15c920e89 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 16 May 2025 17:24:08 -0300
Subject: [PATCH 024/111] Agregado vuex

---
 package-lock.json | 61 +++++++++++++++++++----------------------------
 package.json      |  3 ++-
 2 files changed, 27 insertions(+), 37 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c28b5a6..0f97722 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,7 +8,8 @@
                 "animate.css": "^4.1.1",
                 "bulma": "^0.9.4",
                 "bulma-switch": "^2.0.4",
-                "bulma-toast": "^2.4.1"
+                "bulma-toast": "^2.4.1",
+                "vuex": "^3.6.2"
             },
             "devDependencies": {
                 "axios": "^0.19.2",
@@ -350,7 +351,6 @@
             "version": "7.27.1",
             "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
             "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
-            "dev": true,
             "engines": {
                 "node": ">=6.9.0"
             }
@@ -359,7 +359,6 @@
             "version": "7.27.1",
             "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz",
             "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==",
-            "dev": true,
             "engines": {
                 "node": ">=6.9.0"
             }
@@ -404,7 +403,6 @@
             "version": "7.27.2",
             "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.2.tgz",
             "integrity": "sha512-QYLs8299NA7WM/bZAdp+CviYYkVoYXlDW2rzliy3chxd1PQjej7JORuMJDJXJUb9g0TT+B99EwaVLKmX+sPXWw==",
-            "dev": true,
             "dependencies": {
                 "@babel/types": "^7.27.1"
             },
@@ -1568,7 +1566,6 @@
             "version": "7.27.1",
             "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.1.tgz",
             "integrity": "sha512-+EzkxvLNfiUeKMgy/3luqfsCWFRXLb7U6wNQTk60tovuckwB15B191tJWvpp4HjiQWdJkCxO3Wbvc6jlk3Xb2Q==",
-            "dev": true,
             "dependencies": {
                 "@babel/helper-string-parser": "^7.27.1",
                 "@babel/helper-validator-identifier": "^7.27.1"
@@ -2060,7 +2057,6 @@
             "version": "2.7.16",
             "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.16.tgz",
             "integrity": "sha512-KWhJ9k5nXuNtygPU7+t1rX6baZeqOYLEforUPjgNDBnLicfHCoi48H87Q8XyLZOrNNsmhuwKqtpDQWjEFe6Ekg==",
-            "dev": true,
             "dependencies": {
                 "@babel/parser": "^7.23.5",
                 "postcss": "^8.4.14",
@@ -2075,7 +2071,6 @@
             "version": "8.5.3",
             "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz",
             "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==",
-            "dev": true,
             "funding": [
                 {
                     "type": "opencollective",
@@ -4609,8 +4604,7 @@
         "node_modules/csstype": {
             "version": "3.1.3",
             "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
-            "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
-            "dev": true
+            "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="
         },
         "node_modules/cyclist": {
             "version": "1.0.2",
@@ -8717,7 +8711,6 @@
             "version": "3.3.11",
             "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
             "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
-            "dev": true,
             "funding": [
                 {
                     "type": "github",
@@ -9555,8 +9548,7 @@
         "node_modules/picocolors": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
-            "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
-            "dev": true
+            "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="
         },
         "node_modules/picomatch": {
             "version": "2.3.1",
@@ -10557,7 +10549,6 @@
             "version": "2.8.8",
             "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
             "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
-            "dev": true,
             "optional": true,
             "bin": {
                 "prettier": "bin-prettier.js"
@@ -12085,7 +12076,6 @@
             "version": "0.6.1",
             "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
             "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-            "dev": true,
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -12094,7 +12084,6 @@
             "version": "1.2.1",
             "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
             "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
-            "dev": true,
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -13345,7 +13334,6 @@
             "resolved": "https://registry.npmjs.org/vue/-/vue-2.7.16.tgz",
             "integrity": "sha512-4gCtFXaAA3zYZdTp5s4Hl2sozuySsgz4jy1EnpBHNfpMa9dK1ZCG7viqBPCwXtmgc8nHqUsAu3G4gtmXkkY3Sw==",
             "deprecated": "Vue 2 has reached EOL and is no longer actively maintained. See https://v2.vuejs.org/eol/ for more details.",
-            "dev": true,
             "dependencies": {
                 "@vue/compiler-sfc": "2.7.16",
                 "csstype": "^3.1.0"
@@ -13463,6 +13451,14 @@
             "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==",
             "dev": true
         },
+        "node_modules/vuex": {
+            "version": "3.6.2",
+            "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.6.2.tgz",
+            "integrity": "sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw==",
+            "peerDependencies": {
+                "vue": "^2.0.0"
+            }
+        },
         "node_modules/watchpack": {
             "version": "1.7.5",
             "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz",
@@ -15238,14 +15234,12 @@
         "@babel/helper-string-parser": {
             "version": "7.27.1",
             "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
-            "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
-            "dev": true
+            "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA=="
         },
         "@babel/helper-validator-identifier": {
             "version": "7.27.1",
             "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz",
-            "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==",
-            "dev": true
+            "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow=="
         },
         "@babel/helper-validator-option": {
             "version": "7.27.1",
@@ -15278,7 +15272,6 @@
             "version": "7.27.2",
             "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.2.tgz",
             "integrity": "sha512-QYLs8299NA7WM/bZAdp+CviYYkVoYXlDW2rzliy3chxd1PQjej7JORuMJDJXJUb9g0TT+B99EwaVLKmX+sPXWw==",
-            "dev": true,
             "requires": {
                 "@babel/types": "^7.27.1"
             }
@@ -16040,7 +16033,6 @@
             "version": "7.27.1",
             "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.1.tgz",
             "integrity": "sha512-+EzkxvLNfiUeKMgy/3luqfsCWFRXLb7U6wNQTk60tovuckwB15B191tJWvpp4HjiQWdJkCxO3Wbvc6jlk3Xb2Q==",
-            "dev": true,
             "requires": {
                 "@babel/helper-string-parser": "^7.27.1",
                 "@babel/helper-validator-identifier": "^7.27.1"
@@ -16309,7 +16301,6 @@
             "version": "2.7.16",
             "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.16.tgz",
             "integrity": "sha512-KWhJ9k5nXuNtygPU7+t1rX6baZeqOYLEforUPjgNDBnLicfHCoi48H87Q8XyLZOrNNsmhuwKqtpDQWjEFe6Ekg==",
-            "dev": true,
             "requires": {
                 "@babel/parser": "^7.23.5",
                 "postcss": "^8.4.14",
@@ -16321,7 +16312,6 @@
                     "version": "8.5.3",
                     "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz",
                     "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==",
-                    "dev": true,
                     "requires": {
                         "nanoid": "^3.3.8",
                         "picocolors": "^1.1.1",
@@ -18344,8 +18334,7 @@
         "csstype": {
             "version": "3.1.3",
             "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
-            "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
-            "dev": true
+            "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="
         },
         "cyclist": {
             "version": "1.0.2",
@@ -21555,8 +21544,7 @@
         "nanoid": {
             "version": "3.3.11",
             "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
-            "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
-            "dev": true
+            "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w=="
         },
         "nanomatch": {
             "version": "1.2.13",
@@ -22207,8 +22195,7 @@
         "picocolors": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
-            "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
-            "dev": true
+            "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="
         },
         "picomatch": {
             "version": "2.3.1",
@@ -23060,7 +23047,6 @@
             "version": "2.8.8",
             "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
             "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
-            "dev": true,
             "optional": true
         },
         "private": {
@@ -24290,14 +24276,12 @@
         "source-map": {
             "version": "0.6.1",
             "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-            "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-            "dev": true
+            "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
         },
         "source-map-js": {
             "version": "1.2.1",
             "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
-            "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
-            "dev": true
+            "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA=="
         },
         "source-map-resolve": {
             "version": "0.5.3",
@@ -25287,7 +25271,6 @@
             "version": "2.7.16",
             "resolved": "https://registry.npmjs.org/vue/-/vue-2.7.16.tgz",
             "integrity": "sha512-4gCtFXaAA3zYZdTp5s4Hl2sozuySsgz4jy1EnpBHNfpMa9dK1ZCG7viqBPCwXtmgc8nHqUsAu3G4gtmXkkY3Sw==",
-            "dev": true,
             "requires": {
                 "@vue/compiler-sfc": "2.7.16",
                 "csstype": "^3.1.0"
@@ -25382,6 +25365,12 @@
             "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==",
             "dev": true
         },
+        "vuex": {
+            "version": "3.6.2",
+            "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.6.2.tgz",
+            "integrity": "sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw==",
+            "requires": {}
+        },
         "watchpack": {
             "version": "1.7.5",
             "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz",
diff --git a/package.json b/package.json
index cc4c17c..5964ef3 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,7 @@
         "animate.css": "^4.1.1",
         "bulma": "^0.9.4",
         "bulma-switch": "^2.0.4",
-        "bulma-toast": "^2.4.1"
+        "bulma-toast": "^2.4.1",
+        "vuex": "^3.6.2"
     }
 }
-- 
2.48.1


From 6d3173cd1f855c5b57920d0d49ee41df82814839 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Sun, 18 May 2025 16:36:34 -0300
Subject: [PATCH 025/111] Mejor referencia

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

diff --git a/app/User.php b/app/User.php
index 64ea860..1dac38b 100644
--- a/app/User.php
+++ b/app/User.php
@@ -40,6 +40,6 @@ class User extends Authenticatable
 
     public function grupoDeCompra(): BelongsTo
     {
-        return $this->belongsTo('App\GrupoDeCompra');
+        return $this->belongsTo(GrupoDeCompra::class);
     }
 }
-- 
2.48.1


From a485994a72c52ab67d7459b176c2ffef2c666e13 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Sun, 18 May 2025 17:34:14 -0300
Subject: [PATCH 026/111] =?UTF-8?q?Agregada=20store=20de=20vuex=20para=20g?=
 =?UTF-8?q?uardar=20informaci=C3=B3n=20de=20la=20sesi=C3=B3n=20tras=20logi?=
 =?UTF-8?q?n=20+=20ruta=20y=20controller=20+=20resource=20reducido=20de=20?=
 =?UTF-8?q?grupo=20de=20compra=20para=20pedidos?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Api/GrupoDeCompraController.php           |  5 +++
 app/Http/Controllers/UserController.php       | 39 +++++++++++++++++++
 .../GrupoDeCompraReducidoResource.php         | 22 +++++++++++
 resources/js/app.js                           |  2 +
 resources/js/store/index.js                   | 11 ++++++
 resources/js/store/modules/session.js         | 32 +++++++++++++++
 routes/web.php                                |  4 ++
 7 files changed, 115 insertions(+)
 create mode 100644 app/Http/Controllers/UserController.php
 create mode 100644 app/Http/Resources/GrupoDeCompraReducidoResource.php
 create mode 100644 resources/js/store/index.js
 create mode 100644 resources/js/store/modules/session.js

diff --git a/app/Http/Controllers/Api/GrupoDeCompraController.php b/app/Http/Controllers/Api/GrupoDeCompraController.php
index 58f88d5..577c83a 100644
--- a/app/Http/Controllers/Api/GrupoDeCompraController.php
+++ b/app/Http/Controllers/Api/GrupoDeCompraController.php
@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api;
 
 use App\GrupoDeCompra;
 use App\Http\Controllers\Controller;
+use App\Http\Resources\GrupoDeCompraReducidoResource;
 use App\Http\Resources\GrupoDeCompraResource;
 
 class GrupoDeCompraController extends Controller
@@ -16,4 +17,8 @@ class GrupoDeCompraController extends Controller
     {
         return new GrupoDeCompraResource($grupoDeCompra);
     }
+    public function reducido(GrupoDeCompra $grupoDeCompra)
+    {
+        return new GrupoDeCompraReducidoResource($grupoDeCompra);
+    }
 }
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
new file mode 100644
index 0000000..6a5d79a
--- /dev/null
+++ b/app/Http/Controllers/UserController.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\GrupoDeCompra;
+use App\Http\Resources\GrupoDeCompraReducidoResource;
+use App\Http\Resources\GrupoDeCompraResource;
+use App\UserRole;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use App\User;
+use Illuminate\Support\Facades\Log;
+
+class UserController extends Controller
+{
+    public function session(Request $request)
+    {
+        $user = Auth::user();
+        $role = UserRole::find($user->role_id);
+        $grupo_de_compra = GrupoDeCompra::find($user->grupo_de_compra_id);
+        $result = [
+            'role_id' => $user->role_id,
+            'grupo_de_compra' => null,
+        ];
+        switch ($role->nombre ?? 'error') {
+            case 'barrio':
+                $result['grupo_de_compra'] = new GrupoDeCompraReducidoResource($grupo_de_compra);
+                break;
+            case 'admin_barrio':
+                $result['grupo_de_compra'] = new GrupoDeCompraResource($grupo_de_compra);
+                break;
+            case 'comision':
+                break;
+            default:
+                abort(400, 'Rol invalido');
+        }
+        return $result;
+    }
+}
diff --git a/app/Http/Resources/GrupoDeCompraReducidoResource.php b/app/Http/Resources/GrupoDeCompraReducidoResource.php
new file mode 100644
index 0000000..9bf13d6
--- /dev/null
+++ b/app/Http/Resources/GrupoDeCompraReducidoResource.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class GrupoDeCompraReducidoResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request): array {
+        return [
+            'id' => $this->id,
+            'nombre' => $this->nombre,
+            'devoluciones_habilitadas' => $this->devoluciones_habilitadas,
+        ];
+    }
+}
diff --git a/resources/js/app.js b/resources/js/app.js
index 51be45f..ae11e80 100644
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -18,6 +18,7 @@ window.bulmaToast = require('bulma-toast');
  * Eg. ./components/ExampleComponent.vue -> <example-component></example-component>
  */
 import './components';
+import store from "./store";
 
 /**
  * Constants
@@ -78,6 +79,7 @@ const app = new Vue({
         }
     },
     mounted() {
+        store.dispatch('session/fetchSession');
         Event.$on('obtener-sesion', () => {
             axios.get('/subpedidos/obtener_sesion')
                 .then(response => {
diff --git a/resources/js/store/index.js b/resources/js/store/index.js
new file mode 100644
index 0000000..f2b2ef9
--- /dev/null
+++ b/resources/js/store/index.js
@@ -0,0 +1,11 @@
+import Vue from 'vue';
+import Vuex from 'vuex';
+import session from './modules/session';
+
+Vue.use(Vuex);
+
+export default new Vuex.Store({
+    modules: {
+        session,
+    },
+});
diff --git a/resources/js/store/modules/session.js b/resources/js/store/modules/session.js
new file mode 100644
index 0000000..9dd00d2
--- /dev/null
+++ b/resources/js/store/modules/session.js
@@ -0,0 +1,32 @@
+const state = {
+    role_id: null,
+    grupo_de_compra_id: null,
+};
+
+const mutations = {
+    SET_SESSION(state, { role_id, grupo_de_compra_id }) {
+        state.role_id = role_id;
+        state.grupo_de_compra_id = grupo_de_compra_id;
+    },
+};
+
+const actions = {
+    async fetchSession({ commit }) {
+        const response = await axios.get('/session');
+        console.log(response.data);
+        commit('SET_SESSION', {
+            role_id: response.data.role_id,
+            grupo_de_compra_id: response.data.grupo_de_compra_id,
+        });
+    },
+};
+
+const getters = {};
+
+export default {
+    namespaced: true,
+    state,
+    mutations,
+    actions,
+    getters,
+};
diff --git a/routes/web.php b/routes/web.php
index b5a9882..b21cfbd 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -24,6 +24,10 @@ Auth::routes(['register' => false]);
 
 Route::get('/', 'RouteController@home')->name('home');
 
+Route::middleware('auth')->group(function () {
+    Route::get('/session', 'UserController@session')->name('session');
+});
+
 Route::middleware(['auth', 'role:barrio'])->group( function() {
     Route::get('/productos', 'ProductoController@index')->name('productos.index');
 
-- 
2.48.1


From 61e4c341f332590c3aa2dac1785ca1324f2edeae Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Sun, 18 May 2025 17:48:38 -0300
Subject: [PATCH 027/111] Quitado auth middleware de la ruta, ahora devuelve
 booleano con dato sobre estado de auth + actualizado para guardar el grupo de
 compra entero y no solo la id

---
 app/Http/Controllers/UserController.php | 43 +++++++++++++------------
 resources/js/store/modules/session.js   | 16 ++++-----
 routes/web.php                          |  4 +--
 3 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 6a5d79a..388ad65 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -8,32 +8,33 @@ use App\Http\Resources\GrupoDeCompraResource;
 use App\UserRole;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
-use App\User;
-use Illuminate\Support\Facades\Log;
 
 class UserController extends Controller
 {
     public function session(Request $request)
     {
-        $user = Auth::user();
-        $role = UserRole::find($user->role_id);
-        $grupo_de_compra = GrupoDeCompra::find($user->grupo_de_compra_id);
-        $result = [
-            'role_id' => $user->role_id,
-            'grupo_de_compra' => null,
-        ];
-        switch ($role->nombre ?? 'error') {
-            case 'barrio':
-                $result['grupo_de_compra'] = new GrupoDeCompraReducidoResource($grupo_de_compra);
-                break;
-            case 'admin_barrio':
-                $result['grupo_de_compra'] = new GrupoDeCompraResource($grupo_de_compra);
-                break;
-            case 'comision':
-                break;
-            default:
-                abort(400, 'Rol invalido');
+        if (Auth::check()) {
+            $user = Auth::user();
+            $grupo_de_compra = GrupoDeCompra::find($user->grupo_de_compra_id);
+            $result = [
+                'is_authenticated' => true,
+                'role_id' => $user->role_id,
+                'grupo_de_compra' => null,
+            ];
+            switch (UserRole::find($user->role_id)->nombre ?? 'error') {
+                case 'barrio':
+                    $result['grupo_de_compra'] = new GrupoDeCompraReducidoResource($grupo_de_compra);
+                    break;
+                case 'admin_barrio':
+                    $result['grupo_de_compra'] = new GrupoDeCompraResource($grupo_de_compra);
+                    break;
+                case 'comision':
+                    break;
+                default:
+                    abort(400, 'Rol invalido');
+            }
+            return $result;
         }
-        return $result;
+        return ['is_authenticated' => false];
     }
 }
diff --git a/resources/js/store/modules/session.js b/resources/js/store/modules/session.js
index 9dd00d2..dfbe183 100644
--- a/resources/js/store/modules/session.js
+++ b/resources/js/store/modules/session.js
@@ -1,23 +1,23 @@
 const state = {
+    isAuthenticated: false,
     role_id: null,
-    grupo_de_compra_id: null,
+    grupo_de_compra: null,
 };
 
 const mutations = {
-    SET_SESSION(state, { role_id, grupo_de_compra_id }) {
+    SET_SESSION(state, { role_id, grupo_de_compra, is_authenticated }) {
+        state.isAuthenticated = is_authenticated;
         state.role_id = role_id;
-        state.grupo_de_compra_id = grupo_de_compra_id;
+        state.grupo_de_compra = grupo_de_compra;
+
+        console.log(state);
     },
 };
 
 const actions = {
     async fetchSession({ commit }) {
         const response = await axios.get('/session');
-        console.log(response.data);
-        commit('SET_SESSION', {
-            role_id: response.data.role_id,
-            grupo_de_compra_id: response.data.grupo_de_compra_id,
-        });
+        commit('SET_SESSION', response.data);
     },
 };
 
diff --git a/routes/web.php b/routes/web.php
index b21cfbd..de16ed6 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -24,9 +24,7 @@ Auth::routes(['register' => false]);
 
 Route::get('/', 'RouteController@home')->name('home');
 
-Route::middleware('auth')->group(function () {
-    Route::get('/session', 'UserController@session')->name('session');
-});
+Route::get('/session', 'UserController@session')->name('session');
 
 Route::middleware(['auth', 'role:barrio'])->group( function() {
     Route::get('/productos', 'ProductoController@index')->name('productos.index');
-- 
2.48.1


From e2c716f576ce6d7086c15678021b6568706ff0ef Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Sun, 18 May 2025 21:44:21 -0300
Subject: [PATCH 028/111] Ruta 'sesion' cambiada por ruta para obtener grupo de
 compra de usuario logeado

---
 app/Http/Controllers/UserController.php | 41 ++++++++++---------------
 routes/web.php                          |  4 ++-
 2 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 388ad65..9565bae 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -3,7 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\GrupoDeCompra;
-use App\Http\Resources\GrupoDeCompraReducidoResource;
+use App\Http\Resources\GrupoDeCompraReducido;
 use App\Http\Resources\GrupoDeCompraResource;
 use App\UserRole;
 use Illuminate\Http\Request;
@@ -11,30 +11,23 @@ use Illuminate\Support\Facades\Auth;
 
 class UserController extends Controller
 {
-    public function session(Request $request)
+    public function grupoDeCompra(Request $request)
     {
-        if (Auth::check()) {
-            $user = Auth::user();
-            $grupo_de_compra = GrupoDeCompra::find($user->grupo_de_compra_id);
-            $result = [
-                'is_authenticated' => true,
-                'role_id' => $user->role_id,
-                'grupo_de_compra' => null,
-            ];
-            switch (UserRole::find($user->role_id)->nombre ?? 'error') {
-                case 'barrio':
-                    $result['grupo_de_compra'] = new GrupoDeCompraReducidoResource($grupo_de_compra);
-                    break;
-                case 'admin_barrio':
-                    $result['grupo_de_compra'] = new GrupoDeCompraResource($grupo_de_compra);
-                    break;
-                case 'comision':
-                    break;
-                default:
-                    abort(400, 'Rol invalido');
-            }
-            return $result;
+        $user = Auth::user();
+        $result = [ 'grupo_de_compra' => null, ];
+        $grupo_de_compra = GrupoDeCompra::find($user->grupo_de_compra_id);
+        switch (UserRole::find($user->role_id)->nombre ?? 'error') {
+            case 'barrio':
+                $result['grupo_de_compra'] = new GrupoDeCompraReducido($grupo_de_compra);
+                break;
+            case 'admin_barrio':
+                $result['grupo_de_compra'] = new GrupoDeCompraResource($grupo_de_compra);
+                break;
+            case 'comision':
+                break;
+            default:
+                abort(400, 'Rol invalido.');
         }
-        return ['is_authenticated' => false];
+        return $result;
     }
 }
diff --git a/routes/web.php b/routes/web.php
index de16ed6..57da910 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -24,7 +24,9 @@ Auth::routes(['register' => false]);
 
 Route::get('/', 'RouteController@home')->name('home');
 
-Route::get('/session', 'UserController@session')->name('session');
+Route::middleware(['auth'])->group(function () {
+    Route::get('/user/grupo_de_compra', 'UserController@grupoDeCompra');
+});
 
 Route::middleware(['auth', 'role:barrio'])->group( function() {
     Route::get('/productos', 'ProductoController@index')->name('productos.index');
-- 
2.48.1


From 63b51fd92caa0f6605983bd11bffcccef5176bc8 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Sun, 18 May 2025 21:46:06 -0300
Subject: [PATCH 029/111] =?UTF-8?q?Reemplazo=20modulo=20sesi=C3=B3n=20por?=
 =?UTF-8?q?=20modulo=20admin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/js/app.js                   |  3 ++-
 resources/js/store/index.js           |  4 ++--
 resources/js/store/modules/admin.js   | 31 ++++++++++++++++++++++++++
 resources/js/store/modules/session.js | 32 ---------------------------
 4 files changed, 35 insertions(+), 35 deletions(-)
 create mode 100644 resources/js/store/modules/admin.js
 delete mode 100644 resources/js/store/modules/session.js

diff --git a/resources/js/app.js b/resources/js/app.js
index ae11e80..fd19e5b 100644
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -19,6 +19,7 @@ window.bulmaToast = require('bulma-toast');
  */
 import './components';
 import store from "./store";
+import {mapState} from "vuex";
 
 /**
  * Constants
@@ -50,6 +51,7 @@ Vue.prototype.$toast = function(mensaje, duration = 2000) {
  */
 const app = new Vue({
     el: '#root',
+    store,
     data() {
       return {
         gdc: null,
@@ -79,7 +81,6 @@ const app = new Vue({
         }
     },
     mounted() {
-        store.dispatch('session/fetchSession');
         Event.$on('obtener-sesion', () => {
             axios.get('/subpedidos/obtener_sesion')
                 .then(response => {
diff --git a/resources/js/store/index.js b/resources/js/store/index.js
index f2b2ef9..91e59ed 100644
--- a/resources/js/store/index.js
+++ b/resources/js/store/index.js
@@ -1,11 +1,11 @@
 import Vue from 'vue';
 import Vuex from 'vuex';
-import session from './modules/session';
+import admin from "./modules/admin";
 
 Vue.use(Vuex);
 
 export default new Vuex.Store({
     modules: {
-        session,
+        admin,
     },
 });
diff --git a/resources/js/store/modules/admin.js b/resources/js/store/modules/admin.js
new file mode 100644
index 0000000..f38b5d9
--- /dev/null
+++ b/resources/js/store/modules/admin.js
@@ -0,0 +1,31 @@
+const state = {
+    grupo_de_compra: null,
+};
+
+const mutations = {
+    setGrupoDeCompra(state, { grupo_de_compra }) {
+        state.grupo_de_compra = grupo_de_compra;
+    }
+};
+
+const actions = {
+    async getGrupoDeCompra({ commit }) {
+        const response = await axios.get('/user/grupo_de_compra');
+        commit('setGrupoDeCompra', response.data);
+    },
+};
+
+
+const getters = {
+    pedidosAprobados() {
+        return state.grupo_de_compra.pedidos.filter(p => p.aprobado);
+    }
+};
+
+export default {
+    namespaced: true,
+    state,
+    mutations,
+    actions,
+    getters,
+};
diff --git a/resources/js/store/modules/session.js b/resources/js/store/modules/session.js
deleted file mode 100644
index dfbe183..0000000
--- a/resources/js/store/modules/session.js
+++ /dev/null
@@ -1,32 +0,0 @@
-const state = {
-    isAuthenticated: false,
-    role_id: null,
-    grupo_de_compra: null,
-};
-
-const mutations = {
-    SET_SESSION(state, { role_id, grupo_de_compra, is_authenticated }) {
-        state.isAuthenticated = is_authenticated;
-        state.role_id = role_id;
-        state.grupo_de_compra = grupo_de_compra;
-
-        console.log(state);
-    },
-};
-
-const actions = {
-    async fetchSession({ commit }) {
-        const response = await axios.get('/session');
-        commit('SET_SESSION', response.data);
-    },
-};
-
-const getters = {};
-
-export default {
-    namespaced: true,
-    state,
-    mutations,
-    actions,
-    getters,
-};
-- 
2.48.1


From 8a1334bae574d3f5c5895ce1088e411a432eb85d Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Sun, 18 May 2025 21:46:24 -0300
Subject: [PATCH 030/111] Cambio nombre

---
 app/Http/Controllers/Api/GrupoDeCompraController.php          | 4 ++--
 ...DeCompraReducidoResource.php => GrupoDeCompraReducido.php} | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename app/Http/Resources/{GrupoDeCompraReducidoResource.php => GrupoDeCompraReducido.php} (88%)

diff --git a/app/Http/Controllers/Api/GrupoDeCompraController.php b/app/Http/Controllers/Api/GrupoDeCompraController.php
index 577c83a..aad8c13 100644
--- a/app/Http/Controllers/Api/GrupoDeCompraController.php
+++ b/app/Http/Controllers/Api/GrupoDeCompraController.php
@@ -4,7 +4,7 @@ namespace App\Http\Controllers\Api;
 
 use App\GrupoDeCompra;
 use App\Http\Controllers\Controller;
-use App\Http\Resources\GrupoDeCompraReducidoResource;
+use App\Http\Resources\GrupoDeCompraReducido;
 use App\Http\Resources\GrupoDeCompraResource;
 
 class GrupoDeCompraController extends Controller
@@ -19,6 +19,6 @@ class GrupoDeCompraController extends Controller
     }
     public function reducido(GrupoDeCompra $grupoDeCompra)
     {
-        return new GrupoDeCompraReducidoResource($grupoDeCompra);
+        return new GrupoDeCompraReducido($grupoDeCompra);
     }
 }
diff --git a/app/Http/Resources/GrupoDeCompraReducidoResource.php b/app/Http/Resources/GrupoDeCompraReducido.php
similarity index 88%
rename from app/Http/Resources/GrupoDeCompraReducidoResource.php
rename to app/Http/Resources/GrupoDeCompraReducido.php
index 9bf13d6..b81ac02 100644
--- a/app/Http/Resources/GrupoDeCompraReducidoResource.php
+++ b/app/Http/Resources/GrupoDeCompraReducido.php
@@ -4,7 +4,7 @@ namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
-class GrupoDeCompraReducidoResource extends JsonResource
+class GrupoDeCompraReducido extends JsonResource
 {
     /**
      * Transform the resource into an array.
-- 
2.48.1


From 09bc8e7670e49d660f880e29e0574f1f7f502ce7 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Sun, 18 May 2025 22:44:25 -0300
Subject: [PATCH 031/111] Cambio logica

---
 resources/js/app.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/resources/js/app.js b/resources/js/app.js
index fd19e5b..aadb9e8 100644
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -82,9 +82,14 @@ const app = new Vue({
     },
     mounted() {
         Event.$on('obtener-sesion', () => {
-            axios.get('/subpedidos/obtener_sesion')
-                .then(response => {
-                    if (response.data.subpedido.id) {
+            if (window.location.pathname.startsWith('/admin')) {
+                axios.get('/admin/obtener_sesion')
+                    .then(response => {
+                        this.gdc = response.data.gdc
+                    });
+            } else {
+                axios.get('/subpedidos/obtener_sesion')
+                    .then(response => {
                         this.gdc = response.data.gdc;
                         this.settearDevoluciones();
                         this.pedido = response.data.subpedido.id;
@@ -93,13 +98,8 @@ const app = new Vue({
                                 this.pedido = response.data.data;
                                 Event.$emit("pedido-actualizado");
                             });
-                    } else {
-                        axios.get('/admin/obtener_sesion')
-                            .then(response => {
-                                this.gdc = response.data.gdc
-                            });
-                    }
-                })
+                    })
+            }
         })
       Event.$on('sync-subpedido', (cantidad, id, notas) => {
           if (this.pedido.aprobado) {
-- 
2.48.1


From 85746f2d4d00a615989c1f1578aa154e86ead42c Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Mon, 19 May 2025 00:13:04 -0300
Subject: [PATCH 032/111] toggleAprobacion devuelve no content

---
 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 d17d571..a013adb 100644
--- a/app/Http/Controllers/Api/SubpedidoController.php
+++ b/app/Http/Controllers/Api/SubpedidoController.php
@@ -80,7 +80,7 @@ class SubpedidoController extends Controller
             'aprobacion' => 'required | boolean'
         ]);
         $subpedido->toggleAprobacion($valid['aprobacion']);
-        return new SubpedidoResource($subpedido);
+        return response()->noContent();
     }
 
     public function syncDevoluciones(Subpedido $subpedido) {
-- 
2.48.1


From fbbb400892f71a13fc575b241d946c7637f2dd1c Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Mon, 19 May 2025 00:13:28 -0300
Subject: [PATCH 033/111] /{gdc}/devoluciones devuelve no content

---
 routes/api.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/routes/api.php b/routes/api.php
index 1da4274..0ee0472 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -34,8 +34,8 @@ Route::middleware('api')->group(function () {
         });
 
         Route::post('/{gdc}/devoluciones', function($gdc) {
-            $habilitadas = GrupoDeCompra::find($gdc)->toggleDevoluciones();
-            return ['devoluciones' => $habilitadas];
+            GrupoDeCompra::find($gdc)->toggleDevoluciones();
+            return response()->noContent();
         });
     });
 
-- 
2.48.1


From e6770172acb93e96f8d545cc50f216e100b9cdc3 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Mon, 19 May 2025 00:17:25 -0300
Subject: [PATCH 034/111] =?UTF-8?q?Grupo=20de=20compra=20expl=C3=ADcito=20?=
 =?UTF-8?q?en=20estado=20=20+=20metodos,=20acciones,=20y=20getters=20neces?=
 =?UTF-8?q?arios?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/js/store/modules/admin.js | 59 ++++++++++++++++++++++++++---
 1 file changed, 53 insertions(+), 6 deletions(-)

diff --git a/resources/js/store/modules/admin.js b/resources/js/store/modules/admin.js
index f38b5d9..7c45fd1 100644
--- a/resources/js/store/modules/admin.js
+++ b/resources/js/store/modules/admin.js
@@ -1,24 +1,71 @@
+import axios from "axios";
+
 const state = {
-    grupo_de_compra: null,
+    lastFetch: null,
+    grupo_de_compra_id: null,
+    nombre: null,
+    devoluciones_habilitadas: null,
+    pedidos: null,
+    total_a_recaudar: null,
+    total_barrial: null,
+    total_devoluciones: null,
+    total_a_transferir: null,
+    total_transporte: null,
+    cantidad_transporte: null,
 };
 
 const mutations = {
-    setGrupoDeCompra(state, { grupo_de_compra }) {
-        state.grupo_de_compra = grupo_de_compra;
+    setState(state, { grupo_de_compra }) {
+        state.lastFetch = new Date();
+        state.grupo_de_compra_id = grupo_de_compra.id;
+        state.nombre = grupo_de_compra.nombre;
+        state.devoluciones_habilitadas = grupo_de_compra.devoluciones_habilitadas;
+        state.pedidos = grupo_de_compra.pedidos;
+        state.total_a_recaudar = grupo_de_compra.total_a_recaudar;
+        state.total_barrial = grupo_de_compra.total_barrial;
+        state.total_devoluciones = grupo_de_compra.total_devoluciones;
+        state.total_a_transferir = grupo_de_compra.total_a_transferir;
+        state.total_transporte = grupo_de_compra.total_transporte;
+        state.cantidad_transporte = grupo_de_compra.cantidad_transporte;
+    },
+    toggleCaracteristica(state, { caracteristica_id }) {
+        state[`${caracteristica_id}_habilitadas`] = !state[`${caracteristica_id}_habilitadas`];
     }
 };
 
 const actions = {
     async getGrupoDeCompra({ commit }) {
         const response = await axios.get('/user/grupo_de_compra');
-        commit('setGrupoDeCompra', response.data);
+        commit('setState', response.data);
+    },
+    async setAprobacionPedido({ commit }, { pedido_id, aprobacion }){
+        await axios.post("/api/admin/subpedidos/" + pedido_id + "/aprobacion", { aprobacion: aprobacion });
+        await actions.getGrupoDeCompra({ commit });
+    },
+    async toggleCaracteristica({ commit }, { caracteristica_id }) {
+        await axios.post(`/api/grupos-de-compra/${state.grupo_de_compra_id}/${caracteristica_id}`);
+        commit('toggleCaracteristica', { caracteristica_id: caracteristica_id })
     },
 };
 
-
 const getters = {
+    grupoDeCompraDefinido() {
+      return state.lastFetch !== null;
+    },
+    hayPedidos() {
+        return getters.grupoDeCompraDefinido() && state.pedidos.length > 0;
+    },
     pedidosAprobados() {
-        return state.grupo_de_compra.pedidos.filter(p => p.aprobado);
+        return getters.grupoDeCompraDefinido() ? state.pedidos.filter(p => p.aprobado) : [];
+    },
+    hayAprobados() {
+        return getters.pedidosAprobados().length !== 0;
+    },
+    getPedido() {
+        return (pedido_id) => state.pedidos.find(p => p.id === pedido_id);
+    },
+    getCaracteristica() {
+        return (caracteristica) => state[`${caracteristica}_habilitadas`];
     }
 };
 
-- 
2.48.1


From 47ce7e3bd89d029e36fa0894956784f2df69a816 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Mon, 19 May 2025 00:17:50 -0300
Subject: [PATCH 035/111] =?UTF-8?q?Cambio=20de=20l=C3=B3gica=20para=20usar?=
 =?UTF-8?q?=20el=20modulo=20admin=20de=20la=20store?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/js/components/admin/Body.vue        | 37 +++---------
 .../admin/CaracteristicasOpcionales.vue       |  8 +--
 .../js/components/admin/DropdownDescargar.vue | 24 +++-----
 .../components/admin/FilaCaracteristica.vue   | 58 +++++--------------
 resources/js/components/admin/FilaPedido.vue  | 39 +++++++------
 .../js/components/admin/SwitchAprobacion.vue  | 40 +++++--------
 .../js/components/admin/TablaPedidos.vue      | 53 +++++++++--------
 7 files changed, 99 insertions(+), 160 deletions(-)

diff --git a/resources/js/components/admin/Body.vue b/resources/js/components/admin/Body.vue
index 2083305..25be16c 100644
--- a/resources/js/components/admin/Body.vue
+++ b/resources/js/components/admin/Body.vue
@@ -1,15 +1,11 @@
 <template>
     <div class="block ml-3 mr-3 is-max-widescreen is-max-desktop">
-        <comunes-tabs-secciones :tabs="tabs" :tabInicial="tabActiva"></comunes-tabs-secciones>
+        <tabs-secciones :tabs="tabs" :tabInicial="tabActiva"></tabs-secciones>
         <div class="block" id="pedidos-seccion"
             :class="seccionActiva === 'pedidos-seccion' ? 'is-active' : 'is-hidden'">
             <div class="block pb-6" id="pedidos-tabla-y-dropdown" v-if="hayPedidos">
-                <admin-dropdown-descargar
-                    :gdc_id="gdc.id">
-                </admin-dropdown-descargar>
-                <admin-tabla-pedidos
-                    :gdc="this.gdc"
-                ></admin-tabla-pedidos>
+                <dropdown-descargar></dropdown-descargar>
+                <tabla-pedidos></tabla-pedidos>
             </div>
             <p class="has-text-centered" v-else>
                 Todavía no hay ningún pedido para administrar.
@@ -17,8 +13,7 @@
         </div>
         <div class="block pb-6" id="caracteristicas-seccion"
              :class="seccionActiva === 'caracteristicas-seccion' ? 'is-active' : 'is-hidden'">
-            <admin-caracteristicas-opcionales>
-            </admin-caracteristicas-opcionales>
+            <caracteristicas-opcionales></caracteristicas-opcionales>
         </div>
     </div>
 </template>
@@ -29,7 +24,7 @@ import TabsSecciones from "../comunes/TabsSecciones.vue";
 import DropdownDescargar from "./DropdownDescargar.vue";
 import TablaPedidos from "./TablaPedidos.vue";
 import TablaBonos from "./TablaBonos.vue";
-import axios from "axios";
+import { mapActions, mapGetters } from "vuex";
 export default {
     components: {
         CaracteristicasOpcionales,
@@ -40,7 +35,6 @@ export default {
     },
     data() {
         return {
-            gdc: undefined,
             tabs: [{ id: "pedidos", nombre: "Pedidos" },
                    { id: "caracteristicas", nombre: "Caracteristicas opcionales" }],
             tabActiva: "pedidos",
@@ -48,32 +42,17 @@ export default {
         }
     },
     computed: {
-        hayPedidos: function() {
-            return this.gdc && this.gdc.pedidos.length !== 0
-        },
-        hayAprobados: function() {
-            return this.gdc && this.gdc.pedidos.filter(p => p.aprobado).length > 0
-        }
+        ...mapGetters('admin', ['hayPedidos']),
     },
     methods: {
+        ...mapActions('admin', ['getGrupoDeCompra']),
         setSeccionActiva(tabId) {
             this.tabActiva = tabId;
             this.seccionActiva = tabId + "-seccion";
         },
-        actualizar() {
-            axios.get('/api/grupos-de-compra/' + this.$root.gdc)
-                .then(response => {
-                    this.gdc = response.data.data;
-                    console.log(this.gdc);
-                })
-        }
     },
     async mounted() {
-        Event.$on('sync-aprobacion', (_) => {
-            this.actualizar();
-        });
-        await new Promise(r => setTimeout(r, 1000));
-        this.actualizar();
+        await this.getGrupoDeCompra();
     },
 }
 </script>
diff --git a/resources/js/components/admin/CaracteristicasOpcionales.vue b/resources/js/components/admin/CaracteristicasOpcionales.vue
index 242dfb2..26bd5f4 100644
--- a/resources/js/components/admin/CaracteristicasOpcionales.vue
+++ b/resources/js/components/admin/CaracteristicasOpcionales.vue
@@ -8,8 +8,7 @@ export default {
             caracteristicas: [
                 {
                     id: "devoluciones",
-                    nombre: "Devoluciones",
-                    habilitada: false
+                    nombre: "Devoluciones"
                 },
             ]
         }
@@ -27,16 +26,15 @@ export default {
                 </tr>
             </thead>
             <tbody>
-                <admin-fila-caracteristica
+                <fila-caracteristica
                     v-for="(c,i) in caracteristicas"
                     :key="i"
                     :caracteristica="c">
-                </admin-fila-caracteristica>
+                </fila-caracteristica>
             </tbody>
         </table>
     </div>
 </template>
 
 <style scoped>
-
 </style>
diff --git a/resources/js/components/admin/DropdownDescargar.vue b/resources/js/components/admin/DropdownDescargar.vue
index 0b95488..08ccd4a 100644
--- a/resources/js/components/admin/DropdownDescargar.vue
+++ b/resources/js/components/admin/DropdownDescargar.vue
@@ -14,13 +14,13 @@
             </div>
             <div class="dropdown-menu" id="dropdown-menu" role="menu">
                 <div class="dropdown-content">
-                    <a :href="'/admin/exportar-pedido-a-csv/' + gdc_id" class="dropdown-item has-background-primary">
+                    <a :href="'/admin/exportar-pedido-a-csv/' + grupo_de_compra_id" class="dropdown-item has-background-primary">
                         Planilla para central (CSV)
                     </a>
-                    <a :href="'/admin/exportar-planillas-a-pdf/' + gdc_id" class="dropdown-item">
+                    <a :href="'/admin/exportar-planillas-a-pdf/' + grupo_de_compra_id" class="dropdown-item">
                         Planillas para armado (PDF)
                     </a>
-                    <a :href="'/admin/exportar-pedido-con-nucleos-a-csv/' + gdc_id" class="dropdown-item">
+                    <a :href="'/admin/exportar-pedido-con-nucleos-a-csv/' + grupo_de_compra_id" class="dropdown-item">
                         Planilla completa de la canasta (CSV)
                     </a>
                 </div>
@@ -30,27 +30,19 @@
 </template>
 
 <script>
+import { mapGetters, mapState } from "vuex";
 export default {
-    props: {
-        gdc_id: {
-            type: Number,
-            required: true
-        },
-    },
     data() {
         return {
             dropdownActivo: false
-        }
+        };
     },
     computed: {
-        hayAprobados: function() {
-            return this.$parent.hayAprobados;
-        }
+        ...mapState('admin',["grupo_de_compra_id"]),
+        ...mapGetters('admin',["hayAprobados"]),
     },
 
 }
 </script>
 
-<style>
-
-</style>
+<style></style>
diff --git a/resources/js/components/admin/FilaCaracteristica.vue b/resources/js/components/admin/FilaCaracteristica.vue
index 47055c0..57e9409 100644
--- a/resources/js/components/admin/FilaCaracteristica.vue
+++ b/resources/js/components/admin/FilaCaracteristica.vue
@@ -1,48 +1,20 @@
 <script>
 import axios from "axios";
+import {mapActions, mapGetters, mapState} from "vuex";
 
 export default {
     props: {
         caracteristica: Object
     },
-    data() {
-        return {
-            gdc: undefined
+    computed: {
+        ...mapState('admin',["grupo_de_compra_id"]),
+        ...mapGetters('admin',["getCaracteristica"]),
+        habilitada() {
+            return this.getCaracteristica(this.caracteristica.id);
         }
     },
-    watch: {
-        '$root.gdc' : {
-            handler(newValue) {
-                if (newValue) {
-                    this.gdc = newValue;
-                    this.obtenerValor();
-                }
-            }
-        },
-    },
     methods: {
-        toggleActivacion() {
-            const id = this.caracteristica.id;
-            axios.post(`/api/grupos-de-compra/${this.gdc}/${id}`)
-                .then(response => {
-                    this.caracteristica.habilitada = response.data[id];
-                    this.$root[id] = response.data[id];
-                });
-        },
-        obtenerValor() {
-            const id = this.caracteristica.id;
-            axios.get(`/api/grupos-de-compra/${this.gdc}/${id}`)
-                .then(response => {
-                    this.caracteristica.habilitada = response.data[id];
-                    this.$root[id] = response.data[id];
-                });
-        },
-    },
-    mounted() {
-        if (this.$root.gdc) {
-            this.gdc = this.$root.gdc;
-            this.obtenerValor();
-        }
+        ...mapActions('admin',["toggleCaracteristica"]),
     }
 }
 </script>
@@ -53,17 +25,17 @@ export default {
         <td>
             <div class="field">
                 <input type="checkbox" class="switch is-rounded is-success"
-                       :id="'switch-'+caracteristica.id"
-                       :checked="caracteristica.habilitada"
-                       @change="toggleActivacion(caracteristica)">
-                <label :for="'switch-'+caracteristica.id">
-                    <span class="is-hidden-mobile">{{ caracteristica.habilitada ? 'Habilitada' : 'Deshabilitada' }}</span>
+                       :id="'switch-' + caracteristica.id"
+                       :checked="habilitada"
+                       @change="toggleCaracteristica({ caracteristica_id: caracteristica.id })">
+                <label :for="'switch-' + caracteristica.id">
+                    <span class="is-hidden-mobile">
+                        {{ habilitada ? 'Habilitada' : 'Deshabilitada' }}
+                    </span>
                 </label>
             </div>
         </td>
     </tr>
 </template>
 
-<style scoped>
-
-</style>
+<style scoped></style>
diff --git a/resources/js/components/admin/FilaPedido.vue b/resources/js/components/admin/FilaPedido.vue
index d6d5066..041dd2e 100644
--- a/resources/js/components/admin/FilaPedido.vue
+++ b/resources/js/components/admin/FilaPedido.vue
@@ -1,36 +1,39 @@
 <template>
     <tr>
         <td>{{ pedido.nombre }}</td>
-        <td v-if="$root.devoluciones" class="has-text-right" >{{ pedido.total_sin_devoluciones }}</td>
-        <td v-if="$root.devoluciones" class="has-text-right" ><abbr :title="pedido.devoluciones_notas">-{{ pedido.devoluciones_total }}</abbr></td>
-        <td class="has-text-right" >{{ $root.devoluciones ? pedido.total : pedido.total_sin_devoluciones }}</td>
-        <td>
-            <admin-switch-aprobacion
-                :pedido="pedido">
-            </admin-switch-aprobacion>
+        <td v-if="devoluciones_habilitadas" class="has-text-right" >
+            {{ pedido.total_sin_devoluciones }}
         </td>
+        <td v-if="devoluciones_habilitadas" class="has-text-right" >
+            <abbr :title="pedido.devoluciones_notas">
+                -{{ pedido.devoluciones_total }}
+            </abbr>
+        </td>
+        <td class="has-text-right" >
+            {{ devoluciones_habilitadas ? pedido.total : pedido.total_sin_devoluciones }}
+        </td>
+        <td><switch-aprobacion :pedido_id="pedido_id"></switch-aprobacion></td>
     </tr>
 </template>
 
 <script>
 import SwitchAprobacion from "./SwitchAprobacion.vue";
+import { mapGetters, mapState } from "vuex";
 export default {
     components: {
         SwitchAprobacion
     },
     props: {
-        pedido: Object
+        pedido_id: Number
+    },
+    computed: {
+        ...mapState('admin',["devoluciones_habilitadas"]),
+        ...mapGetters('admin',["getPedido"]),
+        pedido() {
+            return this.getPedido(this.pedido_id);
+        },
     },
-    mounted() {
-        Event.$on('sync-aprobacion', (unPedido) => {
-            if (this.pedido.id === unPedido.id) {
-                this.pedido = unPedido
-            }
-        })
-    }
 }
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>
diff --git a/resources/js/components/admin/SwitchAprobacion.vue b/resources/js/components/admin/SwitchAprobacion.vue
index 4892669..770ef6d 100644
--- a/resources/js/components/admin/SwitchAprobacion.vue
+++ b/resources/js/components/admin/SwitchAprobacion.vue
@@ -1,46 +1,34 @@
 <template>
     <div class="field">
         <input type="checkbox" name="switchRoundedSuccess" class="switch is-rounded is-success"
-            :id="'switch'+this.pedido.id"
-            :checked="pedido.aprobado"
-            @change="toggleAprobacion">
-        <label :for="'switch'+this.pedido.id">
+            :id="'switch' + pedido_id"
+            :checked="aprobado"
+            @change="setAprobacionPedido({ pedido_id: pedido_id, aprobacion: !aprobado })">
+        <label :for="'switch' + pedido_id">
             <span class="is-hidden-mobile">{{ mensaje }}</span>
         </label>
     </div>
 </template>
 
 <script>
+import { mapActions, mapGetters } from "vuex";
 export default {
     props: {
-        pedido: Object
-    },
-    data() {
-        return {
-            aprobado: this.pedido.aprobado
-        }
+        pedido_id: Number
     },
     computed: {
-        mensaje: function () {
-            return this.aprobado ? "Pagado" : "No pagado"
+        ...mapGetters('admin', ["getPedido"]),
+        aprobado() {
+            return this.getPedido(this.pedido_id).aprobado;
+        },
+        mensaje() {
+            return this.aprobado ? "Pagado" : "No pagado";
         }
     },
     methods: {
-        toggleAprobacion() {
-            Event.$emit('aprobacion-subpedido', this.pedido.id, !this.aprobado);
-            this.aprobado = !this.aprobado
-        }
+        ...mapActions('admin',["setAprobacionPedido"]),
     },
-    mounted() {
-        Event.$on('sync-aprobacion', (unPedido) => {
-            if (this.pedido.id === unPedido.id) {
-                this.pedido = unPedido
-            }
-        })
-    }
 }
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>
diff --git a/resources/js/components/admin/TablaPedidos.vue b/resources/js/components/admin/TablaPedidos.vue
index 033636c..b40d57b 100644
--- a/resources/js/components/admin/TablaPedidos.vue
+++ b/resources/js/components/admin/TablaPedidos.vue
@@ -4,17 +4,18 @@
             <thead>
             <tr>
                 <th>Núcleo</th>
-                <th v-if="$root.devoluciones"><abbr title="Total sin tomar en cuenta las devoluciones">Total parcial $</abbr></th>
-                <th v-if="$root.devoluciones"><abbr title="Devoluciones correspondientes al núcleo">Devoluciones $</abbr></th>
-                <th><abbr title="Total a Pagar por el núleo">{{ $root.devoluciones ? 'Total real' : 'Total' }} $</abbr></th>
+                <th v-if="devoluciones_habilitadas"><abbr title="Total sin tomar en cuenta las devoluciones">Total parcial $</abbr></th>
+                <th v-if="devoluciones_habilitadas"><abbr title="Devoluciones correspondientes al núcleo">Devoluciones $</abbr></th>
+                <th><abbr title="Total a Pagar por el núleo">{{ devoluciones_habilitadas ? 'Total real' : 'Total' }} $</abbr></th>
                 <th class="is-1"><abbr title="Pagado">Pagado</abbr></th>
             </tr>
         </thead>
         <tbody>
-            <admin-fila-pedido
-                v-for="pedido in gdc.pedidos"
-                :pedido="pedido" :key="pedido.id">
-            </admin-fila-pedido>
+            <fila-pedido
+                v-for="pedido in pedidos"
+                :pedido_id="pedido.id"
+                :key="pedido.id">
+            </fila-pedido>
         </tbody>
         </table>
         <table class="table is-striped is-bordered">
@@ -23,27 +24,27 @@
             </tr>
             <tr>
                 <th>Total a recaudar:</th>
-                <td class="has-text-right">$ {{ gdc.total_a_recaudar }}</td>
+                <td class="has-text-right">$ {{ total_a_recaudar }}</td>
             </tr>
             <tr>
                 <th>Total bonos barriales:</th>
-                <td class="has-text-right">$ {{ gdc.total_barrial }}</td>
+                <td class="has-text-right">$ {{ total_barrial }}</td>
             </tr>
-            <tr v-if="$root.devoluciones">
+            <tr v-if="devoluciones_habilitadas">
                 <th>Total devoluciones:</th>
-                <td class="has-text-right">- $ {{ gdc.total_devoluciones }}</td>
+                <td class="has-text-right">- $ {{ total_devoluciones }}</td>
             </tr>
             <tr>
                 <th>Cantidad bonos de transporte:</th>
-                <td class="has-text-right">{{ gdc.cantidad_transporte }}</td>
+                <td class="has-text-right">{{ cantidad_transporte }}</td>
             </tr>
             <tr>
                 <th>Total bonos de transporte:</th>
-                <td class="has-text-right">$ {{ gdc.total_transporte }}</td>
+                <td class="has-text-right">$ {{ total_transporte }}</td>
             </tr>
             <tr>
                 <th>Total a depositar:</th>
-                <td class="has-text-right">$ {{ gdc.total_a_transferir }}</td>
+                <td class="has-text-right">$ {{ total_a_transferir }}</td>
             </tr>
         </table>
     </div>
@@ -51,19 +52,25 @@
 
 <script>
 import FilaPedido from "./FilaPedido.vue";
+import { mapGetters, mapState } from "vuex";
 export default {
     components: {
         FilaPedido
     },
-    props: {
-        gdc: {
-            type: Object,
-            required: true
-        }
-    }
+    computed: {
+        ...mapState('admin', [
+            "devoluciones_habilitadas",
+            "pedidos",
+            "total_a_recaudar",
+            "total_barrial",
+            "total_devoluciones",
+            "cantidad_transporte",
+            "total_transporte",
+            "total_a_transferir",
+        ]),
+        ...mapGetters('admin', ['pedidosAprobados']),
+    },
 }
 </script>
 
-<style>
-
-</style>
+<style></style>
-- 
2.48.1


From da5f0051c8c6acdab3983233f55c2c62c61e98fe Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Mon, 19 May 2025 03:02:51 -0300
Subject: [PATCH 036/111] Agregado modulo de login para regiones y barrios

---
 resources/js/store/modules/login.js | 51 +++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 resources/js/store/modules/login.js

diff --git a/resources/js/store/modules/login.js b/resources/js/store/modules/login.js
new file mode 100644
index 0000000..704a882
--- /dev/null
+++ b/resources/js/store/modules/login.js
@@ -0,0 +1,51 @@
+import axios from "axios";
+
+const state = {
+    regiones: null,
+    grupos_de_compra: null,
+    region_elegida: null,
+    grupo_de_compra_elegido: null,
+};
+
+const mutations = {
+    setRegiones(state, { regiones }) {
+        state.regiones = regiones;
+    },
+    setRegionYBarrios(state, { region, grupos_de_compra }) {
+        state.region_elegida = region;
+        state.grupos_de_compra = grupos_de_compra;
+    },
+    selectGrupoDeCompra(state, { grupo_de_compra }) {
+        state.grupo_de_compra_elegido = grupo_de_compra;
+    },
+};
+
+const actions = {
+    async getRegiones({ commit }) {
+        const response = await axios.get("/api/regiones");
+        commit('setRegiones', { regiones: response.data });
+    },
+    async selectRegion({ commit }, { region }) {
+        const response = await axios.get("/api/grupos-de-compra");
+        commit('setRegionYBarrios', { region: region, grupos_de_compra: response.data[region] });
+    }
+};
+
+const getters = {
+    admin() {
+        return window.location.pathname.startsWith('/admin');
+    },
+    mensajes() {
+        return {
+            mensaje: `Contraseña de ${getters.admin() ? 'administración ' : ''}del barrio`,
+            ayuda: `Si no la sabés, consultá a ${getters.admin() ? 'la comisión informática ' : 'tus compañerxs'}.` };
+    },
+};
+
+export default {
+    namespaced: true,
+    state,
+    mutations,
+    actions,
+    getters,
+};
-- 
2.48.1


From fe292802cd0c35afd81f2db519649ab67a10ca5b Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Mon, 19 May 2025 03:04:29 -0300
Subject: [PATCH 037/111] =?UTF-8?q?Clase=20login=20gen=C3=A9rica=20para=20?=
 =?UTF-8?q?barrio=20y=20admin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/js/components/comunes/Login.vue | 57 +++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 resources/js/components/comunes/Login.vue

diff --git a/resources/js/components/comunes/Login.vue b/resources/js/components/comunes/Login.vue
new file mode 100644
index 0000000..9da6903
--- /dev/null
+++ b/resources/js/components/comunes/Login.vue
@@ -0,0 +1,57 @@
+<template>
+    <div v-if="grupo_de_compra_elegido !== null" class="block">
+        <div class="field">
+            <label class="label"
+                   :class="admin ? 'has-text-white' : ''">{{ mensajes.mensaje }}</label>
+            <div class="field has-addons">
+                <div class="control">
+                    <input required class="input" :type="this.passwordType" name="password"  :placeholder="mensajes.mensaje">
+                </div>
+                <div class="control">
+                    <a class="button is-warning" @click="togglePassword">
+                        {{ (passwordVisible ? 'Ocultar' : 'Mostrar') + ' contraseña'}}
+                    </a>
+                </div>
+            </div>
+            <p class="help"
+               :class="admin ? 'has-text-white' : ''">{{ mensajes.ayuda }}</p>
+        </div>
+        <div class="field">
+            <div class="control">
+                <input type="submit" class="button is-warning" value="Log in"/>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import { mapGetters, mapState } from "vuex";
+
+export default {
+    name: 'Login',
+    data() {
+        return {
+            passwordVisible: false,
+            passwordType: "password",
+        }
+    },
+    computed: {
+        ...mapState('login',["grupo_de_compra_elegido"]),
+        ...mapGetters('login',["admin","mensajes"]),
+    },
+    methods: {
+        togglePassword() {
+            if (this.passwordVisible) this.passwordType = "password";
+            else this.passwordType = "text"
+            this.passwordVisible = !this.passwordVisible
+        }
+    }
+}
+</script>
+
+
+<style>
+.help {
+    font-size: 1rem;
+}
+</style>
-- 
2.48.1


From fe57e8c6b31394248c3e2c19a7b90263713f2dbb Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Mon, 19 May 2025 03:05:06 -0300
Subject: [PATCH 038/111] BarrioSelect y RegionSelect usan la store

---
 .../js/components/comunes/BarrioSelect.vue    | 69 +++++++++----------
 .../js/components/comunes/RegionSelect.vue    | 54 ++++++++-------
 2 files changed, 62 insertions(+), 61 deletions(-)

diff --git a/resources/js/components/comunes/BarrioSelect.vue b/resources/js/components/comunes/BarrioSelect.vue
index 6743f4b..215e449 100644
--- a/resources/js/components/comunes/BarrioSelect.vue
+++ b/resources/js/components/comunes/BarrioSelect.vue
@@ -1,13 +1,19 @@
 <template>
-	<div v-show="visible" class="block">
+	<div v-if="region_elegida !== null" class="block">
 		<div class="field">
-			<label class="label" :class="isAdmin ? 'has-text-white' : ''">Seleccioná tu barrio o grupo de compra</label>
+			<label class="label" :class="admin ? 'has-text-white' : ''">
+                Seleccioná tu barrio o grupo de compra
+            </label>
 			<div class="control">
 				<div class="select">
-		        	<select @change="onGDCSelected" v-model="gdc" name="name">
-				    	<option :disabled="isDefaultDisabled==1" value=null>Seleccionar</option>
-						<option v-for="(gdc, index) in gdcs" :key="index" v-text="gdc.nombre + (isAdmin ? '_admin' : '')"
-                                :name="gdc.nombre + (isAdmin ? '_admin' : '')">
+		        	<select @change="selectGrupoDeCompra({ grupo_de_compra: barrio })" v-model="barrio">
+				    	<option :disabled="grupo_de_compra_elegido !== null" value=null>
+                            Seleccionar
+                        </option>
+						<option v-for="(gdc, index) in grupos_de_compra"
+                                :key="index"
+                                v-text="gdc.nombre"
+                                :name="gdc.nombre">
                         </option>
 					</select>
 				</div>
@@ -17,35 +23,24 @@
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				visible: false,
-				region: null,
-				gdcs: [],
-				isDefaultDisabled: 0,
-				gdc: null,
-                isAdmin: this.admin == null ? false : this.admin
-			}
-		},
-		mounted() {
-	  		Event.$on('region-seleccionada', (region)=>  {
-				this.region = region;
-	  			this.fillGDC(region);
-	  			this.visible = true;
-	  		});
-		},
-		methods : {
-			fillGDC(region) {
-		    	axios.get("/api/grupos-de-compra").then(response => {
-		    		this.gdcs = response.data[this.region];
-		    	});
-			},
-			onGDCSelected() {
-				this.isDefaultDisabled = 1;
-	  			Event.$emit("gdc-seleccionado",this.gdc);
-	  		}
-		},
-        props: {'admin': Boolean}
-	}
+import { mapActions, mapGetters, mapMutations, mapState } from "vuex";
+export default {
+    name: 'BarrioSelect',
+    async mounted() {
+        await this.getRegiones();
+    },
+    methods: {
+        ...mapMutations('login',["selectGrupoDeCompra"]),
+        ...mapActions('login',["getRegiones", "getGruposDeCompra"]),
+    },
+    computed: {
+        ...mapState('login',["region_elegida","grupos_de_compra","grupo_de_compra_elegido"]),
+        ...mapGetters('login',["admin"]),
+    },
+    data() {
+        return {
+            barrio: null,
+        };
+    },
+}
 </script>
diff --git a/resources/js/components/comunes/RegionSelect.vue b/resources/js/components/comunes/RegionSelect.vue
index 55d6c8f..ca543bd 100644
--- a/resources/js/components/comunes/RegionSelect.vue
+++ b/resources/js/components/comunes/RegionSelect.vue
@@ -1,12 +1,20 @@
 <template>
 	<div class="block">
 		<div class="field">
-		    <label class="label" :class="whiteText ? 'has-text-white' : ''">Seleccioná tu región</label>
+		    <label class="label" :class="admin ? 'has-text-white' : ''">
+                Seleccioná tu región
+            </label>
 	        <div class="control">
 	        	<div class="select">
-	        		<select @change="onRegionSelected" v-model="region">
-			    		<option :disabled="isDefaultDisabled===1" value=null>Seleccionar</option>
-						<option v-for="(region, index) in regiones" :key="index" v-text="region" :name="region"></option>
+	        		<select @change="selectRegion({ region })" v-model="region">
+			    		<option :disabled="region_elegida !== null" value=null>
+                            Seleccionar
+                        </option>
+						<option v-for="(region, index) in regiones"
+                                :key="index"
+                                v-text="region"
+                                :name="region">
+                        </option>
 					</select>
 				</div>
 			</div>
@@ -15,24 +23,22 @@
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				regiones: [],
-				isDefaultDisabled: 0,
-				region: null,
-                whiteText: this.admin == null ? false : this.admin
-			}
-		},
-		mounted() {
-		    axios.get("/api/regiones").then(response => this.regiones = response.data);
-	  	},
-	  	methods: {
-	  		onRegionSelected() {
-	  			this.isDefaultDisabled = 1;
-	  			Event.$emit("region-seleccionada",this.region);
-	  		}
-	  	},
-        props: {'admin': Boolean}
-	}
+import {mapActions, mapGetters, mapState} from "vuex";
+export default {
+    async mounted() {
+        await this.getRegiones();
+    },
+    data() {
+        return {
+            region: null,
+        };
+    },
+    methods: {
+        ...mapActions('login',["getRegiones","selectRegion"]),
+    },
+    computed: {
+        ...mapState('login',["regiones","region_elegida"]),
+        ...mapGetters('login',["admin"]),
+    }
+}
 </script>
-- 
2.48.1


From eee3f53672eb92f91e328fd797e4816b6f557a14 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Mon, 19 May 2025 03:05:23 -0300
Subject: [PATCH 039/111] Agregado modulo a la store

---
 resources/js/store/index.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/js/store/index.js b/resources/js/store/index.js
index 91e59ed..73dd998 100644
--- a/resources/js/store/index.js
+++ b/resources/js/store/index.js
@@ -1,11 +1,13 @@
 import Vue from 'vue';
 import Vuex from 'vuex';
 import admin from "./modules/admin";
+import login from "./modules/login";
 
 Vue.use(Vuex);
 
 export default new Vuex.Store({
     modules: {
         admin,
+        login,
     },
 });
-- 
2.48.1


From 4b3ab565655cb62b108897c469599096a07e0b48 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Mon, 19 May 2025 03:05:34 -0300
Subject: [PATCH 040/111] Cambio a LoginForm

---
 resources/js/components/admin/Login.vue       | 56 -------------------
 resources/js/components/comunes/LoginForm.vue | 35 ++++++++++++
 resources/js/components/pedidos/Login.vue     | 55 ------------------
 resources/views/auth/admin_login.blade.php    |  5 +-
 resources/views/auth/login.blade.php          |  9 ++-
 5 files changed, 41 insertions(+), 119 deletions(-)
 delete mode 100644 resources/js/components/admin/Login.vue
 create mode 100644 resources/js/components/comunes/LoginForm.vue
 delete mode 100644 resources/js/components/pedidos/Login.vue

diff --git a/resources/js/components/admin/Login.vue b/resources/js/components/admin/Login.vue
deleted file mode 100644
index cc9b07b..0000000
--- a/resources/js/components/admin/Login.vue
+++ /dev/null
@@ -1,56 +0,0 @@
-<template>
-    <div v-show="visible" class="block">
-        <div class="field">
-            <label class="label has-text-white">Contraseña de administración del barrio</label>
-            <div class="field has-addons">
-				<div class="control">
-					<input required class="input" :type="this.passwordType" name="password"  placeholder="Contraseña de admin del barrio">
-				</div>
-				<div class="control">
-					<a class="button is-warning" @click="togglePassword">
-						{{ (passwordVisible ? 'Ocultar' : 'Mostrar') + ' contraseña'}}
-					</a>
-				</div>
-			</div>
-            <p class="help has-text-white">Si no la sabés, consultá a la comisión informática.</p>
-        </div>
-        <div class="field">
-            <div class="control">
-                <input type="submit" class="button is-warning" value="Ingresar"/>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script>
-    export default {
-        data() {
-            return {
-                visible: false,
-                gdc: null,
-				passwordVisible: false,
-				passwordType: "password",
-            }
-        },
-        mounted() {
-            Event.$on('gdc-seleccionado', (gdc) =>  {
-                this.gdc = gdc;
-                this.visible = true;
-            });
-        },
-		methods: {
-			togglePassword() {
-				if (this.passwordVisible) this.passwordType = "password";
-				else this.passwordType = "text"
-				this.passwordVisible = !this.passwordVisible
-			}
-		}
-    }
-</script>
-
-
-<style>
-    .help {
-        font-size: 1rem;
-    }
-</style>
diff --git a/resources/js/components/comunes/LoginForm.vue b/resources/js/components/comunes/LoginForm.vue
new file mode 100644
index 0000000..68bb05b
--- /dev/null
+++ b/resources/js/components/comunes/LoginForm.vue
@@ -0,0 +1,35 @@
+<template>
+    <div class="block">
+        <barrio-select></barrio-select>
+        <login></login>
+        <input readonly v-model="nombre" type="hidden" name="name">
+    </div>
+</template>
+
+<script>
+import {mapActions, mapGetters, mapState} from "vuex";
+import BarrioSelect from "./BarrioSelect.vue";
+import Login from "./Login.vue";
+
+export default {
+    components: {
+        BarrioSelect,
+        Login,
+    },
+    async mounted() {
+        await this.getRegiones();
+    },
+    computed: {
+        ...mapGetters('login',["admin"]),
+        ...mapState('login',["grupo_de_compra_elegido"]),
+        nombre() {
+            return `${this.grupo_de_compra_elegido}${this.admin ? '_admin' : ''}`;
+        }
+    },
+    methods: {
+        ...mapActions('login',["getRegiones"]),
+    },
+}
+</script>
+
+<style scoped></style>
diff --git a/resources/js/components/pedidos/Login.vue b/resources/js/components/pedidos/Login.vue
deleted file mode 100644
index 9b8161e..0000000
--- a/resources/js/components/pedidos/Login.vue
+++ /dev/null
@@ -1,55 +0,0 @@
-<template>
-	<div v-show="visible" class="block">
-		<div class="field">
-			<label class="label">Contraseña del barrio</label>
-			<div class="field has-addons">
-				<div class="control">
-					<input required class="input" :type="this.passwordType" name="password"  placeholder="Contraseña del barrio">
-				</div>
-				<div class="control">
-					<a class="button is-info" @click="togglePassword">
-						{{ (passwordVisible ? 'Ocultar' : 'Mostrar') + ' contraseña'}}
-					</a>
-				</div>
-			</div>
-			<p class="help">Si no la sabés, consultá a tus compañerxs.</p>
-		</div>
-		<div class="field">
-			<div class="control">
-			    <input type="submit" class="button is-success" value="Ingresar"/>
-		    </div>
-	    </div>
-	</div>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				visible: false,
-				gdc: this.$root.gdc,
-				passwordVisible: false,
-				passwordType: "password",
-			}
-		},
-		mounted() {
-			Event.$on('gdc-seleccionado', (gdc) =>  {
-				this.$root.gdc = gdc;
-				this.visible = true;
-			});
-		},
-		methods: {
-			togglePassword() {
-				if (this.passwordVisible) this.passwordType = "password";
-				else this.passwordType = "text"
-				this.passwordVisible = !this.passwordVisible
-			}
-		}
-	}
-</script>
-
-<style>
-	.help {
-		font-size: 1rem;
-	}
-</style>
diff --git a/resources/views/auth/admin_login.blade.php b/resources/views/auth/admin_login.blade.php
index c288df8..4810c55 100644
--- a/resources/views/auth/admin_login.blade.php
+++ b/resources/views/auth/admin_login.blade.php
@@ -21,11 +21,10 @@
             Contraseña incorrecta, intentalo nuevamente.
         </div>
         @enderror
-        <comunes-region-select v-bind:admin="true"></comunes-region-select>
+        <comunes-region-select></comunes-region-select>
         <form method="post" action="/login">
             @csrf
-            <comunes-barrio-select v-bind:admin="true"></comunes-barrio-select>
-            <admin-login></admin-login>
+            <comunes-login-form></comunes-login-form>
         </form>
     </div>
 </section>
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 8425226..0962900 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -24,11 +24,10 @@
             </div>
           @enderror
           <comunes-region-select></comunes-region-select>
-          <form method="post" action="/login">
-            @csrf
-            <comunes-barrio-select></comunes-barrio-select>
-            <pedidos-login></pedidos-login>
-          </form>
+            <form method="post" action="/login">
+                @csrf
+                <comunes-login-form></comunes-login-form>
+            </form>
         </div>
       </section>
       <script src="{{ mix('js/app.js') }}" defer></script>
-- 
2.48.1


From 5b65bc5d9fc4dd718791fdcfcb0b90bebef347bc Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Mon, 19 May 2025 15:01:30 -0300
Subject: [PATCH 041/111] Cambio en referencias

---
 resources/js/components/pedidos/Body.vue             | 12 +++++++++---
 .../js/components/pedidos/CategoriasContainer.vue    |  1 +
 .../js/components/pedidos/ProductosContainer.vue     |  8 ++++++--
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/resources/js/components/pedidos/Body.vue b/resources/js/components/pedidos/Body.vue
index c1fbd44..d0e2972 100644
--- a/resources/js/components/pedidos/Body.vue
+++ b/resources/js/components/pedidos/Body.vue
@@ -1,13 +1,19 @@
 <template>
     <div class="columns ml-3 mr-3">
-        <pedidos-categorias-container :class="chismosaActiva ? 'hide-below-1024' : ''"></pedidos-categorias-container>
-        <pedidos-productos-container :class="chismosaActiva ? 'hide-below-1024' : ''"></pedidos-productos-container>
-        <pedidos-chismosa v-show="chismosaActiva"></pedidos-chismosa>
+        <categorias-container :class="chismosaActiva ? 'hide-below-1024' : ''"></categorias-container>
+        <productos-container :class="chismosaActiva ? 'hide-below-1024' : ''"></productos-container>
+        <chismosa v-show="chismosaActiva"></chismosa>
     </div>
 </template>
 
 <script>
+    import {mapActions} from "vuex";
+    import Chismosa from "./Chismosa.vue";
+    import ProductosContainer from "./ProductosContainer.vue";
+    import CategoriasContainer from "./CategoriasContainer.vue";
+
     export default {
+        components: {CategoriasContainer, ProductosContainer, Chismosa},
         data() {
             return {
                 chismosaActiva: false,
diff --git a/resources/js/components/pedidos/CategoriasContainer.vue b/resources/js/components/pedidos/CategoriasContainer.vue
index 62fd96b..e512cf2 100644
--- a/resources/js/components/pedidos/CategoriasContainer.vue
+++ b/resources/js/components/pedidos/CategoriasContainer.vue
@@ -18,6 +18,7 @@
 
 <script>
 	export default {
+        name: 'CategoriasContainer',
 		data() {
 		    return {
 		      categorias: null,
diff --git a/resources/js/components/pedidos/ProductosContainer.vue b/resources/js/components/pedidos/ProductosContainer.vue
index 3719d7d..67d807f 100644
--- a/resources/js/components/pedidos/ProductosContainer.vue
+++ b/resources/js/components/pedidos/ProductosContainer.vue
@@ -1,14 +1,18 @@
 <template>
 	<div v-show="visible" class="column">
       <div class="columns is-multiline is-mobile">
-        <pedidos-producto-card v-for="(producto,i) in productos" :key="i" :producto="producto">
-        </pedidos-producto-card><!-- END BLOCK COLUMN -->
+        <producto-card v-for="(producto,i) in productos" :key="i" :producto="producto">
+        </producto-card><!-- END BLOCK COLUMN -->
       </div><!-- END COLUMNS -->
     </div><!-- END CONTAINER -->
 </template>
 
 <script>
+import ProductoCard from "./ProductoCard.vue";
+
 export default {
+    name: 'ProductosContainer',
+    components: {ProductoCard},
 	data() {
 	    return {
 	      productos: [],
-- 
2.48.1


From 40e466aa82cae2ed82232c1f47f71707f1bf9670 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Mon, 19 May 2025 15:01:54 -0300
Subject: [PATCH 042/111] Primeras cosas de chismosa

---
 resources/js/store/index.js            |  2 ++
 resources/js/store/modules/chismosa.js | 46 ++++++++++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 resources/js/store/modules/chismosa.js

diff --git a/resources/js/store/index.js b/resources/js/store/index.js
index 73dd998..7e7316e 100644
--- a/resources/js/store/index.js
+++ b/resources/js/store/index.js
@@ -2,6 +2,7 @@ import Vue from 'vue';
 import Vuex from 'vuex';
 import admin from "./modules/admin";
 import login from "./modules/login";
+import chismosa from "./modules/chismosa";
 
 Vue.use(Vuex);
 
@@ -9,5 +10,6 @@ export default new Vuex.Store({
     modules: {
         admin,
         login,
+        chismosa,
     },
 });
diff --git a/resources/js/store/modules/chismosa.js b/resources/js/store/modules/chismosa.js
new file mode 100644
index 0000000..e9fa7cb
--- /dev/null
+++ b/resources/js/store/modules/chismosa.js
@@ -0,0 +1,46 @@
+const state = {
+    lastFetch: null,
+    pedido_id: null,
+    nombre: null,
+    productos: null,
+    aprobado: null,
+    total: null,
+    total_transporte: null,
+    cantidad_transporte: null,
+    total_sin_devoluciones: null,
+    devoluciones_habilitadas: null,
+    devoluciones_total: null,
+    devoluciones_notas: null,
+};
+
+const mutations = {
+    setState(state, { pedido }) {
+        state.lastFetch = new Date();
+        state.pedido_id = pedido.id;
+        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_habilitadas = pedido.grupo_de_compra.devoluciones_habilitadas;
+        state.devoluciones_total = pedido.devoluciones_total;
+        state.devoluciones_notas = pedido.devoluciones_notas;
+    },
+};
+
+const actions = {
+    async getPedido({ commit }) {
+    },
+    async modificarChismosa({ commit }, { producto_id, cantidad, notas }) {
+    },
+    async modificarDevoluciones({ commit }, { monto, notas }) {}
+};
+
+export default {
+    namespaced: true,
+    state,
+    mutations,
+    actions,
+};
-- 
2.48.1


From ff0755176291e6946760039a25b61722f8e231c3 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Mon, 19 May 2025 23:35:27 -0300
Subject: [PATCH 043/111] Simplifcado index

---
 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 a013adb..33bea00 100644
--- a/app/Http/Controllers/Api/SubpedidoController.php
+++ b/app/Http/Controllers/Api/SubpedidoController.php
@@ -17,7 +17,7 @@ class SubpedidoController extends Controller
 {
     public function index(FiltroDeSubpedido $filtros, Request $request)
     {
-        return Subpedido::filtrar($filtros)->get();
+        return Subpedido::filtrar($filtros)->select('id','nombre')->get();
     }
 
     public function indexResources(FiltroDeSubpedido $filtros, Request $request)
-- 
2.48.1


From db5262d655a7eb5e7116d3b14e16993f14fbfe8c Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Tue, 20 May 2025 00:15:05 -0300
Subject: [PATCH 044/111] Simplifcado resource

---
 app/Http/Resources/GrupoDeCompraReducido.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/Http/Resources/GrupoDeCompraReducido.php b/app/Http/Resources/GrupoDeCompraReducido.php
index b81ac02..df44477 100644
--- a/app/Http/Resources/GrupoDeCompraReducido.php
+++ b/app/Http/Resources/GrupoDeCompraReducido.php
@@ -16,7 +16,6 @@ class GrupoDeCompraReducido extends JsonResource
         return [
             'id' => $this->id,
             'nombre' => $this->nombre,
-            'devoluciones_habilitadas' => $this->devoluciones_habilitadas,
         ];
     }
 }
-- 
2.48.1


From ac9b0a00e8ca0dd667b4ba00ea2613dfd625f57c Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Tue, 20 May 2025 00:15:32 -0300
Subject: [PATCH 045/111] Agregado modulo para info de barrio loggeado

---
 resources/js/store/index.js           |  2 ++
 resources/js/store/modules/session.js | 27 +++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 resources/js/store/modules/session.js

diff --git a/resources/js/store/index.js b/resources/js/store/index.js
index 7e7316e..9307ee2 100644
--- a/resources/js/store/index.js
+++ b/resources/js/store/index.js
@@ -3,6 +3,7 @@ import Vuex from 'vuex';
 import admin from "./modules/admin";
 import login from "./modules/login";
 import chismosa from "./modules/chismosa";
+import session from "./modules/session";
 
 Vue.use(Vuex);
 
@@ -11,5 +12,6 @@ export default new Vuex.Store({
         admin,
         login,
         chismosa,
+        session,
     },
 });
diff --git a/resources/js/store/modules/session.js b/resources/js/store/modules/session.js
new file mode 100644
index 0000000..cd5cb62
--- /dev/null
+++ b/resources/js/store/modules/session.js
@@ -0,0 +1,27 @@
+import axios from "axios";
+
+const state = {
+    grupo_de_compra_id: null,
+    grupo_de_compra: null
+};
+
+const mutations = {
+    setState(state, { grupo_de_compra }) {
+        state.grupo_de_compra_id = grupo_de_compra.id;
+        state.grupo_de_compra = grupo_de_compra.nombre;
+    }
+};
+
+const actions = {
+    async getGrupoDeCompra({ commit }) {
+        const response = await axios.get('/user/grupo_de_compra');
+        commit('setState', response.data);
+    },
+};
+
+export default {
+    namespaced: true,
+    state,
+    mutations,
+    actions,
+};
-- 
2.48.1


From f4138510cdd73b22927062791d6772dc8d4f1763 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Tue, 20 May 2025 00:15:47 -0300
Subject: [PATCH 046/111] Agregado un enter

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

diff --git a/resources/js/store/modules/login.js b/resources/js/store/modules/login.js
index 704a882..6542ab8 100644
--- a/resources/js/store/modules/login.js
+++ b/resources/js/store/modules/login.js
@@ -38,7 +38,8 @@ const getters = {
     mensajes() {
         return {
             mensaje: `Contraseña de ${getters.admin() ? 'administración ' : ''}del barrio`,
-            ayuda: `Si no la sabés, consultá a ${getters.admin() ? 'la comisión informática ' : 'tus compañerxs'}.` };
+            ayuda: `Si no la sabés, consultá a ${getters.admin() ? 'la comisión informática ' : 'tus compañerxs'}.`
+        };
     },
 };
 
-- 
2.48.1


From 6c7e62bcb03e67a0dde2cd1a613e03c594d26914 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Tue, 20 May 2025 00:16:22 -0300
Subject: [PATCH 047/111] Agregadas acciones para crear y obtener pedido

---
 resources/js/store/modules/chismosa.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/resources/js/store/modules/chismosa.js b/resources/js/store/modules/chismosa.js
index e9fa7cb..e1ab24a 100644
--- a/resources/js/store/modules/chismosa.js
+++ b/resources/js/store/modules/chismosa.js
@@ -31,7 +31,16 @@ const mutations = {
 };
 
 const actions = {
-    async getPedido({ commit }) {
+    async crearPedido({ commit }, { nombre, grupo_de_compra_id }) {
+        const response = await axios.post("/api/subpedidos", {
+            nombre: nombre,
+            grupo_de_compra_id: grupo_de_compra_id
+        });
+        commit('setState', { pedido: response.data });
+    },
+    async getPedido({ commit }, { pedido_id }) {
+        const response = await axios.get(`/api/subpedidos/${pedido_id}`);
+        commit('setState', { pedido: response.data.data });
     },
     async modificarChismosa({ commit }, { producto_id, cantidad, notas }) {
     },
-- 
2.48.1


From 7bfbbd93099d61cf66b2900bfeb2648866f6fabe Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Wed, 21 May 2025 16:23:47 -0300
Subject: [PATCH 048/111] Cambio de nombre de modulos + info de devoluciones
 habilitadas movida de pedido a barrio

---
 app/Http/Resources/GrupoDeCompraReducido.php          | 1 +
 app/Http/Resources/SubpedidoResource.php              | 1 -
 resources/js/store/index.js                           | 4 ++--
 resources/js/store/modules/{session.js => barrio.js}  | 5 ++++-
 resources/js/store/modules/{chismosa.js => pedido.js} | 2 --
 5 files changed, 7 insertions(+), 6 deletions(-)
 rename resources/js/store/modules/{session.js => barrio.js} (75%)
 rename resources/js/store/modules/{chismosa.js => pedido.js} (92%)

diff --git a/app/Http/Resources/GrupoDeCompraReducido.php b/app/Http/Resources/GrupoDeCompraReducido.php
index df44477..b81ac02 100644
--- a/app/Http/Resources/GrupoDeCompraReducido.php
+++ b/app/Http/Resources/GrupoDeCompraReducido.php
@@ -16,6 +16,7 @@ class GrupoDeCompraReducido extends JsonResource
         return [
             'id' => $this->id,
             'nombre' => $this->nombre,
+            'devoluciones_habilitadas' => $this->devoluciones_habilitadas,
         ];
     }
 }
diff --git a/app/Http/Resources/SubpedidoResource.php b/app/Http/Resources/SubpedidoResource.php
index 1976cd1..89b911e 100644
--- a/app/Http/Resources/SubpedidoResource.php
+++ b/app/Http/Resources/SubpedidoResource.php
@@ -22,7 +22,6 @@ class SubpedidoResource extends JsonResource
         return [
             'id' => $this->id,
             'nombre' => $this->nombre,
-            'grupo_de_compra' => $this->grupoDeCompra,
             'productos' => $productos,
             'aprobado' => (bool) $this->aprobado,
             'total' => number_format($this->total(),2),
diff --git a/resources/js/store/index.js b/resources/js/store/index.js
index 9307ee2..240db1b 100644
--- a/resources/js/store/index.js
+++ b/resources/js/store/index.js
@@ -2,8 +2,8 @@ import Vue from 'vue';
 import Vuex from 'vuex';
 import admin from "./modules/admin";
 import login from "./modules/login";
-import chismosa from "./modules/chismosa";
-import session from "./modules/session";
+import chismosa from "./modules/pedido";
+import session from "./modules/barrio";
 
 Vue.use(Vuex);
 
diff --git a/resources/js/store/modules/session.js b/resources/js/store/modules/barrio.js
similarity index 75%
rename from resources/js/store/modules/session.js
rename to resources/js/store/modules/barrio.js
index cd5cb62..5d9954a 100644
--- a/resources/js/store/modules/session.js
+++ b/resources/js/store/modules/barrio.js
@@ -1,14 +1,17 @@
 import axios from "axios";
 
 const state = {
+    lastFetch: null,
     grupo_de_compra_id: null,
-    grupo_de_compra: null
+    grupo_de_compra: null,
+    devoluciones_habilitadas: null,
 };
 
 const mutations = {
     setState(state, { grupo_de_compra }) {
         state.grupo_de_compra_id = grupo_de_compra.id;
         state.grupo_de_compra = grupo_de_compra.nombre;
+        state.devoluciones_habilitadas = grupo_de_compra.devoluciones_habilitadas;
     }
 };
 
diff --git a/resources/js/store/modules/chismosa.js b/resources/js/store/modules/pedido.js
similarity index 92%
rename from resources/js/store/modules/chismosa.js
rename to resources/js/store/modules/pedido.js
index e1ab24a..20881e4 100644
--- a/resources/js/store/modules/chismosa.js
+++ b/resources/js/store/modules/pedido.js
@@ -8,7 +8,6 @@ const state = {
     total_transporte: null,
     cantidad_transporte: null,
     total_sin_devoluciones: null,
-    devoluciones_habilitadas: null,
     devoluciones_total: null,
     devoluciones_notas: null,
 };
@@ -24,7 +23,6 @@ const mutations = {
         state.total_transporte = pedido.total_transporte;
         state.cantidad_transporte = pedido.cantidad_transporte;
         state.total_sin_devoluciones = pedido.total_sin_devoluciones;
-        state.devoluciones_habilitadas = pedido.grupo_de_compra.devoluciones_habilitadas;
         state.devoluciones_total = pedido.devoluciones_total;
         state.devoluciones_notas = pedido.devoluciones_notas;
     },
-- 
2.48.1


From a512f8e162e9273cf09d2f55eaace914eaad0df2 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Wed, 21 May 2025 18:17:36 -0300
Subject: [PATCH 049/111] Agregado modulo productos + cambios de nombre

---
 resources/js/store/index.js             | 10 +++--
 resources/js/store/modules/barrio.js    |  1 -
 resources/js/store/modules/productos.js | 59 +++++++++++++++++++++++++
 3 files changed, 65 insertions(+), 5 deletions(-)
 create mode 100644 resources/js/store/modules/productos.js

diff --git a/resources/js/store/index.js b/resources/js/store/index.js
index 240db1b..b184b7f 100644
--- a/resources/js/store/index.js
+++ b/resources/js/store/index.js
@@ -2,8 +2,9 @@ import Vue from 'vue';
 import Vuex from 'vuex';
 import admin from "./modules/admin";
 import login from "./modules/login";
-import chismosa from "./modules/pedido";
-import session from "./modules/barrio";
+import pedido from "./modules/pedido";
+import barrio from "./modules/barrio";
+import productos from "./modules/productos";
 
 Vue.use(Vuex);
 
@@ -11,7 +12,8 @@ export default new Vuex.Store({
     modules: {
         admin,
         login,
-        chismosa,
-        session,
+        pedido,
+        barrio,
+        productos,
     },
 });
diff --git a/resources/js/store/modules/barrio.js b/resources/js/store/modules/barrio.js
index 5d9954a..4b0df5b 100644
--- a/resources/js/store/modules/barrio.js
+++ b/resources/js/store/modules/barrio.js
@@ -1,7 +1,6 @@
 import axios from "axios";
 
 const state = {
-    lastFetch: null,
     grupo_de_compra_id: null,
     grupo_de_compra: null,
     devoluciones_habilitadas: null,
diff --git a/resources/js/store/modules/productos.js b/resources/js/store/modules/productos.js
new file mode 100644
index 0000000..3ff6efe
--- /dev/null
+++ b/resources/js/store/modules/productos.js
@@ -0,0 +1,59 @@
+import axios from "axios";
+
+const state = {
+    lastFetch: null,
+    categorias: [],
+    productos: [],
+    filtro: null,
+};
+
+const mutations = {
+    setCategorias(state, categorias) {
+        state.lastFetch = new Date();
+        state.categorias = categorias;
+        console.log(state);
+    },
+    setProductos(state, productos) {
+        state.lastFetch = new Date();
+        state.productos = productos;
+    },
+    setFiltro(state, filtro) {
+        state.lastFetch = new Date();
+        state.filtro = filtro;
+    },
+};
+
+const actions = {
+    async init({ dispatch }) {
+        if (state.lastFetch)
+            return;
+        dispatch('getCategorias');
+        dispatch('getProductos');
+    },
+    async getCategorias({ commit }) {
+        const response = await axios.get('api/categorias');
+        commit('setCategorias', response.data);
+    },
+    async getProductos({ commit }) {
+        const response = await axios.get("/api/productos");
+        commit('setFiltro', null);
+        commit('setProductos', response.data.data);
+    },
+    async seleccionarCategoria({ commit }, { categoria }) {
+        const response = await axios.get("/api/productos");
+        commit('setFiltro', { clave: "categoria", valor: categoria });
+        commit('setProductos', response.data.data);
+    },
+    async filtrarProductos({ commit }, { filtro, valor }) {
+        const response = await axios.get("/api/productos");
+        commit('setFiltro', { clave: filtro, valor: valor });
+        commit('setProductos', response.data.data);
+    }
+};
+
+export default {
+    namespaced: true,
+    state,
+    mutations,
+    actions,
+};
-- 
2.48.1


From b490cd8b25aaffd055cdd1eda9b4f3f28f79ca58 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Wed, 21 May 2025 18:17:58 -0300
Subject: [PATCH 050/111] Trae todos los productos por defecto

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

diff --git a/app/Producto.php b/app/Producto.php
index da18d78..6b55318 100644
--- a/app/Producto.php
+++ b/app/Producto.php
@@ -15,7 +15,6 @@ use Illuminate\Support\Facades\DB;
 class Producto extends Model
 {
     protected $fillable = ["nombre", "precio", "categoria"];
-    static int $paginarPorDefecto = 10;
 
     public function subpedidos(): BelongsToMany
     {
@@ -30,7 +29,7 @@ class Producto extends Model
 
     public static function getPaginar(Request $request): int
     {
-        return $request->has('paginar') && intval($request->input('paginar')) ? intval($request->input('paginar')) : self::$paginarPorDefecto;
+        return $request->has('paginar') && intval($request->input('paginar')) ? intval($request->input('paginar')) : self::all()->count();
     }
 
     public static function productosFilaID()
-- 
2.48.1


From 083658419267c36c82383b2ed7de234a39f32266 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Wed, 21 May 2025 18:18:55 -0300
Subject: [PATCH 051/111] Quitados logs e if innecesario

---
 resources/js/store/modules/productos.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/resources/js/store/modules/productos.js b/resources/js/store/modules/productos.js
index 3ff6efe..14889dc 100644
--- a/resources/js/store/modules/productos.js
+++ b/resources/js/store/modules/productos.js
@@ -11,7 +11,6 @@ const mutations = {
     setCategorias(state, categorias) {
         state.lastFetch = new Date();
         state.categorias = categorias;
-        console.log(state);
     },
     setProductos(state, productos) {
         state.lastFetch = new Date();
@@ -25,8 +24,6 @@ const mutations = {
 
 const actions = {
     async init({ dispatch }) {
-        if (state.lastFetch)
-            return;
         dispatch('getCategorias');
         dispatch('getProductos');
     },
-- 
2.48.1


From e82dd59c34e1349a1d346a3bb6ed61d63776f5bc Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Wed, 21 May 2025 18:19:22 -0300
Subject: [PATCH 052/111] Body espera a cargar productos y categorias

---
 resources/js/components/pedidos/Body.vue | 38 +++++++++++++-----------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/resources/js/components/pedidos/Body.vue b/resources/js/components/pedidos/Body.vue
index d0e2972..119d3f3 100644
--- a/resources/js/components/pedidos/Body.vue
+++ b/resources/js/components/pedidos/Body.vue
@@ -7,22 +7,26 @@
 </template>
 
 <script>
-    import {mapActions} from "vuex";
-    import Chismosa from "./Chismosa.vue";
-    import ProductosContainer from "./ProductosContainer.vue";
-    import CategoriasContainer from "./CategoriasContainer.vue";
+import { mapActions } from "vuex";
+import Chismosa from "./Chismosa.vue";
+import ProductosContainer from "./ProductosContainer.vue";
+import CategoriasContainer from "./CategoriasContainer.vue";
 
-    export default {
-        components: {CategoriasContainer, ProductosContainer, Chismosa},
-        data() {
-            return {
-                chismosaActiva: false,
-            }
-        },
-        mounted() {
-            Event.$on('toggle-chismosa', (activa) => {
-                this.chismosaActiva = activa;
-            });
-        },
-    }
+export default {
+    components: { CategoriasContainer, ProductosContainer, Chismosa },
+    data() {
+        return {
+            chismosaActiva: false,
+        }
+    },
+    methods: {
+        ...mapActions('productos', ["init"]),
+    },
+    async mounted() {
+        await this.init();
+        Event.$on('toggle-chismosa', (activa) => {
+            this.chismosaActiva = activa;
+        });
+    },
+}
 </script>
-- 
2.48.1


From 0dc8f39f071e4d00be70ba753bcdeba16cc3df7d Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Wed, 21 May 2025 18:19:39 -0300
Subject: [PATCH 053/111] Cambio logica para usar modulo pedidos + cambios en
 migas

---
 resources/js/components/comunes/NavBar.vue    |  1 -
 .../pedidos/CategoriasContainer.vue           | 68 +++++++++---------
 resources/js/components/pedidos/NavMigas.vue  | 13 ++--
 .../components/pedidos/ProductosContainer.vue | 70 ++++++-------------
 4 files changed, 59 insertions(+), 93 deletions(-)

diff --git a/resources/js/components/comunes/NavBar.vue b/resources/js/components/comunes/NavBar.vue
index bb5a6d4..de090fb 100644
--- a/resources/js/components/comunes/NavBar.vue
+++ b/resources/js/components/comunes/NavBar.vue
@@ -56,7 +56,6 @@ export default {
     },
     buscar() {
       if (this.burgerActiva) this.toggleBurger()
-      Event.$emit("migas-setear-como-inicio", this.$rootMiga)
       Event.$emit("filtrar-productos",'nombre',this.searchString)
     }
   },
diff --git a/resources/js/components/pedidos/CategoriasContainer.vue b/resources/js/components/pedidos/CategoriasContainer.vue
index e512cf2..4ad30c1 100644
--- a/resources/js/components/pedidos/CategoriasContainer.vue
+++ b/resources/js/components/pedidos/CategoriasContainer.vue
@@ -1,42 +1,38 @@
 <template>
     <div v-show="visible" class="column">
-      <div class="columns is-multiline is-mobile">
-        <div v-for="(categoria,i) in categorias" :key="i" class="block column is-one-quarter-desktop is-one-third-tablet is-half-mobile">
-          <div @click.capture="seleccionarCategoria(categoria)" class="card" style="height:100%" >
-            <div class="card-content">
-              <div class="media">
-                <div class="media-content" style="overflow:hidden">
-                  <p class="title is-6" v-text="categoria"></p>
-                </div>
-              </div>
-            </div>
-          </div><!-- END CARD -->
-        </div><!-- END BLOCK COLUMN -->
-      </div><!-- END COLUMNS -->
-  </div><!-- END CONTAINER -->
+        <div class="columns is-multiline is-mobile">
+            <div v-for="(categoria,i) in categorias" :key="i"
+                 class="block column is-one-quarter-desktop is-one-third-tablet is-half-mobile">
+                <div @click.capture="seleccionar(categoria)" class="card" style="height:100%">
+                    <div class="card-content">
+                        <div class="media">
+                            <div class="media-content" style="overflow:hidden">
+                                <p class="title is-6" v-text="categoria"></p>
+                            </div>
+                        </div>
+                    </div>
+                </div><!-- END CARD -->
+            </div><!-- END BLOCK COLUMN -->
+        </div><!-- END COLUMNS -->
+    </div><!-- END CONTAINER -->
 </template>
 
 <script>
-	export default {
-        name: 'CategoriasContainer',
-		data() {
-		    return {
-		      categorias: null,
-		      visible: true
-		    }
-		  },
-		  mounted() {
-		    axios.get("/api/categorias").then(response => {
-		      this.categorias = response.data;
-		    });
-		    Event.$emit("migas-setear-como-inicio", this.$rootMiga);
-			Event.$on("filtrar-productos", (_) => this.visible = false)
-		  },
-		  methods: {
-		    seleccionarCategoria(categoria) {
-		      this.visible = false;
-		      Event.$emit("filtrar-productos",'categoria',categoria);
-		    }
-		  }
-	}
+import { mapActions, mapState } from "vuex";
+export default {
+    name: 'CategoriasContainer',
+    computed: {
+        ...mapState('productos',["categorias", "filtro"]),
+        visible() {
+            return this.filtro === null;
+        }
+    },
+    methods: {
+        ...mapActions('productos', ["seleccionarCategoria"]),
+        seleccionar(categoria) {
+            this.seleccionarCategoria({ categoria: categoria });
+            Event.$emit('migas-agregar', { nombre: categoria });
+        }
+    }
+}
 </script>
diff --git a/resources/js/components/pedidos/NavMigas.vue b/resources/js/components/pedidos/NavMigas.vue
index ea70dc9..33ff5bb 100644
--- a/resources/js/components/pedidos/NavMigas.vue
+++ b/resources/js/components/pedidos/NavMigas.vue
@@ -2,7 +2,7 @@
 	<nav class="breadcrumb is-centered has-background-danger-light is-fixed-top" aria-label="breadcrumbs" v-show="visible">
 		<ul class="mt-4">
 			<li v-for="(miga, i) in migas" :key="i" :class="{'is-active': i == migaActiva}">
-				<a :href="miga.href" v-text="miga.nombre" 
+				<a :href="miga.href" v-text="miga.nombre"
 				   :class="{'has-text-danger': i != migaActiva}"></a>
 			</li>
 		</ul>
@@ -13,15 +13,16 @@
 	export default {
 		data() {
 		    return {
-		      migas: []
+                initial: [{ nombre: 'Categorías', href: '/productos' }],
+		      migas: [{ nombre: 'Categorías', href: '/productos' }],
 		    }
 		  },
 		  computed: {
 		    visible: function() {
 		      return this.migas.length > 0
 		    },
-			migaActiva: function() { 
-				return this.migas.length-1 
+			migaActiva: function() {
+				return this.migas.length-1
 			}
 		  },
 		  mounted() {
@@ -33,7 +34,7 @@
 		      this.migas.push(miga);
 		    });
 		    Event.$on('migas-reset', () =>  {
-		      this.migas = [];
+		      this.migas = this.initial;
 		    });
 		    Event.$on('migas-pop', () =>  {
 		      this.migas.pop();
@@ -51,4 +52,4 @@ nav.breadcrumb.is-fixed-top {
 	height: 2.75rem;
 	z-index: 5;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/resources/js/components/pedidos/ProductosContainer.vue b/resources/js/components/pedidos/ProductosContainer.vue
index 67d807f..fce1ca3 100644
--- a/resources/js/components/pedidos/ProductosContainer.vue
+++ b/resources/js/components/pedidos/ProductosContainer.vue
@@ -1,59 +1,29 @@
 <template>
-	<div v-show="visible" class="column">
-      <div class="columns is-multiline is-mobile">
-        <producto-card v-for="(producto,i) in productos" :key="i" :producto="producto">
-        </producto-card><!-- END BLOCK COLUMN -->
-      </div><!-- END COLUMNS -->
+    <div v-show="visible" class="column">
+        <div class="columns is-multiline is-mobile">
+            <producto-card v-for="(producto,i) in this.productos" :key="i" :producto="producto">
+            </producto-card><!-- END BLOCK COLUMN -->
+        </div><!-- END COLUMNS -->
     </div><!-- END CONTAINER -->
 </template>
 
 <script>
 import ProductoCard from "./ProductoCard.vue";
-
+import { mapState } from "vuex";
 export default {
     name: 'ProductosContainer',
-    components: {ProductoCard},
-	data() {
-	    return {
-	      productos: [],
-	      visible: false,
-	      paginar: 150,
-		  valor: null,
-	 	  filtro: null
-	    }
-	  },
-	  computed: {
-	    miga: function(){
-	      return {
-	        nombre: this.valor,
-	        href: "#" + this.valor
-	      }
-	    }
-	  },
-	  mounted() {
-	    Event.$on('filtrar-productos', (filtro,valor) =>  {
-		  this.filtro = filtro
-		  this.valor = valor
-	      axios.get("/api/productos", {
-	        params: this.params(filtro,valor)
-	      }).then(response => {
-	        this.productos = response.data.data;
-			this.productos.forEach(p => {
-				p.pivot = {};
-				p.pivot.cantidad = this.$root.cantidad(p);
-				p.pivot.notas = this.$root.notas(p);
-			});
-	      });
-	      this.visible = true;
-	      Event.$emit("migas-agregar",this.miga);
-	    });
-	  },
-	  methods: {
-		params(filtro,valor) {
-			let params = { paginar: this.paginar }
-			params[filtro] = valor
-			return params
-		},
-	  }
-	}
+    components: { ProductoCard },
+    computed: {
+        ...mapState('productos', ["productos", "filtro"]),
+        visible() {
+            return this.filtro !== null;
+        },
+        miga: function () {
+            return {
+                nombre: this.valor,
+                href: "#" + this.valor
+            }
+        }
+    },
+}
 </script>
-- 
2.48.1


From b76ecf57dcb6c70ee8ba8fac4b9439fcb0857042 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Wed, 21 May 2025 18:23:35 -0300
Subject: [PATCH 054/111] Busqueda funcionando con productos.js

---
 resources/js/components/comunes/NavBar.vue | 123 +++++++++++----------
 resources/js/store/modules/productos.js    |   4 +-
 2 files changed, 70 insertions(+), 57 deletions(-)

diff --git a/resources/js/components/comunes/NavBar.vue b/resources/js/components/comunes/NavBar.vue
index de090fb..9148d49 100644
--- a/resources/js/components/comunes/NavBar.vue
+++ b/resources/js/components/comunes/NavBar.vue
@@ -1,90 +1,101 @@
 <template>
     <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>
-        <!-- Styles nombre del barrio-->
-        <p class="navbar-item hide-below-1024">
-          <slot name="gdc"></slot>
-        </p>
-        <p class="navbar-item">
-          <slot name="subpedido"></slot>
-        </p>
-        <pedidos-chismosa-dropdown v-if="this.$root.pedido != null" class="hide-above-1023" id="mobile"></pedidos-chismosa-dropdown>
-        <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>
-        </a>
-      </div>
-      <div class="navbar-menu" :class="{'is-active':burgerActiva}">
-        <div class="navbar-end">
-            <div v-if="this.$root.pedido != null" class="navbar-item field has-addons mt-2 mr-3">
-              <a class="button is-small has-text-dark-grey" @click.capture="buscar">
+        <div class="navbar-brand">
+            <a class="navbar-item" href="https://mps.org.uy">
+                <img src="/assets/logoMPS.png" height="28">
+            </a>
+            <!-- Styles nombre del barrio-->
+            <p class="navbar-item hide-below-1024">
+                <slot name="gdc"></slot>
+            </p>
+            <p class="navbar-item">
+                <slot name="subpedido"></slot>
+            </p>
+            <pedidos-chismosa-dropdown v-if="this.$root.pedido != null" class="hide-above-1023"
+                                       id="mobile"></pedidos-chismosa-dropdown>
+            <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>
+            </a>
+        </div>
+        <div class="navbar-menu" :class="{'is-active':burgerActiva}">
+            <div class="navbar-end">
+                <div v-if="this.$root.pedido != null" class="navbar-item field has-addons mt-2 mr-3">
+                    <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>
-            <pedidos-chismosa-dropdown v-if="this.$root.pedido != null" class="hide-below-1024" id="wide"></pedidos-chismosa-dropdown>
-            <div class="block navbar-item">
-                <a onclick="event.preventDefault(); document.getElementById('logout-form').submit();" class="text-a">
-                    Cerrar sesión
-                </a>
-                <slot name="logout-form"></slot>
+                    </a>
+                    <input class="input is-small" type="text" placeholder="Harina" v-model="searchString"
+                           @keyup.enter="buscar">
+                </div>
+                <pedidos-chismosa-dropdown v-if="this.$root.pedido != null" class="hide-below-1024"
+                                           id="wide"></pedidos-chismosa-dropdown>
+                <div class="block navbar-item">
+                    <a onclick="event.preventDefault(); document.getElementById('logout-form').submit();"
+                       class="text-a">
+                        Cerrar sesión
+                    </a>
+                    <slot name="logout-form"></slot>
+                </div>
             </div>
         </div>
-      </div>
     </nav>
 </template>
 
 <script>
 import ChismosaDropdown from '../pedidos/ChismosaDropdown.vue';
+import {mapActions} from "vuex";
+
 export default {
-  components: { ChismosaDropdown },
-  data() {
-    return {
-      burgerActiva: false,
-      searchString: "",
-    }
-  },
-  methods: {
-    toggleBurger() {
-      this.burgerActiva = !this.burgerActiva
+    components: {ChismosaDropdown},
+    data() {
+        return {
+            burgerActiva: false,
+            searchString: "",
+        }
+    },
+    methods: {
+        ...mapActions('productos', ["filtrarProductos"]),
+        toggleBurger() {
+            this.burgerActiva = !this.burgerActiva
+        },
+        buscar() {
+            if (this.burgerActiva)
+                this.toggleBurger();
+            this.filtrarProductos({filtro: "nombre", valor: this.searchString});
+            Event.$emit('migas-agregar', {nombre: this.searchString});
+
+        }
     },
-    buscar() {
-      if (this.burgerActiva) this.toggleBurger()
-      Event.$emit("filtrar-productos",'nombre',this.searchString)
-    }
-  },
 };
 </script>
 
 <style>
 
 p.navbar-item:empty {
-  display: none;
+    display: none;
 }
 
 #nav-bar {
-  z-index: 10;
+    z-index: 10;
 }
 
 .text-a {
-  color: inherit;
+    color: inherit;
 }
 
 @media (max-width: 1023px) {
-  .hide-below-1024 {
-    display: none !important;
-  }
+    .hide-below-1024 {
+        display: none !important;
+    }
 }
 
 @media (min-width: 1024px) {
-  .hide-above-1023 {
-    display: none !important;
-  }
+    .hide-above-1023 {
+        display: none !important;
+    }
 }
 </style>
diff --git a/resources/js/store/modules/productos.js b/resources/js/store/modules/productos.js
index 14889dc..2bf3443 100644
--- a/resources/js/store/modules/productos.js
+++ b/resources/js/store/modules/productos.js
@@ -42,7 +42,9 @@ const actions = {
         commit('setProductos', response.data.data);
     },
     async filtrarProductos({ commit }, { filtro, valor }) {
-        const response = await axios.get("/api/productos");
+        const response = await axios.get("/api/productos", {
+            params: { [filtro]: valor }
+        });
         commit('setFiltro', { clave: filtro, valor: valor });
         commit('setProductos', response.data.data);
     }
-- 
2.48.1


From caebf1b53b7583ad45bac1e52b738774674f2358 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Wed, 21 May 2025 18:24:31 -0300
Subject: [PATCH 055/111] Simplificado seleccionarCategoria

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

diff --git a/resources/js/store/modules/productos.js b/resources/js/store/modules/productos.js
index 2bf3443..27794c1 100644
--- a/resources/js/store/modules/productos.js
+++ b/resources/js/store/modules/productos.js
@@ -36,10 +36,8 @@ const actions = {
         commit('setFiltro', null);
         commit('setProductos', response.data.data);
     },
-    async seleccionarCategoria({ commit }, { categoria }) {
-        const response = await axios.get("/api/productos");
-        commit('setFiltro', { clave: "categoria", valor: categoria });
-        commit('setProductos', response.data.data);
+    async seleccionarCategoria({ dispatch }, { categoria }) {
+        dispatch('filtrarProductos', { filtro: "categoria", valor: categoria });
     },
     async filtrarProductos({ commit }, { filtro, valor }) {
         const response = await axios.get("/api/productos", {
-- 
2.48.1


From 2f7ee489304060a340fa524c96b8f318fdbaf492 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Wed, 21 May 2025 18:27:08 -0300
Subject: [PATCH 056/111] Formato

---
 resources/js/components/comunes/NavBar.vue | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/resources/js/components/comunes/NavBar.vue b/resources/js/components/comunes/NavBar.vue
index 9148d49..1e73c4f 100644
--- a/resources/js/components/comunes/NavBar.vue
+++ b/resources/js/components/comunes/NavBar.vue
@@ -11,8 +11,11 @@
             <p class="navbar-item">
                 <slot name="subpedido"></slot>
             </p>
-            <pedidos-chismosa-dropdown v-if="this.$root.pedido != null" class="hide-above-1023"
-                                       id="mobile"></pedidos-chismosa-dropdown>
+            <chismosa-dropdown
+                v-if="this.$root.pedido != null"
+                class="hide-above-1023"
+                id="mobile">
+            </chismosa-dropdown>
             <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>
@@ -31,8 +34,11 @@
                     <input class="input is-small" type="text" placeholder="Harina" v-model="searchString"
                            @keyup.enter="buscar">
                 </div>
-                <pedidos-chismosa-dropdown v-if="this.$root.pedido != null" class="hide-below-1024"
-                                           id="wide"></pedidos-chismosa-dropdown>
+                <chismosa-dropdown
+                    v-if="this.$root.pedido != null"
+                    class="hide-below-1024"
+                    id="wide">
+                </chismosa-dropdown>
                 <div class="block navbar-item">
                     <a onclick="event.preventDefault(); document.getElementById('logout-form').submit();"
                        class="text-a">
-- 
2.48.1


From 59b6c295085afedb05e3730f8ccb1a19273892bc Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Wed, 21 May 2025 18:39:56 -0300
Subject: [PATCH 057/111] Solo se muestra en pedido

---
 resources/js/components/pedidos/NavMigas.vue | 94 ++++++++++----------
 resources/js/store/modules/pedido.js         |  7 ++
 2 files changed, 56 insertions(+), 45 deletions(-)

diff --git a/resources/js/components/pedidos/NavMigas.vue b/resources/js/components/pedidos/NavMigas.vue
index 33ff5bb..6e8f672 100644
--- a/resources/js/components/pedidos/NavMigas.vue
+++ b/resources/js/components/pedidos/NavMigas.vue
@@ -1,55 +1,59 @@
 <template>
-	<nav class="breadcrumb is-centered has-background-danger-light is-fixed-top" aria-label="breadcrumbs" v-show="visible">
-		<ul class="mt-4">
-			<li v-for="(miga, i) in migas" :key="i" :class="{'is-active': i == migaActiva}">
-				<a :href="miga.href" v-text="miga.nombre"
-				   :class="{'has-text-danger': i != migaActiva}"></a>
-			</li>
-		</ul>
-	</nav>
+    <nav v-if="pedidoDefinido" class="breadcrumb is-centered has-background-danger-light is-fixed-top"
+         aria-label="breadcrumbs" v-show="visible">
+        <ul class="mt-4">
+            <li v-for="(miga, i) in migas" :key="i" :class="{'is-active': i == migaActiva}">
+                <a :href="miga.href" v-text="miga.nombre"
+                   :class="{'has-text-danger': i != migaActiva}"></a>
+            </li>
+        </ul>
+    </nav>
 </template>
 
 <script>
-	export default {
-		data() {
-		    return {
-                initial: [{ nombre: 'Categorías', href: '/productos' }],
-		      migas: [{ nombre: 'Categorías', href: '/productos' }],
-		    }
-		  },
-		  computed: {
-		    visible: function() {
-		      return this.migas.length > 0
-		    },
-			migaActiva: function() {
-				return this.migas.length-1
-			}
-		  },
-		  mounted() {
-		    Event.$on('migas-setear-como-inicio', (miga) =>  {
-		      this.migas = [];
-		      this.migas.push(miga);
-		    });
-		    Event.$on('migas-agregar', (miga) =>  {
-		      this.migas.push(miga);
-		    });
-		    Event.$on('migas-reset', () =>  {
-		      this.migas = this.initial;
-		    });
-		    Event.$on('migas-pop', () =>  {
-		      this.migas.pop();
-		    });
-		  }
-	}
+import { mapGetters } from "vuex";
+
+export default {
+    data() {
+        return {
+            initial: [{ nombre: 'Categorías', href: '/productos' }],
+            migas: [{ nombre: 'Categorías', href: '/productos' }],
+        }
+    },
+    computed: {
+        ...mapGetters('pedido', ["pedidoDefinido"]),
+        visible: function () {
+            return this.migas.length > 0
+        },
+        migaActiva: function () {
+            return this.migas.length - 1
+        }
+    },
+    mounted() {
+        Event.$on('migas-setear-como-inicio', (miga) => {
+            this.migas = [];
+            this.migas.push(miga);
+        });
+        Event.$on('migas-agregar', (miga) => {
+            this.migas.push(miga);
+        });
+        Event.$on('migas-reset', () => {
+            this.migas = this.initial;
+        });
+        Event.$on('migas-pop', () => {
+            this.migas.pop();
+        });
+    }
+}
 </script>
 
 <style>
 nav.breadcrumb.is-fixed-top {
-	position: fixed;
-	left: 0;
-	right: 0;
-	top: 3.25rem;
-	height: 2.75rem;
-	z-index: 5;
+    position: fixed;
+    left: 0;
+    right: 0;
+    top: 3.25rem;
+    height: 2.75rem;
+    z-index: 5;
 }
 </style>
diff --git a/resources/js/store/modules/pedido.js b/resources/js/store/modules/pedido.js
index 20881e4..0494489 100644
--- a/resources/js/store/modules/pedido.js
+++ b/resources/js/store/modules/pedido.js
@@ -45,9 +45,16 @@ const actions = {
     async modificarDevoluciones({ commit }, { monto, notas }) {}
 };
 
+const getters = {
+    pedidoDefinido() {
+        return state.lastFetch !== null;
+    },
+}
+
 export default {
     namespaced: true,
     state,
     mutations,
     actions,
+    getters,
 };
-- 
2.48.1


From dd30726d104cbfb387ac352147ea8ac5712eb418 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Wed, 21 May 2025 18:41:10 -0300
Subject: [PATCH 058/111] Formato

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

diff --git a/resources/js/components/comunes/NavBar.vue b/resources/js/components/comunes/NavBar.vue
index 1e73c4f..1a6fc91 100644
--- a/resources/js/components/comunes/NavBar.vue
+++ b/resources/js/components/comunes/NavBar.vue
@@ -53,10 +53,10 @@
 
 <script>
 import ChismosaDropdown from '../pedidos/ChismosaDropdown.vue';
-import {mapActions} from "vuex";
+import { mapActions } from "vuex";
 
 export default {
-    components: {ChismosaDropdown},
+    components: { ChismosaDropdown },
     data() {
         return {
             burgerActiva: false,
@@ -71,8 +71,8 @@ export default {
         buscar() {
             if (this.burgerActiva)
                 this.toggleBurger();
-            this.filtrarProductos({filtro: "nombre", valor: this.searchString});
-            Event.$emit('migas-agregar', {nombre: this.searchString});
+            this.filtrarProductos({ filtro: "nombre", valor: this.searchString });
+            Event.$emit('migas-agregar', { nombre: this.searchString });
 
         }
     },
-- 
2.48.1


From 020d554019033eca2730efcba7ff0da69e2f0ff0 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Wed, 21 May 2025 18:44:22 -0300
Subject: [PATCH 059/111] Formato

---
 .../js/components/pedidos/SubpedidoSelect.vue | 156 +++++++++---------
 1 file changed, 80 insertions(+), 76 deletions(-)

diff --git a/resources/js/components/pedidos/SubpedidoSelect.vue b/resources/js/components/pedidos/SubpedidoSelect.vue
index 9031c7a..5f58996 100644
--- a/resources/js/components/pedidos/SubpedidoSelect.vue
+++ b/resources/js/components/pedidos/SubpedidoSelect.vue
@@ -1,28 +1,32 @@
 <template>
-	<div>
-	    <label class="label">Escribí el nombre de tu familia o grupo de convivencia</label>
-  		<div class="columns">
-	  		<div class="column is-two-thirds">
-				<div class="field">
-			        <div class="control">
-		        		<input class="input" @input="onType" v-model="subpedido"/>
-					</div>
-					<p class="help">Debe ser claro para que tus compas del barrio te identifiquen.</p>
-				</div>
-			</div>
-	  		<div class="column is-one-third buttons">
-			  	<button class="button is-danger" v-show="!botonCrearDesabilitado" @click="submit">Crear nuevo pedido</button>
-			</div>
-		</div>
+    <div>
+        <label class="label">Escribí el nombre de tu familia o grupo de convivencia</label>
+        <div class="columns">
+            <div class="column is-two-thirds">
+                <div class="field">
+                    <div class="control">
+                        <input class="input" @input="onType" v-model="subpedido"/>
+                    </div>
+                    <p class="help">Debe ser claro para que tus compas del barrio te identifiquen.</p>
+                </div>
+            </div>
+            <div class="column is-one-third buttons">
+                <button class="button is-danger" v-show="!botonCrearDesabilitado" @click="submit">Crear nuevo pedido
+                </button>
+            </div>
+        </div>
         <div v-if="subpedidosExistentes.length" class="block">
             <label class="label">Si ya comenzaste a hacer tu pedido este mes, elegilo en esta lista:</label>
             <p class="help">Podés seguir escribiendo en el campo de arriba para refinar la búsqueda.</p>
-            <div class="columns is-mobile" v-for="(subpedidoExistente, index) in subpedidosExistentes" :class="{'has-background-grey-lighter': index % 2}" :key="index">
+            <div class="columns is-mobile" v-for="(subpedidoExistente, index) in subpedidosExistentes"
+                 :class="{'has-background-grey-lighter': index % 2}" :key="index">
                 <div class="column is-half-mobile is-two-thirds-desktop is-two-thirds-tablet">
-                    <p style="padding-top: calc(.5em - 1px); margin-bottom: .5rem" v-text="subpedidoExistente.nombre"></p>
+                    <p style="padding-top: calc(.5em - 1px); margin-bottom: .5rem"
+                       v-text="subpedidoExistente.nombre"></p>
                 </div>
                 <div class="buttons column is-half-mobile is-one-third-desktop is-one-third-tablet">
-                    <button class="button is-danger" @click="elegirSubpedido(subpedidoExistente)">Continuar pedido</button>
+                    <button class="button is-danger" @click="elegirSubpedido(subpedidoExistente)">Continuar pedido
+                    </button>
                 </div>
             </div>
         </div>
@@ -30,62 +34,62 @@
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				subpedido: null,
-				subpedidosExistentes: []
-			}
-		},
-	  computed: {
-	    nombresDeSubpedidos: function() {
-	      return this.subpedidosExistentes.map(a => a.nombre.toLowerCase())
-	    },
-	    botonCrearDesabilitado : function() {
-	      return !this.subpedido || this.nombresDeSubpedidos.includes(this.subpedido.toLowerCase())
-	    }
-	  },
-		props: ["gdcid"],
-		mounted() {
-			console.log("ready");
-		},
-		methods: {
-	  		onType() {
-	        if (!this.subpedido){
-	          this.subpedidosExistentes = [];
-	          return;
-	        }
-		    	axios.get("/api/subpedidos", {
-	          params: {
-	            nombre: this.subpedido,
-	            grupo_de_compra: this.gdcid
-	          }
-	        }).then(response => {
-		    		this.subpedidosExistentes = response.data
-		    	});
-	  		},
-	  		submit() {
-	  			axios.post("/api/subpedidos", {
-	  				nombre: this.subpedido,
-	  				grupo_de_compra_id: this.gdcid
-	  			}).then(response => {
-					//se creo el subpedido
-					this.elegirSubpedido(response.data);
-	  			});
-	  		},
-	      elegirSubpedido(subpedido){
-	        //lo guardamos en sesion
-	        this.guardarSubpedidoEnSesion(subpedido);
-	      },
-	      guardarSubpedidoEnSesion(subpedido) {
-	        axios.post("/subpedidos/guardar_sesion", {
-	          subpedido: subpedido,
-              grupo_de_compra_id: this.gdcid
-	        }).then(_ => {
-				Event.$emit('obtener-sesion')
-	          window.location.href = 'productos';
-	        });
-	      }
-	  	}
-	}
+export default {
+    data() {
+        return {
+            subpedido: null,
+            subpedidosExistentes: []
+        }
+    },
+    computed: {
+        nombresDeSubpedidos: function () {
+            return this.subpedidosExistentes.map(a => a.nombre.toLowerCase())
+        },
+        botonCrearDesabilitado: function () {
+            return !this.subpedido || this.nombresDeSubpedidos.includes(this.subpedido.toLowerCase())
+        }
+    },
+    props: ["gdcid"],
+    mounted() {
+        console.log("ready");
+    },
+    methods: {
+        onType() {
+            if (!this.subpedido) {
+                this.subpedidosExistentes = [];
+                return;
+            }
+            axios.get("/api/subpedidos", {
+                params: {
+                    nombre: this.subpedido,
+                    grupo_de_compra: this.gdcid
+                }
+            }).then(response => {
+                this.subpedidosExistentes = response.data
+            });
+        },
+        submit() {
+            axios.post("/api/subpedidos", {
+                nombre: this.subpedido,
+                grupo_de_compra_id: this.gdcid
+            }).then(response => {
+                //se creo el subpedido
+                this.elegirSubpedido(response.data);
+            });
+        },
+        elegirSubpedido(subpedido) {
+            //lo guardamos en sesion
+            this.guardarSubpedidoEnSesion(subpedido);
+        },
+        guardarSubpedidoEnSesion(subpedido) {
+            axios.post("/subpedidos/guardar_sesion", {
+                subpedido: subpedido,
+                grupo_de_compra_id: this.gdcid
+            }).then(_ => {
+                Event.$emit('obtener-sesion')
+                window.location.href = 'productos';
+            });
+        }
+    }
+}
 </script>
-- 
2.48.1


From be24daf9988fd117b8b06f747301cd040cb47ec1 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Wed, 21 May 2025 18:50:32 -0300
Subject: [PATCH 060/111] Usando store para grupo de compra id en lugar de prop

---
 .../js/components/pedidos/SubpedidoSelect.vue     | 15 +++++++++------
 resources/views/subpedidos_create.blade.php       |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/resources/js/components/pedidos/SubpedidoSelect.vue b/resources/js/components/pedidos/SubpedidoSelect.vue
index 5f58996..0c87e5e 100644
--- a/resources/js/components/pedidos/SubpedidoSelect.vue
+++ b/resources/js/components/pedidos/SubpedidoSelect.vue
@@ -34,6 +34,8 @@
 </template>
 
 <script>
+import { mapActions, mapState } from "vuex";
+
 export default {
     data() {
         return {
@@ -42,6 +44,7 @@ export default {
         }
     },
     computed: {
+        ...mapState('barrio',["grupo_de_compra_id"]),
         nombresDeSubpedidos: function () {
             return this.subpedidosExistentes.map(a => a.nombre.toLowerCase())
         },
@@ -49,11 +52,11 @@ export default {
             return !this.subpedido || this.nombresDeSubpedidos.includes(this.subpedido.toLowerCase())
         }
     },
-    props: ["gdcid"],
-    mounted() {
-        console.log("ready");
+    async mounted() {
+        await this.getGrupoDeCompra();
     },
     methods: {
+        ...mapActions('barrio',["getGrupoDeCompra"]),
         onType() {
             if (!this.subpedido) {
                 this.subpedidosExistentes = [];
@@ -62,7 +65,7 @@ export default {
             axios.get("/api/subpedidos", {
                 params: {
                     nombre: this.subpedido,
-                    grupo_de_compra: this.gdcid
+                    grupo_de_compra: this.grupo_de_compra_id
                 }
             }).then(response => {
                 this.subpedidosExistentes = response.data
@@ -71,7 +74,7 @@ export default {
         submit() {
             axios.post("/api/subpedidos", {
                 nombre: this.subpedido,
-                grupo_de_compra_id: this.gdcid
+                grupo_de_compra_id: this.grupo_de_compra_id
             }).then(response => {
                 //se creo el subpedido
                 this.elegirSubpedido(response.data);
@@ -84,7 +87,7 @@ export default {
         guardarSubpedidoEnSesion(subpedido) {
             axios.post("/subpedidos/guardar_sesion", {
                 subpedido: subpedido,
-                grupo_de_compra_id: this.gdcid
+                grupo_de_compra_id: this.grupo_de_compra_id
             }).then(_ => {
                 Event.$emit('obtener-sesion')
                 window.location.href = 'productos';
diff --git a/resources/views/subpedidos_create.blade.php b/resources/views/subpedidos_create.blade.php
index db0ccaf..7a82f36 100644
--- a/resources/views/subpedidos_create.blade.php
+++ b/resources/views/subpedidos_create.blade.php
@@ -9,7 +9,7 @@
   <p class="subtitle">
     Bienvenidx a la aplicación de pedidos del <strong>Mercado Popular de Subsistencia</strong>
   </p>
-  <pedidos-subpedido-select gdcid="{{Auth::user()->grupoDeCompra->id}}"></pedidos-subpedido-select>
+  <pedidos-subpedido-select></pedidos-subpedido-select>
 </div>
 </section>
 @endsection
-- 
2.48.1


From 408531bec31b4b12a51c6fcb9720b11ec32431eb Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Wed, 21 May 2025 18:57:03 -0300
Subject: [PATCH 061/111] =?UTF-8?q?Nombres=20de=20campos=20y=20simplificac?=
 =?UTF-8?q?i=C3=B3n=20de=20deshabilitar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/components/pedidos/SubpedidoSelect.vue | 36 +++++++++----------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/resources/js/components/pedidos/SubpedidoSelect.vue b/resources/js/components/pedidos/SubpedidoSelect.vue
index 0c87e5e..11bdf8b 100644
--- a/resources/js/components/pedidos/SubpedidoSelect.vue
+++ b/resources/js/components/pedidos/SubpedidoSelect.vue
@@ -5,20 +5,20 @@
             <div class="column is-two-thirds">
                 <div class="field">
                     <div class="control">
-                        <input class="input" @input="onType" v-model="subpedido"/>
+                        <input class="input" @input="onType" v-model="searchString"/>
                     </div>
                     <p class="help">Debe ser claro para que tus compas del barrio te identifiquen.</p>
                 </div>
             </div>
             <div class="column is-one-third buttons">
-                <button class="button is-danger" v-show="!botonCrearDesabilitado" @click="submit">Crear nuevo pedido
+                <button class="button is-danger" v-if="!deshabilitado" @click="submit">Crear nuevo pedido
                 </button>
             </div>
         </div>
-        <div v-if="subpedidosExistentes.length" class="block">
+        <div v-if="pedidos.length" class="block">
             <label class="label">Si ya comenzaste a hacer tu pedido este mes, elegilo en esta lista:</label>
             <p class="help">Podés seguir escribiendo en el campo de arriba para refinar la búsqueda.</p>
-            <div class="columns is-mobile" v-for="(subpedidoExistente, index) in subpedidosExistentes"
+            <div class="columns is-mobile" v-for="(subpedidoExistente, index) in pedidos"
                  :class="{'has-background-grey-lighter': index % 2}" :key="index">
                 <div class="column is-half-mobile is-two-thirds-desktop is-two-thirds-tablet">
                     <p style="padding-top: calc(.5em - 1px); margin-bottom: .5rem"
@@ -37,43 +37,41 @@
 import { mapActions, mapState } from "vuex";
 
 export default {
+    async mounted() {
+        await this.getGrupoDeCompra();
+    },
     data() {
         return {
-            subpedido: null,
-            subpedidosExistentes: []
+            searchString: null,
+            pedidos: []
         }
     },
     computed: {
         ...mapState('barrio',["grupo_de_compra_id"]),
-        nombresDeSubpedidos: function () {
-            return this.subpedidosExistentes.map(a => a.nombre.toLowerCase())
-        },
-        botonCrearDesabilitado: function () {
-            return !this.subpedido || this.nombresDeSubpedidos.includes(this.subpedido.toLowerCase())
+        deshabilitado: function () {
+            return !this.searchString?.trim()
+                || this.pedidos.some(p => p.nombre.toLowerCase() === this.searchString.toLowerCase())
         }
     },
-    async mounted() {
-        await this.getGrupoDeCompra();
-    },
     methods: {
         ...mapActions('barrio',["getGrupoDeCompra"]),
         onType() {
-            if (!this.subpedido) {
-                this.subpedidosExistentes = [];
+            if (!this.searchString) {
+                this.pedidos = [];
                 return;
             }
             axios.get("/api/subpedidos", {
                 params: {
-                    nombre: this.subpedido,
+                    nombre: this.searchString,
                     grupo_de_compra: this.grupo_de_compra_id
                 }
             }).then(response => {
-                this.subpedidosExistentes = response.data
+                this.pedidos = response.data
             });
         },
         submit() {
             axios.post("/api/subpedidos", {
-                nombre: this.subpedido,
+                nombre: this.searchString,
                 grupo_de_compra_id: this.grupo_de_compra_id
             }).then(response => {
                 //se creo el subpedido
-- 
2.48.1


From 191f01a398037fce35756cccf959175fc84c1751 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Wed, 21 May 2025 19:10:00 -0300
Subject: [PATCH 062/111] Agregado 'pedidos' al state con metodos para traer y
 settear + separada logica de state en grupo de compra y pedidos

---
 resources/js/store/modules/barrio.js | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/resources/js/store/modules/barrio.js b/resources/js/store/modules/barrio.js
index 4b0df5b..9e44811 100644
--- a/resources/js/store/modules/barrio.js
+++ b/resources/js/store/modules/barrio.js
@@ -4,21 +4,35 @@ const state = {
     grupo_de_compra_id: null,
     grupo_de_compra: null,
     devoluciones_habilitadas: null,
+    pedidos: [],
 };
 
 const mutations = {
-    setState(state, { grupo_de_compra }) {
+    setGrupoDeCompra(state, { grupo_de_compra }) {
         state.grupo_de_compra_id = grupo_de_compra.id;
         state.grupo_de_compra = grupo_de_compra.nombre;
         state.devoluciones_habilitadas = grupo_de_compra.devoluciones_habilitadas;
-    }
+    },
+    setPedidos(state, pedidos) {
+        state.pedidos = pedidos;
+        console.log(state);
+    },
 };
 
 const actions = {
     async getGrupoDeCompra({ commit }) {
         const response = await axios.get('/user/grupo_de_compra');
-        commit('setState', response.data);
+        commit('setGrupoDeCompra', response.data);
     },
+    async getPedidos({ commit }, nombre) {
+        const response = await axios.get('/api/subpedidos/',{
+            params: {
+                nombre: nombre,
+                grupo_de_compra: state.grupo_de_compra_id
+            }
+        });
+        commit('setPedidos', response.data);
+    }
 };
 
 export default {
-- 
2.48.1


From 248b346f78a1fe42f5274a65776a0096176c4ffd Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Wed, 21 May 2025 19:10:47 -0300
Subject: [PATCH 063/111] Usando store para pedidos

---
 .../js/components/pedidos/SubpedidoSelect.vue | 22 +++++++------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/resources/js/components/pedidos/SubpedidoSelect.vue b/resources/js/components/pedidos/SubpedidoSelect.vue
index 11bdf8b..f7b563a 100644
--- a/resources/js/components/pedidos/SubpedidoSelect.vue
+++ b/resources/js/components/pedidos/SubpedidoSelect.vue
@@ -34,7 +34,7 @@
 </template>
 
 <script>
-import { mapActions, mapState } from "vuex";
+import { mapActions, mapMutations, mapState } from "vuex";
 
 export default {
     async mounted() {
@@ -42,32 +42,26 @@ export default {
     },
     data() {
         return {
-            searchString: null,
-            pedidos: []
+            searchString: null
         }
     },
     computed: {
-        ...mapState('barrio',["grupo_de_compra_id"]),
+        ...mapState('barrio',["grupo_de_compra_id","pedidos"]),
         deshabilitado: function () {
             return !this.searchString?.trim()
                 || this.pedidos.some(p => p.nombre.toLowerCase() === this.searchString.toLowerCase())
         }
     },
     methods: {
-        ...mapActions('barrio',["getGrupoDeCompra"]),
+        ...mapActions('barrio',["getGrupoDeCompra","getPedidos"]),
+        ...mapMutations('barrio',["setPedidos"]),
         onType() {
             if (!this.searchString) {
-                this.pedidos = [];
+                this.setPedidos([]);
                 return;
             }
-            axios.get("/api/subpedidos", {
-                params: {
-                    nombre: this.searchString,
-                    grupo_de_compra: this.grupo_de_compra_id
-                }
-            }).then(response => {
-                this.pedidos = response.data
-            });
+
+            this.getPedidos(this.searchString);
         },
         submit() {
             axios.post("/api/subpedidos", {
-- 
2.48.1


From 83027245e8c8626c5a4d64c5124f0347946f90a5 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Wed, 21 May 2025 19:28:06 -0300
Subject: [PATCH 064/111] =?UTF-8?q?Par=C3=A1metros=20simplificados?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/resources/js/store/modules/pedido.js b/resources/js/store/modules/pedido.js
index 0494489..0f9dd7e 100644
--- a/resources/js/store/modules/pedido.js
+++ b/resources/js/store/modules/pedido.js
@@ -13,7 +13,7 @@ const state = {
 };
 
 const mutations = {
-    setState(state, { pedido }) {
+    setState(state, pedido) {
         state.lastFetch = new Date();
         state.pedido_id = pedido.id;
         state.nombre = pedido.nombre;
@@ -29,20 +29,19 @@ const mutations = {
 };
 
 const actions = {
-    async crearPedido({ commit }, { nombre, grupo_de_compra_id }) {
+    async crearPedido({ commit }, nombre, grupo_de_compra_id) {
         const response = await axios.post("/api/subpedidos", {
             nombre: nombre,
             grupo_de_compra_id: grupo_de_compra_id
         });
-        commit('setState', { pedido: response.data });
+        commit('setState', response.data);
     },
-    async getPedido({ commit }, { pedido_id }) {
+    async getPedido({ commit }, pedido_id) {
         const response = await axios.get(`/api/subpedidos/${pedido_id}`);
-        commit('setState', { pedido: response.data.data });
+        commit('setState', response.data.data);
     },
-    async modificarChismosa({ commit }, { producto_id, cantidad, notas }) {
-    },
-    async modificarDevoluciones({ commit }, { monto, notas }) {}
+    async modificarChismosa({ commit }, producto_id, cantidad, notas) {},
+    async modificarDevoluciones({ commit }, monto, notas) {}
 };
 
 const getters = {
-- 
2.48.1


From 3509b9348f4c873c28e2c2a33bffa29ed997e987 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Wed, 21 May 2025 19:28:41 -0300
Subject: [PATCH 065/111] =?UTF-8?q?Transici=C3=B3n=20a=20store?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/components/pedidos/SubpedidoSelect.vue      | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/resources/js/components/pedidos/SubpedidoSelect.vue b/resources/js/components/pedidos/SubpedidoSelect.vue
index f7b563a..eda680c 100644
--- a/resources/js/components/pedidos/SubpedidoSelect.vue
+++ b/resources/js/components/pedidos/SubpedidoSelect.vue
@@ -47,6 +47,7 @@ export default {
     },
     computed: {
         ...mapState('barrio',["grupo_de_compra_id","pedidos"]),
+        ...mapState('pedido',["nombre","pedido_id"]),
         deshabilitado: function () {
             return !this.searchString?.trim()
                 || this.pedidos.some(p => p.nombre.toLowerCase() === this.searchString.toLowerCase())
@@ -54,6 +55,7 @@ export default {
     },
     methods: {
         ...mapActions('barrio',["getGrupoDeCompra","getPedidos"]),
+        ...mapActions('pedido',["crearPedido","getPedido"]),
         ...mapMutations('barrio',["setPedidos"]),
         onType() {
             if (!this.searchString) {
@@ -63,17 +65,13 @@ export default {
 
             this.getPedidos(this.searchString);
         },
-        submit() {
-            axios.post("/api/subpedidos", {
-                nombre: this.searchString,
-                grupo_de_compra_id: this.grupo_de_compra_id
-            }).then(response => {
-                //se creo el subpedido
-                this.elegirSubpedido(response.data);
-            });
+        async submit() {
+            await this.crearPedido(this.searchString, this.grupo_de_compra_id);
+            this.guardarSubpedidoEnSesion({ id: this.pedido_id, nombre: this.nombre });
         },
         elegirSubpedido(subpedido) {
             //lo guardamos en sesion
+            this.getPedido(subpedido.id);
             this.guardarSubpedidoEnSesion(subpedido);
         },
         guardarSubpedidoEnSesion(subpedido) {
-- 
2.48.1


From fe529c2242737757f5f9234c04cfc0bfa8a4cdef Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Wed, 21 May 2025 20:44:58 -0300
Subject: [PATCH 066/111] esperar

---
 resources/js/store/modules/barrio.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/resources/js/store/modules/barrio.js b/resources/js/store/modules/barrio.js
index 9e44811..ae2d624 100644
--- a/resources/js/store/modules/barrio.js
+++ b/resources/js/store/modules/barrio.js
@@ -15,7 +15,6 @@ const mutations = {
     },
     setPedidos(state, pedidos) {
         state.pedidos = pedidos;
-        console.log(state);
     },
 };
 
-- 
2.48.1


From f4560c0be5d47b68307098a3a79769de10f61060 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Wed, 21 May 2025 20:45:35 -0300
Subject: [PATCH 067/111] arreglos en comparacion

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

diff --git a/resources/js/components/pedidos/NavMigas.vue b/resources/js/components/pedidos/NavMigas.vue
index 6e8f672..c17d788 100644
--- a/resources/js/components/pedidos/NavMigas.vue
+++ b/resources/js/components/pedidos/NavMigas.vue
@@ -2,9 +2,9 @@
     <nav v-if="pedidoDefinido" class="breadcrumb is-centered has-background-danger-light is-fixed-top"
          aria-label="breadcrumbs" v-show="visible">
         <ul class="mt-4">
-            <li v-for="(miga, i) in migas" :key="i" :class="{'is-active': i == migaActiva}">
+            <li v-for="(miga, i) in migas" :key="i" :class="{'is-active': i === migaActiva}">
                 <a :href="miga.href" v-text="miga.nombre"
-                   :class="{'has-text-danger': i != migaActiva}"></a>
+                   :class="{'has-text-danger': i !== migaActiva}"></a>
             </li>
         </ul>
     </nav>
-- 
2.48.1


From f92084d399529439c6f0e52b6b18f762c321e6ab Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Wed, 21 May 2025 20:45:50 -0300
Subject: [PATCH 068/111] usando pedido definido

---
 resources/js/components/comunes/NavBar.vue | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/resources/js/components/comunes/NavBar.vue b/resources/js/components/comunes/NavBar.vue
index 1a6fc91..d8fba83 100644
--- a/resources/js/components/comunes/NavBar.vue
+++ b/resources/js/components/comunes/NavBar.vue
@@ -4,15 +4,12 @@
             <a class="navbar-item" href="https://mps.org.uy">
                 <img src="/assets/logoMPS.png" height="28">
             </a>
-            <!-- Styles nombre del barrio-->
             <p class="navbar-item hide-below-1024">
-                <slot name="gdc"></slot>
             </p>
             <p class="navbar-item">
-                <slot name="subpedido"></slot>
             </p>
             <chismosa-dropdown
-                v-if="this.$root.pedido != null"
+                v-if="pedidoDefinido"
                 class="hide-above-1023"
                 id="mobile">
             </chismosa-dropdown>
@@ -25,7 +22,7 @@
         </div>
         <div class="navbar-menu" :class="{'is-active':burgerActiva}">
             <div class="navbar-end">
-                <div v-if="this.$root.pedido != null" class="navbar-item field has-addons mt-2 mr-3">
+                <div v-if="pedidoDefinido" class="navbar-item field has-addons mt-2 mr-3">
                     <a class="button is-small has-text-dark-grey" @click.capture="buscar">
                 <span class="icon">
                   <i class="fas fa-search"></i>
@@ -35,7 +32,7 @@
                            @keyup.enter="buscar">
                 </div>
                 <chismosa-dropdown
-                    v-if="this.$root.pedido != null"
+                    v-if="pedidoDefinido"
                     class="hide-below-1024"
                     id="wide">
                 </chismosa-dropdown>
@@ -53,7 +50,7 @@
 
 <script>
 import ChismosaDropdown from '../pedidos/ChismosaDropdown.vue';
-import { mapActions } from "vuex";
+import { mapActions, mapGetters } from "vuex";
 
 export default {
     components: { ChismosaDropdown },
@@ -63,6 +60,9 @@ export default {
             searchString: "",
         }
     },
+    computed: {
+        ...mapGetters('pedido',["pedidoDefinido"]),
+    },
     methods: {
         ...mapActions('productos', ["filtrarProductos"]),
         toggleBurger() {
@@ -73,7 +73,6 @@ export default {
                 this.toggleBurger();
             this.filtrarProductos({ filtro: "nombre", valor: this.searchString });
             Event.$emit('migas-agregar', { nombre: this.searchString });
-
         }
     },
 };
-- 
2.48.1


From d64659d653c22d3420d51009643a1d82afc29f3b Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Wed, 21 May 2025 20:46:08 -0300
Subject: [PATCH 069/111] template simplificada

---
 resources/views/layouts/app.blade.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index a06c090..e8b6aa1 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -14,22 +14,17 @@
     <script src="https://kit.fontawesome.com/9235d1c676.js" crossorigin="anonymous"></script>
     <link rel="stylesheet" href="{{ mix('css/app.css') }}">
     @yield('stylesheets')
-
-
 </head>
 <body class="has-navbar-fixed-top">
     <div id="root">
         <comunes-nav-bar>
-            <template slot="subpedido">{{ session('subpedido_nombre') ? 'Pedido de '. session('subpedido_nombre') : Auth::user()->name }}</template>
-            <template slot="gdc">{{ session('subpedido_nombre') ? Auth::user()->name : "" }}</template>
-            <template slot="logout-form">
+            <template #logout-form>
                 <form id="logout-form" action="{{ route('logout') }}" method="POST" class="d-none">
                     @csrf
                 </form>
             </template>
         </comunes-nav-bar>
         <pedidos-nav-migas></pedidos-nav-migas>
-
         <main id="main" class="py-4 has-top-padding">
             <pedidos-cartel-pedido-aprobado></pedidos-cartel-pedido-aprobado>
             @yield('content')
-- 
2.48.1


From fff9b5b65f6ac1a13f61a1646203ca8cb960afb4 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Wed, 21 May 2025 20:48:06 -0300
Subject: [PATCH 070/111] Borradas cosas de admin ya no usadas

---
 resources/js/app.js | 26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/resources/js/app.js b/resources/js/app.js
index aadb9e8..dd45c1e 100644
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -19,16 +19,6 @@ window.bulmaToast = require('bulma-toast');
  */
 import './components';
 import store from "./store";
-import {mapState} from "vuex";
-
-/**
- * Constants
- */
-Vue.prototype.$rootMiga = {
-  nombre: "Categorías",
-  href: "/productos"
-}
-
 /**
  * Global methods
  */
@@ -82,12 +72,7 @@ const app = new Vue({
     },
     mounted() {
         Event.$on('obtener-sesion', () => {
-            if (window.location.pathname.startsWith('/admin')) {
-                axios.get('/admin/obtener_sesion')
-                    .then(response => {
-                        this.gdc = response.data.gdc
-                    });
-            } else {
+            if (!window.location.pathname.startsWith('/admin')) {
                 axios.get('/subpedidos/obtener_sesion')
                     .then(response => {
                         this.gdc = response.data.gdc;
@@ -132,15 +117,6 @@ const app = new Vue({
           Event.$emit("pedido-actualizado");
         });
       });
-
-      Event.$on('aprobacion-subpedido', (subpedidoId, aprobado) => {
-        axios.post("/api/admin/subpedidos/" + subpedidoId + "/aprobacion", {
-          aprobacion: aprobado
-        }).then((response) => {
-          Event.$emit('sync-aprobacion', response.data.data);
-          this.$toast('Pedido ' + (aprobado ? 'aprobado' : 'desaprobado') + ' exitosamente')
-        })
-      })
       Event.$emit('obtener-sesion')
     },
 });
-- 
2.48.1


From 1610acfbe751382791d246ae427118ad24396107 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Wed, 21 May 2025 21:30:10 -0300
Subject: [PATCH 071/111] formato

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

diff --git a/resources/js/components/pedidos/Body.vue b/resources/js/components/pedidos/Body.vue
index 119d3f3..f164105 100644
--- a/resources/js/components/pedidos/Body.vue
+++ b/resources/js/components/pedidos/Body.vue
@@ -20,7 +20,7 @@ export default {
         }
     },
     methods: {
-        ...mapActions('productos', ["init"]),
+        ...mapActions('productos',["init"]),
     },
     async mounted() {
         await this.init();
-- 
2.48.1


From e0bb8127f4cedcc025d47ac1dc5b008d5358c5b3 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Wed, 21 May 2025 21:30:38 -0300
Subject: [PATCH 072/111] Quitada ruta no usada

---
 routes/web.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/routes/web.php b/routes/web.php
index 57da910..d0e9514 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -64,12 +64,6 @@ Route::middleware(['auth', 'role:barrio'])->group( function() {
 
 Route::get('/admin/login', 'AdminController@show')->name('admin.login');
 
-Route::get('/admin/obtener_sesion', function() {
-    return [
-        'gdc' => session("admin_gdc")
-    ];
-})->name('admin_obtener_sesion');
-
 Route::middleware(['auth', 'role:admin_barrio'])->group( function () {
 	Route::get('/admin', 'AdminController@index')->name('admin.pedidos');
 
-- 
2.48.1


From 8a32841f9dbf23d7d5cc505f676a4d20ce8cf507 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Wed, 21 May 2025 21:30:59 -0300
Subject: [PATCH 073/111] Agregadas rutas nuevas con session controller

---
 app/Http/Controllers/SessionController.php | 26 ++++++++++++++++++++++
 routes/web.php                             |  4 ++++
 2 files changed, 30 insertions(+)
 create mode 100644 app/Http/Controllers/SessionController.php

diff --git a/app/Http/Controllers/SessionController.php b/app/Http/Controllers/SessionController.php
new file mode 100644
index 0000000..b2b33fe
--- /dev/null
+++ b/app/Http/Controllers/SessionController.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Subpedido;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Validation\Rule;
+
+class SessionController extends Controller
+{
+    public function store(Request $request) {
+        $grupo_de_compra_id = Auth::user()->grupo_de_compra_id;
+        $validated = $request->validate([
+            'id' => 'required',
+                    Rule::in(Subpedido::where('grupo_de_compra_id', $grupo_de_compra_id)->pluck('id')),
+        ]);
+        session()->put('pedido_id', $validated["id"]);
+        return response()->noContent();
+    }
+
+    public function fetch() {
+        return session('pedido_id');
+    }
+}
diff --git a/routes/web.php b/routes/web.php
index d0e9514..3947535 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -59,6 +59,10 @@ Route::middleware(['auth', 'role:barrio'])->group( function() {
                 'gdc' => session("gdc")
             ];
         })->name('obtenerSesion');
+
+        Route::post('sesion', 'SessionController@store');
+
+        Route::get('sesion', 'SessionController@fetch');
     });
 });
 
-- 
2.48.1


From 44bd8045b8dd6257ab7e0b4e969c9905eb3e6089 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Wed, 21 May 2025 21:31:46 -0300
Subject: [PATCH 074/111] Cambios en obtener sesion

---
 resources/js/app.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/resources/js/app.js b/resources/js/app.js
index dd45c1e..9b76829 100644
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -76,7 +76,7 @@ const app = new Vue({
                 axios.get('/subpedidos/obtener_sesion')
                     .then(response => {
                         this.gdc = response.data.gdc;
-                        this.settearDevoluciones();
+                        // this.settearDevoluciones();
                         this.pedido = response.data.subpedido.id;
                         axios.get('/api/subpedidos/' + this.pedido)
                             .then(response => {
@@ -117,7 +117,8 @@ const app = new Vue({
           Event.$emit("pedido-actualizado");
         });
       });
-      Event.$emit('obtener-sesion')
+        if (window.location.pathname.startsWith('/productos'))
+            Event.$emit('obtener-sesion')
     },
 });
 
-- 
2.48.1


From 5a0cf73218a0718af1f4fe1e8cdb681949f09e58 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Wed, 21 May 2025 21:49:04 -0300
Subject: [PATCH 075/111] Crear pedido movido a vuex

---
 resources/js/components/pedidos/SubpedidoSelect.vue | 5 ++---
 resources/js/store/modules/pedido.js                | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/resources/js/components/pedidos/SubpedidoSelect.vue b/resources/js/components/pedidos/SubpedidoSelect.vue
index eda680c..a7230e0 100644
--- a/resources/js/components/pedidos/SubpedidoSelect.vue
+++ b/resources/js/components/pedidos/SubpedidoSelect.vue
@@ -55,7 +55,7 @@ export default {
     },
     methods: {
         ...mapActions('barrio',["getGrupoDeCompra","getPedidos"]),
-        ...mapActions('pedido',["crearPedido","getPedido"]),
+        ...mapActions('pedido',["crearPedido"]),
         ...mapMutations('barrio',["setPedidos"]),
         onType() {
             if (!this.searchString) {
@@ -66,12 +66,11 @@ export default {
             this.getPedidos(this.searchString);
         },
         async submit() {
-            await this.crearPedido(this.searchString, this.grupo_de_compra_id);
+            await this.crearPedido({ nombre: this.searchString, grupo_de_compra_id: this.grupo_de_compra_id });
             this.guardarSubpedidoEnSesion({ id: this.pedido_id, nombre: this.nombre });
         },
         elegirSubpedido(subpedido) {
             //lo guardamos en sesion
-            this.getPedido(subpedido.id);
             this.guardarSubpedidoEnSesion(subpedido);
         },
         guardarSubpedidoEnSesion(subpedido) {
diff --git a/resources/js/store/modules/pedido.js b/resources/js/store/modules/pedido.js
index 0f9dd7e..5a878e6 100644
--- a/resources/js/store/modules/pedido.js
+++ b/resources/js/store/modules/pedido.js
@@ -29,7 +29,7 @@ const mutations = {
 };
 
 const actions = {
-    async crearPedido({ commit }, nombre, grupo_de_compra_id) {
+    async crearPedido({ commit }, { nombre, grupo_de_compra_id }) {
         const response = await axios.post("/api/subpedidos", {
             nombre: nombre,
             grupo_de_compra_id: grupo_de_compra_id
-- 
2.48.1


From 8fbfa751440ea6a0fbb7400a62f71a8f16b5489d Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Wed, 21 May 2025 22:33:02 -0300
Subject: [PATCH 076/111] =?UTF-8?q?Esperando=20a=20que=20pedido=20est?=
 =?UTF-8?q?=C3=A9=20definido?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/resources/js/components/pedidos/Body.vue b/resources/js/components/pedidos/Body.vue
index f164105..06ac1e8 100644
--- a/resources/js/components/pedidos/Body.vue
+++ b/resources/js/components/pedidos/Body.vue
@@ -21,9 +21,11 @@ export default {
     },
     methods: {
         ...mapActions('productos',["init"]),
+        ...mapActions('pedido',["getPedido"]),
     },
     async mounted() {
         await this.init();
+        await this.getPedido();
         Event.$on('toggle-chismosa', (activa) => {
             this.chismosaActiva = activa;
         });
-- 
2.48.1


From cdf5663b16cfcc75e071c22cdadce322f402d041 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Wed, 21 May 2025 22:40:23 -0300
Subject: [PATCH 077/111] =?UTF-8?q?Redirecci=C3=B3n=20movida=20a=20vuex?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/js/components/pedidos/SubpedidoSelect.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/js/components/pedidos/SubpedidoSelect.vue b/resources/js/components/pedidos/SubpedidoSelect.vue
index a7230e0..17ac61e 100644
--- a/resources/js/components/pedidos/SubpedidoSelect.vue
+++ b/resources/js/components/pedidos/SubpedidoSelect.vue
@@ -55,14 +55,13 @@ export default {
     },
     methods: {
         ...mapActions('barrio',["getGrupoDeCompra","getPedidos"]),
-        ...mapActions('pedido',["crearPedido"]),
+        ...mapActions('pedido',["crearPedido","elegirPedido"]),
         ...mapMutations('barrio',["setPedidos"]),
         onType() {
             if (!this.searchString) {
                 this.setPedidos([]);
                 return;
             }
-
             this.getPedidos(this.searchString);
         },
         async submit() {
@@ -74,13 +73,14 @@ export default {
             this.guardarSubpedidoEnSesion(subpedido);
         },
         guardarSubpedidoEnSesion(subpedido) {
+            console.log(`select: ${JSON.stringify(subpedido)}`);
             axios.post("/subpedidos/guardar_sesion", {
                 subpedido: subpedido,
                 grupo_de_compra_id: this.grupo_de_compra_id
             }).then(_ => {
                 Event.$emit('obtener-sesion')
-                window.location.href = 'productos';
             });
+            this.elegirPedido({ pedido: subpedido });
         }
     }
 }
-- 
2.48.1


From 36af26a647737dacedd399d2a96bb71dfbe6f846 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Wed, 21 May 2025 22:40:53 -0300
Subject: [PATCH 078/111] Agregada logica de sesion

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

diff --git a/resources/js/store/modules/pedido.js b/resources/js/store/modules/pedido.js
index 5a878e6..5258142 100644
--- a/resources/js/store/modules/pedido.js
+++ b/resources/js/store/modules/pedido.js
@@ -34,12 +34,19 @@ const actions = {
             nombre: nombre,
             grupo_de_compra_id: grupo_de_compra_id
         });
-        commit('setState', response.data);
+        const pedido = response.data;
+        await axios.post("/subpedidos/sesion", { id: pedido.id, });
+        commit('setState', pedido);
     },
-    async getPedido({ commit }, pedido_id) {
-        const response = await axios.get(`/api/subpedidos/${pedido_id}`);
+    async getPedido({ commit }) {
+        const sesion = await axios.get("/subpedidos/sesion");
+        const response = await axios.get(`/api/subpedidos/${sesion.data}`);
         commit('setState', response.data.data);
     },
+    async elegirPedido({ commit }, { pedido }) {
+        await axios.post("/subpedidos/sesion", { id: pedido.id, });
+        window.location.href = 'productos';
+    },
     async modificarChismosa({ commit }, producto_id, cantidad, notas) {},
     async modificarDevoluciones({ commit }, monto, notas) {}
 };
-- 
2.48.1


From b8390c4ac6327065801138a8e940bc32687823b1 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Wed, 21 May 2025 23:41:23 -0300
Subject: [PATCH 079/111] Usando pedido de vuex

---
 resources/js/components/comunes/NavBar.vue           | 8 ++++++--
 resources/js/components/pedidos/Body.vue             | 2 ++
 resources/js/components/pedidos/ChismosaDropdown.vue | 8 ++++----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/resources/js/components/comunes/NavBar.vue b/resources/js/components/comunes/NavBar.vue
index d8fba83..a8e54d2 100644
--- a/resources/js/components/comunes/NavBar.vue
+++ b/resources/js/components/comunes/NavBar.vue
@@ -5,8 +5,10 @@
                 <img src="/assets/logoMPS.png" height="28">
             </a>
             <p class="navbar-item hide-below-1024">
+                {{ `Núcleo: ${nombre}` }}
             </p>
             <p class="navbar-item">
+                {{ `Barrio: ${grupo_de_compra}` }}
             </p>
             <chismosa-dropdown
                 v-if="pedidoDefinido"
@@ -50,7 +52,7 @@
 
 <script>
 import ChismosaDropdown from '../pedidos/ChismosaDropdown.vue';
-import { mapActions, mapGetters } from "vuex";
+import { mapActions, mapGetters, mapState } from "vuex";
 
 export default {
     components: { ChismosaDropdown },
@@ -61,7 +63,9 @@ export default {
         }
     },
     computed: {
-        ...mapGetters('pedido',["pedidoDefinido"]),
+        ...mapGetters('pedido', ["pedidoDefinido"]),
+        ...mapState('pedido',["nombre"]),
+        ...mapState('barrio',["grupo_de_compra"]),
     },
     methods: {
         ...mapActions('productos', ["filtrarProductos"]),
diff --git a/resources/js/components/pedidos/Body.vue b/resources/js/components/pedidos/Body.vue
index 06ac1e8..4a73c7d 100644
--- a/resources/js/components/pedidos/Body.vue
+++ b/resources/js/components/pedidos/Body.vue
@@ -22,9 +22,11 @@ export default {
     methods: {
         ...mapActions('productos',["init"]),
         ...mapActions('pedido',["getPedido"]),
+        ...mapActions('barrio',["getGrupoDeCompra"]),
     },
     async mounted() {
         await this.init();
+        await this.getGrupoDeCompra();
         await this.getPedido();
         Event.$on('toggle-chismosa', (activa) => {
             this.chismosaActiva = activa;
diff --git a/resources/js/components/pedidos/ChismosaDropdown.vue b/resources/js/components/pedidos/ChismosaDropdown.vue
index a6fe5de..19b0207 100644
--- a/resources/js/components/pedidos/ChismosaDropdown.vue
+++ b/resources/js/components/pedidos/ChismosaDropdown.vue
@@ -13,6 +13,7 @@
 
 <script>
 import Chismosa from './Chismosa.vue'
+import { mapState } from "vuex";
 export default {
     components: {
         Chismosa
@@ -26,9 +27,11 @@ export default {
     data() {
         return {
             activa: false,
-            total: 0,
         }
     },
+    computed: {
+        ...mapState('pedido',["total"]),
+    },
     mounted() {
         Event.$on('pedido-actualizado', this.actualizar);
     },
@@ -37,9 +40,6 @@ export default {
             this.activa = !this.activa;
             Event.$emit("toggle-chismosa", this.activa);
         },
-        actualizar() {
-            this.total = this.$root.pedido.total;
-        },
     },
 }
 </script>
-- 
2.48.1


From b46b56159b52efe8c2d27d7ef2da123429714098 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Thu, 22 May 2025 00:01:36 -0300
Subject: [PATCH 080/111] formato

---
 resources/js/components/pedidos/Chismosa.vue | 99 ++++++++++----------
 1 file changed, 50 insertions(+), 49 deletions(-)

diff --git a/resources/js/components/pedidos/Chismosa.vue b/resources/js/components/pedidos/Chismosa.vue
index c7c8e93..7b4e277 100644
--- a/resources/js/components/pedidos/Chismosa.vue
+++ b/resources/js/components/pedidos/Chismosa.vue
@@ -45,61 +45,62 @@
 </template>
 
 <script>
-    import ProductoRow from "./ProductoRow.vue";
+import ProductoRow from "./ProductoRow.vue";
 
-    export default {
-        components: {ProductoRow},
-        data() {
-            return {
-                mostrar_tabla: false,
-                cantidad_bonos_transporte: 0,
-                total_bonos_transporte: 0,
-                devoluciones: 0,
-                notas_devoluciones: "",
-                notas_devoluciones_abbr: "",
-                total: 0,
-                productos: [],
+export default {
+    components: { ProductoRow },
+    data() {
+        return {
+            mostrar_tabla: false,
+            cantidad_bonos_transporte: 0,
+            total_bonos_transporte: 0,
+            devoluciones: 0,
+            notas_devoluciones: "",
+            notas_devoluciones_abbr: "",
+            total: 0,
+            productos: [],
+        }
+    },
+    mounted() {
+        Event.$on('pedido-actualizado', this.pedidoActualizado);
+        Event.$on('toggle-chismosa', this.pedidoActualizado);
+    },
+    methods: {
+        pedidoActualizado: function () {
+            this.mostrar_tabla = this.$root.productos.length > 0;
+            this.cantidad_bonos_transporte = this.cantidadBonosDeTransporte();
+            this.total_bonos_transporte = this.totalBonosDeTransporte();
+            this.devoluciones = this.$root.pedido.devoluciones_total;
+            this.notas_devoluciones = this.$root.pedido.devoluciones_notas;
+            this.notas_devoluciones_abbr = this.notas_devoluciones.substring(0, 15);
+            if (this.notas_devoluciones.length > 15) {
+                this.notas_devoluciones_abbr += "...";
             }
+            this.total = this.$root.pedido.total;
+            this.productos = this.$root.productos;
         },
-        mounted() {
-            Event.$on('pedido-actualizado', this.pedidoActualizado);
-            Event.$on('toggle-chismosa', this.pedidoActualizado);
+        modificarDevoluciones: function () {
+            Event.$emit("modificar-devoluciones");
         },
-        methods: {
-            pedidoActualizado: function() {
-                this.mostrar_tabla = this.$root.productos.length > 0;
-                this.cantidad_bonos_transporte = this.cantidadBonosDeTransporte();
-                this.total_bonos_transporte = this.totalBonosDeTransporte();
-                this.devoluciones = this.$root.pedido.devoluciones_total;
-                this.notas_devoluciones = this.$root.pedido.devoluciones_notas;
-                this.notas_devoluciones_abbr = this.notas_devoluciones.substring(0, 15);
-                if (this.notas_devoluciones.length > 15) {
-                    this.notas_devoluciones_abbr += "...";
-                }
-                this.total = this.$root.pedido.total;
-                this.productos = this.$root.productos;
-            },
-            modificarDevoluciones: function() {
-                Event.$emit("modificar-devoluciones");
-            },
-            cantidadBonosDeTransporte: function() {
-                return this.$root.pedido.cantidad_transporte;
-            },
-            totalBonosDeTransporte: function() {
-                return this.$root.pedido.total_transporte
-            },
+        cantidadBonosDeTransporte: function () {
+            return this.$root.pedido.cantidad_transporte;
         },
-    }
+        totalBonosDeTransporte: function () {
+            return this.$root.pedido.total_transporte
+        },
+    },
+}
 </script>
 
 <style>
-    .tabla-chismosa {
-        width: 100%;
-    }
-    .fixed-right {
-        position: fixed;
-        overflow-y: auto;
-        max-height: 81vh;
-        margin-right: 20px;
-    }
+.tabla-chismosa {
+    width: 100%;
+}
+
+.fixed-right {
+    position: fixed;
+    overflow-y: auto;
+    max-height: 81vh;
+    margin-right: 20px;
+}
 </style>
-- 
2.48.1


From 1709468f1f3347721e025027aa827bac2601bf54 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Thu, 22 May 2025 00:05:07 -0300
Subject: [PATCH 081/111] total, productos, y devoluciones_habilitadas tomadas
 de vuex

---
 resources/js/components/pedidos/Chismosa.vue | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/resources/js/components/pedidos/Chismosa.vue b/resources/js/components/pedidos/Chismosa.vue
index 7b4e277..800020c 100644
--- a/resources/js/components/pedidos/Chismosa.vue
+++ b/resources/js/components/pedidos/Chismosa.vue
@@ -15,7 +15,7 @@
                     <th class="has-text-right">{{ cantidad_bonos_transporte }}</th>
                     <th class="has-text-right">{{ total_bonos_transporte }}</th>
                 </tr>
-                <tr v-if="this.$root.devoluciones">
+                <tr v-if="devoluciones_habilitadas">
                     <th><p>Devoluciones</p></th>
                     <td>
                         <abbr :title="notas_devoluciones">{{ notas_devoluciones_abbr }}</abbr>
@@ -46,9 +46,21 @@
 
 <script>
 import ProductoRow from "./ProductoRow.vue";
+import { mapState } from "vuex";
 
 export default {
     components: { ProductoRow },
+    computed: {
+        ...mapState('barrio',["devoluciones_habilitadas"]),
+        ...mapState('pedido',[
+            "productos",
+            "total",
+            "total_transporte",
+            "cantidad_transporte",
+            "devoluciones_total",
+            "devoluciones_notas",
+        ]),
+    },
     data() {
         return {
             mostrar_tabla: false,
@@ -57,8 +69,6 @@ export default {
             devoluciones: 0,
             notas_devoluciones: "",
             notas_devoluciones_abbr: "",
-            total: 0,
-            productos: [],
         }
     },
     mounted() {
@@ -76,8 +86,6 @@ export default {
             if (this.notas_devoluciones.length > 15) {
                 this.notas_devoluciones_abbr += "...";
             }
-            this.total = this.$root.pedido.total;
-            this.productos = this.$root.productos;
         },
         modificarDevoluciones: function () {
             Event.$emit("modificar-devoluciones");
-- 
2.48.1


From baeff66aaf12719e977283102cc3318945d55105 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Thu, 22 May 2025 00:12:34 -0300
Subject: [PATCH 082/111] usando vuex para el resto de los datos

---
 resources/js/components/pedidos/Chismosa.vue | 35 ++++++--------------
 1 file changed, 10 insertions(+), 25 deletions(-)

diff --git a/resources/js/components/pedidos/Chismosa.vue b/resources/js/components/pedidos/Chismosa.vue
index 800020c..b6bb492 100644
--- a/resources/js/components/pedidos/Chismosa.vue
+++ b/resources/js/components/pedidos/Chismosa.vue
@@ -12,20 +12,20 @@
                 <tfoot>
                 <tr>
                     <th><abbr title="Bonos de Transporte">B. Transporte</abbr></th>
-                    <th class="has-text-right">{{ cantidad_bonos_transporte }}</th>
-                    <th class="has-text-right">{{ total_bonos_transporte }}</th>
+                    <th class="has-text-right">{{ cantidad_transporte }}</th>
+                    <th class="has-text-right">{{ total_transporte }}</th>
                 </tr>
                 <tr v-if="devoluciones_habilitadas">
                     <th><p>Devoluciones</p></th>
                     <td>
-                        <abbr :title="notas_devoluciones">{{ notas_devoluciones_abbr }}</abbr>
+                        <abbr :title="devoluciones_notas">{{ notas_abreviadas }}</abbr>
                         <button @click.capture="modificarDevoluciones()" class="button is-warning is-small">
                             <span class="icon">
                                 <i class="fas fa-edit"></i>
                             </span>
                         </button>
                     </td>
-                    <th class="has-text-right">-{{ devoluciones }}</th>
+                    <th class="has-text-right">-{{ devoluciones_total }}</th>
                 </tr>
                 <tr>
                     <th>Total total</th>
@@ -60,33 +60,18 @@ export default {
             "devoluciones_total",
             "devoluciones_notas",
         ]),
-    },
-    data() {
-        return {
-            mostrar_tabla: false,
-            cantidad_bonos_transporte: 0,
-            total_bonos_transporte: 0,
-            devoluciones: 0,
-            notas_devoluciones: "",
-            notas_devoluciones_abbr: "",
-        }
+        notas_abreviadas() {
+            return this.devoluciones_notas.substring(0, 15) + (this.devoluciones_notas.length > 15 ? "..." : "");
+        },
+        mostrar_tabla() {
+            return this.productos?.length !== 0;
+        },
     },
     mounted() {
         Event.$on('pedido-actualizado', this.pedidoActualizado);
         Event.$on('toggle-chismosa', this.pedidoActualizado);
     },
     methods: {
-        pedidoActualizado: function () {
-            this.mostrar_tabla = this.$root.productos.length > 0;
-            this.cantidad_bonos_transporte = this.cantidadBonosDeTransporte();
-            this.total_bonos_transporte = this.totalBonosDeTransporte();
-            this.devoluciones = this.$root.pedido.devoluciones_total;
-            this.notas_devoluciones = this.$root.pedido.devoluciones_notas;
-            this.notas_devoluciones_abbr = this.notas_devoluciones.substring(0, 15);
-            if (this.notas_devoluciones.length > 15) {
-                this.notas_devoluciones_abbr += "...";
-            }
-        },
         modificarDevoluciones: function () {
             Event.$emit("modificar-devoluciones");
         },
-- 
2.48.1


From 8d1eb03ffc1e9097806b8ceb8e821a4c53e91914 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Thu, 22 May 2025 00:26:08 -0300
Subject: [PATCH 083/111] Cambio formato y mostrando solo para pedidos

---
 resources/js/components/comunes/NavBar.vue | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/resources/js/components/comunes/NavBar.vue b/resources/js/components/comunes/NavBar.vue
index a8e54d2..4377df5 100644
--- a/resources/js/components/comunes/NavBar.vue
+++ b/resources/js/components/comunes/NavBar.vue
@@ -4,12 +4,11 @@
             <a class="navbar-item" href="https://mps.org.uy">
                 <img src="/assets/logoMPS.png" height="28">
             </a>
-            <p class="navbar-item hide-below-1024">
-                {{ `Núcleo: ${nombre}` }}
-            </p>
-            <p class="navbar-item">
-                {{ `Barrio: ${grupo_de_compra}` }}
-            </p>
+            <div class="navbar-item" id="datos-pedido" v-if="pedidoDefinido">
+                <p class="hide-below-1024">
+                    {{ `Núcleo: ${nombre} - Barrio: ${grupo_de_compra}` }}
+                </p>
+            </div>
             <chismosa-dropdown
                 v-if="pedidoDefinido"
                 class="hide-above-1023"
-- 
2.48.1


From 181fbf924f653dac23fea0cebba6d952c11805ac Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Thu, 22 May 2025 20:25:00 -0300
Subject: [PATCH 084/111] Agregado nombre

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

diff --git a/resources/js/components/pedidos/SubpedidoSelect.vue b/resources/js/components/pedidos/SubpedidoSelect.vue
index 17ac61e..d566510 100644
--- a/resources/js/components/pedidos/SubpedidoSelect.vue
+++ b/resources/js/components/pedidos/SubpedidoSelect.vue
@@ -37,6 +37,7 @@
 import { mapActions, mapMutations, mapState } from "vuex";
 
 export default {
+    name: 'SubpedidoSelect',
     async mounted() {
         await this.getGrupoDeCompra();
     },
-- 
2.48.1


From 128dd05b9a5aff90a9017c38f2f14ea558d8d437 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Thu, 22 May 2025 21:04:17 -0300
Subject: [PATCH 085/111] Agregado metodo, ruta, logica de vuex para obtener
 rol del usuario logeado

---
 app/Http/Controllers/UserController.php |  6 +++++-
 resources/js/store/modules/login.js     | 14 +++++++++++---
 routes/web.php                          |  1 +
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 9565bae..d85e473 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -11,12 +11,16 @@ use Illuminate\Support\Facades\Auth;
 
 class UserController extends Controller
 {
+    public function rol(Request $request) {
+        return ["rol" => UserRole::find($request->user()->role_id)->nombre];
+    }
+
     public function grupoDeCompra(Request $request)
     {
         $user = Auth::user();
         $result = [ 'grupo_de_compra' => null, ];
         $grupo_de_compra = GrupoDeCompra::find($user->grupo_de_compra_id);
-        switch (UserRole::find($user->role_id)->nombre ?? 'error') {
+        switch (UserRole::findOrFail($user->role_id)->nombre) {
             case 'barrio':
                 $result['grupo_de_compra'] = new GrupoDeCompraReducido($grupo_de_compra);
                 break;
diff --git a/resources/js/store/modules/login.js b/resources/js/store/modules/login.js
index 6542ab8..bd9b224 100644
--- a/resources/js/store/modules/login.js
+++ b/resources/js/store/modules/login.js
@@ -5,6 +5,7 @@ const state = {
     grupos_de_compra: null,
     region_elegida: null,
     grupo_de_compra_elegido: null,
+    rol: null,
 };
 
 const mutations = {
@@ -18,6 +19,9 @@ const mutations = {
     selectGrupoDeCompra(state, { grupo_de_compra }) {
         state.grupo_de_compra_elegido = grupo_de_compra;
     },
+    setRol(state, { rol }) {
+        state.rol = rol;
+    },
 };
 
 const actions = {
@@ -28,17 +32,21 @@ const actions = {
     async selectRegion({ commit }, { region }) {
         const response = await axios.get("/api/grupos-de-compra");
         commit('setRegionYBarrios', { region: region, grupos_de_compra: response.data[region] });
+    },
+    async getRol({ commit }) {
+        const response = await axios.get("/user/rol");
+        commit('setRol', { rol: response.data.rol });
     }
 };
 
 const getters = {
-    admin() {
+    adminUrl() {
         return window.location.pathname.startsWith('/admin');
     },
     mensajes() {
         return {
-            mensaje: `Contraseña de ${getters.admin() ? 'administración ' : ''}del barrio`,
-            ayuda: `Si no la sabés, consultá a ${getters.admin() ? 'la comisión informática ' : 'tus compañerxs'}.`
+            mensaje: `Contraseña de ${getters.adminUrl() ? 'administración ' : ''}del barrio`,
+            ayuda: `Si no la sabés, consultá a ${getters.adminUrl() ? 'la comisión informática ' : 'tus compañerxs'}.`
         };
     },
 };
diff --git a/routes/web.php b/routes/web.php
index 3947535..3211ea5 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -25,6 +25,7 @@ Auth::routes(['register' => false]);
 Route::get('/', 'RouteController@home')->name('home');
 
 Route::middleware(['auth'])->group(function () {
+    Route::get('/user/rol', 'UserController@rol')->name('user.rol');
     Route::get('/user/grupo_de_compra', 'UserController@grupoDeCompra');
 });
 
-- 
2.48.1


From 1a8f9eda1876fb82c12983fe02dbf92d1c0144a8 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Thu, 22 May 2025 21:06:14 -0300
Subject: [PATCH 086/111] Cambio en nombre de getter

---
 resources/js/components/comunes/BarrioSelect.vue | 4 ++--
 resources/js/components/comunes/Login.vue        | 6 +++---
 resources/js/components/comunes/LoginForm.vue    | 4 ++--
 resources/js/components/comunes/RegionSelect.vue | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/resources/js/components/comunes/BarrioSelect.vue b/resources/js/components/comunes/BarrioSelect.vue
index 215e449..7d3ae10 100644
--- a/resources/js/components/comunes/BarrioSelect.vue
+++ b/resources/js/components/comunes/BarrioSelect.vue
@@ -1,7 +1,7 @@
 <template>
 	<div v-if="region_elegida !== null" class="block">
 		<div class="field">
-			<label class="label" :class="admin ? 'has-text-white' : ''">
+			<label class="label" :class="adminUrl ? 'has-text-white' : ''">
                 Seleccioná tu barrio o grupo de compra
             </label>
 			<div class="control">
@@ -35,7 +35,7 @@ export default {
     },
     computed: {
         ...mapState('login',["region_elegida","grupos_de_compra","grupo_de_compra_elegido"]),
-        ...mapGetters('login',["admin"]),
+        ...mapGetters('login',["adminUrl"]),
     },
     data() {
         return {
diff --git a/resources/js/components/comunes/Login.vue b/resources/js/components/comunes/Login.vue
index 9da6903..5071ddb 100644
--- a/resources/js/components/comunes/Login.vue
+++ b/resources/js/components/comunes/Login.vue
@@ -2,7 +2,7 @@
     <div v-if="grupo_de_compra_elegido !== null" class="block">
         <div class="field">
             <label class="label"
-                   :class="admin ? 'has-text-white' : ''">{{ mensajes.mensaje }}</label>
+                   :class="adminUrl ? 'has-text-white' : ''">{{ mensajes.mensaje }}</label>
             <div class="field has-addons">
                 <div class="control">
                     <input required class="input" :type="this.passwordType" name="password"  :placeholder="mensajes.mensaje">
@@ -14,7 +14,7 @@
                 </div>
             </div>
             <p class="help"
-               :class="admin ? 'has-text-white' : ''">{{ mensajes.ayuda }}</p>
+               :class="adminUrl ? 'has-text-white' : ''">{{ mensajes.ayuda }}</p>
         </div>
         <div class="field">
             <div class="control">
@@ -37,7 +37,7 @@ export default {
     },
     computed: {
         ...mapState('login',["grupo_de_compra_elegido"]),
-        ...mapGetters('login',["admin","mensajes"]),
+        ...mapGetters('login',["adminUrl","mensajes"]),
     },
     methods: {
         togglePassword() {
diff --git a/resources/js/components/comunes/LoginForm.vue b/resources/js/components/comunes/LoginForm.vue
index 68bb05b..2773371 100644
--- a/resources/js/components/comunes/LoginForm.vue
+++ b/resources/js/components/comunes/LoginForm.vue
@@ -20,10 +20,10 @@ export default {
         await this.getRegiones();
     },
     computed: {
-        ...mapGetters('login',["admin"]),
+        ...mapGetters('login',["adminUrl"]),
         ...mapState('login',["grupo_de_compra_elegido"]),
         nombre() {
-            return `${this.grupo_de_compra_elegido}${this.admin ? '_admin' : ''}`;
+            return `${this.grupo_de_compra_elegido}${this.adminUrl ? '_admin' : ''}`;
         }
     },
     methods: {
diff --git a/resources/js/components/comunes/RegionSelect.vue b/resources/js/components/comunes/RegionSelect.vue
index ca543bd..a6100b7 100644
--- a/resources/js/components/comunes/RegionSelect.vue
+++ b/resources/js/components/comunes/RegionSelect.vue
@@ -1,7 +1,7 @@
 <template>
 	<div class="block">
 		<div class="field">
-		    <label class="label" :class="admin ? 'has-text-white' : ''">
+		    <label class="label" :class="adminUrl ? 'has-text-white' : ''">
                 Seleccioná tu región
             </label>
 	        <div class="control">
@@ -38,7 +38,7 @@ export default {
     },
     computed: {
         ...mapState('login',["regiones","region_elegida"]),
-        ...mapGetters('login',["admin"]),
+        ...mapGetters('login',["adminUrl"]),
     }
 }
 </script>
-- 
2.48.1


From 154e21fae6623e8a619029dc6cc47b705457a43b Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Thu, 22 May 2025 21:06:55 -0300
Subject: [PATCH 087/111] =?UTF-8?q?Agregados=20componentes=20para=20ordena?=
 =?UTF-8?q?r=20el=20flujo=20de=20la=20aplicaci=C3=B3n=20+=20usandolo=20en?=
 =?UTF-8?q?=20la=20view=20+=20cambios=20en=20la=20store=20pedido=20por=20e?=
 =?UTF-8?q?vitar=20redireccion?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/js/components/AppMain.vue           | 30 +++++++++++++++
 resources/js/components/pedidos/Body.vue      | 35 +++++------------
 .../pedidos/PedidoSelectSection.vue           | 26 +++++++++++++
 resources/js/components/pedidos/Productos.vue | 38 +++++++++++++++++++
 .../js/components/pedidos/SubpedidoSelect.vue |  3 +-
 resources/js/store/modules/pedido.js          |  4 +-
 resources/views/subpedidos_create.blade.php   | 12 +-----
 7 files changed, 108 insertions(+), 40 deletions(-)
 create mode 100644 resources/js/components/AppMain.vue
 create mode 100644 resources/js/components/pedidos/PedidoSelectSection.vue
 create mode 100644 resources/js/components/pedidos/Productos.vue

diff --git a/resources/js/components/AppMain.vue b/resources/js/components/AppMain.vue
new file mode 100644
index 0000000..b6c57ab
--- /dev/null
+++ b/resources/js/components/AppMain.vue
@@ -0,0 +1,30 @@
+<script>
+import NavBar from "./comunes/NavBar.vue";
+import { mapActions, mapState } from "vuex";
+export default {
+    name: 'Main',
+    components: { NavBar },
+    computed: {
+        ...mapState('login',["rol"]),
+    },
+    methods: {
+        ...mapActions('login',["getRol"]),
+    },
+    async mounted() {
+        await this.getRol();
+    },
+}
+</script>
+
+<template>
+    <div id="main">
+        <nav-bar></nav-bar>
+        <pedidos-body v-if="rol === 'barrio'"></pedidos-body>
+        <admin-body v-if="rol === 'admin_barrio'"></admin-body>
+        <compras-body v-if="rol === 'comision'"></compras-body>
+    </div>
+</template>
+
+<style scoped>
+
+</style>
diff --git a/resources/js/components/pedidos/Body.vue b/resources/js/components/pedidos/Body.vue
index 4a73c7d..e056948 100644
--- a/resources/js/components/pedidos/Body.vue
+++ b/resources/js/components/pedidos/Body.vue
@@ -1,36 +1,19 @@
 <template>
-    <div class="columns ml-3 mr-3">
-        <categorias-container :class="chismosaActiva ? 'hide-below-1024' : ''"></categorias-container>
-        <productos-container :class="chismosaActiva ? 'hide-below-1024' : ''"></productos-container>
-        <chismosa v-show="chismosaActiva"></chismosa>
+    <div id="pedidos-body">
+        <pedido-select-section v-if="!pedidoDefinido"></pedido-select-section>
+        <productos v-else></productos>
     </div>
 </template>
 
 <script>
-import { mapActions } from "vuex";
-import Chismosa from "./Chismosa.vue";
-import ProductosContainer from "./ProductosContainer.vue";
-import CategoriasContainer from "./CategoriasContainer.vue";
+import { mapGetters } from "vuex";
+import PedidoSelectSection from "./PedidoSelectSection.vue";
+import Productos from "./Productos.vue";
 
 export default {
-    components: { CategoriasContainer, ProductosContainer, Chismosa },
-    data() {
-        return {
-            chismosaActiva: false,
-        }
-    },
-    methods: {
-        ...mapActions('productos',["init"]),
-        ...mapActions('pedido',["getPedido"]),
-        ...mapActions('barrio',["getGrupoDeCompra"]),
-    },
-    async mounted() {
-        await this.init();
-        await this.getGrupoDeCompra();
-        await this.getPedido();
-        Event.$on('toggle-chismosa', (activa) => {
-            this.chismosaActiva = activa;
-        });
+    components: { Productos, PedidoSelectSection },
+    computed: {
+        ...mapGetters('pedido',["pedidoDefinido"]),
     },
 }
 </script>
diff --git a/resources/js/components/pedidos/PedidoSelectSection.vue b/resources/js/components/pedidos/PedidoSelectSection.vue
new file mode 100644
index 0000000..513e2aa
--- /dev/null
+++ b/resources/js/components/pedidos/PedidoSelectSection.vue
@@ -0,0 +1,26 @@
+<script>
+import { defineComponent } from "vue";
+import SubpedidoSelect from "./SubpedidoSelect.vue";
+import { mapGetters } from "vuex";
+
+export default defineComponent({
+    components: { SubpedidoSelect },
+})
+</script>
+
+<template>
+    <section class="section">
+        <div id="root" class="container">
+            <h1 class="title">
+                Pedidos MPS
+            </h1>
+            <p class="subtitle">
+                Bienvenidx a la aplicación de pedidos del <strong>Mercado Popular de Subsistencia</strong>
+            </p>
+            <subpedido-select></subpedido-select>
+        </div>
+    </section>
+</template>
+
+<style scoped>
+</style>
diff --git a/resources/js/components/pedidos/Productos.vue b/resources/js/components/pedidos/Productos.vue
new file mode 100644
index 0000000..06e6db3
--- /dev/null
+++ b/resources/js/components/pedidos/Productos.vue
@@ -0,0 +1,38 @@
+<script >
+import CategoriasContainer from "./CategoriasContainer.vue";
+import ProductosContainer from "./ProductosContainer.vue";
+import Chismosa from "./Chismosa.vue";
+import { defineComponent } from "vue";
+import SubpedidoSelect from "./SubpedidoSelect.vue";
+import { mapActions } from "vuex";
+
+export default defineComponent({
+    components: { SubpedidoSelect, CategoriasContainer, ProductosContainer, Chismosa },
+    data() {
+        return {
+            chismosaActiva: false,
+        }
+    },
+    methods: {
+        ...mapActions('productos',["init"]),
+    },
+    async mounted() {
+        await this.init();
+        Event.$on('toggle-chismosa', (activa) => {
+            this.chismosaActiva = activa;
+        });
+    },
+})
+</script>
+
+<template>
+    <div class="columns ml-3 mr-3" v-else>
+        <categorias-container :class="chismosaActiva ? 'hide-below-1024' : ''"></categorias-container>
+        <productos-container :class="chismosaActiva ? 'hide-below-1024' : ''"></productos-container>
+        <chismosa v-show="chismosaActiva"></chismosa>
+    </div>
+</template>
+
+<style scoped>
+
+</style>
diff --git a/resources/js/components/pedidos/SubpedidoSelect.vue b/resources/js/components/pedidos/SubpedidoSelect.vue
index d566510..a69d101 100644
--- a/resources/js/components/pedidos/SubpedidoSelect.vue
+++ b/resources/js/components/pedidos/SubpedidoSelect.vue
@@ -74,14 +74,13 @@ export default {
             this.guardarSubpedidoEnSesion(subpedido);
         },
         guardarSubpedidoEnSesion(subpedido) {
-            console.log(`select: ${JSON.stringify(subpedido)}`);
+            this.elegirPedido({ pedido: subpedido });
             axios.post("/subpedidos/guardar_sesion", {
                 subpedido: subpedido,
                 grupo_de_compra_id: this.grupo_de_compra_id
             }).then(_ => {
                 Event.$emit('obtener-sesion')
             });
-            this.elegirPedido({ pedido: subpedido });
         }
     }
 }
diff --git a/resources/js/store/modules/pedido.js b/resources/js/store/modules/pedido.js
index 5258142..aed3e87 100644
--- a/resources/js/store/modules/pedido.js
+++ b/resources/js/store/modules/pedido.js
@@ -45,7 +45,9 @@ const actions = {
     },
     async elegirPedido({ commit }, { pedido }) {
         await axios.post("/subpedidos/sesion", { id: pedido.id, });
-        window.location.href = 'productos';
+        const response = await axios.get(`/api/subpedidos/${pedido.id}`);
+        commit('setState', response.data.data);
+        // window.location.href = 'productos';
     },
     async modificarChismosa({ commit }, producto_id, cantidad, notas) {},
     async modificarDevoluciones({ commit }, monto, notas) {}
diff --git a/resources/views/subpedidos_create.blade.php b/resources/views/subpedidos_create.blade.php
index 7a82f36..48afac7 100644
--- a/resources/views/subpedidos_create.blade.php
+++ b/resources/views/subpedidos_create.blade.php
@@ -1,17 +1,7 @@
 @extends('layouts.app')
 
 @section('content')
-<section class="section">
-<div id="root" class="container">
-  <h1 class="title">
-    Pedidos MPS
-  </h1>
-  <p class="subtitle">
-    Bienvenidx a la aplicación de pedidos del <strong>Mercado Popular de Subsistencia</strong>
-  </p>
-  <pedidos-subpedido-select></pedidos-subpedido-select>
-</div>
-</section>
+    <app-main></app-main>
 @endsection
 
 @section('scripts')
-- 
2.48.1


From 442d35eac825aec3009826e6f2b5801fd35ffd46 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Thu, 22 May 2025 21:26:01 -0300
Subject: [PATCH 088/111] Agregado main.blade.php con respectiva ruta y web usa
 main

---
 app/Http/Controllers/RouteController.php |  6 +++++-
 resources/views/main.blade.php           |  8 ++++++++
 routes/web.php                           | 12 +++++++-----
 3 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 resources/views/main.blade.php

diff --git a/app/Http/Controllers/RouteController.php b/app/Http/Controllers/RouteController.php
index 8802251..3d29cdc 100644
--- a/app/Http/Controllers/RouteController.php
+++ b/app/Http/Controllers/RouteController.php
@@ -18,7 +18,7 @@ class RouteController extends Controller
 
         switch ($request->user()->role_id) {
             case $barrio->id:
-                return redirect('/productos');
+                return redirect('/pedido');
             case $admin->id:
                 return redirect('/admin');
             case $comision->id:
@@ -27,4 +27,8 @@ class RouteController extends Controller
                 abort(400, 'Rol de usuario invalido');
         }
     }
+
+    function main(Request $request) {
+        return view('main');
+    }
 }
diff --git a/resources/views/main.blade.php b/resources/views/main.blade.php
new file mode 100644
index 0000000..48afac7
--- /dev/null
+++ b/resources/views/main.blade.php
@@ -0,0 +1,8 @@
+@extends('layouts.app')
+
+@section('content')
+    <app-main></app-main>
+@endsection
+
+@section('scripts')
+@endsection
diff --git a/routes/web.php b/routes/web.php
index 3211ea5..34b5417 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -29,10 +29,12 @@ Route::middleware(['auth'])->group(function () {
     Route::get('/user/grupo_de_compra', 'UserController@grupoDeCompra');
 });
 
-Route::middleware(['auth', 'role:barrio'])->group( function() {
+Route::middleware(['auth', 'role:barrio'])->group(function() {
+    Route::get('/pedido', 'RouteController@main')->name('pedido');
+
     Route::get('/productos', 'ProductoController@index')->name('productos.index');
 
-    Route::name('subpedidos.')->prefix("subpedidos")->group( function() {
+    Route::name('subpedidos.')->prefix("subpedidos")->group(function() {
         Route::get('/', function() {
             return view('subpedidos_create');
         })->name('create');
@@ -69,8 +71,8 @@ Route::middleware(['auth', 'role:barrio'])->group( function() {
 
 Route::get('/admin/login', 'AdminController@show')->name('admin.login');
 
-Route::middleware(['auth', 'role:admin_barrio'])->group( function () {
-	Route::get('/admin', 'AdminController@index')->name('admin.pedidos');
+Route::middleware(['auth', 'role:admin_barrio'])->group(function () {
+	Route::get('/admin', 'RouteController@main')->name('admin');
 
 	Route::get('/admin/exportar-planillas-a-pdf/{gdc}', 'AdminController@exportarPedidosAPdf');
 
@@ -82,7 +84,7 @@ Route::middleware(['auth', 'role:admin_barrio'])->group( function () {
 Route::get('/compras/login', 'ComprasController@show')->name('compras.login');
 
 Route::middleware(['auth', 'role:comision'])->group( function() {
-    Route::get('/compras', 'ComprasController@indexPedidos')->name('compras.pedidos');
+    Route::get('/compras', 'RouteController@main')->name('compras');
     Route::get('/compras/pedidos/descargar', 'ComprasController@descargarPedidos')->name('compras.pedidos.descargar');
     Route::get('/compras/pedidos/notas', 'ComprasController@descargarNotas')->name('compras.pedidos.descargar');
     Route::get('/compras/pedidos/pdf', 'ComprasController@pdf')->name('compras.pedidos.pdf');
-- 
2.48.1


From d4df72afe29775a1305a6dca1834c8feeafa2934 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Thu, 22 May 2025 21:26:08 -0300
Subject: [PATCH 089/111] Titulo simplificado

---
 resources/views/layouts/app.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index e8b6aa1..504a853 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -7,7 +7,7 @@
     <!-- CSRF Token -->
     <meta name="csrf-token" content="{{ csrf_token() }}">
 
-    <title>{{ session("subpedido_nombre") ? "Pedido de " . session("subpedido_nombre") . " - " . config('app.name', 'Pedidos del MPS') : config('app.name', 'Pedidos del MPS')}}</title>
+    <title>{{ config('app.name', 'Pedidos del MPS') }}</title>
     <link rel="icon" type="image/x-icon" href="/assets/favicon.png">
 
     <!-- Fonts -->
-- 
2.48.1


From fd055cd7c62cb489fed92f7a5e3b11f9ef95c64d Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Thu, 22 May 2025 21:45:22 -0300
Subject: [PATCH 090/111] Devolviendo resource tras crear pedido

---
 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 33bea00..6303d7d 100644
--- a/app/Http/Controllers/Api/SubpedidoController.php
+++ b/app/Http/Controllers/Api/SubpedidoController.php
@@ -35,7 +35,7 @@ class SubpedidoController extends Controller
         $s->nombre = $validado["nombre"];
         $s->grupo_de_compra_id = $validado["grupo_de_compra_id"];
         $s->save();
-        return $s;
+        return $this->show($s);
     }
 
     protected function validateSubpedido(): array
-- 
2.48.1


From a594e8a049404ff7ab0e6caf1436a8d93cc16eed Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Thu, 22 May 2025 21:45:34 -0300
Subject: [PATCH 091/111] Arreglado parametro

---
 .../js/components/pedidos/SubpedidoSelect.vue    | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/resources/js/components/pedidos/SubpedidoSelect.vue b/resources/js/components/pedidos/SubpedidoSelect.vue
index a69d101..af64fe3 100644
--- a/resources/js/components/pedidos/SubpedidoSelect.vue
+++ b/resources/js/components/pedidos/SubpedidoSelect.vue
@@ -25,7 +25,7 @@
                        v-text="subpedidoExistente.nombre"></p>
                 </div>
                 <div class="buttons column is-half-mobile is-one-third-desktop is-one-third-tablet">
-                    <button class="button is-danger" @click="elegirSubpedido(subpedidoExistente)">Continuar pedido
+                    <button class="button is-danger" @click="elegirPedido({ pedido: subpedidoExistente })">Continuar pedido
                     </button>
                 </div>
             </div>
@@ -67,21 +67,7 @@ export default {
         },
         async submit() {
             await this.crearPedido({ nombre: this.searchString, grupo_de_compra_id: this.grupo_de_compra_id });
-            this.guardarSubpedidoEnSesion({ id: this.pedido_id, nombre: this.nombre });
         },
-        elegirSubpedido(subpedido) {
-            //lo guardamos en sesion
-            this.guardarSubpedidoEnSesion(subpedido);
-        },
-        guardarSubpedidoEnSesion(subpedido) {
-            this.elegirPedido({ pedido: subpedido });
-            axios.post("/subpedidos/guardar_sesion", {
-                subpedido: subpedido,
-                grupo_de_compra_id: this.grupo_de_compra_id
-            }).then(_ => {
-                Event.$emit('obtener-sesion')
-            });
-        }
     }
 }
 </script>
-- 
2.48.1


From 94e384c83ca1f2c3153f9dd23de4db2711d24786 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Thu, 22 May 2025 21:46:06 -0300
Subject: [PATCH 092/111] Crear pedido setea state, quitado todo lo relativo a
 sesion, y quitado codigo comentado

---
 resources/js/app.js                  | 17 -----------------
 resources/js/store/modules/pedido.js |  9 ---------
 2 files changed, 26 deletions(-)

diff --git a/resources/js/app.js b/resources/js/app.js
index 9b76829..3b3e9cc 100644
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -71,21 +71,6 @@ const app = new Vue({
         }
     },
     mounted() {
-        Event.$on('obtener-sesion', () => {
-            if (!window.location.pathname.startsWith('/admin')) {
-                axios.get('/subpedidos/obtener_sesion')
-                    .then(response => {
-                        this.gdc = response.data.gdc;
-                        // this.settearDevoluciones();
-                        this.pedido = response.data.subpedido.id;
-                        axios.get('/api/subpedidos/' + this.pedido)
-                            .then(response => {
-                                this.pedido = response.data.data;
-                                Event.$emit("pedido-actualizado");
-                            });
-                    })
-            }
-        })
       Event.$on('sync-subpedido', (cantidad, id, notas) => {
           if (this.pedido.aprobado) {
             this.$toast('No se puede modificar un pedido ya aprobado', 2000);
@@ -117,8 +102,6 @@ const app = new Vue({
           Event.$emit("pedido-actualizado");
         });
       });
-        if (window.location.pathname.startsWith('/productos'))
-            Event.$emit('obtener-sesion')
     },
 });
 
diff --git a/resources/js/store/modules/pedido.js b/resources/js/store/modules/pedido.js
index aed3e87..215f7e3 100644
--- a/resources/js/store/modules/pedido.js
+++ b/resources/js/store/modules/pedido.js
@@ -34,20 +34,11 @@ const actions = {
             nombre: nombre,
             grupo_de_compra_id: grupo_de_compra_id
         });
-        const pedido = response.data;
-        await axios.post("/subpedidos/sesion", { id: pedido.id, });
-        commit('setState', pedido);
-    },
-    async getPedido({ commit }) {
-        const sesion = await axios.get("/subpedidos/sesion");
-        const response = await axios.get(`/api/subpedidos/${sesion.data}`);
         commit('setState', response.data.data);
     },
     async elegirPedido({ commit }, { pedido }) {
-        await axios.post("/subpedidos/sesion", { id: pedido.id, });
         const response = await axios.get(`/api/subpedidos/${pedido.id}`);
         commit('setState', response.data.data);
-        // window.location.href = 'productos';
     },
     async modificarChismosa({ commit }, producto_id, cantidad, notas) {},
     async modificarDevoluciones({ commit }, monto, notas) {}
-- 
2.48.1


From 08a731673bfac4001d006756694b91916591d489 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Thu, 22 May 2025 22:12:42 -0300
Subject: [PATCH 093/111] Quitado codigo no usado

---
 resources/js/app.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/resources/js/app.js b/resources/js/app.js
index 3b3e9cc..4f26a9f 100644
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -63,12 +63,6 @@ const app = new Vue({
         let pedido = this.productos.some(p => p.id == producto.id);
         return pedido ? this.productos.find(p => p.id == producto.id).pivot.notas : "";
       },
-        settearDevoluciones() {
-            axios.get(`/api/grupos-de-compra/${this.gdc}/devoluciones`)
-                .then(response => {
-                    this.devoluciones = response.data.devoluciones;
-                });
-        }
     },
     mounted() {
       Event.$on('sync-subpedido', (cantidad, id, notas) => {
-- 
2.48.1


From 5468b795625ca2e7aa1ea259758b761043c0bded Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Thu, 22 May 2025 23:06:51 -0300
Subject: [PATCH 094/111] Agregados getters para datos de productos

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

diff --git a/resources/js/store/modules/pedido.js b/resources/js/store/modules/pedido.js
index 215f7e3..62c7709 100644
--- a/resources/js/store/modules/pedido.js
+++ b/resources/js/store/modules/pedido.js
@@ -48,6 +48,15 @@ const getters = {
     pedidoDefinido() {
         return state.lastFetch !== null;
     },
+    enChismosa() {
+        return ((producto_id) => state.productos.some(p => p.id === producto_id));
+    },
+    cantidad() {
+        return ((producto_id) => state.productos.find(p => p.id === producto_id).pivot.cantidad);
+    },
+    notas() {
+        return ((producto_id) => state.productos.find(p => p.id === producto_id).pivot.notas);
+    }
 }
 
 export default {
-- 
2.48.1


From 45dcf643bf6dd66d8ead153d67be3c998bcd21b0 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Thu, 22 May 2025 23:07:07 -0300
Subject: [PATCH 095/111] Formato

---
 .../js/components/pedidos/ProductosContainer.vue  | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/resources/js/components/pedidos/ProductosContainer.vue b/resources/js/components/pedidos/ProductosContainer.vue
index fce1ca3..70c8772 100644
--- a/resources/js/components/pedidos/ProductosContainer.vue
+++ b/resources/js/components/pedidos/ProductosContainer.vue
@@ -1,10 +1,13 @@
 <template>
     <div v-show="visible" class="column">
         <div class="columns is-multiline is-mobile">
-            <producto-card v-for="(producto,i) in this.productos" :key="i" :producto="producto">
-            </producto-card><!-- END BLOCK COLUMN -->
-        </div><!-- END COLUMNS -->
-    </div><!-- END CONTAINER -->
+            <producto-card
+                v-for="(producto,i) in this.productos"
+                :key="i"
+                :producto="producto">
+            </producto-card>
+        </div>
+    </div>
 </template>
 
 <script>
@@ -20,8 +23,8 @@ export default {
         },
         miga: function () {
             return {
-                nombre: this.valor,
-                href: "#" + this.valor
+                nombre: this.filtro.valor,
+                href: "#" + this.filtro.valor
             }
         }
     },
-- 
2.48.1


From 8f0d715f8c141eae104897266328ae62f6f35c78 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 23 May 2025 00:01:55 -0300
Subject: [PATCH 096/111] Usando vuex

---
 .../components/pedidos/ProductoCantidad.vue   | 194 ++++++++++--------
 .../js/components/pedidos/ProductoCard.vue    |  65 ++----
 .../js/components/pedidos/ProductoRow.vue     |  11 +-
 resources/js/store/modules/pedido.js          |  15 +-
 4 files changed, 145 insertions(+), 140 deletions(-)

diff --git a/resources/js/components/pedidos/ProductoCantidad.vue b/resources/js/components/pedidos/ProductoCantidad.vue
index 49d5799..72182cd 100644
--- a/resources/js/components/pedidos/ProductoCantidad.vue
+++ b/resources/js/components/pedidos/ProductoCantidad.vue
@@ -7,29 +7,31 @@
                 </button>
             </div>
             <div class="control">
-                <input id="cantidad" v-model="cantidad" class="input is-small" type="number" style="text-align: center">
+                <input id="cantidad" v-model="cantidadControl" class="input is-small" type="number"
+                       style="text-align: center">
             </div>
             <div class="control" @click="incrementar();">
                 <button class="button is-small">
                     <i class="fa fa-solid fa-plus"></i>
                 </button>
             </div>
-            <button :disabled="disableConfirm()" class="button is-small is-success ml-1" @click="confirmar()">
+            <button :disabled="!hayCambios" class="button is-small is-success ml-1" @click="confirmar()">
                 <span class="icon">
                     <i class="fas fa-check"></i>
                 </span>
             </button>
-            <button :disabled="!puedeBorrar()" class="button is-small is-danger ml-1" @click="borrar()">
+            <button :disabled="!puedeBorrar" class="button is-small is-danger ml-1" @click="borrar()">
                 <span class="icon">
                     <i class="fas fa-trash-alt"></i>
                 </span>
             </button>
         </div>
-        <div v-if="producto.requiere_notas" v-bind:class="{'has-icons-right': notas_warning_visible}" class="control is-full-width has-icons-left">
+        <div v-if="requiere_notas" :class="{'has-icons-right': notas_warning_visible}"
+             class="control is-full-width has-icons-left">
             <span class="icon is-small is-left">
                 <i class="fas fa-sticky-note"></i>
             </span>
-            <input v-model="notas" v-bind:class="{'is-danger': notas_warning_visible}" id="notas" class="input" type="text" placeholder="Talle o color" />
+            <input v-model="notasControl" v-bind:class="{'is-danger': notas_warning_visible}" id="notas" class="input" type="text" placeholder="Talle o color"/>
             <span v-if="notas_warning_visible" class="icon is-small is-right">
                 <i class="fas fa-exclamation-triangle"></i>
             </span>
@@ -43,98 +45,110 @@
 </template>
 
 <script>
-    export default {
-        props: {
-            producto: Object
+import { mapActions, mapGetters } from "vuex";
+
+export default {
+    props: {
+        producto_id: {
+            type: Number,
+            required: true,
         },
-        data() {
-            return {
-                cantidad: this.cantidadEnChismosa(),
-                notas: this.notasEnChismosa(),
-                notas_warning_visible: false,
+        requiere_notas: {
+            type: Number,
+            required: true,
+        }
+    },
+    data() {
+        return {
+            cantidadControl: 0,
+            notasControl: '',
+            notas_warning_visible: false,
+        }
+    },
+    watch: {
+        cantidadEnChismosa() {
+            this.actualizar();
+        },
+        notasEnChismosa() {
+            this.actualizar();
+        }
+    },
+    mounted() {
+        this.actualizar();
+    },
+    computed: {
+        ...mapGetters('pedido', ["enChismosa", "cantidad", "notas"]),
+        cantidadEnChismosa() {
+            return this.cantidad(this.producto_id);
+        },
+        notasEnChismosa() {
+            return this.notas(this.producto_id);
+        },
+        hayCambios() {
+            return this.cantidadControl !== this.cantidadEnChismosa || this.notasControl !== this.notasEnChismosa;
+        },
+        puedeBorrar() {
+            return this.enChismosa(this.producto_id);
+        },
+        faltaNotas() {
+            return this.requiere_notas && this.cantidadControl > 0 && !this.notasControl;
+        },
+    },
+    methods: {
+        ...mapActions('pedido', ["modificarChismosa"]),
+        decrementar() {
+            this.cantidadControl -= 1;
+        },
+        incrementar() {
+            this.cantidadControl += 1;
+        },
+        borrar() {
+            this.cantidadControl = 0;
+            this.confirmar();
+        },
+        async confirmar() {
+            if (this.faltaNotas) {
+                this.notas_warning_visible = true;
+                return;
             }
-        },
-        mounted() {
-            Event.$on('sync-subpedido', (cantidad, productoId, notas) => {
-                if (this.producto.id === productoId) 
-                    this.sincronizar(cantidad, notas);
+            await this.modificarChismosa({
+                producto_id: this.producto_id,
+                cantidad: this.cantidadControl,
+                notas: this.notasControl
             });
         },
-        methods: {
-            notasEnChismosa() {
-                return this.producto.pivot !== undefined ? this.producto.pivot.notas : "";
-            },
-            cantidadEnChismosa() {
-                return this.producto.pivot !== undefined ? this.producto.pivot.cantidad : 0;
-            },
-            decrementar() {
-                this.cantidad -= 1;
-            },
-            incrementar() {
-                this.cantidad += 1;
-            },
-            confirmar() {
-                if (this.warningNotas()) {
-                    this.notas_warning_visible = true;
-                    return;
-                }
-                console.log("Emit sync " + this.cantidad + " " + this.notas);
-                Event.$emit('sync-subpedido', this.cantidad, this.producto.id, this.notas);
-            },
-            borrar() {
-                this.cantidad = 0;
-                this.confirmar();
-            },
-            sincronizar(cantidad, notas) {
-                this.notas_warning_visible = false;
-                this.notas = notas;
-                this.cantidad = cantidad;
-                if (this.producto.pivot !== undefined) {
-                    this.producto.pivot.cantidad = cantidad;
-                    this.producto.pivot.notas = notas;
-                }
-            },
-            hayCambios() {
-                if (this.cantidad != this.cantidadEnChismosa()) return true;
-                
-                return this.cantidad > 0 && this.notas != this.notasEnChismosa();
-            },
-            puedeBorrar() {
-                return this.cantidadEnChismosa() > 0;
-            },
-            warningNotas() {
-                return this.producto.requiere_notas && this.cantidad > 0 && !this.notas;
-            },
-            disableConfirm() {
-                return !this.hayCambios();
-            },
-        }
+        actualizar() {
+            this.cantidadControl = this.cantidadEnChismosa;
+            this.notasControl = this.notasEnChismosa;
+        },
     }
+}
 </script>
 
 <style>
-    /* Chrome, Safari, Edge, Opera */
-    input::-webkit-outer-spin-button,
-    input::-webkit-inner-spin-button {
-        -webkit-appearance: none;
-        margin: 0;
-    }
+/* Chrome, Safari, Edge, Opera */
+input::-webkit-outer-spin-button,
+input::-webkit-inner-spin-button {
+    -webkit-appearance: none;
+    margin: 0;
+}
 
-    /* Firefox */
-    input[type=number] {
-        appearance: textfield;
-        -moz-appearance: textfield;
-    }
-    
-    .contador {
-        min-width: 178px;
-    }
+/* Firefox */
+input[type=number] {
+    appearance: textfield;
+    -moz-appearance: textfield;
+}
 
-    .is-danger {
-        background-color: #fca697;
-    }
-    .is-danger::placeholder {
-        color: #fff;
-        opacity: 1; /* Firefox */
-    }
-</style>
\ No newline at end of file
+.contador {
+    min-width: 178px;
+}
+
+.is-danger {
+    background-color: #fca697;
+}
+
+.is-danger::placeholder {
+    color: #fff;
+    opacity: 1; /* Firefox */
+}
+</style>
diff --git a/resources/js/components/pedidos/ProductoCard.vue b/resources/js/components/pedidos/ProductoCard.vue
index b2012b9..fa3a978 100644
--- a/resources/js/components/pedidos/ProductoCard.vue
+++ b/resources/js/components/pedidos/ProductoCard.vue
@@ -1,53 +1,25 @@
 <script>
 import ProductoCantidad from "./ProductoCantidad.vue";
+import { mapGetters } from "vuex";
 
 export default {
     name: "ProductoCard",
     components: { ProductoCantidad },
     props: {
-        producto: Object
+        producto: {
+            type: Object,
+            required: true
+        }
     },
-    data() {
-      return {
-          cantidad: this.producto.cantidad,
-          enChismosa: this.producto.cantidad,
-          notas: this.producto.notas,
-      }
+    computed: {
+        ...mapGetters('pedido',["enChismosa", "cantidad"]),
+        fuePedido() {
+            return this.enChismosa(this.producto.id);
+        },
+        cantidadEnChismosa() {
+            return this.cantidad(this.producto.id);
+        }
     },
-    mounted() {
-      Event.$on('sync-subpedido', (cantidad, productoId, notas) => {
-          if (this.producto.id === productoId)
-              this.sincronizar(cantidad, notas);
-      });
-    },
-    methods: {
-        decrementar() {
-            this.cantidad -= 1;
-        },
-        incrementar() {
-            this.cantidad += 1;
-        },
-        confirmar() {
-            Event.$emit('sync-subpedido', this.cantidad, this.producto.id, this.notas);
-        },
-        borrar() {
-            this.cantidad = 0;
-            this.confirmar();
-        },
-        sincronizar(cantidad, notas) {
-            this.cantidad = cantidad;
-            this.producto.cantidad = cantidad;
-            this.enChismosa = cantidad;
-            this.notas = notas;
-            this.producto.notas = notas;
-        },
-        hayCambios() {
-            return this.cantidad !== this.enChismosa || this.notas !== this.producto.notas;
-        },
-        puedeBorrar() {
-            return this.enChismosa > 0;
-        },
-    }
 }
 </script>
 
@@ -59,7 +31,7 @@ export default {
                     <p class="title is-6">
                         {{ producto.nombre }}
                     </p>
-                    <span class="subtitle is-7 hidden-from-tablet" v-if="enChismosa">{{ enChismosa }} en chismosa</span>
+                    <span class="subtitle is-7 hidden-from-tablet" v-if="fuePedido">{{ cantidadEnChismosa }}</span>
                 </div>
                 <div class="column is-one-quarter has-text-right">
                     <p class="has-text-weight-bold has-text-primary">
@@ -73,13 +45,16 @@ export default {
             </div>
             <footer class="columns">
                 <div class="column is-three-quarters">
-                    <producto-cantidad :producto="producto"></producto-cantidad>
+                    <producto-cantidad
+                        :producto_id="producto.id"
+                        :requiere_notas="producto.requiere_notas">
+                    </producto-cantidad>
                 </div>
                 <div class="column">
-                    <p class="subtitle is-7 is-hidden-mobile" v-if="enChismosa > 0">{{ enChismosa }} en chismosa</p>
+                    <p class="subtitle is-7 is-hidden-mobile" v-if="fuePedido">{{ cantidadEnChismosa }} en chismosa</p>
                 </div>
             </footer>
-        </div><!-- END BOX -->
+        </div>
     </div>
 </template>
 
diff --git a/resources/js/components/pedidos/ProductoRow.vue b/resources/js/components/pedidos/ProductoRow.vue
index 30ae0ab..9b30001 100644
--- a/resources/js/components/pedidos/ProductoRow.vue
+++ b/resources/js/components/pedidos/ProductoRow.vue
@@ -2,18 +2,25 @@
 	<tr>
             <td>{{ this.producto.nombre }}</td>
             <td class="has-text-right">
-                <producto-cantidad :producto="producto"></producto-cantidad>
+                <producto-cantidad
+                    :producto_id="producto.id"
+                    :requiere_notas="producto.requiere_notas">
+                </producto-cantidad>
             </td>
-            <td class="has-text-right">{{ this.producto.pivot.total }}</td>
+            <td class="has-text-right">{{ cantidad(producto.id) }}</td>
     </tr>
 </template>
 <script>
     import ProductoCantidad from "./ProductoCantidad.vue";
+    import { mapGetters } from "vuex";
 
     export default {
         components: { ProductoCantidad },
 		props: {
 	        producto: Object
 	    },
+        computed: {
+            ...mapGetters('pedido',["cantidad"]),
+        },
 	}
 </script>
diff --git a/resources/js/store/modules/pedido.js b/resources/js/store/modules/pedido.js
index 62c7709..8505251 100644
--- a/resources/js/store/modules/pedido.js
+++ b/resources/js/store/modules/pedido.js
@@ -1,3 +1,5 @@
+import axios from "axios";
+
 const state = {
     lastFetch: null,
     pedido_id: null,
@@ -40,7 +42,14 @@ const actions = {
         const response = await axios.get(`/api/subpedidos/${pedido.id}`);
         commit('setState', response.data.data);
     },
-    async modificarChismosa({ commit }, producto_id, cantidad, notas) {},
+    async modificarChismosa({ commit }, { producto_id, cantidad, notas }) {
+        const response = await axios.post("/api/subpedidos/" + state.pedido_id + "/sync", {
+            cantidad: cantidad,
+            producto_id: producto_id,
+            notas: notas,
+        });
+        commit('setState', response.data.data);
+    },
     async modificarDevoluciones({ commit }, monto, notas) {}
 };
 
@@ -52,10 +61,10 @@ const getters = {
         return ((producto_id) => state.productos.some(p => p.id === producto_id));
     },
     cantidad() {
-        return ((producto_id) => state.productos.find(p => p.id === producto_id).pivot.cantidad);
+        return ((producto_id) => state.productos.find(p => p.id === producto_id)?.pivot.cantidad ?? 0);
     },
     notas() {
-        return ((producto_id) => state.productos.find(p => p.id === producto_id).pivot.notas);
+        return ((producto_id) => state.productos.find(p => p.id === producto_id)?.pivot.notas ?? "");
     }
 }
 
-- 
2.48.1


From f81141d18b72caa1ee4e31819ae0f8425cda9b7f Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 23 May 2025 00:36:22 -0300
Subject: [PATCH 097/111] Quitado codigo no usado

---
 resources/js/components/pedidos/Chismosa.vue | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/resources/js/components/pedidos/Chismosa.vue b/resources/js/components/pedidos/Chismosa.vue
index b6bb492..2340bec 100644
--- a/resources/js/components/pedidos/Chismosa.vue
+++ b/resources/js/components/pedidos/Chismosa.vue
@@ -67,20 +67,10 @@ export default {
             return this.productos?.length !== 0;
         },
     },
-    mounted() {
-        Event.$on('pedido-actualizado', this.pedidoActualizado);
-        Event.$on('toggle-chismosa', this.pedidoActualizado);
-    },
     methods: {
-        modificarDevoluciones: function () {
+        modificarDevoluciones() {
             Event.$emit("modificar-devoluciones");
         },
-        cantidadBonosDeTransporte: function () {
-            return this.$root.pedido.cantidad_transporte;
-        },
-        totalBonosDeTransporte: function () {
-            return this.$root.pedido.total_transporte
-        },
     },
 }
 </script>
-- 
2.48.1


From 21aa36e3d1dfaf36863a21b6e7b3cb56d603048e Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 23 May 2025 00:36:53 -0300
Subject: [PATCH 098/111] Cambios de nombres, y movida logica de chismosa a
 store de vuex

---
 resources/js/components/comunes/NavBar.vue    |  4 ++--
 .../components/pedidos/ChismosaDropdown.vue   | 22 +++++--------------
 resources/js/components/pedidos/Productos.vue | 17 +++++---------
 resources/js/store/index.js                   |  2 ++
 resources/js/store/modules/ui.js              | 19 ++++++++++++++++
 5 files changed, 35 insertions(+), 29 deletions(-)
 create mode 100644 resources/js/store/modules/ui.js

diff --git a/resources/js/components/comunes/NavBar.vue b/resources/js/components/comunes/NavBar.vue
index 4377df5..4bc97e2 100644
--- a/resources/js/components/comunes/NavBar.vue
+++ b/resources/js/components/comunes/NavBar.vue
@@ -12,7 +12,7 @@
             <chismosa-dropdown
                 v-if="pedidoDefinido"
                 class="hide-above-1023"
-                id="mobile">
+                ariaControls="mobile">
             </chismosa-dropdown>
             <a role="button" class="navbar-burger" :class="{'is-active':burgerActiva}" aria-label="menu"
                aria-expanded="false" data-target="nav-bar" @click="toggleBurger">
@@ -35,7 +35,7 @@
                 <chismosa-dropdown
                     v-if="pedidoDefinido"
                     class="hide-below-1024"
-                    id="wide">
+                    ariaControls="wide">
                 </chismosa-dropdown>
                 <div class="block navbar-item">
                     <a onclick="event.preventDefault(); document.getElementById('logout-form').submit();"
diff --git a/resources/js/components/pedidos/ChismosaDropdown.vue b/resources/js/components/pedidos/ChismosaDropdown.vue
index 19b0207..cb91a74 100644
--- a/resources/js/components/pedidos/ChismosaDropdown.vue
+++ b/resources/js/components/pedidos/ChismosaDropdown.vue
@@ -1,7 +1,7 @@
 <template>
-    <div class="dropdown is-right navbar-item" :class="{'is-active':activa}">
+    <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="id" @click.capture="toggle">
+            <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>
@@ -13,33 +13,23 @@
 
 <script>
 import Chismosa from './Chismosa.vue'
-import { mapState } from "vuex";
+import { mapMutations, mapState } from "vuex";
 export default {
     components: {
         Chismosa
     },
     props: {
-        id: {
+        ariaControls: {
             type: String,
             required: true
         }
     },
-    data() {
-        return {
-            activa: false,
-        }
-    },
     computed: {
         ...mapState('pedido',["total"]),
-    },
-    mounted() {
-        Event.$on('pedido-actualizado', this.actualizar);
+        ...mapState('ui',["show_chismosa"]),
     },
     methods: {
-        toggle() {
-            this.activa = !this.activa;
-            Event.$emit("toggle-chismosa", this.activa);
-        },
+        ...mapMutations('ui',["toggleChismosa"]),
     },
 }
 </script>
diff --git a/resources/js/components/pedidos/Productos.vue b/resources/js/components/pedidos/Productos.vue
index 06e6db3..30a9b1c 100644
--- a/resources/js/components/pedidos/Productos.vue
+++ b/resources/js/components/pedidos/Productos.vue
@@ -4,32 +4,27 @@ import ProductosContainer from "./ProductosContainer.vue";
 import Chismosa from "./Chismosa.vue";
 import { defineComponent } from "vue";
 import SubpedidoSelect from "./SubpedidoSelect.vue";
-import { mapActions } from "vuex";
+import { mapActions, mapState } from "vuex";
 
 export default defineComponent({
     components: { SubpedidoSelect, CategoriasContainer, ProductosContainer, Chismosa },
-    data() {
-        return {
-            chismosaActiva: false,
-        }
+    computed: {
+        ...mapState('ui',["show_chismosa"])
     },
     methods: {
         ...mapActions('productos',["init"]),
     },
     async mounted() {
         await this.init();
-        Event.$on('toggle-chismosa', (activa) => {
-            this.chismosaActiva = activa;
-        });
     },
 })
 </script>
 
 <template>
     <div class="columns ml-3 mr-3" v-else>
-        <categorias-container :class="chismosaActiva ? 'hide-below-1024' : ''"></categorias-container>
-        <productos-container :class="chismosaActiva ? 'hide-below-1024' : ''"></productos-container>
-        <chismosa v-show="chismosaActiva"></chismosa>
+        <categorias-container :class="show_chismosa ? 'hide-below-1024' : ''"></categorias-container>
+        <productos-container :class="show_chismosa ? 'hide-below-1024' : ''"></productos-container>
+        <chismosa v-show="show_chismosa"></chismosa>
     </div>
 </template>
 
diff --git a/resources/js/store/index.js b/resources/js/store/index.js
index b184b7f..245553a 100644
--- a/resources/js/store/index.js
+++ b/resources/js/store/index.js
@@ -5,6 +5,7 @@ import login from "./modules/login";
 import pedido from "./modules/pedido";
 import barrio from "./modules/barrio";
 import productos from "./modules/productos";
+import ui from "./modules/ui";
 
 Vue.use(Vuex);
 
@@ -15,5 +16,6 @@ export default new Vuex.Store({
         pedido,
         barrio,
         productos,
+        ui,
     },
 });
diff --git a/resources/js/store/modules/ui.js b/resources/js/store/modules/ui.js
new file mode 100644
index 0000000..3144e16
--- /dev/null
+++ b/resources/js/store/modules/ui.js
@@ -0,0 +1,19 @@
+const state = {
+    show_chismosa: false,
+    show_devoluciones: false,
+};
+
+const mutations = {
+    toggleChismosa(state) {
+        state.show_chismosa = !state.show_chismosa;
+    },
+    toggleDevoluciones(state) {
+        state.show_devoluciones = !state.show_devoluciones;
+    },
+};
+
+export default {
+    namespaced: true,
+    state,
+    mutations,
+};
-- 
2.48.1


From fb0e13089fadd195630d9ad7fdf7af7a07bfd868 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 23 May 2025 00:56:27 -0300
Subject: [PATCH 099/111] Agregado devoluciones-modal

---
 resources/js/components/pedidos/Productos.vue | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/resources/js/components/pedidos/Productos.vue b/resources/js/components/pedidos/Productos.vue
index 30a9b1c..9362db3 100644
--- a/resources/js/components/pedidos/Productos.vue
+++ b/resources/js/components/pedidos/Productos.vue
@@ -1,15 +1,16 @@
 <script >
+import { defineComponent } from "vue";
+import { mapActions, mapState } from "vuex";
+import SubpedidoSelect from "./SubpedidoSelect.vue";
 import CategoriasContainer from "./CategoriasContainer.vue";
 import ProductosContainer from "./ProductosContainer.vue";
 import Chismosa from "./Chismosa.vue";
-import { defineComponent } from "vue";
-import SubpedidoSelect from "./SubpedidoSelect.vue";
-import { mapActions, mapState } from "vuex";
+import DevolucionesModal from "./DevolucionesModal.vue";
 
 export default defineComponent({
-    components: { SubpedidoSelect, CategoriasContainer, ProductosContainer, Chismosa },
+    components: { DevolucionesModal, SubpedidoSelect, CategoriasContainer, ProductosContainer, Chismosa },
     computed: {
-        ...mapState('ui',["show_chismosa"])
+        ...mapState('ui',["show_chismosa","show_devoluciones"])
     },
     methods: {
         ...mapActions('productos',["init"]),
@@ -25,6 +26,7 @@ export default defineComponent({
         <categorias-container :class="show_chismosa ? 'hide-below-1024' : ''"></categorias-container>
         <productos-container :class="show_chismosa ? 'hide-below-1024' : ''"></productos-container>
         <chismosa v-show="show_chismosa"></chismosa>
+        <devoluciones-modal v-show="show_devoluciones"></devoluciones-modal>
     </div>
 </template>
 
-- 
2.48.1


From 5023032ac2374ce043edbac3c5c0f0591b93c526 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 23 May 2025 00:56:48 -0300
Subject: [PATCH 100/111] Usando vuex para el modal de devoluciones

---
 resources/js/components/pedidos/Chismosa.vue  |  8 +-
 .../components/pedidos/DevolucionesModal.vue  | 80 ++++++++++---------
 resources/js/store/modules/pedido.js          |  8 +-
 3 files changed, 52 insertions(+), 44 deletions(-)

diff --git a/resources/js/components/pedidos/Chismosa.vue b/resources/js/components/pedidos/Chismosa.vue
index 2340bec..9aa0a98 100644
--- a/resources/js/components/pedidos/Chismosa.vue
+++ b/resources/js/components/pedidos/Chismosa.vue
@@ -19,7 +19,7 @@
                     <th><p>Devoluciones</p></th>
                     <td>
                         <abbr :title="devoluciones_notas">{{ notas_abreviadas }}</abbr>
-                        <button @click.capture="modificarDevoluciones()" class="button is-warning is-small">
+                        <button @click.capture="toggleDevoluciones()" class="button is-warning is-small">
                             <span class="icon">
                                 <i class="fas fa-edit"></i>
                             </span>
@@ -46,7 +46,7 @@
 
 <script>
 import ProductoRow from "./ProductoRow.vue";
-import { mapState } from "vuex";
+import { mapMutations, mapState } from "vuex";
 
 export default {
     components: { ProductoRow },
@@ -68,9 +68,7 @@ export default {
         },
     },
     methods: {
-        modificarDevoluciones() {
-            Event.$emit("modificar-devoluciones");
-        },
+        ...mapMutations('ui',["toggleDevoluciones"]),
     },
 }
 </script>
diff --git a/resources/js/components/pedidos/DevolucionesModal.vue b/resources/js/components/pedidos/DevolucionesModal.vue
index 9d4862f..dab43a0 100644
--- a/resources/js/components/pedidos/DevolucionesModal.vue
+++ b/resources/js/components/pedidos/DevolucionesModal.vue
@@ -1,67 +1,71 @@
 <template>
-	<div v-bind:class="visible ? 'is-active modal' : 'modal'">
+    <div :class="show_devoluciones ? 'is-active modal' : 'modal'">
         <div class="modal-background"></div>
         <div class="modal-card">
             <header class="modal-card-head">
                 <p class="modal-card-title">Devoluciones</p>
-                <button class="delete" aria-label="close" @click.capture="cerrar"></button>
+                <button class="delete" aria-label="close" @click.capture="toggleDevoluciones()"></button>
             </header>
             <section class="modal-card-body">
                 <div class="field has-addons is-centered is-thin-centered">
                     <p class="control">
                         Total:
-                        <input id="total" class="input" type="number" v-model="total" style="text-align: center">
+                        <input id="totalControl" class="input" type="number" v-model="totalControl"
+                               style="text-align: center">
                     </p>
                 </div>
                 <div class="field has-addons is-centered is-thin-centered">
                     <p class="control">
                         Notas:
-                        <input id="notas" class="input" type="text" v-model.text="notas">
+                        <input id="notasControl" class="input" type="text" v-model.text="notasControl">
                     </p>
                 </div>
             </section>
             <footer class="modal-card-foot">
                 <button class="button is-success" @click="modificar">Aceptar</button>
-                <button class="button" @click.capture="cerrar">Cancelar</button>
+                <button class="button" @click.capture="toggleDevoluciones()">Cancelar</button>
             </footer>
         </div>
     </div>
 </template>
 
 <script>
-    export default {
-        data() {
-            return {
-                visible: false,
-                total: 0,
-                notas: "",
-            }
+import { mapActions, mapMutations, mapState } from "vuex";
+
+export default {
+    name: 'DevolucionesModal',
+    data() {
+        return {
+            totalControl: 0,
+            notasControl: "",
+        }
+    },
+    mounted() {
+        this.actualizar();
+    },
+    watch: {
+        cantidadEnChismosa() {
+            this.actualizar();
         },
-        computed: {
-            miga: function() {
-                return {
-                    nombre: "Devoluciones",
-                    href: "#devoluciones",
-                }
-            },
+        notasEnChismosa() {
+            this.actualizar();
+        }
+    },
+    computed: {
+        ...mapState('ui', ["show_devoluciones"]),
+        ...mapState('pedido', ["devoluciones_total", "devoluciones_notas"])
+    },
+    methods: {
+        ...mapMutations('ui', ["toggleDevoluciones"]),
+        ...mapActions('pedido', ["modificarDevoluciones"]),
+        modificar() {
+            this.modificarDevoluciones({ monto: this.totalControl, notas: this.notasControl });
+            this.toggleDevoluciones();
         },
-        methods: {
-		    cerrar() {
-		        this.visible = false;
-		        Event.$emit("migas-pop");
-		    },
-            modificar() {
-                Event.$emit('sync-devoluciones', this.total, this.notas);
-                this.cerrar();
-            }
+        actualizar() {
+            this.totalControl = this.devoluciones_total;
+            this.notasControl = this.devoluciones_notas;
         },
-        mounted() {
-            Event.$on('modificar-devoluciones', () => {
-                this.visible = true;
-                this.total = this.$root.pedido.devoluciones_total;
-                this.notas = this.$root.pedido.devoluciones_notas;
-                Event.$emit("migas-agregar", this.miga);
-            });
-        },
-    }
-</script>
\ No newline at end of file
+    },
+}
+</script>
diff --git a/resources/js/store/modules/pedido.js b/resources/js/store/modules/pedido.js
index 8505251..fd4c8ed 100644
--- a/resources/js/store/modules/pedido.js
+++ b/resources/js/store/modules/pedido.js
@@ -50,7 +50,13 @@ const actions = {
         });
         commit('setState', response.data.data);
     },
-    async modificarDevoluciones({ commit }, monto, notas) {}
+    async modificarDevoluciones({ commit }, { monto, notas }) {
+        const response = await axios.post("api/subpedidos/" + state.pedido_id + "/sync_devoluciones", {
+            total: monto,
+            notas: notas,
+        });
+        commit('setState', response.data.data);
+    },
 };
 
 const getters = {
-- 
2.48.1


From 5458fae6d9b6cde4f07db615e4d779149b4ea927 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 23 May 2025 01:02:01 -0300
Subject: [PATCH 101/111] Renombrado

---
 resources/js/components/pedidos/Body.vue                    | 6 +++---
 .../js/components/pedidos/{Productos.vue => Pedido.vue}     | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)
 rename resources/js/components/pedidos/{Productos.vue => Pedido.vue} (80%)

diff --git a/resources/js/components/pedidos/Body.vue b/resources/js/components/pedidos/Body.vue
index e056948..0fd5c24 100644
--- a/resources/js/components/pedidos/Body.vue
+++ b/resources/js/components/pedidos/Body.vue
@@ -1,17 +1,17 @@
 <template>
     <div id="pedidos-body">
         <pedido-select-section v-if="!pedidoDefinido"></pedido-select-section>
-        <productos v-else></productos>
+        <pedido v-else></pedido>
     </div>
 </template>
 
 <script>
 import { mapGetters } from "vuex";
 import PedidoSelectSection from "./PedidoSelectSection.vue";
-import Productos from "./Productos.vue";
+import Pedido from "./Pedido.vue";
 
 export default {
-    components: { Productos, PedidoSelectSection },
+    components: { Pedido, Productos: Pedido, PedidoSelectSection },
     computed: {
         ...mapGetters('pedido',["pedidoDefinido"]),
     },
diff --git a/resources/js/components/pedidos/Productos.vue b/resources/js/components/pedidos/Pedido.vue
similarity index 80%
rename from resources/js/components/pedidos/Productos.vue
rename to resources/js/components/pedidos/Pedido.vue
index 9362db3..a832aa9 100644
--- a/resources/js/components/pedidos/Productos.vue
+++ b/resources/js/components/pedidos/Pedido.vue
@@ -6,9 +6,10 @@ import CategoriasContainer from "./CategoriasContainer.vue";
 import ProductosContainer from "./ProductosContainer.vue";
 import Chismosa from "./Chismosa.vue";
 import DevolucionesModal from "./DevolucionesModal.vue";
+import CartelPedidoAprobado from "./CartelPedidoAprobado.vue";
 
 export default defineComponent({
-    components: { DevolucionesModal, SubpedidoSelect, CategoriasContainer, ProductosContainer, Chismosa },
+    components: { CartelPedidoAprobado, DevolucionesModal, SubpedidoSelect, CategoriasContainer, ProductosContainer, Chismosa },
     computed: {
         ...mapState('ui',["show_chismosa","show_devoluciones"])
     },
@@ -23,6 +24,7 @@ export default defineComponent({
 
 <template>
     <div class="columns ml-3 mr-3" v-else>
+        <cartel-pedido-aprobado></cartel-pedido-aprobado>
         <categorias-container :class="show_chismosa ? 'hide-below-1024' : ''"></categorias-container>
         <productos-container :class="show_chismosa ? 'hide-below-1024' : ''"></productos-container>
         <chismosa v-show="show_chismosa"></chismosa>
-- 
2.48.1


From a9ca04811efe1e6f8bede614d1646afec764e5aa Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 23 May 2025 01:02:11 -0300
Subject: [PATCH 102/111] Usando vuex

---
 .../pedidos/CartelPedidoAprobado.vue          | 31 ++++++-------------
 1 file changed, 9 insertions(+), 22 deletions(-)

diff --git a/resources/js/components/pedidos/CartelPedidoAprobado.vue b/resources/js/components/pedidos/CartelPedidoAprobado.vue
index be6f8a4..b719219 100644
--- a/resources/js/components/pedidos/CartelPedidoAprobado.vue
+++ b/resources/js/components/pedidos/CartelPedidoAprobado.vue
@@ -1,32 +1,19 @@
 <template>
-    <div v-show="aprobado" class="notification is-warning has-text-centered">
+    <div v-if="aprobado" class="notification is-warning has-text-centered">
         Tu pedido fue <strong>aprobado</strong>, por lo que no puede ser modificado
     </div>
 </template>
 
 <script>
-    export default {
-        data() {
-            return {
-                aprobado: false,
-            }
-        },
-        mounted() {
-            Event.$on('pedido-actualizado', this.actualizarEstado);
-            if (this.$root.pedido != null) {
-                this.actualizarEstado();
-            }
-        },
-        methods: {
-            pedidoAprobado: function() {
-                return this.$root.pedido.aprobado;
-            },
-            actualizarEstado: function() {
-                this.aprobado = this.pedidoAprobado();
-            },
-        },
+import { mapState } from "vuex";
+
+export default {
+    name: 'CartelPedidoAprobado',
+    computed: {
+        ...mapState('pedido',["aprobado"]),
     }
+}
 </script>
 
 <style>
-</style>
\ No newline at end of file
+</style>
-- 
2.48.1


From adabd09ea75db0b3dcb567e073d53a6845ce5e45 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 23 May 2025 01:11:31 -0300
Subject: [PATCH 103/111] Cambio id

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

diff --git a/resources/js/components/AppMain.vue b/resources/js/components/AppMain.vue
index b6c57ab..ffd0e0e 100644
--- a/resources/js/components/AppMain.vue
+++ b/resources/js/components/AppMain.vue
@@ -17,7 +17,7 @@ export default {
 </script>
 
 <template>
-    <div id="main">
+    <div id="app-main">
         <nav-bar></nav-bar>
         <pedidos-body v-if="rol === 'barrio'"></pedidos-body>
         <admin-body v-if="rol === 'admin_barrio'"></admin-body>
-- 
2.48.1


From 0381bb05679c57f4bc0d9bbf17addfdbb84e4315 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 23 May 2025 01:12:12 -0300
Subject: [PATCH 104/111] Cartel aprobado movido a pedidos body

---
 resources/js/components/pedidos/Body.vue   | 4 +++-
 resources/js/components/pedidos/Pedido.vue | 1 -
 resources/views/layouts/app.blade.php      | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/js/components/pedidos/Body.vue b/resources/js/components/pedidos/Body.vue
index 0fd5c24..941cb53 100644
--- a/resources/js/components/pedidos/Body.vue
+++ b/resources/js/components/pedidos/Body.vue
@@ -1,5 +1,6 @@
 <template>
     <div id="pedidos-body">
+        <cartel-pedido-aprobado></cartel-pedido-aprobado>
         <pedido-select-section v-if="!pedidoDefinido"></pedido-select-section>
         <pedido v-else></pedido>
     </div>
@@ -9,9 +10,10 @@
 import { mapGetters } from "vuex";
 import PedidoSelectSection from "./PedidoSelectSection.vue";
 import Pedido from "./Pedido.vue";
+import CartelPedidoAprobado from "./CartelPedidoAprobado.vue";
 
 export default {
-    components: { Pedido, Productos: Pedido, PedidoSelectSection },
+    components: { CartelPedidoAprobado, Pedido, Productos: Pedido, PedidoSelectSection },
     computed: {
         ...mapGetters('pedido',["pedidoDefinido"]),
     },
diff --git a/resources/js/components/pedidos/Pedido.vue b/resources/js/components/pedidos/Pedido.vue
index a832aa9..3613b7a 100644
--- a/resources/js/components/pedidos/Pedido.vue
+++ b/resources/js/components/pedidos/Pedido.vue
@@ -24,7 +24,6 @@ export default defineComponent({
 
 <template>
     <div class="columns ml-3 mr-3" v-else>
-        <cartel-pedido-aprobado></cartel-pedido-aprobado>
         <categorias-container :class="show_chismosa ? 'hide-below-1024' : ''"></categorias-container>
         <productos-container :class="show_chismosa ? 'hide-below-1024' : ''"></productos-container>
         <chismosa v-show="show_chismosa"></chismosa>
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 504a853..7a5d66f 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -26,7 +26,6 @@
         </comunes-nav-bar>
         <pedidos-nav-migas></pedidos-nav-migas>
         <main id="main" class="py-4 has-top-padding">
-            <pedidos-cartel-pedido-aprobado></pedidos-cartel-pedido-aprobado>
             @yield('content')
         </main>
     </div>
-- 
2.48.1


From 1e830e3cfd411ee5b2350f8f673f518c32c4664b Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 23 May 2025 01:27:34 -0300
Subject: [PATCH 105/111] Logica de migas movida a ui.js

---
 resources/js/components/comunes/NavBar.vue    |  5 ++--
 .../pedidos/CategoriasContainer.vue           |  7 +++--
 resources/js/components/pedidos/NavMigas.vue  | 30 ++++---------------
 resources/js/store/modules/ui.js              |  5 ++++
 4 files changed, 17 insertions(+), 30 deletions(-)

diff --git a/resources/js/components/comunes/NavBar.vue b/resources/js/components/comunes/NavBar.vue
index 4bc97e2..ec65835 100644
--- a/resources/js/components/comunes/NavBar.vue
+++ b/resources/js/components/comunes/NavBar.vue
@@ -51,7 +51,7 @@
 
 <script>
 import ChismosaDropdown from '../pedidos/ChismosaDropdown.vue';
-import { mapActions, mapGetters, mapState } from "vuex";
+import { mapActions, mapGetters, mapMutations, mapState } from "vuex";
 
 export default {
     components: { ChismosaDropdown },
@@ -68,6 +68,7 @@ export default {
     },
     methods: {
         ...mapActions('productos', ["filtrarProductos"]),
+        ...mapMutations('ui',["addMiga"]),
         toggleBurger() {
             this.burgerActiva = !this.burgerActiva
         },
@@ -75,7 +76,7 @@ export default {
             if (this.burgerActiva)
                 this.toggleBurger();
             this.filtrarProductos({ filtro: "nombre", valor: this.searchString });
-            Event.$emit('migas-agregar', { nombre: this.searchString });
+            this.addMiga({ nombre: this.searchString });
         }
     },
 };
diff --git a/resources/js/components/pedidos/CategoriasContainer.vue b/resources/js/components/pedidos/CategoriasContainer.vue
index 4ad30c1..c31fd86 100644
--- a/resources/js/components/pedidos/CategoriasContainer.vue
+++ b/resources/js/components/pedidos/CategoriasContainer.vue
@@ -18,7 +18,7 @@
 </template>
 
 <script>
-import { mapActions, mapState } from "vuex";
+import { mapActions, mapMutations, mapState } from "vuex";
 export default {
     name: 'CategoriasContainer',
     computed: {
@@ -28,10 +28,11 @@ export default {
         }
     },
     methods: {
-        ...mapActions('productos', ["seleccionarCategoria"]),
+        ...mapActions('productos',["seleccionarCategoria"]),
+        ...mapMutations('ui',["addMiga"]),
         seleccionar(categoria) {
             this.seleccionarCategoria({ categoria: categoria });
-            Event.$emit('migas-agregar', { nombre: categoria });
+            this.addMiga({ nombre: categoria });
         }
     }
 }
diff --git a/resources/js/components/pedidos/NavMigas.vue b/resources/js/components/pedidos/NavMigas.vue
index c17d788..01fe891 100644
--- a/resources/js/components/pedidos/NavMigas.vue
+++ b/resources/js/components/pedidos/NavMigas.vue
@@ -11,39 +11,19 @@
 </template>
 
 <script>
-import { mapGetters } from "vuex";
+import { mapGetters, mapState } from "vuex";
 
 export default {
-    data() {
-        return {
-            initial: [{ nombre: 'Categorías', href: '/productos' }],
-            migas: [{ nombre: 'Categorías', href: '/productos' }],
-        }
-    },
     computed: {
-        ...mapGetters('pedido', ["pedidoDefinido"]),
-        visible: function () {
+        ...mapState('ui',["migas","miga_inicial"]),
+        ...mapGetters('pedido',["pedidoDefinido"]),
+        visible() {
             return this.migas.length > 0
         },
-        migaActiva: function () {
+        migaActiva() {
             return this.migas.length - 1
         }
     },
-    mounted() {
-        Event.$on('migas-setear-como-inicio', (miga) => {
-            this.migas = [];
-            this.migas.push(miga);
-        });
-        Event.$on('migas-agregar', (miga) => {
-            this.migas.push(miga);
-        });
-        Event.$on('migas-reset', () => {
-            this.migas = this.initial;
-        });
-        Event.$on('migas-pop', () => {
-            this.migas.pop();
-        });
-    }
 }
 </script>
 
diff --git a/resources/js/store/modules/ui.js b/resources/js/store/modules/ui.js
index 3144e16..f1d3e33 100644
--- a/resources/js/store/modules/ui.js
+++ b/resources/js/store/modules/ui.js
@@ -1,6 +1,8 @@
 const state = {
     show_chismosa: false,
     show_devoluciones: false,
+    miga_inicial: { nombre: 'Categorias', href: '/pedido' },
+    migas: [{ nombre: 'Categorias', href: '/pedido' }],
 };
 
 const mutations = {
@@ -10,6 +12,9 @@ const mutations = {
     toggleDevoluciones(state) {
         state.show_devoluciones = !state.show_devoluciones;
     },
+    addMiga(state, miga) {
+        state.migas.push(miga);
+    }
 };
 
 export default {
-- 
2.48.1


From 2f071e631d3034538c72cedece2f240894e76e07 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 23 May 2025 01:41:16 -0300
Subject: [PATCH 106/111] Pseudo routing con migas y dispatch en vez de href

---
 resources/js/components/pedidos/NavMigas.vue | 10 +++++++---
 resources/js/store/modules/ui.js             | 14 ++++++++++++--
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/resources/js/components/pedidos/NavMigas.vue b/resources/js/components/pedidos/NavMigas.vue
index 01fe891..6af213b 100644
--- a/resources/js/components/pedidos/NavMigas.vue
+++ b/resources/js/components/pedidos/NavMigas.vue
@@ -3,7 +3,7 @@
          aria-label="breadcrumbs" v-show="visible">
         <ul class="mt-4">
             <li v-for="(miga, i) in migas" :key="i" :class="{'is-active': i === migaActiva}">
-                <a :href="miga.href" v-text="miga.nombre"
+                <a @click="clickMiga({ miga: miga })" v-text="miga.nombre"
                    :class="{'has-text-danger': i !== migaActiva}"></a>
             </li>
         </ul>
@@ -11,11 +11,15 @@
 </template>
 
 <script>
-import { mapGetters, mapState } from "vuex";
+import { mapActions, mapGetters, mapState } from "vuex";
 
 export default {
+    methods: {
+        ...mapActions('productos',["getProductos"]),
+        ...mapActions('ui',["clickMiga"]),
+    },
     computed: {
-        ...mapState('ui',["migas","miga_inicial"]),
+        ...mapState('ui',["migas"]),
         ...mapGetters('pedido',["pedidoDefinido"]),
         visible() {
             return this.migas.length > 0
diff --git a/resources/js/store/modules/ui.js b/resources/js/store/modules/ui.js
index f1d3e33..e7a89de 100644
--- a/resources/js/store/modules/ui.js
+++ b/resources/js/store/modules/ui.js
@@ -1,8 +1,10 @@
+import { dropWhile } from "lodash/array";
+
 const state = {
     show_chismosa: false,
     show_devoluciones: false,
-    miga_inicial: { nombre: 'Categorias', href: '/pedido' },
-    migas: [{ nombre: 'Categorias', href: '/pedido' }],
+    miga_inicial: { nombre: 'Categorias', action: 'productos/getProductos' },
+    migas: [{ nombre: 'Categorias', action: 'productos/getProductos' }],
 };
 
 const mutations = {
@@ -14,6 +16,13 @@ const mutations = {
     },
     addMiga(state, miga) {
         state.migas.push(miga);
+    },
+};
+
+const actions = {
+    clickMiga({ dispatch }, { miga }) {
+        dispatch(miga.action, null, { root: true });
+        state.migas = dropWhile(state.migas.reverse(),(m => m.nombre !== miga.nombre)).reverse();
     }
 };
 
@@ -21,4 +30,5 @@ export default {
     namespaced: true,
     state,
     mutations,
+    actions,
 };
-- 
2.48.1


From 571b02382e6a927d2a0f14a726d1626f90296b05 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 23 May 2025 01:44:39 -0300
Subject: [PATCH 107/111] app limpiada

---
 resources/js/app.js | 76 ++++++---------------------------------------
 1 file changed, 10 insertions(+), 66 deletions(-)

diff --git a/resources/js/app.js b/resources/js/app.js
index 4f26a9f..40a3961 100644
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -5,6 +5,7 @@
  */
 import axios from 'axios';
 import Vue from 'vue';
+
 window.Vue = require('vue');
 window.Event = new Vue();
 window.axios = axios;
@@ -19,19 +20,17 @@ window.bulmaToast = require('bulma-toast');
  */
 import './components';
 import store from "./store";
+
 /**
  * Global methods
  */
-Vue.prototype.$settearProducto = function(cantidad, id) {
-  Event.$emit("sync-subpedido", this.cant, this.producto.id)
-}
-Vue.prototype.$toast = function(mensaje, duration = 2000) {
-  return window.bulmaToast.toast({
-    message: mensaje,
-    duration: duration,
-    type: 'is-danger',
-    position: 'bottom-center',
-  });
+Vue.prototype.$toast = function (mensaje, duration = 2000) {
+    return window.bulmaToast.toast({
+        message: mensaje,
+        duration: duration,
+        type: 'is-danger',
+        position: 'bottom-center',
+    });
 }
 
 /**
@@ -39,63 +38,8 @@ Vue.prototype.$toast = function(mensaje, duration = 2000) {
  * the page. Then, you may begin adding components to this application
  * or customize the JavaScript scaffolding to fit your unique needs.
  */
-const app = new Vue({
+new Vue({
     el: '#root',
     store,
-    data() {
-      return {
-        gdc: null,
-        pedido: null,
-        devoluciones: null,
-      }
-    },
-    computed: {
-      productos: function() {
-        return this.pedido.productos
-      }
-    },
-    methods: {
-      cantidad(producto) {
-        let pedido = this.productos.some(p => p.id == producto.id)
-        return pedido ? this.productos.find(p => p.id == producto.id).pivot.cantidad : 0
-      },
-      notas(producto) {
-        let pedido = this.productos.some(p => p.id == producto.id);
-        return pedido ? this.productos.find(p => p.id == producto.id).pivot.notas : "";
-      },
-    },
-    mounted() {
-      Event.$on('sync-subpedido', (cantidad, id, notas) => {
-          if (this.pedido.aprobado) {
-            this.$toast('No se puede modificar un pedido ya aprobado', 2000);
-            return;
-          }
-          axios.post("/api/subpedidos/" + this.pedido.id + "/sync", {
-            cantidad: cantidad,
-            producto_id: id,
-            notas: notas,
-          }).then((response) => {
-            this.pedido = response.data.data
-            this.$toast('Pedido actualizado exitosamente')
-            Event.$emit("pedido-actualizado");
-          });
-        });
-      // Actualizar monto y notas de devoluciones
-      Event.$on('sync-devoluciones', (total, notas) => {
-        if (this.pedido.aprobado) {
-          this.$toast('No se puede modificar un pedido ya aprobado', 2000);
-          return;
-        }
-
-        axios.post("api/subpedidos/" + this.pedido.id + "/sync_devoluciones", {
-          total: total,
-          notas: notas,
-        }).then((response) => {
-          this.pedido = response.data.data;
-          this.$toast('Pedido actualizado');
-          Event.$emit("pedido-actualizado");
-        });
-      });
-    },
 });
 
-- 
2.48.1


From 0dba210a6a647d1ae06b27b3d2fd9c31590cdde4 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 23 May 2025 02:12:55 -0300
Subject: [PATCH 108/111] Funciones para toast y mostrar errores

---
 resources/js/store/modules/ui.js | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/resources/js/store/modules/ui.js b/resources/js/store/modules/ui.js
index e7a89de..0fbb257 100644
--- a/resources/js/store/modules/ui.js
+++ b/resources/js/store/modules/ui.js
@@ -23,7 +23,21 @@ const actions = {
     clickMiga({ dispatch }, { miga }) {
         dispatch(miga.action, null, { root: true });
         state.migas = dropWhile(state.migas.reverse(),(m => m.nombre !== miga.nombre)).reverse();
-    }
+    },
+    toast(_, { mensaje }) {
+        return window.bulmaToast.toast({
+            message: mensaje,
+            duration: 2000,
+            type: 'is-danger',
+            position: 'bottom-center',
+        });
+    },
+    error({ dispatch }, { error }) {
+        const errorMsg = error.response && error.response.data && error.response.data.message
+            ? error.response.data.message
+            : error.message;
+        dispatch("toast", { mensaje: errorMsg });
+    },
 };
 
 export default {
-- 
2.48.1


From f837b7f066708bf1c8a9034f7a9ece1ee75561b4 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 23 May 2025 02:13:09 -0300
Subject: [PATCH 109/111] Tirando error cuando se intenta modificar un pedido
 aprobado

---
 .../Controllers/Api/SubpedidoController.php   |  5 +--
 resources/js/store/modules/pedido.js          | 34 ++++++++++++-------
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/app/Http/Controllers/Api/SubpedidoController.php b/app/Http/Controllers/Api/SubpedidoController.php
index 6303d7d..7e6b266 100644
--- a/app/Http/Controllers/Api/SubpedidoController.php
+++ b/app/Http/Controllers/Api/SubpedidoController.php
@@ -57,7 +57,7 @@ class SubpedidoController extends Controller
     // recibe request, saca producto y cantidad, valida, y pasa a syncProducto en Subpedido
     public function syncProductos(Subpedido $subpedido) {
         if ($subpedido->aprobado)
-            return new SubpedidoResource($subpedido);
+            abort(400, "No se puede modificar un pedido aprobado.");
 
         $valid = request()->validate([
             'cantidad'       => ['integer','required','min:0'],
@@ -84,7 +84,8 @@ class SubpedidoController extends Controller
     }
 
     public function syncDevoluciones(Subpedido $subpedido) {
-        if ($subpedido->aprobado) return new SubpedidoResource($subpedido);
+        if ($subpedido->aprobado)
+            abort(400, "No se puede modificar un pedido aprobado.");
 
         $valid = request()->validate([
             'total' => 'required|min:0',
diff --git a/resources/js/store/modules/pedido.js b/resources/js/store/modules/pedido.js
index fd4c8ed..6a2a2f3 100644
--- a/resources/js/store/modules/pedido.js
+++ b/resources/js/store/modules/pedido.js
@@ -42,20 +42,28 @@ const actions = {
         const response = await axios.get(`/api/subpedidos/${pedido.id}`);
         commit('setState', response.data.data);
     },
-    async modificarChismosa({ commit }, { producto_id, cantidad, notas }) {
-        const response = await axios.post("/api/subpedidos/" + state.pedido_id + "/sync", {
-            cantidad: cantidad,
-            producto_id: producto_id,
-            notas: notas,
-        });
-        commit('setState', response.data.data);
+    async modificarChismosa({ commit, dispatch }, { producto_id, cantidad, notas }) {
+        try {
+            const response = await axios.post("/api/subpedidos/" + state.pedido_id + "/sync", {
+                cantidad: cantidad,
+                producto_id: producto_id,
+                notas: notas,
+            });
+            commit('setState', response.data.data);
+        } catch (error) {
+            dispatch("ui/error", { error: error }, { root: true });
+        }
     },
-    async modificarDevoluciones({ commit }, { monto, notas }) {
-        const response = await axios.post("api/subpedidos/" + state.pedido_id + "/sync_devoluciones", {
-            total: monto,
-            notas: notas,
-        });
-        commit('setState', response.data.data);
+    async modificarDevoluciones({ commit, dispatch }, { monto, notas }) {
+        try {
+            const response = await axios.post("api/subpedidos/" + state.pedido_id + "/sync_devoluciones", {
+                total: monto,
+                notas: notas,
+            });
+            commit('setState', response.data.data);
+        } catch (error) {
+            dispatch("ui/error", { error: error }, { root: true });
+        }
     },
 };
 
-- 
2.48.1


From 5b9908e0b5eb5cba9286eff0056e0ba135102141 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 23 May 2025 02:18:12 -0300
Subject: [PATCH 110/111] Agregados toast

---
 resources/js/store/modules/admin.js  | 5 ++++-
 resources/js/store/modules/pedido.js | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/resources/js/store/modules/admin.js b/resources/js/store/modules/admin.js
index 7c45fd1..230bbf3 100644
--- a/resources/js/store/modules/admin.js
+++ b/resources/js/store/modules/admin.js
@@ -38,9 +38,12 @@ const actions = {
         const response = await axios.get('/user/grupo_de_compra');
         commit('setState', response.data);
     },
-    async setAprobacionPedido({ commit }, { pedido_id, aprobacion }){
+    async setAprobacionPedido({ commit, dispatch }, { pedido_id, aprobacion }){
         await axios.post("/api/admin/subpedidos/" + pedido_id + "/aprobacion", { aprobacion: aprobacion });
         await actions.getGrupoDeCompra({ commit });
+        dispatch("ui/toast",
+            { mensaje: `Pedido ${aprobacion ? '' : 'des' }aprobado con éxito.` },
+            { root: true });
     },
     async toggleCaracteristica({ commit }, { caracteristica_id }) {
         await axios.post(`/api/grupos-de-compra/${state.grupo_de_compra_id}/${caracteristica_id}`);
diff --git a/resources/js/store/modules/pedido.js b/resources/js/store/modules/pedido.js
index 6a2a2f3..1866f7a 100644
--- a/resources/js/store/modules/pedido.js
+++ b/resources/js/store/modules/pedido.js
@@ -50,6 +50,7 @@ const actions = {
                 notas: notas,
             });
             commit('setState', response.data.data);
+            dispatch("ui/toast", { mensaje: 'Pedido modificado con éxito' }, { root: true });
         } catch (error) {
             dispatch("ui/error", { error: error }, { root: true });
         }
@@ -61,6 +62,7 @@ const actions = {
                 notas: notas,
             });
             commit('setState', response.data.data);
+            dispatch("ui/toast", { mensaje: 'Devoluciones modificadas con éxito' }, { root: true });
         } catch (error) {
             dispatch("ui/error", { error: error }, { root: true });
         }
-- 
2.48.1


From 7140796ccd4f3e636f2a064b5b5ac87f91ee3fe2 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 23 May 2025 02:33:21 -0300
Subject: [PATCH 111/111] Usando sesion para recordar el pedido

---
 app/Http/Controllers/SessionController.php |  1 -
 resources/js/components/pedidos/Body.vue   | 10 +++++++++-
 resources/js/components/pedidos/Pedido.vue |  6 ------
 resources/js/store/modules/pedido.js       | 16 ++++++++++++++--
 4 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/app/Http/Controllers/SessionController.php b/app/Http/Controllers/SessionController.php
index b2b33fe..94b8552 100644
--- a/app/Http/Controllers/SessionController.php
+++ b/app/Http/Controllers/SessionController.php
@@ -5,7 +5,6 @@ namespace App\Http\Controllers;
 use App\Subpedido;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Log;
 use Illuminate\Validation\Rule;
 
 class SessionController extends Controller
diff --git a/resources/js/components/pedidos/Body.vue b/resources/js/components/pedidos/Body.vue
index 941cb53..c4b0628 100644
--- a/resources/js/components/pedidos/Body.vue
+++ b/resources/js/components/pedidos/Body.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script>
-import { mapGetters } from "vuex";
+import { mapActions, mapGetters } from "vuex";
 import PedidoSelectSection from "./PedidoSelectSection.vue";
 import Pedido from "./Pedido.vue";
 import CartelPedidoAprobado from "./CartelPedidoAprobado.vue";
@@ -17,5 +17,13 @@ export default {
     computed: {
         ...mapGetters('pedido',["pedidoDefinido"]),
     },
+    methods: {
+        ...mapActions('productos',["init"]),
+        ...mapActions('pedido',["getSesion"]),
+    },
+    async mounted() {
+        await this.init();
+        await this.getSesion();
+    }
 }
 </script>
diff --git a/resources/js/components/pedidos/Pedido.vue b/resources/js/components/pedidos/Pedido.vue
index 3613b7a..b6e3d1f 100644
--- a/resources/js/components/pedidos/Pedido.vue
+++ b/resources/js/components/pedidos/Pedido.vue
@@ -13,12 +13,6 @@ export default defineComponent({
     computed: {
         ...mapState('ui',["show_chismosa","show_devoluciones"])
     },
-    methods: {
-        ...mapActions('productos',["init"]),
-    },
-    async mounted() {
-        await this.init();
-    },
 })
 </script>
 
diff --git a/resources/js/store/modules/pedido.js b/resources/js/store/modules/pedido.js
index 1866f7a..cccc93b 100644
--- a/resources/js/store/modules/pedido.js
+++ b/resources/js/store/modules/pedido.js
@@ -31,15 +31,27 @@ const mutations = {
 };
 
 const actions = {
-    async crearPedido({ commit }, { nombre, grupo_de_compra_id }) {
+    async guardarSesion(_, { pedido_id }) {
+        await axios.post("/subpedidos/sesion", { id: pedido_id });
+    },
+    async getSesion({ commit }) {
+        const sesion = await axios.get("/subpedidos/sesion");
+        if (sesion.data) {
+            const response = await axios.get(`/api/subpedidos/${sesion.data}`);
+            commit('setState', response.data.data);
+        }
+    },
+    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
         });
+        dispatch("guardarSesion", { pedido_id: response.data.data.id});
         commit('setState', response.data.data);
     },
-    async elegirPedido({ commit }, { pedido }) {
+    async elegirPedido({ commit, dispatch }, { pedido }) {
         const response = await axios.get(`/api/subpedidos/${pedido.id}`);
+        dispatch("guardarSesion", { pedido_id: response.data.data.id})
         commit('setState', response.data.data);
     },
     async modificarChismosa({ commit, dispatch }, { producto_id, cantidad, notas }) {
-- 
2.48.1