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

funcion/refactor-general #45

Merged
atasistro merged 240 commits from funcion/refactor-general into master 2025-06-19 21:10:19 -03:00
Conversation 0 Commits 240 Files changed 123 +4 -5
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit a006fc15fa - Show all commits

9
app/GrupoDeCompra.php
View file

@ -108,7 +108,7 @@ class GrupoDeCompra extends Model
function pedidoParaPdf(): array
{
$productos = $this->productosPedidos(true, true, 'producto_id');
$productos = $this->productosPedidos(true, 'producto_id');
$pedido = [];
$pedido['productos'] = [];
@ -258,13 +258,12 @@ class GrupoDeCompra extends Model
return $result;
}
public function productosPedidos($excluirBarriales = false, $excluirBonos = false, $orderBy = 'producto_nombre'): Collection
public function productosPedidos($excluirBonos = false, $orderBy = 'producto_nombre'): Collection
{
$query = DB::table('pedidos_aprobados')
->where('grupo_de_compra_id', $this->id);
->where('grupo_de_compra_id', $this->id)
->where('producto_nombre','NOT LIKE','%barrial%');
if ($excluirBarriales)
$query = $query->where('producto_nombre','NOT LIKE','%barrial%');
if ($excluirBonos)
$query = $query->where('producto_es_bono',false);