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

FIX: Pie cuotas vigentes

Browse Source
This commit is contained in:
Aldarien
2023-12-22 14:15:09 -03:00
parent 0829d338a9
commit 675b3843ea
7 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,7 @@
</tr>
</thead>
<tbody id="cuotas">
@for ($i = count($pie->cuotas()); $i < $pie->cuotas - count($pie->cuotas(vigentes: true)); $i ++)
@for ($i = count($pie->cuotas(vigentes: true)); $i < $pie->cuotas; $i ++)
<tr>
<td>{{$i + 1}}</td>
<td>
@ -112,7 +112,7 @@
const index = $(event.currentTarget).data('index')
const calendar = $(".fecha.calendar[data-index='" + index + "']")
const fecha = calendar.calendar('get date')
for (let i = index + 1; i < {{$pie->cuotas - count($pie->cuotas())}}; i ++) {
for (let i = index + 1; i < {{$pie->cuotas}}; i ++) {
setDate(i - index, $(".fecha.calendar[data-index='" + i + "']"), fecha)
}
})
@ -120,7 +120,7 @@
$('.copy.banco').click(event => {
const index = $(event.currentTarget).data('index')
const banco = $(".banco.dropdown[data-index='" + index + "']").dropdown('get value')
for (let i = index + 1; i < {{$pie->cuotas - count($pie->cuotas())}}; i ++) {
for (let i = index + 1; i < {{$pie->cuotas}}; i ++) {
$(".banco.dropdown[data-index='" + i + "']").dropdown('set selected', banco)
}
})
@ -133,7 +133,7 @@
$('.copy.valor').click(event => {
const index = $(event.currentTarget).data('index')
const valor = $("[name='valor" + index + "']").val()
for (let i = index + 1; i < {{$pie->cuotas - count($pie->cuotas())}}; i ++) {
for (let i = index + 1; i < {{$pie->cuotas}}; i ++) {
$("[name='valor" + i + "']").val(valor)
}
})

2
app/resources/views/ventas/show/forma_pago/pie.blade.php
View File

@ -14,7 +14,7 @@
<td class="right aligned">Cuotas</td>
<td>
<a href="{{$urls->base}}/venta/{{$venta->id}}/pie/cuotas">
{{count($pie->cuotas(true))}}/{{$pie->cuotas}}
<span data-tooltip="Pagadas">{{count($pie->cuotas(true))}}</span>/{{$pie->cuotas}}
</a>
@if (count($pie->cuotas()) < $pie->cuotas)
<a href="{{$urls->base}}/ventas/pie/{{$pie->id}}/cuotas/add">

1
app/src/Controller/API/Ventas/Pies.php
View File

@ -20,7 +20,6 @@ class Pies
'input' => $body,
'edited' => false
];
error_log(var_export($output,true).PHP_EOL,3,'/logs/pies');
try {
$pie = $pieService->getById($pie_id);
$pieService->edit($pie, (array) $body);

7
app/src/Controller/Ventas/Cuotas.php
View File

@ -83,13 +83,14 @@ class Cuotas
});
return $view->render($response, 'ventas.pies.cuotas.add', compact('pie', 'venta', 'bancos'));
}
public function doAdd(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\Pie $pieService, Repository\Venta $ventaRepository, int $pie_id): ResponseInterface
public function doAdd(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\Pie $pieService,
Repository\Venta $ventaRepository, int $pie_id): ResponseInterface
{
$body = $request->getParsedBody();
$pie = $pieService->getById($pie_id);
$venta = $ventaRepository->fetchByPie($pie_id);
$total = $pie->cuotas - count($pie->cuotas());
$start = count($pie->cuotas());
$start = count($pie->cuotas(vigentes: true));
$total = $pie->cuotas;
for ($i = $start; $i < $total; $i ++) {
$data = [
'pie' => $pie->id,

4
app/src/Model/Venta/Cuota.php
View File

@ -27,9 +27,9 @@ class Cuota extends Model
'valor' => $this->valor,
'estado' => $this->estado ?? false,
'banco' => $this->banco,
'fecha_pago' => $this->fechaPago->format('Y-m-d H:i:s') ?? '',
'fecha_pago' => $this->fechaPago?->format('Y-m-d H:i:s') ?? '',
'abonado' => $this->abonado ?? false,
'fecha_abonado' => $this->fechaAbonado->format('Y-m-d H:i:s') ?? '',
'fecha_abonado' => $this->fechaAbonado?->format('Y-m-d H:i:s') ?? '',
'uf' => $this->uf ?? 1,
'pago' => $this->pago ?? '',
'numero' => $this->numero ?? ''

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

@ -29,7 +29,7 @@ class Pie extends Model
});
}
return array_filter($this->cuotasArray, function(Cuota $cuota) {
return $cuota->pago->currentEstado->tipoEstadoPago->active === 1;
return $cuota->pago->currentEstado->tipoEstadoPago->activo or $cuota->pago->currentEstado->tipoEstadoPago->descripcion === 'devuelto';
});
}

1
app/src/Service/Venta.php
View File

@ -400,7 +400,6 @@ class Venta
$pago = $venta->resciliacion();
$this->pagoService->delete($pago);
$estado = $venta->currentEstado();
error_log(var_export($estado,true));
$this->estadoVentaRepository->remove($estado);
$this->ventaRepository->edit($venta, ['resciliacion' => null]);
return true;