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

Merge branch 'develop' into feature/cierres

Browse Source
This commit is contained in:
Juan Pablo Vial
2025-03-03 15:32:25 -03:00
parent 2a0335f834 e4e952e842
commit 928d2e57be
58 changed files with 753 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/Service/Venta/BonoPie.php
View File

@ -2,6 +2,7 @@
namespace Incoviba\Service\Venta;
use Incoviba\Common\Implement\Exception\EmptyResult;
use Incoviba\Exception\ServiceAction\Read;
use Incoviba\Repository;
use Incoviba\Model;
use Psr\Log\LoggerInterface;
@ -27,8 +28,18 @@ class BonoPie
}
return $bono;
}
/**
* @param int $venta_id
* @return Model\Venta\BonoPie
* @throws Read
*/
public function getByVenta(int $venta_id): Model\Venta\BonoPie
{
return $this->bonoPieRepository->fetchByVenta($venta_id);
try {
return $this->bonoPieRepository->fetchByVenta($venta_id);
} catch (EmptyResult $exception) {
throw new Read(__CLASS__, $exception);
}
}
}

4
app/src/Service/Venta/Cierre.php
View File

@ -17,7 +17,7 @@ class Cierre
public function getByProyecto(int $proyecto_id): array
{
$cierres = $this->cierreRepository->fetchByProyecto($proyecto_id);
foreach ($cierres as &$cierre) {
foreach ($cierres as $cierre) {
$cierre->estados = $this->estadoCierreRepository->fetchByCierre($cierre->id);
$cierre->current = $this->estadoCierreRepository->fetchCurrentByCierre($cierre->id);
$cierre->unidades = $this->unidadRepository->fetchByCierre($cierre->id);
@ -30,7 +30,7 @@ class Cierre
$cierre->estados = $this->estadoCierreRepository->fetchByCierre($cierre_id);
$cierre->current = $this->estadoCierreRepository->fetchCurrentByCierre($cierre_id);
$cierre->unidades = $this->unidadRepository->fetchByCierre($cierre_id);
foreach ($cierre->unidades as &$unidad) {
foreach ($cierre->unidades as $unidad) {
$unidad->currentPrecio = $this->precioRepository->fetchByUnidadAndDate($unidad->id, $cierre->dateTime->format('Y-m-d'));
}
$cierre->valoresCierre = $this->valorCierreRepository->fetchByCierre($cierre_id);

13
app/src/Service/Venta/Credito.php
View File

@ -3,6 +3,8 @@ namespace Incoviba\Service\Venta;
use Exception;
use DateTimeImmutable;
use Incoviba\Common\Implement\Exception\EmptyResult;
use Incoviba\Exception\ServiceAction\Read;
use Psr\Log\LoggerInterface;
use Incoviba\Common\Ideal;
use Incoviba\Repository;
@ -24,9 +26,18 @@ class Credito extends Ideal\Service
parent::__construct($logger);
}
/**
* @param int $venta_id
* @return Model\Venta\Credito
* @throws Read
*/
public function getByVenta(int $venta_id): Model\Venta\Credito
{
return $this->creditoRepository->fetchByVenta($venta_id);
try {
return $this->creditoRepository->fetchByVenta($venta_id);
} catch (EmptyResult $exception) {
throw new Read(__CLASS__, $exception);
}
}
/**

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

@ -3,6 +3,7 @@ namespace Incoviba\Service\Venta;
use DateTimeImmutable;
use DateInterval;
use Incoviba\Common\Implement\Exception\EmptyResult;
use IntlDateFormatter;
use Psr\Log\LoggerInterface;
use Incoviba\Common\Ideal;

3
app/src/Service/Venta/Escritura.php
View File

@ -3,6 +3,7 @@ namespace Incoviba\Service\Venta;
use Exception;
use DateTimeImmutable;
use DateMalformedStringException;
use Psr\Log\LoggerInterface;
use Incoviba\Common\Ideal;
use Incoviba\Common\Implement\Exception\EmptyResult;
@ -65,7 +66,7 @@ class Escritura extends Ideal\Service
}
try {
$data['fecha'] = (new DateTimeImmutable($data['fecha']))->format('Y-m-d');
} catch (\DateMalformedStringException) {
} catch (DateMalformedStringException) {
unset($data['fecha']);
}

16
app/src/Service/Venta/FormaPago.php
View File

@ -1,12 +1,14 @@
<?php
namespace Incoviba\Service\Venta;
use Incoviba\Service\Valor;
use Error;
use Incoviba\Exception\ServiceAction\Read;
use Psr\Log\LoggerInterface;
use Incoviba\Common\Implement;
use Incoviba\Common\Ideal;
use Incoviba\Model;
use Incoviba\Repository;
use Incoviba\Service\Valor;
class FormaPago extends Ideal\Service
{
@ -28,22 +30,22 @@ class FormaPago extends Ideal\Service
$formaPago = new Model\Venta\FormaPago();
try {
$formaPago->pie = $this->pieService->getByVenta($venta_id);
} catch (Implement\Exception\EmptyResult) {}
} catch (Read) {}
try {
$formaPago->bonoPie = $this->bonoPieService->getByVenta($venta_id);
} catch (Implement\Exception\EmptyResult) {}
} catch (Read) {}
try {
$formaPago->credito = $this->creditoService->getByVenta($venta_id);
} catch (Implement\Exception\EmptyResult) {}
} catch (Read) {}
try {
$formaPago->escritura = $this->escrituraRepository->fetchByVenta($venta_id);
} catch (Implement\Exception\EmptyResult) {}
try {
$formaPago->subsidio = $this->subsidioService->getByVenta($venta_id);
} catch (Implement\Exception\EmptyResult) {}
} catch (Read) {}
try {
$formaPago->devolucion = $this->pagoService->getDevolucionByVenta($venta_id);
} catch (Implement\Exception\EmptyResult) {}
} catch (Read) {}
try {
$formaPago->cuotasAbono = $this->cuotaRepository->fetchByVenta($venta_id);
} catch (Implement\Exception\EmptyResult) {}
@ -66,7 +68,7 @@ class FormaPago extends Ideal\Service
$method = 'add' . str_replace(' ', '', ucwords(str_replace('_', ' ', $name)));
$obj = $this->{$method}($data);
$forma_pago->{$name} = $obj;
} catch (\Error $error) {
} catch (Error $error) {
$this->logger->critical($error);
}
}

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

@ -4,6 +4,8 @@ namespace Incoviba\Service\Venta;
use Exception;
use DateTimeInterface;
use DateTimeImmutable;
use DateMalformedStringException;
use Incoviba\Exception\ServiceAction\Read;
use PDOException;
use Incoviba\Common\Implement\Exception\EmptyResult;
use Incoviba\Repository;
@ -112,9 +114,19 @@ class Pago
{
return [];
}
/**
* @param int $venta_id
* @return Model\Venta\Pago
* @throws Read
*/
public function getDevolucionByVenta(int $venta_id): Model\Venta\Pago
{
return $this->process($this->pagoRepository->fetchDevolucionByVenta($venta_id));
try {
return $this->process($this->pagoRepository->fetchDevolucionByVenta($venta_id));
} catch (EmptyResult $exception) {
throw new Read(__CLASS__, $exception);
}
}
public function add(array $data): Model\Venta\Pago
@ -122,7 +134,7 @@ class Pago
if (!isset($data['uf'])) {
try {
$data['uf'] = $this->ufService->get(new DateTimeImmutable($data['fecha']));
} catch (\DateMalformedStringException) {
} catch (DateMalformedStringException) {
$data['uf'] = 0;
}
}
@ -147,14 +159,14 @@ class Pago
if (array_key_exists('fecha', $data)) {
try {
$data['fecha'] = (new DateTimeImmutable($data['fecha']))->format('Y-m-d');
} catch (\DateMalformedStringException) {
} catch (DateMalformedStringException) {
$data['fecha'] = (new DateTimeImmutable())->format('Y-m-d');
}
}
if (array_key_exists('uf', $data)) {
try {
$data['uf'] = $this->ufService->get(new DateTimeImmutable($data['fecha']));
} catch (\DateMalformedStringException) {
} catch (DateMalformedStringException) {
$data['uf'] = 0;
}
}
@ -171,7 +183,7 @@ class Pago
try {
$this->pagoRepository->remove($pago);
return true;
} catch (EmptyResult|PDOException) {
} catch (PDOException) {
return false;
}
}

7
app/src/Service/Venta/Pie.php
View File

@ -3,6 +3,7 @@ namespace Incoviba\Service\Venta;
use Incoviba\Common\Implement\Exception\EmptyResult;
use Incoviba\Common\Implement\Repository\Factory;
use Incoviba\Exception\ServiceAction\Read;
use Incoviba\Repository;
use Incoviba\Model;
@ -20,7 +21,11 @@ class Pie
}
public function getByVenta(int $venta_id): Model\Venta\Pie
{
return $this->process($this->pieRepository->fetchByVenta($venta_id));
try {
return $this->process($this->pieRepository->fetchByVenta($venta_id));
} catch (EmptyResult $exception) {
throw new Read(__CLASS__, $exception);
}
}
public function add(array $data): Model\Venta\Pie

61
app/src/Service/Venta/Precio.php
View File

@ -1,6 +1,8 @@
<?php
namespace Incoviba\Service\Venta;
use Incoviba\Common\Implement\Exception\EmptyResult;
use Incoviba\Exception\ServiceAction\Read;
use Incoviba\Repository;
use Incoviba\Model;
@ -8,29 +10,58 @@ class Precio
{
public function __construct(protected Repository\Venta\Precio $precioRepository, protected Repository\Venta\EstadoPrecio $estadoPrecioRepository) {}
/**
* @param int $proyecto_id
* @return array
* @throws Read
*/
public function getByProyecto(int $proyecto_id): array
{
$precios = $this->precioRepository->fetchByProyecto($proyecto_id);
foreach ($precios as &$precio) {
$precio->estados = $this->estadoPrecioRepository->fetchByPrecio($precio->id);
$precio->current = $this->estadoPrecioRepository->fetchCurrentByPrecio($precio->id);
try {
$precios = $this->precioRepository->fetchByProyecto($proyecto_id);
foreach ($precios as $precio) {
$precio->estados = $this->estadoPrecioRepository->fetchByPrecio($precio->id);
$precio->current = $this->estadoPrecioRepository->fetchCurrentByPrecio($precio->id);
}
return $precios;
} catch (EmptyResult $exception) {
throw new Read(__CLASS__, $exception);
}
return $precios;
}
/**
* @param int $unidad_id
* @return Model\Venta\Precio
* @throws Read
*/
public function getVigenteByUnidad(int $unidad_id): Model\Venta\Precio
{
$precio = $this->precioRepository->fetchVigenteByUnidad($unidad_id);
$precio->estados = $this->estadoPrecioRepository->fetchByPrecio($precio->id);
$precio->current = $this->estadoPrecioRepository->fetchCurrentByPrecio($precio->id);
return $precio;
}
public function getByUnidad(int $unidad_id): array
{
$precios = $this->precioRepository->fetchByUnidad($unidad_id);
foreach ($precios as &$precio) {
try {
$precio = $this->precioRepository->fetchVigenteByUnidad($unidad_id);
$precio->estados = $this->estadoPrecioRepository->fetchByPrecio($precio->id);
$precio->current = $this->estadoPrecioRepository->fetchCurrentByPrecio($precio->id);
return $precio;
} catch (EmptyResult $exception) {
throw new Read(__CLASS__, $exception);
}
}
/**
* @param int $unidad_id
* @return array
* @throws Read
*/
public function getByUnidad(int $unidad_id): array
{
try {
$precios = $this->precioRepository->fetchByUnidad($unidad_id);
foreach ($precios as $precio) {
$precio->estados = $this->estadoPrecioRepository->fetchByPrecio($precio->id);
$precio->current = $this->estadoPrecioRepository->fetchCurrentByPrecio($precio->id);
}
return $precios;
} catch (EmptyResult $exception) {
throw new Read(__CLASS__, $exception);
}
return $precios;
}
}

5
app/src/Service/Venta/PropiedadUnidad.php
View File

@ -2,6 +2,7 @@
namespace Incoviba\Service\Venta;
use Incoviba\Common\Implement\Exception\EmptyResult;
use Incoviba\Exception\ServiceAction\Read;
use Incoviba\Repository;
use Incoviba\Service;
use Incoviba\Model;
@ -51,10 +52,10 @@ class PropiedadUnidad
try {
$unidad->precios = $this->precioService->getByUnidad($unidad->id);
$unidad->currentPrecio = $this->precioService->getVigenteByUnidad($unidad->id);
if ($unidad->valor === 0 or $unidad->valor === null) {
if ($unidad->valor === null or $unidad->valor === 0) {
$unidad->valor = $unidad->currentPrecio->valor;
}
} catch (EmptyResult) {}
} catch (Read) {}
return $unidad;
}
}

14
app/src/Service/Venta/Subsidio.php
View File

@ -1,8 +1,9 @@
<?php
namespace Incoviba\Service\Venta;
use Exception;
use DateTimeImmutable;
use Incoviba\Common\Implement\Exception\EmptyResult;
use Incoviba\Exception\ServiceAction\Read;
use Incoviba\Repository;
use Incoviba\Model;
use Incoviba\Service;
@ -19,9 +20,18 @@ class Subsidio
protected Service\Valor $valorService
) {}
/**
* @param int $venta_id
* @return Model\Venta\Subsidio
* @throws Read
*/
public function getByVenta(int $venta_id): Model\Venta\Subsidio
{
return $this->subsidioRepository->fetchByVenta($venta_id);
try {
return $this->subsidioRepository->fetchByVenta($venta_id);
} catch (EmptyResult $exception) {
throw new Read(__CLASS__, $exception);
}
}
/**

5
app/src/Service/Venta/Unidad.php
View File

@ -1,6 +1,8 @@
<?php
namespace Incoviba\Service\Venta;
use Incoviba\Exception\ServiceAction\Read;
use PDOException;
use Incoviba\Common\Implement\Exception\EmptyResult;
use Incoviba\Repository;
use Incoviba\Service;
@ -60,8 +62,7 @@ class Unidad
try {
$unidad->precios = $this->precioService->getByUnidad($unidad->id);
$unidad->currentPrecio = $this->precioService->getVigenteByUnidad($unidad->id);
} catch (EmptyResult) {
}
} catch (Read) {}
return $unidad;
}
}