From 800fed20978f78589aee284dce85678a22553c6e Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Tue, 27 Aug 2024 19:53:57 -0300
Subject: [PATCH 01/20] Agregada ruta para obtener total de pedidos

---
 routes/web.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/routes/web.php b/routes/web.php
index 2b57d96..c5c4d6e 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -34,11 +34,11 @@ Route::get('/admin/obtener_sesion', function() {
 
 Route::middleware(['auth', 'admin'])->group( function () {
 	Route::get('/admin/pedidos', 'AdminController@index')->name('admin_login.index');
-	
+
 	Route::get('/admin/exportar-planillas-a-pdf/{gdc}', 'AdminController@exportarPlanillasAPdf');
-	
+
 	Route::get('/admin/exportar-pedido-a-csv/{gdc}', 'AdminController@exportarPedidoACSV');
-	
+
 	Route::get('/admin/exportar-pedido-con-nucleos-a-csv/{gdc}', 'AdminController@exportarPedidoConNucleosACSV');
 });
 
@@ -70,3 +70,7 @@ Route::middleware('auth')->group( function() {
 		})->name('obtenerSesion');
 	});
 });
+
+Route::middleware(['auth', 'comi_compras'])->group( function() {
+    Route::get('/compras/pedidos', 'ComprasController@pedidos')->name('compras.pedidos');
+});

From f0f05f836130d3ef4588917afcd5b0f687c4fa2f Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Tue, 27 Aug 2024 20:56:20 -0300
Subject: [PATCH 02/20] Borrado controller no usado

---
 app/Http/Controllers/Api/PedidoController.php | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 app/Http/Controllers/Api/PedidoController.php

diff --git a/app/Http/Controllers/Api/PedidoController.php b/app/Http/Controllers/Api/PedidoController.php
deleted file mode 100644
index 8f2ec61..0000000
--- a/app/Http/Controllers/Api/PedidoController.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Api;
-use App\Http\Controllers\Controller;
-use Illuminate\Support\Facades\DB;
-
-class PedidoController extends Controller
-{
-}

From 48e1a04baec14f4bd8056d094ba5d5955f554289 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Tue, 27 Aug 2024 20:56:27 -0300
Subject: [PATCH 03/20] =?UTF-8?q?Borrado=20m=C3=A9todo=20no=20usado?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/Producto.php b/app/Producto.php
index a37d16a..3474063 100644
--- a/app/Producto.php
+++ b/app/Producto.php
@@ -16,7 +16,7 @@ class Producto extends Model
   {
     return $this->belongsToMany('App\Subpedido','productos_subpedidos')->withPivot(["cantidad"]);
   }
-  
+
   public function proveedor()
   {
     return $this->belongsTo('App\Proveedor');
@@ -33,10 +33,6 @@ class Producto extends Model
       return $request->has('paginar') && intval($request->input('paginar')) ? intval($request->input('paginar')) : self::$paginarPorDefecto;
   }
 
-  public static function productosIDFila() {
-    return Producto::pluck('fila', 'id',)->all();
-  }
-
   public static function productosFilaID() {
     return Producto::pluck('id', 'fila',)->all();
   }
@@ -44,5 +40,5 @@ class Producto extends Model
   public static function productosIDNombre() {
     return Producto::pluck('nombre', 'id',)->all();
   }
-  
+
 }

From 2beda0bf5b0f3fac8dbbaf1db6dd55fd8280add6 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Tue, 27 Aug 2024 20:57:11 -0300
Subject: [PATCH 04/20] =?UTF-8?q?ComprasController=20+=20hice=20est=C3=A1t?=
 =?UTF-8?q?icos=20algunos=20m=C3=A9todos=20+=20primeros=20pasos=20hacia=20?=
 =?UTF-8?q?total=20de=20pedidos=20de=20los=20barrios?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/GrupoDeCompra.php                      | 78 ++++++++++++++--------
 app/Http/Controllers/ComprasController.php | 14 ++++
 2 files changed, 66 insertions(+), 26 deletions(-)
 create mode 100644 app/Http/Controllers/ComprasController.php

diff --git a/app/GrupoDeCompra.php b/app/GrupoDeCompra.php
index 09ec62b..ead150c 100644
--- a/app/GrupoDeCompra.php
+++ b/app/GrupoDeCompra.php
@@ -2,11 +2,11 @@
 
 namespace App;
 
+use App\Producto;
 use Illuminate\Database\Eloquent\Model;
 use Mpdf\Mpdf;
 use League\Csv\CannotInsertRecord;
 use League\Csv\Writer;
-use App\Producto;
 use DB;
 use League\Csv\Reader;
 
@@ -40,7 +40,8 @@ class GrupoDeCompra extends Model
       $mpdf->Output($filename, "D");
   }
 
-  function filaVacia(string $product, int $columns) {
+  static function filaVacia(string $product, int $columns): array
+  {
     $fila = [$product];
     for ($i = 1; $i <= $columns; $i++) {
       $fila[$i] = "0";
@@ -49,23 +50,23 @@ class GrupoDeCompra extends Model
   }
 
   //Asume que los productos están gruadados en orden de fila
-  public function obtenerTemplateDeFilasVacias(int $columns){
+  public static function obtenerTemplateDeFilasVacias(int $columns){
     $productosFilaID = Producto::productosFilaID();
     $productosIDNombre = Producto::productosIDNombre();
     $num_fila = 1;
     $template = [];
     foreach ($productosFilaID as $fila => $id) {
       for ($i = $num_fila; $i < $fila; $i++) {
-        $template[$i] = $this->filaVacia("", $columns);
+        $template[$i] = GrupoDeCompra::filaVacia("", $columns);
       }
-      $template[$fila] = $this->filaVacia($productosIDNombre[$id], $columns);
+      $template[$fila] = GrupoDeCompra::filaVacia($productosIDNombre[$id], $columns);
       $num_fila = $fila+1;
     }
-    $template[$this->obtenerFilaDeBonoTransporte()] = $this->filaVacia("Bonos de transporte", $columns);
+    $template[GrupoDeCompra::obtenerFilaDeBonoTransporte()] = GrupoDeCompra::filaVacia("Bonos de transporte", $columns);
     return $template;
   }
 
-  private function obtenerFilaDeBonoTransporte() {
+  private static function obtenerFilaDeBonoTransporte() {
     $csv = Reader::createFromPath(resource_path('csv/productos.csv'), 'r');
     $csv->setDelimiter("|");
     $csv->setEnclosure("'");
@@ -105,19 +106,7 @@ class GrupoDeCompra extends Model
   }
 
   public function exportarPedidoEnCSV(){
-    $productos_en_pedido = DB::table('pedidos_aprobados')->where('grupo_de_compra_id',$this->id)->get()->keyBy('producto_id');
-
-    //si no hay pedidos aprobados, salir
-    if ($productos_en_pedido->count() == 0) { \Log::debug("El grupo de compra ". $this->nombre . " no tiene pedidos aprobados."); return; }
-    $records = $this->obtenerTemplateDeFilasVacias(1);
-    $productos_id_fila = Producto::productosIdFila();
-    foreach ($productos_en_pedido as $id => $producto_pedido){
-      $fila = $productos_id_fila[$id];
-      $records[$fila][1] = $producto_pedido->cantidad_pedida;
-    }
-    
-    $records[$this->obtenerFilaDeBonoTransporte()][1] = $this->calcularCantidadBDT();
-
+    $records = $this->generarColumnaCantidades();
     try {
       $writer = Writer::createFromPath(resource_path('csv/exports/'.$this->nombre.'.csv'), 'w');
       $writer->insertAll($records);
@@ -126,17 +115,41 @@ class GrupoDeCompra extends Model
     }
   }
 
+  public function generarColumnaCantidades() {
+      $productos_en_pedido = DB::table('pedidos_aprobados')->where('grupo_de_compra_id',$this->id)->get()->keyBy('producto_id');
+
+      //si no hay pedidos aprobados, salir
+      if ($productos_en_pedido->count() == 0) {
+          \Log::debug("El grupo de compra ". $this->nombre . " no tiene pedidos aprobados.");
+          return [];
+      }
+
+      $records = $this->obtenerTemplateDeFilasVacias(1);
+      $productos_id_fila = Producto::productosIdFila();
+      foreach ($productos_en_pedido as $id => $producto_pedido){
+          $fila = $productos_id_fila[$id];
+          $records[$fila][1] = $producto_pedido->cantidad_pedida;
+      }
+
+      $records[$this->obtenerFilaDeBonoTransporte()][1] = $this->calcularCantidadBDT();
+
+      return $records;
+  }
+
   public function exportarPedidoConNucleosEnCSV() {
     $productos_en_pedido = DB::table('pedidos_aprobados')->where('grupo_de_compra_id',$this->id)->get()->keyBy('producto_id');
 
     // si no hay pedidos aprobados, salir
-    if ($productos_en_pedido->count() == 0) { \Log::debug("El grupo de compra ". $this->nombre . " no tiene pedidos aprobados."); return; }
-    
+    if ($productos_en_pedido->count() == 0) {
+        \Log::debug("El grupo de compra ". $this->nombre . " no tiene pedidos aprobados.");
+        return;
+    }
+
     $pedidos = $this->pedidosAprobados();
     // Generar tabla vacía con una columna por núcleo
     $records = $this->obtenerTemplateDeFilasVacias($pedidos->count());
     $productos_id_fila = Producto::productosIdFila();
-    
+
     foreach ($productos_en_pedido as $id => $producto_pedido) {
       $fila = $productos_id_fila[$id];
       $i = 1;
@@ -155,7 +168,7 @@ class GrupoDeCompra extends Model
       $i++;
     }
     array_splice($records, 0, 0, array($nucleos));
-    
+
     // Guardar en un archivo .csv
     try {
       $writer = Writer::createFromPath(resource_path('csv/exports/'.$this->nombre.'-completo.csv'), 'w');
@@ -166,7 +179,20 @@ class GrupoDeCompra extends Model
   }
 
   public static function exportarTodosLosPedidosEnCSV(){
-    $gdcs=GrupoDeCompra::all();
-    foreach ($gdcs as $gdc){ $gdc->exportarPedidoEnCSV(); }
+    $gdcs = GrupoDeCompra::all();
+    $planilla = GrupoDeCompra::obtenerTemplateDeFilasVacias($gdcs->count());
+    $barrios = [""];
+    foreach ($gdcs as $gdc) {
+        $barrios[] = $gdc->nombre;
+    }
+    array_splice($planilla, 0, 0, array($barrios));
+
+    // Guardar en un archivo .csv
+    try {
+        $writer = Writer::createFromPath(resource_path('csv/exports/total-pedidos.csv'), 'w');
+        $writer->insertAll($planilla);
+    } catch (CannotInsertRecord $e) {
+        var_export($e->getRecords());
+    }
   }
 }
diff --git a/app/Http/Controllers/ComprasController.php b/app/Http/Controllers/ComprasController.php
new file mode 100644
index 0000000..ae4de0e
--- /dev/null
+++ b/app/Http/Controllers/ComprasController.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\GrupoDeCompra;
+
+class ComprasController
+{
+    public function pedidos() {
+        GrupoDeCompra::exportarTodosLosPedidosEnCSV();
+        $file = resource_path('csv/exports/total-pedidos.csv');
+        return response()->download($file);
+    }
+}

From 2d7a90f6b2697e480b3239fe6619732f74da6ba9 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Tue, 27 Aug 2024 21:21:10 -0300
Subject: [PATCH 05/20] Agregado middleware para comision compras + columna en
 tabla users

---
 app/Http/Middleware/Compras.php               | 26 +++++++++++++++
 ...08_28_000025_agregar_is_compras_a_user.php | 32 +++++++++++++++++++
 2 files changed, 58 insertions(+)
 create mode 100644 app/Http/Middleware/Compras.php
 create mode 100644 database/migrations/2024_08_28_000025_agregar_is_compras_a_user.php

diff --git a/app/Http/Middleware/Compras.php b/app/Http/Middleware/Compras.php
new file mode 100644
index 0000000..8852113
--- /dev/null
+++ b/app/Http/Middleware/Compras.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Auth;
+
+class Compras
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        $user = Auth::user();
+        if ($user->is_compras) {
+            return $next($request);
+        } else {
+            return response('Necesitás ser de comisión compras para hacer esto', 403);
+        }
+    }
+}
diff --git a/database/migrations/2024_08_28_000025_agregar_is_compras_a_user.php b/database/migrations/2024_08_28_000025_agregar_is_compras_a_user.php
new file mode 100644
index 0000000..57d12ac
--- /dev/null
+++ b/database/migrations/2024_08_28_000025_agregar_is_compras_a_user.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AgregarIsComprasAUser extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->boolean('is_compras')->after('is_admin')->default(0);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('producto_subpedido', function (Blueprint $table) {
+            $table->dropColumn('is_compras');
+        });
+    }
+}

From 5453b1158fddeb2b831df6c101c6d94ca5fa43aa Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 30 Aug 2024 01:13:06 -0300
Subject: [PATCH 06/20] Cambio en logica de registro automatico de componentes

---
 resources/js/app.js        |  5 ++---
 resources/js/components.js | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 resources/js/components.js

diff --git a/resources/js/app.js b/resources/js/app.js
index 026177f..3259426 100644
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -4,7 +4,6 @@
  * building robust, powerful web applications using Vue and Laravel.
  */
 import axios from 'axios';
-import animate from 'animate.css';
 import Vue from 'vue';
 window.Vue = require('vue');
 window.Event = new Vue();
@@ -18,8 +17,8 @@ window.bulmaToast = require('bulma-toast');
  *
  * Eg. ./components/ExampleComponent.vue -> <example-component></example-component>
  */
-const files = require.context('./', true, /\.vue$/i)
-files.keys().map(key => Vue.component(key.split('/').pop().split('.')[0], files(key).default))
+import './components';
+
 /**
  * Constants
  */
diff --git a/resources/js/components.js b/resources/js/components.js
new file mode 100644
index 0000000..e67790e
--- /dev/null
+++ b/resources/js/components.js
@@ -0,0 +1,22 @@
+import Vue from 'vue';
+
+const requireComponent = require.context('./components', true, /\.vue$/);
+
+requireComponent.keys().forEach(fileName => {
+    // Get the component config
+    const componentConfig = requireComponent(fileName);
+    // Get the PascalCase name of the component
+    const componentName = fileName
+        .replace(/^\.\/(.*)\.\w+$/, '$1')    // Remove "./" from the beginning and the file extension from the end
+        .replace(/\//g, '-')                 // Replace directories with hyphens
+        .replace(/([a-z])([A-Z])/g, '$1-$2') // Insert hyphen between camelCase words
+        .toLowerCase()                       // Convert to lowercase
+    // Globally register the component
+    Vue.component(
+        componentName,
+        // Look for the component options on `.default`, which will
+        // exist if the component was exported with `export default`,
+        // otherwise fall back to module's root.
+        componentConfig.default || componentConfig
+    );
+});

From 12b77de01885f636873d21316ce962c1ac33d1dc Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 30 Aug 2024 01:14:10 -0300
Subject: [PATCH 07/20] Refactor de componentes de pantallas de login

---
 .../{BotonAdminLogin.vue => admin/BotonLogin.vue}    |  3 ---
 .../components/{LoginAdmin.vue => admin/Login.vue}   |  0
 .../js/components/{ => comunes}/BarrioSelect.vue     |  0
 .../js/components/{ => comunes}/RegionSelect.vue     |  0
 resources/views/auth/admin_login.blade.php           |  6 +++---
 resources/views/auth/login.blade.php                 | 12 +++---------
 6 files changed, 6 insertions(+), 15 deletions(-)
 rename resources/js/components/{BotonAdminLogin.vue => admin/BotonLogin.vue} (88%)
 rename resources/js/components/{LoginAdmin.vue => admin/Login.vue} (100%)
 rename resources/js/components/{ => comunes}/BarrioSelect.vue (100%)
 rename resources/js/components/{ => comunes}/RegionSelect.vue (100%)

diff --git a/resources/js/components/BotonAdminLogin.vue b/resources/js/components/admin/BotonLogin.vue
similarity index 88%
rename from resources/js/components/BotonAdminLogin.vue
rename to resources/js/components/admin/BotonLogin.vue
index 87d03ba..717af22 100644
--- a/resources/js/components/BotonAdminLogin.vue
+++ b/resources/js/components/admin/BotonLogin.vue
@@ -12,9 +12,6 @@
 </template>
 
 <script>
-export default {
-    name: "BotonAdminLogin"
-}
 </script>
 
 <style scoped>
diff --git a/resources/js/components/LoginAdmin.vue b/resources/js/components/admin/Login.vue
similarity index 100%
rename from resources/js/components/LoginAdmin.vue
rename to resources/js/components/admin/Login.vue
diff --git a/resources/js/components/BarrioSelect.vue b/resources/js/components/comunes/BarrioSelect.vue
similarity index 100%
rename from resources/js/components/BarrioSelect.vue
rename to resources/js/components/comunes/BarrioSelect.vue
diff --git a/resources/js/components/RegionSelect.vue b/resources/js/components/comunes/RegionSelect.vue
similarity index 100%
rename from resources/js/components/RegionSelect.vue
rename to resources/js/components/comunes/RegionSelect.vue
diff --git a/resources/views/auth/admin_login.blade.php b/resources/views/auth/admin_login.blade.php
index fe34390..f1d4a07 100644
--- a/resources/views/auth/admin_login.blade.php
+++ b/resources/views/auth/admin_login.blade.php
@@ -21,11 +21,11 @@
             Contraseña incorrecta, intentalo nuevamente.
         </div>
         @enderror
-        <region-select v-bind:admin="true"></region-select>
+        <comunes-region-select v-bind:admin="true"></comunes-region-select>
         <form method="post" action="login">
             @csrf
-            <barrio-select v-bind:admin="true"></barrio-select>
-            <login-admin></login-admin>
+            <comunes-barrio-select v-bind:admin="true"></comunes-barrio-select>
+            <admin-login></admin-login>
         </form>
     </div>
 </section>
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index d3a2e5f..8226a1f 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -11,7 +11,7 @@
     <body>
         <section class="section">
         <div id="root" class="container">
-          <boton-admin-login></boton-admin-login>
+          <admin-boton-login></admin-boton-login>
           <h1 class="title">
             Pedidos MPS
           </h1>
@@ -23,10 +23,10 @@
               Contraseña incorrecta, intentalo nuevamente.
             </div>
           @enderror
-          <region-select></region-select>
+          <comunes-region-select></comunes-region-select>
           <form method="post" action="login">
             @csrf
-            <barrio-select></barrio-select>
+            <comunes-barrio-select></comunes-barrio-select>
             <login></login>
           </form>
         </div>
@@ -34,9 +34,3 @@
       <script src="{{ mix('js/app.js') }}" defer></script>
     </body>
 </html>
-<script>
-    import BotonAdminLogin from "../../js/components/BotonAdminLogin";
-    export default {
-        components: {BotonAdminLogin}
-    }
-</script>

From 003cb86ec0e148264cc028a2cf83cc5b9fc40d56 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 30 Aug 2024 01:33:47 -0300
Subject: [PATCH 08/20] Refactor de componentes de pantalla de admin

---
 .../{PedidosAdminBody.vue => admin/Body.vue}  | 39 +++++++++----------
 resources/js/components/admin/BotonLogin.vue  |  7 ----
 .../CaracteristicasOpcionales.vue}            | 11 ++----
 .../DropdownDescargar.vue}                    |  3 +-
 .../FilaCaracteristica.vue}                   |  1 -
 .../FilaPedido.vue}                           |  5 +--
 resources/js/components/admin/Login.vue       |  1 -
 .../SwitchAprobacion.vue}                     |  1 -
 .../TablaBonos.vue}                           |  3 +-
 .../TablaPedidos.vue}                         |  5 +--
 .../TabsSecciones.vue}                        |  3 +-
 .../views/auth/admin_subpedidos.blade.php     | 10 +----
 12 files changed, 31 insertions(+), 58 deletions(-)
 rename resources/js/components/{PedidosAdminBody.vue => admin/Body.vue} (73%)
 rename resources/js/components/{PedidosAdminCaracteristicasOpcionales.vue => admin/CaracteristicasOpcionales.vue} (71%)
 rename resources/js/components/{PedidosAdminDropdownDescargar.vue => admin/DropdownDescargar.vue} (97%)
 rename resources/js/components/{PedidosAdminFilaCaracteristica.vue => admin/FilaCaracteristica.vue} (97%)
 rename resources/js/components/{PedidosAdminFilaPedido.vue => admin/FilaPedido.vue} (85%)
 rename resources/js/components/{PedidosAdminSwitchAprobacion.vue => admin/SwitchAprobacion.vue} (96%)
 rename resources/js/components/{PedidosAdminTablaBonos.vue => admin/TablaBonos.vue} (98%)
 rename resources/js/components/{PedidosAdminTablaPedidos.vue => admin/TablaPedidos.vue} (96%)
 rename resources/js/components/{PedidosAdminTabsSecciones.vue => admin/TabsSecciones.vue} (96%)

diff --git a/resources/js/components/PedidosAdminBody.vue b/resources/js/components/admin/Body.vue
similarity index 73%
rename from resources/js/components/PedidosAdminBody.vue
rename to resources/js/components/admin/Body.vue
index 0ed28f6..1ad150e 100644
--- a/resources/js/components/PedidosAdminBody.vue
+++ b/resources/js/components/admin/Body.vue
@@ -1,15 +1,15 @@
 <template>
     <div class="container is-max-widescreen is-max-desktop">
-        <pedidos-admin-tabs-secciones></pedidos-admin-tabs-secciones>
+        <admin-tabs-secciones></admin-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-show="hayPedidos">
-                <pedidos-admin-dropdown-descargar
+                <admin-dropdown-descargar
                     :gdc="gdc">
-                </pedidos-admin-dropdown-descargar>
-                <pedidos-admin-tabla-pedidos
+                </admin-dropdown-descargar>
+                <admin-tabla-pedidos
                     :pedidos="pedidos" :bonosDeTransporte="bonosDeTransporte" :totalBonosBarriales="totalBonosBarriales">
-                </pedidos-admin-tabla-pedidos>
+                </admin-tabla-pedidos>
             </div>
             <p class="has-text-centered" v-show="!hayPedidos">
                 Todavía no hay ningún pedido para administrar.
@@ -17,35 +17,34 @@
         </div>
         <div class="block pb-6" id="bonos-seccion"
             :class="seccionActiva === 'bonos-seccion' ? 'is-active' : 'is-hidden'">
-            <pedidos-admin-tabla-bonos v-show="hayAprobados"
+            <admin-tabla-bonos v-show="hayAprobados"
                 :pedidos="pedidos">
-            </pedidos-admin-tabla-bonos>
+            </admin-tabla-bonos>
             <p class="has-text-centered" v-show="!hayAprobados">
                 Todavía no hay pedidos aprobados.
             </p>
         </div>
         <div class="block pb-6" id="caracteristicas-seccion"
              :class="seccionActiva === 'caracteristicas-seccion' ? 'is-active' : 'is-hidden'">
-            <pedidos-admin-caracteristicas-opcionales>
-            </pedidos-admin-caracteristicas-opcionales>
+            <admin-caracteristicas-opcionales>
+            </admin-caracteristicas-opcionales>
         </div>
     </div>
 </template>
 
 <script>
-import PedidosAdminTabsSecciones from './PedidosAdminTabsSecciones.vue';
-import PedidosAdminDropdownDescargar from "./PedidosAdminDropdownDescargar.vue";
-import PedidosAdminTablaBonos from './PedidosAdminTablaBonos.vue';
-import PedidosAdminTablaPedidos from "./PedidosAdminTablaPedidos.vue";
-import PedidosAdminCaracteristicasOpcionales from "./PedidosAdminCaracteristicasOpcionales.vue";
+import CaracteristicasOpcionales from "./CaracteristicasOpcionales.vue";
+import TabsSecciones from "./TabsSecciones.vue";
+import DropdownDescargar from "./DropdownDescargar.vue";
+import TablaPedidos from "./TablaPedidos.vue";
+import TablaBonos from "./TablaBonos.vue";
 export default {
-    name: "PedidosAdminBody",
     components: {
-        PedidosAdminCaracteristicasOpcionales,
-        PedidosAdminTabsSecciones,
-        PedidosAdminDropdownDescargar,
-        PedidosAdminTablaPedidos,
-        PedidosAdminTablaBonos,
+        CaracteristicasOpcionales,
+        TabsSecciones,
+        DropdownDescargar,
+        TablaPedidos,
+        TablaBonos,
     },
     data() {
         return {
diff --git a/resources/js/components/admin/BotonLogin.vue b/resources/js/components/admin/BotonLogin.vue
index 717af22..0ce0e17 100644
--- a/resources/js/components/admin/BotonLogin.vue
+++ b/resources/js/components/admin/BotonLogin.vue
@@ -10,10 +10,3 @@
         </a>
     </div>
 </template>
-
-<script>
-</script>
-
-<style scoped>
-
-</style>
diff --git a/resources/js/components/PedidosAdminCaracteristicasOpcionales.vue b/resources/js/components/admin/CaracteristicasOpcionales.vue
similarity index 71%
rename from resources/js/components/PedidosAdminCaracteristicasOpcionales.vue
rename to resources/js/components/admin/CaracteristicasOpcionales.vue
index 50d72e7..242dfb2 100644
--- a/resources/js/components/PedidosAdminCaracteristicasOpcionales.vue
+++ b/resources/js/components/admin/CaracteristicasOpcionales.vue
@@ -1,10 +1,8 @@
 <script>
-import axios from "axios";
-import PedidosAdminFilaCaracteristica from "./PedidosAdminFilaCaracteristica.vue";
+import FilaCaracteristica from "./FilaCaracteristica.vue";
 
 export default {
-    name: "PedidosAdminCaracteristicasOpcionales",
-    components: {PedidosAdminFilaCaracteristica},
+    components: { FilaCaracteristica },
     data() {
         return {
             caracteristicas: [
@@ -21,7 +19,6 @@ export default {
 
 <template>
     <div class="block">
-
         <table class="table is-fullwidth is-striped is-bordered">
             <thead>
                 <tr>
@@ -30,11 +27,11 @@ export default {
                 </tr>
             </thead>
             <tbody>
-                <pedidos-admin-fila-caracteristica
+                <admin-fila-caracteristica
                     v-for="(c,i) in caracteristicas"
                     :key="i"
                     :caracteristica="c">
-                </pedidos-admin-fila-caracteristica>
+                </admin-fila-caracteristica>
             </tbody>
         </table>
     </div>
diff --git a/resources/js/components/PedidosAdminDropdownDescargar.vue b/resources/js/components/admin/DropdownDescargar.vue
similarity index 97%
rename from resources/js/components/PedidosAdminDropdownDescargar.vue
rename to resources/js/components/admin/DropdownDescargar.vue
index 0e467a6..2396604 100644
--- a/resources/js/components/PedidosAdminDropdownDescargar.vue
+++ b/resources/js/components/admin/DropdownDescargar.vue
@@ -31,7 +31,6 @@
 
 <script>
 export default {
-    name: "PedidosAdminDropdownDescargar",
     props: {
         gdc: {
             type: Number,
@@ -54,4 +53,4 @@ export default {
 
 <style>
 
-</style>
\ No newline at end of file
+</style>
diff --git a/resources/js/components/PedidosAdminFilaCaracteristica.vue b/resources/js/components/admin/FilaCaracteristica.vue
similarity index 97%
rename from resources/js/components/PedidosAdminFilaCaracteristica.vue
rename to resources/js/components/admin/FilaCaracteristica.vue
index a747fb9..1e47a43 100644
--- a/resources/js/components/PedidosAdminFilaCaracteristica.vue
+++ b/resources/js/components/admin/FilaCaracteristica.vue
@@ -2,7 +2,6 @@
 import axios from "axios";
 
 export default {
-    name: "PedidosAdminFilaCaracteristica",
     props: {
         caracteristica: Object
     },
diff --git a/resources/js/components/PedidosAdminFilaPedido.vue b/resources/js/components/admin/FilaPedido.vue
similarity index 85%
rename from resources/js/components/PedidosAdminFilaPedido.vue
rename to resources/js/components/admin/FilaPedido.vue
index 30e6f1d..ffdb07a 100644
--- a/resources/js/components/PedidosAdminFilaPedido.vue
+++ b/resources/js/components/admin/FilaPedido.vue
@@ -13,11 +13,10 @@
 </template>
 
 <script>
-import PedidosAdminSwitchAprobacion from './PedidosAdminSwitchAprobacion.vue';
+import SwitchAprobacion from "./SwitchAprobacion.vue";
 export default {
-    name: "PedidosAdminFilaPedido",
     components: {
-        PedidosAdminSwitchAprobacion
+        SwitchAprobacion
     },
     props: {
         pedido: Object
diff --git a/resources/js/components/admin/Login.vue b/resources/js/components/admin/Login.vue
index 4a25f5e..cc9b07b 100644
--- a/resources/js/components/admin/Login.vue
+++ b/resources/js/components/admin/Login.vue
@@ -24,7 +24,6 @@
 
 <script>
     export default {
-        name: "LoginAdmin",
         data() {
             return {
                 visible: false,
diff --git a/resources/js/components/PedidosAdminSwitchAprobacion.vue b/resources/js/components/admin/SwitchAprobacion.vue
similarity index 96%
rename from resources/js/components/PedidosAdminSwitchAprobacion.vue
rename to resources/js/components/admin/SwitchAprobacion.vue
index 55ba5ff..4892669 100644
--- a/resources/js/components/PedidosAdminSwitchAprobacion.vue
+++ b/resources/js/components/admin/SwitchAprobacion.vue
@@ -12,7 +12,6 @@
 
 <script>
 export default {
-    name: "PedidosAdminSwitchAprobacion",
     props: {
         pedido: Object
     },
diff --git a/resources/js/components/PedidosAdminTablaBonos.vue b/resources/js/components/admin/TablaBonos.vue
similarity index 98%
rename from resources/js/components/PedidosAdminTablaBonos.vue
rename to resources/js/components/admin/TablaBonos.vue
index ae82e31..88a9942 100644
--- a/resources/js/components/PedidosAdminTablaBonos.vue
+++ b/resources/js/components/admin/TablaBonos.vue
@@ -39,7 +39,6 @@
 
 <script>
 export default {
-    name: "PedidosAdminTablaBonos",
     props: {
         pedidos: {
             type: Array,
@@ -95,4 +94,4 @@ export default {
 
 <style>
 
-</style>
\ No newline at end of file
+</style>
diff --git a/resources/js/components/PedidosAdminTablaPedidos.vue b/resources/js/components/admin/TablaPedidos.vue
similarity index 96%
rename from resources/js/components/PedidosAdminTablaPedidos.vue
rename to resources/js/components/admin/TablaPedidos.vue
index 9756673..d8a4eff 100644
--- a/resources/js/components/PedidosAdminTablaPedidos.vue
+++ b/resources/js/components/admin/TablaPedidos.vue
@@ -46,11 +46,10 @@
 </template>
 
 <script>
-import PedidosAdminFilaPedidoVue from './PedidosAdminFilaPedido.vue';
+import FilaPedido from "./FilaPedido.vue";
 export default {
-    name: "PedidosAdminTablaPedidos",
     components: {
-        PedidosAdminFilaPedidoVue
+        FilaPedido
     },
     props: {
         pedidos: {
diff --git a/resources/js/components/PedidosAdminTabsSecciones.vue b/resources/js/components/admin/TabsSecciones.vue
similarity index 96%
rename from resources/js/components/PedidosAdminTabsSecciones.vue
rename to resources/js/components/admin/TabsSecciones.vue
index 2be699f..0444b08 100644
--- a/resources/js/components/PedidosAdminTabsSecciones.vue
+++ b/resources/js/components/admin/TabsSecciones.vue
@@ -19,7 +19,6 @@
 
 <script>
 export default {
-    name: "PedidosAdminTabsSecciones",
     data() {
         return {
             tabActiva: "pedidos",
@@ -49,7 +48,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import 'bulma';
+@import '../../../../node_modules/bulma';
   hr {
     border: none;
     height: 1px;
diff --git a/resources/views/auth/admin_subpedidos.blade.php b/resources/views/auth/admin_subpedidos.blade.php
index d714ce6..76fedf2 100644
--- a/resources/views/auth/admin_subpedidos.blade.php
+++ b/resources/views/auth/admin_subpedidos.blade.php
@@ -1,13 +1,5 @@
 @extends('layouts.app')
 
 @section('content')
-    <pedidos-admin-body></pedidos-admin-body>
+    <admin-body></admin-body>
 @endsection
-<script>
-    import PedidosAdminBody from "../../js/components/PedidosAdminBody.vue";
-    export default {
-        components: {
-            PedidosAdminBody
-        }
-    }
-</script>

From 189342d7852c7c8e3c506d1fee73abaeeb079a7c Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Fri, 30 Aug 2024 01:34:03 -0300
Subject: [PATCH 09/20] Refactor de componentes de pantalla de pedidos

---
 resources/js/components/{ => comunes}/NavBar.vue       |  6 +++---
 .../components/{ => pedidos}/CartelPedidoAprobado.vue  |  0
 .../components/{ => pedidos}/CategoriasContainer.vue   |  0
 resources/js/components/{ => pedidos}/Chismosa.vue     |  2 +-
 .../js/components/{ => pedidos}/ChismosaDropdown.vue   |  2 +-
 .../js/components/{ => pedidos}/DevolucionesModal.vue  |  0
 resources/js/components/{ => pedidos}/Login.vue        |  3 +--
 resources/js/components/{ => pedidos}/NavMigas.vue     |  0
 .../js/components/{ => pedidos}/ProductoModal.vue      |  0
 resources/js/components/{ => pedidos}/ProductoRow.vue  |  0
 .../js/components/{ => pedidos}/ProductosContainer.vue |  0
 .../js/components/{ => pedidos}/SubpedidoSelect.vue    |  0
 resources/views/layouts/app.blade.php                  |  8 ++++----
 resources/views/productos.blade.php                    | 10 +++++-----
 14 files changed, 15 insertions(+), 16 deletions(-)
 rename resources/js/components/{ => comunes}/NavBar.vue (88%)
 rename resources/js/components/{ => pedidos}/CartelPedidoAprobado.vue (100%)
 rename resources/js/components/{ => pedidos}/CategoriasContainer.vue (100%)
 rename resources/js/components/{ => pedidos}/Chismosa.vue (95%)
 rename resources/js/components/{ => pedidos}/ChismosaDropdown.vue (96%)
 rename resources/js/components/{ => pedidos}/DevolucionesModal.vue (100%)
 rename resources/js/components/{ => pedidos}/Login.vue (98%)
 rename resources/js/components/{ => pedidos}/NavMigas.vue (100%)
 rename resources/js/components/{ => pedidos}/ProductoModal.vue (100%)
 rename resources/js/components/{ => pedidos}/ProductoRow.vue (100%)
 rename resources/js/components/{ => pedidos}/ProductosContainer.vue (100%)
 rename resources/js/components/{ => pedidos}/SubpedidoSelect.vue (100%)

diff --git a/resources/js/components/NavBar.vue b/resources/js/components/comunes/NavBar.vue
similarity index 88%
rename from resources/js/components/NavBar.vue
rename to resources/js/components/comunes/NavBar.vue
index efe574a..bb5a6d4 100644
--- a/resources/js/components/NavBar.vue
+++ b/resources/js/components/comunes/NavBar.vue
@@ -11,7 +11,7 @@
         <p class="navbar-item">
           <slot name="subpedido"></slot>
         </p>
-        <chismosa-dropdown v-if="this.$root.pedido != null" class="hide-above-1023" id="mobile"></chismosa-dropdown>
+        <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>
@@ -28,7 +28,7 @@
               </a>
               <input class="input is-small" type="text" placeholder="Harina" v-model="searchString"  @keyup.enter="buscar" >
             </div>
-            <chismosa-dropdown v-if="this.$root.pedido != null" class="hide-below-1024" id="wide"></chismosa-dropdown>
+            <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
@@ -41,7 +41,7 @@
 </template>
 
 <script>
-import ChismosaDropdown from './ChismosaDropdown.vue';
+import ChismosaDropdown from '../pedidos/ChismosaDropdown.vue';
 export default {
   components: { ChismosaDropdown },
   data() {
diff --git a/resources/js/components/CartelPedidoAprobado.vue b/resources/js/components/pedidos/CartelPedidoAprobado.vue
similarity index 100%
rename from resources/js/components/CartelPedidoAprobado.vue
rename to resources/js/components/pedidos/CartelPedidoAprobado.vue
diff --git a/resources/js/components/CategoriasContainer.vue b/resources/js/components/pedidos/CategoriasContainer.vue
similarity index 100%
rename from resources/js/components/CategoriasContainer.vue
rename to resources/js/components/pedidos/CategoriasContainer.vue
diff --git a/resources/js/components/Chismosa.vue b/resources/js/components/pedidos/Chismosa.vue
similarity index 95%
rename from resources/js/components/Chismosa.vue
rename to resources/js/components/pedidos/Chismosa.vue
index c14b00b..47585cc 100644
--- a/resources/js/components/Chismosa.vue
+++ b/resources/js/components/pedidos/Chismosa.vue
@@ -40,7 +40,7 @@
             </tr>
             </tfoot>
             <tbody>
-            <producto-row v-for="producto in productos" :producto="producto" :key="producto.id"></producto-row>
+            <pedidos-producto-row v-for="producto in productos" :producto="producto" :key="producto.id"></pedidos-producto-row>
             </tbody>
         </table>
         <p class="has-text-centered" v-show="productos.length == 0">
diff --git a/resources/js/components/ChismosaDropdown.vue b/resources/js/components/pedidos/ChismosaDropdown.vue
similarity index 96%
rename from resources/js/components/ChismosaDropdown.vue
rename to resources/js/components/pedidos/ChismosaDropdown.vue
index 9e8c834..e0221ee 100644
--- a/resources/js/components/ChismosaDropdown.vue
+++ b/resources/js/components/pedidos/ChismosaDropdown.vue
@@ -11,7 +11,7 @@
         <div class="dropdown-menu chismosa-menu" :id="id" role="menu">
             <div class="dropdown-content">
                 <div class="dropdown-item">
-                    <chismosa></chismosa>
+                    <pedidos-chismosa></pedidos-chismosa>
                 </div>
             </div>
         </div>
diff --git a/resources/js/components/DevolucionesModal.vue b/resources/js/components/pedidos/DevolucionesModal.vue
similarity index 100%
rename from resources/js/components/DevolucionesModal.vue
rename to resources/js/components/pedidos/DevolucionesModal.vue
diff --git a/resources/js/components/Login.vue b/resources/js/components/pedidos/Login.vue
similarity index 98%
rename from resources/js/components/Login.vue
rename to resources/js/components/pedidos/Login.vue
index 6530957..9b8161e 100644
--- a/resources/js/components/Login.vue
+++ b/resources/js/components/pedidos/Login.vue
@@ -8,7 +8,7 @@
 				</div>
 				<div class="control">
 					<a class="button is-info" @click="togglePassword">
-						{{ (passwordVisible ? 'Ocultar' : 'Mostrar') + ' contraseña'}} 
+						{{ (passwordVisible ? 'Ocultar' : 'Mostrar') + ' contraseña'}}
 					</a>
 				</div>
 			</div>
@@ -24,7 +24,6 @@
 
 <script>
 	export default {
-		name: 'Login',
 		data() {
 			return {
 				visible: false,
diff --git a/resources/js/components/NavMigas.vue b/resources/js/components/pedidos/NavMigas.vue
similarity index 100%
rename from resources/js/components/NavMigas.vue
rename to resources/js/components/pedidos/NavMigas.vue
diff --git a/resources/js/components/ProductoModal.vue b/resources/js/components/pedidos/ProductoModal.vue
similarity index 100%
rename from resources/js/components/ProductoModal.vue
rename to resources/js/components/pedidos/ProductoModal.vue
diff --git a/resources/js/components/ProductoRow.vue b/resources/js/components/pedidos/ProductoRow.vue
similarity index 100%
rename from resources/js/components/ProductoRow.vue
rename to resources/js/components/pedidos/ProductoRow.vue
diff --git a/resources/js/components/ProductosContainer.vue b/resources/js/components/pedidos/ProductosContainer.vue
similarity index 100%
rename from resources/js/components/ProductosContainer.vue
rename to resources/js/components/pedidos/ProductosContainer.vue
diff --git a/resources/js/components/SubpedidoSelect.vue b/resources/js/components/pedidos/SubpedidoSelect.vue
similarity index 100%
rename from resources/js/components/SubpedidoSelect.vue
rename to resources/js/components/pedidos/SubpedidoSelect.vue
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 8ba4413..a06c090 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -19,7 +19,7 @@
 </head>
 <body class="has-navbar-fixed-top">
     <div id="root">
-        <nav-bar>
+        <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">
@@ -27,11 +27,11 @@
                     @csrf
                 </form>
             </template>
-        </nav-bar>
-        <nav-migas></nav-migas>
+        </comunes-nav-bar>
+        <pedidos-nav-migas></pedidos-nav-migas>
 
         <main id="main" class="py-4 has-top-padding">
-            <cartel-pedido-aprobado></cartel-pedido-aprobado>
+            <pedidos-cartel-pedido-aprobado></pedidos-cartel-pedido-aprobado>
             @yield('content')
         </main>
     </div>
diff --git a/resources/views/productos.blade.php b/resources/views/productos.blade.php
index fd29893..d3e5f5c 100644
--- a/resources/views/productos.blade.php
+++ b/resources/views/productos.blade.php
@@ -1,9 +1,9 @@
 @extends('layouts.app')
 
 @section('content')
-<chismosa></chismosa>
-<categorias-container></categorias-container>
-<productos-container></productos-container>
-<producto-modal></producto-modal>
-<devoluciones-modal></devoluciones-modal>
+<pedidos-chismosa></pedidos-chismosa>
+<pedidos-categorias-container></pedidos-categorias-container>
+<pedidos-productos-container></pedidos-productos-container>
+<pedidos-producto-modal></pedidos-producto-modal>
+<pedidos-devoluciones-modal></pedidos-devoluciones-modal>
 @endsection

From 9259248caf28c7508c43d50b148aaba5f9d3ff0f Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Tue, 10 Sep 2024 20:23:49 -0300
Subject: [PATCH 10/20] Middleware de compras andando

---
 app/Http/Kernel.php | 1 +
 routes/web.php      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 62c91ee..fdb1f26 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -38,6 +38,7 @@ class Kernel extends HttpKernel
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
             \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
+            \App\Http\Middleware\Compras::class,
         ],
 
         'api' => [
diff --git a/routes/web.php b/routes/web.php
index bab30fc..f427bf9 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -76,6 +76,6 @@ Route::middleware('auth')->group( function() {
 	});
 });
 
-Route::middleware(['auth', 'comi_compras'])->group( function() {
+Route::middleware(['auth', 'compras'])->group( function() {
     Route::get('/compras/pedidos', 'ComprasController@pedidos')->name('compras.pedidos');
 });

From 53691f6a3016151ac8f1857b4fbb4751f3463ecb Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Tue, 10 Sep 2024 21:03:01 -0300
Subject: [PATCH 11/20] Arreglado middleware compras

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

diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index fdb1f26..243f1f2 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -38,7 +38,6 @@ class Kernel extends HttpKernel
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
             \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
-            \App\Http\Middleware\Compras::class,
         ],
 
         'api' => [
@@ -58,6 +57,7 @@ class Kernel extends HttpKernel
     protected $routeMiddleware = [
         'auth' => \App\Http\Middleware\Authenticate::class,
         'admin' => \App\Http\Middleware\Admin::class,
+        'compras' => \App\Http\Middleware\Compras::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
         'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
         'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,

From bf3f6972991f2170acc2eaa1abaebbb704d7c699 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Tue, 10 Sep 2024 21:11:22 -0300
Subject: [PATCH 12/20] Agregadas rutas con middleware y pantalla de login
 vacia

---
 app/Http/Controllers/ComprasController.php   |  5 +++
 app/Http/Middleware/Compras.php              | 15 +++++----
 resources/views/auth/compras_login.blade.php | 32 ++++++++++++++++++++
 routes/web.php                               |  4 ++-
 4 files changed, 49 insertions(+), 7 deletions(-)
 create mode 100644 resources/views/auth/compras_login.blade.php

diff --git a/app/Http/Controllers/ComprasController.php b/app/Http/Controllers/ComprasController.php
index ae4de0e..0104a7e 100644
--- a/app/Http/Controllers/ComprasController.php
+++ b/app/Http/Controllers/ComprasController.php
@@ -11,4 +11,9 @@ class ComprasController
         $file = resource_path('csv/exports/total-pedidos.csv');
         return response()->download($file);
     }
+
+    public function showLoginForm()
+    {
+        return view('auth/compras_login');
+    }
 }
diff --git a/app/Http/Middleware/Compras.php b/app/Http/Middleware/Compras.php
index 8852113..d3a81ad 100644
--- a/app/Http/Middleware/Compras.php
+++ b/app/Http/Middleware/Compras.php
@@ -3,21 +3,24 @@
 namespace App\Http\Middleware;
 
 use Closure;
-use Auth;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
 class Compras
 {
     /**
      * Handle an incoming request.
      *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
+     * @param Request $request
+     * @param Closure $next
      * @return mixed
      */
-    public function handle($request, Closure $next)
+    public function handle(Request $request, Closure $next)
     {
-        $user = Auth::user();
-        if ($user->is_compras) {
+        if (!Auth::check())
+            return redirect()->route('compras.login');
+
+        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/resources/views/auth/compras_login.blade.php b/resources/views/auth/compras_login.blade.php
new file mode 100644
index 0000000..c76f045
--- /dev/null
+++ b/resources/views/auth/compras_login.blade.php
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html class="has-background-warning" lang="{{ str_replace('_', '-', app()->getLocale()) }}">
+    <head>
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <title>{{ config('app.name', 'Pedidos del MPS') }}</title>
+        <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.9.3/css/bulma.min.css">
+        <link rel="stylesheet" href="{{ mix('css/app.css') }}">
+        <script src="https://kit.fontawesome.com/9235d1c676.js" crossorigin="anonymous"></script>
+    </head>
+    <body>
+        <section class="section">
+        <div id="root" class="container">
+          <h1 class="title">
+            Pedidos MPS
+          </h1>
+          <p class="subtitle">
+            Bienvenidx a la sección de compras de la aplicación del <strong>Mercado Popular de Subsistencia</strong>
+          </p>
+          @error('name')
+            <div class="notification is-danger">
+              Contraseña incorrecta, intentalo nuevamente.
+            </div>
+          @enderror
+          <form method="post" action="login">
+            @csrf
+          </form>
+        </div>
+      </section>
+      <script src="{{ mix('js/app.js') }}" defer></script>
+    </body>
+</html>
diff --git a/routes/web.php b/routes/web.php
index f427bf9..147ffc0 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -76,6 +76,8 @@ Route::middleware('auth')->group( function() {
 	});
 });
 
-Route::middleware(['auth', 'compras'])->group( function() {
+Route::get('/compras/login', 'ComprasController@showLoginForm')->name('compras.login');
+
+Route::middleware(['compras'])->group( function() {
     Route::get('/compras/pedidos', 'ComprasController@pedidos')->name('compras.pedidos');
 });

From 5f565a3f5a3fa2fb0471e57951a50d1911c3fd78 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Tue, 10 Sep 2024 22:07:11 -0300
Subject: [PATCH 13/20] Pantalla de login con textfields + agregado caso de
 usuario de compras a LoginController.php

---
 app/Http/Controllers/Auth/LoginController.php |  4 +-
 resources/js/components/LoginCompras.vue      | 52 +++++++++++++++++++
 resources/views/auth/compras_login.blade.php  |  1 +
 3 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 resources/js/components/LoginCompras.vue

diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 1a061e6..c4092fa 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -31,7 +31,9 @@ class LoginController extends Controller
 
     protected function authenticated(Request $request, $user)
     {
-        if ($user->is_admin) {
+        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 {
diff --git a/resources/js/components/LoginCompras.vue b/resources/js/components/LoginCompras.vue
new file mode 100644
index 0000000..b68a95e
--- /dev/null
+++ b/resources/js/components/LoginCompras.vue
@@ -0,0 +1,52 @@
+<template>
+    <div class="block">
+        <div class="field">
+            <label class="label">Usuario</label>
+            <div class="field">
+                <div class="control">
+                    <input required class="input" type="text" name="user"  placeholder="Usuario">
+                </div>
+            </div>
+        </div>
+        <div class="field">
+            <label class="label">Contraseña</label>
+            <div class="field has-addons">
+				<div class="control">
+					<input required class="input" :type="this.passwordType" name="password"  placeholder="Contraseña">
+				</div>
+				<div class="control">
+					<a class="button is-dark" @click="togglePassword">
+						{{ (passwordVisible ? 'Ocultar' : 'Mostrar') + ' contraseña'}}
+					</a>
+				</div>
+			</div>
+        </div>
+        <div class="field">
+            <div class="control">
+                <input type="submit" class="button is-dark" value="Ingresar"/>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    export default {
+        name: "LoginAdmin",
+        data() {
+            return {
+				passwordVisible: false,
+				passwordType: "password",
+            }
+        },
+		methods: {
+			togglePassword() {
+				if (this.passwordVisible) this.passwordType = "password";
+				else this.passwordType = "text"
+				this.passwordVisible = !this.passwordVisible
+			}
+		}
+    }
+</script>
+
+<style>
+</style>
diff --git a/resources/views/auth/compras_login.blade.php b/resources/views/auth/compras_login.blade.php
index c76f045..e34b53b 100644
--- a/resources/views/auth/compras_login.blade.php
+++ b/resources/views/auth/compras_login.blade.php
@@ -24,6 +24,7 @@
           @enderror
           <form method="post" action="login">
             @csrf
+              <login-compras></login-compras>
           </form>
         </div>
       </section>

From 2337ad9a37af9c2629ee87d835f267ebb69ad8a2 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Sat, 14 Sep 2024 13:37:06 -0300
Subject: [PATCH 14/20] Login de compras funcionando

---
 app/Http/Controllers/ComprasController.php | 2 +-
 app/Http/Middleware/Compras.php            | 2 +-
 resources/js/components/LoginCompras.vue   | 2 +-
 routes/web.php                             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/ComprasController.php b/app/Http/Controllers/ComprasController.php
index 0104a7e..7cc60c3 100644
--- a/app/Http/Controllers/ComprasController.php
+++ b/app/Http/Controllers/ComprasController.php
@@ -12,7 +12,7 @@ class ComprasController
         return response()->download($file);
     }
 
-    public function showLoginForm()
+    public function show()
     {
         return view('auth/compras_login');
     }
diff --git a/app/Http/Middleware/Compras.php b/app/Http/Middleware/Compras.php
index d3a81ad..a9d9f6b 100644
--- a/app/Http/Middleware/Compras.php
+++ b/app/Http/Middleware/Compras.php
@@ -18,7 +18,7 @@ class Compras
     public function handle(Request $request, Closure $next)
     {
         if (!Auth::check())
-            return redirect()->route('compras.login');
+            return redirect()->route('compras_login.show');
 
         if (Auth::user()->is_compras) {
             return $next($request);
diff --git a/resources/js/components/LoginCompras.vue b/resources/js/components/LoginCompras.vue
index b68a95e..23d1133 100644
--- a/resources/js/components/LoginCompras.vue
+++ b/resources/js/components/LoginCompras.vue
@@ -4,7 +4,7 @@
             <label class="label">Usuario</label>
             <div class="field">
                 <div class="control">
-                    <input required class="input" type="text" name="user"  placeholder="Usuario">
+                    <input required class="input" type="text" name="name"  placeholder="Usuario">
                 </div>
             </div>
         </div>
diff --git a/routes/web.php b/routes/web.php
index 147ffc0..6872466 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -76,7 +76,7 @@ Route::middleware('auth')->group( function() {
 	});
 });
 
-Route::get('/compras/login', 'ComprasController@showLoginForm')->name('compras.login');
+Route::get('/compras', 'ComprasController@show')->name('compras_login.show');
 
 Route::middleware(['compras'])->group( function() {
     Route::get('/compras/pedidos', 'ComprasController@pedidos')->name('compras.pedidos');

From 917e3e1df3fbc8d8435b809308647eea2e528589 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Sat, 14 Sep 2024 16:25:57 -0300
Subject: [PATCH 15/20] Ajustes de refactor

---
 resources/js/components.js                                    | 3 +++
 .../js/components/{LoginCompras.vue => compras/Login.vue}     | 0
 resources/js/components/{ => pedidos}/ProductoCard.vue        | 2 +-
 resources/js/components/pedidos/ProductosContainer.vue        | 4 ++--
 resources/views/auth/compras_login.blade.php                  | 2 +-
 resources/views/auth/login.blade.php                          | 2 +-
 resources/views/subpedidos_create.blade.php                   | 2 +-
 7 files changed, 9 insertions(+), 6 deletions(-)
 rename resources/js/components/{LoginCompras.vue => compras/Login.vue} (100%)
 rename resources/js/components/{ => pedidos}/ProductoCard.vue (98%)

diff --git a/resources/js/components.js b/resources/js/components.js
index e67790e..d2ca0bb 100644
--- a/resources/js/components.js
+++ b/resources/js/components.js
@@ -2,6 +2,9 @@ import Vue from 'vue';
 
 const requireComponent = require.context('./components', true, /\.vue$/);
 
+// Registro automático de componentes:
+//  e.g. components/foo/bar/UnComponente.vue
+//       se registra como 'foo-bar-un-componente'
 requireComponent.keys().forEach(fileName => {
     // Get the component config
     const componentConfig = requireComponent(fileName);
diff --git a/resources/js/components/LoginCompras.vue b/resources/js/components/compras/Login.vue
similarity index 100%
rename from resources/js/components/LoginCompras.vue
rename to resources/js/components/compras/Login.vue
diff --git a/resources/js/components/ProductoCard.vue b/resources/js/components/pedidos/ProductoCard.vue
similarity index 98%
rename from resources/js/components/ProductoCard.vue
rename to resources/js/components/pedidos/ProductoCard.vue
index 0790be0..8722642 100644
--- a/resources/js/components/ProductoCard.vue
+++ b/resources/js/components/pedidos/ProductoCard.vue
@@ -103,7 +103,7 @@ export default {
 </template>
 
 <style lang="scss" scoped>
-@use "bulma/sass/utilities/mixins";
+@use "../../../../node_modules/bulma/sass/utilities/mixins";
 
 @include mixins.until(mixins.$desktop) {
     .hidden-until-desktop {
diff --git a/resources/js/components/pedidos/ProductosContainer.vue b/resources/js/components/pedidos/ProductosContainer.vue
index 99c29e4..f721695 100644
--- a/resources/js/components/pedidos/ProductosContainer.vue
+++ b/resources/js/components/pedidos/ProductosContainer.vue
@@ -9,7 +9,6 @@
 
 <script>
 import ProductoCard from "./ProductoCard.vue";
-
 export default {
     components: {ProductoCard},
 	data() {
@@ -50,4 +49,5 @@ export default {
 			return params
 		},
 	  }
-	}</script>
+	}
+</script>
diff --git a/resources/views/auth/compras_login.blade.php b/resources/views/auth/compras_login.blade.php
index e34b53b..6217038 100644
--- a/resources/views/auth/compras_login.blade.php
+++ b/resources/views/auth/compras_login.blade.php
@@ -24,7 +24,7 @@
           @enderror
           <form method="post" action="login">
             @csrf
-              <login-compras></login-compras>
+              <compras-login></compras-login>
           </form>
         </div>
       </section>
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 8226a1f..822042a 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -27,7 +27,7 @@
           <form method="post" action="login">
             @csrf
             <comunes-barrio-select></comunes-barrio-select>
-            <login></login>
+            <pedidos-login></pedidos-login>
           </form>
         </div>
       </section>
diff --git a/resources/views/subpedidos_create.blade.php b/resources/views/subpedidos_create.blade.php
index fbeb87e..db0ccaf 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>
-  <subpedido-select gdcid="{{Auth::user()->grupoDeCompra->id}}"></subpedido-select>
+  <pedidos-subpedido-select gdcid="{{Auth::user()->grupoDeCompra->id}}"></pedidos-subpedido-select>
 </div>
 </section>
 @endsection

From 744b867af3f09b4c9f3b1530e277f3e3bbf84d4a Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Tue, 17 Sep 2024 20:41:50 -0300
Subject: [PATCH 16/20] Agregado body de compras y cambios en rutas

---
 app/Http/Controllers/ComprasController.php |  6 +++++-
 resources/js/components/compras/Body.vue   | 22 ++++++++++++++++++++++
 resources/views/compras_pedidos.blade.php  |  5 +++++
 routes/web.php                             |  3 ++-
 4 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 resources/js/components/compras/Body.vue
 create mode 100644 resources/views/compras_pedidos.blade.php

diff --git a/app/Http/Controllers/ComprasController.php b/app/Http/Controllers/ComprasController.php
index 7cc60c3..5c7e3d1 100644
--- a/app/Http/Controllers/ComprasController.php
+++ b/app/Http/Controllers/ComprasController.php
@@ -6,7 +6,11 @@ use App\GrupoDeCompra;
 
 class ComprasController
 {
-    public function pedidos() {
+    public function indexPedidos() {
+        return view('compras_pedidos');
+    }
+
+    public function descargarPedidos() {
         GrupoDeCompra::exportarTodosLosPedidosEnCSV();
         $file = resource_path('csv/exports/total-pedidos.csv');
         return response()->download($file);
diff --git a/resources/js/components/compras/Body.vue b/resources/js/components/compras/Body.vue
new file mode 100644
index 0000000..6b0a468
--- /dev/null
+++ b/resources/js/components/compras/Body.vue
@@ -0,0 +1,22 @@
+<template>
+    <div class="container is-fluid has-text-centered">
+        <div class="block">
+            <div class="field">
+                <p class="control">
+                    <a href="/compras/pedidos/descargar" class="button">
+                        <span class="icon is-small">
+                            <i class="fas fa-download"></i>
+                        </span>
+                        <span>Descargar planilla de totales</span>
+                    </a>
+                </p>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
diff --git a/resources/views/compras_pedidos.blade.php b/resources/views/compras_pedidos.blade.php
new file mode 100644
index 0000000..92cf9fe
--- /dev/null
+++ b/resources/views/compras_pedidos.blade.php
@@ -0,0 +1,5 @@
+@extends('layouts.app')
+
+@section('content')
+    <compras-body></compras-body>
+@endsection
diff --git a/routes/web.php b/routes/web.php
index 6872466..c2b0ea0 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -79,5 +79,6 @@ Route::middleware('auth')->group( function() {
 Route::get('/compras', 'ComprasController@show')->name('compras_login.show');
 
 Route::middleware(['compras'])->group( function() {
-    Route::get('/compras/pedidos', 'ComprasController@pedidos')->name('compras.pedidos');
+    Route::get('/compras/pedidos', 'ComprasController@indexPedidos')->name('compras.pedidos');
+    Route::get('/compras/pedidos/descargar', 'ComprasController@descargarPedidos')->name('compras.pedidos.descargar');
 });

From 5c1fa931eb1f869fdaaf67e82bfc827d3271e9c8 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Tue, 17 Sep 2024 21:42:55 -0300
Subject: [PATCH 17/20] Arreglo tags

---
 resources/js/components/admin/FilaPedido.vue   | 4 ++--
 resources/js/components/admin/TablaPedidos.vue | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/js/components/admin/FilaPedido.vue b/resources/js/components/admin/FilaPedido.vue
index ffdb07a..70c30e0 100644
--- a/resources/js/components/admin/FilaPedido.vue
+++ b/resources/js/components/admin/FilaPedido.vue
@@ -5,9 +5,9 @@
         <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_menos_devoluciones : pedido.total }}</td>
         <td>
-            <pedidos-admin-switch-aprobacion
+            <admin-switch-aprobacion
                 :pedido="pedido">
-            </pedidos-admin-switch-aprobacion>
+            </admin-switch-aprobacion>
         </td>
     </tr>
 </template>
diff --git a/resources/js/components/admin/TablaPedidos.vue b/resources/js/components/admin/TablaPedidos.vue
index d8a4eff..71ba737 100644
--- a/resources/js/components/admin/TablaPedidos.vue
+++ b/resources/js/components/admin/TablaPedidos.vue
@@ -11,10 +11,10 @@
             </tr>
         </thead>
         <tbody>
-            <pedidos-admin-fila-pedido
+            <admin-fila-pedido
                 v-for="pedido in this.pedidos"
                 :pedido="pedido" :key="pedido.id">
-            </pedidos-admin-fila-pedido>
+            </admin-fila-pedido>
         </tbody>
         </table>
         <table class="table is-striped is-bordered">

From 07289b01e99131c08ff6062682b16ad694a2105e Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Tue, 17 Sep 2024 21:45:28 -0300
Subject: [PATCH 18/20] =?UTF-8?q?Arreglado=20metodo=20que=20al=20final=20s?=
 =?UTF-8?q?=C3=AD=20era=20usado?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/Producto.php b/app/Producto.php
index 23694c9..f3fb6b4 100644
--- a/app/Producto.php
+++ b/app/Producto.php
@@ -42,6 +42,10 @@ class Producto extends Model
     return Producto::pluck('id', 'fila',)->all();
   }
 
+  public static function productosIDFila() {
+      return Producto::pluck('fila', 'id',)->all();
+  }
+
   public static function productosIDNombre() {
     return Producto::pluck('nombre', 'id',)->all();
   }

From 88e3532418e2cff18ffd85360d250fcfd0015e19 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Tue, 17 Sep 2024 21:48:44 -0300
Subject: [PATCH 19/20] Arreglado metodo para generar csv con totales de todos
 los barrios

---
 app/GrupoDeCompra.php | 52 ++++++++++++++++++++++++++++++++++---------
 1 file changed, 41 insertions(+), 11 deletions(-)

diff --git a/app/GrupoDeCompra.php b/app/GrupoDeCompra.php
index 866ed62..33c8043 100644
--- a/app/GrupoDeCompra.php
+++ b/app/GrupoDeCompra.php
@@ -17,7 +17,34 @@ class GrupoDeCompra extends Model
   protected $table = 'grupos_de_compra';
   protected $hidden = ['password'];
 
-  public function toggleDevoluciones()
+    /**
+     * @param $gdcs
+     * @param array $planilla
+     * @return array
+     */
+    public static function getPlanilla($gdcs, array $planilla): array
+    {
+        $barrios = [""];
+        foreach ($gdcs as $i => $gdc) {
+            $barrios[] = $gdc->nombre;
+            $productos_en_pedido = DB::table('pedidos_aprobados')->where('grupo_de_compra_id', $gdc->id)->get()->keyBy('producto_id');
+            $pedidos = $gdc->pedidosAprobados();
+            foreach ($productos_en_pedido as $id => $producto_pedido) {
+                $total = 0;
+                // Poner cantidad de cada producto para cada núcleo
+                foreach ($pedidos as $pedido) {
+                    list($_, $_, $cantidad) = $gdc->agregarCantidad($pedido, $id, [], 0, 0);
+                    $total = $total + $cantidad;
+                }
+                $fila = Producto::productosIdFila()[$id];
+                $planilla[$fila][$i+1] = $total;
+            }
+        }
+        array_splice($planilla, 0, 0, array($barrios));
+        return $planilla;
+    }
+
+    public function toggleDevoluciones()
   {
       $this->devoluciones_habilitadas = !$this->devoluciones_habilitadas;
       $this->save();
@@ -85,7 +112,7 @@ class GrupoDeCompra extends Model
     throw new Exception('No hay bono de transporte');
   }
 
-  private function totalPedidosSinBonos() {
+    private function totalPedidosSinBonos() {
     $total = 0;
     foreach ($this->pedidosAprobados() as $pedido) {
       $total += ceil($pedido->totalSinBonos());
@@ -166,9 +193,7 @@ class GrupoDeCompra extends Model
       $i = 1;
       // Poner cantidad de cada producto para cada núcleo
       foreach ($pedidos as $pedido) {
-        $producto = $pedido->productos()->find($id);
-        $records[$fila][$i] = $producto == NULL ? 0 : $producto["pivot"]["cantidad"];
-        $i++;
+          list($records, $i, $_) = $this->agregarCantidad($pedido, $id, $records, $fila, $i);
       }
     }
     // Insertar lista de núcleos en la primera fila
@@ -189,16 +214,21 @@ class GrupoDeCompra extends Model
     }
   }
 
+    public function agregarCantidad($pedido, $id, array $records, $fila, int $i): array
+    {
+        $producto = $pedido->productos()->find($id);
+        $cantidad = $producto == NULL ? 0 : $producto->pivot->cantidad;
+        $records[$fila][$i] = $cantidad;
+        $i++;
+        return array($records, $i, $cantidad);
+    }
+
   public static function exportarTodosLosPedidosEnCSV(){
     $gdcs = GrupoDeCompra::all();
     $planilla = GrupoDeCompra::obtenerTemplateDeFilasVacias($gdcs->count());
-    $barrios = [""];
-    foreach ($gdcs as $gdc) {
-        $barrios[] = $gdc->nombre;
-    }
-    array_splice($planilla, 0, 0, array($barrios));
+    $planilla = self::getPlanilla($gdcs, $planilla);
 
-    // Guardar en un archivo .csv
+      // Guardar en un archivo .csv
     try {
         $writer = Writer::createFromPath(resource_path('csv/exports/total-pedidos.csv'), 'w');
         $writer->insertAll($planilla);

From 10273e2159d50530009cb4addd50c163beee2fb7 Mon Sep 17 00:00:00 2001
From: ale <ale.tasistro@gmail.com>
Date: Tue, 8 Oct 2024 20:07:03 -0300
Subject: [PATCH 20/20] Arreglos post-merge

---
 resources/js/components/PedidoBody.vue        | 31 -------------------
 .../components/admin/FilaCaracteristica.vue   |  2 +-
 resources/js/components/pedidos/Body.vue      | 22 +++++++++++++
 resources/js/components/pedidos/Chismosa.vue  |  4 +--
 .../ProductoCantidad.vue                      |  0
 .../js/components/pedidos/ProductoCard.vue    |  7 +----
 .../js/components/pedidos/ProductoRow.vue     |  7 +----
 .../components/pedidos/ProductosContainer.vue |  6 ++--
 resources/views/productos.blade.php           |  4 +--
 9 files changed, 31 insertions(+), 52 deletions(-)
 delete mode 100644 resources/js/components/PedidoBody.vue
 create mode 100644 resources/js/components/pedidos/Body.vue
 rename resources/js/components/{Producto => pedidos}/ProductoCantidad.vue (100%)

diff --git a/resources/js/components/PedidoBody.vue b/resources/js/components/PedidoBody.vue
deleted file mode 100644
index d8e671d..0000000
--- a/resources/js/components/PedidoBody.vue
+++ /dev/null
@@ -1,31 +0,0 @@
-<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>
-</template>
-
-<script>
-    import Chismosa from './Chismosa.vue';
-    import ProductosContainer from './ProductosContainer.vue';
-    import CategoriasContainer from './CategoriasContainer.vue';
-
-    export default {
-        componets: {
-            Chismosa,
-            ProductosContainer,
-            CategoriasContainer,
-        },
-        data() {
-            return {
-                chismosaActiva: false,
-            }
-        },
-        mounted() {
-            Event.$on('toggle-chismosa', (activa) => {
-                this.chismosaActiva = activa;
-            });
-        },
-    }
-</script>
diff --git a/resources/js/components/admin/FilaCaracteristica.vue b/resources/js/components/admin/FilaCaracteristica.vue
index 1e47a43..9d5654b 100644
--- a/resources/js/components/admin/FilaCaracteristica.vue
+++ b/resources/js/components/admin/FilaCaracteristica.vue
@@ -5,7 +5,7 @@ export default {
     props: {
         caracteristica: Object
     },
-    data: {
+    data() {
         gdc: undefined
     },
     watch: {
diff --git a/resources/js/components/pedidos/Body.vue b/resources/js/components/pedidos/Body.vue
new file mode 100644
index 0000000..c1fbd44
--- /dev/null
+++ b/resources/js/components/pedidos/Body.vue
@@ -0,0 +1,22 @@
+<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>
+    </div>
+</template>
+
+<script>
+    export default {
+        data() {
+            return {
+                chismosaActiva: false,
+            }
+        },
+        mounted() {
+            Event.$on('toggle-chismosa', (activa) => {
+                this.chismosaActiva = activa;
+            });
+        },
+    }
+</script>
diff --git a/resources/js/components/pedidos/Chismosa.vue b/resources/js/components/pedidos/Chismosa.vue
index cd8d7f6..f24b2fa 100644
--- a/resources/js/components/pedidos/Chismosa.vue
+++ b/resources/js/components/pedidos/Chismosa.vue
@@ -34,7 +34,7 @@
                 </tr>
                 </tfoot>
                 <tbody>
-                <producto-row v-for="producto in productos" :producto="producto" :key="producto.id"></producto-row>
+                <pedidos-producto-row v-for="producto in productos" :producto="producto" :key="producto.id"></pedidos-producto-row>
                 </tbody>
             </table>
             <p class="has-text-centered" v-show="!mostrar_tabla">
@@ -99,4 +99,4 @@
         max-height: 81vh;
         margin-right: 20px;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/resources/js/components/Producto/ProductoCantidad.vue b/resources/js/components/pedidos/ProductoCantidad.vue
similarity index 100%
rename from resources/js/components/Producto/ProductoCantidad.vue
rename to resources/js/components/pedidos/ProductoCantidad.vue
diff --git a/resources/js/components/pedidos/ProductoCard.vue b/resources/js/components/pedidos/ProductoCard.vue
index 7f03510..320a9fd 100644
--- a/resources/js/components/pedidos/ProductoCard.vue
+++ b/resources/js/components/pedidos/ProductoCard.vue
@@ -1,11 +1,6 @@
 <script>
-import ProductoCantidad from './Producto/ProductoCantidad.vue';
-
 export default {
     name: "ProductoCard",
-    components: {
-        ProductoCantidad,
-    },
     props: {
         producto: Object
     },
@@ -73,7 +68,7 @@ export default {
             </div>
             <footer class="columns">
                 <div class="column is-three-quarters">
-                    <producto-cantidad :producto="producto"></producto-cantidad>
+                    <pedidos-producto-cantidad :producto="producto"></pedidos-producto-cantidad>
                 </div>
                 <div class="column">
                     <p class="subtitle is-7 is-hidden-mobile" v-if="enChismosa !== 0">{{ enChismosa }} en chismosa</p>
diff --git a/resources/js/components/pedidos/ProductoRow.vue b/resources/js/components/pedidos/ProductoRow.vue
index 8767667..5020d9c 100644
--- a/resources/js/components/pedidos/ProductoRow.vue
+++ b/resources/js/components/pedidos/ProductoRow.vue
@@ -2,18 +2,13 @@
 	<tr>
             <td>{{ this.producto.nombre }}</td>
             <td class="has-text-right">
-                <producto-cantidad :producto="producto"></producto-cantidad>
+                <pedidos-producto-cantidad :producto="producto"></pedidos-producto-cantidad>
             </td>
             <td class="has-text-right">{{ Math.ceil(this.producto.pivot.total) }}</td>
     </tr>
 </template>
 <script>
-    import ProductoCantidad from './Producto/ProductoCantidad.vue';
-	
     export default {
-        components: {
-            ProductoCantidad,
-        },
 		props: {
 	        producto: Object
 	    },
diff --git a/resources/js/components/pedidos/ProductosContainer.vue b/resources/js/components/pedidos/ProductosContainer.vue
index 4f08ee4..0979855 100644
--- a/resources/js/components/pedidos/ProductosContainer.vue
+++ b/resources/js/components/pedidos/ProductosContainer.vue
@@ -1,16 +1,14 @@
 <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 -->
+        <pedidos-producto-card v-for="(producto,i) in productos" :key="i" :producto="producto">
+        </pedidos-producto-card><!-- END BLOCK COLUMN -->
       </div><!-- END COLUMNS -->
     </div><!-- END CONTAINER -->
 </template>
 
 <script>
-import ProductoCard from "./ProductoCard.vue";
 export default {
-    components: {ProductoCard},
 	data() {
 	    return {
 	      productos: [],
diff --git a/resources/views/productos.blade.php b/resources/views/productos.blade.php
index d3877a4..3b90bcf 100644
--- a/resources/views/productos.blade.php
+++ b/resources/views/productos.blade.php
@@ -1,6 +1,6 @@
 @extends('layouts.app')
 
 @section('content')
-<pedido-body></pedido-body>
-<devoluciones-modal></devoluciones-modal>
+<pedidos-body></pedidos-body>
+<pedidos-devoluciones-modal></pedidos-devoluciones-modal>
 @endsection