diff --git a/app/Http/Resources/PedidoOllasResource.php b/app/Http/Resources/PedidoOllasResource.php new file mode 100644 index 0000000..3af1d40 --- /dev/null +++ b/app/Http/Resources/PedidoOllasResource.php @@ -0,0 +1,30 @@ +productos; + foreach ($productos as $producto) { + $producto['pivot']['total'] = number_format($producto->pivot->cantidad * $producto->precio, 2); + } + return [ + 'id' => $this->id, + 'nombre' => $this->nombre, + 'productos' => $productos, + 'total' => number_format($this->totalCentralesSinTransporte(),2), + 'cantidad_de_ollas' => $this->cantidad_ollas, + ]; + } +} diff --git a/app/Subpedido.php b/app/Subpedido.php index 378b832..df989af 100644 --- a/app/Subpedido.php +++ b/app/Subpedido.php @@ -65,7 +65,11 @@ class Subpedido extends Model public function totalCentral() { - return $this->totalCentralesQueNoPaganTransporte() + $this->totalCentralesQuePaganTransporte() + $this->totalTransporte(); + return $this->totalCentralesSinTransporte() + $this->totalTransporte(); + } + + public function totalCentralesSinTransporte() { + return $this->totalCentralesQueNoPaganTransporte() + $this->totalCentralesQuePaganTransporte(); } public function totalCentralesQueNoPaganTransporte()