diff --git a/app/resources/views/contabilidad/depositos.blade.php b/app/resources/views/contabilidad/depositos.blade.php
index d090039..26d8f17 100644
--- a/app/resources/views/contabilidad/depositos.blade.php
+++ b/app/resources/views/contabilidad/depositos.blade.php
@@ -3,47 +3,72 @@
@section('page_content')
@@ -208,7 +233,10 @@
$(this.ids.forms.add.inicio).calendar(calendar_date_options)
$(this.ids.forms.add.termino).calendar(calendar_date_options)
- $(this.ids.table).dataTable()
+ $(this.ids.table).dataTable({
+ columnDefs: [{target: 7, visible: false, searchable: false}],
+ order: [[7, 'desc'], [0, 'asc']]
+ })
}
}
$(document).ready(() => {
diff --git a/app/src/Controller/Contabilidad.php b/app/src/Controller/Contabilidad.php
index 221ee87..e4d3ede 100644
--- a/app/src/Controller/Contabilidad.php
+++ b/app/src/Controller/Contabilidad.php
@@ -8,6 +8,7 @@ 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;
@@ -50,7 +51,15 @@ class Contabilidad extends Controller
try {
$depositos = $dapRepository->fetchAll();
} catch (EmptyResult) {}
- return $view->render($response, 'contabilidad.depositos', compact('inmobiliarias', 'depositos'));
+ $fecha = new DateTimeImmutable('today');
+ $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\Deposito $deposito) use ($fecha, $mes) {
+ return $deposito->termino < $fecha and $deposito->termino >= $mes;
+ });
+ return $view->render($response, 'contabilidad.depositos', compact('inmobiliarias', 'activos', 'vencidos'));
}
public function tesoreria(ServerRequestInterface $request, ResponseInterface $response, View $view,
Service\Contabilidad\Informe\Tesoreria $contabilidadService,