diff --git a/app/Http/Resources/SubpedidoResource.php b/app/Http/Resources/SubpedidoResource.php index 3108eb5..5c59018 100644 --- a/app/Http/Resources/SubpedidoResource.php +++ b/app/Http/Resources/SubpedidoResource.php @@ -14,19 +14,18 @@ class SubpedidoResource extends JsonResource */ public function toArray($request) { + $total = $this->total(); return [ 'id' => $this->id, 'nombre' => $this->nombre, - 'subtotal_productos' => number_format($this->totalSinBonos(),0), - 'subtotal_bonos' => number_format($this->getSubtotalBonos(),0), - 'bonos_de_transporte' => $this->cantidadBDT(), - 'subtotal_bonos_de_transporte' => number_format($this->getSubtotalBDT(),0), - 'total' => number_format($this->getTotal(),0), - 'total_menos_devoluciones' => number_format($this->getTotalMenosDevoluciones(),0), 'grupo_de_compra' => $this->grupoDeCompra, 'productos' => $this->productos, 'aprobado' => (bool) $this->aprobado, - 'devoluciones_total' => (double) $this->devoluciones_total, + 'total' => $total, + 'total_transporte' => $this->totalTransporte(), + 'cantidad_transporte' => number_format($this->cantidadTransporte(),0), + 'total_menos_devoluciones' => $total - $this->devoluciones_total, + 'devoluciones_total' => $this->devoluciones_total, 'devoluciones_notas' => $this->devoluciones_notas ]; }