Ignore app/bin

Menu
Moderno
2024-04-02 19:58:58 -03:00 · 2024-04-02 19:04:57 -03:00 · 2024-04-02 19:04:26 -03:00 · 2024-04-02 13:50:08 -03:00 · 2024-03-26 17:09:43 -03:00 · 2024-03-26 16:57:07 -03:00
115 changed files with 1442 additions and 569 deletions
--- a/.gitignore
+++ b/.gitignore
@ -10,3 +10,5 @@
 **/.idea/
 **/upload?/
 **/informe?/
+**/.phpunit.cache/
+**/coverage/
--- a/1
+++ b/1
@ -9,6 +9,7 @@ RUN pecl install xdebug-3.1.3 \
    && docker-php-ext-enable xdebug

 COPY ./php-errors.ini /usr/local/etc/php/conf.d/docker-php-errors.ini
+COPY ./php-xdebug.ini /usr/local/etc/php/conf.d/docker-php-xdebug.ini

 COPY --from=composer /usr/bin/composer /usr/bin/composer

--- a/app/.gitignore
+++ b/app/.gitignore
@ -0,0 +1 @@
+**/bin
--- a/app/.phpunit-watcher.yml
+++ b/app/.phpunit-watcher.yml
@ -0,0 +1,13 @@
+watch:
+  directories:
+    - src
+    - tests
+    - common
+  fileMask: '*.php'
+notifications:
+  passingTests: false
+  failingTests: false
+hideManual: true
+phpunit:
+  arguments: '--log-events-text /logs/output.txt --stop-on-failure'
+  timeout: 180
--- a/app/common/Define/Cartola/Banco.php
+++ b/app/common/Define/Cartola/Banco.php
@ -5,6 +5,11 @@ use Psr\Http\Message\UploadedFileInterface;

 interface Banco
 {
+    /**
+     * Process bank movements for database inserts
+     * @param UploadedFileInterface $file
+     * @return array
+     */
    public function process(UploadedFileInterface $file): array;

 }
--- a/app/common/Define/Contabilidad/Exporter.php
+++ b/app/common/Define/Contabilidad/Exporter.php
@ -6,5 +6,5 @@ use Incoviba\Model;

 interface Exporter
 {
-    public function export(Model\Inmobiliaria $inmobiliaria, Model\Banco $banco, DateTimeInterface $mes, array $movimientos): string;
+    public function export(Model\Inmobiliaria $inmobiliaria, Model\Contabilidad\Banco $banco, DateTimeInterface $mes, array $movimientos): string;
 }
--- a/app/common/Ideal/Cartola/Banco.php
+++ b/app/common/Ideal/Cartola/Banco.php
@ -9,7 +9,7 @@ abstract class Banco extends Service implements Define\Cartola\Banco
 {
    public function process(UploadedFileInterface $file): array
    {
-        $data = $this->parseFile($file);
+        $data = $this->handleFile($file);
        $temp = [];
        $columns = $this->columnMap();
        foreach ($data as $row) {
@ -24,11 +24,48 @@ abstract class Banco extends Service implements Define\Cartola\Banco
        }
        return $temp;
    }
+
+    /**
+     * There are banks that need some post-processing
+     * @param array $movimientos
+     * @return array
+     */
    public function processMovimientosDiarios(array $movimientos): array
    {
        return $movimientos;
    }

+    /**
+     * Move the UploadedFile into a temp file from getFilename and after parseFile remove temp file
+     * @param UploadedFileInterface $uploadedFile
+     * @return array
+     */
+    protected function handleFile(UploadedFileInterface $uploadedFile): array
+    {
+        $filename = $this->getFilename($uploadedFile);
+        $uploadedFile->moveTo($filename);
+        $data = $this->parseFile($filename);
+        unlink($filename);
+        return $data;
+    }
+
+    /**
+     * Get filename where to move UploadedFile
+     * @param UploadedFileInterface $uploadedFile
+     * @return string
+     */
+    abstract protected function getFilename(UploadedFileInterface $uploadedFile): string;
+
+    /**
+     * Mapping of uploaded file data columns to database columns
+     * @return array
+     */
    abstract protected function columnMap(): array;
-    abstract protected function parseFile(UploadedFileInterface $uploadedFile): array;
+
+    /**
+     * Translate uploaded file data to database data
+     * @param string $filename
+     * @return array
+     */
+    abstract protected function parseFile(string $filename): array;
 }
--- a/app/common/Implement/Log/MySQLHandler.php
+++ b/app/common/Implement/Log/MySQLHandler.php
@ -0,0 +1,60 @@
+<?php
+namespace Incoviba\Common\Implement\Log;
+
+use PDOStatement;
+use Monolog\Handler\AbstractProcessingHandler;
+use Monolog\LogRecord;
+use Monolog\Level;
+use Incoviba\Common\Define\Connection;
+
+class MySQLHandler extends AbstractProcessingHandler
+{
+    private bool $initialized = false;
+    private PDOStatement $statement;
+
+    public function __construct(protected Connection $connection, int|string|Level $level = Level::Debug, bool $bubble = true)
+    {
+        parent::__construct($level, $bubble);
+    }
+    public function write(LogRecord $record): void
+    {
+        if (!$this->initialized) {
+            $this->initialized();
+        }
+        $this->cleanup();
+        $this->statement->execute([
+            'channel' => $record->channel,
+            'level' => $record->level->getName(),
+            'message' => $record->formatted,
+            'time' => $record->datetime->format('Y-m-d H:i:s.u'),
+            'context' => (count($record->context) > 0) ? json_encode($record->context, JSON_UNESCAPED_SLASHES) : '',
+            'extra' => (count($record->extra) > 0) ? json_encode($record->extra, JSON_UNESCAPED_SLASHES) : ''
+        ]);
+    }
+
+    private function initialized(): void
+    {
+        $query = <<<QUERY
+CREATE TABLE IF NOT EXISTS monolog (
+    channel VARCHAR(255),
+    level VARCHAR(100),
+    message LONGTEXT,
+    time DATETIME,
+    context LONGTEXT,
+    extra LONGTEXT
+)
+QUERY;
+        $this->connection->getPDO()->exec($query);
+        $query = <<<QUERY
+INSERT INTO monolog (channel, level, message, time, context, extra)
+VALUES (:channel, :level, :message, :time, :context, :extra)
+QUERY;
+        $this->statement = $this->connection->getPDO()->prepare($query);
+        $this->initialized = true;
+    }
+    private function cleanup(): void
+    {
+        $query = "DELETE FROM monolog WHERE time < DATE_SUB(CURDATE(), INTERVAL 90 DAY)";
+        $this->connection->query($query);
+    }
+}
--- a/app/common/Implement/Log/PDOFormatter.php
+++ b/app/common/Implement/Log/PDOFormatter.php
@ -0,0 +1,19 @@
+<?php
+namespace Incoviba\Common\Implement\Log;
+
+use Monolog\Formatter\JsonFormatter;
+use Monolog\LogRecord;
+
+class PDOFormatter extends JsonFormatter
+{
+    public function __construct(int $batchMode = self::BATCH_MODE_JSON, bool $appendNewline = false, bool $ignoreEmptyContextAndExtra = false, bool $includeStacktraces = true)
+    {
+        parent::__construct($batchMode, $appendNewline, $ignoreEmptyContextAndExtra, $includeStacktraces);
+    }
+
+    public function format(LogRecord $record): string
+    {
+        $normalized = $this->normalize($record);
+        return $normalized['message'];
+    }
+}
--- a/app/composer.json
+++ b/app/composer.json
@ -1,8 +1,12 @@
 {
    "name": "incoviba/web",
+    "version": "2.0.0",
    "type": "project",
    "require": {
        "berrnd/slim-blade-view": "^1.0",
+        "ext-gd": "*",
+        "ext-openssl": "*",
+        "ext-pdo": "*",
        "guzzlehttp/guzzle": "^7.8",
        "monolog/monolog": "^3.4",
        "nyholm/psr7": "^1.8",
@ -14,8 +18,10 @@
        "slim/slim": "^4.11"
    },
    "require-dev": {
+        "fakerphp/faker": "^1.23",
        "kint-php/kint": "^5.1",
-        "phpunit/phpunit": "^10.2"
+        "phpunit/phpunit": "^10.2",
+        "spatie/phpunit-watcher": "^1.23"
    },
    "authors": [
        {
@ -30,6 +36,8 @@
        }
    },
    "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "process-timeout": 0,
+        "bin-dir": "bin"
    }
 }
--- a/app/phpunit.xml
+++ b/app/phpunit.xml
@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         cacheDirectory="./cache"
+         executionOrder="depends,defects"
+         requireCoverageMetadata="false"
+         beStrictAboutCoverageMetadata="false"
+         beStrictAboutOutputDuringTests="true"
+         colors="true"
+         failOnRisky="false"
+         failOnWarning="false">
+    <testsuites>
+        <testsuite name="unit">
+            <directory>tests/units</directory>
+        </testsuite>
+        <testsuite name="acceptance">
+            <directory>tests/integration</directory>
+        </testsuite>
+        <testsuite name="performance">
+            <directory>tests/performance</directory>
+        </testsuite>
+    </testsuites>
+
+    <source restrictDeprecations="true" restrictNotices="true" restrictWarnings="true">
+        <include>
+            <directory>src</directory>
+            <directory>common</directory>
+        </include>
+    </source>
+    <coverage includeUncoveredFiles="true" pathCoverage="false" ignoreDeprecatedCodeUnits="true" disableCodeCoverageIgnore="true">
+        <report>
+            <html outputDirectory="/code/public/coverage/html" />
+            <php outputFile="/code/public/coverage/coverage.php" />
+        </report>
+    </coverage>
+    <logging>
+        <junit outputFile="/logs/junit.xml" />
+        <teamcity outputFile="/logs/teamcity.txt" />
+        <testdoxHtml outputFile="/logs/testdox.html" />
+        <testdoxText outputFile="/logs/testdox.txt" />
+    </logging>
+</phpunit>
--- a/app/resources/routes/01_api.php
+++ b/app/resources/routes/01_api.php
@ -1,4 +1,6 @@
 <?php
+use Incoviba\Controller\API\Base;
+
 $app->group('/api', function($app) {
    $folder = implode(DIRECTORY_SEPARATOR, [__DIR__, 'api']);
    if (file_exists($folder)) {
@ -10,4 +12,5 @@ $app->group('/api', function($app) {
            include_once $file->getRealPath();
        }
    }
+    $app->get('[/]', Base::class);
 })->add($app->getContainer()->get(Incoviba\Middleware\API::class));
--- a/app/resources/routes/api/contabilidad/centros_costos.php
+++ b/app/resources/routes/api/contabilidad/centros_costos.php
@ -1,5 +1,6 @@
 <?php
-use Incoviba\Controller\API\CentrosCostos;
+
+use Incoviba\Controller\API\Contabilidad\CentrosCostos;

 $app->group('/centros_costos', function($app) {
    $app->post('/add[/]', [CentrosCostos::class, 'add']);
--- a/app/resources/routes/api/contabilidad/nubox.php
+++ b/app/resources/routes/api/contabilidad/nubox.php
@ -1,5 +1,6 @@
 <?php
-use Incoviba\Controller\API\Nubox;
+
+use Incoviba\Controller\API\Contabilidad\Nubox;

 $app->group('/nubox/{inmobiliaria_rut}', function($app) {
    $app->get('/token[/]', [Nubox::class, 'token']);
--- a/app/resources/routes/contabilidad/centros_costos.php
+++ b/app/resources/routes/contabilidad/centros_costos.php
@ -1,5 +1,6 @@
 <?php
-use Incoviba\Controller\CentrosCostos;
+
+use Incoviba\Controller\Contabilidad\CentrosCostos;

 $app->group('/centros_costos', function($app) {
    $app->get('/asignar[/]', [CentrosCostos::class, 'asignar']);
--- a/app/resources/views/contabilidad/centros_costos/asignar.blade.php
+++ b/app/resources/views/contabilidad/centros_costos/asignar.blade.php
@ -14,9 +14,10 @@
                                <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
+                                    @foreach ($inmobiliarias as $inmobiliaria)
+                                        <div class="item"
+                                             data-value="{{$inmobiliaria->rut}}">{{$inmobiliaria->razon}}</div>
+                                    @endforeach
                                </div>
                            </div>
                        </div>
@ -40,7 +41,7 @@
                        </div>
                        <div class="field">
                            <label for="file">Cartola</label>
-                            <input type="file" name="file" id="file" class="ui invisible file input" />
+                            <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
@ -119,20 +120,20 @@
                mes: '',
                movimientos: [],
                centrosCostos: {
-                    ingresos: JSON.parse('{!! json_encode(array_values(array_map(function(\Incoviba\Model\CentroCosto $centroCosto) {
+                    ingresos: JSON.parse('{!! json_encode(array_values(array_map(function(\Incoviba\Model\Contabilidad\CentroCosto $centroCosto) {
                            return [
                                'id' => $centroCosto->id,
                                'descripcion' => $centroCosto->descripcion
                            ];
-                        }, array_filter($centrosCostos, function(\Incoviba\Model\CentroCosto $centroCosto) {
+                        }, array_filter($centrosCostos, function(\Incoviba\Model\Contabilidad\CentroCosto $centroCosto) {
                            return $centroCosto->tipoCentro->descripcion === 'Ingreso';
                        })))) !!}'),
-                    egresos: JSON.parse('{!! json_encode(array_values(array_map(function(\Incoviba\Model\CentroCosto $centroCosto) {
+                    egresos: JSON.parse('{!! json_encode(array_values(array_map(function(\Incoviba\Model\Contabilidad\CentroCosto $centroCosto) {
                            return [
                                'id' => $centroCosto->id,
                                'descripcion' => $centroCosto->descripcion
                            ];
-                        }, array_filter($centrosCostos, function(\Incoviba\Model\CentroCosto $centroCosto) {
+                        }, array_filter($centrosCostos, function(\Incoviba\Model\Contabilidad\CentroCosto $centroCosto) {
                            return $centroCosto->tipoCentro->descripcion === 'Egreso';
                        })))) !!}'),
                }
@ -170,7 +171,11 @@
                                    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}
+                                    return {
+                                        value: cuenta.banco.id,
+                                        text: cuenta.banco.nombre,
+                                        name: cuenta.banco.nombre
+                                    }
                                })).dropdown('refresh')
                            })
                        })
@ -247,12 +252,12 @@
                        const movimientos = this.data.movimientos.map((movimiento, idx) => {
                            const temp = structuredClone(movimiento)
                            temp.fecha = movimiento.fecha.toISOString()
-                            let centro = $(".centro[data-index='" + (idx+1) + "']").dropdown('get value')
+                            let centro = $(".centro[data-index='" + (idx + 1) + "']").dropdown('get value')
                            if (centro.length === 0) {
                                centro = ''
                            }
                            temp.centro_costo = centro
-                            let detalle = $("[name='detalle" + (idx+1) + "']").val()
+                            let detalle = $("[name='detalle" + (idx + 1) + "']").val()
                            if (typeof detalle === 'undefined') {
                                detalle = ''
                            }
@ -294,7 +299,10 @@
                            month: 'numeric',
                            day: 'numeric'
                        })
-                        const numberFormatter = new Intl.NumberFormat('es-CL', {minimumFractionDigits: 0, maximumFractionDigits: 0})
+                        const numberFormatter = new Intl.NumberFormat('es-CL', {
+                            minimumFractionDigits: 0,
+                            maximumFractionDigits: 0
+                        })
                        this.data.movimientos.forEach((row, idx) => {
                            tbody.append(
                                $('<tr></tr>').append(
@ -322,7 +330,7 @@
                        })
                        table.DataTable(this.dataTableConfig)
                    },
-                    centrosDropdown: (idx, ingreso=true) => {
+                    centrosDropdown: (idx, ingreso = true) => {
                        const menu = $('<div></div>').addClass('menu')
                        let centros = this.data.centrosCostos.ingresos
                        if (!ingreso) {
--- a/app/resources/views/contabilidad/informes/tesoreria.blade.php
+++ b/app/resources/views/contabilidad/informes/tesoreria.blade.php
@ -1,5 +1,13 @@
@extends('layout.base')

+@push('page_styles')
+    <style>
+        tr.bold>th {
+            font-weight: bold !important;
+        }
+    </style>
+@endpush
+
@section('page_content')
    <div class="ui container">
        <h1 class="ui centered header">Informe de Tesorería</h1>
--- a/app/resources/views/inmobiliarias/list.blade.php
+++ b/app/resources/views/inmobiliarias/list.blade.php
@ -10,11 +10,6 @@
            <div class="column">
                Inmobiliarias
            </div>
-            {{--<div class="right aligned column">
-                <button class="ui icon button" type="button">
-                    <i class="plus icon"></i>
-                </button>
-            </div>--}}
        </h2>
        <div class="ui divider"></div>
        <div class="ui cards">
@ -22,9 +17,7 @@
            <div class="ui card">
                <div class="content">
                    <div class="header">
-                            {{$inmobiliaria->abreviacion}}
-                        {{--<a href="{{$urls->base}}/inmobiliaria/{{$inmobiliaria->rut}}">
-                        </a>--}}
+                        {{$inmobiliaria->abreviacion}}
                    </div>
                    <div class="description">{{$inmobiliaria->razon}} {{$inmobiliaria->tipoSociedad->descripcion}}</div>
                    <div class="meta">{{$inmobiliaria->rut()}}</div>
--- a/app/resources/views/layout/body/scripts.blade.php
+++ b/app/resources/views/layout/body/scripts.blade.php
@ -2,6 +2,13 @@
 <script src="https://cdnjs.cloudflare.com/ajax/libs/fomantic-ui/2.9.3/semantic.min.js" integrity="sha512-gnoBksrDbaMnlE0rhhkcx3iwzvgBGz6mOEj4/Y5ZY09n55dYddx6+WYc72A55qEesV8VX2iMomteIwobeGK1BQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>

 <script type="text/javascript">
+    function cleanNoCache() {
+        const url = new URL(window.location.href)
+        if (url.searchParams.has('nocache')) {
+            url.searchParams.delete('nocache')
+            window.location.href = url.href
+        }
+    }
    function fetchAPI(url, options=null) {
        if (options === null) {
            options = {}
@ -10,7 +17,11 @@
            options['headers'] = {}
        }
        if (!Object.hasOwn(options['headers'], 'Authorization')) {
-            options['headers']['Authorization'] = 'Bearer {{md5($API_KEY)}}'
+            @if (!$login->isIn())
+                options['headers']['Authorization'] = 'Bearer {{md5($API_KEY)}}'
+            @else
+                options['headers']['Authorization'] = 'Bearer {{md5($API_KEY)}}{{$login->getSeparator()}}{{$login->getToken()}}'
+            @endif
        }
        return fetch(url, options).then(response => {
            if (response.ok) {
@ -36,6 +47,9 @@
            date: 'DD-MM-YYYY'
        },
    }
+    /*$(document).ready(() => {
+        cleanNoCache()
+    })*/
 </script>

@stack('page_scripts')
--- a/app/resources/views/layout/body/scripts/cryptojs.blade.php
+++ b/app/resources/views/layout/body/scripts/cryptojs.blade.php
@ -0,0 +1,3 @@
+@push('page_scripts')
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/4.2.0/crypto-js.min.js" integrity="sha512-a+SUDuwNzXDvz4XrIcXHuCf089/iJAoN4lmrXJg18XnduKK6YlDHNRalv4yd1N40OKI80tFidF+rqTFKGPoWFQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+@endpush
--- a/app/resources/views/login/form.blade.php
+++ b/app/resources/views/login/form.blade.php
@ -16,28 +16,33 @@
    </div>
@endsection

+@include('layout.body.scripts.cryptojs')
+
@push('page_scripts')
    <script type="text/javascript">
+        function encryptPassword(password) {
+            const passphrase = Math.floor(Math.random() * Date.now()).toString()
+            const encrypted = CryptoJS.AES.encrypt(password, passphrase)
+            return [passphrase, encrypted.toString()].join('')
+        }
        function sendLogin(name, password) {
-            const data = new FormData()
-            data.append('name', name)
-            data.append('password', password)
-            return fetch('{{$urls->base}}/login', {
-                method: 'post',
-                headers: {
-                    Accept: 'json'
-                },
-                body: data
-            }).then(response => {
+            const method = 'post'
+            const headers = {
+                Accept: 'json'
+            }
+            const body = new FormData()
+            body.append('name', name)
+            body.append('password', encryptPassword(password))
+            return fetch('{{$urls->base}}/login', {method, headers, body}).then(response => {
                if (response.ok) {
                    return response.json()
                }
            }).then(data => {
                if (data.login === true) {
                @if(isset($redirect_uri))
-                    window.location = '{{$redirect_uri}}'
+                    window.location = '{{$redirect_uri}}?nocache=' + (new Date()).getTime()
                @else
-                    window.location = '{{$urls->base}}'
+                    window.location = '{{$urls->base}}?nocache=' + (new Date()).getTime()
                @endif
                }
            })
--- a/app/resources/views/ventas/pies/cuotas.blade.php
+++ b/app/resources/views/ventas/pies/cuotas.blade.php
@ -5,6 +5,29 @@
@endsection

@section('venta_content')
+    @if (count($asociadas) > 0)
+    <div class="ui grid">
+        <div class="two wide column">Asociados</div>
+        <div class="six wide column">
+            {!! implode(' - ', array_map(function(Incoviba\Model\Venta $venta) use ($urls) {
+                return "<a href=\"{$urls->base}/venta/{$venta->id}\">{$venta->propiedad()->departamentos()[0]->descripcion}</a>";
+            }, $asociadas)) !!}
+        </div>
+    </div>
+    @endif
+    <div class="ui grid">
+        <div class="column">Valor</div>
+        <div class="four wide column">
+            {{$format->ufs($venta->formaPago()->pie->valor)}}
+            @if (count($asociadas) > 0)
+                [{{$format->ufs($venta->formaPago()->pie->valor + array_reduce($asociadas, function(float $sum, Incoviba\Model\Venta $venta) {
+                    return $sum + $venta->formaPago()->pie->valor;
+                }, 0.0))}}]
+            @endif
+        </div>
+        <div class="column">Cuotas</div>
+        <div class="column">{{$venta->formaPago()->pie->cuotas}}</div>
+    </div>
    <table class="ui table" id="cuotas">
        <thead>
            <tr>
@ -37,32 +60,37 @@
                <td>{{$cuota->pago->identificador}}</td>
                <td class="right aligned">{{$format->pesos($cuota->pago->valor)}}</td>
                <td class="right aligned">
-                    @if ($cuota->pago->currentEstado->tipoEstadoPago->descripcion === 'abonado' and $cuota->pago->currentEstado->fecha <= $now)
+                    @if (in_array($cuota->pago->currentEstado->tipoEstadoPago->descripcion, ['depositado', 'abonado'])
+                        and $cuota->pago->currentEstado->fecha <= $now)
                    {{$format->ufs($cuota->pago->valor())}}
+                    @else
+                    ~{{$format->ufs($cuota->pago->valor / $uf_venta)}}
                    @endif
                </td>
-                <td
-                    @if ($cuota->pago->currentEstado->tipoEstadoPago->descripcion === 'abonado')
-                        class="green"
-                    @elseif ($cuota->pago->currentEstado->tipoEstadoPago->descripcion === 'depositado')
-                        class="yellow"
-                    @elseif ($cuota->pago->currentEstado->tipoEstadoPago->activo !== 1)
-                        class="red"
-                    @endif
-                >{{ucwords($cuota->pago->currentEstado->tipoEstadoPago->descripcion)}}</td>
+                <td{!! ($cuota->pago->currentEstado->tipoEstadoPago->descripcion === 'abonado' ? ' class="green"' :
+                    ($cuota->pago->currentEstado->tipoEstadoPago->descripcion === 'depositado' ? ' class="yellow"' :
+                        ($cuota->pago->currentEstado->tipoEstadoPago->activo !== 1 ? ' class="red"' : ''))) !!}>
+                    {{ucwords($cuota->pago->currentEstado->tipoEstadoPago->descripcion)}}
+                </td>
                <td>
                    @if (in_array($cuota->pago->currentEstado->tipoEstadoPago->descripcion, ['abonado', 'anulado', 'reemplazado']))
                        {{$cuota->pago->currentEstado->fecha->format('d-m-Y')}}
                    @elseif (!in_array($cuota->pago->currentEstado->tipoEstadoPago->descripcion, ['anulado', 'reemplazado']))
+                        @if ($cuota->pago->currentEstado->tipoEstadoPago->descripcion === 'depositado')
+                            {{$cuota->pago->currentEstado->fecha->format('d-m-Y')}}
+                        @endif
                        <div class="ui calendar fecha_estado" data-date="{{$cuota->pago->currentEstado->fecha->format('Y-m-d')}}">
                            <div class="ui action left icon input">
                                <i class="calendar icon"></i>
                                <input type="text" name="fecha_estado" />
-                                <button class="ui green basic icon button accept_estado" data-pago="{{$cuota->pago->id}}" data-estado="{{$cuota->pago->currentEstado->tipoEstadoPago->descripcion}}">
+                                <button class="ui green basic icon button accept_estado"
+                                        data-pago="{{$cuota->pago->id}}"
+                                        data-estado="{{$cuota->pago->currentEstado->tipoEstadoPago->descripcion}}">
                                    <i class="check icon"></i>
                                </button>
                                @if ($cuota->pago->currentEstado->tipoEstadoPago->descripcion === 'depositado')
-                                    <button class="ui red basic icon button reject_estado" data-pago="{{$cuota->pago->id}}">
+                                    <button class="ui red basic icon button reject_estado"
+                                            data-pago="{{$cuota->pago->id}}">
                                        <i class="remove icon"></i>
                                    </button>
                                @endif
@ -115,7 +143,7 @@
                    }, 0.0))}}
            </th>
            <th class="right aligned">
-                {{$format->number($pagado / $total * 100, 2)}}%
+                {{$format->number(($total > 0) ? $pagado / $total * 100 : 0, 2)}}%
            </th>
            <th colspan="3"></th>
        </tr>
@ -128,7 +156,7 @@
                {{$format->ufs($total - $pagado)}}
            </th>
            <th class="right aligned">
-                {{$format->number(($total - $pagado) / $total * 100, 2)}}%
+                {{$format->number(($total > 0) ? ($total - $pagado) / $total * 100 : 0, 2)}}%
            </th>
            <th colspan="3"></th>
        </tr>
@ -144,9 +172,10 @@
@push('page_scripts')
    <script type="text/javascript">
        $(document).ready(() => {
-            function updateRow({pago_id, fecha, color, estado, remove_fecha=false, add_reject=false, disable=false}) {
+            function updateRow({pago_id, valor, fecha, color, estado, remove_fecha=false, add_reject=false, disable=false}) {
                const tr = $("tr[data-pago='" + pago_id + "']")

+                tr.find(':nth-child(6)').html(valor)
                tr.find(':nth-child(7)').attr('class', color).html(estado)
                if (remove_fecha) {
                    tr.find(':nth-child(8)').html(fecha)
@ -181,7 +210,7 @@
                        if (!json.depositado) {
                            return
                        }
-                        updateRow({pago_id: json.pago_id, fecha: json.input.fecha, estado: 'Depositado', color: 'yellow', add_reject: true})
+                        updateRow({pago_id: json.pago_id, valor: json.pago.valor_uf, fecha: json.input.fecha, estado: 'Depositado', color: 'yellow', add_reject: true})
                        button.attr('data-estado', 'depositado')
                    })
                })
@ -189,7 +218,7 @@
            function abonar(pago_id, fecha) {
                const url = '{{$urls->api}}/ventas/pago/' + pago_id + '/abonar'
                const body = new FormData()
-                body.set('fecha', fecha.toISOString())
+                body.set('fecha', [fecha.getFullYear(), fecha.getMonth() + 1, fecha.getDate()].join('-'))
                return fetchAPI(url, {method: 'post', body}).then(response => {
                    if (!response) {
                        return
--- a/app/resources/views/ventas/show/propiedad.blade.php
+++ b/app/resources/views/ventas/show/propiedad.blade.php
@ -50,7 +50,7 @@
                </td>
                <td class="right aligned">
                    @if ($unidad->proyectoTipoUnidad->tipoUnidad->descripcion === 'departamento')
-                        {{$format->number(($unidad->valor ?? $precio) / $unidad->proyectoTipoUnidad->vendible(), 2)}} UF/m²
+                        {{$format->number((($unidad->valor === null or $unidad->valor === 0.0) ? $precio : $unidad->valor) / $unidad->proyectoTipoUnidad->vendible(), 2)}} UF/m²
                    @endif
                </td>
                <td class="center aligned">
--- a/app/setup/middlewares/01_auth.php
+++ b/app/setup/middlewares/01_auth.php
@ -1,2 +1,2 @@
 <?php
-//$app->add($app->getContainer()->get(Incoviba\Middleware\Authentication::class));
+$app->add($app->getContainer()->get(Incoviba\Middleware\Authentication::class));
--- a/app/setup/middlewares/96_cors.php
+++ b/app/setup/middlewares/96_cors.php
@ -0,0 +1,2 @@
+<?php
+$app->add($app->getContainer()->get(Incoviba\Middleware\CORS::class));
--- a/app/setup/setups/logs.php
+++ b/app/setup/setups/logs.php
@ -4,18 +4,6 @@ use Psr\Container\ContainerInterface;
 return [
    Psr\Log\LoggerInterface::class => function(ContainerInterface $container) {
        return new Monolog\Logger('incoviba', [
-            new Monolog\Handler\FilterHandler(
-                (new Monolog\Handler\RotatingFileHandler('/logs/debug.log', 10))
-                    ->setFormatter(new Monolog\Formatter\LineFormatter(null, null, false, false, true)),
-                Monolog\Level::Debug,
-                Monolog\Level::Debug
-            ),
-            new Monolog\Handler\FilterHandler(
-                (new Monolog\Handler\RotatingFileHandler('/logs/info.log', 10))
-                    ->setFormatter(new Monolog\Formatter\LineFormatter(null, null, false, false, true)),
-                Monolog\Level::Info,
-                Monolog\Level::Warning,
-            ),
            new Monolog\Handler\FilterHandler(
                (new Monolog\Handler\RotatingFileHandler('/logs/error.log', 10))
                    ->setFormatter(new Monolog\Formatter\LineFormatter(null, null, false, false, true)),
@ -26,6 +14,17 @@ return [
                (new Monolog\Handler\RotatingFileHandler('/logs/critical.log', 10))
                    ->setFormatter(new Monolog\Formatter\LineFormatter(null, null, false, false, true)),
                Monolog\Level::Critical
+            ),
+            new Monolog\Handler\FilterHandler(
+                new Monolog\Handler\RedisHandler($container->get(Predis\ClientInterface::class), 'logs:notices'),
+                Monolog\Level::Notice,
+                Monolog\Level::Warning
+            ),
+            new Monolog\Handler\FilterHandler(
+                (new Incoviba\Common\Implement\Log\MySQLHandler($container->get(Incoviba\Common\Define\Connection::class)))
+                    ->setFormatter(new Incoviba\Common\Implement\Log\PDOFormatter()),
+                Monolog\Level::Debug,
+                Monolog\Level::Warning
            )
        ], [
            $container->get(Monolog\Processor\PsrLogMessageProcessor::class),
--- a/app/setup/setups/middlewares.php
+++ b/app/setup/setups/middlewares.php
@ -14,6 +14,7 @@ return [
    Incoviba\Middleware\API::class => function(ContainerInterface $container) {
        return new Incoviba\Middleware\API(
            $container->get(Psr\Http\Message\ResponseFactoryInterface::class),
+            $container->get(Incoviba\Service\Login::class),
            $container->get('API_KEY')
        );
    }
--- a/app/setup/setups/services.php
+++ b/app/setup/setups/services.php
@ -9,7 +9,8 @@ return [
            $container->get('COOKIE_NAME'),
            $container->get('MAX_LOGIN_HOURS'),
            $container->has('COOKIE_DOMAIN') ? $container->get('COOKIE_DOMAIN') : '',
-            $container->has('COOKIE_PATH') ? $container->get('COOKIE_PATH') : ''
+            $container->has('COOKIE_PATH') ? $container->get('COOKIE_PATH') : '',
+            $container->has('COOKIE_SEPARATOR') ? $container->get('COOKIE_SEPARATOR') : 'g'
        );
    },
    Incoviba\Service\Money::class => function(ContainerInterface $container) {
@ -25,39 +26,40 @@ return [
            ->register('usd', $mindicador)
            ->register('ipc', $ine);
    },
-    Predis\Client::class => function(ContainerInterface $container) {
+    Predis\ClientInterface::class => function(ContainerInterface $container) {
        return new Predis\Client([
            'scheme' => 'tcp',
            'host' => $container->get('REDIS_HOST'),
            'port' => $container->get('REDIS_PORT')
        ]);
    },
-    Incoviba\Service\Cartola::class => function(ContainerInterface $container) {
-        return (new Incoviba\Service\Cartola(
+    Incoviba\Service\Contabilidad\Cartola::class => function(ContainerInterface $container) {
+        return (new Incoviba\Service\Contabilidad\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::class),
            $container->get(Incoviba\Repository\Inmobiliaria\Cuenta::class),
-            $container->get(Incoviba\Repository\Movimiento::class),
-            $container->get(Incoviba\Service\Movimiento::class),
-            $container->get(Incoviba\Repository\Cartola::class)
+            $container->get(Incoviba\Repository\Contabilidad\Movimiento::class),
+            $container->get(Incoviba\Service\Contabilidad\Movimiento::class),
+            $container->get(Incoviba\Repository\Contabilidad\Cartola::class)
        ))
-            ->register('security', $container->get(Incoviba\Service\Cartola\Security::class))
-            ->register('itau', $container->get(Incoviba\Service\Cartola\Itau::class))
-            ->register('santander', $container->get(Incoviba\Service\Cartola\Santander::class));
+            ->register('security', $container->get(Incoviba\Service\Contabilidad\Cartola\Security::class))
+            ->register('itau', $container->get(Incoviba\Service\Contabilidad\Cartola\Itau::class))
+            ->register('santander', $container->get(Incoviba\Service\Contabilidad\Cartola\Santander::class))
+            ->register('bci', $container->get(Incoviba\Service\Contabilidad\Cartola\BCI::class));
    },
    Incoviba\Common\Define\Contabilidad\Exporter::class => function(ContainerInterface $container) {
        return $container->get(Incoviba\Service\Contabilidad\Exporter\Nubox::class);
    },
    Incoviba\Service\Contabilidad\Exporter\Nubox::class => function(ContainerInterface $container) {
-        return new Incoviba\Service\Contabilidad\Exporter\Nubox($container->get(Incoviba\Repository\CentroCosto::class),
+        return new Incoviba\Service\Contabilidad\Exporter\Nubox($container->get(Incoviba\Repository\Contabilidad\CentroCosto::class),
            $container->get('folders')->get('uploads'));
    },
    Incoviba\Service\Contabilidad\Nubox::class => function(ContainerInterface $container) {
        return new Incoviba\Service\Contabilidad\Nubox(
            $container->get(Psr\Log\LoggerInterface::class),
-            $container->get(Incoviba\Repository\Nubox::class),
+            $container->get(Incoviba\Repository\Contabilidad\Nubox::class),
            $container->get(Incoviba\Service\Redis::class),
            new GuzzleHttp\Client(),
            $container->get(Psr\Http\Message\RequestFactoryInterface::class),
--- a/app/src/Controller/API/Base.php
+++ b/app/src/Controller/API/Base.php
@ -0,0 +1,20 @@
+<?php
+namespace Incoviba\Controller\API;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Incoviba\Common\Ideal\Controller;
+
+class Base extends Controller
+{
+    use withJson;
+
+    public function __invoke(ServerRequestInterface $request, ResponseInterface $response): ResponseInterface
+    {
+        $output = [
+            'version' => '2.0.0',
+            'organization' => 'Ingenieria y Construccion Vial Balmaceda Sociedad Anonima'
+        ];
+        return $this->withJson($response, $output);
+    }
+}
--- a/app/src/Controller/API/Contabilidad/Cartolas.php
+++ b/app/src/Controller/API/Contabilidad/Cartolas.php
@ -1,24 +1,23 @@
 <?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;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;

 class Cartolas extends Controller
 {
    use withJson;

-    public function procesar(ServerRequestInterface $request, ResponseInterface $response,
-                                    Repository\Inmobiliaria $inmobiliariaRepository,
-                                    Repository\Banco $bancoRepository,
-                                    Service\Cartola $cartolaService): ResponseInterface
+    public function procesar(ServerRequestInterface        $request, ResponseInterface $response,
+                             Repository\Inmobiliaria       $inmobiliariaRepository,
+                             Repository\Contabilidad\Banco $bancoRepository,
+                             Service\Contabilidad\Cartola  $cartolaService): ResponseInterface
    {
        $body = $request->getParsedBody();
        $output = [
@ -34,10 +33,10 @@ class Cartolas extends Controller
        } catch (EmptyResult) {}
        return $this->withJson($response, $output);
    }
-    public function exportar(ServerRequestInterface $request, ResponseInterface $response,
-                                    Repository\Inmobiliaria $inmobiliariaRepository,
-                                    Repository\Banco $bancoRepository,
-                                    Service\Cartola $cartolaService): ResponseInterface
+    public function exportar(ServerRequestInterface        $request, ResponseInterface $response,
+                             Repository\Inmobiliaria       $inmobiliariaRepository,
+                             Repository\Contabilidad\Banco $bancoRepository,
+                             Service\Contabilidad\Cartola  $cartolaService): ResponseInterface
    {
        $body = $request->getParsedBody();
        $output = [
@ -52,9 +51,9 @@ class Cartolas extends Controller
        } catch (EmptyResult) {}
        return $this->withJson($response, $output);
    }
-    public function diaria(ServerRequestInterface $request, ResponseInterface $response,
+    public function diaria(ServerRequestInterface         $request, ResponseInterface $response,
                           Repository\Inmobiliaria\Cuenta $cuentaRepository,
-                           Service\Cartola $cartolaService): ResponseInterface
+                           Service\Contabilidad\Cartola   $cartolaService): ResponseInterface
    {
        $body = $request->getParsedBody();
        $output = [
@ -80,9 +79,9 @@ class Cartolas extends Controller
        }
        return $this->withJson($response, $output);
    }
-    public function ayer(ServerRequestInterface $request, ResponseInterface $response,
-                         Repository\Inmobiliaria\Cuenta $cuentaRepository,
-                         Repository\Cartola $cartolaRepository): ResponseInterface
+    public function ayer(ServerRequestInterface          $request, ResponseInterface $response,
+                         Repository\Inmobiliaria\Cuenta  $cuentaRepository,
+                         Repository\Contabilidad\Cartola $cartolaRepository): ResponseInterface
    {
        $body = $request->getParsedBody();
        $output = [
--- a/app/src/Controller/API/Contabilidad/CentrosCostos.php
+++ b/app/src/Controller/API/Contabilidad/CentrosCostos.php
@ -1,17 +1,18 @@
 <?php
-namespace Incoviba\Controller\API;
+namespace Incoviba\Controller\API\Contabilidad;

-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\ResponseInterface;
 use Incoviba\Common\Implement\Exception\EmptyResult;
+use Incoviba\Controller\API\withJson;
 use Incoviba\Repository;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;

 class CentrosCostos
 {
    use withJson;

-    public function add(ServerRequestInterface $request, ResponseInterface $response,
-                        Repository\CentroCosto $centroCostoRepository): ResponseInterface
+    public function add(ServerRequestInterface              $request, ResponseInterface $response,
+                        Repository\Contabilidad\CentroCosto $centroCostoRepository): ResponseInterface
    {
        $body = $request->getParsedBody();
        $output = [
@ -26,8 +27,8 @@ class CentrosCostos
        } catch (EmptyResult) {}
        return $this->withJson($response, $output);
    }
-    public function edit(ServerRequestInterface $request, ResponseInterface $response,
-                         Repository\CentroCosto $centroCostoRepository, int $centro_costo_id): ResponseInterface
+    public function edit(ServerRequestInterface              $request, ResponseInterface $response,
+                         Repository\Contabilidad\CentroCosto $centroCostoRepository, int $centro_costo_id): ResponseInterface
    {
        $body = $request->getParsedBody();
        $output = [
@ -45,8 +46,8 @@ class CentrosCostos
        } catch (EmptyResult) {}
        return $this->withJson($response, $output);
    }
-    public function remove(ServerRequestInterface $request, ResponseInterface $response,
-                           Repository\CentroCosto $centroCostoRepository, int $centro_costo_id): ResponseInterface
+    public function remove(ServerRequestInterface              $request, ResponseInterface $response,
+                           Repository\Contabilidad\CentroCosto $centroCostoRepository, int $centro_costo_id): ResponseInterface
    {
        $output = [
            'centro_costo_id' => $centro_costo_id,
--- a/app/src/Controller/API/Contabilidad/Depositos.php
+++ b/app/src/Controller/API/Contabilidad/Depositos.php
@ -2,23 +2,23 @@
 namespace Incoviba\Controller\API\Contabilidad;

 use DateTimeImmutable;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\ResponseInterface;
 use Incoviba\Common\Ideal;
 use Incoviba\Common\Implement;
 use Incoviba\Controller\API\withJson;
 use Incoviba\Repository;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;

 class Depositos extends Ideal\Controller
 {
    use withJson;

-    public function inmobiliaria(ServerRequestInterface         $request, ResponseInterface $response,
-                                 Repository\Inmobiliaria        $inmobiliariaRepository,
-                                 Repository\Banco               $bancoRepository,
-                                 Repository\Inmobiliaria\Cuenta $cuentaRepository,
-                                 Repository\Deposito            $dapRepository,
-                                 int                            $inmobiliaria_rut): ResponseInterface
+    public function inmobiliaria(ServerRequestInterface           $request, ResponseInterface $response,
+                                 Repository\Inmobiliaria          $inmobiliariaRepository,
+                                 Repository\Contabilidad\Banco    $bancoRepository,
+                                 Repository\Inmobiliaria\Cuenta   $cuentaRepository,
+                                 Repository\Contabilidad\Deposito $dapRepository,
+                                 int                              $inmobiliaria_rut): ResponseInterface
    {
        $output = [
            'inmobiliaria_rut' => $inmobiliaria_rut,
@ -33,10 +33,10 @@ class Depositos extends Ideal\Controller
        } 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
+    public function add(ServerRequestInterface           $request, ResponseInterface $response,
+                        Repository\Inmobiliaria          $inmobiliariaRepository, Repository\Contabilidad\Banco $bancoRepository,
+                        Repository\Inmobiliaria\Cuenta   $cuentaRepository,
+                        Repository\Contabilidad\Deposito $dapRepository): ResponseInterface
    {
        $body = $request->getParsedBody();
        $output = [
--- a/app/src/Controller/API/Contabilidad/Movimientos.php
+++ b/app/src/Controller/API/Contabilidad/Movimientos.php
@ -1,21 +1,21 @@
 <?php
 namespace Incoviba\Controller\API\Contabilidad;

-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
+use Incoviba\Common\Ideal;
 use Incoviba\Common\Implement\Exception\EmptyResult;
 use Incoviba\Controller\API\withJson;
-use Incoviba\Common\Ideal;
 use Incoviba\Repository;
 use Incoviba\Service;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;

 class Movimientos extends Ideal\Controller
 {
    use withJson;

-    public function detalles(ServerRequestInterface $request, ResponseInterface $response,
-                             Service\Movimiento     $movimientoService,
-                             Repository\CentroCosto $centroCostoRepository, int $movimiento_id): ResponseInterface
+    public function detalles(ServerRequestInterface              $request, ResponseInterface $response,
+                             Service\Contabilidad\Movimiento     $movimientoService,
+                             Repository\Contabilidad\CentroCosto $centroCostoRepository, int $movimiento_id): ResponseInterface
    {
        $body = $request->getParsedBody();
        $output = [
--- a/app/src/Controller/API/Contabilidad/Nubox.php
+++ b/app/src/Controller/API/Contabilidad/Nubox.php
@ -1,11 +1,12 @@
 <?php
-namespace Incoviba\Controller\API;
+namespace Incoviba\Controller\API\Contabilidad;

 use DateTimeImmutable;
+use Incoviba\Common\Implement\Exception\HttpResponse;
+use Incoviba\Controller\API\withJson;
+use Incoviba\Service;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Incoviba\Common\Implement\Exception\HttpResponse;
-use Incoviba\Service;

 class Nubox
 {
--- a/app/src/Controller/API/Inmobiliarias.php
+++ b/app/src/Controller/API/Inmobiliarias.php
@ -12,6 +12,16 @@ class Inmobiliarias
 {
    use withJson;

+    public function __invoke(ServerRequestInterface $request, ResponseInterface $response, Repository\Inmobiliaria $inmobiliariaRepository): ResponseInterface
+    {
+        $output = [
+            'inmobiliarias' => []
+        ];
+        try {
+            $output['inmobiliarias'] = $inmobiliariaRepository->fetchAll('razon');
+        } catch (EmptyResult) {}
+        return $this->withJson($response, $output);
+    }
    public function cuentas(ServerRequestInterface $request, ResponseInterface $response,
                            Repository\Inmobiliaria $inmobiliariaRepository,
                            Repository\Inmobiliaria\Cuenta $cuentaRepository, int $inmobiliaria_rut): ResponseInterface
--- a/app/src/Controller/API/Ventas/Pagos.php
+++ b/app/src/Controller/API/Ventas/Pagos.php
@ -13,6 +13,19 @@ class Pagos
 {
    use withJson;

+    public function get(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\Pago $pagoService,
+                        Service\Format $formatService, int $pago_id): ResponseInterface
+    {
+        $output = [
+            'pago_id' => $pago_id,
+            'pago' => null
+        ];
+        try {
+            $output['pago'] = json_decode(json_encode($pagoService->getById($pago_id)), JSON_OBJECT_AS_ARRAY);
+            $output['pago']['valor_uf'] = $formatService->ufs($output['pago']['valor_uf']);
+        } catch (EmptyResult) {}
+        return $this->withJson($response, $output);
+    }
    public function edit(ServerRequestInterface $request, ResponseInterface $response, Repository\Venta\Pago $pagoRepository, int $pago_id): ResponseInterface
    {
        $body = $request->getParsedBody();
@ -31,33 +44,41 @@ class Pagos
        } catch (EmptyResult) {}
        return $this->withJson($response, $output);
    }
-    public function depositar(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\Pago $pagoService, int $pago_id): ResponseInterface
+    public function depositar(ServerRequestInterface $request, ResponseInterface $response,
+                              Service\Venta\Pago $pagoService, Service\Format $formatService, int $pago_id): ResponseInterface
    {
        $body = $request->getParsedBody();
        $output = [
            'pago_id' => $pago_id,
            'input' => $body,
+            'pago' => null,
            'depositado' => false
        ];
        try {
            $pago = $pagoService->getById($pago_id);
-            $fecha = new DateTimeImmutable($body->fecha);
+            $fecha = new DateTimeImmutable($body['fecha']);
            $output['depositado'] = $pagoService->depositar($pago, $fecha);
+            $output['pago'] = json_decode(json_encode($pagoService->getById($pago_id)), JSON_OBJECT_AS_ARRAY);
+            $output['pago']['valor_uf'] = $formatService->ufs($output['pago']['valor_uf']);
        } catch (EmptyResult) {}
        return $this->withJson($response, $output);
    }
-    public function abonar(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\Pago $pagoService, int $pago_id): ResponseInterface
+    public function abonar(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\Pago $pagoService,
+                           Service\Format $formatService, int $pago_id): ResponseInterface
    {
        $body = $request->getParsedBody();
        $output = [
            'pago_id' => $pago_id,
            'input' => $body,
+            'pago' => null,
            'abonado' => false
        ];
        try {
            $pago = $pagoService->getById($pago_id);
-            $fecha = new DateTimeImmutable($body->fecha);
+            $fecha = new DateTimeImmutable($body['fecha']);
            $output['abonado'] = $pagoService->abonar($pago, $fecha);
+            $output['pago'] = json_decode(json_encode($pagoService->getById($pago_id)), JSON_OBJECT_AS_ARRAY);
+            $output['pago']['valor_uf'] = $formatService->ufs($output['pago']['valor_uf']);
            $output['input']['fecha'] = $fecha->format('d-m-Y');
        } catch (EmptyResult) {}
        return $this->withJson($response, $output);
--- a/app/src/Controller/CentrosCostos.php
+++ b/app/src/Controller/CentrosCostos.php
@ -1,32 +0,0 @@
-<?php
-namespace Incoviba\Controller;
-
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Incoviba\Repository;
-use Incoviba\Common\Alias\View;
-
-class CentrosCostos
-{
-    public function __invoke(ServerRequestInterface $request, ResponseInterface $response, View $view,
-                             Repository\CentroCosto $centroCostoRepository,
-                             Repository\TipoCentro $tipoCentroRepository,
-                             Repository\CategoriaCentro $categoriaCentroRepository,
-                             Repository\TipoCuenta $tipoCuentaRepository): ResponseInterface
-    {
-        $centrosCostos = $centroCostoRepository->fetchAll();
-        $tiposCentros = $tipoCentroRepository->fetchAll();
-        $categorias = $categoriaCentroRepository->fetchAll('descripcion');
-        $tiposCuentas = $tipoCuentaRepository->fetchAll();
-        return $view->render($response, 'contabilidad.centros_costos', compact('centrosCostos',
-            'tiposCentros', 'categorias', 'tiposCuentas'));
-    }
-    public function asignar(ServerRequestInterface $request, ResponseInterface $response, View $view,
-                            Repository\CentroCosto $centroCostoRepository,
-                            Repository\Inmobiliaria $inmobiliariaRepository): ResponseInterface
-    {
-        $centrosCostos = $centroCostoRepository->fetchAll();
-        $inmobiliarias = $inmobiliariaRepository->fetchAllActive('razon');
-        return $view->render($response, 'contabilidad.centros_costos.asignar', compact('centrosCostos', 'inmobiliarias'));
-    }
-}
--- a/app/src/Controller/Contabilidad.php
+++ b/app/src/Controller/Contabilidad.php
@ -1,25 +1,25 @@
 <?php
 namespace Incoviba\Controller;

-use DateTimeImmutable;
 use DateInterval;
-use Incoviba\Common\Ideal\Controller;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
+use DateTimeImmutable;
 use Incoviba\Common\Alias\View;
-use Incoviba\Common\Implement\Exception\{EmptyResult, EmptyRedis};
+use Incoviba\Common\Ideal\Controller;
+use Incoviba\Common\Implement\Exception\{EmptyRedis, EmptyResult};
 use Incoviba\Model;
 use Incoviba\Repository;
 use Incoviba\Service;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;

 class Contabilidad extends Controller
 {
    use withRedis;

-    public function diaria(ServerRequestInterface $request, ResponseInterface $response, View $view,
-                           Service\Redis $redisService,
-                           Repository\Inmobiliaria $inmobiliariaRepository,
-                           Repository\CentroCosto $centroCostoRepository): ResponseInterface
+    public function diaria(ServerRequestInterface              $request, ResponseInterface $response, View $view,
+                           Service\Redis                       $redisService,
+                           Repository\Inmobiliaria             $inmobiliariaRepository,
+                           Repository\Contabilidad\CentroCosto $centroCostoRepository): ResponseInterface
    {
        $redisKey = 'inmobiliarias';
        $inmobiliarias = [];
@ -27,17 +27,17 @@ class Contabilidad extends Controller
            $inmobiliarias = $this->fetchRedis($redisService, $redisKey);
        } catch (EmptyRedis) {
            try {
-                $inmobiliarias = $inmobiliariaRepository->fetchAll();
+                $inmobiliarias = $inmobiliariaRepository->fetchAll('razon');
                $this->saveRedis($redisService, $redisKey, $inmobiliarias, 30 * 24 * 60 * 60);
            } catch (EmptyResult) {}
        }
        $centrosCostos = $centroCostoRepository->fetchAll();
        return $view->render($response, 'contabilidad.cartolas.diaria', compact('inmobiliarias', 'centrosCostos'));
    }
-    public function depositos(ServerRequestInterface  $request, ResponseInterface $response, View $view,
-                              Service\Redis           $redisService,
-                              Repository\Inmobiliaria $inmobiliariaRepository,
-                              Repository\Deposito     $dapRepository): ResponseInterface
+    public function depositos(ServerRequestInterface           $request, ResponseInterface $response, View $view,
+                              Service\Redis                    $redisService,
+                              Repository\Inmobiliaria          $inmobiliariaRepository,
+                              Repository\Contabilidad\Deposito $dapRepository): ResponseInterface
    {
        $redisKey = 'inmobiliarias';
        $inmobiliarias = [];
@ -54,11 +54,11 @@ class Contabilidad extends Controller
            $depositos = $dapRepository->fetchAll();
        } catch (EmptyResult) {}
        $fecha = new DateTimeImmutable('today');
-        $activos = array_filter($depositos, function(Model\Deposito $deposito) use ($fecha) {
+        $activos = array_filter($depositos, function(Model\Contabilidad\Deposito $deposito) use ($fecha) {
            return $deposito->termino >= $fecha;
        });
        $mes = $fecha->sub(new DateInterval('P1M'));
-        $vencidos = array_filter($depositos, function(Model\Deposito $deposito) use ($fecha, $mes) {
+        $vencidos = array_filter($depositos, function(Model\Contabilidad\Deposito $deposito) use ($fecha, $mes) {
            return $deposito->termino < $fecha and $deposito->termino >= $mes;
        });
        return $view->render($response, 'contabilidad.depositos', compact('inmobiliarias', 'activos', 'vencidos'));
@ -73,4 +73,13 @@ class Contabilidad extends Controller
        $filename = "Informe de Tesorería {$fecha->format('d.m.Y')}";
        return $view->render($response, 'contabilidad.informes.tesoreria', compact('fecha', 'anterior', 'informes', 'filename'));
    }
+    public function cuadratura(ServerRequestInterface $request, ResponseInterface $response, View $view,
+                               Repository\Inmobiliaria $inmobiliariaRepository): ResponseInterface
+    {
+        $inmobiliarias = [];
+        try {
+            $inmobiliarias = $inmobiliariaRepository->fetchAll('razon');
+        } catch (EmptyResult) {}
+        return $view->render($response, 'contabilidad.cuadratura', compact('inmobiliarias'));
+    }
 }
--- a/app/src/Controller/Contabilidad/CentrosCostos.php
+++ b/app/src/Controller/Contabilidad/CentrosCostos.php
@ -0,0 +1,32 @@
+<?php
+namespace Incoviba\Controller\Contabilidad;
+
+use Incoviba\Common\Alias\View;
+use Incoviba\Repository;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+
+class CentrosCostos
+{
+    public function __invoke(ServerRequestInterface                  $request, ResponseInterface $response, View $view,
+                             Repository\Contabilidad\CentroCosto     $centroCostoRepository,
+                             Repository\Contabilidad\TipoCentro      $tipoCentroRepository,
+                             Repository\Contabilidad\CategoriaCentro $categoriaCentroRepository,
+                             Repository\TipoCuenta                   $tipoCuentaRepository): ResponseInterface
+    {
+        $centrosCostos = $centroCostoRepository->fetchAll();
+        $tiposCentros = $tipoCentroRepository->fetchAll();
+        $categorias = $categoriaCentroRepository->fetchAll('descripcion');
+        $tiposCuentas = $tipoCuentaRepository->fetchAll();
+        return $view->render($response, 'contabilidad.centros_costos', compact('centrosCostos',
+            'tiposCentros', 'categorias', 'tiposCuentas'));
+    }
+    public function asignar(ServerRequestInterface              $request, ResponseInterface $response, View $view,
+                            Repository\Contabilidad\CentroCosto $centroCostoRepository,
+                            Repository\Inmobiliaria             $inmobiliariaRepository): ResponseInterface
+    {
+        $centrosCostos = $centroCostoRepository->fetchAll();
+        $inmobiliarias = $inmobiliariaRepository->fetchAllActive('razon');
+        return $view->render($response, 'contabilidad.centros_costos.asignar', compact('centrosCostos', 'inmobiliarias'));
+    }
+}
--- a/app/src/Controller/Inmobiliarias.php
+++ b/app/src/Controller/Inmobiliarias.php
@ -20,8 +20,8 @@ class Inmobiliarias
        $inmobiliarias = [];
        try {
            $inmobiliarias = array_map(function($row) use ($inmobiliariaRepository) {
-                return $inmobiliariaRepository->load((array) $row);
-            }, $this->fetchRedis($redisService, $redisKey));
+                return $inmobiliariaRepository->load($row);
+            }, $this->fetchRedis($redisService, $redisKey, true));
        } catch (EmptyRedis) {
            try {
                $inmobiliarias = $inmobiliariaRepository->fetchAll();
--- a/app/src/Controller/Login.php
+++ b/app/src/Controller/Login.php
@ -1,14 +1,16 @@
 <?php
 namespace Incoviba\Controller;

+use Incoviba\Common\Implement\Exception\EmptyResult;
 use PDOException;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Incoviba\Common\Alias\View;
+use Incoviba\Common\Ideal\Controller;
 use Incoviba\Repository;
 use Incoviba\Service;

-class Login
+class Login extends Controller
 {
    public function form(ServerRequestInterface $request, ResponseInterface $response, View $view, Service\Login $service): ResponseInterface
    {
@ -20,14 +22,17 @@ class Login
    public function login(ServerRequestInterface $request, ResponseInterface $response, Repository\User $userRepository, Service\Login $service): ResponseInterface
    {
        $body = $request->getParsedBody();
-        $user = $userRepository->fetchByName($body['name']);
        $output = [
-            'name' => $user->name,
+            'name' => $body['name'],
            'login' => false
        ];
-        if ($user->validate($body['password'])) {
-            $output['login'] = $service->login($user);
-        }
+
+        try {
+            $user = $userRepository->fetchByName($body['name']);
+            if ($service->validateUser($user, $body['password'])) {
+                $output['login'] = $service->login($user);
+            }
+        } catch (EmptyResult) {}
        $response->getBody()->write(json_encode($output));
        return $response->withHeader('Content-Type', 'application/json');
    }
--- a/app/src/Controller/Ventas.php
+++ b/app/src/Controller/Ventas.php
@ -1,14 +1,14 @@
 <?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;
 use Incoviba\Common\Implement\Exception\EmptyRedis;
+use Incoviba\Common\Implement\Exception\EmptyResult;
 use Incoviba\Model;
 use Incoviba\Repository;
 use Incoviba\Service;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;

 class Ventas
 {
@ -101,14 +101,29 @@ class Ventas
                           View $view, int $venta_id): ResponseInterface
    {
        $venta = $ventaService->getById($venta_id);
-        return $view->render($response, 'ventas.pies.cuotas', compact('venta'));
+        $asociadas = [];
+        if (isset($venta->formaPago()->pie->asociado)) {
+            $asociadas []= $ventaService->getByPie($venta->formaPago()->pie->asociado->id);
+            foreach ($venta->formaPago()->pie->asociado->asociados() as $asociado) {
+                if ($venta->formaPago()->pie->id === $asociado->id) {
+                    continue;
+                }
+                $asociadas []= $ventaService->getByPie($asociado->id);
+            }
+        }
+        if (count($venta->formaPago()->pie->asociados()) > 0) {
+            foreach ($venta->formaPago()->pie->asociados() as $asociado) {
+                $asociadas []= $ventaService->getByPie($asociado->id);
+            }
+        }
+        return $view->render($response, 'ventas.pies.cuotas', compact('venta', 'asociadas'));
    }
-    public function escriturar(ServerRequestInterface $request, ResponseInterface $response, Service\Venta $ventaService,
-                               Repository\Banco $bancoRepository, View $view, int $venta_id): ResponseInterface
+    public function escriturar(ServerRequestInterface        $request, ResponseInterface $response, Service\Venta $ventaService,
+                               Repository\Contabilidad\Banco $bancoRepository, View $view, int $venta_id): ResponseInterface
    {
        $venta = $ventaService->getById($venta_id);
        $bancos = $bancoRepository->fetchAll();
-        usort($bancos, function(Model\Banco $a, Model\Banco $b) {
+        usort($bancos, function(Model\Contabilidad\Banco $a, Model\Contabilidad\Banco $b) {
            return strcmp($a->nombre, $b->nombre);
        });
        return $view->render($response, 'ventas.escriturar', compact('venta', 'bancos'));
--- a/app/src/Controller/Ventas/Creditos.php
+++ b/app/src/Controller/Ventas/Creditos.php
@ -1,19 +1,20 @@
 <?php
 namespace Incoviba\Controller\Ventas;

-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
 use Incoviba\Common\Alias\View;
 use Incoviba\Common\Ideal\Controller;
 use Incoviba\Repository;
+use Incoviba\Service;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;

 class Creditos extends Controller
 {
    public function show(ServerRequestInterface $request, ResponseInterface $response, View $view,
-                         Repository\Venta $ventaRepository, Repository\Banco $bancoRepository,
-                         int $venta_id): ResponseInterface
+                         Service\Venta          $ventaService, Repository\Contabilidad\Banco $bancoRepository,
+                         int                    $venta_id): ResponseInterface
    {
-        $venta = $ventaRepository->fetchById($venta_id);
+        $venta = $ventaService->getById($venta_id);
        $bancos = $bancoRepository->fetchAll('nombre');
        return $view->render($response, 'ventas.creditos', compact('venta', 'bancos'));
    }
--- a/app/src/Controller/Ventas/Cuotas.php
+++ b/app/src/Controller/Ventas/Cuotas.php
@ -2,13 +2,13 @@
 namespace Incoviba\Controller\Ventas;

 use DateTimeImmutable;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Incoviba\Common\Implement\Exception\EmptyResult;
 use Incoviba\Common\Alias\View;
+use Incoviba\Common\Implement\Exception\EmptyResult;
+use Incoviba\Model;
 use Incoviba\Repository;
 use Incoviba\Service;
-use Incoviba\Model;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;

 class Cuotas
 {
@ -73,12 +73,12 @@ class Cuotas
        $response->getBody()->write(json_encode($output));
        return $response->withHeader('Content-Type', 'application/json');
    }
-    public function add(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\Pie $pieService, Repository\Venta $ventaRepository, Repository\Banco $bancoRepository, View $view, int $pie_id): ResponseInterface
+    public function add(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\Pie $pieService, Repository\Venta $ventaRepository, Repository\Contabilidad\Banco $bancoRepository, View $view, int $pie_id): ResponseInterface
    {
        $pie = $pieService->getById($pie_id);
        $venta = $ventaRepository->fetchByPie($pie_id);
        $bancos = $bancoRepository->fetchAll();
-        usort($bancos, function(Model\Banco $a, Model\Banco $b) {
+        usort($bancos, function(Model\Contabilidad\Banco $a, Model\Contabilidad\Banco $b) {
            return strcmp($a->nombre, $b->nombre);
        });
        return $view->render($response, 'ventas.pies.cuotas.add', compact('pie', 'venta', 'bancos'));
--- a/app/src/Controller/Ventas/Escrituras.php
+++ b/app/src/Controller/Ventas/Escrituras.php
@ -1,11 +1,11 @@
 <?php
 namespace Incoviba\Controller\Ventas;

-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
 use Incoviba\Common\Alias\View;
 use Incoviba\Repository;
 use Incoviba\Service;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;

 class Escrituras
 {
@ -22,8 +22,8 @@ class Escrituras
        return $view->render($response, 'ventas.escrituras.informe', compact('venta'));
    }
    public function add(ServerRequestInterface $request, ResponseInterface $response, View $view,
-                        Service\Venta $ventaService, Repository\Banco $bancoRepository,
-                        int $venta_id): ResponseInterface
+                        Service\Venta          $ventaService, Repository\Contabilidad\Banco $bancoRepository,
+                        int                    $venta_id): ResponseInterface
    {
        $venta = $ventaService->getById($venta_id);
        $bancos = $bancoRepository->fetchAll('nombre');
--- a/app/src/Controller/Ventas/Pies.php
+++ b/app/src/Controller/Ventas/Pies.php
@ -1,23 +1,25 @@
 <?php
 namespace Incoviba\Controller\Ventas;

+use Incoviba\Common\Alias\View;
+use Incoviba\Model;
+use Incoviba\Repository;
+use Incoviba\Service;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Incoviba\Common\Alias\View;
-use Incoviba\Service;
-use Incoviba\Repository;
-use Incoviba\Model;

 class Pies
 {
-    public function cuotas(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\Pie $pieService, Repository\Venta $ventaRepository, Repository\Banco $bancoRepository, View $view, int $pie_id): ResponseInterface
+    public function cuotas(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\Pie $pieService,
+                           Repository\Venta $ventaRepository, Repository\Contabilidad\Banco $bancoRepository,
+                           View $view, int $pie_id): ResponseInterface
    {
        $pie = $pieService->getById($pie_id);
        $venta = $ventaRepository->fetchByPie($pie_id);
        $bancos = $bancoRepository->fetchAll();
-        usort($bancos, function(Model\Banco $a, Model\Banco $b) {
+        usort($bancos, function(Model\Contabilidad\Banco $a, Model\Contabilidad\Banco $b) {
            return strcmp($a->nombre, $b->nombre);
        });
-        return $view->render($response, 'ventas.pies.cuotas', compact('pie', 'venta', 'bancos'));
+        return $view->render($response, 'ventas.pies.cuotas', compact('pie', 'venta', 'bancos', 'ventaRepository'));
    }
 }
--- a/app/src/Controller/withRedis.php
+++ b/app/src/Controller/withRedis.php
@ -6,13 +6,13 @@ use Incoviba\Service;

 trait withRedis
 {
-    public function fetchRedis(Service\Redis $redisService, string $redisKey): mixed
+    public function fetchRedis(Service\Redis $redisService, string $redisKey, ?bool $asArray = null): mixed
    {
        $jsonString = $redisService->get($redisKey);
        if ($jsonString === null) {
            throw new EmptyRedis($redisKey);
        }
-        return json_decode($jsonString);
+        return json_decode($jsonString, $asArray);
    }
    public function saveRedis(Service\Redis $redisService, string $redisKey, mixed $value, ?int $expiration = null): void
    {
--- a/app/src/Middleware/API.php
+++ b/app/src/Middleware/API.php
@ -6,10 +6,12 @@ use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 use Incoviba\Exception\MissingAuthorizationHeader;
+use Incoviba\Service;

 class API
 {
-    public function __construct(protected ResponseFactoryInterface $responseFactory, protected string $key) {}
+    public function __construct(protected ResponseFactoryInterface $responseFactory, protected Service\Login $loginService,
+                                protected string $key) {}

    public function __invoke(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
    {
@ -18,7 +20,7 @@ class API
        } catch (MissingAuthorizationHeader $exception) {
            return $this->responseFactory->createResponse(401);
        }
-        if ($this->validate($key)) {
+        if ($this->validate($request, $key)) {
            return $handler->handle($request);
        }
        return $this->responseFactory->createResponse(403);
@ -33,8 +35,26 @@ class API
        }
        throw new MissingAuthorizationHeader();
    }
-    protected function validate($incoming_key): bool
+    protected function validate(ServerRequestInterface $request, $incoming_key): bool
    {
+        if (str_contains($incoming_key, $this->loginService->getSeparator())) {
+            list($incoming_key, $selector, $token) = explode($this->loginService->getSeparator(), $incoming_key);
+            if (!$this->loginService->isIn()) {
+                return false;
+            }
+        }
+        if (!$this->loginService->isIn() and !$this->validPermitted($request)) {
+            return false;
+        }
        return $incoming_key === md5($this->key);
    }
+    protected function validPermitted(ServerRequestInterface $request): bool
+    {
+        $uri = $request->getUri();
+        $validPaths = [
+            '/api',
+            '/api/'
+        ];
+        return in_array($uri->getPath(), $validPaths);
+    }
 }
--- a/app/src/Middleware/Authentication.php
+++ b/app/src/Middleware/Authentication.php
@ -45,13 +45,22 @@ class Authentication
        ]);

        $valid_paths = [
-            '/',
+            '/'
        ];
        if (in_array($current_path, $valid_paths, true)) {
            return true;
        }
+        $valid_subpaths = [
+            '/api/'
+        ];
+        foreach ($valid_subpaths as $path) {
+            if (str_starts_with($current_path, $path)) {
+                return true;
+            }
+        }
        $valid_uris = [
            $this->login_url,
+            "{$this->login_url}/",
        ];
        if (in_array($current_url, $valid_uris, true)) {
            return true;
--- a/app/src/Middleware/CORS.php
+++ b/app/src/Middleware/CORS.php
@ -0,0 +1,21 @@
+<?php
+namespace Incoviba\Middleware;
+
+use Psr\Http\Message\ResponseFactoryInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+
+class CORS
+{
+    public function __construct(protected ResponseFactoryInterface $responseFactory) {}
+    public function __invoke(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
+    {
+        if ($request->getMethod() === 'OPTIONS') {
+            return $this->responseFactory->createResponse()
+                ->withHeader('Access-Control-Allow-Origin', '*')
+                ->withHeader('Access-Control-Allow-Methods', 'POST,GET,OPTIONS');
+        }
+        return $handler->handle($request);
+    }
+}
--- a/app/src/Middleware/Errors.php
+++ b/app/src/Middleware/Errors.php
@ -18,7 +18,7 @@ class Errors
        try {
            return $handler->handle($request);
        } catch (Exception $exception) {
-            $this->logger->notice($exception);
+            $this->logger->warning($exception);
        } catch (Error $error) {
            $this->logger->error($error);
        }
--- a/app/src/Model/CategoriaCentro.php
+++ b/app/src/Model/CategoriaCentro.php
@ -1,5 +0,0 @@
-<?php
-namespace Incoviba\Model;
-
-class CategoriaCentro extends Tipo
-{}
--- a/app/src/Model/Contabilidad/Banco.php
+++ b/app/src/Model/Contabilidad/Banco.php
@ -1,5 +1,5 @@
 <?php
-namespace Incoviba\Model;
+namespace Incoviba\Model\Contabilidad;

 use Incoviba\Common\Ideal\Model;

--- a/app/src/Model/Contabilidad/Cartola.php
+++ b/app/src/Model/Contabilidad/Cartola.php
@ -1,8 +1,9 @@
 <?php
-namespace Incoviba\Model;
+namespace Incoviba\Model\Contabilidad;

 use DateTimeInterface;
 use Incoviba\Common\Ideal;
+use Incoviba\Model\Inmobiliaria;

 class Cartola extends Ideal\Model
 {
--- a/app/src/Model/Contabilidad/CategoriaCentro.php
+++ b/app/src/Model/Contabilidad/CategoriaCentro.php
@ -0,0 +1,7 @@
+<?php
+namespace Incoviba\Model\Contabilidad;
+
+use Incoviba\Model\Tipo;
+
+class CategoriaCentro extends Tipo
+{}
--- a/app/src/Model/Contabilidad/CentroCosto.php
+++ b/app/src/Model/Contabilidad/CentroCosto.php
@ -1,7 +1,8 @@
 <?php
-namespace Incoviba\Model;
+namespace Incoviba\Model\Contabilidad;

 use Incoviba\Common\Ideal;
+use Incoviba\Model\TipoCuenta;

 class CentroCosto extends Ideal\Model
 {
--- a/app/src/Model/Contabilidad/Deposito.php
+++ b/app/src/Model/Contabilidad/Deposito.php
@ -1,8 +1,9 @@
 <?php
-namespace Incoviba\Model;
+namespace Incoviba\Model\Contabilidad;

 use DateTimeInterface;
 use Incoviba\Common\Ideal;
+use Incoviba\Model\Inmobiliaria;

 class Deposito extends Ideal\Model
 {
--- a/app/src/Model/Contabilidad/Movimiento.php
+++ b/app/src/Model/Contabilidad/Movimiento.php
@ -1,8 +1,10 @@
 <?php
-namespace Incoviba\Model;
+namespace Incoviba\Model\Contabilidad;

 use DateTimeInterface;
 use Incoviba\Common\Ideal;
+use Incoviba\Common\Implement\Exception\EmptyResult;
+use Incoviba\Model\Inmobiliaria;
 use Incoviba\Model\Movimiento\Detalle;

 class Movimiento extends Ideal\Model
@ -19,7 +21,11 @@ class Movimiento extends Ideal\Model
    public function getDetalles(): ?Detalle
    {
        if (!isset($this->detalles)) {
-            $this->detalles = $this->runFactory('detalles');
+            try {
+                $this->detalles = $this->runFactory('detalles');
+            } catch (EmptyResult) {
+                $this->detalles = null;
+            }
        }
        return $this->detalles;
    }
--- a/app/src/Model/Contabilidad/Nubox.php
+++ b/app/src/Model/Contabilidad/Nubox.php
@ -1,8 +1,8 @@
 <?php
-namespace Incoviba\Model;
+namespace Incoviba\Model\Contabilidad;

-use Incoviba\Common\Define;
 use Incoviba\Common\Ideal;
+use Incoviba\Model\Inmobiliaria;

 class Nubox extends Ideal\Model
 {
--- a/app/src/Model/Contabilidad/PagoCentroCosto.php
+++ b/app/src/Model/Contabilidad/PagoCentroCosto.php
@ -1,7 +1,8 @@
 <?php
-namespace Incoviba\Model;
+namespace Incoviba\Model\Contabilidad;

 use Incoviba\Common\Ideal;
+use Incoviba\Model\Venta;

 class PagoCentroCosto extends Ideal\Model
 {
--- a/app/src/Model/Contabilidad/TipoCentro.php
+++ b/app/src/Model/Contabilidad/TipoCentro.php
@ -0,0 +1,7 @@
+<?php
+namespace Incoviba\Model\Contabilidad;
+
+use Incoviba\Model\Tipo;
+
+class TipoCentro extends Tipo
+{}
--- a/app/src/Model/Inmobiliaria.php
+++ b/app/src/Model/Inmobiliaria.php
@ -10,8 +10,6 @@ class Inmobiliaria extends Model
    public ?string $dv;
    public ?string $razon;
    public ?string $abreviacion;
-    public ?string $cuenta;
-    public ?Banco $banco;
    public ?TipoSociedad $tipoSociedad;

    public function rut(): string
@ -37,8 +35,6 @@ class Inmobiliaria extends Model
            'rut_formateado' => $this->rut(),
            'razon' => $this->razon ?? '',
            'abreviacion' => $this->abreviacion ?? '',
-            'cuenta' => $this->cuenta ?? '',
-            'banco' => $this->banco ?? '',
            'tipo_sociedad' => $this->tipoSociedad ?? ''
        ];
    }
--- a/app/src/Model/Inmobiliaria/Cuenta.php
+++ b/app/src/Model/Inmobiliaria/Cuenta.php
@ -2,14 +2,39 @@
 namespace Incoviba\Model\Inmobiliaria;

 use Incoviba\Common\Ideal;
+use Incoviba\Common\Implement\Exception\EmptyResult;
 use Incoviba\Model;

 class Cuenta extends Ideal\Model
 {
    public Model\Inmobiliaria $inmobiliaria;
-    public Model\Banco $banco;
+    public Model\Contabilidad\Banco $banco;
    public string $cuenta;

+    protected array $estados;
+    public function getEstados(): array
+    {
+        if (!isset($this->estados)) {
+            $this->estados = $this->runFactory('estados');
+        }
+        return $this->estados;
+    }
+    protected Model\Inmobiliaria\Cuenta\Estado $currentEstado;
+    public function currentEstado(): Model\Inmobiliaria\Cuenta\Estado
+    {
+        if (!isset($this->currentEstado)) {
+            $estados = $this->getEstados();
+            if (count($estados) === 0) {
+                throw new EmptyResult('Current Estado Cuenta');
+            }
+            usort($estados, function(Model\Inmobiliaria\Cuenta\Estado $a, Model\Inmobiliaria\Cuenta\Estado $b) {
+                return $a->id - $b->id;
+            });
+            $this->currentEstado = end($estados);
+        }
+        return $this->currentEstado;
+    }
+
    public function jsonSerialize(): mixed
    {
        return array_merge(parent::jsonSerialize(), [
--- a/app/src/Model/Inmobiliaria/Cuenta/Estado.php
+++ b/app/src/Model/Inmobiliaria/Cuenta/Estado.php
@ -0,0 +1,22 @@
+<?php
+namespace Incoviba\Model\Inmobiliaria\Cuenta;
+
+use DateTimeInterface;
+use Incoviba\Common\Ideal;
+use Incoviba\Model;
+
+class Estado extends Ideal\Model
+{
+    public Model\Inmobiliaria\Cuenta $cuenta;
+    public DateTimeInterface $fecha;
+    public bool $active;
+
+    public function jsonSerialize(): mixed
+    {
+        return array_merge(parent::jsonSerialize(), [
+            'cuenta_id' => $this->cuenta->id,
+            'fecha' => $this->fecha->format('Y-m-d'),
+            'active' => $this->active
+        ]);
+    }
+}
--- a/app/src/Model/Movimiento/Detalle.php
+++ b/app/src/Model/Movimiento/Detalle.php
@ -6,8 +6,8 @@ use Incoviba\Model;

 class Detalle extends Ideal\Model
 {
-    public Model\Movimiento $movimiento;
-    public ?Model\CentroCosto $centroCosto;
+    public Model\Contabilidad\Movimiento $movimiento;
+    public ?Model\Contabilidad\CentroCosto $centroCosto;
    public ?string $detalle;

    public function jsonSerialize(): mixed
--- a/app/src/Model/TipoCentro.php
+++ b/app/src/Model/TipoCentro.php
@ -1,5 +0,0 @@
-<?php
-namespace Incoviba\Model;
-
-class TipoCentro extends Tipo
-{}
--- a/app/src/Model/Venta.php
+++ b/app/src/Model/Venta.php
@ -3,9 +3,6 @@ namespace Incoviba\Model;

 use DateTimeInterface;
 use Incoviba\Common\Ideal;
-use Incoviba\Controller\Ventas;
-use Incoviba\Model\Venta\FormaPago;
-use Incoviba\Model\Venta\Pago;

 class Venta extends Ideal\Model
 {
@ -18,7 +15,7 @@ class Venta extends Ideal\Model
    public bool $relacionado;
    protected ?Venta\Entrega $entrega;
    public float $uf;
-    protected ?Pago $resciliacion;
+    protected ?Venta\Pago $resciliacion;

    public ?array $estados;
    public ?Venta\EstadoVenta $currentEstado;
@ -44,6 +41,11 @@ class Venta extends Ideal\Model
        }
        return $this->formaPago;
    }
+    public function setFormaPago(Venta\FormaPago $formaPago): Venta
+    {
+        $this->formaPago = $formaPago;
+        return $this;
+    }
    public function entrega(): ?Venta\Entrega
    {
        if (!isset($this->entrega)) {
@ -94,9 +96,9 @@ class Venta extends Ideal\Model
        }
        return $this->valor_util;
    }
-    public function saldo(string $moneda = Pago::UF): float
+    public function saldo(string $moneda = Venta\Pago::UF): float
    {
-        $valor = $this->valor * (($moneda === Pago::UF) ? 1 : $this->uf);
+        $valor = $this->valor * (($moneda === Venta\Pago::UF) ? 1 : $this->uf);
        return $valor - $this->formaPago()->total($moneda);
    }

--- a/app/src/Model/Venta/Cuota.php
+++ b/app/src/Model/Venta/Cuota.php
@ -3,7 +3,7 @@ namespace Incoviba\Model\Venta;

 use DateTimeInterface;
 use Incoviba\Common\Ideal\Model;
-use Incoviba\Model\Banco;
+use Incoviba\Model\Contabilidad\Banco;

 class Cuota extends Model
 {
--- a/app/src/Model/Venta/Pago.php
+++ b/app/src/Model/Venta/Pago.php
@ -3,7 +3,7 @@ namespace Incoviba\Model\Venta;

 use DateTimeInterface;
 use Incoviba\Common\Ideal\Model;
-use Incoviba\Model\Banco;
+use Incoviba\Model\Contabilidad\Banco;

 class Pago extends Model
 {
@ -28,10 +28,27 @@ class Pago extends Model
        return $this->valor / (($moneda === Pago::UF) ? $uf : 1);
    }

+    public function estado(?string $tipoEstado = null): ?EstadoPago
+    {
+        if (!isset($this->estados)) {
+            return null;
+        }
+        if ($tipoEstado === null) {
+            return $this->currentEstado;
+        }
+        foreach ($this->estados as $estado) {
+            if ($estado->tipoEstado->descripcion === $tipoEstado) {
+                return $estado;
+            }
+        }
+        return null;
+    }
+
    public function jsonSerialize(): mixed
    {
        return array_merge(parent::jsonSerialize(), [
            'valor' => $this->valor,
+            'valor_uf' => $this->valor(),
            'banco' => $this->banco ?? '',
            'tipo_pago' => $this->tipoPago ?? '',
            'identificador' => $this->identificador ?? '',
--- a/app/src/Model/Venta/Propiedad.php
+++ b/app/src/Model/Venta/Propiedad.php
@ -6,8 +6,7 @@ use Incoviba\Model;

 class Propiedad extends Ideal\Model
 {
-    public array $unidades;
-
+    public array $unidades = [];
    protected array $departamentos;
    public function departamentos(): array
    {
--- a/app/src/Repository/Contabilidad/Banco.php
+++ b/app/src/Repository/Contabilidad/Banco.php
@ -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
    {
--- a/app/src/Repository/Contabilidad/Cartola.php
+++ b/app/src/Repository/Contabilidad/Cartola.php
@ -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,4 +65,14 @@ 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\Contabilidad\Cartola
+    {
+        $query = $this->connection->getQueryBuilder()
+            ->select()
+            ->from($this->getTable())
+            ->where('cuenta_id = ? AND fecha <= ?')
+            ->order('fecha DESC')
+            ->limit(1);
+        return $this->fetchOne($query, [$cuenta_id, $fecha->format('Y-m-d')]);
+    }
 }
--- a/app/src/Repository/Contabilidad/CategoriaCentro.php
+++ b/app/src/Repository/Contabilidad/CategoriaCentro.php
@ -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();
    }
 }
--- a/app/src/Repository/Contabilidad/CentroCosto.php
+++ b/app/src/Repository/Contabilidad/CentroCosto.php
@ -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()
--- a/app/src/Repository/Contabilidad/Deposito.php
+++ b/app/src/Repository/Contabilidad/Deposito.php
@ -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);
    }
--- a/app/src/Repository/Contabilidad/Movimiento.php
+++ b/app/src/Repository/Contabilidad/Movimiento.php
@ -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()
--- a/app/src/Repository/Contabilidad/Nubox.php
+++ b/app/src/Repository/Contabilidad/Nubox.php
@ -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()
--- a/app/src/Repository/Contabilidad/PagoCentroCosto.php
+++ b/app/src/Repository/Contabilidad/PagoCentroCosto.php
@ -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);
    }
--- a/app/src/Repository/Contabilidad/TipoCentro.php
+++ b/app/src/Repository/Contabilidad/TipoCentro.php
@ -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();
    }
 }
--- a/app/src/Repository/Inmobiliaria.php
+++ b/app/src/Repository/Inmobiliaria.php
@ -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');
@ -20,13 +20,9 @@ class Inmobiliaria extends Ideal\Repository
        return 'rut';
    }

-    public function create(?array $data = null): Define\Model
+    public function create(?array $data = null): Model\Inmobiliaria
    {
-        $map = (new Implement\Repository\MapperParser(['dv', 'razon', 'abreviacion', 'cuenta']))
-            ->register('banco', (new Implement\Repository\Mapper())
-                ->setFunction(function($data) {
-                    return $this->bancoRepository->fetchById($data['banco']);
-                }))
+        $map = (new Implement\Repository\MapperParser(['dv', 'razon', 'abreviacion']))
            ->register('sociedad', (new Implement\Repository\Mapper())
                ->setProperty('tipoSociedad')
                ->setFunction(function($data) {
@ -34,7 +30,7 @@ class Inmobiliaria extends Ideal\Repository
                }));
        return $this->parseData(new Model\Inmobiliaria(), $data, $map);
    }
-    public function save(Define\Model $model): Define\Model
+    public function save(Define\Model $model): Model\Inmobiliaria
    {
        $model->rut = $this->saveNew(
            ['dv', 'razon', 'abreviacion', 'cuenta', 'banco', 'sociedad'],
@ -42,7 +38,7 @@ class Inmobiliaria extends Ideal\Repository
        );
        return $model;
    }
-    public function edit(Define\Model $model, array $new_data): Define\Model
+    public function edit(Define\Model $model, array $new_data): Model\Inmobiliaria
    {
        return $this->update($model, ['dv', 'razon', 'abreviacion', 'cuenta', 'banco', 'sociedad'], $new_data);
    }
--- a/app/src/Repository/Inmobiliaria/Cuenta.php
+++ b/app/src/Repository/Inmobiliaria/Cuenta.php
@ -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');
--- a/app/src/Repository/Inmobiliaria/Cuenta/Estado.php
+++ b/app/src/Repository/Inmobiliaria/Cuenta/Estado.php
@ -0,0 +1,62 @@
+<?php
+namespace Incoviba\Repository\Inmobiliaria\Cuenta;
+
+use Incoviba\Common\Define;
+use Incoviba\Common\Ideal;
+use Incoviba\Common\Implement;
+use Incoviba\Repository;
+use Incoviba\Model;
+
+class Estado extends Ideal\Repository
+{
+    public function __construct(Define\Connection $connection, protected Repository\Inmobiliaria\Cuenta $cuentaRepository)
+    {
+        parent::__construct($connection);
+        $this->setTable('estados_cuentas');
+    }
+
+    public function create(?array $data = null): Model\Inmobiliaria\Cuenta\Estado
+    {
+        $map = (new Implement\Repository\MapperParser())
+            ->register('cuenta_id', (new Implement\Repository\Mapper())
+                ->setProperty('cuenta')
+                ->setFunction(function($data) {
+                    return $this->cuentaRepository->fetchById($data['cuenta_id']);
+                }))
+            ->register('fecha', new Implement\Repository\Mapper\DateTime('fecha'))
+            ->register('active', new Implement\Repository\Mapper\Boolean('active'));
+        return $this->parseData(new Model\Inmobiliaria\Cuenta\Estado(), $data, $map);
+    }
+    public function save(Define\Model $model): Model\Inmobiliaria\Cuenta\Estado
+    {
+        $model->id = $this->saveNew([
+            'cuenta_id', 'fecha', 'active'
+        ], [
+            $model->cuenta->id, $model->fecha->format('Y-m-d'), $model->active ? 1 : 0
+        ]);
+        return $model;
+    }
+    public function edit(Define\Model $model, array $new_data): Model\Inmobiliaria\Cuenta\Estado
+    {
+        return $this->update($model, ['cuenta_id', 'fecha', 'active'], $new_data);
+    }
+
+    public function fetchByCuenta(int $cuenta_id): array
+    {
+        $query = $this->connection->getQueryBuilder()
+            ->select()
+            ->from($this->getTable())
+            ->where('cuenta_id = ?');
+        return $this->fetchMany($query, [$cuenta_id]);
+    }
+    public function fetchLastByCuenta(int $cuenta_id): Model\Inmobiliaria\Cuenta\Estado
+    {
+        $query = $this->connection->getQueryBuilder()
+            ->select()
+            ->from($this->getTable())
+            ->where('cuenta_id = ?')
+            ->order('id DESC')
+            ->limit(1);
+        return $this->fetchMany($query, [$cuenta_id]);
+    }
+}
--- a/app/src/Repository/Login.php
+++ b/app/src/Repository/Login.php
@ -16,7 +16,7 @@ class Login extends Ideal\Repository
    }


-    public function create(?array $data = null): Define\Model
+    public function create(?array $data = null): Model\Login
    {
        $map = (new Implement\Repository\MapperParser(['selector', 'token']))
            ->register('user_id', (new Implement\Repository\Mapper())
@ -29,7 +29,7 @@ class Login extends Ideal\Repository
        return $this->parseData(new Model\Login(), $data, $map);
    }

-    public function save(Define\Model $model): Define\Model
+    public function save(Define\Model $model): Model\Login
    {
        $model->id = $this->saveNew(
            ['user_id', 'selector', 'token', 'time', 'status'],
@ -37,29 +37,41 @@ class Login extends Ideal\Repository
        return $model;
    }

-    public function edit(Define\Model $model, array $new_data): Define\Model
+    public function edit(Define\Model $model, array $new_data): Model\Login
    {
        return $this->update($model, ['user_id', 'selector', 'token', 'time', 'status'], $new_data);
    }

    public function fetchByUser(int $user_id): array
    {
-        $query = "SELECT * FROM `{$this->getTable()}` WHERE `user_id` = ?";
+        $query = $this->connection->getQueryBuilder()
+            ->select()
+            ->from($this->getTable())
+            ->where('user_id = ?');
        return $this->fetchMany($query, [$user_id]);
    }
    public function fetchActiveByUser(int $user_id): Model\Login
    {
-        $query = "SELECT * FROM `{$this->getTable()}` WHERE `user_id` = ? AND `status` = 1";
+        $query = $this->connection->getQueryBuilder()
+            ->select()
+            ->from($this->getTable())
+            ->where('user_id = ? AND `status` = 1');
        return $this->fetchOne($query, [$user_id]);
    }
    public function fetchBySelectorAndToken(string $selector, string $token): Model\Login
    {
-        $query = "SELECT * FROM `{$this->getTable()}` WHERE `selector` = ? AND `token` = ?";
+        $query = $this->connection->getQueryBuilder()
+            ->select()
+            ->from($this->getTable())
+            ->where('selector = ? AND token = ?');
        return $this->fetchOne($query, [$selector, $token]);
    }
    public function fetchActiveBySelector(string $selector): Model\Login
    {
-        $query = "SELECT * FROM `{$this->getTable()}` WHERE `selector` = ? AND `status` = 1";
+        $query = $this->connection->getQueryBuilder()
+            ->select()
+            ->from($this->getTable())
+            ->where('selector = ? AND `status` = 1');
        return $this->fetchOne($query, [$selector]);
    }
 }
--- a/app/src/Repository/Movimiento/Detalle.php
+++ b/app/src/Repository/Movimiento/Detalle.php
@ -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');
--- a/app/src/Repository/Venta.php
+++ b/app/src/Repository/Venta.php
@ -132,9 +132,9 @@ class Venta extends Ideal\Repository
            ['propietario', 'propiedad', 'pie', 'bono_pie', 'credito', 'escritura', 'subsidio', 'escriturado',
                'entrega', 'entregado', 'fecha', 'valor_uf', 'estado', 'fecha_ingreso', 'avalchile', 'agente', 'uf',
                'relacionado', 'promocion', 'resciliacion', 'devolucion'],
-            [$model->propietario()->rut, $model->propiedad()->id, $model->formaPago()->pie?->id, $model->formaPago()->bonoPie?->id,
-                $model->formaPago()->credito?->id, $model->formaPago()->escritura?->id, $model->formaPago()->subsidio?->id,
-                $model->formaPago()->escritura !== null ? $model->formaPago()->escritura->pago->fecha->format('Y-m-d') : null,
+            [$model->propietario()->rut, $model->propiedad()->id, $model->formaPago()?->pie?->id, $model->formaPago()?->bonoPie?->id,
+                $model->formaPago()?->credito?->id, $model->formaPago()?->escritura?->id, $model->formaPago()?->subsidio?->id,
+                $model->formaPago()?->escritura !== null ? $model->formaPago()?->escritura->pago->fecha->format('Y-m-d') : null,
                null, null, $model->fecha->format('Y-m-d'), $model->valor, 1, $model->fechaIngreso->format('Y-m-d'),
                null, null, $model->uf, $model->relacionado ? 1 : 0, null, null, null]
        );
--- a/app/src/Repository/Venta/Cuota.php
+++ b/app/src/Repository/Venta/Cuota.php
@ -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);
--- a/app/src/Repository/Venta/Pago.php
+++ b/app/src/Repository/Venta/Pago.php
@ -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);
--- a/app/src/Repository/Venta/Propiedad.php
+++ b/app/src/Repository/Venta/Propiedad.php
@ -18,22 +18,23 @@ class Propiedad extends Ideal\Repository
    public function create(?array $data = null): Model\Venta\Propiedad
    {
        $map = (new Implement\Repository\MapperParser())
-            ->register('unidad_principal', (new Implement\Repository\Mapper())
-                ->setProperty('unidades')
-                ->setFunction(function($data) {
-                    if (isset($data['id'])) {
-                        return $this->unidadService->getByPropiedad($data['id']);
-                    }
-                    return [$this->unidadService->getById($data['unidad_principal'])];
-                }))
            ->register('estado', new Implement\Repository\Mapper\Boolean('estado'));
        return $this->parseData(new Model\Venta\Propiedad(), $data, $map);
    }
+    public function load(array $data_row): Define\Model
+    {
+        $propiedad = parent::load($data_row);
+        if (isset($propiedad->id)) {
+            $propiedad->unidades = $this->unidadService->getByPropiedad($propiedad->id);
+        }
+        return $propiedad;
+    }
+
    public function save(Define\Model $model): Model\Venta\Propiedad
    {
        $model->id = $this->saveNew(
            ['unidad_principal', 'estacionamientos', 'bodegas', 'estado'],
-            [$model->departamentos()[0]->id,
+            [null,
                implode(',', array_map(function(Model\Venta\Unidad $unidad) {return $unidad->id;}, $model->estacionamientos())),
                implode(',', array_map(function(Model\Venta\Unidad $unidad) {return $unidad->id;}, $model->bodegas())),
                1]
--- a/app/src/Service/Contabilidad/Cartola.php
+++ b/app/src/Service/Contabilidad/Cartola.php
@ -1,28 +1,27 @@
 <?php
-namespace Incoviba\Service;
+namespace Incoviba\Service\Contabilidad;

-use DateTimeInterface;
 use DateTimeImmutable;
-use DateInterval;
-use Psr\Http\Message\StreamFactoryInterface;
-use Psr\Http\Message\UploadedFileInterface;
-use Psr\Log\LoggerInterface;
-use Incoviba\Common\Ideal\Service;
+use DateTimeInterface;
 use Incoviba\Common\Define\Cartola\Banco;
 use Incoviba\Common\Define\Contabilidad\Exporter;
+use Incoviba\Common\Ideal\Service;
 use Incoviba\Common\Implement\Exception;
 use Incoviba\Model;
 use Incoviba\Repository;
+use Psr\Http\Message\StreamFactoryInterface;
+use Psr\Http\Message\UploadedFileInterface;
+use Psr\Log\LoggerInterface;

 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 Movimiento $movimientoService,
-                                protected Repository\Cartola $cartolaRepository) {
+    public function __construct(LoggerInterface                              $logger,
+                                protected StreamFactoryInterface             $streamFactory, protected Exporter $exporter,
+                                protected Repository\Inmobiliaria            $inmobiliariaRepository,
+                                protected Repository\Inmobiliaria\Cuenta     $cuentaRepository,
+                                protected Repository\Contabilidad\Movimiento $movimientoRepository,
+                                protected Movimiento                         $movimientoService,
+                                protected Repository\Contabilidad\Cartola    $cartolaRepository) {
        parent::__construct($logger);
    }

@ -32,11 +31,11 @@ class Cartola extends Service
        $this->bancos[$name] = $banco;
        return $this;
    }
-    public function process(Model\Inmobiliaria $inmobiliaria, Model\Banco $banco, DateTimeInterface $mes, UploadedFileInterface $file): array
+    public function process(Model\Inmobiliaria $inmobiliaria, Model\Contabilidad\Banco $banco, DateTimeInterface $mes, UploadedFileInterface $file): array
    {
        return $this->bancos[strtolower($banco->nombre)]->process($file);
    }
-    public function export(Model\Inmobiliaria $inmobiliaria, Model\Banco $banco, DateTimeInterface $mes, array $movimientos): string
+    public function export(Model\Inmobiliaria $inmobiliaria, Model\Contabilidad\Banco $banco, DateTimeInterface $mes, array $movimientos): string
    {
        return $this->exporter->export($inmobiliaria, $banco, $mes, $movimientos);
    }
@ -44,27 +43,29 @@ class Cartola extends Service
    {
        $ms = $this->getMovimientosDiarios($cuenta->banco, $file);

-        $cartolaData = [
-            'cargos' => 0,
-            'abonos' => 0,
-            'saldo' => 0
-        ];
+        $this->groupedMovimientos = [];
        $movimientos = [];
        foreach ($ms as $m) {
            $movimiento = $this->buildMovimiento($cuenta, $m);
            $movimiento = $this->movimientoService->process($movimiento);
-
+            $this->groupMovimientoByDay($movimiento);
            if ($movimiento->fecha->getTimestamp() === $fecha->getTimestamp()) {
                $movimientos []= $movimiento;
+            }
+        }
+        foreach ($this->groupedMovimientos as $timestamp => $movimientos) {
+            $cartolaData = [
+                'cargos' => 0,
+                'abonos' => 0,
+                'saldo' => end($movimientos)->saldo
+            ];
+            foreach ($movimientos as $movimiento) {
                $cartolaData['cargos'] += $movimiento->cargo;
                $cartolaData['abonos'] += $movimiento->abono;
            }
-            if ($movimiento->fecha->getTimestamp() > $fecha->getTimestamp()) {
-                continue;
-            }
-            $cartolaData['saldo'] = $movimiento->saldo;
+            $this->buildCartola($cuenta, end($movimientos)->fecha, $cartolaData);
        }
-        $cartola = $this->buildCartola($cuenta, $fecha, $cartolaData);
+        $cartola = $this->cartolaRepository->fetchByCuentaAndFecha($cuenta->id, $fecha);
        return compact('cartola', 'movimientos');
    }
    public function diariaManual(Model\Inmobiliaria\Cuenta $cuenta, DateTimeInterface $fecha, array $data): array
@ -91,12 +92,21 @@ class Cartola extends Service
        return compact('cartola', 'movimientos');
    }

-    protected function getMovimientosDiarios(Model\Banco $banco, UploadedFileInterface $file): array
+    protected function getMovimientosDiarios(Model\Contabilidad\Banco $banco, UploadedFileInterface $file): array
    {
        $movimientos = $this->bancos[strtolower($banco->nombre)]->process($file);
        return $this->bancos[strtolower($banco->nombre)]->processMovimientosDiarios($movimientos);
    }
-    protected function buildCartola(Model\Inmobiliaria\Cuenta $cuenta, DateTimeInterface $fecha, array $data): Model\Cartola
+    protected array $groupedMovimientos = [];
+    protected function groupMovimientoByDay(Model\Contabilidad\Movimiento $movimiento): Cartola
+    {
+        if (!isset($this->groupedMovimientos[$movimiento->fecha->getTimestamp()])) {
+            $this->groupedMovimientos[$movimiento->fecha->getTimestamp()] = [];
+        }
+        $this->groupedMovimientos[$movimiento->fecha->getTimestamp()] []= $movimiento;
+        return $this;
+    }
+    protected function buildCartola(Model\Inmobiliaria\Cuenta $cuenta, DateTimeInterface $fecha, array $data): Model\Contabilidad\Cartola
    {
        try {
            return $this->cartolaRepository->fetchByCuentaAndFecha($cuenta->id, $fecha);
@ -107,7 +117,7 @@ class Cartola extends Service
            return $this->cartolaRepository->save($cartola);
        }
    }
-    protected function buildMovimiento(Model\Inmobiliaria\Cuenta $cuenta, array $data): Model\Movimiento
+    protected function buildMovimiento(Model\Inmobiliaria\Cuenta $cuenta, array $data): Model\Contabilidad\Movimiento
    {
        try {
            return $this->movimientoRepository
@ -121,7 +131,12 @@ class Cartola extends Service
        } catch (Exception\EmptyResult $exception) {
            $data['cuenta_id'] = $cuenta->id;
            $movimiento = $this->movimientoRepository->create($data);
-            return $this->movimientoRepository->save($movimiento);
+            try {
+                return $this->movimientoRepository->save($movimiento);
+            } catch (\PDOException $exception) {
+                $this->logger->critical(var_export($data,true));
+                throw $exception;
+            }
        }
    }
 }
--- a/app/src/Service/Contabilidad/Cartola/BCI.php
+++ b/app/src/Service/Contabilidad/Cartola/BCI.php
@ -0,0 +1,86 @@
+<?php
+namespace Incoviba\Service\Contabilidad\Cartola;
+
+use Incoviba\Common\Ideal\Cartola\Banco;
+use PhpOffice\PhpSpreadsheet;
+use Psr\Http\Message\UploadedFileInterface;
+
+class BCI extends Banco
+{
+    protected function columnMap(): array
+    {
+        return [
+            'Fecha Transacción' => 'fecha',
+            'Cargo $ (-)' => 'cargo',
+            'Abono $ (+)' => 'abono',
+            'Descripción' => 'glosa',
+            'Saldo' => 'saldo'
+        ];
+    }
+    protected function getFilename(UploadedFileInterface $uploadedFile): string
+    {
+        return '/tmp/cartola.xlsx';
+    }
+    protected function parseFile(string $filename): array
+    {
+        $xlsx = @PhpSpreadsheet\IOFactory::load($filename);
+        $worksheet = $xlsx->getActiveSheet();
+        $rows = $worksheet->getRowIterator();
+
+        $rows->seek(3);
+        $row = $rows->current();
+        $columnIterator = $row->getColumnIterator();
+        $saldoFinal = 0;
+        foreach ($columnIterator as $column) {
+            if ($column->getValue() === null) {
+                continue;
+            }
+            if ($column->getCalculatedValue() === 'Saldo Contable') {
+                $columnIterator->next();
+                $column = $columnIterator->current();
+                $saldoFinal = (int) str_replace('.', '', $column->getCalculatedValue());
+                break;
+            }
+        }
+        $saldo = $saldoFinal;
+
+        $data = [];
+        $columns = [];
+        $dataFound = false;
+        foreach ($rows as $row) {
+            if (!$dataFound and $worksheet->getCell([1, $row->getRowIndex()])->getCalculatedValue() !== null
+                    and trim($worksheet->getCell([1, $row->getRowIndex()])->getCalculatedValue()) === 'Fecha Contable') {
+                $dataFound = true;
+                $columns = $this->getRowData($row);
+                continue;
+            }
+            if (!$dataFound) {
+                continue;
+            }
+            if ($worksheet->getCell([1, $row->getRowIndex()])->getValue() === null) {
+                break;
+            }
+            $rowData = $this->getRowData($row);
+            $rowData = array_combine($columns, $rowData);
+            $rowData['Fecha Transacción'] = implode('-', array_reverse(explode('/', $rowData['Fecha Transacción'])));
+            $rowData['Cargo $ (-)'] = (int) str_replace('.', '', $rowData['Cargo $ (-)'] ?? 0);
+            $rowData['Abono $ (+)'] = (int) str_replace('.', '', $rowData['Abono $ (+)'] ?? 0);
+            $rowData['Saldo'] = $saldo;
+            $saldo = $saldo + $rowData['Cargo $ (-)'] - $rowData['Abono $ (+)'];
+            unset($rowData['']);
+
+            $data []= $rowData;
+        }
+        return array_reverse($data);
+    }
+
+    protected function getRowData(PhpSpreadsheet\Worksheet\Row $row): array
+    {
+        $data = [];
+        $cells = $row->getColumnIterator();
+        foreach ($cells as $cell) {
+            $data []= $cell->getCalculatedValue();
+        }
+        return $data;
+    }
+}
--- a/app/src/Service/Contabilidad/Cartola/Itau.php
+++ b/app/src/Service/Contabilidad/Cartola/Itau.php
@ -1,10 +1,10 @@
 <?php
-namespace Incoviba\Service\Cartola;
+namespace Incoviba\Service\Contabilidad\Cartola;

 use DateTimeImmutable;
-use Psr\Http\Message\UploadedFileInterface;
-use PhpOffice\PhpSpreadsheet;
 use Incoviba\Common\Ideal\Cartola\Banco;
+use PhpOffice\PhpSpreadsheet;
+use Psr\Http\Message\UploadedFileInterface;

 class Itau extends Banco
 {
@ -29,12 +29,12 @@ class Itau extends Banco
            'Saldos' => 'saldo'
        ];
    }
-
-    protected function parseFile(UploadedFileInterface $uploadedFile): array
+    protected function getFilename(UploadedFileInterface $uploadedFile): string
+    {
+        return '/tmp/cartola.xls';
+    }
+    protected function parseFile(string $filename): array
    {
-        $filename = '/tmp/cartola.xls';
-        $uploadedFile->moveTo($filename);
-
        $reader = PhpSpreadsheet\IOFactory::createReader('Xls');
        $xlsx = $reader->load($filename);
        $sheet = $xlsx->getActiveSheet();
@ -51,8 +51,6 @@ class Itau extends Banco
            }
        } catch (PhpSpreadsheet\Exception $exception) {
            $this->logger->critical($exception);
-        } finally {
-            unlink($filename);
        }
        return $data;
    }
--- a/app/src/Service/Contabilidad/Cartola/Santander.php
+++ b/app/src/Service/Contabilidad/Cartola/Santander.php
@ -1,16 +1,14 @@
 <?php
-namespace Incoviba\Service\Cartola;
+namespace Incoviba\Service\Contabilidad\Cartola;

-use DateTimeImmutable;
-use Psr\Http\Message\UploadedFileInterface;
-use PhpOffice\PhpSpreadsheet;
 use Incoviba\Common\Ideal\Cartola\Banco;
+use PhpOffice\PhpSpreadsheet;
+use Psr\Http\Message\UploadedFileInterface;

 class Santander extends Banco
 {
    protected function columnMap(): array
    {
-        // MONTO	DESCRIPCIÓN MOVIMIENTO		FECHA	N° DOCUMENTO	SUCURSAL		CARGO/ABONO
        return [
            'cargo' => 'cargo',
            'abono' => 'abono',
@ -25,17 +23,26 @@ class Santander extends Banco
            'Saldo Diario' => 'saldo'
        ];
    }
-    protected function parseFile(UploadedFileInterface $uploadedFile): array
+    protected function getFilename(UploadedFileInterface $uploadedFile): string
    {
-        $filename = '/tmp/cartola.xlsx';
-        $uploadedFile->moveTo($filename);
-
-        $reader = PhpSpreadsheet\IOFactory::createReader('Xlsx');
-        try {
-            $xlsx = $reader->load($filename);
-        } catch (PhpSpreadsheet\Reader\Exception) {
-            return $this->parseHtml($filename);
+        $start = $uploadedFile->getStream()->read(10);
+        if (str_starts_with($start, '<')) {
+            return '/tmp/cartola.html';
        }
+        return '/tmp/cartola.xlsx';
+    }
+
+    protected function parseFile(string $filename): array
+    {
+        if (str_ends_with($filename, 'xlsx')) {
+            return $this->parseXlsx($filename);
+        }
+        return $this->parseHtml($filename);
+    }
+    protected function parseXlsx(string $filename): array
+    {
+        $reader = PhpSpreadsheet\IOFactory::createReader('Xlsx');
+        $xlsx = $reader->load($filename);
        $sheet = $xlsx->getActiveSheet();

        $found = false;
@ -65,7 +72,7 @@ class Santander extends Banco
                if ($mapped === 'fecha') {
                    $value = implode('-', array_reverse(explode('/', $value)));
                }
-                if ($column === 'MONTO') {
+                if ($column === 'MONTO' or $column === 'SALDO') {
                    $value = (int) $value;
                }
                $rowData[$column] = $value;
@ -81,7 +88,7 @@ class Santander extends Banco
            $data []= $rowData;
        }

-        return $data;
+        return array_reverse($data);
    }
    protected function parseHtml(string $filename): array
    {
@ -108,11 +115,11 @@ class Santander extends Banco
            foreach (['Cargo ($)', 'Abono ($)', 'Saldo Diario'] as $column) {
                $row[$column] = (int) str_replace('.', '', $row[$column]);
            }
-            $row['Saldo Diario'] -= ($row['Abono ($)'] - $row['Cargo ($)']);
            $row['N° DOCUMENTO'] = '';
            $data []= $row;
        }
-        return $data;
+
+        return array_reverse($data);
    }
    protected function parseHtmlRow(array $lines, int &$rowIndex): array
    {
--- a/app/src/Service/Contabilidad/Cartola/Security.php
+++ b/app/src/Service/Contabilidad/Cartola/Security.php
@ -1,11 +1,11 @@
 <?php
-namespace Incoviba\Service\Cartola;
+namespace Incoviba\Service\Contabilidad\Cartola;

-use DOMDocument;
 use DateTimeImmutable;
-use Psr\Http\Message\UploadedFileInterface;
-use PhpOffice\PhpSpreadsheet;
+use DOMDocument;
 use Incoviba\Common\Ideal\Cartola\Banco;
+use PhpOffice\PhpSpreadsheet;
+use Psr\Http\Message\UploadedFileInterface;

 class Security extends Banco
 {
@ -16,14 +16,21 @@ class Security extends Banco
        return $movimientos;
    }

-    protected function parseFile(UploadedFileInterface $uploadedFile): array
+    protected function getFilename(UploadedFileInterface $uploadedFile): string
    {
        $stream = $uploadedFile->getStream();
        $stream->seek(3);
        if ($stream->read(strlen('table')) === 'table') {
-            return $this->processHtm($uploadedFile);
+            return '/tmp/cartola.htm';
        }
-        return $this->processXls($uploadedFile);
+        return '/tmp/cartola.xls';
+    }
+    protected function parseFile(string $filename): array
+    {
+        if (str_ends_with($filename, '.htm')) {
+            return $this->processHtm($filename);
+        }
+        return $this->processXls($filename);
    }
    protected function columnMap(): array
    {
@ -38,10 +45,8 @@ class Security extends Banco
        ];
    }

-    private function processXls(UploadedFileInterface $file): array
+    private function processXls(string $filename): array
    {
-        $filename = '/tmp/cartola.xls';
-        $file->moveTo($filename);
        $xlsx = @PhpSpreadsheet\IOFactory::load($filename);
        $worksheet = $xlsx->getActiveSheet();
        $rows = $worksheet->getRowIterator(3);
@ -82,14 +87,10 @@ class Security extends Banco
                $data []= $rowData;
            }
        }
-        unlink($filename);
        return $data;
    }
-    private function processHtm(UploadedFileInterface $file): array
+    private function processHtm(string $filename): array
    {
-        $filename = '/tmp/cartola.htm';
-        $file->moveTo($filename);
-
        $domDocument = new DOMDocument();
        $domDocument->loadHTML('<body>' . file_get_contents($filename) . '</body>');

@ -122,7 +123,6 @@ class Security extends Banco
            }
            $data []= $rowData;
        }
-
        return $data;
    }
 }
--- a/app/src/Service/Contabilidad/Exporter/Nubox.php
+++ b/app/src/Service/Contabilidad/Exporter/Nubox.php
@ -10,9 +10,9 @@ use PhpOffice\PhpSpreadsheet;

 class Nubox implements Exporter
 {
-    public function __construct(protected Repository\CentroCosto $centroCostoRepository, protected string $uploadFolder) {}
+    public function __construct(protected Repository\Contabilidad\CentroCosto $centroCostoRepository, protected string $uploadFolder) {}

-    public function export(Model\Inmobiliaria $inmobiliaria, Model\Banco $banco, DateTimeInterface $mes, array $movimientos): string
+    public function export(Model\Inmobiliaria $inmobiliaria, Model\Contabilidad\Banco $banco, DateTimeInterface $mes, array $movimientos): string
    {
        PhpSpreadsheet\Settings::setLocale('es-CL');
        $workbook = new PhpSpreadsheet\Spreadsheet();
--- a/app/src/Service/Contabilidad/Informe/Tesoreria.php
+++ b/app/src/Service/Contabilidad/Informe/Tesoreria.php
@ -1,26 +1,25 @@
 <?php
 namespace Incoviba\Service\Contabilidad\Informe;

-use DateTimeInterface;
 use DateInterval;
-use Psr\Log\LoggerInterface;
-use PhpOffice\PhpSpreadsheet;
+use DateTimeInterface;
 use Incoviba\Common\Ideal;
 use Incoviba\Common\Implement;
 use Incoviba\Model;
 use Incoviba\Repository;
 use Incoviba\Service;
+use Psr\Log\LoggerInterface;

 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,
+    public function __construct(LoggerInterface                                        $logger,
+                                protected Repository\Inmobiliaria                      $inmobiliariaRepository,
+                                protected Service\Inmobiliaria\Cuenta                  $cuentaService,
+                                protected Repository\Contabilidad\Deposito             $depositoRepository,
+                                protected Repository\Contabilidad\Cartola              $cartolaRepository,
+                                protected Repository\Contabilidad\Movimiento           $movimientoRepository,
                                protected Service\Contabilidad\Informe\Tesoreria\Excel $excelService,
-                                protected Service\Contabilidad\Informe\Tesoreria\PDF $pdfService)
+                                protected Service\Contabilidad\Informe\Tesoreria\PDF   $pdfService)
    {
        parent::__construct($logger);

@ -170,7 +169,7 @@ class Tesoreria extends Ideal\Service
        };
        $dataInmobiliaria->inmobiliaria = $inmobiliaria;
        try {
-            $cuentas = $this->cuentaRepository->fetchByInmobiliaria($inmobiliaria->rut);
+            $cuentas = $this->cuentaService->getAllActiveByInmobiliaria($inmobiliaria->rut);
        } catch (Implement\Exception\EmptyResult) {
            return $dataInmobiliaria;
        }
@ -228,23 +227,25 @@ class Tesoreria extends Ideal\Service
                    }
                }
            } catch (Implement\Exception\EmptyResult) {}
+            $anterior = $this->getAnterior($fecha);
            try {
-                $cartola = $this->cartolaRepository->fetchByCuentaAndFecha($cuenta->id, $fecha);
+                $cartola = $this->cartolaRepository->fetchLastByCuentaAndFecha($cuenta->id, $fecha);
                $data->actual = $cartola->saldo;
+                //$anterior = $this->getAnterior($cartola->fecha);
            } catch (Implement\Exception\EmptyResult) {}
            try {
-                $cartola = $this->cartolaRepository->fetchByCuentaAndFecha($cuenta->id, $this->getAnterior($fecha));
+                $cartola = $this->cartolaRepository->fetchLastByCuentaAndFecha($cuenta->id, $anterior);
                $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) {
+                        array_filter($movimientos, function(Model\Contabilidad\Movimiento $movimiento) {
                            return $movimiento->abono > 0;
                        }));
                    $this->addMovimientos(self::EGRESOS,
-                        array_filter($movimientos, function(Model\Movimiento $movimiento) {
+                        array_filter($movimientos, function(Model\Contabilidad\Movimiento $movimiento) {
                            return $movimiento->cargo > 0;
                        }));
                } catch (Implement\Exception\EmptyResult) {}
@ -289,5 +290,4 @@ class Tesoreria extends Ideal\Service
        $this->totales->{$tipo} += $total;
        return $this;
    }
-
 }
--- a/app/src/Service/Contabilidad/Movimiento.php
+++ b/app/src/Service/Contabilidad/Movimiento.php
@ -1,26 +1,26 @@
 <?php
-namespace Incoviba\Service;
+namespace Incoviba\Service\Contabilidad;

-use DateTimeInterface;
-use Psr\Log\LoggerInterface;
 use Incoviba\Common\Ideal\Service;
 use Incoviba\Common\Implement;
-use Incoviba\Repository;
 use Incoviba\Model;
+use Incoviba\Repository;
+use Psr\Log\LoggerInterface;

 class Movimiento extends Service
 {
-    public function __construct(LoggerInterface $logger, protected Repository\Movimiento $movimientoRepository,
+    public function __construct(LoggerInterface                         $logger,
+                                protected Repository\Contabilidad\Movimiento $movimientoRepository,
                                protected Repository\Movimiento\Detalle $detalleRepository)
    {
        parent::__construct($logger);
    }

-    public function getById(int $movimiento_id): Model\Movimiento
+    public function getById(int $movimiento_id): Model\Contabilidad\Movimiento
    {
        return $this->process($this->movimientoRepository->fetchById($movimiento_id));
    }
-    public function setDetalles(Model\Movimiento $movimiento, array $data): Model\Movimiento
+    public function setDetalles(Model\Contabilidad\Movimiento $movimiento, array $data): Model\Contabilidad\Movimiento
    {
        try {
            $detalles = $this->detalleRepository->fetchByMovimiento($movimiento->id);
@ -33,7 +33,7 @@ class Movimiento extends Service
        return $movimiento;
    }

-    public function process(Model\Movimiento $movimiento): Model\Movimiento
+    public function process(Model\Contabilidad\Movimiento $movimiento): Model\Contabilidad\Movimiento
    {
        $movimiento->addFactory('detalles', (new Implement\Repository\Factory())->setCallable(function(int $movimiento_id) {
            return $this->detalleRepository->fetchByMovimiento($movimiento_id);
--- a/app/src/Service/Contabilidad/Nubox.php
+++ b/app/src/Service/Contabilidad/Nubox.php
@ -2,24 +2,24 @@
 namespace Incoviba\Service\Contabilidad;

 use DateTimeInterface;
+use Incoviba\Common\Ideal;
+use Incoviba\Common\Implement\Exception;
+use Incoviba\Repository;
+use Incoviba\Service;
 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 Incoviba\Common\Ideal;

 class Nubox extends Ideal\Service
 {
-    public function __construct(protected LoggerInterface $logger,
-                                protected Repository\Nubox $nuboxRepository,
-                                protected Service\Redis $redisService,
-                                protected ClientInterface $client,
-                                protected RequestFactoryInterface $requestFactory,
-                                protected string $api_url)
+    public function __construct(protected LoggerInterface               $logger,
+                                protected Repository\Contabilidad\Nubox $nuboxRepository,
+                                protected Service\Redis                 $redisService,
+                                protected ClientInterface               $client,
+                                protected RequestFactoryInterface       $requestFactory,
+                                protected string                        $api_url)
    {
        parent::__construct($logger);
    }
--- a/app/src/Service/Inmobiliaria/Cuenta.php
+++ b/app/src/Service/Inmobiliaria/Cuenta.php
@ -0,0 +1,56 @@
+<?php
+namespace Incoviba\Service\Inmobiliaria;
+
+use DateTimeImmutable;
+use Psr\Log\LoggerInterface;
+use Incoviba\Common\Ideal\Service;
+use Incoviba\Common\Implement;
+use Incoviba\Model;
+use Incoviba\Repository;
+
+class Cuenta extends Service
+{
+    public function __construct(LoggerInterface $logger, protected Repository\Inmobiliaria\Cuenta $cuentaRepository,
+                                protected Repository\Inmobiliaria\Cuenta\Estado $estadoRepository)
+    {
+        parent::__construct($logger);
+    }
+
+    public function getAllActive(): array
+    {
+        $cuentas = array_map([$this, 'process'], $this->cuentaRepository->fetchAll());
+        return array_values(array_filter($cuentas, function(Model\Inmobiliaria\Cuenta $cuenta) {
+            return $cuenta->currentEstado()->active;
+        }));
+    }
+    public function getAllActiveByInmobiliaria(int $inmobiliaria_rut): array
+    {
+        $cuentas = array_map([$this, 'process'], $this->cuentaRepository->fetchByInmobiliaria($inmobiliaria_rut));
+        return array_values(array_filter($cuentas, function(Model\Inmobiliaria\Cuenta $cuenta) {
+            return $cuenta->currentEstado()->active;
+        }));
+    }
+    public function add(array $data): Model\Inmobiliaria\Cuenta
+    {
+        $cuenta = $this->cuentaRepository->create($data);
+        $cuenta = $this->cuentaRepository->save($cuenta);
+        $dataEstado = [
+            'cuenta_id' => $cuenta->id,
+            'fecha' => new DateTimeImmutable(),
+            'active' => true
+        ];
+        $estado = $this->estadoRepository->create($dataEstado);
+        $this->estadoRepository->save($estado);
+        return $this->process($cuenta);
+    }
+
+    protected function process(Model\Inmobiliaria\Cuenta $cuenta): Model\Inmobiliaria\Cuenta
+    {
+        $cuenta->addFactory('estados', (new Implement\Repository\Factory())
+            ->setCallable(function($cuenta_id) {
+                return $this->estadoRepository->fetchByCuenta($cuenta_id);
+            })
+            ->setArgs(['cuenta_id' => $cuenta->id]));
+        return $cuenta;
+    }
+}
--- a/app/src/Service/Login.php
+++ b/app/src/Service/Login.php
@ -9,7 +9,6 @@ use PDOException;
 use Incoviba\Common\Implement\Exception\EmptyResult;
 use Incoviba\Repository;
 use Incoviba\Model;
-use PhpParser\Node\Expr\AssignOp\Mod;
 use function random_bytes;
 use function password_hash;
 use function setcookie;
@ -47,7 +46,24 @@ class Login
        }
        return $login->user;
    }
-
+    public function getToken(): string
+    {
+        return implode($this->cookie_separator, [$this->selector, $this->token]);
+    }
+    public function getSeparator(): string
+    {
+        return $this->cookie_separator;
+    }
+    public function validateUser(Model\User $user, string $encryptedPassword): bool
+    {
+        list($passphrase, $encrypted) = $this->splitPassword($encryptedPassword);
+        try {
+            $password = $this->cryptoJs_aes_decrypt($encrypted, $passphrase);
+        } catch (Exception) {
+            return false;
+        }
+        return $user->validate($password);
+    }
    public function login(Model\User $user): bool
    {
        try {
@ -97,6 +113,10 @@ class Login
            return;
        }
        $cookie = $_COOKIE[$this->cookie_name];
+        if (!str_contains($cookie, $this->cookie_separator)) {
+            $this->removeCookie();
+            return;
+        }
        list($this->selector, $this->token) = explode($this->cookie_separator, $cookie);
    }
    protected function saveCookie(string $selector, string $token, DateTimeInterface $expires): void
@ -104,9 +124,12 @@ class Login
        setcookie(
            $this->cookie_name,
            implode($this->cookie_separator, [$selector, $token]),
-            $expires->getTimestamp(),
-            $this->path,
-            $this->domain
+            [
+                'expires' => $expires->getTimestamp(),
+                'path' => $this->path,
+                'domain' => $this->domain,
+                'samesite' => 'Strict'
+            ]
        );
        $this->selector = $selector;
        $this->token = $token;
@ -126,10 +149,70 @@ class Login
    {
        return password_verify($this->token, $login->token);
    }
-    protected function generateToken(Model\Login $login)
+    protected function generateToken(Model\Login $login): array
    {
        $selector = bin2hex(random_bytes(12));
        $token = bin2hex(random_bytes(20));
        return ['selector' => $selector, 'token' => $token];
    }
+
+    protected function splitPassword(string $input): array
+    {
+        $ini = strpos($input, 'U');
+        $passphrase = substr($input, 0, $ini);
+        $message = substr($input, $ini);
+        return [$passphrase, $message];
+    }
+    protected function cryptoJs_aes_decrypt($data, $key): string
+    {
+        $data = base64_decode($data);
+        if (substr($data, 0, 8) != "Salted__") {
+            return false;
+        }
+        $salt = substr($data, 8, 8);
+        $keyAndIV = $this->aes_evpKDF($key, $salt);
+        $decrypted = openssl_decrypt(
+            substr($data, 16),
+            "aes-256-cbc",
+            $keyAndIV["key"],
+            OPENSSL_RAW_DATA, // base64 was already decoded
+            $keyAndIV["iv"]
+        );
+        if ($decrypted === false) {
+            throw new Exception();
+        }
+        return $decrypted;
+    }
+    protected function aes_evpKDF($password, $salt, $keySize = 8, $ivSize = 4, $iterations = 1, $hashAlgorithm = "md5"): array
+    {
+        $targetKeySize = $keySize + $ivSize;
+        $derivedBytes = "";
+        $numberOfDerivedWords = 0;
+        $block = NULL;
+        $hasher = hash_init($hashAlgorithm);
+        while ($numberOfDerivedWords < $targetKeySize) {
+            if ($block != NULL) {
+                hash_update($hasher, $block);
+            }
+            hash_update($hasher, $password);
+            hash_update($hasher, $salt);
+            $block = hash_final($hasher, TRUE);
+            $hasher = hash_init($hashAlgorithm);
+
+            // Iterations
+            for ($i = 1; $i < $iterations; $i++) {
+                hash_update($hasher, $block);
+                $block = hash_final($hasher, TRUE);
+                $hasher = hash_init($hashAlgorithm);
+            }
+
+            $derivedBytes .= substr($block, 0, min(strlen($block), ($targetKeySize - $numberOfDerivedWords) * 4));
+
+            $numberOfDerivedWords += strlen($block) / 4;
+        }
+        return array(
+            "key" => substr($derivedBytes, 0, $keySize * 4),
+            "iv"  => substr($derivedBytes, $keySize * 4, $ivSize * 4)
+        );
+    }
 }
--- a/app/src/Service/Menu.php
+++ b/app/src/Service/Menu.php
@ -21,7 +21,7 @@ class Menu
        if (isset($item->submenus)) {
            return $this->buildDropdown($item);
        }
-        return "<a class=\"item\" href=\"{{$this->urls->base}}/{{$item->url}}\">{{$item->title}}</a>";
+        return "<a class=\"item\" href=\"{$this->urls->base}/{$item->url}\">{$item->title}</a>";
    }
    protected function buildDropdown(mixed $item): string
    {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Juan Pablo Vial	062e0543e4	Ignore app/bin	2024-04-02 19:58:58 -03:00
Juan Pablo Vial	b97916cfc4	Menu	2024-04-02 19:04:57 -03:00
Juan Pablo Vial	7af9cafdb6	Moderno	2024-04-02 19:04:26 -03:00
Juan Pablo Vial	84a2fbd119	Log DB	2024-04-02 13:50:08 -03:00
Juan Pablo Vial	bc9c71870c	No remove nocache	2024-03-26 17:09:43 -03:00
Juan Pablo Vial	912e8624b2	Nocache after ready	2024-03-26 16:57:07 -03:00
Juan Pablo Vial	86406bf027	Fecha cuota	2024-03-26 16:41:33 -03:00
Juan Pablo Vial	7b8d44e8c8	Reordenar	2024-03-26 13:59:18 -03:00
Juan Pablo Vial	c10f2e5912	Cuotas con detalle de UF y de Pies asociados	2024-03-26 13:21:47 -03:00
Juan Pablo Vial	bef0a22758	Bin folder	2024-03-26 13:17:08 -03:00
Juan Pablo Vial	092eb95f06	Cache phpunit	2024-03-26 09:38:35 -03:00
Juan Pablo Vial	5f56022109	Restructura contabilidad	2024-03-26 09:38:20 -03:00
Juan Pablo Vial	4b3397dd63	Estado cuenta	2024-03-21 23:10:18 -03:00
Juan Pablo Vial	529f9e32a1	Inmobiliarias por razon y cuadratura	2024-03-21 22:09:15 -03:00
Juan Pablo Vial	939adf126f	FIX: multiples cartolas	2024-03-21 22:08:30 -03:00
Juan Pablo Vial	63400af1db	Cartola diaria adds all cartolas	2024-03-21 21:57:32 -03:00
Juan Pablo Vial	019974614c	FIX: Saldos cartola diaria	2024-03-21 21:18:40 -03:00
Juan Pablo Vial	735c341729	FIX: Login, change in separator defined	2024-03-20 23:29:09 -03:00
Juan Pablo Vial	444ff687fc	Base API, and more solid key and check	2024-03-20 23:07:49 -03:00
Juan Pablo Vial	f3a5fa2cdc	Tests	2024-03-20 23:06:38 -03:00
Juan Pablo Vial	2ed265dcf1	Merge branch 'testing' into develop	2024-03-20 21:11:32 -03:00
Juan Pablo Vial	dbae630fdd	Bold footer	2024-03-20 21:04:43 -03:00
Juan Pablo Vial	d69976d015	FIX: Remove cache from login when redirecting	2024-03-20 20:55:34 -03:00
Juan Pablo Vial	2ccbc31ae0	FIX: Auth had all paths starting with slash as valid	2024-03-20 20:48:05 -03:00
Juan Pablo Vial	e50d80560c	FIX: Auth missing from some routes	2024-03-20 20:43:53 -03:00
Juan Pablo Vial	7cc0333876	Informe tesoreria busca ultima cartola ingresada	2024-03-20 20:22:54 -03:00
Juan Pablo Vial	eb38236926	FIX: cartola BCI	2024-03-20 17:52:34 -03:00
Juan Pablo Vial	85ef4dd60e	Ignore testing cache	2024-03-20 15:00:54 -03:00
Juan Pablo Vial	f1e29e3b0b	Ignore testing results	2024-03-20 13:50:04 -03:00
Juan Pablo Vial	6617a92f5f	Tests	2024-03-20 13:49:58 -03:00
Juan Pablo Vial	ca958b8a88	Testing dependencies	2024-03-20 13:45:53 -03:00
Juan Pablo Vial	dc2e2c7f71	Cartola BCI	2024-03-18 17:54:27 -03:00
Aldarien	936fd2d1e1	Cuota vacia	2024-03-18 18:06:32 +00:00
Juan Pablo Vial	7c6a397e31	CORS	2024-03-18 14:58:54 -03:00
Juan Pablo Vial	7385225a2e	FIX: Venta cargada sin formaPago	2024-03-15 13:09:58 -03:00
Juan Pablo Vial	9c335fd350	FIX: Venta	2024-03-13 22:43:37 -03:00
Juan Pablo Vial	57f9169cc7	Encriptar clave	2024-03-13 21:24:52 -03:00