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

Cartola diaria

Browse Source
This commit is contained in:
Juan Pablo Vial
2024-02-12 09:52:48 -03:00
parent e1eb2c4c56
commit e133bd36cf
8 changed files with 476 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/resources/routes/api/contabilidad/cartolas.php
View File

@ -1,12 +1,13 @@
<?php
use Incoviba\Controller\API\Contabilidad;
use Incoviba\Controller\API\Contabilidad\Cartolas;
$app->group('/cartolas', function($app) {
$app->post('/procesar[/]', [Contabilidad::class, 'procesarCartola']);
$app->post('/procesar[/]', [Cartolas::class, 'procesar']);
});
$app->group('/cartola', function($app) {
$app->group('/diaria', function($app) {
$app->post('/procesar[/]', [Contabilidad::class, 'procesarCartolaDiaria']);
$app->post('/ayer[/]', [Cartolas::class, 'ayer']);
$app->post('/procesar[/]', [Cartolas::class, 'diaria']);
});
$app->post('/exportar[/]', [Contabilidad::class, 'exportarCartola']);
$app->post('/exportar[/]', [Cartolas::class, 'exportar']);
});

6
app/resources/routes/contabilidad/cartolas.php Normal file
View File

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

323
app/resources/views/contabilidad/cartolas/diaria.blade.php Normal file
View File

@ -0,0 +1,323 @@
@extends('layout.base')
@section('page_content')
<div class="ui container">
<h1 class="ui header">
Cartola Diaria
</h1>
<form class="ui form" id="cartola_form">
<div class="fields">
<div class="six wide field">
<label for="inmobiliaria">Sociedad</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="two wide field">
<label>Banco</label>
<div class="ui selection search 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 class="four wide field">
<label for="fecha">Fecha</label>
<div class="ui calendar" id="fecha">
<div class="ui left icon input">
<i class="calendar icon"></i>
<input type="text" name="fecha" />
</div>
</div>
</div>
<div class="field">
<label for="file">Cartola</label>
<input type="file" name="file" id="file" class="ui invisible file input" />
<label for="file" class="ui icon button">
<i class="file icon"></i>
Cargar
</label>
</div>
</div>
</form>
<div class="ui two columns grid">
<div class="column">
<button class="ui icon button" id="process_button">
<i class="file excel icon"></i>
Procesar
</button>
</div>
<div class="right aligned column">
<div class="ui inline active loader" id="loader"></div>
</div>
</div>
<table class="ui table" id="diferencia">
<thead>
<tr>
<th>Hoy</th>
<th>Último Saldo</th>
<th>Saldo Actual</th>
<th>Diferencia</th>
</tr>
</thead>
<tbody></tbody>
</table>
</div>
<div class="ui fluid container">
<table class="ui table" id="tabla_movimientos">
<thead>
<tr>
<th>Fecha</th>
<th>Glosa</th>
<th>Documento</th>
<th class="right aligned">Cargo</th>
<th class="right aligned">Abono</th>
<th class="right aligned">Saldo</th>
<th>Orden</th>
</tr>
</thead>
<tbody id="movimientos"></tbody>
</table>
</div>
@endsection
@include('layout.head.styles.datatables')
@include('layout.body.scripts.datatables')
@push('page_scripts')
<script>
const diaria = {
ids: {},
data: {
inmobiliaria: {
rut: 0,
razon: ''
},
banco: {
id: 0,
nombre: ''
},
fecha: '',
movimientos: [],
saldo: 0,
ayer: 0
},
dataTableConfig: {
order: [[6, 'asc']],
columnDefs: [
{
targets: [0, 2, 3, 4, 5],
width: '10%'
},
{
targets: [1],
width: '20%'
},
{
targets: [6],
visible: false
}
],
},
get() {
return {
bancos: inmobiliaria_rut => {
const url = '{{$urls->api}}/inmobiliaria/' + inmobiliaria_rut + '/cuentas'
$(this.ids.loader).show()
return fetchAPI(url).then(response => {
$(this.ids.loader).hide()
if (!response) {
return
}
return response.json().then(json => {
if (json.cuentas.length === 0) {
return
}
$(this.ids.form.banco).dropdown('change values', json.cuentas.map(cuenta => {
return {
value: cuenta.banco.id,
text: cuenta.banco.nombre,
name: cuenta.banco.nombre
}
})).dropdown('refresh')
})
})
},
ayer: (inmobiliaria_rut, banco_id, fecha) => {
const url = '{{$urls->api}}/contabilidad/cartola/diaria/ayer'
const body = new FormData()
body.set('inmobiliaria_rut', inmobiliaria_rut)
body.set('banco_id', banco_id)
body.set('fecha', fecha.toISOString())
return fetchAPI(url, {method: 'post', body}).then(response => {
if (!response) {
return
}
return response.json().then(json => {
this.data.ayer = json.cartola.saldo
})
})
}
}
},
parse() {
return {
cartola: event => {
event.preventDefault()
const body = new FormData(document.getElementById('cartola_form'))
const fecha = $('#fecha').calendar('get date')
body.set('fecha', [fecha.getFullYear(), fecha.getMonth()+1, fecha.getDate()].join('-'))
const url = '{{$urls->api}}/contabilidad/cartola/diaria/procesar'
$(this.ids.loader).show()
fetchAPI(url, {method: 'post', body}).then(response => {
$(this.ids.loader).hide()
if (!response) {
return
}
return response.json().then(json => {
if (json.cartola.movimientos.length === 0) {
return
}
this.data.movimientos = []
json.cartola.movimientos.forEach((row, idx) => {
const fecha = new Date(row.fecha)
fecha.setDate(fecha.getDate() + 1)
this.data.movimientos[idx] = {
fecha: fecha,
glosa: row.glosa,
documento: row.documento,
cargo: row.cargo,
abono: row.abono,
saldo: row.saldo
}
})
this.data.saldo = json.cartola.cartola.saldo
const ayer = new Date()
ayer.setDate(fecha.getDate() - 1)
this.get().ayer(body.get('inmobiliaria_rut'), body.get('banco_id'), ayer)
.then(() => {
this.draw().diferencia()
this.draw().cartola()
})
})
})
return false
}
}
},
draw() {
return {
diferencia: () => {
const table = $(this.ids.table.diferencia)
const tbody = table.find('tbody')
tbody.html('')
const dateFormatter = new Intl.DateTimeFormat('es-CL', {
year: 'numeric',
month: 'numeric',
day: 'numeric'
})
const numberFormatter = new Intl.NumberFormat('es-CL', {minimumFractionDigits: 0, maximumFractionDigits: 0})
tbody.append(
$('<tr></tr>').append(
$('<td></td>').html(dateFormatter.format(this.data.fecha))
).append(
$('<td></td>').html(numberFormatter.format(this.data.ayer))
).append(
$('<td></td>').html(numberFormatter.format(this.data.saldo))
).append(
$('<td></td>').html(numberFormatter.format(this.data.saldo - this.data.ayer))
)
)
},
cartola: () => {
const table = $(this.ids.table.base)
table.DataTable().clear()
table.DataTable().destroy()
const tbody = $(this.ids.table.body)
tbody.html('')
const dateFormatter = new Intl.DateTimeFormat('es-CL', {
year: 'numeric',
month: 'numeric',
day: 'numeric'
})
const numberFormatter = new Intl.NumberFormat('es-CL', {minimumFractionDigits: 0, maximumFractionDigits: 0})
this.data.movimientos.forEach((row, idx) => {
tbody.append(
$('<tr></tr>').append(
$('<td></td>').html(dateFormatter.format(row.fecha))
).append(
$('<td></td>').html(row.glosa)
).append(
$('<td></td>').html(row.documento)
).append(
$('<td></td>').addClass('right aligned').html(row.cargo === 0 ? '' : numberFormatter.format(row.cargo))
).append(
$('<td></td>').addClass('right aligned').html(row.abono === 0 ? '' : numberFormatter.format(row.abono))
).append(
$('<td></td>').addClass('right aligned').html(row.saldo === 0 ? '' : numberFormatter.format(row.saldo))
).append(
$('<td></td>').html(idx + 1)
)
)
})
table.DataTable(this.dataTableConfig)
},
}
},
setup(ids) {
this.ids = ids
$(this.ids.form.inmobiliaria).dropdown({
fireOnInit: true,
onChange: (value, text, $choice) => {
this.data.inmobiliaria.rut = value
this.data.inmobiliaria.razon = text
this.get().bancos(value)
},
})
$(this.ids.form.banco).dropdown({
fireOnInit: true,
onChange: (value, text, $choice) => {
this.data.banco.id = value
this.data.banco.nombre = text
}
})
$(this.ids.loader).hide()
calendar_date_options['initialDate'] = new Date()
calendar_date_options['maxDate'] = calendar_date_options['initialDate']
calendar_date_options['onChange'] = (date, text, mode) => {
this.data.fecha = date
}
$(this.ids.form.fecha).calendar(calendar_date_options)
$(this.ids.form.base).submit(this.parse().cartola)
$(this.ids.button).click(this.parse().cartola)
$(this.ids.table.base).DataTable(this.dataTableConfig)
}
}
$(document).ready(() => {
diaria.setup({
table: {
base: '#tabla_movimientos',
body: '#movimientos',
diferencia: '#diferencia'
},
form: {
base: '#cartola_form',
inmobiliaria: '#inmobiliaria',
banco: '#banco',
fecha: '#fecha'
},
button: '#process_button',
loader: '#loader'
})
})
</script>
@endpush

1
app/setup/setups/services.php
View File

@ -32,6 +32,7 @@ return [
},
Incoviba\Service\Cartola::class => function(ContainerInterface $container) {
return (new Incoviba\Service\Cartola(
$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\Cuenta::class),

59
app/src/Controller/API/Contabilidad.php
View File

@ -13,62 +13,5 @@ class Contabilidad extends Controller
{
use withJson;
public function procesarCartola(ServerRequestInterface $request, ResponseInterface $response,
Repository\Inmobiliaria $inmobiliariaRepository,
Repository\Banco $bancoRepository,
Service\Cartola $cartolaService): ResponseInterface
{
$body = $request->getParsedBody();
$output = [
'input' => $body,
'movimientos' => []
];
try {
$inmobiliaria = $inmobiliariaRepository->fetchById($body['inmobiliaria']);
$banco = $bancoRepository->fetchById($body['banco']);
$mes = new DateTimeImmutable($body['mes']);
$file = $request->getUploadedFiles()['file'];
$output['movimientos'] = $cartolaService->process($inmobiliaria, $banco, $mes, $file);
} catch (EmptyResult) {}
return $this->withJson($response, $output);
}
public function exportarCartola(ServerRequestInterface $request, ResponseInterface $response,
Repository\Inmobiliaria $inmobiliariaRepository,
Repository\Banco $bancoRepository,
Service\Cartola $cartolaService): ResponseInterface
{
$body = $request->getParsedBody();
$output = [
'input' => $body,
'filename' => ''
];
try {
$inmobiliaria = $inmobiliariaRepository->fetchById($body['inmobiliaria']);
$banco = $bancoRepository->fetchById($body['banco']);
$mes = new DateTimeImmutable($body['mes']);
$output['filename'] = $cartolaService->export($inmobiliaria, $banco, $mes, json_decode($body['movimientos']));
} catch (EmptyResult) {}
return $this->withJson($response, $output);
}
public function procesarCartolaDiaria(ServerRequestInterface $request, ResponseInterface $response,
Repository\Inmobiliaria $inmobiliariaRepository,
Repository\Banco $bancoRepository,
Service\Cartola $cartolaService): ResponseInterface
{
$body = $request->getParsedBody();
$output = [
'input' => $body,
'cartola' => []
];
try {
$inmobiliaria = $inmobiliariaRepository->fetchById($body['inmobiliaria_rut']);
$banco = $bancoRepository->fetchById($body['banco_id']);
$fecha = new DateTimeImmutable($body['fecha']);
$file = $request->getUploadedFiles()['file'];
$output['cartola'] = $cartolaService->diaria($inmobiliaria, $banco, $fecha, $file);
} catch (EmptyResult $exception) {
$this->logger->debug($exception);
}
return $this->withJson($response, $output);
}
}

98
app/src/Controller/API/Contabilidad/Cartolas.php Normal file
View File

@ -0,0 +1,98 @@
<?php
namespace Incoviba\Controller\API\Contabilidad;
use DateTimeInterface;
use DateTimeImmutable;
use Psr\Http\Message\ServerRequestInterface;
use Psr\Http\Message\ResponseInterface;
use Incoviba\Common\Ideal\Controller;
use Incoviba\Common\Implement\Exception\EmptyResult;
use Incoviba\Controller\API\withJson;
use Incoviba\Repository;
use Incoviba\Service;
class Cartolas extends Controller
{
use withJson;
public function procesar(ServerRequestInterface $request, ResponseInterface $response,
Repository\Inmobiliaria $inmobiliariaRepository,
Repository\Banco $bancoRepository,
Service\Cartola $cartolaService): ResponseInterface
{
$body = $request->getParsedBody();
$output = [
'input' => $body,
'movimientos' => []
];
try {
$inmobiliaria = $inmobiliariaRepository->fetchById($body['inmobiliaria']);
$banco = $bancoRepository->fetchById($body['banco']);
$mes = new DateTimeImmutable($body['mes']);
$file = $request->getUploadedFiles()['file'];
$output['movimientos'] = $cartolaService->process($inmobiliaria, $banco, $mes, $file);
} catch (EmptyResult) {}
return $this->withJson($response, $output);
}
public function exportar(ServerRequestInterface $request, ResponseInterface $response,
Repository\Inmobiliaria $inmobiliariaRepository,
Repository\Banco $bancoRepository,
Service\Cartola $cartolaService): ResponseInterface
{
$body = $request->getParsedBody();
$output = [
'input' => $body,
'filename' => ''
];
try {
$inmobiliaria = $inmobiliariaRepository->fetchById($body['inmobiliaria']);
$banco = $bancoRepository->fetchById($body['banco']);
$mes = new DateTimeImmutable($body['mes']);
$output['filename'] = $cartolaService->export($inmobiliaria, $banco, $mes, json_decode($body['movimientos']));
} catch (EmptyResult) {}
return $this->withJson($response, $output);
}
public function diaria(ServerRequestInterface $request, ResponseInterface $response,
Repository\Inmobiliaria $inmobiliariaRepository,
Repository\Banco $bancoRepository,
Service\Cartola $cartolaService): ResponseInterface
{
$body = $request->getParsedBody();
$output = [
'input' => $body,
'cartola' => []
];
try {
$inmobiliaria = $inmobiliariaRepository->fetchById($body['inmobiliaria_rut']);
$banco = $bancoRepository->fetchById($body['banco_id']);
$fecha = new DateTimeImmutable($body['fecha']);
$file = $request->getUploadedFiles()['file'];
$output['cartola'] = $cartolaService->diaria($inmobiliaria, $banco, $fecha, $file);
} catch (EmptyResult $exception) {
$this->logger->debug($exception);
}
return $this->withJson($response, $output);
}
public function ayer(ServerRequestInterface $request, ResponseInterface $response,
Repository\Inmobiliaria $inmobiliariaRepository,
Repository\Banco $bancoRepository,
Repository\Inmobiliaria\Cuenta $cuentaRepository,
Repository\Cartola $cartolaRepository): ResponseInterface
{
$body = $request->getParsedBody();
$output = [
'input' => $body,
'cartola' => []
];
try {
$inmobiliaria = $inmobiliariaRepository->fetchById($body['inmobiliaria_rut']);
$banco = $bancoRepository->fetchById($body['banco_id']);
$cuenta = $cuentaRepository->fetchByInmobiliariaAndBanco($inmobiliaria->rut, $banco->id);
$fecha = new DateTimeImmutable($body['fecha']);
$output['cartola'] = $cartolaRepository->fetchByCuentaAndFecha($cuenta->id, $fecha);
} catch (EmptyResult $exception) {
$this->logger->critical($exception);
}
return $this->withJson($response, $output);
}
}

31
app/src/Controller/Contabilidad.php Normal file
View File

@ -0,0 +1,31 @@
<?php
namespace Incoviba\Controller;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
use Incoviba\Common\Alias\View;
use Incoviba\Common\Implement\Exception\{EmptyResult, EmptyRedis};
use Incoviba\Repository;
use Incoviba\Service;
class Contabilidad
{
use withRedis;
public function diaria(ServerRequestInterface $request, ResponseInterface $response, View $view,
Service\Redis $redisService,
Repository\Inmobiliaria $inmobiliariaRepository): ResponseInterface
{
$redisKey = 'inmobiliarias';
$inmobiliarias = [];
try {
$inmobiliarias = $this->fetchRedis($redisService, $redisKey);
} catch (EmptyRedis) {
try {
$inmobiliarias = $inmobiliariaRepository->fetchAll();
$this->saveRedis($redisService, $redisKey, $inmobiliarias, 30 * 24 * 60 * 60);
} catch (EmptyResult) {}
}
return $view->render($response, 'contabilidad.cartolas.diaria', compact('inmobiliarias'));
}
}

17
app/src/Service/Cartola.php
View File

@ -5,18 +5,23 @@ use DateTimeInterface;
use DateTimeImmutable;
use Psr\Http\Message\StreamFactoryInterface;
use Psr\Http\Message\UploadedFileInterface;
use Psr\Log\LoggerInterface;
use Incoviba\Common\Ideal\Service;
use Incoviba\Common\Define\Cartola\Banco;
use Incoviba\Common\Define\Contabilidad\Exporter;
use Incoviba\Common\Implement\Exception;
use Incoviba\Model;
use Incoviba\Repository;
class Cartola
class Cartola extends Service
{
public function __construct(protected StreamFactoryInterface $streamFactory, protected Exporter $exporter,
public function __construct(LoggerInterface $logger,
protected StreamFactoryInterface $streamFactory, protected Exporter $exporter,
protected Repository\Inmobiliaria\Cuenta $cuentaRepository,
protected Repository\Movimiento $movimientoRepository,
protected Repository\Cartola $cartolaRepository) {}
protected Repository\Cartola $cartolaRepository) {
parent::__construct($logger);
}
protected array $bancos;
public function register(string $name, Banco $banco): Cartola
@ -46,9 +51,9 @@ class Cartola
$movimientos = [];
foreach ($ms as $m) {
$movimiento = $this->buildMovimiento($cuenta, $m);
$movimientos []= $movimiento;
if ($movimiento->fecha === $fecha) {
if ($movimiento->fecha->getTimestamp() === $fecha->getTimestamp()) {
$movimientos []= $movimiento;
$cartolaData['cargos'] += $movimiento->cargo;
$cartolaData['abonos'] += $movimiento->abono;
}
@ -61,7 +66,7 @@ class Cartola
protected function getMovimientosDiarios(Model\Banco $banco, UploadedFileInterface $file): array
{
$movimientos = $this->bancos[strtolower($banco->nombre)]->process($file);
switch ($banco->nombre) {
switch (strtolower($banco->nombre)) {
case 'security':
$movimientos = $this->processMovimientosDiariosSecurity($movimientos);
break;