Merge branch 'develop'

2024-03-13 16:31:34 -03:00 · 2023-06-22 23:18:13 -04:00 · 2023-02-15 18:30:09 -03:00 · 2023-02-14 20:50:42 -03:00 · 2023-02-13 17:18:41 -03:00
140 changed files with 583 additions and 2551 deletions
--- a/.gitignore
+++ b/.gitignore
@ -10,5 +10,3 @@
 **/.idea/
 **/upload?/
 **/informe?/
-**/.phpunit.cache/
-**/coverage/
--- a/1
+++ b/1
@ -9,7 +9,6 @@ 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
@ -1 +0,0 @@
-**/bin
--- a/app/.phpunit-watcher.yml
+++ b/app/.phpunit-watcher.yml
@ -1,13 +0,0 @@
-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,11 +5,6 @@ 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\Contabilidad\Banco $banco, DateTimeInterface $mes, array $movimientos): string;
+    public function export(Model\Inmobiliaria $inmobiliaria, Model\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->handleFile($file);
+        $data = $this->parseFile($file);
        $temp = [];
        $columns = $this->columnMap();
        foreach ($data as $row) {
@ -24,48 +24,11 @@ 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;
-
-    /**
-     * Translate uploaded file data to database data
-     * @param string $filename
-     * @return array
-     */
-    abstract protected function parseFile(string $filename): array;
+    abstract protected function parseFile(UploadedFileInterface $uploadedFile): array;
 }
--- a/app/common/Implement/Log/MySQLHandler.php
+++ b/app/common/Implement/Log/MySQLHandler.php
@ -1,60 +0,0 @@
-<?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
@ -1,19 +0,0 @@
-<?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,12 +1,8 @@
 {
    "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",
@ -18,10 +14,8 @@
        "slim/slim": "^4.11"
    },
    "require-dev": {
-        "fakerphp/faker": "^1.23",
        "kint-php/kint": "^5.1",
-        "phpunit/phpunit": "^10.2",
-        "spatie/phpunit-watcher": "^1.23"
+        "phpunit/phpunit": "^10.2"
    },
    "authors": [
        {
@ -36,8 +30,6 @@
        }
    },
    "config": {
-        "sort-packages": true,
-        "process-timeout": 0,
-        "bin-dir": "bin"
+        "sort-packages": true
    }
 }
--- a/app/phpunit.xml
+++ b/app/phpunit.xml
@ -1,43 +0,0 @@
-<?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="/code/cache/tests"
-         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="/code/cache/tests/junit.xml" />
-        <teamcity outputFile="/code/cache/tests/teamcity.txt" />
-        <testdoxHtml outputFile="/code/cache/tests/testdox.html" />
-        <testdoxText outputFile="/code/cache/tests/testdox.txt" />
-    </logging>
-</phpunit>
--- a/app/resources/routes/01_api.php
+++ b/app/resources/routes/01_api.php
@ -1,6 +1,4 @@
 <?php
-use Incoviba\Controller\API\Base;
-
 $app->group('/api', function($app) {
    $folder = implode(DIRECTORY_SEPARATOR, [__DIR__, 'api']);
    if (file_exists($folder)) {
@ -12,5 +10,4 @@ $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,6 +1,5 @@
 <?php
-
-use Incoviba\Controller\API\Contabilidad\CentrosCostos;
+use Incoviba\Controller\API\CentrosCostos;

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

-$app->group('/movimientos', function($app) {
-    $app->post('/segment', [Movimientos::class, 'segment']);
-    $app->get('[/]', Movimientos::class);
-});
 $app->group('/movimiento/{movimiento_id}', function($app) {
    $app->post('/detalles', [Movimientos::class, 'detalles']);
 });
--- a/app/resources/routes/api/contabilidad/nubox.php
+++ b/app/resources/routes/api/contabilidad/nubox.php
@ -1,6 +1,5 @@
 <?php
-
-use Incoviba\Controller\API\Contabilidad\Nubox;
+use Incoviba\Controller\API\Nubox;

 $app->group('/nubox/{inmobiliaria_rut}', function($app) {
    $app->get('/token[/]', [Nubox::class, 'token']);
--- a/app/resources/routes/api/inmobiliarias.php
+++ b/app/resources/routes/api/inmobiliarias.php
@ -2,20 +2,9 @@
 use Incoviba\Controller\API\Inmobiliarias;

 $app->group('/inmobiliarias', function($app) {
-    $folder = implode(DIRECTORY_SEPARATOR, [__DIR__, 'inmobiliarias']);
-    if (file_exists($folder)) {
-        $files = new FilesystemIterator($folder);
-        foreach ($files as $file) {
-            if ($file->isDir()) {
-                continue;
-            }
-            include_once $file->getRealPath();
-        }
-    }
    $app->get('[/]', Inmobiliarias::class);
 });
 $app->group('/inmobiliaria/{inmobiliaria_rut}', function($app) {
-    $app->post('/agentes', [Inmobiliarias::class, 'agentes']);
    $app->get('/cuentas[/]', [Inmobiliarias::class, 'cuentas']);
    $app->get('/proyectos[/]', [Inmobiliarias::class, 'proyectos']);
 });
--- a/app/resources/routes/api/inmobiliarias/proveedores.php
+++ b/app/resources/routes/api/inmobiliarias/proveedores.php
@ -1,11 +0,0 @@
-<?php
-use Incoviba\Controller\API\Inmobiliarias\Agentes;
-
-$app->group('/agentes', function($app) {
-    $app->post('/add[/]', [Agentes::class, 'add']);
-    $app->post('/register[/]', [Agentes::class, 'register']);
-    $app->get('[/]', Agentes::class);
-});
-$app->group('/agente/{agente_id}', function($app) {
-    $app->post('/edit[/]', [Agentes::class, 'edit']);
-});
--- a/app/resources/routes/contabilidad/centros_costos.php
+++ b/app/resources/routes/contabilidad/centros_costos.php
@ -1,6 +1,5 @@
 <?php
-
-use Incoviba\Controller\Contabilidad\CentrosCostos;
+use Incoviba\Controller\CentrosCostos;

 $app->group('/centros_costos', function($app) {
    $app->get('/asignar[/]', [CentrosCostos::class, 'asignar']);
--- a/app/resources/routes/contabilidad/movimientos.php
+++ b/app/resources/routes/contabilidad/movimientos.php
@ -1,4 +0,0 @@
-<?php
-use Incoviba\Controller\Contabilidad\Movimientos;
-
-$app->get('/movimientos', Movimientos::class);
--- a/app/resources/views/contabilidad/centros_costos/asignar.blade.php
+++ b/app/resources/views/contabilidad/centros_costos/asignar.blade.php
@ -15,8 +15,7 @@
                                <div class="default text">Inmobiliaria</div>
                                <div class="menu">
                                @foreach ($inmobiliarias as $inmobiliaria)
-                                        <div class="item"
-                                             data-value="{{$inmobiliaria->rut}}">{{$inmobiliaria->razon}}</div>
+                                    <div class="item" data-value="{{$inmobiliaria->rut}}">{{$inmobiliaria->razon}}</div>
                                @endforeach
                                </div>
                            </div>
@ -41,7 +40,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
@ -120,20 +119,20 @@
                mes: '',
                movimientos: [],
                centrosCostos: {
-                    ingresos: JSON.parse('{!! json_encode(array_values(array_map(function(\Incoviba\Model\Contabilidad\CentroCosto $centroCosto) {
+                    ingresos: JSON.parse('{!! json_encode(array_values(array_map(function(\Incoviba\Model\CentroCosto $centroCosto) {
                            return [
                                'id' => $centroCosto->id,
                                'descripcion' => $centroCosto->descripcion
                            ];
-                        }, array_filter($centrosCostos, function(\Incoviba\Model\Contabilidad\CentroCosto $centroCosto) {
+                        }, array_filter($centrosCostos, function(\Incoviba\Model\CentroCosto $centroCosto) {
                            return $centroCosto->tipoCentro->descripcion === 'Ingreso';
                        })))) !!}'),
-                    egresos: JSON.parse('{!! json_encode(array_values(array_map(function(\Incoviba\Model\Contabilidad\CentroCosto $centroCosto) {
+                    egresos: JSON.parse('{!! json_encode(array_values(array_map(function(\Incoviba\Model\CentroCosto $centroCosto) {
                            return [
                                'id' => $centroCosto->id,
                                'descripcion' => $centroCosto->descripcion
                            ];
-                        }, array_filter($centrosCostos, function(\Incoviba\Model\Contabilidad\CentroCosto $centroCosto) {
+                        }, array_filter($centrosCostos, function(\Incoviba\Model\CentroCosto $centroCosto) {
                            return $centroCosto->tipoCentro->descripcion === 'Egreso';
                        })))) !!}'),
                }
@ -171,11 +170,7 @@
                                    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')
                            })
                        })
@ -252,12 +247,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 = ''
                            }
@ -299,10 +294,7 @@
                            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(
@ -330,7 +322,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,13 +1,5 @@
@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>
@ -27,11 +19,7 @@
            <table class="ui collapsing simple table">
                <tr>
                    <td>Informe anterior</td>
-                    <td>
-                        <a href="{{$urls->base}}/contabilidad/informes/tesoreria/{{$anterior->format('Y-m-d')}}">
-                            {{$anterior->format('d/m/Y')}}
-                        </a>
-                    </td>
+                    <td>{{$anterior->format('d/m/Y')}}</td>
                </tr>
                <tr>
                    <td>Informe actual</td>
@ -52,17 +40,6 @@
                </tr>
            </table>
        </div>
-        @if ($siguiente !== null)
-            <div class="five wide column"></div>
-            <div class="right aligned two wide column">
-                <div class="ui segment">
-                    Siguiente
-                    <a href="{{$urls->base}}/contabilidad/informes/tesoreria/{{$siguiente->format('Y-m-d')}}">
-                        {{$siguiente->format('d/m/Y')}} >>
-                    </a>
-                </div>
-            </div>
-        @endif
    </div>
    <table class="ui striped table">
        <thead>
--- a/app/resources/views/contabilidad/movimientos.blade.php
+++ b/app/resources/views/contabilidad/movimientos.blade.php
@ -1,160 +0,0 @@
-@extends('layout.base')
-
-@section('page_content')
-    <div class="ui container">
-        <h1 class="ui header">Movimientos Contables</h1>
-    </div>
-    <table id="tabla_movimientos" class="ui table">
-        <thead>
-        <tr>
-            <th>Sociedad</th>
-            <th>Banco - Cuenta</th>
-            <th>Fecha</th>
-            <th>ISO Fecha</th>
-            <th class="right aligned">Valor</th>
-            <th>Valor</th>
-            <th>Centro de Costo</th>
-            <th>Glosa</th>
-            <th>Detalle</th>
-        </tr>
-        </thead>
-        <tbody id="movimientos"></tbody>
-    </table>
-@endsection
-
-@include('layout.head.styles.datatables')
-@include('layout.head.styles.datatables.searchbuilder')
-@include('layout.head.styles.datatables.buttons')
-
-@include('layout.body.scripts.datatables')
-@include('layout.body.scripts.datatables.searchbuilder')
-@include('layout.body.scripts.datatables.buttons')
-
-@push('page_scripts')
-    <script>
-        function getData(table_id, from, amount) {
-            const url = '{{$urls->api}}/contabilidad/movimientos'
-            const movimientos = []
-            return fetchAPI(url).then(response => {
-                if (!response) {
-                    return
-                }
-                response.json().then(json => {
-                    if (json.movimientos.length === 0) {
-                        return
-                    }
-                    const formatter = new Intl.NumberFormat('es-CL')
-                    const dateFormatter = new Intl.DateTimeFormat('es-CL', {day: '2-digit', month: '2-digit', year: 'numeric'})
-                    json.movimientos.forEach(movimiento => {
-                        const fecha = new Date(movimiento.fecha)
-                        const valor = movimiento.abono - movimiento.cargo
-                        movimientos.push([
-                            movimiento.cuenta.inmobiliaria.razon,
-                            movimiento.cuenta.banco.nombre + ' - ' + movimiento.cuenta.cuenta,
-                            dateFormatter.format(fecha),
-                            fecha.toISOString(),
-                            formatter.format(valor),
-                            valor,
-                            (movimiento.detalles) ? movimiento.detalles.centro_costo.id + ' - ' + movimiento.detalles.centro_costo.descripcion : '',
-                            movimiento.glosa,
-                            (movimiento.detalles) ? movimiento.detalles.detalle : ''
-                        ])
-                    })
-                }).then(() => {
-                    const table = new DataTable(table_id, {
-                        columnDefs: [
-                            {targets: 3, visible: false},
-                            {targets: 4, className: 'dt-right'},
-                            {targets: 5, visible: false}
-                        ],
-                        order: [[3, 'asc']],
-                        language: {
-                            info: 'Mostrando página _PAGE_ de _PAGES_',
-                            infoEmpty: 'No hay cuotas ingresadas',
-                            infoFiltered: '(filtrado de _MAX_ cuotas)',
-                            lengthMenu: 'Mostrando de a _MENU_ cuotas',
-                            zeroRecords: 'No se encotró cuotas con ese criterio',
-                            search: 'Buscar: ',
-                            searchBuilder: {
-                                add: 'Filtrar',
-                                condition: 'Comparador',
-                                clearAll: 'Resetear',
-                                delete: 'Eliminar',
-                                deleteTitle: 'Eliminar Titulo',
-                                data: 'Columna',
-                                left: 'Izquierda',
-                                leftTitle: 'Titulo Izquierdo',
-                                logicAnd: 'Y',
-                                logicOr: 'O',
-                                right: 'Derecha',
-                                rightTitle: 'Titulo Derecho',
-                                title: {
-                                    0: 'Filtros',
-                                    _: 'Filtros (%d)'
-                                },
-                                value: 'Opciones',
-                                valueJoiner: 'y'
-                            }
-                        },
-                        layout: {
-                            top1: {
-                                searchBuilder: {
-                                    columns: [0, 1, 2, 4, 6, 7, 8]
-                                }
-                            },
-                            top1End: {
-                                buttons: [
-                                    {
-                                        extend: 'excelHtml5',
-                                        className: 'green',
-                                        text: 'Exportar a Excel <i class="file excel icon"></i>',
-                                        title: 'Movimientos Contables',
-                                        download: 'open',
-                                        exportOptions: {
-                                            columns: [0, 1, 2, 5, 6, 7, 8]
-                                        }
-                                    }
-                                ]
-                            }
-                        },
-                        data: movimientos,
-                    })
-                })
-            })
-        }
-        function updateTable(table, from, amount) {
-            const url = '{{$urls->api}}/contabilidad/movimientos'
-            return fetchAPI(url).then(response => {
-                if (!response) {
-                    return
-                }
-                response.json().then(json => {
-                    if (json.movimientos.length === 0) {
-                        return
-                    }
-                    table.clear()
-                    const formatter = new Intl.NumberFormat('es-CL')
-                    const dateFormatter = new Intl.DateTimeFormat('es-CL', {day: '2-digit', month: '2-digit', year: 'numeric'})
-                    json.movimientos.forEach(movimiento => {
-                        const fecha = new Date(movimiento.fecha)
-                        table.row.add([
-                            movimiento.cuenta.inmobiliaria.razon,
-                            movimiento.cuenta.banco.nombre + ' - ' + movimiento.cuenta.cuenta,
-                            dateFormatter.format(fecha),
-                            fecha.toISOString(),
-                            formatter.format(movimiento.abono - movimiento.cargo),
-                            (movimiento.detalles) ? movimiento.detalles.centro_costo.id + ' - ' + movimiento.detalles.centro_costo.descripcion : '',
-                            movimiento.glosa,
-                            (movimiento.detalles) ? movimiento.detalles.detalle : ''
-                        ])
-                    })
-                }).then(() => {
-                    table.draw()
-                })
-            })
-        }
-        $(document).ready(() => {
-            getData('#tabla_movimientos', 0, 100)
-        })
-    </script>
-@endpush
--- a/app/resources/views/inmobiliarias/list.blade.php
+++ b/app/resources/views/inmobiliarias/list.blade.php
@ -10,6 +10,11 @@
            <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">
@ -18,6 +23,8 @@
                <div class="content">
                    <div class="header">
                            {{$inmobiliaria->abreviacion}}
+                        {{--<a href="{{$urls->base}}/inmobiliaria/{{$inmobiliaria->rut}}">
+                        </a>--}}
                    </div>
                    <div class="description">{{$inmobiliaria->razon}} {{$inmobiliaria->tipoSociedad->descripcion}}</div>
                    <div class="meta">{{$inmobiliaria->rut()}}</div>
--- a/app/resources/views/layout/body/header/menu/contabilidad.blade.php
+++ b/app/resources/views/layout/body/header/menu/contabilidad.blade.php
@ -18,6 +18,5 @@
        </div>
        <a class="item" href="{{$urls->base}}/contabilidad/cartolas/diaria">Cartola Diaria</a>
        <a class="item" href="{{$urls->base}}/contabilidad/depositos">Depósitos a Plazo</a>
-        <a class="item" href="{{$urls->base}}/contabilidad/movimientos">Movimientos</a>
    </div>
 </div>
--- a/app/resources/views/layout/body/scripts.blade.php
+++ b/app/resources/views/layout/body/scripts.blade.php
@ -10,7 +10,7 @@
            options['headers'] = {}
        }
        if (!Object.hasOwn(options['headers'], 'Authorization')) {
-            options['headers']['Authorization'] = 'Bearer {{md5($API_KEY)}}{{($login->isIn()) ? $login->getSeparator() . $login->getToken() : ''}}'
+            options['headers']['Authorization'] = 'Bearer {{md5($API_KEY)}}'
        }
        return fetch(url, options).then(response => {
            if (response.ok) {
--- a/app/resources/views/layout/body/scripts/cryptojs.blade.php
+++ b/app/resources/views/layout/body/scripts/cryptojs.blade.php
@ -1,3 +0,0 @@
-@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/layout/body/scripts/datatables.blade.php
+++ b/app/resources/views/layout/body/scripts/datatables.blade.php
@ -1,4 +1,5 @@
@push('page_scripts')
-    <script type="text/javascript" src="https://cdn.datatables.net/2.0.3/js/dataTables.min.js"></script>
-    <script src="https://cdn.datatables.net/2.0.3/js/dataTables.semanticui.min.js"></script>
+    {{--<script type="text/javascript" src="https://cdn.datatables.net/2.0.1/js/jquery.dataTables.min.js"></script>--}}
+    <script type="text/javascript" src="https://cdn.datatables.net/2.0.1/js/dataTables.min.js"></script>
+    <script src="https://cdn.datatables.net/2.0.1/js/dataTables.semanticui.min.js"></script>
@endpush
--- a/app/resources/views/layout/body/scripts/datatables/buttons.blade.php
+++ b/app/resources/views/layout/body/scripts/datatables/buttons.blade.php
@ -1,9 +1,9 @@
@push('page_scripts')
    <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.2.9/pdfmake.min.js" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-    <script src="https://cdn.datatables.net/buttons/3.0.1/js/dataTables.buttons.min.js"></script>
-    <script src="https://cdn.datatables.net/buttons/3.0.1/js/buttons.semanticui.min.js"></script>
-    <script src="https://cdn.datatables.net/buttons/3.0.1/js/buttons.colVis.min.js"></script>
-    <script src="https://cdn.datatables.net/buttons/3.0.1/js/buttons.html5.min.js"></script>
-    <script src="https://cdn.datatables.net/buttons/3.0.1/js/buttons.print.min.js"></script>
+    <script src="https://cdn.datatables.net/buttons/3.0.0/js/dataTables.buttons.min.js"></script>
+    <script src="https://cdn.datatables.net/buttons/3.0.0/js/buttons.semanticui.min.js"></script>
+    <script src="https://cdn.datatables.net/buttons/3.0.0/js/buttons.colVis.min.js"></script>
+    <script src="https://cdn.datatables.net/buttons/3.0.0/js/buttons.html5.min.js"></script>
+    <script src="https://cdn.datatables.net/buttons/3.0.0/js/buttons.print.min.js"></script>
@endpush
--- a/app/resources/views/layout/body/scripts/datatables/searchbuilder.blade.php
+++ b/app/resources/views/layout/body/scripts/datatables/searchbuilder.blade.php
@ -1,5 +0,0 @@
-@push('page_scripts')
-    <script src="https://cdn.datatables.net/datetime/1.5.2/js/dataTables.dateTime.min.js"></script>
-    <script src="https://cdn.datatables.net/searchbuilder/1.7.0/js/dataTables.searchBuilder.min.js"></script>
-    <script src="https://cdn.datatables.net/searchbuilder/1.7.0/js/searchBuilder.semanticui.js"></script>
-@endpush
--- a/app/resources/views/layout/head/styles/datatables.blade.php
+++ b/app/resources/views/layout/head/styles/datatables.blade.php
@ -1,3 +1,3 @@
@push('page_styles')
-    <link rel="stylesheet" href="https://cdn.datatables.net/2.0.3/css/dataTables.semanticui.min.css" />
+    <link rel="stylesheet" href="https://cdn.datatables.net/2.0.1/css/dataTables.semanticui.min.css" />
@endpush
--- a/app/resources/views/layout/head/styles/datatables/searchbuilder.blade.php
+++ b/app/resources/views/layout/head/styles/datatables/searchbuilder.blade.php
@ -1,4 +0,0 @@
-@push('page_styles')
-    <link rel="stylesheet" href="https://cdn.datatables.net/datetime/1.5.2/css/dataTables.dateTime.min.css" />
-    <link rel="stylesheet" href="https://cdn.datatables.net/searchbuilder/1.7.0/css/searchBuilder.dataTables.min.css" />
-@endpush
--- a/app/resources/views/login/form.blade.php
+++ b/app/resources/views/login/form.blade.php
@ -16,30 +16,29 @@
    </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 method = 'post'
-            const headers = {
+            const data = new FormData()
+            data.append('name', name)
+            data.append('password', password)
+            return fetch('{{$urls->base}}/login', {
+                method: 'post',
+                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 => {
+                },
+                body: data
+            }).then(response => {
                if (response.ok) {
                    return response.json()
                }
            }).then(data => {
                if (data.login === true) {
-                    window.location = '{{(isset($redirect_uri)) ? $redirect_uri : $urls->base}}'
+                @if(isset($redirect_uri))
+                    window.location = '{{$redirect_uri}}'
+                @else
+                    window.location = '{{$urls->base}}'
+                @endif
                }
            })
        }
--- a/app/resources/views/ventas/facturacion.blade.php
+++ b/app/resources/views/ventas/facturacion.blade.php
@ -177,7 +177,7 @@
                const cantidad = this.unidades.length
                this.unidades.forEach(unidad => {
                    const values = [
-                        '<a href="{{$urls->base}}/ventas/factura/' + this.id + '">' + venta + '</a>',
+                        venta,
                        cantidad,
                        unidad.tipo,
                        unidad.descripcion,
--- a/app/resources/views/ventas/facturacion/show.blade.php
+++ b/app/resources/views/ventas/facturacion/show.blade.php
@ -184,8 +184,8 @@
            totales: {},
            proporcion: 1,
            precio: {{$UF->transform($venta->currentEstado()->fecha, $venta->valor)}},
-            terreno: {{(isset($terreno->fecha) and $terreno->fecha >= $lastDic) ?
-                    $IPC->readjust($terreno->valor, $terreno->fecha, $venta->currentEstado()->fecha) : 0}},
+            terreno: {{(isset($venta->proyecto()->terreno->fecha) and $venta->proyecto()->terreno->fecha >= $lastDic) ?
+                    $IPC->readjust($venta->proyecto()->terreno->valor, $venta->proyecto()->terreno->fecha, $venta->currentEstado()->fecha) : 0}},
            uf: {{$UF->get($venta->currentEstado()->fecha)}},
            unidades: JSON.parse('{!! json_encode(array_map(function(Incoviba\Model\Venta\PropiedadUnidad $unidad) use ($venta, $UF, $format) {
                    $precio = ($unidad->valor > 0) ? $unidad->valor : ($unidad->precio($venta->currentEstado()->fecha) ? $unidad->precio($venta->currentEstado()->fecha)->valor : 0);
--- a/app/resources/views/ventas/pies/cuotas.blade.php
+++ b/app/resources/views/ventas/pies/cuotas.blade.php
@ -5,29 +5,6 @@
@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>
@ -60,37 +37,32 @@
                <td>{{$cuota->pago->identificador}}</td>
                <td class="right aligned">{{$format->pesos($cuota->pago->valor)}}</td>
                <td class="right aligned">
-                    @if (in_array($cuota->pago->currentEstado->tipoEstadoPago->descripcion, ['depositado', 'abonado'])
-                        and $cuota->pago->currentEstado->fecha <= $now)
+                    @if ($cuota->pago->currentEstado->tipoEstadoPago->descripcion === 'abonado' and $cuota->pago->currentEstado->fecha <= $now)
                    {{$format->ufs($cuota->pago->valor())}}
-                    @else
-                    ~{{$format->ufs($cuota->pago->valor / $uf_venta)}}
                    @endif
                </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 ($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>
                    @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
@ -143,7 +115,7 @@
                    }, 0.0))}}
            </th>
            <th class="right aligned">
-                {{$format->number(($total > 0) ? $pagado / $total * 100 : 0, 2)}}%
+                {{$format->number($pagado / $total * 100, 2)}}%
            </th>
            <th colspan="3"></th>
        </tr>
@ -156,7 +128,7 @@
                {{$format->ufs($total - $pagado)}}
            </th>
            <th class="right aligned">
-                {{$format->number(($total > 0) ? ($total - $pagado) / $total * 100 : 0, 2)}}%
+                {{$format->number(($total - $pagado) / $total * 100, 2)}}%
            </th>
            <th colspan="3"></th>
        </tr>
@ -172,10 +144,9 @@
@push('page_scripts')
    <script type="text/javascript">
        $(document).ready(() => {
-            function updateRow({pago_id, valor, fecha, color, estado, remove_fecha=false, add_reject=false, disable=false}) {
+            function updateRow({pago_id, 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)
@ -210,7 +181,7 @@
                        if (!json.depositado) {
                            return
                        }
-                        updateRow({pago_id: json.pago_id, valor: json.pago.valor_uf, fecha: json.input.fecha, estado: 'Depositado', color: 'yellow', add_reject: true})
+                        updateRow({pago_id: json.pago_id, fecha: json.input.fecha, estado: 'Depositado', color: 'yellow', add_reject: true})
                        button.attr('data-estado', 'depositado')
                    })
                })
@ -218,7 +189,7 @@
            function abonar(pago_id, fecha) {
                const url = '{{$urls->api}}/ventas/pago/' + pago_id + '/abonar'
                const body = new FormData()
-                body.set('fecha', [fecha.getFullYear(), fecha.getMonth() + 1, fecha.getDate()].join('-'))
+                body.set('fecha', fecha.toISOString())
                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 === null or $unidad->valor === 0.0) ? $precio : $unidad->valor) / $unidad->proyectoTipoUnidad->vendible(), 2)}} UF/m²
+                        {{$format->number(($unidad->valor ?? $precio) / $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
@ -1,2 +0,0 @@
-<?php
-$app->add($app->getContainer()->get(Incoviba\Middleware\CORS::class));
--- a/app/setup/setups/logs.php
+++ b/app/setup/setups/logs.php
@ -4,6 +4,18 @@ 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)),
@ -14,17 +26,6 @@ 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,7 +14,6 @@ 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,8 +9,7 @@ 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_SEPARATOR') ? $container->get('COOKIE_SEPARATOR') : 'g'
+            $container->has('COOKIE_PATH') ? $container->get('COOKIE_PATH') : ''
        );
    },
    Incoviba\Service\Money::class => function(ContainerInterface $container) {
@ -26,40 +25,39 @@ return [
            ->register('usd', $mindicador)
            ->register('ipc', $ine);
    },
-    Predis\ClientInterface::class => function(ContainerInterface $container) {
+    Predis\Client::class => function(ContainerInterface $container) {
        return new Predis\Client([
            'scheme' => 'tcp',
            'host' => $container->get('REDIS_HOST'),
            'port' => $container->get('REDIS_PORT')
        ]);
    },
-    Incoviba\Service\Contabilidad\Cartola::class => function(ContainerInterface $container) {
-        return (new Incoviba\Service\Contabilidad\Cartola(
+    Incoviba\Service\Cartola::class => function(ContainerInterface $container) {
+        return (new Incoviba\Service\Cartola(
            $container->get(Psr\Log\LoggerInterface::class),
            $container->get(Psr\Http\Message\StreamFactoryInterface::class),
            $container->get(Incoviba\Common\Define\Contabilidad\Exporter::class),
            $container->get(Incoviba\Repository\Inmobiliaria::class),
            $container->get(Incoviba\Repository\Inmobiliaria\Cuenta::class),
-            $container->get(Incoviba\Repository\Contabilidad\Movimiento::class),
-            $container->get(Incoviba\Service\Contabilidad\Movimiento::class),
-            $container->get(Incoviba\Repository\Contabilidad\Cartola::class)
+            $container->get(Incoviba\Repository\Movimiento::class),
+            $container->get(Incoviba\Service\Movimiento::class),
+            $container->get(Incoviba\Repository\Cartola::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));
+            ->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));
    },
    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\Contabilidad\CentroCosto::class),
+        return new Incoviba\Service\Contabilidad\Exporter\Nubox($container->get(Incoviba\Repository\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\Contabilidad\Nubox::class),
+            $container->get(Incoviba\Repository\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
@ -1,20 +0,0 @@
-<?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,14 +1,15 @@
 <?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
 {
@ -16,8 +17,8 @@ class Cartolas extends Controller

    public function procesar(ServerRequestInterface $request, ResponseInterface $response,
                                    Repository\Inmobiliaria $inmobiliariaRepository,
-                             Repository\Contabilidad\Banco $bancoRepository,
-                             Service\Contabilidad\Cartola  $cartolaService): ResponseInterface
+                                    Repository\Banco $bancoRepository,
+                                    Service\Cartola $cartolaService): ResponseInterface
    {
        $body = $request->getParsedBody();
        $output = [
@ -35,8 +36,8 @@ class Cartolas extends Controller
    }
    public function exportar(ServerRequestInterface $request, ResponseInterface $response,
                                    Repository\Inmobiliaria $inmobiliariaRepository,
-                             Repository\Contabilidad\Banco $bancoRepository,
-                             Service\Contabilidad\Cartola  $cartolaService): ResponseInterface
+                                    Repository\Banco $bancoRepository,
+                                    Service\Cartola $cartolaService): ResponseInterface
    {
        $body = $request->getParsedBody();
        $output = [
@ -53,7 +54,7 @@ class Cartolas extends Controller
    }
    public function diaria(ServerRequestInterface $request, ResponseInterface $response,
                           Repository\Inmobiliaria\Cuenta $cuentaRepository,
-                           Service\Contabilidad\Cartola   $cartolaService): ResponseInterface
+                           Service\Cartola $cartolaService): ResponseInterface
    {
        $body = $request->getParsedBody();
        $output = [
@ -81,7 +82,7 @@ class Cartolas extends Controller
    }
    public function ayer(ServerRequestInterface $request, ResponseInterface $response,
                         Repository\Inmobiliaria\Cuenta $cuentaRepository,
-                         Repository\Contabilidad\Cartola $cartolaRepository): ResponseInterface
+                         Repository\Cartola $cartolaRepository): ResponseInterface
    {
        $body = $request->getParsedBody();
        $output = [
--- a/app/src/Controller/API/Contabilidad/CentrosCostos.php
+++ b/app/src/Controller/API/Contabilidad/CentrosCostos.php
@ -1,63 +0,0 @@
-<?php
-namespace Incoviba\Controller\API\Contabilidad;
-
-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\Contabilidad\CentroCosto $centroCostoRepository): ResponseInterface
-    {
-        $body = $request->getParsedBody();
-        $output = [
-            'input' => $body,
-            'added' => false
-        ];
-        try {
-            $centroCosto = $centroCostoRepository->create($body);
-            $centroCosto->id = $body['id'];
-            $centroCostoRepository->save($centroCosto);
-            $output['added'] = true;
-        } catch (EmptyResult) {}
-        return $this->withJson($response, $output);
-    }
-    public function edit(ServerRequestInterface              $request, ResponseInterface $response,
-                         Repository\Contabilidad\CentroCosto $centroCostoRepository, int $centro_costo_id): ResponseInterface
-    {
-        $body = $request->getParsedBody();
-        $output = [
-            'centro_costo_id' => $centro_costo_id,
-            'input' => $body,
-            'edited' => false
-        ];
-        try {
-            $centroCosto = $centroCostoRepository->fetchById($centro_costo_id);
-            if ($body['tipo_cuenta_id'] === '') {
-                $body['tipo_cuenta_id'] = null;
-            }
-            $centroCostoRepository->edit($centroCosto, $body);
-            $output['edited'] = true;
-        } catch (EmptyResult) {}
-        return $this->withJson($response, $output);
-    }
-    public function remove(ServerRequestInterface              $request, ResponseInterface $response,
-                           Repository\Contabilidad\CentroCosto $centroCostoRepository, int $centro_costo_id): ResponseInterface
-    {
-        $output = [
-            'centro_costo_id' => $centro_costo_id,
-            'removed' => false
-        ];
-        try {
-            $centroCosto = $centroCostoRepository->fetchById($centro_costo_id);
-            $centroCostoRepository->remove($centroCosto);
-            $output['removed'] = true;
-        } catch (EmptyResult) {}
-        return $this->withJson($response, $output);
-    }
-}
--- a/app/src/Controller/API/Contabilidad/Depositos.php
+++ b/app/src/Controller/API/Contabilidad/Depositos.php
@ -2,12 +2,12 @@
 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
 {
@ -15,9 +15,9 @@ class Depositos extends Ideal\Controller

    public function inmobiliaria(ServerRequestInterface         $request, ResponseInterface $response,
                                 Repository\Inmobiliaria        $inmobiliariaRepository,
-                                 Repository\Contabilidad\Banco    $bancoRepository,
+                                 Repository\Banco               $bancoRepository,
                                 Repository\Inmobiliaria\Cuenta $cuentaRepository,
-                                 Repository\Contabilidad\Deposito $dapRepository,
+                                 Repository\Deposito            $dapRepository,
                                 int                            $inmobiliaria_rut): ResponseInterface
    {
        $output = [
@ -34,9 +34,9 @@ class Depositos extends Ideal\Controller
        return $this->withJson($response, $output);
    }
    public function add(ServerRequestInterface         $request, ResponseInterface $response,
-                        Repository\Inmobiliaria          $inmobiliariaRepository, Repository\Contabilidad\Banco $bancoRepository,
+                        Repository\Inmobiliaria        $inmobiliariaRepository, Repository\Banco $bancoRepository,
                        Repository\Inmobiliaria\Cuenta $cuentaRepository,
-                        Repository\Contabilidad\Deposito $dapRepository): ResponseInterface
+                        Repository\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 Incoviba\Common\Ideal;
-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;
+use Incoviba\Common\Implement\Exception\EmptyResult;
+use Incoviba\Controller\API\withJson;
+use Incoviba\Common\Ideal;
+use Incoviba\Repository;
+use Incoviba\Service;

 class Movimientos extends Ideal\Controller
 {
    use withJson;

    public function detalles(ServerRequestInterface $request, ResponseInterface $response,
-                             Service\Contabilidad\Movimiento     $movimientoService,
-                             Repository\Contabilidad\CentroCosto $centroCostoRepository, int $movimiento_id): ResponseInterface
+                             Service\Movimiento     $movimientoService,
+                             Repository\CentroCosto $centroCostoRepository, int $movimiento_id): ResponseInterface
    {
        $body = $request->getParsedBody();
        $output = [
@ -47,43 +47,4 @@ class Movimientos extends Ideal\Controller
        } catch (EmptyResult) {}
        return $this->withJson($response, $output);
    }
-    public function __invoke(ServerRequestInterface $request, ResponseInterface $response, Service\Contabilidad\Movimiento $movimientoService): ResponseInterface
-    {
-        $output = [
-            'movimientos' => []
-        ];
-        try {
-            $movimientos = $movimientoService->getAll();
-            $output['movimientos'] = json_decode(json_encode($movimientos), JSON_OBJECT_AS_ARRAY);
-            foreach ($output['movimientos'] as $i => &$arrayMovimiento) {
-                $arrayMovimiento['cuenta'] = json_decode(json_encode($movimientos[$i]->cuenta), JSON_OBJECT_AS_ARRAY);
-                $arrayMovimiento['cuenta']['inmobiliaria'] = json_decode(json_encode($movimientos[$i]->cuenta->inmobiliaria), JSON_OBJECT_AS_ARRAY);
-                if ($arrayMovimiento['detalles'] !== null) {
-                    $arrayMovimiento['detalles']['centro_costo'] = $movimientos[$i]->getDetalles()->centroCosto;
-                }
-            }
-        } catch (EmptyResult) {}
-        return $this->withJson($response, $output);
-    }
-    public function segment(ServerRequestInterface $request, ResponseInterface $response,
-                            Service\Contabilidad\Movimiento $movimientoService): ResponseInterface
-    {
-        $input = $request->getParsedBody();
-        $output = [
-            'input' => $input,
-            'movimientos' => []
-        ];
-        try {
-            $movimientos = $movimientoService->getAmountStartingFrom($input['from'], $input['amount']);
-            $output['movimientos'] = json_decode(json_encode($movimientos), JSON_OBJECT_AS_ARRAY);
-            foreach ($output['movimientos'] as $i => &$arrayMovimiento) {
-                $arrayMovimiento['cuenta'] = json_decode(json_encode($movimientos[$i]->cuenta), JSON_OBJECT_AS_ARRAY);
-                $arrayMovimiento['cuenta']['inmobiliaria'] = json_decode(json_encode($movimientos[$i]->cuenta->inmobiliaria), JSON_OBJECT_AS_ARRAY);
-                if ($arrayMovimiento['detalles'] !== null) {
-                    $arrayMovimiento['detalles']['centro_costo'] = $movimientos[$i]->getDetalles()->centroCosto;
-                }
-            }
-        } catch (EmptyResult) {}
-        return $this->withJson($response, $output);
-    }
 }
--- a/app/src/Controller/API/Contabilidad/Nubox.php
+++ b/app/src/Controller/API/Contabilidad/Nubox.php
@ -1,91 +0,0 @@
-<?php
-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;
-
-class Nubox
-{
-    use withJson;
-
-    public function token(ServerRequestInterface $request, ResponseInterface $response,
-                          Service\Contabilidad\Nubox $nuboxService, int $inmobiliaria_rut): ResponseInterface
-    {
-        $output = [
-            'inmobiliaria_rut' => $inmobiliaria_rut,
-            'token' => ''
-        ];
-        try {
-            $output['token'] = $nuboxService->getToken($inmobiliaria_rut);
-        } catch (HttpResponse $exception) {
-            $output['error'] = [
-                'code' => $exception->getCode(),
-                'message' => $exception->getMessage()
-            ];
-        }
-        return $this->withJson($response, $output);
-    }
-    public function sistemas(ServerRequestInterface $request, ResponseInterface $response,
-                             Service\Contabilidad\Nubox $nuboxService, int $inmobiliaria_rut): ResponseInterface
-    {
-        $output = [
-            'inmobiliaria_rut' => $inmobiliaria_rut,
-            'sistemas' => []
-        ];
-        try {
-            $output['sistemas'] = $nuboxService->getSistemas($inmobiliaria_rut);
-        } catch (HttpResponse $exception) {
-            $output['error'] = [
-                'code' => $exception->getCode(),
-                'message' => $exception->getMessage()
-            ];
-        }
-        return $this->withJson($response, $output);
-    }
-    public function libroMayor(ServerRequestInterface $request, ResponseInterface $response,
-                               Service\Contabilidad\Nubox $nuboxService, int $inmobiliaria_rut): ResponseInterface
-    {
-        $body = $request->getParsedBody();
-        $output = [
-            'inmobiliaria_rut' => $inmobiliaria_rut,
-            'input' => $body,
-            'libro_mayor' => []
-        ];
-        try {
-            $from = new DateTimeImmutable($body['inicio']);
-            $to = new DateTimeImmutable($body['termino']);
-            $output['libro_mayor'] = $nuboxService->getLibroMayor($inmobiliaria_rut, $from, $to);
-        } catch (HttpResponse $exception) {
-            $output['error'] = [
-                'code' => $exception->getCode(),
-                'message' => $exception->getMessage()
-            ];
-        }
-        return $this->withJson($response, $output);
-    }
-    public function libroDiario(ServerRequestInterface $request, ResponseInterface $response,
-                                Service\Contabilidad\Nubox $nuboxService, int $inmobiliaria_rut): ResponseInterface
-    {
-        $body = $request->getParsedBody();
-        $output = [
-            'inmobiliaria_rut' => $inmobiliaria_rut,
-            'input' => $body,
-            'libro_diario' => []
-        ];
-        try {
-            $from = new DateTimeImmutable($body['inicio']);
-            $to = new DateTimeImmutable($body['termino']);
-            $output['libro_diario'] = $nuboxService->getLibroDiario($inmobiliaria_rut, $from, $to);
-        } catch (HttpResponse $exception) {
-            $output['error'] = [
-                'code' => $exception->getCode(),
-                'message' => $exception->getMessage()
-            ];
-        }
-        return $this->withJson($response, $output);
-    }
-}
--- a/app/src/Controller/API/Inmobiliarias.php
+++ b/app/src/Controller/API/Inmobiliarias.php
@ -12,16 +12,6 @@ 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
@ -55,29 +45,4 @@ class Inmobiliarias
        } catch (EmptyResult) {}
        return $this->withJson($response, $output);
    }
-    public function agentes(ServerRequestInterface $request, ResponseInterface $response,
-                            Repository\Inmobiliaria $inmobiliariaRepository,
-                            Repository\Inmobiliaria\SociedadAgente $sociedadAgenteRepository,
-                            Repository\Inmobiliaria\TipoAgente $tipoAgenteRepository,
-                            int $inmobiliaria_rut): ResponseInterface
-    {
-        $input = $request->getParsedBody();
-        $output = [
-            'sociedad_rut' => $inmobiliaria_rut,
-            'input' => $input,
-            'sociedad' => null,
-            'agentes' => []
-        ];
-        try {
-            $inmobiliaria = $inmobiliariaRepository->fetchById($inmobiliaria_rut);
-            $output['sociedad'] = $inmobiliaria;
-            if (isset($input['tipo_agente_id'])) {
-                $tipo = $tipoAgenteRepository->fetchById($input['tipo_agente_id']);
-                $output['agentes'] = $sociedadAgenteRepository->fetchBySociedadAndTipo($inmobiliaria->rut, $tipo->id);
-            } else {
-                $output['agentes'] = $sociedadAgenteRepository->fetchBySociedad($inmobiliaria->rut);
-            }
-        } catch (EmptyResult) {}
-        return $this->withJson($response, $output);
-    }
 }
--- a/app/src/Controller/API/Inmobiliarias/Agentes.php
+++ b/app/src/Controller/API/Inmobiliarias/Agentes.php
@ -1,90 +0,0 @@
-<?php
-namespace Incoviba\Controller\API\Inmobiliarias;
-
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Incoviba\Common\Implement\Exception\EmptyResult;
-use Incoviba\Controller\API\withJson;
-use Incoviba\Repository;
-
-class Agentes
-{
-    use withJson;
-
-    public function __invoke(ServerRequestInterface $request, ResponseInterface $response, Repository\Inmobiliaria\Agente $agenteRepository): ResponseInterface
-    {
-        $output = [
-            'agentes' => []
-        ];
-        try {
-            $output['agentes'] = $agenteRepository->fetchAll('abreviacion');
-        } catch (EmptyResult) {}
-        return $this->withJson($response, $output);
-    }
-    public function add(ServerRequestInterface $request, ResponseInterface $response, Repository\Inmobiliaria\Agente $agenteRepository): ResponseInterface
-    {
-        $input = $request->getParsedBody();
-        $output = [
-            'input' => $input,
-            'agente' => null
-        ];
-        try {
-            $agente = $agenteRepository->create($input);
-            $output['agente'] = $agenteRepository->save($agente);
-        } catch (EmptyResult) {}
-        return $this->withJson($response, $output);
-    }
-    public function edit(ServerRequestInterface $request, ResponseInterface $response,
-                         Repository\Inmobiliaria\Agente $agenteRepository, int $agente_id): ResponseInterface
-    {
-        $input = $request->getParsedBody();
-        $output = [
-            'agente_id' => $agente_id,
-            'input' => $input,
-            'agente' => null
-        ];
-        try {
-            $agente = $agenteRepository->fetchById($agente_id);
-            $output['agente'] = $agenteRepository->edit($agente, $input);
-        } catch (EmptyResult) {}
-        return $this->withJson($response, $output);
-    }
-    public function register(ServerRequestInterface $request, ResponseInterface $response,
-                             Repository\Inmobiliaria $inmobiliariaRepository,
-                             Repository\Inmobiliaria\Agente $agenteRepository,
-                             Repository\Inmobiliaria\TipoAgente $tipoAgenteRepository,
-                             Repository\Inmobiliaria\AgenteTipo $agenteTipoRepository,
-                             Repository\Inmobiliaria\SociedadAgente $sociedadAgenteRepository): ResponseInterface
-    {
-        $input = $request->getParsedBody();
-        $output = [
-            'input' => $input,
-            'sociedad' => null,
-            'agente' => null,
-            'tipo_agente' => null,
-            'sociedad_agente' => null
-        ];
-        try {
-            $sociedad = $inmobiliariaRepository->fetchById($input['sociedad_rut']);
-            $output['sociedad'] = $sociedad;
-            $agente = $agenteRepository->fetchById($input['agente_id']);
-            $output['agente'] = $agente;
-            $tipo = $tipoAgenteRepository->fetchById($input['tipo_agente_id']);
-            $output['tipo_agente'] = $tipo;
-            $agenteTipo = $agenteTipoRepository->fetchByAgenteAndTipo($agente->id, $tipo->id);
-            try {
-                $output['sociedad_agente'] = $sociedadAgenteRepository->fetchBySociedadAndAgenteAndTipo($sociedad->rut, $agente->id, $tipo->id);
-            } catch (EmptyResult) {
-                $data = [
-                    'sociedad_rut' => $sociedad->rut,
-                    'agente_tipo_id' => $agenteTipo->id
-                ];
-                $sociedadAgente = $sociedadAgenteRepository->create($data);
-                $output['sociedad_agente'] = $sociedadAgenteRepository->save($sociedadAgente);
-            }
-        } catch (EmptyResult) {
-
-        }
-        return $this->withJson($response, $output);
-    }
-}
--- a/app/src/Controller/API/Ventas/Pagos.php
+++ b/app/src/Controller/API/Ventas/Pagos.php
@ -13,19 +13,6 @@ 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();
@ -44,41 +31,33 @@ class Pagos
        } catch (EmptyResult) {}
        return $this->withJson($response, $output);
    }
-    public function depositar(ServerRequestInterface $request, ResponseInterface $response,
-                              Service\Venta\Pago $pagoService, Service\Format $formatService, int $pago_id): ResponseInterface
+    public function depositar(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\Pago $pagoService, 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,
-                           Service\Format $formatService, int $pago_id): ResponseInterface
+    public function abonar(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\Pago $pagoService, 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/Contabilidad.php
+++ b/app/src/Controller/Contabilidad.php
@ -1,16 +1,16 @@
 <?php
 namespace Incoviba\Controller;

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

 class Contabilidad extends Controller
 {
@ -19,7 +19,7 @@ class Contabilidad extends Controller
    public function diaria(ServerRequestInterface $request, ResponseInterface $response, View $view,
                           Service\Redis $redisService,
                           Repository\Inmobiliaria $inmobiliariaRepository,
-                           Repository\Contabilidad\CentroCosto $centroCostoRepository): ResponseInterface
+                           Repository\CentroCosto $centroCostoRepository): ResponseInterface
    {
        $redisKey = 'inmobiliarias';
        $inmobiliarias = [];
@ -27,7 +27,7 @@ class Contabilidad extends Controller
            $inmobiliarias = $this->fetchRedis($redisService, $redisKey);
        } catch (EmptyRedis) {
            try {
-                $inmobiliarias = $inmobiliariaRepository->fetchAll('razon');
+                $inmobiliarias = $inmobiliariaRepository->fetchAll();
                $this->saveRedis($redisService, $redisKey, $inmobiliarias, 30 * 24 * 60 * 60);
            } catch (EmptyResult) {}
        }
@ -37,7 +37,7 @@ class Contabilidad extends Controller
    public function depositos(ServerRequestInterface  $request, ResponseInterface $response, View $view,
                              Service\Redis           $redisService,
                              Repository\Inmobiliaria $inmobiliariaRepository,
-                              Repository\Contabilidad\Deposito $dapRepository): ResponseInterface
+                              Repository\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\Contabilidad\Deposito $deposito) use ($fecha) {
+        $activos = array_filter($depositos, function(Model\Deposito $deposito) use ($fecha) {
            return $deposito->termino >= $fecha;
        });
        $mes = $fecha->sub(new DateInterval('P1M'));
-        $vencidos = array_filter($depositos, function(Model\Contabilidad\Deposito $deposito) use ($fecha, $mes) {
+        $vencidos = array_filter($depositos, function(Model\Deposito $deposito) use ($fecha, $mes) {
            return $deposito->termino < $fecha and $deposito->termino >= $mes;
        });
        return $view->render($response, 'contabilidad.depositos', compact('inmobiliarias', 'activos', 'vencidos'));
@ -69,25 +69,8 @@ class Contabilidad extends Controller
    {
        $fecha = new DateTimeImmutable($fecha);
        $anterior = $contabilidadService->getAnterior($fecha);
-        $yesterday = new DateTimeImmutable('yesterday');
-        $siguiente = null;
-        if ($yesterday > $fecha) {
-            $siguiente = $fecha->add(new DateInterval('P1D'));
-            if ($siguiente->format('N') === '6') {
-                $siguiente = $fecha->add(new DateInterval('P3D'));
-            }
-        }
        $informes = $contabilidadService->build($fecha);
        $filename = "Informe de Tesorería {$fecha->format('d.m.Y')}";
-        return $view->render($response, 'contabilidad.informes.tesoreria', compact('fecha', 'anterior', 'siguiente', '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'));
+        return $view->render($response, 'contabilidad.informes.tesoreria', compact('fecha', 'anterior', 'informes', 'filename'));
    }
 }
--- a/app/src/Controller/Contabilidad/CentrosCostos.php
+++ b/app/src/Controller/Contabilidad/CentrosCostos.php
@ -1,32 +0,0 @@
-<?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/Contabilidad/Movimientos.php
+++ b/app/src/Controller/Contabilidad/Movimientos.php
@ -1,15 +0,0 @@
-<?php
-namespace Incoviba\Controller\Contabilidad;
-
-use Incoviba\Common\Alias\View;
-use Incoviba\Common\Ideal\Controller;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-
-class Movimientos extends Controller
-{
-    public function __invoke(ServerRequestInterface $request, ResponseInterface $response, View $view): ResponseInterface
-    {
-        return $view->render($response, 'contabilidad.movimientos');
-    }
-}
--- 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($row);
-            }, $this->fetchRedis($redisService, $redisKey, true));
+                return $inmobiliariaRepository->load((array) $row);
+            }, $this->fetchRedis($redisService, $redisKey));
        } catch (EmptyRedis) {
            try {
                $inmobiliarias = $inmobiliariaRepository->fetchAll();
--- a/app/src/Controller/Login.php
+++ b/app/src/Controller/Login.php
@ -1,16 +1,14 @@
 <?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 extends Controller
+class Login
 {
    public function form(ServerRequestInterface $request, ResponseInterface $response, View $view, Service\Login $service): ResponseInterface
    {
@ -22,17 +20,14 @@ class Login extends Controller
    public function login(ServerRequestInterface $request, ResponseInterface $response, Repository\User $userRepository, Service\Login $service): ResponseInterface
    {
        $body = $request->getParsedBody();
+        $user = $userRepository->fetchByName($body['name']);
        $output = [
-            'name' => $body['name'],
+            'name' => $user->name,
            'login' => false
        ];
-
-        try {
-            $user = $userRepository->fetchByName($body['name']);
-            if ($service->validateUser($user, $body['password'])) {
+        if ($user->validate($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\EmptyRedis;
 use Incoviba\Common\Implement\Exception\EmptyResult;
+use Incoviba\Common\Implement\Exception\EmptyRedis;
 use Incoviba\Model;
 use Incoviba\Repository;
 use Incoviba\Service;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;

 class Ventas
 {
@ -101,29 +101,14 @@ class Ventas
                           View $view, int $venta_id): ResponseInterface
    {
        $venta = $ventaService->getById($venta_id);
-        $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'));
+        return $view->render($response, 'ventas.pies.cuotas', compact('venta'));
    }
    public function escriturar(ServerRequestInterface $request, ResponseInterface $response, Service\Venta $ventaService,
-                               Repository\Contabilidad\Banco $bancoRepository, View $view, int $venta_id): ResponseInterface
+                               Repository\Banco $bancoRepository, View $view, int $venta_id): ResponseInterface
    {
        $venta = $ventaService->getById($venta_id);
        $bancos = $bancoRepository->fetchAll();
-        usort($bancos, function(Model\Contabilidad\Banco $a, Model\Contabilidad\Banco $b) {
+        usort($bancos, function(Model\Banco $a, Model\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,20 +1,19 @@
 <?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,
-                         Service\Venta          $ventaService, Repository\Contabilidad\Banco $bancoRepository,
+                         Repository\Venta $ventaRepository, Repository\Banco $bancoRepository,
                         int $venta_id): ResponseInterface
    {
-        $venta = $ventaService->getById($venta_id);
+        $venta = $ventaRepository->fetchById($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 Incoviba\Common\Alias\View;
-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;
+use Incoviba\Common\Implement\Exception\EmptyResult;
+use Incoviba\Common\Alias\View;
+use Incoviba\Repository;
+use Incoviba\Service;
+use Incoviba\Model;

 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\Contabilidad\Banco $bancoRepository, View $view, int $pie_id): ResponseInterface
+    public function add(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\Pie $pieService, Repository\Venta $ventaRepository, Repository\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\Contabilidad\Banco $a, Model\Contabilidad\Banco $b) {
+        usort($bancos, function(Model\Banco $a, Model\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,7 +22,7 @@ class Escrituras
        return $view->render($response, 'ventas.escrituras.informe', compact('venta'));
    }
    public function add(ServerRequestInterface $request, ResponseInterface $response, View $view,
-                        Service\Venta          $ventaService, Repository\Contabilidad\Banco $bancoRepository,
+                        Service\Venta $ventaService, Repository\Banco $bancoRepository,
                        int $venta_id): ResponseInterface
    {
        $venta = $ventaService->getById($venta_id);
--- a/app/src/Controller/Ventas/Facturacion.php
+++ b/app/src/Controller/Ventas/Facturacion.php
@ -8,18 +8,14 @@ use Incoviba\Service;

 class Facturacion
 {
-    public function __invoke(ServerRequestInterface $request, ResponseInterface $response, View $view,
-                             Service\Proyecto $proyectoService): ResponseInterface
+    public function __invoke(ServerRequestInterface $request, ResponseInterface $response, View $view, Service\Proyecto $proyectoService): ResponseInterface
    {
        $proyectos = $proyectoService->getEscriturando();
        return $view->render($response, 'ventas.facturacion', compact('proyectos'));
    }
-    public function show(ServerRequestInterface $request, ResponseInterface $response, View $view,
-                         Service\Venta $ventaService, Service\Proyecto\Terreno $terrenoService,
-                         int $venta_id): ResponseInterface
+    public function show(ServerRequestInterface $request, ResponseInterface $response, View $view, Service\Venta $ventaService, int $venta_id): ResponseInterface
    {
        $venta = $ventaService->getById($venta_id);
-        $terreno = $terrenoService->valor($venta->proyecto()->id);
-        return $view->render($response, 'ventas.facturacion.show', compact('venta', 'terreno'));
+        return $view->render($response, 'ventas.facturacion.show', compact('venta'));
    }
 }
--- a/app/src/Controller/Ventas/Pies.php
+++ b/app/src/Controller/Ventas/Pies.php
@ -1,25 +1,23 @@
 <?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\Contabilidad\Banco $bancoRepository,
-                           View $view, int $pie_id): ResponseInterface
+    public function cuotas(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\Pie $pieService, Repository\Venta $ventaRepository, Repository\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\Contabilidad\Banco $a, Model\Contabilidad\Banco $b) {
+        usort($bancos, function(Model\Banco $a, Model\Banco $b) {
            return strcmp($a->nombre, $b->nombre);
        });
-        return $view->render($response, 'ventas.pies.cuotas', compact('pie', 'venta', 'bancos', 'ventaRepository'));
+        return $view->render($response, 'ventas.pies.cuotas', compact('pie', 'venta', 'bancos'));
    }
 }
--- 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, ?bool $asArray = null): mixed
+    public function fetchRedis(Service\Redis $redisService, string $redisKey): mixed
    {
        $jsonString = $redisService->get($redisKey);
        if ($jsonString === null) {
            throw new EmptyRedis($redisKey);
        }
-        return json_decode($jsonString, $asArray);
+        return json_decode($jsonString);
    }
    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,12 +6,10 @@ 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 Service\Login $loginService,
-                                protected string $key) {}
+    public function __construct(protected ResponseFactoryInterface $responseFactory, protected string $key) {}

    public function __invoke(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
    {
@ -20,7 +18,7 @@ class API
        } catch (MissingAuthorizationHeader $exception) {
            return $this->responseFactory->createResponse(401);
        }
-        if ($this->validate($request, $key)) {
+        if ($this->validate($key)) {
            return $handler->handle($request);
        }
        return $this->responseFactory->createResponse(403);
@ -35,26 +33,8 @@ class API
        }
        throw new MissingAuthorizationHeader();
    }
-    protected function validate(ServerRequestInterface $request, $incoming_key): bool
+    protected function validate($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
@ -24,7 +24,7 @@ class Authentication
            return $handler->handle($request);
        }
        $this->logger->notice("Not logged in.");
-        $response = $this->responseFactory->createResponse(307, 'Not logged in')
+        $response = $this->responseFactory->createResponse(301, 'Not logged in')
            ->withHeader('Referer', (string) $request->getUri())
            ->withHeader('X-Redirected-URI', (string) $request->getUri());
        $url = "{$request->getUri()}";
@ -45,22 +45,13 @@ 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
@ -1,21 +0,0 @@
-<?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,11 +18,11 @@ class Errors
        try {
            return $handler->handle($request);
        } catch (Exception $exception) {
-            $this->logger->warning($exception);
+            $this->logger->notice($exception);
        } catch (Error $error) {
            $this->logger->error($error);
        }
-        $response = $this->responseFactory->createResponse(500, 'Internal Server Error');
+        $response = $this->responseFactory->createResponse(600, 'Internal Server Error');
        if (str_contains($request->getUri()->getPath(), '/api')) {
            return $response;
        }
--- a/app/src/Model/Contabilidad/Banco.php
+++ b/app/src/Model/Contabilidad/Banco.php
@ -1,5 +1,5 @@
 <?php
-namespace Incoviba\Model\Contabilidad;
+namespace Incoviba\Model;

 use Incoviba\Common\Ideal\Model;

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

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

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

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

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

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

 class Deposito extends Ideal\Model
 {
--- a/app/src/Model/Inmobiliaria.php
+++ b/app/src/Model/Inmobiliaria.php
@ -10,6 +10,8 @@ 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
@ -35,6 +37,8 @@ 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/Agente.php
+++ b/app/src/Model/Inmobiliaria/Agente.php
@ -1,40 +0,0 @@
-<?php
-namespace Incoviba\Model\Inmobiliaria;
-
-use Incoviba\Common\Ideal;
-use Incoviba\Model;
-
-class Agente extends Ideal\Model
-{
-    public ?int $rut;
-    public string $descripcion;
-    public ?string $contacto;
-    public ?int $telefono;
-    public ?string $correo;
-    public ?Model\Direccion $direccion;
-    public ?string $giro;
-    public string $abreviacion;
-
-    protected ?array $tiposAgentes;
-    public function tipos(): ?array
-    {
-        if (!isset($this->tiposAgentes)) {
-            $this->tiposAgentes = $this->runFactory('tipos_agentes');
-        }
-        return $this->tiposAgentes;
-    }
-
-    public function jsonSerialize(): mixed
-    {
-        return array_merge(parent::jsonSerialize(), [
-            'rut' => $this->rut,
-            'descripcion' => $this->descripcion,
-            'contacto' => $this->contacto,
-            'telefono' => $this->telefono,
-            'correo' => $this->correo,
-            'direccion' => $this->direccion,
-            'giro' => $this->giro,
-            'abreviacion' => $this->abreviacion,
-        ]);
-    }
-}
--- a/app/src/Model/Inmobiliaria/AgenteTipo.php
+++ b/app/src/Model/Inmobiliaria/AgenteTipo.php
@ -1,10 +0,0 @@
-<?php
-namespace Incoviba\Model\Inmobiliaria;
-
-use Incoviba\Common\Ideal;
-
-class AgenteTipo extends Ideal\Model
-{
-    public Agente $agente;
-    public TipoAgente $tipoAgente;
-}
--- a/app/src/Model/Inmobiliaria/Cuenta.php
+++ b/app/src/Model/Inmobiliaria/Cuenta.php
@ -2,39 +2,14 @@
 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\Contabilidad\Banco $banco;
+    public Model\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
@ -1,22 +0,0 @@
-<?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/Inmobiliaria/SociedadAgente.php
+++ b/app/src/Model/Inmobiliaria/SociedadAgente.php
@ -1,19 +0,0 @@
-<?php
-namespace Incoviba\Model\Inmobiliaria;
-
-use Incoviba\Common\Ideal;
-use Incoviba\Model;
-
-class SociedadAgente extends Ideal\Model
-{
-    public Model\Inmobiliaria $sociedad;
-    public AgenteTipo $agenteTipo;
-
-    public function jsonSerialize(): mixed
-    {
-        return [
-            'sociedad_rut' => $this->sociedad->rut,
-            'agente_tipo_id' => $this->agenteTipo->id
-        ];
-    }
-}
--- a/app/src/Model/Inmobiliaria/TipoAgente.php
+++ b/app/src/Model/Inmobiliaria/TipoAgente.php
@ -1,11 +0,0 @@
-<?php
-namespace Incoviba\Model\Inmobiliaria;
-
-use Incoviba\Model;
-
-class TipoAgente extends Model\Tipo
-{
-    public string $icono;
-    public string $color;
-    public string $bgcolor;
-}
--- a/app/src/Model/Contabilidad/Movimiento.php
+++ b/app/src/Model/Contabilidad/Movimiento.php
@ -1,10 +1,8 @@
 <?php
-namespace Incoviba\Model\Contabilidad;
+namespace Incoviba\Model;

 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
@ -21,11 +19,7 @@ class Movimiento extends Ideal\Model
    public function getDetalles(): ?Detalle
    {
        if (!isset($this->detalles)) {
-            try {
            $this->detalles = $this->runFactory('detalles');
-            } catch (EmptyResult) {
-                $this->detalles = null;
-            }
        }
        return $this->detalles;
    }
--- 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\Contabilidad\Movimiento $movimiento;
-    public ?Model\Contabilidad\CentroCosto $centroCosto;
+    public Model\Movimiento $movimiento;
+    public ?Model\CentroCosto $centroCosto;
    public ?string $detalle;

    public function jsonSerialize(): mixed
--- a/app/src/Model/Contabilidad/Nubox.php
+++ b/app/src/Model/Contabilidad/Nubox.php
@ -1,8 +1,8 @@
 <?php
-namespace Incoviba\Model\Contabilidad;
+namespace Incoviba\Model;

+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,8 +1,7 @@
 <?php
-namespace Incoviba\Model\Contabilidad;
+namespace Incoviba\Model;

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

 class PagoCentroCosto extends Ideal\Model
 {
--- a/app/src/Model/TipoCentro.php
+++ b/app/src/Model/TipoCentro.php
@ -0,0 +1,5 @@
+<?php
+namespace Incoviba\Model;
+
+class TipoCentro extends Tipo
+{}
--- a/app/src/Model/Venta.php
+++ b/app/src/Model/Venta.php
@ -3,6 +3,9 @@ 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
 {
@ -15,7 +18,7 @@ class Venta extends Ideal\Model
    public bool $relacionado;
    protected ?Venta\Entrega $entrega;
    public float $uf;
-    protected ?Venta\Pago $resciliacion;
+    protected ?Pago $resciliacion;

    public ?array $estados;
    public ?Venta\EstadoVenta $currentEstado;
@ -41,11 +44,6 @@ 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)) {
@ -96,9 +94,9 @@ class Venta extends Ideal\Model
        }
        return $this->valor_util;
    }
-    public function saldo(string $moneda = Venta\Pago::UF): float
+    public function saldo(string $moneda = Pago::UF): float
    {
-        $valor = $this->valor * (($moneda === Venta\Pago::UF) ? 1 : $this->uf);
+        $valor = $this->valor * (($moneda === 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\Contabilidad\Banco;
+use Incoviba\Model\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\Contabilidad\Banco;
+use Incoviba\Model\Banco;

 class Pago extends Model
 {
@ -28,27 +28,10 @@ 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,7 +6,8 @@ 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\Contabilidad;
+namespace Incoviba\Repository;

 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\Contabilidad\Banco(), $data, $map);
+        return $this->parseData(new Model\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\Contabilidad;
+namespace Incoviba\Repository;

 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\Contabilidad\Cartola
+    public function create(?array $data = null): Model\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\Contabilidad\Cartola(), $data, $map);
+        return $this->parseData(new Model\Cartola(), $data, $map);
    }
-    public function save(Define\Model $model): Model\Contabilidad\Cartola
+    public function save(Define\Model $model): Model\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\Contabilidad\Cartola
+    public function edit(Define\Model $model, array $new_data): Model\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\Contabilidad\Cartola
+    public function fetchByCuentaAndFecha(int $cuenta_id, DateTimeInterface $fecha): Model\Cartola
    {
        $query = $this->connection->getQueryBuilder()
            ->select()
@ -65,14 +65,4 @@ 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,9 +1,8 @@
 <?php
-namespace Incoviba\Repository\Contabilidad;
+namespace Incoviba\Repository;

 use Incoviba\Common\Define;
 use Incoviba\Model;
-use Incoviba\Repository\Tipo;

 class CategoriaCentro extends Tipo
 {
@ -15,6 +14,6 @@ class CategoriaCentro extends Tipo

    protected function getBlank(): Define\Model
    {
-        return new Model\Contabilidad\CategoriaCentro();
+        return new Model\CategoriaCentro();
    }
 }
--- a/app/src/Repository/Contabilidad/CentroCosto.php
+++ b/app/src/Repository/Contabilidad/CentroCosto.php
@ -1,12 +1,12 @@
 <?php
-namespace Incoviba\Repository\Contabilidad;
+namespace Incoviba\Repository;

 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\Contabilidad\CentroCosto
+    public function create(?array $data = null): Model\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\Contabilidad\CentroCosto(), $data, $map);
+        return $this->parseData(new Model\CentroCosto(), $data, $map);
    }
-    public function save(Define\Model $model): Model\Contabilidad\CentroCosto
+    public function save(Define\Model $model): Model\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\Contabilidad\CentroCosto
+    public function edit(Define\Model $model, array $new_data): Model\CentroCosto
    {
        return $this->update($model, ['tipo_centro_id', 'categoria_id', 'tipo_cuenta_id', 'cuenta_contable', 'descripcion'], $new_data);
    }

-    public function fetchByDescripcion(string $descripcion): Model\Contabilidad\CentroCosto
+    public function fetchByDescripcion(string $descripcion): Model\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\Contabilidad;
+namespace Incoviba\Repository;

 use DateTimeImmutable;
 use Incoviba\Common\Define;
 use Incoviba\Common\Ideal;
 use Incoviba\Common\Implement;
-use Incoviba\Model;
 use Incoviba\Repository;
+use Incoviba\Model;

 class Deposito extends Ideal\Repository
 {
@ -16,7 +16,7 @@ class Deposito extends Ideal\Repository
        $this->setTable('depositos');
    }

-    public function create(?array $data = null): Model\Contabilidad\Deposito
+    public function create(?array $data = null): Model\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\Contabilidad\Deposito(), $data, $map);
+        return $this->parseData(new Model\Deposito(), $data, $map);
    }
-    public function save(Define\Model $model): Model\Contabilidad\Deposito
+    public function save(Define\Model $model): Model\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\Contabilidad\Deposito
+    public function edit(Define\Model $model, array $new_data): Model\Deposito
    {
        return $this->update($model, ['cuenta_id', 'capital', 'futuro', 'inicio', 'termino'], $new_data);
    }
--- 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 Contabilidad\Banco $bancoRepository, protected Repository\Inmobiliaria\TipoSociedad $tipoSociedadRepository)
+    public function __construct(Define\Connection $connection, protected Repository\Banco $bancoRepository, protected Repository\Inmobiliaria\TipoSociedad $tipoSociedadRepository)
    {
        parent::__construct($connection);
        $this->setTable('inmobiliaria');
@ -20,9 +20,13 @@ class Inmobiliaria extends Ideal\Repository
        return 'rut';
    }

-    public function create(?array $data = null): Model\Inmobiliaria
+    public function create(?array $data = null): Define\Model
    {
-        $map = (new Implement\Repository\MapperParser(['dv', 'razon', 'abreviacion']))
+        $map = (new Implement\Repository\MapperParser(['dv', 'razon', 'abreviacion', 'cuenta']))
+            ->register('banco', (new Implement\Repository\Mapper())
+                ->setFunction(function($data) {
+                    return $this->bancoRepository->fetchById($data['banco']);
+                }))
            ->register('sociedad', (new Implement\Repository\Mapper())
                ->setProperty('tipoSociedad')
                ->setFunction(function($data) {
@ -30,7 +34,7 @@ class Inmobiliaria extends Ideal\Repository
                }));
        return $this->parseData(new Model\Inmobiliaria(), $data, $map);
    }
-    public function save(Define\Model $model): Model\Inmobiliaria
+    public function save(Define\Model $model): Define\Model
    {
        $model->rut = $this->saveNew(
            ['dv', 'razon', 'abreviacion', 'cuenta', 'banco', 'sociedad'],
@ -38,7 +42,7 @@ class Inmobiliaria extends Ideal\Repository
        );
        return $model;
    }
-    public function edit(Define\Model $model, array $new_data): Model\Inmobiliaria
+    public function edit(Define\Model $model, array $new_data): Define\Model
    {
        return $this->update($model, ['dv', 'razon', 'abreviacion', 'cuenta', 'banco', 'sociedad'], $new_data);
    }
--- a/app/src/Repository/Inmobiliaria/Agente.php
+++ b/app/src/Repository/Inmobiliaria/Agente.php
@ -1,47 +0,0 @@
-<?php
-namespace Incoviba\Repository\Inmobiliaria;
-
-use Incoviba\Common\Define;
-use Incoviba\Common\Ideal;
-use Incoviba\Common\Implement;
-use Incoviba\Model;
-use Incoviba\Repository;
-
-class Agente extends Ideal\Repository
-{
-    public function __construct(Define\Connection $connection, protected Repository\Direccion $direccionRepository, protected TipoAgente $tipoAgenteRepository)
-    {
-        parent::__construct($connection);
-        $this->setTable('agente');
-    }
-
-    public function create(?array $data = null): Model\Inmobiliaria\Agente
-    {
-        $map = (new Implement\Repository\MapperParser(['rut', 'descripcion', 'telefono', 'correo', 'giro', 'abreviacion']))
-            ->register('representante', (new Implement\Repository\Mapper())
-                ->setProperty('contacto'))
-            ->register('direccion', (new Implement\Repository\Mapper())
-                ->setFunction(function(?array $data) {
-                    if ($data === null) {
-                        return null;
-                    }
-                    return $this->direccionRepository->fetchById($data['direccion']);
-                }));
-        return $this->parseData(new Model\Inmobiliaria\Agente(), $data, $map);
-    }
-    public function save(Define\Model $model): Model\Inmobiliaria\Agente
-    {
-        $model->id = $this->saveNew([
-            'rut', 'descripcion', 'representante', 'telefono', 'correo', 'giro', 'abreviacion'
-        ], [
-            $model->rut, $model->descripcion, $model->contacto, $model->telefono, $model->correo, $model->giro, $model->abreviacion
-        ]);
-        return $model;
-    }
-    public function edit(Define\Model $model, array $new_data): Model\Inmobiliaria\Agente
-    {
-        return $this->update($model, [
-            'rut', 'descripcion', 'representante', 'telefono', 'correo', 'giro', 'abreviacion'
-        ], $new_data);
-    }
-}
--- a/app/src/Repository/Inmobiliaria/AgenteTipo.php
+++ b/app/src/Repository/Inmobiliaria/AgenteTipo.php
@ -1,68 +0,0 @@
-<?php
-namespace Incoviba\Repository\Inmobiliaria;
-
-use Incoviba\Common\Define;
-use Incoviba\Common\Ideal;
-use Incoviba\Common\Implement;
-use Incoviba\Model;
-use Incoviba\Repository;
-
-class AgenteTipo extends Ideal\Repository
-{
-    public function __construct(Define\Connection $connection, protected Agente $agenteRepository,
-                                protected TipoAgente $tipoAgenteRepository)
-    {
-        parent::__construct($connection);
-        $this->setTable('agente_tipo');
-    }
-
-    public function create(?array $data = null): Model\Inmobiliaria\AgenteTipo
-    {
-        $map = (new Implement\Repository\MapperParser())
-            ->register('agente', (new Implement\Repository\Mapper())
-                ->setFunction(function(?array $data) {
-                    return ($data === null) ? null : $this->agenteRepository->fetchById($data['agente']);
-                }))
-            ->register('tipo', (new Implement\Repository\Mapper())
-                ->setFunction(function(?array $data) {
-                    return ($data === null) ? null : $this->tipoAgenteRepository->fetchById($data['tipo']);
-                }));
-        return $this->parseData(new Model\Inmobiliaria\AgenteTipo(), $data, $map);
-    }
-    public function save(Define\Model $model): Model\Inmobiliaria\AgenteTipo
-    {
-        $model->id = $this->saveNew(['agente', 'tipo'], [
-            $model->agente->id, $model->agenteTipo->id
-        ]);
-        return $model;
-    }
-    public function edit(Define\Model $model, array $new_data): Model\Inmobiliaria\AgenteTipo
-    {
-        return $this->update($model, ['agente', 'tipo'], $new_data);
-    }
-
-    public function fetchByAgente(int $agente_id): array
-    {
-        $query = $this->connection->getQueryBuilder()
-            ->select()
-            ->from($this->getTable())
-            ->where('agente = ?');
-        return $this->fetchMany($query, [$agente_id]);
-    }
-    public function fetchByTipo(int $tipo_agente_id): array
-    {
-        $query = $this->connection->getQueryBuilder()
-            ->select()
-            ->from($this->getTable())
-            ->where('tipo = ?');
-        return $this->fetchMany($query, [$tipo_agente_id]);
-    }
-    public function fetchByAgenteAndTipo(int $agente_id, int $tipo_agente_id): Model\Inmobiliaria\AgenteTipo
-    {
-        $query = $this->connection->getQueryBuilder()
-            ->select()
-            ->from($this->getTable())
-            ->where('agente = ? AND tipo = ?');
-        return $this->fetchOne($query, [$agente_id, $tipo_agente_id]);
-    }
-}
--- a/app/src/Repository/Inmobiliaria/Cuenta.php
+++ b/app/src/Repository/Inmobiliaria/Cuenta.php
@ -3,15 +3,16 @@ namespace Incoviba\Repository\Inmobiliaria;

 use Incoviba\Common\Define;
 use Incoviba\Common\Ideal;
-use Incoviba\Common\Implement;
-use Incoviba\Model;
 use Incoviba\Repository;
+use Incoviba\Model;
+use Incoviba\Common\Implement;
+use PhpParser\Node\Expr\BinaryOp\Mod;

 class Cuenta extends Ideal\Repository
 {
    public function __construct(Define\Connection $connection,
                                protected Repository\Inmobiliaria $inmobiliariaRepository,
-                                protected Repository\Contabilidad\Banco $bancoRepository)
+                                protected Repository\Banco $bancoRepository)
    {
        parent::__construct($connection);
        $this->setTable('cuenta');
--- a/app/src/Repository/Inmobiliaria/Cuenta/Estado.php
+++ b/app/src/Repository/Inmobiliaria/Cuenta/Estado.php
@ -1,62 +0,0 @@
-<?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/Inmobiliaria/SociedadAgente.php
+++ b/app/src/Repository/Inmobiliaria/SociedadAgente.php
@ -1,105 +0,0 @@
-<?php
-namespace Incoviba\Repository\Inmobiliaria;
-
-use Incoviba\Common\Define;
-use Incoviba\Common\Ideal;
-use Incoviba\Common\Implement;
-use Incoviba\Model;
-use Incoviba\Repository;
-
-class SociedadAgente extends Ideal\Repository
-{
-    public function __construct(Define\Connection $connection, protected Repository\Inmobiliaria $inmobiliariaRepository,
-                                protected AgenteTipo $agenteRepository)
-    {
-        parent::__construct($connection);
-        $this->setTable('sociedad_agente');
-    }
-    public function create(?array $data = null): Model\Inmobiliaria\SociedadAgente
-    {
-        $map = (new Implement\Repository\MapperParser())
-            ->register('sociedad_rut', (new Implement\Repository\Mapper())
-                ->setProperty('sociedad')
-                ->setFunction(function(?array $data) {
-                    return ($data === null) ? null : $this->inmobiliariaRepository->fetchById($data['sociedad_rut']);
-                }))
-            ->register('agente_tipo_id', (new Implement\Repository\Mapper())
-                ->setProperty('agenteTipo')
-                ->setFunction(function(?array $data) {
-                    return ($data === null) ? null : $this->agenteRepository->fetchById($data['agente_tipo_id']);
-                }));
-        return $this->parseData(new Model\Inmobiliaria\SociedadAgente(), $data, $map);
-    }
-    public function save(Define\Model $model): Model\Inmobiliaria\SociedadAgente
-    {
-        $model->id = $this->saveNew([
-            'sociedad_rut', 'agente_tipo_id'
-        ], [
-            $model->sociedad->rut, $model->agenteTipo->id
-        ]);
-        return $model;
-    }
-    public function edit(Define\Model $model, array $new_data): Model\Inmobiliaria\SociedadAgente
-    {
-        return $this->update($model, ['sociedad_rut', 'agente_tipo_id'], $new_data);
-    }
-    public function load(array $data_row): Define\Model
-    {
-        $model = $this->create($data_row);
-        return $model;
-    }
-
-    public function fetchBySociedad(int $sociedad_rut): array
-    {
-        $query = $this->connection->getQueryBuilder()
-            ->select()
-            ->from($this->getTable())
-            ->where('sociedad_rut = ?');
-        return $this->fetchMany($query, [$sociedad_rut]);
-    }
-    public function fetchByAgente(int $agente_id): array
-    {
-        $query = $this->connection->getQueryBuilder()
-            ->select('a.*')
-            ->from("{$this->getTable()} a")
-            ->joined('JOIN agente_tipo at ON a.agente_tipo_id = at.id')
-            ->where('at.agente = ?');
-        return $this->fetchMany($query, [$agente_id]);
-    }
-    public function fetchByTipo(int $tipo_agente_id): array
-    {
-        $query = $this->connection->getQueryBuilder()
-            ->select('a.*')
-            ->from("{$this->getTable()} a")
-            ->joined('JOIN agente_tipo at ON a.agente_tipo_id = at.id')
-            ->where('at.tipo = ?');
-        return $this->fetchMany($query, [$tipo_agente_id]);
-    }
-    public function fetchBySociedadAndTipo(int $sociedad_rut, int $tipo_agente_id): array
-    {
-        $query = $this->connection->getQueryBuilder()
-            ->select('a.*')
-            ->from("{$this->getTable()} a")
-            ->joined('JOIN agente_tipo at ON a.agente_tipo_id = at.id')
-            ->where('sociedad_rut = ? AND at.tipo = ?');
-        return $this->fetchMany($query, [$sociedad_rut, $tipo_agente_id]);
-    }
-    public function fetchBySociedadAndAgente(int $sociedad_rut, int $agente_id): array
-    {
-        $query = $this->connection->getQueryBuilder()
-            ->select('a.*')
-            ->from("{$this->getTable()} a")
-            ->joined('JOIN agente_tipo at ON a.agente_tipo_id = at.id')
-            ->where('sociedad_rut = ? AND at.agente = ?');
-        return $this->fetchMany($query, [$sociedad_rut, $agente_id]);
-    }
-    public function fetchBySociedadAndAgenteAndTipo(int $sociedad_rut, int $agente_id, int $tipo_agente_id): array
-    {
-        $query = $this->connection->getQueryBuilder()
-            ->select('a.*')
-            ->from("{$this->getTable()} a")
-            ->joined('JOIN agente_tipo at ON a.agente_tipo_id = at.id')
-            ->where('sociedad_rut = ? AND at.agente = ? AND at.tipo = ?');
-        return $this->fetchMany($query, [$sociedad_rut, $agente_id, $tipo_agente_id]);
-    }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Juan Pablo Vial	6ddc48ec60	Merge branch 'develop'	2024-03-13 16:31:34 -03:00
Juan Pablo Vial	331ee1e584	Merge branch 'develop'	2023-06-22 23:18:13 -04:00
Aldarien	24c17debf3	Merge branch 'develop'	2023-02-15 18:30:09 -03:00
Aldarien	552fd0aa06	Merge branch 'develop'	2023-02-14 20:50:42 -03:00
Aldarien	60faf293d4	Merge branch 'develop'	2023-02-13 17:18:41 -03:00