Informe Tesoreria

This commit is contained in:
Juan Pablo Vial
2024-02-13 01:16:17 -03:00
parent 19333bc338
commit e44ab30665
23 changed files with 896 additions and 40 deletions

View File

@ -0,0 +1,7 @@
<?php
use Incoviba\Controller\API\Contabilidad\DAPs;
$app->group('/depositos', function($app) {
$app->post('/add[/]', [DAPs::class, 'add']);
$app->get('/inmobiliaria/{inmobiliaria_rut}[/]', [DAPs::class, 'inmobiliaria']);
});

View File

@ -0,0 +1,6 @@
<?php
use Incoviba\Controller\Contabilidad;
$app->group('/depositos', function($app) {
$app->get('[/]', [Contabilidad::class, 'depositos']);
});

View File

@ -0,0 +1,10 @@
<?php
$app->group('/informes', function($app) {
$files = new FilesystemIterator(implode(DIRECTORY_SEPARATOR, [__DIR__, 'informes']));
foreach ($files as $file) {
if ($file->isDir()) {
continue;
}
include_once $file->getRealPath();
}
});

View File

@ -0,0 +1,6 @@
<?php
use Incoviba\Controller\Contabilidad;
$app->group('/tesoreria', function($app) {
$app->get('[/[{fecha}[/]]]', [Contabilidad::class, 'tesoreria']);
});

View File

@ -0,0 +1,235 @@
@extends('layout.base')
@section('page_content')
<div class="ui container">
<h1 class="ui header">Depósitos a Plazo</h1>
<table class="ui table" id="depositos">
<thead>
<tr>
<th>Inmobiliaria</th>
<th>Banco</th>
<th> Depósito</th>
<th>Capital</th>
<th>Inicio</th>
<th>Plazo</th>
<th>Vencimiento</th>
<th>Monto al Vencimiento</th>
<th>Tasa</th>
<th>
<button class="ui green icon button" id="add_button">
<i class="plus icon"></i>
</button>
</th>
</tr>
</thead>
<tbody>
@foreach ($depositos as $deposito)
<tr>
<td>{{$deposito->cuenta->inmobiliaria->razon}}</td>
<td>{{$deposito->cuenta->banco->nombre}}</td>
<td>{{$deposito->id}}</td>
<td>{{$format->pesos($deposito->capital)}}</td>
<td>{{$deposito->inicio->format('d-m-Y')}}</td>
<td>{{$deposito->plazo()}}</td>
<td>{{$deposito->termino->format('d-m-Y')}}</td>
<td>{{$format->pesos($deposito->futuro)}}</td>
<td>{{$format->percent($deposito->tasa() * 100, 4)}}</td>
<td>
<button class="ui red icon button remove_button" data-deposito="{{$deposito->id}}">
<i class="remove icon"></i>
</button>
</td>
</tr>
@endforeach
</tbody>
</table>
</div>
<div class="ui modal" id="add_modal">
<div class="content">
<form class="ui form" id="add_form">
<div class="two fields">
<div class="field">
<label for="inmobiliaria">Inmobiliaria</label>
<div class="ui search selection dropdown" id="inmobiliaria">
<input type="hidden" name="inmobiliaria_rut" />
<i class="dropdown icon"></i>
<div class="default text">Inmobiliaria</div>
<div class="menu">
@foreach ($inmobiliarias as $inmobiliaria)
<div class="item" data-value="{{$inmobiliaria->rut}}">{{$inmobiliaria->razon}}</div>
@endforeach
</div>
</div>
</div>
<div class="field">
<label for="banco">Banco</label>
<div class="ui search selection dropdown" id="banco">
<input type="hidden" name="banco_id" />
<i class="dropdown icon"></i>
<div class="default text">Banco</div>
<div class="menu"></div>
</div>
</div>
</div>
<div class="three wide field">
<label for="identificador"> Depósito</label>
<input type="text" id="identificador" name="id" />
</div>
<div class="three fields">
<div class="field">
<label for="capital">Capital</label>
<input type="number" id="capital" name="capital" />
</div>
<div class="field">
<label for="futuro">Monto al Vencimiento</label>
<input type="number" id="futuro" name="futuro" />
</div>
</div>
<div class="two fields">
<div class="field">
<label for="inicio">Inicio</label>
<div class="ui calendar" id="inicio">
<div class="ui left icon input">
<i class="calendar icon"></i>
<input type="text" name="inicio" />
</div>
</div>
</div>
<div class="field">
<label for="termino">Vencimiento</label>
<div class="ui calendar" id="termino">
<div class="ui left icon input">
<i class="calendar icon"></i>
<input type="text" name="termino" />
</div>
</div>
</div>
</div>
</form>
</div>
<div class="actions">
<button class="ui approve button">Agregar</button>
</div>
</div>
@endsection
@include('layout.head.styles.datatables')
@include('layout.body.scripts.datatables')
@push('page_scripts')
<script>
const depositos = {
ids: {},
data: {
inmobiliaria: {
rut: 0,
razon: ''
},
banco: {
id: 0,
nombre: ''
}
},
get() {
return {
bancos: inmobiliaria_rut => {
const url = '{{$urls->api}}/inmobiliaria/' + inmobiliaria_rut + '/cuentas'
return fetchAPI(url).then(response => {
if (!response) {
return
}
return response.json().then(json => {
if (json.cuentas.length === 0) {
return
}
$(this.ids.forms.add.bancos).dropdown('change values', json.cuentas.map(cuenta => {
return {value: cuenta.banco.id, text: cuenta.banco.nombre, name: cuenta.banco.nombre}
})).dropdown('refresh')
})
})
},
}
},
add() {
return {
deposito: form => {
const url = '{{$urls->api}}/contabilidad/depositos/add'
const body = new FormData(form)
const inicio = $(this.ids.forms.add.inicio).calendar('get date')
const termino = $(this.ids.forms.add.termino).calendar('get date')
body.set('inicio', [inicio.getFullYear(), inicio.getMonth()+1, inicio.getDate()].join('-'))
body.set('termino', [termino.getFullYear(), termino.getMonth()+1, termino.getDate()].join('-'))
return fetchAPI(url, {method: 'post', body}).then(response => {
if (!response) {
return
}
return response.json().then(json => {
if (json.status) {
window.location.reload()
}
})
})
}
}
},
setup(ids) {
this.ids = ids
$(this.ids.buttons.add).click(event => {
$(this.ids.modals.add).modal('show')
})
$(this.ids.modals.add).modal({
onApprove: $element => {
$(this.ids.forms.add.base).submit()
}
})
$(this.ids.forms.add.base).submit(event => {
event.preventDefault()
this.add().deposito(event.currentTarget)
return false
})
$(this.ids.forms.add.inmobiliarias).dropdown({
fireOnInit: true,
onChange: (value, text, $choice) => {
this.data.inmobiliaria.rut = value
this.data.inmobiliaria.razon = text
this.get().bancos(value)
}
})
$(this.ids.forms.add.banco).dropdown({
fireOnInit: true,
onChange: (value, text, $choice) => {
this.data.banco.id = value
this.data.banco.nombre = text
}
})
$(this.ids.forms.add.inicio).calendar(calendar_date_options)
$(this.ids.forms.add.termino).calendar(calendar_date_options)
$(this.ids.table).dataTable()
}
}
$(document).ready(() => {
depositos.setup({
table: '#depositos',
buttons: {
add: '#add_button'
},
modals: {
add: '#add_modal'
},
forms: {
add: {
base: '#add_form',
inmobiliarias: '#inmobiliaria',
bancos: '#banco',
inicio: '#inicio',
termino: '#termino'
}
}
})
})
</script>
@endpush

View File

@ -0,0 +1,147 @@
@extends('layout.base')
@section('page_content')
<div class="ui container">
<h1 class="ui centered header">Informe de Tesorería</h1>
<h4 class="ui centered sub header">{{$fecha->format('d M Y')}}</h4>
</div>
<div class="ui grid">
<div class="four wide column">
<table class="ui collapsing simple table">
<tr>
<td>Informe anterior</td>
<td>{{$anterior->format('d/m/Y')}}</td>
</tr>
<tr>
<td>Informe actual</td>
<td>{{$fecha->format('d/m/Y')}}</td>
</tr>
</table>
</div>
<div class="column"></div>
<div class="four wide column">
<table class="ui collapsing simple table">
<tr>
<td>Valor UF</td>
<td class="right aligned">{{$format->pesos($UF->get($fecha), 2)}}</td>
</tr>
<tr>
<td>Valor Dólar</td>
<td class="right aligned">{{$format->pesos($USD->get($fecha), 2)}}</td>
</tr>
</table>
</div>
</div>
<table class="ui striped table">
<thead>
<tr>
<th>EMPRESA</th>
<th>Banco</th>
<th>Cuenta</th>
<th class="right aligned">Saldo Anterior</th>
<th class="right aligned">Saldo Actual</th>
<th class="right aligned">Diferencia</th>
<th class="right aligned">FFMM</th>
<th class="right aligned">DAP</th>
<th class="right aligned">Saldo Empresa</th>
<th class="right aligned">Total Cuentas</th>
<th class="right aligned">Total FFMM</th>
<th class="right aligned">Total DAP</th>
<th class="right aligned">Caja Total</th>
</tr>
</thead>
<tbody>
@foreach ($informes['inmobiliarias'] as $inmobiliaria_rut => $informe)
@foreach ($informe->cuentas as $i => $cuenta)
<tr>
@if ($i === 0)
<td rowspan="{{count($informe->cuentas)}}">{{$informe->inmobiliaria->razon}}</td>
@endif
<td>{{$cuenta->banco}}</td>
<td>{{$cuenta->numero}}</td>
<td class="right aligned">{{$format->pesos($cuenta->anterior)}}</td>
<td class="right aligned">{{$format->pesos($cuenta->actual)}}</td>
<td class="right aligned">{{$format->pesos($cuenta->diferencia())}}</td>
<td class="right aligned">{{$format->pesos($cuenta->ffmm)}}</td>
<td class="right aligned">{{$format->pesos($cuenta->deposito)}}</td>
<td class="right aligned">{{$format->pesos($cuenta->saldo())}}</td>
@if ($i === 0)
<td class="right aligned" rowspan="{{count($informe->cuentas)}}">{{$format->pesos($informe->total())}}</td>
<td class="right aligned" rowspan="{{count($informe->cuentas)}}">{{$format->pesos($informe->ffmm())}}</td>
<td class="right aligned" rowspan="{{count($informe->cuentas)}}">{{$format->pesos($informe->deposito())}}</td>
<td class="right aligned" rowspan="{{count($informe->cuentas)}}">{{$format->pesos($informe->caja())}}</td>
@endif
</tr>
@endforeach
@endforeach
</tbody>
<tfoot>
<tr class="bold">
<th colspan="3">TOTAL</th>
<th class="right aligned">{{$format->pesos($informes['totales']->anterior)}}</th>
<th class="right aligned">{{$format->pesos($informes['totales']->actual)}}</th>
<th class="right aligned">{{$format->pesos($informes['totales']->diferencia())}}</th>
<th class="right aligned">{{$format->pesos($informes['totales']->ffmm)}}</th>
<th class="right aligned">{{$format->pesos($informes['totales']->deposito)}}</th>
<th class="right aligned">{{$format->pesos($informes['totales']->saldo())}}</th>
<th class="right aligned">{{$format->pesos($informes['totales']->cuentas())}}</th>
<th class="right aligned">{{$format->pesos($informes['totales']->ffmms())}}</th>
<th class="right aligned">{{$format->pesos($informes['totales']->depositos())}}</th>
<th class="right aligned">{{$format->pesos($informes['totales']->caja())}}</th>
</tr>
</tfoot>
</table>
<table class="ui table">
<thead>
<tr>
<th>EMPRESA</th>
<th class="right aligned">INGRESOS</th>
<th class="right aligned">EGRESOS</th>
<th>FECHA</th>
<th>BANCO</th>
<th>DESCRIPCIÓN</th>
</tr>
</thead>
<tbody>
@foreach ($informes['movimientos'] as $tipo => $movimientos)
@if ($tipo === 'capital dap')
@if (count($movimientos['ingresos']) === 0 and count($movimientos['egresos']) === 0)
@continue
@endif
<tr class="grey">
<td colspan="6">{{strtoupper($tipo)}}</td>
</tr>
@foreach ($movimientos as $t => $ms)
@foreach ($ms as $movimiento)
<tr>
<td >{{$movimiento->cuenta->inmobiliaria->razon}}</td>
<td class="right aligned">{{$format->pesos($movimiento->abono)}}</td>
<td class="right aligned">{{$format->pesos($movimiento->cargo)}}</td>
<td>{{$movimiento->fecha->format('d/m/Y')}}</td>
<td>{{$movimiento->cuenta->banco->nombre}}</td>
<td>{{$movimiento->glosa}}</td>
</tr>
@endforeach
@endforeach
@continue
@endif
@if (count($movimientos) === 0)
@continue
@endif
<tr class="grey">
<td colspan="6">{{strtoupper($tipo)}}</td>
</tr>
@foreach ($movimientos as $movimiento)
<tr>
<td >{{$movimiento->cuenta->inmobiliaria->razon}}</td>
<td class="right aligned">{{$format->pesos($movimiento->abono)}}</td>
<td class="red right aligned">{{$format->pesos($movimiento->cargo)}}</td>
<td>{{$movimiento->fecha->format('d/m/Y')}}</td>
<td>{{$movimiento->cuenta->banco->nombre}}</td>
<td>{{$movimiento->glosa}}</td>
</tr>
@endforeach
@endforeach
</tbody>
</table>
@endsection

View File

@ -2,6 +2,13 @@
Contabilidad
<i class="dropdown icon"></i>
<div class="menu">
<div class="item">
<i class="dropdown icon"></i>
Informes
<div class="menu">
<a class="item" href="{{$urls->base}}/contabilidad/informes/tesoreria">Tesorería</a>
</div>
</div>
<div class="item">
<i class="dropdown icon"></i>
<a class="text" href="{{$urls->base}}/contabilidad/centros_costos">Centros de Costos</a>
@ -9,5 +16,7 @@
<a class="item" href="{{$urls->base}}/contabilidad/centros_costos/asignar">Asignar en Cartola</a>
</div>
</div>
<a class="item" href="{{$urls->base}}/contabilidad/cartolas/diaria">Cartola Diaria</a>
<a class="item" href="{{$urls->base}}/contabilidad/depositos">Depósitos a Plazo</a>
</div>
</div>

View File

@ -20,7 +20,9 @@ return [
$ine = new Incoviba\Service\Money\Ine(new GuzzleHttp\Client([
'base_uri' => 'https://api-calculadora.ine.cl/ServiciosCalculadoraVariacion'
]));
return (new Incoviba\Service\Money())->register('uf', $mindicador)
return (new Incoviba\Service\Money($container->get(Psr\Log\LoggerInterface::class)))
->register('uf', $mindicador)
->register('usd', $mindicador)
->register('ipc', $ine);
},
Predis\Client::class => function(ContainerInterface $container) {
@ -35,6 +37,7 @@ return [
$container->get(Psr\Log\LoggerInterface::class),
$container->get(Psr\Http\Message\StreamFactoryInterface::class),
$container->get(Incoviba\Common\Define\Contabilidad\Exporter::class),
$container->get(Incoviba\Repository\Inmobiliaria::class),
$container->get(Incoviba\Repository\Inmobiliaria\Cuenta::class),
$container->get(Incoviba\Repository\Movimiento::class),
$container->get(Incoviba\Repository\Cartola::class)

View File

@ -11,6 +11,7 @@ return [
'format' => $container->get(Incoviba\Service\Format::class),
'API_KEY' => $container->get('API_KEY'),
'UF' => $container->get(Incoviba\Service\UF::class),
'USD' => $container->get(Incoviba\Service\USD::class),
'IPC' => $container->get(Incoviba\Service\IPC::class)
];
if ($global_variables['login']->isIn()) {

View File

@ -1,6 +1,7 @@
<?php
namespace Incoviba\Controller\API\Contabilidad;
use DateTimeImmutable;
use Psr\Http\Message\ServerRequestInterface;
use Psr\Http\Message\ResponseInterface;
use Incoviba\Common\Ideal;
@ -16,20 +17,52 @@ class DAPs extends Ideal\Controller
Repository\Inmobiliaria $inmobiliariaRepository,
Repository\Banco $bancoRepository,
Repository\Inmobiliaria\Cuenta $cuentaRepository,
Repository\DAP $dapRepository,
Repository\Deposito $dapRepository,
int $inmobiliaria_rut): ResponseInterface
{
$output = [
'inmobiliaria_rut' => $inmobiliaria_rut,
'daps' => []
'depositos' => []
];
try {
$inmobiliaria = $inmobiliariaRepository->fetchById($inmobiliaria_rut);
$cuentas = $cuentaRepository->fetchByInmobiliaria($inmobiliaria->rut);
foreach ($cuentas as $cuenta) {
$daps = $dapRepository->fetchByCuenta($cuenta->id);
$output['depositos'] = $dapRepository->fetchByCuenta($cuenta->id);
}
} catch (Implement\Exception\EmptyResult) {}
return $this->withJson($response, $output);
}
public function add(ServerRequestInterface $request, ResponseInterface $response,
Repository\Inmobiliaria $inmobiliariaRepository, Repository\Banco $bancoRepository,
Repository\Inmobiliaria\Cuenta $cuentaRepository,
Repository\Deposito $dapRepository): ResponseInterface
{
$body = $request->getParsedBody();
$output = [
'input' => $body,
'status' => false
];
try {
$inmobiliaria = $inmobiliariaRepository->fetchById($body['inmobiliaria_rut']);
$banco = $bancoRepository->fetchById($body['banco_id']);
$cuenta = $cuentaRepository->fetchByInmobiliariaAndBanco($inmobiliaria->rut, $banco->id);
$data = [
'id' => $body['id'],
'cuenta_id' => $cuenta->id,
'capital' => $body['capital'],
'futuro' => $body['futuro'],
'inicio' => (new DateTimeImmutable($body['inicio']))->format('Y-m-d'),
'termino' => (new DateTimeImmutable($body['termino']))->format('Y-m-d')
];
try {
$dapRepository->fetchById($body['id']);
} catch (Implement\Exception\EmptyResult) {
$dap = $dapRepository->create($data);
$dapRepository->save($dap);
}
$output['status'] = true;
} catch (Implement\Exception\EmptyResult) {}
return $this->withJson($response, $output);
}
}

View File

@ -1,6 +1,9 @@
<?php
namespace Incoviba\Controller;
use DateTimeImmutable;
use DateInterval;
use Incoviba\Common\Ideal\Controller;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
use Incoviba\Common\Alias\View;
@ -8,7 +11,7 @@ use Incoviba\Common\Implement\Exception\{EmptyResult, EmptyRedis};
use Incoviba\Repository;
use Incoviba\Service;
class Contabilidad
class Contabilidad extends Controller
{
use withRedis;
@ -22,10 +25,40 @@ class Contabilidad
$inmobiliarias = $this->fetchRedis($redisService, $redisKey);
} catch (EmptyRedis) {
try {
$inmobiliarias = $inmobiliariaRepository->fetchAll();
$inmobiliarias = $inmobiliariaRepository->fetchAllActive();
$this->saveRedis($redisService, $redisKey, $inmobiliarias, 30 * 24 * 60 * 60);
} catch (EmptyResult) {}
}
return $view->render($response, 'contabilidad.cartolas.diaria', compact('inmobiliarias'));
}
public function depositos(ServerRequestInterface $request, ResponseInterface $response, View $view,
Service\Redis $redisService,
Repository\Inmobiliaria $inmobiliariaRepository,
Repository\Deposito $dapRepository): ResponseInterface
{
$redisKey = 'inmobiliarias';
$inmobiliarias = [];
try {
$inmobiliarias = $this->fetchRedis($redisService, $redisKey);
} catch (EmptyRedis) {
try {
$inmobiliarias = $inmobiliariaRepository->fetchAllActive();
$this->saveRedis($redisService, $redisKey, $inmobiliarias, 30 * 24 * 60 * 60);
} catch (EmptyResult) {}
}
$depositos = [];
try {
$depositos = $dapRepository->fetchAll();
} catch (EmptyResult) {}
return $view->render($response, 'contabilidad.depositos', compact('inmobiliarias', 'depositos'));
}
public function tesoreria(ServerRequestInterface $request, ResponseInterface $response, View $view,
Service\Contabilidad\Informe\Tesoreria $contabilidadService,
string $fecha = 'today'): ResponseInterface
{
$fecha = new DateTimeImmutable($fecha);
$anterior = $contabilidadService->getAnterior($fecha);
$informes = $contabilidadService->build($fecha);
return $view->render($response, 'contabilidad.informes.tesoreria', compact('fecha', 'anterior', 'informes'));
}
}

View File

@ -4,7 +4,7 @@ namespace Incoviba\Model;
use DateTimeInterface;
use Incoviba\Common\Ideal;
class DAP extends Ideal\Model
class Deposito extends Ideal\Model
{
public Inmobiliaria\Cuenta $cuenta;
public int $capital;
@ -12,13 +12,13 @@ class DAP extends Ideal\Model
public DateTimeInterface $inicio;
public DateTimeInterface $termino;
public function periodo(): int
public function plazo(): int
{
return $this->termino->diff($this->inicio)->days;
}
public function interes(): float
public function tasa(): float
{
return ($this->futuro - $this->capital) / $this->capital / $this->periodo() * 365;
return ($this->futuro - $this->capital) / $this->capital;
}
public function jsonSerialize(): mixed
@ -29,8 +29,8 @@ class DAP extends Ideal\Model
'futuro' => $this->futuro,
'inicio' => $this->inicio->format('Y-m-d'),
'termino' => $this->termino->format('Y-m-d'),
'periodo' => $this->periodo(),
'interes' => $this->interes()
'plazo' => $this->plazo(),
'tasa' => $this->tasa()
]);
}
}

View File

@ -49,6 +49,14 @@ class Cartola extends Ideal\Repository
return $this->update($model, ['cuenta_id', 'fecha', 'cargos', 'abonos', 'saldo'], $new_data);
}
public function fetchByFecha(DateTimeInterface $fecha): array
{
$query = $this->connection->getQueryBuilder()
->select()
->from($this->getTable())
->where('fecha = ?');
return $this->fetchMany($query, [$fecha->format('Y-m-d')]);
}
public function fetchByCuentaAndFecha(int $cuenta_id, DateTimeInterface $fecha): Model\Cartola
{
$query = $this->connection->getQueryBuilder()

View File

@ -7,7 +7,7 @@ use Incoviba\Common\Implement;
use Incoviba\Repository;
use Incoviba\Model;
class DAP extends Ideal\Repository
class Deposito extends Ideal\Repository
{
public function __construct(Define\Connection $connection, protected Repository\Inmobiliaria\Cuenta $cuentaRepository)
{
@ -15,9 +15,9 @@ class DAP extends Ideal\Repository
$this->setTable('depositos');
}
public function create(?array $data = null): Model\DAP
public function create(?array $data = null): Model\Deposito
{
$map = (new Implement\Repository\MapperParser(['capital', 'futuro']))
$map = (new Implement\Repository\MapperParser(['id', 'capital', 'futuro']))
->register('cuenta_id', (new Implement\Repository\Mapper())
->setProperty('cuenta')
->setFunction(function(array $data) {
@ -25,20 +25,20 @@ class DAP extends Ideal\Repository
}))
->register('inicio', new Implement\Repository\Mapper\DateTime('inicio'))
->register('termino', new Implement\Repository\Mapper\DateTime('termino'));
return $this->parseData(new Model\DAP(), $data, $map);
return $this->parseData(new Model\Deposito(), $data, $map);
}
public function save(Define\Model $model): Model\DAP
public function save(Define\Model $model): Model\Deposito
{
$model->id = $this->saveNew([
'cuenta_id', 'capital', 'futuro', 'inicio', 'termino'
$this->saveNew([
'id', 'cuenta_id', 'capital', 'futuro', 'inicio', 'termino'
], [
$model->cuenta->id, $model->capital, $model->futuro,
$model->id, $model->cuenta->id, $model->capital, $model->futuro,
$model->inicio->format('Y-m-d'), $model->termino->format('Y-m-d')
]);
return $model;
}
public function edit(Define\Model $model, array $new_data): Model\DAP
public function edit(Define\Model $model, array $new_data): Model\Deposito
{
return $this->update($model, ['cuenta_id', 'capital', 'futuro', 'inicio', 'termino'], $new_data);
}

View File

@ -53,6 +53,14 @@ class Movimiento extends Ideal\Repository
return $this->update($model, ['cuenta_id', 'fecha', 'glosa', 'documento', 'cargo', 'abono', 'saldo'], $new_data);
}
public function fetchByCuentaAndFecha(int $cuenta_id, DateTimeInterface $fecha): array
{
$query = $this->connection->getQueryBuilder()
->select()
->from($this->getTable())
->where('cuenta_id = ? AND fecha = ?');
return $this->fetchMany($query, [$cuenta_id, $fecha->format('Y-m-d')]);
}
public function fetchByCuentaAndFechaAndMonto(int $cuenta_id, DateTimeInterface $fecha, int $monto): Model\Movimiento
{
$query = $this->connection->getQueryBuilder()

View File

@ -3,6 +3,7 @@ namespace Incoviba\Service;
use DateTimeInterface;
use DateTimeImmutable;
use DateInterval;
use Psr\Http\Message\StreamFactoryInterface;
use Psr\Http\Message\UploadedFileInterface;
use Psr\Log\LoggerInterface;
@ -17,6 +18,7 @@ class Cartola extends Service
{
public function __construct(LoggerInterface $logger,
protected StreamFactoryInterface $streamFactory, protected Exporter $exporter,
protected Repository\Inmobiliaria $inmobiliariaRepository,
protected Repository\Inmobiliaria\Cuenta $cuentaRepository,
protected Repository\Movimiento $movimientoRepository,
protected Repository\Cartola $cartolaRepository) {

View File

@ -0,0 +1,20 @@
<?php
namespace Incoviba\Service;
use DateTimeInterface;
use Psr\Log\LoggerInterface;
use Incoviba\Common\Ideal;
class Contabilidad extends Ideal\Controller
{
public function __construct(LoggerInterface $logger,
protected Contabilidad\Informe\Tesoreria $tesoreriaService)
{
parent::__construct($logger);
}
public function tesoreria(DateTimeInterface $fecha): array
{
return $this->tesoreriaService->build($fecha);
}
}

View File

@ -0,0 +1,277 @@
<?php
namespace Incoviba\Service\Contabilidad\Informe;
use DateTimeInterface;
use DateInterval;
use Psr\Log\LoggerInterface;
use Incoviba\Common\Ideal;
use Incoviba\Common\Implement;
use Incoviba\Repository;
use Incoviba\Model;
class Tesoreria extends Ideal\Service
{
public function __construct(LoggerInterface $logger,
protected Repository\Inmobiliaria $inmobiliariaRepository,
protected Repository\Inmobiliaria\Cuenta $cuentaRepository,
protected Repository\Deposito $depositoRepository,
protected Repository\Cartola $cartolaRepository,
protected Repository\Movimiento $movimientoRepository)
{
parent::__construct($logger);
$this->movimientos = new class() {
public function __construct()
{
$this->dap = new class()
{
public array $ingresos = [];
public array $egresos = [];
};
}
public object $dap;
public array $ingresos = [];
public array $egresos = [];
const INGRESOS = 'ingresos';
const EGRESOS = 'egresos';
public function addDap(string $tipo, array $movimientos)
{
foreach ($movimientos as $movimiento) {
$this->dap->{$tipo} []= $movimiento;
}
return $this;
}
public function build(): array
{
return [
'capital dap' => [
'ingresos' => $this->dap->ingresos,
'egresos' => $this->dap->egresos
],
'ingresos' => $this->ingresos,
'egresos' => $this->egresos
];
}
};
$this->totales = new class() {
public int $anterior = 0;
public int $actual = 0;
public int $ffmm = 0;
public int $deposito = 0;
public function diferencia(): int
{
return $this->actual - $this->anterior;
}
public function saldo(): int
{
return $this->diferencia() + $this->ffmm + $this->deposito;
}
public function cuentas(): int
{
return $this->actual;
}
public function ffmms(): int
{
return $this->ffmm;
}
public function depositos(): int
{
return $this->deposito;
}
public function caja(): int
{
return $this->cuentas() + $this->ffmms() + $this->depositos();
}
};
}
const DAP_INGRESOS = 'dap->ingresos';
const DAP_EGRESOS = 'dap->egresos';
const INGRESOS = 'ingresos';
const EGRESOS = 'egresos';
const TOTAL_ANTERIOR = 'anterior';
const TOTAL_ACTUAL = 'actual';
const TOTAL_FFMM = 'ffmm';
const TOTAL_DAP = 'deposito';
protected DateTimeInterface $anterior;
protected object $totales;
protected object $movimientos;
public function getAnterior(DateTimeInterface $fecha): DateTimeInterface
{
if (!isset($this->anterior)) {
$this->anterior = $fecha->sub(new DateInterval('P1D'));
if ($this->anterior->format('N') === '7') {
$this->anterior = $fecha->sub(new DateInterval('P3D'));
}
}
return $this->anterior;
}
public function build(DateTimeInterface $fecha): array
{
try {
$inmobiliarias = $this->inmobiliariaRepository->fetchAllActive();
} catch (Implement\Exception\EmptyResult) {
return [];
}
$informe = ['inmobiliarias' => []];
foreach ($inmobiliarias as $inmobiliaria) {
$informe['inmobiliarias'][$inmobiliaria->rut] = $this->buildInmobiliaria($inmobiliaria, $fecha);
}
$informe['movimientos'] = $this->buildMovimientos();
$informe['totales'] = $this->buildTotales();
return $informe;
}
protected function buildInmobiliaria(Model\Inmobiliaria $inmobiliaria, DateTimeInterface $fecha): object
{
$dataInmobiliaria = new class() {
public Model\Inmobiliaria $inmobiliaria;
public array $cuentas = [];
public function total(): int
{
return array_reduce($this->cuentas, function(int $sum, $cuenta) {
return $sum + $cuenta->actual;
}, 0);
}
public function ffmm(): int
{
return array_reduce($this->cuentas, function(int $sum, $cuenta) {
return $sum + $cuenta->ffmm;
}, 0);
}
public function deposito(): int
{
return array_reduce($this->cuentas, function(int $sum, $cuenta) {
return $sum + $cuenta->deposito;
}, 0);
}
public function caja(): int
{
return array_reduce($this->cuentas, function(int $sum, $cuenta) {
return $sum + $cuenta->saldo();
}, 0);
}
};
$dataInmobiliaria->inmobiliaria = $inmobiliaria;
try {
$cuentas = $this->cuentaRepository->fetchByInmobiliaria($inmobiliaria->rut);
} catch (Implement\Exception\EmptyResult) {
return $dataInmobiliaria;
}
foreach ($cuentas as $cuenta) {
$data = new class() {
public string $banco;
public string $numero;
public int $anterior = 0;
public int $actual = 0;
public int $ffmm = 0;
public int $deposito = 0;
public function diferencia(): int
{
return $this->actual - $this->anterior;
}
public function saldo(): int
{
return $this->diferencia() + $this->ffmm + $this->deposito;
}
};
$data->banco = $cuenta->banco->nombre;
$data->numero = $cuenta->cuenta;
try {
$depositos = $this->depositoRepository->fetchByCuenta($cuenta->id);
foreach ($depositos as $deposito) {
$data->deposito += $deposito->capital;
$this->addTotal(self::TOTAL_DAP, $deposito->capital);
if ($deposito->inicio === $fecha) {
$this->addMovimientos(self::DAP_EGRESOS, [(object) [
'cuenta' => $deposito->cuenta,
'fecha' => $deposito->inicio,
'cargo' => - $deposito->capital,
'abono' => 0,
'saldo' => - $deposito->capital,
'glosa' => 'INVERSION DAP'
]]);
}
if ($deposito->termino === $fecha) {
$data->deposito -= $deposito->capital;
$this->addTotal(self::TOTAL_DAP, -$deposito->capital);
$this->addMovimientos(self::DAP_INGRESOS, [(object) [
'cuenta' => $deposito->cuenta,
'fecha' => $deposito->termino,
'cargo' => 0,
'abono' => $deposito->futuro,
'saldo' => $deposito->futuro,
'glosa' => 'RESCATE DAP'
]]);
}
}
} catch (Implement\Exception\EmptyResult) {}
try {
$cartola = $this->cartolaRepository->fetchByCuentaAndFecha($cuenta->id, $fecha);
$data->actual = $cartola->saldo;
} catch (Implement\Exception\EmptyResult) {}
try {
$cartola = $this->cartolaRepository->fetchByCuentaAndFecha($cuenta->id, $this->getAnterior($fecha));
$data->anterior = $cartola->saldo;
} catch (Implement\Exception\EmptyResult) {}
if ($data->diferencia() !== 0) {
try {
$movimientos = $this->movimientoRepository->fetchByCuentaAndFecha($cuenta->id, $fecha);
$this->addMovimientos(self::INGRESOS,
array_filter($movimientos, function(Model\Movimiento $movimiento) {
return $movimiento->abono > 0;
}));
$this->addMovimientos(self::EGRESOS,
array_filter($movimientos, function(Model\Movimiento $movimiento) {
return $movimiento->cargo > 0;
}));
} catch (Implement\Exception\EmptyResult) {}
}
$dataInmobiliaria->cuentas []= $data;
$this->addTotal(
[self::TOTAL_ANTERIOR, self::TOTAL_ACTUAL],
[$data->anterior, $data->actual]
);
}
return $dataInmobiliaria;
}
protected function buildMovimientos(): array
{
return $this->movimientos->build();
}
protected function buildTotales(): object
{
return $this->totales;
}
protected function addMovimientos(string $tipo, array $movimientos): Tesoreria
{
if (str_contains($tipo, 'dap')) {
list($d, $t) = explode('->', $tipo);
$this->movimientos->addDap($t, $movimientos);
return $this;
}
foreach ($movimientos as $movimiento) {
$this->movimientos->{$tipo} []= $movimiento;
}
return $this;
}
protected function addTotal(string|array $tipo, int|array $total): Tesoreria
{
if (is_array($tipo)) {
foreach ($tipo as $i => $t) {
$this->addTotal($t, $total[$i]);
}
return $this;
}
$this->totales->{$tipo} += $total;
return $this;
}
}

View File

@ -4,20 +4,25 @@ namespace Incoviba\Service\Contabilidad;
use DateTimeInterface;
use Psr\Http\Client\ClientInterface;
use Psr\Http\Message\RequestFactoryInterface;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\StreamInterface;
use Psr\Log\LoggerInterface;
use Incoviba\Common\Implement\Exception;
use Incoviba\Repository;
use Incoviba\Service;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\StreamInterface;
use function Symfony\Component\Translation\t;
use Incoviba\Common\Ideal;
class Nubox
class Nubox extends Ideal\Service
{
public function __construct(protected Repository\Nubox $nuboxRepository,
public function __construct(protected LoggerInterface $logger,
protected Repository\Nubox $nuboxRepository,
protected Service\Redis $redisService,
protected ClientInterface $client,
protected RequestFactoryInterface $requestFactory,
protected string $api_url) {}
protected string $api_url)
{
parent::__construct($logger);
}
protected array $tokens;
public function getToken(int $inmobiliaria_rut): string
@ -120,7 +125,7 @@ class Nubox
$uri = 'contabilidad/libro-diario?' . http_build_query($query);
$response = $this->send($uri, $inmobiliaria_rut);
if ($response->getStatusCode() !== 200) {
error_log(var_export($uri,true).PHP_EOL,3,'/logs/debug');
$this->logger->debug($uri);
throw new Exception\HttpResponse($response->getReasonPhrase(), $response->getStatusCode());
}
return json_decode($response->getBody()->getContents(), JSON_OBJECT_AS_ARRAY);

View File

@ -25,12 +25,12 @@ class Format
{
return "{$this->number($number, $decimal_places)}%";
}
public function pesos(string $valor): string
public function pesos(string $valor, int $decimal_places = 0): string
{
return "$ {$this->number($valor)}";
return "$ {$this->number($valor, $decimal_places)}";
}
public function ufs(string $valor): string
public function ufs(string $valor, int $decimal_places = 2): string
{
return "{$this->number($valor, 2)} UF";
return "{$this->number($valor, $decimal_places)} UF";
}
}

View File

@ -7,9 +7,12 @@ use DateInterval;
use Incoviba\Common\Define\Money\Provider;
use Incoviba\Common\Implement\Exception\EmptyResponse;
use Incoviba\Service\Money\MiIndicador;
use Psr\Log\LoggerInterface;
class Money
{
public function __construct(protected LoggerInterface $logger) {}
protected array $providers;
public function register(string $name, Provider $provider): Money
{
@ -49,4 +52,13 @@ class Money
return 0;
}
}
public function getUSD(DateTimeInterface $dateTime): float
{
try {
return $this->getProvider('usd')->get(MiIndicador::USD, $dateTime);
} catch (EmptyResponse $exception) {
$this->logger->critical($exception);
return 0;
}
}
}

View File

@ -11,7 +11,7 @@ class MiIndicador implements Provider
{
const UF = 'uf';
const IPC = 'ipc';
const USD = 'dolar_intercambio';
const USD = 'dolar';
public function __construct(protected ClientInterface $client) {}

34
app/src/Service/USD.php Normal file
View File

@ -0,0 +1,34 @@
<?php
namespace Incoviba\Service;
use DateTimeInterface;
use DateTimeImmutable;
use Incoviba\Common\Implement\Exception\EmptyRedis;
class USD
{
protected string $redisKey = 'usd';
public function __construct(protected Redis $redisService, protected Money $moneyService) {}
public function get(?DateTimeInterface $date = null): float
{
if ($date === null) {
$date = new DateTimeImmutable();
}
$usds = [];
try {
$usds = json_decode($this->redisService->get($this->redisKey), JSON_OBJECT_AS_ARRAY);
if (!isset($usds[$date->format('Y-m-d')])) {
throw new EmptyRedis($this->redisKey);
}
$usd = $usds[$date->format('Y-m-d')];
} catch (EmptyRedis) {
$usd = $this->moneyService->getUSD($date);
$usds[$date->format('Y-m-d')] = $usd;
ksort($usds);
$this->redisService->set($this->redisKey, json_encode($usds), 60 * 60 * 24 * 30);
}
return $usd;
}
}