Incoviba/oficial
1
0
Fork 0
Code Issues Pull Requests 2 Releases Wiki Activity

FIX: Pie cuotas valores uf

Browse Source
This commit is contained in:
Aldarien
2024-01-08 13:16:12 -03:00
parent 675b3843ea
commit bc2333bc95
4 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/resources/views/ventas/pies/cuotas.blade.php
View File

@ -26,7 +26,10 @@
<th>Fecha Estado ISO</th>
</tr>
</thead>
<tbody>@php $now = new DateTimeImmutable(); @endphp
<tbody>@php
$now = new DateTimeImmutable();
$uf_venta = $venta->uf === 0.0 ? $UF->get($venta->currentEstado()->fecha) : $venta->uf;
@endphp
@foreach ($venta->formaPago()->pie->cuotas() as $cuota)
<tr>
<td>{{$cuota->numero}}</td>
@ -85,16 +88,12 @@
}, 0))}}
</th>
<th class="right aligned">
@php
$now = new DateTimeImmutable();
@endphp
{{$format->ufs($total = array_reduce($venta->formaPago()->pie->cuotas(),
function(float $sum, Incoviba\Model\Venta\Cuota $cuota) use ($now, $venta) {
if ($cuota->pago->fecha > $now) {
return $sum + $cuota->pago->valor / $venta->uf;
}
return $sum + $cuota->pago->valor();
}, 0))}}
function(float $sum, Incoviba\Model\Venta\Cuota $cuota) use ($now, $uf_venta) {
return $sum + (($cuota->pago->fecha > $now or $cuota->pago->uf === null) ?
$cuota->pago->valor / $uf_venta :
$cuota->pago->valor());
}, 0.0))}}
</th>
<th colspan="3"></th>
</tr>

3
app/src/Model/Venta/Pago.php
View File

@ -24,7 +24,8 @@ class Pago extends Model
public function valor(string $moneda = Pago::UF): float
{
return $this->valor / (($moneda === Pago::UF) ? ($this->uf > 0 ? $this->uf : 1) : 1);
$uf = $this->uf ?? ($this->uf > 0.0 ? $this->uf : 1);
return $this->valor / (($moneda === Pago::UF) ? $uf : 1);
}
public function jsonSerialize(): mixed

2
app/src/Model/Venta/Pie.php
View File

@ -25,7 +25,7 @@ class Pie extends Model
}
if ($pagadas) {
return array_filter($this->cuotasArray, function(Cuota $cuota) {
return $cuota->pago->currentEstado->tipoEstadoPago->descripcion !== 'no pagado';
return in_array($cuota->pago->currentEstado->tipoEstadoPago->descripcion, ['depositado', 'abonado']);
});
}
return array_filter($this->cuotasArray, function(Cuota $cuota) {

17
app/src/Service/Venta/Pago.php
View File

@ -136,14 +136,23 @@ class Pago
{
$pago->estados = $this->estadoPagoRepository->fetchByPago($pago->id);
$pago->currentEstado = $this->estadoPagoRepository->fetchCurrentByPago($pago->id);
$pago->uf = $this->getUF($pago);
return $pago;
}
protected function getUF(Model\Venta\Pago $pago): ?float
{
if (($pago->uf === null or $pago->uf === 0.0)
and $pago->currentEstado->tipoEstadoPago->descripcion === 'abonado'
and $pago->currentEstado->fecha <= new DateTimeImmutable()) {
$pago->uf = $this->moneyService->getUF($pago->currentEstado->fecha);
if ($pago->uf !== 0.0) {
$this->pagoRepository->edit($pago, ['uf' => $pago->uf]);
$uf = $this->moneyService->getUF($pago->currentEstado->fecha);
if ($uf !== 0.0) {
$this->pagoRepository->edit($pago, ['uf' => $uf]);
return $uf;
}
} elseif ($pago->uf === 0.0) {
$this->pagoRepository->edit($pago, ['uf' => null]);
return null;
}
return $pago;
return $pago->uf;
}
}