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

FIX: IPC en factura

Browse Source
This commit is contained in:
Juan Pablo Vial
2024-06-10 21:41:11 -04:00
parent 1caa62500a
commit 3fc7aa88dc
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -927,7 +927,7 @@
date: new Intl.DateTimeFormat('es-CL', {year: 'numeric', month: '2-digit', day: '2-digit'}), date: new Intl.DateTimeFormat('es-CL', {year: 'numeric', month: '2-digit', day: '2-digit'}),
pesos: new Intl.NumberFormat('es-CL', {minimumFractionDigits: 0, maximumFractionDigits: 0}), pesos: new Intl.NumberFormat('es-CL', {minimumFractionDigits: 0, maximumFractionDigits: 0}),
ufs: new Intl.NumberFormat('es-CL', {minimumFractionDigits: 2, maximumFractionDigits: 2}), ufs: new Intl.NumberFormat('es-CL', {minimumFractionDigits: 2, maximumFractionDigits: 2}),
percent: new Intl.NumberFormat('es-CL', {minimumFractionDigits: 2, maximumFractionDigits: 2}) percent: new Intl.NumberFormat('es-CL', {minimumFractionDigits: 4, maximumFractionDigits: 4})
}, },
draw() { draw() {
return { return {

10
app/src/Controller/Ventas/Facturacion.php
View File

@ -6,9 +6,10 @@ use DateTimeImmutable;
use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Message\ServerRequestInterface;
use Incoviba\Common\Alias\View; use Incoviba\Common\Alias\View;
use Incoviba\Common\Ideal;
use Incoviba\Service; use Incoviba\Service;
class Facturacion class Facturacion extends Ideal\Controller
{ {
public function __invoke(ServerRequestInterface $request, ResponseInterface $response, View $view, public function __invoke(ServerRequestInterface $request, ResponseInterface $response, View $view,
Service\Proyecto $proyectoService, Service\Proyecto\Terreno $terrenoService): ResponseInterface Service\Proyecto $proyectoService, Service\Proyecto\Terreno $terrenoService): ResponseInterface
@ -28,8 +29,8 @@ class Facturacion
$uf = $ufService->get($venta->currentEstado()->fecha); $uf = $ufService->get($venta->currentEstado()->fecha);
$terreno = $terrenoService->valor($venta->proyecto()->id); $terreno = $terrenoService->valor($venta->proyecto()->id);
$lastNov = new DateTimeImmutable((new DateTimeImmutable())->sub(new DateInterval('P1Y'))->format('Y-11-1')); $lastNov = new DateTimeImmutable((new DateTimeImmutable())->sub(new DateInterval('P1Y'))->format('Y-11-1'));
$prevMonth = $venta->fecha->sub(new DateInterval('P1M')); $prevMonth = $venta->currentEstado()->fecha->sub(new DateInterval('P1M'));
if ($prevMonth->format('m') === $venta->fecha->format('m')) { if ($prevMonth->format('m') === $venta->currentEstado()->fecha->format('m')) {
$prevMonth = $prevMonth->sub(new DateInterval('P10D')); $prevMonth = $prevMonth->sub(new DateInterval('P10D'));
} }
$ipc = $ipcService->get($lastNov, $prevMonth); $ipc = $ipcService->get($lastNov, $prevMonth);
@ -38,8 +39,11 @@ class Facturacion
if ($prevMonthTerreno->format('m') === $terreno->fecha->format('m')) { if ($prevMonthTerreno->format('m') === $terreno->fecha->format('m')) {
$prevMonthTerreno = $prevMonthTerreno->sub(new DateInterval('P10D')); $prevMonthTerreno = $prevMonthTerreno->sub(new DateInterval('P10D'));
} }
if ($prevMonthTerreno->format('Y-m') !== $lastNov->format('Y-m')) {
$ipc = $ipcService->get($prevMonthTerreno, $prevMonth); $ipc = $ipcService->get($prevMonthTerreno, $prevMonth);
} }
}
return $view->render($response, 'ventas.facturacion.show', compact('venta', 'terreno', 'uf', 'ipc')); return $view->render($response, 'ventas.facturacion.show', compact('venta', 'terreno', 'uf', 'ipc'));
} }
} }