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

Merge pull request 'Cambio en cuenta de bonos de transporte' (#27) from funcion/fix-bonos-de-transporte into master 

Reviewed-on: #27
This commit is contained in:
Rodrigo 2024-04-06 16:48:06 -03:00
parent 5036c2baa9 e9321678e2
commit 85238695c7
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/GrupoDeCompra.php
View File

@ -86,7 +86,7 @@ class GrupoDeCompra extends Model
}
public function calcularCantidadBDT() {
return ceil($this->totalPedidosSinBonos() / 500);
return ceil(($this->totalPedidosSinBonos()+1) / 500);
}
public function totalBonosBarriales() {

24
app/Subpedido.php
View File

@ -18,17 +18,6 @@ class Subpedido extends Model
return $this->belongsToMany('App\Producto')->withPivot(["cantidad","total"]);
}
//Bonos del MPS, Sororo, etc. NO devuelve bonos de transporte
private function bonos()
{
return $this->productos()->where('bono',1);
}
public function productosSinBonos()
{
return $this->productos()->where('bono',false);
}
public function grupoDeCompra()
{
return $this->belongsTo('App\GrupoDeCompra');
@ -40,6 +29,17 @@ class Subpedido extends Model
return $filtros->aplicar($query);
}
//Bonos del MPS, Sororo, etc. NO devuelve bonos de transporte
private function bonos()
{
return $this->productos()->where('bono',1);
}
public function productosSinBonos()
{
return $this->productos()->where('bono',false);
}
//Subtotal de dinero de productos del pedido, sin bonos ni transporte
public function totalSinBonos()
{
@ -49,7 +49,7 @@ class Subpedido extends Model
//Cantidad de bonos de transporte
public function cantidadBDT()
{
return ceil($this->totalSinBonos() / 500);
return ceil(($this->totalSinBonos()+1) / 500);
}
//Subtotal de dinero de bonos de transporte