nathalie
/
pedi2
3
3
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request 'Filtrado de barrios para usar solo los que tienen pedidos aprobados + agregada cantidad de bonos de transporte a planilla de totales de barrios' (#37) from funcion/planilla-pedidos-total into master 

Reviewed-on: #37
Reviewed-by: Rodrigo <rodrigopdm@protonmail.com>
This commit is contained in:
Rodrigo 2024-10-15 21:46:42 -03:00
parent c53e342f54 61e756f9e5
commit 4e7e46f92d
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/GrupoDeCompra.php
View File

@ -37,8 +37,9 @@ class GrupoDeCompra extends Model
$total = $total + $cantidad; $total = $total + $cantidad;
} }
$fila = Producto::productosIdFila()[$id]; $fila = Producto::productosIdFila()[$id];
$planilla[$fila][$i+1] = $total; $planilla[$fila][$i-1] = $total;
} }
$planilla[GrupoDeCompra::obtenerFilaDeBonoTransporte()][$i-1] = $gdc->calcularCantidadBDT();
} }
array_splice($planilla, 0, 0, array($barrios)); array_splice($planilla, 0, 0, array($barrios));
return $planilla; return $planilla;
@ -143,7 +144,7 @@ class GrupoDeCompra extends Model
return $total; return $total;
} }
public function exportarPedidoEnCSV(){ public function exportarPedidoEnCSV() {
$records = $this->generarColumnaCantidades(); $records = $this->generarColumnaCantidades();
try { try {
$writer = Writer::createFromPath(resource_path('csv/exports/'.$this->nombre.'.csv'), 'w'); $writer = Writer::createFromPath(resource_path('csv/exports/'.$this->nombre.'.csv'), 'w');
@ -224,7 +225,9 @@ class GrupoDeCompra extends Model
} }
public static function exportarTodosLosPedidosEnCSV(){ public static function exportarTodosLosPedidosEnCSV(){
$gdcs = GrupoDeCompra::all(); $gdcs = GrupoDeCompra::all()->filter(function ($grupoDeCompra) {
return !$grupoDeCompra->pedidosAprobados()->isEmpty();
});
$planilla = GrupoDeCompra::obtenerTemplateDeFilasVacias($gdcs->count()); $planilla = GrupoDeCompra::obtenerTemplateDeFilasVacias($gdcs->count());
$planilla = self::getPlanilla($gdcs, $planilla); $planilla = self::getPlanilla($gdcs, $planilla);