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

Restructura contabilidad

Browse Source
This commit is contained in:
Juan Pablo Vial
2024-03-26 09:38:20 -03:00
parent 4b3397dd63
commit 5f56022109
57 changed files with 311 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/Repository/Banco.php → app/src/Repository/Contabilidad/Banco.php
View File

@ -1,5 +1,5 @@
<?php
namespace Incoviba\Repository;
namespace Incoviba\Repository\Contabilidad;
use Incoviba\Common\Define;
use Incoviba\Common\Ideal;
@ -17,7 +17,7 @@ class Banco extends Ideal\Repository
public function create(?array $data = null): Define\Model
{
$map = new Implement\Repository\MapperParser(['nombre']);
return $this->parseData(new Model\Banco(), $data, $map);
return $this->parseData(new Model\Contabilidad\Banco(), $data, $map);
}
public function save(Define\Model $model): Define\Model
{

14
app/src/Repository/Cartola.php → app/src/Repository/Contabilidad/Cartola.php
View File

@ -1,5 +1,5 @@
<?php
namespace Incoviba\Repository;
namespace Incoviba\Repository\Contabilidad;
use DateTimeInterface;
use Incoviba\Common\Define;
@ -16,7 +16,7 @@ class Cartola extends Ideal\Repository
$this->setTable('cartolas');
}
public function create(?array $data = null): Model\Cartola
public function create(?array $data = null): Model\Contabilidad\Cartola
{
$map = (new Implement\Repository\MapperParser(['cargos', 'abonos', 'saldo']))
->register('fecha', new Implement\Repository\Mapper\DateTime('fecha'))
@ -25,9 +25,9 @@ class Cartola extends Ideal\Repository
->setFunction(function($data) {
return $this->cuentaRepository->fetchById($data['cuenta_id']);
}));
return $this->parseData(new Model\Cartola(), $data, $map);
return $this->parseData(new Model\Contabilidad\Cartola(), $data, $map);
}
public function save(Define\Model $model): Model\Cartola
public function save(Define\Model $model): Model\Contabilidad\Cartola
{
$model->id = $this->saveNew([
'cuenta_id',
@ -44,7 +44,7 @@ class Cartola extends Ideal\Repository
]);
return $model;
}
public function edit(Define\Model $model, array $new_data): Model\Cartola
public function edit(Define\Model $model, array $new_data): Model\Contabilidad\Cartola
{
return $this->update($model, ['cuenta_id', 'fecha', 'cargos', 'abonos', 'saldo'], $new_data);
}
@ -57,7 +57,7 @@ class Cartola extends Ideal\Repository
->where('fecha = ?');
return $this->fetchMany($query, [$fecha->format('Y-m-d')]);
}
public function fetchByCuentaAndFecha(int $cuenta_id, DateTimeInterface $fecha): Model\Cartola
public function fetchByCuentaAndFecha(int $cuenta_id, DateTimeInterface $fecha): Model\Contabilidad\Cartola
{
$query = $this->connection->getQueryBuilder()
->select()
@ -65,7 +65,7 @@ class Cartola extends Ideal\Repository
->where('cuenta_id = ? AND fecha = ?');
return $this->fetchOne($query, [$cuenta_id, $fecha->format('Y-m-d')]);
}
public function fetchLastByCuentaAndFecha(int $cuenta_id, DateTimeInterface $fecha): Model\Cartola
public function fetchLastByCuentaAndFecha(int $cuenta_id, DateTimeInterface $fecha): Model\Contabilidad\Cartola
{
$query = $this->connection->getQueryBuilder()
->select()

5
app/src/Repository/CategoriaCentro.php → app/src/Repository/Contabilidad/CategoriaCentro.php
View File

@ -1,8 +1,9 @@
<?php
namespace Incoviba\Repository;
namespace Incoviba\Repository\Contabilidad;
use Incoviba\Common\Define;
use Incoviba\Model;
use Incoviba\Repository\Tipo;
class CategoriaCentro extends Tipo
{
@ -14,6 +15,6 @@ class CategoriaCentro extends Tipo
protected function getBlank(): Define\Model
{
return new Model\CategoriaCentro();
return new Model\Contabilidad\CategoriaCentro();
}
}

14
app/src/Repository/CentroCosto.php → app/src/Repository/Contabilidad/CentroCosto.php
View File

@ -1,12 +1,12 @@
<?php
namespace Incoviba\Repository;
namespace Incoviba\Repository\Contabilidad;
use Incoviba\Common\Define;
use Incoviba\Common\Ideal;
use Incoviba\Common\Implement\Repository\Mapper;
use Incoviba\Common\Implement\Repository\MapperParser;
use Incoviba\Repository;
use Incoviba\Model;
use Incoviba\Repository\TipoCuenta;
class CentroCosto extends Ideal\Repository
{
@ -18,7 +18,7 @@ class CentroCosto extends Ideal\Repository
$this->setTable('centros_costos');
}
public function create(?array $data = null): Model\CentroCosto
public function create(?array $data = null): Model\Contabilidad\CentroCosto
{
$map = (new MapperParser(['descripcion']))
->register('tipo_centro_id', (new Mapper())
@ -39,9 +39,9 @@ class CentroCosto extends Ideal\Repository
->setDefault(null))
->register('cuenta_contable', (new Mapper())
->setProperty('cuentaContable'));
return $this->parseData(new Model\CentroCosto(), $data, $map);
return $this->parseData(new Model\Contabilidad\CentroCosto(), $data, $map);
}
public function save(Define\Model $model): Model\CentroCosto
public function save(Define\Model $model): Model\Contabilidad\CentroCosto
{
$this->saveNew(
['id', 'tipo_centro_id', 'categoria_id', 'tipo_cuenta_id', 'cuenta_contable', 'descripcion'],
@ -49,12 +49,12 @@ class CentroCosto extends Ideal\Repository
);
return $model;
}
public function edit(Define\Model $model, array $new_data): Model\CentroCosto
public function edit(Define\Model $model, array $new_data): Model\Contabilidad\CentroCosto
{
return $this->update($model, ['tipo_centro_id', 'categoria_id', 'tipo_cuenta_id', 'cuenta_contable', 'descripcion'], $new_data);
}
public function fetchByDescripcion(string $descripcion): Model\CentroCosto
public function fetchByDescripcion(string $descripcion): Model\Contabilidad\CentroCosto
{
$query = $this->connection->getQueryBuilder()
->select()

12
app/src/Repository/Deposito.php → app/src/Repository/Contabilidad/Deposito.php
View File

@ -1,12 +1,12 @@
<?php
namespace Incoviba\Repository;
namespace Incoviba\Repository\Contabilidad;
use DateTimeImmutable;
use Incoviba\Common\Define;
use Incoviba\Common\Ideal;
use Incoviba\Common\Implement;
use Incoviba\Repository;
use Incoviba\Model;
use Incoviba\Repository;
class Deposito extends Ideal\Repository
{
@ -16,7 +16,7 @@ class Deposito extends Ideal\Repository
$this->setTable('depositos');
}
public function create(?array $data = null): Model\Deposito
public function create(?array $data = null): Model\Contabilidad\Deposito
{
$map = (new Implement\Repository\MapperParser(['id', 'capital', 'futuro']))
->register('cuenta_id', (new Implement\Repository\Mapper())
@ -26,9 +26,9 @@ class Deposito extends Ideal\Repository
}))
->register('inicio', new Implement\Repository\Mapper\DateTime('inicio'))
->register('termino', new Implement\Repository\Mapper\DateTime('termino'));
return $this->parseData(new Model\Deposito(), $data, $map);
return $this->parseData(new Model\Contabilidad\Deposito(), $data, $map);
}
public function save(Define\Model $model): Model\Deposito
public function save(Define\Model $model): Model\Contabilidad\Deposito
{
$this->saveNew([
'id', 'cuenta_id', 'capital', 'futuro', 'inicio', 'termino'
@ -39,7 +39,7 @@ class Deposito extends Ideal\Repository
return $model;
}
public function edit(Define\Model $model, array $new_data): Model\Deposito
public function edit(Define\Model $model, array $new_data): Model\Contabilidad\Deposito
{
return $this->update($model, ['cuenta_id', 'capital', 'futuro', 'inicio', 'termino'], $new_data);
}

13
app/src/Repository/Movimiento.php → app/src/Repository/Contabilidad/Movimiento.php
View File

@ -1,11 +1,12 @@
<?php
namespace Incoviba\Repository;
namespace Incoviba\Repository\Contabilidad;
use DateTimeInterface;
use Incoviba\Common\Define;
use Incoviba\Common\Ideal;
use Incoviba\Common\Implement;
use Incoviba\Model;
use Incoviba\Repository\Inmobiliaria;
class Movimiento extends Ideal\Repository
{
@ -15,7 +16,7 @@ class Movimiento extends Ideal\Repository
$this->setTable('movimientos');
}
public function create(?array $data = null): Model\Movimiento
public function create(?array $data = null): Model\Contabilidad\Movimiento
{
$map = (new Implement\Repository\MapperParser(['cargo', 'abono', 'saldo', 'glosa', 'documento']))
->register('fecha', new Implement\Repository\Mapper\DateTime('fecha'))
@ -25,9 +26,9 @@ class Movimiento extends Ideal\Repository
return $this->cuentaRepository->fetchById($data['cuenta_id']);
})
);
return $this->parseData(new Model\Movimiento(), $data, $map);
return $this->parseData(new Model\Contabilidad\Movimiento(), $data, $map);
}
public function save(Define\Model $model): Model\Movimiento
public function save(Define\Model $model): Model\Contabilidad\Movimiento
{
$model->id = $this->saveNew([
'cuenta_id',
@ -48,7 +49,7 @@ class Movimiento extends Ideal\Repository
]);
return $model;
}
public function edit(Define\Model $model, array $new_data): Model\Movimiento
public function edit(Define\Model $model, array $new_data): Model\Contabilidad\Movimiento
{
return $this->update($model, ['cuenta_id', 'fecha', 'glosa', 'documento', 'cargo', 'abono', 'saldo'], $new_data);
}
@ -61,7 +62,7 @@ class Movimiento extends Ideal\Repository
->where('cuenta_id = ? AND fecha = ?');
return $this->fetchMany($query, [$cuenta_id, $fecha->format('Y-m-d')]);
}
public function fetchByCuentaAndFechaAndCargoAndAbonoAndSaldo(int $cuenta_id, DateTimeInterface $fecha, int $cargo, int $abono, int $saldo): Model\Movimiento
public function fetchByCuentaAndFechaAndCargoAndAbonoAndSaldo(int $cuenta_id, DateTimeInterface $fecha, int $cargo, int $abono, int $saldo): Model\Contabilidad\Movimiento
{
$query = $this->connection->getQueryBuilder()
->select()

13
app/src/Repository/Nubox.php → app/src/Repository/Contabilidad/Nubox.php
View File

@ -1,10 +1,11 @@
<?php
namespace Incoviba\Repository;
namespace Incoviba\Repository\Contabilidad;
use Incoviba\Common\Define;
use Incoviba\Common\Ideal;
use Incoviba\Common\Implement;
use Incoviba\Model;
use Incoviba\Repository\Inmobiliaria;
class Nubox extends Ideal\Repository
{
@ -14,7 +15,7 @@ class Nubox extends Ideal\Repository
$this->setTable('inmobiliarias_nubox');
}
public function create(?array $data = null): Model\Nubox
public function create(?array $data = null): Model\Contabilidad\Nubox
{
$map = (new Implement\Repository\MapperParser(['usuario', 'alias']))
->register('inmobiliaria_rut', (new Implement\Repository\Mapper())
@ -24,9 +25,9 @@ class Nubox extends Ideal\Repository
}))
->register('contraseña', (new Implement\Repository\Mapper())
->setProperty('password'));
return $this->parseData(new Model\Nubox(), $data, $map);
return $this->parseData(new Model\Contabilidad\Nubox(), $data, $map);
}
public function save(Define\Model $model): Model\Nubox
public function save(Define\Model $model): Model\Contabilidad\Nubox
{
$this->saveNew(
['inmobiliaria_rut', 'alias', 'usuario', 'contraseña'],
@ -34,12 +35,12 @@ class Nubox extends Ideal\Repository
);
return $model;
}
public function edit(Define\Model $model, array $new_data): Model\Nubox
public function edit(Define\Model $model, array $new_data): Model\Contabilidad\Nubox
{
return $this->update($model, ['inmobiliaria_rut', 'alias', 'usuario', 'contraseña'], $new_data);
}
public function fetchByInmobiliaria(int $inmobiliaria_rut): Model\Nubox
public function fetchByInmobiliaria(int $inmobiliaria_rut): Model\Contabilidad\Nubox
{
$query = $this->connection->getQueryBuilder()
->select()

10
app/src/Repository/PagoCentroCosto.php → app/src/Repository/Contabilidad/PagoCentroCosto.php
View File

@ -1,5 +1,5 @@
<?php
namespace Incoviba\Repository;
namespace Incoviba\Repository\Contabilidad;
use Incoviba\Common\Define;
use Incoviba\Common\Ideal;
@ -15,7 +15,7 @@ class PagoCentroCosto extends Ideal\Repository
$this->setTable('pagos_centros_costos');
}
public function create(?array $data = null): Model\PagoCentroCosto
public function create(?array $data = null): Model\Contabilidad\PagoCentroCosto
{
$map = (new Implement\Repository\MapperParser())
->register('pago_id', (new Implement\Repository\Mapper())
@ -28,14 +28,14 @@ class PagoCentroCosto extends Ideal\Repository
->setFunction(function(array $data) {
return $this->centroCostoRepository->fetchById($data['centro_costo_id']);
}));
return $this->parseData(new Model\PagoCentroCosto(), $data, $map);
return $this->parseData(new Model\Contabilidad\PagoCentroCosto(), $data, $map);
}
public function save(Define\Model $model): Model\PagoCentroCosto
public function save(Define\Model $model): Model\Contabilidad\PagoCentroCosto
{
$model->id = $this->saveNew(['pago_id', 'centro_costo_id'], [$model->pago->id, $model->centroCosto->id]);
return $model;
}
public function edit(Define\Model $model, array $new_data): Model\PagoCentroCosto
public function edit(Define\Model $model, array $new_data): Model\Contabilidad\PagoCentroCosto
{
return $this->update($model, ['pago_id', 'centro_costo_id'], $new_data);
}

5
app/src/Repository/TipoCentro.php → app/src/Repository/Contabilidad/TipoCentro.php
View File

@ -1,8 +1,9 @@
<?php
namespace Incoviba\Repository;
namespace Incoviba\Repository\Contabilidad;
use Incoviba\Common\Define;
use Incoviba\Model;
use Incoviba\Repository\Tipo;
class TipoCentro extends Tipo
{
@ -14,6 +15,6 @@ class TipoCentro extends Tipo
protected function getBlank(): Define\Model
{
return new Model\TipoCentro();
return new Model\Contabilidad\TipoCentro();
}
}

2
app/src/Repository/Inmobiliaria.php
View File

@ -9,7 +9,7 @@ use Incoviba\Repository;
class Inmobiliaria extends Ideal\Repository
{
public function __construct(Define\Connection $connection, protected Repository\Banco $bancoRepository, protected Repository\Inmobiliaria\TipoSociedad $tipoSociedadRepository)
public function __construct(Define\Connection $connection, protected Contabilidad\Banco $bancoRepository, protected Repository\Inmobiliaria\TipoSociedad $tipoSociedadRepository)
{
parent::__construct($connection);
$this->setTable('inmobiliaria');

11
app/src/Repository/Inmobiliaria/Cuenta.php
View File

@ -3,16 +3,15 @@ namespace Incoviba\Repository\Inmobiliaria;
use Incoviba\Common\Define;
use Incoviba\Common\Ideal;
use Incoviba\Repository;
use Incoviba\Model;
use Incoviba\Common\Implement;
use PhpParser\Node\Expr\BinaryOp\Mod;
use Incoviba\Model;
use Incoviba\Repository;
class Cuenta extends Ideal\Repository
{
public function __construct(Define\Connection $connection,
protected Repository\Inmobiliaria $inmobiliariaRepository,
protected Repository\Banco $bancoRepository)
public function __construct(Define\Connection $connection,
protected Repository\Inmobiliaria $inmobiliariaRepository,
protected Repository\Contabilidad\Banco $bancoRepository)
{
parent::__construct($connection);
$this->setTable('cuenta');

4
app/src/Repository/Movimiento/Detalle.php
View File

@ -9,8 +9,8 @@ use Incoviba\Repository;
class Detalle extends Ideal\Repository
{
public function __construct(Define\Connection $connection, protected Repository\Movimiento $movimientoRepository,
protected Repository\CentroCosto $centroCostoRepository)
public function __construct(Define\Connection $connection, protected Repository\Contabilidad\Movimiento $movimientoRepository,
protected Repository\Contabilidad\CentroCosto $centroCostoRepository)
{
parent::__construct($connection);
$this->setTable('movimientos_detalles');

10
app/src/Repository/Venta/Cuota.php
View File

@ -1,8 +1,6 @@
<?php
namespace Incoviba\Repository\Venta;
use PDO;
use DateTimeImmutable;
use Incoviba\Common\Define;
use Incoviba\Common\Ideal;
use Incoviba\Common\Implement;
@ -13,10 +11,10 @@ use Incoviba\Service;
class Cuota extends Ideal\Repository
{
public function __construct(
Define\Connection $connection,
protected Pie $pieRepository,
protected Repository\Banco $bancoRepository,
protected Service\Venta\Pago $pagoService
Define\Connection $connection,
protected Pie $pieRepository,
protected Repository\Contabilidad\Banco $bancoRepository,
protected Service\Venta\Pago $pagoService
)
{
parent::__construct($connection);

6
app/src/Repository/Venta/Pago.php
View File

@ -10,9 +10,9 @@ use Incoviba\Repository;
class Pago extends Ideal\Repository
{
public function __construct(
Define\Connection $connection,
protected Repository\Banco $bancoRepository,
protected TipoPago $tipoPagoRepository
Define\Connection $connection,
protected Repository\Contabilidad\Banco $bancoRepository,
protected TipoPago $tipoPagoRepository
)
{
parent::__construct($connection);