From 66298228e34c78b95f549a6bd58176b65169a9cc Mon Sep 17 00:00:00 2001 From: ale Date: Sun, 3 Aug 2025 10:57:04 -0300 Subject: [PATCH 01/11] =?UTF-8?q?Par=C3=A1metro=20de=20ollas=20actualizado?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/csv/parametros.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/csv/parametros.csv b/resources/csv/parametros.csv index ebd8fda..501c7ac 100644 --- a/resources/csv/parametros.csv +++ b/resources/csv/parametros.csv @@ -1,4 +1,4 @@ id|nombre|valor bono-transporte|'Bono de transporte'|15 monto-transporte|'Monto para bono de transporte'|500 -monto-olla|'Monto por olla'|1200 +monto-olla|'Monto por olla'|800 From bcc4f4a28a2027cc84ea0aad697a8041f3c3de11 Mon Sep 17 00:00:00 2001 From: ale Date: Sun, 3 Aug 2025 11:01:15 -0300 Subject: [PATCH 02/11] Metodo para obtener id de tipo_pedido y arreglada query de pedidos de ollas para levantar solo los barrios con pedidos de ollas --- app/Helpers/PedidosExportHelper.php | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/app/Helpers/PedidosExportHelper.php b/app/Helpers/PedidosExportHelper.php index b8672f2..c8a16dc 100644 --- a/app/Helpers/PedidosExportHelper.php +++ b/app/Helpers/PedidosExportHelper.php @@ -43,7 +43,12 @@ class PedidosExportHelper static public function pedidosDeOllas() { $filePath = "csv/exports/pedidos-de-ollas-" . now()->format('Y-m-d') . ".csv"; - $barrios = GrupoDeCompra::barriosMenosPrueba()->get(); + $barrios = GrupoDeCompra::barriosMenosPrueba() + ->whereHas('subpedidos', function ($query) { + $tipo_olla = self::getTipoId('olla'); + $query->where('tipo_pedido_id', $tipo_olla); + }) + ->get(); $contenido = self::generarContenidoCSV($barrios, fn($grupoId) => "subpedidos.grupo_de_compra_id = $grupoId @@ -62,7 +67,7 @@ class PedidosExportHelper */ public static function cantidadDeOllasParaCSV(Collection $barrios, Collection $contenido) { - $tipo_olla = TipoPedido::where('nombre', 'olla')->first()->id; + $tipo_olla = self::getTipoId('olla'); $parametros = collect(CsvHelper::getRecords(resource_path("csv/parametros.csv"), "No se pudo leer el archivo.")); $fila = [ @@ -241,4 +246,13 @@ class PedidosExportHelper } return $transporte; } + + /** + * @return mixed + */ + public static function getTipoId(string $tipo) + { + $tipo_olla = TipoPedido::where('nombre', $tipo)->first()->id; + return $tipo_olla; + } } From 53e75ae357f856ecba99c158425f0fa2cdba2882 Mon Sep 17 00:00:00 2001 From: ale Date: Sun, 3 Aug 2025 11:01:39 -0300 Subject: [PATCH 03/11] =?UTF-8?q?Arreglo=20l=C3=B3gica=20para=20no=20gener?= =?UTF-8?q?ar=20muchas=20veces=20el=20pedido=20de=20ollas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/OllasController.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/OllasController.php b/app/Http/Controllers/OllasController.php index 2b64615..655c5d5 100644 --- a/app/Http/Controllers/OllasController.php +++ b/app/Http/Controllers/OllasController.php @@ -20,8 +20,11 @@ class OllasController extends Controller $pedido = $gdc->subpedidos()->firstOrCreate([ 'nombre' => 'Pedido de Ollas de ' . $gdc->nombre, 'tipo_pedido_id' => $tipoOlla->id, - 'cantidad_ollas' => 0, ]); + if (!$pedido->cantidad_ollas) { + $pedido->cantidad_ollas = 0; + $pedido->save(); + } return response()->json(new PedidoOllasResource($pedido)); } From 76239ee7ddc4b31c15502fb674f7942a991ea128 Mon Sep 17 00:00:00 2001 From: ale Date: Sun, 3 Aug 2025 11:31:55 -0300 Subject: [PATCH 04/11] Cambio texto de saldo para casos positivo y negativo --- resources/js/components/admin/TablaPedidos.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/resources/js/components/admin/TablaPedidos.vue b/resources/js/components/admin/TablaPedidos.vue index 1aae42c..55bbf5a 100644 --- a/resources/js/components/admin/TablaPedidos.vue +++ b/resources/js/components/admin/TablaPedidos.vue @@ -47,8 +47,8 @@ $ {{ total_de_pedido }} - Saldo a favor: - - $ {{ saldo }} + {{ texto_saldo }} + $ {{ saldo }} Total a transferir: @@ -80,6 +80,9 @@ export default { "saldo", ]), ...mapGetters('admin', ['pedidosAprobados']), + texto_saldo() { + return this.saldo < 0 ? "Deuda:" : "Saldo a favor:"; + } }, } From e0f55661a442bda627506ab38cd6fca6e0cffab5 Mon Sep 17 00:00:00 2001 From: ale Date: Sun, 3 Aug 2025 11:38:32 -0300 Subject: [PATCH 05/11] Agregada planilla de ejemplo para saldos --- app/Http/Controllers/ComisionesController.php | 6 ++++++ resources/csv/saldos.csv | 4 ++++ resources/js/components/comisiones/saldos/SaldosSeccion.vue | 1 + routes/web.php | 1 + 4 files changed, 12 insertions(+) create mode 100644 resources/csv/saldos.csv diff --git a/app/Http/Controllers/ComisionesController.php b/app/Http/Controllers/ComisionesController.php index f4150aa..f003826 100644 --- a/app/Http/Controllers/ComisionesController.php +++ b/app/Http/Controllers/ComisionesController.php @@ -131,6 +131,12 @@ class ComisionesController return response()->json(GrupoDeCompraResource::collection(GrupoDeCompra::all())); } + public function descargarSaldosEjemplo(): BinaryFileResponse + { + $file = resource_path('csv/saldos.csv'); + return response()->download($file); + } + public function obtenerParametros(): JsonResponse { try { diff --git a/resources/csv/saldos.csv b/resources/csv/saldos.csv new file mode 100644 index 0000000..c289861 --- /dev/null +++ b/resources/csv/saldos.csv @@ -0,0 +1,4 @@ +Barrio|Saldo +ENTREVERO|2500 +TRES CRUCES|1200 +PRUEBA|3700 diff --git a/resources/js/components/comisiones/saldos/SaldosSeccion.vue b/resources/js/components/comisiones/saldos/SaldosSeccion.vue index c9b413a..dd1123c 100644 --- a/resources/js/components/comisiones/saldos/SaldosSeccion.vue +++ b/resources/js/components/comisiones/saldos/SaldosSeccion.vue @@ -53,6 +53,7 @@ export default {
  • No puede haber "enters" en ninguna celda
  • El nombre de los barrios debe estar exactamente igual que como están configurados en esta aplicacaión
    • + Planilla de ejemplo.
    diff --git a/routes/web.php b/routes/web.php index 969c0e1..a539e25 100644 --- a/routes/web.php +++ b/routes/web.php @@ -56,6 +56,7 @@ Route::middleware(['auth', 'role:comision'])->group( function() { Route::get('/comisiones/pedidos/ollas', 'ComisionesController@descargarPedidosDeOllas')->name('comisiones.pedidos.ollas'); Route::get('/comisiones/canasta/ejemplo', 'ComisionesController@descargarCanastaEjemplo')->name('comisiones.canasta.ejemplo'); Route::post('/comisiones/canasta', 'ComisionesController@cargarCanasta')->name('comisiones.canasta'); + Route::get('/comisiones/saldos/ejemplo', 'ComisionesController@descargarSaldosEjemplo')->name('comisiones.saldos.ejemplo'); Route::post('/comisiones/saldos', 'ComisionesController@cargarSaldos')->name('comisiones.saldos'); Route::put('/comisiones/parametros/{parametro_id}', 'ComisionesController@modificarParametros'); }); From e61c3f6d4ba07adfb8fd0a2facbc433d9cd284aa Mon Sep 17 00:00:00 2001 From: nathalie Date: Sun, 3 Aug 2025 12:07:34 -0300 Subject: [PATCH 06/11] Agregado webpack --- package-lock.json | 314 +++++++++++++++++++++++++++++++++++++++------- package.json | 4 +- 2 files changed, 269 insertions(+), 49 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2370676..1ea596d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,9 @@ "sass": "^1.20.1", "sass-loader": "^8.0.0", "vue": "^2.5.17", - "vue-template-compiler": "^2.6.10" + "vue-template-compiler": "^2.6.10", + "webpack": "^4.47.0", + "webpack-cli": "^3.3.12" } }, "node_modules/@ampproject/remapping": { @@ -1648,6 +1650,19 @@ "hasInstallScript": true, "optional": true, "dependencies": { + "@parcel/watcher-android-arm64": "2.5.1", + "@parcel/watcher-darwin-arm64": "2.5.1", + "@parcel/watcher-darwin-x64": "2.5.1", + "@parcel/watcher-freebsd-x64": "2.5.1", + "@parcel/watcher-linux-arm-glibc": "2.5.1", + "@parcel/watcher-linux-arm-musl": "2.5.1", + "@parcel/watcher-linux-arm64-glibc": "2.5.1", + "@parcel/watcher-linux-arm64-musl": "2.5.1", + "@parcel/watcher-linux-x64-glibc": "2.5.1", + "@parcel/watcher-linux-x64-musl": "2.5.1", + "@parcel/watcher-win32-arm64": "2.5.1", + "@parcel/watcher-win32-ia32": "2.5.1", + "@parcel/watcher-win32-x64": "2.5.1", "detect-libc": "^1.0.3", "is-glob": "^4.0.3", "micromatch": "^4.0.5", @@ -2043,6 +2058,7 @@ "dependencies": { "@babel/parser": "^7.23.5", "postcss": "^8.4.14", + "prettier": "^1.18.2 || ^2.0.0", "source-map": "^0.6.1" }, "optionalDependencies": { @@ -2088,6 +2104,7 @@ "merge-source-map": "^1.1.0", "postcss": "^7.0.36", "postcss-selector-parser": "^6.0.2", + "prettier": "^1.18.2 || ^2.0.0", "source-map": "~0.6.1", "vue-template-es2015-compiler": "^1.9.0" }, @@ -3072,9 +3089,9 @@ "dev": true }, "node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", "dev": true, "dependencies": { "balanced-match": "^1.0.0", @@ -3540,6 +3557,7 @@ "anymatch": "^2.0.0", "async-each": "^1.0.1", "braces": "^2.3.2", + "fsevents": "^1.2.7", "glob-parent": "^3.1.0", "inherits": "^2.0.3", "is-binary-path": "^1.0.0", @@ -3880,16 +3898,16 @@ } }, "node_modules/compression": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/compression/-/compression-1.8.0.tgz", - "integrity": "sha512-k6WLKfunuqCYD3t6AsuPGvQWaKwuLLh2/xHNcX4qE+vIfDNXpSqnrhwA7O53R7WVQUnt8dVAIW+YHr7xTgOgGA==", + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/compression/-/compression-1.8.1.tgz", + "integrity": "sha512-9mAqGPHLakhCLeNyxPkK4xVo746zQ/czLH1Ky+vkitMnWfWZps8r0qXuwhwizagCRttsL4lfG4pIOvaWLpAP0w==", "dev": true, "dependencies": { "bytes": "3.1.2", "compressible": "~2.0.18", "debug": "2.6.9", "negotiator": "~0.6.4", - "on-headers": "~1.0.2", + "on-headers": "~1.1.0", "safe-buffer": "5.2.1", "vary": "~1.1.2" }, @@ -7959,6 +7977,9 @@ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", "dev": true, + "dependencies": { + "graceful-fs": "^4.1.6" + }, "optionalDependencies": { "graceful-fs": "^4.1.6" } @@ -9156,9 +9177,9 @@ } }, "node_modules/on-headers": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", - "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.1.0.tgz", + "integrity": "sha512-737ZY3yNnXy37FHkQxPzt4UZ2UWPWiCZWLvFZ4fu5cueciegX0zGPnrlY6bwRg4FdQOe9YU8MkmJwGhoMybl8A==", "dev": true, "engines": { "node": ">= 0.8" @@ -9481,21 +9502,73 @@ } }, "node_modules/pbkdf2": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz", - "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.3.tgz", + "integrity": "sha512-wfRLBZ0feWRhCIkoMB6ete7czJcnNnqRpcoWQBLqatqXXmelSRqfdDK4F3u9T2s2cXas/hQJcryI/4lAL+XTlA==", "dev": true, "dependencies": { - "create-hash": "^1.1.2", - "create-hmac": "^1.1.4", - "ripemd160": "^2.0.1", - "safe-buffer": "^5.0.1", - "sha.js": "^2.4.8" + "create-hash": "~1.1.3", + "create-hmac": "^1.1.7", + "ripemd160": "=2.0.1", + "safe-buffer": "^5.2.1", + "sha.js": "^2.4.11", + "to-buffer": "^1.2.0" }, "engines": { "node": ">=0.12" } }, + "node_modules/pbkdf2/node_modules/create-hash": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz", + "integrity": "sha512-snRpch/kwQhcdlnZKYanNF1m0RDlrCdSKQaH87w1FCFPVPNCQ/Il9QJKAX2jVBZddRdaHBMC+zXa9Gw9tmkNUA==", + "dev": true, + "dependencies": { + "cipher-base": "^1.0.1", + "inherits": "^2.0.1", + "ripemd160": "^2.0.0", + "sha.js": "^2.4.0" + } + }, + "node_modules/pbkdf2/node_modules/hash-base": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz", + "integrity": "sha512-0TROgQ1/SxE6KmxWSvXHvRj90/Xo1JvZShofnYF+f6ZsGtR4eES7WfrQzPalmyagfKZCXpVnitiRebZulWsbiw==", + "dev": true, + "dependencies": { + "inherits": "^2.0.1" + } + }, + "node_modules/pbkdf2/node_modules/ripemd160": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz", + "integrity": "sha512-J7f4wutN8mdbV08MJnXibYpCOPHR+yzy+iQ/AsjMv2j8cLavQ8VGagDFUwwTAdF8FmRKVeNpbTTEwNHCW1g94w==", + "dev": true, + "dependencies": { + "hash-base": "^2.0.0", + "inherits": "^2.0.1" + } + }, + "node_modules/pbkdf2/node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, "node_modules/picocolors": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", @@ -11315,6 +11388,7 @@ "integrity": "sha512-d0NoFH4v6SjEK7BoX810Jsrhj7IQSYHAHLi/iSpgqKc7LaIDshFRlSg5LOymf9FqQhxEHs2W5ZQXlvy0KD45Uw==", "dev": true, "dependencies": { + "@parcel/watcher": "^2.4.1", "chokidar": "^4.0.0", "immutable": "^5.0.2", "source-map-js": ">=0.6.2 <2.0.0" @@ -11698,18 +11772,45 @@ "dev": true }, "node_modules/sha.js": { - "version": "2.4.11", - "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", - "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", + "version": "2.4.12", + "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.12.tgz", + "integrity": "sha512-8LzC5+bvI45BjpfXU8V5fdU2mfeKiQe1D1gIMn7XUlF3OTUrpdJpPPH4EMAnF0DsHHdSZqCdSss5qCmJKuiO3w==", "dev": true, "dependencies": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" + "inherits": "^2.0.4", + "safe-buffer": "^5.2.1", + "to-buffer": "^1.2.0" }, "bin": { "sha.js": "bin.js" + }, + "engines": { + "node": ">= 0.10" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/sha.js/node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, "node_modules/shallow-clone": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", @@ -12707,6 +12808,46 @@ "integrity": "sha512-okFlQcoGTi4LQBG/PgSYblw9VOyptsz2KJZqc6qtgGdes8VktzUQkj4BI2blit072iS8VODNcMA+tvnS9dnuMA==", "dev": true }, + "node_modules/to-buffer": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.2.1.tgz", + "integrity": "sha512-tB82LpAIWjhLYbqjx3X4zEeHN6M8CiuOEy2JY8SEQVdYRe3CCHOFaqrBW1doLDrfpWhplcW7BL+bO3/6S3pcDQ==", + "dev": true, + "dependencies": { + "isarray": "^2.0.5", + "safe-buffer": "^5.2.1", + "typed-array-buffer": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/to-buffer/node_modules/isarray": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", + "dev": true + }, + "node_modules/to-buffer/node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, "node_modules/to-object-path": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", @@ -13404,8 +13545,10 @@ "integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==", "dev": true, "dependencies": { + "chokidar": "^3.4.1", "graceful-fs": "^4.1.2", - "neo-async": "^2.5.0" + "neo-async": "^2.5.0", + "watchpack-chokidar2": "^2.0.1" }, "optionalDependencies": { "chokidar": "^3.4.1", @@ -13471,6 +13614,7 @@ "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", + "fsevents": "~2.3.2", "glob-parent": "~5.1.2", "is-binary-path": "~2.1.0", "is-glob": "~4.0.1", @@ -17093,9 +17237,9 @@ "dev": true }, "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", "dev": true, "requires": { "balanced-match": "^1.0.0", @@ -17726,16 +17870,16 @@ } }, "compression": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/compression/-/compression-1.8.0.tgz", - "integrity": "sha512-k6WLKfunuqCYD3t6AsuPGvQWaKwuLLh2/xHNcX4qE+vIfDNXpSqnrhwA7O53R7WVQUnt8dVAIW+YHr7xTgOgGA==", + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/compression/-/compression-1.8.1.tgz", + "integrity": "sha512-9mAqGPHLakhCLeNyxPkK4xVo746zQ/czLH1Ky+vkitMnWfWZps8r0qXuwhwizagCRttsL4lfG4pIOvaWLpAP0w==", "dev": true, "requires": { "bytes": "3.1.2", "compressible": "~2.0.18", "debug": "2.6.9", "negotiator": "~0.6.4", - "on-headers": "~1.0.2", + "on-headers": "~1.1.0", "safe-buffer": "5.2.1", "vary": "~1.1.2" }, @@ -21857,9 +22001,9 @@ } }, "on-headers": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", - "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.1.0.tgz", + "integrity": "sha512-737ZY3yNnXy37FHkQxPzt4UZ2UWPWiCZWLvFZ4fu5cueciegX0zGPnrlY6bwRg4FdQOe9YU8MkmJwGhoMybl8A==", "dev": true }, "once": { @@ -22103,16 +22247,56 @@ } }, "pbkdf2": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz", - "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.3.tgz", + "integrity": "sha512-wfRLBZ0feWRhCIkoMB6ete7czJcnNnqRpcoWQBLqatqXXmelSRqfdDK4F3u9T2s2cXas/hQJcryI/4lAL+XTlA==", "dev": true, "requires": { - "create-hash": "^1.1.2", - "create-hmac": "^1.1.4", - "ripemd160": "^2.0.1", - "safe-buffer": "^5.0.1", - "sha.js": "^2.4.8" + "create-hash": "~1.1.3", + "create-hmac": "^1.1.7", + "ripemd160": "=2.0.1", + "safe-buffer": "^5.2.1", + "sha.js": "^2.4.11", + "to-buffer": "^1.2.0" + }, + "dependencies": { + "create-hash": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz", + "integrity": "sha512-snRpch/kwQhcdlnZKYanNF1m0RDlrCdSKQaH87w1FCFPVPNCQ/Il9QJKAX2jVBZddRdaHBMC+zXa9Gw9tmkNUA==", + "dev": true, + "requires": { + "cipher-base": "^1.0.1", + "inherits": "^2.0.1", + "ripemd160": "^2.0.0", + "sha.js": "^2.4.0" + } + }, + "hash-base": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz", + "integrity": "sha512-0TROgQ1/SxE6KmxWSvXHvRj90/Xo1JvZShofnYF+f6ZsGtR4eES7WfrQzPalmyagfKZCXpVnitiRebZulWsbiw==", + "dev": true, + "requires": { + "inherits": "^2.0.1" + } + }, + "ripemd160": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz", + "integrity": "sha512-J7f4wutN8mdbV08MJnXibYpCOPHR+yzy+iQ/AsjMv2j8cLavQ8VGagDFUwwTAdF8FmRKVeNpbTTEwNHCW1g94w==", + "dev": true, + "requires": { + "hash-base": "^2.0.0", + "inherits": "^2.0.1" + } + }, + "safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true + } } }, "picocolors": { @@ -23936,13 +24120,22 @@ "dev": true }, "sha.js": { - "version": "2.4.11", - "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", - "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", + "version": "2.4.12", + "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.12.tgz", + "integrity": "sha512-8LzC5+bvI45BjpfXU8V5fdU2mfeKiQe1D1gIMn7XUlF3OTUrpdJpPPH4EMAnF0DsHHdSZqCdSss5qCmJKuiO3w==", "dev": true, "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" + "inherits": "^2.0.4", + "safe-buffer": "^5.2.1", + "to-buffer": "^1.2.0" + }, + "dependencies": { + "safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true + } } }, "shallow-clone": { @@ -24745,6 +24938,31 @@ "integrity": "sha512-okFlQcoGTi4LQBG/PgSYblw9VOyptsz2KJZqc6qtgGdes8VktzUQkj4BI2blit072iS8VODNcMA+tvnS9dnuMA==", "dev": true }, + "to-buffer": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.2.1.tgz", + "integrity": "sha512-tB82LpAIWjhLYbqjx3X4zEeHN6M8CiuOEy2JY8SEQVdYRe3CCHOFaqrBW1doLDrfpWhplcW7BL+bO3/6S3pcDQ==", + "dev": true, + "requires": { + "isarray": "^2.0.5", + "safe-buffer": "^5.2.1", + "typed-array-buffer": "^1.0.3" + }, + "dependencies": { + "isarray": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", + "dev": true + }, + "safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true + } + } + }, "to-object-path": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", diff --git a/package.json b/package.json index 23c0c28..6275509 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,9 @@ "sass": "^1.20.1", "sass-loader": "^8.0.0", "vue": "^2.5.17", - "vue-template-compiler": "^2.6.10" + "vue-template-compiler": "^2.6.10", + "webpack": "^4.47.0", + "webpack-cli": "^3.3.12" }, "dependencies": { "animate.css": "^4.1.1", From 9cc82a91710d69f10b10f249ff32a243e6384c51 Mon Sep 17 00:00:00 2001 From: ale Date: Sun, 3 Aug 2025 12:30:55 -0300 Subject: [PATCH 07/11] Mejor manejo de errores --- app/Http/Controllers/ComisionesController.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/ComisionesController.php b/app/Http/Controllers/ComisionesController.php index f003826..e47e917 100644 --- a/app/Http/Controllers/ComisionesController.php +++ b/app/Http/Controllers/ComisionesController.php @@ -11,7 +11,9 @@ use App\Http\Resources\GrupoDeCompraResource; use App\Producto; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; +use League\Csv\CannotInsertRecord; use League\Csv\Exception; +use League\Csv\InvalidArgument; use Mpdf\MpdfException; use Symfony\Component\HttpFoundation\BinaryFileResponse; @@ -31,7 +33,7 @@ class ComisionesController { try { PedidosExportHelper::pedidosBarriales(); - } catch (Exception $e) { + } catch (CannotInsertRecord|InvalidArgument|Exception $e) { return response()->json(['message' => $e->getMessage()], 500); } $pattern = storage_path('csv/exports/pedidos-por-barrio-*.csv'); @@ -48,7 +50,7 @@ class ComisionesController { try { PedidosExportHelper::pedidosDeOllas(); - } catch (Exception $e) { + } catch (CannotInsertRecord|InvalidArgument|Exception $e) { return response()->json(['message' => $e->getMessage()], 500); } $pattern = storage_path('csv/exports/pedidos-de-ollas-*.csv'); @@ -61,9 +63,13 @@ class ComisionesController return response()->download($files[0]); } - public function descargarNotas(): BinaryFileResponse + public function descargarNotas() { - Producto::planillaNotas(); + try { + Producto::planillaNotas(); + } catch (CannotInsertRecord|InvalidArgument $e) { + return response()->json(['message' => $e->getMessage()], 500); + } $pattern = storage_path('csv/exports/notas-por-barrio-*.csv'); $files = glob($pattern); From 6c49a4dca0562e050a49635bd74c7bcf7f316595 Mon Sep 17 00:00:00 2001 From: ale Date: Sun, 3 Aug 2025 12:34:01 -0300 Subject: [PATCH 08/11] Log de error --- app/Http/Controllers/ComisionesController.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Http/Controllers/ComisionesController.php b/app/Http/Controllers/ComisionesController.php index e47e917..4076c37 100644 --- a/app/Http/Controllers/ComisionesController.php +++ b/app/Http/Controllers/ComisionesController.php @@ -11,6 +11,7 @@ use App\Http\Resources\GrupoDeCompraResource; use App\Producto; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; +use Illuminate\Support\Facades\Log; use League\Csv\CannotInsertRecord; use League\Csv\Exception; use League\Csv\InvalidArgument; @@ -34,6 +35,7 @@ class ComisionesController try { PedidosExportHelper::pedidosBarriales(); } catch (CannotInsertRecord|InvalidArgument|Exception $e) { + Log::error($e->getMessage()); return response()->json(['message' => $e->getMessage()], 500); } $pattern = storage_path('csv/exports/pedidos-por-barrio-*.csv'); From 786ab8cb98af1f1420231ea4e26311530d50654e Mon Sep 17 00:00:00 2001 From: ale Date: Tue, 8 Jul 2025 13:29:38 -0300 Subject: [PATCH 09/11] Estilo --- resources/js/components/AppLogin.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/js/components/AppLogin.vue b/resources/js/components/AppLogin.vue index be2ddee..0aa1cd2 100644 --- a/resources/js/components/AppLogin.vue +++ b/resources/js/components/AppLogin.vue @@ -17,7 +17,7 @@ export default {
    -
    +
    From 5711c28f5699b8793dd6ac41c9c98c286d99a856 Mon Sep 17 00:00:00 2001 From: ale Date: Mon, 4 Aug 2025 21:56:44 -0300 Subject: [PATCH 10/11] Arreglo chismosa en celular --- .../js/components/pedidos/ChismosaDropdown.vue | 2 +- .../js/components/pedidos/PedidosNavBarBrand.vue | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/resources/js/components/pedidos/ChismosaDropdown.vue b/resources/js/components/pedidos/ChismosaDropdown.vue index 8aad7f7..9ac6c85 100644 --- a/resources/js/components/pedidos/ChismosaDropdown.vue +++ b/resources/js/components/pedidos/ChismosaDropdown.vue @@ -5,7 +5,7 @@ - +
    diff --git a/resources/js/components/pedidos/PedidosNavBarBrand.vue b/resources/js/components/pedidos/PedidosNavBarBrand.vue index bcc5130..21ff877 100644 --- a/resources/js/components/pedidos/PedidosNavBarBrand.vue +++ b/resources/js/components/pedidos/PedidosNavBarBrand.vue @@ -8,7 +8,7 @@ export default { computed: { ...mapGetters('pedido', ["pedidoDefinido"]), ...mapState('pedido', ["nombre", "grupo_de_compra"]), - ...mapState('ui', ["burger_activa"]) + ...mapState('ui', ["burger_activa"]), }, methods: { ...mapMutations('ui', ["toggleBurger"]), @@ -17,14 +17,17 @@ export default { From 5aadfe675330602d2933968aa2540a0f5df420ad Mon Sep 17 00:00:00 2001 From: ale Date: Tue, 5 Aug 2025 19:06:59 -0300 Subject: [PATCH 11/11] Cambio a lang="es" --- 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 5120415..c640cbf 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -1,5 +1,5 @@ - +