Merge branch 'develop'

.gitignore

@@ -10,5 +10,3 @@
 **/.idea/
 **/upload?/
 **/informe?/
-**/.phpunit.cache/
-**/coverage/

Dockerfile

@@ -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
 

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

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;
 
 }

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;
 }

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;
-
+    abstract protected function parseFile(UploadedFileInterface $uploadedFile): array;
-    /**
-     * Translate uploaded file data to database data
-     * @param string $filename
-     * @return array
-     */
-    abstract protected function parseFile(string $filename): array;
 }

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",
+        "phpunit/phpunit": "^10.2"
-        "spatie/phpunit-watcher": "^1.23"
     },
     "authors": [
         {
@@ -36,8 +30,6 @@
         }
     },
     "config": {
-        "sort-packages": true,
+        "sort-packages": true
-        "process-timeout": 0,
-        "bin-dir": "bin"
     }
 }

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="./cache"
-         executionOrder="depends,defects"
-         requireCoverageMetadata="false"
-         beStrictAboutCoverageMetadata="false"
-         beStrictAboutOutputDuringTests="true"
-         colors="true"
-         failOnRisky="false"
-         failOnWarning="false">
-    <testsuites>
-        <testsuite name="unit">
-            <directory>tests/units</directory>
-        </testsuite>
-        <testsuite name="acceptance">
-            <directory>tests/integration</directory>
-        </testsuite>
-        <testsuite name="performance">
-            <directory>tests/performance</directory>
-        </testsuite>
-    </testsuites>
-
-    <source restrictDeprecations="true" restrictNotices="true" restrictWarnings="true">
-        <include>
-            <directory>src</directory>
-            <directory>common</directory>
-        </include>
-    </source>
-    <coverage includeUncoveredFiles="true" pathCoverage="false" ignoreDeprecatedCodeUnits="true" disableCodeCoverageIgnore="true">
-        <report>
-            <html outputDirectory="/code/public/coverage/html" />
-            <php outputFile="/code/public/coverage/coverage.php" />
-        </report>
-    </coverage>
-    <logging>
-        <junit outputFile="/logs/junit.xml" />
-        <teamcity outputFile="/logs/teamcity.txt" />
-        <testdoxHtml outputFile="/logs/testdox.html" />
-        <testdoxText outputFile="/logs/testdox.txt" />
-    </logging>
-</phpunit>

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));

app/resources/routes/api/contabilidad/centros_costos.php

@@ -1,6 +1,5 @@
 <?php
-
+use Incoviba\Controller\API\CentrosCostos;
-use Incoviba\Controller\API\Contabilidad\CentrosCostos;
 
 $app->group('/centros_costos', function($app) {
     $app->post('/add[/]', [CentrosCostos::class, 'add']);

app/resources/routes/api/contabilidad/nubox.php

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

app/resources/routes/contabilidad/centros_costos.php

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

app/resources/views/contabilidad/centros_costos/asignar.blade.php

@@ -14,10 +14,9 @@
                                 <i class="dropdown icon"></i>
                                 <div class="default text">Inmobiliaria</div>
                                 <div class="menu">
-                                    @foreach ($inmobiliarias as $inmobiliaria)
+                                @foreach ($inmobiliarias as $inmobiliaria)
-                                        <div class="item"
+                                    <div class="item" data-value="{{$inmobiliaria->rut}}">{{$inmobiliaria->razon}}</div>
-                                             data-value="{{$inmobiliaria->rut}}">{{$inmobiliaria->razon}}</div>
+                                @endforeach
-                                    @endforeach
                                 </div>
                             </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 {
+                                    return {value: cuenta.banco.id, text: cuenta.banco.nombre, name: cuenta.banco.nombre}
-                                        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', {
+                        const numberFormatter = new Intl.NumberFormat('es-CL', {minimumFractionDigits: 0, maximumFractionDigits: 0})
-                            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) {

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>

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">
@@ -17,7 +22,9 @@
             <div class="ui card">
                 <div class="content">
                     <div class="header">
-                        {{$inmobiliaria->abreviacion}}
+                            {{$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>

app/resources/views/layout/body/scripts.blade.php

@@ -2,13 +2,6 @@
 <script src="https://cdnjs.cloudflare.com/ajax/libs/fomantic-ui/2.9.3/semantic.min.js" integrity="sha512-gnoBksrDbaMnlE0rhhkcx3iwzvgBGz6mOEj4/Y5ZY09n55dYddx6+WYc72A55qEesV8VX2iMomteIwobeGK1BQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 
 <script type="text/javascript">
-    function cleanNoCache() {
-        const url = new URL(window.location.href)
-        if (url.searchParams.has('nocache')) {
-            url.searchParams.delete('nocache')
-            window.location.href = url.href
-        }
-    }
     function fetchAPI(url, options=null) {
         if (options === null) {
             options = {}
@@ -17,11 +10,7 @@
             options['headers'] = {}
         }
         if (!Object.hasOwn(options['headers'], 'Authorization')) {
-            @if (!$login->isIn())
+            options['headers']['Authorization'] = 'Bearer {{md5($API_KEY)}}'
-                options['headers']['Authorization'] = 'Bearer {{md5($API_KEY)}}'
-            @else
-                options['headers']['Authorization'] = 'Bearer {{md5($API_KEY)}}{{$login->getSeparator()}}{{$login->getToken()}}'
-            @endif
         }
         return fetch(url, options).then(response => {
             if (response.ok) {
@@ -47,7 +36,6 @@
             date: 'DD-MM-YYYY'
         },
     }
-    cleanNoCache()
 </script>
 
 @stack('page_scripts')

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

app/resources/views/login/form.blade.php

@@ -16,33 +16,28 @@
     </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 data = new FormData()
-            const headers = {
+            data.append('name', name)
-                Accept: 'json'
+            data.append('password', password)
-            }
+            return fetch('{{$urls->base}}/login', {
-            const body = new FormData()
+                method: 'post',
-            body.append('name', name)
+                headers: {
-            body.append('password', encryptPassword(password))
+                    Accept: 'json'
-            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) {
                 @if(isset($redirect_uri))
-                    window.location = '{{$redirect_uri}}?nocache=' + (new Date()).getTime()
+                    window.location = '{{$redirect_uri}}'
                 @else
-                    window.location = '{{$urls->base}}?nocache=' + (new Date()).getTime()
+                    window.location = '{{$urls->base}}'
                 @endif
                 }
             })

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,10 +37,8 @@
                 <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
@@ -140,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>
@@ -153,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>

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">

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));

app/setup/middlewares/96_cors.php

@@ -1,2 +0,0 @@
-<?php
-$app->add($app->getContainer()->get(Incoviba\Middleware\CORS::class));

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')
         );
     }

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_PATH') ? $container->get('COOKIE_PATH') : ''
-            $container->has('COOKIE_SEPARATOR') ? $container->get('COOKIE_SEPARATOR') : 'g'
         );
     },
     Incoviba\Service\Money::class => function(ContainerInterface $container) {
@@ -33,33 +32,32 @@ return [
             'port' => $container->get('REDIS_PORT')
         ]);
     },
-    \Incoviba\Service\Contabilidad\Cartola::class => function(ContainerInterface $container) {
+    Incoviba\Service\Cartola::class => function(ContainerInterface $container) {
-        return (new \Incoviba\Service\Contabilidad\Cartola(
+        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\Repository\Movimiento::class),
-            $container->get(\Incoviba\Service\Contabilidad\Movimiento::class),
+            $container->get(Incoviba\Service\Movimiento::class),
-            $container->get(\Incoviba\Repository\Contabilidad\Cartola::class)
+            $container->get(Incoviba\Repository\Cartola::class)
         ))
-            ->register('security', $container->get(\Incoviba\Service\Contabilidad\Cartola\Security::class))
+            ->register('security', $container->get(Incoviba\Service\Cartola\Security::class))
-            ->register('itau', $container->get(\Incoviba\Service\Contabilidad\Cartola\Itau::class))
+            ->register('itau', $container->get(Incoviba\Service\Cartola\Itau::class))
-            ->register('santander', $container->get(\Incoviba\Service\Contabilidad\Cartola\Santander::class))
+            ->register('santander', $container->get(Incoviba\Service\Cartola\Santander::class));
-            ->register('bci', $container->get(\Incoviba\Service\Contabilidad\Cartola\BCI::class));
     },
     Incoviba\Common\Define\Contabilidad\Exporter::class => function(ContainerInterface $container) {
         return $container->get(Incoviba\Service\Contabilidad\Exporter\Nubox::class);
     },
     Incoviba\Service\Contabilidad\Exporter\Nubox::class => function(ContainerInterface $container) {
-        return new Incoviba\Service\Contabilidad\Exporter\Nubox($container->get(\Incoviba\Repository\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),

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);
-    }
-}

app/src/Controller/API/CentrosCostos.php

@@ -1,18 +1,17 @@
 <?php
-namespace Incoviba\Controller\API\Contabilidad;
+namespace Incoviba\Controller\API;
 
-use Incoviba\Common\Implement\Exception\EmptyResult;
-use Incoviba\Controller\API\withJson;
-use Incoviba\Repository;
-use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\ResponseInterface;
+use Incoviba\Common\Implement\Exception\EmptyResult;
+use Incoviba\Repository;
 
 class CentrosCostos
 {
     use withJson;
 
-    public function add(ServerRequestInterface              $request, ResponseInterface $response,
+    public function add(ServerRequestInterface $request, ResponseInterface $response,
-                        Repository\Contabilidad\CentroCosto $centroCostoRepository): ResponseInterface
+                        Repository\CentroCosto $centroCostoRepository): ResponseInterface
     {
         $body = $request->getParsedBody();
         $output = [
@@ -27,8 +26,8 @@ class CentrosCostos
         } catch (EmptyResult) {}
         return $this->withJson($response, $output);
     }
-    public function edit(ServerRequestInterface              $request, ResponseInterface $response,
+    public function edit(ServerRequestInterface $request, ResponseInterface $response,
-                         Repository\Contabilidad\CentroCosto $centroCostoRepository, int $centro_costo_id): ResponseInterface
+                         Repository\CentroCosto $centroCostoRepository, int $centro_costo_id): ResponseInterface
     {
         $body = $request->getParsedBody();
         $output = [
@@ -46,8 +45,8 @@ class CentrosCostos
         } catch (EmptyResult) {}
         return $this->withJson($response, $output);
     }
-    public function remove(ServerRequestInterface              $request, ResponseInterface $response,
+    public function remove(ServerRequestInterface $request, ResponseInterface $response,
-                           Repository\Contabilidad\CentroCosto $centroCostoRepository, int $centro_costo_id): ResponseInterface
+                           Repository\CentroCosto $centroCostoRepository, int $centro_costo_id): ResponseInterface
     {
         $output = [
             'centro_costo_id' => $centro_costo_id,

app/src/Controller/API/Contabilidad/Cartolas.php

@@ -1,23 +1,24 @@
 <?php
 namespace Incoviba\Controller\API\Contabilidad;
 
+use DateTimeInterface;
 use DateTimeImmutable;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\ResponseInterface;
 use Incoviba\Common\Ideal\Controller;
 use Incoviba\Common\Implement\Exception\EmptyResult;
 use Incoviba\Controller\API\withJson;
 use Incoviba\Repository;
 use Incoviba\Service;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
 
 class Cartolas extends Controller
 {
     use withJson;
 
-    public function procesar(ServerRequestInterface        $request, ResponseInterface $response,
+    public function procesar(ServerRequestInterface $request, ResponseInterface $response,
-                             Repository\Inmobiliaria       $inmobiliariaRepository,
+                                    Repository\Inmobiliaria $inmobiliariaRepository,
-                             Repository\Contabilidad\Banco $bancoRepository,
+                                    Repository\Banco $bancoRepository,
-                             Service\Contabilidad\Cartola  $cartolaService): ResponseInterface
+                                    Service\Cartola $cartolaService): ResponseInterface
     {
         $body = $request->getParsedBody();
         $output = [
@@ -33,10 +34,10 @@ class Cartolas extends Controller
         } catch (EmptyResult) {}
         return $this->withJson($response, $output);
     }
-    public function exportar(ServerRequestInterface        $request, ResponseInterface $response,
+    public function exportar(ServerRequestInterface $request, ResponseInterface $response,
-                             Repository\Inmobiliaria       $inmobiliariaRepository,
+                                    Repository\Inmobiliaria $inmobiliariaRepository,
-                             Repository\Contabilidad\Banco $bancoRepository,
+                                    Repository\Banco $bancoRepository,
-                             Service\Contabilidad\Cartola  $cartolaService): ResponseInterface
+                                    Service\Cartola $cartolaService): ResponseInterface
     {
         $body = $request->getParsedBody();
         $output = [
@@ -51,9 +52,9 @@ class Cartolas extends Controller
         } catch (EmptyResult) {}
         return $this->withJson($response, $output);
     }
-    public function diaria(ServerRequestInterface         $request, ResponseInterface $response,
+    public function diaria(ServerRequestInterface $request, ResponseInterface $response,
                            Repository\Inmobiliaria\Cuenta $cuentaRepository,
-                           Service\Contabilidad\Cartola   $cartolaService): ResponseInterface
+                           Service\Cartola $cartolaService): ResponseInterface
     {
         $body = $request->getParsedBody();
         $output = [
@@ -79,9 +80,9 @@ class Cartolas extends Controller
         }
         return $this->withJson($response, $output);
     }
-    public function ayer(ServerRequestInterface          $request, ResponseInterface $response,
+    public function ayer(ServerRequestInterface $request, ResponseInterface $response,
-                         Repository\Inmobiliaria\Cuenta  $cuentaRepository,
+                         Repository\Inmobiliaria\Cuenta $cuentaRepository,
-                         Repository\Contabilidad\Cartola $cartolaRepository): ResponseInterface
+                         Repository\Cartola $cartolaRepository): ResponseInterface
     {
         $body = $request->getParsedBody();
         $output = [

app/src/Controller/API/Contabilidad/Depositos.php

@@ -2,23 +2,23 @@
 namespace Incoviba\Controller\API\Contabilidad;
 
 use DateTimeImmutable;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\ResponseInterface;
 use Incoviba\Common\Ideal;
 use Incoviba\Common\Implement;
 use Incoviba\Controller\API\withJson;
 use Incoviba\Repository;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
 
 class Depositos extends Ideal\Controller
 {
     use withJson;
 
-    public function inmobiliaria(ServerRequestInterface           $request, ResponseInterface $response,
+    public function inmobiliaria(ServerRequestInterface         $request, ResponseInterface $response,
-                                 Repository\Inmobiliaria          $inmobiliariaRepository,
+                                 Repository\Inmobiliaria        $inmobiliariaRepository,
-                                 Repository\Contabilidad\Banco    $bancoRepository,
+                                 Repository\Banco               $bancoRepository,
-                                 Repository\Inmobiliaria\Cuenta   $cuentaRepository,
+                                 Repository\Inmobiliaria\Cuenta $cuentaRepository,
-                                 Repository\Contabilidad\Deposito $dapRepository,
+                                 Repository\Deposito            $dapRepository,
-                                 int                              $inmobiliaria_rut): ResponseInterface
+                                 int                            $inmobiliaria_rut): ResponseInterface
     {
         $output = [
             'inmobiliaria_rut' => $inmobiliaria_rut,
@@ -33,10 +33,10 @@ class Depositos extends Ideal\Controller
         } catch (Implement\Exception\EmptyResult) {}
         return $this->withJson($response, $output);
     }
-    public function add(ServerRequestInterface           $request, ResponseInterface $response,
+    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\Inmobiliaria\Cuenta $cuentaRepository,
-                        Repository\Contabilidad\Deposito $dapRepository): ResponseInterface
+                        Repository\Deposito            $dapRepository): ResponseInterface
     {
         $body = $request->getParsedBody();
         $output = [

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,
+    public function detalles(ServerRequestInterface $request, ResponseInterface $response,
-                             Service\Contabilidad\Movimiento     $movimientoService,
+                             Service\Movimiento     $movimientoService,
-                             Repository\Contabilidad\CentroCosto $centroCostoRepository, int $movimiento_id): ResponseInterface
+                             Repository\CentroCosto $centroCostoRepository, int $movimiento_id): ResponseInterface
     {
         $body = $request->getParsedBody();
         $output = [

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

app/src/Controller/API/Nubox.php

@@ -1,12 +1,11 @@
 <?php
-namespace Incoviba\Controller\API\Contabilidad;
+namespace Incoviba\Controller\API;
 
 use DateTimeImmutable;
-use Incoviba\Common\Implement\Exception\HttpResponse;
-use Incoviba\Controller\API\withJson;
-use Incoviba\Service;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
+use Incoviba\Common\Implement\Exception\HttpResponse;
+use Incoviba\Service;
 
 class Nubox
 {

app/src/Controller/CentrosCostos.php

@@ -0,0 +1,32 @@
+<?php
+namespace Incoviba\Controller;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Incoviba\Repository;
+use Incoviba\Common\Alias\View;
+
+class CentrosCostos
+{
+    public function __invoke(ServerRequestInterface $request, ResponseInterface $response, View $view,
+                             Repository\CentroCosto $centroCostoRepository,
+                             Repository\TipoCentro $tipoCentroRepository,
+                             Repository\CategoriaCentro $categoriaCentroRepository,
+                             Repository\TipoCuenta $tipoCuentaRepository): ResponseInterface
+    {
+        $centrosCostos = $centroCostoRepository->fetchAll();
+        $tiposCentros = $tipoCentroRepository->fetchAll();
+        $categorias = $categoriaCentroRepository->fetchAll('descripcion');
+        $tiposCuentas = $tipoCuentaRepository->fetchAll();
+        return $view->render($response, 'contabilidad.centros_costos', compact('centrosCostos',
+            'tiposCentros', 'categorias', 'tiposCuentas'));
+    }
+    public function asignar(ServerRequestInterface $request, ResponseInterface $response, View $view,
+                            Repository\CentroCosto $centroCostoRepository,
+                            Repository\Inmobiliaria $inmobiliariaRepository): ResponseInterface
+    {
+        $centrosCostos = $centroCostoRepository->fetchAll();
+        $inmobiliarias = $inmobiliariaRepository->fetchAllActive('razon');
+        return $view->render($response, 'contabilidad.centros_costos.asignar', compact('centrosCostos', 'inmobiliarias'));
+    }
+}

app/src/Controller/Contabilidad.php

@@ -1,25 +1,25 @@
 <?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
 {
     use withRedis;
 
-    public function diaria(ServerRequestInterface              $request, ResponseInterface $response, View $view,
+    public function diaria(ServerRequestInterface $request, ResponseInterface $response, View $view,
-                           Service\Redis                       $redisService,
+                           Service\Redis $redisService,
-                           Repository\Inmobiliaria             $inmobiliariaRepository,
+                           Repository\Inmobiliaria $inmobiliariaRepository,
-                           Repository\Contabilidad\CentroCosto $centroCostoRepository): ResponseInterface
+                           Repository\CentroCosto $centroCostoRepository): ResponseInterface
     {
         $redisKey = 'inmobiliarias';
         $inmobiliarias = [];
@@ -27,17 +27,17 @@ class Contabilidad extends Controller
             $inmobiliarias = $this->fetchRedis($redisService, $redisKey);
         } catch (EmptyRedis) {
             try {
-                $inmobiliarias = $inmobiliariaRepository->fetchAll('razon');
+                $inmobiliarias = $inmobiliariaRepository->fetchAll();
                 $this->saveRedis($redisService, $redisKey, $inmobiliarias, 30 * 24 * 60 * 60);
             } catch (EmptyResult) {}
         }
         $centrosCostos = $centroCostoRepository->fetchAll();
         return $view->render($response, 'contabilidad.cartolas.diaria', compact('inmobiliarias', 'centrosCostos'));
     }
-    public function depositos(ServerRequestInterface           $request, ResponseInterface $response, View $view,
+    public function depositos(ServerRequestInterface  $request, ResponseInterface $response, View $view,
-                              Service\Redis                    $redisService,
+                              Service\Redis           $redisService,
-                              Repository\Inmobiliaria          $inmobiliariaRepository,
+                              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'));
@@ -73,13 +73,4 @@ class Contabilidad extends Controller
         $filename = "Informe de Tesorería {$fecha->format('d.m.Y')}";
         return $view->render($response, 'contabilidad.informes.tesoreria', compact('fecha', 'anterior', 'informes', 'filename'));
     }
-    public function cuadratura(ServerRequestInterface $request, ResponseInterface $response, View $view,
-                               Repository\Inmobiliaria $inmobiliariaRepository): ResponseInterface
-    {
-        $inmobiliarias = [];
-        try {
-            $inmobiliarias = $inmobiliariaRepository->fetchAll('razon');
-        } catch (EmptyResult) {}
-        return $view->render($response, 'contabilidad.cuadratura', compact('inmobiliarias'));
-    }
 }

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'));
-    }
-}

app/src/Controller/Inmobiliarias.php

@@ -20,8 +20,8 @@ class Inmobiliarias
         $inmobiliarias = [];
         try {
             $inmobiliarias = array_map(function($row) use ($inmobiliariaRepository) {
-                return $inmobiliariaRepository->load($row);
+                return $inmobiliariaRepository->load((array) $row);
-            }, $this->fetchRedis($redisService, $redisKey, true));
+            }, $this->fetchRedis($redisService, $redisKey));
         } catch (EmptyRedis) {
             try {
                 $inmobiliarias = $inmobiliariaRepository->fetchAll();

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
         ];
-
+        if ($user->validate($body['password'])) {
-        try {
+            $output['login'] = $service->login($user);
-            $user = $userRepository->fetchByName($body['name']);
+        }
-            if ($service->validateUser($user, $body['password'])) {
-                $output['login'] = $service->login($user);
-            }
-        } catch (EmptyResult) {}
         $response->getBody()->write(json_encode($output));
         return $response->withHeader('Content-Type', 'application/json');
     }

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
 {
@@ -98,28 +98,17 @@ class Ventas
         return $view->render($response, 'ventas.add', compact('regiones', 'proyectos'));
     }
     public function cuotas(ServerRequestInterface $request, ResponseInterface $response, Service\Venta $ventaService,
-                           Repository\Venta $ventaRepository,
                            View $view, int $venta_id): ResponseInterface
     {
         $venta = $ventaService->getById($venta_id);
-        $asociadas = [];
+        return $view->render($response, 'ventas.pies.cuotas', compact('venta'));
-        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);
-            }
-        }
-        return $view->render($response, 'ventas.pies.cuotas', compact('venta', 'asociadas'));
     }
-    public function escriturar(ServerRequestInterface        $request, ResponseInterface $response, Service\Venta $ventaService,
+    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'));

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
+                         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'));
     }

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'));

app/src/Controller/Ventas/Escrituras.php

@@ -1,11 +1,11 @@
 <?php
 namespace Incoviba\Controller\Ventas;
 
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
 use Incoviba\Common\Alias\View;
 use Incoviba\Repository;
 use Incoviba\Service;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
 
 class Escrituras
 {
@@ -22,8 +22,8 @@ class Escrituras
         return $view->render($response, 'ventas.escrituras.informe', compact('venta'));
     }
     public function add(ServerRequestInterface $request, ResponseInterface $response, View $view,
-                        Service\Venta          $ventaService, Repository\Contabilidad\Banco $bancoRepository,
+                        Service\Venta $ventaService, Repository\Banco $bancoRepository,
-                        int                    $venta_id): ResponseInterface
+                        int $venta_id): ResponseInterface
     {
         $venta = $ventaService->getById($venta_id);
         $bancos = $bancoRepository->fetchAll('nombre');

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,
+    public function cuotas(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\Pie $pieService, Repository\Venta $ventaRepository, Repository\Banco $bancoRepository, View $view, int $pie_id): ResponseInterface
-                           Repository\Venta $ventaRepository, Repository\Contabilidad\Banco $bancoRepository,
-                           View $view, int $pie_id): ResponseInterface
     {
         $pie = $pieService->getById($pie_id);
         $venta = $ventaRepository->fetchByPie($pie_id);
         $bancos = $bancoRepository->fetchAll();
-        usort($bancos, function(Model\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'));
     }
 }

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
     {

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,
+    public function __construct(protected ResponseFactoryInterface $responseFactory, protected string $key) {}
-                                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);
-    }
 }

app/src/Middleware/Authentication.php

@@ -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;

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);
-    }
-}

app/src/Model/Banco.php

@@ -1,5 +1,5 @@
 <?php
-namespace Incoviba\Model\Contabilidad;
+namespace Incoviba\Model;
 
 use Incoviba\Common\Ideal\Model;
 

app/src/Model/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
 {

app/src/Model/CategoriaCentro.php

@@ -0,0 +1,5 @@
+<?php
+namespace Incoviba\Model;
+
+class CategoriaCentro extends Tipo
+{}

app/src/Model/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
 {

app/src/Model/Contabilidad/CategoriaCentro.php

@@ -1,7 +0,0 @@
-<?php
-namespace Incoviba\Model\Contabilidad;
-
-use Incoviba\Model\Tipo;
-
-class CategoriaCentro extends Tipo
-{}

app/src/Model/Contabilidad/TipoCentro.php

@@ -1,7 +0,0 @@
-<?php
-namespace Incoviba\Model\Contabilidad;
-
-use Incoviba\Model\Tipo;
-
-class TipoCentro extends Tipo
-{}

app/src/Model/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
 {

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 ?? ''
         ];
     }

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(), [

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
-        ]);
-    }
-}

app/src/Model/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');
-                $this->detalles = $this->runFactory('detalles');
-            } catch (EmptyResult) {
-                $this->detalles = null;
-            }
         }
         return $this->detalles;
     }

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\Movimiento $movimiento;
-    public ?Model\Contabilidad\CentroCosto $centroCosto;
+    public ?Model\CentroCosto $centroCosto;
     public ?string $detalle;
 
     public function jsonSerialize(): mixed

app/src/Model/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
 {

app/src/Model/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
 {

app/src/Model/TipoCentro.php

@@ -0,0 +1,5 @@
+<?php
+namespace Incoviba\Model;
+
+class TipoCentro extends Tipo
+{}

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);
     }
 

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
 {

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
 {

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
     {

app/src/Repository/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
     {

app/src/Repository/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')]);
-    }
 }

app/src/Repository/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();
     }
 }

app/src/Repository/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()

app/src/Repository/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);
     }

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);
     }

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,
+    public function __construct(Define\Connection $connection,
-                                protected Repository\Inmobiliaria       $inmobiliariaRepository,
+                                protected Repository\Inmobiliaria $inmobiliariaRepository,
-                                protected Repository\Contabilidad\Banco $bancoRepository)
+                                protected Repository\Banco $bancoRepository)
     {
         parent::__construct($connection);
         $this->setTable('cuenta');

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]);
-    }
-}

app/src/Repository/Movimiento.php

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

app/src/Repository/Movimiento/Detalle.php

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

app/src/Repository/Nubox.php

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

app/src/Repository/PagoCentroCosto.php

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

app/src/Repository/TipoCentro.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 TipoCentro extends Tipo
 {
@@ -15,6 +14,6 @@ class TipoCentro extends Tipo
 
     protected function getBlank(): Define\Model
     {
-        return new Model\Contabilidad\TipoCentro();
+        return new Model\TipoCentro();
     }
 }

app/src/Repository/Venta.php

@@ -132,9 +132,9 @@ class Venta extends Ideal\Repository
             ['propietario', 'propiedad', 'pie', 'bono_pie', 'credito', 'escritura', 'subsidio', 'escriturado',
                 'entrega', 'entregado', 'fecha', 'valor_uf', 'estado', 'fecha_ingreso', 'avalchile', 'agente', 'uf',
                 'relacionado', 'promocion', 'resciliacion', 'devolucion'],
-            [$model->propietario()->rut, $model->propiedad()->id, $model->formaPago()?->pie?->id, $model->formaPago()?->bonoPie?->id,
+            [$model->propietario()->rut, $model->propiedad()->id, $model->formaPago()->pie?->id, $model->formaPago()->bonoPie?->id,
-                $model->formaPago()?->credito?->id, $model->formaPago()?->escritura?->id, $model->formaPago()?->subsidio?->id,
+                $model->formaPago()->credito?->id, $model->formaPago()->escritura?->id, $model->formaPago()->subsidio?->id,
-                $model->formaPago()?->escritura !== null ? $model->formaPago()?->escritura->pago->fecha->format('Y-m-d') : null,
+                $model->formaPago()->escritura !== null ? $model->formaPago()->escritura->pago->fecha->format('Y-m-d') : null,
                 null, null, $model->fecha->format('Y-m-d'), $model->valor, 1, $model->fechaIngreso->format('Y-m-d'),
                 null, null, $model->uf, $model->relacionado ? 1 : 0, null, null, null]
         );

app/src/Repository/Venta/Cuota.php

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

app/src/Repository/Venta/Pago.php

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

app/src/Repository/Venta/Propiedad.php

@@ -18,23 +18,22 @@ class Propiedad extends Ideal\Repository
     public function create(?array $data = null): Model\Venta\Propiedad
     {
         $map = (new Implement\Repository\MapperParser())
+            ->register('unidad_principal', (new Implement\Repository\Mapper())
+                ->setProperty('unidades')
+                ->setFunction(function($data) {
+                    if (isset($data['id'])) {
+                        return $this->unidadService->getByPropiedad($data['id']);
+                    }
+                    return [$this->unidadService->getById($data['unidad_principal'])];
+                }))
             ->register('estado', new Implement\Repository\Mapper\Boolean('estado'));
         return $this->parseData(new Model\Venta\Propiedad(), $data, $map);
     }
-    public function load(array $data_row): Define\Model
-    {
-        $propiedad = parent::load($data_row);
-        if (isset($propiedad->id)) {
-            $propiedad->unidades = $this->unidadService->getByPropiedad($propiedad->id);
-        }
-        return $propiedad;
-    }
-
     public function save(Define\Model $model): Model\Venta\Propiedad
     {
         $model->id = $this->saveNew(
             ['unidad_principal', 'estacionamientos', 'bodegas', 'estado'],
-            [null,
+            [$model->departamentos()[0]->id,
                 implode(',', array_map(function(Model\Venta\Unidad $unidad) {return $unidad->id;}, $model->estacionamientos())),
                 implode(',', array_map(function(Model\Venta\Unidad $unidad) {return $unidad->id;}, $model->bodegas())),
                 1]

app/src/Service/Cartola.php

@@ -1,27 +1,28 @@
 <?php
-namespace Incoviba\Service\Contabilidad;
+namespace Incoviba\Service;
 
-use DateTimeImmutable;
 use DateTimeInterface;
-use Incoviba\Common\Define\Cartola\Banco;
+use DateTimeImmutable;
-use Incoviba\Common\Define\Contabilidad\Exporter;
+use DateInterval;
-use Incoviba\Common\Ideal\Service;
-use Incoviba\Common\Implement\Exception;
-use Incoviba\Model;
-use Incoviba\Repository;
 use Psr\Http\Message\StreamFactoryInterface;
 use Psr\Http\Message\UploadedFileInterface;
 use Psr\Log\LoggerInterface;
+use Incoviba\Common\Ideal\Service;
+use Incoviba\Common\Define\Cartola\Banco;
+use Incoviba\Common\Define\Contabilidad\Exporter;
+use Incoviba\Common\Implement\Exception;
+use Incoviba\Model;
+use Incoviba\Repository;
 
 class Cartola extends Service
 {
-    public function __construct(LoggerInterface                              $logger,
+    public function __construct(LoggerInterface $logger,
-                                protected StreamFactoryInterface             $streamFactory, protected Exporter $exporter,
+                                protected StreamFactoryInterface $streamFactory, protected Exporter $exporter,
-                                protected Repository\Inmobiliaria            $inmobiliariaRepository,
+                                protected Repository\Inmobiliaria $inmobiliariaRepository,
-                                protected Repository\Inmobiliaria\Cuenta     $cuentaRepository,
+                                protected Repository\Inmobiliaria\Cuenta $cuentaRepository,
-                                protected Repository\Contabilidad\Movimiento $movimientoRepository,
+                                protected Repository\Movimiento $movimientoRepository,
-                                protected Movimiento                         $movimientoService,
+                                protected Movimiento $movimientoService,
-                                protected Repository\Contabilidad\Cartola    $cartolaRepository) {
+                                protected Repository\Cartola $cartolaRepository) {
         parent::__construct($logger);
     }
 
@@ -31,11 +32,11 @@ class Cartola extends Service
         $this->bancos[$name] = $banco;
         return $this;
     }
-    public function process(Model\Inmobiliaria $inmobiliaria, Model\Contabilidad\Banco $banco, DateTimeInterface $mes, UploadedFileInterface $file): array
+    public function process(Model\Inmobiliaria $inmobiliaria, Model\Banco $banco, DateTimeInterface $mes, UploadedFileInterface $file): array
     {
         return $this->bancos[strtolower($banco->nombre)]->process($file);
     }
-    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
     {
         return $this->exporter->export($inmobiliaria, $banco, $mes, $movimientos);
     }
@@ -43,29 +44,27 @@ class Cartola extends Service
     {
         $ms = $this->getMovimientosDiarios($cuenta->banco, $file);
 
-        $this->groupedMovimientos = [];
+        $cartolaData = [
+            'cargos' => 0,
+            'abonos' => 0,
+            'saldo' => 0
+        ];
         $movimientos = [];
         foreach ($ms as $m) {
             $movimiento = $this->buildMovimiento($cuenta, $m);
             $movimiento = $this->movimientoService->process($movimiento);
-            $this->groupMovimientoByDay($movimiento);
+
             if ($movimiento->fecha->getTimestamp() === $fecha->getTimestamp()) {
                 $movimientos []= $movimiento;
-            }
-        }
-        foreach ($this->groupedMovimientos as $timestamp => $movimientos) {
-            $cartolaData = [
-                'cargos' => 0,
-                'abonos' => 0,
-                'saldo' => end($movimientos)->saldo
-            ];
-            foreach ($movimientos as $movimiento) {
                 $cartolaData['cargos'] += $movimiento->cargo;
                 $cartolaData['abonos'] += $movimiento->abono;
             }
-            $this->buildCartola($cuenta, end($movimientos)->fecha, $cartolaData);
+            if ($movimiento->fecha->getTimestamp() > $fecha->getTimestamp()) {
+                continue;
+            }
+            $cartolaData['saldo'] = $movimiento->saldo;
         }
-        $cartola = $this->cartolaRepository->fetchByCuentaAndFecha($cuenta->id, $fecha);
+        $cartola = $this->buildCartola($cuenta, $fecha, $cartolaData);
         return compact('cartola', 'movimientos');
     }
     public function diariaManual(Model\Inmobiliaria\Cuenta $cuenta, DateTimeInterface $fecha, array $data): array
@@ -92,21 +91,12 @@ class Cartola extends Service
         return compact('cartola', 'movimientos');
     }
 
-    protected function getMovimientosDiarios(Model\Contabilidad\Banco $banco, UploadedFileInterface $file): array
+    protected function getMovimientosDiarios(Model\Banco $banco, UploadedFileInterface $file): array
     {
         $movimientos = $this->bancos[strtolower($banco->nombre)]->process($file);
         return $this->bancos[strtolower($banco->nombre)]->processMovimientosDiarios($movimientos);
     }
-    protected array $groupedMovimientos = [];
+    protected function buildCartola(Model\Inmobiliaria\Cuenta $cuenta, DateTimeInterface $fecha, array $data): Model\Cartola
-    protected function groupMovimientoByDay(Model\Contabilidad\Movimiento $movimiento): Cartola
-    {
-        if (!isset($this->groupedMovimientos[$movimiento->fecha->getTimestamp()])) {
-            $this->groupedMovimientos[$movimiento->fecha->getTimestamp()] = [];
-        }
-        $this->groupedMovimientos[$movimiento->fecha->getTimestamp()] []= $movimiento;
-        return $this;
-    }
-    protected function buildCartola(Model\Inmobiliaria\Cuenta $cuenta, DateTimeInterface $fecha, array $data): Model\Contabilidad\Cartola
     {
         try {
             return $this->cartolaRepository->fetchByCuentaAndFecha($cuenta->id, $fecha);
@@ -117,7 +107,7 @@ class Cartola extends Service
             return $this->cartolaRepository->save($cartola);
         }
     }
-    protected function buildMovimiento(Model\Inmobiliaria\Cuenta $cuenta, array $data): Model\Contabilidad\Movimiento
+    protected function buildMovimiento(Model\Inmobiliaria\Cuenta $cuenta, array $data): Model\Movimiento
     {
         try {
             return $this->movimientoRepository
@@ -131,12 +121,7 @@ class Cartola extends Service
         } catch (Exception\EmptyResult $exception) {
             $data['cuenta_id'] = $cuenta->id;
             $movimiento = $this->movimientoRepository->create($data);
-            try {
+            return $this->movimientoRepository->save($movimiento);
-                return $this->movimientoRepository->save($movimiento);
-            } catch (\PDOException $exception) {
-                $this->logger->critical(var_export($data,true));
-                throw $exception;
-            }
         }
     }
 }

app/src/Service/Cartola/Itau.php

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

app/src/Service/Cartola/Santander.php

@@ -1,14 +1,16 @@
 <?php
-namespace Incoviba\Service\Contabilidad\Cartola;
+namespace Incoviba\Service\Cartola;
 
-use Incoviba\Common\Ideal\Cartola\Banco;
+use DateTimeImmutable;
-use PhpOffice\PhpSpreadsheet;
 use Psr\Http\Message\UploadedFileInterface;
+use PhpOffice\PhpSpreadsheet;
+use Incoviba\Common\Ideal\Cartola\Banco;
 
 class Santander extends Banco
 {
     protected function columnMap(): array
     {
+        // MONTO	DESCRIPCIÓN MOVIMIENTO		FECHA	N° DOCUMENTO	SUCURSAL		CARGO/ABONO
         return [
             'cargo' => 'cargo',
             'abono' => 'abono',
@@ -23,26 +25,17 @@ class Santander extends Banco
             'Saldo Diario' => 'saldo'
         ];
     }
-    protected function getFilename(UploadedFileInterface $uploadedFile): string
+    protected function parseFile(UploadedFileInterface $uploadedFile): array
     {
-        $start = $uploadedFile->getStream()->read(10);
+        $filename = '/tmp/cartola.xlsx';
-        if (str_starts_with($start, '<')) {
+        $uploadedFile->moveTo($filename);
-            return '/tmp/cartola.html';
-        }
-        return '/tmp/cartola.xlsx';
-    }
 
-    protected function parseFile(string $filename): array
-    {
-        if (str_ends_with($filename, 'xlsx')) {
-            return $this->parseXlsx($filename);
-        }
-        return $this->parseHtml($filename);
-    }
-    protected function parseXlsx(string $filename): array
-    {
         $reader = PhpSpreadsheet\IOFactory::createReader('Xlsx');
-        $xlsx = $reader->load($filename);
+        try {
+            $xlsx = $reader->load($filename);
+        } catch (PhpSpreadsheet\Reader\Exception) {
+            return $this->parseHtml($filename);
+        }
         $sheet = $xlsx->getActiveSheet();
 
         $found = false;
@@ -72,7 +65,7 @@ class Santander extends Banco
                 if ($mapped === 'fecha') {
                     $value = implode('-', array_reverse(explode('/', $value)));
                 }
-                if ($column === 'MONTO' or $column === 'SALDO') {
+                if ($column === 'MONTO') {
                     $value = (int) $value;
                 }
                 $rowData[$column] = $value;
@@ -88,7 +81,7 @@ class Santander extends Banco
             $data []= $rowData;
         }
 
-        return array_reverse($data);
+        return $data;
     }
     protected function parseHtml(string $filename): array
     {
@@ -115,11 +108,11 @@ class Santander extends Banco
             foreach (['Cargo ($)', 'Abono ($)', 'Saldo Diario'] as $column) {
                 $row[$column] = (int) str_replace('.', '', $row[$column]);
             }
+            $row['Saldo Diario'] -= ($row['Abono ($)'] - $row['Cargo ($)']);
             $row['N° DOCUMENTO'] = '';
             $data []= $row;
         }
-
+        return $data;
-        return array_reverse($data);
     }
     protected function parseHtmlRow(array $lines, int &$rowIndex): array
     {

app/src/Service/Cartola/Security.php

@@ -1,11 +1,11 @@
 <?php
-namespace Incoviba\Service\Contabilidad\Cartola;
+namespace Incoviba\Service\Cartola;
 
-use DateTimeImmutable;
 use DOMDocument;
-use Incoviba\Common\Ideal\Cartola\Banco;
+use DateTimeImmutable;
-use PhpOffice\PhpSpreadsheet;
 use Psr\Http\Message\UploadedFileInterface;
+use PhpOffice\PhpSpreadsheet;
+use Incoviba\Common\Ideal\Cartola\Banco;
 
 class Security extends Banco
 {
@@ -16,21 +16,14 @@ class Security extends Banco
         return $movimientos;
     }
 
-    protected function getFilename(UploadedFileInterface $uploadedFile): string
+    protected function parseFile(UploadedFileInterface $uploadedFile): array
     {
         $stream = $uploadedFile->getStream();
         $stream->seek(3);
         if ($stream->read(strlen('table')) === 'table') {
-            return '/tmp/cartola.htm';
+            return $this->processHtm($uploadedFile);
         }
-        return '/tmp/cartola.xls';
+        return $this->processXls($uploadedFile);
-    }
-    protected function parseFile(string $filename): array
-    {
-        if (str_ends_with($filename, '.htm')) {
-            return $this->processHtm($filename);
-        }
-        return $this->processXls($filename);
     }
     protected function columnMap(): array
     {
@@ -45,8 +38,10 @@ class Security extends Banco
         ];
     }
 
-    private function processXls(string $filename): array
+    private function processXls(UploadedFileInterface $file): array
     {
+        $filename = '/tmp/cartola.xls';
+        $file->moveTo($filename);
         $xlsx = @PhpSpreadsheet\IOFactory::load($filename);
         $worksheet = $xlsx->getActiveSheet();
         $rows = $worksheet->getRowIterator(3);
@@ -87,10 +82,14 @@ class Security extends Banco
                 $data []= $rowData;
             }
         }
+        unlink($filename);
         return $data;
     }
-    private function processHtm(string $filename): array
+    private function processHtm(UploadedFileInterface $file): array
     {
+        $filename = '/tmp/cartola.htm';
+        $file->moveTo($filename);
+
         $domDocument = new DOMDocument();
         $domDocument->loadHTML('<body>' . file_get_contents($filename) . '</body>');
 
@@ -123,6 +122,7 @@ class Security extends Banco
             }
             $data []= $rowData;
         }
+
         return $data;
     }
 }

app/src/Service/Contabilidad/Cartola/BCI.php

@@ -1,86 +0,0 @@
-<?php
-namespace Incoviba\Service\Contabilidad\Cartola;
-
-use Incoviba\Common\Ideal\Cartola\Banco;
-use PhpOffice\PhpSpreadsheet;
-use Psr\Http\Message\UploadedFileInterface;
-
-class BCI extends Banco
-{
-    protected function columnMap(): array
-    {
-        return [
-            'Fecha Transacción' => 'fecha',
-            'Cargo $ (-)' => 'cargo',
-            'Abono $ (+)' => 'abono',
-            'Descripción' => 'glosa',
-            'Saldo' => 'saldo'
-        ];
-    }
-    protected function getFilename(UploadedFileInterface $uploadedFile): string
-    {
-        return '/tmp/cartola.xlsx';
-    }
-    protected function parseFile(string $filename): array
-    {
-        $xlsx = @PhpSpreadsheet\IOFactory::load($filename);
-        $worksheet = $xlsx->getActiveSheet();
-        $rows = $worksheet->getRowIterator();
-
-        $rows->seek(3);
-        $row = $rows->current();
-        $columnIterator = $row->getColumnIterator();
-        $saldoFinal = 0;
-        foreach ($columnIterator as $column) {
-            if ($column->getValue() === null) {
-                continue;
-            }
-            if ($column->getCalculatedValue() === 'Saldo Contable') {
-                $columnIterator->next();
-                $column = $columnIterator->current();
-                $saldoFinal = (int) str_replace('.', '', $column->getCalculatedValue());
-                break;
-            }
-        }
-        $saldo = $saldoFinal;
-
-        $data = [];
-        $columns = [];
-        $dataFound = false;
-        foreach ($rows as $row) {
-            if (!$dataFound and $worksheet->getCell([1, $row->getRowIndex()])->getCalculatedValue() !== null
-                    and trim($worksheet->getCell([1, $row->getRowIndex()])->getCalculatedValue()) === 'Fecha Contable') {
-                $dataFound = true;
-                $columns = $this->getRowData($row);
-                continue;
-            }
-            if (!$dataFound) {
-                continue;
-            }
-            if ($worksheet->getCell([1, $row->getRowIndex()])->getValue() === null) {
-                break;
-            }
-            $rowData = $this->getRowData($row);
-            $rowData = array_combine($columns, $rowData);
-            $rowData['Fecha Transacción'] = implode('-', array_reverse(explode('/', $rowData['Fecha Transacción'])));
-            $rowData['Cargo $ (-)'] = (int) str_replace('.', '', $rowData['Cargo $ (-)'] ?? 0);
-            $rowData['Abono $ (+)'] = (int) str_replace('.', '', $rowData['Abono $ (+)'] ?? 0);
-            $rowData['Saldo'] = $saldo;
-            $saldo = $saldo + $rowData['Cargo $ (-)'] - $rowData['Abono $ (+)'];
-            unset($rowData['']);
-
-            $data []= $rowData;
-        }
-        return array_reverse($data);
-    }
-
-    protected function getRowData(PhpSpreadsheet\Worksheet\Row $row): array
-    {
-        $data = [];
-        $cells = $row->getColumnIterator();
-        foreach ($cells as $cell) {
-            $data []= $cell->getCalculatedValue();
-        }
-        return $data;
-    }
-}

app/src/Service/Contabilidad/Exporter/Nubox.php

@@ -10,9 +10,9 @@ use PhpOffice\PhpSpreadsheet;
 
 class Nubox implements Exporter
 {
-    public function __construct(protected Repository\Contabilidad\CentroCosto $centroCostoRepository, protected string $uploadFolder) {}
+    public function __construct(protected Repository\CentroCosto $centroCostoRepository, protected string $uploadFolder) {}
 
-    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
     {
         PhpSpreadsheet\Settings::setLocale('es-CL');
         $workbook = new PhpSpreadsheet\Spreadsheet();

app/src/Service/Contabilidad/Informe/Tesoreria.php

@@ -1,25 +1,26 @@
 <?php
 namespace Incoviba\Service\Contabilidad\Informe;
 
-use DateInterval;
 use DateTimeInterface;
+use DateInterval;
+use Psr\Log\LoggerInterface;
+use PhpOffice\PhpSpreadsheet;
 use Incoviba\Common\Ideal;
 use Incoviba\Common\Implement;
 use Incoviba\Model;
 use Incoviba\Repository;
 use Incoviba\Service;
-use Psr\Log\LoggerInterface;
 
 class Tesoreria extends Ideal\Service
 {
-    public function __construct(LoggerInterface                                        $logger,
+    public function __construct(LoggerInterface $logger,
-                                protected Repository\Inmobiliaria                      $inmobiliariaRepository,
+                                protected Repository\Inmobiliaria $inmobiliariaRepository,
-                                protected Service\Inmobiliaria\Cuenta                  $cuentaService,
+                                protected Repository\Inmobiliaria\Cuenta $cuentaRepository,
-                                protected Repository\Contabilidad\Deposito             $depositoRepository,
+                                protected Repository\Deposito $depositoRepository,
-                                protected Repository\Contabilidad\Cartola              $cartolaRepository,
+                                protected Repository\Cartola $cartolaRepository,
-                                protected Repository\Contabilidad\Movimiento           $movimientoRepository,
+                                protected Repository\Movimiento $movimientoRepository,
                                 protected Service\Contabilidad\Informe\Tesoreria\Excel $excelService,
-                                protected Service\Contabilidad\Informe\Tesoreria\PDF   $pdfService)
+                                protected Service\Contabilidad\Informe\Tesoreria\PDF $pdfService)
     {
         parent::__construct($logger);
 
@@ -169,7 +170,7 @@ class Tesoreria extends Ideal\Service
         };
         $dataInmobiliaria->inmobiliaria = $inmobiliaria;
         try {
-            $cuentas = $this->cuentaService->getAllActiveByInmobiliaria($inmobiliaria->rut);
+            $cuentas = $this->cuentaRepository->fetchByInmobiliaria($inmobiliaria->rut);
         } catch (Implement\Exception\EmptyResult) {
             return $dataInmobiliaria;
         }
@@ -227,25 +228,23 @@ class Tesoreria extends Ideal\Service
                     }
                 }
             } catch (Implement\Exception\EmptyResult) {}
-            $anterior = $this->getAnterior($fecha);
             try {
-                $cartola = $this->cartolaRepository->fetchLastByCuentaAndFecha($cuenta->id, $fecha);
+                $cartola = $this->cartolaRepository->fetchByCuentaAndFecha($cuenta->id, $fecha);
                 $data->actual = $cartola->saldo;
-                //$anterior = $this->getAnterior($cartola->fecha);
             } catch (Implement\Exception\EmptyResult) {}
             try {
-                $cartola = $this->cartolaRepository->fetchLastByCuentaAndFecha($cuenta->id, $anterior);
+                $cartola = $this->cartolaRepository->fetchByCuentaAndFecha($cuenta->id, $this->getAnterior($fecha));
                 $data->anterior = $cartola->saldo;
             } catch (Implement\Exception\EmptyResult) {}
             if ($data->diferencia() !== 0) {
                 try {
                     $movimientos = $this->movimientoRepository->fetchByCuentaAndFecha($cuenta->id, $fecha);
                     $this->addMovimientos(self::INGRESOS,
-                        array_filter($movimientos, function(Model\Contabilidad\Movimiento $movimiento) {
+                        array_filter($movimientos, function(Model\Movimiento $movimiento) {
                             return $movimiento->abono > 0;
                         }));
                     $this->addMovimientos(self::EGRESOS,
-                        array_filter($movimientos, function(Model\Contabilidad\Movimiento $movimiento) {
+                        array_filter($movimientos, function(Model\Movimiento $movimiento) {
                             return $movimiento->cargo > 0;
                         }));
                 } catch (Implement\Exception\EmptyResult) {}
@@ -290,4 +289,5 @@ class Tesoreria extends Ideal\Service
         $this->totales->{$tipo} += $total;
         return $this;
     }
+
 }

app/src/Service/Contabilidad/Nubox.php

@@ -2,24 +2,24 @@
 namespace Incoviba\Service\Contabilidad;
 
 use DateTimeInterface;
-use Incoviba\Common\Ideal;
-use Incoviba\Common\Implement\Exception;
-use Incoviba\Repository;
-use Incoviba\Service;
 use Psr\Http\Client\ClientInterface;
 use Psr\Http\Message\RequestFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\StreamInterface;
 use Psr\Log\LoggerInterface;
+use Incoviba\Common\Implement\Exception;
+use Incoviba\Repository;
+use Incoviba\Service;
+use Incoviba\Common\Ideal;
 
 class Nubox extends Ideal\Service
 {
-    public function __construct(protected LoggerInterface               $logger,
+    public function __construct(protected LoggerInterface $logger,
-                                protected Repository\Contabilidad\Nubox $nuboxRepository,
+                                protected Repository\Nubox $nuboxRepository,
-                                protected Service\Redis                 $redisService,
+                                protected Service\Redis $redisService,
-                                protected ClientInterface               $client,
+                                protected ClientInterface $client,
-                                protected RequestFactoryInterface       $requestFactory,
+                                protected RequestFactoryInterface $requestFactory,
-                                protected string                        $api_url)
+                                protected string $api_url)
     {
         parent::__construct($logger);
     }

app/src/Service/Inmobiliaria/Cuenta.php

@@ -1,56 +0,0 @@
-<?php
-namespace Incoviba\Service\Inmobiliaria;
-
-use DateTimeImmutable;
-use Psr\Log\LoggerInterface;
-use Incoviba\Common\Ideal\Service;
-use Incoviba\Common\Implement;
-use Incoviba\Model;
-use Incoviba\Repository;
-
-class Cuenta extends Service
-{
-    public function __construct(LoggerInterface $logger, protected Repository\Inmobiliaria\Cuenta $cuentaRepository,
-                                protected Repository\Inmobiliaria\Cuenta\Estado $estadoRepository)
-    {
-        parent::__construct($logger);
-    }
-
-    public function getAllActive(): array
-    {
-        $cuentas = array_map([$this, 'process'], $this->cuentaRepository->fetchAll());
-        return array_values(array_filter($cuentas, function(Model\Inmobiliaria\Cuenta $cuenta) {
-            return $cuenta->currentEstado()->active;
-        }));
-    }
-    public function getAllActiveByInmobiliaria(int $inmobiliaria_rut): array
-    {
-        $cuentas = array_map([$this, 'process'], $this->cuentaRepository->fetchByInmobiliaria($inmobiliaria_rut));
-        return array_values(array_filter($cuentas, function(Model\Inmobiliaria\Cuenta $cuenta) {
-            return $cuenta->currentEstado()->active;
-        }));
-    }
-    public function add(array $data): Model\Inmobiliaria\Cuenta
-    {
-        $cuenta = $this->cuentaRepository->create($data);
-        $cuenta = $this->cuentaRepository->save($cuenta);
-        $dataEstado = [
-            'cuenta_id' => $cuenta->id,
-            'fecha' => new DateTimeImmutable(),
-            'active' => true
-        ];
-        $estado = $this->estadoRepository->create($dataEstado);
-        $this->estadoRepository->save($estado);
-        return $this->process($cuenta);
-    }
-
-    protected function process(Model\Inmobiliaria\Cuenta $cuenta): Model\Inmobiliaria\Cuenta
-    {
-        $cuenta->addFactory('estados', (new Implement\Repository\Factory())
-            ->setCallable(function($cuenta_id) {
-                return $this->estadoRepository->fetchByCuenta($cuenta_id);
-            })
-            ->setArgs(['cuenta_id' => $cuenta->id]));
-        return $cuenta;
-    }
-}

app/src/Service/Login.php

@@ -47,24 +47,7 @@ class Login
         }
         return $login->user;
     }
-    public function getToken(): string
+
-    {
-        return implode($this->cookie_separator, [$this->selector, $this->token]);
-    }
-    public function getSeparator(): string
-    {
-        return $this->cookie_separator;
-    }
-    public function validateUser(Model\User $user, string $encryptedPassword): bool
-    {
-        list($passphrase, $encrypted) = $this->splitPassword($encryptedPassword);
-        try {
-            $password = $this->cryptoJs_aes_decrypt($encrypted, $passphrase);
-        } catch (Exception) {
-            return false;
-        }
-        return $user->validate($password);
-    }
     public function login(Model\User $user): bool
     {
         try {
@@ -114,10 +97,6 @@ class Login
             return;
         }
         $cookie = $_COOKIE[$this->cookie_name];
-        if (!str_contains($cookie, $this->cookie_separator)) {
-            $this->removeCookie();
-            return;
-        }
         list($this->selector, $this->token) = explode($this->cookie_separator, $cookie);
     }
     protected function saveCookie(string $selector, string $token, DateTimeInterface $expires): void
@@ -125,12 +104,9 @@ class Login
         setcookie(
             $this->cookie_name,
             implode($this->cookie_separator, [$selector, $token]),
-            [
+            $expires->getTimestamp(),
-                'expires' => $expires->getTimestamp(),
+            $this->path,
-                'path' => $this->path,
+            $this->domain
-                'domain' => $this->domain,
-                'samesite' => 'Strict'
-            ]
         );
         $this->selector = $selector;
         $this->token = $token;
@@ -150,70 +126,10 @@ class Login
     {
         return password_verify($this->token, $login->token);
     }
-    protected function generateToken(Model\Login $login): array
+    protected function generateToken(Model\Login $login)
     {
         $selector = bin2hex(random_bytes(12));
         $token = bin2hex(random_bytes(20));
         return ['selector' => $selector, 'token' => $token];
     }
-
-    protected function splitPassword(string $input): array
-    {
-        $ini = strpos($input, 'U');
-        $passphrase = substr($input, 0, $ini);
-        $message = substr($input, $ini);
-        return [$passphrase, $message];
-    }
-    protected function cryptoJs_aes_decrypt($data, $key): string
-    {
-        $data = base64_decode($data);
-        if (substr($data, 0, 8) != "Salted__") {
-            return false;
-        }
-        $salt = substr($data, 8, 8);
-        $keyAndIV = $this->aes_evpKDF($key, $salt);
-        $decrypted = openssl_decrypt(
-            substr($data, 16),
-            "aes-256-cbc",
-            $keyAndIV["key"],
-            OPENSSL_RAW_DATA, // base64 was already decoded
-            $keyAndIV["iv"]
-        );
-        if ($decrypted === false) {
-            throw new Exception();
-        }
-        return $decrypted;
-    }
-    protected function aes_evpKDF($password, $salt, $keySize = 8, $ivSize = 4, $iterations = 1, $hashAlgorithm = "md5"): array
-    {
-        $targetKeySize = $keySize + $ivSize;
-        $derivedBytes = "";
-        $numberOfDerivedWords = 0;
-        $block = NULL;
-        $hasher = hash_init($hashAlgorithm);
-        while ($numberOfDerivedWords < $targetKeySize) {
-            if ($block != NULL) {
-                hash_update($hasher, $block);
-            }
-            hash_update($hasher, $password);
-            hash_update($hasher, $salt);
-            $block = hash_final($hasher, TRUE);
-            $hasher = hash_init($hashAlgorithm);
-
-            // Iterations
-            for ($i = 1; $i < $iterations; $i++) {
-                hash_update($hasher, $block);
-                $block = hash_final($hasher, TRUE);
-                $hasher = hash_init($hashAlgorithm);
-            }
-
-            $derivedBytes .= substr($block, 0, min(strlen($block), ($targetKeySize - $numberOfDerivedWords) * 4));
-
-            $numberOfDerivedWords += strlen($block) / 4;
-        }
-        return array(
-            "key" => substr($derivedBytes, 0, $keySize * 4),
-            "iv"  => substr($derivedBytes, $keySize * 4, $ivSize * 4)
-        );
-    }
 }

app/src/Service/Movimiento.php

@@ -1,26 +1,26 @@
 <?php
-namespace Incoviba\Service\Contabilidad;
+namespace Incoviba\Service;
 
+use DateTimeInterface;
+use Psr\Log\LoggerInterface;
 use Incoviba\Common\Ideal\Service;
 use Incoviba\Common\Implement;
-use Incoviba\Model;
 use Incoviba\Repository;
-use Psr\Log\LoggerInterface;
+use Incoviba\Model;
 
 class Movimiento extends Service
 {
-    public function __construct(LoggerInterface                         $logger,
+    public function __construct(LoggerInterface $logger, protected Repository\Movimiento $movimientoRepository,
-                                protected Repository\Contabilidad\Movimiento $movimientoRepository,
                                 protected Repository\Movimiento\Detalle $detalleRepository)
     {
         parent::__construct($logger);
     }
 
-    public function getById(int $movimiento_id): Model\Contabilidad\Movimiento
+    public function getById(int $movimiento_id): Model\Movimiento
     {
         return $this->process($this->movimientoRepository->fetchById($movimiento_id));
     }
-    public function setDetalles(Model\Contabilidad\Movimiento $movimiento, array $data): Model\Contabilidad\Movimiento
+    public function setDetalles(Model\Movimiento $movimiento, array $data): Model\Movimiento
     {
         try {
             $detalles = $this->detalleRepository->fetchByMovimiento($movimiento->id);
@@ -33,7 +33,7 @@ class Movimiento extends Service
         return $movimiento;
     }
 
-    public function process(Model\Contabilidad\Movimiento $movimiento): Model\Contabilidad\Movimiento
+    public function process(Model\Movimiento $movimiento): Model\Movimiento
     {
         $movimiento->addFactory('detalles', (new Implement\Repository\Factory())->setCallable(function(int $movimiento_id) {
             return $this->detalleRepository->fetchByMovimiento($movimiento_id);

app/src/Service/Venta.php

@@ -83,10 +83,6 @@ class Venta extends Service
     {
         return $this->ventaRepository->fetchByIdForList($venta_id);
     }
-    public function getByPie(int $pie_id): Model\Venta
-    {
-        return $this->process($this->ventaRepository->fetchByPie($pie_id));
-    }
 
     protected function process(Model\Venta $venta): Model\Venta
     {
@@ -108,7 +104,7 @@ class Venta extends Service
         $data['uf'] = $this->moneyService->getUF($fecha);
         $propietario = $this->addPropietario($data);
         $propiedad = $this->addPropiedad($data);
-        $formaPago = $this->addFormaPago($data);
+        $forma_pago = $this->addFormaPago($data);
         $venta_data = [
             'propietario' => $propietario->rut,
             'propiedad' => $propiedad->id,
@@ -120,15 +116,14 @@ class Venta extends Service
         $map = ['pie', 'subsidio', 'credito', 'bono_pie'];
         foreach ($map as $field) {
             $name = lcfirst(str_replace(' ', '', ucwords(str_replace('_', ' ', $field))));
-            if (isset($formaPago->{$name})) {
+            if (isset($forma_pago->{$name})) {
-                $venta_data[$field] = $formaPago->{$name}->id;
+                $venta_data[$field] = $forma_pago->{$name}->id;
             }
         }
         try {
             return $this->ventaRepository->fetchByPropietarioAndPropiedad($propietario->rut, $propiedad->id);
         } catch (Implement\Exception\EmptyResult) {
             $venta = $this->ventaRepository->create($venta_data);
-            $venta->setFormaPago($formaPago);
             $venta = $this->ventaRepository->save($venta);
 
             $tipoEstado = $this->tipoEstadoVentaRepository->fetchByDescripcion('vigente');
@@ -236,7 +231,7 @@ class Venta extends Service
     protected function addPropiedad(array $data): Model\Venta\Propiedad
     {
         $ids = array_filter($data, function($key) {
-            return str_starts_with($key, 'unidad');
+            return str_contains($key, 'unidad');
         }, ARRAY_FILTER_USE_KEY);
 
         return $this->propiedadService->addPropiedad($ids);
@@ -244,7 +239,85 @@ class Venta extends Service
     protected function addFormaPago(array $data): Model\Venta\FormaPago
     {
         return $this->formaPagoService->add($data);
+        /*$fields = [
+            'pie',
+            'subsidio',
+            'credito',
+            'bono_pie'
+        ];
+        $forma_pago = new Model\Venta\FormaPago();
+        foreach ($fields as $name) {
+            if (isset($data["has_{$name}"])) {
+                $method = 'add' . str_replace(' ', '', ucwords(str_replace('_', ' ', $name)));
+                $obj = $this->{$method}($data);
+                $forma_pago->{$name} = $obj;
+            }
+        }
+        return $forma_pago;*/
     }
+    /*protected function addPie(array $data): Model\Venta\Pie
+    {
+        $fields = array_fill_keys([
+            'fecha_venta',
+            'pie',
+            'cuotas',
+            'uf'
+        ], 0);
+        $filtered_data = array_intersect_key($data, $fields);
+        $mapped_data = array_combine([
+            'fecha',
+            'valor',
+            'cuotas',
+            'uf'
+        ], $filtered_data);
+        $mapped_data['valor'] = $this->cleanValue($mapped_data['valor']);
+        return $this->pieService->add($mapped_data);
+    }
+    protected function addSubsidio(array $data): Model\Venta\Subsidio
+    {
+        $fields = array_fill_keys([
+            'fecha_venta',
+            'ahorro',
+            'subsidio',
+            'uf'
+        ], 0);
+        $filtered_data = array_intersect_key($data, $fields);
+        $mapped_data = array_combine([
+            'fecha',
+            'ahorro',
+            'subsidio',
+            'uf'
+        ], $filtered_data);
+        return $this->subsidioService->add($mapped_data);
+    }
+    protected function addCredito(array $data): Model\Venta\Credito
+    {
+        $fields = array_fill_keys([
+            'fecha_venta',
+            'credito',
+            'uf'
+        ], 0);
+        $filtered_data = array_intersect_key($data, $fields);
+        $mapped_data = array_combine([
+            'fecha',
+            'valor',
+            'uf'
+        ], $filtered_data);
+        return $this->creditoService->add($mapped_data);
+    }
+    protected function addBonoPie(array $data): Model\Venta\BonoPie
+    {
+        $fields = array_fill_keys([
+            'fecha_venta',
+            'bono_pie'
+        ], 0);
+        $filtered_data = array_intersect_key($data, $fields);
+        $mapped_data = array_combine([
+            'fecha',
+            'valor'
+        ], $filtered_data);
+        return $this->bonoPieService->add($mapped_data);
+    }*/
     protected function addEstado(Model\Venta $venta, Model\Venta\TipoEstadoVenta $tipoEstadoVenta, array $data): void
     {
         $fecha = new DateTimeImmutable($data['fecha']);

app/src/Service/Venta/Cuota.php

@@ -75,11 +75,10 @@ class Cuota
     }
     public function getByPie(int $pie_id): array
     {
-	try {
+        return $this->cuotaRepository->fetchByPie($pie_id);
-            return $this->cuotaRepository->fetchByPie($pie_id);
+        /*return array_filter($this->cuotaRepository->fetchByPie($pie_id), function(Model\Venta\Cuota $cuota) {
-	} catch (EmptyResult) {
+            return !in_array($cuota->pago->currentEstado->tipoEstadoPago->descripcion, ['anulado']);
-	    return [];
+        });*/
-	}
     }
     public function getVigenteByPie(int $pie_id): array
     {

app/src/Service/Venta/FormaPago.php

@@ -77,6 +77,7 @@ class FormaPago extends Ideal\Service
             'uf'
         ], 0);
         $filtered_data = array_intersect_key($data, $fields);
+        $this->logger->critical(var_export($filtered_data,true));
         $mapped_data = array_combine([
             'fecha',
             'valor',

app/src/Service/Venta/Pago.php

@@ -30,7 +30,6 @@ class Pago
         try {
             $estado = $this->estadoPagoRepository->create($data);
             $this->estadoPagoRepository->save($estado);
-            $this->getUF($pago);
             return true;
         } catch (PDOException) {
             return false;
@@ -163,7 +162,7 @@ class Pago
     protected function getUF(Model\Venta\Pago $pago): ?float
     {
         if (($pago->uf === null or $pago->uf === 0.0)
-            and in_array($pago->currentEstado->tipoEstadoPago->descripcion, ['depositado', 'abonado'])
+            and $pago->currentEstado->tipoEstadoPago->descripcion === 'abonado'
             and $pago->currentEstado->fecha <= new DateTimeImmutable()) {
             $uf = $this->moneyService->getUF($pago->currentEstado->fecha);
             if ($uf !== 0.0) {

app/src/Service/Venta/Pie.php

@@ -2,7 +2,6 @@
 namespace Incoviba\Service\Venta;
 
 use Incoviba\Common\Implement\Exception\EmptyResult;
-use Incoviba\Common\Implement\Repository\Factory;
 use Incoviba\Repository;
 use Incoviba\Model;
 
@@ -48,9 +47,6 @@ class Pie
         try {
             $pie->asociados = $this->pieRepository->fetchAsociados($pie->id);
         } catch (EmptyResult) {}
-        if (isset($pie->asociado)) {
-            $pie->asociado = $this->getById($pie->asociado->id);
-        }
         return $pie;
     }
 }

app/src/Service/Venta/Propiedad.php

@@ -3,23 +3,18 @@ namespace Incoviba\Service\Venta;
 
 use PDO;
 use PDOException;
-use Psr\Log\LoggerInterface;
 use Incoviba\Common\Define;
-use Incoviba\Common\Ideal\Service;
 use Incoviba\Common\Implement\Exception\EmptyResult;
 use Incoviba\Repository;
 use Incoviba\Model;
 
-class Propiedad extends Service
+class Propiedad
 {
     public function __construct(
-        LoggerInterface $logger,
         protected Repository\Venta\Propiedad $propiedadRepository,
         protected Repository\Venta\Unidad $unidadRepository,
         protected Define\Connection $connection
-    ) {
+    ) {}
-        parent::__construct($logger);
-    }
 
     public function addPropiedad(array $ids): Model\Venta\Propiedad
     {

app/tests/performance/APITest.php

@@ -1,17 +0,0 @@
-<?php
-namespace ProVM\Performance;
-
-use GuzzleHttp\Client;
-use PHPUnit\Framework;
-
-class APITest extends Framework\TestCase
-{
-    public function testLoad(): void
-    {
-        $client = new Client(['base_uri' => 'http://proxy']);
-        $start = microtime(true);
-        $response = $client->get('/api', ['headers' => ['Authorization'  => 'Bearer ' . md5($_ENV['API_KEY'])]]);
-        $end = microtime(true);
-        $this->assertLessThanOrEqual(1000, $end - $start);
-    }
-}

app/tests/performance/HomeTest.php

@@ -1,17 +0,0 @@
-<?php
-namespace ProVM\Performance;
-
-use GuzzleHttp\Client;
-use PHPUnit\Framework;
-
-class HomeTest extends Framework\TestCase
-{
-    public function testLoad(): void
-    {
-        $client = new Client(['base_uri' => 'http://proxy']);
-        $start = microtime(true);
-        $response = $client->get('');
-        $end = microtime(true);
-        $this->assertLessThanOrEqual(1000, $end - $start);
-    }
-}