From 6ab24c89614efe27a968266eb9054ecd5329d5ec Mon Sep 17 00:00:00 2001 From: Juan Pablo Vial Date: Fri, 23 Jun 2023 11:36:44 -0400 Subject: [PATCH 001/163] Command return --- app/Command/Money/Get.php | 1 + app/Command/Money/Lookup.php | 1 + 2 files changed, 2 insertions(+) diff --git a/app/Command/Money/Get.php b/app/Command/Money/Get.php index 9228582..0b2efbd 100644 --- a/app/Command/Money/Get.php +++ b/app/Command/Money/Get.php @@ -41,6 +41,7 @@ class Get extends Command } } $this->updateUF(); + return Command::SUCCESS; } protected function getDates(): array diff --git a/app/Command/Money/Lookup.php b/app/Command/Money/Lookup.php index 43b85b9..0e9ce4d 100644 --- a/app/Command/Money/Lookup.php +++ b/app/Command/Money/Lookup.php @@ -31,6 +31,7 @@ class Lookup extends Command $io->note($this->runGetUF()); } } + return Command::SUCCESS; } protected function hasPendingMoney(): bool From be33305cf130497c2ec2456fbc32cc354444aa05 Mon Sep 17 00:00:00 2001 From: Juan Pablo Vial Date: Mon, 24 Jul 2023 20:41:38 -0400 Subject: [PATCH 002/163] config --- app_old/.adminer.env.sample | 2 + app_old/.db.env.sample | 4 + app_old/.env.sample | 2 + app_old/.gitignore | 10 + app_old/aldarien/asset/.gitignore | 11 + app_old/aldarien/asset/LICENSE | 21 + app_old/aldarien/asset/README.md | 2 + app_old/aldarien/asset/app/Contract/Asset.php | 21 + .../aldarien/asset/app/Helper/functions.php | 5 + app_old/aldarien/asset/app/Service/Asset.php | 88 ++ app_old/aldarien/asset/composer.json | 26 + app_old/aldarien/asset/phpunit.xml | 17 + app_old/aldarien/asset/tests/AssetTest.php | 25 + app_old/aldarien/config/.gitignore | 13 + app_old/aldarien/config/.travis.yml | 3 + app_old/aldarien/config/LICENSE | 21 + app_old/aldarien/config/README.md | 4 + .../aldarien/config/app/Contract/Config.php | 31 + .../config/app/Contract/YamlWrapper.php | 21 + .../aldarien/config/app/Helper/functions.php | 9 + .../aldarien/config/app/Service/Config.php | 150 ++++ .../aldarien/config/bootstrap/autoload.php | 3 + app_old/aldarien/config/composer.json | 28 + app_old/aldarien/config/phpunit.xml | 17 + app_old/aldarien/config/tests/ConfigTest.php | 90 ++ app_old/aldarien/contract/.gitignore | 6 + app_old/aldarien/contract/LICENSE | 21 + .../contract/app/Definition/Contract.php | 20 + app_old/aldarien/contract/composer.json | 18 + app_old/aldarien/format/.gitignore | 11 + app_old/aldarien/format/LICENSE | 21 + app_old/aldarien/format/README.md | 2 + app_old/aldarien/format/app/Helper/Format.php | 43 + app_old/aldarien/format/composer.json | 23 + app_old/aldarien/format/config/app.php | 5 + app_old/aldarien/format/phpunit.xml | 17 + app_old/aldarien/format/tests/FormatTest.php | 59 ++ app_old/aldarien/response/.gitignore | 7 + app_old/aldarien/response/LICENSE | 21 + app_old/aldarien/response/README.md | 2 + .../response/app/Contract/Response.php | 27 + .../response/app/Helper/functions.php | 11 + .../response/app/Service/Response.php | 62 ++ .../aldarien/response/bootstrap/autoload.php | 3 + app_old/aldarien/response/composer.json | 26 + app_old/aldarien/response/phpunit.xml | 17 + .../aldarien/response/tests/ResponseTest.php | 22 + app_old/aldarien/root/.gitignore | 5 + app_old/aldarien/root/LICENSE | 21 + app_old/aldarien/root/README.md | 22 + .../aldarien/root/app/Helper/functions.php | 5 + app_old/aldarien/root/composer.json | 21 + app_old/aldarien/root/phpunit.xml | 19 + app_old/aldarien/root/src/Root.php | 48 + app_old/aldarien/root/tests/RootTest.php | 61 ++ app_old/aldarien/session/.gitignore | 11 + app_old/aldarien/session/LICENSE | 21 + app_old/aldarien/session/README.md | 2 + .../aldarien/session/app/Contract/Session.php | 29 + app_old/aldarien/session/composer.json | 24 + app_old/aldarien/url/.gitignore | 12 + app_old/aldarien/url/LICENSE | 21 + app_old/aldarien/url/README.md | 2 + app_old/aldarien/url/app/Contract/URL.php | 21 + app_old/aldarien/url/app/Helper/functions.php | 8 + app_old/aldarien/url/app/Service/URL.php | 83 ++ app_old/aldarien/url/composer.json | 29 + app_old/aldarien/view/.gitignore | 10 + app_old/aldarien/view/LICENSE | 21 + app_old/aldarien/view/README.md | 2 + app_old/aldarien/view/app/Contract/View.php | 30 + .../aldarien/view/app/Helper/functions.php | 5 + app_old/aldarien/view/app/Service/View.php | 27 + app_old/aldarien/view/composer.json | 28 + app_old/aldarien/view/config/locations.php | 8 + app_old/aldarien/view/phpunit.xml | 17 + app_old/aldarien/view/public/index.php | 5 + .../view/resources/views/base.blade.php | 9 + app_old/aldarien/view/tests/ViewTest.php | 22 + app_old/app/Alias/Connection.php | 50 ++ app_old/app/Alias/Excel/Style/Mes.php | 18 + app_old/app/Alias/Format.php | 17 + app_old/app/Alias/Model.php | 87 ++ app_old/app/Alias/NewEstado.php | 21 + app_old/app/Alias/NewModel.php | 9 + app_old/app/Alias/NewTipo.php | 15 + app_old/app/Alias/OldModel.php | 8 + app_old/app/Alias/PHPExcel.php | 155 ++++ app_old/app/Alias/RemoteConnection.php | 17 + app_old/app/Command/Money/Get.php | 87 ++ app_old/app/Command/Money/Lookup.php | 52 ++ app_old/app/Contract/Auth.php | 27 + app_old/app/Contract/Route.php | 27 + app_old/app/Controller/API/Unidades.php | 41 + .../less => app_old/app}/Controller/Admin.php | 0 .../less => app_old/app}/Controller/Ajax.php | 0 app_old/app/Controller/Auth.php | 59 ++ app_old/app/Controller/Bonos.php | 67 ++ .../app}/Controller/Buscar.php | 0 app_old/app/Controller/Cierres.php | 428 +++++++++ .../app}/Controller/Comentarios.php | 0 app_old/app/Controller/Contabilidad.php | 100 +++ .../app}/Controller/Creditos.php | 0 .../app}/Controller/Cuotas.php | 0 .../app}/Controller/Devoluciones.php | 0 .../app}/Controller/Escrituras.php | 0 .../app}/Controller/FormaPago.php | 0 app_old/app/Controller/Home.php | 85 ++ app_old/app/Controller/Informes.php | 830 ++++++++++++++++++ .../app}/Controller/Inmobiliarias.php | 0 .../app}/Controller/Operadores.php | 0 .../less => app_old/app}/Controller/Other.php | 0 .../app}/Controller/Pagares.php | 0 .../less => app_old/app}/Controller/Pagos.php | 0 .../less => app_old/app}/Controller/Pies.php | 0 .../app}/Controller/Postventas.php | 0 app_old/app/Controller/Precios.php | 177 ++++ .../app}/Controller/Propietarios.php | 0 .../app}/Controller/ProyectoTipoUnidades.php | 0 app_old/app/Controller/Proyectos.php | 327 +++++++ .../app}/Controller/Reajustes.php | 0 .../app}/Controller/Registros.php | 0 .../app}/Controller/Subsidios.php | 0 .../less => app_old/app}/Controller/Temas.php | 0 .../app}/Controller/Unidades.php | 0 .../app}/Controller/UnidadesBloqueadas.php | 0 app_old/app/Controller/Ventas.php | 605 +++++++++++++ app_old/app/Definition/Controller.php | 31 + app_old/app/Definition/hasEstado.php | 38 + app_old/app/Definition/hasRUT.php | 20 + app_old/app/Exception/PropertyNotFound.php | 16 + app_old/app/Helper/Color.php | 169 ++++ app_old/app/Helper/Line.php | 61 ++ app_old/app/Helper/functions.php | 128 +++ app_old/app/Middleware/Auth.php | 38 + app_old/app/Service/Auth.php | 165 ++++ app_old/app/Service/Borrador.php | 118 +++ app_old/app/Service/DBToModel.php | 158 ++++ app_old/app/Service/Factory.php | 204 +++++ app_old/app/Service/Informador.php | 463 ++++++++++ .../Service/Informe/Contabilidad/Resumen.php | 190 ++++ app_old/app/Service/Informe/Informe.php | 55 ++ app_old/app/Service/Money.php | 55 ++ app_old/app/Service/Register.php | 34 + app_old/app/Service/Remote.php | 19 + app_old/app/Service/Replacer.php | 127 +++ app_old/app/Service/Route.php | 131 +++ app_old/bin/Pipfile | 12 + app_old/bin/console | 3 + app_old/bin/index.php | 8 + app_old/bin/informes/Pipfile | 16 + app_old/bin/informes/app.py | 14 + app_old/bin/informes/controllers/ventas.py | 141 +++ app_old/bootstrap/autoload.php | 8 + app_old/bootstrap/database.php | 29 + app_old/bootstrap/dotenv.php | 12 + app_old/bootstrap/errors.php | 7 + app_old/bootstrap/logs.php | 26 + app_old/bootstrap/routes.php | 21 + setup/cli.app.php => app_old/cli/app.php | 0 {setup => app_old/cli}/cli/config.php | 0 {setup => app_old/cli}/cli/middlewares.php | 0 {setup => app_old/cli}/cli/setups.php | 11 +- {setup => app_old/cli}/composer.php | 0 app_old/composer.json | 69 ++ app_old/config/app.php | 9 + app_old/config/databases.php | 24 + app_old/config/incoviba.php | 6 + app_old/config/locations.php | 16 + app_old/fontify.json | 7 + .../incoviba}/modelos/.gitignore | 0 .../incoviba}/modelos/common/Alias/Model.php | 0 .../modelos/common/Alias/NewEstado.php | 0 .../modelos/common/Alias/NewModel.php | 0 .../modelos/common/Alias/NewTipo.php | 0 .../modelos/common/Alias/OldModel.php | 0 .../modelos/common/Factory/Model.php | 0 .../incoviba}/modelos/composer.json | 0 .../incoviba}/modelos/src/common/Action.php | 0 .../incoviba}/modelos/src/common/Auth.php | 0 .../incoviba}/modelos/src/common/Location.php | 0 .../modelos/src/common/Permission.php | 0 .../incoviba}/modelos/src/common/Registry.php | 0 .../modelos/src/common/RegistryData.php | 0 .../incoviba}/modelos/src/common/Role.php | 0 .../incoviba}/modelos/src/common/User.php | 0 .../incoviba}/modelos/src/common/UserRole.php | 0 .../modelos/src/nuevo/Common/Banco.php | 0 .../modelos/src/nuevo/Common/Comuna.php | 0 .../modelos/src/nuevo/Common/Direccion.php | 0 .../incoviba}/modelos/src/nuevo/Common/M2.php | 0 .../modelos/src/nuevo/Common/Provincia.php | 0 .../modelos/src/nuevo/Common/Region.php | 0 .../incoviba}/modelos/src/nuevo/Common/UF.php | 0 .../modelos/src/nuevo/Inmobiliaria/Agente.php | 0 .../Inmobiliaria/CategoriaCuentaContable.php | 0 .../modelos/src/nuevo/Inmobiliaria/Cobro.php | 0 .../src/nuevo/Inmobiliaria/Contrato.php | 0 .../modelos/src/nuevo/Inmobiliaria/Cuenta.php | 0 .../src/nuevo/Inmobiliaria/CuentaContable.php | 0 .../src/nuevo/Inmobiliaria/EstadoCobro.php | 0 .../src/nuevo/Inmobiliaria/Inmobiliaria.php | 0 .../src/nuevo/Inmobiliaria/Participacion.php | 0 .../src/nuevo/Inmobiliaria/Representante.php | 0 .../modelos/src/nuevo/Inmobiliaria/Socio.php | 0 .../src/nuevo/Inmobiliaria/TipoAgente.php | 0 .../src/nuevo/Inmobiliaria/TipoCobro.php | 0 .../src/nuevo/Inmobiliaria/TipoContrato.php | 0 .../nuevo/Inmobiliaria/TipoEstadoCobro.php | 0 .../Inmobiliaria/TransaccionContable.php | 0 .../src/nuevo/Proyecto/EstadoProyecto.php | 0 .../modelos/src/nuevo/Proyecto/Etapa.php | 0 .../modelos/src/nuevo/Proyecto/Participe.php | 0 .../modelos/src/nuevo/Proyecto/Proyecto.php | 0 .../src/nuevo/Proyecto/ProyectoParticipe.php | 0 .../modelos/src/nuevo/Proyecto/Tema.php | 0 .../src/nuevo/Proyecto/TipoEstadoProyecto.php | 0 .../modelos/src/nuevo/Proyecto/TipoUnidad.php | 0 .../src/nuevo/Proyecto/UnidadProyecto.php | 0 .../modelos/src/nuevo/Venta/Cierre.php | 0 .../modelos/src/nuevo/Venta/Comentario.php | 0 .../modelos/src/nuevo/Venta/Cuota.php | 0 .../modelos/src/nuevo/Venta/Entrega.php | 0 .../modelos/src/nuevo/Venta/EstadoCierre.php | 0 .../src/nuevo/Venta/EstadoObservacion.php | 0 .../modelos/src/nuevo/Venta/EstadoPago.php | 0 .../src/nuevo/Venta/EstadoPostventa.php | 0 .../modelos/src/nuevo/Venta/EstadoVenta.php | 0 .../modelos/src/nuevo/Venta/FondoVenta.php | 0 .../modelos/src/nuevo/Venta/FormaPago.php | 0 .../modelos/src/nuevo/Venta/Medicion.php | 0 .../modelos/src/nuevo/Venta/Observacion.php | 0 .../modelos/src/nuevo/Venta/Pago.php | 0 .../incoviba}/modelos/src/nuevo/Venta/Pie.php | 0 .../modelos/src/nuevo/Venta/Postventa.php | 0 .../src/nuevo/Venta/PostventaObservacion.php | 0 .../modelos/src/nuevo/Venta/Premio.php | 0 .../modelos/src/nuevo/Venta/Propiedad.php | 0 .../modelos/src/nuevo/Venta/Propietario.php | 0 .../src/nuevo/Venta/ProyectoTipoMedicion.php | 0 .../modelos/src/nuevo/Venta/Reserva.php | 0 .../src/nuevo/Venta/TipoEstadoCierre.php | 0 .../src/nuevo/Venta/TipoEstadoObservacion.php | 0 .../src/nuevo/Venta/TipoEstadoPago.php | 0 .../src/nuevo/Venta/TipoEstadoPostventa.php | 0 .../src/nuevo/Venta/TipoEstadoVenta.php | 0 .../modelos/src/nuevo/Venta/TipoFondo.php | 0 .../modelos/src/nuevo/Venta/TipoMedicion.php | 0 .../modelos/src/nuevo/Venta/TipoPago.php | 0 .../modelos/src/nuevo/Venta/TipoPremio.php | 0 .../modelos/src/nuevo/Venta/Unidad.php | 0 .../src/nuevo/Venta/UnidadPropiedad.php | 0 .../modelos/src/nuevo/Venta/UnidadReserva.php | 0 .../modelos/src/nuevo/Venta/Venta.php | 0 .../modelos/src/old/Common/Banco.php | 0 .../modelos/src/old/Common/Comuna.php | 0 .../modelos/src/old/Common/Direccion.php | 0 .../modelos/src/old/Common/Provincia.php | 0 .../modelos/src/old/Common/Region.php | 0 .../modelos/src/old/Inmobiliaria/Cuenta.php | 0 .../src/old/Inmobiliaria/Inmobiliaria.php | 0 .../Inmobiliaria/RelacionInmobiliarias.php | 0 .../src/old/Inmobiliaria/TipoSociedad.php | 0 .../modelos/src/old/Proyecto/Agente.php | 0 .../modelos/src/old/Proyecto/AgenteTipo.php | 0 .../src/old/Proyecto/AvanceConstruccion.php | 0 .../modelos/src/old/Proyecto/Cobro.php | 0 .../modelos/src/old/Proyecto/Costo.php | 0 .../modelos/src/old/Proyecto/EstadoCobro.php | 0 .../src/old/Proyecto/EstadoProyecto.php | 0 .../src/old/Proyecto/EstadoProyectoAgente.php | 0 .../src/old/Proyecto/EtapaProyecto.php | 0 .../modelos/src/old/Proyecto/Pagare.php | 0 .../modelos/src/old/Proyecto/Proyectista.php | 0 .../modelos/src/old/Proyecto/Proyectistas.php | 0 .../modelos/src/old/Proyecto/Proyecto.php | 0 .../src/old/Proyecto/ProyectoAgente.php | 0 .../src/old/Proyecto/ProyectoTipoUnidad.php | 0 .../src/old/Proyecto/RelacionAgentes.php | 0 .../src/old/Proyecto/RenovacionPagare.php | 0 .../modelos/src/old/Proyecto/TipoAgente.php | 0 .../modelos/src/old/Proyecto/TipoCobro.php | 0 .../modelos/src/old/Proyecto/TipoElemento.php | 0 .../src/old/Proyecto/TipoEstadoCobro.php | 0 .../src/old/Proyecto/TipoEstadoProyecto.php | 0 .../old/Proyecto/TipoEstadoProyectoAgente.php | 0 .../src/old/Proyecto/TipoMonedaPagare.php | 0 .../src/old/Proyecto/TipoProyectista.php | 0 .../src/old/Proyecto/TipoTipologia.php | 0 .../modelos/src/old/Proyecto/Tipologia.php | 0 .../modelos/src/old/Venta/BonoPie.php | 0 .../modelos/src/old/Venta/Cierre.php | 0 .../modelos/src/old/Venta/Comentario.php | 0 .../modelos/src/old/Venta/Credito.php | 0 .../incoviba}/modelos/src/old/Venta/Cuota.php | 0 .../modelos/src/old/Venta/Entrega.php | 0 .../modelos/src/old/Venta/Escritura.php | 0 .../modelos/src/old/Venta/EstadoCierre.php | 0 .../modelos/src/old/Venta/EstadoPago.php | 0 .../modelos/src/old/Venta/EstadoPrecio.php | 0 .../modelos/src/old/Venta/EstadoProblema.php | 0 .../src/old/Venta/EstadoUnidadBloqueada.php | 0 .../modelos/src/old/Venta/EstadoVenta.php | 0 .../incoviba}/modelos/src/old/Venta/Pago.php | 0 .../incoviba}/modelos/src/old/Venta/Pie.php | 0 .../modelos/src/old/Venta/Precio.php | 0 .../modelos/src/old/Venta/Problema.php | 0 .../modelos/src/old/Venta/Promocion.php | 0 .../modelos/src/old/Venta/PromocionVenta.php | 0 .../modelos/src/old/Venta/Propiedad.php | 0 .../modelos/src/old/Venta/PropiedadUnidad.php | 0 .../modelos/src/old/Venta/Propietario.php | 0 .../modelos/src/old/Venta/Subsidio.php | 0 .../src/old/Venta/TipoEstadoCierre.php | 0 .../modelos/src/old/Venta/TipoEstadoPago.php | 0 .../src/old/Venta/TipoEstadoPrecio.php | 0 .../old/Venta/TipoEstadoUnidadBloqueada.php | 0 .../modelos/src/old/Venta/TipoEstadoVenta.php | 0 .../modelos/src/old/Venta/TipoPago.php | 0 .../modelos/src/old/Venta/TipoUnidad.php | 0 .../modelos/src/old/Venta/TipoValorCierre.php | 0 .../modelos/src/old/Venta/Unidad.php | 0 .../modelos/src/old/Venta/UnidadBloqueada.php | 0 .../modelos/src/old/Venta/UnidadCierre.php | 0 .../modelos/src/old/Venta/ValorCierre.php | 0 .../incoviba}/modelos/src/old/Venta/Venta.php | 0 .../modelos/src/old/Venta/Venta.php.save | 0 package.json => app_old/package.json | 0 {public => app_old/public}/Pipfile | 0 {public => app_old/public}/api/.htaccess | 0 {public => app_old/public}/api/index.php | 0 {public => app_old/public}/api/keys | 0 {public => app_old/public}/css/app.css | 0 {public => app_old/public}/css/custom.css | 0 .../public}/fonts/FontAwesome.otf | Bin .../public}/fonts/fontawesome-webfont.eot | Bin .../public}/fonts/fontawesome-webfont.svg | 0 .../public}/fonts/fontawesome-webfont.ttf | Bin .../public}/fonts/fontawesome-webfont.woff | Bin .../public}/fonts/fontawesome-webfont.woff2 | Bin .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin .../fonts/glyphicons-halflings-regular.woff2 | Bin .../public}/images/Isotipo 16.png | Bin .../public}/images/Isotipo 32.png | Bin .../public}/images/Isotipo 64.png | Bin .../public}/images/logo_cabezal.png | Bin app_old/public/index.php | 8 + .../index.php => app_old/public/index.php.old | 0 .../public}/install/create_admin.php | 0 .../public}/install/create_guest.php | 0 .../public}/install/create_user_base.php | 0 .../public}/install/end_install.php | 0 {public => app_old/public}/install/index.php | 0 .../public}/install/log_locations.php | 0 .../public}/install/next_step.php | 0 {public => app_old/public}/js/admin.js | 0 {public => app_old/public}/js/app.js | 0 .../public}/js/ventas/pies/cuotas/add.js | 0 {public => app_old/public}/links.log | 0 {public => app_old/public}/precios.csv | 0 {resources => app_old/resources}/js/app.js | 0 .../resources}/js/binaryIndexOf.js | 0 .../resources}/js/bootstrap.js | 0 {resources => app_old/resources}/js/chart.js | 0 .../resources}/js/jquery.filterTable.js | 0 app_old/resources/less/Controller/Admin.php | 233 +++++ app_old/resources/less/Controller/Ajax.php | 215 +++++ .../resources}/less/Controller/Auth.php | 0 .../resources}/less/Controller/Bonos.php | 0 app_old/resources/less/Controller/Buscar.php | 340 +++++++ .../resources}/less/Controller/Cierres.php | 0 .../resources/less/Controller/Comentarios.php | 39 + .../less/Controller/Contabilidad.php | 0 .../resources/less/Controller/Creditos.php | 207 +++++ app_old/resources/less/Controller/Cuotas.php | 230 +++++ .../less/Controller/Devoluciones.php | 19 + .../resources/less/Controller/Escrituras.php | 212 +++++ .../resources/less/Controller/FormaPago.php | 98 +++ .../resources}/less/Controller/Informes.php | 9 +- .../less/Controller/Informes.php.save | 0 .../less/Controller/Inmobiliarias.php | 74 ++ .../resources/less/Controller/Operadores.php | 47 + app_old/resources/less/Controller/Other.php | 71 ++ app_old/resources/less/Controller/Pagares.php | 271 ++++++ app_old/resources/less/Controller/Pagos.php | 358 ++++++++ app_old/resources/less/Controller/Pies.php | 104 +++ .../resources/less/Controller/Postventas.php | 69 ++ .../resources}/less/Controller/Precios.php | 0 .../less/Controller/Propietarios.php | 129 +++ .../less/Controller/ProyectoTipoUnidades.php | 77 ++ .../resources}/less/Controller/Proyectos.php | 0 .../resources/less/Controller/Reajustes.php | 90 ++ .../resources/less/Controller/Registros.php | 39 + .../resources/less/Controller/Subsidios.php | 184 ++++ app_old/resources/less/Controller/Temas.php | 111 +++ .../resources/less/Controller/Unidades.php | 126 +++ .../less/Controller/UnidadesBloqueadas.php | 83 ++ .../resources}/less/Controller/Ventas.php | 0 .../resources}/less/_variables.less | 0 .../resources}/less/app.less | 0 .../resources}/less/bootstrap.less | 0 .../resources}/less/custom.less | 0 .../resources}/less/print.less | 0 .../resources}/less/submenu.less | 0 .../resources}/routes/api.php | 0 .../resources}/routes/api/unidades.php | 0 .../resources}/routes/cli.php | 0 app_old/resources/routes/ui/01_auth.php | 15 + app_old/resources/routes/ui/99_base.php | 4 + .../resources}/views/admin/base.blade.php | 0 .../resources}/views/admin/menu.blade.php | 0 .../views/admin/menu/models.blade.php | 0 .../views/admin/menu/registros.blade.php | 0 .../views/admin/menu/roles.blade.php | 0 .../views/admin/menu/users.blade.php | 0 .../resources}/views/admin/models.blade.php | 0 .../registros/controles_avance.blade.php | 0 .../views/admin/registros/list.blade.php | 0 .../views/admin/registros/show.blade.php | 0 .../views/admin/roles/add.blade.php | 0 .../admin/roles/add_permissions.blade.php | 0 .../views/admin/roles/add_users.blade.php | 0 .../views/admin/roles/list.blade.php | 0 .../views/admin/roles/show.blade.php | 0 .../views/admin/users/add.blade.php | 0 .../views/admin/users/add_role.blade.php | 0 .../views/admin/users/list.blade.php | 0 .../views/admin/users/show.blade.php | 0 .../resources}/views/auth/base.blade.php | 12 +- .../views/auth/change_pass.blade.php | 0 app_old/resources/views/auth/login.blade.php | 17 + .../resources}/views/benchmark.blade.php | 0 .../resources}/views/buscar/buscar.blade.php | 0 .../views/buscar/resultado.blade.php | 0 .../resources}/views/calendario.blade.php | 0 .../resources}/views/cierres.blade.php | 0 .../resources}/views/construccion.blade.php | 0 .../views/contabilidad/pago.blade.php | 0 .../views/contabilidad/pagos.blade.php | 0 .../resources}/views/form/fecha.blade.php | 0 .../resources}/views/guest.blade.php | 14 +- .../resources}/views/home.blade.php | 2 +- .../views/informes/comisiones.blade.php | 0 .../views/informes/contabilidad.blade.php | 0 .../views/informes/escrituras.blade.php | 0 .../views/informes/gantt_entregas.blade.php | 0 .../views/informes/para_comision.blade.php | 0 .../views/informes/proyectos.blade.php | 0 .../views/informes/resciliaciones.blade.php | 0 .../informes/resumen_contabilidad.blade.php | 0 .../views/informes/ventas.blade.php | 0 .../views/inmobiliarias/add.blade.php | 0 .../views/inmobiliarias/edit.blade.php | 0 .../views/inmobiliarias/list.blade.php | 0 .../views/inmobiliarias/show.blade.php | 0 .../resources}/views/install/admin.blade.php | 0 .../resources}/views/install/base.blade.php | 0 .../resources}/views/install/end.blade.php | 0 .../resources}/views/install/start.blade.php | 0 .../resources}/views/layout/base.blade.php | 0 .../resources}/views/layout/footer.blade.php | 0 .../resources}/views/layout/header.blade.php | 0 .../views/layout/icons/abonar.blade.php | 0 .../views/layout/icons/add.blade.php | 0 .../views/layout/icons/edit.blade.php | 0 .../views/layout/icons/pagar.blade.php | 0 .../views/layout/icons/remove.blade.php | 0 .../views/layout/icons/show.blade.php | 0 .../resources}/views/layout/menu.blade.php | 2 +- .../views/layout/menu.blade.php.save | 0 .../views/layout/menu/herramientas.blade.php | 0 .../views/layout/menu/informes.blade.php | 0 .../views/layout/menu/inmobiliarias.blade.php | 0 .../views/layout/menu/login.blade.php | 8 + .../views/layout/menu/operadores.blade.php | 0 .../views/layout/menu/proyectos.blade.php | 0 .../views/layout/menu/ventas.blade.php | 0 .../views/other/capacidades.blade.php | 0 .../views/other/entregar_multiple.blade.php | 0 .../views/print/devolucion.blade.php | 0 .../resources}/views/proyectos/add.blade.php | 0 .../views/proyectos/advance.blade.php | 0 .../views/proyectos/avance.blade.php | 0 .../views/proyectos/avances/edit.blade.php | 0 .../views/proyectos/avances_row.blade.php | 0 .../views/proyectos/construccion.blade.php | 0 .../views/proyectos/disponibles.blade.php | 0 .../views/proyectos/estimado.blade.php | 0 .../views/proyectos/historia.blade.php | 0 .../views/proyectos/historia.blade.php.old | 0 .../resources}/views/proyectos/list.blade.php | 0 .../views/proyectos/operadores/add.blade.php | 0 .../views/proyectos/pagares/add.blade.php | 0 .../pagares/add_renovacion.blade.php | 0 .../views/proyectos/pagares/edit.blade.php | 0 .../pagares/edit_renovacion.blade.php | 0 .../views/proyectos/pagares/show.blade.php | 0 .../views/proyectos/por_vender.blade.php | 0 .../views/proyectos/reservas/base.blade.php | 0 .../resources}/views/proyectos/show.blade.php | 0 .../views/proyectos/superficies.blade.php | 0 .../proyectos/tipo_unidades/add.blade.php | 0 .../proyectos/tipo_unidades/edit.blade.php | 0 .../views/proyectos/unidades/add.blade.php | 0 .../views/proyectos/unidades/add2.blade.php | 0 .../views/proyectos/unidades/assign.blade.php | 0 .../views/proyectos/unidades/edit.blade.php | 0 .../views/proyectos/unidades/list.blade.php | 0 .../proyectos/unidades/proyectos.blade.php | 0 .../views/proyectos/ventas.blade.php | 0 .../resources}/views/temas/add.blade.php | 0 .../resources}/views/temas/edit.blade.php | 0 .../resources}/views/temas/list.blade.php | 0 .../resources}/views/ventas/add.blade.php | 0 .../views/ventas/archivar.blade.php | 0 .../views/ventas/bonos/add.blade.php | 0 .../views/ventas/bonos/edit.blade.php | 0 .../resources}/views/ventas/ceder.blade.php | 0 .../views/ventas/cierres/add.blade.php | 0 .../views/ventas/cierres/edit.blade.php | 0 .../views/ventas/cierres/evaluar.blade.php | 0 .../views/ventas/cierres/list.blade.php | 0 .../views/ventas/cierres/show.blade.php | 0 .../views/ventas/comentarios/add.blade.php | 0 .../views/ventas/consolidacion/pago.blade.php | 0 .../ventas/consolidacion/proyectos.blade.php | 0 .../views/ventas/consolidacion/show.blade.php | 0 .../views/ventas/creditos/abonar.blade.php | 0 .../views/ventas/creditos/add.blade.php | 0 .../views/ventas/creditos/edit.blade.php | 0 .../views/ventas/creditos/pagar.blade.php | 0 .../ventas/creditos/pendientes.blade.php | 0 .../views/ventas/creditos/show.blade.php | 0 .../resources}/views/ventas/desist.blade.php | 0 .../views/ventas/devolucion.blade.php | 0 .../resources}/views/ventas/edit.blade.php | 0 .../views/ventas/entregar.blade.php | 0 .../views/ventas/escrituras/abonar.blade.php | 0 .../views/ventas/escrituras/add.blade.php | 0 .../views/ventas/escrituras/edit.blade.php | 0 .../views/ventas/escrituras/informe.blade.php | 0 .../views/ventas/escrituras/pagar.blade.php | 0 .../resources}/views/ventas/firmar.blade.php | 0 .../views/ventas/forma_pago.blade.php | 0 .../views/ventas/forma_pago/edit.blade.php | 0 .../resources}/views/ventas/list.blade.php | 0 .../operadores/unidades/bloquear.blade.php | 0 .../ventas/operadores/unidades/list.blade.php | 0 .../views/ventas/pagos/edit.blade.php | 0 .../views/ventas/pagos/pendientes.blade.php | 0 .../views/ventas/pagos/show.blade.php | 0 .../views/ventas/pies/cuotas/abonar.blade.php | 0 .../views/ventas/pies/cuotas/add.blade.php | 0 .../views/ventas/pies/cuotas/edit.blade.php | 0 .../views/ventas/pies/cuotas/estado.blade.php | 0 .../ventas/pies/cuotas/pendientes.blade.php | 0 .../views/ventas/pies/cuotas/show.blade.php | 0 .../views/ventas/pies/edit.blade.php | 0 .../views/ventas/pies/reajustar.blade.php | 0 .../ventas/pies/reajustes/abonar.blade.php | 0 .../ventas/pies/reajustes/edit.blade.php | 0 .../ventas/pies/reajustes/pagar.blade.php | 0 .../views/ventas/pies/resumen.blade.php | 0 .../views/ventas/pies/totales.blade.php | 0 .../views/ventas/postventas/add.blade.php | 0 .../views/ventas/postventas/show.blade.php | 0 .../views/ventas/precios/add.blade.php | 0 .../views/ventas/precios/import.blade.php | 0 .../views/ventas/precios/list.blade.php | 0 .../views/ventas/precios/proyectos.blade.php | 0 .../views/ventas/propietarios/edit.blade.php | 0 .../views/ventas/proyectos.blade.php | 0 .../views/ventas/resciliaciones.blade.php | 0 .../resources}/views/ventas/show.blade.php | 0 .../views/ventas/sort_title.blade.php | 0 .../views/ventas/subsidios/abonar.blade.php | 0 .../views/ventas/subsidios/add.blade.php | 0 .../views/ventas/subsidios/edit.blade.php | 0 .../views/ventas/subsidios/pagar.blade.php | 0 {setup => app_old/setup}/api/config.php | 0 {setup => app_old/setup}/api/setups.php | 0 app_old/setup/app.php | 61 ++ {setup => app_old/setup}/common/config.php | 0 app_old/setup/composer.php | 6 + {setup => app_old/setup}/database.php | 0 {setup => app_old/setup}/env/config.php | 0 {setup => app_old/setup}/router.php | 0 {setup => app_old/setup}/settings/01_env.php | 0 .../setup}/settings/02_common.php | 0 {setup => app_old/setup}/settings/03_api.php | 0 {setup => app_old/setup}/settings/04_ui.php | 0 {setup => app_old/setup}/setups/04_ui.php | 0 app_old/ui/app.php | 45 + app_old/ui/composer.php | 6 + app_old/ui/middlewares/01_auth.php | 2 + app_old/ui/middlewares/02_databases.php | 20 + app_old/ui/middlewares/98_logs.php | 2 + app_old/ui/middlewares/99_routes.php | 15 + app_old/ui/settings/01_env.php | 4 + app_old/ui/settings/02_folders.php | 12 + app_old/ui/settings/03_urls.php | 8 + app_old/ui/settings/04_databases.php | 20 + app_old/ui/setups/01_views.php | 20 + app_old/ui/setups/03_services.php | 8 + app_old/ui/setups/98_logs.php | 30 + .../webpack.config.js | 0 resources/views/auth/login.blade.php | 17 - resources/views/layout/menu/login.blade.php | 8 - setup/app.php | 57 -- 612 files changed, 11436 insertions(+), 107 deletions(-) create mode 100644 app_old/.adminer.env.sample create mode 100644 app_old/.db.env.sample create mode 100644 app_old/.env.sample create mode 100644 app_old/.gitignore create mode 100644 app_old/aldarien/asset/.gitignore create mode 100644 app_old/aldarien/asset/LICENSE create mode 100644 app_old/aldarien/asset/README.md create mode 100644 app_old/aldarien/asset/app/Contract/Asset.php create mode 100644 app_old/aldarien/asset/app/Helper/functions.php create mode 100644 app_old/aldarien/asset/app/Service/Asset.php create mode 100644 app_old/aldarien/asset/composer.json create mode 100644 app_old/aldarien/asset/phpunit.xml create mode 100644 app_old/aldarien/asset/tests/AssetTest.php create mode 100644 app_old/aldarien/config/.gitignore create mode 100644 app_old/aldarien/config/.travis.yml create mode 100644 app_old/aldarien/config/LICENSE create mode 100644 app_old/aldarien/config/README.md create mode 100644 app_old/aldarien/config/app/Contract/Config.php create mode 100644 app_old/aldarien/config/app/Contract/YamlWrapper.php create mode 100644 app_old/aldarien/config/app/Helper/functions.php create mode 100644 app_old/aldarien/config/app/Service/Config.php create mode 100644 app_old/aldarien/config/bootstrap/autoload.php create mode 100644 app_old/aldarien/config/composer.json create mode 100644 app_old/aldarien/config/phpunit.xml create mode 100644 app_old/aldarien/config/tests/ConfigTest.php create mode 100644 app_old/aldarien/contract/.gitignore create mode 100644 app_old/aldarien/contract/LICENSE create mode 100644 app_old/aldarien/contract/app/Definition/Contract.php create mode 100644 app_old/aldarien/contract/composer.json create mode 100644 app_old/aldarien/format/.gitignore create mode 100644 app_old/aldarien/format/LICENSE create mode 100644 app_old/aldarien/format/README.md create mode 100644 app_old/aldarien/format/app/Helper/Format.php create mode 100644 app_old/aldarien/format/composer.json create mode 100644 app_old/aldarien/format/config/app.php create mode 100644 app_old/aldarien/format/phpunit.xml create mode 100644 app_old/aldarien/format/tests/FormatTest.php create mode 100644 app_old/aldarien/response/.gitignore create mode 100644 app_old/aldarien/response/LICENSE create mode 100644 app_old/aldarien/response/README.md create mode 100644 app_old/aldarien/response/app/Contract/Response.php create mode 100644 app_old/aldarien/response/app/Helper/functions.php create mode 100644 app_old/aldarien/response/app/Service/Response.php create mode 100644 app_old/aldarien/response/bootstrap/autoload.php create mode 100644 app_old/aldarien/response/composer.json create mode 100644 app_old/aldarien/response/phpunit.xml create mode 100644 app_old/aldarien/response/tests/ResponseTest.php create mode 100644 app_old/aldarien/root/.gitignore create mode 100644 app_old/aldarien/root/LICENSE create mode 100644 app_old/aldarien/root/README.md create mode 100644 app_old/aldarien/root/app/Helper/functions.php create mode 100644 app_old/aldarien/root/composer.json create mode 100644 app_old/aldarien/root/phpunit.xml create mode 100644 app_old/aldarien/root/src/Root.php create mode 100644 app_old/aldarien/root/tests/RootTest.php create mode 100644 app_old/aldarien/session/.gitignore create mode 100644 app_old/aldarien/session/LICENSE create mode 100644 app_old/aldarien/session/README.md create mode 100644 app_old/aldarien/session/app/Contract/Session.php create mode 100644 app_old/aldarien/session/composer.json create mode 100644 app_old/aldarien/url/.gitignore create mode 100644 app_old/aldarien/url/LICENSE create mode 100644 app_old/aldarien/url/README.md create mode 100644 app_old/aldarien/url/app/Contract/URL.php create mode 100644 app_old/aldarien/url/app/Helper/functions.php create mode 100644 app_old/aldarien/url/app/Service/URL.php create mode 100644 app_old/aldarien/url/composer.json create mode 100644 app_old/aldarien/view/.gitignore create mode 100644 app_old/aldarien/view/LICENSE create mode 100644 app_old/aldarien/view/README.md create mode 100644 app_old/aldarien/view/app/Contract/View.php create mode 100644 app_old/aldarien/view/app/Helper/functions.php create mode 100644 app_old/aldarien/view/app/Service/View.php create mode 100644 app_old/aldarien/view/composer.json create mode 100644 app_old/aldarien/view/config/locations.php create mode 100644 app_old/aldarien/view/phpunit.xml create mode 100644 app_old/aldarien/view/public/index.php create mode 100644 app_old/aldarien/view/resources/views/base.blade.php create mode 100644 app_old/aldarien/view/tests/ViewTest.php create mode 100644 app_old/app/Alias/Connection.php create mode 100644 app_old/app/Alias/Excel/Style/Mes.php create mode 100644 app_old/app/Alias/Format.php create mode 100644 app_old/app/Alias/Model.php create mode 100644 app_old/app/Alias/NewEstado.php create mode 100644 app_old/app/Alias/NewModel.php create mode 100644 app_old/app/Alias/NewTipo.php create mode 100644 app_old/app/Alias/OldModel.php create mode 100644 app_old/app/Alias/PHPExcel.php create mode 100644 app_old/app/Alias/RemoteConnection.php create mode 100644 app_old/app/Command/Money/Get.php create mode 100644 app_old/app/Command/Money/Lookup.php create mode 100644 app_old/app/Contract/Auth.php create mode 100644 app_old/app/Contract/Route.php create mode 100644 app_old/app/Controller/API/Unidades.php rename {resources/less => app_old/app}/Controller/Admin.php (100%) rename {resources/less => app_old/app}/Controller/Ajax.php (100%) create mode 100644 app_old/app/Controller/Auth.php create mode 100644 app_old/app/Controller/Bonos.php rename {resources/less => app_old/app}/Controller/Buscar.php (100%) create mode 100644 app_old/app/Controller/Cierres.php rename {resources/less => app_old/app}/Controller/Comentarios.php (100%) create mode 100644 app_old/app/Controller/Contabilidad.php rename {resources/less => app_old/app}/Controller/Creditos.php (100%) rename {resources/less => app_old/app}/Controller/Cuotas.php (100%) rename {resources/less => app_old/app}/Controller/Devoluciones.php (100%) rename {resources/less => app_old/app}/Controller/Escrituras.php (100%) rename {resources/less => app_old/app}/Controller/FormaPago.php (100%) create mode 100644 app_old/app/Controller/Home.php create mode 100644 app_old/app/Controller/Informes.php rename {resources/less => app_old/app}/Controller/Inmobiliarias.php (100%) rename {resources/less => app_old/app}/Controller/Operadores.php (100%) rename {resources/less => app_old/app}/Controller/Other.php (100%) rename {resources/less => app_old/app}/Controller/Pagares.php (100%) rename {resources/less => app_old/app}/Controller/Pagos.php (100%) rename {resources/less => app_old/app}/Controller/Pies.php (100%) rename {resources/less => app_old/app}/Controller/Postventas.php (100%) create mode 100644 app_old/app/Controller/Precios.php rename {resources/less => app_old/app}/Controller/Propietarios.php (100%) rename {resources/less => app_old/app}/Controller/ProyectoTipoUnidades.php (100%) create mode 100644 app_old/app/Controller/Proyectos.php rename {resources/less => app_old/app}/Controller/Reajustes.php (100%) rename {resources/less => app_old/app}/Controller/Registros.php (100%) rename {resources/less => app_old/app}/Controller/Subsidios.php (100%) rename {resources/less => app_old/app}/Controller/Temas.php (100%) rename {resources/less => app_old/app}/Controller/Unidades.php (100%) rename {resources/less => app_old/app}/Controller/UnidadesBloqueadas.php (100%) create mode 100644 app_old/app/Controller/Ventas.php create mode 100644 app_old/app/Definition/Controller.php create mode 100644 app_old/app/Definition/hasEstado.php create mode 100644 app_old/app/Definition/hasRUT.php create mode 100644 app_old/app/Exception/PropertyNotFound.php create mode 100644 app_old/app/Helper/Color.php create mode 100644 app_old/app/Helper/Line.php create mode 100644 app_old/app/Helper/functions.php create mode 100644 app_old/app/Middleware/Auth.php create mode 100644 app_old/app/Service/Auth.php create mode 100644 app_old/app/Service/Borrador.php create mode 100644 app_old/app/Service/DBToModel.php create mode 100644 app_old/app/Service/Factory.php create mode 100644 app_old/app/Service/Informador.php create mode 100644 app_old/app/Service/Informe/Contabilidad/Resumen.php create mode 100644 app_old/app/Service/Informe/Informe.php create mode 100644 app_old/app/Service/Money.php create mode 100644 app_old/app/Service/Register.php create mode 100644 app_old/app/Service/Remote.php create mode 100644 app_old/app/Service/Replacer.php create mode 100644 app_old/app/Service/Route.php create mode 100644 app_old/bin/Pipfile create mode 100644 app_old/bin/console create mode 100644 app_old/bin/index.php create mode 100644 app_old/bin/informes/Pipfile create mode 100644 app_old/bin/informes/app.py create mode 100644 app_old/bin/informes/controllers/ventas.py create mode 100644 app_old/bootstrap/autoload.php create mode 100644 app_old/bootstrap/database.php create mode 100644 app_old/bootstrap/dotenv.php create mode 100644 app_old/bootstrap/errors.php create mode 100644 app_old/bootstrap/logs.php create mode 100644 app_old/bootstrap/routes.php rename setup/cli.app.php => app_old/cli/app.php (100%) rename {setup => app_old/cli}/cli/config.php (100%) rename {setup => app_old/cli}/cli/middlewares.php (100%) rename {setup => app_old/cli}/cli/setups.php (82%) rename {setup => app_old/cli}/composer.php (100%) create mode 100644 app_old/composer.json create mode 100644 app_old/config/app.php create mode 100644 app_old/config/databases.php create mode 100644 app_old/config/incoviba.php create mode 100644 app_old/config/locations.php create mode 100644 app_old/fontify.json rename {incoviba => app_old/incoviba}/modelos/.gitignore (100%) rename {incoviba => app_old/incoviba}/modelos/common/Alias/Model.php (100%) rename {incoviba => app_old/incoviba}/modelos/common/Alias/NewEstado.php (100%) rename {incoviba => app_old/incoviba}/modelos/common/Alias/NewModel.php (100%) rename {incoviba => app_old/incoviba}/modelos/common/Alias/NewTipo.php (100%) rename {incoviba => app_old/incoviba}/modelos/common/Alias/OldModel.php (100%) rename {incoviba => app_old/incoviba}/modelos/common/Factory/Model.php (100%) rename {incoviba => app_old/incoviba}/modelos/composer.json (100%) rename {incoviba => app_old/incoviba}/modelos/src/common/Action.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/common/Auth.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/common/Location.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/common/Permission.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/common/Registry.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/common/RegistryData.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/common/Role.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/common/User.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/common/UserRole.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Common/Banco.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Common/Comuna.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Common/Direccion.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Common/M2.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Common/Provincia.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Common/Region.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Common/UF.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Inmobiliaria/Agente.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Inmobiliaria/CategoriaCuentaContable.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Inmobiliaria/Cobro.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Inmobiliaria/Contrato.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Inmobiliaria/Cuenta.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Inmobiliaria/CuentaContable.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Inmobiliaria/EstadoCobro.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Inmobiliaria/Inmobiliaria.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Inmobiliaria/Participacion.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Inmobiliaria/Representante.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Inmobiliaria/Socio.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Inmobiliaria/TipoAgente.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Inmobiliaria/TipoCobro.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Inmobiliaria/TipoContrato.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Inmobiliaria/TipoEstadoCobro.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Inmobiliaria/TransaccionContable.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Proyecto/EstadoProyecto.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Proyecto/Etapa.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Proyecto/Participe.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Proyecto/Proyecto.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Proyecto/ProyectoParticipe.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Proyecto/Tema.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Proyecto/TipoEstadoProyecto.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Proyecto/TipoUnidad.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Proyecto/UnidadProyecto.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Venta/Cierre.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Venta/Comentario.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Venta/Cuota.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Venta/Entrega.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Venta/EstadoCierre.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Venta/EstadoObservacion.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Venta/EstadoPago.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Venta/EstadoPostventa.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Venta/EstadoVenta.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Venta/FondoVenta.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Venta/FormaPago.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Venta/Medicion.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Venta/Observacion.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Venta/Pago.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Venta/Pie.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Venta/Postventa.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Venta/PostventaObservacion.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Venta/Premio.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Venta/Propiedad.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Venta/Propietario.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Venta/ProyectoTipoMedicion.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Venta/Reserva.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Venta/TipoEstadoCierre.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Venta/TipoEstadoObservacion.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Venta/TipoEstadoPago.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Venta/TipoEstadoPostventa.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Venta/TipoEstadoVenta.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Venta/TipoFondo.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Venta/TipoMedicion.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Venta/TipoPago.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Venta/TipoPremio.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Venta/Unidad.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Venta/UnidadPropiedad.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Venta/UnidadReserva.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/nuevo/Venta/Venta.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Common/Banco.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Common/Comuna.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Common/Direccion.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Common/Provincia.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Common/Region.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Inmobiliaria/Cuenta.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Inmobiliaria/Inmobiliaria.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Inmobiliaria/RelacionInmobiliarias.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Inmobiliaria/TipoSociedad.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Proyecto/Agente.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Proyecto/AgenteTipo.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Proyecto/AvanceConstruccion.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Proyecto/Cobro.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Proyecto/Costo.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Proyecto/EstadoCobro.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Proyecto/EstadoProyecto.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Proyecto/EstadoProyectoAgente.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Proyecto/EtapaProyecto.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Proyecto/Pagare.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Proyecto/Proyectista.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Proyecto/Proyectistas.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Proyecto/Proyecto.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Proyecto/ProyectoAgente.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Proyecto/ProyectoTipoUnidad.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Proyecto/RelacionAgentes.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Proyecto/RenovacionPagare.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Proyecto/TipoAgente.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Proyecto/TipoCobro.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Proyecto/TipoElemento.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Proyecto/TipoEstadoCobro.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Proyecto/TipoEstadoProyecto.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Proyecto/TipoEstadoProyectoAgente.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Proyecto/TipoMonedaPagare.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Proyecto/TipoProyectista.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Proyecto/TipoTipologia.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Proyecto/Tipologia.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Venta/BonoPie.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Venta/Cierre.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Venta/Comentario.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Venta/Credito.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Venta/Cuota.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Venta/Entrega.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Venta/Escritura.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Venta/EstadoCierre.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Venta/EstadoPago.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Venta/EstadoPrecio.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Venta/EstadoProblema.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Venta/EstadoUnidadBloqueada.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Venta/EstadoVenta.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Venta/Pago.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Venta/Pie.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Venta/Precio.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Venta/Problema.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Venta/Promocion.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Venta/PromocionVenta.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Venta/Propiedad.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Venta/PropiedadUnidad.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Venta/Propietario.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Venta/Subsidio.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Venta/TipoEstadoCierre.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Venta/TipoEstadoPago.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Venta/TipoEstadoPrecio.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Venta/TipoEstadoUnidadBloqueada.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Venta/TipoEstadoVenta.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Venta/TipoPago.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Venta/TipoUnidad.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Venta/TipoValorCierre.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Venta/Unidad.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Venta/UnidadBloqueada.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Venta/UnidadCierre.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Venta/ValorCierre.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Venta/Venta.php (100%) rename {incoviba => app_old/incoviba}/modelos/src/old/Venta/Venta.php.save (100%) rename package.json => app_old/package.json (100%) rename {public => app_old/public}/Pipfile (100%) rename {public => app_old/public}/api/.htaccess (100%) rename {public => app_old/public}/api/index.php (100%) rename {public => app_old/public}/api/keys (100%) rename {public => app_old/public}/css/app.css (100%) rename {public => app_old/public}/css/custom.css (100%) rename {public => app_old/public}/fonts/FontAwesome.otf (100%) rename {public => app_old/public}/fonts/fontawesome-webfont.eot (100%) rename {public => app_old/public}/fonts/fontawesome-webfont.svg (100%) rename {public => app_old/public}/fonts/fontawesome-webfont.ttf (100%) rename {public => app_old/public}/fonts/fontawesome-webfont.woff (100%) rename {public => app_old/public}/fonts/fontawesome-webfont.woff2 (100%) rename {public => app_old/public}/fonts/glyphicons-halflings-regular.eot (100%) rename {public => app_old/public}/fonts/glyphicons-halflings-regular.svg (100%) rename {public => app_old/public}/fonts/glyphicons-halflings-regular.ttf (100%) rename {public => app_old/public}/fonts/glyphicons-halflings-regular.woff (100%) rename {public => app_old/public}/fonts/glyphicons-halflings-regular.woff2 (100%) rename {public => app_old/public}/images/Isotipo 16.png (100%) rename {public => app_old/public}/images/Isotipo 32.png (100%) rename {public => app_old/public}/images/Isotipo 64.png (100%) rename {public => app_old/public}/images/logo_cabezal.png (100%) create mode 100644 app_old/public/index.php rename public/index.php => app_old/public/index.php.old (100%) rename {public => app_old/public}/install/create_admin.php (100%) rename {public => app_old/public}/install/create_guest.php (100%) rename {public => app_old/public}/install/create_user_base.php (100%) rename {public => app_old/public}/install/end_install.php (100%) rename {public => app_old/public}/install/index.php (100%) rename {public => app_old/public}/install/log_locations.php (100%) rename {public => app_old/public}/install/next_step.php (100%) rename {public => app_old/public}/js/admin.js (100%) rename {public => app_old/public}/js/app.js (100%) rename {public => app_old/public}/js/ventas/pies/cuotas/add.js (100%) rename {public => app_old/public}/links.log (100%) rename {public => app_old/public}/precios.csv (100%) rename {resources => app_old/resources}/js/app.js (100%) rename {resources => app_old/resources}/js/binaryIndexOf.js (100%) rename {resources => app_old/resources}/js/bootstrap.js (100%) rename {resources => app_old/resources}/js/chart.js (100%) rename {resources => app_old/resources}/js/jquery.filterTable.js (100%) create mode 100644 app_old/resources/less/Controller/Admin.php create mode 100644 app_old/resources/less/Controller/Ajax.php rename {resources => app_old/resources}/less/Controller/Auth.php (100%) rename {resources => app_old/resources}/less/Controller/Bonos.php (100%) create mode 100644 app_old/resources/less/Controller/Buscar.php rename {resources => app_old/resources}/less/Controller/Cierres.php (100%) create mode 100644 app_old/resources/less/Controller/Comentarios.php rename {resources => app_old/resources}/less/Controller/Contabilidad.php (100%) create mode 100644 app_old/resources/less/Controller/Creditos.php create mode 100644 app_old/resources/less/Controller/Cuotas.php create mode 100644 app_old/resources/less/Controller/Devoluciones.php create mode 100644 app_old/resources/less/Controller/Escrituras.php create mode 100644 app_old/resources/less/Controller/FormaPago.php rename {resources => app_old/resources}/less/Controller/Informes.php (99%) rename {resources => app_old/resources}/less/Controller/Informes.php.save (100%) create mode 100644 app_old/resources/less/Controller/Inmobiliarias.php create mode 100644 app_old/resources/less/Controller/Operadores.php create mode 100644 app_old/resources/less/Controller/Other.php create mode 100644 app_old/resources/less/Controller/Pagares.php create mode 100644 app_old/resources/less/Controller/Pagos.php create mode 100644 app_old/resources/less/Controller/Pies.php create mode 100644 app_old/resources/less/Controller/Postventas.php rename {resources => app_old/resources}/less/Controller/Precios.php (100%) create mode 100644 app_old/resources/less/Controller/Propietarios.php create mode 100644 app_old/resources/less/Controller/ProyectoTipoUnidades.php rename {resources => app_old/resources}/less/Controller/Proyectos.php (100%) create mode 100644 app_old/resources/less/Controller/Reajustes.php create mode 100644 app_old/resources/less/Controller/Registros.php create mode 100644 app_old/resources/less/Controller/Subsidios.php create mode 100644 app_old/resources/less/Controller/Temas.php create mode 100644 app_old/resources/less/Controller/Unidades.php create mode 100644 app_old/resources/less/Controller/UnidadesBloqueadas.php rename {resources => app_old/resources}/less/Controller/Ventas.php (100%) rename {resources => app_old/resources}/less/_variables.less (100%) rename {resources => app_old/resources}/less/app.less (100%) rename {resources => app_old/resources}/less/bootstrap.less (100%) rename {resources => app_old/resources}/less/custom.less (100%) rename {resources => app_old/resources}/less/print.less (100%) rename {resources => app_old/resources}/less/submenu.less (100%) rename {resources => app_old/resources}/routes/api.php (100%) rename {resources => app_old/resources}/routes/api/unidades.php (100%) rename {resources => app_old/resources}/routes/cli.php (100%) create mode 100644 app_old/resources/routes/ui/01_auth.php create mode 100644 app_old/resources/routes/ui/99_base.php rename {resources => app_old/resources}/views/admin/base.blade.php (100%) rename {resources => app_old/resources}/views/admin/menu.blade.php (100%) rename {resources => app_old/resources}/views/admin/menu/models.blade.php (100%) rename {resources => app_old/resources}/views/admin/menu/registros.blade.php (100%) rename {resources => app_old/resources}/views/admin/menu/roles.blade.php (100%) rename {resources => app_old/resources}/views/admin/menu/users.blade.php (100%) rename {resources => app_old/resources}/views/admin/models.blade.php (100%) rename {resources => app_old/resources}/views/admin/registros/controles_avance.blade.php (100%) rename {resources => app_old/resources}/views/admin/registros/list.blade.php (100%) rename {resources => app_old/resources}/views/admin/registros/show.blade.php (100%) rename {resources => app_old/resources}/views/admin/roles/add.blade.php (100%) rename {resources => app_old/resources}/views/admin/roles/add_permissions.blade.php (100%) rename {resources => app_old/resources}/views/admin/roles/add_users.blade.php (100%) rename {resources => app_old/resources}/views/admin/roles/list.blade.php (100%) rename {resources => app_old/resources}/views/admin/roles/show.blade.php (100%) rename {resources => app_old/resources}/views/admin/users/add.blade.php (100%) rename {resources => app_old/resources}/views/admin/users/add_role.blade.php (100%) rename {resources => app_old/resources}/views/admin/users/list.blade.php (100%) rename {resources => app_old/resources}/views/admin/users/show.blade.php (100%) rename {resources => app_old/resources}/views/auth/base.blade.php (72%) rename {resources => app_old/resources}/views/auth/change_pass.blade.php (100%) create mode 100644 app_old/resources/views/auth/login.blade.php rename {resources => app_old/resources}/views/benchmark.blade.php (100%) rename {resources => app_old/resources}/views/buscar/buscar.blade.php (100%) rename {resources => app_old/resources}/views/buscar/resultado.blade.php (100%) rename {resources => app_old/resources}/views/calendario.blade.php (100%) rename {resources => app_old/resources}/views/cierres.blade.php (100%) rename {resources => app_old/resources}/views/construccion.blade.php (100%) rename {resources => app_old/resources}/views/contabilidad/pago.blade.php (100%) rename {resources => app_old/resources}/views/contabilidad/pagos.blade.php (100%) rename {resources => app_old/resources}/views/form/fecha.blade.php (100%) rename {resources => app_old/resources}/views/guest.blade.php (71%) rename {resources => app_old/resources}/views/home.blade.php (60%) rename {resources => app_old/resources}/views/informes/comisiones.blade.php (100%) rename {resources => app_old/resources}/views/informes/contabilidad.blade.php (100%) rename {resources => app_old/resources}/views/informes/escrituras.blade.php (100%) rename {resources => app_old/resources}/views/informes/gantt_entregas.blade.php (100%) rename {resources => app_old/resources}/views/informes/para_comision.blade.php (100%) rename {resources => app_old/resources}/views/informes/proyectos.blade.php (100%) rename {resources => app_old/resources}/views/informes/resciliaciones.blade.php (100%) rename {resources => app_old/resources}/views/informes/resumen_contabilidad.blade.php (100%) rename {resources => app_old/resources}/views/informes/ventas.blade.php (100%) rename {resources => app_old/resources}/views/inmobiliarias/add.blade.php (100%) rename {resources => app_old/resources}/views/inmobiliarias/edit.blade.php (100%) rename {resources => app_old/resources}/views/inmobiliarias/list.blade.php (100%) rename {resources => app_old/resources}/views/inmobiliarias/show.blade.php (100%) rename {resources => app_old/resources}/views/install/admin.blade.php (100%) rename {resources => app_old/resources}/views/install/base.blade.php (100%) rename {resources => app_old/resources}/views/install/end.blade.php (100%) rename {resources => app_old/resources}/views/install/start.blade.php (100%) rename {resources => app_old/resources}/views/layout/base.blade.php (100%) rename {resources => app_old/resources}/views/layout/footer.blade.php (100%) rename {resources => app_old/resources}/views/layout/header.blade.php (100%) rename {resources => app_old/resources}/views/layout/icons/abonar.blade.php (100%) rename {resources => app_old/resources}/views/layout/icons/add.blade.php (100%) rename {resources => app_old/resources}/views/layout/icons/edit.blade.php (100%) rename {resources => app_old/resources}/views/layout/icons/pagar.blade.php (100%) rename {resources => app_old/resources}/views/layout/icons/remove.blade.php (100%) rename {resources => app_old/resources}/views/layout/icons/show.blade.php (100%) rename {resources => app_old/resources}/views/layout/menu.blade.php (96%) rename {resources => app_old/resources}/views/layout/menu.blade.php.save (100%) rename {resources => app_old/resources}/views/layout/menu/herramientas.blade.php (100%) rename {resources => app_old/resources}/views/layout/menu/informes.blade.php (100%) rename {resources => app_old/resources}/views/layout/menu/inmobiliarias.blade.php (100%) create mode 100644 app_old/resources/views/layout/menu/login.blade.php rename {resources => app_old/resources}/views/layout/menu/operadores.blade.php (100%) rename {resources => app_old/resources}/views/layout/menu/proyectos.blade.php (100%) rename {resources => app_old/resources}/views/layout/menu/ventas.blade.php (100%) rename {resources => app_old/resources}/views/other/capacidades.blade.php (100%) rename {resources => app_old/resources}/views/other/entregar_multiple.blade.php (100%) rename {resources => app_old/resources}/views/print/devolucion.blade.php (100%) rename {resources => app_old/resources}/views/proyectos/add.blade.php (100%) rename {resources => app_old/resources}/views/proyectos/advance.blade.php (100%) rename {resources => app_old/resources}/views/proyectos/avance.blade.php (100%) rename {resources => app_old/resources}/views/proyectos/avances/edit.blade.php (100%) rename {resources => app_old/resources}/views/proyectos/avances_row.blade.php (100%) rename {resources => app_old/resources}/views/proyectos/construccion.blade.php (100%) rename {resources => app_old/resources}/views/proyectos/disponibles.blade.php (100%) rename {resources => app_old/resources}/views/proyectos/estimado.blade.php (100%) rename {resources => app_old/resources}/views/proyectos/historia.blade.php (100%) rename {resources => app_old/resources}/views/proyectos/historia.blade.php.old (100%) rename {resources => app_old/resources}/views/proyectos/list.blade.php (100%) rename {resources => app_old/resources}/views/proyectos/operadores/add.blade.php (100%) rename {resources => app_old/resources}/views/proyectos/pagares/add.blade.php (100%) rename {resources => app_old/resources}/views/proyectos/pagares/add_renovacion.blade.php (100%) rename {resources => app_old/resources}/views/proyectos/pagares/edit.blade.php (100%) rename {resources => app_old/resources}/views/proyectos/pagares/edit_renovacion.blade.php (100%) rename {resources => app_old/resources}/views/proyectos/pagares/show.blade.php (100%) rename {resources => app_old/resources}/views/proyectos/por_vender.blade.php (100%) rename {resources => app_old/resources}/views/proyectos/reservas/base.blade.php (100%) rename {resources => app_old/resources}/views/proyectos/show.blade.php (100%) rename {resources => app_old/resources}/views/proyectos/superficies.blade.php (100%) rename {resources => app_old/resources}/views/proyectos/tipo_unidades/add.blade.php (100%) rename {resources => app_old/resources}/views/proyectos/tipo_unidades/edit.blade.php (100%) rename {resources => app_old/resources}/views/proyectos/unidades/add.blade.php (100%) rename {resources => app_old/resources}/views/proyectos/unidades/add2.blade.php (100%) rename {resources => app_old/resources}/views/proyectos/unidades/assign.blade.php (100%) rename {resources => app_old/resources}/views/proyectos/unidades/edit.blade.php (100%) rename {resources => app_old/resources}/views/proyectos/unidades/list.blade.php (100%) rename {resources => app_old/resources}/views/proyectos/unidades/proyectos.blade.php (100%) rename {resources => app_old/resources}/views/proyectos/ventas.blade.php (100%) rename {resources => app_old/resources}/views/temas/add.blade.php (100%) rename {resources => app_old/resources}/views/temas/edit.blade.php (100%) rename {resources => app_old/resources}/views/temas/list.blade.php (100%) rename {resources => app_old/resources}/views/ventas/add.blade.php (100%) rename {resources => app_old/resources}/views/ventas/archivar.blade.php (100%) rename {resources => app_old/resources}/views/ventas/bonos/add.blade.php (100%) rename {resources => app_old/resources}/views/ventas/bonos/edit.blade.php (100%) rename {resources => app_old/resources}/views/ventas/ceder.blade.php (100%) rename {resources => app_old/resources}/views/ventas/cierres/add.blade.php (100%) rename {resources => app_old/resources}/views/ventas/cierres/edit.blade.php (100%) rename {resources => app_old/resources}/views/ventas/cierres/evaluar.blade.php (100%) rename {resources => app_old/resources}/views/ventas/cierres/list.blade.php (100%) rename {resources => app_old/resources}/views/ventas/cierres/show.blade.php (100%) rename {resources => app_old/resources}/views/ventas/comentarios/add.blade.php (100%) rename {resources => app_old/resources}/views/ventas/consolidacion/pago.blade.php (100%) rename {resources => app_old/resources}/views/ventas/consolidacion/proyectos.blade.php (100%) rename {resources => app_old/resources}/views/ventas/consolidacion/show.blade.php (100%) rename {resources => app_old/resources}/views/ventas/creditos/abonar.blade.php (100%) rename {resources => app_old/resources}/views/ventas/creditos/add.blade.php (100%) rename {resources => app_old/resources}/views/ventas/creditos/edit.blade.php (100%) rename {resources => app_old/resources}/views/ventas/creditos/pagar.blade.php (100%) rename {resources => app_old/resources}/views/ventas/creditos/pendientes.blade.php (100%) rename {resources => app_old/resources}/views/ventas/creditos/show.blade.php (100%) rename {resources => app_old/resources}/views/ventas/desist.blade.php (100%) rename {resources => app_old/resources}/views/ventas/devolucion.blade.php (100%) rename {resources => app_old/resources}/views/ventas/edit.blade.php (100%) rename {resources => app_old/resources}/views/ventas/entregar.blade.php (100%) rename {resources => app_old/resources}/views/ventas/escrituras/abonar.blade.php (100%) rename {resources => app_old/resources}/views/ventas/escrituras/add.blade.php (100%) rename {resources => app_old/resources}/views/ventas/escrituras/edit.blade.php (100%) rename {resources => app_old/resources}/views/ventas/escrituras/informe.blade.php (100%) rename {resources => app_old/resources}/views/ventas/escrituras/pagar.blade.php (100%) rename {resources => app_old/resources}/views/ventas/firmar.blade.php (100%) rename {resources => app_old/resources}/views/ventas/forma_pago.blade.php (100%) rename {resources => app_old/resources}/views/ventas/forma_pago/edit.blade.php (100%) rename {resources => app_old/resources}/views/ventas/list.blade.php (100%) rename {resources => app_old/resources}/views/ventas/operadores/unidades/bloquear.blade.php (100%) rename {resources => app_old/resources}/views/ventas/operadores/unidades/list.blade.php (100%) rename {resources => app_old/resources}/views/ventas/pagos/edit.blade.php (100%) rename {resources => app_old/resources}/views/ventas/pagos/pendientes.blade.php (100%) rename {resources => app_old/resources}/views/ventas/pagos/show.blade.php (100%) rename {resources => app_old/resources}/views/ventas/pies/cuotas/abonar.blade.php (100%) rename {resources => app_old/resources}/views/ventas/pies/cuotas/add.blade.php (100%) rename {resources => app_old/resources}/views/ventas/pies/cuotas/edit.blade.php (100%) rename {resources => app_old/resources}/views/ventas/pies/cuotas/estado.blade.php (100%) rename {resources => app_old/resources}/views/ventas/pies/cuotas/pendientes.blade.php (100%) rename {resources => app_old/resources}/views/ventas/pies/cuotas/show.blade.php (100%) rename {resources => app_old/resources}/views/ventas/pies/edit.blade.php (100%) rename {resources => app_old/resources}/views/ventas/pies/reajustar.blade.php (100%) rename {resources => app_old/resources}/views/ventas/pies/reajustes/abonar.blade.php (100%) rename {resources => app_old/resources}/views/ventas/pies/reajustes/edit.blade.php (100%) rename {resources => app_old/resources}/views/ventas/pies/reajustes/pagar.blade.php (100%) rename {resources => app_old/resources}/views/ventas/pies/resumen.blade.php (100%) rename {resources => app_old/resources}/views/ventas/pies/totales.blade.php (100%) rename {resources => app_old/resources}/views/ventas/postventas/add.blade.php (100%) rename {resources => app_old/resources}/views/ventas/postventas/show.blade.php (100%) rename {resources => app_old/resources}/views/ventas/precios/add.blade.php (100%) rename {resources => app_old/resources}/views/ventas/precios/import.blade.php (100%) rename {resources => app_old/resources}/views/ventas/precios/list.blade.php (100%) rename {resources => app_old/resources}/views/ventas/precios/proyectos.blade.php (100%) rename {resources => app_old/resources}/views/ventas/propietarios/edit.blade.php (100%) rename {resources => app_old/resources}/views/ventas/proyectos.blade.php (100%) rename {resources => app_old/resources}/views/ventas/resciliaciones.blade.php (100%) rename {resources => app_old/resources}/views/ventas/show.blade.php (100%) rename {resources => app_old/resources}/views/ventas/sort_title.blade.php (100%) rename {resources => app_old/resources}/views/ventas/subsidios/abonar.blade.php (100%) rename {resources => app_old/resources}/views/ventas/subsidios/add.blade.php (100%) rename {resources => app_old/resources}/views/ventas/subsidios/edit.blade.php (100%) rename {resources => app_old/resources}/views/ventas/subsidios/pagar.blade.php (100%) rename {setup => app_old/setup}/api/config.php (100%) rename {setup => app_old/setup}/api/setups.php (100%) create mode 100644 app_old/setup/app.php rename {setup => app_old/setup}/common/config.php (100%) create mode 100644 app_old/setup/composer.php rename {setup => app_old/setup}/database.php (100%) rename {setup => app_old/setup}/env/config.php (100%) rename {setup => app_old/setup}/router.php (100%) rename {setup => app_old/setup}/settings/01_env.php (100%) rename {setup => app_old/setup}/settings/02_common.php (100%) rename {setup => app_old/setup}/settings/03_api.php (100%) rename {setup => app_old/setup}/settings/04_ui.php (100%) rename {setup => app_old/setup}/setups/04_ui.php (100%) create mode 100644 app_old/ui/app.php create mode 100644 app_old/ui/composer.php create mode 100644 app_old/ui/middlewares/01_auth.php create mode 100644 app_old/ui/middlewares/02_databases.php create mode 100644 app_old/ui/middlewares/98_logs.php create mode 100644 app_old/ui/middlewares/99_routes.php create mode 100644 app_old/ui/settings/01_env.php create mode 100644 app_old/ui/settings/02_folders.php create mode 100644 app_old/ui/settings/03_urls.php create mode 100644 app_old/ui/settings/04_databases.php create mode 100644 app_old/ui/setups/01_views.php create mode 100644 app_old/ui/setups/03_services.php create mode 100644 app_old/ui/setups/98_logs.php rename webpack.config.js => app_old/webpack.config.js (100%) delete mode 100644 resources/views/auth/login.blade.php delete mode 100644 resources/views/layout/menu/login.blade.php delete mode 100644 setup/app.php diff --git a/app_old/.adminer.env.sample b/app_old/.adminer.env.sample new file mode 100644 index 0000000..7e78794 --- /dev/null +++ b/app_old/.adminer.env.sample @@ -0,0 +1,2 @@ +ADMINER_DESIGN=dracula +ADMINER_PLUGINS=dump-json diff --git a/app_old/.db.env.sample b/app_old/.db.env.sample new file mode 100644 index 0000000..18b1117 --- /dev/null +++ b/app_old/.db.env.sample @@ -0,0 +1,4 @@ +MYSQL_DATABASE= +MYSQL_PASSWORD= +MYSQL_ROOT_PASSWORD= +MYSQL_USER= diff --git a/app_old/.env.sample b/app_old/.env.sample new file mode 100644 index 0000000..31fe938 --- /dev/null +++ b/app_old/.env.sample @@ -0,0 +1,2 @@ +BASE_URL= +MYSQL_HOST= diff --git a/app_old/.gitignore b/app_old/.gitignore new file mode 100644 index 0000000..94a1003 --- /dev/null +++ b/app_old/.gitignore @@ -0,0 +1,10 @@ +**/*.env +**/vendor/ +**/composer.lock +**/node_modules/ +**/package-lock.json +**/Pipfile.lock +**/logs/ +**/cache/ +**/modules/ +**/.idea/ diff --git a/app_old/aldarien/asset/.gitignore b/app_old/aldarien/asset/.gitignore new file mode 100644 index 0000000..3b12249 --- /dev/null +++ b/app_old/aldarien/asset/.gitignore @@ -0,0 +1,11 @@ +composer.phar +/vendor/ + +# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file +# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file +# composer.lock + +#Eclipse IDE +.settings +.buildpath +.project diff --git a/app_old/aldarien/asset/LICENSE b/app_old/aldarien/asset/LICENSE new file mode 100644 index 0000000..55dc05a --- /dev/null +++ b/app_old/aldarien/asset/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2017 Aldarien + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/app_old/aldarien/asset/README.md b/app_old/aldarien/asset/README.md new file mode 100644 index 0000000..1580798 --- /dev/null +++ b/app_old/aldarien/asset/README.md @@ -0,0 +1,2 @@ +# asset +Asset manager module for my apps diff --git a/app_old/aldarien/asset/app/Contract/Asset.php b/app_old/aldarien/asset/app/Contract/Asset.php new file mode 100644 index 0000000..30b02c2 --- /dev/null +++ b/app_old/aldarien/asset/app/Contract/Asset.php @@ -0,0 +1,21 @@ +get($identifier); + } +} +?> diff --git a/app_old/aldarien/asset/app/Helper/functions.php b/app_old/aldarien/asset/app/Helper/functions.php new file mode 100644 index 0000000..b0688e2 --- /dev/null +++ b/app_old/aldarien/asset/app/Helper/functions.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/app_old/aldarien/asset/app/Service/Asset.php b/app_old/aldarien/asset/app/Service/Asset.php new file mode 100644 index 0000000..e7c36b7 --- /dev/null +++ b/app_old/aldarien/asset/app/Service/Asset.php @@ -0,0 +1,88 @@ +dir = config('locations.public'); + } + public function get($identifier) + { + $asset = $this->find($identifier); + return $asset->url; + } + protected function find($identifier) + { + $type = $this->getType($identifier); + $asset = null; + if ($type == false) { + foreach (array_keys($this->assets) as $type) { + if (($asset = $this->getAsset($identifier, $type))) { + break; + } + } + } else { + $asset = $this->getAsset($identifier, $type); + } + return $asset; + } + protected function getType($identifier) + { + if (strpos($identifier, '.') !== false) { + list($name, $ext) = explode('.', $identifier); + return $ext; + } + return false; + } + protected function getAsset($identifier, $type) + { + if (!isset($this->assets[$type])) { + $this->loadAssets($type); + } + if (!isset($this->assets[$type])) { + return null; + } + + foreach ($this->assets[$type] as $asset) { + if ($this->compareIdentifier($asset, $identifier)) { + return $asset; + } + } + return null; + } + protected function loadAssets($type) + { + $dir = $this->dir . '/' . $type . '/*.' . $type; + $files = glob($dir); + foreach ($files as $file) { + $url = $this->url($file); + $identifier = pathinfo($file)['filename']; + + $this->assets[$type] []= (object) ['identifier' => $identifier, 'url' => $url, 'type' => $type]; + } + } + protected function url($file) + { + $url = '/' . config('app.project') . '/' . str_replace('\\', '/', str_replace(realpath(config('locations.public')), '', dirname(realpath($file)))) . '/' . basename(realpath($file)); + $url = preg_replace('/\/+/', '/', $url); + return $url; + } + protected function compareIdentifier($asset, $identifier) + { + if (strpos($identifier, '.') !== false) { + list($name, $ext) = explode('.', $identifier); + if ($asset->identifier == $name and $asset->type == $ext) { + return true; + } + } else { + if ($asset->identifier == $identifier) { + return true; + } + } + return false; + } +} diff --git a/app_old/aldarien/asset/composer.json b/app_old/aldarien/asset/composer.json new file mode 100644 index 0000000..dd2c217 --- /dev/null +++ b/app_old/aldarien/asset/composer.json @@ -0,0 +1,26 @@ +{ + "name" : "aldarien/asset", + "description" : "Asset manager module for my apps", + "type" : "library", + "require" : { + "aldarien/config" : "*", + "aldarien/contract" : "*" + }, + "require-dev" : { + "phpunit/phpunit" : "*" + }, + "license" : "MIT", + "authors" : [{ + "name" : "Aldarien", + "email" : "aldarien85@gmail.com" + } + ], + "autoload" : { + "psr-4" : { + "App\\" : "app" + }, + "files": [ + "app/Helper/functions.php" + ] + } +} diff --git a/app_old/aldarien/asset/phpunit.xml b/app_old/aldarien/asset/phpunit.xml new file mode 100644 index 0000000..e60ecbd --- /dev/null +++ b/app_old/aldarien/asset/phpunit.xml @@ -0,0 +1,17 @@ + + + + + ./tests/ + + + + + ./app + + + \ No newline at end of file diff --git a/app_old/aldarien/asset/tests/AssetTest.php b/app_old/aldarien/asset/tests/AssetTest.php new file mode 100644 index 0000000..e53f0ad --- /dev/null +++ b/app_old/aldarien/asset/tests/AssetTest.php @@ -0,0 +1,25 @@ +assertEquals(asset('style.css'), '/css/style.css'); + } +} +?> \ No newline at end of file diff --git a/app_old/aldarien/config/.gitignore b/app_old/aldarien/config/.gitignore new file mode 100644 index 0000000..47c4114 --- /dev/null +++ b/app_old/aldarien/config/.gitignore @@ -0,0 +1,13 @@ +composer.phar +/vendor/ + +# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file +# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file +# composer.lock + +config + +# Eclipse IDE +.settings +.buildpath +.project \ No newline at end of file diff --git a/app_old/aldarien/config/.travis.yml b/app_old/aldarien/config/.travis.yml new file mode 100644 index 0000000..a792980 --- /dev/null +++ b/app_old/aldarien/config/.travis.yml @@ -0,0 +1,3 @@ +language: php +php: '7.1' +install: composer update diff --git a/app_old/aldarien/config/LICENSE b/app_old/aldarien/config/LICENSE new file mode 100644 index 0000000..55dc05a --- /dev/null +++ b/app_old/aldarien/config/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2017 Aldarien + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/app_old/aldarien/config/README.md b/app_old/aldarien/config/README.md new file mode 100644 index 0000000..dfed35b --- /dev/null +++ b/app_old/aldarien/config/README.md @@ -0,0 +1,4 @@ +# config +Config module that recovers configuration files + +[![Build Status](https://travis-ci.org/Aldarien/config.svg?branch=1.0.1)](https://travis-ci.org/Aldarien/config) diff --git a/app_old/aldarien/config/app/Contract/Config.php b/app_old/aldarien/config/app/Contract/Config.php new file mode 100644 index 0000000..9664aca --- /dev/null +++ b/app_old/aldarien/config/app/Contract/Config.php @@ -0,0 +1,31 @@ +get($name); + } + public static function set($name, $value) + { + $instance = self::getInstance(); + return $instance->set($name, $value); + } + public static function addFile($filename) + { + $instance = self::getInstance(); + return $instance->loadFile($filename); + } +} +?> diff --git a/app_old/aldarien/config/app/Contract/YamlWrapper.php b/app_old/aldarien/config/app/Contract/YamlWrapper.php new file mode 100644 index 0000000..0ab60f6 --- /dev/null +++ b/app_old/aldarien/config/app/Contract/YamlWrapper.php @@ -0,0 +1,21 @@ + \ No newline at end of file diff --git a/app_old/aldarien/config/app/Helper/functions.php b/app_old/aldarien/config/app/Helper/functions.php new file mode 100644 index 0000000..e073f18 --- /dev/null +++ b/app_old/aldarien/config/app/Helper/functions.php @@ -0,0 +1,9 @@ + diff --git a/app_old/aldarien/config/app/Service/Config.php b/app_old/aldarien/config/app/Service/Config.php new file mode 100644 index 0000000..072e38f --- /dev/null +++ b/app_old/aldarien/config/app/Service/Config.php @@ -0,0 +1,150 @@ +dir = $dir; + $this->load(); + } + protected function load() + { + $files = glob($this->dir . '/*.{php,json,yml}', GLOB_BRACE); + foreach ($files as $file) { + $info = pathinfo($file); + $name = $info['filename']; + + $d = $this->getData($file); + $data[$name] = $d; + $data = array_merge($data, $this->translateArray($d, $name)); + foreach ($data as $key => $value) { + $this->add($key, $value); + } + } + } + public function loadFile(string $filename) + { + if (!file_exists(realpath($filename))) { + return false; + } + $info = pathinfo($filename); + $name = $info['filename']; + $d = $this->getData($filename); + $data[$name] = $d; + $data = array_merge($data, $this->translateArray($d, $name)); + foreach ($data as $key => $value) { + $this->add($key, $value); + } + return true; + } + protected function getData($filename) + { + $info = pathinfo($filename); + + switch ($info['extension']) { + case 'php': + return include_once $filename; + case 'json': + return json_decode(file_get_contents($filename), true); + case 'yml': + return YamlWrapper::load($filename); + default: + throw new \DomainException('Invalid file extension for ' . $filename); + } + } + protected function translateArray($array, $level) + { + $output = []; + foreach ($array as $k1 => $l1) { + $key = $level . '.' . $k1; + if (is_array($l1)) { + $output[$key] = $l1; + $output = array_merge($output, $this->translateArray($l1, $key)); + } else { + $output[$key] = $l1; + } + } + return $output; + } + protected function add($field, $value) + { + if (isset($this->data[$field])) { + if ($this->data[$field] == $value) { + return; + } + if (is_array($this->data[$field])) { + $this->data[$field] = $this->merge($this->data[$field], $this->replace($value)); + } else { + $this->data[$field] = $this->replace($value); + } + } else { + $this->data[$field] = $this->replace($value); + } + } + protected function merge($arr1, $arr2) + { + $output = $arr1; + foreach ($arr2 as $k => $value) { + if (isset($arr1[$k])) { + if ($arr1[$k] == $value) { + continue; + } + if (is_array($arr1[$k])) { + $output[$k] = $this->merge($arr1[$k], $value); + } else { + $output[$k] = array_merge([$arr1[$k]], $value); + } + } else { + $output[$k] = $value; + } + } + return $output; + } + protected function replace($value) + { + if (is_array($value)) { + foreach ($value as $k => $v) { + $value[$k] = $this->replace($v); + } + return $value; + } + if (strpos($value, '{') !== false) { + while(strpos($value, '{') !== false) { + $ini = strpos($value, '{') + 1; + $end = strpos($value, '}', $ini); + $rep = substr($value, $ini, $end - $ini); + $new = $this->get($rep); + if ($new === null) { + $new = ''; + } + $value = str_replace('{' . $rep . '}', $new, $value); + } + } + return $value; + } + + public function get($name = null) + { + if ($name == null) { + return $this->data; + } + if (isset($this->data[$name])) { + return $this->data[$name]; + } + return null; + } + public function set($name, $value) + { + $this->add($name, $value); + } +} +?> diff --git a/app_old/aldarien/config/bootstrap/autoload.php b/app_old/aldarien/config/bootstrap/autoload.php new file mode 100644 index 0000000..42765bd --- /dev/null +++ b/app_old/aldarien/config/bootstrap/autoload.php @@ -0,0 +1,3 @@ + diff --git a/app_old/aldarien/config/composer.json b/app_old/aldarien/config/composer.json new file mode 100644 index 0000000..ff4255b --- /dev/null +++ b/app_old/aldarien/config/composer.json @@ -0,0 +1,28 @@ +{ + "name": "aldarien/config", + "description": "Config module for my apps", + "type": "library", + "license": "MIT", + "authors": [ + { + "name": "Aldarien", + "email": "aldarien85@gmail.com" + } + ], + "require": { + "aldarien/contract": "*", + "aldarien/root": "*", + "symfony/yaml": "*" + }, + "autoload": { + "psr-4": { + "App\\": "app" + }, + "files": [ + "app/Helper/functions.php" + ] + }, + "require-dev": { + "phpunit/phpunit": "^6.3" + } +} diff --git a/app_old/aldarien/config/phpunit.xml b/app_old/aldarien/config/phpunit.xml new file mode 100644 index 0000000..db312e1 --- /dev/null +++ b/app_old/aldarien/config/phpunit.xml @@ -0,0 +1,17 @@ + + + + + ./tests/ + + + + + ./app + + + \ No newline at end of file diff --git a/app_old/aldarien/config/tests/ConfigTest.php b/app_old/aldarien/config/tests/ConfigTest.php new file mode 100644 index 0000000..187e0a3 --- /dev/null +++ b/app_old/aldarien/config/tests/ConfigTest.php @@ -0,0 +1,90 @@ + 'Config', 'test_array' => ['data1' => 1, 'data2' => 2]]; ?>"; + file_put_contents(dirname(__DIR__) . '/config/app.php', $str); + $data = ['name' => 'Config', 'test_array' => ['data1' => 1, 'data2' => 2]]; + file_put_contents(dirname(__DIR__) . '/config/json.json', json_encode($data)); + file_put_contents(dirname(__DIR__) . '/config/yaml.yml', YamlWrapper::dump($data)); + $data = ['last_name' => 'Config']; + file_put_contents(dirname(__DIR__) . '/config/yaml.json', json_encode($data)); + } + public function testGetNamePhp() + { + $name = 'Config'; + + $this->assertEquals($name, config('app.name')); + } + public function testGetNameJson() + { + $name = 'Config'; + + $this->assertEquals($name, config('json.name')); + } + public function testGetNameYaml() + { + $name = 'Config'; + + $this->assertEquals($name, config('yaml.name')); + } + public function testSetNamehp() + { + $new_name = 'Config_Test'; + config('app.name', $new_name); + $this->assertEquals($new_name, config('app.name')); + } + public function testSetNameJson() + { + $new_name = 'Config_Test'; + config('json.name', $new_name); + $this->assertEquals($new_name, config('json.name')); + } + public function testSetNameYaml() + { + $new_name = 'Config_Test'; + config('yaml.name', $new_name); + $this->assertEquals($new_name, config('yaml.name')); + } + public function testArrayGetPhp() + { + $this->assertArrayHasKey('data1', config('app.test_array')); + } + public function testArrayGetJson() + { + $this->assertArrayHasKey('data1', config('json.test_array')); + } + public function testArrayGetYaml() + { + $this->assertArrayHasKey('data1', config('yaml.test_array')); + } + public function testSameSectionName() + { + $this->assertEquals('Config', config('yaml.last_name')); + } + public function testDuplicateValue() + { + config('json.name', 'Config2'); + $this->assertEquals('Config2', config('json.name')); + } + public function testAddFile() + { + $filename = dirname(__DIR__) . '/composer.json'; + App\Contract\Config::addFile($filename); + $this->assertEquals('aldarien/config', config('composer.name')); + } + public function tearDown() + { + unlink(dirname(__DIR__) . '/config/app.php'); + unlink(dirname(__DIR__) . '/config/json.json'); + unlink(dirname(__DIR__) . '/config/yaml.yml'); + unlink(dirname(__DIR__) . '/config/yaml.json'); + rmdir(dirname(__DIR__) . '/config'); + } +} +?> \ No newline at end of file diff --git a/app_old/aldarien/contract/.gitignore b/app_old/aldarien/contract/.gitignore new file mode 100644 index 0000000..c422267 --- /dev/null +++ b/app_old/aldarien/contract/.gitignore @@ -0,0 +1,6 @@ +composer.phar +/vendor/ + +# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file +# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file +# composer.lock diff --git a/app_old/aldarien/contract/LICENSE b/app_old/aldarien/contract/LICENSE new file mode 100644 index 0000000..55dc05a --- /dev/null +++ b/app_old/aldarien/contract/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2017 Aldarien + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/app_old/aldarien/contract/app/Definition/Contract.php b/app_old/aldarien/contract/app/Definition/Contract.php new file mode 100644 index 0000000..4cc88ca --- /dev/null +++ b/app_old/aldarien/contract/app/Definition/Contract.php @@ -0,0 +1,20 @@ + diff --git a/app_old/aldarien/contract/composer.json b/app_old/aldarien/contract/composer.json new file mode 100644 index 0000000..96ef067 --- /dev/null +++ b/app_old/aldarien/contract/composer.json @@ -0,0 +1,18 @@ +{ + "name": "aldarien/contract", + "description": "Contract trait for my apps", + "type": "library", + "license": "MIT", + "authors": [ + { + "name": "Aldarien", + "email": "aldarien85@gmail.com" + } + ], + "require": {}, + "autoload": { + "psr-4": { + "App\\": "app" + } + } +} diff --git a/app_old/aldarien/format/.gitignore b/app_old/aldarien/format/.gitignore new file mode 100644 index 0000000..6ee50e6 --- /dev/null +++ b/app_old/aldarien/format/.gitignore @@ -0,0 +1,11 @@ +composer.phar +/vendor/ + +# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file +# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file +# composer.lock + +# Eclipse IDE +.settings +.buildpath +.project \ No newline at end of file diff --git a/app_old/aldarien/format/LICENSE b/app_old/aldarien/format/LICENSE new file mode 100644 index 0000000..55dc05a --- /dev/null +++ b/app_old/aldarien/format/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2017 Aldarien + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/app_old/aldarien/format/README.md b/app_old/aldarien/format/README.md new file mode 100644 index 0000000..d4f839f --- /dev/null +++ b/app_old/aldarien/format/README.md @@ -0,0 +1,2 @@ +# format +Module for formatting data, mostly numbers diff --git a/app_old/aldarien/format/app/Helper/Format.php b/app_old/aldarien/format/app/Helper/Format.php new file mode 100644 index 0000000..9836f38 --- /dev/null +++ b/app_old/aldarien/format/app/Helper/Format.php @@ -0,0 +1,43 @@ +format("d \d\\e F Y"); + } + public static function shortDate(string $date) + { + $d = \Carbon\Carbon::parse($date, config('app.timezone')); + return $d->format('d-m-Y'); + } + public static function localDate(string $date) + { + $d = \Carbon\Carbon::parse($date, config('app.timezone')); + setlocale(LC_TIME, 'es'); + return $d->formatLocalized('%d de %B de %Y'); + } + public static function m2(float $number, bool $print = false) + { + return self::number($number, 2) . (($print) ? ' m²' : ''); + } + public static function percent(float $number, bool $print = false) + { + return self::number($number, 2) . (($print) ? '%' : ''); + } +} +?> \ No newline at end of file diff --git a/app_old/aldarien/format/composer.json b/app_old/aldarien/format/composer.json new file mode 100644 index 0000000..59d058d --- /dev/null +++ b/app_old/aldarien/format/composer.json @@ -0,0 +1,23 @@ +{ + "name" : "aldarien/format", + "description" : "Module for formatting data, mostly numbers", + "type" : "library", + "require-dev" : { + "phpunit/phpunit" : "*", + "aldarien/config": "*" + }, + "license" : "MIT", + "authors" : [{ + "name" : "Aldarien", + "email" : "aldarien85@gmail.com" + } + ], + "autoload" : { + "psr-4" : { + "App\\" : "app" + } + }, + "require": { + "nesbot/carbon": "^2" + } +} diff --git a/app_old/aldarien/format/config/app.php b/app_old/aldarien/format/config/app.php new file mode 100644 index 0000000..9e747f9 --- /dev/null +++ b/app_old/aldarien/format/config/app.php @@ -0,0 +1,5 @@ + 'America/Santiago' +]; +?> \ No newline at end of file diff --git a/app_old/aldarien/format/phpunit.xml b/app_old/aldarien/format/phpunit.xml new file mode 100644 index 0000000..e60ecbd --- /dev/null +++ b/app_old/aldarien/format/phpunit.xml @@ -0,0 +1,17 @@ + + + + + ./tests/ + + + + + ./app + + + \ No newline at end of file diff --git a/app_old/aldarien/format/tests/FormatTest.php b/app_old/aldarien/format/tests/FormatTest.php new file mode 100644 index 0000000..bcc6bd5 --- /dev/null +++ b/app_old/aldarien/format/tests/FormatTest.php @@ -0,0 +1,59 @@ +number, 3); + $this->assertEquals($output, $result); + } + public function testPesosPrint() + { + $output = '$ 5.049.872'; + $result = Format::pesos($this->number, true); + $this->assertEquals($output, $result); + } + public function testUFPrint() + { + $output = '5.049.872,32 UF'; + $result = Format::ufs($this->number, true); + $this->assertEquals($output, $result); + } + public function testDate() + { + $output = '25 de March 2016'; + $result = Format::date($this->date); + $this->assertEquals($output, $result); + } + public function testShortDate() + { + $output = '25-03-2016'; + $result = Format::shortDate($this->date); + $this->assertEquals($output, $result); + } + public function testLocalDate() + { + $output = '25 de marzo de 2016'; + $result = Format::localDate($this->date); + $this->assertEquals($output, $result); + } + public function testM2Print() + { + $output = '5.049.872,32 m²'; + $result = Format::m2($this->number, true); + $this->assertEquals($output, $result); + } + public function testPercentPrint() + { + $output = '5.049.872,32%'; + $result = Format::percent($this->number, true); + $this->assertEquals($output, $result); + } +} +?> \ No newline at end of file diff --git a/app_old/aldarien/response/.gitignore b/app_old/aldarien/response/.gitignore new file mode 100644 index 0000000..265bf84 --- /dev/null +++ b/app_old/aldarien/response/.gitignore @@ -0,0 +1,7 @@ +#Eclipse IDE +.settings +.buildpath +.project + +#Composer +vendor diff --git a/app_old/aldarien/response/LICENSE b/app_old/aldarien/response/LICENSE new file mode 100644 index 0000000..55dc05a --- /dev/null +++ b/app_old/aldarien/response/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2017 Aldarien + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/app_old/aldarien/response/README.md b/app_old/aldarien/response/README.md new file mode 100644 index 0000000..80c6096 --- /dev/null +++ b/app_old/aldarien/response/README.md @@ -0,0 +1,2 @@ +# response +Response handler module for my apps diff --git a/app_old/aldarien/response/app/Contract/Response.php b/app_old/aldarien/response/app/Contract/Response.php new file mode 100644 index 0000000..4b0089e --- /dev/null +++ b/app_old/aldarien/response/app/Contract/Response.php @@ -0,0 +1,27 @@ + \ No newline at end of file diff --git a/app_old/aldarien/response/app/Helper/functions.php b/app_old/aldarien/response/app/Helper/functions.php new file mode 100644 index 0000000..32c48f8 --- /dev/null +++ b/app_old/aldarien/response/app/Helper/functions.php @@ -0,0 +1,11 @@ + \ No newline at end of file diff --git a/app_old/aldarien/response/app/Service/Response.php b/app_old/aldarien/response/app/Service/Response.php new file mode 100644 index 0000000..d0f3e24 --- /dev/null +++ b/app_old/aldarien/response/app/Service/Response.php @@ -0,0 +1,62 @@ +gump = new \GUMP(); + } + public function sanitize() + { + if ($_POST) { + $this->post = $this->correctNumbers($this->gump->sanitize($_POST)); + } + if ($_GET) { + $this->get = $this->correctNumbers($this->gump->sanitize($_GET)); + } + } + public function correctNumbers(array $data) + { + $output = []; + foreach ($data as $key => $value) { + if (is_float(str_replace(',', '.', $value))) { + $output[$key] = str_replace(',', '.', $value); + } else { + $output[$key] = $value; + } + } + return $output; + } + public function get($query = null) + { + if ($this->get == null) { + $this->sanitize(); + } + if ($query == null) { + return $this->get; + } + if (isset($this->get[$query])) { + return $this->get[$query]; + } + return false; + } + public function post($query = null) + { + if ($this->post == null) { + $this->sanitize(); + } + if ($query == null) { + return $this->post; + } + if (isset($this->post[$query])) { + return $this->post[$query]; + } + return false; + } +} +?> diff --git a/app_old/aldarien/response/bootstrap/autoload.php b/app_old/aldarien/response/bootstrap/autoload.php new file mode 100644 index 0000000..b5e8220 --- /dev/null +++ b/app_old/aldarien/response/bootstrap/autoload.php @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/app_old/aldarien/response/composer.json b/app_old/aldarien/response/composer.json new file mode 100644 index 0000000..a337f86 --- /dev/null +++ b/app_old/aldarien/response/composer.json @@ -0,0 +1,26 @@ +{ + "name" : "aldarien/response", + "description" : "Response handler module for my apps", + "type" : "library", + "require" : { + "wixel/gump" : "^2.0.0", + "aldarien/contract" : "*" + }, + "require-dev" : { + "phpunit/phpunit" : "*" + }, + "license" : "MIT", + "authors" : [{ + "name" : "Aldarien", + "email" : "jpvial@gmail.com" + } + ], + "autoload" : { + "psr-4" : { + "App\\" : "app" + }, + "files": [ + "app/Helper/functions.php" + ] + } +} diff --git a/app_old/aldarien/response/phpunit.xml b/app_old/aldarien/response/phpunit.xml new file mode 100644 index 0000000..db312e1 --- /dev/null +++ b/app_old/aldarien/response/phpunit.xml @@ -0,0 +1,17 @@ + + + + + ./tests/ + + + + + ./app + + + \ No newline at end of file diff --git a/app_old/aldarien/response/tests/ResponseTest.php b/app_old/aldarien/response/tests/ResponseTest.php new file mode 100644 index 0000000..67d603c --- /dev/null +++ b/app_old/aldarien/response/tests/ResponseTest.php @@ -0,0 +1,22 @@ +value; + $_POST['test'] = $this->value; + } + public function testGet() + { + $this->assertEquals($this->value, get('test')); + } + public function testPost() + { + $this->assertEquals($this->value, post('test')); + } +} +?> \ No newline at end of file diff --git a/app_old/aldarien/root/.gitignore b/app_old/aldarien/root/.gitignore new file mode 100644 index 0000000..f7e7961 --- /dev/null +++ b/app_old/aldarien/root/.gitignore @@ -0,0 +1,5 @@ +.buildpath +.project +.settings +*.lock +vendor \ No newline at end of file diff --git a/app_old/aldarien/root/LICENSE b/app_old/aldarien/root/LICENSE new file mode 100644 index 0000000..55dc05a --- /dev/null +++ b/app_old/aldarien/root/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2017 Aldarien + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/app_old/aldarien/root/README.md b/app_old/aldarien/root/README.md new file mode 100644 index 0000000..039cbc3 --- /dev/null +++ b/app_old/aldarien/root/README.md @@ -0,0 +1,22 @@ +# root +get root directory path for your project + +## Usage + +add `Root::root('project')` or `root('project')` or `Root::root()` or `root()` where you need the root directory of your proyect. + +## Example + +For the structure: + +~~~ +/usr/share/www/projects +- myProject +-- src +-- tests +~~~ + +using `Root::root('myProject')` + +outputs: +`/usr/share/www/projects/myProject` diff --git a/app_old/aldarien/root/app/Helper/functions.php b/app_old/aldarien/root/app/Helper/functions.php new file mode 100644 index 0000000..86fd2eb --- /dev/null +++ b/app_old/aldarien/root/app/Helper/functions.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/app_old/aldarien/root/composer.json b/app_old/aldarien/root/composer.json new file mode 100644 index 0000000..784dfb7 --- /dev/null +++ b/app_old/aldarien/root/composer.json @@ -0,0 +1,21 @@ +{ + "name" : "aldarien/root", + "description" : "Find the root path for your proyect", + "authors" : [{ + "name" : "Aldarien" + } + ], + "license": "MIT", + "require-dev" : { + "phpunit/phpunit" : "*", + "kint-php/kint" : "*" + }, + "autoload" : { + "psr-4" : { + "Proyect\\Root\\" : "src" + }, + "files": [ + "app/Helper/functions.php" + ] + } +} diff --git a/app_old/aldarien/root/phpunit.xml b/app_old/aldarien/root/phpunit.xml new file mode 100644 index 0000000..63ecd1c --- /dev/null +++ b/app_old/aldarien/root/phpunit.xml @@ -0,0 +1,19 @@ + + + + tests + + + + + src + + + diff --git a/app_old/aldarien/root/src/Root.php b/app_old/aldarien/root/src/Root.php new file mode 100644 index 0000000..13058df --- /dev/null +++ b/app_old/aldarien/root/src/Root.php @@ -0,0 +1,48 @@ +$proyect_name/public/index.php calls for $proyect_name/bootstrap/autoload.php, + * you just need to + * + * include root() . '/bootstrap/autoload.php' + * + * @param string $proyect_name + * @return string + */ + public static function root(string $proyect_name = '') + { + $dir = realpath(__DIR__); + if ($proyect_name == '') { + return self::findComposerFile($dir); + } else { + $ini = strpos($dir, $proyect_name) + strlen($proyect_name); + } + $path = substr($dir, $ini); + $cnt = substr_count($path, DIRECTORY_SEPARATOR); + $root = DIRECTORY_SEPARATOR; + for ($i = 0; $i < $cnt; $i ++) { + $root .= '..' . DIRECTORY_SEPARATOR; + } + + return realpath($dir . $root); + } + protected static function findComposerFile($dir) + { + if (file_exists($dir . '/vendor/')) { + return $dir; + } + + $root = realpath('/'); + if (realpath($dir) == $root) { + return null; + } + + $dir = dirname($dir); + return self::findComposerFile($dir); + } +} +?> diff --git a/app_old/aldarien/root/tests/RootTest.php b/app_old/aldarien/root/tests/RootTest.php new file mode 100644 index 0000000..1deed6c --- /dev/null +++ b/app_old/aldarien/root/tests/RootTest.php @@ -0,0 +1,61 @@ +getCurrentDir(); + $this->assertEquals($this->getRoot(), $this->current_dir); + $this->assertEquals($this->getBaseRoot(), $this->current_dir); + } + public function testBaseRootFunction() + { + $this->getCurrentDir(); + $this->assertEquals($this->getFRoot(), $this->current_dir); + $this->assertEquals($this->getFBaseRoot(), $this->current_dir); + } + public function testSrcRoot() + { + $this->changeDir('src'); + $this->assertEquals(realpath($this->getRoot() . '/src'), $this->current_dir); + $this->assertEquals(realpath($this->getBaseRoot() . '/src'), $this->current_dir); + } + public function testSrcRootFunction() + { + $this->changeDir('src'); + $this->assertEquals(realpath($this->getFRoot() . '/src'), $this->current_dir); + $this->assertEquals(realpath($this->getFBaseRoot() . '/src'), $this->current_dir); + } + + private function getCurrentDir() + { + $this->current_dir = getcwd(); + } + private function changeDir($dir) + { + chdir($dir); + $this->getCurrentDir(); + } + private function getRoot() + { + return Root::root($this->proyect_name); + } + private function getBaseRoot() + { + return Root::root(); + } + private function getFRoot() + { + return root($this->proyect_name); + } + private function getFBaseRoot() + { + return root(); + } +} +?> \ No newline at end of file diff --git a/app_old/aldarien/session/.gitignore b/app_old/aldarien/session/.gitignore new file mode 100644 index 0000000..6ee50e6 --- /dev/null +++ b/app_old/aldarien/session/.gitignore @@ -0,0 +1,11 @@ +composer.phar +/vendor/ + +# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file +# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file +# composer.lock + +# Eclipse IDE +.settings +.buildpath +.project \ No newline at end of file diff --git a/app_old/aldarien/session/LICENSE b/app_old/aldarien/session/LICENSE new file mode 100644 index 0000000..55dc05a --- /dev/null +++ b/app_old/aldarien/session/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2017 Aldarien + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/app_old/aldarien/session/README.md b/app_old/aldarien/session/README.md new file mode 100644 index 0000000..6825213 --- /dev/null +++ b/app_old/aldarien/session/README.md @@ -0,0 +1,2 @@ +# session +Session wrapper for aura/session diff --git a/app_old/aldarien/session/app/Contract/Session.php b/app_old/aldarien/session/app/Contract/Session.php new file mode 100644 index 0000000..2968a8f --- /dev/null +++ b/app_old/aldarien/session/app/Contract/Session.php @@ -0,0 +1,29 @@ +newInstance($_COOKIE); + } + public static function get($segment, $name) + { + $instance = self::getInstance(); + $segment = $instance->getSegment($segment); + return $segment->get($name); + } + public static function set($segment, $name, $value) + { + $instance = self::getInstance(); + $segment = $instance->getSegment($segment); + $segment->set($name, $value); + } +} +?> \ No newline at end of file diff --git a/app_old/aldarien/session/composer.json b/app_old/aldarien/session/composer.json new file mode 100644 index 0000000..7fe764d --- /dev/null +++ b/app_old/aldarien/session/composer.json @@ -0,0 +1,24 @@ +{ + "name": "aldarien/session", + "description": "Session wrapper for aura/session", + "type": "library", + "require": { + "aura/session": "*", + "aldarien/contract": "*" + }, + "require-dev": { + "phpunit/phpunit": "*" + }, + "license": "MIT", + "authors": [ + { + "name": "Aldarien", + "email": "aldarien85@gmail.com" + } + ], + "autoload": { + "psr-4": { + "App\\": "app" + } + } +} diff --git a/app_old/aldarien/url/.gitignore b/app_old/aldarien/url/.gitignore new file mode 100644 index 0000000..a06a2f1 --- /dev/null +++ b/app_old/aldarien/url/.gitignore @@ -0,0 +1,12 @@ +composer.phar +/vendor/ + +# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file +# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file +# composer.lock + +.settings +.buildpath +.project + +# Eclipse IDE \ No newline at end of file diff --git a/app_old/aldarien/url/LICENSE b/app_old/aldarien/url/LICENSE new file mode 100644 index 0000000..55dc05a --- /dev/null +++ b/app_old/aldarien/url/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2017 Aldarien + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/app_old/aldarien/url/README.md b/app_old/aldarien/url/README.md new file mode 100644 index 0000000..0c1a426 --- /dev/null +++ b/app_old/aldarien/url/README.md @@ -0,0 +1,2 @@ +# url +Get relative path url diff --git a/app_old/aldarien/url/app/Contract/URL.php b/app_old/aldarien/url/app/Contract/URL.php new file mode 100644 index 0000000..14d7ef0 --- /dev/null +++ b/app_old/aldarien/url/app/Contract/URL.php @@ -0,0 +1,21 @@ +url($path, $variables); + } +} +?> \ No newline at end of file diff --git a/app_old/aldarien/url/app/Helper/functions.php b/app_old/aldarien/url/app/Helper/functions.php new file mode 100644 index 0000000..6e9435e --- /dev/null +++ b/app_old/aldarien/url/app/Helper/functions.php @@ -0,0 +1,8 @@ + \ No newline at end of file diff --git a/app_old/aldarien/url/app/Service/URL.php b/app_old/aldarien/url/app/Service/URL.php new file mode 100644 index 0000000..49a601d --- /dev/null +++ b/app_old/aldarien/url/app/Service/URL.php @@ -0,0 +1,83 @@ +root = $this->findRoot(); + $this->relative = $this->findRelative(); + } + + protected function findRoot() + { + $base = $_SERVER['HTTP_HOST'] . ((isset($_SERVER['HTTP_PORT'])) ? ':' . $_SERVER['HTTP_PORT'] : ''); + $scheme = 'http'; + if (isset($_SERVER['REQUEST_SCHEME'])) { + $scheme = $_SERVER['REQUEST_SCHEME']; + } + if (isset($_SERVER['HTTPS'])) { + $scheme = 'https'; + } + $uri = Http::createFromString(\Sabre\Uri\resolve($scheme . '://' . $base, $_SERVER['SCRIPT_NAME'])); + $host = new Host($uri->getHost()); + if ($host->isAbsolute()) { + return $host->getRegistrableDomain(); + } + $base = $host . (($uri->getPort()) ? ':' . $uri->getPort() : ''); + return ($uri->getScheme() ?: 'http') . '://' . $base; + } + protected function findRelative() + { + $uri = Http::createFromString($_SERVER['SCRIPT_NAME']); + $normalized = (new HierarchicalPath($uri->getPath()))->withoutLeadingSlash()->withoutTrailingSlash()->withoutDotSegments()->withoutEmptySegments(); + if ($normalized->getDirname() == '.') { + return ''; + } + return $normalized->getDirname(); + } + + + public function url($path = '', $variables = null) + { + $uri = Http::createFromString($path); + if ($uri->getHost() != $this->root and $uri->getHost() != '') { + return $path; + } + + $uri = \Sabre\Uri\resolve($this->getBaseUrl(), $path); + try { + $host = new Host(Http::createFromString($uri)->getHost()); + } catch (\League\Uri\Exception $e) { + $uri = \Sabre\Uri\resolve($this->getBaseUrl(), '../../') . '/' . basename($path); + $host = new Host(Http::createFromString($uri)->getHost()); + } + + $base = new Host(Http::createFromString($this->root)->getHost()); + if ($host . '' != $base . '') { + $host = new Host(Http::createFromString($this->root)->getHost()); + $page = str_replace($this->root, '', $uri); + $uri = \Sabre\Uri\resolve(Http::createFromString($this->root)->getScheme() . '://' . $host->getRegistrableDomain(). '/', $page); + } + + if ($variables != null) { + $uri = \Sabre\Uri\resolve($uri, '?' . http_build_query($variables)); + } + $uri = \Sabre\Uri\normalize($uri); + + return $uri; + } + protected function getBaseUrl() + { + $url = \Sabre\Uri\normalize(trim($this->root . '/' . $this->relative, '/') . '/'); + return $url; + } +} +?> diff --git a/app_old/aldarien/url/composer.json b/app_old/aldarien/url/composer.json new file mode 100644 index 0000000..779ed73 --- /dev/null +++ b/app_old/aldarien/url/composer.json @@ -0,0 +1,29 @@ +{ + "name" : "aldarien/url", + "description" : "Get relative path uri", + "type" : "library", + "require" : { + "aldarien/contract" : "*", + "aldarien/root" : "*", + "league/uri": "*", + "league/uri-components": "*", + "sabre/uri": "*" + }, + "require-dev" : { + "phpunit/phpunit" : "*" + }, + "license" : "MIT", + "authors" : [{ + "name" : "Aldarien", + "email" : "jpvial@gmail.com" + } + ], + "autoload" : { + "psr-4" : { + "App\\" : "app" + }, + "files": [ + "app/Helper/functions.php" + ] + } +} diff --git a/app_old/aldarien/view/.gitignore b/app_old/aldarien/view/.gitignore new file mode 100644 index 0000000..120b68f --- /dev/null +++ b/app_old/aldarien/view/.gitignore @@ -0,0 +1,10 @@ +composer.phar +/vendor/ + +# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file +# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file +# composer.lock + +.settings +.buildpath +.project diff --git a/app_old/aldarien/view/LICENSE b/app_old/aldarien/view/LICENSE new file mode 100644 index 0000000..55dc05a --- /dev/null +++ b/app_old/aldarien/view/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2017 Aldarien + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/app_old/aldarien/view/README.md b/app_old/aldarien/view/README.md new file mode 100644 index 0000000..b888dbd --- /dev/null +++ b/app_old/aldarien/view/README.md @@ -0,0 +1,2 @@ +# view +View module for my apps diff --git a/app_old/aldarien/view/app/Contract/View.php b/app_old/aldarien/view/app/Contract/View.php new file mode 100644 index 0000000..1d0c5b9 --- /dev/null +++ b/app_old/aldarien/view/app/Contract/View.php @@ -0,0 +1,30 @@ + "http://{$remote->getIP()}:8008", + 'headers' => ['Accept' => 'application/json'] + ]))); + return new ViewService(['money' => $money]); + } + public static function show($template, $variables = null) + { + $instance = self::getInstance(); + return $instance->show($template, $variables); + } +} +?> diff --git a/app_old/aldarien/view/app/Helper/functions.php b/app_old/aldarien/view/app/Helper/functions.php new file mode 100644 index 0000000..ba0e9e1 --- /dev/null +++ b/app_old/aldarien/view/app/Helper/functions.php @@ -0,0 +1,5 @@ + diff --git a/app_old/aldarien/view/app/Service/View.php b/app_old/aldarien/view/app/Service/View.php new file mode 100644 index 0000000..7217696 --- /dev/null +++ b/app_old/aldarien/view/app/Service/View.php @@ -0,0 +1,27 @@ +views = config('locations.views'); + $this->cache = config('locations.cache'); + + $this->blade = new BladeOne($this->views, $this->cache, null, $variables); + } + public function show($template, $vars = null) + { + if ($vars) { + return $this->blade->run($template, $vars); + } + return $this->blade->run($template); + } +} +?> diff --git a/app_old/aldarien/view/composer.json b/app_old/aldarien/view/composer.json new file mode 100644 index 0000000..5d283ab --- /dev/null +++ b/app_old/aldarien/view/composer.json @@ -0,0 +1,28 @@ +{ + "name": "aldarien/view", + "description": "View module for my apps", + "type": "library", + "require": { + "eftec/bladeone": "*", + "aldarien/contract": "*", + "aldarien/config": "*" + }, + "license": "MIT", + "authors": [ + { + "name": "Aldarien", + "email": "aldarien85@gmail.com" + } + ], + "autoload": { + "psr-4": { + "App\\": "app" + }, + "files": [ + "app/Helper/functions.php" + ] + }, + "require-dev": { + "phpunit/phpunit": "*" + } +} diff --git a/app_old/aldarien/view/config/locations.php b/app_old/aldarien/view/config/locations.php new file mode 100644 index 0000000..1dd0425 --- /dev/null +++ b/app_old/aldarien/view/config/locations.php @@ -0,0 +1,8 @@ + root(), + 'cache' => '{locations.base}/cache', + 'resources' => '{locations.base}/resources', + 'views' => '{locations.resources}/views' +]; +?> \ No newline at end of file diff --git a/app_old/aldarien/view/phpunit.xml b/app_old/aldarien/view/phpunit.xml new file mode 100644 index 0000000..e60ecbd --- /dev/null +++ b/app_old/aldarien/view/phpunit.xml @@ -0,0 +1,17 @@ + + + + + ./tests/ + + + + + ./app + + + \ No newline at end of file diff --git a/app_old/aldarien/view/public/index.php b/app_old/aldarien/view/public/index.php new file mode 100644 index 0000000..1070f11 --- /dev/null +++ b/app_old/aldarien/view/public/index.php @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/app_old/aldarien/view/resources/views/base.blade.php b/app_old/aldarien/view/resources/views/base.blade.php new file mode 100644 index 0000000..8cafca1 --- /dev/null +++ b/app_old/aldarien/view/resources/views/base.blade.php @@ -0,0 +1,9 @@ + + + + View + + +View test + + \ No newline at end of file diff --git a/app_old/aldarien/view/tests/ViewTest.php b/app_old/aldarien/view/tests/ViewTest.php new file mode 100644 index 0000000..85f4aa6 --- /dev/null +++ b/app_old/aldarien/view/tests/ViewTest.php @@ -0,0 +1,22 @@ + + + + View + + +View test + + +DATA; + $this->assertEquals($output, view('base')); + } +} +?> \ No newline at end of file diff --git a/app_old/app/Alias/Connection.php b/app_old/app/Alias/Connection.php new file mode 100644 index 0000000..1eea52a --- /dev/null +++ b/app_old/app/Alias/Connection.php @@ -0,0 +1,50 @@ +connection)) { + $r = 0; + $exception = null; + while ($r < $this->retries) { + try { + $dsn = $this->getDsn(); + $this->connection = new PDO($dsn, $this->username, $this->password); + return $this->connection; + } catch (PDOException $e) { + if ($exception !== null) { + $e = new PDOException($e->getMessage(), $e->getCode(), $exception); + } + $exception = $e; + usleep(500); + } + $r ++; + } + throw $exception; + } + return $this->connection; + } + protected function getDsn(): string + { + $dsn = "mysql:host={$this->host};dbname={$this->database}"; + if (isset($this->port)) { + $dsn .= ";port={$this->port}"; + } + return $dsn; + } +} diff --git a/app_old/app/Alias/Excel/Style/Mes.php b/app_old/app/Alias/Excel/Style/Mes.php new file mode 100644 index 0000000..368246b --- /dev/null +++ b/app_old/app/Alias/Excel/Style/Mes.php @@ -0,0 +1,18 @@ +setNumFormat('mmm-YY'); + $format->setAlign('center'); + } +} diff --git a/app_old/app/Alias/Format.php b/app_old/app/Alias/Format.php new file mode 100644 index 0000000..0ca615c --- /dev/null +++ b/app_old/app/Alias/Format.php @@ -0,0 +1,17 @@ + diff --git a/app_old/app/Alias/Model.php b/app_old/app/Alias/Model.php new file mode 100644 index 0000000..59ada5e --- /dev/null +++ b/app_old/app/Alias/Model.php @@ -0,0 +1,87 @@ +id; + $orm = $this->orm; + $ref = new \ReflectionObject($orm); + if (!$ref->hasProperty('_dirty_fields')) { + return; + } + $dirty = $ref->getProperty('_dirty_fields'); + $dirty->setAccessible(true); + $new_values = $dirty->getValue($orm); + $changes = array_combine(array_keys($new_values), array_fill(0, count($new_values), ['old' => '', 'new' => ''])); + if ($this->isNew()) { + $old = (object) array_combine(array_keys($new_values), array_fill(0, count($new_values), '')); + } else { + $old = model(get_called_class())->findOne($this->{$this->getId()}); + } + foreach ($new_values as $column => $value) { + $changes[$column] = ['column' => $column, 'old' => $old->$column, 'new' => $value]; + } + $action = '[' . get_called_class() . ']'; + doLog($user, $action, $changes); + } + public function getId() + { + if (property_exists(get_called_class(), '_id_column')) { + return static::$_id_column; + } + return $this->id; + } + public function save() + { + $ref = new \ReflectionObject($this); + if ($ref->hasProperty('_timestamps')) { + $ref = $ref->getProperty('_timestamps'); + $ref->setAccessible(true); + if ($ref->getValue()) { + if ($this->is_new()) { + $this->setExpr('created_at', 'NOW()'); + } + $this->setExpr('updated_at', 'NOW()'); + } + } + if (!\ORM::getDb()->inTransaction()) { + \ORM::getDb()->beginTransaction(); + } + try { + parent::save(); + if (\ORM::getDb()->inTransaction()) { + \ORM::getDb()->commit(); + } + } catch (\Exception $e) { + if (\ORM::getDb()->inTransaction()) { + \ORM::getDb()->rollBack(); + } + throw $e; + } + $this->log(); + } + public function __call($method, $args) + { + if (!method_exists($this, $method)) { + $str = '' . Stringy::create($method)->underscored(); + if (method_exists($this, $str)) { + return call_user_func_array([$this, $str], $args); + } + throw new \BadMethodCallException($method . ' not found in ' . get_class($this)); + } + return call_user_func_array([$this, $str], $args); + } +} +?> diff --git a/app_old/app/Alias/NewEstado.php b/app_old/app/Alias/NewEstado.php new file mode 100644 index 0000000..d884bb6 --- /dev/null +++ b/app_old/app/Alias/NewEstado.php @@ -0,0 +1,21 @@ +fecha, config('app.timezone')); + } +} +?> diff --git a/app_old/app/Alias/NewModel.php b/app_old/app/Alias/NewModel.php new file mode 100644 index 0000000..1c513b4 --- /dev/null +++ b/app_old/app/Alias/NewModel.php @@ -0,0 +1,9 @@ + \ No newline at end of file diff --git a/app_old/app/Alias/NewTipo.php b/app_old/app/Alias/NewTipo.php new file mode 100644 index 0000000..b5fa3fb --- /dev/null +++ b/app_old/app/Alias/NewTipo.php @@ -0,0 +1,15 @@ + \ No newline at end of file diff --git a/app_old/app/Alias/OldModel.php b/app_old/app/Alias/OldModel.php new file mode 100644 index 0000000..b3f9730 --- /dev/null +++ b/app_old/app/Alias/OldModel.php @@ -0,0 +1,8 @@ + diff --git a/app_old/app/Alias/PHPExcel.php b/app_old/app/Alias/PHPExcel.php new file mode 100644 index 0000000..ab98f53 --- /dev/null +++ b/app_old/app/Alias/PHPExcel.php @@ -0,0 +1,155 @@ +name = $name; + $this->filename = $filename; + } + public function addColumns($fields) + { + $columns = []; + foreach ($fields as $i => $field) { + if (is_object($field)) { + if (isset($field->style)) { + $style = $this->getExcelStyle($field->style); + } else { + $style = $this->getExcelStyle(); + } + $column = new ExcelHelper\Column($field->name, $field->name, 10, $style); + } elseif (is_array($field)) { + if (isset($field['style'])) { + $style = $this->getExcelStyle($field['style']); + } else { + $style = $this->getExcelStyle(); + } + $column = new ExcelHelper\Column($field['name'], $field['name'], 10, $style); + } else { + $style = $this->getExcelStyle(); + $column = new ExcelHelper\Column($field, $field, 10, $style); + } + $columns []= $column; + } + $collection = new ExcelHelper\ColumnCollection($columns); + $this->columns = $collection; + } + protected function getExcelStyle($style = 'text') + { + switch (strtolower($style)) { + case 'date': + return new ExcelHelper\CellStyle\Date(); + case 'mes': + return new \App\Alias\Excel\Style\Mes(); + case 'currency': + case 'amount': + return new ExcelHelper\CellStyle\Amount(); + case 'number': + case 'integer': + return new ExcelHelper\CellStyle\Integer(); + case 'percent': + case 'percentage': + return new ExcelHelper\CellStyle\Percentage(); + case 'text': + case 'string': + default: + return new ExcelHelper\CellStyle\Text(); + } + } + public function addData($data) + { + if ($this->data == null) { + $this->data = []; + } + $this->data = array_merge($data); + } + public function addRow($rowData) + { + if ($this->data == null) { + $this->data = []; + } + $this->data []= $rowData; + } + public function addTotals($totals) + { + $columns = (array) $this->columns; + $columns = array_pop($columns); + $ts = []; + foreach ($columns as $column) { + $col = $column->getHeading(); + if (isset($totals[$col])) { + $ts[$col] = $this->getTotal($col, $totals[$col]); + continue; + } + $ts[$col] = ''; + } + $this->data []= $ts; + } + protected function getTotal($col, $aggr) + { + $col_num = $this->getColNumber($col); + $col = $this->getColName($col_num); + switch(strtolower($aggr)) { + case 'sum': + $num = 109; + break; + case 'count': + $num = 102; + break; + case 'counta': + $num = 103; + break; + default: + $num = 0; + } + if ($num > 0) { + $end = count($this->data) + 2; + $str = "=SUBTOTAL({$num};{$col}3:{$col}{$end})"; + return $str; + } + return $aggr; + } + protected function getColNumber($col) + { + $columns = (array) $this->columns; + $columns = array_keys(array_pop($columns)); + return array_search($col, $columns); + } + protected function getColName($col_num) + { + $cols = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'; + $N = strlen($cols); + $name = ''; + if ($col_num > $N) { + $name .= $cols[floor($col_num / $N)]; + $col_num = $N * ($col_num / $N - floor($col_num / $N)); + } + $name .= $cols[$col_num]; + return $name; + } + public function informe() + { + header("Content-Type: application/octet-stream; charset=utf-8"); + header('Content-Transfer-Encoding: binary'); + header('Content-Disposition: attachment; filename="' . $this->filename . '"'); + header('Cache-Control: max-age=0'); + + $pE = new ExcelHelper\TableWorkbook('php://output'); + $ws = $pE->addWorksheet($this->name); + + $table = new ExcelHelper\Table($ws, 0, 0, $this->name, new \ArrayIterator($this->data)); + $table->setColumnCollection($this->columns); + + $pE->writeTable($table); + + $pE->close(); + } +} diff --git a/app_old/app/Alias/RemoteConnection.php b/app_old/app/Alias/RemoteConnection.php new file mode 100644 index 0000000..475225e --- /dev/null +++ b/app_old/app/Alias/RemoteConnection.php @@ -0,0 +1,17 @@ +retries + ); + } +} diff --git a/app_old/app/Command/Money/Get.php b/app_old/app/Command/Money/Get.php new file mode 100644 index 0000000..606c8b1 --- /dev/null +++ b/app_old/app/Command/Money/Get.php @@ -0,0 +1,87 @@ +title('Get Money'); + + $dates = $this->getDates(); + foreach ($dates as $date_string => $ids) { + $date = $this->parseDate($date_string); + $response = $this->service->getUF($date); + if ($response->total === 0) { + continue; + } + foreach ($ids as $id) { + $this->queueUpdate($id, $response->uf->value); + } + } + $this->updateUF(); + return Command::SUCCESS; + } + + protected function getDates(): array + { + $query = "SELECT id, fecha FROM pago WHERE uf IS NULL AND fecha BETWEEN 0 AND DATE_ADD(CURDATE(), INTERVAL 9 DAY) ORDER BY fecha"; + $statement = $this->connection->connect()->query($query); + $rows = $statement->fetchAll(PDO::FETCH_ASSOC); + if (count($rows) === 0) { + return []; + } + $dates = []; + foreach ($rows as $row) { + if (!isset($dates[$row['fecha']])) { + $dates[$row['fecha']] = []; + } + $dates[$row['fecha']] []= (int) $row['id']; + } + return $dates; + } + protected function parseDate(string $date_string): DateTimeInterface + { + return new DateTimeImmutable($date_string); + } + protected array $rows; + protected function queueUpdate(int $id, float $value): void + { + $this->rows []= [$value, $id]; + } + protected function updateUF(): void + { + $query = "UPDATE pago SET uf = ? WHERE id = ?"; + $statement = $this->connection->connect()->prepare($query); + foreach ($this->rows as $row) { + $this->connection->connect()->beginTransaction(); + try { + $statement->execute($row); + $this->connection->connect()->commit(); + } catch (PDOException $e) { + $this->connection->connect()->rollBack(); + } + } + } +} diff --git a/app_old/app/Command/Money/Lookup.php b/app_old/app/Command/Money/Lookup.php new file mode 100644 index 0000000..2b87b28 --- /dev/null +++ b/app_old/app/Command/Money/Lookup.php @@ -0,0 +1,52 @@ +title('Lookup Money'); + + while (true) { + $io->info('Checking pending'); + if ($this->hasPendingMoney()) { + $io->success('Running money get UF'); + $io->note($this->runGetUF()); + } + } + return Command::SUCCESS; + } + + protected function hasPendingMoney(): bool + { + $query = "SELECT 1 FROM pago WHERE uf IS NULL AND fecha BETWEEN 0 AND DATE_ADD(CURDATE(), INTERVAL 9 DAY)"; + $statement = $this->connection->connect()->query($query); + return $statement->rowCount() > 0; + } + protected function runGetUF(): string + { + $command = "/code/bin/console money:uf:get"; + $result = shell_exec($command); + if (!$result or $result === null) { + throw new \Exception(); + } + return $result; + } +} diff --git a/app_old/app/Contract/Auth.php b/app_old/app/Contract/Auth.php new file mode 100644 index 0000000..fb2e3b6 --- /dev/null +++ b/app_old/app/Contract/Auth.php @@ -0,0 +1,27 @@ + \ No newline at end of file diff --git a/app_old/app/Contract/Route.php b/app_old/app/Contract/Route.php new file mode 100644 index 0000000..fd4a84c --- /dev/null +++ b/app_old/app/Contract/Route.php @@ -0,0 +1,27 @@ + \ No newline at end of file diff --git a/app_old/app/Controller/API/Unidades.php b/app_old/app/Controller/API/Unidades.php new file mode 100644 index 0000000..b7abead --- /dev/null +++ b/app_old/app/Controller/API/Unidades.php @@ -0,0 +1,41 @@ +findOne($id_proyecto); + if (!$proyecto) { + throw new \InvalidArgumentException('Proyecto identificado por ' . $id_proyecto . ' no existe.'); + } + $unidades = $proyecto->unidades($id_tipo); + $unidades = array_filter($unidades, function($item) { + return !$item->isVendida() and !$item->isReservada(); + }); + $unidades = array_map(function($item) { + return $item->asArray(); + }, $unidades); + usort($unidades, function($a, $b) { + $ap = strpos($a['descripcion'], ' '); + $ad = $a['descripcion']; + if ($ap != false) { + $ad = substr($ad, 0, $ap); + } + $bd = $b['descripcion']; + $bp = strpos($b['descripcion'], ' '); + if ($bp != false) { + $bd = substr($bd, 0, $bp); + } + return strcmp( + str_pad($ad, 4, '0', \STR_PAD_LEFT), + str_pad($bd, 4, '0', \STR_PAD_LEFT) + ); + }); + $output = array_values($unidades); + $response->getBody()->write(\json_encode($output)); + return $response->withHeader('Content-Type', 'application/json'); + } +} diff --git a/resources/less/Controller/Admin.php b/app_old/app/Controller/Admin.php similarity index 100% rename from resources/less/Controller/Admin.php rename to app_old/app/Controller/Admin.php diff --git a/resources/less/Controller/Ajax.php b/app_old/app/Controller/Ajax.php similarity index 100% rename from resources/less/Controller/Ajax.php rename to app_old/app/Controller/Ajax.php diff --git a/app_old/app/Controller/Auth.php b/app_old/app/Controller/Auth.php new file mode 100644 index 0000000..74c9d78 --- /dev/null +++ b/app_old/app/Controller/Auth.php @@ -0,0 +1,59 @@ +render($response, 'auth.login'); + } + public function do_login(ServerRequestInterface $request, ResponseInterface $response): ResponseInterface + { + $post = $request->getParsedBody(); + $name = $post['name']; + $password = $post['password']; + $bool = sAuth::login($name, $password); + if ($bool) { + return $response->withStatus(301)->withHeader('Location', '/'); + } + return $response->withStatus(301)->withHeader('Location', '/auth/login'); + } + public function logout(ServerRequestInterface $request, ResponseInterface $response): ResponseInterface + { + sAuth::logout(); + return $response + ->withStatus(301) + ->withHeader('Location', '/'); + } + public function check_pass(ServerRequestInterface $request, ResponseInterface $response): ResponseInterface + { + if (\password_verify(post('password'), sAuth::User()->password)) { + $response->getBody()->write('OK'); + } else { + $response->getBody()->write('KO'); + } + return $response; + } + public function change_pass(ServerRequestInterface $request, ResponseInterface $response, View $view): ResponseInterface + { + return $view->render($response, 'auth.change_pass'); + } + public function do_change_pass(ServerRequestInterface $request, ResponseInterface $response): ResponseInterface + { + $post = $request->getParsedBody(); + if (\password_verify($post['old'], sAuth::User()->password)) { + if ($post['new'] == $post['new2']) { + $user = sAuth::User(); + $user->password($post['new']); + $user->save(); + return $response->withStatus(301)->withHeader('Location', '/'); + } + } + return $response->withStatus(301)->withHeader('Location', '/auth/change_pass'); + } +} diff --git a/app_old/app/Controller/Bonos.php b/app_old/app/Controller/Bonos.php new file mode 100644 index 0000000..32daaa5 --- /dev/null +++ b/app_old/app/Controller/Bonos.php @@ -0,0 +1,67 @@ +findOne($id_venta); + return view('ventas.bonos.add', compact('venta')); + } + public static function do_add() + { + $id_venta = get('venta'); + $venta = model(Venta::class)->findOne($id_venta); + if ($venta->bono_pie != 0) { + header('Location: ' . nUrl('ventas', 'show', ['venta' => $venta->id])); + return; + } + $uf = uf($venta->fecha()); + $valor = post('valor'); + $data = [ + 'fecha' => $venta->fecha, + 'valor' => $valor * $uf->uf->value, + 'tipo' => 8, + 'uf' => $uf->uf->value + ]; + $pago = model(Pago::class)->create($data); + $pago->save(); + $data = [ + 'valor' => $valor, + 'pago' => $pago->id + ]; + $bono = model(BonoPie::class)->create($data); + $bono->save(); + $venta->bono_pie = $bono->id; + $venta->save(); + header('Location: ' . nUrl('ventas', 'show', ['venta' => $venta->id])); + } + public static function edit() + { + $id_venta = get('venta'); + $venta = model(Venta::class)->findOne($id_venta); + return view('ventas.bonos.edit', compact('venta')); + } + public static function do_edit() + { + $id_venta = get('venta'); + $venta = model(Venta::class)->findOne($id_venta); + $bono = $venta->bonoPie(); + $valor = post('valor') * $bono->pago()->uf(); + $pago = $bono->pago(); + if ($valor != $bono->pago()->valor()) { + $pago->valor = $valor; + $pago->save(); + } + header('Location: ' . nUrl('ventas', 'show', ['venta' => $venta->id])); + exit(); + } +} diff --git a/resources/less/Controller/Buscar.php b/app_old/app/Controller/Buscar.php similarity index 100% rename from resources/less/Controller/Buscar.php rename to app_old/app/Controller/Buscar.php diff --git a/app_old/app/Controller/Cierres.php b/app_old/app/Controller/Cierres.php new file mode 100644 index 0000000..46a76b9 --- /dev/null +++ b/app_old/app/Controller/Cierres.php @@ -0,0 +1,428 @@ +select('proyecto.*') + ->join('estado_proyecto', ['estado.proyecto', '=', 'proyecto.id'], 'estado') + ->join('tipo_estado_proyecto', ['tipo.id', '=', 'estado.estado'], 'tipo') + ->join('etapa_proyecto', ['etapa.id', '=', 'tipo.etapa'], 'etapa') + ->whereGte('etapa.orden', 3) + ->orderByAsc('proyecto.descripcion') + ->groupBy('proyecto.id') + ->findMany(); + $regiones = model(Region::class)->order_by_asc('numeracion')->findMany(); + return view('ventas.cierres.add', compact('proyectos', 'regiones')); + } + public static function agregar() + { + $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); + $id_proyecto = post('proyecto'); + $proyecto = model(Proyecto::class)->findOne($id_proyecto); + $id_agente = post('agente'); + $agente = model(Agente::class)->findOne($id_agente); + + $direccion = model(Direccion::class) + ->where('calle', post('calle')) + ->where('numero', post('numero')) + ->where('extra', post('extra')) + ->where('comuna', post('comuna')) + ->findOne(); + if (!$direccion) { + $data = [ + 'calle' => post('calle'), + 'numero' => post('numero'), + 'extra' => post('extra'), + 'comuna' => post('comuna') + ]; + $direccion = model(Direccion::class)->create($data); + $direccion->save(); + } + + list($rut, $dv) = explode('-', str_replace('.', '', post('rut'))); + $propietario = model(Propietario::class)->findOne($rut); + if (!$propietario) { + $data = [ + 'rut' => $rut, + 'dv' => $dv, + 'nombres' => trim(post('nombres')), + 'apellido_paterno' => post('paterno'), + 'apellido_materno' => post('materno'), + 'sexo' => post('sexo'), + 'estado_civil' => post('estado_civil'), + 'profesion' => post('profesion'), + 'direccion' => $direccion->id, + 'telefono' => post('codigo_telefono') . post('telefono'), + 'email' => post('email') . '@' . post('email_domain'), + 'representante' => 0, + 'otro' => 0 + ]; + $propietario = model(Propietario::class)->create($data); + $propietario->save(); + } + + $unis = json_decode(post('unidades')); + $id_principal = array_shift($unis); + $unidad = model(Unidad::class)->findOne(post('unidad' . $id_principal)); + $u = model(U::class)->findOne($unidad->id); + if (!$u) { + $unidad->save(); + } + $data = [ + 'unidad_id' => $unidad->id + ]; + $reserva = model(Reserva::class)->create($data); + $reserva->save(); + foreach ($unis as $id_unidad) { + $unidad = model(Unidad::class)->findOne(post('unidad' . $id_unidad)); + $data = [ + 'reserva_id' => $reserva->id, + 'unidad_id' => $unidad->id + ]; + $ur = model(UnidadReserva::class)->create($data); + $ur->save(); + } + + $data = [ + 'proyecto_id' => $proyecto->id, + 'agente_id' => $agente->id, + 'propietario_rut' => $propietario->rut, + 'reserva_id' => $reserva->id, + 'fecha' => $f->format('Y-m-d'), + 'valor' => correctNumber(post('valor')), + 'pie' => correctNumber(post('pie')), + 'credito' => correctNumber(post('credito')), + 'estado' => 1 + ]; + $cierre = model(Cierre::class)->create($data); + $cierre->save(); + header('Location: ' . url('', ['p' => 'cierres', 'a' => 'list'])); + } + public static function list() + { + $proyectos = Cierre::proyectos(); + + return view('ventas.cierres.list', compact('proyectos')); + } + public static function show() + { + $id = get('cierre'); + $cierre = model(Cierre::class)->findOne($id); + + return view('ventas.cierres.show', compact('cierre')); + } + public static function guardar() + { + $proyecto = \model(Proyecto::class)->findOne(post('proyecto')); + $fecha = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); + $unidad = \model(Unidad::class)->findOne(post('departamento')); + $relacionado = (post('relacionado') === true) ? true : false; + $subrelacionado = (post('subrelacionado') === true) ? true : false; + $precio = (float) post('precio') ?: 0; + $input = [ + 'proyecto' => $proyecto, + 'fecha' => $fecha, + 'departamento' => $unidad, + 'precio' => $precio, + 'relacionado' => $relacionado, + 'subrelacionado' => $subrelacionado, + 'unidades' => [], + 'pie' => (float) post('pie') + ]; + $ebs = 0; + if (post('unidades') != '') { + $unidades = json_decode(html_entity_decode(post('unidades')), true); + foreach ($unidades as $un) { + $u = \model(Unidad::class)->findOne($un); + $input['unidades'] []= $u; + if ($u->precio($fecha) !== false) { + $ebs += $u->precio($fecha)->valor; + } + } + } + $promo = 0; + if (post('promocion') != null) { + $promo = (float) post('promocion'); + $input['promocion'] = $promo; + } + $bono = 0; + if (post('bono') != null) { + $bono = (float) post('bono'); + $input['bono'] = $bono; + } + $operador = 0; + if (post('operador') != null) { + $operador = ($precio - $bono - $promo) * (float) post('operador') / 100; + $input['operador'] = $operador; + } + + $cierre = Cierre::find($proyecto, $unidad, $precio)->findOne(); + if ($cierre === false) { + $cierre = model(Cierre::class)->create(); + $cierre->guardar((object) $input); + } + $output = ['status' => 'ok', 'cierre' => $cierre->asArray()]; + return json_encode($output); + } + public static function aprobar() + { + $fecha = Carbon::today(config('app.timezone')); + $cierre = model(Cierre::class)->findOne(post('cierre')); + if ($cierre->estado()->tipo()->descripcion == "revisado" or $cierre->estado()->tipo()->descripcion == "rechazado") { + $cierre->aprobar($fecha); + return json_encode(['estado' => 'aprobado']); + } + return json_encode(['estado' => 'no vigente']); + } + public static function rechazar() + { + $fecha = Carbon::today(config('app.timezone')); + $cierre = model(Cierre::class)->findOne(post('cierre')); + if ($cierre->estado()->tipo()->vigente == 1) { + $cierre->rechazar($fecha); + return json_encode(['estado' => 'rechazado']); + } + return json_encode(['estado' => 'no vigente']); + } + public static function abandonar() + { + $id = get('cierre'); + $cierre = model(Cierre::class)->findOne($id); + $tipo = model(TipoEstadoCierre::class)->where('descripcion', 'abandonado')->findOne(); + $today = Carbon::today(config('app.timezone')); + $data = [ + 'cierre' => $cierre->id, + 'tipo' => $tipo->id, + 'fecha' => $today->format('Y-m-d') + ]; + $estado = model(EstadoCierre::class)->create($data); + $estado->save(); + header('Location: ' . url('', ['p' => 'cierres', 'a' => 'list'])); + } + public static function promesar() + { + $id = get('cierre'); + $cierre = model(Cierre::class)->findOne($id); + $tipo = model(TipoEstadoCierre::class)->where('descripcion', 'promesado')->findOne(); + $today = Carbon::today(config('app.timezone')); + $data = [ + 'cierre' => $cierre->id, + 'tipo' => $tipo->id, + 'fecha' => $today->format('Y-m-d') + ]; + $estado = model(EstadoCierre::class)->create($data); + $estado->save(); + header('Location: ' . url('', ['p' => 'cierres', 'a' => 'show', 'cierre' => $cierre->id])); + } + public static function borrador() + { + $id = get('cierre'); + $cierre = model(Cierre::class)->findOne($id); + + $borrador = new Borrador($cierre); + d($borrador->show()); + $borrador->create(); + } + public static function evalue() + { + $proyectos = \model(Proyecto::class)->orderByAsc('descripcion')->findMany(); + return view('ventas.cierres.evaluar', ['proyectos' => $proyectos, 'locations' => config('locations')]); + } + public static function evaluar() + { + $proyecto = \model(Proyecto::class)->findOne(post('proyecto')); + $fecha = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); + $unidad = \model(Unidad::class)->findOne(post('departamento')); + $relacionado = (post('relacionado') === 'true') ? true : false; + $subrelacionado = (post('subrelacionado') === 'true') ? true : false; + $precio = (float) post('precio') ?: 0; + $neto = $precio; + $ebs = 0; + if (post('unidades') != '') { + $unidades = json_decode(html_entity_decode(post('unidades')), true); + foreach ($unidades as $un) { + $u = \model(Unidad::class)->findOne($un); + if ($u->precio($fecha) !== false) { + $ebs += $u->precio($fecha)->valor; + } + } + } + $promocion = 0; + if (post('promocion') != null) { + $promocion = (float) post('promocion'); + } + $bono = 0; + if (post('bono') != null) { + $bono = (float) post('bono'); + } + $operador = 0; + if (post('operador') != null) { + $operador = ($precio - $bono - $promocion) * (float) post('operador') / 100; + } + $rel = 0; + if ($relacionado) { + $rel = ($unidad->precio($fecha)->valor) * 6 / 100; + } + if ($subrelacionado) { + $rel = ($unidad->precio($fecha)->valor) * 3 / 100; + } + $neto = $precio - $bono - $promocion - $operador - $ebs; + + $output = [ + 'unidad' => [ + 'tipo' => [ + 'nombre' => $unidad->tipologia()->nombre, + 'tipologia' => $unidad->tipologia()->tipologia()->descripcion + ], + 'superficie' => format('m2', $unidad->m2()) . ' m²' + ], + 'oferta' => [ + 'bruto' => format('ufs', $precio, null, true), + 'neto' => format('ufs', $neto, null, true), + 'uf_m2' => format('ufs', $neto / $unidad->m2('vendible'), null, true) . '/m²', + 'fecha' => format('shortDate', $unidad->precio($fecha)->inicio()->fecha()) + ], + 'lista' => [ + 'precio' => format('ufs', $unidad->precio($fecha)->valor, null, true), + 'uf_m2' => format('ufs', $unidad->precio($fecha)->valor / $unidad->m2('vendible'), null, true) . '/m²' + ], + 'precios' => [ + 'bruto' => format('ufs', $precio, null, true), + 'neto' => format('ufs', $neto, null, true), + 'departamento' => format('ufs', $unidad->precio($fecha)->valor, null, true), + 'relacionado' => format('ufs', $unidad->precio($fecha)->valor - $rel, null, true), + 'fecha' => format('shortDate', $unidad->precio($fecha)->inicio()->fecha()) + ], + 'uf_m2' => [ + 'neto' => format('ufs', $neto / $unidad->m2('vendible'), null, true) . '/m²', + 'departamento' => format('ufs', $unidad->precio($fecha)->valor / $unidad->m2('vendible'), null, true) . '/m²', + 'relacionado' => format('ufs', ($unidad->precio($fecha)->valor - $rel) / $unidad->m2('vendible'), null, true) . '/²' + ], + 'evaluacion' => Cierre::evaluar($neto, $unidad, $fecha, $rel), + 'estado' => ['id' => 0, 'descripcion' => 'no existe'] + ]; + if ($rel > 0) { + $output ['relacionado'] = [ + 'precio' => format('ufs', $unidad->precio($fecha)->valor - $rel, null, true), + 'uf_m2' => format('ufs', ($unidad->precio($fecha)->valor - $rel) / $unidad->m2('vendible'), null, true) . '/²' + ]; + } + $estado = Cierre::find($proyecto, $unidad, $precio)->findOne(); + if ($estado) { + $output['estado'] = [ + 'id' => $estado->estado()->tipo()->id, + 'cierre' => $estado->id, + 'descripcion' => $estado->estado()->tipo()->descripcion, + 'fecha' => format('shortDate', $estado->estado()->fecha) + ]; + } + + return json_encode($output); + } + public static function edit() + { + $cierre = model(Cierre::class)->findOne(get('cierre')); + $proyectos = model(Proyecto::class)->findMany(); + $regiones = model(Region::class)->findMany(); + $valores = model(TipoValorCierre::class)->findMany(); + return view('ventas.cierres.edit', compact('cierre', 'proyectos', 'regiones', 'valores')); + } + public static function do_edit() + { + $cierre = model(Cierre::class)->findOne(get('cierre')); + + $data = [ + 'calle' => post('calle'), + 'numero' => post('numero'), + 'extra' => post('extra'), + 'comuna' => post('comuna') + ]; + $direccion = (new Factory(Direccion::class))->where($data)->find(); + if (!$direccion) { + $direccion = model(Direccion::class)->create($data); + $direccion->save(); + } + if (post('rut') != '') { + $data = [ + 'rut' => explode('-', str_replace('.', '', post('rut')))[0], + ]; + $propietario = (new Factory(Propietario::class))->where($data)->find(); + if (!$propietario) { + $data = array_merge($data, [ + 'nombres' => post('nombres'), + 'apellido_paterno' => post('paterno'), + 'apellido_materno' => post('materno'), + 'dv' => (post('rut')) ? explode('-', str_replace('.', '', post('rut')))[1] : '', + 'sexo' => post('sexo'), + 'estado_civil' => post('estado_civil'), + 'profesion' => post('profesion'), + 'telefono' => post('codigo_telefono') . post('telefono'), + 'email' => post('email') . '@' . post('email_domain'), + 'direccion' => $direccion->id + ]); + $propietario = model(Propietario::class)->create($data); + $propietario->save(); + } + } + $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); + $data = [ + 'proyecto' => post('proyecto'), + 'precio' => post('precio'), + 'fecha' => $f->format('Y-m-d'), + 'relacionado' => (post('relacionado')) ? 1 : 0, + 'propietario' => (isset($propietario) and $propietario) ? $propietario->rut : 0 + ]; + foreach ($data as $field => $value) { + if ($value != $cierre->$field) { + $cierre->$field = $value; + } + } + $cierre->save(); + + $valores = model(TipoValorCierre::class)->findMany(); + foreach ($valores as $valor) { + if (post($valor->descripcion) == '') { + continue; + } + if ($cierre->valor($valor->descripcion)) { + if ($cierre->valor($valor->descripcion)->valor != post($valor->descripcion)) { + $v = $cierre->valor($valor->descripcion); + $v->valor = post($valor->descripcion); + $v->save(); + } + continue; + } + $data = [ + 'tipo' => $valor->descripcion, + 'valor' => post($valor->descripcion) + ]; + $cierre->addValor($data); + } + header('Location: ' . nUrl('cierres', 'show', ['cierre' => $cierre->id])); + } +} +?> diff --git a/resources/less/Controller/Comentarios.php b/app_old/app/Controller/Comentarios.php similarity index 100% rename from resources/less/Controller/Comentarios.php rename to app_old/app/Controller/Comentarios.php diff --git a/app_old/app/Controller/Contabilidad.php b/app_old/app/Controller/Contabilidad.php new file mode 100644 index 0000000..4b19a77 --- /dev/null +++ b/app_old/app/Controller/Contabilidad.php @@ -0,0 +1,100 @@ +orderByAsc('descripcion')->findMany(); + foreach ($proyectos as &$proyecto) { + $arr = $proyecto->asArray(); + $arr['direccion'] = $proyecto->direccion()->asArray(); + $arr['direccion']['comuna'] = $proyecto->direccion()->comuna()->asArray(); + $arr['inmobiliaria'] = $proyecto->inmobiliaria()->asArray(); + $proyecto = $arr; + } + return json_encode(compact('proyectos')); + } + public static function get_fechas() { + $id_proyecto = get('proyecto'); + $proyecto = model(Proyecto::class)->findOne($id_proyecto); + $cuotas = []; + foreach ($proyecto->ventas() as $venta) { + $cs = $venta->pie()->cuotas(); + $cuotas = array_merge($cs, array_filter($cs, function($item) { + $tipo = $item->pago()->estado()->tipo(); + return ($tipo == 'depositado' or $tipo == 'abonado'); + })); + } + $fechas = array_map(function($item) { + return [ + 'timestamp' => $item->pago()->estado()->fecha()->timestamp, + 'short' => $item->pago()->estado()->fecha()->format('Y-m-d'), + 'long' => $item->pago()->estado()->fecha()->format('d / m / Y') + ]; + }, $cuotas); + usort($fechas, function($a, $b) { + return $b['timestamp'] - $a['timestamp']; + }); + return json_encode(compact('fechas')); + } + public static function get_pagos_fechas() { + $id_proyecto = get('proyecto'); + $fecha = Carbon::parse(get('fecha')); + $proyecto = model(Proyecto::class)->findOne($id_proyecto); + $pagos = []; + foreach ($proyecto->ventas() as $venta) { + foreach ($venta->pie()->cuotas() as $cuota) { + if ($cuota->pago()->estado()->fecha() == $fecha) { + $pagos []= [ + 'Departamento' => $venta->propiedad()->unidad()->descripcion, + 'Valor' => [ + 'UF' => $cuota->pago()->valor('ufs'), + 'Pesos' => $cuota->pago()->valor() + ], + 'Numero' => $cuota->numero(), + 'Total' => $venta->pie()->cuotas + ]; + break; + } + } + } + return json_encode(compact('pagos')); + } + public static function pagos_fecha() { + $fecha = Carbon::now(); + return view('contabilidad.pagos', compact('fecha')); + } + public static function show_pagos() { + $id_proyecto = get('proyecto'); + $fecha = Carbon::parse(get('fecha')); + $proyecto = model(Proyecto::class)->findOne($id_proyecto); + $pagos = []; + foreach ($proyecto->ventas() as $venta) { + foreach ($venta->pie()->cuotas() as $cuota) { + if ($cuota->pago()->estado()->fecha() == $fecha) { + $pagos []= (object) [ + 'Departamento' => $venta->propiedad()->unidad()->descripcion, + 'Valor' => (object) [ + 'UF' => $cuota->pago()->valor('ufs'), + 'Pesos' => $cuota->pago()->valor() + ], + 'Numero' => $cuota->numero(), + 'Total' => $venta->pie()->cuotas + ]; + break; + } + } + } + return view('contabilidad.pago', compact('proyecto', 'fecha', 'pagos')); + } +} diff --git a/resources/less/Controller/Creditos.php b/app_old/app/Controller/Creditos.php similarity index 100% rename from resources/less/Controller/Creditos.php rename to app_old/app/Controller/Creditos.php diff --git a/resources/less/Controller/Cuotas.php b/app_old/app/Controller/Cuotas.php similarity index 100% rename from resources/less/Controller/Cuotas.php rename to app_old/app/Controller/Cuotas.php diff --git a/resources/less/Controller/Devoluciones.php b/app_old/app/Controller/Devoluciones.php similarity index 100% rename from resources/less/Controller/Devoluciones.php rename to app_old/app/Controller/Devoluciones.php diff --git a/resources/less/Controller/Escrituras.php b/app_old/app/Controller/Escrituras.php similarity index 100% rename from resources/less/Controller/Escrituras.php rename to app_old/app/Controller/Escrituras.php diff --git a/resources/less/Controller/FormaPago.php b/app_old/app/Controller/FormaPago.php similarity index 100% rename from resources/less/Controller/FormaPago.php rename to app_old/app/Controller/FormaPago.php diff --git a/app_old/app/Controller/Home.php b/app_old/app/Controller/Home.php new file mode 100644 index 0000000..fa31ea6 --- /dev/null +++ b/app_old/app/Controller/Home.php @@ -0,0 +1,85 @@ +getCantidadCuotasDias(); + $cierres = $this->getCierres(); + $pendientes = $this->getCantidadCuotasPendientes(); + $hoy = $this->getCantidadCuotasHoy(); + return $view->render($response, 'home', compact('pendientes', 'hoy', 'dias', 'cierres')); + } + + protected array $proyectos; + protected function getProyectos(): array + { + if (!isset($this->proyectos)) { + $this->proyectos = model(Proyecto::class)->findMany(); + } + return $this->proyectos; + } + protected function getCantidadCuotasPendientes(): int + { + $pendientes = 0; + $proyectos = $this->getProyectos(); + foreach ($proyectos as $proyecto) { + $pendientes += $proyecto->cuotasPendientes(); + } + return $pendientes; + } + protected function getCantidadCuotasDias(): array + { + $dias = []; + $proyectos = $this->getProyectos(); + foreach ($proyectos as $proyecto) { + foreach ($proyecto->cuotasMes() as $cuota) { + $f = $cuota->pago()->fecha(); + if ($f->isoWeekday() == 6 or $f->isoWeekDay() == 7) { + $f = $f->copy()->addDays(2)->startOfWeek(); + } + $dia = $f->format('Y-m-d'); + if (!isset($dias[$dia])) { + $dias[$dia] = [$proyecto->descripcion => 0]; + } + if (!isset($dias[$dia][$proyecto->descripcion])) { + $dias[$dia][$proyecto->descripcion] = 0; + } + $dias[$dia][$proyecto->descripcion] ++; + } + } + uksort($dias, function($a, $b) { + return strcmp($a, $b); + }); + return $dias; + } + protected function getCantidadCuotasHoy(): int + { + $hoy = 0; + $proyectos = $this->getProyectos(); + foreach ($proyectos as $proyecto) { + $hoy += $proyecto->cuotasHoy(); + } + return $hoy; + } + protected function getCierres(): array + { + $cierres = []; + $proyectos = $this->getProyectos(); + foreach ($proyectos as $proyecto) { + if (count($proyecto->cierres()) > 0) { + $cierres[$proyecto->descripcion] = (object) ['total' => count($proyecto->cierres()),'vigentes' => $proyecto->cierres(3), 'rechazados' => $proyecto->cierres(-1), 'pendientes' => $proyecto->cierres(2)]; + } + } + uksort($cierres, function($a, $b) { + return strcmp($a, $b); + }); + return $cierres; + } +} diff --git a/app_old/app/Controller/Informes.php b/app_old/app/Controller/Informes.php new file mode 100644 index 0000000..4ab5631 --- /dev/null +++ b/app_old/app/Controller/Informes.php @@ -0,0 +1,830 @@ +find_one($id_proyecto); + $ini = \Carbon\Carbon::parse($proyecto->estado()->fecha, config('app.timezone')); + #$informe = new Informador('Carta Gantt Proyecto - ' . $proyecto->descripcion); + $name = 'Carta Gantt Proyecto - ' . $proyecto->descripcion; + $hoy = Carbon::now(config('app.timezone')); + $filename = str_replace('ñ', 'n', $name . ' - ' . $hoy->format('Y-m-d') . '.xls'); + $informe = new PHPExcel($name, $filename); + + $columnas = ['Departamento', 'Propietario', 'Entrega', 'Estado']; + $today = \Carbon\Carbon::today(config('app.timezone')); + $end = $today->copy()->addDays(30); + $dif = $end->diffInDays($ini); + for ($i = 0; $i <= $dif; $i ++) { + $f = $ini->copy()->addDays($i); + if ($f->isWeekend()) { + continue; + } + $columnas []= $f->format('Y-m-d'); + } + $informe->addColumns($columnas); + + $data = []; + foreach ($proyecto->entregas() as $venta) { + $info = []; + $info []= $venta->unidad()->descripcion; + $info []= $venta->propietario()->findOne()->nombreCompleto(); + $fe = Carbon::parse($venta->entrega()->find_one()->fecha, config('app.timezone')); + $info []= $fe->format('Y-m-d'); + $info []= ''; + + for ($i = 0; $i <= $dif; $i ++) { + $f = $ini->copy()->addDays($i); + if ($f->isWeekend()) { + continue; + } + if ($f >= $fe and $f <= $fe->copy()->addDays(14)) { + $info []= 'X'; + } else { + $info []= ''; + } + } + + $data []= $info; + } + $informe->addDatas($data); + + return $informe->informe(); + } else { + $proyectos = model(Proyecto::class)->order_by_asc('descripcion')->find_many(); + return view('informes.gantt_entregas', compact('proyectos')); + } + } + public static function escrituras() + { + if (get('proyecto')) { + set_time_limit(60); + $id_proyecto = get('proyecto'); + $proyecto = model(Proyecto::class)->find_one($id_proyecto); + + #$informe = new Informador('Escrituras - ' . $proyecto->descripcion); + $name = 'Escrituras'; + $hoy = Carbon::now(config('app.timezone')); + $filename = str_replace('ñ', 'n', $name . ' - ' . $proyecto->descripcion . ' - ' . $hoy->format('Y-m-d') . '.xls'); + $informe = new PHPExcel($name, $filename); + + $columnas = [ + 'Departamento', + 'Estacionamientos', + 'Bodegas', + 'Propietario', + (object) ['name' => 'Promesa', 'style' => 'number'], + ['name' => 'Bono Pie', 'style' => 'amount'], + ['name' => 'Pie Pagado', 'style' => 'amount'], + ['name' => 'Reajuste', 'style' => 'amount'], + ['name' => 'Abono Contado', 'style' => 'amount'], + ['name' => 'Subsidio', 'style' => 'amount'], + 'Estado Subsidio', + ['name' => 'Credito', 'style' => 'amount'], + 'Banco', + 'Estado Credito', + ['name' => 'Saldo', 'style' => 'amount'], + ['name' => 'Escritura', 'style' => 'amount'], + ['name' => 'Entrega', 'style' => 'date'] + ]; + $informe->addColumns($columnas); + + //$ventas = $proyecto->escrituras(); + $ventas = $proyecto->ventas(); + + $data = []; + foreach ($ventas as $venta) { + $info = []; + $info['Departamento'] = $venta->unidad()->descripcion; + $ests = []; + foreach ($venta->propiedad()->estacionamientos() as $e) { + $ests []= $e->descripcion; + } + $bods = []; + foreach ($venta->propiedad()->bodegas() as $b) { + $bods []= $b->descripcion; + } + $info['Estacionamientos'] = implode(' - ', $ests); + $info['Bodegas'] = implode(' - ', $bods); + $info['Propietario'] = $venta->propietario()->nombreCompleto(); + $info['Promesa'] = $venta->valor_uf; + $saldo = $venta->valor_uf; + $info['Bono Pie'] = ''; + if ($venta->bono_pie != 0) { + $info['Bono Pie'] = $venta->bonoPie()->pago()->valor('ufs'); + $saldo -= $venta->bonoPie()->pago()->valor('ufs'); + } + $info['Pie'] = ''; + $info['Reajuste'] = ''; + if ($venta->pie != 0) { + $info['Pie'] = $venta->pie()->valorPagado(); + $saldo -= $venta->pie()->valorPagado(); + if ($venta->pie()->reajuste != 0) { + $info['Reajuste'] = $venta->pie()->reajuste()->valor('ufs'); + $saldo -= $venta->pie()->reajuste()->valor('ufs'); + } + } + $info['Abono Contado'] = ''; + if ($venta->escritura != 0) { + $info['Abono Contado'] = $venta->escritura()->pago()->valor('ufs'); + $saldo -= $venta->escritura()->pago()->valor('ufs'); + } + $info['Subsidio'] = ''; + $info['Estado Subsidio'] = ''; + if ($venta->subsidio != 0) { + $info['Subsidio'] = $venta->subsidio()->total('ufs'); + $info['Estado Subsidio'] = implode(' - ', [ + $venta->subsidio()->subsidio()->estado()->tipo()->descripcion, + $venta->subsidio()->pago()->estado()->tipo()->descripcion + ]); + $saldo -= $venta->subsidio()->total('ufs'); + } + $info['Credito'] = ''; + $info['Banco'] = ''; + $info['Estado Credito'] = ''; + if ($venta->credito != 0) { + $info['Credito'] = $venta->credito()->pago()->valor('ufs'); + $saldo -= $venta->credito()->pago()->valor('ufs'); + if ($venta->credito()->pago()->banco != 0) { + $info['Banco'] = $venta->credito()->pago()->banco()->nombre; + } + $info['Estado Credito'] = $venta->credito()->pago()->estado()->tipo()->descripcion; + } + $info['Saldo'] = -$saldo; + $info['Escritura'] = ''; + if ($venta->escriturado != 0) { + $info['Escritura'] = $venta->escriturado; + } + $info['Entrega'] = ''; + if ($venta->entregado != 0) { + $info['Entrega'] = $venta->entregado; + } + + $data []= $info; + } + $informe->addData($data); + + return $informe->informe(); + } else { + $proyectos = model(Proyecto::class)->order_by_asc('descripcion')->find_many(); + return view('informes.escrituras', compact('proyectos')); + } + } + public static function consolidacion() + { + $id_proyecto = get('proyecto'); + $proyecto = model(Proyecto::class)->findOne($id_proyecto); + + $ventas = $proyecto->ventas(); + set_time_limit(count($ventas)); + + $f = Carbon::today(config('app.timezone')); + setlocale(LC_TIME, 'es'); + + $data = [ + [$proyecto->descripcion], + [strftime('%d de %B de %Y', $f->timestamp)], + [''], + [''] + ]; + $columns = [ + ['name' => 'Fecha', 'style' => 'date'], + 'Glosa', + ['name' => 'Debe', 'style' => 'number'], + ['name' => 'Haber', 'style' => 'number'], + ['name' => 'Saldo', 'style' => 'number'], + 'Comentario' + ]; + $bold_rows = []; + + foreach ($ventas as $venta) { + $data []= ['Departamento ' . $venta->unidad()->descripcion . ' (' . format('ufs', $venta->valor_uf) . ' UF)']; + $data []= $columns; + $bold_rows []= count($data) - 1; + $ufs = 0; + $debe = 0; + $haber = 0; + $sum = 0; + if ($venta->pie != 0) { + $cuotas = $venta->pie()->cuotas(); + foreach ($cuotas as $cuota) { + $sum += $cuota->pago()->valor(); + $ufs += $cuota->pago()->valor('ufs'); + $haber += $cuota->pago()->valor(); + $info = [ + $cuota->pago()->estado()->fecha, + 'Pie - Cuota ' . $cuota->numero() . ' - ' . $venta->pie()->cuotas . ' (' . format('ufs', $cuota->pago()->valor('ufs')) . ' UF)', + '', + $cuota->pago()->valor(), + $sum + ]; + if ($cuota->pago()->estado()->estado < 2) { + $info []= 'No ha sido abonada.'; + } + $data []= $info; + } + if ($venta->pie()->reajuste != 0) { + $sum += $venta->pie()->reajuste()->valor(); + $ufs += $venta->pie()->reajuste()->valor('ufs'); + $haber += $venta->pie()->reajuste()->valor(); + $info = [ + $venta->pie()->reajuste()->estado()->fecha, + 'Reajuste (' . format('ufs', $venta->pie()->reajuste()->valor('ufs')) . ' UF)', + '', + $venta->pie()->reajuste()->valor(), + $sum + ]; + if ($venta->pie()->reajuste()->estado()->estado < 2) { + $info []= 'No ha sido abonado.'; + } + $data []= $info; + } + } + if ($venta->escritura != 0) { + $sum += $venta->escritura()->pago()->valor(); + $ufs += $venta->escritura()->pago()->valor('ufs'); + $haber += $venta->escritura()->pago()->valor(); + $info = [ + $venta->escritura()->pago()->estado()->fecha, + 'Abono Escritura (' . format('ufs', $venta->escritura()->pago()->valor('ufs')) . ' UF)', + '', + $venta->escritura()->pago()->valor(), + $sum + ]; + if ($venta->escritura()->pago()->estado()->estado < 2) { + $info []= 'No ha sido abonado.'; + } + $data []= $info; + } + if ($venta->credito != 0) { + $sum += $venta->credito()->pago()->valor(); + $ufs += $venta->credito()->pago()->valor('ufs'); + $haber += $venta->credito()->pago()->valor(); + $info = [ + $venta->credito()->pago()->estado()->fecha, + 'Crédito (' . format('ufs', $venta->credito()->pago()->valor('ufs')) . ' UF)', + '', + $venta->credito()->pago()->valor(), + $sum + ]; + if ($venta->credito()->pago()->estado()->estado < 2) { + $info []= 'No ha sido pagado.'; + } + $data []= $info; + } + if ($venta->bono_pie != 0) { + try { + $sum -= $venta->bonoPie()->pago()->valor(); + $debe += $venta->bonoPie()->pago()->valor(); + $info = [ + $venta->bonoPie()->pago()->estado()->fecha, + 'Bono Pie (' . format('ufs', $venta->bonoPie()->pago()->valor('ufs')) . ' UF)'. + $venta->bonoPie()->pago()->valor(), + '', + $sum + ]; + $data []= $info; + $sum += $venta->bonoPie()->pago()->valor(); + $haber += $venta->bonoPie()->pago()->valor(); + $info = [ + $venta->bonoPie()->pago()->estado()->fecha, + 'Bono Pie (' . format('ufs', $venta->bonoPie()->pago()->valor('ufs')) . ' UF)'. + '', + $venta->bonoPie()->pago()->valor(), + $sum + ]; + $data []= $info; + } catch (\Exception $e) { + + } + } + $info = [ + '', + 'TOTAL (' . format('ufs', $ufs) . ' UF)', + $debe, + $haber, + $sum + ]; + $data []= $info; + $bold_rows []= count($data) - 1; + + $data []= ['']; + } + /** + * Departamento # + * Fecha |Glosa |Debe |Haber |Saldo + * |Pie - Cuota 1 - n (# UF) |- |$# | + * |Reajuste (# UF) |- |$# | + * |Abono Escritura (# UF) |- |$# | + * |Crédito (# UF) |- |$# | + * |Bono Pie (# UF) |$# |- | + * |Bono Pie (# UF) |- |$# | + * |Devolución (# UF) |$# |- | + * - |TOTAL (# UF) | | | + */ + + array_walk($data, function(&$e, $i) use ($columns) { + if (count($e) < count($columns)) { + $n = count($columns) - count($e); + for ($j = 0; $j < $n; $j ++) { + $e []= ''; + } + } + }); + + #$informe = new Informador('Consolidación - ' . $proyecto->descripcion); + $name = 'Consolidación'; + $hoy = Carbon::now(config('app.timezone')); + $filename = str_replace('ñ', 'n', $name . ' - ' . $proyecto->descripcion . ' - ' . $hoy->format('Y-m-d') . '.xls'); + $informe = new PHPExcel($name, $filename); + $informe->addColumns($columns); + $informe->addData($data); + + return $informe->informe(); + } + public static function creditos_pendientes() + { + function creditos() { + $creditos = model(Credito::class) + ->select('credito.*') + ->join('venta', ['venta.credito', '=', 'credito.id']) + ->join('pago', ['pago.id', '=', 'credito.pago']) + ->rawJoin('JOIN (SELECT ep.* FROM (SELECT pago, MAX(id) AS id FROM estado_pago GROUP BY pago) e0 JOIN estado_pago ep ON ep.id = e0.id)', ['estado_pago.pago', '=', 'pago.id'], 'estado_pago') + ->whereLt('estado_pago.estado', 2) + ->where('venta.estado', 1) + ->orderByAsc('estado_pago.fecha') + ->findMany(); + foreach ($creditos as $credito) { + yield $credito; + } + } + $informe = new Informador('Créditos Pendientes'); + + $columnas = ['Proyecto', 'Departamento', 'Valor', 'Fecha Escritura', 'Estado']; + $informe->addColumns($columnas); + + $row = 0; + foreach (creditos() as $credito) { + $informe->addData($row, $credito->venta()->proyecto()->descripcion, 'Proyecto'); + $informe->addData($row, $credito->venta()->unidad()->descripcion, 'Departamento'); + $informe->addData($row, $credito->pago()->valor('ufs'), 'Valor'); + $informe->addData($row, (($credito->venta()->escriturado) ? $credito->venta()->escriturado : $credito->pago()->estado()->fecha), 'Fecha Escritura'); + $informe->addData($row, ucwords($credito->pago()->estado()->tipo()->descripcion), 'Estado'); + + $row ++; + } + + $date = [ + 'numberFormat' => ['short-date'] + ]; + $ufs = [ + 'numberFormat' => ['thousands'] + ]; + $formats = ['Valor' => $ufs, 'Fecha Escritura' => $date]; + $informe->addFormats($formats); + + return $informe->informe(); + } + public static function ventas() + { + if (get('proyecto')) { + ini_set('memory_limit', "1G"); + ini_set('max_execution_time', '3600'); + $id = get('proyecto'); + $proyecto = model(Proyecto::class)->findOne($id); + $ventas = $proyecto->ventas(); + + /*usort($ventas, function($a, $b) { + return $a->fecha()->timestamp - $b->fecha()->timestamp; + });*/ + + $procasa = model(Agente::class)->findOne(1); + $pa = model(ProyectoAgente::class)->where('agente', $procasa->id)->where('proyecto', $proyecto->id)->findOne(); + if ($pa) { + $comision = $pa->comision / 100; + } else { + $comision = 0.03; + } + + #$informe = new Informador('Ventas - ' . $proyecto->descripcion); + $name = 'Informe de Ventas'; + $hoy = Carbon::now(config('app.timezone')); + $filename = str_replace('ñ', 'n', $name . ' - ' . $proyecto->descripcion . ' - ' . $hoy->format('Y-m-d') . '.xlsx'); + //$informe = new PHPExcel($name, $filename); + + $columnas = [ + 'Propietario', + 'Departamento', + ['name' => 'Estacionamientos', 'style' => 'number'], + ['name' => 'Bodegas', 'style' => 'number'], + 'Fecha Venta', + ['name' => 'Mes', 'style' => 'mes'], + 'Tipo', + ['name' => 'm² Ponderados', 'style' => 'amount'], + ['name' => 'Valor Promesa', 'style' => 'amount'], + ['name' => 'Pie', 'style' => 'amount'], + ['name' => 'Pie Pagado', 'style' => 'amount'], + ['name' => '% Pie Pagado', 'style' => 'percent'], + ['name' => 'Bono Pie', 'style' => 'amount'], + 'Operador', + ['name' => 'Valor Operador', 'style' => 'amount'], + ['name' => 'Premios', 'style' => 'amount'], + ['name' => 'Subsidio', 'style' => 'amount'], + ['name' => 'Ahorro', 'style' => 'amount'], + ['name' => 'Credito', 'style' => 'amount'], + 'Banco', + ['name' => 'Valor Ests & Bods', 'style' => 'amount'], + ['name' => 'Valor Neto', 'style' => 'amount'], + ['name' => 'UF/m²*', 'style' => 'amount'], + ['name' => 'Comision', 'style' => 'amount'], + ['name' => 'Venta s/Comision', 'style' => 'amount'], + ['name' => 'Precio', 'style' => 'Amount'] + ]; + //$informe->addColumns($columnas); + + $data = []; + foreach ($ventas as $venta) { + $info = []; + $info['Propietario'] = mb_strtoupper($venta->propietario()->nombreCompleto()); + $info['Departamento'] = implode(' - ', array_map(function($item) { + return $item->descripcion; + }, $venta->propiedad()->departamentos())); + $es = $venta->propiedad()->estacionamientos(); + $info['Estacionamientos'] = implode(', ', array_map(function($item) { + return $item->descripcion; + }, $es)); + $bs = $venta->propiedad()->bodegas(); + $info['Bodegas'] = implode(', ', array_map(function($item) { + return $item->descripcion; + }, $bs)); + $info['Fecha Venta'] = $venta->fecha()->format('Y-m-d'); + $info['Mes'] = $venta->fecha()->format('M-y'); + $info['Tipo'] = $venta->unidad()->abreviacion; + $info['m² Ponderados'] = $venta->unidad()->m2('vendible'); + $info['Valor Promesa'] = $venta->valor_uf; + $info['Pie'] = 0; + if ($venta->pie()) { + $info['Pie'] = $venta->pie()->valor; + } + $info['Pie Pagado'] = 0; + $info['% Pie Pagado'] = 0; + if ($venta->pie()) { + $info['Pie Pagado'] = $venta->pie()->valorPagado('uf'); + $info['% Pie Pagado'] = $venta->pie()->valorPagado('uf') / $venta->valor_uf; + } + + $info['Bono Pie'] = ($venta->bono_pie == 0 or $venta->bonoPie() === false) ? '' : $venta->bonoPie()->pago()->valor('ufs'); + $info['Operador'] = ($venta->agente and $venta->agente()->agente()->tipo == 19) ? $venta->agente()->agente()->descripcion : ''; + $info['Valor Operador'] = $venta->valorComision(); + //$promos = 0; + $ps = $venta->promociones(); + $info['Premios'] = array_reduce($ps, function($sum, $item) { + return $sum + $item->valor; + }); + $info['Subsidio'] = 0; + $info['Ahorro'] = 0; + if ($venta->subsidio != 0) { + $info['Subsidio'] = $venta->subsidio()->subsidio()->valor('ufs'); + $info['Ahorro'] = $venta->subsidio()->pago()->valor('ufs'); + } + $info['Credito'] = 0; + $info['Banco'] = ''; + if ($venta->credito != 0 and $venta->credito()->pago()) { + $info['Credito'] = $venta->credito()?->pago()->valor('ufs'); + if ($venta->credito()?->pago()->banco != 0) { + $info['Banco'] = $venta->credito()?->pago()->banco()->nombre; + } + } + $info['Valor Ests & Bods'] = $venta->valorEstacionamientosYBodegas(); + $info['Valor Neto'] = $venta->valorFinal(); + $info['UF/m²*'] = $venta->uf_m2(); + $info['Comision'] = $venta->valorFinal() * $comision; + $info['Venta s/Comision'] = $venta->valorFinal() - $info['Comision']; + $fecha = $venta->fecha(); + $info['Precio'] = 0; + try { + $info['Precio'] = array_reduce($venta->propiedad()->departamentos(), function($sum, $item) use ($fecha) { + if (!$item->precio($fecha)) { + return $sum; + } + return $sum + $item->precio($fecha)->valor; + }); + } catch (\Exception $e) { + } + + $data []= $info; + } + + $body = [ + "Proyecto" => $proyecto->descripcion, + "Compañía" => $proyecto->inmobiliaria()->abreviacion, + "data" => $data + ]; + $client = new Client(['base_uri' => "{$_ENV['PYTHON_HOST']}"]); + $response = $client->post('/ventas', ['json' => $body]); + + header("Content-Type: application/octet-stream; charset=utf-8"); + header('Content-Transfer-Encoding: binary'); + header('Content-Disposition: attachment; filename="' . $filename . '"'); + header('Cache-Control: max-age=0'); + return $response->getBody(); + //file_put_contents('php://output', $output); + + } else { + $proyectos = model(Proyecto::class)->order_by_asc('descripcion')->find_many(); + return view('informes.ventas', compact('proyectos')); + } + } + public static function resumen_contabilidad() + { + if (get('proyecto')) { + $id = get('proyecto'); + $fecha = get('fecha'); + + $service = new Resumen(); + $service->build($id, new \DateTimeImmutable($fecha)); + return ''; + } else { + $proyectos = model(Proyecto::class)->order_by_asc('descripcion')->find_many(); + return view('informes.resumen_contabilidad', compact('proyectos')); + } + } + public static function contabilidad() + { + if (get('proyecto')) { + $id = get('proyecto'); + $fecha = get('fecha'); + $mes = null; + if ($fecha != null) { + $mes = Carbon::parse($fecha); + } + $proyecto = model(Proyecto::class)->findOne($id); + $q = "SELECT pago.*, venta.id AS vid, venta.tipo AS ctipo, venta.pie AS pie + FROM ( + SELECT pago.id, banco.nombre AS banco, pago.fecha, pago.valor, pago.uf, ep.estado, ep.fecha AS efecha + FROM pago JOIN banco ON banco.id = pago.banco JOIN (( + SELECT pago, MAX(id) AS id FROM estado_pago GROUP BY pago) e0 JOIN estado_pago ep ON ep.id = e0.id) ON ep.pago = pago.id + WHERE ep.estado > 0 "; + if ($mes != null) { + $q .= "AND (pago.fecha BETWEEN '" . $mes->format('Y-m-01') . "' AND '" . $mes->format('Y-m-t') . "' + OR ep.fecha BETWEEN '" . $mes->format('Y-m-01') . "' AND '" . $mes->format('Y-m-t') . "')"; + } + $q .= ") pago JOIN (SELECT venta.* + FROM (( + SELECT venta.id, venta.pie, venta.propiedad, credito.pago, 'credito' AS tipo + FROM venta JOIN credito ON credito.id = venta.credito) + UNION ALL ( + SELECT venta.id, venta.pie, venta.propiedad, escritura.pago, 'escritura' AS tipo + FROM venta JOIN escritura ON escritura.id = venta.escritura) + UNION ALL ( + SELECT venta.id, venta.pie, venta.propiedad, cuota.pago, 'cuota' AS tipo + FROM venta JOIN cuota ON cuota.pie = venta.pie)) venta + JOIN propiedad ON propiedad.id = venta.propiedad + JOIN unidad ON unidad.id = propiedad.unidad_principal + WHERE unidad.proyecto = ?) venta + ON venta.pago = pago.id"; + $st = \ORM::getDB()->prepare($q); + $st->execute([$id]); + if ($st->rowCount() > 0) { + $R = $st->fetchAll(\PDO::FETCH_OBJ); + + //$informe = new Informador('Contabilidad - ' . (($mes != null) ? $mes->format('Y-m') . ' - ' : '') . $proyecto->descripcion); + $name = 'Contabilidad'; + $hoy = Carbon::now(config('app.timezone')); + $filename = str_replace('ñ', 'n', 'Contabilidad - ' . (($mes != null) ? $mes->format('Y-m') . ' - ' : '') . $proyecto->descripcion . ' - ' . $hoy->format('Y-m-d') . '.xls'); + + $informe = new PHPExcel($name, $filename); + + $columnas = ['Proyecto', 'Fecha', 'Banco', 'Departamento', 'RUT', 'Propietario', 'Glosa', 'Glosa2', (object) ['name' => 'Valor', 'style' => 'integer'], (object) ['name' => 'Valor UF', 'style' => 'currency']]; + $informe->addColumns($columnas); + $data = []; + foreach ($R as $r) { + $info = []; + $info['Proyecto'] = $proyecto->descripcion; + $f1 = \Carbon\Carbon::parse($r->fecha, config('app.timezone')); + $f2 = \Carbon\Carbon::parse($r->efecha, config('app.timezone')); + $info['Fecha'] = ($f1->max($f2))->format('Y-m-d'); + $info['Banco'] = $r->banco; + $venta = model(Venta::class)->findOne($r->vid); + $info['Departamento'] = $venta->unidad()->descripcion; + $info['RUT'] = $venta->propietario()->rut(); + $info['Propietario'] = $venta->propietario()->nombreCompleto(); + $info['Glosa'] = ucwords($r->ctipo); + $info['Glosa2'] = ''; + if ($r->ctipo == 'cuota') { + $cuota = model(Cuota::class)->where('pago', $r->id)->findOne(); + + $info['Glosa'] = 'Pie - ' . format('ufs', $cuota->pie()->valor('ufs'), null, true); + + $info['Glosa2'] = $cuota->numero() . ' - ' . $cuota->pie()->cuotas; + } + $info['Valor'] = $r->valor; + $info['Valor UF'] = '0'; + if ($r->uf > 0) { + $info['Valor UF'] = $r->valor / $r->uf; + } + $data []= $info; + } + + $informe->addData($data); + + return $informe->informe(); + } + } else { + setlocale(LC_TIME, 'es_ES'); + $proyectos = model(Proyecto::class)->order_by_asc('descripcion')->find_many(); + return view('informes.contabilidad', compact('proyectos')); + } + } + public static function para_comision() + { + $proyectos = model(Proyecto::class)->orderByAsc('descripcion')->findMany(); + return view('informes.para_comision', compact('proyectos')); + } + public static function comisiones() + { + $id = post('proyecto'); + $proyecto = model(Proyecto::class)->findOne($id); + $unidades = explode('-', str_replace([';', '.', ':', ' ', PHP_EOL, '|', '+', ','], '-', post('unidades'))); + $ventas = model(Venta::class) + ->select('venta.*') + ->join('propiedad', ['propiedad.id', '=', 'venta.propiedad']) + ->join('unidad', ['unidad.id', '=', 'propiedad.unidad_principal']) + ->where('unidad.proyecto', $proyecto->id) + ->where('venta.estado', 1) + ->whereIn('unidad.descripcion', $unidades) + ->orderByExpr('FIELD(unidad.descripcion, ' . implode(', ', $unidades) . ')') + ->findMany(); + $ids = []; + $totales = (object) ['precio' => 0, 'neto' => 0, 'comision' => 0]; + foreach ($ventas as $venta) { + $ids []= $venta->id; + $totales->precio += $venta->valor_uf; + $totales->neto += $venta->valorCorredora(); + $totales->comision += $venta->valorCorredora() * 1.5 / 100; + } + return view('informes.comisiones', compact('ventas', 'proyecto', 'totales', 'ids')); + } + public static function comisiones_xlsx() + { + $id_ventas = explode(',', get('ventas')); + $ventas = model(Venta::class) + ->whereIn('id', $id_ventas) + ->orderByExpr('FIELD(id, ' . implode(', ', $id_ventas) . ')') + ->findMany(); + + $informe = new Informador('Comisiones - ' . $ventas[0]->proyecto()->descripcion); + $columnas = ['Departamento', 'Estacionamientos', 'Bodegas', 'Propietario', 'Precio', '% Com', 'Com UF']; + $informe->addColumns($columnas); + $data = []; + foreach ($ventas as $venta) { + $info = []; + $info['Departamento'] = $venta->unidad()->descripcion; + $info['Estacionamientos'] = implode(' - ', $venta->propiedad()->estacionamientos('array')); + $info['Bodegas'] = implode(' - ', $venta->propiedad()->bodegas('array')); + $info['Propietario'] = $venta->propietario()->nombreCompleto(); + $info['Precio'] = "'" . format('ufs', $venta->valorCorredora()); + $info['% Com'] = '1,5 %'; + $info['Com UF'] = "'" . format('ufs', $venta->valorCorredora() * 1.5 / 100); + $data []= $info; + } + + $informe->addDatas($data); + + return $informe->informe(); + } + public static function cuotas() + { + $id_venta = get('venta'); + $venta = model(Venta::class)->findOne($id_venta); + + $name = 'Cuotas - ' . $venta->unidad()->descripcion; + $hoy = Carbon::now(config('app.timezone')); + $filename = str_replace('ñ', 'n', $name . ' - ' . $venta->proyecto()->descripcion . ' - ' . $hoy->format('Y-m-d') . '.xls'); + $informe = new PHPExcel($name, $filename); + $columnas = [ + ['name' => 'Cuota', 'style' => 'number'], + ['name' => 'Fecha Cuota', 'style' => 'date'], + 'Banco', + 'Identificador', + ['name' => 'Valor $', 'style' => 'number'], + ['name' => 'Valor UF', 'style' => 'currency'], + ['name' => 'Fecha Pago', 'style' => 'date'] + ]; + $informe->addColumns($columnas); + $data = []; + foreach ($venta->pie()->cuotas() as $cuota) { + $info = []; + $info['Cuota'] = $cuota->numero(); + $info['Fecha Cuota'] = $cuota->pago()->fecha()->format('Y-m-d'); + $info['Banco'] = $cuota->pago()->banco()->descripcion; + $info['Identificador'] = $cuota->pago()->identificador; + $info['Valor $'] = $cuota->pago()->valor(); + $info['Valor UF'] = $cuota->pago()->valor('ufs'); + $info['Fecha Pago'] = $cuota->pago()->estado()->fecha()->format('Y-m-d'); + $data []= $info; + } + $informe->addData($data); + + return $informe->informe(); + } + public static function resciliaciones() + { + if (get('proyecto')) { + $id = get('proyecto'); + $proyecto = model(Proyecto::class)->findOne($id); + $ventas = $proyecto->resciliaciones(); + + usort($ventas, function($a, $b) { + return $a->fecha()->timestamp - $b->fecha()->timestamp; + }); + + $name = 'Resciliaciones'; + $hoy = Carbon::now(config('app.timezone')); + $filename = str_replace('ñ', 'n', $name . ' - ' . $proyecto->descripcion . ' - ' . $hoy->format('Y-m-d') . '.xls'); + $informe = new PHPExcel($name, $filename); + + $columnas = [ + 'Propietario', + ['name' => 'Departamento', 'style' => 'number'], + ['name' => 'Estacionamientos', 'style' => 'number'], + ['name' => 'Bodegas', 'style' => 'number'], + 'Fecha Venta', + 'Fecha Resciliación', + ['name' => 'Mes', 'style' => 'mes'], + 'Tipo', + ['name' => 'm² Ponderados', 'style' => 'amount'], + ['name' => 'Valor Promesa', 'style' => 'amount'], + ]; + $informe->addColumns($columnas); + + $data = []; + foreach ($ventas as $venta) { + $info = []; + $info['Propietario'] = mb_strtoupper($venta->propietario()->nombreCompleto()); + $info['Departamento'] = $venta->unidad()->descripcion; + $ests = []; + if ($venta->propiedad()->estacionamientos != '') { + $es = $venta->propiedad()->estacionamientos(); + foreach ($es as $e) { + $ests []= $e->descripcion; + } + } + $info['Estacionamientos'] = implode(', ', $ests); + $bods = []; + if ($venta->propiedad()->bodegas != '') { + $bs = $venta->propiedad()->bodegas(); + foreach ($bs as $b) { + $bods []= $b->descripcion; + } + } + $info['Bodegas'] = implode(', ', $bods); + $info['Fecha Venta'] = $venta->fecha()->format('d.m.Y'); + $info['Fecha Resciliación'] = $venta->estado()->fecha()->format('d.m.Y'); + $info['Mes'] = $venta->estado()->fecha()->format('M-y'); + $info['Tipo'] = $venta->unidad()->abreviacion; + $info['m² Ponderados'] = $venta->unidad()->m2('vendible'); + $info['Valor Promesa'] = $venta->valor_uf; + + $data []= $info; + } + $informe->addData($data); + + $totals = [ + 'Departamento' => 'count', + 'Estacionamientos' => 'count', + 'Bodegas' => 'count', + 'm² Ponderados' => 'sum', + 'Valor Promesa' => 'sum' + ]; + $informe->addTotals($totals); + + return $informe->informe(); + } else { + $proyectos = model(Proyecto::class)->order_by_asc('descripcion')->find_many(); + return view('informes.resciliaciones', compact('proyectos')); + } + } +} diff --git a/resources/less/Controller/Inmobiliarias.php b/app_old/app/Controller/Inmobiliarias.php similarity index 100% rename from resources/less/Controller/Inmobiliarias.php rename to app_old/app/Controller/Inmobiliarias.php diff --git a/resources/less/Controller/Operadores.php b/app_old/app/Controller/Operadores.php similarity index 100% rename from resources/less/Controller/Operadores.php rename to app_old/app/Controller/Operadores.php diff --git a/resources/less/Controller/Other.php b/app_old/app/Controller/Other.php similarity index 100% rename from resources/less/Controller/Other.php rename to app_old/app/Controller/Other.php diff --git a/resources/less/Controller/Pagares.php b/app_old/app/Controller/Pagares.php similarity index 100% rename from resources/less/Controller/Pagares.php rename to app_old/app/Controller/Pagares.php diff --git a/resources/less/Controller/Pagos.php b/app_old/app/Controller/Pagos.php similarity index 100% rename from resources/less/Controller/Pagos.php rename to app_old/app/Controller/Pagos.php diff --git a/resources/less/Controller/Pies.php b/app_old/app/Controller/Pies.php similarity index 100% rename from resources/less/Controller/Pies.php rename to app_old/app/Controller/Pies.php diff --git a/resources/less/Controller/Postventas.php b/app_old/app/Controller/Postventas.php similarity index 100% rename from resources/less/Controller/Postventas.php rename to app_old/app/Controller/Postventas.php diff --git a/app_old/app/Controller/Precios.php b/app_old/app/Controller/Precios.php new file mode 100644 index 0000000..20db97b --- /dev/null +++ b/app_old/app/Controller/Precios.php @@ -0,0 +1,177 @@ +orderByAsc('descripcion')->findMany(); + return view('ventas.precios.proyectos', compact('proyectos')); + } + public static function list() + { + $proyecto = \model(Proyecto::class)->findOne(get('proyecto')); + return view('ventas.precios.list', compact('proyecto')); + } + public static function import() + { + $proyectos = \model(Proyecto::class)->orderByAsc('descripcion')->findMany(); + return view('ventas.precios.import', compact('proyectos')); + } + public static function importar() + { + $proyecto = \model(Proyecto::class)->findOne(post('proyecto')); + $fecha = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); + $file = explode(PHP_EOL, trim(file_get_contents($_FILES['archivo']['tmp_name']))); + $columnas = explode(';', array_shift($file)); + $tr = model(TipoEstadoPrecio::class)->where('descripcion', 'reemplazado')->findOne()->id; + $tv = model(TipoEstadoPrecio::class)->where('descripcion', 'vigente')->findOne()->id; + foreach ($file as $line) { + if (trim($line) == '') { + continue; + } + $info = explode(';', $line); + $tipo = \model(TipoUnidad::class)->where('descripcion', $info[0])->findOne(); + $unidad = \model(Unidad::class)->where('tipo', $tipo->id)->where('descripcion', $info[1])->where('proyecto', $proyecto->id)->findOne(); + if (!$unidad) { + continue; + } + + try { + self::reemplazar($unidad->id, $info[2], $fecha, $tr, $tv); + } catch (\Exception $e) { + continue; + } + } + header('Location: ' . nUrl('precios', 'list', ['proyecto' => $proyecto->id])); + } + public static function add() + { + $proyecto = \model(Proyecto::class)->findOne(get('proyecto')); + return view('ventas.precios.add', compact('proyecto')); + } + public static function agregar() + { + $proyecto = get('proyecto'); + $fecha = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); + $precios = []; + foreach (post() as $name => $valor) { + if ($valor == '' or strpos($name, 'precio') === false) { + continue; + } + list($tipo, $id) = explode(':', $name); + $tipo = trim(str_replace('precio', '', $tipo), '_'); + $id = explode('-', $id); + switch (count($id)) { + case 1: + $precios []= ['tipo' => 'pt', 'id' => $id[0], 'valor' => $valor]; + break; + case 2: + $exists = false; + foreach ($precios as $precio) { + if ($precio['tipo'] == 'pt' and $precio['id'] == $id[0]) { + $exists = true; + break; + } + } + if (!$exists) { + $precios []= ['tipo' => 'subtipo', 'id' => $id[1], 'pt' => $id[0], 'valor' => $valor]; + } + break; + case 3: + $exists = false; + foreach ($precios as $precio) { + if ($precio['tipo'] == 'pt' and $precio['id'] == $id[0]) { + $exists = true; + break; + } + if ($precio['tipo'] == 'subtipo' and 'id' == $id[1] and 'pt' == $id[0]) { + $exists = true; + break; + } + } + if (!$exists) { + $precios []= ['tipo' => 'unidad', 'id' => $id[2], 'valor' => $valor]; + } + break; + } + } + foreach ($precios as $precio) { + $precio = (object) $precio; + try { + switch ($precio->tipo) { + case 'pt': + $pt = model(ProyectoTipoUnidad::class)->findOne($precio->id); + $pt->setPrecios($fecha, $precio->valor); + break; + case 'subtipo': + $pt = model(ProyectoTipoUnidad::class)->findOne($precio->pt); + $pt->setPreciosSubtipo($precios->id, $fecha, $precio->valor); + break; + case 'unidad': + $unidad = model(Unidad::class)->findOne($precio->id); + $unidad->setPrecio($fecha, $precio->valor); + break; + } + } catch(\Exception $e) { + continue; + } + } + header('Location: ' . nUrl('precios', 'list', ['proyecto' => $proyecto])); + } + protected static function reemplazar(int $unidad_id, float $valor, \DateTime $fecha, int $tr = 0, int $tv = 0) + { + if ($tr == 0) { + $tr = model(TipoEstadoPrecio::class)->where('descripcion', 'reemplazado')->findOne()->id; + } + if ($tv == 0) { + $tv = model(TipoEstadoPrecio::class)->where('descripcion', 'vigente')->findOne()->id; + } + $olds = \model(Precio::class)->where('unidad', $unidad_id)->findMany(); + if ($olds !== false) { + foreach ($olds as $old) { + if (!$old->vigente()) { + continue; + } + $data = [ + 'precio' => $old->id, + 'fecha' => $fecha->format('Y-m-d'), + 'estado' => $tr + ]; + $estado = \model(EstadoPrecio::class)->create($data); + $estado->save(); + } + } + $data = [ + 'unidad' => $unidad_id, + 'valor' => $valor + ]; + $precio = (new Factory(Precio::class))->where($data)->find(); + if (!$precio) { + $precio = \model(Precio::class)->create($data); + $precio->save(); + } + $data = [ + 'precio' => $precio->id, + 'fecha' => $fecha->format('Y-m-d'), + 'estado' => $tv + ]; + $estado = \model(EstadoPrecio::class)->create($data); + $estado->save(); + } +} diff --git a/resources/less/Controller/Propietarios.php b/app_old/app/Controller/Propietarios.php similarity index 100% rename from resources/less/Controller/Propietarios.php rename to app_old/app/Controller/Propietarios.php diff --git a/resources/less/Controller/ProyectoTipoUnidades.php b/app_old/app/Controller/ProyectoTipoUnidades.php similarity index 100% rename from resources/less/Controller/ProyectoTipoUnidades.php rename to app_old/app/Controller/ProyectoTipoUnidades.php diff --git a/app_old/app/Controller/Proyectos.php b/app_old/app/Controller/Proyectos.php new file mode 100644 index 0000000..9c69ad5 --- /dev/null +++ b/app_old/app/Controller/Proyectos.php @@ -0,0 +1,327 @@ +where('inmobiliaria', $id_inmobiliaria); + } else { + $proyectos = model(Proyecto::class); + } + $proyectos = $proyectos->order_by_asc('descripcion')->findMany(); + return view('proyectos.list', compact('proyectos')); + } + public static function show() + { + $id_proyecto = get('proyecto'); + if ($id_proyecto == null) { + header('Location: ' . url('', ['p' => 'proyectos', 'a' => 'list'])); + } + $proyecto = model(Proyecto::class)->findOne($id_proyecto); + $estados = model(TipoEstadoProyecto::class)->findMany(); + foreach ($estados as &$estado) { + $estado = $estado->asArray()['orden'] + 1; + } + $colors = []; + + $ventas_pt = (object) ['fields' => [], 'data' => [], 'totales' => [], 'vendidas' => []]; + $ventas = $proyecto->ventas('fecha'); + $months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']; + if (count($ventas) > 0) { + $inicio = $ventas[0]->fecha()->format('Y'); + $fin = $ventas[count($ventas) - 1]->fecha()->format('Y'); + $end = $ventas[count($ventas) - 1]->fecha()->format('M'); + for ($y = $inicio; $y <= $fin; $y ++) { + foreach ($months as $month) { + $ventas_pt->fields []= $y . ' ' . $month; + if ($y == $fin and $month == $end) { + break; + } + } + } + } + + foreach ($proyecto->tipologias() as $tipo) { + if (!isset($ventas_pt->data[$tipo->tipologia->descripcion])) { + $ventas_pt->data[$tipo->tipologia->descripcion] = []; + $ventas_pt->data[$tipo->tipologia->descripcion] = array_fill(0, count($ventas_pt->fields), 0); + $ventas_pt->totales[$tipo->tipologia->descripcion] = 0; + $ventas_pt->vendidas[$tipo->tipologia->descripcion] = 0; + } + foreach ($tipo->tipos as $pt) { + foreach ($pt->ventas('fecha') as $venta) { + $ventas_pt->data[$tipo->tipologia->descripcion][array_search($venta->fecha()->format('Y M'), $ventas_pt->fields)] ++; + $ventas_pt->vendidas[$tipo->tipologia->descripcion] ++; + } + $ventas_pt->totales[$tipo->tipologia->descripcion] += count($pt->unidades()); + } + } + foreach ($ventas_pt->data as $tipo => $data) { + $acum = 0; + foreach ($data as $i => $cantidad) { + $acum += $cantidad; + $ventas_pt->data[$tipo][$i] = round($acum / $ventas_pt->totales[$tipo] * 100, 2); + } + } + $meses = ['Ene', 'Feb', 'Mar', 'Abr', 'May', 'Jun', 'Jul', 'Ago', 'Sep', 'Oct', 'Nov', 'Dic']; + array_walk($ventas_pt->fields, function(&$item) use ($meses, $months) { + $item = str_replace($months, $meses, $item); + }); + + for ($i = 0; $i < 10; $i ++) { + $colors[$i] = 'rgb(' . mt_rand(0, 255) . ', ' . mt_rand(0, 255) . ', ' . mt_rand(0, 255) . ')'; + } + return view('proyectos.show', compact('proyecto', 'estados', 'colors', 'ventas_pt')); + } + public static function historial() + { + $proyecto = model(Proyecto::class)->findOne(get('proyecto')); + return view('proyectos.historia', compact('proyecto')); + } + public static function advance() + { + $id_proyecto = get('proyecto'); + $proyecto = model(Proyecto::class)->findOne($id_proyecto); + $estados = model(TipoEstadoProyecto::class)->whereGt('orden', $proyecto->estado()->tipo()->orden)->orderByAsc('orden')->findMany(); + + return view('proyectos.advance', compact('proyecto', 'estados')); + } + public static function avanzar() + { + $id_proyecto = get('proyecto'); + $proyecto = model(Proyecto::class)->findOne($id_proyecto); + $id_tipo = post('estado'); + $tipo = model(TipoEstadoProyecto::class)->findOne($id_tipo); + $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); + + $tipos = model(TipoEstadoProyecto::class) + ->whereGt('orden', $proyecto->estado()->tipo()->orden) + ->whereLte('orden', $tipo->orden) + ->orderByAsc('orden') + ->findMany(); + + foreach ($tipos as $t) { + $estado = model(EstadoProyecto::class)->create(); + $estado->proyecto = $proyecto->id; + $estado->estado = $t->id; + $estado->fecha = $f->format('Y-m-d'); + $estado->save(); + } + header('Location: ' . url('', ['p' => 'proyectos', 'a' => 'show', 'proyecto' => $proyecto->id])); + } + public static function avance() + { + $id = get('proyecto'); + $proyecto = model(Proyecto::class)->findOne($id); + $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); + $av = post('avance') / 100; + $ep = (double) post('estado_pago'); + $avance = model(AvanceConstruccion::class) + ->where('proyecto', $proyecto->id) + ->where('fecha', $f->format('Y-m-d')) + ->findOne(); + if (!$avance) { + $data = [ + 'proyecto' => $proyecto->id, + 'fecha' => $f->format('Y-m-d'), + 'numero' => post('numero'), + 'avance' => $av, + 'estado_pago' => $ep + ]; + $avance = model(AvanceConstruccion::class)->create($data); + } + $avance->save(); + header('Location: ' . url('', ['p' => 'proyectos', 'a' => 'historial', 'proyecto' => $proyecto->id])); + } + public static function add() + { + $rut = get('inmobiliaria'); + + $inmobiliarias = model(Inmobiliaria::class)->orderByAsc('abreviacion')->findMany(); + $regiones = model(Region::class)->orderByAsc('numeracion')->findMany(); + + return view('proyectos.add', compact('inmobiliarias', 'rut', 'regiones')); + } + public static function agregar() + { + $proyecto = model(Proyecto::class)->where('descripcion', post('descripcion'))->where('inmobiliaria', post('inmobiliaria'))->find_one(); + if ($proyecto) { + header('Location: ' . url('', ['p' => 'proyectos', 'a' => 'show', 'proyecto' => $proyecto->id])); + die(); + } + $proyecto = model(Proyecto::class)->create(); + $proyecto->descripcion = post('descripcion'); + $proyecto->inmobiliaria = post('inmobiliaria'); + + $direccion = model(Direccion::class) + ->where('calle', post('calle')) + ->where('numero', post('numero')) + ->where('extra', post('extra')) + ->where('comuna', post('comuna')) + ->findOne(); + if (!$direccion) { + $direccion = model(Direccion::class)->create(); + $direccion->calle = post('calle'); + $direccion->numero = post('numero'); + $direccion->extra = post('extra'); + $direccion->comuna = post('comuna'); + $direccion->save(); + } + + $proyecto->direccion = $direccion->id; + $proyecto->save(); + + $fecha = Carbon::parse(post('year'), post('month'), post('day'), config('app.timezone')); + $estado = model(EstadoProyecto::class)->create(); + $estado->proyecto = $proyecto->id; + $estado->estado = 1; + $estado->fecha = $fecha->format('Y-m-d'); + $estado->save(); + header('Location: ' . url('', ['p' => 'proyectos', 'a' => 'show', 'proyecto' => $proyecto->id])); + } + public static function disponibles() + { + $id = get('proyecto'); + $proyecto = model(Proyecto::class)->findOne($id); + + return view('proyectos.disponibles', compact('proyecto')); + } + public static function list_unidades() + { + $id = get('proyecto'); + $proyecto = model(Proyecto::class)->findOne($id); + $libres = model(Unidad::class)->where('proyecto', $proyecto->id)->where('pt', 0)->findMany(); + + return view('proyectos.unidades.list', compact('proyecto', 'libres')); + } + public static function add_tipo_unidad() + { + $id = get('proyecto'); + $proyecto = model(Proyecto::class)->findOne($id); + $tipos = model(TipoUnidad::class)->findMany(); + + return view('proyectos.tipo_unidades.add', compact('proyecto', 'tipos')); + } + public static function agregar_tipo_unidad() + { + $id = get('proyecto'); + $proyecto = model(Proyecto::class)->findOne($id); + $data = post(); + $data['proyecto'] = $proyecto->id; + $tipo = model(ProyectoTipoUnidad::class)->where('proyecto', $data['proyecto']) + ->where('tipo', $data['tipo'])->where('nombre', $data['nombre'])->findOne(); + if ($tipo === false) { + $tipo = model(ProyectoTipoUnidad::class)->create($data); + $tipo->save(); + } + header('Location: ' . nUrl('proyectos', 'list_unidades', ['proyecto' => $proyecto->id])); + } + public static function construccion() + { + $id = get('proyecto'); + $proyecto = model(Proyecto::class)->findOne($id); + return view('proyectos.construccion', compact('proyecto')); + } + public static function editar_avance() + { + $avance = model(AvanceConstruccion::class)->findOne(get('avance')); + return view('proyectos.avances.edit', compact('avance')); + } + public static function edit_avance() + { + $avance = model(AvanceConstruccion::class)->findOne(get('avance')); + $cols = [ + 'day', + 'month', + 'year', + 'avance', + 'estado_pago', + 'pagado', + 'day_pago', + 'month_pago', + 'year_pago' + ]; + $data = array_filter(post(), function($key) use ($cols) { + return (array_search($key, $cols) !== false); + }, \ARRAY_FILTER_USE_KEY); + $data['fecha'] = implode('-', [$data['year'], $data['month'], $data['day']]); + unset($data['year']); + unset($data['month']); + unset($data['day']); + $data['fecha_pagado'] = implode('-', [$data['year_pago'], $data['month_pago'], $data['day_pago']]); + unset($data['year_pago']); + unset($data['month_pago']); + unset($data['day_pago']); + $data['avance'] /= 100; + $avance->edit($data); + + header('Location: ' . nUrl('proyectos', 'construccion', ['proyecto' => $avance->proyecto])); + } + public static function reservas() + { + $proyecto = model(Proyecto::class)->findOne(get('proyecto')); + $pisos = []; + $totales = []; + foreach ($proyecto->unidades('departamento') as $unidad) { + if (!isset($pisos[$unidad->piso - 1])) { + $piso = (object) ['descripcion' => $unidad->piso, 'unidades' => []]; + $pisos[$unidad->piso - 1] = $piso; + } + if (!isset($totales[$unidad->linea()])) { + $totales[$unidad->linea()] = (object) ['ventas' => 0, 'reservas' => 0]; + } + $pisos[$unidad->piso - 1]->unidades[$unidad->linea()] = $unidad; + if ($unidad->isVendida()) { + $totales[$unidad->linea()]->ventas ++; + } + if ($unidad->isReservada()) { + $totales[$unidad->linea()]->reservas ++; + } + } + ksort($pisos); + $max_unidades = 0; + foreach ($pisos as $piso) { + if (count($piso->unidades) > $max_unidades) { + $max_unidades = count($piso->unidades); + } + } + return view('proyectos.reservas.base', compact('proyecto', 'pisos', 'max_unidades', 'totales')); + } + public static function unidades() + { + if (get('proyecto')) { + $proyecto = model(Proyecto::class)->findOne(get('proyecto')); + $libres = model(Unidad::class)->where('proyecto', $proyecto->id)->where('pt', 0)->findMany(); + + return view('proyectos.unidades.list', compact('proyecto', 'libres')); + } + $proyectos = model(Proyecto::class)->order_by_asc('descripcion')->findMany(); + return view('proyectos.unidades.proyectos', compact('proyectos')); + } +} +?> diff --git a/resources/less/Controller/Reajustes.php b/app_old/app/Controller/Reajustes.php similarity index 100% rename from resources/less/Controller/Reajustes.php rename to app_old/app/Controller/Reajustes.php diff --git a/resources/less/Controller/Registros.php b/app_old/app/Controller/Registros.php similarity index 100% rename from resources/less/Controller/Registros.php rename to app_old/app/Controller/Registros.php diff --git a/resources/less/Controller/Subsidios.php b/app_old/app/Controller/Subsidios.php similarity index 100% rename from resources/less/Controller/Subsidios.php rename to app_old/app/Controller/Subsidios.php diff --git a/resources/less/Controller/Temas.php b/app_old/app/Controller/Temas.php similarity index 100% rename from resources/less/Controller/Temas.php rename to app_old/app/Controller/Temas.php diff --git a/resources/less/Controller/Unidades.php b/app_old/app/Controller/Unidades.php similarity index 100% rename from resources/less/Controller/Unidades.php rename to app_old/app/Controller/Unidades.php diff --git a/resources/less/Controller/UnidadesBloqueadas.php b/app_old/app/Controller/UnidadesBloqueadas.php similarity index 100% rename from resources/less/Controller/UnidadesBloqueadas.php rename to app_old/app/Controller/UnidadesBloqueadas.php diff --git a/app_old/app/Controller/Ventas.php b/app_old/app/Controller/Ventas.php new file mode 100644 index 0000000..31f1e61 --- /dev/null +++ b/app_old/app/Controller/Ventas.php @@ -0,0 +1,605 @@ +findOne($proyecto); + $ventas = $proyecto->ventas(); + self::sort($ventas); + return view('ventas.list', compact('proyecto', 'ventas')); + } + protected static function sort(&$ventas) + { + $sort = get('sort'); + if ($sort == null) { + $sort = 'departamento'; + } + $direction = get('sort_dir'); + if ($direction == null) { + $direction = 1; + } + switch ($sort) { + case 'departamento': + usort($ventas, function($a, $b) use ($direction) { + return ($a->propiedad()->unidad()->descripcion - $b->propiedad()->unidad()->descripcion) * $direction; + }); + break; + case 'propietario': + usort($ventas, function($a, $b) use ($direction) { + $pa = trim($a->propietario()->nombreCompleto(true), ', '); + $pb = trim($b->propietario()->nombreCompleto(true), ', '); + return $direction * strcasecmp($pa, $pb); + }); + break; + case 'valor_uf': + usort($ventas, function($a, $b) use ($direction) { + return $direction * ($a->valor_uf - $b->valor_uf); + }); + break; + case 'uf_m2': + usort($ventas, function($a, $b) use ($direction) { + return $direction * ($a->uf_m2() - $b->uf_m2()); + }); + break; + case 'fecha_venta': + usort($ventas, function($a, $b) use ($direction) { + return ($a->fecha()->timestamp - $b->fecha()->timestamp) * $direction; + }); + break; + } + if ($direction == 'desc') { + $ventas = array_reverse($ventas); + } + } + public static function listProyectos() + { + $proyectos = model(Proyecto::class) + ->select('proyecto.*') + ->join('estado_proyecto', ['estado.proyecto', '=', 'proyecto.id'], 'estado') + ->join('tipo_estado_proyecto', ['tipo.id', '=', 'estado.estado'], 'tipo') + ->join('etapa_proyecto', ['etapa.id', '=', 'tipo.etapa'], 'etapa') + ->whereGte('etapa.orden', 4) + ->orderByAsc('proyecto.descripcion') + ->groupBy('proyecto.id') + ->findMany(); + echo view('ventas.proyectos', compact('proyectos')); + } + public static function show() + { + $id = get('venta'); + $venta = model(Venta::class)->findOne($id); + + return view('ventas.show', compact('venta')); + } + public static function new() + { + $proyectos = model(Proyecto::class) + ->select('proyecto.*') + ->join('estado_proyecto', ['estado.proyecto', '=', 'proyecto.id'], 'estado') + ->join('tipo_estado_proyecto', ['tipo.id', '=', 'estado.estado'], 'tipo') + ->join('etapa_proyecto', ['etapa.id', '=', 'tipo.etapa'], 'etapa') + ->whereGte('etapa.orden', 3) + ->orderByAsc('proyecto.descripcion') + ->groupBy('proyecto.id') + ->findMany(); + $regiones = model(Region::class)->order_by_asc('numeracion')->findMany(); + return view('ventas.add', compact('proyectos', 'regiones')); + } + public static function agregar() + { + error_log(var_export(post(), true)); + $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); + $t = Carbon::today(config('app.timezone')); + $uf = uf($f); + error_log(var_export($uf, true)); + + $calle = trim(post('calle')); + $numero = post('numero'); + $extra = trim(post('extra')); + $comuna = post('comuna'); + $direccion = model(Direccion::class) + ->where('calle', $calle) + ->where('numero', $numero) + ->where('extra', $extra) + ->where('comuna', $comuna) + ->findOne(); + if (!$direccion) { + $direccion = model(Direccion::class)->create(); + $direccion->calle = $calle; + $direccion->numero = $numero; + $direccion->extra = $extra; + $direccion->comuna = $comuna; + $direccion->save(); + } + + list($rut, $dv) = explode('-', str_replace('.', '', post('rut'))); + $propietario = model(Propietario::class)->where('rut', $rut)->findOne(); + if (!$propietario) { + $propietario = model(Propietario::class)->create(); + $propietario->rut = $rut; + $propietario->dv = $dv; + $propietario->nombres = trim(post('nombres')); + $propietario->apellido_paterno = trim(post('paterno')); + $propietario->apellido_materno = trim(post('materno')); + $propietario->direccion = $direccion->id; + if (post('otro') != null) { + $propietario->otro = 1; + } + + $propietario->save(); + } + + $unis = json_decode(post('unidades')); + $id_principal = array_shift($unis); + $principal = model(Unidad::class)->findOne(post('unidad' . $id_principal)); + // Revisar si existe la propiedad y si está vigente. + $propiedad = model(Propiedad::class)->create(); + $propiedad->unidad_principal = $principal->id; + $propiedad->save(); + $data = [ + 'propiedad' => $propiedad->id, + 'unidad' => $principal->id, + 'principal' => 1 + ]; + $pu = model(PropiedadUnidad::class)->create($data); + $pu->save(); + foreach ($unis as $id_unidad) { + $data = [ + 'propiedad' => $propiedad->id, + 'unidad' => post('unidad' . $id_unidad), + 'principal' => 0 + ]; + $pu = model(PropiedadUnidad::class)->create($data); + $pu->save(); + } + + $venta = model(Venta::class)->create(); + $venta->propietario = $propietario->rut; + $venta->propiedad = $propiedad->id; + if (post('pie')) { + $pie = model(Pie::class)->create(); + $pie->valor = post('pie'); + $pie->fecha = $f->format('Y-m-d'); + $pie->cuotas = post('cuotas'); + if ($uf->total > 0) { + $pie->uf = $uf->uf->value; + } + $pie->save(); + + $venta->pie = $pie->id; + } + if (post('bono_pie')) { + $bono = model(BonoPie::class)->create(); + $bono->valor = post('bono_pie'); + + $pago = model(Pago::class)->create(); + $pago->fecha = $f->format('Y-m-d'); + if ($uf->total > 0) { + $pago->uf = $uf->uf->value; + } + $pago->valor = $bono->valor * $uf->uf->value; + $pago->tipo = 8; + $pago->new(); + + $bono->pago = $pago->id; + $bono->save(); + + $venta->bono_pie = $bono->id; + } + if (post('credito')) { + $pago = model(Pago::class)->create(); + $pago->fecha = $f->format('Y-m-d'); + if ($uf->total > 0) { + $pago->uf = $uf->uf->value; + } + $pago->valor = post('credito') * $uf->uf->value; + $pago->tipo = 2; + $pago->new(); + + $credito = model(Credito::class)->create(); + $credito->pago = $pago->id; + $credito->save(); + + $venta->credito = $credito->id; + } + + $venta->fecha = $f->format('Y-m-d'); + $venta->valor_uf = str_replace(',', '.', post('valor')); + $venta->fecha_ingreso = $t->format('Y-m-d'); + if (post('operador') != 0) { + $venta->agente = post('operador'); + } + if ($uf->total > 0) { + $venta->uf = $uf->uf->value; + } + $venta->new(); + + if (post('promociones') != 0) { + $promos = json_decode(post('promociones')); + foreach ($promos as $id_promo) { + $promocion = model(Promocion::class)->findOne(post('promocion' . $id_promo)); + $promo = model(PromocionVenta::class)->create(); + $promo->promocion = $promocion->id; + $promo->venta = $venta->id; + $promo->valor = post('promo' . $id_promo); + $promo->save(); + } + } + header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); + } + public static function edit() + { + $id = get('venta'); + $venta = model(Venta::class)->findOne($id); + $proyectos = model(Proyecto::class)->order_by_asc('descripcion')->findMany(); + $regiones = model(Region::class)->order_by_asc('numeracion')->findMany(); + return view('ventas.edit', compact('venta', 'proyectos', 'regiones')); + } + public static function editar() + { + $id = get('venta'); + $venta = model(Venta::class)->findOne($id); + + $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); + $uf = uf($f); + + $valor = correctNumber(post('valor')); + $change = false; + if ($venta->fecha != $f->format('Y-m-d')) { + $venta->fecha = $f->format('Y-m-d'); + $venta->uf = $uf->uf->value; + $change = true; + } + if ($venta->valor_uf != $valor) { + $venta->valor_uf = $valor; + $change = true; + } + if ($change) { + $venta->save(); + } + + $direccion = $venta->propietario()->direccion(); + $calle = post('calle'); + $numero = post('numero'); + $extra = post('extra'); + $comuna = post('comuna'); + $change = false; + if ($direccion->calle != $calle) { + $direccion->calle = $calle; + $change = true; + } + if ($direccion->numero != $numero) { + $direccion->numero = $numero; + $change = true; + } + if ($direccion->extra != $extra) { + $direccion->extra = $extra; + $change = true; + } + if ($direccion->comuna != $comuna) { + $direccion->comuna = $comuna; + $change = true; + } + if ($change) { + $direccion->save(); + } + + $propietario = $venta->propietario(); + list($rut, $dv) = explode('-', str_replace('.', '', post('rut'))); + $nombres = post('nombres'); + $paterno = post('paterno'); + $materno = post('materno'); + $change = false; + if ($propietario->rut != $rut) { + $propietario->rut = $rut; + $propietario->dv = $dv; + $venta->propietario = $rut; + $venta->save(); + $change = true; + } + if ($propietario->nombres != $nombres) { + $propietario->nombres = $nombres; + $change = true; + } + if ($propietario->apellido_paterno != $paterno) { + $propietario->apellido_paterno = $paterno; + $change = true; + } + if ($propietario->apellido_materno != $materno) { + $propietario->apellido_materno = $materno; + $change = true; + } + if ($change) { + $propietario->save(); + } + + $unidades = json_decode(post('unidades')); + if (count($unidades) > 0) { + $propiedad = $venta->propiedad(); + $ests = explode(';', $propiedad->estacionamientos); + $bods = explode(';', $propiedad->bodegas); + $change = false; + foreach ($unidades as $n) { + $id = post('unidad' . $n); + $unidad = model(Unidad::class)->findOne($id); + if ($unidad->tipo == 1 and $propiedad->unidad_principal != $unidad->id) { + $propiedad->unidad_principal = $unidad->id; + $change = true; + } + if ($unidad->tipo == 2 and array_search($unidad->id, $ests) === false) { + $ests []= $unidad->id; + } + if ($unidad->tipo == 3 and array_search($unidad->id, $bods) === false) { + $bods []= $unidad->id; + } + } + $ests = implode(';', $ests); + $bods = implode(';', $bods); + if ($propiedad->estacionamientos != $ests) { + $propiedad->estacionamientos = $ests; + $change = true; + } + if ($propiedad->bodegas != $bods) { + $propiedad->bodegas = $bods; + $change = true; + } + if ($change) { + $propiedad->save(); + } + } + + if (post('pie')) { + $pie = $venta->pie(); + $valor = correctNumber(post('pie')); + $cuotas = post('cuotas'); + $change = false; + if ($pie->valor != $valor) { + $pie->valor = $valor; + $change = true; + } + if ($pie->cuotas != $cuotas) { + $pie->cuotas = $cuotas; + $change = true; + } + if ($change) { + $pie->save(); + } + } + + $credito = $venta->credito(); + $valor = post('credito'); + header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); + } + public static function desistir() + { + $id = get('venta'); + $venta = model(Venta::class)->findOne($id); + + return view('ventas.desist', compact('venta')); + } + public static function desistiendo() + { + $id = get('venta'); + $venta = model(Venta::class)->findOne($id); + + $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); + $valor = correctNumber(post('pago')); + $uf = uf($f); + + $venta->estado = 0; + $tipo = model(TipoEstadoVenta::class)->where('descripcion', 'desistida')->findOne(); + $data = [ + 'venta' => $venta->id, + 'estado' => $tipo->id, + 'fecha' => $f->format('Y-m-d') + ]; + $estado = model(EstadoVenta::class)->create($data); + $propiedad = $venta->propiedad(); + $propiedad->estado = 0; + $pago = model(Pago::class)->create(); + $pago->fecha = $f->format('Y-m-d'); + $pago->valor = (double) $valor; + $pago->uf = $uf->uf->value; + $pago->tipo = 1; + + $pago->new(); + $propiedad->save(); + $estado->save(); + $venta->resciliacion = $pago->id; + $venta->save(); + header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); + } + public static function ceder() + { + $id = get('venta'); + $venta = model(Venta::class)->findOne($id); + + return view('ventas.ceder', compact('venta')); + } + public static function cediendo() + { + $id = get('venta'); + $venta = model(Venta::class)->findOne($id); + $nueva_venta = model(Venta::class)->create(); + + $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); + + list($rut, $dv) = explode('-', str_replace('.', '', post('rut'))); + $propietario = model(Propietario::class)->where('rut', $rut)->findOne(); + if (!$propietario) { + $propietario = model(Propietario::class)->create(); + $propietario->rut = $rut; + $propietario->dv = $dv; + $propietario->nombres = trim(post('nombres')); + $propietario->apellido_paterno = trim(post('paterno')); + $propietario->apellido_materno = trim(post('materno')); + $propietario->direccion = $direccion->id; + if (post('otro') != null) { + $propietario->otro = 1; + } + + $propietario->save(); + } + + $nueva_venta->fecha_ingreso = $f->format(); + $nueva_venta->estado = 1; + $cols = [ + 'propiedad', + 'pie', + 'bono_pie', + 'credito', + 'escritura', + 'subsidio', + 'fecha', + 'valor_uf', + 'agente', + 'uf' + ]; + foreach ($cols as $col) { + $nueva_venta->{$col} = $venta->{$col}; + } + $nueva_venta->new(); + + $venta->estado = -1; + $tipo = model(TipoEstadoVenta::class)->where('descripcion', 'cedida')->findOne(); + $data = [ + 'venta' => $venta->id, + 'estado' => $tipo->id, + 'fecha' => $f->format('Y-m-d') + ]; + $estado = model(EstadoVenta::class)->create($data); + $estado->save(); + + $venta->save(); + header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); + } + public static function entregar() + { + $id = get('venta'); + $venta = model(Venta::class)->findOne($id); + + return view('ventas.entregar', compact('venta')); + } + public static function consolidacion() + { + if (get('proyecto')) { + $id_proyecto = get('proyecto'); + $proyecto = model(Proyecto::class)->findOne($id_proyecto); + + $ventas = $proyecto->ventas(); + set_time_limit(count($ventas)); + + $f = Carbon::today(config('app.timezone')); + setlocale(LC_TIME, 'es'); + + return view('ventas.consolidacion.show', compact('ventas', 'f')); + } else { + $proyectos = model(Proyecto::class)->order_by_asc('descripcion')->find_many(); + return view('ventas.consolidacion.proyectos', compact('proyectos')); + } + } + public static function devolucion() + { + $id = get('venta'); + $venta = model(Venta::class)->findOne($id); + $uf = uf(Carbon::now(config('app.config')))->uf->value; + $valor = round($venta->saldo() * $uf); + + return view('ventas.devolucion', compact('venta', 'valor', 'uf')); + } + public static function devolver() + { + $id = get('venta'); + $venta = model(Venta::class)->findOne($id); + + $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); + $uf = uf($f); + $valor = correctNumber(post('valor')); + + $data = [ + 'fecha' => $f->format('Y-m-d'), + 'valor' => $valor, + 'tipo' => 1, + 'uf' => $uf->uf->value, + 'identificador' => post('identificador'), + 'banco' => 0 + ]; + + $banco = model(Banco::class)->where('nombre', post('banco'))->findOne(); + if ($banco) { + $data['banco'] = $banco->id; + } + + $pago = model(Pago::class)->create($data); + $pago->newPagado(); + + $venta->devolucion = $pago->id; + $venta->save(); + header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); + } + public static function resciliaciones() + { + $resciliaciones = model(Venta::class)->where('estado', 0)->findMany(); + + return view('ventas.resciliaciones', compact('resciliaciones')); + } + public static function firmar() + { + $venta = \model(Venta::class)->findOne(get('venta')); + return view('ventas.firmar', compact('venta')); + } + public static function firmando() + { + $venta = \model(Venta::class)->findOne(get('venta')); + $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); + $venta->firmar($f); + header('Location: ' . nUrl('ventas', 'show', ['venta' => $venta->id])); + + } + public static function archivar() + { + $venta = \model(Venta::class)->findOne(get('venta')); + return view('ventas.archivar', compact('venta')); + } + public static function archivando() + { + $venta = \model(Venta::class)->findOne(get('venta')); + $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); + $venta->archivar($f); + header('Location: ' . nUrl('ventas', 'show', ['venta' => $venta->id])); + } +} +?> diff --git a/app_old/app/Definition/Controller.php b/app_old/app/Definition/Controller.php new file mode 100644 index 0000000..c0e3dae --- /dev/null +++ b/app_old/app/Definition/Controller.php @@ -0,0 +1,31 @@ +isPublic()) { + + return self::{$action}(); + } + } + if (self::$default == null and \method_exists(self::class, 'setDefault')) { + self::setDefault(); + } + if (self::$default == null) { + header('Location: .'); + return; + } + return self::$default; + } +} +?> \ No newline at end of file diff --git a/app_old/app/Definition/hasEstado.php b/app_old/app/Definition/hasEstado.php new file mode 100644 index 0000000..014fe8a --- /dev/null +++ b/app_old/app/Definition/hasEstado.php @@ -0,0 +1,38 @@ +getTable(); + $self = Stringy::create(get_class($this)); + $ns = $self->substr(0, $self->indexOfLast('\\')); + $self = $self->substr($self->indexOfLast('\\') + 1); + $column = $self->underscored(); + $class = $ns . '\\Estado' . $self; + if (substr($table, -1, 1) == 's') { + $column .= '_id'; + } + + return $this->has_many($class, $column)->findMany(); + } + public function estado() + { + $table = $this->getTable(); + $self = Stringy::create(get_class($this)); + $ns = $self->substr(0, $self->indexOfLast('\\')); + $self = $self->substr($self->indexOfLast('\\') + 1); + $column = $self->underscored(); + $class = $ns . '\\Estado' . $self; + if (substr($table, -1, 1) == 's') { + $column .= '_id'; + } + + $id = $this->has_many($class, $column)->max('id'); + return $this->has_many($class, $column)->findOne($id); + } +} +?> \ No newline at end of file diff --git a/app_old/app/Definition/hasRUT.php b/app_old/app/Definition/hasRUT.php new file mode 100644 index 0000000..8ba3d80 --- /dev/null +++ b/app_old/app/Definition/hasRUT.php @@ -0,0 +1,20 @@ +rut) . '-' . $this->dv; + } +} +?> \ No newline at end of file diff --git a/app_old/app/Exception/PropertyNotFound.php b/app_old/app/Exception/PropertyNotFound.php new file mode 100644 index 0000000..a35e537 --- /dev/null +++ b/app_old/app/Exception/PropertyNotFound.php @@ -0,0 +1,16 @@ +class = $class; + $this->property = $property; + $msg = "Property '" . $property . "' for class '" . $class . "' not found."; + parent::__construct($msg); + } +} \ No newline at end of file diff --git a/app_old/app/Helper/Color.php b/app_old/app/Helper/Color.php new file mode 100644 index 0000000..68c3199 --- /dev/null +++ b/app_old/app/Helper/Color.php @@ -0,0 +1,169 @@ +color = $args[0]; + break; + } + $this->color = $this->hex2dec($this->hex2array($args[0])); + break; + case 2: + if (is_array($args[0])) { + $this->color = $args[0]; + $this->color []= $args[1]; + break; + } + $color = $this->hex2array($args[0]); + $color []= $args[1]; + $this->color = $this->hex2dec($color); + break; + case 3: + case 4: + if (is_numeric($args[0])) { + $this->color = $args; + break; + } + $this->color = $this->hex2dec($args); + break; + } + } + protected function hex2dec(array $hex) + { + return array_map('hexdec', $hex); + } + protected function dec2hex(array $bin) + { + return array_map('dechex', $bin); + } + protected function hex2array(string $hex) + { + switch (strlen($hex)) { + case 3: + case 4: + case 6: + case 7: + return str_split($hex, 2); + default: + throw new OutOfBoundsException('The string ' . $hex . ' is not a correct color code.'); + } + } + protected function array2hex(array $arr) + { + return implode('', $arr); + } + + public function convertTo($type) + { + switch (strtolower($type)) { + case 'hex': + if (is_numeric($this->color[0])) { + $this->color = $this->dec2hex($this->color); + } + break; + case 'dec': + if (!is_numeric($this->color[0])) { + $this->color = $this->hex2dec($this->color); + } + break; + default: + throw new InvalidArgumentException($type . ' is not a valid argument.'); + } + } + public function add($base_color, $amount) + { + $changed = false; + if (!is_numeric($this->color)) { + $this->convertTo('dec'); + $changed = true; + } + switch (strtolower($base_color)) { + case 'r': + $base_color = 0; + break; + case 'g': + $base_color = 1; + break; + case 'b': + $base_color = 2; + break; + case 'a': + $base_color = 3; + break; + default: + throw new OutOfBoundsException("Base color '" . $base_color . "' does not exist."); + } + $this->color[$base_color] += $amount; + if ($changed) { + $this->convertTo('hex'); + } + } + public function print() + { + $this->convertTo('hex'); + return implode('', $this->color); + } + public function toRGB() + { + $changed = false; + $this->convertTo('dec'); + $str = 'rgb(' . implode(', ', array_map(function($a) { + return round($a, 2); + }, $this->color)) . ')'; + if ($changed) { + $this->convertTo('hex'); + } + return $str; + } + public function __toString() + { + return $this->print(); + } + public function toArray() + { + return $this->color; + } + public function toVector() + { + $changed = false; + $this->convertTo('dec'); + $arr = $this->toArray(); + if ($changed) { + $this->convertTo('hex'); + } + return $arr; + } + public function luminosity() + { + $changed = false; + $this->convertTo('dec'); + //sqrt( 0.299*R^2 + 0.587*G^2 + 0.114*B^2 ) + $str = sqrt(0.299 * pow($this->color[0], 2) + 0.587 * pow($this->color[1], 2) + 0.114 * pow($this->color[2], 2)) / 255 * 100; + if ($changed) { + $this->convertTo('hex'); + } + return $str; + } + public function isDark() + { + if ($this->luminosity() < 50) { + return true; + } + return false; + } + public function isBright() + { + if ($this->luminosity() > 75) { + return true; + } + return false; + } +} diff --git a/app_old/app/Helper/Line.php b/app_old/app/Helper/Line.php new file mode 100644 index 0000000..02cc0d9 --- /dev/null +++ b/app_old/app/Helper/Line.php @@ -0,0 +1,61 @@ +origin = $point_a; + $this->length = $this->distance($point_a, $point_b); + $this->direction = $this->gradient($point_a, $point_b); + } + public function origin() + { + return $this->origin; + } + public function length() + { + return $this->length; + } + public function direction() + { + return $this->direction; + } + /** + * Calculate the gradient to move from point a to point b + * @param array $point_a [Vector] + * @param array $point_b [Vector] + * @return array [Vector] + */ + public function gradient($point_a, $point_b) + { + $distance = $this->distance($point_a, $point_b); + return array_map(function($a, $b) use ($distance) { + return ($a - $b) / $distance; + }, $point_b, $point_a); + } + // sqrt((a0-b0)²+(a1-b1)²+(a2-b2)²) + public function distance($point_a, $point_b) + { + return sqrt(array_sum(array_map(function($a, $b) { + return pow($a - $b, 2); + }, $point_a, $point_b))); + } + /** + * Move from point in the direction of the gradient acording to step_size + * @param array $point [Vector] + * @param int $step_size [step size] + * @return array [Vector] + */ + public function move($point, $step_size) + { + $gradient = $this->direction; + return array_map(function($a, $b) use ($step_size) { + return $a + $b * $step_size; + }, $point, $gradient); + } +} diff --git a/app_old/app/Helper/functions.php b/app_old/app/Helper/functions.php new file mode 100644 index 0000000..1ba6021 --- /dev/null +++ b/app_old/app/Helper/functions.php @@ -0,0 +1,128 @@ + "http://{$remote->getIP()}:8080", + 'headers' => [ + 'Accept' => 'application/json' + ] + ])))->getUF($date); +} +function format($tipo, $valor, $format = null, $print = false) { + if ($valor === null) { + $valor = 0; + } + if (strtolower($tipo) == 'localdate') { + $d = \Carbon\Carbon::parse($valor); + $d->locale('es_ES'); + if ($format == null) { + $format = 'DD [de] MMMM [de] YYYY'; + } + return $d->isoFormat($format); + } + if (method_exists('\App\Helper\Format', $tipo)) { + if ($print) { + return \App\Helper\Format::$tipo($valor, $print); + } else { + return \App\Helper\Format::$tipo($valor); + } + } else { + switch ($tipo) { + case 'localDate': + if (isset($format)) { + $intl = new IntlDateFormatter('es_ES', IntlDateFormatter::SHORT, IntlDateFormatter::SHORT, 'America/Santiago'); + $intl->setPattern($format); + return ucwords($intl->format($valor)); + } + case 'percent': + return \App\Helper\Format::number($valor, 2); + case 'rut': + return \App\Helper\Format::number($valor, 0); + } + } +} +function model(string $class_name) { + return \Model::factory($class_name); +} +function correctNumber($number) { + if (strpos($number, ',') !== false) { + return str_replace(',', '.', str_replace('.', '', $number)); + } elseif (substr_count($number, '.') > 1) { + return str_replace('.', '', $number); + } + return $number; +} +function parseRanges($range, $numeric = true, $negatives = true) { + $rns = preg_split('/[,;]+/', $range); + $data = []; + foreach ($rns as $p) { + if (!$negatives) { + if (strpos($p, '-') !== false) { + list($ini, $end) = explode('-', $p); + $data = array_merge($data, range($ini, $end)); + continue; + } + } + if ($numeric) { + $data []= (float) $p; + continue; + } + $data []= $p; + } + return $data; +} +function nUrl($p, $a = null, $data = null) { + $query = ['p' => $p]; + if ($a != null) { + $query['a'] = $a; + if ($data != null) { + $query = array_merge($query, $data); + } + } + return url('', $query); +} +function api($p, $a, $data = null) { + $url = baseUrl() . '/' . 'api'; + $url .= '?' . 'p=' . $p . '&a=' . $a . '&API_KEY=1'; + if ($data != null) { + $url .= '&' . implode('&', array_map(function($val, $k) { + return $k . '=' . $val; + }, $data)); + } + return $url; +} +function doLog($user, $action, $variables) { + App\Service\Register::log($user, $action, $variables); +} +?> diff --git a/app_old/app/Middleware/Auth.php b/app_old/app/Middleware/Auth.php new file mode 100644 index 0000000..523c942 --- /dev/null +++ b/app_old/app/Middleware/Auth.php @@ -0,0 +1,38 @@ +skipRoutes($request) or $this->service->isIn()) { + return $handler->handle($request); + } + return $this->redirect('guest'); + } + + protected function skipRoutes(ServerRequestInterface $request): bool + { + $uri = $request->getUri(); + $route = $uri->getPath(); + $routes = [ + '/guest', + '/auth/login' + ]; + return in_array($route, $routes, true); + } + protected function redirect(string $route): ResponseInterface + { + $response = $this->responseFactory->createResponse(301, 'Not authorized'); + return $this->view->render($response, $route); + } +} diff --git a/app_old/app/Service/Auth.php b/app_old/app/Service/Auth.php new file mode 100644 index 0000000..7f021ac --- /dev/null +++ b/app_old/app/Service/Auth.php @@ -0,0 +1,165 @@ +getCookie(); + } + protected function getCookie() + { + if (isset($_COOKIE['rememberMe'])) { + list($s, $t) = \explode(':', $_COOKIE['rememberMe']); + $this->selector = $s; + $this->token = $t; + } + } + protected function saveCookie() + { + $now = \Carbon\Carbon::now(config('app.timezone')); + $exp = $now->addHours(config('app.login_hours')); + \setcookie('rememberMe', $this->selector . ':' . $this->token, $exp->timestamp); + } + protected function clearCookie() + { + \setcookie('rememberMe', '', \Carbon\Carbon::now(config('app.timezone'))->timestamp); + } + protected function generateToken() + { + $this->selector = bin2hex(\random_bytes(12)); + $this->token = bin2hex(\random_bytes(20)); + } + public function login($username, $password) + { + $user = \Model::factory(User::class)->where('name', $username)->where('enabled', 1)->findOne(); + if ($user !== false) { + if (\password_verify($password, $user->password) === false) { + $this->clearCookie(); + return false; + } + + $this->generateToken(); + $now = \Carbon\Carbon::now(config('app.timezone')); + $exp = $now->addHours(-config('app.login_hours')); + $auth = \Model::factory(\Incoviba\common\Auth::class)->where('user_id', $user->id)->whereGt('time', $exp->timestamp)->where('status', 1)->findOne(); + if ($auth !== false) { + $auth->time('now'); + $auth->selector = $this->selector; + $auth->token($this->token); + $auth->save(); + $this->saveCookie(); + return true; + } + + $auth = \Model::factory(\Incoviba\common\Auth::class)->create(); + $auth->user_id = $user->id; + $auth->time('now'); + $auth->selector = $this->selector; + $auth->token($this->token); + + try { + $auth->save(); + $this->saveCookie(); + return true; + } catch (\Exception $e) { + $this->clearCookie(); + return false; + } + } + return false; + } + public function isIn() + { + if ($this->selector == null) { + return false; + } + $auths = \Model::factory(\Incoviba\common\Auth::class)->where('selector', $this->selector)->findMany(); + if ($auths === false) { + $this->clearCookie(); + return false; + } + foreach ($auths as $auth) { + if (\password_verify($this->token, $auth->token)) { + return $auth->isIn(); + } + } + return false; + } + public function User() + { + if ($this->selector == null) { + return false; + } + $auths = \Model::factory(\Incoviba\common\Auth::class)->where('selector', $this->selector)->findMany(); + if ($auths === false) { + return false; + } + foreach ($auths as $auth) { + if (\password_verify($this->token, $auth->token)) { + return $auth->user(); + } + } + return false; + } + public function hasAccess() + { + if ($this->selector == null) { + return false; + } + $auths = \Model::factory(\Incoviba\common\Auth::class)->where('selector', $this->selector)->findMany(); + if ($auths === false) { + return false; + } + foreach ($auths as $auth) { + if (\password_verify($this->token, $auth->token)) { + return $auth->user()->hasAccess(); + } + } + return false; + } + public function checkAccess($controller, $action = null) + { + if ($this->selector == null) { + return false; + } + $auths = \Model::factory(\Incoviba\common\Auth::class)->where('selector', $this->selector)->findMany(); + if ($auths === false) { + return false; + } + foreach ($auths as $auth) { + if (\password_verify($this->token, $auth->token)) { + return $auth->user()->checkAccess($controller, $action); + } + } + return false; + } + public function logout() + { + $this->clearCookie(); + if ($this->selector == null) { + return true; + } + $auths = \Model::factory(\Incoviba\common\Auth::class)->where('selector', $this->selector)->findMany(); + if ($auths === false) { + return true; + } + foreach ($auths as $auth) { + if (\password_verify($this->token, $auth->token)) { + $auth->status = 0; + try { + $auth->save(); + return true; + } catch (\Exception $e) { + return false; + } + } + } + return true; + } +} diff --git a/app_old/app/Service/Borrador.php b/app_old/app/Service/Borrador.php new file mode 100644 index 0000000..4f4b3af --- /dev/null +++ b/app_old/app/Service/Borrador.php @@ -0,0 +1,118 @@ +cierre = $cierre; + $this->lineas = []; + } + protected function add(string $str, int $new_line = 0) + { + $this->lineas []= $str; + if ($new_line > 0) { + $this->newLine($new_line); + } + } + protected function newLine($n = 1) + { + for ($i = 0; $i < $n; $i ++) { + $this->lineas []= ''; + } + } + protected function load() + { + $this->word = IOFactory::load('borrador-' . $this->cierre->proyecto()->nombre . '.docx'); + } + protected function extract() + { + $this->load(); + $data = []; + foreach ($this->word->getSections() as $section) { + foreach ($section->getElements() as $element) { + $r = $this->elementGet($element); + $data []= $r; + } + } + if (count($data) > 0) { + $this->text = $data; + } + } + protected function elementGet($element) + { + if ($element instanceof TextBreak) { + return PHP_EOL; + } + if ($element instanceof TextRun) { + $data = []; + foreach ($element->getElements() as $e) { + $data []= $this->elementGet($e); + } + return implode('', $data); + } + if (!method_exists($element, 'getText')) { + d($element); + } + return $element->getText(); + } + protected function build() + { + if ($this->text == null) { + $this->extract(); + } + foreach ($this->text as $line) { + if ($line == PHP_EOL) { + $this->newLine(); + continue; + } + if (strpos($line, '[[') !== false) { + $replacer = new Replacer(); + $this->add($replacer->replace($line, $this->cierre)); + continue; + } + $this->add($line); + } + } + public function create() + { + $output = new PhpWord(); + + $output->getSettings()->setDecimalSymbol(','); + $output->getSettings()->setThemeFontLang(new Language(Language::ES_ES)); + + $section = $output->addSection(); + foreach ($this->lineas as $linea) { + if ($linea == '') { + $section->addTextBreak(); + continue; + } + $section->addText($linea); + } + + $output->getSettings()->setTrackRevisions(true); + + $writer = IOFactory::createWriter($output); + $filename = 'Borrador ' . $this->cierre->propietario()->nombreCompleto() . ' con ' . $this->cierre->proyecto()->inmobiliaria()->razon_social . '.docx'; + $writer->save($filename); + } + public function show() + { + $this->build(); + return implode(PHP_EOL, $this->lineas); + } +} +?> \ No newline at end of file diff --git a/app_old/app/Service/DBToModel.php b/app_old/app/Service/DBToModel.php new file mode 100644 index 0000000..158e85c --- /dev/null +++ b/app_old/app/Service/DBToModel.php @@ -0,0 +1,158 @@ +name = $name; + $this->db = \ORM::get_db($name); + } + + public function run() + { + $this->getTables(); + foreach ($this->tables as $table) { + if ($this->createClass($table)) { + echo 'ok
', PHP_EOL; + } + } + } + protected function getType($type) + { + if (strpos($type, '(') !== false) { + $type = substr($type, 0, strpos($type, '(')); + } + if (strpos($type, ' ') !== false) { + $type = substr($type, 0, strpos($type, ' ')); + } + switch ($type) { + case 'int': + case 'float': + case 'double': + case 'char': + return trim($type); + case 'date': + case 'datetime': + return trim(strtolower($type)); + case 'varchar': + case 'text': + case 'blob': + return 'string'; + case 'bigint': + case 'tinyint': + case 'enum': + return 'int'; + default: + d($type); + } + } + protected function getTables() + { + $q = "SHOW TABLES"; + $st = $this->db->query($q); + $results = $st->fetchAll(\PDO::FETCH_COLUMN); + $this->tables = []; + foreach ($results as $result) { + $this->tables []= $result; + } + } + protected function getColumns($table) + { + $q = "SHOW COLUMNS FROM `" . $table . "`"; + $st = $this->db->query($q); + $results = $st->fetchAll(\PDO::FETCH_OBJ); + return $results; + } + protected function phpDoc($columns) + { + $str = ['/**']; + $str []= ' *'; + foreach ($columns as $column) { + $str []= ' * @property ' . $this->getType($column->Type) . ' ' . $column->Field; + } + $str []= ' *'; + $str []= ' */'; + + return implode(PHP_EOL, $str); + } + protected function className($table) + { + $name = Stringy::create($table)->upperCamelize(); + return $name; + } + protected function createClass($table) + { + $class = '' . $this->className($table); + $columns = $this->getColumns($table); + $docs = $this->phpDoc($columns); + + $output = ['name}';"; + $output []= '}'; + $output []= '?>'; + + //d(implode(PHP_EOL, $output)); + + $filename = realpath(root() . '/src') . DIRECTORY_SEPARATOR . $class . '.php'; + return file_put_contents($filename, implode(PHP_EOL, $output)); + } + public function create($namespace, $table) + { + $class = '' . $this->className($table); + $columns = $this->getColumns($table); + $docs = $this->phpDoc($columns); + + $namespace = trim($namespace, '\\'); + + $output = ['name}';"; + $output []= '}'; + $output []= '?>'; + $output = implode(PHP_EOL, $output); + + $namespace = explode('\\', $namespace); + array_shift($namespace); + $namespace = implode('/', $namespace); + + $filename = realpath(root() . '/src/' . $namespace) . DIRECTORY_SEPARATOR . $class . '.php'; + + $result = [ + 'result' => false, + 'filename' => $filename, + 'output' => $output + ]; + if (!file_exists($filename)) { + $result['result'] = file_put_contents($filename, $output); + } else { + $result['result'] = true; + } + return json_encode($result); + } + public function list() + { + $this->getTables(); + $output = []; + foreach ($this->tables as $table) { + $output []= ['table' => $table, 'model' => '' . $this->className($table)]; + } + + return json_encode(['models' => $output]); + } +} +?> \ No newline at end of file diff --git a/app_old/app/Service/Factory.php b/app_old/app/Service/Factory.php new file mode 100644 index 0000000..ac7386a --- /dev/null +++ b/app_old/app/Service/Factory.php @@ -0,0 +1,204 @@ +class = $class; + $this->is_aggregator = true; + if (is_subclass_of($class, 'Model')) { + $this->is_aggregator = false; + } + } + public function new() + { + $class = $this->class; + if ($this->is_aggregator) { + return new $class(); + } + return model($class)->create(); + } + public function create($data) + { + $class = $this->class; + if ($this->is_aggregator) { + $obj = new $class(); + $obj->create($data); + return $obj; + } + return model($class)->create($data); + } + /** + * [column => value, column => [value, operator]] + * @var array + */ + protected $conditions; + public function where(array $data) + { + if ($this->conditions == null) { + $this->conditions = $data; + return $this; + } + $this->conditions = array_merge($this->conditions, $data); + return $this; + } + /** + * [column, column => order] + * @var array + */ + protected $order; + public function order(array $data) + { + if ($this->order == null) { + $this->order = $data; + return $this; + } + $this->order = array_merge($this->order, $data); + return $this; + } + protected $limit; + public function limit(array $data) + { + if (!isset($data['limit'])) { + $data['limit'] = $data[0]; + } + if (!isset($data['offset'])) { + $data['offset'] = 0; + if (isset($data[1])) { + $data['offset'] = $data[1]; + } + } + $this->limit = (object) ['limit' => $data['limit'], 'offset' => $data['offset']]; + return $this; + } + protected $many; + public function find($many = false) + { + $this->many = $many; + if ($this->is_aggregator) { + return $this->findAggregator(); + } + return $this->findModel(); + } + + protected function findModel() + { + $objs = model($this->class); + $objs = $this->parseLimit($this->parseOrder($this->parseConditions($objs))); + + if ($this->many) { + return $objs->findMany(); + } + return $objs->findOne(); + } + protected function parseConditions($orm) + { + if ($this->conditions == null) { + return $orm; + } + foreach ($this->conditions as $column => $value) { + if (is_array($value)) { + list($value, $op) = $value; + switch ($op) { + case '>': + case 'gt': + $orm = $orm->whereGt($column, $value); + break; + } + } else { + $orm = $orm->where($column, $value); + } + } + return $orm; + } + protected function parseOrder($orm) + { + if ($this->order == null) { + return $orm; + } + foreach ($this->order as $column => $order) { + if (is_numeric($column)) { + $column = $order; + $order = 'asc'; + } + switch (strtolower($order)) { + case 'asc': + default: + $orm = $orm->orderByAsc($column); + break; + case 'desc': + $orm = $orm->orderByDesc($column); + break; + case 'expr': + $orm = $orm->orderByExpr($column); + break; + } + } + return $orm; + } + protected function parseLimit($orm) + { + if ($this->limit == null) { + return $orm; + } + $orm = $orm->limit($this->limit->limit); + if (isset($this->limit->offset)) { + $orm = $orm->offset($this->limit->offset); + } + return $orm; + } + protected function findAggregator() + { + $model = $this->modelName($this->class); + $ids = $this->getIds($model); + $class = $this->class; + if (count($ids) == 0) { + return false; + } + if ($this->many) { + $objs = []; + foreach ($ids as $id) { + $objs []= new $class($id); + } + } else { + $objs = new $class($ids[0]); + } + return $objs; + } + protected function getIds($model) + { + $id = $this->getModelId($model); + $table = $this->getTable($model); + $st = \ORM::forTable($table)->select($id); + $st = $this->parseConditions($st); + $results = $st->findArray(); + $output = array_map(function($a) use($id) { + return $a[$id]; + }, $results); + return $output; + } + protected function modelName($class) + { + $arr = explode("\\", $class); + \array_push($arr, end($arr)); + return implode("\\", $arr); + } + protected function getModelId($model) + { + $table = $this->getTable($model); + $query = "SHOW KEYS FROM {$table} WHERE Key_name = 'PRIMARY'"; + $st = \ORM::getDb()->query($query); + $results = $st->fetchAll(\PDO::FETCH_OBJ); + return $results[0]->Column_name; + } + protected function getTable($model) + { + $arr = explode("\\", $model); + return Stringy::create(end($arr))->toLowerCase() . ''; + } +} diff --git a/app_old/app/Service/Informador.php b/app_old/app/Service/Informador.php new file mode 100644 index 0000000..c64db26 --- /dev/null +++ b/app_old/app/Service/Informador.php @@ -0,0 +1,463 @@ +title = $title; + } else { + $this->title = 'Informe'; + } + } + + public function addColumn(string $title, $col = '') + { + if ($col == '') { + if ($this->columns == null) { + $i = 0; + } else{ + $i = count($this->columns); + } + $col = $this->mapColumn($i); + } + + if (isset($this->columns[$col])) { + $columns = []; + foreach ($this->columns as $c => $data) { + if (ord($c) < ord($col)) { + $columns[$c] = $data; + } elseif (ord($c) == ord($col)) { + $columns[$col] = $title; + } else { + $columns[chr(ord($c) + 1)] = $data; + } + } + $this->columns = $columns; + } else { + $this->columns[$col] = $title; + } + } + public function mapColumn($n) + { + $letters = range('A', 'Z'); + $max = count($letters); + $r = $n / $max + 1; + $p = floor($r - 1) - 1; + $i = $n % $max; + if ($r >= 2) { + return $letters[$p] . $letters[$i]; + } + return $letters[$i]; + } + public function getColumn($col_title) + { + return array_search($col_title, $this->columns); + } + public function getColumnNumber($col) + { + $letters = range('A', 'Z'); + if (strlen($col) > 1) { + $ls = str_split($col); + $n = 0; + foreach ($ls as $i => $l) { + $n += array_search($l, $letters) + $i * count($letters) + 1; + } + return $n; + } + return array_search($col, $letters); + } + public function addColumns(array $columns) + { + foreach ($columns as $column) { + $this->addColumn($column); + } + } + public function addData(int $row, $data, $col = '') + { + if (!isset($this->data[$row])) { + $this->data[$row] = []; + } + if ($col == '') { + $i = count($this->data[$row]); + $col = $this->mapColumn($i); + } elseif (ctype_print($col)) { + $col = $this->getColumn($col); + } else { + $col = $this->mapColumn($col); + } + + if (isset($this->data[$row][$col])) { + $data_array = []; + foreach ($this->data[$row] as $c => $d) { + if (ord($c) < ord($col)) { + $data_array[$c] = $d; + } elseif (ord($c) == ord($col)) { + $data_array[$col] = $this->parseData($data); + } else { + $data_array[chr(ord($c) + 1)] = $d; + } + } + $this->data[$row] = $data_array; + } else { + $this->data[$row][$col] = $this->parseData($data); + } + } + protected function parseData($data) + { + if ($this->isDate($data)) { + // Date + return Date::PHPToExcel($data); + } + return $data; + } + protected function isDate($data) + { + try { + if (strpos($data, '-') === false) { + return false; + } + $fecha = explode('-', $data); + if (count($fecha) != 3) { + return false; + } + list($year, $month, $day) = $fecha; + if (strlen($year) == 4 and strlen($month) <= 2 and strlen($day) <= 2) { + return true; + } + if (ctype_digit($year) and ctype_digit($month) and ctype_digit($day)) { + $f = Carbon::parse($data, config('app.timezone')); + return true; + } + return false; + } catch(\Exception $e) { + return false; + } + return false; + } + public function addDataRow(int $row, array $data_array) + { + foreach ($data_array as $data) { + $this->addData($row, $data); + } + } + public function addDatas(array $data_matrix) + { + foreach ($data_matrix as $row => $data_array) { + $this->addDataRow($row, $data_array); + } + } + protected function findTitleColumn($title) + { + return array_search($title, $this->columns); + } + public function addFormat($format, $title = '') + { + $col = 'A'; + if ($title == '') { + $i = count($this->col_formats); + $col = $this->mapColumn($i); + } else { + $col = $this->findTitleColumn($title); + } + + if (isset($this->col_formats[$col])) { + $columns = []; + foreach ($this->col_formats as $c => $data) { + if (ord($c) < ord($col)) { + $columns[$c] = $data; + } elseif (ord($c) == ord($col)) { + $columns[$col] = $this->translateFormat($format); + } else { + $columns[chr(ord($c) + 1)] = $data; + } + } + $this->col_formats = $columns; + } else { + $this->col_formats[$col] = $this->translateFormat($format); + } + + uksort($this->col_formats, function($ak, $bk) { + return strcmp($ak, $bk); + }); + } + protected function translateFormat(array $format) + { + $translated = []; + foreach ($format as $category => $values) { + switch ($category) { + case 'numberFormat': + $data = $this->translateNumberFormat($values); + break; + case 'alignment': + $data = $this->translateAlignment($values); + break; + case 'font': + $data = $this->translateFont($values); + break; + case 'fill': + $data = $this->translateFill($values); + break; + case 'borders': + $data = $this->translateBorders($values); + break; + } + $translated[$category] = $data; + } + return $translated; + } + protected function translateNumberFormat(array $values) + { + $translated = []; + foreach ($values as $value) { + switch ($value) { + case 'short-date': + $translated['formatCode'] = 'dd-mm-yyyy'; + break; + case 'date': + $translated['formatCode'] = 'dd mmmm, yyyy'; + break; + case 'thousands': + $translated['formatCode'] = NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1; + break; + case 'pesos': + $translated['formatCode'] = '$ #.###'; + break; + default: + $translated['formatCode'] = $value; + } + } + return $translated; + } + protected function translateAlignment(array $values) + { + $translated = []; + foreach ($values as $type => $value) { + switch ($type) { + case 'horizontal': + switch ($value) { + case 'center': + $new = Alignment::HORIZONTAL_CENTER; + break; + } + break; + case 'vertical': + switch ($value) { + case 'middle': + case 'center': + $new = Alignment::VERTICAL_CENTER; + } + default: + $new = $value; + break; + } + $translated[$type] = $new; + } + return $translated; + } + protected function translateFont(array $values) + { + $translated = []; + foreach ($values as $type => $value) { + switch ($type) { + case 'color': + $new = $this->translateColor($value); + break; + default: + $new = $value; + break; + } + $translated[$type] = $new; + } + return $translated; + } + protected function translateFill(array $values) + { + $translated = []; + foreach ($values as $type => $value) { + switch ($type) { + case 'fillType': + switch ($value) { + case 'solid': + $new = Fill::FILL_SOLID; + break; + default: + $new = $value; + break; + } + break; + case 'color': + $new = $this->translateColor($value); + break; + default: + $new = $value; + break; + } + $translated[$type] = $new; + } + return $translated; + } + protected function translateBorders(array $values) + { + $translated = []; + foreach ($format as $category => $value) { + switch ($category) { + case 'allBorders': + case 'left': + case 'right': + case 'top': + case 'bottom': + case 'diagonal': + case 'vertical': + case 'horizontal': + $data = $this->translateBorder($value); + break; + default: + $data = $value; + } + $translated[$category] = $data; + } + return $translated; + } + protected function translateBorder(array $values) + { + $translated = []; + foreach ($values as $type => $value) { + switch ($type) { + case 'color': + $new = $this->translateColor($value); + break; + default: + $new = $value; + break; + } + $translated[$type] = $new; + } + return $translated; + } + protected function translateColor($color) + { + $color_definitions = [ + 'red' => 'ff0000', + 'light-red' => 'ffcccc', + 'dark-red' => 'a00000' + ]; + if (is_array($color)) { + $t = dechex(255 * $color['transparency'] / 100); + $c = $color_definitions[$color['color']]; + $hex = $t . $c; + return ['argb' => $hex]; + } + return ['rgb' => $color_definitions[$color]]; + } + public function addFormats(array $formats) + { + foreach ($formats as $title => $format) { + $this->addFormat($format, $title); + } + } + public function addTotal(string $col) + { + if (isset($this->columns[$col])) { + $sum = 0; + foreach ($this->data as $row => $data) { + $sum += $data[$col]; + } + $this->totals[$col] = $sum; + } + } + public function addAverage(string $col) + { + $this->addTotal($col); + $this->totals[$col] /= count($this->data); + } + + protected function fillData() + { + foreach ($this->data as $row => $data) { + $this->data[$row] = $this->fillAndSort($data); + } + if (count($this->totals) > 0) { + $this->totals = $this->fillAndSort($this->totals); + } + } + protected function fillAndSort(array $row) + { + foreach ($this->columns as $val) { + if (!isset($row[$val])) { + $row[$val] = ''; + } + } + function sortArrayByArray(Array $array, Array $orderArray) { + $ordered = array(); + foreach($orderArray as $key) { + if(array_key_exists($key, $array)) { + $ordered[$key] = $array[$key]; + unset($array[$key]); + } + } + return $ordered + $array; + } + $row = sortArrayByArray($row, $this->columns); + + return $row; + } + + public function informe() + { + $ea = new Spreadsheet(); + $ea->getProperties()->setCreator('Juan Pablo Vial B.'); + $ea->getProperties()->setTitle($this->title); + $ea->getProperties()->setCompany('Incoviba S.A.'); + + $ews = $ea->getActiveSheet(); + + $ews->fromArray(array($this->columns), '', 'A1'); + $ews->fromArray($this->data, '', 'A2'); + $end = 2; + if ($this->totals != null and count($this->totals) > 0) { + $ews->fromArray($this->totals, '', 'A' . count($data) + 2); + $end = 3; + } + + if ($this->col_formats != null and count($this->col_formats) > 0) { + foreach ($this->col_formats as $col => $format) { + $ews->getStyleByColumnAndRow($this->getColumnNumber($col), 2, $this->getColumnNumber($col), count($this->data) + $end)->applyFromArray($format); + } + } + + for ($col = 0; $col < count($this->columns); $col ++) { + $ews->getColumnDimensionByColumn($col)->setAutoSize(true); + } + + $ews->setAutoFilterByColumnAndRow(0, 1, count($this->columns) - 1, count($this->data)); + + $hoy = Carbon::now(config('app.timezone')); + $filename = str_replace('ñ', 'n', $this->title . ' - ' . $hoy->format('Y-m-d') . '.xlsx'); + + $writer = IOFactory::createWriter($ea, "Xlsx"); + + header("Content-Type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet; charset=utf-8"); + header('Content-Transfer-Encoding: binary'); + header('Content-Disposition: attachment; filename="' . $filename . '"'); + header('Cache-Control: max-age=0'); + + $writer->save('php://output'); + } +} +?> diff --git a/app_old/app/Service/Informe/Contabilidad/Resumen.php b/app_old/app/Service/Informe/Contabilidad/Resumen.php new file mode 100644 index 0000000..e20266a --- /dev/null +++ b/app_old/app/Service/Informe/Contabilidad/Resumen.php @@ -0,0 +1,190 @@ +separator = $separator; + } + + protected function getVentas($id_proyecto) + { + $proyecto = model(Proyecto::class)->findOne($id_proyecto); + $ventas = $proyecto->ventas(); + $output = []; + foreach ($ventas as $venta) { + $found = false; + foreach ($output as $v) { + if ($v->unidad()->descripcion == $venta->unidad()->descripcion) { + $found = true; + break; + } + } + if (!$found) { + $output []= $venta; + } + } + return $output; + } + protected function startOfYear(DateTimeInterface $up_to) + { + return new DateTimeImmutable((clone $up_to)->sub(new DateInterval('P1Y'))->format('31-12-Y')); + } + protected function defaultValueDate(DateTimeInterface $up_to, $glosa = '') + { + return (object) ['fecha' => $this->startOfYear($up_to), 'valor' => 0, 'glosa' => $glosa, 'estado' => '']; + } + protected function extractValueDate(Pago $pago, $glosa = '') + { + return (object) ['fecha' => $pago->fecha(), 'valor' => $pago->valor, 'glosa' => $glosa, 'estado' => $pago->estado()->tipo()->descripcion]; + } + protected function getAnticipos(Venta $venta, DateTimeInterface $up_to) + { + if ($venta->pie == 0) { + return [$this->defaultValueDate($up_to)]; + } + $cuotas = $venta->pie()->cuotas('fecha', $up_to); + $ly = $this->startOfYear($up_to); + $older = array_reduce($cuotas, function($sum, $item) use ($ly) { + if ($item->pago()->estado()->tipo()->active != 1 or strtolower($item->pago()->estado()->tipo()->descripcion) == 'no pagado') { + return $sum; + } + if ($item->pago()->fecha() >= $ly) { + return $sum; + } + return $sum + $item->pago()->valor; + }); + $current = array_filter($cuotas, function($item) use ($ly) { + return $item->pago()->fecha() >= $ly; + }); + foreach ($current as &$item) { + $item = $this->extractValueDate($item->pago(), "Cuota {$item->numero}"); + } + return array_merge([(object) ['fecha' => $ly, 'valor' => $older, 'glosa' => 'Anticipo acumulado', 'estado' => 'Pagado']], $current); + } + protected function getReajuste(Venta $venta, DateTimeInterface $up_to) + { + if ($venta->pie == 0 or $venta->pie()->reajuste == null) { + return $this->defaultValueDate($up_to, 'Reajuste'); + } + return $this->extractValueDate($venta->pie()->reajuste(), 'Reajuste'); + } + protected function getAbono(Venta $venta, DateTimeInterface $up_to) + { + if ($venta->escritura == 0) { + return $this->defaultValueDate($up_to, 'Abono'); + } + return $this->extractValueDate($venta->escritura()->pago(), 'Abono'); + } + protected function getBono(Venta $venta, DateTimeInterface $up_to) + { + if ($venta->bono_pie == 0) { + return $this->defaultValueDate($up_to, 'Bono Pie'); + } + return $this->extractValueDate($venta->bonoPie()->pago(), 'Bono Pie'); + } + protected function getCredito(Venta $venta, DateTimeInterface $up_to) + { + if ($venta->credito == 0) { + return $this->defaultValueDate($up_to, 'Credito'); + } + return $this->extractValueDate($venta->credito()->pago(), 'Credito'); + } + protected function getSubsidio(Venta $venta, DateTimeInterface $up_to) + { + if ($venta->subsidio == 0) { + return [$this->defaultValueDate($up_to, 'Ahorro'), $this->defaultValueDate($up_to, 'Subsidio')]; + } + return [$this->extractValueDate($venta->subsidio()->pago(), 'Ahorro'), $this->extractValueDate($venta->subsidio()->subsidio(), 'Subsidio')]; + } + protected function getResciliacion(Venta $venta, DateTimeInterface $up_to) + { + if ($venta->resciliacion == null) { + return $this->defaultValueDate($up_to, 'Resciliacion'); + } + return $this->extractValueDate($venta->resciliacion()->pago(), 'Resciliacion'); + } + protected function getPagos(Venta $venta, DateTimeInterface $up_to) + { + $pagos = []; + $pagos = array_merge($pagos, $this->getAnticipos($venta, $up_to)); + $pagos []= $this->getReajuste($venta, $up_to); + $pagos []= $this->getAbono($venta, $up_to); + $pagos []= $this->getBono($venta, $up_to); + $pagos []= $this->getCredito($venta, $up_to); + $pagos = array_merge($pagos, $this->getSubsidio($venta, $up_to)); + return array_filter($pagos, function($item) { + return $item->valor != 0; + }); + } + + protected function buildLine(Venta $venta, $pago) + { + if ($pago->valor > 0) { + return ['', $venta->unidad()->descripcion, $pago->fecha->format('d/m/Y'), $pago->glosa, '', $pago->valor, $pago->estado]; + } + return ['', $venta->unidad()->descripcion, $pago->fecha->format('d/m/Y'), $pago->glosa, -$pago->valor, '', $pago->estado]; + } + protected function buildLibro(Venta $venta, DateTimeInterface $up_to) + { + $pagos = $this->getPagos($venta, $up_to); + $output = [ + ['', "Cuenta: Anticipos Dpto {$venta->unidad()->descripcion}"], + ['', 'Fecha', 'Glosa', 'Haber', 'Debe', 'Estado'] + ]; + $debe = 0; + $haber = 0; + foreach ($pagos as $pago) { + $output []= $this->buildLine($venta, $pago); + if ($pago->valor > 0) { + $debe += $pago->valor; + } + else { + $haber -= $pago->valor; + } + } + $output []= ['', '', '', 'Total', $haber, $debe]; + return $output; + } + + public function build(int $id_proyecto, DateTimeInterface $up_to) + { + ini_set('max_execution_time', 60 * 60); + $ventas = $this->getVentas($id_proyecto); + + $output = ["Libro Mayor {$ventas[0]->proyecto()->descripcion}", '']; + foreach ($ventas as $venta) { + $output = array_merge($output, $this->buildLibro($venta, $up_to)); + } + + $filename = "Contabilidad - Resumen - {$ventas[0]->proyecto()->descripcion} - {$up_to->format('Y-m-d')}.xlsx"; + $informe = new Informe(); + $informe->createSpreadsheet() + ->addArray($output) + ->formatColumn('E') + ->formatColumn('F') + ->send($filename); + } +} diff --git a/app_old/app/Service/Informe/Informe.php b/app_old/app/Service/Informe/Informe.php new file mode 100644 index 0000000..8254a10 --- /dev/null +++ b/app_old/app/Service/Informe/Informe.php @@ -0,0 +1,55 @@ +spreadsheet = new Spreadsheet(); + return $this; + } + protected function formatArray(array $data) + { + $maxCols = 0; + foreach ($data as $row) { + if (!is_array($row)) { + continue; + } + if (count($row) > $maxCols) { + $maxCols = count($row); + } + } + foreach ($data as &$row) { + if (!is_array($row)) { + $row = [$row]; + } + if (count($row) < $maxCols) { + $row = array_merge($row, array_fill(0, $maxCols - count($row), '')); + } + } + return $data; + } + public function addArray(array $data, string $start = 'A1') + { + $this->spreadsheet->getActiveSheet()->fromArray($this->formatArray($data), null, $start); + return $this; + } + public function formatColumn(string $column) + { + $this->spreadsheet->getActiveSheet()->getStyle("{$column}:{$column}")->getNumberFormat()->setFormatCode('#,##0'); + return $this; + } + public function send(string $filename) + { + header('Content-Type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'); + header("Content-Disposition: attachment;filename=\"{$filename}\""); + header('Cache-Control: max-age=0'); + + $writer = IOFactory::createWriter($this->spreadsheet, 'Xlsx'); + $writer->save('php://output'); + } +} diff --git a/app_old/app/Service/Money.php b/app_old/app/Service/Money.php new file mode 100644 index 0000000..2472e62 --- /dev/null +++ b/app_old/app/Service/Money.php @@ -0,0 +1,55 @@ +parseDate($date); + if (!$this->checkNextMonthValueCalculationByDate($date)) { + return $this->emptyResult(); + } + + $response = $this->client->get('api/uf/value/' . $date->format('Y-m-d')); + + if (!$this->isOk($response)) { + return $this->emptyResult(); + } + + $body = $response->getBody()->getContents(); + if (trim($response->getBody()) === '') { + return $this->emptyResult(); + } + return json_decode($body); + } + + protected function parseDate(string|DateTimeInterface $date): DateTimeInterface + { + if (is_string($date)) { + $date = Carbon::parse($date, config('app.timezone')); + } + return $date; + } + protected function checkNextMonthValueCalculationByDate(DateTimeInterface $date): bool + { + $next_m_9 = Carbon::today(config('app.timezone'))->copy()->endOfMonth()->addDays(9); + $date = Carbon::parse($date); + return $date->lessThan($next_m_9); + } + protected function isOk(ResponseInterface $response): bool + { + $statusCode = $response->getStatusCode(); + return $statusCode >= 200 and $statusCode < 300; + } + protected function emptyResult(): object + { + return (object) ['total' => 0]; + } +} diff --git a/app_old/app/Service/Register.php b/app_old/app/Service/Register.php new file mode 100644 index 0000000..03f96e0 --- /dev/null +++ b/app_old/app/Service/Register.php @@ -0,0 +1,34 @@ + $user, + 'action' => $action, + 'time' => Carbon::now(config('app.timezone'))->toDateTimeString()//->format('Y-m-d HH:mm:ss') + ]; + $registry = model(RModel::class) + ->where('user', $user) + ->where('action', $action) + ->where('time', $data['time']) + ->findOne(); + if (!$registry) { + $registry = model(RModel::class)->create($data); + $registry->save(); + } + foreach ($variables as $data) { + $data['registry'] = $registry->id; + $log = (new Factory(RegistryData::class))->where($data)->find(); + if (!$log) { + $log = model(RegistryData::class)->create($data); + $log->save(); + } + } + } +} diff --git a/app_old/app/Service/Remote.php b/app_old/app/Service/Remote.php new file mode 100644 index 0000000..77418a2 --- /dev/null +++ b/app_old/app/Service/Remote.php @@ -0,0 +1,19 @@ +connection->connect(); + $statement = $connection->query($query); + $result = $statement->fetch(PDO::FETCH_ASSOC); + return $result['ip']; + } +} diff --git a/app_old/app/Service/Replacer.php b/app_old/app/Service/Replacer.php new file mode 100644 index 0000000..bf61513 --- /dev/null +++ b/app_old/app/Service/Replacer.php @@ -0,0 +1,127 @@ +parseLine($line); + + $output = $line; + foreach ($instructions as $instruction) { + $output = str_replace($instruction['original'], $this->buildLine($instruction['instruction'], $data), $output); + } + return $output; + } + protected function parseLine($line) + { + $ini_el = '[['; + $end_el = ']]'; + + $instructions = []; + $offset = 0; + while (strpos($line, $ini_el, $offset) !== false) { + $ini = strpos($line, $ini_el, $offset) + strlen($ini_el); + $end = strpos($line, $end_el, $offset); + $find = substr($line, $ini, $end - $ini); + $instructions []= ['original' => $ini_el . $find . $end_el, 'instruction' => $find]; + $offset = $end + 1; + } + return $instructions; + } + protected function buildLine($instructions, $data) + { + if (strpos($instructions, '|') !== false) { + $instructions = explode('|', $instructions); + } else { + $instructions = [$instructions]; + } + $output = ''; + foreach ($instructions as $instruction) { + $output = $this->buildReplace($instruction, $data, $output); + } + return $output; + } + protected function buildReplace($instruction, $data, $output = null) + { + if (strpos($instruction, '(') !== false) { + $ini = strpos($instruction, '(') + 1; + $end = strpos($instruction, ')'); + $mod = substr($instruction, $ini, $end - $ini); + $instruction = substr($instruction, 0, $ini - 1); + } + switch ($instruction) { + case 'UPPER': + return strtoupper($output); + case 'LOWER': + return strtolower($output); + case 'ISSET': + if ($output != '') { + return ', ' . $output; + } + return ''; + case 'UFS': + return format('ufs', $output); + case 'PESOS': + return format('pesos', $output); + } + + if (isset($mod)) { + $obj = $this->find($instruction . '(' . $mod .')', $data); + } else { + $obj = $this->find($instruction, $data); + } + if ($obj) { + return $obj; + } + if (is_object($output) and method_exists($output, $instruction)) { + if (isset($mod)) { + return $output->$instruction($mod); + } + return $output->$instruction(); + } + if (is_object($output) and isset($output->$instruction)) { + return $output->$instruction; + } + if ($instruction == 'strftime') { + setlocale(LC_TIME, 'es-CL', 'es'); + $f = Carbon::parse($output, config('app.timezone')); + $output = strftime($mod, $f->timestamp); + return $output; + } + + d($output, $instruction, function_exists($instruction), is_object($output), is_object($output) and isset($output->$instruction)); + } + protected function find($instruction, $data) + { + if (strpos($instruction, '(') !== false) { + $ini = strpos($instruction, '(') + 1; + $end = strpos($instruction, ')'); + $mod = substr($instruction, $ini, $end - $ini); + $instruction = substr($instruction, 0, $ini - 1); + } + if (method_exists($data, $instruction)) { + if (isset($mod)) { + return $data->$instruction($mod); + } + return $data->$instruction(); + } + if (isset($data->$instruction)) { + return $data->$instruction; + } + switch ($instruction) { + case 'Unidades': + $str = 'Departamento ' . $data->reserva()->unidad()->numeracion; + foreach ($data->reserva()->unidades() as $unidad) { + $str .= ', ' . ucwords($unidad->unidadProyecto()->tipo()->descripcion) . ' ' . $unidad->numeracion; + } + return $str; + case 'inmobiliaria': + return $data->proyecto()->inmobiliaria(); + } + return false; + } +} +?> \ No newline at end of file diff --git a/app_old/app/Service/Route.php b/app_old/app/Service/Route.php new file mode 100644 index 0000000..f910f87 --- /dev/null +++ b/app_old/app/Service/Route.php @@ -0,0 +1,131 @@ +add($t, $query, $callback); + } + } else { + switch (strtoupper($type)) { + case 'GET': + $this->get($query, $callback); + break; + case 'POST': + $this->post($query, $callback); + break; + } + } + } + public function get($query, $callback) + { + if ($this->exists('get', $query)) { + return; + } + $this->routes['get'][$query] = (object) ['query' => $query, 'callback' => $this->parseCallback($callback)]; + } + public function post($query, $callback) + { + if ($this->exists('post', $query)) { + return; + } + $this->routes['post'][$query] = (object) ['query' => $query, 'callback' => $this->parseCallback($callback)]; + } + protected function exists($type, $query) + { + return isset($this->routes['post'][$query]); + } + protected function parseCallback($callback) + { + if (is_callable($callback)) { + return $callback; + } + elseif (is_object($callback)) { + return [$callback, 'index']; + } + elseif (is_string($callback) and strpos($callback, '@') !== false) { + list($class, $method) = explode('@', $callback); + $class = '\\App\\Controller\\' . $class; + if (method_exists($class, $method)) { + return [$class, $method]; + } + } + elseif (is_string($callback)) { + $class = '\\App\\Controller\\' . $callback; + return [$class, 'index']; + } + } + public function route() + { + $url = $_SERVER['SCRIPT_NAME']; + $query = $_SERVER['QUERY_STRING']; + $method = $_SERVER['REQUEST_METHOD']; + $route = null; + switch (strtoupper($method)) { + case 'GET': + $route = $this->getGet($url, $query); + break; + case 'POST': + $route = $this->getPost($url, $query); + break; + } + if ($route) { + return $this->run($route->callback); + } + return false; + } + protected function getGet($url, $query) + { + if (isset($this->routes['get'][$url])) { + return $this->routes['get'][$url]; + } + $p = get('p'); + if ($p == null) { + $p = get('page'); + if ($p == null) { + $p = get('m'); + if ($p == null) { + $p = get('module'); + } + } + } + if (isset($this->routes['get'][$p])) { + return $this->routes['get'][$p]; + } + return false; + } + protected function getPost($url, $query) + { + if (isset($this->routes['post'][$url])) { + return $this->routes['post'][$url]; + } + $p = get('p'); + if ($p == null) { + $p = get('page'); + if ($p == null) { + $p = get('m'); + if ($p == null) { + $p = get('module'); + } + } + } + if (isset($this->routes['post'][$p])) { + return $this->routes['post'][$p]; + } + return false; + } + protected function run($callback) + { + return call_user_func($callback); + } +} +?> \ No newline at end of file diff --git a/app_old/bin/Pipfile b/app_old/bin/Pipfile new file mode 100644 index 0000000..8108982 --- /dev/null +++ b/app_old/bin/Pipfile @@ -0,0 +1,12 @@ +[[source]] +name = "pypi" +url = "https://pypi.org/simple" +verify_ssl = true + +[dev-packages] + +[packages] +gunicorn = "*" + +[requires] +python_version = "3.8" diff --git a/app_old/bin/console b/app_old/bin/console new file mode 100644 index 0000000..11aaaef --- /dev/null +++ b/app_old/bin/console @@ -0,0 +1,3 @@ +#!/bin/bash + +php /code/bin/index.php "$@" diff --git a/app_old/bin/index.php b/app_old/bin/index.php new file mode 100644 index 0000000..ff23b96 --- /dev/null +++ b/app_old/bin/index.php @@ -0,0 +1,8 @@ +run(); diff --git a/app_old/bin/informes/Pipfile b/app_old/bin/informes/Pipfile new file mode 100644 index 0000000..e8687af --- /dev/null +++ b/app_old/bin/informes/Pipfile @@ -0,0 +1,16 @@ +[[source]] +name = "pypi" +url = "https://pypi.org/simple" +verify_ssl = true + +[dev-packages] + +[packages] +pandas = "*" +xlsxwriter = "*" +httpx = "*" +flask = "*" +numpy = "*" + +[requires] +python_version = "3.8" diff --git a/app_old/bin/informes/app.py b/app_old/bin/informes/app.py new file mode 100644 index 0000000..ff2a8f0 --- /dev/null +++ b/app_old/bin/informes/app.py @@ -0,0 +1,14 @@ +import argparse +from flask import Flask +from controllers.ventas import ventas_blueprint + + +app = Flask(__name__) +app.register_blueprint(ventas_blueprint, url_prefix='/ventas') + + +if __name__ == '__main__': + parser = argparse.ArgumentParser() + parser.add_argument('-p', '--port', default=8011) + args = parser.parse_args() + app.run(port=args.port, debug=True) diff --git a/app_old/bin/informes/controllers/ventas.py b/app_old/bin/informes/controllers/ventas.py new file mode 100644 index 0000000..ab3ffce --- /dev/null +++ b/app_old/bin/informes/controllers/ventas.py @@ -0,0 +1,141 @@ +from flask import Blueprint, request, Response +import io +import json +import pandas as pd +import numpy as np +import datetime + + +ventas_blueprint = Blueprint('ventas', __name__,) + + +def format_data(data): + df = pd.DataFrame(data) + int_columns = ['Departamento', 'Estacionamientos', 'Bodegas'] + for col in int_columns: + df[col] = pd.to_numeric(df[col], errors='ignore') + float_columns = ['Valor Promesa', 'Pie', 'Pie Pagado', '% Pie Pagado', 'Bono Pie', 'Valor Operador', + 'Premios', 'Subsidio', 'Ahorro', 'Credito', 'Valor Ests & Bods', 'Valor Neto', + 'UF/m²*', 'Comision', 'Venta s/Comision', 'Precio'] + for col in float_columns: + if col in df.columns: + df[col] = pd.to_numeric(df[col], errors='coerce') + df = df.replace(np.nan, 0, regex=True) + + df['Fecha Venta'] = pd.to_datetime(df['Fecha Venta'], format='%Y-%m-%d') + df = df.sort_values(by=['Fecha Venta', 'Departamento']) + df['Fecha Venta'] = df['Fecha Venta'].dt.strftime('%d.%m.%Y') + + return df + + +def format_columns(workbook, columns): + column_settings = [{'header': column} for column in columns] + + center_format = workbook.add_format({'align': 'center'}) + amount_format = workbook.add_format({'num_format': '#,##0.00'}) + percent_format = workbook.add_format({'num_format': '0.00%'}) + + amount_columns = ['m² Ponderados', 'Valor Promesa', 'Pie', 'Pie Pagado', 'Bono Pie', 'Valor Operador', 'Premios', + 'Subsidio', 'Ahorro', 'Credito', 'Valor Ests & Bods', 'Valor Neto', 'UF/m²*', 'Comision', + 'Venta s/Comision', 'Precio'] + center_columns = ['Departamento', 'Estacionamientos', 'Bodegas'] + sum_columns = ['m² Ponderados', 'Valor Promesa', 'Pie', 'Pie Pagado', 'Bono Pie', 'Subsidio', 'Ahorro', 'Credito', + 'Valor Operador', 'Premios', 'Valor Ests & Bods', 'Valor Neto', 'Comision'] + count_columns = ['Departamento', 'Estacionamientos', 'Bodegas'] + + for (k, col) in enumerate(column_settings): + if col['header'] in amount_columns: + column_settings[k]['format'] = amount_format + if col['header'] in center_columns: + column_settings[k]['format'] = center_format + if col['header'] in sum_columns: + column_settings[k]['total_function'] = 'sum' + if col['header'] in count_columns: + column_settings[k]['total_function'] = 'count' + if col['header'] == '% Pie Pagado': + column_settings[k]['format'] = percent_format + if col['header'] == 'Propietario': + column_settings[k]['total_string'] = 'TOTAL' + + return column_settings + + +def format_excel(workbook, worksheet, data): + center_format = workbook.add_format({'align': 'center'}) + amount_format = workbook.add_format({'num_format': '#,##0.00'}) + percent_format = workbook.add_format({'num_format': '0.00%'}) + + amount_columns = ['m² Ponderados', 'Valor Promesa', 'Pie', 'Pie Pagado', 'Bono Pie', 'Valor Operador', 'Premios', + 'Subsidio', 'Ahorro', 'Credito', 'Valor Ests & Bods', 'Valor Neto', 'UF/m²*', 'Comision', + 'Venta s/Comision', 'Precio'] + center_columns = ['Departamento', 'Estacionamientos', 'Bodegas'] + + for col in amount_columns: + if col not in data.columns: + continue + k = data.columns.get_loc(col) + 1 + worksheet.set_column(k, k, cell_format=amount_format) + for col in center_columns: + if col not in data.columns: + continue + k = data.columns.get_loc(col) + 1 + worksheet.set_column(k, k, cell_format=center_format) + col = '% Pie Pagado' + k = data.columns.get_loc(col) + 1 + worksheet.set_column(k, k, cell_format=percent_format) + + return worksheet + + +@ventas_blueprint.route('', methods=['POST']) +def ventas(): + data = json.loads(request.data) + output = io.BytesIO() + writer = pd.ExcelWriter('tmp.xlsx', engine='xlsxwriter') + df = format_data(data['data']) + + start_row = 4 + if 'Compañía' in data: + start_row += 1 + df.to_excel(writer, startrow=start_row+1, startcol=1, header=False, index=False, sheet_name='Ventas') + wb = writer.book + wb.filename = output + + title_format = wb.add_format({'font_size': 16, 'bold': True}) + ws = writer.sheets['Ventas'] + (max_row, max_col) = df.shape + + if 'Compañía' in data: + ws.merge_range(1, 1, 1, max_col, data['Compañía']) + ws.merge_range(start_row-3, 1, start_row-3, max_col, data['Proyecto'], cell_format=title_format) + ws.write_string(start_row-2, 1, 'Ventas') + column_settings = format_columns(wb, df.columns) + ws.add_table(start_row, 1, max_row+start_row+1, max_col, {'name': 'Ventas', 'total_row': 1, + 'columns': column_settings, + 'style': 'Table Style Medium 1'}) + ws = format_excel(wb, ws, df) + + column_widths = { + 'B': 46, + 'C': 16, + 'D': 18, + 'E': 10, + 'F': 13, + 'G': 7, + 'H': 8, + 'I': 16, + 'J': 16, + 'K': 13, + 'L': 14 + } + for (col, wd) in column_widths.items(): + ws.set_column('{0}:{0}'.format(col), wd) + + writer.save() + output.seek(0) + date = datetime.date.today() + filename = "Informe de Ventas - {0} - {1}.xlsx".format(data['Proyecto'], date.strftime('%Y-%m-%d')) + return Response(output, mimetype="application/ms-excel", + headers={"Content-Disposition": "attachment;filename={0}".format(filename), + "Content-Type": 'application/octet-stream; charset=utf-8'}) diff --git a/app_old/bootstrap/autoload.php b/app_old/bootstrap/autoload.php new file mode 100644 index 0000000..318f80d --- /dev/null +++ b/app_old/bootstrap/autoload.php @@ -0,0 +1,8 @@ + diff --git a/app_old/bootstrap/database.php b/app_old/bootstrap/database.php new file mode 100644 index 0000000..4372bf2 --- /dev/null +++ b/app_old/bootstrap/database.php @@ -0,0 +1,29 @@ + $data) { + load($data, $name); +} + +function load($data, $name = '') { + if (!isset($data['port'])) { + $port = 3306; + } else { + $port = $data['port']; + } + $dsn = 'mysql:host=' . $data['host'] . ';port=' . $port . ';dbname=' . $data['database'] . ';charset=utf8'; + + if ($name != '') { + ORM::configure($dsn, null, $name); + ORM::configure('username', $data['username'], $name); + ORM::configure('password', $data['password'], $name); + } else { + ORM::configure($dsn, null); + ORM::configure('username', $data['username']); + ORM::configure('password', $data['password']); + } +} + +Model::$short_table_names = true; diff --git a/app_old/bootstrap/dotenv.php b/app_old/bootstrap/dotenv.php new file mode 100644 index 0000000..799a5b1 --- /dev/null +++ b/app_old/bootstrap/dotenv.php @@ -0,0 +1,12 @@ +isDir() or $file->getExtension() != 'env') { + continue; + } + $env = Dotenv::createImmutable($file->getPath(), $file->getBasename()); + $env->load(); +} diff --git a/app_old/bootstrap/errors.php b/app_old/bootstrap/errors.php new file mode 100644 index 0000000..0e54dc4 --- /dev/null +++ b/app_old/bootstrap/errors.php @@ -0,0 +1,7 @@ +pushHandler(new \Whoops\Handler\PrettyPageHandler); + $whoops->register(); +}*/ +?> diff --git a/app_old/bootstrap/logs.php b/app_old/bootstrap/logs.php new file mode 100644 index 0000000..249be53 --- /dev/null +++ b/app_old/bootstrap/logs.php @@ -0,0 +1,26 @@ +underscored(); + Route::add(['GET', 'POST'], $route, $name); +} + +Route::add(['GET', 'POST'], 'buscar', 'Buscar'); +?> \ No newline at end of file diff --git a/setup/cli.app.php b/app_old/cli/app.php similarity index 100% rename from setup/cli.app.php rename to app_old/cli/app.php diff --git a/setup/cli/config.php b/app_old/cli/cli/config.php similarity index 100% rename from setup/cli/config.php rename to app_old/cli/cli/config.php diff --git a/setup/cli/middlewares.php b/app_old/cli/cli/middlewares.php similarity index 100% rename from setup/cli/middlewares.php rename to app_old/cli/cli/middlewares.php diff --git a/setup/cli/setups.php b/app_old/cli/cli/setups.php similarity index 82% rename from setup/cli/setups.php rename to app_old/cli/cli/setups.php index 33b847a..6c4a99f 100644 --- a/setup/cli/setups.php +++ b/app_old/cli/cli/setups.php @@ -1,4 +1,5 @@ function(ContainerInterface $container) { - return new App\Alias\RemoteConnection(); + \App\Alias\RemoteConnection::class => function(ContainerInterface $container) { + return new \App\Alias\RemoteConnection(); }, App\Service\Remote::class => function(ContainerInterface $container) { - return new App\Service\Remote($container->get(App\Alias\RemoteConnection::class)); + return new App\Service\Remote($container->get(\App\Alias\RemoteConnection::class)); }, App\Service\Money::class => function(ContainerInterface $container) { return new App\Service\Money($container->get(GuzzleHttp\Client::class)); }, - App\Alias\Connection::class => function(ContainerInterface $container) { + \App\Alias\Connection::class => function(ContainerInterface $container) { $data = $container->get('databases')->get(ORM::DEFAULT_CONNECTION); - return new App\Alias\Connection( + return new \App\Alias\Connection( $data->get('host'), $data->get('database'), $data->get('username'), diff --git a/setup/composer.php b/app_old/cli/composer.php similarity index 100% rename from setup/composer.php rename to app_old/cli/composer.php diff --git a/app_old/composer.json b/app_old/composer.json new file mode 100644 index 0000000..bfbfb8e --- /dev/null +++ b/app_old/composer.json @@ -0,0 +1,69 @@ +{ + "name" : "aldarien/incoviba", + "description" : "Intranet portal for Incoviba", + "type" : "project", + "require" : { + "aldarien/asset": "*", + "aldarien/config": "*", + "aldarien/format": "*", + "aldarien/response": "*", + "aldarien/session": "*", + "aldarien/url": "*", + "aldarien/view": "*", + "berrnd/slim-blade-view": "^0.1.1", + "guzzlehttp/guzzle": "*", + "incoviba/modelos": "*", + "j4mie/paris": "^1.5", + "monolog/monolog": "^3", + "nesbot/carbon": "^2", + "nyholm/psr7": "*", + "nyholm/psr7-server": "*", + "php-di/php-di": "*", + "php-di/slim-bridge": "*", + "phpoffice/phpspreadsheet": "^1", + "phpoffice/phpword": "^0", + "rubellum/slim-blade-view": "*", + "slam/php-excel": "^4.4", + "slim/slim": "^4", + "symfony/console": "6.4.x-dev", + "vlucas/phpdotenv": "^5.3", + "voku/stringy": "^6" + }, + "require-dev" : { + "phpunit/phpunit" : "*", + "kint-php/kint" : "*", + "filp/whoops" : "*" + }, + "license" : "GNU AGPLv3", + "authors" : [{ + "name" : "Aldarien", + "email" : "jpvial@gmail.com" + } + ], + "autoload" : { + "psr-4" : { + "App\\" : "app/", + "ProVM\\Common\\": "provm/common/" + }, + "files" : [ + "app/Helper/functions.php" + ] + }, + "minimum-stability": "dev", + "repositories": [ + { + "type": "path", + "url": "./aldarien/**", + "options": { + "symlink": true + } + }, + { + "type": "path", + "url": "./incoviba/modelos" + } + ], + "config": { + "sort-packages": true + } +} diff --git a/app_old/config/app.php b/app_old/config/app.php new file mode 100644 index 0000000..4db5c28 --- /dev/null +++ b/app_old/config/app.php @@ -0,0 +1,9 @@ + 'America/Santiago', + 'locale' => 'es', + 'database' => 'mysql', + 'debug' => false, + 'benchmark' => false, + 'login_hours' => 5*24 +]; diff --git a/app_old/config/databases.php b/app_old/config/databases.php new file mode 100644 index 0000000..14e279f --- /dev/null +++ b/app_old/config/databases.php @@ -0,0 +1,24 @@ + [ + 'host' => $_ENV['MYSQL_HOST'], + 'database' => $_ENV['MYSQL_DATABASE'], + 'username' => $_ENV['MYSQL_USER'], + 'password' => $_ENV['MYSQL_PASSWORD'] + ], + 'mysql_copy' => [ + 'host' => 'localhost', + 'database' => 'incoviba3', + 'username' => 'incoviba', + 'password' => $_ENV['MYSQL_PASSWORD'] + ] + ]; + if (isset($_ENV['MYSQL_PORT'])) { + $arr['mysql']['port'] = $_ENV['MYSQL_PORT']; + } + return $arr; +} +return buildDatabaseConfig(); diff --git a/app_old/config/incoviba.php b/app_old/config/incoviba.php new file mode 100644 index 0000000..d21d9e8 --- /dev/null +++ b/app_old/config/incoviba.php @@ -0,0 +1,6 @@ + [ + 'caducidad' => 30 + ] +]; diff --git a/app_old/config/locations.php b/app_old/config/locations.php new file mode 100644 index 0000000..05442b6 --- /dev/null +++ b/app_old/config/locations.php @@ -0,0 +1,16 @@ + root(), + 'cache' => '{locations.base}/cache', + 'public' => '{locations.base}/public', + 'resources' => '{locations.base}/resources', + 'views' => '{locations.resources}/views', + 'src' => '{locations.base}/src', + //'languages' => '{locations.resources}/languages' + 'app' => '{locations.base}/app', + 'controllers' => '{locations.app}/Controller', + 'money' => 'provm.cl/optimus/money', + 'api' => '192.168.1.100/intranet/api', + 'api_url' => '/api' +]; +?> diff --git a/app_old/fontify.json b/app_old/fontify.json new file mode 100644 index 0000000..923703c --- /dev/null +++ b/app_old/fontify.json @@ -0,0 +1,7 @@ +{ + "modules": [ + "bootstrap", + "font-awesome" + ], + "dest": "public" +} \ No newline at end of file diff --git a/incoviba/modelos/.gitignore b/app_old/incoviba/modelos/.gitignore similarity index 100% rename from incoviba/modelos/.gitignore rename to app_old/incoviba/modelos/.gitignore diff --git a/incoviba/modelos/common/Alias/Model.php b/app_old/incoviba/modelos/common/Alias/Model.php similarity index 100% rename from incoviba/modelos/common/Alias/Model.php rename to app_old/incoviba/modelos/common/Alias/Model.php diff --git a/incoviba/modelos/common/Alias/NewEstado.php b/app_old/incoviba/modelos/common/Alias/NewEstado.php similarity index 100% rename from incoviba/modelos/common/Alias/NewEstado.php rename to app_old/incoviba/modelos/common/Alias/NewEstado.php diff --git a/incoviba/modelos/common/Alias/NewModel.php b/app_old/incoviba/modelos/common/Alias/NewModel.php similarity index 100% rename from incoviba/modelos/common/Alias/NewModel.php rename to app_old/incoviba/modelos/common/Alias/NewModel.php diff --git a/incoviba/modelos/common/Alias/NewTipo.php b/app_old/incoviba/modelos/common/Alias/NewTipo.php similarity index 100% rename from incoviba/modelos/common/Alias/NewTipo.php rename to app_old/incoviba/modelos/common/Alias/NewTipo.php diff --git a/incoviba/modelos/common/Alias/OldModel.php b/app_old/incoviba/modelos/common/Alias/OldModel.php similarity index 100% rename from incoviba/modelos/common/Alias/OldModel.php rename to app_old/incoviba/modelos/common/Alias/OldModel.php diff --git a/incoviba/modelos/common/Factory/Model.php b/app_old/incoviba/modelos/common/Factory/Model.php similarity index 100% rename from incoviba/modelos/common/Factory/Model.php rename to app_old/incoviba/modelos/common/Factory/Model.php diff --git a/incoviba/modelos/composer.json b/app_old/incoviba/modelos/composer.json similarity index 100% rename from incoviba/modelos/composer.json rename to app_old/incoviba/modelos/composer.json diff --git a/incoviba/modelos/src/common/Action.php b/app_old/incoviba/modelos/src/common/Action.php similarity index 100% rename from incoviba/modelos/src/common/Action.php rename to app_old/incoviba/modelos/src/common/Action.php diff --git a/incoviba/modelos/src/common/Auth.php b/app_old/incoviba/modelos/src/common/Auth.php similarity index 100% rename from incoviba/modelos/src/common/Auth.php rename to app_old/incoviba/modelos/src/common/Auth.php diff --git a/incoviba/modelos/src/common/Location.php b/app_old/incoviba/modelos/src/common/Location.php similarity index 100% rename from incoviba/modelos/src/common/Location.php rename to app_old/incoviba/modelos/src/common/Location.php diff --git a/incoviba/modelos/src/common/Permission.php b/app_old/incoviba/modelos/src/common/Permission.php similarity index 100% rename from incoviba/modelos/src/common/Permission.php rename to app_old/incoviba/modelos/src/common/Permission.php diff --git a/incoviba/modelos/src/common/Registry.php b/app_old/incoviba/modelos/src/common/Registry.php similarity index 100% rename from incoviba/modelos/src/common/Registry.php rename to app_old/incoviba/modelos/src/common/Registry.php diff --git a/incoviba/modelos/src/common/RegistryData.php b/app_old/incoviba/modelos/src/common/RegistryData.php similarity index 100% rename from incoviba/modelos/src/common/RegistryData.php rename to app_old/incoviba/modelos/src/common/RegistryData.php diff --git a/incoviba/modelos/src/common/Role.php b/app_old/incoviba/modelos/src/common/Role.php similarity index 100% rename from incoviba/modelos/src/common/Role.php rename to app_old/incoviba/modelos/src/common/Role.php diff --git a/incoviba/modelos/src/common/User.php b/app_old/incoviba/modelos/src/common/User.php similarity index 100% rename from incoviba/modelos/src/common/User.php rename to app_old/incoviba/modelos/src/common/User.php diff --git a/incoviba/modelos/src/common/UserRole.php b/app_old/incoviba/modelos/src/common/UserRole.php similarity index 100% rename from incoviba/modelos/src/common/UserRole.php rename to app_old/incoviba/modelos/src/common/UserRole.php diff --git a/incoviba/modelos/src/nuevo/Common/Banco.php b/app_old/incoviba/modelos/src/nuevo/Common/Banco.php similarity index 100% rename from incoviba/modelos/src/nuevo/Common/Banco.php rename to app_old/incoviba/modelos/src/nuevo/Common/Banco.php diff --git a/incoviba/modelos/src/nuevo/Common/Comuna.php b/app_old/incoviba/modelos/src/nuevo/Common/Comuna.php similarity index 100% rename from incoviba/modelos/src/nuevo/Common/Comuna.php rename to app_old/incoviba/modelos/src/nuevo/Common/Comuna.php diff --git a/incoviba/modelos/src/nuevo/Common/Direccion.php b/app_old/incoviba/modelos/src/nuevo/Common/Direccion.php similarity index 100% rename from incoviba/modelos/src/nuevo/Common/Direccion.php rename to app_old/incoviba/modelos/src/nuevo/Common/Direccion.php diff --git a/incoviba/modelos/src/nuevo/Common/M2.php b/app_old/incoviba/modelos/src/nuevo/Common/M2.php similarity index 100% rename from incoviba/modelos/src/nuevo/Common/M2.php rename to app_old/incoviba/modelos/src/nuevo/Common/M2.php diff --git a/incoviba/modelos/src/nuevo/Common/Provincia.php b/app_old/incoviba/modelos/src/nuevo/Common/Provincia.php similarity index 100% rename from incoviba/modelos/src/nuevo/Common/Provincia.php rename to app_old/incoviba/modelos/src/nuevo/Common/Provincia.php diff --git a/incoviba/modelos/src/nuevo/Common/Region.php b/app_old/incoviba/modelos/src/nuevo/Common/Region.php similarity index 100% rename from incoviba/modelos/src/nuevo/Common/Region.php rename to app_old/incoviba/modelos/src/nuevo/Common/Region.php diff --git a/incoviba/modelos/src/nuevo/Common/UF.php b/app_old/incoviba/modelos/src/nuevo/Common/UF.php similarity index 100% rename from incoviba/modelos/src/nuevo/Common/UF.php rename to app_old/incoviba/modelos/src/nuevo/Common/UF.php diff --git a/incoviba/modelos/src/nuevo/Inmobiliaria/Agente.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Agente.php similarity index 100% rename from incoviba/modelos/src/nuevo/Inmobiliaria/Agente.php rename to app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Agente.php diff --git a/incoviba/modelos/src/nuevo/Inmobiliaria/CategoriaCuentaContable.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/CategoriaCuentaContable.php similarity index 100% rename from incoviba/modelos/src/nuevo/Inmobiliaria/CategoriaCuentaContable.php rename to app_old/incoviba/modelos/src/nuevo/Inmobiliaria/CategoriaCuentaContable.php diff --git a/incoviba/modelos/src/nuevo/Inmobiliaria/Cobro.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Cobro.php similarity index 100% rename from incoviba/modelos/src/nuevo/Inmobiliaria/Cobro.php rename to app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Cobro.php diff --git a/incoviba/modelos/src/nuevo/Inmobiliaria/Contrato.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Contrato.php similarity index 100% rename from incoviba/modelos/src/nuevo/Inmobiliaria/Contrato.php rename to app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Contrato.php diff --git a/incoviba/modelos/src/nuevo/Inmobiliaria/Cuenta.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Cuenta.php similarity index 100% rename from incoviba/modelos/src/nuevo/Inmobiliaria/Cuenta.php rename to app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Cuenta.php diff --git a/incoviba/modelos/src/nuevo/Inmobiliaria/CuentaContable.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/CuentaContable.php similarity index 100% rename from incoviba/modelos/src/nuevo/Inmobiliaria/CuentaContable.php rename to app_old/incoviba/modelos/src/nuevo/Inmobiliaria/CuentaContable.php diff --git a/incoviba/modelos/src/nuevo/Inmobiliaria/EstadoCobro.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/EstadoCobro.php similarity index 100% rename from incoviba/modelos/src/nuevo/Inmobiliaria/EstadoCobro.php rename to app_old/incoviba/modelos/src/nuevo/Inmobiliaria/EstadoCobro.php diff --git a/incoviba/modelos/src/nuevo/Inmobiliaria/Inmobiliaria.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Inmobiliaria.php similarity index 100% rename from incoviba/modelos/src/nuevo/Inmobiliaria/Inmobiliaria.php rename to app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Inmobiliaria.php diff --git a/incoviba/modelos/src/nuevo/Inmobiliaria/Participacion.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Participacion.php similarity index 100% rename from incoviba/modelos/src/nuevo/Inmobiliaria/Participacion.php rename to app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Participacion.php diff --git a/incoviba/modelos/src/nuevo/Inmobiliaria/Representante.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Representante.php similarity index 100% rename from incoviba/modelos/src/nuevo/Inmobiliaria/Representante.php rename to app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Representante.php diff --git a/incoviba/modelos/src/nuevo/Inmobiliaria/Socio.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Socio.php similarity index 100% rename from incoviba/modelos/src/nuevo/Inmobiliaria/Socio.php rename to app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Socio.php diff --git a/incoviba/modelos/src/nuevo/Inmobiliaria/TipoAgente.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/TipoAgente.php similarity index 100% rename from incoviba/modelos/src/nuevo/Inmobiliaria/TipoAgente.php rename to app_old/incoviba/modelos/src/nuevo/Inmobiliaria/TipoAgente.php diff --git a/incoviba/modelos/src/nuevo/Inmobiliaria/TipoCobro.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/TipoCobro.php similarity index 100% rename from incoviba/modelos/src/nuevo/Inmobiliaria/TipoCobro.php rename to app_old/incoviba/modelos/src/nuevo/Inmobiliaria/TipoCobro.php diff --git a/incoviba/modelos/src/nuevo/Inmobiliaria/TipoContrato.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/TipoContrato.php similarity index 100% rename from incoviba/modelos/src/nuevo/Inmobiliaria/TipoContrato.php rename to app_old/incoviba/modelos/src/nuevo/Inmobiliaria/TipoContrato.php diff --git a/incoviba/modelos/src/nuevo/Inmobiliaria/TipoEstadoCobro.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/TipoEstadoCobro.php similarity index 100% rename from incoviba/modelos/src/nuevo/Inmobiliaria/TipoEstadoCobro.php rename to app_old/incoviba/modelos/src/nuevo/Inmobiliaria/TipoEstadoCobro.php diff --git a/incoviba/modelos/src/nuevo/Inmobiliaria/TransaccionContable.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/TransaccionContable.php similarity index 100% rename from incoviba/modelos/src/nuevo/Inmobiliaria/TransaccionContable.php rename to app_old/incoviba/modelos/src/nuevo/Inmobiliaria/TransaccionContable.php diff --git a/incoviba/modelos/src/nuevo/Proyecto/EstadoProyecto.php b/app_old/incoviba/modelos/src/nuevo/Proyecto/EstadoProyecto.php similarity index 100% rename from incoviba/modelos/src/nuevo/Proyecto/EstadoProyecto.php rename to app_old/incoviba/modelos/src/nuevo/Proyecto/EstadoProyecto.php diff --git a/incoviba/modelos/src/nuevo/Proyecto/Etapa.php b/app_old/incoviba/modelos/src/nuevo/Proyecto/Etapa.php similarity index 100% rename from incoviba/modelos/src/nuevo/Proyecto/Etapa.php rename to app_old/incoviba/modelos/src/nuevo/Proyecto/Etapa.php diff --git a/incoviba/modelos/src/nuevo/Proyecto/Participe.php b/app_old/incoviba/modelos/src/nuevo/Proyecto/Participe.php similarity index 100% rename from incoviba/modelos/src/nuevo/Proyecto/Participe.php rename to app_old/incoviba/modelos/src/nuevo/Proyecto/Participe.php diff --git a/incoviba/modelos/src/nuevo/Proyecto/Proyecto.php b/app_old/incoviba/modelos/src/nuevo/Proyecto/Proyecto.php similarity index 100% rename from incoviba/modelos/src/nuevo/Proyecto/Proyecto.php rename to app_old/incoviba/modelos/src/nuevo/Proyecto/Proyecto.php diff --git a/incoviba/modelos/src/nuevo/Proyecto/ProyectoParticipe.php b/app_old/incoviba/modelos/src/nuevo/Proyecto/ProyectoParticipe.php similarity index 100% rename from incoviba/modelos/src/nuevo/Proyecto/ProyectoParticipe.php rename to app_old/incoviba/modelos/src/nuevo/Proyecto/ProyectoParticipe.php diff --git a/incoviba/modelos/src/nuevo/Proyecto/Tema.php b/app_old/incoviba/modelos/src/nuevo/Proyecto/Tema.php similarity index 100% rename from incoviba/modelos/src/nuevo/Proyecto/Tema.php rename to app_old/incoviba/modelos/src/nuevo/Proyecto/Tema.php diff --git a/incoviba/modelos/src/nuevo/Proyecto/TipoEstadoProyecto.php b/app_old/incoviba/modelos/src/nuevo/Proyecto/TipoEstadoProyecto.php similarity index 100% rename from incoviba/modelos/src/nuevo/Proyecto/TipoEstadoProyecto.php rename to app_old/incoviba/modelos/src/nuevo/Proyecto/TipoEstadoProyecto.php diff --git a/incoviba/modelos/src/nuevo/Proyecto/TipoUnidad.php b/app_old/incoviba/modelos/src/nuevo/Proyecto/TipoUnidad.php similarity index 100% rename from incoviba/modelos/src/nuevo/Proyecto/TipoUnidad.php rename to app_old/incoviba/modelos/src/nuevo/Proyecto/TipoUnidad.php diff --git a/incoviba/modelos/src/nuevo/Proyecto/UnidadProyecto.php b/app_old/incoviba/modelos/src/nuevo/Proyecto/UnidadProyecto.php similarity index 100% rename from incoviba/modelos/src/nuevo/Proyecto/UnidadProyecto.php rename to app_old/incoviba/modelos/src/nuevo/Proyecto/UnidadProyecto.php diff --git a/incoviba/modelos/src/nuevo/Venta/Cierre.php b/app_old/incoviba/modelos/src/nuevo/Venta/Cierre.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/Cierre.php rename to app_old/incoviba/modelos/src/nuevo/Venta/Cierre.php diff --git a/incoviba/modelos/src/nuevo/Venta/Comentario.php b/app_old/incoviba/modelos/src/nuevo/Venta/Comentario.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/Comentario.php rename to app_old/incoviba/modelos/src/nuevo/Venta/Comentario.php diff --git a/incoviba/modelos/src/nuevo/Venta/Cuota.php b/app_old/incoviba/modelos/src/nuevo/Venta/Cuota.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/Cuota.php rename to app_old/incoviba/modelos/src/nuevo/Venta/Cuota.php diff --git a/incoviba/modelos/src/nuevo/Venta/Entrega.php b/app_old/incoviba/modelos/src/nuevo/Venta/Entrega.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/Entrega.php rename to app_old/incoviba/modelos/src/nuevo/Venta/Entrega.php diff --git a/incoviba/modelos/src/nuevo/Venta/EstadoCierre.php b/app_old/incoviba/modelos/src/nuevo/Venta/EstadoCierre.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/EstadoCierre.php rename to app_old/incoviba/modelos/src/nuevo/Venta/EstadoCierre.php diff --git a/incoviba/modelos/src/nuevo/Venta/EstadoObservacion.php b/app_old/incoviba/modelos/src/nuevo/Venta/EstadoObservacion.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/EstadoObservacion.php rename to app_old/incoviba/modelos/src/nuevo/Venta/EstadoObservacion.php diff --git a/incoviba/modelos/src/nuevo/Venta/EstadoPago.php b/app_old/incoviba/modelos/src/nuevo/Venta/EstadoPago.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/EstadoPago.php rename to app_old/incoviba/modelos/src/nuevo/Venta/EstadoPago.php diff --git a/incoviba/modelos/src/nuevo/Venta/EstadoPostventa.php b/app_old/incoviba/modelos/src/nuevo/Venta/EstadoPostventa.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/EstadoPostventa.php rename to app_old/incoviba/modelos/src/nuevo/Venta/EstadoPostventa.php diff --git a/incoviba/modelos/src/nuevo/Venta/EstadoVenta.php b/app_old/incoviba/modelos/src/nuevo/Venta/EstadoVenta.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/EstadoVenta.php rename to app_old/incoviba/modelos/src/nuevo/Venta/EstadoVenta.php diff --git a/incoviba/modelos/src/nuevo/Venta/FondoVenta.php b/app_old/incoviba/modelos/src/nuevo/Venta/FondoVenta.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/FondoVenta.php rename to app_old/incoviba/modelos/src/nuevo/Venta/FondoVenta.php diff --git a/incoviba/modelos/src/nuevo/Venta/FormaPago.php b/app_old/incoviba/modelos/src/nuevo/Venta/FormaPago.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/FormaPago.php rename to app_old/incoviba/modelos/src/nuevo/Venta/FormaPago.php diff --git a/incoviba/modelos/src/nuevo/Venta/Medicion.php b/app_old/incoviba/modelos/src/nuevo/Venta/Medicion.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/Medicion.php rename to app_old/incoviba/modelos/src/nuevo/Venta/Medicion.php diff --git a/incoviba/modelos/src/nuevo/Venta/Observacion.php b/app_old/incoviba/modelos/src/nuevo/Venta/Observacion.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/Observacion.php rename to app_old/incoviba/modelos/src/nuevo/Venta/Observacion.php diff --git a/incoviba/modelos/src/nuevo/Venta/Pago.php b/app_old/incoviba/modelos/src/nuevo/Venta/Pago.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/Pago.php rename to app_old/incoviba/modelos/src/nuevo/Venta/Pago.php diff --git a/incoviba/modelos/src/nuevo/Venta/Pie.php b/app_old/incoviba/modelos/src/nuevo/Venta/Pie.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/Pie.php rename to app_old/incoviba/modelos/src/nuevo/Venta/Pie.php diff --git a/incoviba/modelos/src/nuevo/Venta/Postventa.php b/app_old/incoviba/modelos/src/nuevo/Venta/Postventa.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/Postventa.php rename to app_old/incoviba/modelos/src/nuevo/Venta/Postventa.php diff --git a/incoviba/modelos/src/nuevo/Venta/PostventaObservacion.php b/app_old/incoviba/modelos/src/nuevo/Venta/PostventaObservacion.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/PostventaObservacion.php rename to app_old/incoviba/modelos/src/nuevo/Venta/PostventaObservacion.php diff --git a/incoviba/modelos/src/nuevo/Venta/Premio.php b/app_old/incoviba/modelos/src/nuevo/Venta/Premio.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/Premio.php rename to app_old/incoviba/modelos/src/nuevo/Venta/Premio.php diff --git a/incoviba/modelos/src/nuevo/Venta/Propiedad.php b/app_old/incoviba/modelos/src/nuevo/Venta/Propiedad.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/Propiedad.php rename to app_old/incoviba/modelos/src/nuevo/Venta/Propiedad.php diff --git a/incoviba/modelos/src/nuevo/Venta/Propietario.php b/app_old/incoviba/modelos/src/nuevo/Venta/Propietario.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/Propietario.php rename to app_old/incoviba/modelos/src/nuevo/Venta/Propietario.php diff --git a/incoviba/modelos/src/nuevo/Venta/ProyectoTipoMedicion.php b/app_old/incoviba/modelos/src/nuevo/Venta/ProyectoTipoMedicion.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/ProyectoTipoMedicion.php rename to app_old/incoviba/modelos/src/nuevo/Venta/ProyectoTipoMedicion.php diff --git a/incoviba/modelos/src/nuevo/Venta/Reserva.php b/app_old/incoviba/modelos/src/nuevo/Venta/Reserva.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/Reserva.php rename to app_old/incoviba/modelos/src/nuevo/Venta/Reserva.php diff --git a/incoviba/modelos/src/nuevo/Venta/TipoEstadoCierre.php b/app_old/incoviba/modelos/src/nuevo/Venta/TipoEstadoCierre.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/TipoEstadoCierre.php rename to app_old/incoviba/modelos/src/nuevo/Venta/TipoEstadoCierre.php diff --git a/incoviba/modelos/src/nuevo/Venta/TipoEstadoObservacion.php b/app_old/incoviba/modelos/src/nuevo/Venta/TipoEstadoObservacion.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/TipoEstadoObservacion.php rename to app_old/incoviba/modelos/src/nuevo/Venta/TipoEstadoObservacion.php diff --git a/incoviba/modelos/src/nuevo/Venta/TipoEstadoPago.php b/app_old/incoviba/modelos/src/nuevo/Venta/TipoEstadoPago.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/TipoEstadoPago.php rename to app_old/incoviba/modelos/src/nuevo/Venta/TipoEstadoPago.php diff --git a/incoviba/modelos/src/nuevo/Venta/TipoEstadoPostventa.php b/app_old/incoviba/modelos/src/nuevo/Venta/TipoEstadoPostventa.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/TipoEstadoPostventa.php rename to app_old/incoviba/modelos/src/nuevo/Venta/TipoEstadoPostventa.php diff --git a/incoviba/modelos/src/nuevo/Venta/TipoEstadoVenta.php b/app_old/incoviba/modelos/src/nuevo/Venta/TipoEstadoVenta.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/TipoEstadoVenta.php rename to app_old/incoviba/modelos/src/nuevo/Venta/TipoEstadoVenta.php diff --git a/incoviba/modelos/src/nuevo/Venta/TipoFondo.php b/app_old/incoviba/modelos/src/nuevo/Venta/TipoFondo.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/TipoFondo.php rename to app_old/incoviba/modelos/src/nuevo/Venta/TipoFondo.php diff --git a/incoviba/modelos/src/nuevo/Venta/TipoMedicion.php b/app_old/incoviba/modelos/src/nuevo/Venta/TipoMedicion.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/TipoMedicion.php rename to app_old/incoviba/modelos/src/nuevo/Venta/TipoMedicion.php diff --git a/incoviba/modelos/src/nuevo/Venta/TipoPago.php b/app_old/incoviba/modelos/src/nuevo/Venta/TipoPago.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/TipoPago.php rename to app_old/incoviba/modelos/src/nuevo/Venta/TipoPago.php diff --git a/incoviba/modelos/src/nuevo/Venta/TipoPremio.php b/app_old/incoviba/modelos/src/nuevo/Venta/TipoPremio.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/TipoPremio.php rename to app_old/incoviba/modelos/src/nuevo/Venta/TipoPremio.php diff --git a/incoviba/modelos/src/nuevo/Venta/Unidad.php b/app_old/incoviba/modelos/src/nuevo/Venta/Unidad.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/Unidad.php rename to app_old/incoviba/modelos/src/nuevo/Venta/Unidad.php diff --git a/incoviba/modelos/src/nuevo/Venta/UnidadPropiedad.php b/app_old/incoviba/modelos/src/nuevo/Venta/UnidadPropiedad.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/UnidadPropiedad.php rename to app_old/incoviba/modelos/src/nuevo/Venta/UnidadPropiedad.php diff --git a/incoviba/modelos/src/nuevo/Venta/UnidadReserva.php b/app_old/incoviba/modelos/src/nuevo/Venta/UnidadReserva.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/UnidadReserva.php rename to app_old/incoviba/modelos/src/nuevo/Venta/UnidadReserva.php diff --git a/incoviba/modelos/src/nuevo/Venta/Venta.php b/app_old/incoviba/modelos/src/nuevo/Venta/Venta.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/Venta.php rename to app_old/incoviba/modelos/src/nuevo/Venta/Venta.php diff --git a/incoviba/modelos/src/old/Common/Banco.php b/app_old/incoviba/modelos/src/old/Common/Banco.php similarity index 100% rename from incoviba/modelos/src/old/Common/Banco.php rename to app_old/incoviba/modelos/src/old/Common/Banco.php diff --git a/incoviba/modelos/src/old/Common/Comuna.php b/app_old/incoviba/modelos/src/old/Common/Comuna.php similarity index 100% rename from incoviba/modelos/src/old/Common/Comuna.php rename to app_old/incoviba/modelos/src/old/Common/Comuna.php diff --git a/incoviba/modelos/src/old/Common/Direccion.php b/app_old/incoviba/modelos/src/old/Common/Direccion.php similarity index 100% rename from incoviba/modelos/src/old/Common/Direccion.php rename to app_old/incoviba/modelos/src/old/Common/Direccion.php diff --git a/incoviba/modelos/src/old/Common/Provincia.php b/app_old/incoviba/modelos/src/old/Common/Provincia.php similarity index 100% rename from incoviba/modelos/src/old/Common/Provincia.php rename to app_old/incoviba/modelos/src/old/Common/Provincia.php diff --git a/incoviba/modelos/src/old/Common/Region.php b/app_old/incoviba/modelos/src/old/Common/Region.php similarity index 100% rename from incoviba/modelos/src/old/Common/Region.php rename to app_old/incoviba/modelos/src/old/Common/Region.php diff --git a/incoviba/modelos/src/old/Inmobiliaria/Cuenta.php b/app_old/incoviba/modelos/src/old/Inmobiliaria/Cuenta.php similarity index 100% rename from incoviba/modelos/src/old/Inmobiliaria/Cuenta.php rename to app_old/incoviba/modelos/src/old/Inmobiliaria/Cuenta.php diff --git a/incoviba/modelos/src/old/Inmobiliaria/Inmobiliaria.php b/app_old/incoviba/modelos/src/old/Inmobiliaria/Inmobiliaria.php similarity index 100% rename from incoviba/modelos/src/old/Inmobiliaria/Inmobiliaria.php rename to app_old/incoviba/modelos/src/old/Inmobiliaria/Inmobiliaria.php diff --git a/incoviba/modelos/src/old/Inmobiliaria/RelacionInmobiliarias.php b/app_old/incoviba/modelos/src/old/Inmobiliaria/RelacionInmobiliarias.php similarity index 100% rename from incoviba/modelos/src/old/Inmobiliaria/RelacionInmobiliarias.php rename to app_old/incoviba/modelos/src/old/Inmobiliaria/RelacionInmobiliarias.php diff --git a/incoviba/modelos/src/old/Inmobiliaria/TipoSociedad.php b/app_old/incoviba/modelos/src/old/Inmobiliaria/TipoSociedad.php similarity index 100% rename from incoviba/modelos/src/old/Inmobiliaria/TipoSociedad.php rename to app_old/incoviba/modelos/src/old/Inmobiliaria/TipoSociedad.php diff --git a/incoviba/modelos/src/old/Proyecto/Agente.php b/app_old/incoviba/modelos/src/old/Proyecto/Agente.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/Agente.php rename to app_old/incoviba/modelos/src/old/Proyecto/Agente.php diff --git a/incoviba/modelos/src/old/Proyecto/AgenteTipo.php b/app_old/incoviba/modelos/src/old/Proyecto/AgenteTipo.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/AgenteTipo.php rename to app_old/incoviba/modelos/src/old/Proyecto/AgenteTipo.php diff --git a/incoviba/modelos/src/old/Proyecto/AvanceConstruccion.php b/app_old/incoviba/modelos/src/old/Proyecto/AvanceConstruccion.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/AvanceConstruccion.php rename to app_old/incoviba/modelos/src/old/Proyecto/AvanceConstruccion.php diff --git a/incoviba/modelos/src/old/Proyecto/Cobro.php b/app_old/incoviba/modelos/src/old/Proyecto/Cobro.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/Cobro.php rename to app_old/incoviba/modelos/src/old/Proyecto/Cobro.php diff --git a/incoviba/modelos/src/old/Proyecto/Costo.php b/app_old/incoviba/modelos/src/old/Proyecto/Costo.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/Costo.php rename to app_old/incoviba/modelos/src/old/Proyecto/Costo.php diff --git a/incoviba/modelos/src/old/Proyecto/EstadoCobro.php b/app_old/incoviba/modelos/src/old/Proyecto/EstadoCobro.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/EstadoCobro.php rename to app_old/incoviba/modelos/src/old/Proyecto/EstadoCobro.php diff --git a/incoviba/modelos/src/old/Proyecto/EstadoProyecto.php b/app_old/incoviba/modelos/src/old/Proyecto/EstadoProyecto.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/EstadoProyecto.php rename to app_old/incoviba/modelos/src/old/Proyecto/EstadoProyecto.php diff --git a/incoviba/modelos/src/old/Proyecto/EstadoProyectoAgente.php b/app_old/incoviba/modelos/src/old/Proyecto/EstadoProyectoAgente.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/EstadoProyectoAgente.php rename to app_old/incoviba/modelos/src/old/Proyecto/EstadoProyectoAgente.php diff --git a/incoviba/modelos/src/old/Proyecto/EtapaProyecto.php b/app_old/incoviba/modelos/src/old/Proyecto/EtapaProyecto.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/EtapaProyecto.php rename to app_old/incoviba/modelos/src/old/Proyecto/EtapaProyecto.php diff --git a/incoviba/modelos/src/old/Proyecto/Pagare.php b/app_old/incoviba/modelos/src/old/Proyecto/Pagare.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/Pagare.php rename to app_old/incoviba/modelos/src/old/Proyecto/Pagare.php diff --git a/incoviba/modelos/src/old/Proyecto/Proyectista.php b/app_old/incoviba/modelos/src/old/Proyecto/Proyectista.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/Proyectista.php rename to app_old/incoviba/modelos/src/old/Proyecto/Proyectista.php diff --git a/incoviba/modelos/src/old/Proyecto/Proyectistas.php b/app_old/incoviba/modelos/src/old/Proyecto/Proyectistas.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/Proyectistas.php rename to app_old/incoviba/modelos/src/old/Proyecto/Proyectistas.php diff --git a/incoviba/modelos/src/old/Proyecto/Proyecto.php b/app_old/incoviba/modelos/src/old/Proyecto/Proyecto.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/Proyecto.php rename to app_old/incoviba/modelos/src/old/Proyecto/Proyecto.php diff --git a/incoviba/modelos/src/old/Proyecto/ProyectoAgente.php b/app_old/incoviba/modelos/src/old/Proyecto/ProyectoAgente.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/ProyectoAgente.php rename to app_old/incoviba/modelos/src/old/Proyecto/ProyectoAgente.php diff --git a/incoviba/modelos/src/old/Proyecto/ProyectoTipoUnidad.php b/app_old/incoviba/modelos/src/old/Proyecto/ProyectoTipoUnidad.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/ProyectoTipoUnidad.php rename to app_old/incoviba/modelos/src/old/Proyecto/ProyectoTipoUnidad.php diff --git a/incoviba/modelos/src/old/Proyecto/RelacionAgentes.php b/app_old/incoviba/modelos/src/old/Proyecto/RelacionAgentes.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/RelacionAgentes.php rename to app_old/incoviba/modelos/src/old/Proyecto/RelacionAgentes.php diff --git a/incoviba/modelos/src/old/Proyecto/RenovacionPagare.php b/app_old/incoviba/modelos/src/old/Proyecto/RenovacionPagare.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/RenovacionPagare.php rename to app_old/incoviba/modelos/src/old/Proyecto/RenovacionPagare.php diff --git a/incoviba/modelos/src/old/Proyecto/TipoAgente.php b/app_old/incoviba/modelos/src/old/Proyecto/TipoAgente.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/TipoAgente.php rename to app_old/incoviba/modelos/src/old/Proyecto/TipoAgente.php diff --git a/incoviba/modelos/src/old/Proyecto/TipoCobro.php b/app_old/incoviba/modelos/src/old/Proyecto/TipoCobro.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/TipoCobro.php rename to app_old/incoviba/modelos/src/old/Proyecto/TipoCobro.php diff --git a/incoviba/modelos/src/old/Proyecto/TipoElemento.php b/app_old/incoviba/modelos/src/old/Proyecto/TipoElemento.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/TipoElemento.php rename to app_old/incoviba/modelos/src/old/Proyecto/TipoElemento.php diff --git a/incoviba/modelos/src/old/Proyecto/TipoEstadoCobro.php b/app_old/incoviba/modelos/src/old/Proyecto/TipoEstadoCobro.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/TipoEstadoCobro.php rename to app_old/incoviba/modelos/src/old/Proyecto/TipoEstadoCobro.php diff --git a/incoviba/modelos/src/old/Proyecto/TipoEstadoProyecto.php b/app_old/incoviba/modelos/src/old/Proyecto/TipoEstadoProyecto.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/TipoEstadoProyecto.php rename to app_old/incoviba/modelos/src/old/Proyecto/TipoEstadoProyecto.php diff --git a/incoviba/modelos/src/old/Proyecto/TipoEstadoProyectoAgente.php b/app_old/incoviba/modelos/src/old/Proyecto/TipoEstadoProyectoAgente.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/TipoEstadoProyectoAgente.php rename to app_old/incoviba/modelos/src/old/Proyecto/TipoEstadoProyectoAgente.php diff --git a/incoviba/modelos/src/old/Proyecto/TipoMonedaPagare.php b/app_old/incoviba/modelos/src/old/Proyecto/TipoMonedaPagare.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/TipoMonedaPagare.php rename to app_old/incoviba/modelos/src/old/Proyecto/TipoMonedaPagare.php diff --git a/incoviba/modelos/src/old/Proyecto/TipoProyectista.php b/app_old/incoviba/modelos/src/old/Proyecto/TipoProyectista.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/TipoProyectista.php rename to app_old/incoviba/modelos/src/old/Proyecto/TipoProyectista.php diff --git a/incoviba/modelos/src/old/Proyecto/TipoTipologia.php b/app_old/incoviba/modelos/src/old/Proyecto/TipoTipologia.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/TipoTipologia.php rename to app_old/incoviba/modelos/src/old/Proyecto/TipoTipologia.php diff --git a/incoviba/modelos/src/old/Proyecto/Tipologia.php b/app_old/incoviba/modelos/src/old/Proyecto/Tipologia.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/Tipologia.php rename to app_old/incoviba/modelos/src/old/Proyecto/Tipologia.php diff --git a/incoviba/modelos/src/old/Venta/BonoPie.php b/app_old/incoviba/modelos/src/old/Venta/BonoPie.php similarity index 100% rename from incoviba/modelos/src/old/Venta/BonoPie.php rename to app_old/incoviba/modelos/src/old/Venta/BonoPie.php diff --git a/incoviba/modelos/src/old/Venta/Cierre.php b/app_old/incoviba/modelos/src/old/Venta/Cierre.php similarity index 100% rename from incoviba/modelos/src/old/Venta/Cierre.php rename to app_old/incoviba/modelos/src/old/Venta/Cierre.php diff --git a/incoviba/modelos/src/old/Venta/Comentario.php b/app_old/incoviba/modelos/src/old/Venta/Comentario.php similarity index 100% rename from incoviba/modelos/src/old/Venta/Comentario.php rename to app_old/incoviba/modelos/src/old/Venta/Comentario.php diff --git a/incoviba/modelos/src/old/Venta/Credito.php b/app_old/incoviba/modelos/src/old/Venta/Credito.php similarity index 100% rename from incoviba/modelos/src/old/Venta/Credito.php rename to app_old/incoviba/modelos/src/old/Venta/Credito.php diff --git a/incoviba/modelos/src/old/Venta/Cuota.php b/app_old/incoviba/modelos/src/old/Venta/Cuota.php similarity index 100% rename from incoviba/modelos/src/old/Venta/Cuota.php rename to app_old/incoviba/modelos/src/old/Venta/Cuota.php diff --git a/incoviba/modelos/src/old/Venta/Entrega.php b/app_old/incoviba/modelos/src/old/Venta/Entrega.php similarity index 100% rename from incoviba/modelos/src/old/Venta/Entrega.php rename to app_old/incoviba/modelos/src/old/Venta/Entrega.php diff --git a/incoviba/modelos/src/old/Venta/Escritura.php b/app_old/incoviba/modelos/src/old/Venta/Escritura.php similarity index 100% rename from incoviba/modelos/src/old/Venta/Escritura.php rename to app_old/incoviba/modelos/src/old/Venta/Escritura.php diff --git a/incoviba/modelos/src/old/Venta/EstadoCierre.php b/app_old/incoviba/modelos/src/old/Venta/EstadoCierre.php similarity index 100% rename from incoviba/modelos/src/old/Venta/EstadoCierre.php rename to app_old/incoviba/modelos/src/old/Venta/EstadoCierre.php diff --git a/incoviba/modelos/src/old/Venta/EstadoPago.php b/app_old/incoviba/modelos/src/old/Venta/EstadoPago.php similarity index 100% rename from incoviba/modelos/src/old/Venta/EstadoPago.php rename to app_old/incoviba/modelos/src/old/Venta/EstadoPago.php diff --git a/incoviba/modelos/src/old/Venta/EstadoPrecio.php b/app_old/incoviba/modelos/src/old/Venta/EstadoPrecio.php similarity index 100% rename from incoviba/modelos/src/old/Venta/EstadoPrecio.php rename to app_old/incoviba/modelos/src/old/Venta/EstadoPrecio.php diff --git a/incoviba/modelos/src/old/Venta/EstadoProblema.php b/app_old/incoviba/modelos/src/old/Venta/EstadoProblema.php similarity index 100% rename from incoviba/modelos/src/old/Venta/EstadoProblema.php rename to app_old/incoviba/modelos/src/old/Venta/EstadoProblema.php diff --git a/incoviba/modelos/src/old/Venta/EstadoUnidadBloqueada.php b/app_old/incoviba/modelos/src/old/Venta/EstadoUnidadBloqueada.php similarity index 100% rename from incoviba/modelos/src/old/Venta/EstadoUnidadBloqueada.php rename to app_old/incoviba/modelos/src/old/Venta/EstadoUnidadBloqueada.php diff --git a/incoviba/modelos/src/old/Venta/EstadoVenta.php b/app_old/incoviba/modelos/src/old/Venta/EstadoVenta.php similarity index 100% rename from incoviba/modelos/src/old/Venta/EstadoVenta.php rename to app_old/incoviba/modelos/src/old/Venta/EstadoVenta.php diff --git a/incoviba/modelos/src/old/Venta/Pago.php b/app_old/incoviba/modelos/src/old/Venta/Pago.php similarity index 100% rename from incoviba/modelos/src/old/Venta/Pago.php rename to app_old/incoviba/modelos/src/old/Venta/Pago.php diff --git a/incoviba/modelos/src/old/Venta/Pie.php b/app_old/incoviba/modelos/src/old/Venta/Pie.php similarity index 100% rename from incoviba/modelos/src/old/Venta/Pie.php rename to app_old/incoviba/modelos/src/old/Venta/Pie.php diff --git a/incoviba/modelos/src/old/Venta/Precio.php b/app_old/incoviba/modelos/src/old/Venta/Precio.php similarity index 100% rename from incoviba/modelos/src/old/Venta/Precio.php rename to app_old/incoviba/modelos/src/old/Venta/Precio.php diff --git a/incoviba/modelos/src/old/Venta/Problema.php b/app_old/incoviba/modelos/src/old/Venta/Problema.php similarity index 100% rename from incoviba/modelos/src/old/Venta/Problema.php rename to app_old/incoviba/modelos/src/old/Venta/Problema.php diff --git a/incoviba/modelos/src/old/Venta/Promocion.php b/app_old/incoviba/modelos/src/old/Venta/Promocion.php similarity index 100% rename from incoviba/modelos/src/old/Venta/Promocion.php rename to app_old/incoviba/modelos/src/old/Venta/Promocion.php diff --git a/incoviba/modelos/src/old/Venta/PromocionVenta.php b/app_old/incoviba/modelos/src/old/Venta/PromocionVenta.php similarity index 100% rename from incoviba/modelos/src/old/Venta/PromocionVenta.php rename to app_old/incoviba/modelos/src/old/Venta/PromocionVenta.php diff --git a/incoviba/modelos/src/old/Venta/Propiedad.php b/app_old/incoviba/modelos/src/old/Venta/Propiedad.php similarity index 100% rename from incoviba/modelos/src/old/Venta/Propiedad.php rename to app_old/incoviba/modelos/src/old/Venta/Propiedad.php diff --git a/incoviba/modelos/src/old/Venta/PropiedadUnidad.php b/app_old/incoviba/modelos/src/old/Venta/PropiedadUnidad.php similarity index 100% rename from incoviba/modelos/src/old/Venta/PropiedadUnidad.php rename to app_old/incoviba/modelos/src/old/Venta/PropiedadUnidad.php diff --git a/incoviba/modelos/src/old/Venta/Propietario.php b/app_old/incoviba/modelos/src/old/Venta/Propietario.php similarity index 100% rename from incoviba/modelos/src/old/Venta/Propietario.php rename to app_old/incoviba/modelos/src/old/Venta/Propietario.php diff --git a/incoviba/modelos/src/old/Venta/Subsidio.php b/app_old/incoviba/modelos/src/old/Venta/Subsidio.php similarity index 100% rename from incoviba/modelos/src/old/Venta/Subsidio.php rename to app_old/incoviba/modelos/src/old/Venta/Subsidio.php diff --git a/incoviba/modelos/src/old/Venta/TipoEstadoCierre.php b/app_old/incoviba/modelos/src/old/Venta/TipoEstadoCierre.php similarity index 100% rename from incoviba/modelos/src/old/Venta/TipoEstadoCierre.php rename to app_old/incoviba/modelos/src/old/Venta/TipoEstadoCierre.php diff --git a/incoviba/modelos/src/old/Venta/TipoEstadoPago.php b/app_old/incoviba/modelos/src/old/Venta/TipoEstadoPago.php similarity index 100% rename from incoviba/modelos/src/old/Venta/TipoEstadoPago.php rename to app_old/incoviba/modelos/src/old/Venta/TipoEstadoPago.php diff --git a/incoviba/modelos/src/old/Venta/TipoEstadoPrecio.php b/app_old/incoviba/modelos/src/old/Venta/TipoEstadoPrecio.php similarity index 100% rename from incoviba/modelos/src/old/Venta/TipoEstadoPrecio.php rename to app_old/incoviba/modelos/src/old/Venta/TipoEstadoPrecio.php diff --git a/incoviba/modelos/src/old/Venta/TipoEstadoUnidadBloqueada.php b/app_old/incoviba/modelos/src/old/Venta/TipoEstadoUnidadBloqueada.php similarity index 100% rename from incoviba/modelos/src/old/Venta/TipoEstadoUnidadBloqueada.php rename to app_old/incoviba/modelos/src/old/Venta/TipoEstadoUnidadBloqueada.php diff --git a/incoviba/modelos/src/old/Venta/TipoEstadoVenta.php b/app_old/incoviba/modelos/src/old/Venta/TipoEstadoVenta.php similarity index 100% rename from incoviba/modelos/src/old/Venta/TipoEstadoVenta.php rename to app_old/incoviba/modelos/src/old/Venta/TipoEstadoVenta.php diff --git a/incoviba/modelos/src/old/Venta/TipoPago.php b/app_old/incoviba/modelos/src/old/Venta/TipoPago.php similarity index 100% rename from incoviba/modelos/src/old/Venta/TipoPago.php rename to app_old/incoviba/modelos/src/old/Venta/TipoPago.php diff --git a/incoviba/modelos/src/old/Venta/TipoUnidad.php b/app_old/incoviba/modelos/src/old/Venta/TipoUnidad.php similarity index 100% rename from incoviba/modelos/src/old/Venta/TipoUnidad.php rename to app_old/incoviba/modelos/src/old/Venta/TipoUnidad.php diff --git a/incoviba/modelos/src/old/Venta/TipoValorCierre.php b/app_old/incoviba/modelos/src/old/Venta/TipoValorCierre.php similarity index 100% rename from incoviba/modelos/src/old/Venta/TipoValorCierre.php rename to app_old/incoviba/modelos/src/old/Venta/TipoValorCierre.php diff --git a/incoviba/modelos/src/old/Venta/Unidad.php b/app_old/incoviba/modelos/src/old/Venta/Unidad.php similarity index 100% rename from incoviba/modelos/src/old/Venta/Unidad.php rename to app_old/incoviba/modelos/src/old/Venta/Unidad.php diff --git a/incoviba/modelos/src/old/Venta/UnidadBloqueada.php b/app_old/incoviba/modelos/src/old/Venta/UnidadBloqueada.php similarity index 100% rename from incoviba/modelos/src/old/Venta/UnidadBloqueada.php rename to app_old/incoviba/modelos/src/old/Venta/UnidadBloqueada.php diff --git a/incoviba/modelos/src/old/Venta/UnidadCierre.php b/app_old/incoviba/modelos/src/old/Venta/UnidadCierre.php similarity index 100% rename from incoviba/modelos/src/old/Venta/UnidadCierre.php rename to app_old/incoviba/modelos/src/old/Venta/UnidadCierre.php diff --git a/incoviba/modelos/src/old/Venta/ValorCierre.php b/app_old/incoviba/modelos/src/old/Venta/ValorCierre.php similarity index 100% rename from incoviba/modelos/src/old/Venta/ValorCierre.php rename to app_old/incoviba/modelos/src/old/Venta/ValorCierre.php diff --git a/incoviba/modelos/src/old/Venta/Venta.php b/app_old/incoviba/modelos/src/old/Venta/Venta.php similarity index 100% rename from incoviba/modelos/src/old/Venta/Venta.php rename to app_old/incoviba/modelos/src/old/Venta/Venta.php diff --git a/incoviba/modelos/src/old/Venta/Venta.php.save b/app_old/incoviba/modelos/src/old/Venta/Venta.php.save similarity index 100% rename from incoviba/modelos/src/old/Venta/Venta.php.save rename to app_old/incoviba/modelos/src/old/Venta/Venta.php.save diff --git a/package.json b/app_old/package.json similarity index 100% rename from package.json rename to app_old/package.json diff --git a/public/Pipfile b/app_old/public/Pipfile similarity index 100% rename from public/Pipfile rename to app_old/public/Pipfile diff --git a/public/api/.htaccess b/app_old/public/api/.htaccess similarity index 100% rename from public/api/.htaccess rename to app_old/public/api/.htaccess diff --git a/public/api/index.php b/app_old/public/api/index.php similarity index 100% rename from public/api/index.php rename to app_old/public/api/index.php diff --git a/public/api/keys b/app_old/public/api/keys similarity index 100% rename from public/api/keys rename to app_old/public/api/keys diff --git a/public/css/app.css b/app_old/public/css/app.css similarity index 100% rename from public/css/app.css rename to app_old/public/css/app.css diff --git a/public/css/custom.css b/app_old/public/css/custom.css similarity index 100% rename from public/css/custom.css rename to app_old/public/css/custom.css diff --git a/public/fonts/FontAwesome.otf b/app_old/public/fonts/FontAwesome.otf similarity index 100% rename from public/fonts/FontAwesome.otf rename to app_old/public/fonts/FontAwesome.otf diff --git a/public/fonts/fontawesome-webfont.eot b/app_old/public/fonts/fontawesome-webfont.eot similarity index 100% rename from public/fonts/fontawesome-webfont.eot rename to app_old/public/fonts/fontawesome-webfont.eot diff --git a/public/fonts/fontawesome-webfont.svg b/app_old/public/fonts/fontawesome-webfont.svg similarity index 100% rename from public/fonts/fontawesome-webfont.svg rename to app_old/public/fonts/fontawesome-webfont.svg diff --git a/public/fonts/fontawesome-webfont.ttf b/app_old/public/fonts/fontawesome-webfont.ttf similarity index 100% rename from public/fonts/fontawesome-webfont.ttf rename to app_old/public/fonts/fontawesome-webfont.ttf diff --git a/public/fonts/fontawesome-webfont.woff b/app_old/public/fonts/fontawesome-webfont.woff similarity index 100% rename from public/fonts/fontawesome-webfont.woff rename to app_old/public/fonts/fontawesome-webfont.woff diff --git a/public/fonts/fontawesome-webfont.woff2 b/app_old/public/fonts/fontawesome-webfont.woff2 similarity index 100% rename from public/fonts/fontawesome-webfont.woff2 rename to app_old/public/fonts/fontawesome-webfont.woff2 diff --git a/public/fonts/glyphicons-halflings-regular.eot b/app_old/public/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from public/fonts/glyphicons-halflings-regular.eot rename to app_old/public/fonts/glyphicons-halflings-regular.eot diff --git a/public/fonts/glyphicons-halflings-regular.svg b/app_old/public/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from public/fonts/glyphicons-halflings-regular.svg rename to app_old/public/fonts/glyphicons-halflings-regular.svg diff --git a/public/fonts/glyphicons-halflings-regular.ttf b/app_old/public/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from public/fonts/glyphicons-halflings-regular.ttf rename to app_old/public/fonts/glyphicons-halflings-regular.ttf diff --git a/public/fonts/glyphicons-halflings-regular.woff b/app_old/public/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from public/fonts/glyphicons-halflings-regular.woff rename to app_old/public/fonts/glyphicons-halflings-regular.woff diff --git a/public/fonts/glyphicons-halflings-regular.woff2 b/app_old/public/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from public/fonts/glyphicons-halflings-regular.woff2 rename to app_old/public/fonts/glyphicons-halflings-regular.woff2 diff --git a/public/images/Isotipo 16.png b/app_old/public/images/Isotipo 16.png similarity index 100% rename from public/images/Isotipo 16.png rename to app_old/public/images/Isotipo 16.png diff --git a/public/images/Isotipo 32.png b/app_old/public/images/Isotipo 32.png similarity index 100% rename from public/images/Isotipo 32.png rename to app_old/public/images/Isotipo 32.png diff --git a/public/images/Isotipo 64.png b/app_old/public/images/Isotipo 64.png similarity index 100% rename from public/images/Isotipo 64.png rename to app_old/public/images/Isotipo 64.png diff --git a/public/images/logo_cabezal.png b/app_old/public/images/logo_cabezal.png similarity index 100% rename from public/images/logo_cabezal.png rename to app_old/public/images/logo_cabezal.png diff --git a/app_old/public/index.php b/app_old/public/index.php new file mode 100644 index 0000000..7c36a8c --- /dev/null +++ b/app_old/public/index.php @@ -0,0 +1,8 @@ +run(); diff --git a/public/index.php b/app_old/public/index.php.old similarity index 100% rename from public/index.php rename to app_old/public/index.php.old diff --git a/public/install/create_admin.php b/app_old/public/install/create_admin.php similarity index 100% rename from public/install/create_admin.php rename to app_old/public/install/create_admin.php diff --git a/public/install/create_guest.php b/app_old/public/install/create_guest.php similarity index 100% rename from public/install/create_guest.php rename to app_old/public/install/create_guest.php diff --git a/public/install/create_user_base.php b/app_old/public/install/create_user_base.php similarity index 100% rename from public/install/create_user_base.php rename to app_old/public/install/create_user_base.php diff --git a/public/install/end_install.php b/app_old/public/install/end_install.php similarity index 100% rename from public/install/end_install.php rename to app_old/public/install/end_install.php diff --git a/public/install/index.php b/app_old/public/install/index.php similarity index 100% rename from public/install/index.php rename to app_old/public/install/index.php diff --git a/public/install/log_locations.php b/app_old/public/install/log_locations.php similarity index 100% rename from public/install/log_locations.php rename to app_old/public/install/log_locations.php diff --git a/public/install/next_step.php b/app_old/public/install/next_step.php similarity index 100% rename from public/install/next_step.php rename to app_old/public/install/next_step.php diff --git a/public/js/admin.js b/app_old/public/js/admin.js similarity index 100% rename from public/js/admin.js rename to app_old/public/js/admin.js diff --git a/public/js/app.js b/app_old/public/js/app.js similarity index 100% rename from public/js/app.js rename to app_old/public/js/app.js diff --git a/public/js/ventas/pies/cuotas/add.js b/app_old/public/js/ventas/pies/cuotas/add.js similarity index 100% rename from public/js/ventas/pies/cuotas/add.js rename to app_old/public/js/ventas/pies/cuotas/add.js diff --git a/public/links.log b/app_old/public/links.log similarity index 100% rename from public/links.log rename to app_old/public/links.log diff --git a/public/precios.csv b/app_old/public/precios.csv similarity index 100% rename from public/precios.csv rename to app_old/public/precios.csv diff --git a/resources/js/app.js b/app_old/resources/js/app.js similarity index 100% rename from resources/js/app.js rename to app_old/resources/js/app.js diff --git a/resources/js/binaryIndexOf.js b/app_old/resources/js/binaryIndexOf.js similarity index 100% rename from resources/js/binaryIndexOf.js rename to app_old/resources/js/binaryIndexOf.js diff --git a/resources/js/bootstrap.js b/app_old/resources/js/bootstrap.js similarity index 100% rename from resources/js/bootstrap.js rename to app_old/resources/js/bootstrap.js diff --git a/resources/js/chart.js b/app_old/resources/js/chart.js similarity index 100% rename from resources/js/chart.js rename to app_old/resources/js/chart.js diff --git a/resources/js/jquery.filterTable.js b/app_old/resources/js/jquery.filterTable.js similarity index 100% rename from resources/js/jquery.filterTable.js rename to app_old/resources/js/jquery.filterTable.js diff --git a/app_old/resources/less/Controller/Admin.php b/app_old/resources/less/Controller/Admin.php new file mode 100644 index 0000000..137057c --- /dev/null +++ b/app_old/resources/less/Controller/Admin.php @@ -0,0 +1,233 @@ +list(); + } + public static function listNamespaces() + { + $base = [ + 'Common', + 'Inmobiliaria', + 'Proyecto', + 'Venta' + ]; + $nss = [ + 'Incoviba' => [ + 'old' => $base, + 'new' => $base + ] + ]; + + echo json_encode(['namespaces' => self::collapseMultiArray($nss)]); + } + protected static function collapseMultiArray($array, $level = '') + { + $output = []; + foreach ($array as $key => $subarray) { + if (is_array($subarray)) { + $output = array_merge($output, self::collapseMultiArray($subarray, $level . '\\' . $key)); + } else { + $output []= $level . '\\' . $subarray; + } + } + + return $output; + } + public static function createModel() + { + $db = post('database'); + $ns = post('namespace'); + $table = post('table'); + + $modeler = new DBToModel($db); + echo $modeler->create($ns, $table); + } + public static function list_roles() + { + $roles = \Model::factory(\Incoviba\common\Role::class)->findMany(); + echo view('admin.roles.list', compact('roles')); + } + public static function add_role() + { + echo view('admin.roles.add'); + } + public static function do_add_role() + { + $role = \Model::factory(\Incoviba\common\Role::class)->where('description', post('description'))->findOne(); + if ($role === false) { + $role = \Model::factory(\Incoviba\common\Role::class)->create(['description' => post('description')]); + $role->save(); + } + header('Location: ' . nUrl('admin', 'add_role')); + } + public static function role() + { + $role = \Model::factory(\Incoviba\common\Role::class)->findOne(get('role')); + $actions = model(Action::class)->orderByAsc('description')->findMany(); + $permissions = []; + foreach ($actions as $action) { + $permissions []= (object) ['description' => $action->description, 'status' => false, 'inherited' => false]; + } + array_walk($permissions, function(&$el, $i, $role) { + if ($role->checkAccess($el->description)) { + $el->status = true; + if ($role->isInherited($el->description)) { + $el->inherited = true; + } + } + }, $role); + echo view('admin.roles.show', compact('role', 'permissions')); + } + public static function add_role_permissions() + { + $role = \Model::factory(\Incoviba\common\Role::class)->findOne(get('role')); + $locations = \Model::factory(\Incoviba\common\Location::class)->findMany(); + $actions = model(\Incoviba\common\Action::class)->findMany(); + echo view('admin.roles.add_permissions', compact('role', 'locations', 'actions')); + } + public static function do_add_role_permissions() + { + $role = \Model::factory(\Incoviba\common\Role::class)->findOne(get('role')); + $actions = model(\Incoviba\common\Action::class)->findMany(); + foreach ($actions as $action) { + $p = \Model::factory(\Incoviba\common\Permission::class)->where('type', 2)->where('ext_id', $role->id)->where('action_id', $action->id)->findOne(); + if (array_search($action->id, post('allowed'))) { + if (!$p) { + $data = [ + 'type' => 2, + 'ext_id' => $role->id, + 'action_id' => $action->id + ]; + $p = model(\Incoviba\common\Permission::class)->create($data); + } + $p->status = 1; + } else { + if ($p !== false) { + $p->status = 0; + } + } + if ($p !== false) { + $p->save(); + } + } + header('Location: ' . nUrl('admin', 'role', ['role' => $role->id])); + } + public static function list_users() + { + $users = \Model::factory(\Incoviba\common\User::class)->orderByAsc('name')->findMany(); + echo view('admin.users.list', compact('users')); + } + public static function add_user() + { + echo view('admin.users.add'); + } + public static function do_add_user() + { + $user = \Model::factory(\Incoviba\common\User::class)->where('name', post('name'))->findOne(); + if ($user === false) { + $user = \Model::factory(\Incoviba\common\User::class)->create(); + $user->name = post('name'); + $user->password(post('password')); + + $user->save(); + } + header('Location: ' . url('', ['p' => 'admin', 'a' => 'add_user'])); + } + public static function user() + { + $user = \Model::factory(\Incoviba\common\User::class)->findOne(get('user')); + echo view('admin.users.show', compact('user')); + } + public static function add_user_role() + { + if (get('user') !== false) { + $user = \Model::factory(\Incoviba\common\User::class)->findOne(get('user')); + $roles = \Model::factory(\Incoviba\common\Role::class)->findMany(); + return view('admin.users.add_role', compact('user', 'roles')); + } elseif (get('role') !== false) { + $role = \Model::factory(\Incoviba\common\Role::class)->findOne(get('role')); + $users = \Model::factory(\Incoviba\common\User::class)->findMany(); + return view('admin.roles.add_users', compact('users', 'role')); + } + } + public static function do_add_user_role() + { + if (get('user') !== false) { + $user = \Model::factory(\Incoviba\common\User::class)->findOne(get('user')); + foreach (post('role') as $r_id) { + $role = \Model::factory(\Incoviba\common\Role::class)->findOne($r_id); + + $usrRl = \Model::factory(\Incoviba\common\UserRole::class)->where('user', $user->id)->where('role', $role->id)->findOne(); + if ($usrRl === false) { + $usrRl = \Model::factory(\Incoviba\common\UserRole::class)->create(['user' => $user->id, 'role' => $role->id]); + $usrRl->save(); + } + } + header('Location: ' . url('', ['p' => 'admin', 'a' => 'user', 'user' => $user->id])); + } elseif (get('role') !== false) { + $role = \Model::factory(\Incoviba\common\Role::class)->findOne(get('role')); + foreach (post('users') as $u_id) { + $user = \Model::factory(\Incoviba\common\User::class)->findOne($u_id); + + $usrRl = \Model::factory(\Incoviba\common\UserRole::class)->where('user', $user->id)->where('role', $role->id)->findOne(); + if ($usrRl === false) { + $usrRl = \Model::factory(\Incoviba\common\UserRole::class)->create(['user' => $user->id, 'role' => $role->id]); + $usrRl->save(); + } + } + header('Location: ' . url('', ['p' => 'admin', 'a' => 'role', 'role' => $role->id])); + } + } + public static function remove_user_role() + { + $q = "DELETE FROM user_roles WHERE user = ? AND role = ?"; + $st = \ORM::getDb()->prepare($q); + $st->execute([get('user'), get('role')]); + header('Location: ' . nUrl('admin')); + } + public static function delete_user() + { + $q = "DELETE FROM user_roles WHERE user = ?"; + $st = \ORM::getDb()->prepare($q); + $st->execute([get('user')]); + $q = "DELETE FROM logins WHERE user = ?"; + $st = \ORM::getDb()->prepare($q); + $st->execute([get('user')]); + $q = "DELETE FROM permissions WHERE type = 1 AND ext_id = ?"; + $st = \ORM::getDb()->prepare($q); + $st->execute([get('user')]); + $user = \model(\Incoviba\common\User::class)->findOne(get('user')); + $user->delete(); + header('Location: ' . nUrl('admin', 'list_users')); + } + public static function reset_user() + { + $user = model(\Incoviba\common\User::class)->findOne(get('user')); + $user->password('123456'); + $user->save(); + header('Location: ' . nUrl('admin', 'user', ['user' => $user->id])); + } +} +?> diff --git a/app_old/resources/less/Controller/Ajax.php b/app_old/resources/less/Controller/Ajax.php new file mode 100644 index 0000000..912c979 --- /dev/null +++ b/app_old/resources/less/Controller/Ajax.php @@ -0,0 +1,215 @@ +whereNotEqual('nombre', '')->order_by_asc('nombre')->findMany(); + foreach ($bancos as &$banco) { + $banco = $banco->as_array('nombre')['nombre']; + } + return json_encode($bancos); + } + protected static function buscarBanco() + { + $q = get('q'); + if ($q == null) { + $q = get('query'); + if ($q == null) { + return ''; + } + } + $bancos = \Model::factory(\Incoviba\old\Common\Banco::class)->whereLike('nombre', '%' . $q . '%')->order_by_asc('nombre')->findMany(); + foreach ($bancos as &$banco) { + $banco = $banco->as_array('nombre')['nombre']; + } + return json_encode($bancos); + } + public static function comunas() + { + $id = post('region'); + $comunas = \Model::factory(\Incoviba\old\Common\Comuna::class) + ->select('comuna.*') + ->join('provincia', ['provincia.id', '=', 'comuna.provincia']) + ->where('provincia.region', $id) + ->order_by_asc('comuna.descripcion') + ->findMany(); + + foreach ($comunas as &$comuna) { + $comuna = $comuna->as_array('id', 'descripcion'); + } + return json_encode($comunas); + } + public static function propietario() + { + $id = post('rut'); + $propietario = \Model::factory(\Incoviba\old\Venta\Propietario::class)->where('rut', $id)->findOne(); + if ($propietario) { + $propietario = $propietario->as_array(); + return json_encode($propietario); + } + return null; + } + public static function direccion() + { + $id = post('direccion'); + $direccion = \Model::factory(\Incoviba\old\Common\Direccion::class)->findOne($id); + $comuna = $direccion->comuna(); + $provincia = $comuna->provincia(); + $region = $provincia->region(); + $direccion = $direccion->as_array(); + $direccion['comuna'] = $comuna->as_array(); + $direccion['comuna']['provincia'] = $provincia->as_array(); + $direccion['comuna']['provincia']['region'] = $region->as_array(); + return json_encode($direccion); + } + public static function tipo_unidades() + { + $id = post('proyecto'); + $proyecto = \Model::factory(\Incoviba\old\Proyecto\Proyecto::class)->findOne($id); + $tipos = $proyecto->tipoUnidades(); + foreach ($tipos as &$tipo) { + $tipo = $tipo->as_array(); + } + return json_encode($tipos); + } + public static function unidades() + { + $id_proyecto = post('proyecto'); + $id_tipo = post('tipo'); + + $proyecto = model(\Incoviba\old\Proyecto\Proyecto::class)->findOne($id_proyecto); + $unidades = $proyecto->unidadesDisponibles($id_tipo); + foreach ($unidades as &$unidad) { + $tipologia = $unidad->tipologia(); + $unidad = $unidad->as_array(); + $unidad['tipologia'] = $tipologia->as_array(); + if ($tipologia->tipologia()) { + $unidad['tipologia']['tipologia'] = (array) $tipologia->tipologia(); + continue; + } + $unidad['tipologia']['tipologia'] = ['descripcion' => $tipologia->abreviacion]; + } + return json_encode($unidades); + } + public static function unidades_precios() + { + $proyecto = model(\Incoviba\old\Proyecto\Proyecto::class)->findOne(post('proyecto')); + $unidades = $proyecto->unidades(); + usort($unidades, function($a, $b) { + $t = $a->tipo - $b->tipo; + if ($t == 0) { + return (int) $a->descripcion - (int) $b->descripcion; + } + return $t; + }); + $output = []; + foreach ($unidades as $u) { + $info = [ + 'id' => $u->id, + 'abreviacion' => $u->abreviacion, + 'descripcion' => $u->descripcion, + 'valor' => '--' + ]; + if ($u->precio()) { + $info['valor'] = format('ufs', $u->precio()->valor, null, true); + } + $output []= $info; + } + return json_encode($output); + } + public static function operadores() + { + $id_proyecto = post('proyecto'); + $proyecto = \Model::factory(\Incoviba\old\Proyecto\Proyecto::class)->findOne($id_proyecto); + $operadores = $proyecto->operadores(); + foreach ($operadores as &$operador) { + $operador = [ + 'id' => $operador->id, + 'abreviacion' => $operador->abreviacion + ]; + } + return json_encode($operadores); + } + public static function promociones() + { + $id = post('proyecto'); + $proyecto = \Model::factory(\Incoviba\old\Proyecto\Proyecto::class)->findOne($id); + $promociones = $proyecto->promociones(); + foreach ($promociones as &$promocion) { + $promocion = $promocion->as_array(); + } + return json_encode($promociones); + } + public static function nombres() + { + $nss = model(Propietario::class)->select('nombres')->orderByAsc('nombres')->findMany(); + $nombres = []; + foreach ($nss as $n) { + $ns = explode(' ', $n->nombres); + foreach ($ns as $nombre) { + $nombres []= $nombre; + } + } + $nombres = array_values(array_unique($nombres)); + return json_encode($nombres); + } + public static function apellidos() + { + $aps = model(Propietario::class)->select('apellido_paterno')->orderByAsc('apellido_paterno')->findMany(); + $apellidos = []; + foreach ($aps as $ap) { + $apellidos []= $ap->apellido_paterno; + } + $aps = model(Propietario::class)->select('apellido_materno')->orderByAsc('apellido_materno')->findMany(); + foreach ($aps as $ap) { + $apellidos []= $ap->apellido_paterno; + } + $apellidos = array_values(array_unique($apellidos)); + sort($apellidos); + return json_encode($apellidos); + } + public static function calles() + { + $results = model(Direccion::class)->select('calle')->orderByAsc('calle')->findMany(); + $calles = []; + foreach ($results as $result) { + $calles []= $result->calle; + } + $calles = array_values(array_unique($calles)); + return json_encode($calles); + } + public static function inmobiliarias() + { + $q = post('rut'); + $inmobiliaria = model(Inmobiliaria::class)->findOne($q); + return json_encode($inmobiliaria->as_array()); + } +} +?> diff --git a/resources/less/Controller/Auth.php b/app_old/resources/less/Controller/Auth.php similarity index 100% rename from resources/less/Controller/Auth.php rename to app_old/resources/less/Controller/Auth.php diff --git a/resources/less/Controller/Bonos.php b/app_old/resources/less/Controller/Bonos.php similarity index 100% rename from resources/less/Controller/Bonos.php rename to app_old/resources/less/Controller/Bonos.php diff --git a/app_old/resources/less/Controller/Buscar.php b/app_old/resources/less/Controller/Buscar.php new file mode 100644 index 0000000..ef62a9e --- /dev/null +++ b/app_old/resources/less/Controller/Buscar.php @@ -0,0 +1,340 @@ + $results]); + } + protected static function getResults() + { + $q = get('q'); + if ($q == null) { + $q = get('query'); + } + $t = get('t'); + if ($t == null) { + $t = get('tipo'); + } + $t = urldecode($t); + if ($t == null) { + $t = 'cualquiera'; + } + + $results = null; + if ($q != null) { + $q = urldecode($q); + $results = self::buscar($q, $t); + } + return $results; + } + public static function buscar($query, $tipo) + { + $method = 'buscar' . str_replace(' ', '', ucwords($tipo)); + if (is_callable(['self', $method])) { + $results = self::$method(self::prepareQuery($query)); + $results = self::removeDuplicates($results); + $results = self::sort($results); + return $results; + } + return []; + } + protected static function prepareQuery($query) + { + $query = str_replace('"', '"', $query); + $data = explode(' ', $query); + $regex = "~(?=\\S)[^'\"\\s]*(?:'[^']*'[^'\"\\s]*|\"[^\"]*\"[^'\"\\s]*)*~"; + preg_match_all($regex, $query, $data); + $data = $data[0]; + foreach ($data as &$l) { + $l = str_replace('"', '', str_replace("'", '', $l)); + } + if (is_array($data) and count($data) == 1) { + $data = $data[0]; + } + return $data; + } + protected static function removeDuplicates($results) + { + $output = []; + foreach ($results as $result) { + if (array_search($result, $output) === false) { + $output []= $result; + } + } + return $output; + } + protected static function sort($results) + { + usort($results, function($a, $b) { + $py = strcmp($a->proyecto()->descripcion, $b->proyecto()->descripcion); + if ($py == 0) { + if (!method_exists($a, 'unidad') and !method_exists($b, 'unidad')) { + return $a->descripcion - $b->descripcion; + } + if (!method_exists($a, 'unidad')) { + return $a->descripcion - $b->unidad()->descripcion; + } + if (!method_exists($b, 'unidad')) { + return $a->unidad()->descripcion - $b->descripcion; + } + + $u = $a->unidad()->descripcion - $b->unidad()->descripcion; + if ($u == 0) { + return strcmp($a->propietario()->apellido_paterno, $b->propietario()->apellido_paterno); + } + return $u; + } + return $py; + }); + return $results; + } + protected static function buscarCualquiera($query) + { + $results = []; + foreach (self::$tipos as $tipo) { + if ($tipo == 'cualquiera') { + continue; + } + $method = 'buscar' . str_replace(' ', '', ucwords($tipo)); + + if (is_callable(['self', $method])) { + $results = array_merge($results, self::$method($query)); + } + } + return $results; + } + protected static function buscarDepartamento($query) + { + if (is_array($query)) { + $results = []; + foreach ($query as $segment) { + $results = array_merge($results, self::buscarDepartamento($segment)); + } + } else { + $results = \Model::factory(Venta::class) + ->select('venta.*') + ->join('propiedad', ['propiedad.id', '=', 'venta.propiedad']) + ->join('unidad', ['unidad.id', '=', 'propiedad.unidad_principal']) + ->whereLike('unidad.descripcion', '%' . $query . '%') + ->findMany(); + } + return $results; + } + protected static function buscarEstacionamiento($query) + { + if (is_array($query)) { + $results = []; + foreach ($query as $segment) { + $results = array_merge($results, self::buscarEstacionamiento($segment)); + } + } else { + $results = \Model::factory(Venta::class) + ->select('venta.*') + ->join('propiedad', ['propiedad.id', '=', 'venta.propiedad']) + ->join('unidad', "`propiedad`.`estacionamientos` LIKE `unidad`.`id` OR `propiedad`.`estacionamientos` LIKE CONCAT('%;', `unidad`.`id`) OR `propiedad`.`estacionamientos` LIKE CONCAT(`unidad`.`id`, ';%') OR `propiedad`.`estacionamientos` LIKE CONCAT('%;', `unidad`.`id`, ';%')") + ->where('unidad.descripcion', $query) + ->findMany(); + } + return $results; + } + protected static function buscarBodega($query) + { + if (is_array($query)) { + $results = []; + foreach ($query as $segment) { + $results = array_merge($results, self::buscarBodega($segment)); + } + } else { + $results = \Model::factory(Venta::class) + ->select('venta.*') + ->join('propiedad', ['propiedad.id', '=', 'venta.propiedad']) + ->join('unidad', "`propiedad`.`bodegas` LIKE `unidad`.`id` OR `propiedad`.`bodegas` LIKE CONCAT('%;', `unidad`.`id`) OR `propiedad`.`bodegas` LIKE CONCAT(`unidad`.`id`, ';%') OR `propiedad`.`bodegas` LIKE CONCAT('%;', `unidad`.`id`, ';%')") + ->where('unidad.descripcion', $query) + ->findMany(); + } + return $results; + } + protected static function buscarPropietario($query) + { + if (is_array($query)) { + $results = []; + foreach ($query as $segment) { + $results = array_merge($results, self::buscarPropietario($segment)); + } + } else { + $results = self::buscarPropietarioNombres($query); + $results = array_merge($results, self::buscarPropietarioApellido($query)); + $results = array_merge($results, self::buscarPropietarioNombreCompleto($query)); + } + return $results; + } + protected static function buscarPropietarioNombres($query) + { + $results = \Model::factory(Venta::class) + ->select('venta.*') + ->join('propietario', ['propietario.rut', '=', 'venta.propietario']) + ->whereLike('propietario.nombres', '%' . $query . '%') + ->findMany(); + return $results; + } + protected static function buscarPropietarioApellido($query) + { + $results = \Model::factory(Venta::class) + ->select('venta.*') + ->join('propietario', ['propietario.rut', '=', 'venta.propietario']) + ->whereAnyIs([ + ['propietario.apellido_paterno' => '%' . $query . '%'], + ['propietario.apellido_materno' => '%' . $query . '%'] + ], 'LIKE') + ->findMany(); + return $results; + } + protected static function buscarPropietarioNombreCompleto($query) + { + $results = \Model::factory(Venta::class) + ->select('venta.*') + ->join('propietario', ['propietario.rut', '=', 'venta.propietario']) + ->whereRaw("CONCAT_WS(' ', propietario.nombres, propietario.apellido_paterno, propietario.apellido_materno) LIKE '%" . $query . "%'") + ->findMany(); + return $results; + } + protected static function buscarPrecioVenta($query) + { + if (is_array($query)) { + $results = []; + foreach ($query as $segment) { + $results = array_merge($results, self::buscarPrecioVenta($segment)); + } + } else { + $query = str_replace([',', '.'], ['.', ''], $query); + $results = \Model::factory(Venta::class)->where('valor_uf', $query)->findMany(); + } + return $results; + } + protected static function buscarProyecto($query) + { + if (is_array($query)) { + $results = []; + foreach ($query as $segment) { + $results = array_merge($results, self::buscarProyecto($segment)); + } + } else { + $results = model(Venta::class) + ->select('venta.*') + ->join('propiedad', ['propiedad.id', '=', 'venta.propiedad']) + ->join('unidad', ['unidad.id', '=', 'propiedad.unidad_principal']) + ->join('proyecto', ['proyecto.id', '=', 'unidad.proyecto']) + ->whereLike('proyecto.descripcion', '%' . $query . '%') + ->findMany(); + } + return $results; + } + protected static function buscarPago($query) + { + if (is_array($query)) { + $results = []; + foreach ($query as $segment) { + $results = array_merge($results, self::buscarPrecioVenta($segment)); + } + } else { + $query = str_replace(',', '.', str_replace('.', '', $query)); + $query2 = (float) $query; + if ($query != $query2) { + return []; + } + if (!is_float($query2)) { + return []; + } + $query = $query2; + $results = self::buscarValorCuota($query); + $results = array_merge($results, self::buscarReajuste($query)); + $results = array_merge($results, self::buscarEscritura($query)); + $results = array_merge($results, self::buscarSubsidio($query)); + $results = array_merge($results, self::buscarCredito($query)); + } + return $results; + } + protected static function buscarValorCuota($query) + { + $results = \Model::factory(Venta::class) + ->select('venta.*') + ->join('cuota', ['cuota.pie', '=', 'venta.pie']) + ->join('pago', ['pago.id', '=', 'cuota.pago']) + ->whereRaw("`pago`.`valor` = " . $query . " OR `pago`.`valor` / `pago`.`uf` = " . $query) + ->findMany(); + return $results; + } + protected static function buscarReajuste($query) + { + $results = \Model::factory(Venta::class) + ->select('venta.*') + ->join('pie', ['pie.id', '=', 'venta.pie']) + ->join('pago', ['pago.id', '=', 'pie.reajuste']) + ->whereRaw("`pago`.`valor` = " . $query . " OR `pago`.`valor` / `pago`.`uf` = " . $query) + ->findMany(); + return $results; + } + protected static function buscarEscritura($query) + { + $results = \Model::factory(Venta::class) + ->select('venta.*') + ->join('escritura', ['escritura.id', '=', 'venta.escritura']) + ->join('pago', ['pago.id', '=', 'escritura.pago']) + ->whereRaw("`pago`.`valor` = " . $query . " OR `pago`.`valor` / `pago`.`uf` = " . $query) + ->findMany(); + return $results; + } + protected static function buscarSubsidio($query) + { + $results = \Model::factory(Venta::class) + ->select('venta.*') + ->join('subsidio', ['subsidio.id', '=', 'venta.subsidio']) + ->join('pago', ['pago.id', '=', 'subsidio.pago']) + ->whereRaw("`pago`.`valor` = " . $query . " OR `pago`.`valor` / `pago`.`uf` = " . $query) + ->findMany(); + return $results; + } + protected static function buscarCredito($query) + { + $results = \Model::factory(Venta::class) + ->select('venta.*') + ->join('credito', ['credito.id', '=', 'venta.credito']) + ->join('pago', ['pago.id', '=', 'credito.pago']) + ->whereRaw("`pago`.`valor` = " . $query . " OR `pago`.`valor` / `pago`.`uf` = " . $query) + ->findMany(); + return $results; + } + protected static function buscarUnidad($query) + { + if (is_array($query)) { + $results = []; + foreach ($query as $segment) { + $results = array_merge($results, self::buscarUnidad($segment)); + } + } else { + $results = model(Unidad::class)->where('descripcion', $query)->findMany(); + foreach ($results as $i => $u) { + if ($u->venta()) { + unset($results[$i]); + } + } + } + return $results; + } +} +?> diff --git a/resources/less/Controller/Cierres.php b/app_old/resources/less/Controller/Cierres.php similarity index 100% rename from resources/less/Controller/Cierres.php rename to app_old/resources/less/Controller/Cierres.php diff --git a/app_old/resources/less/Controller/Comentarios.php b/app_old/resources/less/Controller/Comentarios.php new file mode 100644 index 0000000..494fcc6 --- /dev/null +++ b/app_old/resources/less/Controller/Comentarios.php @@ -0,0 +1,39 @@ +findOne(get('venta')); + echo view('ventas.comentarios.add', compact('venta')); + } + public static function agregar() + { + $venta = \Model::factory(\Incoviba\old\Venta\Venta::class)->findOne(get('venta')); + if ($venta === false) { + throw new Exception('Venta no existe.'); + } + $data = [ + 'venta' => $venta->id, + 'fecha' => \Carbon\Carbon::now(config('app.timezone'))->format('Y-m-d H:i:s'), + 'texto' => post('comentario') + ]; + $comentario = \Model::factory(\Incoviba\old\Venta\Comentario::class)->create($data); + $comentario->save(); + header('Location: ' . nUrl('ventas', 'show', ['venta' => $venta->id])); + } + public static function delete() + { + $comentario = \Model::factory(\Incoviba\old\Venta\Comentario::class)->findOne(get('comentario')); + $venta = $comentario->venta(); + $comentario->estado = 0; + $comentario->save(); + header('Location: ' . nUrl('ventas', 'show', ['venta' => $venta->id])); + } +} +?> diff --git a/resources/less/Controller/Contabilidad.php b/app_old/resources/less/Controller/Contabilidad.php similarity index 100% rename from resources/less/Controller/Contabilidad.php rename to app_old/resources/less/Controller/Contabilidad.php diff --git a/app_old/resources/less/Controller/Creditos.php b/app_old/resources/less/Controller/Creditos.php new file mode 100644 index 0000000..60a72da --- /dev/null +++ b/app_old/resources/less/Controller/Creditos.php @@ -0,0 +1,207 @@ +findOne($id); + return view('ventas.creditos.add', compact('venta')); + } + public static function agregado() + { + $id = get('venta'); + if ($id == null) { + header('Location: .'); + } + $venta = \Model::factory(Venta::class)->findOne($id); + + $banco = \Model::factory(Banco::class)->where('nombre', post('banco'))->findOne(); + $f = Carbon::createFromDate(post('y'), post('m'), post('d'), config('app.timezone')); + $uf = uf($f); + + $pago = \Model::factory(Pago::class)->create(); + $pago->banco = $banco->id; + $pago->fecha = $f->format('Y-m-d'); + $pago->uf = $uf->uf->value; + $pago->valor = post('valor') * $pago->uf; + $pago->tipo = 2; + + $credito = \Model::factory(Credito::class)->create(); + $credito->banco = $pago->banco; + $credito->valor = $pago->valor; + $credito->fecha = $pago->fecha; + $credito->uf = $pago->uf; + + $pago->new(); + + $credito->pago = $pago->id; + $credito->save(); + + $venta->credito = $credito->id; + $venta->save(); + header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); + } + public static function pagar() + { + $id = get('venta'); + $venta = \Model::factory(Venta::class)->findOne($id); + return view('ventas.creditos.pagar', compact('venta')); + } + public static function pagando() + { + $id = get('venta'); + $venta = \Model::factory(Venta::class)->findOne($id); + $valor = str_replace(',', '.', str_replace('.', '', post('valor'))); + $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); + + $pago = $venta->credito()->pago(); + if ($pago->valor != $valor) { + $pago->valor = $valor; + } + + $estado = \Model::factory(EstadoPago::class)->create(); + $estado->pago = $pago->id; + $estado->fecha = $f->format('Y-m-d'); + $estado->estado = 1; + $estado->save(); + + if ($pago->is_dirty('valor')) { + $pago->save(); + } + header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); + } + public static function abonar() + { + $id = get('venta'); + $venta = \Model::factory(Venta::class)->findOne($id); + return view('ventas.creditos.abonar', compact('venta')); + } + public static function abonando() + { + $id = get('venta'); + $venta = \Model::factory(Venta::class)->findOne($id); + $valor = str_replace(',', '.', str_replace('.', '', post('valor'))); + $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); + + $pago = $venta->credito()->pago(); + if ($pago->valor != $valor) { + $pago->valor = $valor; + } + + $estado = \Model::factory(EstadoPago::class)->create(); + $estado->pago = $pago->id; + $estado->fecha = $f->format('Y-m-d'); + $estado->estado = 2; + + $estado->save(); + + if ($pago->is_dirty('valor')) { + $pago->save(); + } + header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); + } + public static function show() + { + $id = get('venta'); + $venta = model(Venta::class)->findOne($id); + + return view('ventas.creditos.show', compact('venta')); + } + public static function edit() + { + $id = get('venta'); + $venta = model(Venta::class)->findOne($id); + + return view('ventas.creditos.edit', compact('venta')); + } + public static function editado() + { + $id = get('venta'); + $venta = model(Venta::class)->findOne($id); + + $pago = $venta->credito()->pago(); + + $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); + $uf = uf($f); + $banco = model(Banco::class)->where('nombre', post('banco'))->findOne(); + $valor = correctNumber(post('valor')) * $uf->uf->value; + + $fields = ['valor', 'uf', 'fecha', 'banco']; + $data = ['valor' => $valor, 'uf' => $uf->uf->value, 'fecha' => $f->format('Y-m-d'), 'banco' => $banco->id]; + + $change = false; + foreach ($fields as $field) { + if ($pago->$field != $data[$field]) { + $change = true; + $pago->$field = $data[$field]; + if ($field == 'fecha') { + $eps = $pago->estados(); + foreach ($eps as $ep) { + if ($ep->estado == 0) { + $ep->fecha = $data[$field]; + $ep->save(); + break; + } + } + } + } + } + + if ($change) { + $pago->save(); + } + header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); + } + public static function remove() + { + $id = get('venta'); + $venta = model(Venta::class)->findOne($id); + + $pago = $venta->credito()->pago(); + $f = Carbon::today(config('app.timezone')); + + $data = [ + 'pago' => $pago->id, + 'estado' => -3, + 'fecha' => $f->format('Y-m-d') + ]; + $estado = model(EstadoPago::class)->create($data); + $estado->save(); + $venta->credito = 0; + $venta->save(); + header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); + } + public static function pendientes() + { + $creditos = model(Credito::class) + ->select('credito.*') + ->join('venta', ['venta.credito', '=', 'credito.id']) + ->join('pago', ['pago.id', '=', 'credito.pago']) + ->rawJoin('JOIN (SELECT ep.* FROM (SELECT pago, MAX(id) AS id FROM estado_pago GROUP BY pago) e0 JOIN estado_pago ep ON ep.id = e0.id)', ['estado_pago.pago', '=', 'pago.id'], 'estado_pago') + ->whereLt('estado_pago.estado', 2) + ->where('venta.estado', 1) + ->orderByAsc('estado_pago.fecha') + ->findMany(); + return view('ventas.creditos.pendientes', compact('creditos')); + } +} +?> diff --git a/app_old/resources/less/Controller/Cuotas.php b/app_old/resources/less/Controller/Cuotas.php new file mode 100644 index 0000000..4d457ba --- /dev/null +++ b/app_old/resources/less/Controller/Cuotas.php @@ -0,0 +1,230 @@ +findOne($id); + + return view('ventas.pies.cuotas.show', compact('cuota')); + } + public static function edit() + { + $id = get('cuota'); + $cuota = \Model::factory(Cuota::class)->findOne($id); + return view('ventas.pies.cuotas.edit', compact('cuota')); + } + public static function editar() + { + $id = get('cuota'); + $cuota = \Model::factory(Cuota::class)->findOne($id); + + $cuota->numero = post('numero'); + $cuota->{'valor_$'} = post('valor'); + $banco = \Model::factory(\Incoviba\old\Common\Banco::class)->where('nombre', post('banco'))->findOne(); + if ($banco) { + $cuota->banco = $banco->id; + } else { + $cuota->banco = 0; + } + $f = \Carbon\Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); + $cuota->fecha = $f->format('Y-m-d'); + $pago = $cuota->pago(); + $pago->valor = post('valor'); + $pago->banco = $banco->id; + $pago->identificador = post('identificador'); + $pago->fecha = $f->format('Y-m-d'); + $uf = uf($f); + if ($uf->total > 0) { + $pago->uf = $uf->uf->value; + } else { + $pago->uf = 0; + } + + $pago->save(); + $cuota->save(); + header('Location: ' . url('', ['p' => 'pies', 'a' => 'resumen', 'pie' => $cuota->pie()->id])); + } + public static function edited() + { + $id = get('cuota'); + $cuota = \Model::factory(Cuota::class)->findOne($id); + $pago = $cuota->pago(); + foreach ($_POST as $key => $value) { + $pago->$key = $value; + } + $pago->save(); + } + public static function pendientes() + { + $f = \Carbon\Carbon::today(config('app.timezone')); + $cuotas = \Model::factory(Cuota::class) + ->select('cuota.*') + ->join('pago', ['pago.id', '=', 'cuota.pago']) + ->join('venta', ['venta.pie', '=', 'cuota.pie']) + ->raw_join('JOIN (SELECT e1.* FROM (SELECT pago, MAX(id) AS id FROM estado_pago GROUP BY pago) e0 JOIN estado_pago e1 ON e1.id = e0.id)', ['ep.pago', '=', 'pago.id'], 'ep') + ->where('ep.estado', 0) + ->where('venta.estado', 1) + ->whereLte('pago.fecha', $f->format('Y-m-d')) + ->order_by_asc('pago.fecha') + ->findMany(); + $sum = 0; + if (count($cuotas) > 0) { + $sum = array_reduce($cuotas, function($carry, $item) { + $carry += $item->pago()->valor; + return $carry; + }); + } + setlocale(LC_TIME, 'es'); + return view('ventas.pies.cuotas.pendientes', compact('cuotas', 'sum')); + } + public static function depositar() + { + $id = post('cuota'); + $cuota = \Model::factory(Cuota::class)->findOne($id); + if ($cuota->pago()->estado()->estado == 1) { + return 'ok'; + } + $estado = \Model::factory(EstadoPago::class)->create(); + $estado->pago = $cuota->pago()->id; + $estado->estado = 1; + $f = Carbon::parse(post('fecha'), config('app.timezone')); + $estado->fecha = $f->format('Y-m-d'); + $estado->save(); + return 'ok'; + } + public static function remove() + { + $id = get('cuota'); + $cuota = \Model::factory(Cuota::class)->findOne($id); + + $estado = \Model::factory(EstadoPago::class)->create(); + $estado->pago = $cuota->pago()->id; + $estado->estado = -3; + $f = Carbon::today(config('app.timezone')); + $estado->fecha = $f->format('Y-m-d'); + $estado->save(); + header('Location: ' . url('', ['p' => 'pies', 'a' => 'resumen', 'pie' => $cuota->pie()->id])); + } + public static function para_abonar() + { + $cuotas = \Model::factory(Cuota::class) + ->select('cuota.*') + ->join('pago', ['pago.id', '=', 'cuota.pago']) + ->join('venta', ['venta.pie', '=', 'cuota.pie']) + ->raw_join('JOIN (SELECT e1.* FROM (SELECT pago, MAX(id) AS id FROM estado_pago GROUP BY pago) e0 JOIN estado_pago e1 ON e1.id = e0.id)', ['ep.pago', '=', 'pago.id'], 'ep') + ->where('ep.estado', 1) + ->where('venta.estado', 1) + ->order_by_asc('ep.fecha') + ->findMany(); + $ini = get('start'); + if ($ini == null) { + $ini = 0; + } + $n = get('step'); + if ($n == 0) { + $n = 30; + } + $total = count($cuotas); + $cuotas = array_slice($cuotas, $ini, $n); + $pages = ceil($total / $n); + $current = ($ini + $n) / $n; + return view('ventas.pies.cuotas.abonar', compact('cuotas', 'total', 'pages', 'current')); + } + public static function abonar() + { + $id = post('cuota'); + $cuota = \Model::factory(Cuota::class)->findOne($id); + if ($cuota->pago()->estado()->estado == 2) { + return 'ok'; + } + $estado = \Model::factory(EstadoPago::class)->create(); + $estado->pago = $cuota->pago()->id; + $estado->estado = 2; + $f = Carbon::parse(post('fecha'), config('app.timezone')); + $estado->fecha = $f->format('Y-m-d'); + $estado->save(); + return 'ok'; + } + public static function rebotar() + { + $id = post('cuota'); + $cuota = \Model::factory(Cuota::class)->findOne($id); + if ($cuota->pago()->estado()->estado == -1) { + return 'ok'; + } + $estado = \Model::factory(EstadoPago::class)->create(); + $estado->pago = $cuota->pago()->id; + $estado->estado = -1; + $f = Carbon::parse(post('fecha'), config('app.timezone')); + $estado->fecha = $f->format('Y-m-d'); + $estado->save(); + return 'ok'; + } + public static function add() + { + $id = get('pie'); + $pie = \Model::factory(Pie::class)->findOne($id); + return view('ventas.pies.cuotas.add', compact('pie')); + } + public static function agregar() + { + $id = get('pie'); + $pie = \Model::factory(Pie::class)->findOne($id); + + $cant = $pie->cuotas - count($pie->cuotas()); + for ($i = 0; $i < $cant; $i ++) { + if (trim(post('valor' . $i)) == '') { + continue; + } + $banco = \Model::factory(Banco::class)->where('nombre', post('banco' . $i))->findOne(); + $f = Carbon::createFromDate(post('year' . $i), post('month' . $i), post('day' . $i), config('app.timezone')); + $uf = uf($f); + $valor = correctNumber(post('valor' . $i)); + + $pago = \Model::factory(Pago::class)->create(); + $pago->banco = $banco->id; + $pago->fecha = $f->format('Y-m-d'); + if ($uf and $uf->total > 0) { + $pago->uf = $uf->uf->value; + } else { + $pago->uf = 0; + } + $pago->tipo = 1; + $pago->valor = $valor; + $pago->identificador = post('identificador' . $i); + + $cuota = \Model::factory(Cuota::class)->create(); + $cuota->pie = $pie->id; + $cuota->fecha = $pago->fecha; + $cuota->{'valor_$'} = $pago->valor; + $cuota->estado = 0; + $cuota->banco = $pago->banco; + $cuota->uf = $pago->uf; + $cuota->numero = post('numero' . $i); + + $pago->new(); + + $cuota->pago = $pago->id; + $cuota->save(); + header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $pie->venta()->id])); + } + } +} +?> diff --git a/app_old/resources/less/Controller/Devoluciones.php b/app_old/resources/less/Controller/Devoluciones.php new file mode 100644 index 0000000..8d9c41c --- /dev/null +++ b/app_old/resources/less/Controller/Devoluciones.php @@ -0,0 +1,19 @@ +findOne($id); + + return view('print.devolucion', compact('venta')); + } +} +?> diff --git a/app_old/resources/less/Controller/Escrituras.php b/app_old/resources/less/Controller/Escrituras.php new file mode 100644 index 0000000..f2cb056 --- /dev/null +++ b/app_old/resources/less/Controller/Escrituras.php @@ -0,0 +1,212 @@ +findOne($id); + return view('ventas.escrituras.add', compact('venta')); + } + public static function agregar() + { + $id = get('venta'); + $venta = \Model::factory(Venta::class)->findOne($id); + + $f = Carbon::createFromDate(post('escritura_year'), post('escritura_month'), post('escritura_day'), config('app.timezone')); + $venta->escriturado = $f->format('Y-m-d'); + + if (post('valor_reajuste')) { + $reajuste = \Model::factory(Pago::class)->create(); + $reajuste->valor = correctNumber(post('valor_reajuste')); + $fp = Carbon::createFromDate(post('reajuste_year'), post('reajuste_month'), post('reajuste_day'), config('app.timezone')); + $reajuste->fecha = $fp->format('Y-m-d'); + $reajuste->uf = (float) uf($fp)->uf->value; + $reajuste->newPagado(); + + $pie = $venta->pie(); + $pie->reajuste = $reajuste->id; + $pie->save(); + } + if (post('escritura_valor') or post('escritura_valor_uf')) { + $pago = \Model::factory(Pago::class)->create(); + $fp = Carbon::createFromDate(post('pago_escritura_year'), post('pago_escritura_month'), post('pago_escritura_day'), config('app.timezone')); + $pago->fecha = $fp->format('Y-m-d'); + $pago->uf = (float) uf($fp)->uf->value; + if (post('escritura_valor')) { + $pago->valor = correctNumber(post('escritura_valor')); + $pago->newPagado(); + } else { + $pago->valor = correctNumber(post('escritura_valor_uf')) * $pago->uf; + $pago->new(); + } + + $escritura = \Model::factory(Escritura::class)->create(); + $escritura->pago = $pago->id; + $escritura->valor = $pago->valor('uf'); + $escritura->fecha = $pago->fecha; + $escritura->save(); + + $venta->escritura = $escritura->id; + } + if (post('subsidio_ahorrado') or post('subsidio_valor')) { + $total = post('subsidio_ahorrado') + post('subsidio_valor'); + $subsidio = \Model::factory(Subsidio::class)->create(); + $pago = \Model::factory(Pago::class)->create(); + $pago->fecha = $f->format('Y-m-d'); + $pago->uf = (float) uf($f)->uf->value; + $pago->valor = correctNumber(post('subsidio_ahorrado')) * $pago->uf; + $pago->new(); + $subsidio->pago = $pago->id; + $pago = \Model::factory(Pago::class)->create(); + $pago->fecha = $f->format('Y-m-d'); + $pago->uf = (float) uf($f)->uf->value; + $pago->valor = correctNumber(post('subsidio_valor')) * $pago->uf; + $pago->new(); + $subsidio->subsidio = $pago->id; + $subsidio->save(); + + $venta->subsidio = $subsidio->id; + } + if (post('credito_valor')) { + $pago = \Model::factory(Pago::class)->create(); + $pago->fecha = $f->format('Y-m-d'); + $pago->uf = (float) uf($f)->uf->value; + $valor = post('credito_valor'); + if (strpos($valor, ',') !== false) { + $valor = correctNumber($valor); + } + $pago->valor = $valor * $pago->uf; + $banco = \Model::factory(Banco::class)->where('nombre', post('credito_banco'))->findOne(); + $pago->banco = $banco->id; + $pago->new(); + + $credito = \Model::factory(Credito::class)->create(); + $credito->pago = $pago->id; + $credito->save(); + + $venta->credito = $credito->id; + } elseif (post('credito_banco')) { + $pago = $venta->credito()->pago(); + $banco = \Model::factory(Banco::class)->where('nombre', post('credito_banco'))->findOne(); + $pago->banco = $banco->id; + $pago->save(); + } + + $tipo = \Model::factory(TipoEstadoVenta::class)->where('descripcion', 'escriturando')->findOne(); + $data = [ + 'venta' => $venta->id, + 'estado' => $tipo->id, + 'fecha' => $venta->escriturado + ]; + $estado = \Model::factory(EstadoVenta::class)->create($data); + $estado->save(); + $venta->save(); + header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); + } + public static function edit() + { + $id = get('venta'); + $venta = \Model::factory(Venta::class)->findOne($id); + echo view('ventas.escrituras.edit', compact('venta')); + } + public static function editar() + { + $id = get('venta'); + $venta = \Model::factory(Venta::class)->findOne($id); + $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); + $uf = uf($f); + + $valor = correctNumber(post('valor')); + if ($valor == '') { + $valor_uf = correctNumber(post('valor_uf')); + $valor = $valor_uf * $uf->uf->value; + } + $pago = $venta->escritura()->pago(); + if ($pago->valor != $valor) { + $pago->valor = $valor; + } + if ($pago->fecha != $f->format('Y-m-d')) { + $pago->fecha = $f->format('Y-m-d'); + $pago->uf = $uf->uf->value; + } + + $pago->save(); + header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); + } + public static function informe() + { + $id = get('venta'); + $venta = \Model::factory(Venta::class)->findOne($id); + return view('ventas.escrituras.informe', compact('venta')); + } + public static function pagar() + { + $id = get('venta'); + $venta = model(Venta::class)->findOne($id); + + return view('ventas.escrituras.pagar', compact('venta')); + } + public static function pagado() + { + $id = get('venta'); + $venta = model(Venta::class)->findOne($id); + + $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); + + $data = [ + 'pago' => $venta->escritura()->pago()->id, + 'fecha' => $f->format('Y-m-d'), + 'estado' => 1 + ]; + $estado = model(EstadoPago::class)->create($data); + $estado->save(); + header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); + } + public static function abonar() + { + $id = get('venta'); + $venta = model(Venta::class)->findOne($id); + + return view('ventas.escrituras.abonar', compact('venta')); + } + public static function abonado() + { + $id = get('venta'); + $venta = model(Venta::class)->findOne($id); + + $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); + + $data = [ + 'pago' => $venta->escritura()->pago()->id, + 'fecha' => $f->format('Y-m-d'), + 'estado' => 2 + ]; + $estado = model(EstadoPago::class)->create($data); + $estado->save(); + header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); + } +} +?> diff --git a/app_old/resources/less/Controller/FormaPago.php b/app_old/resources/less/Controller/FormaPago.php new file mode 100644 index 0000000..6ccc7b3 --- /dev/null +++ b/app_old/resources/less/Controller/FormaPago.php @@ -0,0 +1,98 @@ +findOne($id); + + return view('ventas.forma_pago.edit', compact('venta')); + } + public static function editar() + { + d(post()); + $id = get('venta'); + $venta = model(Venta::class)->findOne($id); + + $valor = correctNumber(post('valor_pie')); + $cuotas = post('cuotas_pie'); + if ($venta->pie != 0) { + $pie = $venta->pie(); + $changed = false; + if ($pie->valor != $valor) { + $pie->valor = $valor; + $changed = true; + } + if ($pie->cuotas != $cuotas) { + $pie->cuotas = $cuotas; + $changed = true; + } + if ($changed) { + d($pie); + } + + $valor = correctNumber(post('valor_reajuste')); + $f = Carbon::createFromDate(post('year_reajuste'), post('month_reajuste'), post('day_reajuste'), config('app.timezone')); + $uf = uf($f); + $reajuste = $pie->reajuste(); + $changed = false; + if ($reajuste->valor != $valor) { + $reajuste->valor = $valor; + $changed = true; + } + if ($reajuste->fecha != $f->format('Y-m-d')) { + $reajuste->fecha = $f->format('Y-m-d'); + $reajuste->uf = $uf->uf->value; + $changed = true; + } + if ($changed) { + d($reajuste); + } + } elseif ($valor != '') { + $f = Carbon::parse($venta->fecha, config('app.timezone')); + $uf = uf($f); + $data = [ + 'valor' => $valor, + 'cuotas' => $cuotas, + 'uf' => $uf->uf->value, + 'fecha' => $f->format('Y-m-d') + ]; + $pie = model(Pie::class)->create($data); + d($pie); + } + + $valor = correctNumber(post('valor_escritura')); + $f = Carbon::createFromDate(post('year_escritura'), post('month_escritura'), post('day_escritura'), config('app.timezone')); + if ($venta->escritura != 0) { + $escritura = $venta->escritura(); + d($escritura); + } elseif ($valor != '') { + $data = [ + 'valor' => $valor, + 'fecha' => $f->format('Y-m-d'), + 'uf' => $uf->uf->value, + 'tipo' => 7 + ]; + $pago = model(Pago::class)->create($data); + $pago->newPagado(); + $data['pago'] = $pago->id; + unset($data['tipo']); + $escritura = model(Escritura::class)->create($data); + $escritura->save(); + $venta->escritura = $escritura->id; + $venta->save(); + } + } +} +?> diff --git a/resources/less/Controller/Informes.php b/app_old/resources/less/Controller/Informes.php similarity index 99% rename from resources/less/Controller/Informes.php rename to app_old/resources/less/Controller/Informes.php index 965a88b..e93d4c8 100644 --- a/resources/less/Controller/Informes.php +++ b/app_old/resources/less/Controller/Informes.php @@ -1,17 +1,16 @@ orderByAsc('abreviacion')->findMany(); + return view('inmobiliarias.list', compact('inmobiliarias')); + } + public static function show() + { + $rut = get('rut'); + $inmobiliaria = model(Inmobiliaria::class)->findOne($rut); + return view('inmobiliarias.show', compact('inmobiliaria')); + } + public static function add() + { + $sociedades = model(TipoSociedad::class)->findMany(); + return view('inmobiliarias.add', compact('sociedades')); + } + public static function agregar() + { + list($rut, $dv) = explode('-', str_replace('.', '', post('rut'))); + + $inmobiliaria = model(Inmobiliaria::class)->findOne($rut); + if ($inmobiliaria) { + header('Location: ' . url('', ['p' => 'inmobiliarias', 'a' => 'show', 'rut' => $inmobiliaria->rut])); + die(); + } + + $inmobiliaria = model(Inmobiliaria::class)->create(); + $inmobiliaria->rut = $rut; + $inmobiliaria->dv = $dv; + $inmobiliaria->razon = post('razon'); + $inmobiliaria->abreviacion = post('abrev'); + $inmobiliaria->sociedad = post('sociedad'); + + $inmobiliaria->save(); + header('Location: ' . url('', ['p' => 'inmobiliarias', 'a' => 'show', 'rut' => $inmobiliaria->rut])); + } + public static function edit() + { + $sociedades = model(TipoSociedad::class)->findMany(); + $rut = get('rut'); + $inmobiliaria = model(Inmobiliaria::class)->findOne($rut); + $bancos = model(Banco::class)->findMany(); + usort($bancos, function($a, $b) { + return strcmp($a->nombre, $b->nombre); + }); + return view('inmobiliarias.edit', compact('inmobiliaria', 'bancos', 'sociedades')); + } + public static function do_edit() + { + $rut = get('rut'); + $inmobiliaria = model(Inmobiliaria::class)->findOne($rut); + foreach (post() as $field => $value) { + if ($value != '' and $inmobiliaria->{$field} != $value) { + $inmobiliaria->{$field} = $value; + } + } + + $inmobiliaria->save(); + header('Location: ' . nUrl('inmobiliarias', 'show', ['rut' => $inmobiliaria->rut])); + } +} +?> diff --git a/app_old/resources/less/Controller/Operadores.php b/app_old/resources/less/Controller/Operadores.php new file mode 100644 index 0000000..765ba2a --- /dev/null +++ b/app_old/resources/less/Controller/Operadores.php @@ -0,0 +1,47 @@ +findOne(get('proyecto')); + $operadores = model(Agente::class) + ->select('agente.*') + ->join('agente_tipo', ['agente_tipo.agente', '=', 'agente.id']) + ->join('tipo_agente', ['tipo_agente.id', '=', 'agente_tipo.tipo']) + ->where('tipo_agente.descripcion', 'operador') + ->orderByAsc('agente.abreviacion') + ->findMany(); + $vigentes = array_map(function($item) { + return $item->agente()->agente(); + }, $proyecto->operadoresVigentes()); + echo view('proyectos.operadores.add', compact('proyecto', 'operadores', 'vigentes')); + } + public static function add() + { + $proyecto = model(Proyecto::class)->findOne(get('proyecto')); + $fecha = Carbon::today(config('app.timezone')); + foreach (post('operadores') as $op) { + $operador = model(Agente::class)->findOne($op); + $at = $operador->tipos(19); + $data = [ + 'proyecto' => $proyecto->id, + 'agente' => $at->id, + 'fecha' => $fecha->format('Y-m-d'), + 'comision' => 2 + ]; + $pa = model(ProyectoAgente::class)->create($data); + $pa->new(); + } + header('Location: ' . nUrl('proyectos', 'show', ['proyecto' => $proyecto->id])); + } +} diff --git a/app_old/resources/less/Controller/Other.php b/app_old/resources/less/Controller/Other.php new file mode 100644 index 0000000..eb90f31 --- /dev/null +++ b/app_old/resources/less/Controller/Other.php @@ -0,0 +1,71 @@ +create(); + $unidad = \Model::factory(Unidad::class)->where('descripcion', $info[0])->where('proyecto', post('proyecto'))->find_one(); + if (!$unidad->venta()->find_one()) { + echo 'x'; + continue; + } + $venta = $unidad->venta()->find_one(); + $entrega->fecha = \Carbon\Carbon::parse($info[1])->format('Y-m-d'); + if ($venta->entrega == '0') { + $entrega->save(); + $venta->entrega = $entrega->id; + $venta->save(); + echo '.'; + } else { + echo 'x'; + } + } + } else { + $proyectos = \Model::factory(Proyecto::class)->order_by_asc('descripcion')->find_many(); + return view('other.entregar_multiple', compact('proyectos')); + } + } + public static function capacidades() + { + $capacidades = []; + $controllers = glob(config('locations.app') . '/Controller/*.php'); + foreach ($controllers as $controller) { + if (basename($controller) == 'Admin.php' or basename($controller) == 'Other.php') { + continue; + } + $class = Stringy::create($controller)->replace(config('locations.app'), '/App')->replace('.php', '')->replace('/', '\\')->__toString(); + $ref = new \ReflectionClass($class); + $static = $ref->getMethods(\ReflectionMethod::IS_STATIC && \ReflectionMethod::IS_PUBLIC); + foreach ($static as $method) { + if ($method->name == 'setDefault' or $method->name == 'index') { + continue; + } + $capacidades []= $method; + } + } + return view('other.capacidades', compact('capacidades')); + } +} +?> \ No newline at end of file diff --git a/app_old/resources/less/Controller/Pagares.php b/app_old/resources/less/Controller/Pagares.php new file mode 100644 index 0000000..f05b24e --- /dev/null +++ b/app_old/resources/less/Controller/Pagares.php @@ -0,0 +1,271 @@ +findOne(get('pagare')); + return view('proyectos.pagares.show', compact('pagare')); + } + public static function add() + { + $proyecto = model(Proyecto::class)->findOne(get('proyecto')); + return view('proyectos.pagares.add', compact('proyecto')); + } + public static function do_add() + { + $proyecto = model(Proyecto::class)->findOne(get('proyecto')); + $data = post(); + + $data['id'] = $data['numero']; + unset($data['numero']); + $data['proyecto'] = $proyecto->id; + $moneda = model(TipoMonedaPagare::class)->where('descripcion', $data['moneda'])->findOne(); + $data['moneda'] = $moneda->id; + + $fecha = ['year', 'month', 'day']; + $fecha_arr = array_filter($data, function($item) use ($fecha) { + return (array_search($item, $fecha) !== false); + }, \ARRAY_FILTER_USE_KEY); + uksort($fecha_arr, function($a, $b) use ($fecha) { + return array_search($a, $fecha) - array_search($b, $fecha); + }); + foreach ($fecha as $f) { + unset($data[$f]); + } + array_walk($fecha_arr, function(&$item) { + if (strlen($item) < 4) { + $item = str_pad($item, 2, '0', \STR_PAD_LEFT); + } + }); + $data['fecha'] = implode('-', $fecha_arr); + + foreach ($fecha as &$key) { + $key .= '_banco'; + } + $fecha_arr = array_filter($data, function($item) use ($fecha) { + return (array_search($item, $fecha) !== false); + }, \ARRAY_FILTER_USE_KEY); + uksort($fecha_arr, function($a, $b) use ($fecha) { + return array_search($a, $fecha) - array_search($b, $fecha); + }); + foreach ($fecha as $f) { + unset($data[$f]); + } + array_walk($fecha_arr, function(&$item) { + if (strlen($item) < 4) { + $item = str_pad($item, 2, '0', \STR_PAD_LEFT); + } + }); + $data['fecha_banco'] = implode('-', $fecha_arr); + + $data['abonado'] = (int) $data['abonado']; + if ($data['abonado'] == 0) { + $data['fecha'] = '0000-00-00'; + } + + $pagare = model(Pagare::class)->create($data); + $pagare->save(); + header('Location: ' . nUrl('pagares', 'show', ['pagare' => $pagare->id])); + } + public static function edit() + { + $pagare = model(Pagare::class)->findOne(get('pagare')); + return view('proyectos.pagares.edit', compact('pagare')); + } + public static function do_edit() + { + $pagare = model(Pagare::class)->findOne(get('pagare')); + + $data = post(); + if ($pagare->id != $data['numero']) { + foreach ($pagare->renovaciones() as $renovacion) { + $renovacion->pagare = $data['numero']; + $renovacion->save(); + } + $pagare->id = $data['numero']; + $changed = true; + } + unset($data['numero']); + $moneda = model(TipoMonedaPagare::class)->where('descripcion', $data['moneda'])->findOne(); + $data['moneda'] = $moneda->id; + $fecha = ['year', 'month', 'day']; + $fecha_arr = array_filter($data, function($item) use ($fecha) { + return (array_search($item, $fecha) !== false); + }, \ARRAY_FILTER_USE_KEY); + uksort($fecha_arr, function($a, $b) use ($fecha) { + return array_search($a, $fecha) - array_search($b, $fecha); + }); + foreach ($fecha as $f) { + unset($data[$f]); + } + array_walk($fecha_arr, function(&$item) { + if (strlen($item) < 4) { + $item = str_pad($item, 2, '0', \STR_PAD_LEFT); + } + }); + $data['fecha'] = implode('-', $fecha_arr); + + foreach ($fecha as &$key) { + $key .= '_banco'; + } + $fecha_arr = array_filter($data, function($item) use ($fecha) { + return (array_search($item, $fecha) !== false); + }, \ARRAY_FILTER_USE_KEY); + uksort($fecha_arr, function($a, $b) use ($fecha) { + return array_search($a, $fecha) - array_search($b, $fecha); + }); + foreach ($fecha as $f) { + unset($data[$f]); + } + array_walk($fecha_arr, function(&$item) { + if (strlen($item) < 4) { + $item = str_pad($item, 2, '0', \STR_PAD_LEFT); + } + }); + $data['fecha_banco'] = implode('-', $fecha_arr); + + $data['abonado'] = (int) $data['abonado']; + if ($data['abonado'] == 0) { + $data['fecha'] = '0000-00-00'; + } + + $changed = false; + foreach ($data as $k => $v) { + if ($pagare->$k != $v) { + $pagare->$k = $v; + $changed = true; + if (strpos($k, 'fecha') !== false) { + $pagare->uf = 0; + } + } + } + + if ($changed) { + $pagare->save(); + } + header('Location: ' . nUrl('pagares', 'show', ['pagare' => $pagare->id])); + } + public static function edit_renovacion() + { + $renovacion = model(RenovacionPagare::class)->findOne(get('renovacion')); + return view('proyectos.pagares.edit_renovacion', compact('renovacion')); + } + public static function do_edit_renovacion() + { + $renovacion = model(RenovacionPagare::class)->findOne(get('renovacion')); + + $data = post(); + $fecha = ['year', 'month', 'day']; + $fecha_arr = array_filter($data, function($item) use ($fecha) { + return (array_search($item, $fecha) !== false); + }, \ARRAY_FILTER_USE_KEY); + uksort($fecha_arr, function($a, $b) use ($fecha) { + return array_search($a, $fecha) - array_search($b, $fecha); + }); + foreach ($fecha as $f) { + unset($data[$f]); + } + array_walk($fecha_arr, function(&$item) { + if (strlen($item) < 4) { + $item = str_pad($item, 2, '0', \STR_PAD_LEFT); + } + }); + $data['fecha'] = implode('-', $fecha_arr); + + foreach ($fecha as &$key) { + $key .= '_banco'; + } + $fecha_arr = array_filter($data, function($item) use ($fecha) { + return (array_search($item, $fecha) !== false); + }, \ARRAY_FILTER_USE_KEY); + uksort($fecha_arr, function($a, $b) use ($fecha) { + return array_search($a, $fecha) - array_search($b, $fecha); + }); + foreach ($fecha as $f) { + unset($data[$f]); + } + array_walk($fecha_arr, function(&$item) { + if (strlen($item) < 4) { + $item = str_pad($item, 2, '0', \STR_PAD_LEFT); + } + }); + $data['fecha_banco'] = implode('-', $fecha_arr); + + $changed = false; + foreach ($data as $k => $v) { + if ($renovacion->$k != $v) { + $renovacion->$k = $v; + $changed = true; + if (strpos($k, 'fecha') !== false) { + $renovacion->uf = 0; + } + } + } + if ($changed) { + $renovacion->save(); + } + header('Location: ' . nUrl('pagares', 'show', ['pagare' => $renovacion->pagare])); + } + public static function add_renovacion() + { + $pagare = model(Pagare::class)->findOne(get('pagare')); + return view('proyectos.pagares.add_renovacion', compact('pagare')); + } + public static function do_add_renovacion() + { + $pagare = model(Pagare::class)->findOne(get('pagare')); + $data = post(); + + $data['pagare'] = $pagare->id; + $fecha = ['year', 'month', 'day']; + $fecha_arr = array_filter($data, function($item) use ($fecha) { + return (array_search($item, $fecha) !== false); + }, \ARRAY_FILTER_USE_KEY); + uksort($fecha_arr, function($a, $b) use ($fecha) { + return array_search($a, $fecha) - array_search($b, $fecha); + }); + foreach ($fecha as $f) { + unset($data[$f]); + } + array_walk($fecha_arr, function(&$item) { + if (strlen($item) < 4) { + $item = str_pad($item, 2, '0', \STR_PAD_LEFT); + } + }); + $data['fecha'] = implode('-', $fecha_arr); + + foreach ($fecha as &$key) { + $key .= '_banco'; + } + $fecha_arr = array_filter($data, function($item) use ($fecha) { + return (array_search($item, $fecha) !== false); + }, \ARRAY_FILTER_USE_KEY); + uksort($fecha_arr, function($a, $b) use ($fecha) { + return array_search($a, $fecha) - array_search($b, $fecha); + }); + foreach ($fecha as $f) { + unset($data[$f]); + } + array_walk($fecha_arr, function(&$item) { + if (strlen($item) < 4) { + $item = str_pad($item, 2, '0', \STR_PAD_LEFT); + } + }); + $data['fecha_banco'] = implode('-', $fecha_arr); + + $renovacion = model(RenovacionPagare::class)->create($data); + $renovacion->save(); + + header('Location: ' . nUrl('pagares', 'show', ['pagare' => $renovacion->pagare])); + } +} diff --git a/app_old/resources/less/Controller/Pagos.php b/app_old/resources/less/Controller/Pagos.php new file mode 100644 index 0000000..f279b9e --- /dev/null +++ b/app_old/resources/less/Controller/Pagos.php @@ -0,0 +1,358 @@ +findOne($id); + $tipos = model(TipoPago::class)->orderByAsc('descripcion')->findMany(); + $estados = model(TipoEstadoPago::class)->orderByAsc('descripcion')->findMany(); + + return view('ventas.pagos.edit', compact('pago', 'asociado', 'id_asociado', 'tipos', 'estados')); + } + public static function editar() + { + $id = get('pago'); + $pago = model(Pago::class)->findOne($id); + + $fp = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); + $tipo = model(TipoPago::class)->findOne(post('tipo')); + $valor = correctNumber(post('valor')); + $banco = model(Banco::class)->where('nombre', post('banco'))->findOne(); + + $fe = Carbon::createFromDate(post('yearestado'), post('monthestado'), post('dayestado'), config('app.timezone')); + $estado = model(TipoEstadoPago::class)->findOne(post('estado')); + $uf = uf($fe); + + $est = $pago->estado(); + if ($est->fecha != $fe->format('Y-m-d')) { + $est->fecha = $fe->format('Y-m-d'); + $pago->uf = $uf->uf->value; + } + if ($est->estado != $estado->id) { + $est->estado = $estado->id; + } + + if ($pago->fecha != $fp->format('Y-m-d')) { + $pago->fecha = $fp->format('Y-m-d'); + } + if ($pago->tipo != $tipo->id) { + $pago->tipo = $tipo->id; + } + if ($pago->valor != $valor) { + $pago->valor = $valor; + } + if ($pago->identificador != post('identificador')) { + $pago->identificador = post('identificador'); + } + if ($pago->pagador != post('pagador')) { + $pago->pagador = post('pagador'); + } + if ($pago->banco != $banco->id) { + $pago->banco = $banco->id; + } + + $est->save(); + $pago->save(); + header('Location: ' . url('', ['p' => get('asociado') . 's', 'a' => 'show', get('asociado') => get(get('asociado'))])); + } + public static function pendientes() + { + $ventas = model(Venta::class) + ->select('venta.*') + ->rawJoin('JOIN (SELECT e1.* FROM estado_venta e1 JOIN (SELECT venta, MAX(id) AS id FROM estado_venta GROUP BY venta) e0 ON e0.id = e1.id)', ['ev.venta', '=', 'venta.id'], 'ev') + ->join('tipo_estado_venta', ['te.id', '=', 'ev.estado'], 'te') + ->join('propiedad', ['propiedad.id', '=', 'venta.propiedad']) + ->join('unidad', ['unidad.id', '=', 'propiedad.unidad_principal']) + ->join('proyecto', ['proyecto.id', '=', 'unidad.proyecto']) + ->where('te.activa', 1) + ->orderByAsc('proyecto.descripcion') + ->orderByExpr('LPAD(unidad.descripcion, 4, "0")') + ->findMany(); + $n = 30; + $mod = floor(count($ventas) / $n); + $i_rest = count($ventas) - count($ventas) % $mod + 1; + $rest = count($ventas) - $i_rest; + $lots = (object) ['size' => $mod, 'N' => $n, 'rest' => (object) [ + 'size' => $rest, + 'start' => $i_rest + ] + ]; + return view('ventas.pagos.pendientes', compact('ventas', 'lots')); + } + public static function para_pendientes() + { + $timezone = config('app.timezone'); + $today = Carbon::today($timezone); + $days = []; + $fechas = []; + for ($i = $today->copy()->subDays(15); $i <= $today->copy()->addDays(15); $i = $i->copy()->addDay()) { + $days []= $i->format('Y-m-d'); + $fechas []= $i->format('d-m-Y'); + } + $pagos_pendientes = model(Pago::class) + ->select('estado_pago.fecha') + ->selectExpr('COUNT(pago.id)', 'cantidad') + ->join('cuota', ['cuota.pago', '=', 'pago.id']) + ->join('venta', ['venta.pie', '=', 'cuota.pie']) + ->filter('filterEstado') + ->where('estado_pago.estado', 0) + ->where('venta.estado', 1) + ->whereGte('estado_pago.fecha', $today->copy()->subDays(15)->format('Y-m-d')) + ->whereLte('estado_pago.fecha', $today->copy()->addDays(15)->format('Y-m-d')) + ->orderByAsc('estado_pago.fecha') + ->groupBy('estado_pago.fecha') + ->findMany(); + $valores = array_fill(0, count($days), 0); + $anteriores = model(Pago::class) + ->join('cuota', ['cuota.pago', '=', 'pago.id']) + ->join('venta', ['venta.pie', '=', 'cuota.pie']) + ->filter('filterEstado') + ->where('estado_pago.estado', 0) + ->where('venta.estado', 1) + ->whereLt('estado_pago.fecha', $today->copy()->subDays(15)->format('Y-m-d')) + ->count(); + foreach ($pagos_pendientes as $pago) { + $valores[array_search($pago->fecha()->format('Y-m-d'), $days)] = $pago->cantidad; + } + $acum = []; + $sum = 0; + foreach ($valores as $valor) { + $sum += $valor; + $acum []= $sum; + } + $t = array_search($today->format('Y-m-d'), $days); + $color = array_merge( + array_fill(0, $t, 'red'), + ['blue'], + array_fill(0, count($days) - $t, 'green') + ); + $pagos = ['data' => $acum, 'historico' => $anteriores, 'backgroundColor' => $color]; + $abonos_pendientes = model(Pago::class) + ->select('estado_pago.fecha') + ->selectExpr('COUNT(pago.id)', 'cantidad') + ->filter('filterEstado') + ->where('estado_pago.estado', 1) + ->whereGte('estado_pago.fecha', $today->copy()->subDays(15)->format('Y-m-d')) + ->whereLt('estado_pago.fecha', $today->copy()->format('Y-m-d')) + ->orderByAsc('estado_pago.fecha') + ->groupBy('estado_pago.fecha') + ->findMany(); + $anteriores = model(Pago::class) + ->join('cuota', ['cuota.pago', '=', 'pago.id']) + ->join('venta', ['venta.pie', '=', 'cuota.pie']) + ->filter('filterEstado') + ->where('estado_pago.estado', 1) + ->where('venta.estado', 1) + ->whereLt('estado_pago.fecha', $today->copy()->subDays(15)->format('Y-m-d')) + ->count(); + $valores = array_fill(0, count($days), 0); + foreach ($abonos_pendientes as $pago) { + $valores[array_search($pago->fecha()->format('Y-m-d'), $days)] = $pago->cantidad; + } + $acum = []; + $sum = 0; + foreach ($valores as $valor) { + $sum += $valor; + $acum []= $sum; + } + $color = array_fill(0, count($pagos), 'rgb(200, 0, 0)'); + $abonos = ['data' => $acum, 'historico' => $anteriores, 'backgroundColor' => $color]; + $output = ['count' => count($days), 'fechas' => $fechas, 'pagos' => $pagos, 'abonos' => $abonos]; + echo json_encode($output); + } + public static function para_abonar() + { + $ids = json_decode(post('ids')); + //$id = get('id'); + function checkPago(&$pagos, $tipo, $pago) { + if (!$pago) { + return; + } + if (!$pago->estado()) { + $pagos []= [ + 'tipo' => $tipo, + 'pago' => $pago->asArray(), + 'estado' => -1 + ]; + return; + } + if ($pago->estado()->tipo()->descripcion == 'depositado') { + $pagos []= [ + 'tipo' => $tipo, + 'pago' => $pago->asArray(), + 'fecha' => format('shortDate', $pago->estado()->fecha), + 'valor' => format('pesos', $pago->valor, true), + 'estado' => 1 + ]; + } + } + $output = []; + foreach ($ids as $id) { + $venta = model(Venta::class)->findOne($id); + if ($venta->estado()->tipo()->activa == 0) { + $output []= ['status' => -1, 'venta' => $venta->id]; + continue; + } + $pagos = []; + if ($venta->pie()) { + foreach ($venta->pie()->cuotas() as $cuota) { + checkPago($pagos, 'Pie', $cuota->pago()); + } + if ($venta->pie()->reajuste()) { + checkPago($pagos, 'Reajuste', $venta->pie()->reajuste()); + } + } + if ($venta->credito()) { + checkPago($pagos, 'Credito', $venta->credito()->pago()); + } + if ($venta->escritura()) { + checkPago($pagos, 'Abono Escritura', $venta->escritura()->pago()); + } + if ($venta->subsidio()) { + checkPago($pagos, 'Subsidio', $venta->subsidio()->subsidio()); + checkPago($pagos, 'Ahorro', $venta->subsidio()->pago()); + } + if (count($pagos) <= 0) { + $output []= ['status' => -1, 'venta' => $venta->id]; + continue; + } + $output []= [ + 'status' => 1, + 'proyecto' => $venta->proyecto()->descripcion, + 'venta' => $venta->id, + 'propietario' => $venta->propietario()->nombreCompleto(), + 'departamento' => $venta->unidad()->descripcion, + 'pagos' => $pagos + ]; + } + return json_encode($output); + } + public static function rebotes() + { + $ids = json_decode(post('ids')); + $response = []; + foreach ($ids as $id) { + //$id = get('id'); + $venta = model(Venta::class)->findOne($id); + $rebotes = $venta->pagos(-1); + if (count($rebotes) < 1) { + $response []= ['status' => -1, 'venta' => $venta->id]; + continue; + } + usort($rebotes, function($a, $b) { + return $b->estado()->fecha()->diffInDays($a->estado()->fecha(), false); + }); + + $output = []; + $textos = []; + foreach ($rebotes as $rebote) { + $fuente = $rebote->fuente()[0]; + $text = '' . ucwords(str_replace('_', ' ', $fuente->tipo)) . ''; + $info = ['tipo' => ucwords(str_replace('_', ' ', $fuente->tipo))]; + switch ($fuente->tipo) { + case('cuota'): + $text .= '' . $fuente->obj->pie()->venta()->proyecto()->descripcion + . '' . $fuente->obj->pie()->venta()->unidad()->descripcion . '' + . $fuente->obj->pie()->venta()->propietario()->nombreCompleto() + . '' . format('shortDate', $rebote->estado()->fecha) . ''; + $info['proyecto'] = $fuente->obj->pie()->venta()->proyecto()->descripcion; + $info['venta'] = $fuente->obj->pie()->venta()->id; + $info['departamento'] = $fuente->obj->pie()->venta()->unidad()->descripcion; + $info['propietario'] = $fuente->obj->pie()->venta()->propietario()->nombreCompleto(); + $info['fecha'] = format('shortDate', $rebote->estado()->fecha); + break; + } + $text .= '' . format('pesos', $rebote->valor('pesos'), true) . ''; + $info['valor'] = format('pesos', $rebote->valor('pesos'), true); + $output []= array_merge(['id' => $rebote->id], $info); + $textos []= ['id' => $rebote->id, 'text' => $text]; + } + $response []= ['status' => 1, 'venta' => $venta->id, 'textos' => $textos, 'rebotes' => $output]; + } + + return json_encode($response); + } + public static function show() + { + $id = get('pago'); + $asociado = get('asociado'); + $id_asociado = get($asociado); + + $pago = model(Pago::class)->findOne($id); + + return view('ventas.pagos.show', compact('pago', 'asociado', 'id_asociado')); + } + public static function pagar() + { + $id = get('pago'); + $pago = model(Pago::class)->findOne($id); + $asociado = get('asociado'); + $id_asociado = get($asociado); + + return view('ventas.pagos.pagar', compact('pago', 'asociado', 'id_asociado')); + } + public static function pagando() + { + $id = get('pago'); + $pago = model(Pago::class)->findOne($id); + $asociado = get('asociado'); + $id_asociado = get($asociado); + + $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); + $data = [ + 'fecha' => $f->format('Y-m-d'), + 'pago' => $pago->id, + 'estado' => 1 + ]; + $estado = model(EstadoPago::class)->create($data); + + $estado->save(); + header('Location: ' . url('', ['p' => $asociado . 's', 'a' => 'show', $asociado => $id_asociado])); + } + public static function abonar() + { + $id = get('pago'); + $pago = model(Pago::class)->findOne($id); + $asociado = get('asociado'); + $id_asociado = get($asociado); + + return view('ventas.pagos.abonar', compact('pago', 'asociado', 'id_asociado')); + } + public static function abonando() + { + $id = get('pago'); + $pago = model(Pago::class)->findOne($id); + $asociado = get('asociado'); + $id_asociado = get($asociado); + + $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); + $data = [ + 'fecha' => $f->format('Y-m-d'), + 'pago' => $pago->id, + 'estado' => 2 + ]; + $estado = model(EstadoPago::class)->create($data); + + $estado->save(); + header('Location: ' . url('', ['p' => $asociado . 's', 'a' => 'show', $asociado => $id_asociado])); + } +} +?> diff --git a/app_old/resources/less/Controller/Pies.php b/app_old/resources/less/Controller/Pies.php new file mode 100644 index 0000000..38c2fcb --- /dev/null +++ b/app_old/resources/less/Controller/Pies.php @@ -0,0 +1,104 @@ +findOne($proyecto); + $ventas = $proyecto->ventas(); + self::sort($ventas); + return view('ventas.list', compact('proyecto', 'ventas')); + } + public static function listProyectos() + { + $proyectos = \Model::factory(Proyecto::class) + ->select('proyecto.*') + ->join('estado_proyecto', ['estado.proyecto', '=', 'proyecto.id'], 'estado') + ->join('tipo_estado_proyecto', ['tipo.id', '=', 'estado.estado'], 'tipo') + ->join('etapa_proyecto', ['etapa.id', '=', 'tipo.etapa'], 'etapa') + ->whereGte('etapa.orden', 4) + ->groupBy('proyecto.id') + ->findMany(); + echo view('ventas.proyectos', compact('proyectos')); + } + public static function resumen() + { + $id = get('pie'); + $pie = \Model::factory(\Incoviba\old\Venta\Pie::class)->findOne($id); + $venta = $pie->venta(); + return view('ventas.pies.resumen', compact('venta')); + } + public static function reajustar() + { + $id = get('venta'); + $venta = \Model::factory(Venta::class)->findOne($id); + return view('ventas.pies.reajustar', compact('venta')); + } + public static function reajuste() + { + $id = get('venta'); + $venta = \Model::factory(Venta::class)->findOne($id); + + $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); + $pago = \Model::factory(Pago::class)->create(); + $pago->fecha = $f->format('Y-m-d'); + $pago->uf = (float) uf($f)->uf->value; + $pago->valor = str_replace('.', '', post('valor')); + + $pago->new(); + + $pie = $venta->pie(); + $pie->reajuste = $pago->id; + $pie->save(); + header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); + } + public static function edit() + { + $id = get('venta'); + $venta = \Model::factory(Venta::class)->findOne($id); + return view('ventas.pies.edit', compact('venta')); + } + public static function editar() + { + $id = get('venta'); + $venta = \Model::factory(Venta::class)->findOne($id); + $pie = $venta->pie(); + $valor = correctNumber(post('valor')); + if ($pie->valor != $valor) { + $pie->valor = $valor; + } + if ($pie->cuotas != post('cuotas')) { + $pie->cuotas = post('cuotas'); + } + + $pie->save(); + header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); + } + public static function asociar() + { + $id = get('pie'); + $pie = \Model::factory(Pie::class)->findOne($id); + $pie->asociado = post('asociado'); + + $pie->save(); + header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $pie->venta()->id])); + } +} +?> diff --git a/app_old/resources/less/Controller/Postventas.php b/app_old/resources/less/Controller/Postventas.php new file mode 100644 index 0000000..7b38cb6 --- /dev/null +++ b/app_old/resources/less/Controller/Postventas.php @@ -0,0 +1,69 @@ +findOne($id); + + return view('ventas.postventas.add', compact('venta')); + } + public static function agregar() + { + $id = get('venta'); + $venta = model(Venta::class)->findOne($id); + + $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); + $observaciones = json_decode(post('observaciones')); + $postventa = model(Postventa::class)->create(); + $postventa->venta_id = $venta->id; + $postventa->save(); + + $estado = model(EstadoPostventa::class)->create(); + $estado->postventa_id = $postventa->id; + $estado->tipo_estado_postventa_id = 1; + $estado->fecha = $f->format('Y-m-d'); + $estado->save(); + + foreach ($observaciones as $o) { + $observacion = model(Observacion::class)->create(); + $observacion->texto = post('observacion' . $o); + + $observacion->save(); + + $estado = model(EstadoObservacion::class)->create(); + $estado->observacion_id = $observacion->id; + $estado->tipo_estado_observacion_id = 1; + $estado->fecha = $f->format('Y-m-d'); + $estado->save(); + + $po = model(PostventaObservacion::class)->create(); + $po->postventa_id = $postventa->id; + $po->observacion_id = $observacion->id; + $po->save(); + } + header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); + } + public static function show() + { + $id = get('postventa'); + $postventa = model(Postventa::class)->findOne($id); + $venta = model(Venta::class)->findOne($postventa->venta_id); + + return view('ventas.postventas.show', compact('postventa', 'venta')); + } +} +?> diff --git a/resources/less/Controller/Precios.php b/app_old/resources/less/Controller/Precios.php similarity index 100% rename from resources/less/Controller/Precios.php rename to app_old/resources/less/Controller/Precios.php diff --git a/app_old/resources/less/Controller/Propietarios.php b/app_old/resources/less/Controller/Propietarios.php new file mode 100644 index 0000000..5d38ee7 --- /dev/null +++ b/app_old/resources/less/Controller/Propietarios.php @@ -0,0 +1,129 @@ +findOne($id); + $propietario = $venta->propietario(); + $regiones = model(Region::class)->orderByAsc('numeracion')->findMany(); + + return view('ventas.propietarios.edit', compact('venta', 'propietario', 'regiones')); + } + public static function editar() + { + $id = get('venta'); + $venta = model(Venta::class)->findOne($id); + + $info = post(); + list($info['rut'], $info['dv']) = explode('-', str_replace('.', '', $info['rut'])); + $propietario = model(Propietario::class)->findOne($info['rut']); + if (!$propietario) { + $propietario = model(Propietario::class)->create(); + } + if ($propietario->direccion != 0) { + $direccion = $propietario->direccion(); + } else { + $direccion = model(Direccion::class) + ->where('calle', post('calle')) + ->where('numero', post('numero')) + ->where('extra', post('extra')) + ->where('comuna', post('comuna')) + ->findOne(); + if (!$direccion) { + $data = [ + 'calle' => post('calle'), + 'numero' => post('numero'), + 'extra' => post('extra'), + 'comuna' => post('comuna') + ]; + $direccion = model(Direccion::class)->create($data); + } + } + + if (isset($info['empresa'])) { + $info['apellido_paterno'] = ''; + $info['apellido_materno'] = ''; + } + + if ($propietario->representante != 0) { + list($info['rep_rut'], $info['rep_dv']) = explode('-', str_replace('.', '', $info['rep_rut'])); + $representante = $propietario->representante(); + } elseif (isset($info['rep_rut'])) { + list($info['rep_rut'], $info['rep_dv']) = explode('-', str_replace('.', '', $info['rep_rut'])); + $representante= model(Propietario::class)->findOne($info['rep_rut']); + if (!$representante) { + $representante= model(Propietario::class)->create(); + } + } + + $fields = ['rut', 'dv', 'nombres', 'apellido_paterno', 'apellido_materno']; + $change = false; + foreach ($fields as $key) { + if ($propietario->$key != $info[$key]) { + $propietario->$key = $info[$key]; + $change = true; + } + } + if ($direccion->isNew()) { + $direccion->save(); + } + if ($propietario->direccion != $direccion->id) { + $propietario->direccion = $direccion->id; + $change = true; + } + if ($change) { + d($propietario); + $propietario->save(); + } + + if (isset($info['rep_rut'])) { + $change = false; + if ($representante->rut != $info['rep_rut']) { + $representante->rut = $info['rep_rut']; + $representante->dv = $info['rep_dv']; + $change = true; + } + if ($representante->nombres != $info['rep_nombres']) { + $representante->nombres = $info['rep_nombres']; + $change = true; + } + if ($representante->apellido_paterno != $info['rep_apaterno']) { + $representante->apellido_paterno = $info['rep_apaterno']; + $change = true; + } + if ($representante->apellido_materno != $info['rep_amaterno']) { + $representante->apellido_materno = $info['rep_amaterno']; + $change = true; + } + if ($representante->direccion != $direccion->id) { + $representante->direccion = $direccion->id; + $change = true; + } + if ($change) { + $representante->save(); + } + if ($propietario->representante != $representante->rut) { + $propietario->representante = $representante->rut; + $propietario->save(); + } + } + + if ($venta->propietario != $propietario->rut) { + $venta->propietario = $propietario->rut; + $venta->save(); + } + header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); + } +} +?> diff --git a/app_old/resources/less/Controller/ProyectoTipoUnidades.php b/app_old/resources/less/Controller/ProyectoTipoUnidades.php new file mode 100644 index 0000000..32c0c1d --- /dev/null +++ b/app_old/resources/less/Controller/ProyectoTipoUnidades.php @@ -0,0 +1,77 @@ +findOne($id); + $tipos = model(TipoUnidad::class)->findMany(); + + return view('proyectos.tipo_unidades.edit', compact('tipo', 'tipos')); + } + public static function editar() + { + $id = get('tipo_unidad'); + $tipo = model(ProyectoTipoUnidad::class)->findOne($id); + + $changed = false; + foreach (post() as $field => $value) { + if ($tipo->{$field} != $value) { + $tipo->{$field} = $value; + $changed = true; + } + } + if ($changed) { + $tipo->save(); + } + header('Location: ' . nUrl('proyectos', 'list_unidades', ['proyecto' => $tipo->proyecto()->id])); + } + public static function add_unidad() + { + $id = get('tipo_unidad'); + $tipo = model(ProyectoTipoUnidad::class)->findOne($id); + if ($tipo->tipo()->descripcion == 'departamento') { + return view('proyectos.unidades.add', compact('tipo')); + } + return view('proyectos.unidades.add2', compact('tipo')); + } + public static function assign() + { + $id = get('proyecto'); + $proyecto = model(Proyecto::class)->findOne($id); + $tipos = model(ProyectoTipoUnidad::class)->where('proyecto', $proyecto->id)->findMany(); + $libres = model(Unidad::class)->where('proyecto', $proyecto->id)->where('pt', 0)->findMany(); + + return view('proyectos.unidades.assign', compact('proyecto', 'tipos', 'libres')); + } + public static function asignar() + { + $id = get('proyecto'); + $proyecto = model(Proyecto::class)->findOne($id); + + $libres = model(Unidad::class)->where('proyecto', $proyecto->id)->where('pt', 0)->findMany(); + foreach ($libres as $unidad) { + $unidad->pt = post('tipo' . $unidad->id); + $unidad->save(); + } + header('Location: ' . nUrl('proyectos', 'list_unidades', ['proyecto' => $proyecto->id])); + } +} diff --git a/resources/less/Controller/Proyectos.php b/app_old/resources/less/Controller/Proyectos.php similarity index 100% rename from resources/less/Controller/Proyectos.php rename to app_old/resources/less/Controller/Proyectos.php diff --git a/app_old/resources/less/Controller/Reajustes.php b/app_old/resources/less/Controller/Reajustes.php new file mode 100644 index 0000000..4c6c938 --- /dev/null +++ b/app_old/resources/less/Controller/Reajustes.php @@ -0,0 +1,90 @@ +findOne($id); + return view('ventas.pies.reajustes.edit', compact('venta')); + } + public static function editar() + { + $id = get('venta'); + $venta = model(Venta::class)->findOne($id); + $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); + $uf = uf($f); + + $valor = correctNumber(post('valor')); + if ($valor == '') { + $valor_uf = correctNumber(post('valor_uf')); + $valor = $valor_uf * $uf->uf->value; + } + $pago = $venta->pie()->reajuste(); + if ($pago->valor != $valor) { + $pago->valor = $valor; + } + if ($pago->fecha != $f->format('Y-m-d')) { + $pago->fecha = $f->format('Y-m-d'); + $pago->uf = $uf->uf->value; + } + + $pago->save(); + header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); + } + public static function pagar() + { + $id = get('venta'); + $venta = model(Venta::class)->findOne($id); + + return view('ventas.pies.reajustes.pagar', compact('venta')); + } + public static function pagado() + { + $id = get('venta'); + $venta = model(Venta::class)->findOne($id); + + $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); + + $data = [ + 'pago' => $venta->pie()->reajuste()->id, + 'fecha' => $f->format('Y-m-d'), + 'estado' => 1 + ]; + $estado = model(EstadoPago::class)->create($data); + $estado->save(); + header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); + } + public static function abonar() + { + $id = get('venta'); + $venta = model(Venta::class)->findOne($id); + + return view('ventas.pies.reajustes.abonar', compact('venta')); + } + public static function abonado() + { + $id = get('venta'); + $venta = model(Venta::class)->findOne($id); + + $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); + + $data = [ + 'pago' => $venta->pie()->reajuste()->id, + 'fecha' => $f->format('Y-m-d'), + 'estado' => 2 + ]; + $estado = model(EstadoPago::class)->create($data); + $estado->save(); + header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); + } +} +?> diff --git a/app_old/resources/less/Controller/Registros.php b/app_old/resources/less/Controller/Registros.php new file mode 100644 index 0000000..546fece --- /dev/null +++ b/app_old/resources/less/Controller/Registros.php @@ -0,0 +1,39 @@ +orderByDesc('time')->findMany(); + $ini = new Color(0, 100, 0); + $end = new Color(255, 255, 255); + $colores = self::colores($end, $ini, 100); + return view('admin.registros.list', compact('registros', 'colores')); + } + public static function show() + { + $registro = model(RModel::class)->findOne(get('registro')); + $ini = new Color(0, 100, 0); + $end = new Color(255, 255, 255); + $colores = self::colores($end, $ini, 100); + return view('admin.registros.show', compact('registro', 'colores')); + } + protected static function colores($ini, $end, $max) + { + $current = $ini->toVector(); + $colores = []; + $line = new Line($ini->toVector(), $end->toVector()); + for ($i = 0; $i < $max; $i ++) { + $colores[$i] = new Color($current); + $current = $line->move($current, $line->length() / $max); + } + return $colores; + } +} diff --git a/app_old/resources/less/Controller/Subsidios.php b/app_old/resources/less/Controller/Subsidios.php new file mode 100644 index 0000000..5107fc3 --- /dev/null +++ b/app_old/resources/less/Controller/Subsidios.php @@ -0,0 +1,184 @@ +findOne($id); + echo view('ventas.subsidios.add', compact('venta')); + } + public static function do_add() + { + $id = get('venta'); + $venta = model(Venta::class)->findOne($id); + $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); + $uf = uf($f); + + $pago1 = model(Pago::class)->create(); + $valor = post('ahorro_uf') * $uf->uf->value; + if (post('ahorro') != null) { + $valor = post('ahorro'); + } + $pago1->valor = $valor; + $pago1->fecha = $f->format('Y-m-d'); + $pago1->uf = $uf->uf->value; + + $pago2 = model(Pago::class)->create(); + $valor = post('subsidio_uf') * $uf->uf->value; + if (post('subsidio') != null) { + $valor = post('subsidio'); + } + $pago2->valor = $valor; + $pago2->fecha = $f->format('Y-m-d'); + $pago2->uf = $uf->uf->value; + + $pago1->new(); + $pago2->new(); + + $subsidio = model(Subsidio::class)->create(); + $subsidio->pago = $pago1->id; + $subsidio->subsidio = $pago2->id; + + $subsidio->save(); + $venta->subsidio = $subsidio->id(); + $venta->save(); + header('Location: ' . nUrl('ventas', 'show', ['venta' => $venta->id])); + } + public static function edit() + { + $id = get('venta'); + $venta = model(Venta::class)->findOne($id); + echo view('ventas.subsidios.edit', compact('venta')); + } + public static function do_edit() + { + $id = get('venta'); + $venta = model(Venta::class)->findOne($id); + $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); + $uf = uf($f); + + $pago1 = $venta->subsidio()->pago(); + $valor = post('ahorro_uf') * $uf->uf->value; + if (post('ahorro') != null) { + $valor = post('ahorro'); + } + $pago1->valor = $valor; + $pago1->fecha = $f->format('Y-m-d'); + $pago1->uf = $uf->uf->value; + + $pago2 = $venta->subsidio()->subsidio(); + $valor = post('subsidio_uf') * $uf->uf->value; + if (post('subsidio') != null) { + $valor = post('subsidio'); + } + $pago2->valor = $valor; + $pago2->fecha = $f->format('Y-m-d'); + $pago2->uf = $uf->uf->value; + + $pago1->save(); + $pago2->save(); + header('Location: ' . nUrl('ventas', 'show', ['venta' => $venta->id])); + } + public static function pagar() + { + $id = get('venta'); + $venta = model(Venta::class)->findOne($id); + $tipo = get('tipo'); + switch($tipo) { + case 'subsidio': + $pago = $venta->subsidio()->subsidio(); + break; + case 'pago': + $pago = $venta->subsidio()->pago(); + break; + default: + $pago = null; + } + echo view('ventas.subsidios.pagar', compact('venta', 'pago')); + } + public static function do_pagar() + { + $id = get('venta'); + $venta = model(Venta::class)->findOne($id); + $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); + $tipo = post('tipo'); + switch($tipo) { + case 'subsidio': + $pago = $venta->subsidio()->subsidio(); + break; + case 'pago': + $pago = $venta->subsidio()->pago(); + break; + default: + $pago = null; + } + $pago->valor = post('valor'); + $tipo = model(TipoEstadoPago::class)->where('descripcion', 'depositado')->findOne(); + $data = [ + 'pago' => $pago->id, + 'fecha' => $f->format('Y-m-d'), + 'estado' => $tipo->id + ]; + $estado = model(EstadoPago::class)->create($data); + $pago->save(); + $estado->save(); + header('Location: ' . nUrl('ventas', 'show', ['venta' => $venta->id])); + } + public static function abonar() + { + $id = get('venta'); + $venta = model(Venta::class)->findOne($id); + $tipo = get('tipo'); + switch($tipo) { + case 'subsidio': + $pago = $venta->subsidio()->subsidio(); + break; + case 'pago': + $pago = $venta->subsidio()->pago(); + break; + default: + $pago = null; + } + echo view('ventas.subsidios.abonar', compact('venta', 'pago')); + } + public static function do_abonar() + { + $id = get('venta'); + $venta = model(Venta::class)->findOne($id); + $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); + $tipo = post('tipo'); + switch($tipo) { + case 'subsidio': + $pago = $venta->subsidio()->subsidio(); + break; + case 'pago': + $pago = $venta->subsidio()->pago(); + break; + default: + $pago = null; + } + $pago->valor = post('valor'); + $tipo = model(TipoEstadoPago::class)->where('descripcion', 'abonado')->findOne(); + $data = [ + 'pago' => $pago->id, + 'fecha' => $f->format('Y-m-d'), + 'estado' => $tipo->id + ]; + $estado = model(EstadoPago::class)->create($data); + $pago->save(); + $estado->save(); + header('Location: ' . nUrl('ventas', 'show', ['venta' => $venta->id])); + } +} diff --git a/app_old/resources/less/Controller/Temas.php b/app_old/resources/less/Controller/Temas.php new file mode 100644 index 0000000..24b121a --- /dev/null +++ b/app_old/resources/less/Controller/Temas.php @@ -0,0 +1,111 @@ +orderByAsc('descripcion')->findMany(); + return view('temas.add', compact('proyectos')); + } + public static function agregar() + { + $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); + $data = [ + "proyecto_id" => post('proyecto'), + "inicio" => $f->format('Y-m-d'), + "texto" => post('texto') + ]; + $tema = model(Tema::class)->create($data); + + $tema->save(); + header('Location: ' . url('', ['p' => 'temas', 'a' => 'list'])); + } + public static function list() + { + $temas = model(Tema::class)->findMany(); + $t = Carbon::today(config('app.timezone')); + foreach ($temas as $i => $tema) { + if ($tema->cierre()->year != -1 and $t->diff($tema->cierre())->days > 10) { + unset($temas[$i]); + } + } + $temas = array_values($temas); + usort($temas, function($a, $b) { + $p = strcmp($a->proyecto()->descripcion, $b->proyecto()->descripcion); + if ($p == 0) { + $f = $b->inicio()->diff($a->inicio())->format('%r%a'); + if ($f == 0) { + return $a->id - $b->id; + } + return $f; + } + return $p; + }); + + return view('temas.list', compact('temas')); + } + public static function edit() + { + $id = get('tema'); + $tema = model(Tema::class)->findOne($id); + $proyectos = model(Proyecto::class)->orderByAsc('descripcion')->findMany(); + return view('temas.edit', compact('tema', 'proyectos')); + } + public static function editar() + { + $id = get('tema'); + $tema = model(Tema::class)->findOne($id); + + $proyecto = post('proyecto'); + $changed = false; + if ($tema->proyecto_id != $proyecto) { + $tema->proyecto_id = $proyecto; + $changed = true; + } + $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); + if ($tema->inicio() != $f) { + $tema->inicio = $f->format('Y-m-d'); + $changed = true; + } + $texto = post('texto'); + if ($tema->texto != $texto) { + $tema->texto = $texto; + $changed = true; + } + + if ($changed) { + $tema->save(); + } + header('Location: ' . url('', ['p' => 'temas', 'a' => 'list'])); + } + public static function cerrar() + { + $id = get('tema'); + $tema = model(Tema::class)->findOne($id); + $f = Carbon::today(config('app.timezone')); + $tema->cierre = $f->format('Y-m-d'); + + $tema->save(); + header('Location: ' . url('', ['p' => 'temas', 'a' => 'list'])); + } + public static function abrir() + { + $id = get('tema'); + $tema = model(Tema::class)->findOne($id)->as_array(); + unset($tema['id'], $tema['cierre'], $tema['created_at'], $tema['updated_at']); + + $tema = model(Tema::class)->create($tema); + + $tema->save(); + header('Location: ' . url('', ['p' => 'temas', 'a' => 'list'])); + } +} +?> diff --git a/app_old/resources/less/Controller/Unidades.php b/app_old/resources/less/Controller/Unidades.php new file mode 100644 index 0000000..9f0da01 --- /dev/null +++ b/app_old/resources/less/Controller/Unidades.php @@ -0,0 +1,126 @@ +findOne($id); + $len = strlen(post('total')); + + $unis = json_decode(post('unidades')); + $data = []; + foreach ($unis as $n_unidad) { + if ($tipo->tipo()->descripcion == 'departamento') { + $ini = post('piso_ini' . $n_unidad); + $end = post('piso_end' . $n_unidad); + $subtipo = post('linea' . $n_unidad); + $orientacion = post('orientacion' . $n_unidad); + for ($piso = $ini; $piso <= $end; $piso ++) { + $descripcion = $piso . str_pad(post('linea' . $n_unidad), $len, '0', \STR_PAD_LEFT); + + $data []= [ + 'proyecto' => $tipo->proyecto()->id, + 'tipo' => $tipo->tipo()->id, + 'subtipo' => $subtipo, + 'piso' => $piso, + 'descripcion' => $descripcion, + 'abreviacion' => $tipo->abreviacion, + 'm2' => $tipo->m2, + 'terraza' => $tipo->terraza, + 'logia' => $tipo->logia, + 'orientacion' => $orientacion, + 'pt' => $tipo->id + ]; + } + } else { + $descripcion = post('descripcion' . $n_unidad); + $piso = post('piso' . $n_unidad); + $data []= [ + 'proyecto' => $tipo->proyecto()->id, + 'tipo' => $tipo->tipo()->id, + 'piso' => $piso, + 'descripcion' => $descripcion, + 'abreviacion' => $tipo->abreviacion, + 'm2' => $tipo->m2, + 'terraza' => $tipo->terraza, + 'logia' => $tipo->logia, + 'pt' => $tipo->id + ]; + } + } + + foreach ($data as $uni) { + $unidad = model(Unidad::class) + ->where('descripcion', $uni['descripcion']) + ->where('proyecto', $uni['proyecto']) + ->where('tipo', $uni['tipo']) + ->findOne(); + if ($unidad) { + continue; + } + $unidad = model(Unidad::class)->create($uni); + $unidad->save(); + } + header('Location: ' . url('', ['p' => 'proyectos', 'a' => 'list_unidades', 'proyecto' => $tipo->proyecto()->id])); + } + public static function edit() + { + $id = get('unidad'); + $unidad = model(Unidad::class)->findOne($id); + $tipos = model(ProyectoTipoUnidad::class)->where('proyecto', $unidad->proyecto()->id)->findMany(); + $abreviaciones = ['N', 'NE', 'E', 'SE', 'S', 'SO', 'O', 'NO']; + $descripciones = ['Norte', 'Noreste', 'Este', 'Sureste', 'Sur', 'Suroeste', 'Oeste', 'Noroeste']; + $orientaciones = []; + foreach ($abreviaciones as $i => $ab) { + $orientaciones []= (object) ['abreviacion' => $ab, 'descripcion' => $descripciones[$i]]; + } + + return view('proyectos.unidades.edit', compact('unidad', 'tipos', 'orientaciones')); + } + public static function editar() + { + $id = get('unidad'); + $unidad = model(Unidad::class)->findOne($id); + + $change = false; + $fields = ['descripcion', 'tipo', 'piso', 'linea', 'orientacion']; + foreach ($fields as $field) { + $f = $field; + if ($f == 'tipo') { + $f = 'pt'; + } + if ($f == 'linea') { + $f = 'subtipo'; + } + if ($unidad->{$f} != post($field)) { + $unidad->{$f} = post($field); + $change = true; + } + } + + if ($change) { + $unidad->save(); + } + header('Location: ' . nUrl('proyectos', 'list_unidades', ['proyecto' => $unidad->proyecto()->id])); + } + public static function remove() + { + $id = get('unidad'); + $unidad = model(Unidad::class)->findOne($id); + $unidad->delete(); + + $id = get('proyecto'); + header('Location: ' . nUrl('proyectos', 'list_unidades', ['proyecto' => $id])); + } +} +?> diff --git a/app_old/resources/less/Controller/UnidadesBloqueadas.php b/app_old/resources/less/Controller/UnidadesBloqueadas.php new file mode 100644 index 0000000..9bd4107 --- /dev/null +++ b/app_old/resources/less/Controller/UnidadesBloqueadas.php @@ -0,0 +1,83 @@ +findMany(); + echo view('ventas.operadores.unidades.list', compact('proyectos')); + } + public static function add() + { + $proyectos = model(Proyecto::class)->findMany(); + echo view('ventas.operadores.unidades.add', compact('proyectos')); + } + public static function bloquear() + { + $operador = model(ProyectoAgente::class)->findOne(get('operador')); + echo view('ventas.operadores.unidades.bloquear', compact('operador')); + } + public static function do_bloquear() + { + $operador = model(ProyectoAgente::class)->findOne(get('operador')); + $fecha = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); + $unidades = self::getUnidades([], 'departamentos', 1); + $unidades = self::getUnidades($unidades, 'estacionamientos', 2); + $unidades = self::getUnidades($unidades, 'bodegas', 3); + if (post('unidad') != null) { + foreach (post('unidad') as $u) { + $unidad = model(Unidad::class)->findOne($u); + if (array_search($unidad, $unidades) === false) { + $unidades []= $unidad; + } + } + } + + foreach ($unidades as $unidad) { + $data = [ + 'agente' => $operador->id, + 'unidad' => $unidad->id + ]; + $ub = model(UnidadBloqueada::class)->create($data); + $ub->new($fecha); + } + header('Location: ' . nUrl('unidades_bloqueadas', 'list')); + } + protected static function getUnidades(array $unidades, string $name, int $tipo): array + { + if (trim(post($name)) == '') { + return $unidades; + } + $unis = []; + $separators = [PHP_EOL, ';', ',', '-']; + foreach ($separators as $separator) { + if (strpos(post($name), $separator) !== false) { + $unis = explode($separator, post($name)); + break; + } + } + if (count($unis) == 0) { + return $unidades; + } + array_walk($unis, function(&$item) { + $item = trim($item); + $item = model(Unidad::class)->where('descripcion', $item)->where('tipo', 1)->findOne(); + }); + foreach ($unis as $uni) { + if (array_search($uni, $unidades) === false) { + $unidades []= $uni; + } + } + return $unidades; + } +} diff --git a/resources/less/Controller/Ventas.php b/app_old/resources/less/Controller/Ventas.php similarity index 100% rename from resources/less/Controller/Ventas.php rename to app_old/resources/less/Controller/Ventas.php diff --git a/resources/less/_variables.less b/app_old/resources/less/_variables.less similarity index 100% rename from resources/less/_variables.less rename to app_old/resources/less/_variables.less diff --git a/resources/less/app.less b/app_old/resources/less/app.less similarity index 100% rename from resources/less/app.less rename to app_old/resources/less/app.less diff --git a/resources/less/bootstrap.less b/app_old/resources/less/bootstrap.less similarity index 100% rename from resources/less/bootstrap.less rename to app_old/resources/less/bootstrap.less diff --git a/resources/less/custom.less b/app_old/resources/less/custom.less similarity index 100% rename from resources/less/custom.less rename to app_old/resources/less/custom.less diff --git a/resources/less/print.less b/app_old/resources/less/print.less similarity index 100% rename from resources/less/print.less rename to app_old/resources/less/print.less diff --git a/resources/less/submenu.less b/app_old/resources/less/submenu.less similarity index 100% rename from resources/less/submenu.less rename to app_old/resources/less/submenu.less diff --git a/resources/routes/api.php b/app_old/resources/routes/api.php similarity index 100% rename from resources/routes/api.php rename to app_old/resources/routes/api.php diff --git a/resources/routes/api/unidades.php b/app_old/resources/routes/api/unidades.php similarity index 100% rename from resources/routes/api/unidades.php rename to app_old/resources/routes/api/unidades.php diff --git a/resources/routes/cli.php b/app_old/resources/routes/cli.php similarity index 100% rename from resources/routes/cli.php rename to app_old/resources/routes/cli.php diff --git a/app_old/resources/routes/ui/01_auth.php b/app_old/resources/routes/ui/01_auth.php new file mode 100644 index 0000000..0c2ce0e --- /dev/null +++ b/app_old/resources/routes/ui/01_auth.php @@ -0,0 +1,15 @@ +group('/auth', function($app) { + $app->group('/login', function($app) { + $app->get('[/]', [Auth::class, 'login']); + $app->post('[/]', [Auth::class, 'do_login']); + }); + $app->get('/logout[/]', [Auth::class, 'logout']); + $app->group('/pass', function($app) { + $app->get('/check', [Auth::class, 'check_pass']); + $app->get('[/]', [Auth::class, 'change_pass']); + $app->post('[/]', [Auth::class, 'do_change_pass']); + }); +}); diff --git a/app_old/resources/routes/ui/99_base.php b/app_old/resources/routes/ui/99_base.php new file mode 100644 index 0000000..b57230d --- /dev/null +++ b/app_old/resources/routes/ui/99_base.php @@ -0,0 +1,4 @@ +get('[/]', Home::class); diff --git a/resources/views/admin/base.blade.php b/app_old/resources/views/admin/base.blade.php similarity index 100% rename from resources/views/admin/base.blade.php rename to app_old/resources/views/admin/base.blade.php diff --git a/resources/views/admin/menu.blade.php b/app_old/resources/views/admin/menu.blade.php similarity index 100% rename from resources/views/admin/menu.blade.php rename to app_old/resources/views/admin/menu.blade.php diff --git a/resources/views/admin/menu/models.blade.php b/app_old/resources/views/admin/menu/models.blade.php similarity index 100% rename from resources/views/admin/menu/models.blade.php rename to app_old/resources/views/admin/menu/models.blade.php diff --git a/resources/views/admin/menu/registros.blade.php b/app_old/resources/views/admin/menu/registros.blade.php similarity index 100% rename from resources/views/admin/menu/registros.blade.php rename to app_old/resources/views/admin/menu/registros.blade.php diff --git a/resources/views/admin/menu/roles.blade.php b/app_old/resources/views/admin/menu/roles.blade.php similarity index 100% rename from resources/views/admin/menu/roles.blade.php rename to app_old/resources/views/admin/menu/roles.blade.php diff --git a/resources/views/admin/menu/users.blade.php b/app_old/resources/views/admin/menu/users.blade.php similarity index 100% rename from resources/views/admin/menu/users.blade.php rename to app_old/resources/views/admin/menu/users.blade.php diff --git a/resources/views/admin/models.blade.php b/app_old/resources/views/admin/models.blade.php similarity index 100% rename from resources/views/admin/models.blade.php rename to app_old/resources/views/admin/models.blade.php diff --git a/resources/views/admin/registros/controles_avance.blade.php b/app_old/resources/views/admin/registros/controles_avance.blade.php similarity index 100% rename from resources/views/admin/registros/controles_avance.blade.php rename to app_old/resources/views/admin/registros/controles_avance.blade.php diff --git a/resources/views/admin/registros/list.blade.php b/app_old/resources/views/admin/registros/list.blade.php similarity index 100% rename from resources/views/admin/registros/list.blade.php rename to app_old/resources/views/admin/registros/list.blade.php diff --git a/resources/views/admin/registros/show.blade.php b/app_old/resources/views/admin/registros/show.blade.php similarity index 100% rename from resources/views/admin/registros/show.blade.php rename to app_old/resources/views/admin/registros/show.blade.php diff --git a/resources/views/admin/roles/add.blade.php b/app_old/resources/views/admin/roles/add.blade.php similarity index 100% rename from resources/views/admin/roles/add.blade.php rename to app_old/resources/views/admin/roles/add.blade.php diff --git a/resources/views/admin/roles/add_permissions.blade.php b/app_old/resources/views/admin/roles/add_permissions.blade.php similarity index 100% rename from resources/views/admin/roles/add_permissions.blade.php rename to app_old/resources/views/admin/roles/add_permissions.blade.php diff --git a/resources/views/admin/roles/add_users.blade.php b/app_old/resources/views/admin/roles/add_users.blade.php similarity index 100% rename from resources/views/admin/roles/add_users.blade.php rename to app_old/resources/views/admin/roles/add_users.blade.php diff --git a/resources/views/admin/roles/list.blade.php b/app_old/resources/views/admin/roles/list.blade.php similarity index 100% rename from resources/views/admin/roles/list.blade.php rename to app_old/resources/views/admin/roles/list.blade.php diff --git a/resources/views/admin/roles/show.blade.php b/app_old/resources/views/admin/roles/show.blade.php similarity index 100% rename from resources/views/admin/roles/show.blade.php rename to app_old/resources/views/admin/roles/show.blade.php diff --git a/resources/views/admin/users/add.blade.php b/app_old/resources/views/admin/users/add.blade.php similarity index 100% rename from resources/views/admin/users/add.blade.php rename to app_old/resources/views/admin/users/add.blade.php diff --git a/resources/views/admin/users/add_role.blade.php b/app_old/resources/views/admin/users/add_role.blade.php similarity index 100% rename from resources/views/admin/users/add_role.blade.php rename to app_old/resources/views/admin/users/add_role.blade.php diff --git a/resources/views/admin/users/list.blade.php b/app_old/resources/views/admin/users/list.blade.php similarity index 100% rename from resources/views/admin/users/list.blade.php rename to app_old/resources/views/admin/users/list.blade.php diff --git a/resources/views/admin/users/show.blade.php b/app_old/resources/views/admin/users/show.blade.php similarity index 100% rename from resources/views/admin/users/show.blade.php rename to app_old/resources/views/admin/users/show.blade.php diff --git a/resources/views/auth/base.blade.php b/app_old/resources/views/auth/base.blade.php similarity index 72% rename from resources/views/auth/base.blade.php rename to app_old/resources/views/auth/base.blade.php index cef48cf..c1e7338 100644 --- a/resources/views/auth/base.blade.php +++ b/app_old/resources/views/auth/base.blade.php @@ -1,5 +1,5 @@ - + @@ -7,9 +7,9 @@ {{$titulo}} - @endif Incoviba S. A. - - - + + + @stack('styles') @@ -19,7 +19,7 @@
- + Logo
@@ -36,7 +36,7 @@ @include('layout.menu.login') @else -
  • Ingresar
    • +
  • Ingresar
    • @endif diff --git a/resources/views/auth/change_pass.blade.php b/app_old/resources/views/auth/change_pass.blade.php similarity index 100% rename from resources/views/auth/change_pass.blade.php rename to app_old/resources/views/auth/change_pass.blade.php diff --git a/app_old/resources/views/auth/login.blade.php b/app_old/resources/views/auth/login.blade.php new file mode 100644 index 0000000..d36013e --- /dev/null +++ b/app_old/resources/views/auth/login.blade.php @@ -0,0 +1,17 @@ +@extends('auth.base') + +@section('content') +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +@endsection diff --git a/resources/views/benchmark.blade.php b/app_old/resources/views/benchmark.blade.php similarity index 100% rename from resources/views/benchmark.blade.php rename to app_old/resources/views/benchmark.blade.php diff --git a/resources/views/buscar/buscar.blade.php b/app_old/resources/views/buscar/buscar.blade.php similarity index 100% rename from resources/views/buscar/buscar.blade.php rename to app_old/resources/views/buscar/buscar.blade.php diff --git a/resources/views/buscar/resultado.blade.php b/app_old/resources/views/buscar/resultado.blade.php similarity index 100% rename from resources/views/buscar/resultado.blade.php rename to app_old/resources/views/buscar/resultado.blade.php diff --git a/resources/views/calendario.blade.php b/app_old/resources/views/calendario.blade.php similarity index 100% rename from resources/views/calendario.blade.php rename to app_old/resources/views/calendario.blade.php diff --git a/resources/views/cierres.blade.php b/app_old/resources/views/cierres.blade.php similarity index 100% rename from resources/views/cierres.blade.php rename to app_old/resources/views/cierres.blade.php diff --git a/resources/views/construccion.blade.php b/app_old/resources/views/construccion.blade.php similarity index 100% rename from resources/views/construccion.blade.php rename to app_old/resources/views/construccion.blade.php diff --git a/resources/views/contabilidad/pago.blade.php b/app_old/resources/views/contabilidad/pago.blade.php similarity index 100% rename from resources/views/contabilidad/pago.blade.php rename to app_old/resources/views/contabilidad/pago.blade.php diff --git a/resources/views/contabilidad/pagos.blade.php b/app_old/resources/views/contabilidad/pagos.blade.php similarity index 100% rename from resources/views/contabilidad/pagos.blade.php rename to app_old/resources/views/contabilidad/pagos.blade.php diff --git a/resources/views/form/fecha.blade.php b/app_old/resources/views/form/fecha.blade.php similarity index 100% rename from resources/views/form/fecha.blade.php rename to app_old/resources/views/form/fecha.blade.php diff --git a/resources/views/guest.blade.php b/app_old/resources/views/guest.blade.php similarity index 71% rename from resources/views/guest.blade.php rename to app_old/resources/views/guest.blade.php index fc12734..6692a1e 100644 --- a/resources/views/guest.blade.php +++ b/app_old/resources/views/guest.blade.php @@ -1,5 +1,5 @@ - + @@ -7,9 +7,9 @@ {{$titulo}} - @endif Incoviba S. A. - - - + + + @stack('styles') @@ -19,7 +19,7 @@
    - + Logo
    @@ -36,7 +36,7 @@ @include('layout.menu.login') @else -
  • Ingresar
    • +
  • Ingresar
    • @endif @@ -54,4 +54,4 @@ @include('layout.footer') @stack('scripts') - \ No newline at end of file + diff --git a/resources/views/home.blade.php b/app_old/resources/views/home.blade.php similarity index 60% rename from resources/views/home.blade.php rename to app_old/resources/views/home.blade.php index 1f7015e..ccc52ff 100644 --- a/resources/views/home.blade.php +++ b/app_old/resources/views/home.blade.php @@ -8,7 +8,7 @@ @endif @if ($pendientes > 0)
    -
    Existe{{($pendientes > 1) ? 'n' : ''}} {{$pendientes}} cuota{{($pendientes > 1) ? 's' : ''}} pendiente{{($pendientes > 1) ? 's' : ''}}.
    +
    Existe{{($pendientes > 1) ? 'n' : ''}} {{$pendientes}} cuota{{($pendientes > 1) ? 's' : ''}} pendiente{{($pendientes > 1) ? 's' : ''}}.
    @endif diff --git a/resources/views/informes/comisiones.blade.php b/app_old/resources/views/informes/comisiones.blade.php similarity index 100% rename from resources/views/informes/comisiones.blade.php rename to app_old/resources/views/informes/comisiones.blade.php diff --git a/resources/views/informes/contabilidad.blade.php b/app_old/resources/views/informes/contabilidad.blade.php similarity index 100% rename from resources/views/informes/contabilidad.blade.php rename to app_old/resources/views/informes/contabilidad.blade.php diff --git a/resources/views/informes/escrituras.blade.php b/app_old/resources/views/informes/escrituras.blade.php similarity index 100% rename from resources/views/informes/escrituras.blade.php rename to app_old/resources/views/informes/escrituras.blade.php diff --git a/resources/views/informes/gantt_entregas.blade.php b/app_old/resources/views/informes/gantt_entregas.blade.php similarity index 100% rename from resources/views/informes/gantt_entregas.blade.php rename to app_old/resources/views/informes/gantt_entregas.blade.php diff --git a/resources/views/informes/para_comision.blade.php b/app_old/resources/views/informes/para_comision.blade.php similarity index 100% rename from resources/views/informes/para_comision.blade.php rename to app_old/resources/views/informes/para_comision.blade.php diff --git a/resources/views/informes/proyectos.blade.php b/app_old/resources/views/informes/proyectos.blade.php similarity index 100% rename from resources/views/informes/proyectos.blade.php rename to app_old/resources/views/informes/proyectos.blade.php diff --git a/resources/views/informes/resciliaciones.blade.php b/app_old/resources/views/informes/resciliaciones.blade.php similarity index 100% rename from resources/views/informes/resciliaciones.blade.php rename to app_old/resources/views/informes/resciliaciones.blade.php diff --git a/resources/views/informes/resumen_contabilidad.blade.php b/app_old/resources/views/informes/resumen_contabilidad.blade.php similarity index 100% rename from resources/views/informes/resumen_contabilidad.blade.php rename to app_old/resources/views/informes/resumen_contabilidad.blade.php diff --git a/resources/views/informes/ventas.blade.php b/app_old/resources/views/informes/ventas.blade.php similarity index 100% rename from resources/views/informes/ventas.blade.php rename to app_old/resources/views/informes/ventas.blade.php diff --git a/resources/views/inmobiliarias/add.blade.php b/app_old/resources/views/inmobiliarias/add.blade.php similarity index 100% rename from resources/views/inmobiliarias/add.blade.php rename to app_old/resources/views/inmobiliarias/add.blade.php diff --git a/resources/views/inmobiliarias/edit.blade.php b/app_old/resources/views/inmobiliarias/edit.blade.php similarity index 100% rename from resources/views/inmobiliarias/edit.blade.php rename to app_old/resources/views/inmobiliarias/edit.blade.php diff --git a/resources/views/inmobiliarias/list.blade.php b/app_old/resources/views/inmobiliarias/list.blade.php similarity index 100% rename from resources/views/inmobiliarias/list.blade.php rename to app_old/resources/views/inmobiliarias/list.blade.php diff --git a/resources/views/inmobiliarias/show.blade.php b/app_old/resources/views/inmobiliarias/show.blade.php similarity index 100% rename from resources/views/inmobiliarias/show.blade.php rename to app_old/resources/views/inmobiliarias/show.blade.php diff --git a/resources/views/install/admin.blade.php b/app_old/resources/views/install/admin.blade.php similarity index 100% rename from resources/views/install/admin.blade.php rename to app_old/resources/views/install/admin.blade.php diff --git a/resources/views/install/base.blade.php b/app_old/resources/views/install/base.blade.php similarity index 100% rename from resources/views/install/base.blade.php rename to app_old/resources/views/install/base.blade.php diff --git a/resources/views/install/end.blade.php b/app_old/resources/views/install/end.blade.php similarity index 100% rename from resources/views/install/end.blade.php rename to app_old/resources/views/install/end.blade.php diff --git a/resources/views/install/start.blade.php b/app_old/resources/views/install/start.blade.php similarity index 100% rename from resources/views/install/start.blade.php rename to app_old/resources/views/install/start.blade.php diff --git a/resources/views/layout/base.blade.php b/app_old/resources/views/layout/base.blade.php similarity index 100% rename from resources/views/layout/base.blade.php rename to app_old/resources/views/layout/base.blade.php diff --git a/resources/views/layout/footer.blade.php b/app_old/resources/views/layout/footer.blade.php similarity index 100% rename from resources/views/layout/footer.blade.php rename to app_old/resources/views/layout/footer.blade.php diff --git a/resources/views/layout/header.blade.php b/app_old/resources/views/layout/header.blade.php similarity index 100% rename from resources/views/layout/header.blade.php rename to app_old/resources/views/layout/header.blade.php diff --git a/resources/views/layout/icons/abonar.blade.php b/app_old/resources/views/layout/icons/abonar.blade.php similarity index 100% rename from resources/views/layout/icons/abonar.blade.php rename to app_old/resources/views/layout/icons/abonar.blade.php diff --git a/resources/views/layout/icons/add.blade.php b/app_old/resources/views/layout/icons/add.blade.php similarity index 100% rename from resources/views/layout/icons/add.blade.php rename to app_old/resources/views/layout/icons/add.blade.php diff --git a/resources/views/layout/icons/edit.blade.php b/app_old/resources/views/layout/icons/edit.blade.php similarity index 100% rename from resources/views/layout/icons/edit.blade.php rename to app_old/resources/views/layout/icons/edit.blade.php diff --git a/resources/views/layout/icons/pagar.blade.php b/app_old/resources/views/layout/icons/pagar.blade.php similarity index 100% rename from resources/views/layout/icons/pagar.blade.php rename to app_old/resources/views/layout/icons/pagar.blade.php diff --git a/resources/views/layout/icons/remove.blade.php b/app_old/resources/views/layout/icons/remove.blade.php similarity index 100% rename from resources/views/layout/icons/remove.blade.php rename to app_old/resources/views/layout/icons/remove.blade.php diff --git a/resources/views/layout/icons/show.blade.php b/app_old/resources/views/layout/icons/show.blade.php similarity index 100% rename from resources/views/layout/icons/show.blade.php rename to app_old/resources/views/layout/icons/show.blade.php diff --git a/resources/views/layout/menu.blade.php b/app_old/resources/views/layout/menu.blade.php similarity index 96% rename from resources/views/layout/menu.blade.php rename to app_old/resources/views/layout/menu.blade.php index d1e442b..e4fef47 100644 --- a/resources/views/layout/menu.blade.php +++ b/app_old/resources/views/layout/menu.blade.php @@ -61,7 +61,7 @@ @include('layout.menu.login') @if (\App\Contract\Auth::checkAccess('buscar')) -
    • +
  •  
    • @endif diff --git a/resources/views/layout/menu.blade.php.save b/app_old/resources/views/layout/menu.blade.php.save similarity index 100% rename from resources/views/layout/menu.blade.php.save rename to app_old/resources/views/layout/menu.blade.php.save diff --git a/resources/views/layout/menu/herramientas.blade.php b/app_old/resources/views/layout/menu/herramientas.blade.php similarity index 100% rename from resources/views/layout/menu/herramientas.blade.php rename to app_old/resources/views/layout/menu/herramientas.blade.php diff --git a/resources/views/layout/menu/informes.blade.php b/app_old/resources/views/layout/menu/informes.blade.php similarity index 100% rename from resources/views/layout/menu/informes.blade.php rename to app_old/resources/views/layout/menu/informes.blade.php diff --git a/resources/views/layout/menu/inmobiliarias.blade.php b/app_old/resources/views/layout/menu/inmobiliarias.blade.php similarity index 100% rename from resources/views/layout/menu/inmobiliarias.blade.php rename to app_old/resources/views/layout/menu/inmobiliarias.blade.php diff --git a/app_old/resources/views/layout/menu/login.blade.php b/app_old/resources/views/layout/menu/login.blade.php new file mode 100644 index 0000000..5329249 --- /dev/null +++ b/app_old/resources/views/layout/menu/login.blade.php @@ -0,0 +1,8 @@ + diff --git a/resources/views/layout/menu/operadores.blade.php b/app_old/resources/views/layout/menu/operadores.blade.php similarity index 100% rename from resources/views/layout/menu/operadores.blade.php rename to app_old/resources/views/layout/menu/operadores.blade.php diff --git a/resources/views/layout/menu/proyectos.blade.php b/app_old/resources/views/layout/menu/proyectos.blade.php similarity index 100% rename from resources/views/layout/menu/proyectos.blade.php rename to app_old/resources/views/layout/menu/proyectos.blade.php diff --git a/resources/views/layout/menu/ventas.blade.php b/app_old/resources/views/layout/menu/ventas.blade.php similarity index 100% rename from resources/views/layout/menu/ventas.blade.php rename to app_old/resources/views/layout/menu/ventas.blade.php diff --git a/resources/views/other/capacidades.blade.php b/app_old/resources/views/other/capacidades.blade.php similarity index 100% rename from resources/views/other/capacidades.blade.php rename to app_old/resources/views/other/capacidades.blade.php diff --git a/resources/views/other/entregar_multiple.blade.php b/app_old/resources/views/other/entregar_multiple.blade.php similarity index 100% rename from resources/views/other/entregar_multiple.blade.php rename to app_old/resources/views/other/entregar_multiple.blade.php diff --git a/resources/views/print/devolucion.blade.php b/app_old/resources/views/print/devolucion.blade.php similarity index 100% rename from resources/views/print/devolucion.blade.php rename to app_old/resources/views/print/devolucion.blade.php diff --git a/resources/views/proyectos/add.blade.php b/app_old/resources/views/proyectos/add.blade.php similarity index 100% rename from resources/views/proyectos/add.blade.php rename to app_old/resources/views/proyectos/add.blade.php diff --git a/resources/views/proyectos/advance.blade.php b/app_old/resources/views/proyectos/advance.blade.php similarity index 100% rename from resources/views/proyectos/advance.blade.php rename to app_old/resources/views/proyectos/advance.blade.php diff --git a/resources/views/proyectos/avance.blade.php b/app_old/resources/views/proyectos/avance.blade.php similarity index 100% rename from resources/views/proyectos/avance.blade.php rename to app_old/resources/views/proyectos/avance.blade.php diff --git a/resources/views/proyectos/avances/edit.blade.php b/app_old/resources/views/proyectos/avances/edit.blade.php similarity index 100% rename from resources/views/proyectos/avances/edit.blade.php rename to app_old/resources/views/proyectos/avances/edit.blade.php diff --git a/resources/views/proyectos/avances_row.blade.php b/app_old/resources/views/proyectos/avances_row.blade.php similarity index 100% rename from resources/views/proyectos/avances_row.blade.php rename to app_old/resources/views/proyectos/avances_row.blade.php diff --git a/resources/views/proyectos/construccion.blade.php b/app_old/resources/views/proyectos/construccion.blade.php similarity index 100% rename from resources/views/proyectos/construccion.blade.php rename to app_old/resources/views/proyectos/construccion.blade.php diff --git a/resources/views/proyectos/disponibles.blade.php b/app_old/resources/views/proyectos/disponibles.blade.php similarity index 100% rename from resources/views/proyectos/disponibles.blade.php rename to app_old/resources/views/proyectos/disponibles.blade.php diff --git a/resources/views/proyectos/estimado.blade.php b/app_old/resources/views/proyectos/estimado.blade.php similarity index 100% rename from resources/views/proyectos/estimado.blade.php rename to app_old/resources/views/proyectos/estimado.blade.php diff --git a/resources/views/proyectos/historia.blade.php b/app_old/resources/views/proyectos/historia.blade.php similarity index 100% rename from resources/views/proyectos/historia.blade.php rename to app_old/resources/views/proyectos/historia.blade.php diff --git a/resources/views/proyectos/historia.blade.php.old b/app_old/resources/views/proyectos/historia.blade.php.old similarity index 100% rename from resources/views/proyectos/historia.blade.php.old rename to app_old/resources/views/proyectos/historia.blade.php.old diff --git a/resources/views/proyectos/list.blade.php b/app_old/resources/views/proyectos/list.blade.php similarity index 100% rename from resources/views/proyectos/list.blade.php rename to app_old/resources/views/proyectos/list.blade.php diff --git a/resources/views/proyectos/operadores/add.blade.php b/app_old/resources/views/proyectos/operadores/add.blade.php similarity index 100% rename from resources/views/proyectos/operadores/add.blade.php rename to app_old/resources/views/proyectos/operadores/add.blade.php diff --git a/resources/views/proyectos/pagares/add.blade.php b/app_old/resources/views/proyectos/pagares/add.blade.php similarity index 100% rename from resources/views/proyectos/pagares/add.blade.php rename to app_old/resources/views/proyectos/pagares/add.blade.php diff --git a/resources/views/proyectos/pagares/add_renovacion.blade.php b/app_old/resources/views/proyectos/pagares/add_renovacion.blade.php similarity index 100% rename from resources/views/proyectos/pagares/add_renovacion.blade.php rename to app_old/resources/views/proyectos/pagares/add_renovacion.blade.php diff --git a/resources/views/proyectos/pagares/edit.blade.php b/app_old/resources/views/proyectos/pagares/edit.blade.php similarity index 100% rename from resources/views/proyectos/pagares/edit.blade.php rename to app_old/resources/views/proyectos/pagares/edit.blade.php diff --git a/resources/views/proyectos/pagares/edit_renovacion.blade.php b/app_old/resources/views/proyectos/pagares/edit_renovacion.blade.php similarity index 100% rename from resources/views/proyectos/pagares/edit_renovacion.blade.php rename to app_old/resources/views/proyectos/pagares/edit_renovacion.blade.php diff --git a/resources/views/proyectos/pagares/show.blade.php b/app_old/resources/views/proyectos/pagares/show.blade.php similarity index 100% rename from resources/views/proyectos/pagares/show.blade.php rename to app_old/resources/views/proyectos/pagares/show.blade.php diff --git a/resources/views/proyectos/por_vender.blade.php b/app_old/resources/views/proyectos/por_vender.blade.php similarity index 100% rename from resources/views/proyectos/por_vender.blade.php rename to app_old/resources/views/proyectos/por_vender.blade.php diff --git a/resources/views/proyectos/reservas/base.blade.php b/app_old/resources/views/proyectos/reservas/base.blade.php similarity index 100% rename from resources/views/proyectos/reservas/base.blade.php rename to app_old/resources/views/proyectos/reservas/base.blade.php diff --git a/resources/views/proyectos/show.blade.php b/app_old/resources/views/proyectos/show.blade.php similarity index 100% rename from resources/views/proyectos/show.blade.php rename to app_old/resources/views/proyectos/show.blade.php diff --git a/resources/views/proyectos/superficies.blade.php b/app_old/resources/views/proyectos/superficies.blade.php similarity index 100% rename from resources/views/proyectos/superficies.blade.php rename to app_old/resources/views/proyectos/superficies.blade.php diff --git a/resources/views/proyectos/tipo_unidades/add.blade.php b/app_old/resources/views/proyectos/tipo_unidades/add.blade.php similarity index 100% rename from resources/views/proyectos/tipo_unidades/add.blade.php rename to app_old/resources/views/proyectos/tipo_unidades/add.blade.php diff --git a/resources/views/proyectos/tipo_unidades/edit.blade.php b/app_old/resources/views/proyectos/tipo_unidades/edit.blade.php similarity index 100% rename from resources/views/proyectos/tipo_unidades/edit.blade.php rename to app_old/resources/views/proyectos/tipo_unidades/edit.blade.php diff --git a/resources/views/proyectos/unidades/add.blade.php b/app_old/resources/views/proyectos/unidades/add.blade.php similarity index 100% rename from resources/views/proyectos/unidades/add.blade.php rename to app_old/resources/views/proyectos/unidades/add.blade.php diff --git a/resources/views/proyectos/unidades/add2.blade.php b/app_old/resources/views/proyectos/unidades/add2.blade.php similarity index 100% rename from resources/views/proyectos/unidades/add2.blade.php rename to app_old/resources/views/proyectos/unidades/add2.blade.php diff --git a/resources/views/proyectos/unidades/assign.blade.php b/app_old/resources/views/proyectos/unidades/assign.blade.php similarity index 100% rename from resources/views/proyectos/unidades/assign.blade.php rename to app_old/resources/views/proyectos/unidades/assign.blade.php diff --git a/resources/views/proyectos/unidades/edit.blade.php b/app_old/resources/views/proyectos/unidades/edit.blade.php similarity index 100% rename from resources/views/proyectos/unidades/edit.blade.php rename to app_old/resources/views/proyectos/unidades/edit.blade.php diff --git a/resources/views/proyectos/unidades/list.blade.php b/app_old/resources/views/proyectos/unidades/list.blade.php similarity index 100% rename from resources/views/proyectos/unidades/list.blade.php rename to app_old/resources/views/proyectos/unidades/list.blade.php diff --git a/resources/views/proyectos/unidades/proyectos.blade.php b/app_old/resources/views/proyectos/unidades/proyectos.blade.php similarity index 100% rename from resources/views/proyectos/unidades/proyectos.blade.php rename to app_old/resources/views/proyectos/unidades/proyectos.blade.php diff --git a/resources/views/proyectos/ventas.blade.php b/app_old/resources/views/proyectos/ventas.blade.php similarity index 100% rename from resources/views/proyectos/ventas.blade.php rename to app_old/resources/views/proyectos/ventas.blade.php diff --git a/resources/views/temas/add.blade.php b/app_old/resources/views/temas/add.blade.php similarity index 100% rename from resources/views/temas/add.blade.php rename to app_old/resources/views/temas/add.blade.php diff --git a/resources/views/temas/edit.blade.php b/app_old/resources/views/temas/edit.blade.php similarity index 100% rename from resources/views/temas/edit.blade.php rename to app_old/resources/views/temas/edit.blade.php diff --git a/resources/views/temas/list.blade.php b/app_old/resources/views/temas/list.blade.php similarity index 100% rename from resources/views/temas/list.blade.php rename to app_old/resources/views/temas/list.blade.php diff --git a/resources/views/ventas/add.blade.php b/app_old/resources/views/ventas/add.blade.php similarity index 100% rename from resources/views/ventas/add.blade.php rename to app_old/resources/views/ventas/add.blade.php diff --git a/resources/views/ventas/archivar.blade.php b/app_old/resources/views/ventas/archivar.blade.php similarity index 100% rename from resources/views/ventas/archivar.blade.php rename to app_old/resources/views/ventas/archivar.blade.php diff --git a/resources/views/ventas/bonos/add.blade.php b/app_old/resources/views/ventas/bonos/add.blade.php similarity index 100% rename from resources/views/ventas/bonos/add.blade.php rename to app_old/resources/views/ventas/bonos/add.blade.php diff --git a/resources/views/ventas/bonos/edit.blade.php b/app_old/resources/views/ventas/bonos/edit.blade.php similarity index 100% rename from resources/views/ventas/bonos/edit.blade.php rename to app_old/resources/views/ventas/bonos/edit.blade.php diff --git a/resources/views/ventas/ceder.blade.php b/app_old/resources/views/ventas/ceder.blade.php similarity index 100% rename from resources/views/ventas/ceder.blade.php rename to app_old/resources/views/ventas/ceder.blade.php diff --git a/resources/views/ventas/cierres/add.blade.php b/app_old/resources/views/ventas/cierres/add.blade.php similarity index 100% rename from resources/views/ventas/cierres/add.blade.php rename to app_old/resources/views/ventas/cierres/add.blade.php diff --git a/resources/views/ventas/cierres/edit.blade.php b/app_old/resources/views/ventas/cierres/edit.blade.php similarity index 100% rename from resources/views/ventas/cierres/edit.blade.php rename to app_old/resources/views/ventas/cierres/edit.blade.php diff --git a/resources/views/ventas/cierres/evaluar.blade.php b/app_old/resources/views/ventas/cierres/evaluar.blade.php similarity index 100% rename from resources/views/ventas/cierres/evaluar.blade.php rename to app_old/resources/views/ventas/cierres/evaluar.blade.php diff --git a/resources/views/ventas/cierres/list.blade.php b/app_old/resources/views/ventas/cierres/list.blade.php similarity index 100% rename from resources/views/ventas/cierres/list.blade.php rename to app_old/resources/views/ventas/cierres/list.blade.php diff --git a/resources/views/ventas/cierres/show.blade.php b/app_old/resources/views/ventas/cierres/show.blade.php similarity index 100% rename from resources/views/ventas/cierres/show.blade.php rename to app_old/resources/views/ventas/cierres/show.blade.php diff --git a/resources/views/ventas/comentarios/add.blade.php b/app_old/resources/views/ventas/comentarios/add.blade.php similarity index 100% rename from resources/views/ventas/comentarios/add.blade.php rename to app_old/resources/views/ventas/comentarios/add.blade.php diff --git a/resources/views/ventas/consolidacion/pago.blade.php b/app_old/resources/views/ventas/consolidacion/pago.blade.php similarity index 100% rename from resources/views/ventas/consolidacion/pago.blade.php rename to app_old/resources/views/ventas/consolidacion/pago.blade.php diff --git a/resources/views/ventas/consolidacion/proyectos.blade.php b/app_old/resources/views/ventas/consolidacion/proyectos.blade.php similarity index 100% rename from resources/views/ventas/consolidacion/proyectos.blade.php rename to app_old/resources/views/ventas/consolidacion/proyectos.blade.php diff --git a/resources/views/ventas/consolidacion/show.blade.php b/app_old/resources/views/ventas/consolidacion/show.blade.php similarity index 100% rename from resources/views/ventas/consolidacion/show.blade.php rename to app_old/resources/views/ventas/consolidacion/show.blade.php diff --git a/resources/views/ventas/creditos/abonar.blade.php b/app_old/resources/views/ventas/creditos/abonar.blade.php similarity index 100% rename from resources/views/ventas/creditos/abonar.blade.php rename to app_old/resources/views/ventas/creditos/abonar.blade.php diff --git a/resources/views/ventas/creditos/add.blade.php b/app_old/resources/views/ventas/creditos/add.blade.php similarity index 100% rename from resources/views/ventas/creditos/add.blade.php rename to app_old/resources/views/ventas/creditos/add.blade.php diff --git a/resources/views/ventas/creditos/edit.blade.php b/app_old/resources/views/ventas/creditos/edit.blade.php similarity index 100% rename from resources/views/ventas/creditos/edit.blade.php rename to app_old/resources/views/ventas/creditos/edit.blade.php diff --git a/resources/views/ventas/creditos/pagar.blade.php b/app_old/resources/views/ventas/creditos/pagar.blade.php similarity index 100% rename from resources/views/ventas/creditos/pagar.blade.php rename to app_old/resources/views/ventas/creditos/pagar.blade.php diff --git a/resources/views/ventas/creditos/pendientes.blade.php b/app_old/resources/views/ventas/creditos/pendientes.blade.php similarity index 100% rename from resources/views/ventas/creditos/pendientes.blade.php rename to app_old/resources/views/ventas/creditos/pendientes.blade.php diff --git a/resources/views/ventas/creditos/show.blade.php b/app_old/resources/views/ventas/creditos/show.blade.php similarity index 100% rename from resources/views/ventas/creditos/show.blade.php rename to app_old/resources/views/ventas/creditos/show.blade.php diff --git a/resources/views/ventas/desist.blade.php b/app_old/resources/views/ventas/desist.blade.php similarity index 100% rename from resources/views/ventas/desist.blade.php rename to app_old/resources/views/ventas/desist.blade.php diff --git a/resources/views/ventas/devolucion.blade.php b/app_old/resources/views/ventas/devolucion.blade.php similarity index 100% rename from resources/views/ventas/devolucion.blade.php rename to app_old/resources/views/ventas/devolucion.blade.php diff --git a/resources/views/ventas/edit.blade.php b/app_old/resources/views/ventas/edit.blade.php similarity index 100% rename from resources/views/ventas/edit.blade.php rename to app_old/resources/views/ventas/edit.blade.php diff --git a/resources/views/ventas/entregar.blade.php b/app_old/resources/views/ventas/entregar.blade.php similarity index 100% rename from resources/views/ventas/entregar.blade.php rename to app_old/resources/views/ventas/entregar.blade.php diff --git a/resources/views/ventas/escrituras/abonar.blade.php b/app_old/resources/views/ventas/escrituras/abonar.blade.php similarity index 100% rename from resources/views/ventas/escrituras/abonar.blade.php rename to app_old/resources/views/ventas/escrituras/abonar.blade.php diff --git a/resources/views/ventas/escrituras/add.blade.php b/app_old/resources/views/ventas/escrituras/add.blade.php similarity index 100% rename from resources/views/ventas/escrituras/add.blade.php rename to app_old/resources/views/ventas/escrituras/add.blade.php diff --git a/resources/views/ventas/escrituras/edit.blade.php b/app_old/resources/views/ventas/escrituras/edit.blade.php similarity index 100% rename from resources/views/ventas/escrituras/edit.blade.php rename to app_old/resources/views/ventas/escrituras/edit.blade.php diff --git a/resources/views/ventas/escrituras/informe.blade.php b/app_old/resources/views/ventas/escrituras/informe.blade.php similarity index 100% rename from resources/views/ventas/escrituras/informe.blade.php rename to app_old/resources/views/ventas/escrituras/informe.blade.php diff --git a/resources/views/ventas/escrituras/pagar.blade.php b/app_old/resources/views/ventas/escrituras/pagar.blade.php similarity index 100% rename from resources/views/ventas/escrituras/pagar.blade.php rename to app_old/resources/views/ventas/escrituras/pagar.blade.php diff --git a/resources/views/ventas/firmar.blade.php b/app_old/resources/views/ventas/firmar.blade.php similarity index 100% rename from resources/views/ventas/firmar.blade.php rename to app_old/resources/views/ventas/firmar.blade.php diff --git a/resources/views/ventas/forma_pago.blade.php b/app_old/resources/views/ventas/forma_pago.blade.php similarity index 100% rename from resources/views/ventas/forma_pago.blade.php rename to app_old/resources/views/ventas/forma_pago.blade.php diff --git a/resources/views/ventas/forma_pago/edit.blade.php b/app_old/resources/views/ventas/forma_pago/edit.blade.php similarity index 100% rename from resources/views/ventas/forma_pago/edit.blade.php rename to app_old/resources/views/ventas/forma_pago/edit.blade.php diff --git a/resources/views/ventas/list.blade.php b/app_old/resources/views/ventas/list.blade.php similarity index 100% rename from resources/views/ventas/list.blade.php rename to app_old/resources/views/ventas/list.blade.php diff --git a/resources/views/ventas/operadores/unidades/bloquear.blade.php b/app_old/resources/views/ventas/operadores/unidades/bloquear.blade.php similarity index 100% rename from resources/views/ventas/operadores/unidades/bloquear.blade.php rename to app_old/resources/views/ventas/operadores/unidades/bloquear.blade.php diff --git a/resources/views/ventas/operadores/unidades/list.blade.php b/app_old/resources/views/ventas/operadores/unidades/list.blade.php similarity index 100% rename from resources/views/ventas/operadores/unidades/list.blade.php rename to app_old/resources/views/ventas/operadores/unidades/list.blade.php diff --git a/resources/views/ventas/pagos/edit.blade.php b/app_old/resources/views/ventas/pagos/edit.blade.php similarity index 100% rename from resources/views/ventas/pagos/edit.blade.php rename to app_old/resources/views/ventas/pagos/edit.blade.php diff --git a/resources/views/ventas/pagos/pendientes.blade.php b/app_old/resources/views/ventas/pagos/pendientes.blade.php similarity index 100% rename from resources/views/ventas/pagos/pendientes.blade.php rename to app_old/resources/views/ventas/pagos/pendientes.blade.php diff --git a/resources/views/ventas/pagos/show.blade.php b/app_old/resources/views/ventas/pagos/show.blade.php similarity index 100% rename from resources/views/ventas/pagos/show.blade.php rename to app_old/resources/views/ventas/pagos/show.blade.php diff --git a/resources/views/ventas/pies/cuotas/abonar.blade.php b/app_old/resources/views/ventas/pies/cuotas/abonar.blade.php similarity index 100% rename from resources/views/ventas/pies/cuotas/abonar.blade.php rename to app_old/resources/views/ventas/pies/cuotas/abonar.blade.php diff --git a/resources/views/ventas/pies/cuotas/add.blade.php b/app_old/resources/views/ventas/pies/cuotas/add.blade.php similarity index 100% rename from resources/views/ventas/pies/cuotas/add.blade.php rename to app_old/resources/views/ventas/pies/cuotas/add.blade.php diff --git a/resources/views/ventas/pies/cuotas/edit.blade.php b/app_old/resources/views/ventas/pies/cuotas/edit.blade.php similarity index 100% rename from resources/views/ventas/pies/cuotas/edit.blade.php rename to app_old/resources/views/ventas/pies/cuotas/edit.blade.php diff --git a/resources/views/ventas/pies/cuotas/estado.blade.php b/app_old/resources/views/ventas/pies/cuotas/estado.blade.php similarity index 100% rename from resources/views/ventas/pies/cuotas/estado.blade.php rename to app_old/resources/views/ventas/pies/cuotas/estado.blade.php diff --git a/resources/views/ventas/pies/cuotas/pendientes.blade.php b/app_old/resources/views/ventas/pies/cuotas/pendientes.blade.php similarity index 100% rename from resources/views/ventas/pies/cuotas/pendientes.blade.php rename to app_old/resources/views/ventas/pies/cuotas/pendientes.blade.php diff --git a/resources/views/ventas/pies/cuotas/show.blade.php b/app_old/resources/views/ventas/pies/cuotas/show.blade.php similarity index 100% rename from resources/views/ventas/pies/cuotas/show.blade.php rename to app_old/resources/views/ventas/pies/cuotas/show.blade.php diff --git a/resources/views/ventas/pies/edit.blade.php b/app_old/resources/views/ventas/pies/edit.blade.php similarity index 100% rename from resources/views/ventas/pies/edit.blade.php rename to app_old/resources/views/ventas/pies/edit.blade.php diff --git a/resources/views/ventas/pies/reajustar.blade.php b/app_old/resources/views/ventas/pies/reajustar.blade.php similarity index 100% rename from resources/views/ventas/pies/reajustar.blade.php rename to app_old/resources/views/ventas/pies/reajustar.blade.php diff --git a/resources/views/ventas/pies/reajustes/abonar.blade.php b/app_old/resources/views/ventas/pies/reajustes/abonar.blade.php similarity index 100% rename from resources/views/ventas/pies/reajustes/abonar.blade.php rename to app_old/resources/views/ventas/pies/reajustes/abonar.blade.php diff --git a/resources/views/ventas/pies/reajustes/edit.blade.php b/app_old/resources/views/ventas/pies/reajustes/edit.blade.php similarity index 100% rename from resources/views/ventas/pies/reajustes/edit.blade.php rename to app_old/resources/views/ventas/pies/reajustes/edit.blade.php diff --git a/resources/views/ventas/pies/reajustes/pagar.blade.php b/app_old/resources/views/ventas/pies/reajustes/pagar.blade.php similarity index 100% rename from resources/views/ventas/pies/reajustes/pagar.blade.php rename to app_old/resources/views/ventas/pies/reajustes/pagar.blade.php diff --git a/resources/views/ventas/pies/resumen.blade.php b/app_old/resources/views/ventas/pies/resumen.blade.php similarity index 100% rename from resources/views/ventas/pies/resumen.blade.php rename to app_old/resources/views/ventas/pies/resumen.blade.php diff --git a/resources/views/ventas/pies/totales.blade.php b/app_old/resources/views/ventas/pies/totales.blade.php similarity index 100% rename from resources/views/ventas/pies/totales.blade.php rename to app_old/resources/views/ventas/pies/totales.blade.php diff --git a/resources/views/ventas/postventas/add.blade.php b/app_old/resources/views/ventas/postventas/add.blade.php similarity index 100% rename from resources/views/ventas/postventas/add.blade.php rename to app_old/resources/views/ventas/postventas/add.blade.php diff --git a/resources/views/ventas/postventas/show.blade.php b/app_old/resources/views/ventas/postventas/show.blade.php similarity index 100% rename from resources/views/ventas/postventas/show.blade.php rename to app_old/resources/views/ventas/postventas/show.blade.php diff --git a/resources/views/ventas/precios/add.blade.php b/app_old/resources/views/ventas/precios/add.blade.php similarity index 100% rename from resources/views/ventas/precios/add.blade.php rename to app_old/resources/views/ventas/precios/add.blade.php diff --git a/resources/views/ventas/precios/import.blade.php b/app_old/resources/views/ventas/precios/import.blade.php similarity index 100% rename from resources/views/ventas/precios/import.blade.php rename to app_old/resources/views/ventas/precios/import.blade.php diff --git a/resources/views/ventas/precios/list.blade.php b/app_old/resources/views/ventas/precios/list.blade.php similarity index 100% rename from resources/views/ventas/precios/list.blade.php rename to app_old/resources/views/ventas/precios/list.blade.php diff --git a/resources/views/ventas/precios/proyectos.blade.php b/app_old/resources/views/ventas/precios/proyectos.blade.php similarity index 100% rename from resources/views/ventas/precios/proyectos.blade.php rename to app_old/resources/views/ventas/precios/proyectos.blade.php diff --git a/resources/views/ventas/propietarios/edit.blade.php b/app_old/resources/views/ventas/propietarios/edit.blade.php similarity index 100% rename from resources/views/ventas/propietarios/edit.blade.php rename to app_old/resources/views/ventas/propietarios/edit.blade.php diff --git a/resources/views/ventas/proyectos.blade.php b/app_old/resources/views/ventas/proyectos.blade.php similarity index 100% rename from resources/views/ventas/proyectos.blade.php rename to app_old/resources/views/ventas/proyectos.blade.php diff --git a/resources/views/ventas/resciliaciones.blade.php b/app_old/resources/views/ventas/resciliaciones.blade.php similarity index 100% rename from resources/views/ventas/resciliaciones.blade.php rename to app_old/resources/views/ventas/resciliaciones.blade.php diff --git a/resources/views/ventas/show.blade.php b/app_old/resources/views/ventas/show.blade.php similarity index 100% rename from resources/views/ventas/show.blade.php rename to app_old/resources/views/ventas/show.blade.php diff --git a/resources/views/ventas/sort_title.blade.php b/app_old/resources/views/ventas/sort_title.blade.php similarity index 100% rename from resources/views/ventas/sort_title.blade.php rename to app_old/resources/views/ventas/sort_title.blade.php diff --git a/resources/views/ventas/subsidios/abonar.blade.php b/app_old/resources/views/ventas/subsidios/abonar.blade.php similarity index 100% rename from resources/views/ventas/subsidios/abonar.blade.php rename to app_old/resources/views/ventas/subsidios/abonar.blade.php diff --git a/resources/views/ventas/subsidios/add.blade.php b/app_old/resources/views/ventas/subsidios/add.blade.php similarity index 100% rename from resources/views/ventas/subsidios/add.blade.php rename to app_old/resources/views/ventas/subsidios/add.blade.php diff --git a/resources/views/ventas/subsidios/edit.blade.php b/app_old/resources/views/ventas/subsidios/edit.blade.php similarity index 100% rename from resources/views/ventas/subsidios/edit.blade.php rename to app_old/resources/views/ventas/subsidios/edit.blade.php diff --git a/resources/views/ventas/subsidios/pagar.blade.php b/app_old/resources/views/ventas/subsidios/pagar.blade.php similarity index 100% rename from resources/views/ventas/subsidios/pagar.blade.php rename to app_old/resources/views/ventas/subsidios/pagar.blade.php diff --git a/setup/api/config.php b/app_old/setup/api/config.php similarity index 100% rename from setup/api/config.php rename to app_old/setup/api/config.php diff --git a/setup/api/setups.php b/app_old/setup/api/setups.php similarity index 100% rename from setup/api/setups.php rename to app_old/setup/api/setups.php diff --git a/app_old/setup/app.php b/app_old/setup/app.php new file mode 100644 index 0000000..f386aef --- /dev/null +++ b/app_old/setup/app.php @@ -0,0 +1,61 @@ +addDefinitions(['environment' => $__environment]); + } + $folders = [ + 'settings', + 'setups' + ]; + foreach ($folders as $f) { + $folder = implode(DIRECTORY_SEPARATOR, [ + __DIR__, + $f + ]); + if (!file_exists($folder)) { + continue; + } + $files = new DirectoryIterator($folder); + foreach ($files as $file) { + if ($file->isDir() or $file->getExtension() != 'php') { + continue; + } + $builder->addDefinitions($file->getRealPath()); + } + } + + $container = $builder->build(); + $app = Bridge::create($container); + if ($app->getContainer()->has('base_url') and $app->getContainer()->get('base_url') != '') { + $app->setBasePath($app->getContainer()->get('base_url')); + } + $app->addRoutingMiddleware(); + + foreach ($folders as $folder) { + $filename = implode(DIRECTORY_SEPARATOR, [ + __DIR__, + $folder, + 'middleware.php' + ]); + if (!file_exists($filename)) { + continue; + } + include_once $filename; + } + + $app->addErrorMiddleware(true, true, true); + + include_once 'database.php'; + + include_once 'router.php'; + + return $app; +} + +return buildApp($__environment); diff --git a/setup/common/config.php b/app_old/setup/common/config.php similarity index 100% rename from setup/common/config.php rename to app_old/setup/common/config.php diff --git a/app_old/setup/composer.php b/app_old/setup/composer.php new file mode 100644 index 0000000..2d27ee1 --- /dev/null +++ b/app_old/setup/composer.php @@ -0,0 +1,6 @@ +isDir()) { + continue; + } + $builder->addDefinitions($file->getRealPath()); + } +} + +$app = Bridge::create($builder->build()); + +$folder = implode(DIRECTORY_SEPARATOR, [ + __DIR__, + 'middlewares' +]); +if (file_exists($folder)) { + $files = new FilesystemIterator($folder); + foreach ($files as $file) { + if ($file->isDir()) { + continue; + } + require_once $file->getRealPath(); + } +} + +return $app; diff --git a/app_old/ui/composer.php b/app_old/ui/composer.php new file mode 100644 index 0000000..2d27ee1 --- /dev/null +++ b/app_old/ui/composer.php @@ -0,0 +1,6 @@ +add($app->getContainer()->get(App\Middleware\Auth::class)); diff --git a/app_old/ui/middlewares/02_databases.php b/app_old/ui/middlewares/02_databases.php new file mode 100644 index 0000000..3d0841f --- /dev/null +++ b/app_old/ui/middlewares/02_databases.php @@ -0,0 +1,20 @@ +port)) { + $port = $settings->port; + } + $dsn = 'mysql:host=' . $settings->host . ';port=' . $port . ';dbname=' . $settings->database . ';charset=utf8'; + + ORM::configure($dsn, null, $name); + ORM::configure('username', $settings->username, $name); + ORM::configure('password', $settings->password, $name); +} + +$databases = $app->getContainer()->get('databases'); +foreach ($databases as $name => $settings) { + loadDatabase($settings, $name); +} + +Model::$short_table_names = true; diff --git a/app_old/ui/middlewares/98_logs.php b/app_old/ui/middlewares/98_logs.php new file mode 100644 index 0000000..b81e521 --- /dev/null +++ b/app_old/ui/middlewares/98_logs.php @@ -0,0 +1,2 @@ +getContainer()->get(Psr\Log\LoggerInterface::class)); diff --git a/app_old/ui/middlewares/99_routes.php b/app_old/ui/middlewares/99_routes.php new file mode 100644 index 0000000..e3b3da5 --- /dev/null +++ b/app_old/ui/middlewares/99_routes.php @@ -0,0 +1,15 @@ +getContainer()->get('folders')->get('routes'), + 'ui' + ]); + $files = new FilesystemIterator($folder); + foreach ($files as $file) { + if ($file->isDir()) { + continue; + } + include_once $file->getRealPath(); + } +} +buildRoutes($app); diff --git a/app_old/ui/settings/01_env.php b/app_old/ui/settings/01_env.php new file mode 100644 index 0000000..9ee040b --- /dev/null +++ b/app_old/ui/settings/01_env.php @@ -0,0 +1,4 @@ + $_ENV +]; diff --git a/app_old/ui/settings/02_folders.php b/app_old/ui/settings/02_folders.php new file mode 100644 index 0000000..b216fc3 --- /dev/null +++ b/app_old/ui/settings/02_folders.php @@ -0,0 +1,12 @@ + function() { + return new DI\Container([ + 'base' => dirname(__FILE__, 3), + 'resources' => DI\String('{base}/resources'), + 'routes' => DI\String('{resources}/routes'), + 'templates' => DI\String('{resources}/views'), + 'cache' => DI\String('{base}/cache') + ]); + } +]; diff --git a/app_old/ui/settings/03_urls.php b/app_old/ui/settings/03_urls.php new file mode 100644 index 0000000..55d2969 --- /dev/null +++ b/app_old/ui/settings/03_urls.php @@ -0,0 +1,8 @@ + function() { + return [ + 'base' => 'http://localhost:8080' + ]; + } +]; diff --git a/app_old/ui/settings/04_databases.php b/app_old/ui/settings/04_databases.php new file mode 100644 index 0000000..54d689e --- /dev/null +++ b/app_old/ui/settings/04_databases.php @@ -0,0 +1,20 @@ + function(ContainerInterface $container) { + $env = $container->get('env'); + $arr = [ + ORM::DEFAULT_CONNECTION => (object) [ + 'host' => $env['MYSQL_HOST'], + 'database' => $env['MYSQL_DATABASE'], + 'username' => $env['MYSQL_USER'], + 'password' => $env['MYSQL_PASSWORD'] + ] + ]; + if (isset($env['MYSQL_PORT'])) { + $arr[ORM::DEFAULT_CONNECTION]->port = $env['MYSQL_PORT']; + } + return (object) $arr; + } +]; diff --git a/app_old/ui/setups/01_views.php b/app_old/ui/setups/01_views.php new file mode 100644 index 0000000..4a20566 --- /dev/null +++ b/app_old/ui/setups/01_views.php @@ -0,0 +1,20 @@ + function(ContainerInterface $container) { + $folders = $container->get('folders'); + return new Slim\Views\Blade( + $folders->get('templates'), + $folders->get('cache'), + null, + $container->has('urls') ? $container->get('urls') : [] + ); + }, + eftec\bladeone\BladeOne::class => function(ContainerInterface $container) { + return new eftec\bladeone\BladeOne( + $container->get('folders')->get('templates'), + $container->get('folders')->get('cache') + ); + } +]; diff --git a/app_old/ui/setups/03_services.php b/app_old/ui/setups/03_services.php new file mode 100644 index 0000000..af7ff76 --- /dev/null +++ b/app_old/ui/setups/03_services.php @@ -0,0 +1,8 @@ + function(ContainerInterface $container) { + return $container->get(Nyholm\Psr7\Factory\Psr17Factory::class); + } +]; diff --git a/app_old/ui/setups/98_logs.php b/app_old/ui/setups/98_logs.php new file mode 100644 index 0000000..224590a --- /dev/null +++ b/app_old/ui/setups/98_logs.php @@ -0,0 +1,30 @@ + function(ContainerInterface $container) { + return new Monolog\Logger('ui', [ + new Monolog\Handler\FilterHandler( + new Monolog\Handler\RotatingFileHandler('/logs/ui.debug.log'), + Monolog\Level::Debug, + Monolog\Level::Notice + ), + new Monolog\Handler\FilterHandler( + (new Monolog\Handler\RotatingFileHandler('/logs/ui.error.log')) + ->setFormatter(new Monolog\Formatter\LineFormatter(null, null, true)), + Monolog\Level::Warning, + Monolog\Level::Error + ), + new Monolog\Handler\FilterHandler( + new Monolog\Handler\RotatingFileHandler('/logs/ui.critical.log'), + Monolog\Level::Critical + ) + ], [ + $container->get(Monolog\Processor\PsrLogMessageProcessor::class), + $container->get(Monolog\Processor\WebProcessor::class), + $container->get(Monolog\Processor\IntrospectionProcessor::class), + $container->get(Monolog\Processor\MemoryUsageProcessor::class), + $container->get(Monolog\Processor\MemoryPeakUsageProcessor::class) + ]); + } +]; diff --git a/webpack.config.js b/app_old/webpack.config.js similarity index 100% rename from webpack.config.js rename to app_old/webpack.config.js diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php deleted file mode 100644 index 4e2cbdd..0000000 --- a/resources/views/auth/login.blade.php +++ /dev/null @@ -1,17 +0,0 @@ -@extends('auth.base') - -@section('content') - -
    -
    Usuario
    -
    -
    -
    -
    Cláve
    -
    -
    -
    -
    -
    - -@endsection diff --git a/resources/views/layout/menu/login.blade.php b/resources/views/layout/menu/login.blade.php deleted file mode 100644 index 2e310b1..0000000 --- a/resources/views/layout/menu/login.blade.php +++ /dev/null @@ -1,8 +0,0 @@ - diff --git a/setup/app.php b/setup/app.php deleted file mode 100644 index 42a9b0e..0000000 --- a/setup/app.php +++ /dev/null @@ -1,57 +0,0 @@ -addDefinitions(['environment' => $__environment]); -} -foreach ($folders as $f) { - $folder = implode(DIRECTORY_SEPARATOR, [ - __DIR__, - $f - ]); - if (!file_exists($folder)) { - continue; - } - $files = new DirectoryIterator($folder); - foreach ($files as $file) { - if ($file->isDir() or $file->getExtension() != 'php') { - continue; - } - $builder->addDefinitions($file->getRealPath()); - } -} - -$container = $builder->build(); -$app = Bridge::create($container); -if ($app->getContainer()->has('base_url') and $app->getContainer()->get('base_url') != '') { - $app->setBasePath($app->getContainer()->get('base_url')); -} -$app->addRoutingMiddleware(); - -foreach ($folders as $folder) { - $filename = implode(DIRECTORY_SEPARATOR, [ - __DIR__, - $folder, - 'middleware.php' - ]); - if (!file_exists($filename)) { - continue; - } - include_once $filename; -} - -$app->addErrorMiddleware(true, true, true); - -include_once 'database.php'; - -include_once 'router.php'; - -return $app; From b7fc538e782db2e05f8fcef9c57313e86efa3e79 Mon Sep 17 00:00:00 2001 From: Juan Pablo Vial Date: Mon, 24 Jul 2023 20:52:13 -0400 Subject: [PATCH 003/163] Old Version --- .adminer.env | 2 - .adminer.env.sample | 2 - .db.env | 5 - .db.env.sample | 4 - .env.sample | 3 - aldarien/asset/.gitignore | 11 - aldarien/asset/LICENSE | 21 - aldarien/asset/README.md | 2 - aldarien/asset/app/Contract/Asset.php | 21 - aldarien/asset/app/Helper/functions.php | 5 - aldarien/asset/app/Service/Asset.php | 88 -- aldarien/asset/composer.json | 26 - aldarien/asset/phpunit.xml | 17 - aldarien/asset/tests/AssetTest.php | 25 - aldarien/config/.gitignore | 13 - aldarien/config/.travis.yml | 3 - aldarien/config/LICENSE | 21 - aldarien/config/README.md | 4 - aldarien/config/app/Contract/Config.php | 31 - aldarien/config/app/Contract/YamlWrapper.php | 21 - aldarien/config/app/Helper/functions.php | 9 - aldarien/config/app/Service/Config.php | 150 ---- aldarien/config/bootstrap/autoload.php | 3 - aldarien/config/composer.json | 28 - aldarien/config/phpunit.xml | 17 - aldarien/config/tests/ConfigTest.php | 90 -- aldarien/contract/.gitignore | 6 - aldarien/contract/LICENSE | 21 - aldarien/contract/app/Definition/Contract.php | 20 - aldarien/contract/composer.json | 18 - aldarien/format/.gitignore | 11 - aldarien/format/LICENSE | 21 - aldarien/format/README.md | 2 - aldarien/format/app/Helper/Format.php | 43 - aldarien/format/composer.json | 23 - aldarien/format/config/app.php | 5 - aldarien/format/phpunit.xml | 17 - aldarien/format/tests/FormatTest.php | 59 -- aldarien/response/.gitignore | 7 - aldarien/response/LICENSE | 21 - aldarien/response/README.md | 2 - aldarien/response/app/Contract/Response.php | 27 - aldarien/response/app/Helper/functions.php | 11 - aldarien/response/app/Service/Response.php | 62 -- aldarien/response/bootstrap/autoload.php | 3 - aldarien/response/composer.json | 26 - aldarien/response/phpunit.xml | 17 - aldarien/response/tests/ResponseTest.php | 22 - aldarien/root/.gitignore | 5 - aldarien/root/LICENSE | 21 - aldarien/root/README.md | 22 - aldarien/root/app/Helper/functions.php | 5 - aldarien/root/composer.json | 21 - aldarien/root/phpunit.xml | 19 - aldarien/root/src/Root.php | 48 - aldarien/root/tests/RootTest.php | 61 -- aldarien/session/.gitignore | 11 - aldarien/session/LICENSE | 21 - aldarien/session/README.md | 2 - aldarien/session/app/Contract/Session.php | 29 - aldarien/session/composer.json | 24 - aldarien/url/.gitignore | 12 - aldarien/url/LICENSE | 21 - aldarien/url/README.md | 2 - aldarien/url/app/Contract/URL.php | 21 - aldarien/url/app/Helper/functions.php | 8 - aldarien/url/app/Service/URL.php | 83 -- aldarien/url/composer.json | 29 - aldarien/view/.gitignore | 10 - aldarien/view/LICENSE | 21 - aldarien/view/README.md | 2 - aldarien/view/app/Contract/View.php | 30 - aldarien/view/app/Helper/functions.php | 5 - aldarien/view/app/Service/View.php | 27 - ...fae499b6e99106ff3bd673b8eb7319ae68e7ae.php | 9 - aldarien/view/composer.json | 28 - aldarien/view/config/locations.php | 8 - aldarien/view/phpunit.xml | 17 - aldarien/view/public/index.php | 5 - aldarien/view/resources/views/base.blade.php | 9 - aldarien/view/tests/ViewTest.php | 22 - app/Alias/Connection.php | 50 -- app/Alias/Excel/Style/Mes.php | 18 - app/Alias/Format.php | 12 - app/Alias/Model.php | 87 -- app/Alias/NewEstado.php | 20 - app/Alias/NewModel.php | 9 - app/Alias/NewTipo.php | 15 - app/Alias/OldModel.php | 8 - app/Alias/PHPExcel.php | 155 ---- app/Alias/RemoteConnection.php | 17 - app/Command/Money/Get.php | 87 -- app/Command/Money/Lookup.php | 52 -- app/Contract/Auth.php | 27 - app/Contract/Route.php | 27 - app/Controller/API/Unidades.php | 41 - app/Controller/Admin.php | 233 ----- app/Controller/Ajax.php | 215 ----- app/Controller/Auth.php | 56 -- app/Controller/Bonos.php | 67 -- app/Controller/Buscar.php | 340 ------- app/Controller/Cierres.php | 428 --------- app/Controller/Comentarios.php | 39 - app/Controller/Contabilidad.php | 100 --- app/Controller/Creditos.php | 207 ----- app/Controller/Cuotas.php | 230 ----- app/Controller/Devoluciones.php | 19 - app/Controller/Escrituras.php | 212 ----- app/Controller/FormaPago.php | 98 --- app/Controller/Informes.php | 832 ------------------ app/Controller/Inmobiliarias.php | 74 -- app/Controller/Operadores.php | 47 - app/Controller/Other.php | 71 -- app/Controller/Pagares.php | 271 ------ app/Controller/Pagos.php | 358 -------- app/Controller/Pies.php | 104 --- app/Controller/Postventas.php | 69 -- app/Controller/Precios.php | 177 ---- app/Controller/Propietarios.php | 129 --- app/Controller/ProyectoTipoUnidades.php | 77 -- app/Controller/Proyectos.php | 327 ------- app/Controller/Reajustes.php | 90 -- app/Controller/Registros.php | 39 - app/Controller/Subsidios.php | 184 ---- app/Controller/Temas.php | 111 --- app/Controller/Unidades.php | 126 --- app/Controller/UnidadesBloqueadas.php | 83 -- app/Controller/Ventas.php | 605 ------------- app/Definition/Controller.php | 31 - app/Definition/hasEstado.php | 38 - app/Definition/hasRUT.php | 20 - app/Exception/PropertyNotFound.php | 16 - app/Helper/Color.php | 169 ---- app/Helper/Line.php | 61 -- app/Helper/functions.php | 128 --- app/Service/Auth.php | 163 ---- app/Service/Borrador.php | 118 --- app/Service/DBToModel.php | 158 ---- app/Service/Factory.php | 204 ----- app/Service/Informador.php | 463 ---------- app/Service/Informe/Contabilidad/Resumen.php | 190 ---- app/Service/Informe/Informe.php | 55 -- app/Service/Money.php | 55 -- app/Service/Register.php | 34 - app/Service/Remote.php | 19 - app/Service/Replacer.php | 127 --- app/Service/Route.php | 131 --- bin/Pipfile | 12 - bin/console | 3 - bin/index.php | 8 - bin/informes/Pipfile | 16 - bin/informes/app.py | 14 - bin/informes/controllers/ventas.py | 141 --- bootstrap/autoload.php | 8 - bootstrap/database.php | 29 - bootstrap/dotenv.php | 12 - bootstrap/errors.php | 7 - bootstrap/logs.php | 26 - bootstrap/routes.php | 21 - composer.json | 68 -- config/app.php | 9 - config/databases.php | 24 - config/incoviba.php | 6 - config/locations.php | 16 - fontify.json | 7 - 165 files changed, 10974 deletions(-) delete mode 100644 .adminer.env delete mode 100644 .adminer.env.sample delete mode 100644 .db.env delete mode 100644 .db.env.sample delete mode 100644 .env.sample delete mode 100644 aldarien/asset/.gitignore delete mode 100644 aldarien/asset/LICENSE delete mode 100644 aldarien/asset/README.md delete mode 100644 aldarien/asset/app/Contract/Asset.php delete mode 100644 aldarien/asset/app/Helper/functions.php delete mode 100644 aldarien/asset/app/Service/Asset.php delete mode 100644 aldarien/asset/composer.json delete mode 100644 aldarien/asset/phpunit.xml delete mode 100644 aldarien/asset/tests/AssetTest.php delete mode 100644 aldarien/config/.gitignore delete mode 100644 aldarien/config/.travis.yml delete mode 100644 aldarien/config/LICENSE delete mode 100644 aldarien/config/README.md delete mode 100644 aldarien/config/app/Contract/Config.php delete mode 100644 aldarien/config/app/Contract/YamlWrapper.php delete mode 100644 aldarien/config/app/Helper/functions.php delete mode 100644 aldarien/config/app/Service/Config.php delete mode 100644 aldarien/config/bootstrap/autoload.php delete mode 100644 aldarien/config/composer.json delete mode 100644 aldarien/config/phpunit.xml delete mode 100644 aldarien/config/tests/ConfigTest.php delete mode 100644 aldarien/contract/.gitignore delete mode 100644 aldarien/contract/LICENSE delete mode 100644 aldarien/contract/app/Definition/Contract.php delete mode 100644 aldarien/contract/composer.json delete mode 100644 aldarien/format/.gitignore delete mode 100644 aldarien/format/LICENSE delete mode 100644 aldarien/format/README.md delete mode 100644 aldarien/format/app/Helper/Format.php delete mode 100644 aldarien/format/composer.json delete mode 100644 aldarien/format/config/app.php delete mode 100644 aldarien/format/phpunit.xml delete mode 100644 aldarien/format/tests/FormatTest.php delete mode 100644 aldarien/response/.gitignore delete mode 100644 aldarien/response/LICENSE delete mode 100644 aldarien/response/README.md delete mode 100644 aldarien/response/app/Contract/Response.php delete mode 100644 aldarien/response/app/Helper/functions.php delete mode 100644 aldarien/response/app/Service/Response.php delete mode 100644 aldarien/response/bootstrap/autoload.php delete mode 100644 aldarien/response/composer.json delete mode 100644 aldarien/response/phpunit.xml delete mode 100644 aldarien/response/tests/ResponseTest.php delete mode 100644 aldarien/root/.gitignore delete mode 100644 aldarien/root/LICENSE delete mode 100644 aldarien/root/README.md delete mode 100644 aldarien/root/app/Helper/functions.php delete mode 100644 aldarien/root/composer.json delete mode 100644 aldarien/root/phpunit.xml delete mode 100644 aldarien/root/src/Root.php delete mode 100644 aldarien/root/tests/RootTest.php delete mode 100644 aldarien/session/.gitignore delete mode 100644 aldarien/session/LICENSE delete mode 100644 aldarien/session/README.md delete mode 100644 aldarien/session/app/Contract/Session.php delete mode 100644 aldarien/session/composer.json delete mode 100644 aldarien/url/.gitignore delete mode 100644 aldarien/url/LICENSE delete mode 100644 aldarien/url/README.md delete mode 100644 aldarien/url/app/Contract/URL.php delete mode 100644 aldarien/url/app/Helper/functions.php delete mode 100644 aldarien/url/app/Service/URL.php delete mode 100644 aldarien/url/composer.json delete mode 100644 aldarien/view/.gitignore delete mode 100644 aldarien/view/LICENSE delete mode 100644 aldarien/view/README.md delete mode 100644 aldarien/view/app/Contract/View.php delete mode 100644 aldarien/view/app/Helper/functions.php delete mode 100644 aldarien/view/app/Service/View.php delete mode 100644 aldarien/view/cache/26fae499b6e99106ff3bd673b8eb7319ae68e7ae.php delete mode 100644 aldarien/view/composer.json delete mode 100644 aldarien/view/config/locations.php delete mode 100644 aldarien/view/phpunit.xml delete mode 100644 aldarien/view/public/index.php delete mode 100644 aldarien/view/resources/views/base.blade.php delete mode 100644 aldarien/view/tests/ViewTest.php delete mode 100644 app/Alias/Connection.php delete mode 100644 app/Alias/Excel/Style/Mes.php delete mode 100644 app/Alias/Format.php delete mode 100644 app/Alias/Model.php delete mode 100644 app/Alias/NewEstado.php delete mode 100644 app/Alias/NewModel.php delete mode 100644 app/Alias/NewTipo.php delete mode 100644 app/Alias/OldModel.php delete mode 100644 app/Alias/PHPExcel.php delete mode 100644 app/Alias/RemoteConnection.php delete mode 100644 app/Command/Money/Get.php delete mode 100644 app/Command/Money/Lookup.php delete mode 100644 app/Contract/Auth.php delete mode 100644 app/Contract/Route.php delete mode 100644 app/Controller/API/Unidades.php delete mode 100644 app/Controller/Admin.php delete mode 100644 app/Controller/Ajax.php delete mode 100644 app/Controller/Auth.php delete mode 100644 app/Controller/Bonos.php delete mode 100644 app/Controller/Buscar.php delete mode 100644 app/Controller/Cierres.php delete mode 100644 app/Controller/Comentarios.php delete mode 100644 app/Controller/Contabilidad.php delete mode 100644 app/Controller/Creditos.php delete mode 100644 app/Controller/Cuotas.php delete mode 100644 app/Controller/Devoluciones.php delete mode 100644 app/Controller/Escrituras.php delete mode 100644 app/Controller/FormaPago.php delete mode 100644 app/Controller/Informes.php delete mode 100644 app/Controller/Inmobiliarias.php delete mode 100644 app/Controller/Operadores.php delete mode 100644 app/Controller/Other.php delete mode 100644 app/Controller/Pagares.php delete mode 100644 app/Controller/Pagos.php delete mode 100644 app/Controller/Pies.php delete mode 100644 app/Controller/Postventas.php delete mode 100644 app/Controller/Precios.php delete mode 100644 app/Controller/Propietarios.php delete mode 100644 app/Controller/ProyectoTipoUnidades.php delete mode 100644 app/Controller/Proyectos.php delete mode 100644 app/Controller/Reajustes.php delete mode 100644 app/Controller/Registros.php delete mode 100644 app/Controller/Subsidios.php delete mode 100644 app/Controller/Temas.php delete mode 100644 app/Controller/Unidades.php delete mode 100644 app/Controller/UnidadesBloqueadas.php delete mode 100644 app/Controller/Ventas.php delete mode 100644 app/Definition/Controller.php delete mode 100644 app/Definition/hasEstado.php delete mode 100644 app/Definition/hasRUT.php delete mode 100644 app/Exception/PropertyNotFound.php delete mode 100644 app/Helper/Color.php delete mode 100644 app/Helper/Line.php delete mode 100644 app/Helper/functions.php delete mode 100644 app/Service/Auth.php delete mode 100644 app/Service/Borrador.php delete mode 100644 app/Service/DBToModel.php delete mode 100644 app/Service/Factory.php delete mode 100644 app/Service/Informador.php delete mode 100644 app/Service/Informe/Contabilidad/Resumen.php delete mode 100644 app/Service/Informe/Informe.php delete mode 100644 app/Service/Money.php delete mode 100644 app/Service/Register.php delete mode 100644 app/Service/Remote.php delete mode 100644 app/Service/Replacer.php delete mode 100644 app/Service/Route.php delete mode 100644 bin/Pipfile delete mode 100644 bin/console delete mode 100644 bin/index.php delete mode 100644 bin/informes/Pipfile delete mode 100644 bin/informes/app.py delete mode 100644 bin/informes/controllers/ventas.py delete mode 100644 bootstrap/autoload.php delete mode 100644 bootstrap/database.php delete mode 100644 bootstrap/dotenv.php delete mode 100644 bootstrap/errors.php delete mode 100644 bootstrap/logs.php delete mode 100644 bootstrap/routes.php delete mode 100644 composer.json delete mode 100644 config/app.php delete mode 100644 config/databases.php delete mode 100644 config/incoviba.php delete mode 100644 config/locations.php delete mode 100644 fontify.json diff --git a/.adminer.env b/.adminer.env deleted file mode 100644 index 7e78794..0000000 --- a/.adminer.env +++ /dev/null @@ -1,2 +0,0 @@ -ADMINER_DESIGN=dracula -ADMINER_PLUGINS=dump-json diff --git a/.adminer.env.sample b/.adminer.env.sample deleted file mode 100644 index 7e78794..0000000 --- a/.adminer.env.sample +++ /dev/null @@ -1,2 +0,0 @@ -ADMINER_DESIGN=dracula -ADMINER_PLUGINS=dump-json diff --git a/.db.env b/.db.env deleted file mode 100644 index 16b5aed..0000000 --- a/.db.env +++ /dev/null @@ -1,5 +0,0 @@ -MYSQL_DATABASE=incoviba -MYSQL_PASSWORD=5GQYFvRjVw2A4KcD -MYSQL_ROOT_PASSWORD=password -MYSQL_USER=incoviba -MYSQL_PORT=3307 diff --git a/.db.env.sample b/.db.env.sample deleted file mode 100644 index 18b1117..0000000 --- a/.db.env.sample +++ /dev/null @@ -1,4 +0,0 @@ -MYSQL_DATABASE= -MYSQL_PASSWORD= -MYSQL_ROOT_PASSWORD= -MYSQL_USER= diff --git a/.env.sample b/.env.sample deleted file mode 100644 index 76074d2..0000000 --- a/.env.sample +++ /dev/null @@ -1,3 +0,0 @@ -COMPOSE_PROFILES= -BASE_URL= -MYSQL_HOST= diff --git a/aldarien/asset/.gitignore b/aldarien/asset/.gitignore deleted file mode 100644 index 3b12249..0000000 --- a/aldarien/asset/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -composer.phar -/vendor/ - -# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file -# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file -# composer.lock - -#Eclipse IDE -.settings -.buildpath -.project diff --git a/aldarien/asset/LICENSE b/aldarien/asset/LICENSE deleted file mode 100644 index 55dc05a..0000000 --- a/aldarien/asset/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2017 Aldarien - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/aldarien/asset/README.md b/aldarien/asset/README.md deleted file mode 100644 index 1580798..0000000 --- a/aldarien/asset/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# asset -Asset manager module for my apps diff --git a/aldarien/asset/app/Contract/Asset.php b/aldarien/asset/app/Contract/Asset.php deleted file mode 100644 index 30b02c2..0000000 --- a/aldarien/asset/app/Contract/Asset.php +++ /dev/null @@ -1,21 +0,0 @@ -get($identifier); - } -} -?> diff --git a/aldarien/asset/app/Helper/functions.php b/aldarien/asset/app/Helper/functions.php deleted file mode 100644 index b0688e2..0000000 --- a/aldarien/asset/app/Helper/functions.php +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file diff --git a/aldarien/asset/app/Service/Asset.php b/aldarien/asset/app/Service/Asset.php deleted file mode 100644 index e7c36b7..0000000 --- a/aldarien/asset/app/Service/Asset.php +++ /dev/null @@ -1,88 +0,0 @@ -dir = config('locations.public'); - } - public function get($identifier) - { - $asset = $this->find($identifier); - return $asset->url; - } - protected function find($identifier) - { - $type = $this->getType($identifier); - $asset = null; - if ($type == false) { - foreach (array_keys($this->assets) as $type) { - if (($asset = $this->getAsset($identifier, $type))) { - break; - } - } - } else { - $asset = $this->getAsset($identifier, $type); - } - return $asset; - } - protected function getType($identifier) - { - if (strpos($identifier, '.') !== false) { - list($name, $ext) = explode('.', $identifier); - return $ext; - } - return false; - } - protected function getAsset($identifier, $type) - { - if (!isset($this->assets[$type])) { - $this->loadAssets($type); - } - if (!isset($this->assets[$type])) { - return null; - } - - foreach ($this->assets[$type] as $asset) { - if ($this->compareIdentifier($asset, $identifier)) { - return $asset; - } - } - return null; - } - protected function loadAssets($type) - { - $dir = $this->dir . '/' . $type . '/*.' . $type; - $files = glob($dir); - foreach ($files as $file) { - $url = $this->url($file); - $identifier = pathinfo($file)['filename']; - - $this->assets[$type] []= (object) ['identifier' => $identifier, 'url' => $url, 'type' => $type]; - } - } - protected function url($file) - { - $url = '/' . config('app.project') . '/' . str_replace('\\', '/', str_replace(realpath(config('locations.public')), '', dirname(realpath($file)))) . '/' . basename(realpath($file)); - $url = preg_replace('/\/+/', '/', $url); - return $url; - } - protected function compareIdentifier($asset, $identifier) - { - if (strpos($identifier, '.') !== false) { - list($name, $ext) = explode('.', $identifier); - if ($asset->identifier == $name and $asset->type == $ext) { - return true; - } - } else { - if ($asset->identifier == $identifier) { - return true; - } - } - return false; - } -} diff --git a/aldarien/asset/composer.json b/aldarien/asset/composer.json deleted file mode 100644 index dd2c217..0000000 --- a/aldarien/asset/composer.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name" : "aldarien/asset", - "description" : "Asset manager module for my apps", - "type" : "library", - "require" : { - "aldarien/config" : "*", - "aldarien/contract" : "*" - }, - "require-dev" : { - "phpunit/phpunit" : "*" - }, - "license" : "MIT", - "authors" : [{ - "name" : "Aldarien", - "email" : "aldarien85@gmail.com" - } - ], - "autoload" : { - "psr-4" : { - "App\\" : "app" - }, - "files": [ - "app/Helper/functions.php" - ] - } -} diff --git a/aldarien/asset/phpunit.xml b/aldarien/asset/phpunit.xml deleted file mode 100644 index e60ecbd..0000000 --- a/aldarien/asset/phpunit.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - ./tests/ - - - - - ./app - - - \ No newline at end of file diff --git a/aldarien/asset/tests/AssetTest.php b/aldarien/asset/tests/AssetTest.php deleted file mode 100644 index e53f0ad..0000000 --- a/aldarien/asset/tests/AssetTest.php +++ /dev/null @@ -1,25 +0,0 @@ -assertEquals(asset('style.css'), '/css/style.css'); - } -} -?> \ No newline at end of file diff --git a/aldarien/config/.gitignore b/aldarien/config/.gitignore deleted file mode 100644 index 47c4114..0000000 --- a/aldarien/config/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -composer.phar -/vendor/ - -# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file -# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file -# composer.lock - -config - -# Eclipse IDE -.settings -.buildpath -.project \ No newline at end of file diff --git a/aldarien/config/.travis.yml b/aldarien/config/.travis.yml deleted file mode 100644 index a792980..0000000 --- a/aldarien/config/.travis.yml +++ /dev/null @@ -1,3 +0,0 @@ -language: php -php: '7.1' -install: composer update diff --git a/aldarien/config/LICENSE b/aldarien/config/LICENSE deleted file mode 100644 index 55dc05a..0000000 --- a/aldarien/config/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2017 Aldarien - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/aldarien/config/README.md b/aldarien/config/README.md deleted file mode 100644 index dfed35b..0000000 --- a/aldarien/config/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# config -Config module that recovers configuration files - -[![Build Status](https://travis-ci.org/Aldarien/config.svg?branch=1.0.1)](https://travis-ci.org/Aldarien/config) diff --git a/aldarien/config/app/Contract/Config.php b/aldarien/config/app/Contract/Config.php deleted file mode 100644 index 9664aca..0000000 --- a/aldarien/config/app/Contract/Config.php +++ /dev/null @@ -1,31 +0,0 @@ -get($name); - } - public static function set($name, $value) - { - $instance = self::getInstance(); - return $instance->set($name, $value); - } - public static function addFile($filename) - { - $instance = self::getInstance(); - return $instance->loadFile($filename); - } -} -?> diff --git a/aldarien/config/app/Contract/YamlWrapper.php b/aldarien/config/app/Contract/YamlWrapper.php deleted file mode 100644 index 0ab60f6..0000000 --- a/aldarien/config/app/Contract/YamlWrapper.php +++ /dev/null @@ -1,21 +0,0 @@ - \ No newline at end of file diff --git a/aldarien/config/app/Helper/functions.php b/aldarien/config/app/Helper/functions.php deleted file mode 100644 index e073f18..0000000 --- a/aldarien/config/app/Helper/functions.php +++ /dev/null @@ -1,9 +0,0 @@ - diff --git a/aldarien/config/app/Service/Config.php b/aldarien/config/app/Service/Config.php deleted file mode 100644 index 072e38f..0000000 --- a/aldarien/config/app/Service/Config.php +++ /dev/null @@ -1,150 +0,0 @@ -dir = $dir; - $this->load(); - } - protected function load() - { - $files = glob($this->dir . '/*.{php,json,yml}', GLOB_BRACE); - foreach ($files as $file) { - $info = pathinfo($file); - $name = $info['filename']; - - $d = $this->getData($file); - $data[$name] = $d; - $data = array_merge($data, $this->translateArray($d, $name)); - foreach ($data as $key => $value) { - $this->add($key, $value); - } - } - } - public function loadFile(string $filename) - { - if (!file_exists(realpath($filename))) { - return false; - } - $info = pathinfo($filename); - $name = $info['filename']; - $d = $this->getData($filename); - $data[$name] = $d; - $data = array_merge($data, $this->translateArray($d, $name)); - foreach ($data as $key => $value) { - $this->add($key, $value); - } - return true; - } - protected function getData($filename) - { - $info = pathinfo($filename); - - switch ($info['extension']) { - case 'php': - return include_once $filename; - case 'json': - return json_decode(file_get_contents($filename), true); - case 'yml': - return YamlWrapper::load($filename); - default: - throw new \DomainException('Invalid file extension for ' . $filename); - } - } - protected function translateArray($array, $level) - { - $output = []; - foreach ($array as $k1 => $l1) { - $key = $level . '.' . $k1; - if (is_array($l1)) { - $output[$key] = $l1; - $output = array_merge($output, $this->translateArray($l1, $key)); - } else { - $output[$key] = $l1; - } - } - return $output; - } - protected function add($field, $value) - { - if (isset($this->data[$field])) { - if ($this->data[$field] == $value) { - return; - } - if (is_array($this->data[$field])) { - $this->data[$field] = $this->merge($this->data[$field], $this->replace($value)); - } else { - $this->data[$field] = $this->replace($value); - } - } else { - $this->data[$field] = $this->replace($value); - } - } - protected function merge($arr1, $arr2) - { - $output = $arr1; - foreach ($arr2 as $k => $value) { - if (isset($arr1[$k])) { - if ($arr1[$k] == $value) { - continue; - } - if (is_array($arr1[$k])) { - $output[$k] = $this->merge($arr1[$k], $value); - } else { - $output[$k] = array_merge([$arr1[$k]], $value); - } - } else { - $output[$k] = $value; - } - } - return $output; - } - protected function replace($value) - { - if (is_array($value)) { - foreach ($value as $k => $v) { - $value[$k] = $this->replace($v); - } - return $value; - } - if (strpos($value, '{') !== false) { - while(strpos($value, '{') !== false) { - $ini = strpos($value, '{') + 1; - $end = strpos($value, '}', $ini); - $rep = substr($value, $ini, $end - $ini); - $new = $this->get($rep); - if ($new === null) { - $new = ''; - } - $value = str_replace('{' . $rep . '}', $new, $value); - } - } - return $value; - } - - public function get($name = null) - { - if ($name == null) { - return $this->data; - } - if (isset($this->data[$name])) { - return $this->data[$name]; - } - return null; - } - public function set($name, $value) - { - $this->add($name, $value); - } -} -?> diff --git a/aldarien/config/bootstrap/autoload.php b/aldarien/config/bootstrap/autoload.php deleted file mode 100644 index 42765bd..0000000 --- a/aldarien/config/bootstrap/autoload.php +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/aldarien/config/composer.json b/aldarien/config/composer.json deleted file mode 100644 index ff4255b..0000000 --- a/aldarien/config/composer.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "name": "aldarien/config", - "description": "Config module for my apps", - "type": "library", - "license": "MIT", - "authors": [ - { - "name": "Aldarien", - "email": "aldarien85@gmail.com" - } - ], - "require": { - "aldarien/contract": "*", - "aldarien/root": "*", - "symfony/yaml": "*" - }, - "autoload": { - "psr-4": { - "App\\": "app" - }, - "files": [ - "app/Helper/functions.php" - ] - }, - "require-dev": { - "phpunit/phpunit": "^6.3" - } -} diff --git a/aldarien/config/phpunit.xml b/aldarien/config/phpunit.xml deleted file mode 100644 index db312e1..0000000 --- a/aldarien/config/phpunit.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - ./tests/ - - - - - ./app - - - \ No newline at end of file diff --git a/aldarien/config/tests/ConfigTest.php b/aldarien/config/tests/ConfigTest.php deleted file mode 100644 index 187e0a3..0000000 --- a/aldarien/config/tests/ConfigTest.php +++ /dev/null @@ -1,90 +0,0 @@ - 'Config', 'test_array' => ['data1' => 1, 'data2' => 2]]; ?>"; - file_put_contents(dirname(__DIR__) . '/config/app.php', $str); - $data = ['name' => 'Config', 'test_array' => ['data1' => 1, 'data2' => 2]]; - file_put_contents(dirname(__DIR__) . '/config/json.json', json_encode($data)); - file_put_contents(dirname(__DIR__) . '/config/yaml.yml', YamlWrapper::dump($data)); - $data = ['last_name' => 'Config']; - file_put_contents(dirname(__DIR__) . '/config/yaml.json', json_encode($data)); - } - public function testGetNamePhp() - { - $name = 'Config'; - - $this->assertEquals($name, config('app.name')); - } - public function testGetNameJson() - { - $name = 'Config'; - - $this->assertEquals($name, config('json.name')); - } - public function testGetNameYaml() - { - $name = 'Config'; - - $this->assertEquals($name, config('yaml.name')); - } - public function testSetNamehp() - { - $new_name = 'Config_Test'; - config('app.name', $new_name); - $this->assertEquals($new_name, config('app.name')); - } - public function testSetNameJson() - { - $new_name = 'Config_Test'; - config('json.name', $new_name); - $this->assertEquals($new_name, config('json.name')); - } - public function testSetNameYaml() - { - $new_name = 'Config_Test'; - config('yaml.name', $new_name); - $this->assertEquals($new_name, config('yaml.name')); - } - public function testArrayGetPhp() - { - $this->assertArrayHasKey('data1', config('app.test_array')); - } - public function testArrayGetJson() - { - $this->assertArrayHasKey('data1', config('json.test_array')); - } - public function testArrayGetYaml() - { - $this->assertArrayHasKey('data1', config('yaml.test_array')); - } - public function testSameSectionName() - { - $this->assertEquals('Config', config('yaml.last_name')); - } - public function testDuplicateValue() - { - config('json.name', 'Config2'); - $this->assertEquals('Config2', config('json.name')); - } - public function testAddFile() - { - $filename = dirname(__DIR__) . '/composer.json'; - App\Contract\Config::addFile($filename); - $this->assertEquals('aldarien/config', config('composer.name')); - } - public function tearDown() - { - unlink(dirname(__DIR__) . '/config/app.php'); - unlink(dirname(__DIR__) . '/config/json.json'); - unlink(dirname(__DIR__) . '/config/yaml.yml'); - unlink(dirname(__DIR__) . '/config/yaml.json'); - rmdir(dirname(__DIR__) . '/config'); - } -} -?> \ No newline at end of file diff --git a/aldarien/contract/.gitignore b/aldarien/contract/.gitignore deleted file mode 100644 index c422267..0000000 --- a/aldarien/contract/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -composer.phar -/vendor/ - -# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file -# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file -# composer.lock diff --git a/aldarien/contract/LICENSE b/aldarien/contract/LICENSE deleted file mode 100644 index 55dc05a..0000000 --- a/aldarien/contract/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2017 Aldarien - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/aldarien/contract/app/Definition/Contract.php b/aldarien/contract/app/Definition/Contract.php deleted file mode 100644 index 4cc88ca..0000000 --- a/aldarien/contract/app/Definition/Contract.php +++ /dev/null @@ -1,20 +0,0 @@ - diff --git a/aldarien/contract/composer.json b/aldarien/contract/composer.json deleted file mode 100644 index 96ef067..0000000 --- a/aldarien/contract/composer.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "aldarien/contract", - "description": "Contract trait for my apps", - "type": "library", - "license": "MIT", - "authors": [ - { - "name": "Aldarien", - "email": "aldarien85@gmail.com" - } - ], - "require": {}, - "autoload": { - "psr-4": { - "App\\": "app" - } - } -} diff --git a/aldarien/format/.gitignore b/aldarien/format/.gitignore deleted file mode 100644 index 6ee50e6..0000000 --- a/aldarien/format/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -composer.phar -/vendor/ - -# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file -# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file -# composer.lock - -# Eclipse IDE -.settings -.buildpath -.project \ No newline at end of file diff --git a/aldarien/format/LICENSE b/aldarien/format/LICENSE deleted file mode 100644 index 55dc05a..0000000 --- a/aldarien/format/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2017 Aldarien - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/aldarien/format/README.md b/aldarien/format/README.md deleted file mode 100644 index d4f839f..0000000 --- a/aldarien/format/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# format -Module for formatting data, mostly numbers diff --git a/aldarien/format/app/Helper/Format.php b/aldarien/format/app/Helper/Format.php deleted file mode 100644 index 9836f38..0000000 --- a/aldarien/format/app/Helper/Format.php +++ /dev/null @@ -1,43 +0,0 @@ -format("d \d\\e F Y"); - } - public static function shortDate(string $date) - { - $d = \Carbon\Carbon::parse($date, config('app.timezone')); - return $d->format('d-m-Y'); - } - public static function localDate(string $date) - { - $d = \Carbon\Carbon::parse($date, config('app.timezone')); - setlocale(LC_TIME, 'es'); - return $d->formatLocalized('%d de %B de %Y'); - } - public static function m2(float $number, bool $print = false) - { - return self::number($number, 2) . (($print) ? ' m²' : ''); - } - public static function percent(float $number, bool $print = false) - { - return self::number($number, 2) . (($print) ? '%' : ''); - } -} -?> \ No newline at end of file diff --git a/aldarien/format/composer.json b/aldarien/format/composer.json deleted file mode 100644 index 59d058d..0000000 --- a/aldarien/format/composer.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name" : "aldarien/format", - "description" : "Module for formatting data, mostly numbers", - "type" : "library", - "require-dev" : { - "phpunit/phpunit" : "*", - "aldarien/config": "*" - }, - "license" : "MIT", - "authors" : [{ - "name" : "Aldarien", - "email" : "aldarien85@gmail.com" - } - ], - "autoload" : { - "psr-4" : { - "App\\" : "app" - } - }, - "require": { - "nesbot/carbon": "^2" - } -} diff --git a/aldarien/format/config/app.php b/aldarien/format/config/app.php deleted file mode 100644 index 9e747f9..0000000 --- a/aldarien/format/config/app.php +++ /dev/null @@ -1,5 +0,0 @@ - 'America/Santiago' -]; -?> \ No newline at end of file diff --git a/aldarien/format/phpunit.xml b/aldarien/format/phpunit.xml deleted file mode 100644 index e60ecbd..0000000 --- a/aldarien/format/phpunit.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - ./tests/ - - - - - ./app - - - \ No newline at end of file diff --git a/aldarien/format/tests/FormatTest.php b/aldarien/format/tests/FormatTest.php deleted file mode 100644 index bcc6bd5..0000000 --- a/aldarien/format/tests/FormatTest.php +++ /dev/null @@ -1,59 +0,0 @@ -number, 3); - $this->assertEquals($output, $result); - } - public function testPesosPrint() - { - $output = '$ 5.049.872'; - $result = Format::pesos($this->number, true); - $this->assertEquals($output, $result); - } - public function testUFPrint() - { - $output = '5.049.872,32 UF'; - $result = Format::ufs($this->number, true); - $this->assertEquals($output, $result); - } - public function testDate() - { - $output = '25 de March 2016'; - $result = Format::date($this->date); - $this->assertEquals($output, $result); - } - public function testShortDate() - { - $output = '25-03-2016'; - $result = Format::shortDate($this->date); - $this->assertEquals($output, $result); - } - public function testLocalDate() - { - $output = '25 de marzo de 2016'; - $result = Format::localDate($this->date); - $this->assertEquals($output, $result); - } - public function testM2Print() - { - $output = '5.049.872,32 m²'; - $result = Format::m2($this->number, true); - $this->assertEquals($output, $result); - } - public function testPercentPrint() - { - $output = '5.049.872,32%'; - $result = Format::percent($this->number, true); - $this->assertEquals($output, $result); - } -} -?> \ No newline at end of file diff --git a/aldarien/response/.gitignore b/aldarien/response/.gitignore deleted file mode 100644 index 265bf84..0000000 --- a/aldarien/response/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -#Eclipse IDE -.settings -.buildpath -.project - -#Composer -vendor diff --git a/aldarien/response/LICENSE b/aldarien/response/LICENSE deleted file mode 100644 index 55dc05a..0000000 --- a/aldarien/response/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2017 Aldarien - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/aldarien/response/README.md b/aldarien/response/README.md deleted file mode 100644 index 80c6096..0000000 --- a/aldarien/response/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# response -Response handler module for my apps diff --git a/aldarien/response/app/Contract/Response.php b/aldarien/response/app/Contract/Response.php deleted file mode 100644 index 4b0089e..0000000 --- a/aldarien/response/app/Contract/Response.php +++ /dev/null @@ -1,27 +0,0 @@ - \ No newline at end of file diff --git a/aldarien/response/app/Helper/functions.php b/aldarien/response/app/Helper/functions.php deleted file mode 100644 index 32c48f8..0000000 --- a/aldarien/response/app/Helper/functions.php +++ /dev/null @@ -1,11 +0,0 @@ - \ No newline at end of file diff --git a/aldarien/response/app/Service/Response.php b/aldarien/response/app/Service/Response.php deleted file mode 100644 index d0f3e24..0000000 --- a/aldarien/response/app/Service/Response.php +++ /dev/null @@ -1,62 +0,0 @@ -gump = new \GUMP(); - } - public function sanitize() - { - if ($_POST) { - $this->post = $this->correctNumbers($this->gump->sanitize($_POST)); - } - if ($_GET) { - $this->get = $this->correctNumbers($this->gump->sanitize($_GET)); - } - } - public function correctNumbers(array $data) - { - $output = []; - foreach ($data as $key => $value) { - if (is_float(str_replace(',', '.', $value))) { - $output[$key] = str_replace(',', '.', $value); - } else { - $output[$key] = $value; - } - } - return $output; - } - public function get($query = null) - { - if ($this->get == null) { - $this->sanitize(); - } - if ($query == null) { - return $this->get; - } - if (isset($this->get[$query])) { - return $this->get[$query]; - } - return false; - } - public function post($query = null) - { - if ($this->post == null) { - $this->sanitize(); - } - if ($query == null) { - return $this->post; - } - if (isset($this->post[$query])) { - return $this->post[$query]; - } - return false; - } -} -?> diff --git a/aldarien/response/bootstrap/autoload.php b/aldarien/response/bootstrap/autoload.php deleted file mode 100644 index b5e8220..0000000 --- a/aldarien/response/bootstrap/autoload.php +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/aldarien/response/composer.json b/aldarien/response/composer.json deleted file mode 100644 index a337f86..0000000 --- a/aldarien/response/composer.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name" : "aldarien/response", - "description" : "Response handler module for my apps", - "type" : "library", - "require" : { - "wixel/gump" : "^2.0.0", - "aldarien/contract" : "*" - }, - "require-dev" : { - "phpunit/phpunit" : "*" - }, - "license" : "MIT", - "authors" : [{ - "name" : "Aldarien", - "email" : "jpvial@gmail.com" - } - ], - "autoload" : { - "psr-4" : { - "App\\" : "app" - }, - "files": [ - "app/Helper/functions.php" - ] - } -} diff --git a/aldarien/response/phpunit.xml b/aldarien/response/phpunit.xml deleted file mode 100644 index db312e1..0000000 --- a/aldarien/response/phpunit.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - ./tests/ - - - - - ./app - - - \ No newline at end of file diff --git a/aldarien/response/tests/ResponseTest.php b/aldarien/response/tests/ResponseTest.php deleted file mode 100644 index 67d603c..0000000 --- a/aldarien/response/tests/ResponseTest.php +++ /dev/null @@ -1,22 +0,0 @@ -value; - $_POST['test'] = $this->value; - } - public function testGet() - { - $this->assertEquals($this->value, get('test')); - } - public function testPost() - { - $this->assertEquals($this->value, post('test')); - } -} -?> \ No newline at end of file diff --git a/aldarien/root/.gitignore b/aldarien/root/.gitignore deleted file mode 100644 index f7e7961..0000000 --- a/aldarien/root/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -.buildpath -.project -.settings -*.lock -vendor \ No newline at end of file diff --git a/aldarien/root/LICENSE b/aldarien/root/LICENSE deleted file mode 100644 index 55dc05a..0000000 --- a/aldarien/root/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2017 Aldarien - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/aldarien/root/README.md b/aldarien/root/README.md deleted file mode 100644 index 039cbc3..0000000 --- a/aldarien/root/README.md +++ /dev/null @@ -1,22 +0,0 @@ -# root -get root directory path for your project - -## Usage - -add `Root::root('project')` or `root('project')` or `Root::root()` or `root()` where you need the root directory of your proyect. - -## Example - -For the structure: - -~~~ -/usr/share/www/projects -- myProject --- src --- tests -~~~ - -using `Root::root('myProject')` - -outputs: -`/usr/share/www/projects/myProject` diff --git a/aldarien/root/app/Helper/functions.php b/aldarien/root/app/Helper/functions.php deleted file mode 100644 index 86fd2eb..0000000 --- a/aldarien/root/app/Helper/functions.php +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file diff --git a/aldarien/root/composer.json b/aldarien/root/composer.json deleted file mode 100644 index 784dfb7..0000000 --- a/aldarien/root/composer.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name" : "aldarien/root", - "description" : "Find the root path for your proyect", - "authors" : [{ - "name" : "Aldarien" - } - ], - "license": "MIT", - "require-dev" : { - "phpunit/phpunit" : "*", - "kint-php/kint" : "*" - }, - "autoload" : { - "psr-4" : { - "Proyect\\Root\\" : "src" - }, - "files": [ - "app/Helper/functions.php" - ] - } -} diff --git a/aldarien/root/phpunit.xml b/aldarien/root/phpunit.xml deleted file mode 100644 index 63ecd1c..0000000 --- a/aldarien/root/phpunit.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - tests - - - - - src - - - diff --git a/aldarien/root/src/Root.php b/aldarien/root/src/Root.php deleted file mode 100644 index 13058df..0000000 --- a/aldarien/root/src/Root.php +++ /dev/null @@ -1,48 +0,0 @@ -$proyect_name/public/index.php calls for $proyect_name/bootstrap/autoload.php, - * you just need to - * - * include root() . '/bootstrap/autoload.php' - * - * @param string $proyect_name - * @return string - */ - public static function root(string $proyect_name = '') - { - $dir = realpath(__DIR__); - if ($proyect_name == '') { - return self::findComposerFile($dir); - } else { - $ini = strpos($dir, $proyect_name) + strlen($proyect_name); - } - $path = substr($dir, $ini); - $cnt = substr_count($path, DIRECTORY_SEPARATOR); - $root = DIRECTORY_SEPARATOR; - for ($i = 0; $i < $cnt; $i ++) { - $root .= '..' . DIRECTORY_SEPARATOR; - } - - return realpath($dir . $root); - } - protected static function findComposerFile($dir) - { - if (file_exists($dir . '/vendor/')) { - return $dir; - } - - $root = realpath('/'); - if (realpath($dir) == $root) { - return null; - } - - $dir = dirname($dir); - return self::findComposerFile($dir); - } -} -?> diff --git a/aldarien/root/tests/RootTest.php b/aldarien/root/tests/RootTest.php deleted file mode 100644 index 1deed6c..0000000 --- a/aldarien/root/tests/RootTest.php +++ /dev/null @@ -1,61 +0,0 @@ -getCurrentDir(); - $this->assertEquals($this->getRoot(), $this->current_dir); - $this->assertEquals($this->getBaseRoot(), $this->current_dir); - } - public function testBaseRootFunction() - { - $this->getCurrentDir(); - $this->assertEquals($this->getFRoot(), $this->current_dir); - $this->assertEquals($this->getFBaseRoot(), $this->current_dir); - } - public function testSrcRoot() - { - $this->changeDir('src'); - $this->assertEquals(realpath($this->getRoot() . '/src'), $this->current_dir); - $this->assertEquals(realpath($this->getBaseRoot() . '/src'), $this->current_dir); - } - public function testSrcRootFunction() - { - $this->changeDir('src'); - $this->assertEquals(realpath($this->getFRoot() . '/src'), $this->current_dir); - $this->assertEquals(realpath($this->getFBaseRoot() . '/src'), $this->current_dir); - } - - private function getCurrentDir() - { - $this->current_dir = getcwd(); - } - private function changeDir($dir) - { - chdir($dir); - $this->getCurrentDir(); - } - private function getRoot() - { - return Root::root($this->proyect_name); - } - private function getBaseRoot() - { - return Root::root(); - } - private function getFRoot() - { - return root($this->proyect_name); - } - private function getFBaseRoot() - { - return root(); - } -} -?> \ No newline at end of file diff --git a/aldarien/session/.gitignore b/aldarien/session/.gitignore deleted file mode 100644 index 6ee50e6..0000000 --- a/aldarien/session/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -composer.phar -/vendor/ - -# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file -# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file -# composer.lock - -# Eclipse IDE -.settings -.buildpath -.project \ No newline at end of file diff --git a/aldarien/session/LICENSE b/aldarien/session/LICENSE deleted file mode 100644 index 55dc05a..0000000 --- a/aldarien/session/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2017 Aldarien - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/aldarien/session/README.md b/aldarien/session/README.md deleted file mode 100644 index 6825213..0000000 --- a/aldarien/session/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# session -Session wrapper for aura/session diff --git a/aldarien/session/app/Contract/Session.php b/aldarien/session/app/Contract/Session.php deleted file mode 100644 index 2968a8f..0000000 --- a/aldarien/session/app/Contract/Session.php +++ /dev/null @@ -1,29 +0,0 @@ -newInstance($_COOKIE); - } - public static function get($segment, $name) - { - $instance = self::getInstance(); - $segment = $instance->getSegment($segment); - return $segment->get($name); - } - public static function set($segment, $name, $value) - { - $instance = self::getInstance(); - $segment = $instance->getSegment($segment); - $segment->set($name, $value); - } -} -?> \ No newline at end of file diff --git a/aldarien/session/composer.json b/aldarien/session/composer.json deleted file mode 100644 index 7fe764d..0000000 --- a/aldarien/session/composer.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "aldarien/session", - "description": "Session wrapper for aura/session", - "type": "library", - "require": { - "aura/session": "*", - "aldarien/contract": "*" - }, - "require-dev": { - "phpunit/phpunit": "*" - }, - "license": "MIT", - "authors": [ - { - "name": "Aldarien", - "email": "aldarien85@gmail.com" - } - ], - "autoload": { - "psr-4": { - "App\\": "app" - } - } -} diff --git a/aldarien/url/.gitignore b/aldarien/url/.gitignore deleted file mode 100644 index a06a2f1..0000000 --- a/aldarien/url/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -composer.phar -/vendor/ - -# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file -# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file -# composer.lock - -.settings -.buildpath -.project - -# Eclipse IDE \ No newline at end of file diff --git a/aldarien/url/LICENSE b/aldarien/url/LICENSE deleted file mode 100644 index 55dc05a..0000000 --- a/aldarien/url/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2017 Aldarien - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/aldarien/url/README.md b/aldarien/url/README.md deleted file mode 100644 index 0c1a426..0000000 --- a/aldarien/url/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# url -Get relative path url diff --git a/aldarien/url/app/Contract/URL.php b/aldarien/url/app/Contract/URL.php deleted file mode 100644 index 14d7ef0..0000000 --- a/aldarien/url/app/Contract/URL.php +++ /dev/null @@ -1,21 +0,0 @@ -url($path, $variables); - } -} -?> \ No newline at end of file diff --git a/aldarien/url/app/Helper/functions.php b/aldarien/url/app/Helper/functions.php deleted file mode 100644 index 6e9435e..0000000 --- a/aldarien/url/app/Helper/functions.php +++ /dev/null @@ -1,8 +0,0 @@ - \ No newline at end of file diff --git a/aldarien/url/app/Service/URL.php b/aldarien/url/app/Service/URL.php deleted file mode 100644 index 49a601d..0000000 --- a/aldarien/url/app/Service/URL.php +++ /dev/null @@ -1,83 +0,0 @@ -root = $this->findRoot(); - $this->relative = $this->findRelative(); - } - - protected function findRoot() - { - $base = $_SERVER['HTTP_HOST'] . ((isset($_SERVER['HTTP_PORT'])) ? ':' . $_SERVER['HTTP_PORT'] : ''); - $scheme = 'http'; - if (isset($_SERVER['REQUEST_SCHEME'])) { - $scheme = $_SERVER['REQUEST_SCHEME']; - } - if (isset($_SERVER['HTTPS'])) { - $scheme = 'https'; - } - $uri = Http::createFromString(\Sabre\Uri\resolve($scheme . '://' . $base, $_SERVER['SCRIPT_NAME'])); - $host = new Host($uri->getHost()); - if ($host->isAbsolute()) { - return $host->getRegistrableDomain(); - } - $base = $host . (($uri->getPort()) ? ':' . $uri->getPort() : ''); - return ($uri->getScheme() ?: 'http') . '://' . $base; - } - protected function findRelative() - { - $uri = Http::createFromString($_SERVER['SCRIPT_NAME']); - $normalized = (new HierarchicalPath($uri->getPath()))->withoutLeadingSlash()->withoutTrailingSlash()->withoutDotSegments()->withoutEmptySegments(); - if ($normalized->getDirname() == '.') { - return ''; - } - return $normalized->getDirname(); - } - - - public function url($path = '', $variables = null) - { - $uri = Http::createFromString($path); - if ($uri->getHost() != $this->root and $uri->getHost() != '') { - return $path; - } - - $uri = \Sabre\Uri\resolve($this->getBaseUrl(), $path); - try { - $host = new Host(Http::createFromString($uri)->getHost()); - } catch (\League\Uri\Exception $e) { - $uri = \Sabre\Uri\resolve($this->getBaseUrl(), '../../') . '/' . basename($path); - $host = new Host(Http::createFromString($uri)->getHost()); - } - - $base = new Host(Http::createFromString($this->root)->getHost()); - if ($host . '' != $base . '') { - $host = new Host(Http::createFromString($this->root)->getHost()); - $page = str_replace($this->root, '', $uri); - $uri = \Sabre\Uri\resolve(Http::createFromString($this->root)->getScheme() . '://' . $host->getRegistrableDomain(). '/', $page); - } - - if ($variables != null) { - $uri = \Sabre\Uri\resolve($uri, '?' . http_build_query($variables)); - } - $uri = \Sabre\Uri\normalize($uri); - - return $uri; - } - protected function getBaseUrl() - { - $url = \Sabre\Uri\normalize(trim($this->root . '/' . $this->relative, '/') . '/'); - return $url; - } -} -?> diff --git a/aldarien/url/composer.json b/aldarien/url/composer.json deleted file mode 100644 index 779ed73..0000000 --- a/aldarien/url/composer.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "name" : "aldarien/url", - "description" : "Get relative path uri", - "type" : "library", - "require" : { - "aldarien/contract" : "*", - "aldarien/root" : "*", - "league/uri": "*", - "league/uri-components": "*", - "sabre/uri": "*" - }, - "require-dev" : { - "phpunit/phpunit" : "*" - }, - "license" : "MIT", - "authors" : [{ - "name" : "Aldarien", - "email" : "jpvial@gmail.com" - } - ], - "autoload" : { - "psr-4" : { - "App\\" : "app" - }, - "files": [ - "app/Helper/functions.php" - ] - } -} diff --git a/aldarien/view/.gitignore b/aldarien/view/.gitignore deleted file mode 100644 index 120b68f..0000000 --- a/aldarien/view/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -composer.phar -/vendor/ - -# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file -# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file -# composer.lock - -.settings -.buildpath -.project diff --git a/aldarien/view/LICENSE b/aldarien/view/LICENSE deleted file mode 100644 index 55dc05a..0000000 --- a/aldarien/view/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2017 Aldarien - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/aldarien/view/README.md b/aldarien/view/README.md deleted file mode 100644 index b888dbd..0000000 --- a/aldarien/view/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# view -View module for my apps diff --git a/aldarien/view/app/Contract/View.php b/aldarien/view/app/Contract/View.php deleted file mode 100644 index 1d0c5b9..0000000 --- a/aldarien/view/app/Contract/View.php +++ /dev/null @@ -1,30 +0,0 @@ - "http://{$remote->getIP()}:8008", - 'headers' => ['Accept' => 'application/json'] - ]))); - return new ViewService(['money' => $money]); - } - public static function show($template, $variables = null) - { - $instance = self::getInstance(); - return $instance->show($template, $variables); - } -} -?> diff --git a/aldarien/view/app/Helper/functions.php b/aldarien/view/app/Helper/functions.php deleted file mode 100644 index ba0e9e1..0000000 --- a/aldarien/view/app/Helper/functions.php +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/aldarien/view/app/Service/View.php b/aldarien/view/app/Service/View.php deleted file mode 100644 index 7217696..0000000 --- a/aldarien/view/app/Service/View.php +++ /dev/null @@ -1,27 +0,0 @@ -views = config('locations.views'); - $this->cache = config('locations.cache'); - - $this->blade = new BladeOne($this->views, $this->cache, null, $variables); - } - public function show($template, $vars = null) - { - if ($vars) { - return $this->blade->run($template, $vars); - } - return $this->blade->run($template); - } -} -?> diff --git a/aldarien/view/cache/26fae499b6e99106ff3bd673b8eb7319ae68e7ae.php b/aldarien/view/cache/26fae499b6e99106ff3bd673b8eb7319ae68e7ae.php deleted file mode 100644 index 8cafca1..0000000 --- a/aldarien/view/cache/26fae499b6e99106ff3bd673b8eb7319ae68e7ae.php +++ /dev/null @@ -1,9 +0,0 @@ - - - - View - - -View test - - \ No newline at end of file diff --git a/aldarien/view/composer.json b/aldarien/view/composer.json deleted file mode 100644 index 5d283ab..0000000 --- a/aldarien/view/composer.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "name": "aldarien/view", - "description": "View module for my apps", - "type": "library", - "require": { - "eftec/bladeone": "*", - "aldarien/contract": "*", - "aldarien/config": "*" - }, - "license": "MIT", - "authors": [ - { - "name": "Aldarien", - "email": "aldarien85@gmail.com" - } - ], - "autoload": { - "psr-4": { - "App\\": "app" - }, - "files": [ - "app/Helper/functions.php" - ] - }, - "require-dev": { - "phpunit/phpunit": "*" - } -} diff --git a/aldarien/view/config/locations.php b/aldarien/view/config/locations.php deleted file mode 100644 index 1dd0425..0000000 --- a/aldarien/view/config/locations.php +++ /dev/null @@ -1,8 +0,0 @@ - root(), - 'cache' => '{locations.base}/cache', - 'resources' => '{locations.base}/resources', - 'views' => '{locations.resources}/views' -]; -?> \ No newline at end of file diff --git a/aldarien/view/phpunit.xml b/aldarien/view/phpunit.xml deleted file mode 100644 index e60ecbd..0000000 --- a/aldarien/view/phpunit.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - ./tests/ - - - - - ./app - - - \ No newline at end of file diff --git a/aldarien/view/public/index.php b/aldarien/view/public/index.php deleted file mode 100644 index 1070f11..0000000 --- a/aldarien/view/public/index.php +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file diff --git a/aldarien/view/resources/views/base.blade.php b/aldarien/view/resources/views/base.blade.php deleted file mode 100644 index 8cafca1..0000000 --- a/aldarien/view/resources/views/base.blade.php +++ /dev/null @@ -1,9 +0,0 @@ - - - - View - - -View test - - \ No newline at end of file diff --git a/aldarien/view/tests/ViewTest.php b/aldarien/view/tests/ViewTest.php deleted file mode 100644 index 85f4aa6..0000000 --- a/aldarien/view/tests/ViewTest.php +++ /dev/null @@ -1,22 +0,0 @@ - - - - View - - -View test - - -DATA; - $this->assertEquals($output, view('base')); - } -} -?> \ No newline at end of file diff --git a/app/Alias/Connection.php b/app/Alias/Connection.php deleted file mode 100644 index 1eea52a..0000000 --- a/app/Alias/Connection.php +++ /dev/null @@ -1,50 +0,0 @@ -connection)) { - $r = 0; - $exception = null; - while ($r < $this->retries) { - try { - $dsn = $this->getDsn(); - $this->connection = new PDO($dsn, $this->username, $this->password); - return $this->connection; - } catch (PDOException $e) { - if ($exception !== null) { - $e = new PDOException($e->getMessage(), $e->getCode(), $exception); - } - $exception = $e; - usleep(500); - } - $r ++; - } - throw $exception; - } - return $this->connection; - } - protected function getDsn(): string - { - $dsn = "mysql:host={$this->host};dbname={$this->database}"; - if (isset($this->port)) { - $dsn .= ";port={$this->port}"; - } - return $dsn; - } -} diff --git a/app/Alias/Excel/Style/Mes.php b/app/Alias/Excel/Style/Mes.php deleted file mode 100644 index 368246b..0000000 --- a/app/Alias/Excel/Style/Mes.php +++ /dev/null @@ -1,18 +0,0 @@ -setNumFormat('mmm-YY'); - $format->setAlign('center'); - } -} diff --git a/app/Alias/Format.php b/app/Alias/Format.php deleted file mode 100644 index f2067aa..0000000 --- a/app/Alias/Format.php +++ /dev/null @@ -1,12 +0,0 @@ - \ No newline at end of file diff --git a/app/Alias/Model.php b/app/Alias/Model.php deleted file mode 100644 index 9f8f579..0000000 --- a/app/Alias/Model.php +++ /dev/null @@ -1,87 +0,0 @@ -id; - $orm = $this->orm; - $ref = new \ReflectionObject($orm); - if (!$ref->hasProperty('_dirty_fields')) { - return; - } - $dirty = $ref->getProperty('_dirty_fields'); - $dirty->setAccessible(true); - $new_values = $dirty->getValue($orm); - $changes = array_combine(array_keys($new_values), array_fill(0, count($new_values), ['old' => '', 'new' => ''])); - if ($this->isNew()) { - $old = (object) array_combine(array_keys($new_values), array_fill(0, count($new_values), '')); - } else { - $old = model(get_called_class())->findOne($this->{$this->getId()}); - } - foreach ($new_values as $column => $value) { - $changes[$column] = ['column' => $column, 'old' => $old->$column, 'new' => $value]; - } - $action = '[' . get_called_class() . ']'; - doLog($user, $action, $changes); - } - public function getId() - { - if (property_exists(get_called_class(), '_id_column')) { - return static::$_id_column; - } - return $this->id; - } - public function save() - { - $ref = new \ReflectionObject($this); - if ($ref->hasProperty('_timestamps')) { - $ref = $ref->getProperty('_timestamps'); - $ref->setAccessible(true); - if ($ref->getValue()) { - if ($this->is_new()) { - $this->setExpr('created_at', 'NOW()'); - } - $this->setExpr('updated_at', 'NOW()'); - } - } - if (!\ORM::getDb()->inTransaction()) { - \ORM::getDb()->beginTransaction(); - } - try { - parent::save(); - if (\ORM::getDb()->inTransaction()) { - \ORM::getDb()->commit(); - } - } catch (\Exception $e) { - if (\ORM::getDb()->inTransaction()) { - \ORM::getDb()->rollBack(); - } - throw $e; - } - $this->log(); - } - public function __call($method, $args) - { - if (!method_exists($this, $method)) { - $str = '' . Stringy::create($method)->underscored(); - if (method_exists($this, $str)) { - return call_user_func_array([$this, $str], $args); - } - throw new \BadMethodCallException($method . ' not found in ' . get_class($this)); - } - return call_user_func_array([$this, $str], $args); - } -} -?> diff --git a/app/Alias/NewEstado.php b/app/Alias/NewEstado.php deleted file mode 100644 index 4bf9089..0000000 --- a/app/Alias/NewEstado.php +++ /dev/null @@ -1,20 +0,0 @@ -fecha, config('app.timezone')); - } -} -?> \ No newline at end of file diff --git a/app/Alias/NewModel.php b/app/Alias/NewModel.php deleted file mode 100644 index 1c513b4..0000000 --- a/app/Alias/NewModel.php +++ /dev/null @@ -1,9 +0,0 @@ - \ No newline at end of file diff --git a/app/Alias/NewTipo.php b/app/Alias/NewTipo.php deleted file mode 100644 index b5fa3fb..0000000 --- a/app/Alias/NewTipo.php +++ /dev/null @@ -1,15 +0,0 @@ - \ No newline at end of file diff --git a/app/Alias/OldModel.php b/app/Alias/OldModel.php deleted file mode 100644 index b3f9730..0000000 --- a/app/Alias/OldModel.php +++ /dev/null @@ -1,8 +0,0 @@ - diff --git a/app/Alias/PHPExcel.php b/app/Alias/PHPExcel.php deleted file mode 100644 index de0ac75..0000000 --- a/app/Alias/PHPExcel.php +++ /dev/null @@ -1,155 +0,0 @@ -name = $name; - $this->filename = $filename; - } - public function addColumns($fields) - { - $columns = []; - foreach ($fields as $i => $field) { - if (is_object($field)) { - if (isset($field->style)) { - $style = $this->getExcelStyle($field->style); - } else { - $style = $this->getExcelStyle(); - } - $column = new ExcelHelper\Column($field->name, $field->name, 10, $style); - } elseif (is_array($field)) { - if (isset($field['style'])) { - $style = $this->getExcelStyle($field['style']); - } else { - $style = $this->getExcelStyle(); - } - $column = new ExcelHelper\Column($field['name'], $field['name'], 10, $style); - } else { - $style = $this->getExcelStyle(); - $column = new ExcelHelper\Column($field, $field, 10, $style); - } - $columns []= $column; - } - $collection = new ExcelHelper\ColumnCollection($columns); - $this->columns = $collection; - } - protected function getExcelStyle($style = 'text') - { - switch (strtolower($style)) { - case 'date': - return new ExcelHelper\CellStyle\Date(); - case 'mes': - return new Excel\Style\Mes(); - case 'currency': - case 'amount': - return new ExcelHelper\CellStyle\Amount(); - case 'number': - case 'integer': - return new ExcelHelper\CellStyle\Integer(); - case 'percent': - case 'percentage': - return new ExcelHelper\CellStyle\Percentage(); - case 'text': - case 'string': - default: - return new ExcelHelper\CellStyle\Text(); - } - } - public function addData($data) - { - if ($this->data == null) { - $this->data = []; - } - $this->data = array_merge($data); - } - public function addRow($rowData) - { - if ($this->data == null) { - $this->data = []; - } - $this->data []= $rowData; - } - public function addTotals($totals) - { - $columns = (array) $this->columns; - $columns = array_pop($columns); - $ts = []; - foreach ($columns as $column) { - $col = $column->getHeading(); - if (isset($totals[$col])) { - $ts[$col] = $this->getTotal($col, $totals[$col]); - continue; - } - $ts[$col] = ''; - } - $this->data []= $ts; - } - protected function getTotal($col, $aggr) - { - $col_num = $this->getColNumber($col); - $col = $this->getColName($col_num); - switch(strtolower($aggr)) { - case 'sum': - $num = 109; - break; - case 'count': - $num = 102; - break; - case 'counta': - $num = 103; - break; - default: - $num = 0; - } - if ($num > 0) { - $end = count($this->data) + 2; - $str = "=SUBTOTAL({$num};{$col}3:{$col}{$end})"; - return $str; - } - return $aggr; - } - protected function getColNumber($col) - { - $columns = (array) $this->columns; - $columns = array_keys(array_pop($columns)); - return array_search($col, $columns); - } - protected function getColName($col_num) - { - $cols = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'; - $N = strlen($cols); - $name = ''; - if ($col_num > $N) { - $name .= $cols[floor($col_num / $N)]; - $col_num = $N * ($col_num / $N - floor($col_num / $N)); - } - $name .= $cols[$col_num]; - return $name; - } - public function informe() - { - header("Content-Type: application/octet-stream; charset=utf-8"); - header('Content-Transfer-Encoding: binary'); - header('Content-Disposition: attachment; filename="' . $this->filename . '"'); - header('Cache-Control: max-age=0'); - - $pE = new ExcelHelper\TableWorkbook('php://output'); - $ws = $pE->addWorksheet($this->name); - - $table = new ExcelHelper\Table($ws, 0, 0, $this->name, new \ArrayIterator($this->data)); - $table->setColumnCollection($this->columns); - - $pE->writeTable($table); - - $pE->close(); - } -} diff --git a/app/Alias/RemoteConnection.php b/app/Alias/RemoteConnection.php deleted file mode 100644 index 475225e..0000000 --- a/app/Alias/RemoteConnection.php +++ /dev/null @@ -1,17 +0,0 @@ -retries - ); - } -} diff --git a/app/Command/Money/Get.php b/app/Command/Money/Get.php deleted file mode 100644 index 0b2efbd..0000000 --- a/app/Command/Money/Get.php +++ /dev/null @@ -1,87 +0,0 @@ -title('Get Money'); - - $dates = $this->getDates(); - foreach ($dates as $date_string => $ids) { - $date = $this->parseDate($date_string); - $response = $this->service->getUF($date); - if ($response->total === 0) { - continue; - } - foreach ($ids as $id) { - $this->queueUpdate($id, $response->uf->value); - } - } - $this->updateUF(); - return Command::SUCCESS; - } - - protected function getDates(): array - { - $query = "SELECT id, fecha FROM pago WHERE uf IS NULL AND fecha BETWEEN 0 AND DATE_ADD(CURDATE(), INTERVAL 9 DAY) ORDER BY fecha"; - $statement = $this->connection->connect()->query($query); - $rows = $statement->fetchAll(PDO::FETCH_ASSOC); - if (count($rows) === 0) { - return []; - } - $dates = []; - foreach ($rows as $row) { - if (!isset($dates[$row['fecha']])) { - $dates[$row['fecha']] = []; - } - $dates[$row['fecha']] []= (int) $row['id']; - } - return $dates; - } - protected function parseDate(string $date_string): DateTimeInterface - { - return new DateTimeImmutable($date_string); - } - protected array $rows; - protected function queueUpdate(int $id, float $value): void - { - $this->rows []= [$value, $id]; - } - protected function updateUF(): void - { - $query = "UPDATE pago SET uf = ? WHERE id = ?"; - $statement = $this->connection->connect()->prepare($query); - foreach ($this->rows as $row) { - $this->connection->connect()->beginTransaction(); - try { - $statement->execute($row); - $this->connection->connect()->commit(); - } catch (PDOException $e) { - $this->connection->connect()->rollBack(); - } - } - } -} diff --git a/app/Command/Money/Lookup.php b/app/Command/Money/Lookup.php deleted file mode 100644 index 0e9ce4d..0000000 --- a/app/Command/Money/Lookup.php +++ /dev/null @@ -1,52 +0,0 @@ -title('Lookup Money'); - - while (true) { - $io->info('Checking pending'); - if ($this->hasPendingMoney()) { - $io->success('Running money get UF'); - $io->note($this->runGetUF()); - } - } - return Command::SUCCESS; - } - - protected function hasPendingMoney(): bool - { - $query = "SELECT 1 FROM pago WHERE uf IS NULL AND fecha BETWEEN 0 AND DATE_ADD(CURDATE(), INTERVAL 9 DAY)"; - $statement = $this->connection->connect()->query($query); - return $statement->rowCount() > 0; - } - protected function runGetUF(): string - { - $command = "/code/bin/console money:uf:get"; - $result = shell_exec($command); - if (!$result or $result === null) { - throw new \Exception(); - } - return $result; - } -} diff --git a/app/Contract/Auth.php b/app/Contract/Auth.php deleted file mode 100644 index fb2e3b6..0000000 --- a/app/Contract/Auth.php +++ /dev/null @@ -1,27 +0,0 @@ - \ No newline at end of file diff --git a/app/Contract/Route.php b/app/Contract/Route.php deleted file mode 100644 index fd4a84c..0000000 --- a/app/Contract/Route.php +++ /dev/null @@ -1,27 +0,0 @@ - \ No newline at end of file diff --git a/app/Controller/API/Unidades.php b/app/Controller/API/Unidades.php deleted file mode 100644 index b7abead..0000000 --- a/app/Controller/API/Unidades.php +++ /dev/null @@ -1,41 +0,0 @@ -findOne($id_proyecto); - if (!$proyecto) { - throw new \InvalidArgumentException('Proyecto identificado por ' . $id_proyecto . ' no existe.'); - } - $unidades = $proyecto->unidades($id_tipo); - $unidades = array_filter($unidades, function($item) { - return !$item->isVendida() and !$item->isReservada(); - }); - $unidades = array_map(function($item) { - return $item->asArray(); - }, $unidades); - usort($unidades, function($a, $b) { - $ap = strpos($a['descripcion'], ' '); - $ad = $a['descripcion']; - if ($ap != false) { - $ad = substr($ad, 0, $ap); - } - $bd = $b['descripcion']; - $bp = strpos($b['descripcion'], ' '); - if ($bp != false) { - $bd = substr($bd, 0, $bp); - } - return strcmp( - str_pad($ad, 4, '0', \STR_PAD_LEFT), - str_pad($bd, 4, '0', \STR_PAD_LEFT) - ); - }); - $output = array_values($unidades); - $response->getBody()->write(\json_encode($output)); - return $response->withHeader('Content-Type', 'application/json'); - } -} diff --git a/app/Controller/Admin.php b/app/Controller/Admin.php deleted file mode 100644 index 137057c..0000000 --- a/app/Controller/Admin.php +++ /dev/null @@ -1,233 +0,0 @@ -list(); - } - public static function listNamespaces() - { - $base = [ - 'Common', - 'Inmobiliaria', - 'Proyecto', - 'Venta' - ]; - $nss = [ - 'Incoviba' => [ - 'old' => $base, - 'new' => $base - ] - ]; - - echo json_encode(['namespaces' => self::collapseMultiArray($nss)]); - } - protected static function collapseMultiArray($array, $level = '') - { - $output = []; - foreach ($array as $key => $subarray) { - if (is_array($subarray)) { - $output = array_merge($output, self::collapseMultiArray($subarray, $level . '\\' . $key)); - } else { - $output []= $level . '\\' . $subarray; - } - } - - return $output; - } - public static function createModel() - { - $db = post('database'); - $ns = post('namespace'); - $table = post('table'); - - $modeler = new DBToModel($db); - echo $modeler->create($ns, $table); - } - public static function list_roles() - { - $roles = \Model::factory(\Incoviba\common\Role::class)->findMany(); - echo view('admin.roles.list', compact('roles')); - } - public static function add_role() - { - echo view('admin.roles.add'); - } - public static function do_add_role() - { - $role = \Model::factory(\Incoviba\common\Role::class)->where('description', post('description'))->findOne(); - if ($role === false) { - $role = \Model::factory(\Incoviba\common\Role::class)->create(['description' => post('description')]); - $role->save(); - } - header('Location: ' . nUrl('admin', 'add_role')); - } - public static function role() - { - $role = \Model::factory(\Incoviba\common\Role::class)->findOne(get('role')); - $actions = model(Action::class)->orderByAsc('description')->findMany(); - $permissions = []; - foreach ($actions as $action) { - $permissions []= (object) ['description' => $action->description, 'status' => false, 'inherited' => false]; - } - array_walk($permissions, function(&$el, $i, $role) { - if ($role->checkAccess($el->description)) { - $el->status = true; - if ($role->isInherited($el->description)) { - $el->inherited = true; - } - } - }, $role); - echo view('admin.roles.show', compact('role', 'permissions')); - } - public static function add_role_permissions() - { - $role = \Model::factory(\Incoviba\common\Role::class)->findOne(get('role')); - $locations = \Model::factory(\Incoviba\common\Location::class)->findMany(); - $actions = model(\Incoviba\common\Action::class)->findMany(); - echo view('admin.roles.add_permissions', compact('role', 'locations', 'actions')); - } - public static function do_add_role_permissions() - { - $role = \Model::factory(\Incoviba\common\Role::class)->findOne(get('role')); - $actions = model(\Incoviba\common\Action::class)->findMany(); - foreach ($actions as $action) { - $p = \Model::factory(\Incoviba\common\Permission::class)->where('type', 2)->where('ext_id', $role->id)->where('action_id', $action->id)->findOne(); - if (array_search($action->id, post('allowed'))) { - if (!$p) { - $data = [ - 'type' => 2, - 'ext_id' => $role->id, - 'action_id' => $action->id - ]; - $p = model(\Incoviba\common\Permission::class)->create($data); - } - $p->status = 1; - } else { - if ($p !== false) { - $p->status = 0; - } - } - if ($p !== false) { - $p->save(); - } - } - header('Location: ' . nUrl('admin', 'role', ['role' => $role->id])); - } - public static function list_users() - { - $users = \Model::factory(\Incoviba\common\User::class)->orderByAsc('name')->findMany(); - echo view('admin.users.list', compact('users')); - } - public static function add_user() - { - echo view('admin.users.add'); - } - public static function do_add_user() - { - $user = \Model::factory(\Incoviba\common\User::class)->where('name', post('name'))->findOne(); - if ($user === false) { - $user = \Model::factory(\Incoviba\common\User::class)->create(); - $user->name = post('name'); - $user->password(post('password')); - - $user->save(); - } - header('Location: ' . url('', ['p' => 'admin', 'a' => 'add_user'])); - } - public static function user() - { - $user = \Model::factory(\Incoviba\common\User::class)->findOne(get('user')); - echo view('admin.users.show', compact('user')); - } - public static function add_user_role() - { - if (get('user') !== false) { - $user = \Model::factory(\Incoviba\common\User::class)->findOne(get('user')); - $roles = \Model::factory(\Incoviba\common\Role::class)->findMany(); - return view('admin.users.add_role', compact('user', 'roles')); - } elseif (get('role') !== false) { - $role = \Model::factory(\Incoviba\common\Role::class)->findOne(get('role')); - $users = \Model::factory(\Incoviba\common\User::class)->findMany(); - return view('admin.roles.add_users', compact('users', 'role')); - } - } - public static function do_add_user_role() - { - if (get('user') !== false) { - $user = \Model::factory(\Incoviba\common\User::class)->findOne(get('user')); - foreach (post('role') as $r_id) { - $role = \Model::factory(\Incoviba\common\Role::class)->findOne($r_id); - - $usrRl = \Model::factory(\Incoviba\common\UserRole::class)->where('user', $user->id)->where('role', $role->id)->findOne(); - if ($usrRl === false) { - $usrRl = \Model::factory(\Incoviba\common\UserRole::class)->create(['user' => $user->id, 'role' => $role->id]); - $usrRl->save(); - } - } - header('Location: ' . url('', ['p' => 'admin', 'a' => 'user', 'user' => $user->id])); - } elseif (get('role') !== false) { - $role = \Model::factory(\Incoviba\common\Role::class)->findOne(get('role')); - foreach (post('users') as $u_id) { - $user = \Model::factory(\Incoviba\common\User::class)->findOne($u_id); - - $usrRl = \Model::factory(\Incoviba\common\UserRole::class)->where('user', $user->id)->where('role', $role->id)->findOne(); - if ($usrRl === false) { - $usrRl = \Model::factory(\Incoviba\common\UserRole::class)->create(['user' => $user->id, 'role' => $role->id]); - $usrRl->save(); - } - } - header('Location: ' . url('', ['p' => 'admin', 'a' => 'role', 'role' => $role->id])); - } - } - public static function remove_user_role() - { - $q = "DELETE FROM user_roles WHERE user = ? AND role = ?"; - $st = \ORM::getDb()->prepare($q); - $st->execute([get('user'), get('role')]); - header('Location: ' . nUrl('admin')); - } - public static function delete_user() - { - $q = "DELETE FROM user_roles WHERE user = ?"; - $st = \ORM::getDb()->prepare($q); - $st->execute([get('user')]); - $q = "DELETE FROM logins WHERE user = ?"; - $st = \ORM::getDb()->prepare($q); - $st->execute([get('user')]); - $q = "DELETE FROM permissions WHERE type = 1 AND ext_id = ?"; - $st = \ORM::getDb()->prepare($q); - $st->execute([get('user')]); - $user = \model(\Incoviba\common\User::class)->findOne(get('user')); - $user->delete(); - header('Location: ' . nUrl('admin', 'list_users')); - } - public static function reset_user() - { - $user = model(\Incoviba\common\User::class)->findOne(get('user')); - $user->password('123456'); - $user->save(); - header('Location: ' . nUrl('admin', 'user', ['user' => $user->id])); - } -} -?> diff --git a/app/Controller/Ajax.php b/app/Controller/Ajax.php deleted file mode 100644 index 912c979..0000000 --- a/app/Controller/Ajax.php +++ /dev/null @@ -1,215 +0,0 @@ -whereNotEqual('nombre', '')->order_by_asc('nombre')->findMany(); - foreach ($bancos as &$banco) { - $banco = $banco->as_array('nombre')['nombre']; - } - return json_encode($bancos); - } - protected static function buscarBanco() - { - $q = get('q'); - if ($q == null) { - $q = get('query'); - if ($q == null) { - return ''; - } - } - $bancos = \Model::factory(\Incoviba\old\Common\Banco::class)->whereLike('nombre', '%' . $q . '%')->order_by_asc('nombre')->findMany(); - foreach ($bancos as &$banco) { - $banco = $banco->as_array('nombre')['nombre']; - } - return json_encode($bancos); - } - public static function comunas() - { - $id = post('region'); - $comunas = \Model::factory(\Incoviba\old\Common\Comuna::class) - ->select('comuna.*') - ->join('provincia', ['provincia.id', '=', 'comuna.provincia']) - ->where('provincia.region', $id) - ->order_by_asc('comuna.descripcion') - ->findMany(); - - foreach ($comunas as &$comuna) { - $comuna = $comuna->as_array('id', 'descripcion'); - } - return json_encode($comunas); - } - public static function propietario() - { - $id = post('rut'); - $propietario = \Model::factory(\Incoviba\old\Venta\Propietario::class)->where('rut', $id)->findOne(); - if ($propietario) { - $propietario = $propietario->as_array(); - return json_encode($propietario); - } - return null; - } - public static function direccion() - { - $id = post('direccion'); - $direccion = \Model::factory(\Incoviba\old\Common\Direccion::class)->findOne($id); - $comuna = $direccion->comuna(); - $provincia = $comuna->provincia(); - $region = $provincia->region(); - $direccion = $direccion->as_array(); - $direccion['comuna'] = $comuna->as_array(); - $direccion['comuna']['provincia'] = $provincia->as_array(); - $direccion['comuna']['provincia']['region'] = $region->as_array(); - return json_encode($direccion); - } - public static function tipo_unidades() - { - $id = post('proyecto'); - $proyecto = \Model::factory(\Incoviba\old\Proyecto\Proyecto::class)->findOne($id); - $tipos = $proyecto->tipoUnidades(); - foreach ($tipos as &$tipo) { - $tipo = $tipo->as_array(); - } - return json_encode($tipos); - } - public static function unidades() - { - $id_proyecto = post('proyecto'); - $id_tipo = post('tipo'); - - $proyecto = model(\Incoviba\old\Proyecto\Proyecto::class)->findOne($id_proyecto); - $unidades = $proyecto->unidadesDisponibles($id_tipo); - foreach ($unidades as &$unidad) { - $tipologia = $unidad->tipologia(); - $unidad = $unidad->as_array(); - $unidad['tipologia'] = $tipologia->as_array(); - if ($tipologia->tipologia()) { - $unidad['tipologia']['tipologia'] = (array) $tipologia->tipologia(); - continue; - } - $unidad['tipologia']['tipologia'] = ['descripcion' => $tipologia->abreviacion]; - } - return json_encode($unidades); - } - public static function unidades_precios() - { - $proyecto = model(\Incoviba\old\Proyecto\Proyecto::class)->findOne(post('proyecto')); - $unidades = $proyecto->unidades(); - usort($unidades, function($a, $b) { - $t = $a->tipo - $b->tipo; - if ($t == 0) { - return (int) $a->descripcion - (int) $b->descripcion; - } - return $t; - }); - $output = []; - foreach ($unidades as $u) { - $info = [ - 'id' => $u->id, - 'abreviacion' => $u->abreviacion, - 'descripcion' => $u->descripcion, - 'valor' => '--' - ]; - if ($u->precio()) { - $info['valor'] = format('ufs', $u->precio()->valor, null, true); - } - $output []= $info; - } - return json_encode($output); - } - public static function operadores() - { - $id_proyecto = post('proyecto'); - $proyecto = \Model::factory(\Incoviba\old\Proyecto\Proyecto::class)->findOne($id_proyecto); - $operadores = $proyecto->operadores(); - foreach ($operadores as &$operador) { - $operador = [ - 'id' => $operador->id, - 'abreviacion' => $operador->abreviacion - ]; - } - return json_encode($operadores); - } - public static function promociones() - { - $id = post('proyecto'); - $proyecto = \Model::factory(\Incoviba\old\Proyecto\Proyecto::class)->findOne($id); - $promociones = $proyecto->promociones(); - foreach ($promociones as &$promocion) { - $promocion = $promocion->as_array(); - } - return json_encode($promociones); - } - public static function nombres() - { - $nss = model(Propietario::class)->select('nombres')->orderByAsc('nombres')->findMany(); - $nombres = []; - foreach ($nss as $n) { - $ns = explode(' ', $n->nombres); - foreach ($ns as $nombre) { - $nombres []= $nombre; - } - } - $nombres = array_values(array_unique($nombres)); - return json_encode($nombres); - } - public static function apellidos() - { - $aps = model(Propietario::class)->select('apellido_paterno')->orderByAsc('apellido_paterno')->findMany(); - $apellidos = []; - foreach ($aps as $ap) { - $apellidos []= $ap->apellido_paterno; - } - $aps = model(Propietario::class)->select('apellido_materno')->orderByAsc('apellido_materno')->findMany(); - foreach ($aps as $ap) { - $apellidos []= $ap->apellido_paterno; - } - $apellidos = array_values(array_unique($apellidos)); - sort($apellidos); - return json_encode($apellidos); - } - public static function calles() - { - $results = model(Direccion::class)->select('calle')->orderByAsc('calle')->findMany(); - $calles = []; - foreach ($results as $result) { - $calles []= $result->calle; - } - $calles = array_values(array_unique($calles)); - return json_encode($calles); - } - public static function inmobiliarias() - { - $q = post('rut'); - $inmobiliaria = model(Inmobiliaria::class)->findOne($q); - return json_encode($inmobiliaria->as_array()); - } -} -?> diff --git a/app/Controller/Auth.php b/app/Controller/Auth.php deleted file mode 100644 index c7ca497..0000000 --- a/app/Controller/Auth.php +++ /dev/null @@ -1,56 +0,0 @@ - 'auth', 'a' => 'login'])); - } - } - public static function logout() - { - sAuth::logout(); - header('Location: .'); - } - public static function check_pass() - { - if (\password_verify(post('password'), sAuth::User()->password)) { - return 'OK'; - } - return 'KO'; - } - public static function change_pass() - { - return view('auth.change_pass'); - } - public static function do_change_pass() - { - if (\password_verify(post('old'), sAuth::User()->password)) { - if (post('new') == post('new2')) { - $user = sAuth::User(); - $user->password(post('new')); - $user->save(); - header('Location: .'); - die(); - } - } - header('Location: ' . url('', ['p' => 'auth', 'a' => 'change_pass'])); - } -} -?> diff --git a/app/Controller/Bonos.php b/app/Controller/Bonos.php deleted file mode 100644 index 32daaa5..0000000 --- a/app/Controller/Bonos.php +++ /dev/null @@ -1,67 +0,0 @@ -findOne($id_venta); - return view('ventas.bonos.add', compact('venta')); - } - public static function do_add() - { - $id_venta = get('venta'); - $venta = model(Venta::class)->findOne($id_venta); - if ($venta->bono_pie != 0) { - header('Location: ' . nUrl('ventas', 'show', ['venta' => $venta->id])); - return; - } - $uf = uf($venta->fecha()); - $valor = post('valor'); - $data = [ - 'fecha' => $venta->fecha, - 'valor' => $valor * $uf->uf->value, - 'tipo' => 8, - 'uf' => $uf->uf->value - ]; - $pago = model(Pago::class)->create($data); - $pago->save(); - $data = [ - 'valor' => $valor, - 'pago' => $pago->id - ]; - $bono = model(BonoPie::class)->create($data); - $bono->save(); - $venta->bono_pie = $bono->id; - $venta->save(); - header('Location: ' . nUrl('ventas', 'show', ['venta' => $venta->id])); - } - public static function edit() - { - $id_venta = get('venta'); - $venta = model(Venta::class)->findOne($id_venta); - return view('ventas.bonos.edit', compact('venta')); - } - public static function do_edit() - { - $id_venta = get('venta'); - $venta = model(Venta::class)->findOne($id_venta); - $bono = $venta->bonoPie(); - $valor = post('valor') * $bono->pago()->uf(); - $pago = $bono->pago(); - if ($valor != $bono->pago()->valor()) { - $pago->valor = $valor; - $pago->save(); - } - header('Location: ' . nUrl('ventas', 'show', ['venta' => $venta->id])); - exit(); - } -} diff --git a/app/Controller/Buscar.php b/app/Controller/Buscar.php deleted file mode 100644 index ef62a9e..0000000 --- a/app/Controller/Buscar.php +++ /dev/null @@ -1,340 +0,0 @@ - $results]); - } - protected static function getResults() - { - $q = get('q'); - if ($q == null) { - $q = get('query'); - } - $t = get('t'); - if ($t == null) { - $t = get('tipo'); - } - $t = urldecode($t); - if ($t == null) { - $t = 'cualquiera'; - } - - $results = null; - if ($q != null) { - $q = urldecode($q); - $results = self::buscar($q, $t); - } - return $results; - } - public static function buscar($query, $tipo) - { - $method = 'buscar' . str_replace(' ', '', ucwords($tipo)); - if (is_callable(['self', $method])) { - $results = self::$method(self::prepareQuery($query)); - $results = self::removeDuplicates($results); - $results = self::sort($results); - return $results; - } - return []; - } - protected static function prepareQuery($query) - { - $query = str_replace('"', '"', $query); - $data = explode(' ', $query); - $regex = "~(?=\\S)[^'\"\\s]*(?:'[^']*'[^'\"\\s]*|\"[^\"]*\"[^'\"\\s]*)*~"; - preg_match_all($regex, $query, $data); - $data = $data[0]; - foreach ($data as &$l) { - $l = str_replace('"', '', str_replace("'", '', $l)); - } - if (is_array($data) and count($data) == 1) { - $data = $data[0]; - } - return $data; - } - protected static function removeDuplicates($results) - { - $output = []; - foreach ($results as $result) { - if (array_search($result, $output) === false) { - $output []= $result; - } - } - return $output; - } - protected static function sort($results) - { - usort($results, function($a, $b) { - $py = strcmp($a->proyecto()->descripcion, $b->proyecto()->descripcion); - if ($py == 0) { - if (!method_exists($a, 'unidad') and !method_exists($b, 'unidad')) { - return $a->descripcion - $b->descripcion; - } - if (!method_exists($a, 'unidad')) { - return $a->descripcion - $b->unidad()->descripcion; - } - if (!method_exists($b, 'unidad')) { - return $a->unidad()->descripcion - $b->descripcion; - } - - $u = $a->unidad()->descripcion - $b->unidad()->descripcion; - if ($u == 0) { - return strcmp($a->propietario()->apellido_paterno, $b->propietario()->apellido_paterno); - } - return $u; - } - return $py; - }); - return $results; - } - protected static function buscarCualquiera($query) - { - $results = []; - foreach (self::$tipos as $tipo) { - if ($tipo == 'cualquiera') { - continue; - } - $method = 'buscar' . str_replace(' ', '', ucwords($tipo)); - - if (is_callable(['self', $method])) { - $results = array_merge($results, self::$method($query)); - } - } - return $results; - } - protected static function buscarDepartamento($query) - { - if (is_array($query)) { - $results = []; - foreach ($query as $segment) { - $results = array_merge($results, self::buscarDepartamento($segment)); - } - } else { - $results = \Model::factory(Venta::class) - ->select('venta.*') - ->join('propiedad', ['propiedad.id', '=', 'venta.propiedad']) - ->join('unidad', ['unidad.id', '=', 'propiedad.unidad_principal']) - ->whereLike('unidad.descripcion', '%' . $query . '%') - ->findMany(); - } - return $results; - } - protected static function buscarEstacionamiento($query) - { - if (is_array($query)) { - $results = []; - foreach ($query as $segment) { - $results = array_merge($results, self::buscarEstacionamiento($segment)); - } - } else { - $results = \Model::factory(Venta::class) - ->select('venta.*') - ->join('propiedad', ['propiedad.id', '=', 'venta.propiedad']) - ->join('unidad', "`propiedad`.`estacionamientos` LIKE `unidad`.`id` OR `propiedad`.`estacionamientos` LIKE CONCAT('%;', `unidad`.`id`) OR `propiedad`.`estacionamientos` LIKE CONCAT(`unidad`.`id`, ';%') OR `propiedad`.`estacionamientos` LIKE CONCAT('%;', `unidad`.`id`, ';%')") - ->where('unidad.descripcion', $query) - ->findMany(); - } - return $results; - } - protected static function buscarBodega($query) - { - if (is_array($query)) { - $results = []; - foreach ($query as $segment) { - $results = array_merge($results, self::buscarBodega($segment)); - } - } else { - $results = \Model::factory(Venta::class) - ->select('venta.*') - ->join('propiedad', ['propiedad.id', '=', 'venta.propiedad']) - ->join('unidad', "`propiedad`.`bodegas` LIKE `unidad`.`id` OR `propiedad`.`bodegas` LIKE CONCAT('%;', `unidad`.`id`) OR `propiedad`.`bodegas` LIKE CONCAT(`unidad`.`id`, ';%') OR `propiedad`.`bodegas` LIKE CONCAT('%;', `unidad`.`id`, ';%')") - ->where('unidad.descripcion', $query) - ->findMany(); - } - return $results; - } - protected static function buscarPropietario($query) - { - if (is_array($query)) { - $results = []; - foreach ($query as $segment) { - $results = array_merge($results, self::buscarPropietario($segment)); - } - } else { - $results = self::buscarPropietarioNombres($query); - $results = array_merge($results, self::buscarPropietarioApellido($query)); - $results = array_merge($results, self::buscarPropietarioNombreCompleto($query)); - } - return $results; - } - protected static function buscarPropietarioNombres($query) - { - $results = \Model::factory(Venta::class) - ->select('venta.*') - ->join('propietario', ['propietario.rut', '=', 'venta.propietario']) - ->whereLike('propietario.nombres', '%' . $query . '%') - ->findMany(); - return $results; - } - protected static function buscarPropietarioApellido($query) - { - $results = \Model::factory(Venta::class) - ->select('venta.*') - ->join('propietario', ['propietario.rut', '=', 'venta.propietario']) - ->whereAnyIs([ - ['propietario.apellido_paterno' => '%' . $query . '%'], - ['propietario.apellido_materno' => '%' . $query . '%'] - ], 'LIKE') - ->findMany(); - return $results; - } - protected static function buscarPropietarioNombreCompleto($query) - { - $results = \Model::factory(Venta::class) - ->select('venta.*') - ->join('propietario', ['propietario.rut', '=', 'venta.propietario']) - ->whereRaw("CONCAT_WS(' ', propietario.nombres, propietario.apellido_paterno, propietario.apellido_materno) LIKE '%" . $query . "%'") - ->findMany(); - return $results; - } - protected static function buscarPrecioVenta($query) - { - if (is_array($query)) { - $results = []; - foreach ($query as $segment) { - $results = array_merge($results, self::buscarPrecioVenta($segment)); - } - } else { - $query = str_replace([',', '.'], ['.', ''], $query); - $results = \Model::factory(Venta::class)->where('valor_uf', $query)->findMany(); - } - return $results; - } - protected static function buscarProyecto($query) - { - if (is_array($query)) { - $results = []; - foreach ($query as $segment) { - $results = array_merge($results, self::buscarProyecto($segment)); - } - } else { - $results = model(Venta::class) - ->select('venta.*') - ->join('propiedad', ['propiedad.id', '=', 'venta.propiedad']) - ->join('unidad', ['unidad.id', '=', 'propiedad.unidad_principal']) - ->join('proyecto', ['proyecto.id', '=', 'unidad.proyecto']) - ->whereLike('proyecto.descripcion', '%' . $query . '%') - ->findMany(); - } - return $results; - } - protected static function buscarPago($query) - { - if (is_array($query)) { - $results = []; - foreach ($query as $segment) { - $results = array_merge($results, self::buscarPrecioVenta($segment)); - } - } else { - $query = str_replace(',', '.', str_replace('.', '', $query)); - $query2 = (float) $query; - if ($query != $query2) { - return []; - } - if (!is_float($query2)) { - return []; - } - $query = $query2; - $results = self::buscarValorCuota($query); - $results = array_merge($results, self::buscarReajuste($query)); - $results = array_merge($results, self::buscarEscritura($query)); - $results = array_merge($results, self::buscarSubsidio($query)); - $results = array_merge($results, self::buscarCredito($query)); - } - return $results; - } - protected static function buscarValorCuota($query) - { - $results = \Model::factory(Venta::class) - ->select('venta.*') - ->join('cuota', ['cuota.pie', '=', 'venta.pie']) - ->join('pago', ['pago.id', '=', 'cuota.pago']) - ->whereRaw("`pago`.`valor` = " . $query . " OR `pago`.`valor` / `pago`.`uf` = " . $query) - ->findMany(); - return $results; - } - protected static function buscarReajuste($query) - { - $results = \Model::factory(Venta::class) - ->select('venta.*') - ->join('pie', ['pie.id', '=', 'venta.pie']) - ->join('pago', ['pago.id', '=', 'pie.reajuste']) - ->whereRaw("`pago`.`valor` = " . $query . " OR `pago`.`valor` / `pago`.`uf` = " . $query) - ->findMany(); - return $results; - } - protected static function buscarEscritura($query) - { - $results = \Model::factory(Venta::class) - ->select('venta.*') - ->join('escritura', ['escritura.id', '=', 'venta.escritura']) - ->join('pago', ['pago.id', '=', 'escritura.pago']) - ->whereRaw("`pago`.`valor` = " . $query . " OR `pago`.`valor` / `pago`.`uf` = " . $query) - ->findMany(); - return $results; - } - protected static function buscarSubsidio($query) - { - $results = \Model::factory(Venta::class) - ->select('venta.*') - ->join('subsidio', ['subsidio.id', '=', 'venta.subsidio']) - ->join('pago', ['pago.id', '=', 'subsidio.pago']) - ->whereRaw("`pago`.`valor` = " . $query . " OR `pago`.`valor` / `pago`.`uf` = " . $query) - ->findMany(); - return $results; - } - protected static function buscarCredito($query) - { - $results = \Model::factory(Venta::class) - ->select('venta.*') - ->join('credito', ['credito.id', '=', 'venta.credito']) - ->join('pago', ['pago.id', '=', 'credito.pago']) - ->whereRaw("`pago`.`valor` = " . $query . " OR `pago`.`valor` / `pago`.`uf` = " . $query) - ->findMany(); - return $results; - } - protected static function buscarUnidad($query) - { - if (is_array($query)) { - $results = []; - foreach ($query as $segment) { - $results = array_merge($results, self::buscarUnidad($segment)); - } - } else { - $results = model(Unidad::class)->where('descripcion', $query)->findMany(); - foreach ($results as $i => $u) { - if ($u->venta()) { - unset($results[$i]); - } - } - } - return $results; - } -} -?> diff --git a/app/Controller/Cierres.php b/app/Controller/Cierres.php deleted file mode 100644 index 46a76b9..0000000 --- a/app/Controller/Cierres.php +++ /dev/null @@ -1,428 +0,0 @@ -select('proyecto.*') - ->join('estado_proyecto', ['estado.proyecto', '=', 'proyecto.id'], 'estado') - ->join('tipo_estado_proyecto', ['tipo.id', '=', 'estado.estado'], 'tipo') - ->join('etapa_proyecto', ['etapa.id', '=', 'tipo.etapa'], 'etapa') - ->whereGte('etapa.orden', 3) - ->orderByAsc('proyecto.descripcion') - ->groupBy('proyecto.id') - ->findMany(); - $regiones = model(Region::class)->order_by_asc('numeracion')->findMany(); - return view('ventas.cierres.add', compact('proyectos', 'regiones')); - } - public static function agregar() - { - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $id_proyecto = post('proyecto'); - $proyecto = model(Proyecto::class)->findOne($id_proyecto); - $id_agente = post('agente'); - $agente = model(Agente::class)->findOne($id_agente); - - $direccion = model(Direccion::class) - ->where('calle', post('calle')) - ->where('numero', post('numero')) - ->where('extra', post('extra')) - ->where('comuna', post('comuna')) - ->findOne(); - if (!$direccion) { - $data = [ - 'calle' => post('calle'), - 'numero' => post('numero'), - 'extra' => post('extra'), - 'comuna' => post('comuna') - ]; - $direccion = model(Direccion::class)->create($data); - $direccion->save(); - } - - list($rut, $dv) = explode('-', str_replace('.', '', post('rut'))); - $propietario = model(Propietario::class)->findOne($rut); - if (!$propietario) { - $data = [ - 'rut' => $rut, - 'dv' => $dv, - 'nombres' => trim(post('nombres')), - 'apellido_paterno' => post('paterno'), - 'apellido_materno' => post('materno'), - 'sexo' => post('sexo'), - 'estado_civil' => post('estado_civil'), - 'profesion' => post('profesion'), - 'direccion' => $direccion->id, - 'telefono' => post('codigo_telefono') . post('telefono'), - 'email' => post('email') . '@' . post('email_domain'), - 'representante' => 0, - 'otro' => 0 - ]; - $propietario = model(Propietario::class)->create($data); - $propietario->save(); - } - - $unis = json_decode(post('unidades')); - $id_principal = array_shift($unis); - $unidad = model(Unidad::class)->findOne(post('unidad' . $id_principal)); - $u = model(U::class)->findOne($unidad->id); - if (!$u) { - $unidad->save(); - } - $data = [ - 'unidad_id' => $unidad->id - ]; - $reserva = model(Reserva::class)->create($data); - $reserva->save(); - foreach ($unis as $id_unidad) { - $unidad = model(Unidad::class)->findOne(post('unidad' . $id_unidad)); - $data = [ - 'reserva_id' => $reserva->id, - 'unidad_id' => $unidad->id - ]; - $ur = model(UnidadReserva::class)->create($data); - $ur->save(); - } - - $data = [ - 'proyecto_id' => $proyecto->id, - 'agente_id' => $agente->id, - 'propietario_rut' => $propietario->rut, - 'reserva_id' => $reserva->id, - 'fecha' => $f->format('Y-m-d'), - 'valor' => correctNumber(post('valor')), - 'pie' => correctNumber(post('pie')), - 'credito' => correctNumber(post('credito')), - 'estado' => 1 - ]; - $cierre = model(Cierre::class)->create($data); - $cierre->save(); - header('Location: ' . url('', ['p' => 'cierres', 'a' => 'list'])); - } - public static function list() - { - $proyectos = Cierre::proyectos(); - - return view('ventas.cierres.list', compact('proyectos')); - } - public static function show() - { - $id = get('cierre'); - $cierre = model(Cierre::class)->findOne($id); - - return view('ventas.cierres.show', compact('cierre')); - } - public static function guardar() - { - $proyecto = \model(Proyecto::class)->findOne(post('proyecto')); - $fecha = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $unidad = \model(Unidad::class)->findOne(post('departamento')); - $relacionado = (post('relacionado') === true) ? true : false; - $subrelacionado = (post('subrelacionado') === true) ? true : false; - $precio = (float) post('precio') ?: 0; - $input = [ - 'proyecto' => $proyecto, - 'fecha' => $fecha, - 'departamento' => $unidad, - 'precio' => $precio, - 'relacionado' => $relacionado, - 'subrelacionado' => $subrelacionado, - 'unidades' => [], - 'pie' => (float) post('pie') - ]; - $ebs = 0; - if (post('unidades') != '') { - $unidades = json_decode(html_entity_decode(post('unidades')), true); - foreach ($unidades as $un) { - $u = \model(Unidad::class)->findOne($un); - $input['unidades'] []= $u; - if ($u->precio($fecha) !== false) { - $ebs += $u->precio($fecha)->valor; - } - } - } - $promo = 0; - if (post('promocion') != null) { - $promo = (float) post('promocion'); - $input['promocion'] = $promo; - } - $bono = 0; - if (post('bono') != null) { - $bono = (float) post('bono'); - $input['bono'] = $bono; - } - $operador = 0; - if (post('operador') != null) { - $operador = ($precio - $bono - $promo) * (float) post('operador') / 100; - $input['operador'] = $operador; - } - - $cierre = Cierre::find($proyecto, $unidad, $precio)->findOne(); - if ($cierre === false) { - $cierre = model(Cierre::class)->create(); - $cierre->guardar((object) $input); - } - $output = ['status' => 'ok', 'cierre' => $cierre->asArray()]; - return json_encode($output); - } - public static function aprobar() - { - $fecha = Carbon::today(config('app.timezone')); - $cierre = model(Cierre::class)->findOne(post('cierre')); - if ($cierre->estado()->tipo()->descripcion == "revisado" or $cierre->estado()->tipo()->descripcion == "rechazado") { - $cierre->aprobar($fecha); - return json_encode(['estado' => 'aprobado']); - } - return json_encode(['estado' => 'no vigente']); - } - public static function rechazar() - { - $fecha = Carbon::today(config('app.timezone')); - $cierre = model(Cierre::class)->findOne(post('cierre')); - if ($cierre->estado()->tipo()->vigente == 1) { - $cierre->rechazar($fecha); - return json_encode(['estado' => 'rechazado']); - } - return json_encode(['estado' => 'no vigente']); - } - public static function abandonar() - { - $id = get('cierre'); - $cierre = model(Cierre::class)->findOne($id); - $tipo = model(TipoEstadoCierre::class)->where('descripcion', 'abandonado')->findOne(); - $today = Carbon::today(config('app.timezone')); - $data = [ - 'cierre' => $cierre->id, - 'tipo' => $tipo->id, - 'fecha' => $today->format('Y-m-d') - ]; - $estado = model(EstadoCierre::class)->create($data); - $estado->save(); - header('Location: ' . url('', ['p' => 'cierres', 'a' => 'list'])); - } - public static function promesar() - { - $id = get('cierre'); - $cierre = model(Cierre::class)->findOne($id); - $tipo = model(TipoEstadoCierre::class)->where('descripcion', 'promesado')->findOne(); - $today = Carbon::today(config('app.timezone')); - $data = [ - 'cierre' => $cierre->id, - 'tipo' => $tipo->id, - 'fecha' => $today->format('Y-m-d') - ]; - $estado = model(EstadoCierre::class)->create($data); - $estado->save(); - header('Location: ' . url('', ['p' => 'cierres', 'a' => 'show', 'cierre' => $cierre->id])); - } - public static function borrador() - { - $id = get('cierre'); - $cierre = model(Cierre::class)->findOne($id); - - $borrador = new Borrador($cierre); - d($borrador->show()); - $borrador->create(); - } - public static function evalue() - { - $proyectos = \model(Proyecto::class)->orderByAsc('descripcion')->findMany(); - return view('ventas.cierres.evaluar', ['proyectos' => $proyectos, 'locations' => config('locations')]); - } - public static function evaluar() - { - $proyecto = \model(Proyecto::class)->findOne(post('proyecto')); - $fecha = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $unidad = \model(Unidad::class)->findOne(post('departamento')); - $relacionado = (post('relacionado') === 'true') ? true : false; - $subrelacionado = (post('subrelacionado') === 'true') ? true : false; - $precio = (float) post('precio') ?: 0; - $neto = $precio; - $ebs = 0; - if (post('unidades') != '') { - $unidades = json_decode(html_entity_decode(post('unidades')), true); - foreach ($unidades as $un) { - $u = \model(Unidad::class)->findOne($un); - if ($u->precio($fecha) !== false) { - $ebs += $u->precio($fecha)->valor; - } - } - } - $promocion = 0; - if (post('promocion') != null) { - $promocion = (float) post('promocion'); - } - $bono = 0; - if (post('bono') != null) { - $bono = (float) post('bono'); - } - $operador = 0; - if (post('operador') != null) { - $operador = ($precio - $bono - $promocion) * (float) post('operador') / 100; - } - $rel = 0; - if ($relacionado) { - $rel = ($unidad->precio($fecha)->valor) * 6 / 100; - } - if ($subrelacionado) { - $rel = ($unidad->precio($fecha)->valor) * 3 / 100; - } - $neto = $precio - $bono - $promocion - $operador - $ebs; - - $output = [ - 'unidad' => [ - 'tipo' => [ - 'nombre' => $unidad->tipologia()->nombre, - 'tipologia' => $unidad->tipologia()->tipologia()->descripcion - ], - 'superficie' => format('m2', $unidad->m2()) . ' m²' - ], - 'oferta' => [ - 'bruto' => format('ufs', $precio, null, true), - 'neto' => format('ufs', $neto, null, true), - 'uf_m2' => format('ufs', $neto / $unidad->m2('vendible'), null, true) . '/m²', - 'fecha' => format('shortDate', $unidad->precio($fecha)->inicio()->fecha()) - ], - 'lista' => [ - 'precio' => format('ufs', $unidad->precio($fecha)->valor, null, true), - 'uf_m2' => format('ufs', $unidad->precio($fecha)->valor / $unidad->m2('vendible'), null, true) . '/m²' - ], - 'precios' => [ - 'bruto' => format('ufs', $precio, null, true), - 'neto' => format('ufs', $neto, null, true), - 'departamento' => format('ufs', $unidad->precio($fecha)->valor, null, true), - 'relacionado' => format('ufs', $unidad->precio($fecha)->valor - $rel, null, true), - 'fecha' => format('shortDate', $unidad->precio($fecha)->inicio()->fecha()) - ], - 'uf_m2' => [ - 'neto' => format('ufs', $neto / $unidad->m2('vendible'), null, true) . '/m²', - 'departamento' => format('ufs', $unidad->precio($fecha)->valor / $unidad->m2('vendible'), null, true) . '/m²', - 'relacionado' => format('ufs', ($unidad->precio($fecha)->valor - $rel) / $unidad->m2('vendible'), null, true) . '/²' - ], - 'evaluacion' => Cierre::evaluar($neto, $unidad, $fecha, $rel), - 'estado' => ['id' => 0, 'descripcion' => 'no existe'] - ]; - if ($rel > 0) { - $output ['relacionado'] = [ - 'precio' => format('ufs', $unidad->precio($fecha)->valor - $rel, null, true), - 'uf_m2' => format('ufs', ($unidad->precio($fecha)->valor - $rel) / $unidad->m2('vendible'), null, true) . '/²' - ]; - } - $estado = Cierre::find($proyecto, $unidad, $precio)->findOne(); - if ($estado) { - $output['estado'] = [ - 'id' => $estado->estado()->tipo()->id, - 'cierre' => $estado->id, - 'descripcion' => $estado->estado()->tipo()->descripcion, - 'fecha' => format('shortDate', $estado->estado()->fecha) - ]; - } - - return json_encode($output); - } - public static function edit() - { - $cierre = model(Cierre::class)->findOne(get('cierre')); - $proyectos = model(Proyecto::class)->findMany(); - $regiones = model(Region::class)->findMany(); - $valores = model(TipoValorCierre::class)->findMany(); - return view('ventas.cierres.edit', compact('cierre', 'proyectos', 'regiones', 'valores')); - } - public static function do_edit() - { - $cierre = model(Cierre::class)->findOne(get('cierre')); - - $data = [ - 'calle' => post('calle'), - 'numero' => post('numero'), - 'extra' => post('extra'), - 'comuna' => post('comuna') - ]; - $direccion = (new Factory(Direccion::class))->where($data)->find(); - if (!$direccion) { - $direccion = model(Direccion::class)->create($data); - $direccion->save(); - } - if (post('rut') != '') { - $data = [ - 'rut' => explode('-', str_replace('.', '', post('rut')))[0], - ]; - $propietario = (new Factory(Propietario::class))->where($data)->find(); - if (!$propietario) { - $data = array_merge($data, [ - 'nombres' => post('nombres'), - 'apellido_paterno' => post('paterno'), - 'apellido_materno' => post('materno'), - 'dv' => (post('rut')) ? explode('-', str_replace('.', '', post('rut')))[1] : '', - 'sexo' => post('sexo'), - 'estado_civil' => post('estado_civil'), - 'profesion' => post('profesion'), - 'telefono' => post('codigo_telefono') . post('telefono'), - 'email' => post('email') . '@' . post('email_domain'), - 'direccion' => $direccion->id - ]); - $propietario = model(Propietario::class)->create($data); - $propietario->save(); - } - } - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $data = [ - 'proyecto' => post('proyecto'), - 'precio' => post('precio'), - 'fecha' => $f->format('Y-m-d'), - 'relacionado' => (post('relacionado')) ? 1 : 0, - 'propietario' => (isset($propietario) and $propietario) ? $propietario->rut : 0 - ]; - foreach ($data as $field => $value) { - if ($value != $cierre->$field) { - $cierre->$field = $value; - } - } - $cierre->save(); - - $valores = model(TipoValorCierre::class)->findMany(); - foreach ($valores as $valor) { - if (post($valor->descripcion) == '') { - continue; - } - if ($cierre->valor($valor->descripcion)) { - if ($cierre->valor($valor->descripcion)->valor != post($valor->descripcion)) { - $v = $cierre->valor($valor->descripcion); - $v->valor = post($valor->descripcion); - $v->save(); - } - continue; - } - $data = [ - 'tipo' => $valor->descripcion, - 'valor' => post($valor->descripcion) - ]; - $cierre->addValor($data); - } - header('Location: ' . nUrl('cierres', 'show', ['cierre' => $cierre->id])); - } -} -?> diff --git a/app/Controller/Comentarios.php b/app/Controller/Comentarios.php deleted file mode 100644 index 494fcc6..0000000 --- a/app/Controller/Comentarios.php +++ /dev/null @@ -1,39 +0,0 @@ -findOne(get('venta')); - echo view('ventas.comentarios.add', compact('venta')); - } - public static function agregar() - { - $venta = \Model::factory(\Incoviba\old\Venta\Venta::class)->findOne(get('venta')); - if ($venta === false) { - throw new Exception('Venta no existe.'); - } - $data = [ - 'venta' => $venta->id, - 'fecha' => \Carbon\Carbon::now(config('app.timezone'))->format('Y-m-d H:i:s'), - 'texto' => post('comentario') - ]; - $comentario = \Model::factory(\Incoviba\old\Venta\Comentario::class)->create($data); - $comentario->save(); - header('Location: ' . nUrl('ventas', 'show', ['venta' => $venta->id])); - } - public static function delete() - { - $comentario = \Model::factory(\Incoviba\old\Venta\Comentario::class)->findOne(get('comentario')); - $venta = $comentario->venta(); - $comentario->estado = 0; - $comentario->save(); - header('Location: ' . nUrl('ventas', 'show', ['venta' => $venta->id])); - } -} -?> diff --git a/app/Controller/Contabilidad.php b/app/Controller/Contabilidad.php deleted file mode 100644 index 4b19a77..0000000 --- a/app/Controller/Contabilidad.php +++ /dev/null @@ -1,100 +0,0 @@ -orderByAsc('descripcion')->findMany(); - foreach ($proyectos as &$proyecto) { - $arr = $proyecto->asArray(); - $arr['direccion'] = $proyecto->direccion()->asArray(); - $arr['direccion']['comuna'] = $proyecto->direccion()->comuna()->asArray(); - $arr['inmobiliaria'] = $proyecto->inmobiliaria()->asArray(); - $proyecto = $arr; - } - return json_encode(compact('proyectos')); - } - public static function get_fechas() { - $id_proyecto = get('proyecto'); - $proyecto = model(Proyecto::class)->findOne($id_proyecto); - $cuotas = []; - foreach ($proyecto->ventas() as $venta) { - $cs = $venta->pie()->cuotas(); - $cuotas = array_merge($cs, array_filter($cs, function($item) { - $tipo = $item->pago()->estado()->tipo(); - return ($tipo == 'depositado' or $tipo == 'abonado'); - })); - } - $fechas = array_map(function($item) { - return [ - 'timestamp' => $item->pago()->estado()->fecha()->timestamp, - 'short' => $item->pago()->estado()->fecha()->format('Y-m-d'), - 'long' => $item->pago()->estado()->fecha()->format('d / m / Y') - ]; - }, $cuotas); - usort($fechas, function($a, $b) { - return $b['timestamp'] - $a['timestamp']; - }); - return json_encode(compact('fechas')); - } - public static function get_pagos_fechas() { - $id_proyecto = get('proyecto'); - $fecha = Carbon::parse(get('fecha')); - $proyecto = model(Proyecto::class)->findOne($id_proyecto); - $pagos = []; - foreach ($proyecto->ventas() as $venta) { - foreach ($venta->pie()->cuotas() as $cuota) { - if ($cuota->pago()->estado()->fecha() == $fecha) { - $pagos []= [ - 'Departamento' => $venta->propiedad()->unidad()->descripcion, - 'Valor' => [ - 'UF' => $cuota->pago()->valor('ufs'), - 'Pesos' => $cuota->pago()->valor() - ], - 'Numero' => $cuota->numero(), - 'Total' => $venta->pie()->cuotas - ]; - break; - } - } - } - return json_encode(compact('pagos')); - } - public static function pagos_fecha() { - $fecha = Carbon::now(); - return view('contabilidad.pagos', compact('fecha')); - } - public static function show_pagos() { - $id_proyecto = get('proyecto'); - $fecha = Carbon::parse(get('fecha')); - $proyecto = model(Proyecto::class)->findOne($id_proyecto); - $pagos = []; - foreach ($proyecto->ventas() as $venta) { - foreach ($venta->pie()->cuotas() as $cuota) { - if ($cuota->pago()->estado()->fecha() == $fecha) { - $pagos []= (object) [ - 'Departamento' => $venta->propiedad()->unidad()->descripcion, - 'Valor' => (object) [ - 'UF' => $cuota->pago()->valor('ufs'), - 'Pesos' => $cuota->pago()->valor() - ], - 'Numero' => $cuota->numero(), - 'Total' => $venta->pie()->cuotas - ]; - break; - } - } - } - return view('contabilidad.pago', compact('proyecto', 'fecha', 'pagos')); - } -} diff --git a/app/Controller/Creditos.php b/app/Controller/Creditos.php deleted file mode 100644 index 60a72da..0000000 --- a/app/Controller/Creditos.php +++ /dev/null @@ -1,207 +0,0 @@ -findOne($id); - return view('ventas.creditos.add', compact('venta')); - } - public static function agregado() - { - $id = get('venta'); - if ($id == null) { - header('Location: .'); - } - $venta = \Model::factory(Venta::class)->findOne($id); - - $banco = \Model::factory(Banco::class)->where('nombre', post('banco'))->findOne(); - $f = Carbon::createFromDate(post('y'), post('m'), post('d'), config('app.timezone')); - $uf = uf($f); - - $pago = \Model::factory(Pago::class)->create(); - $pago->banco = $banco->id; - $pago->fecha = $f->format('Y-m-d'); - $pago->uf = $uf->uf->value; - $pago->valor = post('valor') * $pago->uf; - $pago->tipo = 2; - - $credito = \Model::factory(Credito::class)->create(); - $credito->banco = $pago->banco; - $credito->valor = $pago->valor; - $credito->fecha = $pago->fecha; - $credito->uf = $pago->uf; - - $pago->new(); - - $credito->pago = $pago->id; - $credito->save(); - - $venta->credito = $credito->id; - $venta->save(); - header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); - } - public static function pagar() - { - $id = get('venta'); - $venta = \Model::factory(Venta::class)->findOne($id); - return view('ventas.creditos.pagar', compact('venta')); - } - public static function pagando() - { - $id = get('venta'); - $venta = \Model::factory(Venta::class)->findOne($id); - $valor = str_replace(',', '.', str_replace('.', '', post('valor'))); - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - - $pago = $venta->credito()->pago(); - if ($pago->valor != $valor) { - $pago->valor = $valor; - } - - $estado = \Model::factory(EstadoPago::class)->create(); - $estado->pago = $pago->id; - $estado->fecha = $f->format('Y-m-d'); - $estado->estado = 1; - $estado->save(); - - if ($pago->is_dirty('valor')) { - $pago->save(); - } - header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); - } - public static function abonar() - { - $id = get('venta'); - $venta = \Model::factory(Venta::class)->findOne($id); - return view('ventas.creditos.abonar', compact('venta')); - } - public static function abonando() - { - $id = get('venta'); - $venta = \Model::factory(Venta::class)->findOne($id); - $valor = str_replace(',', '.', str_replace('.', '', post('valor'))); - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - - $pago = $venta->credito()->pago(); - if ($pago->valor != $valor) { - $pago->valor = $valor; - } - - $estado = \Model::factory(EstadoPago::class)->create(); - $estado->pago = $pago->id; - $estado->fecha = $f->format('Y-m-d'); - $estado->estado = 2; - - $estado->save(); - - if ($pago->is_dirty('valor')) { - $pago->save(); - } - header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); - } - public static function show() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - - return view('ventas.creditos.show', compact('venta')); - } - public static function edit() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - - return view('ventas.creditos.edit', compact('venta')); - } - public static function editado() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - - $pago = $venta->credito()->pago(); - - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $uf = uf($f); - $banco = model(Banco::class)->where('nombre', post('banco'))->findOne(); - $valor = correctNumber(post('valor')) * $uf->uf->value; - - $fields = ['valor', 'uf', 'fecha', 'banco']; - $data = ['valor' => $valor, 'uf' => $uf->uf->value, 'fecha' => $f->format('Y-m-d'), 'banco' => $banco->id]; - - $change = false; - foreach ($fields as $field) { - if ($pago->$field != $data[$field]) { - $change = true; - $pago->$field = $data[$field]; - if ($field == 'fecha') { - $eps = $pago->estados(); - foreach ($eps as $ep) { - if ($ep->estado == 0) { - $ep->fecha = $data[$field]; - $ep->save(); - break; - } - } - } - } - } - - if ($change) { - $pago->save(); - } - header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); - } - public static function remove() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - - $pago = $venta->credito()->pago(); - $f = Carbon::today(config('app.timezone')); - - $data = [ - 'pago' => $pago->id, - 'estado' => -3, - 'fecha' => $f->format('Y-m-d') - ]; - $estado = model(EstadoPago::class)->create($data); - $estado->save(); - $venta->credito = 0; - $venta->save(); - header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); - } - public static function pendientes() - { - $creditos = model(Credito::class) - ->select('credito.*') - ->join('venta', ['venta.credito', '=', 'credito.id']) - ->join('pago', ['pago.id', '=', 'credito.pago']) - ->rawJoin('JOIN (SELECT ep.* FROM (SELECT pago, MAX(id) AS id FROM estado_pago GROUP BY pago) e0 JOIN estado_pago ep ON ep.id = e0.id)', ['estado_pago.pago', '=', 'pago.id'], 'estado_pago') - ->whereLt('estado_pago.estado', 2) - ->where('venta.estado', 1) - ->orderByAsc('estado_pago.fecha') - ->findMany(); - return view('ventas.creditos.pendientes', compact('creditos')); - } -} -?> diff --git a/app/Controller/Cuotas.php b/app/Controller/Cuotas.php deleted file mode 100644 index 4d457ba..0000000 --- a/app/Controller/Cuotas.php +++ /dev/null @@ -1,230 +0,0 @@ -findOne($id); - - return view('ventas.pies.cuotas.show', compact('cuota')); - } - public static function edit() - { - $id = get('cuota'); - $cuota = \Model::factory(Cuota::class)->findOne($id); - return view('ventas.pies.cuotas.edit', compact('cuota')); - } - public static function editar() - { - $id = get('cuota'); - $cuota = \Model::factory(Cuota::class)->findOne($id); - - $cuota->numero = post('numero'); - $cuota->{'valor_$'} = post('valor'); - $banco = \Model::factory(\Incoviba\old\Common\Banco::class)->where('nombre', post('banco'))->findOne(); - if ($banco) { - $cuota->banco = $banco->id; - } else { - $cuota->banco = 0; - } - $f = \Carbon\Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $cuota->fecha = $f->format('Y-m-d'); - $pago = $cuota->pago(); - $pago->valor = post('valor'); - $pago->banco = $banco->id; - $pago->identificador = post('identificador'); - $pago->fecha = $f->format('Y-m-d'); - $uf = uf($f); - if ($uf->total > 0) { - $pago->uf = $uf->uf->value; - } else { - $pago->uf = 0; - } - - $pago->save(); - $cuota->save(); - header('Location: ' . url('', ['p' => 'pies', 'a' => 'resumen', 'pie' => $cuota->pie()->id])); - } - public static function edited() - { - $id = get('cuota'); - $cuota = \Model::factory(Cuota::class)->findOne($id); - $pago = $cuota->pago(); - foreach ($_POST as $key => $value) { - $pago->$key = $value; - } - $pago->save(); - } - public static function pendientes() - { - $f = \Carbon\Carbon::today(config('app.timezone')); - $cuotas = \Model::factory(Cuota::class) - ->select('cuota.*') - ->join('pago', ['pago.id', '=', 'cuota.pago']) - ->join('venta', ['venta.pie', '=', 'cuota.pie']) - ->raw_join('JOIN (SELECT e1.* FROM (SELECT pago, MAX(id) AS id FROM estado_pago GROUP BY pago) e0 JOIN estado_pago e1 ON e1.id = e0.id)', ['ep.pago', '=', 'pago.id'], 'ep') - ->where('ep.estado', 0) - ->where('venta.estado', 1) - ->whereLte('pago.fecha', $f->format('Y-m-d')) - ->order_by_asc('pago.fecha') - ->findMany(); - $sum = 0; - if (count($cuotas) > 0) { - $sum = array_reduce($cuotas, function($carry, $item) { - $carry += $item->pago()->valor; - return $carry; - }); - } - setlocale(LC_TIME, 'es'); - return view('ventas.pies.cuotas.pendientes', compact('cuotas', 'sum')); - } - public static function depositar() - { - $id = post('cuota'); - $cuota = \Model::factory(Cuota::class)->findOne($id); - if ($cuota->pago()->estado()->estado == 1) { - return 'ok'; - } - $estado = \Model::factory(EstadoPago::class)->create(); - $estado->pago = $cuota->pago()->id; - $estado->estado = 1; - $f = Carbon::parse(post('fecha'), config('app.timezone')); - $estado->fecha = $f->format('Y-m-d'); - $estado->save(); - return 'ok'; - } - public static function remove() - { - $id = get('cuota'); - $cuota = \Model::factory(Cuota::class)->findOne($id); - - $estado = \Model::factory(EstadoPago::class)->create(); - $estado->pago = $cuota->pago()->id; - $estado->estado = -3; - $f = Carbon::today(config('app.timezone')); - $estado->fecha = $f->format('Y-m-d'); - $estado->save(); - header('Location: ' . url('', ['p' => 'pies', 'a' => 'resumen', 'pie' => $cuota->pie()->id])); - } - public static function para_abonar() - { - $cuotas = \Model::factory(Cuota::class) - ->select('cuota.*') - ->join('pago', ['pago.id', '=', 'cuota.pago']) - ->join('venta', ['venta.pie', '=', 'cuota.pie']) - ->raw_join('JOIN (SELECT e1.* FROM (SELECT pago, MAX(id) AS id FROM estado_pago GROUP BY pago) e0 JOIN estado_pago e1 ON e1.id = e0.id)', ['ep.pago', '=', 'pago.id'], 'ep') - ->where('ep.estado', 1) - ->where('venta.estado', 1) - ->order_by_asc('ep.fecha') - ->findMany(); - $ini = get('start'); - if ($ini == null) { - $ini = 0; - } - $n = get('step'); - if ($n == 0) { - $n = 30; - } - $total = count($cuotas); - $cuotas = array_slice($cuotas, $ini, $n); - $pages = ceil($total / $n); - $current = ($ini + $n) / $n; - return view('ventas.pies.cuotas.abonar', compact('cuotas', 'total', 'pages', 'current')); - } - public static function abonar() - { - $id = post('cuota'); - $cuota = \Model::factory(Cuota::class)->findOne($id); - if ($cuota->pago()->estado()->estado == 2) { - return 'ok'; - } - $estado = \Model::factory(EstadoPago::class)->create(); - $estado->pago = $cuota->pago()->id; - $estado->estado = 2; - $f = Carbon::parse(post('fecha'), config('app.timezone')); - $estado->fecha = $f->format('Y-m-d'); - $estado->save(); - return 'ok'; - } - public static function rebotar() - { - $id = post('cuota'); - $cuota = \Model::factory(Cuota::class)->findOne($id); - if ($cuota->pago()->estado()->estado == -1) { - return 'ok'; - } - $estado = \Model::factory(EstadoPago::class)->create(); - $estado->pago = $cuota->pago()->id; - $estado->estado = -1; - $f = Carbon::parse(post('fecha'), config('app.timezone')); - $estado->fecha = $f->format('Y-m-d'); - $estado->save(); - return 'ok'; - } - public static function add() - { - $id = get('pie'); - $pie = \Model::factory(Pie::class)->findOne($id); - return view('ventas.pies.cuotas.add', compact('pie')); - } - public static function agregar() - { - $id = get('pie'); - $pie = \Model::factory(Pie::class)->findOne($id); - - $cant = $pie->cuotas - count($pie->cuotas()); - for ($i = 0; $i < $cant; $i ++) { - if (trim(post('valor' . $i)) == '') { - continue; - } - $banco = \Model::factory(Banco::class)->where('nombre', post('banco' . $i))->findOne(); - $f = Carbon::createFromDate(post('year' . $i), post('month' . $i), post('day' . $i), config('app.timezone')); - $uf = uf($f); - $valor = correctNumber(post('valor' . $i)); - - $pago = \Model::factory(Pago::class)->create(); - $pago->banco = $banco->id; - $pago->fecha = $f->format('Y-m-d'); - if ($uf and $uf->total > 0) { - $pago->uf = $uf->uf->value; - } else { - $pago->uf = 0; - } - $pago->tipo = 1; - $pago->valor = $valor; - $pago->identificador = post('identificador' . $i); - - $cuota = \Model::factory(Cuota::class)->create(); - $cuota->pie = $pie->id; - $cuota->fecha = $pago->fecha; - $cuota->{'valor_$'} = $pago->valor; - $cuota->estado = 0; - $cuota->banco = $pago->banco; - $cuota->uf = $pago->uf; - $cuota->numero = post('numero' . $i); - - $pago->new(); - - $cuota->pago = $pago->id; - $cuota->save(); - header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $pie->venta()->id])); - } - } -} -?> diff --git a/app/Controller/Devoluciones.php b/app/Controller/Devoluciones.php deleted file mode 100644 index 8d9c41c..0000000 --- a/app/Controller/Devoluciones.php +++ /dev/null @@ -1,19 +0,0 @@ -findOne($id); - - return view('print.devolucion', compact('venta')); - } -} -?> diff --git a/app/Controller/Escrituras.php b/app/Controller/Escrituras.php deleted file mode 100644 index f2cb056..0000000 --- a/app/Controller/Escrituras.php +++ /dev/null @@ -1,212 +0,0 @@ -findOne($id); - return view('ventas.escrituras.add', compact('venta')); - } - public static function agregar() - { - $id = get('venta'); - $venta = \Model::factory(Venta::class)->findOne($id); - - $f = Carbon::createFromDate(post('escritura_year'), post('escritura_month'), post('escritura_day'), config('app.timezone')); - $venta->escriturado = $f->format('Y-m-d'); - - if (post('valor_reajuste')) { - $reajuste = \Model::factory(Pago::class)->create(); - $reajuste->valor = correctNumber(post('valor_reajuste')); - $fp = Carbon::createFromDate(post('reajuste_year'), post('reajuste_month'), post('reajuste_day'), config('app.timezone')); - $reajuste->fecha = $fp->format('Y-m-d'); - $reajuste->uf = (float) uf($fp)->uf->value; - $reajuste->newPagado(); - - $pie = $venta->pie(); - $pie->reajuste = $reajuste->id; - $pie->save(); - } - if (post('escritura_valor') or post('escritura_valor_uf')) { - $pago = \Model::factory(Pago::class)->create(); - $fp = Carbon::createFromDate(post('pago_escritura_year'), post('pago_escritura_month'), post('pago_escritura_day'), config('app.timezone')); - $pago->fecha = $fp->format('Y-m-d'); - $pago->uf = (float) uf($fp)->uf->value; - if (post('escritura_valor')) { - $pago->valor = correctNumber(post('escritura_valor')); - $pago->newPagado(); - } else { - $pago->valor = correctNumber(post('escritura_valor_uf')) * $pago->uf; - $pago->new(); - } - - $escritura = \Model::factory(Escritura::class)->create(); - $escritura->pago = $pago->id; - $escritura->valor = $pago->valor('uf'); - $escritura->fecha = $pago->fecha; - $escritura->save(); - - $venta->escritura = $escritura->id; - } - if (post('subsidio_ahorrado') or post('subsidio_valor')) { - $total = post('subsidio_ahorrado') + post('subsidio_valor'); - $subsidio = \Model::factory(Subsidio::class)->create(); - $pago = \Model::factory(Pago::class)->create(); - $pago->fecha = $f->format('Y-m-d'); - $pago->uf = (float) uf($f)->uf->value; - $pago->valor = correctNumber(post('subsidio_ahorrado')) * $pago->uf; - $pago->new(); - $subsidio->pago = $pago->id; - $pago = \Model::factory(Pago::class)->create(); - $pago->fecha = $f->format('Y-m-d'); - $pago->uf = (float) uf($f)->uf->value; - $pago->valor = correctNumber(post('subsidio_valor')) * $pago->uf; - $pago->new(); - $subsidio->subsidio = $pago->id; - $subsidio->save(); - - $venta->subsidio = $subsidio->id; - } - if (post('credito_valor')) { - $pago = \Model::factory(Pago::class)->create(); - $pago->fecha = $f->format('Y-m-d'); - $pago->uf = (float) uf($f)->uf->value; - $valor = post('credito_valor'); - if (strpos($valor, ',') !== false) { - $valor = correctNumber($valor); - } - $pago->valor = $valor * $pago->uf; - $banco = \Model::factory(Banco::class)->where('nombre', post('credito_banco'))->findOne(); - $pago->banco = $banco->id; - $pago->new(); - - $credito = \Model::factory(Credito::class)->create(); - $credito->pago = $pago->id; - $credito->save(); - - $venta->credito = $credito->id; - } elseif (post('credito_banco')) { - $pago = $venta->credito()->pago(); - $banco = \Model::factory(Banco::class)->where('nombre', post('credito_banco'))->findOne(); - $pago->banco = $banco->id; - $pago->save(); - } - - $tipo = \Model::factory(TipoEstadoVenta::class)->where('descripcion', 'escriturando')->findOne(); - $data = [ - 'venta' => $venta->id, - 'estado' => $tipo->id, - 'fecha' => $venta->escriturado - ]; - $estado = \Model::factory(EstadoVenta::class)->create($data); - $estado->save(); - $venta->save(); - header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); - } - public static function edit() - { - $id = get('venta'); - $venta = \Model::factory(Venta::class)->findOne($id); - echo view('ventas.escrituras.edit', compact('venta')); - } - public static function editar() - { - $id = get('venta'); - $venta = \Model::factory(Venta::class)->findOne($id); - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $uf = uf($f); - - $valor = correctNumber(post('valor')); - if ($valor == '') { - $valor_uf = correctNumber(post('valor_uf')); - $valor = $valor_uf * $uf->uf->value; - } - $pago = $venta->escritura()->pago(); - if ($pago->valor != $valor) { - $pago->valor = $valor; - } - if ($pago->fecha != $f->format('Y-m-d')) { - $pago->fecha = $f->format('Y-m-d'); - $pago->uf = $uf->uf->value; - } - - $pago->save(); - header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); - } - public static function informe() - { - $id = get('venta'); - $venta = \Model::factory(Venta::class)->findOne($id); - return view('ventas.escrituras.informe', compact('venta')); - } - public static function pagar() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - - return view('ventas.escrituras.pagar', compact('venta')); - } - public static function pagado() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - - $data = [ - 'pago' => $venta->escritura()->pago()->id, - 'fecha' => $f->format('Y-m-d'), - 'estado' => 1 - ]; - $estado = model(EstadoPago::class)->create($data); - $estado->save(); - header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); - } - public static function abonar() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - - return view('ventas.escrituras.abonar', compact('venta')); - } - public static function abonado() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - - $data = [ - 'pago' => $venta->escritura()->pago()->id, - 'fecha' => $f->format('Y-m-d'), - 'estado' => 2 - ]; - $estado = model(EstadoPago::class)->create($data); - $estado->save(); - header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); - } -} -?> diff --git a/app/Controller/FormaPago.php b/app/Controller/FormaPago.php deleted file mode 100644 index 6ccc7b3..0000000 --- a/app/Controller/FormaPago.php +++ /dev/null @@ -1,98 +0,0 @@ -findOne($id); - - return view('ventas.forma_pago.edit', compact('venta')); - } - public static function editar() - { - d(post()); - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - - $valor = correctNumber(post('valor_pie')); - $cuotas = post('cuotas_pie'); - if ($venta->pie != 0) { - $pie = $venta->pie(); - $changed = false; - if ($pie->valor != $valor) { - $pie->valor = $valor; - $changed = true; - } - if ($pie->cuotas != $cuotas) { - $pie->cuotas = $cuotas; - $changed = true; - } - if ($changed) { - d($pie); - } - - $valor = correctNumber(post('valor_reajuste')); - $f = Carbon::createFromDate(post('year_reajuste'), post('month_reajuste'), post('day_reajuste'), config('app.timezone')); - $uf = uf($f); - $reajuste = $pie->reajuste(); - $changed = false; - if ($reajuste->valor != $valor) { - $reajuste->valor = $valor; - $changed = true; - } - if ($reajuste->fecha != $f->format('Y-m-d')) { - $reajuste->fecha = $f->format('Y-m-d'); - $reajuste->uf = $uf->uf->value; - $changed = true; - } - if ($changed) { - d($reajuste); - } - } elseif ($valor != '') { - $f = Carbon::parse($venta->fecha, config('app.timezone')); - $uf = uf($f); - $data = [ - 'valor' => $valor, - 'cuotas' => $cuotas, - 'uf' => $uf->uf->value, - 'fecha' => $f->format('Y-m-d') - ]; - $pie = model(Pie::class)->create($data); - d($pie); - } - - $valor = correctNumber(post('valor_escritura')); - $f = Carbon::createFromDate(post('year_escritura'), post('month_escritura'), post('day_escritura'), config('app.timezone')); - if ($venta->escritura != 0) { - $escritura = $venta->escritura(); - d($escritura); - } elseif ($valor != '') { - $data = [ - 'valor' => $valor, - 'fecha' => $f->format('Y-m-d'), - 'uf' => $uf->uf->value, - 'tipo' => 7 - ]; - $pago = model(Pago::class)->create($data); - $pago->newPagado(); - $data['pago'] = $pago->id; - unset($data['tipo']); - $escritura = model(Escritura::class)->create($data); - $escritura->save(); - $venta->escritura = $escritura->id; - $venta->save(); - } - } -} -?> diff --git a/app/Controller/Informes.php b/app/Controller/Informes.php deleted file mode 100644 index bc40396..0000000 --- a/app/Controller/Informes.php +++ /dev/null @@ -1,832 +0,0 @@ -find_one($id_proyecto); - $ini = \Carbon\Carbon::parse($proyecto->estado()->fecha, config('app.timezone')); - #$informe = new Informador('Carta Gantt Proyecto - ' . $proyecto->descripcion); - $name = 'Carta Gantt Proyecto - ' . $proyecto->descripcion; - $hoy = Carbon::now(config('app.timezone')); - $filename = str_replace('ñ', 'n', $name . ' - ' . $hoy->format('Y-m-d') . '.xls'); - $informe = new PHPExcel($name, $filename); - - $columnas = ['Departamento', 'Propietario', 'Entrega', 'Estado']; - $today = \Carbon\Carbon::today(config('app.timezone')); - $end = $today->copy()->addDays(30); - $dif = $end->diffInDays($ini); - for ($i = 0; $i <= $dif; $i ++) { - $f = $ini->copy()->addDays($i); - if ($f->isWeekend()) { - continue; - } - $columnas []= $f->format('Y-m-d'); - } - $informe->addColumns($columnas); - - $data = []; - foreach ($proyecto->entregas() as $venta) { - $info = []; - $info []= $venta->unidad()->descripcion; - $info []= $venta->propietario()->findOne()->nombreCompleto(); - $fe = Carbon::parse($venta->entrega()->find_one()->fecha, config('app.timezone')); - $info []= $fe->format('Y-m-d'); - $info []= ''; - - for ($i = 0; $i <= $dif; $i ++) { - $f = $ini->copy()->addDays($i); - if ($f->isWeekend()) { - continue; - } - if ($f >= $fe and $f <= $fe->copy()->addDays(14)) { - $info []= 'X'; - } else { - $info []= ''; - } - } - - $data []= $info; - } - $informe->addDatas($data); - - return $informe->informe(); - } else { - $proyectos = model(Proyecto::class)->order_by_asc('descripcion')->find_many(); - return view('informes.gantt_entregas', compact('proyectos')); - } - } - public static function escrituras() - { - if (get('proyecto')) { - set_time_limit(60); - $id_proyecto = get('proyecto'); - $proyecto = model(Proyecto::class)->find_one($id_proyecto); - - #$informe = new Informador('Escrituras - ' . $proyecto->descripcion); - $name = 'Escrituras'; - $hoy = Carbon::now(config('app.timezone')); - $filename = str_replace('ñ', 'n', $name . ' - ' . $proyecto->descripcion . ' - ' . $hoy->format('Y-m-d') . '.xls'); - $informe = new PHPExcel($name, $filename); - - $columnas = [ - 'Departamento', - 'Estacionamientos', - 'Bodegas', - 'Propietario', - (object) ['name' => 'Promesa', 'style' => 'number'], - ['name' => 'Bono Pie', 'style' => 'amount'], - ['name' => 'Pie Pagado', 'style' => 'amount'], - ['name' => 'Reajuste', 'style' => 'amount'], - ['name' => 'Abono Contado', 'style' => 'amount'], - ['name' => 'Subsidio', 'style' => 'amount'], - 'Estado Subsidio', - ['name' => 'Credito', 'style' => 'amount'], - 'Banco', - 'Estado Credito', - ['name' => 'Saldo', 'style' => 'amount'], - ['name' => 'Escritura', 'style' => 'amount'], - ['name' => 'Entrega', 'style' => 'date'] - ]; - $informe->addColumns($columnas); - - //$ventas = $proyecto->escrituras(); - $ventas = $proyecto->ventas(); - - $data = []; - foreach ($ventas as $venta) { - $info = []; - $info['Departamento'] = $venta->unidad()->descripcion; - $ests = []; - foreach ($venta->propiedad()->estacionamientos() as $e) { - $ests []= $e->descripcion; - } - $bods = []; - foreach ($venta->propiedad()->bodegas() as $b) { - $bods []= $b->descripcion; - } - $info['Estacionamientos'] = implode(' - ', $ests); - $info['Bodegas'] = implode(' - ', $bods); - $info['Propietario'] = $venta->propietario()->nombreCompleto(); - $info['Promesa'] = $venta->valor_uf; - $saldo = $venta->valor_uf; - $info['Bono Pie'] = ''; - if ($venta->bono_pie != 0) { - $info['Bono Pie'] = $venta->bonoPie()->pago()->valor('ufs'); - $saldo -= $venta->bonoPie()->pago()->valor('ufs'); - } - $info['Pie'] = ''; - $info['Reajuste'] = ''; - if ($venta->pie != 0) { - $info['Pie'] = $venta->pie()->valorPagado(); - $saldo -= $venta->pie()->valorPagado(); - if ($venta->pie()->reajuste != 0) { - $info['Reajuste'] = $venta->pie()->reajuste()->valor('ufs'); - $saldo -= $venta->pie()->reajuste()->valor('ufs'); - } - } - $info['Abono Contado'] = ''; - if ($venta->escritura != 0) { - $info['Abono Contado'] = $venta->escritura()->pago()->valor('ufs'); - $saldo -= $venta->escritura()->pago()->valor('ufs'); - } - $info['Subsidio'] = ''; - $info['Estado Subsidio'] = ''; - if ($venta->subsidio != 0) { - $info['Subsidio'] = $venta->subsidio()->total('ufs'); - $info['Estado Subsidio'] = implode(' - ', [ - $venta->subsidio()->subsidio()->estado()->tipo()->descripcion, - $venta->subsidio()->pago()->estado()->tipo()->descripcion - ]); - $saldo -= $venta->subsidio()->total('ufs'); - } - $info['Credito'] = ''; - $info['Banco'] = ''; - $info['Estado Credito'] = ''; - if ($venta->credito != 0) { - $info['Credito'] = $venta->credito()->pago()->valor('ufs'); - $saldo -= $venta->credito()->pago()->valor('ufs'); - if ($venta->credito()->pago()->banco != 0) { - $info['Banco'] = $venta->credito()->pago()->banco()->nombre; - } - $info['Estado Credito'] = $venta->credito()->pago()->estado()->tipo()->descripcion; - } - $info['Saldo'] = -$saldo; - $info['Escritura'] = ''; - if ($venta->escriturado != 0) { - $info['Escritura'] = $venta->escriturado; - } - $info['Entrega'] = ''; - if ($venta->entregado != 0) { - $info['Entrega'] = $venta->entregado; - } - - $data []= $info; - } - $informe->addData($data); - - return $informe->informe(); - } else { - $proyectos = model(Proyecto::class)->order_by_asc('descripcion')->find_many(); - return view('informes.escrituras', compact('proyectos')); - } - } - public static function consolidacion() - { - $id_proyecto = get('proyecto'); - $proyecto = model(Proyecto::class)->findOne($id_proyecto); - - $ventas = $proyecto->ventas(); - set_time_limit(count($ventas)); - - $f = Carbon::today(config('app.timezone')); - setlocale(LC_TIME, 'es'); - - $data = [ - [$proyecto->descripcion], - [strftime('%d de %B de %Y', $f->timestamp)], - [''], - [''] - ]; - $columns = [ - ['name' => 'Fecha', 'style' => 'date'], - 'Glosa', - ['name' => 'Debe', 'style' => 'number'], - ['name' => 'Haber', 'style' => 'number'], - ['name' => 'Saldo', 'style' => 'number'], - 'Comentario' - ]; - $bold_rows = []; - - foreach ($ventas as $venta) { - $data []= ['Departamento ' . $venta->unidad()->descripcion . ' (' . format('ufs', $venta->valor_uf) . ' UF)']; - $data []= $columns; - $bold_rows []= count($data) - 1; - $ufs = 0; - $debe = 0; - $haber = 0; - $sum = 0; - if ($venta->pie != 0) { - $cuotas = $venta->pie()->cuotas(); - foreach ($cuotas as $cuota) { - $sum += $cuota->pago()->valor(); - $ufs += $cuota->pago()->valor('ufs'); - $haber += $cuota->pago()->valor(); - $info = [ - $cuota->pago()->estado()->fecha, - 'Pie - Cuota ' . $cuota->numero() . ' - ' . $venta->pie()->cuotas . ' (' . format('ufs', $cuota->pago()->valor('ufs')) . ' UF)', - '', - $cuota->pago()->valor(), - $sum - ]; - if ($cuota->pago()->estado()->estado < 2) { - $info []= 'No ha sido abonada.'; - } - $data []= $info; - } - if ($venta->pie()->reajuste != 0) { - $sum += $venta->pie()->reajuste()->valor(); - $ufs += $venta->pie()->reajuste()->valor('ufs'); - $haber += $venta->pie()->reajuste()->valor(); - $info = [ - $venta->pie()->reajuste()->estado()->fecha, - 'Reajuste (' . format('ufs', $venta->pie()->reajuste()->valor('ufs')) . ' UF)', - '', - $venta->pie()->reajuste()->valor(), - $sum - ]; - if ($venta->pie()->reajuste()->estado()->estado < 2) { - $info []= 'No ha sido abonado.'; - } - $data []= $info; - } - } - if ($venta->escritura != 0) { - $sum += $venta->escritura()->pago()->valor(); - $ufs += $venta->escritura()->pago()->valor('ufs'); - $haber += $venta->escritura()->pago()->valor(); - $info = [ - $venta->escritura()->pago()->estado()->fecha, - 'Abono Escritura (' . format('ufs', $venta->escritura()->pago()->valor('ufs')) . ' UF)', - '', - $venta->escritura()->pago()->valor(), - $sum - ]; - if ($venta->escritura()->pago()->estado()->estado < 2) { - $info []= 'No ha sido abonado.'; - } - $data []= $info; - } - if ($venta->credito != 0) { - $sum += $venta->credito()->pago()->valor(); - $ufs += $venta->credito()->pago()->valor('ufs'); - $haber += $venta->credito()->pago()->valor(); - $info = [ - $venta->credito()->pago()->estado()->fecha, - 'Crédito (' . format('ufs', $venta->credito()->pago()->valor('ufs')) . ' UF)', - '', - $venta->credito()->pago()->valor(), - $sum - ]; - if ($venta->credito()->pago()->estado()->estado < 2) { - $info []= 'No ha sido pagado.'; - } - $data []= $info; - } - if ($venta->bono_pie != 0) { - try { - $sum -= $venta->bonoPie()->pago()->valor(); - $debe += $venta->bonoPie()->pago()->valor(); - $info = [ - $venta->bonoPie()->pago()->estado()->fecha, - 'Bono Pie (' . format('ufs', $venta->bonoPie()->pago()->valor('ufs')) . ' UF)'. - $venta->bonoPie()->pago()->valor(), - '', - $sum - ]; - $data []= $info; - $sum += $venta->bonoPie()->pago()->valor(); - $haber += $venta->bonoPie()->pago()->valor(); - $info = [ - $venta->bonoPie()->pago()->estado()->fecha, - 'Bono Pie (' . format('ufs', $venta->bonoPie()->pago()->valor('ufs')) . ' UF)'. - '', - $venta->bonoPie()->pago()->valor(), - $sum - ]; - $data []= $info; - } catch (\Exception $e) { - - } - } - $info = [ - '', - 'TOTAL (' . format('ufs', $ufs) . ' UF)', - $debe, - $haber, - $sum - ]; - $data []= $info; - $bold_rows []= count($data) - 1; - - $data []= ['']; - } - /** - * Departamento # - * Fecha |Glosa |Debe |Haber |Saldo - * |Pie - Cuota 1 - n (# UF) |- |$# | - * |Reajuste (# UF) |- |$# | - * |Abono Escritura (# UF) |- |$# | - * |Crédito (# UF) |- |$# | - * |Bono Pie (# UF) |$# |- | - * |Bono Pie (# UF) |- |$# | - * |Devolución (# UF) |$# |- | - * - |TOTAL (# UF) | | | - */ - - array_walk($data, function(&$e, $i) use ($columns) { - if (count($e) < count($columns)) { - $n = count($columns) - count($e); - for ($j = 0; $j < $n; $j ++) { - $e []= ''; - } - } - }); - - #$informe = new Informador('Consolidación - ' . $proyecto->descripcion); - $name = 'Consolidación'; - $hoy = Carbon::now(config('app.timezone')); - $filename = str_replace('ñ', 'n', $name . ' - ' . $proyecto->descripcion . ' - ' . $hoy->format('Y-m-d') . '.xls'); - $informe = new PHPExcel($name, $filename); - $informe->addColumns($columns); - $informe->addData($data); - - return $informe->informe(); - } - public static function creditos_pendientes() - { - function creditos() { - $creditos = model(Credito::class) - ->select('credito.*') - ->join('venta', ['venta.credito', '=', 'credito.id']) - ->join('pago', ['pago.id', '=', 'credito.pago']) - ->rawJoin('JOIN (SELECT ep.* FROM (SELECT pago, MAX(id) AS id FROM estado_pago GROUP BY pago) e0 JOIN estado_pago ep ON ep.id = e0.id)', ['estado_pago.pago', '=', 'pago.id'], 'estado_pago') - ->whereLt('estado_pago.estado', 2) - ->where('venta.estado', 1) - ->orderByAsc('estado_pago.fecha') - ->findMany(); - foreach ($creditos as $credito) { - yield $credito; - } - } - $informe = new Informador('Créditos Pendientes'); - - $columnas = ['Proyecto', 'Departamento', 'Valor', 'Fecha Escritura', 'Estado']; - $informe->addColumns($columnas); - - $row = 0; - foreach (creditos() as $credito) { - $informe->addData($row, $credito->venta()->proyecto()->descripcion, 'Proyecto'); - $informe->addData($row, $credito->venta()->unidad()->descripcion, 'Departamento'); - $informe->addData($row, $credito->pago()->valor('ufs'), 'Valor'); - $informe->addData($row, (($credito->venta()->escriturado) ? $credito->venta()->escriturado : $credito->pago()->estado()->fecha), 'Fecha Escritura'); - $informe->addData($row, ucwords($credito->pago()->estado()->tipo()->descripcion), 'Estado'); - - $row ++; - } - - $date = [ - 'numberFormat' => ['short-date'] - ]; - $ufs = [ - 'numberFormat' => ['thousands'] - ]; - $formats = ['Valor' => $ufs, 'Fecha Escritura' => $date]; - $informe->addFormats($formats); - - return $informe->informe(); - } - public static function ventas() - { - if (get('proyecto')) { - ini_set('memory_limit', "1G"); - ini_set('max_execution_time', '3600'); - $id = get('proyecto'); - $proyecto = model(Proyecto::class)->findOne($id); - $ventas = $proyecto->ventas(); - - /*usort($ventas, function($a, $b) { - return $a->fecha()->timestamp - $b->fecha()->timestamp; - });*/ - - $procasa = model(Agente::class)->findOne(1); - $pa = model(ProyectoAgente::class)->where('agente', $procasa->id)->where('proyecto', $proyecto->id)->findOne(); - if ($pa) { - $comision = $pa->comision / 100; - } else { - $comision = 0.03; - } - - #$informe = new Informador('Ventas - ' . $proyecto->descripcion); - $name = 'Informe de Ventas'; - $hoy = Carbon::now(config('app.timezone')); - $filename = str_replace('ñ', 'n', $name . ' - ' . $proyecto->descripcion . ' - ' . $hoy->format('Y-m-d') . '.xlsx'); - //$informe = new PHPExcel($name, $filename); - - $columnas = [ - 'Propietario', - 'Departamento', - ['name' => 'Estacionamientos', 'style' => 'number'], - ['name' => 'Bodegas', 'style' => 'number'], - 'Fecha Venta', - ['name' => 'Mes', 'style' => 'mes'], - 'Tipo', - ['name' => 'm² Ponderados', 'style' => 'amount'], - ['name' => 'Valor Promesa', 'style' => 'amount'], - ['name' => 'Pie', 'style' => 'amount'], - ['name' => 'Pie Pagado', 'style' => 'amount'], - ['name' => '% Pie Pagado', 'style' => 'percent'], - ['name' => 'Bono Pie', 'style' => 'amount'], - 'Operador', - ['name' => 'Valor Operador', 'style' => 'amount'], - ['name' => 'Premios', 'style' => 'amount'], - ['name' => 'Subsidio', 'style' => 'amount'], - ['name' => 'Ahorro', 'style' => 'amount'], - ['name' => 'Credito', 'style' => 'amount'], - 'Banco', - ['name' => 'Valor Ests & Bods', 'style' => 'amount'], - ['name' => 'Valor Neto', 'style' => 'amount'], - ['name' => 'UF/m²*', 'style' => 'amount'], - ['name' => 'Comision', 'style' => 'amount'], - ['name' => 'Venta s/Comision', 'style' => 'amount'], - ['name' => 'Precio', 'style' => 'Amount'] - ]; - //$informe->addColumns($columnas); - - $data = []; - foreach ($ventas as $venta) { - $info = []; - $info['Propietario'] = mb_strtoupper($venta->propietario()->nombreCompleto()); - $info['Departamento'] = implode(' - ', array_map(function($item) { - return $item->descripcion; - }, $venta->propiedad()->departamentos())); - $es = $venta->propiedad()->estacionamientos(); - $info['Estacionamientos'] = implode(', ', array_map(function($item) { - return $item->descripcion; - }, $es)); - $bs = $venta->propiedad()->bodegas(); - $info['Bodegas'] = implode(', ', array_map(function($item) { - return $item->descripcion; - }, $bs)); - $info['Fecha Venta'] = $venta->fecha()->format('Y-m-d'); - $info['Mes'] = $venta->fecha()->format('M-y'); - $info['Tipo'] = $venta->unidad()->abreviacion; - $info['m² Ponderados'] = $venta->unidad()->m2('vendible'); - $info['Valor Promesa'] = $venta->valor_uf; - $info['Pie'] = 0; - if ($venta->pie()) { - $info['Pie'] = $venta->pie()->valor; - } - $info['Pie Pagado'] = 0; - $info['% Pie Pagado'] = 0; - if ($venta->pie()) { - $info['Pie Pagado'] = $venta->pie()->valorPagado('uf'); - $info['% Pie Pagado'] = $venta->pie()->valorPagado('uf') / $venta->valor_uf; - } - - $info['Bono Pie'] = ($venta->bono_pie == 0 or $venta->bonoPie() === false) ? '' : $venta->bonoPie()->pago()->valor('ufs'); - $info['Operador'] = ($venta->agente and $venta->agente()->agente()->tipo == 19) ? $venta->agente()->agente()->descripcion : ''; - $info['Valor Operador'] = $venta->valorComision(); - //$promos = 0; - $ps = $venta->promociones(); - $info['Premios'] = array_reduce($ps, function($sum, $item) { - return $sum + $item->valor; - }); - $info['Subsidio'] = 0; - $info['Ahorro'] = 0; - if ($venta->subsidio != 0) { - $info['Subsidio'] = $venta->subsidio()->subsidio()->valor('ufs'); - $info['Ahorro'] = $venta->subsidio()->pago()->valor('ufs'); - } - $info['Credito'] = 0; - $info['Banco'] = ''; - if ($venta->credito != 0 and $venta->credito()->pago()) { - $info['Credito'] = $venta->credito()?->pago()->valor('ufs'); - if ($venta->credito()?->pago()->banco != 0) { - $info['Banco'] = $venta->credito()?->pago()->banco()->nombre; - } - } - $info['Valor Ests & Bods'] = $venta->valorEstacionamientosYBodegas(); - $info['Valor Neto'] = $venta->valorFinal(); - $info['UF/m²*'] = $venta->uf_m2(); - $info['Comision'] = $venta->valorFinal() * $comision; - $info['Venta s/Comision'] = $venta->valorFinal() - $info['Comision']; - $fecha = $venta->fecha(); - $info['Precio'] = 0; - try { - $info['Precio'] = array_reduce($venta->propiedad()->departamentos(), function($sum, $item) use ($fecha) { - if (!$item->precio($fecha)) { - return $sum; - } - return $sum + $item->precio($fecha)->valor; - }); - } catch (\Exception $e) { - } - - $data []= $info; - } - - $body = [ - "Proyecto" => $proyecto->descripcion, - "Compañía" => $proyecto->inmobiliaria()->abreviacion, - "data" => $data - ]; - $client = new Client(['base_uri' => "{$_ENV['PYTHON_HOST']}"]); - $response = $client->post('/ventas', ['json' => $body]); - - header("Content-Type: application/octet-stream; charset=utf-8"); - header('Content-Transfer-Encoding: binary'); - header('Content-Disposition: attachment; filename="' . $filename . '"'); - header('Cache-Control: max-age=0'); - return $response->getBody(); - //file_put_contents('php://output', $output); - - } else { - $proyectos = model(Proyecto::class)->order_by_asc('descripcion')->find_many(); - return view('informes.ventas', compact('proyectos')); - } - } - public static function resumen_contabilidad() - { - if (get('proyecto')) { - $id = get('proyecto'); - $fecha = get('fecha'); - - $service = new Resumen(); - $service->build($id, new \DateTimeImmutable($fecha)); - return ''; - } else { - $proyectos = model(Proyecto::class)->order_by_asc('descripcion')->find_many(); - return view('informes.resumen_contabilidad', compact('proyectos')); - } - } - public static function contabilidad() - { - if (get('proyecto')) { - $id = get('proyecto'); - $fecha = get('fecha'); - $mes = null; - if ($fecha != null) { - $mes = Carbon::parse($fecha); - } - $proyecto = model(Proyecto::class)->findOne($id); - $q = "SELECT pago.*, venta.id AS vid, venta.tipo AS ctipo, venta.pie AS pie - FROM ( - SELECT pago.id, banco.nombre AS banco, pago.fecha, pago.valor, pago.uf, ep.estado, ep.fecha AS efecha - FROM pago JOIN banco ON banco.id = pago.banco JOIN (( - SELECT pago, MAX(id) AS id FROM estado_pago GROUP BY pago) e0 JOIN estado_pago ep ON ep.id = e0.id) ON ep.pago = pago.id - WHERE ep.estado > 0 "; - if ($mes != null) { - $q .= "AND (pago.fecha BETWEEN '" . $mes->format('Y-m-01') . "' AND '" . $mes->format('Y-m-t') . "' - OR ep.fecha BETWEEN '" . $mes->format('Y-m-01') . "' AND '" . $mes->format('Y-m-t') . "')"; - } - $q .= ") pago JOIN (SELECT venta.* - FROM (( - SELECT venta.id, venta.pie, venta.propiedad, credito.pago, 'credito' AS tipo - FROM venta JOIN credito ON credito.id = venta.credito) - UNION ALL ( - SELECT venta.id, venta.pie, venta.propiedad, escritura.pago, 'escritura' AS tipo - FROM venta JOIN escritura ON escritura.id = venta.escritura) - UNION ALL ( - SELECT venta.id, venta.pie, venta.propiedad, cuota.pago, 'cuota' AS tipo - FROM venta JOIN cuota ON cuota.pie = venta.pie)) venta - JOIN propiedad ON propiedad.id = venta.propiedad - JOIN unidad ON unidad.id = propiedad.unidad_principal - WHERE unidad.proyecto = ?) venta - ON venta.pago = pago.id"; - $st = \ORM::getDB()->prepare($q); - $st->execute([$id]); - if ($st->rowCount() > 0) { - $R = $st->fetchAll(\PDO::FETCH_OBJ); - - //$informe = new Informador('Contabilidad - ' . (($mes != null) ? $mes->format('Y-m') . ' - ' : '') . $proyecto->descripcion); - $name = 'Contabilidad'; - $hoy = Carbon::now(config('app.timezone')); - $filename = str_replace('ñ', 'n', 'Contabilidad - ' . (($mes != null) ? $mes->format('Y-m') . ' - ' : '') . $proyecto->descripcion . ' - ' . $hoy->format('Y-m-d') . '.xls'); - - $informe = new PHPExcel($name, $filename); - - $columnas = ['Proyecto', 'Fecha', 'Banco', 'Departamento', 'RUT', 'Propietario', 'Glosa', 'Glosa2', (object) ['name' => 'Valor', 'style' => 'integer'], (object) ['name' => 'Valor UF', 'style' => 'currency']]; - $informe->addColumns($columnas); - $data = []; - foreach ($R as $r) { - $info = []; - $info['Proyecto'] = $proyecto->descripcion; - $f1 = \Carbon\Carbon::parse($r->fecha, config('app.timezone')); - $f2 = \Carbon\Carbon::parse($r->efecha, config('app.timezone')); - $info['Fecha'] = ($f1->max($f2))->format('Y-m-d'); - $info['Banco'] = $r->banco; - $venta = model(Venta::class)->findOne($r->vid); - $info['Departamento'] = $venta->unidad()->descripcion; - $info['RUT'] = $venta->propietario()->rut(); - $info['Propietario'] = $venta->propietario()->nombreCompleto(); - $info['Glosa'] = ucwords($r->ctipo); - $info['Glosa2'] = ''; - if ($r->ctipo == 'cuota') { - $cuota = model(Cuota::class)->where('pago', $r->id)->findOne(); - - $info['Glosa'] = 'Pie - ' . format('ufs', $cuota->pie()->valor('ufs'), null, true); - - $info['Glosa2'] = $cuota->numero() . ' - ' . $cuota->pie()->cuotas; - } - $info['Valor'] = $r->valor; - $info['Valor UF'] = '0'; - if ($r->uf > 0) { - $info['Valor UF'] = $r->valor / $r->uf; - } - $data []= $info; - } - - $informe->addData($data); - - return $informe->informe(); - } - } else { - setlocale(LC_TIME, 'es_ES'); - $proyectos = model(Proyecto::class)->order_by_asc('descripcion')->find_many(); - return view('informes.contabilidad', compact('proyectos')); - } - } - public static function para_comision() - { - $proyectos = model(Proyecto::class)->orderByAsc('descripcion')->findMany(); - return view('informes.para_comision', compact('proyectos')); - } - public static function comisiones() - { - $id = post('proyecto'); - $proyecto = model(Proyecto::class)->findOne($id); - $unidades = explode('-', str_replace([';', '.', ':', ' ', PHP_EOL, '|', '+', ','], '-', post('unidades'))); - $ventas = model(Venta::class) - ->select('venta.*') - ->join('propiedad', ['propiedad.id', '=', 'venta.propiedad']) - ->join('unidad', ['unidad.id', '=', 'propiedad.unidad_principal']) - ->where('unidad.proyecto', $proyecto->id) - ->where('venta.estado', 1) - ->whereIn('unidad.descripcion', $unidades) - ->orderByExpr('FIELD(unidad.descripcion, ' . implode(', ', $unidades) . ')') - ->findMany(); - $ids = []; - $totales = (object) ['precio' => 0, 'neto' => 0, 'comision' => 0]; - foreach ($ventas as $venta) { - $ids []= $venta->id; - $totales->precio += $venta->valor_uf; - $totales->neto += $venta->valorCorredora(); - $totales->comision += $venta->valorCorredora() * 1.5 / 100; - } - return view('informes.comisiones', compact('ventas', 'proyecto', 'totales', 'ids')); - } - public static function comisiones_xlsx() - { - $id_ventas = explode(',', get('ventas')); - $ventas = model(Venta::class) - ->whereIn('id', $id_ventas) - ->orderByExpr('FIELD(id, ' . implode(', ', $id_ventas) . ')') - ->findMany(); - - $informe = new Informador('Comisiones - ' . $ventas[0]->proyecto()->descripcion); - $columnas = ['Departamento', 'Estacionamientos', 'Bodegas', 'Propietario', 'Precio', '% Com', 'Com UF']; - $informe->addColumns($columnas); - $data = []; - foreach ($ventas as $venta) { - $info = []; - $info['Departamento'] = $venta->unidad()->descripcion; - $info['Estacionamientos'] = implode(' - ', $venta->propiedad()->estacionamientos('array')); - $info['Bodegas'] = implode(' - ', $venta->propiedad()->bodegas('array')); - $info['Propietario'] = $venta->propietario()->nombreCompleto(); - $info['Precio'] = "'" . format('ufs', $venta->valorCorredora()); - $info['% Com'] = '1,5 %'; - $info['Com UF'] = "'" . format('ufs', $venta->valorCorredora() * 1.5 / 100); - $data []= $info; - } - - $informe->addDatas($data); - - return $informe->informe(); - } - public static function cuotas() - { - $id_venta = get('venta'); - $venta = model(Venta::class)->findOne($id_venta); - - $name = 'Cuotas - ' . $venta->unidad()->descripcion; - $hoy = Carbon::now(config('app.timezone')); - $filename = str_replace('ñ', 'n', $name . ' - ' . $venta->proyecto()->descripcion . ' - ' . $hoy->format('Y-m-d') . '.xls'); - $informe = new PHPExcel($name, $filename); - $columnas = [ - ['name' => 'Cuota', 'style' => 'number'], - ['name' => 'Fecha Cuota', 'style' => 'date'], - 'Banco', - 'Identificador', - ['name' => 'Valor $', 'style' => 'number'], - ['name' => 'Valor UF', 'style' => 'currency'], - ['name' => 'Fecha Pago', 'style' => 'date'] - ]; - $informe->addColumns($columnas); - $data = []; - foreach ($venta->pie()->cuotas() as $cuota) { - $info = []; - $info['Cuota'] = $cuota->numero(); - $info['Fecha Cuota'] = $cuota->pago()->fecha()->format('Y-m-d'); - $info['Banco'] = $cuota->pago()->banco()->descripcion; - $info['Identificador'] = $cuota->pago()->identificador; - $info['Valor $'] = $cuota->pago()->valor(); - $info['Valor UF'] = $cuota->pago()->valor('ufs'); - $info['Fecha Pago'] = $cuota->pago()->estado()->fecha()->format('Y-m-d'); - $data []= $info; - } - $informe->addData($data); - - return $informe->informe(); - } - public static function resciliaciones() - { - if (get('proyecto')) { - $id = get('proyecto'); - $proyecto = model(Proyecto::class)->findOne($id); - $ventas = $proyecto->resciliaciones(); - - usort($ventas, function($a, $b) { - return $a->fecha()->timestamp - $b->fecha()->timestamp; - }); - - $name = 'Resciliaciones'; - $hoy = Carbon::now(config('app.timezone')); - $filename = str_replace('ñ', 'n', $name . ' - ' . $proyecto->descripcion . ' - ' . $hoy->format('Y-m-d') . '.xls'); - $informe = new PHPExcel($name, $filename); - - $columnas = [ - 'Propietario', - ['name' => 'Departamento', 'style' => 'number'], - ['name' => 'Estacionamientos', 'style' => 'number'], - ['name' => 'Bodegas', 'style' => 'number'], - 'Fecha Venta', - 'Fecha Resciliación', - ['name' => 'Mes', 'style' => 'mes'], - 'Tipo', - ['name' => 'm² Ponderados', 'style' => 'amount'], - ['name' => 'Valor Promesa', 'style' => 'amount'], - ]; - $informe->addColumns($columnas); - - $data = []; - foreach ($ventas as $venta) { - $info = []; - $info['Propietario'] = mb_strtoupper($venta->propietario()->nombreCompleto()); - $info['Departamento'] = $venta->unidad()->descripcion; - $ests = []; - if ($venta->propiedad()->estacionamientos != '') { - $es = $venta->propiedad()->estacionamientos(); - foreach ($es as $e) { - $ests []= $e->descripcion; - } - } - $info['Estacionamientos'] = implode(', ', $ests); - $bods = []; - if ($venta->propiedad()->bodegas != '') { - $bs = $venta->propiedad()->bodegas(); - foreach ($bs as $b) { - $bods []= $b->descripcion; - } - } - $info['Bodegas'] = implode(', ', $bods); - $info['Fecha Venta'] = $venta->fecha()->format('d.m.Y'); - $info['Fecha Resciliación'] = $venta->estado()->fecha()->format('d.m.Y'); - $info['Mes'] = $venta->estado()->fecha()->format('M-y'); - $info['Tipo'] = $venta->unidad()->abreviacion; - $info['m² Ponderados'] = $venta->unidad()->m2('vendible'); - $info['Valor Promesa'] = $venta->valor_uf; - - $data []= $info; - } - $informe->addData($data); - - $totals = [ - 'Departamento' => 'count', - 'Estacionamientos' => 'count', - 'Bodegas' => 'count', - 'm² Ponderados' => 'sum', - 'Valor Promesa' => 'sum' - ]; - $informe->addTotals($totals); - - return $informe->informe(); - } else { - $proyectos = model(Proyecto::class)->order_by_asc('descripcion')->find_many(); - return view('informes.resciliaciones', compact('proyectos')); - } - } -} diff --git a/app/Controller/Inmobiliarias.php b/app/Controller/Inmobiliarias.php deleted file mode 100644 index f0b8910..0000000 --- a/app/Controller/Inmobiliarias.php +++ /dev/null @@ -1,74 +0,0 @@ -orderByAsc('abreviacion')->findMany(); - return view('inmobiliarias.list', compact('inmobiliarias')); - } - public static function show() - { - $rut = get('rut'); - $inmobiliaria = model(Inmobiliaria::class)->findOne($rut); - return view('inmobiliarias.show', compact('inmobiliaria')); - } - public static function add() - { - $sociedades = model(TipoSociedad::class)->findMany(); - return view('inmobiliarias.add', compact('sociedades')); - } - public static function agregar() - { - list($rut, $dv) = explode('-', str_replace('.', '', post('rut'))); - - $inmobiliaria = model(Inmobiliaria::class)->findOne($rut); - if ($inmobiliaria) { - header('Location: ' . url('', ['p' => 'inmobiliarias', 'a' => 'show', 'rut' => $inmobiliaria->rut])); - die(); - } - - $inmobiliaria = model(Inmobiliaria::class)->create(); - $inmobiliaria->rut = $rut; - $inmobiliaria->dv = $dv; - $inmobiliaria->razon = post('razon'); - $inmobiliaria->abreviacion = post('abrev'); - $inmobiliaria->sociedad = post('sociedad'); - - $inmobiliaria->save(); - header('Location: ' . url('', ['p' => 'inmobiliarias', 'a' => 'show', 'rut' => $inmobiliaria->rut])); - } - public static function edit() - { - $sociedades = model(TipoSociedad::class)->findMany(); - $rut = get('rut'); - $inmobiliaria = model(Inmobiliaria::class)->findOne($rut); - $bancos = model(Banco::class)->findMany(); - usort($bancos, function($a, $b) { - return strcmp($a->nombre, $b->nombre); - }); - return view('inmobiliarias.edit', compact('inmobiliaria', 'bancos', 'sociedades')); - } - public static function do_edit() - { - $rut = get('rut'); - $inmobiliaria = model(Inmobiliaria::class)->findOne($rut); - foreach (post() as $field => $value) { - if ($value != '' and $inmobiliaria->{$field} != $value) { - $inmobiliaria->{$field} = $value; - } - } - - $inmobiliaria->save(); - header('Location: ' . nUrl('inmobiliarias', 'show', ['rut' => $inmobiliaria->rut])); - } -} -?> diff --git a/app/Controller/Operadores.php b/app/Controller/Operadores.php deleted file mode 100644 index 765ba2a..0000000 --- a/app/Controller/Operadores.php +++ /dev/null @@ -1,47 +0,0 @@ -findOne(get('proyecto')); - $operadores = model(Agente::class) - ->select('agente.*') - ->join('agente_tipo', ['agente_tipo.agente', '=', 'agente.id']) - ->join('tipo_agente', ['tipo_agente.id', '=', 'agente_tipo.tipo']) - ->where('tipo_agente.descripcion', 'operador') - ->orderByAsc('agente.abreviacion') - ->findMany(); - $vigentes = array_map(function($item) { - return $item->agente()->agente(); - }, $proyecto->operadoresVigentes()); - echo view('proyectos.operadores.add', compact('proyecto', 'operadores', 'vigentes')); - } - public static function add() - { - $proyecto = model(Proyecto::class)->findOne(get('proyecto')); - $fecha = Carbon::today(config('app.timezone')); - foreach (post('operadores') as $op) { - $operador = model(Agente::class)->findOne($op); - $at = $operador->tipos(19); - $data = [ - 'proyecto' => $proyecto->id, - 'agente' => $at->id, - 'fecha' => $fecha->format('Y-m-d'), - 'comision' => 2 - ]; - $pa = model(ProyectoAgente::class)->create($data); - $pa->new(); - } - header('Location: ' . nUrl('proyectos', 'show', ['proyecto' => $proyecto->id])); - } -} diff --git a/app/Controller/Other.php b/app/Controller/Other.php deleted file mode 100644 index eb90f31..0000000 --- a/app/Controller/Other.php +++ /dev/null @@ -1,71 +0,0 @@ -create(); - $unidad = \Model::factory(Unidad::class)->where('descripcion', $info[0])->where('proyecto', post('proyecto'))->find_one(); - if (!$unidad->venta()->find_one()) { - echo 'x'; - continue; - } - $venta = $unidad->venta()->find_one(); - $entrega->fecha = \Carbon\Carbon::parse($info[1])->format('Y-m-d'); - if ($venta->entrega == '0') { - $entrega->save(); - $venta->entrega = $entrega->id; - $venta->save(); - echo '.'; - } else { - echo 'x'; - } - } - } else { - $proyectos = \Model::factory(Proyecto::class)->order_by_asc('descripcion')->find_many(); - return view('other.entregar_multiple', compact('proyectos')); - } - } - public static function capacidades() - { - $capacidades = []; - $controllers = glob(config('locations.app') . '/Controller/*.php'); - foreach ($controllers as $controller) { - if (basename($controller) == 'Admin.php' or basename($controller) == 'Other.php') { - continue; - } - $class = Stringy::create($controller)->replace(config('locations.app'), '/App')->replace('.php', '')->replace('/', '\\')->__toString(); - $ref = new \ReflectionClass($class); - $static = $ref->getMethods(\ReflectionMethod::IS_STATIC && \ReflectionMethod::IS_PUBLIC); - foreach ($static as $method) { - if ($method->name == 'setDefault' or $method->name == 'index') { - continue; - } - $capacidades []= $method; - } - } - return view('other.capacidades', compact('capacidades')); - } -} -?> \ No newline at end of file diff --git a/app/Controller/Pagares.php b/app/Controller/Pagares.php deleted file mode 100644 index f05b24e..0000000 --- a/app/Controller/Pagares.php +++ /dev/null @@ -1,271 +0,0 @@ -findOne(get('pagare')); - return view('proyectos.pagares.show', compact('pagare')); - } - public static function add() - { - $proyecto = model(Proyecto::class)->findOne(get('proyecto')); - return view('proyectos.pagares.add', compact('proyecto')); - } - public static function do_add() - { - $proyecto = model(Proyecto::class)->findOne(get('proyecto')); - $data = post(); - - $data['id'] = $data['numero']; - unset($data['numero']); - $data['proyecto'] = $proyecto->id; - $moneda = model(TipoMonedaPagare::class)->where('descripcion', $data['moneda'])->findOne(); - $data['moneda'] = $moneda->id; - - $fecha = ['year', 'month', 'day']; - $fecha_arr = array_filter($data, function($item) use ($fecha) { - return (array_search($item, $fecha) !== false); - }, \ARRAY_FILTER_USE_KEY); - uksort($fecha_arr, function($a, $b) use ($fecha) { - return array_search($a, $fecha) - array_search($b, $fecha); - }); - foreach ($fecha as $f) { - unset($data[$f]); - } - array_walk($fecha_arr, function(&$item) { - if (strlen($item) < 4) { - $item = str_pad($item, 2, '0', \STR_PAD_LEFT); - } - }); - $data['fecha'] = implode('-', $fecha_arr); - - foreach ($fecha as &$key) { - $key .= '_banco'; - } - $fecha_arr = array_filter($data, function($item) use ($fecha) { - return (array_search($item, $fecha) !== false); - }, \ARRAY_FILTER_USE_KEY); - uksort($fecha_arr, function($a, $b) use ($fecha) { - return array_search($a, $fecha) - array_search($b, $fecha); - }); - foreach ($fecha as $f) { - unset($data[$f]); - } - array_walk($fecha_arr, function(&$item) { - if (strlen($item) < 4) { - $item = str_pad($item, 2, '0', \STR_PAD_LEFT); - } - }); - $data['fecha_banco'] = implode('-', $fecha_arr); - - $data['abonado'] = (int) $data['abonado']; - if ($data['abonado'] == 0) { - $data['fecha'] = '0000-00-00'; - } - - $pagare = model(Pagare::class)->create($data); - $pagare->save(); - header('Location: ' . nUrl('pagares', 'show', ['pagare' => $pagare->id])); - } - public static function edit() - { - $pagare = model(Pagare::class)->findOne(get('pagare')); - return view('proyectos.pagares.edit', compact('pagare')); - } - public static function do_edit() - { - $pagare = model(Pagare::class)->findOne(get('pagare')); - - $data = post(); - if ($pagare->id != $data['numero']) { - foreach ($pagare->renovaciones() as $renovacion) { - $renovacion->pagare = $data['numero']; - $renovacion->save(); - } - $pagare->id = $data['numero']; - $changed = true; - } - unset($data['numero']); - $moneda = model(TipoMonedaPagare::class)->where('descripcion', $data['moneda'])->findOne(); - $data['moneda'] = $moneda->id; - $fecha = ['year', 'month', 'day']; - $fecha_arr = array_filter($data, function($item) use ($fecha) { - return (array_search($item, $fecha) !== false); - }, \ARRAY_FILTER_USE_KEY); - uksort($fecha_arr, function($a, $b) use ($fecha) { - return array_search($a, $fecha) - array_search($b, $fecha); - }); - foreach ($fecha as $f) { - unset($data[$f]); - } - array_walk($fecha_arr, function(&$item) { - if (strlen($item) < 4) { - $item = str_pad($item, 2, '0', \STR_PAD_LEFT); - } - }); - $data['fecha'] = implode('-', $fecha_arr); - - foreach ($fecha as &$key) { - $key .= '_banco'; - } - $fecha_arr = array_filter($data, function($item) use ($fecha) { - return (array_search($item, $fecha) !== false); - }, \ARRAY_FILTER_USE_KEY); - uksort($fecha_arr, function($a, $b) use ($fecha) { - return array_search($a, $fecha) - array_search($b, $fecha); - }); - foreach ($fecha as $f) { - unset($data[$f]); - } - array_walk($fecha_arr, function(&$item) { - if (strlen($item) < 4) { - $item = str_pad($item, 2, '0', \STR_PAD_LEFT); - } - }); - $data['fecha_banco'] = implode('-', $fecha_arr); - - $data['abonado'] = (int) $data['abonado']; - if ($data['abonado'] == 0) { - $data['fecha'] = '0000-00-00'; - } - - $changed = false; - foreach ($data as $k => $v) { - if ($pagare->$k != $v) { - $pagare->$k = $v; - $changed = true; - if (strpos($k, 'fecha') !== false) { - $pagare->uf = 0; - } - } - } - - if ($changed) { - $pagare->save(); - } - header('Location: ' . nUrl('pagares', 'show', ['pagare' => $pagare->id])); - } - public static function edit_renovacion() - { - $renovacion = model(RenovacionPagare::class)->findOne(get('renovacion')); - return view('proyectos.pagares.edit_renovacion', compact('renovacion')); - } - public static function do_edit_renovacion() - { - $renovacion = model(RenovacionPagare::class)->findOne(get('renovacion')); - - $data = post(); - $fecha = ['year', 'month', 'day']; - $fecha_arr = array_filter($data, function($item) use ($fecha) { - return (array_search($item, $fecha) !== false); - }, \ARRAY_FILTER_USE_KEY); - uksort($fecha_arr, function($a, $b) use ($fecha) { - return array_search($a, $fecha) - array_search($b, $fecha); - }); - foreach ($fecha as $f) { - unset($data[$f]); - } - array_walk($fecha_arr, function(&$item) { - if (strlen($item) < 4) { - $item = str_pad($item, 2, '0', \STR_PAD_LEFT); - } - }); - $data['fecha'] = implode('-', $fecha_arr); - - foreach ($fecha as &$key) { - $key .= '_banco'; - } - $fecha_arr = array_filter($data, function($item) use ($fecha) { - return (array_search($item, $fecha) !== false); - }, \ARRAY_FILTER_USE_KEY); - uksort($fecha_arr, function($a, $b) use ($fecha) { - return array_search($a, $fecha) - array_search($b, $fecha); - }); - foreach ($fecha as $f) { - unset($data[$f]); - } - array_walk($fecha_arr, function(&$item) { - if (strlen($item) < 4) { - $item = str_pad($item, 2, '0', \STR_PAD_LEFT); - } - }); - $data['fecha_banco'] = implode('-', $fecha_arr); - - $changed = false; - foreach ($data as $k => $v) { - if ($renovacion->$k != $v) { - $renovacion->$k = $v; - $changed = true; - if (strpos($k, 'fecha') !== false) { - $renovacion->uf = 0; - } - } - } - if ($changed) { - $renovacion->save(); - } - header('Location: ' . nUrl('pagares', 'show', ['pagare' => $renovacion->pagare])); - } - public static function add_renovacion() - { - $pagare = model(Pagare::class)->findOne(get('pagare')); - return view('proyectos.pagares.add_renovacion', compact('pagare')); - } - public static function do_add_renovacion() - { - $pagare = model(Pagare::class)->findOne(get('pagare')); - $data = post(); - - $data['pagare'] = $pagare->id; - $fecha = ['year', 'month', 'day']; - $fecha_arr = array_filter($data, function($item) use ($fecha) { - return (array_search($item, $fecha) !== false); - }, \ARRAY_FILTER_USE_KEY); - uksort($fecha_arr, function($a, $b) use ($fecha) { - return array_search($a, $fecha) - array_search($b, $fecha); - }); - foreach ($fecha as $f) { - unset($data[$f]); - } - array_walk($fecha_arr, function(&$item) { - if (strlen($item) < 4) { - $item = str_pad($item, 2, '0', \STR_PAD_LEFT); - } - }); - $data['fecha'] = implode('-', $fecha_arr); - - foreach ($fecha as &$key) { - $key .= '_banco'; - } - $fecha_arr = array_filter($data, function($item) use ($fecha) { - return (array_search($item, $fecha) !== false); - }, \ARRAY_FILTER_USE_KEY); - uksort($fecha_arr, function($a, $b) use ($fecha) { - return array_search($a, $fecha) - array_search($b, $fecha); - }); - foreach ($fecha as $f) { - unset($data[$f]); - } - array_walk($fecha_arr, function(&$item) { - if (strlen($item) < 4) { - $item = str_pad($item, 2, '0', \STR_PAD_LEFT); - } - }); - $data['fecha_banco'] = implode('-', $fecha_arr); - - $renovacion = model(RenovacionPagare::class)->create($data); - $renovacion->save(); - - header('Location: ' . nUrl('pagares', 'show', ['pagare' => $renovacion->pagare])); - } -} diff --git a/app/Controller/Pagos.php b/app/Controller/Pagos.php deleted file mode 100644 index f279b9e..0000000 --- a/app/Controller/Pagos.php +++ /dev/null @@ -1,358 +0,0 @@ -findOne($id); - $tipos = model(TipoPago::class)->orderByAsc('descripcion')->findMany(); - $estados = model(TipoEstadoPago::class)->orderByAsc('descripcion')->findMany(); - - return view('ventas.pagos.edit', compact('pago', 'asociado', 'id_asociado', 'tipos', 'estados')); - } - public static function editar() - { - $id = get('pago'); - $pago = model(Pago::class)->findOne($id); - - $fp = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $tipo = model(TipoPago::class)->findOne(post('tipo')); - $valor = correctNumber(post('valor')); - $banco = model(Banco::class)->where('nombre', post('banco'))->findOne(); - - $fe = Carbon::createFromDate(post('yearestado'), post('monthestado'), post('dayestado'), config('app.timezone')); - $estado = model(TipoEstadoPago::class)->findOne(post('estado')); - $uf = uf($fe); - - $est = $pago->estado(); - if ($est->fecha != $fe->format('Y-m-d')) { - $est->fecha = $fe->format('Y-m-d'); - $pago->uf = $uf->uf->value; - } - if ($est->estado != $estado->id) { - $est->estado = $estado->id; - } - - if ($pago->fecha != $fp->format('Y-m-d')) { - $pago->fecha = $fp->format('Y-m-d'); - } - if ($pago->tipo != $tipo->id) { - $pago->tipo = $tipo->id; - } - if ($pago->valor != $valor) { - $pago->valor = $valor; - } - if ($pago->identificador != post('identificador')) { - $pago->identificador = post('identificador'); - } - if ($pago->pagador != post('pagador')) { - $pago->pagador = post('pagador'); - } - if ($pago->banco != $banco->id) { - $pago->banco = $banco->id; - } - - $est->save(); - $pago->save(); - header('Location: ' . url('', ['p' => get('asociado') . 's', 'a' => 'show', get('asociado') => get(get('asociado'))])); - } - public static function pendientes() - { - $ventas = model(Venta::class) - ->select('venta.*') - ->rawJoin('JOIN (SELECT e1.* FROM estado_venta e1 JOIN (SELECT venta, MAX(id) AS id FROM estado_venta GROUP BY venta) e0 ON e0.id = e1.id)', ['ev.venta', '=', 'venta.id'], 'ev') - ->join('tipo_estado_venta', ['te.id', '=', 'ev.estado'], 'te') - ->join('propiedad', ['propiedad.id', '=', 'venta.propiedad']) - ->join('unidad', ['unidad.id', '=', 'propiedad.unidad_principal']) - ->join('proyecto', ['proyecto.id', '=', 'unidad.proyecto']) - ->where('te.activa', 1) - ->orderByAsc('proyecto.descripcion') - ->orderByExpr('LPAD(unidad.descripcion, 4, "0")') - ->findMany(); - $n = 30; - $mod = floor(count($ventas) / $n); - $i_rest = count($ventas) - count($ventas) % $mod + 1; - $rest = count($ventas) - $i_rest; - $lots = (object) ['size' => $mod, 'N' => $n, 'rest' => (object) [ - 'size' => $rest, - 'start' => $i_rest - ] - ]; - return view('ventas.pagos.pendientes', compact('ventas', 'lots')); - } - public static function para_pendientes() - { - $timezone = config('app.timezone'); - $today = Carbon::today($timezone); - $days = []; - $fechas = []; - for ($i = $today->copy()->subDays(15); $i <= $today->copy()->addDays(15); $i = $i->copy()->addDay()) { - $days []= $i->format('Y-m-d'); - $fechas []= $i->format('d-m-Y'); - } - $pagos_pendientes = model(Pago::class) - ->select('estado_pago.fecha') - ->selectExpr('COUNT(pago.id)', 'cantidad') - ->join('cuota', ['cuota.pago', '=', 'pago.id']) - ->join('venta', ['venta.pie', '=', 'cuota.pie']) - ->filter('filterEstado') - ->where('estado_pago.estado', 0) - ->where('venta.estado', 1) - ->whereGte('estado_pago.fecha', $today->copy()->subDays(15)->format('Y-m-d')) - ->whereLte('estado_pago.fecha', $today->copy()->addDays(15)->format('Y-m-d')) - ->orderByAsc('estado_pago.fecha') - ->groupBy('estado_pago.fecha') - ->findMany(); - $valores = array_fill(0, count($days), 0); - $anteriores = model(Pago::class) - ->join('cuota', ['cuota.pago', '=', 'pago.id']) - ->join('venta', ['venta.pie', '=', 'cuota.pie']) - ->filter('filterEstado') - ->where('estado_pago.estado', 0) - ->where('venta.estado', 1) - ->whereLt('estado_pago.fecha', $today->copy()->subDays(15)->format('Y-m-d')) - ->count(); - foreach ($pagos_pendientes as $pago) { - $valores[array_search($pago->fecha()->format('Y-m-d'), $days)] = $pago->cantidad; - } - $acum = []; - $sum = 0; - foreach ($valores as $valor) { - $sum += $valor; - $acum []= $sum; - } - $t = array_search($today->format('Y-m-d'), $days); - $color = array_merge( - array_fill(0, $t, 'red'), - ['blue'], - array_fill(0, count($days) - $t, 'green') - ); - $pagos = ['data' => $acum, 'historico' => $anteriores, 'backgroundColor' => $color]; - $abonos_pendientes = model(Pago::class) - ->select('estado_pago.fecha') - ->selectExpr('COUNT(pago.id)', 'cantidad') - ->filter('filterEstado') - ->where('estado_pago.estado', 1) - ->whereGte('estado_pago.fecha', $today->copy()->subDays(15)->format('Y-m-d')) - ->whereLt('estado_pago.fecha', $today->copy()->format('Y-m-d')) - ->orderByAsc('estado_pago.fecha') - ->groupBy('estado_pago.fecha') - ->findMany(); - $anteriores = model(Pago::class) - ->join('cuota', ['cuota.pago', '=', 'pago.id']) - ->join('venta', ['venta.pie', '=', 'cuota.pie']) - ->filter('filterEstado') - ->where('estado_pago.estado', 1) - ->where('venta.estado', 1) - ->whereLt('estado_pago.fecha', $today->copy()->subDays(15)->format('Y-m-d')) - ->count(); - $valores = array_fill(0, count($days), 0); - foreach ($abonos_pendientes as $pago) { - $valores[array_search($pago->fecha()->format('Y-m-d'), $days)] = $pago->cantidad; - } - $acum = []; - $sum = 0; - foreach ($valores as $valor) { - $sum += $valor; - $acum []= $sum; - } - $color = array_fill(0, count($pagos), 'rgb(200, 0, 0)'); - $abonos = ['data' => $acum, 'historico' => $anteriores, 'backgroundColor' => $color]; - $output = ['count' => count($days), 'fechas' => $fechas, 'pagos' => $pagos, 'abonos' => $abonos]; - echo json_encode($output); - } - public static function para_abonar() - { - $ids = json_decode(post('ids')); - //$id = get('id'); - function checkPago(&$pagos, $tipo, $pago) { - if (!$pago) { - return; - } - if (!$pago->estado()) { - $pagos []= [ - 'tipo' => $tipo, - 'pago' => $pago->asArray(), - 'estado' => -1 - ]; - return; - } - if ($pago->estado()->tipo()->descripcion == 'depositado') { - $pagos []= [ - 'tipo' => $tipo, - 'pago' => $pago->asArray(), - 'fecha' => format('shortDate', $pago->estado()->fecha), - 'valor' => format('pesos', $pago->valor, true), - 'estado' => 1 - ]; - } - } - $output = []; - foreach ($ids as $id) { - $venta = model(Venta::class)->findOne($id); - if ($venta->estado()->tipo()->activa == 0) { - $output []= ['status' => -1, 'venta' => $venta->id]; - continue; - } - $pagos = []; - if ($venta->pie()) { - foreach ($venta->pie()->cuotas() as $cuota) { - checkPago($pagos, 'Pie', $cuota->pago()); - } - if ($venta->pie()->reajuste()) { - checkPago($pagos, 'Reajuste', $venta->pie()->reajuste()); - } - } - if ($venta->credito()) { - checkPago($pagos, 'Credito', $venta->credito()->pago()); - } - if ($venta->escritura()) { - checkPago($pagos, 'Abono Escritura', $venta->escritura()->pago()); - } - if ($venta->subsidio()) { - checkPago($pagos, 'Subsidio', $venta->subsidio()->subsidio()); - checkPago($pagos, 'Ahorro', $venta->subsidio()->pago()); - } - if (count($pagos) <= 0) { - $output []= ['status' => -1, 'venta' => $venta->id]; - continue; - } - $output []= [ - 'status' => 1, - 'proyecto' => $venta->proyecto()->descripcion, - 'venta' => $venta->id, - 'propietario' => $venta->propietario()->nombreCompleto(), - 'departamento' => $venta->unidad()->descripcion, - 'pagos' => $pagos - ]; - } - return json_encode($output); - } - public static function rebotes() - { - $ids = json_decode(post('ids')); - $response = []; - foreach ($ids as $id) { - //$id = get('id'); - $venta = model(Venta::class)->findOne($id); - $rebotes = $venta->pagos(-1); - if (count($rebotes) < 1) { - $response []= ['status' => -1, 'venta' => $venta->id]; - continue; - } - usort($rebotes, function($a, $b) { - return $b->estado()->fecha()->diffInDays($a->estado()->fecha(), false); - }); - - $output = []; - $textos = []; - foreach ($rebotes as $rebote) { - $fuente = $rebote->fuente()[0]; - $text = ''; - $info = ['tipo' => ucwords(str_replace('_', ' ', $fuente->tipo))]; - switch ($fuente->tipo) { - case('cuota'): - $text .= ''; - $info['proyecto'] = $fuente->obj->pie()->venta()->proyecto()->descripcion; - $info['venta'] = $fuente->obj->pie()->venta()->id; - $info['departamento'] = $fuente->obj->pie()->venta()->unidad()->descripcion; - $info['propietario'] = $fuente->obj->pie()->venta()->propietario()->nombreCompleto(); - $info['fecha'] = format('shortDate', $rebote->estado()->fecha); - break; - } - $text .= ''; - $info['valor'] = format('pesos', $rebote->valor('pesos'), true); - $output []= array_merge(['id' => $rebote->id], $info); - $textos []= ['id' => $rebote->id, 'text' => $text]; - } - $response []= ['status' => 1, 'venta' => $venta->id, 'textos' => $textos, 'rebotes' => $output]; - } - - return json_encode($response); - } - public static function show() - { - $id = get('pago'); - $asociado = get('asociado'); - $id_asociado = get($asociado); - - $pago = model(Pago::class)->findOne($id); - - return view('ventas.pagos.show', compact('pago', 'asociado', 'id_asociado')); - } - public static function pagar() - { - $id = get('pago'); - $pago = model(Pago::class)->findOne($id); - $asociado = get('asociado'); - $id_asociado = get($asociado); - - return view('ventas.pagos.pagar', compact('pago', 'asociado', 'id_asociado')); - } - public static function pagando() - { - $id = get('pago'); - $pago = model(Pago::class)->findOne($id); - $asociado = get('asociado'); - $id_asociado = get($asociado); - - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $data = [ - 'fecha' => $f->format('Y-m-d'), - 'pago' => $pago->id, - 'estado' => 1 - ]; - $estado = model(EstadoPago::class)->create($data); - - $estado->save(); - header('Location: ' . url('', ['p' => $asociado . 's', 'a' => 'show', $asociado => $id_asociado])); - } - public static function abonar() - { - $id = get('pago'); - $pago = model(Pago::class)->findOne($id); - $asociado = get('asociado'); - $id_asociado = get($asociado); - - return view('ventas.pagos.abonar', compact('pago', 'asociado', 'id_asociado')); - } - public static function abonando() - { - $id = get('pago'); - $pago = model(Pago::class)->findOne($id); - $asociado = get('asociado'); - $id_asociado = get($asociado); - - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $data = [ - 'fecha' => $f->format('Y-m-d'), - 'pago' => $pago->id, - 'estado' => 2 - ]; - $estado = model(EstadoPago::class)->create($data); - - $estado->save(); - header('Location: ' . url('', ['p' => $asociado . 's', 'a' => 'show', $asociado => $id_asociado])); - } -} -?> diff --git a/app/Controller/Pies.php b/app/Controller/Pies.php deleted file mode 100644 index 38c2fcb..0000000 --- a/app/Controller/Pies.php +++ /dev/null @@ -1,104 +0,0 @@ -findOne($proyecto); - $ventas = $proyecto->ventas(); - self::sort($ventas); - return view('ventas.list', compact('proyecto', 'ventas')); - } - public static function listProyectos() - { - $proyectos = \Model::factory(Proyecto::class) - ->select('proyecto.*') - ->join('estado_proyecto', ['estado.proyecto', '=', 'proyecto.id'], 'estado') - ->join('tipo_estado_proyecto', ['tipo.id', '=', 'estado.estado'], 'tipo') - ->join('etapa_proyecto', ['etapa.id', '=', 'tipo.etapa'], 'etapa') - ->whereGte('etapa.orden', 4) - ->groupBy('proyecto.id') - ->findMany(); - echo view('ventas.proyectos', compact('proyectos')); - } - public static function resumen() - { - $id = get('pie'); - $pie = \Model::factory(\Incoviba\old\Venta\Pie::class)->findOne($id); - $venta = $pie->venta(); - return view('ventas.pies.resumen', compact('venta')); - } - public static function reajustar() - { - $id = get('venta'); - $venta = \Model::factory(Venta::class)->findOne($id); - return view('ventas.pies.reajustar', compact('venta')); - } - public static function reajuste() - { - $id = get('venta'); - $venta = \Model::factory(Venta::class)->findOne($id); - - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $pago = \Model::factory(Pago::class)->create(); - $pago->fecha = $f->format('Y-m-d'); - $pago->uf = (float) uf($f)->uf->value; - $pago->valor = str_replace('.', '', post('valor')); - - $pago->new(); - - $pie = $venta->pie(); - $pie->reajuste = $pago->id; - $pie->save(); - header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); - } - public static function edit() - { - $id = get('venta'); - $venta = \Model::factory(Venta::class)->findOne($id); - return view('ventas.pies.edit', compact('venta')); - } - public static function editar() - { - $id = get('venta'); - $venta = \Model::factory(Venta::class)->findOne($id); - $pie = $venta->pie(); - $valor = correctNumber(post('valor')); - if ($pie->valor != $valor) { - $pie->valor = $valor; - } - if ($pie->cuotas != post('cuotas')) { - $pie->cuotas = post('cuotas'); - } - - $pie->save(); - header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); - } - public static function asociar() - { - $id = get('pie'); - $pie = \Model::factory(Pie::class)->findOne($id); - $pie->asociado = post('asociado'); - - $pie->save(); - header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $pie->venta()->id])); - } -} -?> diff --git a/app/Controller/Postventas.php b/app/Controller/Postventas.php deleted file mode 100644 index 7b38cb6..0000000 --- a/app/Controller/Postventas.php +++ /dev/null @@ -1,69 +0,0 @@ -findOne($id); - - return view('ventas.postventas.add', compact('venta')); - } - public static function agregar() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $observaciones = json_decode(post('observaciones')); - $postventa = model(Postventa::class)->create(); - $postventa->venta_id = $venta->id; - $postventa->save(); - - $estado = model(EstadoPostventa::class)->create(); - $estado->postventa_id = $postventa->id; - $estado->tipo_estado_postventa_id = 1; - $estado->fecha = $f->format('Y-m-d'); - $estado->save(); - - foreach ($observaciones as $o) { - $observacion = model(Observacion::class)->create(); - $observacion->texto = post('observacion' . $o); - - $observacion->save(); - - $estado = model(EstadoObservacion::class)->create(); - $estado->observacion_id = $observacion->id; - $estado->tipo_estado_observacion_id = 1; - $estado->fecha = $f->format('Y-m-d'); - $estado->save(); - - $po = model(PostventaObservacion::class)->create(); - $po->postventa_id = $postventa->id; - $po->observacion_id = $observacion->id; - $po->save(); - } - header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); - } - public static function show() - { - $id = get('postventa'); - $postventa = model(Postventa::class)->findOne($id); - $venta = model(Venta::class)->findOne($postventa->venta_id); - - return view('ventas.postventas.show', compact('postventa', 'venta')); - } -} -?> diff --git a/app/Controller/Precios.php b/app/Controller/Precios.php deleted file mode 100644 index 20db97b..0000000 --- a/app/Controller/Precios.php +++ /dev/null @@ -1,177 +0,0 @@ -orderByAsc('descripcion')->findMany(); - return view('ventas.precios.proyectos', compact('proyectos')); - } - public static function list() - { - $proyecto = \model(Proyecto::class)->findOne(get('proyecto')); - return view('ventas.precios.list', compact('proyecto')); - } - public static function import() - { - $proyectos = \model(Proyecto::class)->orderByAsc('descripcion')->findMany(); - return view('ventas.precios.import', compact('proyectos')); - } - public static function importar() - { - $proyecto = \model(Proyecto::class)->findOne(post('proyecto')); - $fecha = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $file = explode(PHP_EOL, trim(file_get_contents($_FILES['archivo']['tmp_name']))); - $columnas = explode(';', array_shift($file)); - $tr = model(TipoEstadoPrecio::class)->where('descripcion', 'reemplazado')->findOne()->id; - $tv = model(TipoEstadoPrecio::class)->where('descripcion', 'vigente')->findOne()->id; - foreach ($file as $line) { - if (trim($line) == '') { - continue; - } - $info = explode(';', $line); - $tipo = \model(TipoUnidad::class)->where('descripcion', $info[0])->findOne(); - $unidad = \model(Unidad::class)->where('tipo', $tipo->id)->where('descripcion', $info[1])->where('proyecto', $proyecto->id)->findOne(); - if (!$unidad) { - continue; - } - - try { - self::reemplazar($unidad->id, $info[2], $fecha, $tr, $tv); - } catch (\Exception $e) { - continue; - } - } - header('Location: ' . nUrl('precios', 'list', ['proyecto' => $proyecto->id])); - } - public static function add() - { - $proyecto = \model(Proyecto::class)->findOne(get('proyecto')); - return view('ventas.precios.add', compact('proyecto')); - } - public static function agregar() - { - $proyecto = get('proyecto'); - $fecha = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $precios = []; - foreach (post() as $name => $valor) { - if ($valor == '' or strpos($name, 'precio') === false) { - continue; - } - list($tipo, $id) = explode(':', $name); - $tipo = trim(str_replace('precio', '', $tipo), '_'); - $id = explode('-', $id); - switch (count($id)) { - case 1: - $precios []= ['tipo' => 'pt', 'id' => $id[0], 'valor' => $valor]; - break; - case 2: - $exists = false; - foreach ($precios as $precio) { - if ($precio['tipo'] == 'pt' and $precio['id'] == $id[0]) { - $exists = true; - break; - } - } - if (!$exists) { - $precios []= ['tipo' => 'subtipo', 'id' => $id[1], 'pt' => $id[0], 'valor' => $valor]; - } - break; - case 3: - $exists = false; - foreach ($precios as $precio) { - if ($precio['tipo'] == 'pt' and $precio['id'] == $id[0]) { - $exists = true; - break; - } - if ($precio['tipo'] == 'subtipo' and 'id' == $id[1] and 'pt' == $id[0]) { - $exists = true; - break; - } - } - if (!$exists) { - $precios []= ['tipo' => 'unidad', 'id' => $id[2], 'valor' => $valor]; - } - break; - } - } - foreach ($precios as $precio) { - $precio = (object) $precio; - try { - switch ($precio->tipo) { - case 'pt': - $pt = model(ProyectoTipoUnidad::class)->findOne($precio->id); - $pt->setPrecios($fecha, $precio->valor); - break; - case 'subtipo': - $pt = model(ProyectoTipoUnidad::class)->findOne($precio->pt); - $pt->setPreciosSubtipo($precios->id, $fecha, $precio->valor); - break; - case 'unidad': - $unidad = model(Unidad::class)->findOne($precio->id); - $unidad->setPrecio($fecha, $precio->valor); - break; - } - } catch(\Exception $e) { - continue; - } - } - header('Location: ' . nUrl('precios', 'list', ['proyecto' => $proyecto])); - } - protected static function reemplazar(int $unidad_id, float $valor, \DateTime $fecha, int $tr = 0, int $tv = 0) - { - if ($tr == 0) { - $tr = model(TipoEstadoPrecio::class)->where('descripcion', 'reemplazado')->findOne()->id; - } - if ($tv == 0) { - $tv = model(TipoEstadoPrecio::class)->where('descripcion', 'vigente')->findOne()->id; - } - $olds = \model(Precio::class)->where('unidad', $unidad_id)->findMany(); - if ($olds !== false) { - foreach ($olds as $old) { - if (!$old->vigente()) { - continue; - } - $data = [ - 'precio' => $old->id, - 'fecha' => $fecha->format('Y-m-d'), - 'estado' => $tr - ]; - $estado = \model(EstadoPrecio::class)->create($data); - $estado->save(); - } - } - $data = [ - 'unidad' => $unidad_id, - 'valor' => $valor - ]; - $precio = (new Factory(Precio::class))->where($data)->find(); - if (!$precio) { - $precio = \model(Precio::class)->create($data); - $precio->save(); - } - $data = [ - 'precio' => $precio->id, - 'fecha' => $fecha->format('Y-m-d'), - 'estado' => $tv - ]; - $estado = \model(EstadoPrecio::class)->create($data); - $estado->save(); - } -} diff --git a/app/Controller/Propietarios.php b/app/Controller/Propietarios.php deleted file mode 100644 index 5d38ee7..0000000 --- a/app/Controller/Propietarios.php +++ /dev/null @@ -1,129 +0,0 @@ -findOne($id); - $propietario = $venta->propietario(); - $regiones = model(Region::class)->orderByAsc('numeracion')->findMany(); - - return view('ventas.propietarios.edit', compact('venta', 'propietario', 'regiones')); - } - public static function editar() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - - $info = post(); - list($info['rut'], $info['dv']) = explode('-', str_replace('.', '', $info['rut'])); - $propietario = model(Propietario::class)->findOne($info['rut']); - if (!$propietario) { - $propietario = model(Propietario::class)->create(); - } - if ($propietario->direccion != 0) { - $direccion = $propietario->direccion(); - } else { - $direccion = model(Direccion::class) - ->where('calle', post('calle')) - ->where('numero', post('numero')) - ->where('extra', post('extra')) - ->where('comuna', post('comuna')) - ->findOne(); - if (!$direccion) { - $data = [ - 'calle' => post('calle'), - 'numero' => post('numero'), - 'extra' => post('extra'), - 'comuna' => post('comuna') - ]; - $direccion = model(Direccion::class)->create($data); - } - } - - if (isset($info['empresa'])) { - $info['apellido_paterno'] = ''; - $info['apellido_materno'] = ''; - } - - if ($propietario->representante != 0) { - list($info['rep_rut'], $info['rep_dv']) = explode('-', str_replace('.', '', $info['rep_rut'])); - $representante = $propietario->representante(); - } elseif (isset($info['rep_rut'])) { - list($info['rep_rut'], $info['rep_dv']) = explode('-', str_replace('.', '', $info['rep_rut'])); - $representante= model(Propietario::class)->findOne($info['rep_rut']); - if (!$representante) { - $representante= model(Propietario::class)->create(); - } - } - - $fields = ['rut', 'dv', 'nombres', 'apellido_paterno', 'apellido_materno']; - $change = false; - foreach ($fields as $key) { - if ($propietario->$key != $info[$key]) { - $propietario->$key = $info[$key]; - $change = true; - } - } - if ($direccion->isNew()) { - $direccion->save(); - } - if ($propietario->direccion != $direccion->id) { - $propietario->direccion = $direccion->id; - $change = true; - } - if ($change) { - d($propietario); - $propietario->save(); - } - - if (isset($info['rep_rut'])) { - $change = false; - if ($representante->rut != $info['rep_rut']) { - $representante->rut = $info['rep_rut']; - $representante->dv = $info['rep_dv']; - $change = true; - } - if ($representante->nombres != $info['rep_nombres']) { - $representante->nombres = $info['rep_nombres']; - $change = true; - } - if ($representante->apellido_paterno != $info['rep_apaterno']) { - $representante->apellido_paterno = $info['rep_apaterno']; - $change = true; - } - if ($representante->apellido_materno != $info['rep_amaterno']) { - $representante->apellido_materno = $info['rep_amaterno']; - $change = true; - } - if ($representante->direccion != $direccion->id) { - $representante->direccion = $direccion->id; - $change = true; - } - if ($change) { - $representante->save(); - } - if ($propietario->representante != $representante->rut) { - $propietario->representante = $representante->rut; - $propietario->save(); - } - } - - if ($venta->propietario != $propietario->rut) { - $venta->propietario = $propietario->rut; - $venta->save(); - } - header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); - } -} -?> diff --git a/app/Controller/ProyectoTipoUnidades.php b/app/Controller/ProyectoTipoUnidades.php deleted file mode 100644 index 32c0c1d..0000000 --- a/app/Controller/ProyectoTipoUnidades.php +++ /dev/null @@ -1,77 +0,0 @@ -findOne($id); - $tipos = model(TipoUnidad::class)->findMany(); - - return view('proyectos.tipo_unidades.edit', compact('tipo', 'tipos')); - } - public static function editar() - { - $id = get('tipo_unidad'); - $tipo = model(ProyectoTipoUnidad::class)->findOne($id); - - $changed = false; - foreach (post() as $field => $value) { - if ($tipo->{$field} != $value) { - $tipo->{$field} = $value; - $changed = true; - } - } - if ($changed) { - $tipo->save(); - } - header('Location: ' . nUrl('proyectos', 'list_unidades', ['proyecto' => $tipo->proyecto()->id])); - } - public static function add_unidad() - { - $id = get('tipo_unidad'); - $tipo = model(ProyectoTipoUnidad::class)->findOne($id); - if ($tipo->tipo()->descripcion == 'departamento') { - return view('proyectos.unidades.add', compact('tipo')); - } - return view('proyectos.unidades.add2', compact('tipo')); - } - public static function assign() - { - $id = get('proyecto'); - $proyecto = model(Proyecto::class)->findOne($id); - $tipos = model(ProyectoTipoUnidad::class)->where('proyecto', $proyecto->id)->findMany(); - $libres = model(Unidad::class)->where('proyecto', $proyecto->id)->where('pt', 0)->findMany(); - - return view('proyectos.unidades.assign', compact('proyecto', 'tipos', 'libres')); - } - public static function asignar() - { - $id = get('proyecto'); - $proyecto = model(Proyecto::class)->findOne($id); - - $libres = model(Unidad::class)->where('proyecto', $proyecto->id)->where('pt', 0)->findMany(); - foreach ($libres as $unidad) { - $unidad->pt = post('tipo' . $unidad->id); - $unidad->save(); - } - header('Location: ' . nUrl('proyectos', 'list_unidades', ['proyecto' => $proyecto->id])); - } -} diff --git a/app/Controller/Proyectos.php b/app/Controller/Proyectos.php deleted file mode 100644 index 9c69ad5..0000000 --- a/app/Controller/Proyectos.php +++ /dev/null @@ -1,327 +0,0 @@ -where('inmobiliaria', $id_inmobiliaria); - } else { - $proyectos = model(Proyecto::class); - } - $proyectos = $proyectos->order_by_asc('descripcion')->findMany(); - return view('proyectos.list', compact('proyectos')); - } - public static function show() - { - $id_proyecto = get('proyecto'); - if ($id_proyecto == null) { - header('Location: ' . url('', ['p' => 'proyectos', 'a' => 'list'])); - } - $proyecto = model(Proyecto::class)->findOne($id_proyecto); - $estados = model(TipoEstadoProyecto::class)->findMany(); - foreach ($estados as &$estado) { - $estado = $estado->asArray()['orden'] + 1; - } - $colors = []; - - $ventas_pt = (object) ['fields' => [], 'data' => [], 'totales' => [], 'vendidas' => []]; - $ventas = $proyecto->ventas('fecha'); - $months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']; - if (count($ventas) > 0) { - $inicio = $ventas[0]->fecha()->format('Y'); - $fin = $ventas[count($ventas) - 1]->fecha()->format('Y'); - $end = $ventas[count($ventas) - 1]->fecha()->format('M'); - for ($y = $inicio; $y <= $fin; $y ++) { - foreach ($months as $month) { - $ventas_pt->fields []= $y . ' ' . $month; - if ($y == $fin and $month == $end) { - break; - } - } - } - } - - foreach ($proyecto->tipologias() as $tipo) { - if (!isset($ventas_pt->data[$tipo->tipologia->descripcion])) { - $ventas_pt->data[$tipo->tipologia->descripcion] = []; - $ventas_pt->data[$tipo->tipologia->descripcion] = array_fill(0, count($ventas_pt->fields), 0); - $ventas_pt->totales[$tipo->tipologia->descripcion] = 0; - $ventas_pt->vendidas[$tipo->tipologia->descripcion] = 0; - } - foreach ($tipo->tipos as $pt) { - foreach ($pt->ventas('fecha') as $venta) { - $ventas_pt->data[$tipo->tipologia->descripcion][array_search($venta->fecha()->format('Y M'), $ventas_pt->fields)] ++; - $ventas_pt->vendidas[$tipo->tipologia->descripcion] ++; - } - $ventas_pt->totales[$tipo->tipologia->descripcion] += count($pt->unidades()); - } - } - foreach ($ventas_pt->data as $tipo => $data) { - $acum = 0; - foreach ($data as $i => $cantidad) { - $acum += $cantidad; - $ventas_pt->data[$tipo][$i] = round($acum / $ventas_pt->totales[$tipo] * 100, 2); - } - } - $meses = ['Ene', 'Feb', 'Mar', 'Abr', 'May', 'Jun', 'Jul', 'Ago', 'Sep', 'Oct', 'Nov', 'Dic']; - array_walk($ventas_pt->fields, function(&$item) use ($meses, $months) { - $item = str_replace($months, $meses, $item); - }); - - for ($i = 0; $i < 10; $i ++) { - $colors[$i] = 'rgb(' . mt_rand(0, 255) . ', ' . mt_rand(0, 255) . ', ' . mt_rand(0, 255) . ')'; - } - return view('proyectos.show', compact('proyecto', 'estados', 'colors', 'ventas_pt')); - } - public static function historial() - { - $proyecto = model(Proyecto::class)->findOne(get('proyecto')); - return view('proyectos.historia', compact('proyecto')); - } - public static function advance() - { - $id_proyecto = get('proyecto'); - $proyecto = model(Proyecto::class)->findOne($id_proyecto); - $estados = model(TipoEstadoProyecto::class)->whereGt('orden', $proyecto->estado()->tipo()->orden)->orderByAsc('orden')->findMany(); - - return view('proyectos.advance', compact('proyecto', 'estados')); - } - public static function avanzar() - { - $id_proyecto = get('proyecto'); - $proyecto = model(Proyecto::class)->findOne($id_proyecto); - $id_tipo = post('estado'); - $tipo = model(TipoEstadoProyecto::class)->findOne($id_tipo); - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - - $tipos = model(TipoEstadoProyecto::class) - ->whereGt('orden', $proyecto->estado()->tipo()->orden) - ->whereLte('orden', $tipo->orden) - ->orderByAsc('orden') - ->findMany(); - - foreach ($tipos as $t) { - $estado = model(EstadoProyecto::class)->create(); - $estado->proyecto = $proyecto->id; - $estado->estado = $t->id; - $estado->fecha = $f->format('Y-m-d'); - $estado->save(); - } - header('Location: ' . url('', ['p' => 'proyectos', 'a' => 'show', 'proyecto' => $proyecto->id])); - } - public static function avance() - { - $id = get('proyecto'); - $proyecto = model(Proyecto::class)->findOne($id); - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $av = post('avance') / 100; - $ep = (double) post('estado_pago'); - $avance = model(AvanceConstruccion::class) - ->where('proyecto', $proyecto->id) - ->where('fecha', $f->format('Y-m-d')) - ->findOne(); - if (!$avance) { - $data = [ - 'proyecto' => $proyecto->id, - 'fecha' => $f->format('Y-m-d'), - 'numero' => post('numero'), - 'avance' => $av, - 'estado_pago' => $ep - ]; - $avance = model(AvanceConstruccion::class)->create($data); - } - $avance->save(); - header('Location: ' . url('', ['p' => 'proyectos', 'a' => 'historial', 'proyecto' => $proyecto->id])); - } - public static function add() - { - $rut = get('inmobiliaria'); - - $inmobiliarias = model(Inmobiliaria::class)->orderByAsc('abreviacion')->findMany(); - $regiones = model(Region::class)->orderByAsc('numeracion')->findMany(); - - return view('proyectos.add', compact('inmobiliarias', 'rut', 'regiones')); - } - public static function agregar() - { - $proyecto = model(Proyecto::class)->where('descripcion', post('descripcion'))->where('inmobiliaria', post('inmobiliaria'))->find_one(); - if ($proyecto) { - header('Location: ' . url('', ['p' => 'proyectos', 'a' => 'show', 'proyecto' => $proyecto->id])); - die(); - } - $proyecto = model(Proyecto::class)->create(); - $proyecto->descripcion = post('descripcion'); - $proyecto->inmobiliaria = post('inmobiliaria'); - - $direccion = model(Direccion::class) - ->where('calle', post('calle')) - ->where('numero', post('numero')) - ->where('extra', post('extra')) - ->where('comuna', post('comuna')) - ->findOne(); - if (!$direccion) { - $direccion = model(Direccion::class)->create(); - $direccion->calle = post('calle'); - $direccion->numero = post('numero'); - $direccion->extra = post('extra'); - $direccion->comuna = post('comuna'); - $direccion->save(); - } - - $proyecto->direccion = $direccion->id; - $proyecto->save(); - - $fecha = Carbon::parse(post('year'), post('month'), post('day'), config('app.timezone')); - $estado = model(EstadoProyecto::class)->create(); - $estado->proyecto = $proyecto->id; - $estado->estado = 1; - $estado->fecha = $fecha->format('Y-m-d'); - $estado->save(); - header('Location: ' . url('', ['p' => 'proyectos', 'a' => 'show', 'proyecto' => $proyecto->id])); - } - public static function disponibles() - { - $id = get('proyecto'); - $proyecto = model(Proyecto::class)->findOne($id); - - return view('proyectos.disponibles', compact('proyecto')); - } - public static function list_unidades() - { - $id = get('proyecto'); - $proyecto = model(Proyecto::class)->findOne($id); - $libres = model(Unidad::class)->where('proyecto', $proyecto->id)->where('pt', 0)->findMany(); - - return view('proyectos.unidades.list', compact('proyecto', 'libres')); - } - public static function add_tipo_unidad() - { - $id = get('proyecto'); - $proyecto = model(Proyecto::class)->findOne($id); - $tipos = model(TipoUnidad::class)->findMany(); - - return view('proyectos.tipo_unidades.add', compact('proyecto', 'tipos')); - } - public static function agregar_tipo_unidad() - { - $id = get('proyecto'); - $proyecto = model(Proyecto::class)->findOne($id); - $data = post(); - $data['proyecto'] = $proyecto->id; - $tipo = model(ProyectoTipoUnidad::class)->where('proyecto', $data['proyecto']) - ->where('tipo', $data['tipo'])->where('nombre', $data['nombre'])->findOne(); - if ($tipo === false) { - $tipo = model(ProyectoTipoUnidad::class)->create($data); - $tipo->save(); - } - header('Location: ' . nUrl('proyectos', 'list_unidades', ['proyecto' => $proyecto->id])); - } - public static function construccion() - { - $id = get('proyecto'); - $proyecto = model(Proyecto::class)->findOne($id); - return view('proyectos.construccion', compact('proyecto')); - } - public static function editar_avance() - { - $avance = model(AvanceConstruccion::class)->findOne(get('avance')); - return view('proyectos.avances.edit', compact('avance')); - } - public static function edit_avance() - { - $avance = model(AvanceConstruccion::class)->findOne(get('avance')); - $cols = [ - 'day', - 'month', - 'year', - 'avance', - 'estado_pago', - 'pagado', - 'day_pago', - 'month_pago', - 'year_pago' - ]; - $data = array_filter(post(), function($key) use ($cols) { - return (array_search($key, $cols) !== false); - }, \ARRAY_FILTER_USE_KEY); - $data['fecha'] = implode('-', [$data['year'], $data['month'], $data['day']]); - unset($data['year']); - unset($data['month']); - unset($data['day']); - $data['fecha_pagado'] = implode('-', [$data['year_pago'], $data['month_pago'], $data['day_pago']]); - unset($data['year_pago']); - unset($data['month_pago']); - unset($data['day_pago']); - $data['avance'] /= 100; - $avance->edit($data); - - header('Location: ' . nUrl('proyectos', 'construccion', ['proyecto' => $avance->proyecto])); - } - public static function reservas() - { - $proyecto = model(Proyecto::class)->findOne(get('proyecto')); - $pisos = []; - $totales = []; - foreach ($proyecto->unidades('departamento') as $unidad) { - if (!isset($pisos[$unidad->piso - 1])) { - $piso = (object) ['descripcion' => $unidad->piso, 'unidades' => []]; - $pisos[$unidad->piso - 1] = $piso; - } - if (!isset($totales[$unidad->linea()])) { - $totales[$unidad->linea()] = (object) ['ventas' => 0, 'reservas' => 0]; - } - $pisos[$unidad->piso - 1]->unidades[$unidad->linea()] = $unidad; - if ($unidad->isVendida()) { - $totales[$unidad->linea()]->ventas ++; - } - if ($unidad->isReservada()) { - $totales[$unidad->linea()]->reservas ++; - } - } - ksort($pisos); - $max_unidades = 0; - foreach ($pisos as $piso) { - if (count($piso->unidades) > $max_unidades) { - $max_unidades = count($piso->unidades); - } - } - return view('proyectos.reservas.base', compact('proyecto', 'pisos', 'max_unidades', 'totales')); - } - public static function unidades() - { - if (get('proyecto')) { - $proyecto = model(Proyecto::class)->findOne(get('proyecto')); - $libres = model(Unidad::class)->where('proyecto', $proyecto->id)->where('pt', 0)->findMany(); - - return view('proyectos.unidades.list', compact('proyecto', 'libres')); - } - $proyectos = model(Proyecto::class)->order_by_asc('descripcion')->findMany(); - return view('proyectos.unidades.proyectos', compact('proyectos')); - } -} -?> diff --git a/app/Controller/Reajustes.php b/app/Controller/Reajustes.php deleted file mode 100644 index 4c6c938..0000000 --- a/app/Controller/Reajustes.php +++ /dev/null @@ -1,90 +0,0 @@ -findOne($id); - return view('ventas.pies.reajustes.edit', compact('venta')); - } - public static function editar() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $uf = uf($f); - - $valor = correctNumber(post('valor')); - if ($valor == '') { - $valor_uf = correctNumber(post('valor_uf')); - $valor = $valor_uf * $uf->uf->value; - } - $pago = $venta->pie()->reajuste(); - if ($pago->valor != $valor) { - $pago->valor = $valor; - } - if ($pago->fecha != $f->format('Y-m-d')) { - $pago->fecha = $f->format('Y-m-d'); - $pago->uf = $uf->uf->value; - } - - $pago->save(); - header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); - } - public static function pagar() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - - return view('ventas.pies.reajustes.pagar', compact('venta')); - } - public static function pagado() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - - $data = [ - 'pago' => $venta->pie()->reajuste()->id, - 'fecha' => $f->format('Y-m-d'), - 'estado' => 1 - ]; - $estado = model(EstadoPago::class)->create($data); - $estado->save(); - header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); - } - public static function abonar() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - - return view('ventas.pies.reajustes.abonar', compact('venta')); - } - public static function abonado() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - - $data = [ - 'pago' => $venta->pie()->reajuste()->id, - 'fecha' => $f->format('Y-m-d'), - 'estado' => 2 - ]; - $estado = model(EstadoPago::class)->create($data); - $estado->save(); - header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); - } -} -?> diff --git a/app/Controller/Registros.php b/app/Controller/Registros.php deleted file mode 100644 index 546fece..0000000 --- a/app/Controller/Registros.php +++ /dev/null @@ -1,39 +0,0 @@ -orderByDesc('time')->findMany(); - $ini = new Color(0, 100, 0); - $end = new Color(255, 255, 255); - $colores = self::colores($end, $ini, 100); - return view('admin.registros.list', compact('registros', 'colores')); - } - public static function show() - { - $registro = model(RModel::class)->findOne(get('registro')); - $ini = new Color(0, 100, 0); - $end = new Color(255, 255, 255); - $colores = self::colores($end, $ini, 100); - return view('admin.registros.show', compact('registro', 'colores')); - } - protected static function colores($ini, $end, $max) - { - $current = $ini->toVector(); - $colores = []; - $line = new Line($ini->toVector(), $end->toVector()); - for ($i = 0; $i < $max; $i ++) { - $colores[$i] = new Color($current); - $current = $line->move($current, $line->length() / $max); - } - return $colores; - } -} diff --git a/app/Controller/Subsidios.php b/app/Controller/Subsidios.php deleted file mode 100644 index 5107fc3..0000000 --- a/app/Controller/Subsidios.php +++ /dev/null @@ -1,184 +0,0 @@ -findOne($id); - echo view('ventas.subsidios.add', compact('venta')); - } - public static function do_add() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $uf = uf($f); - - $pago1 = model(Pago::class)->create(); - $valor = post('ahorro_uf') * $uf->uf->value; - if (post('ahorro') != null) { - $valor = post('ahorro'); - } - $pago1->valor = $valor; - $pago1->fecha = $f->format('Y-m-d'); - $pago1->uf = $uf->uf->value; - - $pago2 = model(Pago::class)->create(); - $valor = post('subsidio_uf') * $uf->uf->value; - if (post('subsidio') != null) { - $valor = post('subsidio'); - } - $pago2->valor = $valor; - $pago2->fecha = $f->format('Y-m-d'); - $pago2->uf = $uf->uf->value; - - $pago1->new(); - $pago2->new(); - - $subsidio = model(Subsidio::class)->create(); - $subsidio->pago = $pago1->id; - $subsidio->subsidio = $pago2->id; - - $subsidio->save(); - $venta->subsidio = $subsidio->id(); - $venta->save(); - header('Location: ' . nUrl('ventas', 'show', ['venta' => $venta->id])); - } - public static function edit() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - echo view('ventas.subsidios.edit', compact('venta')); - } - public static function do_edit() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $uf = uf($f); - - $pago1 = $venta->subsidio()->pago(); - $valor = post('ahorro_uf') * $uf->uf->value; - if (post('ahorro') != null) { - $valor = post('ahorro'); - } - $pago1->valor = $valor; - $pago1->fecha = $f->format('Y-m-d'); - $pago1->uf = $uf->uf->value; - - $pago2 = $venta->subsidio()->subsidio(); - $valor = post('subsidio_uf') * $uf->uf->value; - if (post('subsidio') != null) { - $valor = post('subsidio'); - } - $pago2->valor = $valor; - $pago2->fecha = $f->format('Y-m-d'); - $pago2->uf = $uf->uf->value; - - $pago1->save(); - $pago2->save(); - header('Location: ' . nUrl('ventas', 'show', ['venta' => $venta->id])); - } - public static function pagar() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - $tipo = get('tipo'); - switch($tipo) { - case 'subsidio': - $pago = $venta->subsidio()->subsidio(); - break; - case 'pago': - $pago = $venta->subsidio()->pago(); - break; - default: - $pago = null; - } - echo view('ventas.subsidios.pagar', compact('venta', 'pago')); - } - public static function do_pagar() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $tipo = post('tipo'); - switch($tipo) { - case 'subsidio': - $pago = $venta->subsidio()->subsidio(); - break; - case 'pago': - $pago = $venta->subsidio()->pago(); - break; - default: - $pago = null; - } - $pago->valor = post('valor'); - $tipo = model(TipoEstadoPago::class)->where('descripcion', 'depositado')->findOne(); - $data = [ - 'pago' => $pago->id, - 'fecha' => $f->format('Y-m-d'), - 'estado' => $tipo->id - ]; - $estado = model(EstadoPago::class)->create($data); - $pago->save(); - $estado->save(); - header('Location: ' . nUrl('ventas', 'show', ['venta' => $venta->id])); - } - public static function abonar() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - $tipo = get('tipo'); - switch($tipo) { - case 'subsidio': - $pago = $venta->subsidio()->subsidio(); - break; - case 'pago': - $pago = $venta->subsidio()->pago(); - break; - default: - $pago = null; - } - echo view('ventas.subsidios.abonar', compact('venta', 'pago')); - } - public static function do_abonar() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $tipo = post('tipo'); - switch($tipo) { - case 'subsidio': - $pago = $venta->subsidio()->subsidio(); - break; - case 'pago': - $pago = $venta->subsidio()->pago(); - break; - default: - $pago = null; - } - $pago->valor = post('valor'); - $tipo = model(TipoEstadoPago::class)->where('descripcion', 'abonado')->findOne(); - $data = [ - 'pago' => $pago->id, - 'fecha' => $f->format('Y-m-d'), - 'estado' => $tipo->id - ]; - $estado = model(EstadoPago::class)->create($data); - $pago->save(); - $estado->save(); - header('Location: ' . nUrl('ventas', 'show', ['venta' => $venta->id])); - } -} diff --git a/app/Controller/Temas.php b/app/Controller/Temas.php deleted file mode 100644 index 24b121a..0000000 --- a/app/Controller/Temas.php +++ /dev/null @@ -1,111 +0,0 @@ -orderByAsc('descripcion')->findMany(); - return view('temas.add', compact('proyectos')); - } - public static function agregar() - { - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $data = [ - "proyecto_id" => post('proyecto'), - "inicio" => $f->format('Y-m-d'), - "texto" => post('texto') - ]; - $tema = model(Tema::class)->create($data); - - $tema->save(); - header('Location: ' . url('', ['p' => 'temas', 'a' => 'list'])); - } - public static function list() - { - $temas = model(Tema::class)->findMany(); - $t = Carbon::today(config('app.timezone')); - foreach ($temas as $i => $tema) { - if ($tema->cierre()->year != -1 and $t->diff($tema->cierre())->days > 10) { - unset($temas[$i]); - } - } - $temas = array_values($temas); - usort($temas, function($a, $b) { - $p = strcmp($a->proyecto()->descripcion, $b->proyecto()->descripcion); - if ($p == 0) { - $f = $b->inicio()->diff($a->inicio())->format('%r%a'); - if ($f == 0) { - return $a->id - $b->id; - } - return $f; - } - return $p; - }); - - return view('temas.list', compact('temas')); - } - public static function edit() - { - $id = get('tema'); - $tema = model(Tema::class)->findOne($id); - $proyectos = model(Proyecto::class)->orderByAsc('descripcion')->findMany(); - return view('temas.edit', compact('tema', 'proyectos')); - } - public static function editar() - { - $id = get('tema'); - $tema = model(Tema::class)->findOne($id); - - $proyecto = post('proyecto'); - $changed = false; - if ($tema->proyecto_id != $proyecto) { - $tema->proyecto_id = $proyecto; - $changed = true; - } - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - if ($tema->inicio() != $f) { - $tema->inicio = $f->format('Y-m-d'); - $changed = true; - } - $texto = post('texto'); - if ($tema->texto != $texto) { - $tema->texto = $texto; - $changed = true; - } - - if ($changed) { - $tema->save(); - } - header('Location: ' . url('', ['p' => 'temas', 'a' => 'list'])); - } - public static function cerrar() - { - $id = get('tema'); - $tema = model(Tema::class)->findOne($id); - $f = Carbon::today(config('app.timezone')); - $tema->cierre = $f->format('Y-m-d'); - - $tema->save(); - header('Location: ' . url('', ['p' => 'temas', 'a' => 'list'])); - } - public static function abrir() - { - $id = get('tema'); - $tema = model(Tema::class)->findOne($id)->as_array(); - unset($tema['id'], $tema['cierre'], $tema['created_at'], $tema['updated_at']); - - $tema = model(Tema::class)->create($tema); - - $tema->save(); - header('Location: ' . url('', ['p' => 'temas', 'a' => 'list'])); - } -} -?> diff --git a/app/Controller/Unidades.php b/app/Controller/Unidades.php deleted file mode 100644 index 9f0da01..0000000 --- a/app/Controller/Unidades.php +++ /dev/null @@ -1,126 +0,0 @@ -findOne($id); - $len = strlen(post('total')); - - $unis = json_decode(post('unidades')); - $data = []; - foreach ($unis as $n_unidad) { - if ($tipo->tipo()->descripcion == 'departamento') { - $ini = post('piso_ini' . $n_unidad); - $end = post('piso_end' . $n_unidad); - $subtipo = post('linea' . $n_unidad); - $orientacion = post('orientacion' . $n_unidad); - for ($piso = $ini; $piso <= $end; $piso ++) { - $descripcion = $piso . str_pad(post('linea' . $n_unidad), $len, '0', \STR_PAD_LEFT); - - $data []= [ - 'proyecto' => $tipo->proyecto()->id, - 'tipo' => $tipo->tipo()->id, - 'subtipo' => $subtipo, - 'piso' => $piso, - 'descripcion' => $descripcion, - 'abreviacion' => $tipo->abreviacion, - 'm2' => $tipo->m2, - 'terraza' => $tipo->terraza, - 'logia' => $tipo->logia, - 'orientacion' => $orientacion, - 'pt' => $tipo->id - ]; - } - } else { - $descripcion = post('descripcion' . $n_unidad); - $piso = post('piso' . $n_unidad); - $data []= [ - 'proyecto' => $tipo->proyecto()->id, - 'tipo' => $tipo->tipo()->id, - 'piso' => $piso, - 'descripcion' => $descripcion, - 'abreviacion' => $tipo->abreviacion, - 'm2' => $tipo->m2, - 'terraza' => $tipo->terraza, - 'logia' => $tipo->logia, - 'pt' => $tipo->id - ]; - } - } - - foreach ($data as $uni) { - $unidad = model(Unidad::class) - ->where('descripcion', $uni['descripcion']) - ->where('proyecto', $uni['proyecto']) - ->where('tipo', $uni['tipo']) - ->findOne(); - if ($unidad) { - continue; - } - $unidad = model(Unidad::class)->create($uni); - $unidad->save(); - } - header('Location: ' . url('', ['p' => 'proyectos', 'a' => 'list_unidades', 'proyecto' => $tipo->proyecto()->id])); - } - public static function edit() - { - $id = get('unidad'); - $unidad = model(Unidad::class)->findOne($id); - $tipos = model(ProyectoTipoUnidad::class)->where('proyecto', $unidad->proyecto()->id)->findMany(); - $abreviaciones = ['N', 'NE', 'E', 'SE', 'S', 'SO', 'O', 'NO']; - $descripciones = ['Norte', 'Noreste', 'Este', 'Sureste', 'Sur', 'Suroeste', 'Oeste', 'Noroeste']; - $orientaciones = []; - foreach ($abreviaciones as $i => $ab) { - $orientaciones []= (object) ['abreviacion' => $ab, 'descripcion' => $descripciones[$i]]; - } - - return view('proyectos.unidades.edit', compact('unidad', 'tipos', 'orientaciones')); - } - public static function editar() - { - $id = get('unidad'); - $unidad = model(Unidad::class)->findOne($id); - - $change = false; - $fields = ['descripcion', 'tipo', 'piso', 'linea', 'orientacion']; - foreach ($fields as $field) { - $f = $field; - if ($f == 'tipo') { - $f = 'pt'; - } - if ($f == 'linea') { - $f = 'subtipo'; - } - if ($unidad->{$f} != post($field)) { - $unidad->{$f} = post($field); - $change = true; - } - } - - if ($change) { - $unidad->save(); - } - header('Location: ' . nUrl('proyectos', 'list_unidades', ['proyecto' => $unidad->proyecto()->id])); - } - public static function remove() - { - $id = get('unidad'); - $unidad = model(Unidad::class)->findOne($id); - $unidad->delete(); - - $id = get('proyecto'); - header('Location: ' . nUrl('proyectos', 'list_unidades', ['proyecto' => $id])); - } -} -?> diff --git a/app/Controller/UnidadesBloqueadas.php b/app/Controller/UnidadesBloqueadas.php deleted file mode 100644 index 9bd4107..0000000 --- a/app/Controller/UnidadesBloqueadas.php +++ /dev/null @@ -1,83 +0,0 @@ -findMany(); - echo view('ventas.operadores.unidades.list', compact('proyectos')); - } - public static function add() - { - $proyectos = model(Proyecto::class)->findMany(); - echo view('ventas.operadores.unidades.add', compact('proyectos')); - } - public static function bloquear() - { - $operador = model(ProyectoAgente::class)->findOne(get('operador')); - echo view('ventas.operadores.unidades.bloquear', compact('operador')); - } - public static function do_bloquear() - { - $operador = model(ProyectoAgente::class)->findOne(get('operador')); - $fecha = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $unidades = self::getUnidades([], 'departamentos', 1); - $unidades = self::getUnidades($unidades, 'estacionamientos', 2); - $unidades = self::getUnidades($unidades, 'bodegas', 3); - if (post('unidad') != null) { - foreach (post('unidad') as $u) { - $unidad = model(Unidad::class)->findOne($u); - if (array_search($unidad, $unidades) === false) { - $unidades []= $unidad; - } - } - } - - foreach ($unidades as $unidad) { - $data = [ - 'agente' => $operador->id, - 'unidad' => $unidad->id - ]; - $ub = model(UnidadBloqueada::class)->create($data); - $ub->new($fecha); - } - header('Location: ' . nUrl('unidades_bloqueadas', 'list')); - } - protected static function getUnidades(array $unidades, string $name, int $tipo): array - { - if (trim(post($name)) == '') { - return $unidades; - } - $unis = []; - $separators = [PHP_EOL, ';', ',', '-']; - foreach ($separators as $separator) { - if (strpos(post($name), $separator) !== false) { - $unis = explode($separator, post($name)); - break; - } - } - if (count($unis) == 0) { - return $unidades; - } - array_walk($unis, function(&$item) { - $item = trim($item); - $item = model(Unidad::class)->where('descripcion', $item)->where('tipo', 1)->findOne(); - }); - foreach ($unis as $uni) { - if (array_search($uni, $unidades) === false) { - $unidades []= $uni; - } - } - return $unidades; - } -} diff --git a/app/Controller/Ventas.php b/app/Controller/Ventas.php deleted file mode 100644 index 31f1e61..0000000 --- a/app/Controller/Ventas.php +++ /dev/null @@ -1,605 +0,0 @@ -findOne($proyecto); - $ventas = $proyecto->ventas(); - self::sort($ventas); - return view('ventas.list', compact('proyecto', 'ventas')); - } - protected static function sort(&$ventas) - { - $sort = get('sort'); - if ($sort == null) { - $sort = 'departamento'; - } - $direction = get('sort_dir'); - if ($direction == null) { - $direction = 1; - } - switch ($sort) { - case 'departamento': - usort($ventas, function($a, $b) use ($direction) { - return ($a->propiedad()->unidad()->descripcion - $b->propiedad()->unidad()->descripcion) * $direction; - }); - break; - case 'propietario': - usort($ventas, function($a, $b) use ($direction) { - $pa = trim($a->propietario()->nombreCompleto(true), ', '); - $pb = trim($b->propietario()->nombreCompleto(true), ', '); - return $direction * strcasecmp($pa, $pb); - }); - break; - case 'valor_uf': - usort($ventas, function($a, $b) use ($direction) { - return $direction * ($a->valor_uf - $b->valor_uf); - }); - break; - case 'uf_m2': - usort($ventas, function($a, $b) use ($direction) { - return $direction * ($a->uf_m2() - $b->uf_m2()); - }); - break; - case 'fecha_venta': - usort($ventas, function($a, $b) use ($direction) { - return ($a->fecha()->timestamp - $b->fecha()->timestamp) * $direction; - }); - break; - } - if ($direction == 'desc') { - $ventas = array_reverse($ventas); - } - } - public static function listProyectos() - { - $proyectos = model(Proyecto::class) - ->select('proyecto.*') - ->join('estado_proyecto', ['estado.proyecto', '=', 'proyecto.id'], 'estado') - ->join('tipo_estado_proyecto', ['tipo.id', '=', 'estado.estado'], 'tipo') - ->join('etapa_proyecto', ['etapa.id', '=', 'tipo.etapa'], 'etapa') - ->whereGte('etapa.orden', 4) - ->orderByAsc('proyecto.descripcion') - ->groupBy('proyecto.id') - ->findMany(); - echo view('ventas.proyectos', compact('proyectos')); - } - public static function show() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - - return view('ventas.show', compact('venta')); - } - public static function new() - { - $proyectos = model(Proyecto::class) - ->select('proyecto.*') - ->join('estado_proyecto', ['estado.proyecto', '=', 'proyecto.id'], 'estado') - ->join('tipo_estado_proyecto', ['tipo.id', '=', 'estado.estado'], 'tipo') - ->join('etapa_proyecto', ['etapa.id', '=', 'tipo.etapa'], 'etapa') - ->whereGte('etapa.orden', 3) - ->orderByAsc('proyecto.descripcion') - ->groupBy('proyecto.id') - ->findMany(); - $regiones = model(Region::class)->order_by_asc('numeracion')->findMany(); - return view('ventas.add', compact('proyectos', 'regiones')); - } - public static function agregar() - { - error_log(var_export(post(), true)); - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $t = Carbon::today(config('app.timezone')); - $uf = uf($f); - error_log(var_export($uf, true)); - - $calle = trim(post('calle')); - $numero = post('numero'); - $extra = trim(post('extra')); - $comuna = post('comuna'); - $direccion = model(Direccion::class) - ->where('calle', $calle) - ->where('numero', $numero) - ->where('extra', $extra) - ->where('comuna', $comuna) - ->findOne(); - if (!$direccion) { - $direccion = model(Direccion::class)->create(); - $direccion->calle = $calle; - $direccion->numero = $numero; - $direccion->extra = $extra; - $direccion->comuna = $comuna; - $direccion->save(); - } - - list($rut, $dv) = explode('-', str_replace('.', '', post('rut'))); - $propietario = model(Propietario::class)->where('rut', $rut)->findOne(); - if (!$propietario) { - $propietario = model(Propietario::class)->create(); - $propietario->rut = $rut; - $propietario->dv = $dv; - $propietario->nombres = trim(post('nombres')); - $propietario->apellido_paterno = trim(post('paterno')); - $propietario->apellido_materno = trim(post('materno')); - $propietario->direccion = $direccion->id; - if (post('otro') != null) { - $propietario->otro = 1; - } - - $propietario->save(); - } - - $unis = json_decode(post('unidades')); - $id_principal = array_shift($unis); - $principal = model(Unidad::class)->findOne(post('unidad' . $id_principal)); - // Revisar si existe la propiedad y si está vigente. - $propiedad = model(Propiedad::class)->create(); - $propiedad->unidad_principal = $principal->id; - $propiedad->save(); - $data = [ - 'propiedad' => $propiedad->id, - 'unidad' => $principal->id, - 'principal' => 1 - ]; - $pu = model(PropiedadUnidad::class)->create($data); - $pu->save(); - foreach ($unis as $id_unidad) { - $data = [ - 'propiedad' => $propiedad->id, - 'unidad' => post('unidad' . $id_unidad), - 'principal' => 0 - ]; - $pu = model(PropiedadUnidad::class)->create($data); - $pu->save(); - } - - $venta = model(Venta::class)->create(); - $venta->propietario = $propietario->rut; - $venta->propiedad = $propiedad->id; - if (post('pie')) { - $pie = model(Pie::class)->create(); - $pie->valor = post('pie'); - $pie->fecha = $f->format('Y-m-d'); - $pie->cuotas = post('cuotas'); - if ($uf->total > 0) { - $pie->uf = $uf->uf->value; - } - $pie->save(); - - $venta->pie = $pie->id; - } - if (post('bono_pie')) { - $bono = model(BonoPie::class)->create(); - $bono->valor = post('bono_pie'); - - $pago = model(Pago::class)->create(); - $pago->fecha = $f->format('Y-m-d'); - if ($uf->total > 0) { - $pago->uf = $uf->uf->value; - } - $pago->valor = $bono->valor * $uf->uf->value; - $pago->tipo = 8; - $pago->new(); - - $bono->pago = $pago->id; - $bono->save(); - - $venta->bono_pie = $bono->id; - } - if (post('credito')) { - $pago = model(Pago::class)->create(); - $pago->fecha = $f->format('Y-m-d'); - if ($uf->total > 0) { - $pago->uf = $uf->uf->value; - } - $pago->valor = post('credito') * $uf->uf->value; - $pago->tipo = 2; - $pago->new(); - - $credito = model(Credito::class)->create(); - $credito->pago = $pago->id; - $credito->save(); - - $venta->credito = $credito->id; - } - - $venta->fecha = $f->format('Y-m-d'); - $venta->valor_uf = str_replace(',', '.', post('valor')); - $venta->fecha_ingreso = $t->format('Y-m-d'); - if (post('operador') != 0) { - $venta->agente = post('operador'); - } - if ($uf->total > 0) { - $venta->uf = $uf->uf->value; - } - $venta->new(); - - if (post('promociones') != 0) { - $promos = json_decode(post('promociones')); - foreach ($promos as $id_promo) { - $promocion = model(Promocion::class)->findOne(post('promocion' . $id_promo)); - $promo = model(PromocionVenta::class)->create(); - $promo->promocion = $promocion->id; - $promo->venta = $venta->id; - $promo->valor = post('promo' . $id_promo); - $promo->save(); - } - } - header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); - } - public static function edit() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - $proyectos = model(Proyecto::class)->order_by_asc('descripcion')->findMany(); - $regiones = model(Region::class)->order_by_asc('numeracion')->findMany(); - return view('ventas.edit', compact('venta', 'proyectos', 'regiones')); - } - public static function editar() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $uf = uf($f); - - $valor = correctNumber(post('valor')); - $change = false; - if ($venta->fecha != $f->format('Y-m-d')) { - $venta->fecha = $f->format('Y-m-d'); - $venta->uf = $uf->uf->value; - $change = true; - } - if ($venta->valor_uf != $valor) { - $venta->valor_uf = $valor; - $change = true; - } - if ($change) { - $venta->save(); - } - - $direccion = $venta->propietario()->direccion(); - $calle = post('calle'); - $numero = post('numero'); - $extra = post('extra'); - $comuna = post('comuna'); - $change = false; - if ($direccion->calle != $calle) { - $direccion->calle = $calle; - $change = true; - } - if ($direccion->numero != $numero) { - $direccion->numero = $numero; - $change = true; - } - if ($direccion->extra != $extra) { - $direccion->extra = $extra; - $change = true; - } - if ($direccion->comuna != $comuna) { - $direccion->comuna = $comuna; - $change = true; - } - if ($change) { - $direccion->save(); - } - - $propietario = $venta->propietario(); - list($rut, $dv) = explode('-', str_replace('.', '', post('rut'))); - $nombres = post('nombres'); - $paterno = post('paterno'); - $materno = post('materno'); - $change = false; - if ($propietario->rut != $rut) { - $propietario->rut = $rut; - $propietario->dv = $dv; - $venta->propietario = $rut; - $venta->save(); - $change = true; - } - if ($propietario->nombres != $nombres) { - $propietario->nombres = $nombres; - $change = true; - } - if ($propietario->apellido_paterno != $paterno) { - $propietario->apellido_paterno = $paterno; - $change = true; - } - if ($propietario->apellido_materno != $materno) { - $propietario->apellido_materno = $materno; - $change = true; - } - if ($change) { - $propietario->save(); - } - - $unidades = json_decode(post('unidades')); - if (count($unidades) > 0) { - $propiedad = $venta->propiedad(); - $ests = explode(';', $propiedad->estacionamientos); - $bods = explode(';', $propiedad->bodegas); - $change = false; - foreach ($unidades as $n) { - $id = post('unidad' . $n); - $unidad = model(Unidad::class)->findOne($id); - if ($unidad->tipo == 1 and $propiedad->unidad_principal != $unidad->id) { - $propiedad->unidad_principal = $unidad->id; - $change = true; - } - if ($unidad->tipo == 2 and array_search($unidad->id, $ests) === false) { - $ests []= $unidad->id; - } - if ($unidad->tipo == 3 and array_search($unidad->id, $bods) === false) { - $bods []= $unidad->id; - } - } - $ests = implode(';', $ests); - $bods = implode(';', $bods); - if ($propiedad->estacionamientos != $ests) { - $propiedad->estacionamientos = $ests; - $change = true; - } - if ($propiedad->bodegas != $bods) { - $propiedad->bodegas = $bods; - $change = true; - } - if ($change) { - $propiedad->save(); - } - } - - if (post('pie')) { - $pie = $venta->pie(); - $valor = correctNumber(post('pie')); - $cuotas = post('cuotas'); - $change = false; - if ($pie->valor != $valor) { - $pie->valor = $valor; - $change = true; - } - if ($pie->cuotas != $cuotas) { - $pie->cuotas = $cuotas; - $change = true; - } - if ($change) { - $pie->save(); - } - } - - $credito = $venta->credito(); - $valor = post('credito'); - header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); - } - public static function desistir() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - - return view('ventas.desist', compact('venta')); - } - public static function desistiendo() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $valor = correctNumber(post('pago')); - $uf = uf($f); - - $venta->estado = 0; - $tipo = model(TipoEstadoVenta::class)->where('descripcion', 'desistida')->findOne(); - $data = [ - 'venta' => $venta->id, - 'estado' => $tipo->id, - 'fecha' => $f->format('Y-m-d') - ]; - $estado = model(EstadoVenta::class)->create($data); - $propiedad = $venta->propiedad(); - $propiedad->estado = 0; - $pago = model(Pago::class)->create(); - $pago->fecha = $f->format('Y-m-d'); - $pago->valor = (double) $valor; - $pago->uf = $uf->uf->value; - $pago->tipo = 1; - - $pago->new(); - $propiedad->save(); - $estado->save(); - $venta->resciliacion = $pago->id; - $venta->save(); - header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); - } - public static function ceder() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - - return view('ventas.ceder', compact('venta')); - } - public static function cediendo() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - $nueva_venta = model(Venta::class)->create(); - - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - - list($rut, $dv) = explode('-', str_replace('.', '', post('rut'))); - $propietario = model(Propietario::class)->where('rut', $rut)->findOne(); - if (!$propietario) { - $propietario = model(Propietario::class)->create(); - $propietario->rut = $rut; - $propietario->dv = $dv; - $propietario->nombres = trim(post('nombres')); - $propietario->apellido_paterno = trim(post('paterno')); - $propietario->apellido_materno = trim(post('materno')); - $propietario->direccion = $direccion->id; - if (post('otro') != null) { - $propietario->otro = 1; - } - - $propietario->save(); - } - - $nueva_venta->fecha_ingreso = $f->format(); - $nueva_venta->estado = 1; - $cols = [ - 'propiedad', - 'pie', - 'bono_pie', - 'credito', - 'escritura', - 'subsidio', - 'fecha', - 'valor_uf', - 'agente', - 'uf' - ]; - foreach ($cols as $col) { - $nueva_venta->{$col} = $venta->{$col}; - } - $nueva_venta->new(); - - $venta->estado = -1; - $tipo = model(TipoEstadoVenta::class)->where('descripcion', 'cedida')->findOne(); - $data = [ - 'venta' => $venta->id, - 'estado' => $tipo->id, - 'fecha' => $f->format('Y-m-d') - ]; - $estado = model(EstadoVenta::class)->create($data); - $estado->save(); - - $venta->save(); - header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); - } - public static function entregar() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - - return view('ventas.entregar', compact('venta')); - } - public static function consolidacion() - { - if (get('proyecto')) { - $id_proyecto = get('proyecto'); - $proyecto = model(Proyecto::class)->findOne($id_proyecto); - - $ventas = $proyecto->ventas(); - set_time_limit(count($ventas)); - - $f = Carbon::today(config('app.timezone')); - setlocale(LC_TIME, 'es'); - - return view('ventas.consolidacion.show', compact('ventas', 'f')); - } else { - $proyectos = model(Proyecto::class)->order_by_asc('descripcion')->find_many(); - return view('ventas.consolidacion.proyectos', compact('proyectos')); - } - } - public static function devolucion() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - $uf = uf(Carbon::now(config('app.config')))->uf->value; - $valor = round($venta->saldo() * $uf); - - return view('ventas.devolucion', compact('venta', 'valor', 'uf')); - } - public static function devolver() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $uf = uf($f); - $valor = correctNumber(post('valor')); - - $data = [ - 'fecha' => $f->format('Y-m-d'), - 'valor' => $valor, - 'tipo' => 1, - 'uf' => $uf->uf->value, - 'identificador' => post('identificador'), - 'banco' => 0 - ]; - - $banco = model(Banco::class)->where('nombre', post('banco'))->findOne(); - if ($banco) { - $data['banco'] = $banco->id; - } - - $pago = model(Pago::class)->create($data); - $pago->newPagado(); - - $venta->devolucion = $pago->id; - $venta->save(); - header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); - } - public static function resciliaciones() - { - $resciliaciones = model(Venta::class)->where('estado', 0)->findMany(); - - return view('ventas.resciliaciones', compact('resciliaciones')); - } - public static function firmar() - { - $venta = \model(Venta::class)->findOne(get('venta')); - return view('ventas.firmar', compact('venta')); - } - public static function firmando() - { - $venta = \model(Venta::class)->findOne(get('venta')); - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $venta->firmar($f); - header('Location: ' . nUrl('ventas', 'show', ['venta' => $venta->id])); - - } - public static function archivar() - { - $venta = \model(Venta::class)->findOne(get('venta')); - return view('ventas.archivar', compact('venta')); - } - public static function archivando() - { - $venta = \model(Venta::class)->findOne(get('venta')); - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $venta->archivar($f); - header('Location: ' . nUrl('ventas', 'show', ['venta' => $venta->id])); - } -} -?> diff --git a/app/Definition/Controller.php b/app/Definition/Controller.php deleted file mode 100644 index c0e3dae..0000000 --- a/app/Definition/Controller.php +++ /dev/null @@ -1,31 +0,0 @@ -isPublic()) { - - return self::{$action}(); - } - } - if (self::$default == null and \method_exists(self::class, 'setDefault')) { - self::setDefault(); - } - if (self::$default == null) { - header('Location: .'); - return; - } - return self::$default; - } -} -?> \ No newline at end of file diff --git a/app/Definition/hasEstado.php b/app/Definition/hasEstado.php deleted file mode 100644 index 014fe8a..0000000 --- a/app/Definition/hasEstado.php +++ /dev/null @@ -1,38 +0,0 @@ -getTable(); - $self = Stringy::create(get_class($this)); - $ns = $self->substr(0, $self->indexOfLast('\\')); - $self = $self->substr($self->indexOfLast('\\') + 1); - $column = $self->underscored(); - $class = $ns . '\\Estado' . $self; - if (substr($table, -1, 1) == 's') { - $column .= '_id'; - } - - return $this->has_many($class, $column)->findMany(); - } - public function estado() - { - $table = $this->getTable(); - $self = Stringy::create(get_class($this)); - $ns = $self->substr(0, $self->indexOfLast('\\')); - $self = $self->substr($self->indexOfLast('\\') + 1); - $column = $self->underscored(); - $class = $ns . '\\Estado' . $self; - if (substr($table, -1, 1) == 's') { - $column .= '_id'; - } - - $id = $this->has_many($class, $column)->max('id'); - return $this->has_many($class, $column)->findOne($id); - } -} -?> \ No newline at end of file diff --git a/app/Definition/hasRUT.php b/app/Definition/hasRUT.php deleted file mode 100644 index 8ba3d80..0000000 --- a/app/Definition/hasRUT.php +++ /dev/null @@ -1,20 +0,0 @@ -rut) . '-' . $this->dv; - } -} -?> \ No newline at end of file diff --git a/app/Exception/PropertyNotFound.php b/app/Exception/PropertyNotFound.php deleted file mode 100644 index a35e537..0000000 --- a/app/Exception/PropertyNotFound.php +++ /dev/null @@ -1,16 +0,0 @@ -class = $class; - $this->property = $property; - $msg = "Property '" . $property . "' for class '" . $class . "' not found."; - parent::__construct($msg); - } -} \ No newline at end of file diff --git a/app/Helper/Color.php b/app/Helper/Color.php deleted file mode 100644 index 68c3199..0000000 --- a/app/Helper/Color.php +++ /dev/null @@ -1,169 +0,0 @@ -color = $args[0]; - break; - } - $this->color = $this->hex2dec($this->hex2array($args[0])); - break; - case 2: - if (is_array($args[0])) { - $this->color = $args[0]; - $this->color []= $args[1]; - break; - } - $color = $this->hex2array($args[0]); - $color []= $args[1]; - $this->color = $this->hex2dec($color); - break; - case 3: - case 4: - if (is_numeric($args[0])) { - $this->color = $args; - break; - } - $this->color = $this->hex2dec($args); - break; - } - } - protected function hex2dec(array $hex) - { - return array_map('hexdec', $hex); - } - protected function dec2hex(array $bin) - { - return array_map('dechex', $bin); - } - protected function hex2array(string $hex) - { - switch (strlen($hex)) { - case 3: - case 4: - case 6: - case 7: - return str_split($hex, 2); - default: - throw new OutOfBoundsException('The string ' . $hex . ' is not a correct color code.'); - } - } - protected function array2hex(array $arr) - { - return implode('', $arr); - } - - public function convertTo($type) - { - switch (strtolower($type)) { - case 'hex': - if (is_numeric($this->color[0])) { - $this->color = $this->dec2hex($this->color); - } - break; - case 'dec': - if (!is_numeric($this->color[0])) { - $this->color = $this->hex2dec($this->color); - } - break; - default: - throw new InvalidArgumentException($type . ' is not a valid argument.'); - } - } - public function add($base_color, $amount) - { - $changed = false; - if (!is_numeric($this->color)) { - $this->convertTo('dec'); - $changed = true; - } - switch (strtolower($base_color)) { - case 'r': - $base_color = 0; - break; - case 'g': - $base_color = 1; - break; - case 'b': - $base_color = 2; - break; - case 'a': - $base_color = 3; - break; - default: - throw new OutOfBoundsException("Base color '" . $base_color . "' does not exist."); - } - $this->color[$base_color] += $amount; - if ($changed) { - $this->convertTo('hex'); - } - } - public function print() - { - $this->convertTo('hex'); - return implode('', $this->color); - } - public function toRGB() - { - $changed = false; - $this->convertTo('dec'); - $str = 'rgb(' . implode(', ', array_map(function($a) { - return round($a, 2); - }, $this->color)) . ')'; - if ($changed) { - $this->convertTo('hex'); - } - return $str; - } - public function __toString() - { - return $this->print(); - } - public function toArray() - { - return $this->color; - } - public function toVector() - { - $changed = false; - $this->convertTo('dec'); - $arr = $this->toArray(); - if ($changed) { - $this->convertTo('hex'); - } - return $arr; - } - public function luminosity() - { - $changed = false; - $this->convertTo('dec'); - //sqrt( 0.299*R^2 + 0.587*G^2 + 0.114*B^2 ) - $str = sqrt(0.299 * pow($this->color[0], 2) + 0.587 * pow($this->color[1], 2) + 0.114 * pow($this->color[2], 2)) / 255 * 100; - if ($changed) { - $this->convertTo('hex'); - } - return $str; - } - public function isDark() - { - if ($this->luminosity() < 50) { - return true; - } - return false; - } - public function isBright() - { - if ($this->luminosity() > 75) { - return true; - } - return false; - } -} diff --git a/app/Helper/Line.php b/app/Helper/Line.php deleted file mode 100644 index 02cc0d9..0000000 --- a/app/Helper/Line.php +++ /dev/null @@ -1,61 +0,0 @@ -origin = $point_a; - $this->length = $this->distance($point_a, $point_b); - $this->direction = $this->gradient($point_a, $point_b); - } - public function origin() - { - return $this->origin; - } - public function length() - { - return $this->length; - } - public function direction() - { - return $this->direction; - } - /** - * Calculate the gradient to move from point a to point b - * @param array $point_a [Vector] - * @param array $point_b [Vector] - * @return array [Vector] - */ - public function gradient($point_a, $point_b) - { - $distance = $this->distance($point_a, $point_b); - return array_map(function($a, $b) use ($distance) { - return ($a - $b) / $distance; - }, $point_b, $point_a); - } - // sqrt((a0-b0)²+(a1-b1)²+(a2-b2)²) - public function distance($point_a, $point_b) - { - return sqrt(array_sum(array_map(function($a, $b) { - return pow($a - $b, 2); - }, $point_a, $point_b))); - } - /** - * Move from point in the direction of the gradient acording to step_size - * @param array $point [Vector] - * @param int $step_size [step size] - * @return array [Vector] - */ - public function move($point, $step_size) - { - $gradient = $this->direction; - return array_map(function($a, $b) use ($step_size) { - return $a + $b * $step_size; - }, $point, $gradient); - } -} diff --git a/app/Helper/functions.php b/app/Helper/functions.php deleted file mode 100644 index 7c55e14..0000000 --- a/app/Helper/functions.php +++ /dev/null @@ -1,128 +0,0 @@ - "http://{$remote->getIP()}:8080", - 'headers' => [ - 'Accept' => 'application/json' - ] - ])))->getUF($date); -} -function format($tipo, $valor, $format = null, $print = false) { - if ($valor === null) { - $valor = 0; - } - if (strtolower($tipo) == 'localdate') { - $d = \Carbon\Carbon::parse($valor); - $d->locale('es_ES'); - if ($format == null) { - $format = 'DD [de] MMMM [de] YYYY'; - } - return $d->isoFormat($format); - } - if (method_exists('\App\Helper\Format', $tipo)) { - if ($print) { - return \App\Helper\Format::$tipo($valor, $print); - } else { - return \App\Helper\Format::$tipo($valor); - } - } else { - switch ($tipo) { - case 'localDate': - if (isset($format)) { - $intl = new IntlDateFormatter('es_ES', IntlDateFormatter::SHORT, IntlDateFormatter::SHORT, 'America/Santiago'); - $intl->setPattern($format); - return ucwords($intl->format($valor)); - } - case 'percent': - return \App\Helper\Format::number($valor, 2); - case 'rut': - return \App\Helper\Format::number($valor, 0); - } - } -} -function model(string $class_name) { - return \Model::factory($class_name); -} -function correctNumber($number) { - if (strpos($number, ',') !== false) { - return str_replace(',', '.', str_replace('.', '', $number)); - } elseif (substr_count($number, '.') > 1) { - return str_replace('.', '', $number); - } - return $number; -} -function parseRanges($range, $numeric = true, $negatives = true) { - $rns = preg_split('/[,;]+/', $range); - $data = []; - foreach ($rns as $p) { - if (!$negatives) { - if (strpos($p, '-') !== false) { - list($ini, $end) = explode('-', $p); - $data = array_merge($data, range($ini, $end)); - continue; - } - } - if ($numeric) { - $data []= (float) $p; - continue; - } - $data []= $p; - } - return $data; -} -function nUrl($p, $a = null, $data = null) { - $query = ['p' => $p]; - if ($a != null) { - $query['a'] = $a; - if ($data != null) { - $query = array_merge($query, $data); - } - } - return url('', $query); -} -function api($p, $a, $data = null) { - $url = baseUrl() . '/' . 'api'; - $url .= '?' . 'p=' . $p . '&a=' . $a . '&API_KEY=1'; - if ($data != null) { - $url .= '&' . implode('&', array_map(function($val, $k) { - return $k . '=' . $val; - }, $data)); - } - return $url; -} -function doLog($user, $action, $variables) { - App\Service\Register::log($user, $action, $variables); -} -?> diff --git a/app/Service/Auth.php b/app/Service/Auth.php deleted file mode 100644 index 7af1f48..0000000 --- a/app/Service/Auth.php +++ /dev/null @@ -1,163 +0,0 @@ -getCookie(); - } - protected function getCookie() - { - if (isset($_COOKIE['rememberMe'])) { - list($s, $t) = \explode(':', $_COOKIE['rememberMe']); - $this->selector = $s; - $this->token = $t; - } - } - protected function saveCookie() - { - $now = \Carbon\Carbon::now(config('app.timezone')); - $exp = $now->addHours(config('app.login_hours')); - \setcookie('rememberMe', $this->selector . ':' . $this->token, $exp->timestamp); - } - protected function clearCookie() - { - \setcookie('rememberMe', '', \Carbon\Carbon::now(config('app.timezone'))->timestamp); - } - protected function generateToken() - { - $this->selector = bin2hex(\random_bytes(12)); - $this->token = bin2hex(\random_bytes(20)); - } - public function login($username, $password) - { - $user = \Model::factory(\Incoviba\common\User::class)->where('name', $username)->where('enabled', 1)->findOne(); - if ($user !== false) { - if (\password_verify($password, $user->password) === false) { - $this->clearCookie(); - return false; - } - - $this->generateToken(); - $now = \Carbon\Carbon::now(config('app.timezone')); - $exp = $now->addHours(-config('app.login_hours')); - $auth = \Model::factory(\Incoviba\common\Auth::class)->where('user_id', $user->id)->whereGt('time', $exp->timestamp)->where('status', 1)->findOne(); - if ($auth !== false) { - $auth->time('now'); - $auth->selector = $this->selector; - $auth->token($this->token); - $auth->save(); - $this->saveCookie(); - return true; - } - - $auth = \Model::factory(\Incoviba\common\Auth::class)->create(); - $auth->user_id = $user->id; - $auth->time('now'); - $auth->selector = $this->selector; - $auth->token($this->token); - - try { - $auth->save(); - $this->saveCookie(); - return true; - } catch (\Exception $e) { - $this->clearCookie(); - return false; - } - } - return false; - } - public function isIn() - { - if ($this->selector == null) { - return false; - } - $auths = \Model::factory(\Incoviba\common\Auth::class)->where('selector', $this->selector)->findMany(); - if ($auths === false) { - $this->clearCookie(); - return false; - } - foreach ($auths as $auth) { - if (\password_verify($this->token, $auth->token)) { - return $auth->isIn(); - } - } - return false; - } - public function User() - { - if ($this->selector == null) { - return false; - } - $auths = \Model::factory(\Incoviba\common\Auth::class)->where('selector', $this->selector)->findMany(); - if ($auths === false) { - return false; - } - foreach ($auths as $auth) { - if (\password_verify($this->token, $auth->token)) { - return $auth->user(); - } - } - return false; - } - public function hasAccess() - { - if ($this->selector == null) { - return false; - } - $auths = \Model::factory(\Incoviba\common\Auth::class)->where('selector', $this->selector)->findMany(); - if ($auths === false) { - return false; - } - foreach ($auths as $auth) { - if (\password_verify($this->token, $auth->token)) { - return $auth->user()->hasAccess(); - } - } - return false; - } - public function checkAccess($controller, $action = null) - { - if ($this->selector == null) { - return false; - } - $auths = \Model::factory(\Incoviba\common\Auth::class)->where('selector', $this->selector)->findMany(); - if ($auths === false) { - return false; - } - foreach ($auths as $auth) { - if (\password_verify($this->token, $auth->token)) { - return $auth->user()->checkAccess($controller, $action); - } - } - return false; - } - public function logout() - { - $this->clearCookie(); - if ($this->selector == null) { - return true; - } - $auths = \Model::factory(\Incoviba\common\Auth::class)->where('selector', $this->selector)->findMany(); - if ($auths === false) { - return true; - } - foreach ($auths as $auth) { - if (\password_verify($this->token, $auth->token)) { - $auth->status = 0; - try { - $auth->save(); - return true; - } catch (\Exception $e) { - return false; - } - } - } - return true; - } -} diff --git a/app/Service/Borrador.php b/app/Service/Borrador.php deleted file mode 100644 index 4f4b3af..0000000 --- a/app/Service/Borrador.php +++ /dev/null @@ -1,118 +0,0 @@ -cierre = $cierre; - $this->lineas = []; - } - protected function add(string $str, int $new_line = 0) - { - $this->lineas []= $str; - if ($new_line > 0) { - $this->newLine($new_line); - } - } - protected function newLine($n = 1) - { - for ($i = 0; $i < $n; $i ++) { - $this->lineas []= ''; - } - } - protected function load() - { - $this->word = IOFactory::load('borrador-' . $this->cierre->proyecto()->nombre . '.docx'); - } - protected function extract() - { - $this->load(); - $data = []; - foreach ($this->word->getSections() as $section) { - foreach ($section->getElements() as $element) { - $r = $this->elementGet($element); - $data []= $r; - } - } - if (count($data) > 0) { - $this->text = $data; - } - } - protected function elementGet($element) - { - if ($element instanceof TextBreak) { - return PHP_EOL; - } - if ($element instanceof TextRun) { - $data = []; - foreach ($element->getElements() as $e) { - $data []= $this->elementGet($e); - } - return implode('', $data); - } - if (!method_exists($element, 'getText')) { - d($element); - } - return $element->getText(); - } - protected function build() - { - if ($this->text == null) { - $this->extract(); - } - foreach ($this->text as $line) { - if ($line == PHP_EOL) { - $this->newLine(); - continue; - } - if (strpos($line, '[[') !== false) { - $replacer = new Replacer(); - $this->add($replacer->replace($line, $this->cierre)); - continue; - } - $this->add($line); - } - } - public function create() - { - $output = new PhpWord(); - - $output->getSettings()->setDecimalSymbol(','); - $output->getSettings()->setThemeFontLang(new Language(Language::ES_ES)); - - $section = $output->addSection(); - foreach ($this->lineas as $linea) { - if ($linea == '') { - $section->addTextBreak(); - continue; - } - $section->addText($linea); - } - - $output->getSettings()->setTrackRevisions(true); - - $writer = IOFactory::createWriter($output); - $filename = 'Borrador ' . $this->cierre->propietario()->nombreCompleto() . ' con ' . $this->cierre->proyecto()->inmobiliaria()->razon_social . '.docx'; - $writer->save($filename); - } - public function show() - { - $this->build(); - return implode(PHP_EOL, $this->lineas); - } -} -?> \ No newline at end of file diff --git a/app/Service/DBToModel.php b/app/Service/DBToModel.php deleted file mode 100644 index 158e85c..0000000 --- a/app/Service/DBToModel.php +++ /dev/null @@ -1,158 +0,0 @@ -name = $name; - $this->db = \ORM::get_db($name); - } - - public function run() - { - $this->getTables(); - foreach ($this->tables as $table) { - if ($this->createClass($table)) { - echo 'ok
    ', PHP_EOL; - } - } - } - protected function getType($type) - { - if (strpos($type, '(') !== false) { - $type = substr($type, 0, strpos($type, '(')); - } - if (strpos($type, ' ') !== false) { - $type = substr($type, 0, strpos($type, ' ')); - } - switch ($type) { - case 'int': - case 'float': - case 'double': - case 'char': - return trim($type); - case 'date': - case 'datetime': - return trim(strtolower($type)); - case 'varchar': - case 'text': - case 'blob': - return 'string'; - case 'bigint': - case 'tinyint': - case 'enum': - return 'int'; - default: - d($type); - } - } - protected function getTables() - { - $q = "SHOW TABLES"; - $st = $this->db->query($q); - $results = $st->fetchAll(\PDO::FETCH_COLUMN); - $this->tables = []; - foreach ($results as $result) { - $this->tables []= $result; - } - } - protected function getColumns($table) - { - $q = "SHOW COLUMNS FROM `" . $table . "`"; - $st = $this->db->query($q); - $results = $st->fetchAll(\PDO::FETCH_OBJ); - return $results; - } - protected function phpDoc($columns) - { - $str = ['/**']; - $str []= ' *'; - foreach ($columns as $column) { - $str []= ' * @property ' . $this->getType($column->Type) . ' ' . $column->Field; - } - $str []= ' *'; - $str []= ' */'; - - return implode(PHP_EOL, $str); - } - protected function className($table) - { - $name = Stringy::create($table)->upperCamelize(); - return $name; - } - protected function createClass($table) - { - $class = '' . $this->className($table); - $columns = $this->getColumns($table); - $docs = $this->phpDoc($columns); - - $output = ['name}';"; - $output []= '}'; - $output []= '?>'; - - //d(implode(PHP_EOL, $output)); - - $filename = realpath(root() . '/src') . DIRECTORY_SEPARATOR . $class . '.php'; - return file_put_contents($filename, implode(PHP_EOL, $output)); - } - public function create($namespace, $table) - { - $class = '' . $this->className($table); - $columns = $this->getColumns($table); - $docs = $this->phpDoc($columns); - - $namespace = trim($namespace, '\\'); - - $output = ['name}';"; - $output []= '}'; - $output []= '?>'; - $output = implode(PHP_EOL, $output); - - $namespace = explode('\\', $namespace); - array_shift($namespace); - $namespace = implode('/', $namespace); - - $filename = realpath(root() . '/src/' . $namespace) . DIRECTORY_SEPARATOR . $class . '.php'; - - $result = [ - 'result' => false, - 'filename' => $filename, - 'output' => $output - ]; - if (!file_exists($filename)) { - $result['result'] = file_put_contents($filename, $output); - } else { - $result['result'] = true; - } - return json_encode($result); - } - public function list() - { - $this->getTables(); - $output = []; - foreach ($this->tables as $table) { - $output []= ['table' => $table, 'model' => '' . $this->className($table)]; - } - - return json_encode(['models' => $output]); - } -} -?> \ No newline at end of file diff --git a/app/Service/Factory.php b/app/Service/Factory.php deleted file mode 100644 index ac7386a..0000000 --- a/app/Service/Factory.php +++ /dev/null @@ -1,204 +0,0 @@ -class = $class; - $this->is_aggregator = true; - if (is_subclass_of($class, 'Model')) { - $this->is_aggregator = false; - } - } - public function new() - { - $class = $this->class; - if ($this->is_aggregator) { - return new $class(); - } - return model($class)->create(); - } - public function create($data) - { - $class = $this->class; - if ($this->is_aggregator) { - $obj = new $class(); - $obj->create($data); - return $obj; - } - return model($class)->create($data); - } - /** - * [column => value, column => [value, operator]] - * @var array - */ - protected $conditions; - public function where(array $data) - { - if ($this->conditions == null) { - $this->conditions = $data; - return $this; - } - $this->conditions = array_merge($this->conditions, $data); - return $this; - } - /** - * [column, column => order] - * @var array - */ - protected $order; - public function order(array $data) - { - if ($this->order == null) { - $this->order = $data; - return $this; - } - $this->order = array_merge($this->order, $data); - return $this; - } - protected $limit; - public function limit(array $data) - { - if (!isset($data['limit'])) { - $data['limit'] = $data[0]; - } - if (!isset($data['offset'])) { - $data['offset'] = 0; - if (isset($data[1])) { - $data['offset'] = $data[1]; - } - } - $this->limit = (object) ['limit' => $data['limit'], 'offset' => $data['offset']]; - return $this; - } - protected $many; - public function find($many = false) - { - $this->many = $many; - if ($this->is_aggregator) { - return $this->findAggregator(); - } - return $this->findModel(); - } - - protected function findModel() - { - $objs = model($this->class); - $objs = $this->parseLimit($this->parseOrder($this->parseConditions($objs))); - - if ($this->many) { - return $objs->findMany(); - } - return $objs->findOne(); - } - protected function parseConditions($orm) - { - if ($this->conditions == null) { - return $orm; - } - foreach ($this->conditions as $column => $value) { - if (is_array($value)) { - list($value, $op) = $value; - switch ($op) { - case '>': - case 'gt': - $orm = $orm->whereGt($column, $value); - break; - } - } else { - $orm = $orm->where($column, $value); - } - } - return $orm; - } - protected function parseOrder($orm) - { - if ($this->order == null) { - return $orm; - } - foreach ($this->order as $column => $order) { - if (is_numeric($column)) { - $column = $order; - $order = 'asc'; - } - switch (strtolower($order)) { - case 'asc': - default: - $orm = $orm->orderByAsc($column); - break; - case 'desc': - $orm = $orm->orderByDesc($column); - break; - case 'expr': - $orm = $orm->orderByExpr($column); - break; - } - } - return $orm; - } - protected function parseLimit($orm) - { - if ($this->limit == null) { - return $orm; - } - $orm = $orm->limit($this->limit->limit); - if (isset($this->limit->offset)) { - $orm = $orm->offset($this->limit->offset); - } - return $orm; - } - protected function findAggregator() - { - $model = $this->modelName($this->class); - $ids = $this->getIds($model); - $class = $this->class; - if (count($ids) == 0) { - return false; - } - if ($this->many) { - $objs = []; - foreach ($ids as $id) { - $objs []= new $class($id); - } - } else { - $objs = new $class($ids[0]); - } - return $objs; - } - protected function getIds($model) - { - $id = $this->getModelId($model); - $table = $this->getTable($model); - $st = \ORM::forTable($table)->select($id); - $st = $this->parseConditions($st); - $results = $st->findArray(); - $output = array_map(function($a) use($id) { - return $a[$id]; - }, $results); - return $output; - } - protected function modelName($class) - { - $arr = explode("\\", $class); - \array_push($arr, end($arr)); - return implode("\\", $arr); - } - protected function getModelId($model) - { - $table = $this->getTable($model); - $query = "SHOW KEYS FROM {$table} WHERE Key_name = 'PRIMARY'"; - $st = \ORM::getDb()->query($query); - $results = $st->fetchAll(\PDO::FETCH_OBJ); - return $results[0]->Column_name; - } - protected function getTable($model) - { - $arr = explode("\\", $model); - return Stringy::create(end($arr))->toLowerCase() . ''; - } -} diff --git a/app/Service/Informador.php b/app/Service/Informador.php deleted file mode 100644 index c64db26..0000000 --- a/app/Service/Informador.php +++ /dev/null @@ -1,463 +0,0 @@ -title = $title; - } else { - $this->title = 'Informe'; - } - } - - public function addColumn(string $title, $col = '') - { - if ($col == '') { - if ($this->columns == null) { - $i = 0; - } else{ - $i = count($this->columns); - } - $col = $this->mapColumn($i); - } - - if (isset($this->columns[$col])) { - $columns = []; - foreach ($this->columns as $c => $data) { - if (ord($c) < ord($col)) { - $columns[$c] = $data; - } elseif (ord($c) == ord($col)) { - $columns[$col] = $title; - } else { - $columns[chr(ord($c) + 1)] = $data; - } - } - $this->columns = $columns; - } else { - $this->columns[$col] = $title; - } - } - public function mapColumn($n) - { - $letters = range('A', 'Z'); - $max = count($letters); - $r = $n / $max + 1; - $p = floor($r - 1) - 1; - $i = $n % $max; - if ($r >= 2) { - return $letters[$p] . $letters[$i]; - } - return $letters[$i]; - } - public function getColumn($col_title) - { - return array_search($col_title, $this->columns); - } - public function getColumnNumber($col) - { - $letters = range('A', 'Z'); - if (strlen($col) > 1) { - $ls = str_split($col); - $n = 0; - foreach ($ls as $i => $l) { - $n += array_search($l, $letters) + $i * count($letters) + 1; - } - return $n; - } - return array_search($col, $letters); - } - public function addColumns(array $columns) - { - foreach ($columns as $column) { - $this->addColumn($column); - } - } - public function addData(int $row, $data, $col = '') - { - if (!isset($this->data[$row])) { - $this->data[$row] = []; - } - if ($col == '') { - $i = count($this->data[$row]); - $col = $this->mapColumn($i); - } elseif (ctype_print($col)) { - $col = $this->getColumn($col); - } else { - $col = $this->mapColumn($col); - } - - if (isset($this->data[$row][$col])) { - $data_array = []; - foreach ($this->data[$row] as $c => $d) { - if (ord($c) < ord($col)) { - $data_array[$c] = $d; - } elseif (ord($c) == ord($col)) { - $data_array[$col] = $this->parseData($data); - } else { - $data_array[chr(ord($c) + 1)] = $d; - } - } - $this->data[$row] = $data_array; - } else { - $this->data[$row][$col] = $this->parseData($data); - } - } - protected function parseData($data) - { - if ($this->isDate($data)) { - // Date - return Date::PHPToExcel($data); - } - return $data; - } - protected function isDate($data) - { - try { - if (strpos($data, '-') === false) { - return false; - } - $fecha = explode('-', $data); - if (count($fecha) != 3) { - return false; - } - list($year, $month, $day) = $fecha; - if (strlen($year) == 4 and strlen($month) <= 2 and strlen($day) <= 2) { - return true; - } - if (ctype_digit($year) and ctype_digit($month) and ctype_digit($day)) { - $f = Carbon::parse($data, config('app.timezone')); - return true; - } - return false; - } catch(\Exception $e) { - return false; - } - return false; - } - public function addDataRow(int $row, array $data_array) - { - foreach ($data_array as $data) { - $this->addData($row, $data); - } - } - public function addDatas(array $data_matrix) - { - foreach ($data_matrix as $row => $data_array) { - $this->addDataRow($row, $data_array); - } - } - protected function findTitleColumn($title) - { - return array_search($title, $this->columns); - } - public function addFormat($format, $title = '') - { - $col = 'A'; - if ($title == '') { - $i = count($this->col_formats); - $col = $this->mapColumn($i); - } else { - $col = $this->findTitleColumn($title); - } - - if (isset($this->col_formats[$col])) { - $columns = []; - foreach ($this->col_formats as $c => $data) { - if (ord($c) < ord($col)) { - $columns[$c] = $data; - } elseif (ord($c) == ord($col)) { - $columns[$col] = $this->translateFormat($format); - } else { - $columns[chr(ord($c) + 1)] = $data; - } - } - $this->col_formats = $columns; - } else { - $this->col_formats[$col] = $this->translateFormat($format); - } - - uksort($this->col_formats, function($ak, $bk) { - return strcmp($ak, $bk); - }); - } - protected function translateFormat(array $format) - { - $translated = []; - foreach ($format as $category => $values) { - switch ($category) { - case 'numberFormat': - $data = $this->translateNumberFormat($values); - break; - case 'alignment': - $data = $this->translateAlignment($values); - break; - case 'font': - $data = $this->translateFont($values); - break; - case 'fill': - $data = $this->translateFill($values); - break; - case 'borders': - $data = $this->translateBorders($values); - break; - } - $translated[$category] = $data; - } - return $translated; - } - protected function translateNumberFormat(array $values) - { - $translated = []; - foreach ($values as $value) { - switch ($value) { - case 'short-date': - $translated['formatCode'] = 'dd-mm-yyyy'; - break; - case 'date': - $translated['formatCode'] = 'dd mmmm, yyyy'; - break; - case 'thousands': - $translated['formatCode'] = NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1; - break; - case 'pesos': - $translated['formatCode'] = '$ #.###'; - break; - default: - $translated['formatCode'] = $value; - } - } - return $translated; - } - protected function translateAlignment(array $values) - { - $translated = []; - foreach ($values as $type => $value) { - switch ($type) { - case 'horizontal': - switch ($value) { - case 'center': - $new = Alignment::HORIZONTAL_CENTER; - break; - } - break; - case 'vertical': - switch ($value) { - case 'middle': - case 'center': - $new = Alignment::VERTICAL_CENTER; - } - default: - $new = $value; - break; - } - $translated[$type] = $new; - } - return $translated; - } - protected function translateFont(array $values) - { - $translated = []; - foreach ($values as $type => $value) { - switch ($type) { - case 'color': - $new = $this->translateColor($value); - break; - default: - $new = $value; - break; - } - $translated[$type] = $new; - } - return $translated; - } - protected function translateFill(array $values) - { - $translated = []; - foreach ($values as $type => $value) { - switch ($type) { - case 'fillType': - switch ($value) { - case 'solid': - $new = Fill::FILL_SOLID; - break; - default: - $new = $value; - break; - } - break; - case 'color': - $new = $this->translateColor($value); - break; - default: - $new = $value; - break; - } - $translated[$type] = $new; - } - return $translated; - } - protected function translateBorders(array $values) - { - $translated = []; - foreach ($format as $category => $value) { - switch ($category) { - case 'allBorders': - case 'left': - case 'right': - case 'top': - case 'bottom': - case 'diagonal': - case 'vertical': - case 'horizontal': - $data = $this->translateBorder($value); - break; - default: - $data = $value; - } - $translated[$category] = $data; - } - return $translated; - } - protected function translateBorder(array $values) - { - $translated = []; - foreach ($values as $type => $value) { - switch ($type) { - case 'color': - $new = $this->translateColor($value); - break; - default: - $new = $value; - break; - } - $translated[$type] = $new; - } - return $translated; - } - protected function translateColor($color) - { - $color_definitions = [ - 'red' => 'ff0000', - 'light-red' => 'ffcccc', - 'dark-red' => 'a00000' - ]; - if (is_array($color)) { - $t = dechex(255 * $color['transparency'] / 100); - $c = $color_definitions[$color['color']]; - $hex = $t . $c; - return ['argb' => $hex]; - } - return ['rgb' => $color_definitions[$color]]; - } - public function addFormats(array $formats) - { - foreach ($formats as $title => $format) { - $this->addFormat($format, $title); - } - } - public function addTotal(string $col) - { - if (isset($this->columns[$col])) { - $sum = 0; - foreach ($this->data as $row => $data) { - $sum += $data[$col]; - } - $this->totals[$col] = $sum; - } - } - public function addAverage(string $col) - { - $this->addTotal($col); - $this->totals[$col] /= count($this->data); - } - - protected function fillData() - { - foreach ($this->data as $row => $data) { - $this->data[$row] = $this->fillAndSort($data); - } - if (count($this->totals) > 0) { - $this->totals = $this->fillAndSort($this->totals); - } - } - protected function fillAndSort(array $row) - { - foreach ($this->columns as $val) { - if (!isset($row[$val])) { - $row[$val] = ''; - } - } - function sortArrayByArray(Array $array, Array $orderArray) { - $ordered = array(); - foreach($orderArray as $key) { - if(array_key_exists($key, $array)) { - $ordered[$key] = $array[$key]; - unset($array[$key]); - } - } - return $ordered + $array; - } - $row = sortArrayByArray($row, $this->columns); - - return $row; - } - - public function informe() - { - $ea = new Spreadsheet(); - $ea->getProperties()->setCreator('Juan Pablo Vial B.'); - $ea->getProperties()->setTitle($this->title); - $ea->getProperties()->setCompany('Incoviba S.A.'); - - $ews = $ea->getActiveSheet(); - - $ews->fromArray(array($this->columns), '', 'A1'); - $ews->fromArray($this->data, '', 'A2'); - $end = 2; - if ($this->totals != null and count($this->totals) > 0) { - $ews->fromArray($this->totals, '', 'A' . count($data) + 2); - $end = 3; - } - - if ($this->col_formats != null and count($this->col_formats) > 0) { - foreach ($this->col_formats as $col => $format) { - $ews->getStyleByColumnAndRow($this->getColumnNumber($col), 2, $this->getColumnNumber($col), count($this->data) + $end)->applyFromArray($format); - } - } - - for ($col = 0; $col < count($this->columns); $col ++) { - $ews->getColumnDimensionByColumn($col)->setAutoSize(true); - } - - $ews->setAutoFilterByColumnAndRow(0, 1, count($this->columns) - 1, count($this->data)); - - $hoy = Carbon::now(config('app.timezone')); - $filename = str_replace('ñ', 'n', $this->title . ' - ' . $hoy->format('Y-m-d') . '.xlsx'); - - $writer = IOFactory::createWriter($ea, "Xlsx"); - - header("Content-Type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet; charset=utf-8"); - header('Content-Transfer-Encoding: binary'); - header('Content-Disposition: attachment; filename="' . $filename . '"'); - header('Cache-Control: max-age=0'); - - $writer->save('php://output'); - } -} -?> diff --git a/app/Service/Informe/Contabilidad/Resumen.php b/app/Service/Informe/Contabilidad/Resumen.php deleted file mode 100644 index e20266a..0000000 --- a/app/Service/Informe/Contabilidad/Resumen.php +++ /dev/null @@ -1,190 +0,0 @@ -separator = $separator; - } - - protected function getVentas($id_proyecto) - { - $proyecto = model(Proyecto::class)->findOne($id_proyecto); - $ventas = $proyecto->ventas(); - $output = []; - foreach ($ventas as $venta) { - $found = false; - foreach ($output as $v) { - if ($v->unidad()->descripcion == $venta->unidad()->descripcion) { - $found = true; - break; - } - } - if (!$found) { - $output []= $venta; - } - } - return $output; - } - protected function startOfYear(DateTimeInterface $up_to) - { - return new DateTimeImmutable((clone $up_to)->sub(new DateInterval('P1Y'))->format('31-12-Y')); - } - protected function defaultValueDate(DateTimeInterface $up_to, $glosa = '') - { - return (object) ['fecha' => $this->startOfYear($up_to), 'valor' => 0, 'glosa' => $glosa, 'estado' => '']; - } - protected function extractValueDate(Pago $pago, $glosa = '') - { - return (object) ['fecha' => $pago->fecha(), 'valor' => $pago->valor, 'glosa' => $glosa, 'estado' => $pago->estado()->tipo()->descripcion]; - } - protected function getAnticipos(Venta $venta, DateTimeInterface $up_to) - { - if ($venta->pie == 0) { - return [$this->defaultValueDate($up_to)]; - } - $cuotas = $venta->pie()->cuotas('fecha', $up_to); - $ly = $this->startOfYear($up_to); - $older = array_reduce($cuotas, function($sum, $item) use ($ly) { - if ($item->pago()->estado()->tipo()->active != 1 or strtolower($item->pago()->estado()->tipo()->descripcion) == 'no pagado') { - return $sum; - } - if ($item->pago()->fecha() >= $ly) { - return $sum; - } - return $sum + $item->pago()->valor; - }); - $current = array_filter($cuotas, function($item) use ($ly) { - return $item->pago()->fecha() >= $ly; - }); - foreach ($current as &$item) { - $item = $this->extractValueDate($item->pago(), "Cuota {$item->numero}"); - } - return array_merge([(object) ['fecha' => $ly, 'valor' => $older, 'glosa' => 'Anticipo acumulado', 'estado' => 'Pagado']], $current); - } - protected function getReajuste(Venta $venta, DateTimeInterface $up_to) - { - if ($venta->pie == 0 or $venta->pie()->reajuste == null) { - return $this->defaultValueDate($up_to, 'Reajuste'); - } - return $this->extractValueDate($venta->pie()->reajuste(), 'Reajuste'); - } - protected function getAbono(Venta $venta, DateTimeInterface $up_to) - { - if ($venta->escritura == 0) { - return $this->defaultValueDate($up_to, 'Abono'); - } - return $this->extractValueDate($venta->escritura()->pago(), 'Abono'); - } - protected function getBono(Venta $venta, DateTimeInterface $up_to) - { - if ($venta->bono_pie == 0) { - return $this->defaultValueDate($up_to, 'Bono Pie'); - } - return $this->extractValueDate($venta->bonoPie()->pago(), 'Bono Pie'); - } - protected function getCredito(Venta $venta, DateTimeInterface $up_to) - { - if ($venta->credito == 0) { - return $this->defaultValueDate($up_to, 'Credito'); - } - return $this->extractValueDate($venta->credito()->pago(), 'Credito'); - } - protected function getSubsidio(Venta $venta, DateTimeInterface $up_to) - { - if ($venta->subsidio == 0) { - return [$this->defaultValueDate($up_to, 'Ahorro'), $this->defaultValueDate($up_to, 'Subsidio')]; - } - return [$this->extractValueDate($venta->subsidio()->pago(), 'Ahorro'), $this->extractValueDate($venta->subsidio()->subsidio(), 'Subsidio')]; - } - protected function getResciliacion(Venta $venta, DateTimeInterface $up_to) - { - if ($venta->resciliacion == null) { - return $this->defaultValueDate($up_to, 'Resciliacion'); - } - return $this->extractValueDate($venta->resciliacion()->pago(), 'Resciliacion'); - } - protected function getPagos(Venta $venta, DateTimeInterface $up_to) - { - $pagos = []; - $pagos = array_merge($pagos, $this->getAnticipos($venta, $up_to)); - $pagos []= $this->getReajuste($venta, $up_to); - $pagos []= $this->getAbono($venta, $up_to); - $pagos []= $this->getBono($venta, $up_to); - $pagos []= $this->getCredito($venta, $up_to); - $pagos = array_merge($pagos, $this->getSubsidio($venta, $up_to)); - return array_filter($pagos, function($item) { - return $item->valor != 0; - }); - } - - protected function buildLine(Venta $venta, $pago) - { - if ($pago->valor > 0) { - return ['', $venta->unidad()->descripcion, $pago->fecha->format('d/m/Y'), $pago->glosa, '', $pago->valor, $pago->estado]; - } - return ['', $venta->unidad()->descripcion, $pago->fecha->format('d/m/Y'), $pago->glosa, -$pago->valor, '', $pago->estado]; - } - protected function buildLibro(Venta $venta, DateTimeInterface $up_to) - { - $pagos = $this->getPagos($venta, $up_to); - $output = [ - ['', "Cuenta: Anticipos Dpto {$venta->unidad()->descripcion}"], - ['', 'Fecha', 'Glosa', 'Haber', 'Debe', 'Estado'] - ]; - $debe = 0; - $haber = 0; - foreach ($pagos as $pago) { - $output []= $this->buildLine($venta, $pago); - if ($pago->valor > 0) { - $debe += $pago->valor; - } - else { - $haber -= $pago->valor; - } - } - $output []= ['', '', '', 'Total', $haber, $debe]; - return $output; - } - - public function build(int $id_proyecto, DateTimeInterface $up_to) - { - ini_set('max_execution_time', 60 * 60); - $ventas = $this->getVentas($id_proyecto); - - $output = ["Libro Mayor {$ventas[0]->proyecto()->descripcion}", '']; - foreach ($ventas as $venta) { - $output = array_merge($output, $this->buildLibro($venta, $up_to)); - } - - $filename = "Contabilidad - Resumen - {$ventas[0]->proyecto()->descripcion} - {$up_to->format('Y-m-d')}.xlsx"; - $informe = new Informe(); - $informe->createSpreadsheet() - ->addArray($output) - ->formatColumn('E') - ->formatColumn('F') - ->send($filename); - } -} diff --git a/app/Service/Informe/Informe.php b/app/Service/Informe/Informe.php deleted file mode 100644 index 8254a10..0000000 --- a/app/Service/Informe/Informe.php +++ /dev/null @@ -1,55 +0,0 @@ -spreadsheet = new Spreadsheet(); - return $this; - } - protected function formatArray(array $data) - { - $maxCols = 0; - foreach ($data as $row) { - if (!is_array($row)) { - continue; - } - if (count($row) > $maxCols) { - $maxCols = count($row); - } - } - foreach ($data as &$row) { - if (!is_array($row)) { - $row = [$row]; - } - if (count($row) < $maxCols) { - $row = array_merge($row, array_fill(0, $maxCols - count($row), '')); - } - } - return $data; - } - public function addArray(array $data, string $start = 'A1') - { - $this->spreadsheet->getActiveSheet()->fromArray($this->formatArray($data), null, $start); - return $this; - } - public function formatColumn(string $column) - { - $this->spreadsheet->getActiveSheet()->getStyle("{$column}:{$column}")->getNumberFormat()->setFormatCode('#,##0'); - return $this; - } - public function send(string $filename) - { - header('Content-Type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'); - header("Content-Disposition: attachment;filename=\"{$filename}\""); - header('Cache-Control: max-age=0'); - - $writer = IOFactory::createWriter($this->spreadsheet, 'Xlsx'); - $writer->save('php://output'); - } -} diff --git a/app/Service/Money.php b/app/Service/Money.php deleted file mode 100644 index 2472e62..0000000 --- a/app/Service/Money.php +++ /dev/null @@ -1,55 +0,0 @@ -parseDate($date); - if (!$this->checkNextMonthValueCalculationByDate($date)) { - return $this->emptyResult(); - } - - $response = $this->client->get('api/uf/value/' . $date->format('Y-m-d')); - - if (!$this->isOk($response)) { - return $this->emptyResult(); - } - - $body = $response->getBody()->getContents(); - if (trim($response->getBody()) === '') { - return $this->emptyResult(); - } - return json_decode($body); - } - - protected function parseDate(string|DateTimeInterface $date): DateTimeInterface - { - if (is_string($date)) { - $date = Carbon::parse($date, config('app.timezone')); - } - return $date; - } - protected function checkNextMonthValueCalculationByDate(DateTimeInterface $date): bool - { - $next_m_9 = Carbon::today(config('app.timezone'))->copy()->endOfMonth()->addDays(9); - $date = Carbon::parse($date); - return $date->lessThan($next_m_9); - } - protected function isOk(ResponseInterface $response): bool - { - $statusCode = $response->getStatusCode(); - return $statusCode >= 200 and $statusCode < 300; - } - protected function emptyResult(): object - { - return (object) ['total' => 0]; - } -} diff --git a/app/Service/Register.php b/app/Service/Register.php deleted file mode 100644 index 03f96e0..0000000 --- a/app/Service/Register.php +++ /dev/null @@ -1,34 +0,0 @@ - $user, - 'action' => $action, - 'time' => Carbon::now(config('app.timezone'))->toDateTimeString()//->format('Y-m-d HH:mm:ss') - ]; - $registry = model(RModel::class) - ->where('user', $user) - ->where('action', $action) - ->where('time', $data['time']) - ->findOne(); - if (!$registry) { - $registry = model(RModel::class)->create($data); - $registry->save(); - } - foreach ($variables as $data) { - $data['registry'] = $registry->id; - $log = (new Factory(RegistryData::class))->where($data)->find(); - if (!$log) { - $log = model(RegistryData::class)->create($data); - $log->save(); - } - } - } -} diff --git a/app/Service/Remote.php b/app/Service/Remote.php deleted file mode 100644 index 2e6e69e..0000000 --- a/app/Service/Remote.php +++ /dev/null @@ -1,19 +0,0 @@ -connection->connect(); - $statement = $connection->query($query); - $result = $statement->fetch(PDO::FETCH_ASSOC); - return $result['ip']; - } -} diff --git a/app/Service/Replacer.php b/app/Service/Replacer.php deleted file mode 100644 index bf61513..0000000 --- a/app/Service/Replacer.php +++ /dev/null @@ -1,127 +0,0 @@ -parseLine($line); - - $output = $line; - foreach ($instructions as $instruction) { - $output = str_replace($instruction['original'], $this->buildLine($instruction['instruction'], $data), $output); - } - return $output; - } - protected function parseLine($line) - { - $ini_el = '[['; - $end_el = ']]'; - - $instructions = []; - $offset = 0; - while (strpos($line, $ini_el, $offset) !== false) { - $ini = strpos($line, $ini_el, $offset) + strlen($ini_el); - $end = strpos($line, $end_el, $offset); - $find = substr($line, $ini, $end - $ini); - $instructions []= ['original' => $ini_el . $find . $end_el, 'instruction' => $find]; - $offset = $end + 1; - } - return $instructions; - } - protected function buildLine($instructions, $data) - { - if (strpos($instructions, '|') !== false) { - $instructions = explode('|', $instructions); - } else { - $instructions = [$instructions]; - } - $output = ''; - foreach ($instructions as $instruction) { - $output = $this->buildReplace($instruction, $data, $output); - } - return $output; - } - protected function buildReplace($instruction, $data, $output = null) - { - if (strpos($instruction, '(') !== false) { - $ini = strpos($instruction, '(') + 1; - $end = strpos($instruction, ')'); - $mod = substr($instruction, $ini, $end - $ini); - $instruction = substr($instruction, 0, $ini - 1); - } - switch ($instruction) { - case 'UPPER': - return strtoupper($output); - case 'LOWER': - return strtolower($output); - case 'ISSET': - if ($output != '') { - return ', ' . $output; - } - return ''; - case 'UFS': - return format('ufs', $output); - case 'PESOS': - return format('pesos', $output); - } - - if (isset($mod)) { - $obj = $this->find($instruction . '(' . $mod .')', $data); - } else { - $obj = $this->find($instruction, $data); - } - if ($obj) { - return $obj; - } - if (is_object($output) and method_exists($output, $instruction)) { - if (isset($mod)) { - return $output->$instruction($mod); - } - return $output->$instruction(); - } - if (is_object($output) and isset($output->$instruction)) { - return $output->$instruction; - } - if ($instruction == 'strftime') { - setlocale(LC_TIME, 'es-CL', 'es'); - $f = Carbon::parse($output, config('app.timezone')); - $output = strftime($mod, $f->timestamp); - return $output; - } - - d($output, $instruction, function_exists($instruction), is_object($output), is_object($output) and isset($output->$instruction)); - } - protected function find($instruction, $data) - { - if (strpos($instruction, '(') !== false) { - $ini = strpos($instruction, '(') + 1; - $end = strpos($instruction, ')'); - $mod = substr($instruction, $ini, $end - $ini); - $instruction = substr($instruction, 0, $ini - 1); - } - if (method_exists($data, $instruction)) { - if (isset($mod)) { - return $data->$instruction($mod); - } - return $data->$instruction(); - } - if (isset($data->$instruction)) { - return $data->$instruction; - } - switch ($instruction) { - case 'Unidades': - $str = 'Departamento ' . $data->reserva()->unidad()->numeracion; - foreach ($data->reserva()->unidades() as $unidad) { - $str .= ', ' . ucwords($unidad->unidadProyecto()->tipo()->descripcion) . ' ' . $unidad->numeracion; - } - return $str; - case 'inmobiliaria': - return $data->proyecto()->inmobiliaria(); - } - return false; - } -} -?> \ No newline at end of file diff --git a/app/Service/Route.php b/app/Service/Route.php deleted file mode 100644 index f910f87..0000000 --- a/app/Service/Route.php +++ /dev/null @@ -1,131 +0,0 @@ -add($t, $query, $callback); - } - } else { - switch (strtoupper($type)) { - case 'GET': - $this->get($query, $callback); - break; - case 'POST': - $this->post($query, $callback); - break; - } - } - } - public function get($query, $callback) - { - if ($this->exists('get', $query)) { - return; - } - $this->routes['get'][$query] = (object) ['query' => $query, 'callback' => $this->parseCallback($callback)]; - } - public function post($query, $callback) - { - if ($this->exists('post', $query)) { - return; - } - $this->routes['post'][$query] = (object) ['query' => $query, 'callback' => $this->parseCallback($callback)]; - } - protected function exists($type, $query) - { - return isset($this->routes['post'][$query]); - } - protected function parseCallback($callback) - { - if (is_callable($callback)) { - return $callback; - } - elseif (is_object($callback)) { - return [$callback, 'index']; - } - elseif (is_string($callback) and strpos($callback, '@') !== false) { - list($class, $method) = explode('@', $callback); - $class = '\\App\\Controller\\' . $class; - if (method_exists($class, $method)) { - return [$class, $method]; - } - } - elseif (is_string($callback)) { - $class = '\\App\\Controller\\' . $callback; - return [$class, 'index']; - } - } - public function route() - { - $url = $_SERVER['SCRIPT_NAME']; - $query = $_SERVER['QUERY_STRING']; - $method = $_SERVER['REQUEST_METHOD']; - $route = null; - switch (strtoupper($method)) { - case 'GET': - $route = $this->getGet($url, $query); - break; - case 'POST': - $route = $this->getPost($url, $query); - break; - } - if ($route) { - return $this->run($route->callback); - } - return false; - } - protected function getGet($url, $query) - { - if (isset($this->routes['get'][$url])) { - return $this->routes['get'][$url]; - } - $p = get('p'); - if ($p == null) { - $p = get('page'); - if ($p == null) { - $p = get('m'); - if ($p == null) { - $p = get('module'); - } - } - } - if (isset($this->routes['get'][$p])) { - return $this->routes['get'][$p]; - } - return false; - } - protected function getPost($url, $query) - { - if (isset($this->routes['post'][$url])) { - return $this->routes['post'][$url]; - } - $p = get('p'); - if ($p == null) { - $p = get('page'); - if ($p == null) { - $p = get('m'); - if ($p == null) { - $p = get('module'); - } - } - } - if (isset($this->routes['post'][$p])) { - return $this->routes['post'][$p]; - } - return false; - } - protected function run($callback) - { - return call_user_func($callback); - } -} -?> \ No newline at end of file diff --git a/bin/Pipfile b/bin/Pipfile deleted file mode 100644 index 8108982..0000000 --- a/bin/Pipfile +++ /dev/null @@ -1,12 +0,0 @@ -[[source]] -name = "pypi" -url = "https://pypi.org/simple" -verify_ssl = true - -[dev-packages] - -[packages] -gunicorn = "*" - -[requires] -python_version = "3.8" diff --git a/bin/console b/bin/console deleted file mode 100644 index 11aaaef..0000000 --- a/bin/console +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -php /code/bin/index.php "$@" diff --git a/bin/index.php b/bin/index.php deleted file mode 100644 index f5683c7..0000000 --- a/bin/index.php +++ /dev/null @@ -1,8 +0,0 @@ -run(); diff --git a/bin/informes/Pipfile b/bin/informes/Pipfile deleted file mode 100644 index e8687af..0000000 --- a/bin/informes/Pipfile +++ /dev/null @@ -1,16 +0,0 @@ -[[source]] -name = "pypi" -url = "https://pypi.org/simple" -verify_ssl = true - -[dev-packages] - -[packages] -pandas = "*" -xlsxwriter = "*" -httpx = "*" -flask = "*" -numpy = "*" - -[requires] -python_version = "3.8" diff --git a/bin/informes/app.py b/bin/informes/app.py deleted file mode 100644 index ff2a8f0..0000000 --- a/bin/informes/app.py +++ /dev/null @@ -1,14 +0,0 @@ -import argparse -from flask import Flask -from controllers.ventas import ventas_blueprint - - -app = Flask(__name__) -app.register_blueprint(ventas_blueprint, url_prefix='/ventas') - - -if __name__ == '__main__': - parser = argparse.ArgumentParser() - parser.add_argument('-p', '--port', default=8011) - args = parser.parse_args() - app.run(port=args.port, debug=True) diff --git a/bin/informes/controllers/ventas.py b/bin/informes/controllers/ventas.py deleted file mode 100644 index ab3ffce..0000000 --- a/bin/informes/controllers/ventas.py +++ /dev/null @@ -1,141 +0,0 @@ -from flask import Blueprint, request, Response -import io -import json -import pandas as pd -import numpy as np -import datetime - - -ventas_blueprint = Blueprint('ventas', __name__,) - - -def format_data(data): - df = pd.DataFrame(data) - int_columns = ['Departamento', 'Estacionamientos', 'Bodegas'] - for col in int_columns: - df[col] = pd.to_numeric(df[col], errors='ignore') - float_columns = ['Valor Promesa', 'Pie', 'Pie Pagado', '% Pie Pagado', 'Bono Pie', 'Valor Operador', - 'Premios', 'Subsidio', 'Ahorro', 'Credito', 'Valor Ests & Bods', 'Valor Neto', - 'UF/m²*', 'Comision', 'Venta s/Comision', 'Precio'] - for col in float_columns: - if col in df.columns: - df[col] = pd.to_numeric(df[col], errors='coerce') - df = df.replace(np.nan, 0, regex=True) - - df['Fecha Venta'] = pd.to_datetime(df['Fecha Venta'], format='%Y-%m-%d') - df = df.sort_values(by=['Fecha Venta', 'Departamento']) - df['Fecha Venta'] = df['Fecha Venta'].dt.strftime('%d.%m.%Y') - - return df - - -def format_columns(workbook, columns): - column_settings = [{'header': column} for column in columns] - - center_format = workbook.add_format({'align': 'center'}) - amount_format = workbook.add_format({'num_format': '#,##0.00'}) - percent_format = workbook.add_format({'num_format': '0.00%'}) - - amount_columns = ['m² Ponderados', 'Valor Promesa', 'Pie', 'Pie Pagado', 'Bono Pie', 'Valor Operador', 'Premios', - 'Subsidio', 'Ahorro', 'Credito', 'Valor Ests & Bods', 'Valor Neto', 'UF/m²*', 'Comision', - 'Venta s/Comision', 'Precio'] - center_columns = ['Departamento', 'Estacionamientos', 'Bodegas'] - sum_columns = ['m² Ponderados', 'Valor Promesa', 'Pie', 'Pie Pagado', 'Bono Pie', 'Subsidio', 'Ahorro', 'Credito', - 'Valor Operador', 'Premios', 'Valor Ests & Bods', 'Valor Neto', 'Comision'] - count_columns = ['Departamento', 'Estacionamientos', 'Bodegas'] - - for (k, col) in enumerate(column_settings): - if col['header'] in amount_columns: - column_settings[k]['format'] = amount_format - if col['header'] in center_columns: - column_settings[k]['format'] = center_format - if col['header'] in sum_columns: - column_settings[k]['total_function'] = 'sum' - if col['header'] in count_columns: - column_settings[k]['total_function'] = 'count' - if col['header'] == '% Pie Pagado': - column_settings[k]['format'] = percent_format - if col['header'] == 'Propietario': - column_settings[k]['total_string'] = 'TOTAL' - - return column_settings - - -def format_excel(workbook, worksheet, data): - center_format = workbook.add_format({'align': 'center'}) - amount_format = workbook.add_format({'num_format': '#,##0.00'}) - percent_format = workbook.add_format({'num_format': '0.00%'}) - - amount_columns = ['m² Ponderados', 'Valor Promesa', 'Pie', 'Pie Pagado', 'Bono Pie', 'Valor Operador', 'Premios', - 'Subsidio', 'Ahorro', 'Credito', 'Valor Ests & Bods', 'Valor Neto', 'UF/m²*', 'Comision', - 'Venta s/Comision', 'Precio'] - center_columns = ['Departamento', 'Estacionamientos', 'Bodegas'] - - for col in amount_columns: - if col not in data.columns: - continue - k = data.columns.get_loc(col) + 1 - worksheet.set_column(k, k, cell_format=amount_format) - for col in center_columns: - if col not in data.columns: - continue - k = data.columns.get_loc(col) + 1 - worksheet.set_column(k, k, cell_format=center_format) - col = '% Pie Pagado' - k = data.columns.get_loc(col) + 1 - worksheet.set_column(k, k, cell_format=percent_format) - - return worksheet - - -@ventas_blueprint.route('', methods=['POST']) -def ventas(): - data = json.loads(request.data) - output = io.BytesIO() - writer = pd.ExcelWriter('tmp.xlsx', engine='xlsxwriter') - df = format_data(data['data']) - - start_row = 4 - if 'Compañía' in data: - start_row += 1 - df.to_excel(writer, startrow=start_row+1, startcol=1, header=False, index=False, sheet_name='Ventas') - wb = writer.book - wb.filename = output - - title_format = wb.add_format({'font_size': 16, 'bold': True}) - ws = writer.sheets['Ventas'] - (max_row, max_col) = df.shape - - if 'Compañía' in data: - ws.merge_range(1, 1, 1, max_col, data['Compañía']) - ws.merge_range(start_row-3, 1, start_row-3, max_col, data['Proyecto'], cell_format=title_format) - ws.write_string(start_row-2, 1, 'Ventas') - column_settings = format_columns(wb, df.columns) - ws.add_table(start_row, 1, max_row+start_row+1, max_col, {'name': 'Ventas', 'total_row': 1, - 'columns': column_settings, - 'style': 'Table Style Medium 1'}) - ws = format_excel(wb, ws, df) - - column_widths = { - 'B': 46, - 'C': 16, - 'D': 18, - 'E': 10, - 'F': 13, - 'G': 7, - 'H': 8, - 'I': 16, - 'J': 16, - 'K': 13, - 'L': 14 - } - for (col, wd) in column_widths.items(): - ws.set_column('{0}:{0}'.format(col), wd) - - writer.save() - output.seek(0) - date = datetime.date.today() - filename = "Informe de Ventas - {0} - {1}.xlsx".format(data['Proyecto'], date.strftime('%Y-%m-%d')) - return Response(output, mimetype="application/ms-excel", - headers={"Content-Disposition": "attachment;filename={0}".format(filename), - "Content-Type": 'application/octet-stream; charset=utf-8'}) diff --git a/bootstrap/autoload.php b/bootstrap/autoload.php deleted file mode 100644 index 318f80d..0000000 --- a/bootstrap/autoload.php +++ /dev/null @@ -1,8 +0,0 @@ - diff --git a/bootstrap/database.php b/bootstrap/database.php deleted file mode 100644 index 4372bf2..0000000 --- a/bootstrap/database.php +++ /dev/null @@ -1,29 +0,0 @@ - $data) { - load($data, $name); -} - -function load($data, $name = '') { - if (!isset($data['port'])) { - $port = 3306; - } else { - $port = $data['port']; - } - $dsn = 'mysql:host=' . $data['host'] . ';port=' . $port . ';dbname=' . $data['database'] . ';charset=utf8'; - - if ($name != '') { - ORM::configure($dsn, null, $name); - ORM::configure('username', $data['username'], $name); - ORM::configure('password', $data['password'], $name); - } else { - ORM::configure($dsn, null); - ORM::configure('username', $data['username']); - ORM::configure('password', $data['password']); - } -} - -Model::$short_table_names = true; diff --git a/bootstrap/dotenv.php b/bootstrap/dotenv.php deleted file mode 100644 index 799a5b1..0000000 --- a/bootstrap/dotenv.php +++ /dev/null @@ -1,12 +0,0 @@ -isDir() or $file->getExtension() != 'env') { - continue; - } - $env = Dotenv::createImmutable($file->getPath(), $file->getBasename()); - $env->load(); -} diff --git a/bootstrap/errors.php b/bootstrap/errors.php deleted file mode 100644 index 0e54dc4..0000000 --- a/bootstrap/errors.php +++ /dev/null @@ -1,7 +0,0 @@ -pushHandler(new \Whoops\Handler\PrettyPageHandler); - $whoops->register(); -}*/ -?> diff --git a/bootstrap/logs.php b/bootstrap/logs.php deleted file mode 100644 index 249be53..0000000 --- a/bootstrap/logs.php +++ /dev/null @@ -1,26 +0,0 @@ -underscored(); - Route::add(['GET', 'POST'], $route, $name); -} - -Route::add(['GET', 'POST'], 'buscar', 'Buscar'); -?> \ No newline at end of file diff --git a/composer.json b/composer.json deleted file mode 100644 index 55f9f15..0000000 --- a/composer.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "name" : "aldarien/incoviba", - "description" : "Intranet portal for Incoviba", - "type" : "project", - "require" : { - "aldarien/asset": "*", - "aldarien/config": "*", - "aldarien/format": "*", - "aldarien/response": "*", - "aldarien/session": "*", - "aldarien/url": "*", - "aldarien/view": "*", - "guzzlehttp/guzzle": "*", - "incoviba/modelos": "*", - "j4mie/paris": "^1.5", - "monolog/monolog": "^3", - "nesbot/carbon": "^2", - "nyholm/psr7": "*", - "nyholm/psr7-server": "*", - "php-di/php-di": "*", - "php-di/slim-bridge": "*", - "phpoffice/phpspreadsheet": "^1", - "phpoffice/phpword": "^0", - "rubellum/slim-blade-view": "*", - "slam/php-excel": "^4.4", - "slim/slim": "^4", - "symfony/console": "6.4.x-dev", - "vlucas/phpdotenv": "^5.3", - "voku/stringy": "^6" - }, - "require-dev" : { - "phpunit/phpunit" : "*", - "kint-php/kint" : "*", - "filp/whoops" : "*" - }, - "license" : "GNU AGPLv3", - "authors" : [{ - "name" : "Aldarien", - "email" : "jpvial@gmail.com" - } - ], - "autoload" : { - "psr-4" : { - "App\\" : "app/", - "ProVM\\Common\\": "provm/common/" - }, - "files" : [ - "app/Helper/functions.php" - ] - }, - "minimum-stability": "dev", - "repositories": [ - { - "type": "path", - "url": "./aldarien/**", - "options": { - "symlink": true - } - }, - { - "type": "path", - "url": "./incoviba/modelos" - } - ], - "config": { - "sort-packages": true - } -} diff --git a/config/app.php b/config/app.php deleted file mode 100644 index 4db5c28..0000000 --- a/config/app.php +++ /dev/null @@ -1,9 +0,0 @@ - 'America/Santiago', - 'locale' => 'es', - 'database' => 'mysql', - 'debug' => false, - 'benchmark' => false, - 'login_hours' => 5*24 -]; diff --git a/config/databases.php b/config/databases.php deleted file mode 100644 index 14e279f..0000000 --- a/config/databases.php +++ /dev/null @@ -1,24 +0,0 @@ - [ - 'host' => $_ENV['MYSQL_HOST'], - 'database' => $_ENV['MYSQL_DATABASE'], - 'username' => $_ENV['MYSQL_USER'], - 'password' => $_ENV['MYSQL_PASSWORD'] - ], - 'mysql_copy' => [ - 'host' => 'localhost', - 'database' => 'incoviba3', - 'username' => 'incoviba', - 'password' => $_ENV['MYSQL_PASSWORD'] - ] - ]; - if (isset($_ENV['MYSQL_PORT'])) { - $arr['mysql']['port'] = $_ENV['MYSQL_PORT']; - } - return $arr; -} -return buildDatabaseConfig(); diff --git a/config/incoviba.php b/config/incoviba.php deleted file mode 100644 index d21d9e8..0000000 --- a/config/incoviba.php +++ /dev/null @@ -1,6 +0,0 @@ - [ - 'caducidad' => 30 - ] -]; diff --git a/config/locations.php b/config/locations.php deleted file mode 100644 index 05442b6..0000000 --- a/config/locations.php +++ /dev/null @@ -1,16 +0,0 @@ - root(), - 'cache' => '{locations.base}/cache', - 'public' => '{locations.base}/public', - 'resources' => '{locations.base}/resources', - 'views' => '{locations.resources}/views', - 'src' => '{locations.base}/src', - //'languages' => '{locations.resources}/languages' - 'app' => '{locations.base}/app', - 'controllers' => '{locations.app}/Controller', - 'money' => 'provm.cl/optimus/money', - 'api' => '192.168.1.100/intranet/api', - 'api_url' => '/api' -]; -?> diff --git a/fontify.json b/fontify.json deleted file mode 100644 index 923703c..0000000 --- a/fontify.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "modules": [ - "bootstrap", - "font-awesome" - ], - "dest": "public" -} \ No newline at end of file From d9d5a15376816dc920289ef0860536b79851a58b Mon Sep 17 00:00:00 2001 From: Juan Pablo Vial Date: Mon, 24 Jul 2023 20:54:30 -0400 Subject: [PATCH 004/163] Docker --- .env.sample | 3 +++ Dockerfile | 2 ++ docker-compose.yml | 25 ++++++++++++++----------- nginx.conf | 7 ++----- 4 files changed, 21 insertions(+), 16 deletions(-) create mode 100644 .env.sample diff --git a/.env.sample b/.env.sample new file mode 100644 index 0000000..ea98faf --- /dev/null +++ b/.env.sample @@ -0,0 +1,3 @@ +COMPOSE_PROFILES=app,db +APP_PATH=./app +APP_PORT=8080 diff --git a/Dockerfile b/Dockerfile index 509141c..2b3b2ee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,6 +8,8 @@ RUN docker-php-ext-install pdo pdo_mysql zip intl gd bcmath 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 --from=composer /usr/bin/composer /usr/bin/composer WORKDIR /code diff --git a/docker-compose.yml b/docker-compose.yml index 4052376..58ae7bc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,10 +11,11 @@ services: container_name: incoviba_web <<: *restart ports: - - "8080:80" + - "${APP_PORT}:80" volumes: - - .:/code + - ${APP_PATH:-.}/:/code - ./nginx.conf:/etc/nginx/conf.d/default.conf + - ./logs/proxy:/logs php: profiles: @@ -23,13 +24,12 @@ services: container_name: incoviba_php <<: *restart env_file: - - .env - - .db.env - - .remote.env + - ${APP_PATH:-.}/.env + - ${APP_PATH:-.}/.db.env + #- ${APP_PATH:-.}/.remote.env volumes: - - .:/code - - ./php-errors.ini:/usr/local/etc/php/conf.d/docker-php-errors.ini - - ./logs:/logs + - ${APP_PATH:-.}/:/code + - ./logs/php:/logs db: profiles: @@ -37,9 +37,10 @@ services: image: mariadb:latest container_name: incoviba_db <<: *restart - env_file: .db.env + env_file: ${APP_PATH:-.}/.db.env volumes: - dbdata:/var/lib/mysql + - ./incoviba.sql.gz:/docker-entrypoint-initdb.d/incoviba.sql.gz networks: - default - adminer_network @@ -50,9 +51,11 @@ services: image: adminer:latest container_name: incoviba_adminer <<: *restart + env_file: ${APP_PATH:-.}/.adminer.env + networks: + - adminer_network ports: - "8083:8080" - env_file: .adminer.env python: profiles: @@ -80,7 +83,7 @@ services: - "8084:80" volumes: - dbdata: + dbdata: {} networks: adminer_network: {} diff --git a/nginx.conf b/nginx.conf index 42bb089..dfbee25 100644 --- a/nginx.conf +++ b/nginx.conf @@ -2,13 +2,10 @@ server { listen 80; server_name web; index index.php; - error_log /code/logs/error.log; - access_log /code/logs/access.log; + error_log /logs/error.log; + access_log /logs/access.log; root /code/public; - location /api { - try_files $uri /api/index.php$is_args$args; - } location / { try_files $uri /index.php$is_args$args; } From 1a7b10ce3c999f7654004d5fc8c87e293b7c4168 Mon Sep 17 00:00:00 2001 From: Juan Pablo Vial Date: Mon, 24 Jul 2023 20:55:26 -0400 Subject: [PATCH 005/163] Auth, Login, Home, Venta->Listados->Precios --- app/common/Alias/View.php | 9 + app/common/Define/Connection.php | 14 + app/common/Define/Database.php | 8 + app/common/Define/Model.php | 8 + app/common/Define/Repository.php | 11 + app/common/Ideal/Model.php | 16 + app/common/Ideal/Repository.php | 126 ++++ app/common/Implement/Connection.php | 61 ++ app/common/Implement/Database/MySQL.php | 24 + .../Implement/Exception/EmptyResult.php | 15 + app/composer.json | 31 + app/public/assets/images/Isotipo 16.png | Bin 0 -> 3552 bytes app/public/assets/images/Isotipo 32.png | Bin 0 -> 4572 bytes app/public/assets/images/Isotipo 64.png | Bin 0 -> 6361 bytes app/public/assets/images/logo_cabezal.png | Bin 0 -> 23004 bytes app/public/index.php | 7 + app/public/robots.txt | 2 + app/resources/routes/01_api.php | 13 + app/resources/routes/03_proyectos.php | 6 + app/resources/routes/04_ventas.php | 10 + app/resources/routes/98_login.php | 8 + app/resources/routes/99_base.php | 4 + app/resources/routes/api/proyectos.php | 6 + app/resources/routes/api/ventas.php | 13 + app/resources/routes/api/ventas/precios.php | 6 + app/resources/routes/ventas/cuotas.php | 9 + app/resources/routes/ventas/precios.php | 6 + app/resources/views/guest.blade.php | 7 + app/resources/views/home.blade.php | 26 + .../views/home/cierres_vigentes.blade.php | 24 + .../views/home/cuotas_por_vencer.blade.php | 22 + app/resources/views/layout/base.blade.php | 5 + app/resources/views/layout/body.blade.php | 5 + .../views/layout/body/footer.blade.php | 4 + .../views/layout/body/header.blade.php | 7 + .../views/layout/body/header/menu.blade.php | 17 + .../body/header/menu/contabilidad.blade.php | 8 + .../layout/body/header/menu/guest.blade.php | 1 + .../body/header/menu/herramientas.blade.php | 7 + .../body/header/menu/inmobiliarias.blade.php | 1 + .../body/header/menu/operadores.blade.php | 9 + .../body/header/menu/proyectos.blade.php | 8 + .../layout/body/header/menu/search.blade.php | 1 + .../layout/body/header/menu/user.blade.php | 31 + .../layout/body/header/menu/ventas.blade.php | 41 ++ .../views/layout/body/scripts.blade.php | 4 + .../layout/body/scripts/datatables.blade.php | 4 + app/resources/views/layout/head.blade.php | 10 + .../views/layout/head/styles.blade.php | 3 + .../layout/head/styles/datatables.blade.php | 3 + app/resources/views/login/form.blade.php | 60 ++ .../views/ventas/cuotas/pendientes.blade.php | 108 +++ .../views/ventas/precios/list.blade.php | 676 ++++++++++++++++++ app/setup/app.php | 45 ++ app/setup/composer.php | 6 + app/setup/middlewares/01_auth.php | 2 + app/setup/middlewares/98_logs.php | 2 + app/setup/middlewares/99_routes.php | 12 + app/setup/settings/env.php | 2 + app/setup/settings/folders.php | 12 + app/setup/settings/urls.php | 21 + app/setup/setups/database.php | 18 + app/setup/setups/logs.php | 32 + app/setup/setups/middlewares.php | 15 + app/setup/setups/services.php | 14 + app/setup/setups/views.php | 23 + app/src/Controller/Base.php | 90 +++ app/src/Controller/Login.php | 55 ++ app/src/Controller/Proyectos.php | 21 + app/src/Controller/Users.php | 11 + app/src/Controller/Ventas/Cuotas.php | 60 ++ app/src/Controller/Ventas/Precios.php | 24 + app/src/Middleware/Authentication.php | 48 ++ app/src/Model/Banco.php | 16 + app/src/Model/Comuna.php | 18 + app/src/Model/Direccion.php | 22 + app/src/Model/Inmobiliaria.php | 38 + app/src/Model/Inmobiliaria/TipoSociedad.php | 16 + app/src/Model/Login.php | 25 + app/src/Model/Provincia.php | 18 + app/src/Model/Proyecto.php | 32 + app/src/Model/Proyecto/ProyectoTipoUnidad.php | 42 ++ app/src/Model/Proyecto/Superficie.php | 8 + app/src/Model/Proyecto/Terreno.php | 8 + app/src/Model/Region.php | 20 + app/src/Model/Role.php | 7 + app/src/Model/Tipo.php | 16 + app/src/Model/User.php | 28 + app/src/Model/Venta/Cierre.php | 26 + app/src/Model/Venta/Cuota.php | 38 + app/src/Model/Venta/Datos.php | 27 + app/src/Model/Venta/EstadoPago.php | 22 + app/src/Model/Venta/EstadoPrecio.php | 21 + app/src/Model/Venta/Pago.php | 32 + app/src/Model/Venta/Pie.php | 27 + app/src/Model/Venta/Precio.php | 23 + app/src/Model/Venta/Propietario.php | 46 ++ app/src/Model/Venta/TipoEstadoPago.php | 8 + app/src/Model/Venta/TipoEstadoPrecio.php | 7 + app/src/Model/Venta/TipoPago.php | 8 + app/src/Model/Venta/TipoUnidad.php | 16 + app/src/Model/Venta/Unidad.php | 25 + app/src/Repository/Banco.php | 35 + app/src/Repository/Comuna.php | 51 ++ app/src/Repository/Direccion.php | 48 ++ app/src/Repository/Inmobiliaria.php | 55 ++ .../Repository/Inmobiliaria/TipoSociedad.php | 36 + app/src/Repository/Login.php | 77 ++ app/src/Repository/Provincia.php | 51 ++ app/src/Repository/Proyecto.php | 88 +++ .../Proyecto/ProyectoTipoUnidad.php | 54 ++ app/src/Repository/Region.php | 53 ++ app/src/Repository/User.php | 46 ++ app/src/Repository/Venta/Cierre.php | 82 +++ app/src/Repository/Venta/Cuota.php | 161 +++++ app/src/Repository/Venta/EstadoPago.php | 67 ++ app/src/Repository/Venta/EstadoPrecio.php | 65 ++ app/src/Repository/Venta/Pago.php | 73 ++ app/src/Repository/Venta/Pie.php | 60 ++ app/src/Repository/Venta/Precio.php | 55 ++ app/src/Repository/Venta/Propietario.php | 82 +++ app/src/Repository/Venta/TipoEstadoPago.php | 40 ++ app/src/Repository/Venta/TipoEstadoPrecio.php | 35 + app/src/Repository/Venta/TipoPago.php | 35 + app/src/Repository/Venta/TipoUnidad.php | 39 + app/src/Repository/Venta/Unidad.php | 47 ++ app/src/Service/Format.php | 24 + app/src/Service/Login.php | 135 ++++ app/src/Service/Ventas/Pago.php | 31 + app/src/Service/Ventas/Precio.php | 19 + 130 files changed, 4302 insertions(+) create mode 100644 app/common/Alias/View.php create mode 100644 app/common/Define/Connection.php create mode 100644 app/common/Define/Database.php create mode 100644 app/common/Define/Model.php create mode 100644 app/common/Define/Repository.php create mode 100644 app/common/Ideal/Model.php create mode 100644 app/common/Ideal/Repository.php create mode 100644 app/common/Implement/Connection.php create mode 100644 app/common/Implement/Database/MySQL.php create mode 100644 app/common/Implement/Exception/EmptyResult.php create mode 100644 app/composer.json create mode 100644 app/public/assets/images/Isotipo 16.png create mode 100644 app/public/assets/images/Isotipo 32.png create mode 100644 app/public/assets/images/Isotipo 64.png create mode 100644 app/public/assets/images/logo_cabezal.png create mode 100644 app/public/index.php create mode 100644 app/public/robots.txt create mode 100644 app/resources/routes/01_api.php create mode 100644 app/resources/routes/03_proyectos.php create mode 100644 app/resources/routes/04_ventas.php create mode 100644 app/resources/routes/98_login.php create mode 100644 app/resources/routes/99_base.php create mode 100644 app/resources/routes/api/proyectos.php create mode 100644 app/resources/routes/api/ventas.php create mode 100644 app/resources/routes/api/ventas/precios.php create mode 100644 app/resources/routes/ventas/cuotas.php create mode 100644 app/resources/routes/ventas/precios.php create mode 100644 app/resources/views/guest.blade.php create mode 100644 app/resources/views/home.blade.php create mode 100644 app/resources/views/home/cierres_vigentes.blade.php create mode 100644 app/resources/views/home/cuotas_por_vencer.blade.php create mode 100644 app/resources/views/layout/base.blade.php create mode 100644 app/resources/views/layout/body.blade.php create mode 100644 app/resources/views/layout/body/footer.blade.php create mode 100644 app/resources/views/layout/body/header.blade.php create mode 100644 app/resources/views/layout/body/header/menu.blade.php create mode 100644 app/resources/views/layout/body/header/menu/contabilidad.blade.php create mode 100644 app/resources/views/layout/body/header/menu/guest.blade.php create mode 100644 app/resources/views/layout/body/header/menu/herramientas.blade.php create mode 100644 app/resources/views/layout/body/header/menu/inmobiliarias.blade.php create mode 100644 app/resources/views/layout/body/header/menu/operadores.blade.php create mode 100644 app/resources/views/layout/body/header/menu/proyectos.blade.php create mode 100644 app/resources/views/layout/body/header/menu/search.blade.php create mode 100644 app/resources/views/layout/body/header/menu/user.blade.php create mode 100644 app/resources/views/layout/body/header/menu/ventas.blade.php create mode 100644 app/resources/views/layout/body/scripts.blade.php create mode 100644 app/resources/views/layout/body/scripts/datatables.blade.php create mode 100644 app/resources/views/layout/head.blade.php create mode 100644 app/resources/views/layout/head/styles.blade.php create mode 100644 app/resources/views/layout/head/styles/datatables.blade.php create mode 100644 app/resources/views/login/form.blade.php create mode 100644 app/resources/views/ventas/cuotas/pendientes.blade.php create mode 100644 app/resources/views/ventas/precios/list.blade.php create mode 100644 app/setup/app.php create mode 100644 app/setup/composer.php create mode 100644 app/setup/middlewares/01_auth.php create mode 100644 app/setup/middlewares/98_logs.php create mode 100644 app/setup/middlewares/99_routes.php create mode 100644 app/setup/settings/env.php create mode 100644 app/setup/settings/folders.php create mode 100644 app/setup/settings/urls.php create mode 100644 app/setup/setups/database.php create mode 100644 app/setup/setups/logs.php create mode 100644 app/setup/setups/middlewares.php create mode 100644 app/setup/setups/services.php create mode 100644 app/setup/setups/views.php create mode 100644 app/src/Controller/Base.php create mode 100644 app/src/Controller/Login.php create mode 100644 app/src/Controller/Proyectos.php create mode 100644 app/src/Controller/Users.php create mode 100644 app/src/Controller/Ventas/Cuotas.php create mode 100644 app/src/Controller/Ventas/Precios.php create mode 100644 app/src/Middleware/Authentication.php create mode 100644 app/src/Model/Banco.php create mode 100644 app/src/Model/Comuna.php create mode 100644 app/src/Model/Direccion.php create mode 100644 app/src/Model/Inmobiliaria.php create mode 100644 app/src/Model/Inmobiliaria/TipoSociedad.php create mode 100644 app/src/Model/Login.php create mode 100644 app/src/Model/Provincia.php create mode 100644 app/src/Model/Proyecto.php create mode 100644 app/src/Model/Proyecto/ProyectoTipoUnidad.php create mode 100644 app/src/Model/Proyecto/Superficie.php create mode 100644 app/src/Model/Proyecto/Terreno.php create mode 100644 app/src/Model/Region.php create mode 100644 app/src/Model/Role.php create mode 100644 app/src/Model/Tipo.php create mode 100644 app/src/Model/User.php create mode 100644 app/src/Model/Venta/Cierre.php create mode 100644 app/src/Model/Venta/Cuota.php create mode 100644 app/src/Model/Venta/Datos.php create mode 100644 app/src/Model/Venta/EstadoPago.php create mode 100644 app/src/Model/Venta/EstadoPrecio.php create mode 100644 app/src/Model/Venta/Pago.php create mode 100644 app/src/Model/Venta/Pie.php create mode 100644 app/src/Model/Venta/Precio.php create mode 100644 app/src/Model/Venta/Propietario.php create mode 100644 app/src/Model/Venta/TipoEstadoPago.php create mode 100644 app/src/Model/Venta/TipoEstadoPrecio.php create mode 100644 app/src/Model/Venta/TipoPago.php create mode 100644 app/src/Model/Venta/TipoUnidad.php create mode 100644 app/src/Model/Venta/Unidad.php create mode 100644 app/src/Repository/Banco.php create mode 100644 app/src/Repository/Comuna.php create mode 100644 app/src/Repository/Direccion.php create mode 100644 app/src/Repository/Inmobiliaria.php create mode 100644 app/src/Repository/Inmobiliaria/TipoSociedad.php create mode 100644 app/src/Repository/Login.php create mode 100644 app/src/Repository/Provincia.php create mode 100644 app/src/Repository/Proyecto.php create mode 100644 app/src/Repository/Proyecto/ProyectoTipoUnidad.php create mode 100644 app/src/Repository/Region.php create mode 100644 app/src/Repository/User.php create mode 100644 app/src/Repository/Venta/Cierre.php create mode 100644 app/src/Repository/Venta/Cuota.php create mode 100644 app/src/Repository/Venta/EstadoPago.php create mode 100644 app/src/Repository/Venta/EstadoPrecio.php create mode 100644 app/src/Repository/Venta/Pago.php create mode 100644 app/src/Repository/Venta/Pie.php create mode 100644 app/src/Repository/Venta/Precio.php create mode 100644 app/src/Repository/Venta/Propietario.php create mode 100644 app/src/Repository/Venta/TipoEstadoPago.php create mode 100644 app/src/Repository/Venta/TipoEstadoPrecio.php create mode 100644 app/src/Repository/Venta/TipoPago.php create mode 100644 app/src/Repository/Venta/TipoUnidad.php create mode 100644 app/src/Repository/Venta/Unidad.php create mode 100644 app/src/Service/Format.php create mode 100644 app/src/Service/Login.php create mode 100644 app/src/Service/Ventas/Pago.php create mode 100644 app/src/Service/Ventas/Precio.php diff --git a/app/common/Alias/View.php b/app/common/Alias/View.php new file mode 100644 index 0000000..80df0a9 --- /dev/null +++ b/app/common/Alias/View.php @@ -0,0 +1,9 @@ + $this->id + ]; + } +} diff --git a/app/common/Ideal/Repository.php b/app/common/Ideal/Repository.php new file mode 100644 index 0000000..9b4acc7 --- /dev/null +++ b/app/common/Ideal/Repository.php @@ -0,0 +1,126 @@ +table; + } + public function setTable(string $table): Repository + { + $this->table = $table; + return $this; + } + + public function load(array $data_row): Model + { + $model = $this->create($data_row); + $model->{$this->getKey()} = $data_row[$this->getKey()]; + return $model; + } + + public function remove(Model $model): void + { + $query = "DELETE FROM `{$this->getTable()}` WHERE `{$this->getKey()}` = ?"; + $this->connection->execute($query, [$model->getId()]); + } + + public function fetchById(int $id): Define\Model + { + $query = "SELECT * FROM `{$this->getTable()}` WHERE `{$this->getKey()}` = ?"; + return $this->fetchOne($query, [$id]); + } + public function fetchAll(): array + { + $query = "SELECT * FROM `{$this->getTable()}`"; + return $this->fetchMany($query); + } + + protected function getKey(): string + { + return 'id'; + } + protected function parseData(Define\Model $model, ?array $data, array $data_map): Define\Model + { + if ($data === null) { + return $model; + } + foreach ($data_map as $column => $settings) { + if (isset($data[$column])) { + $property = $column; + if (isset($settings['property'])) { + $property = $settings['property']; + } + $value = $data[$column]; + if (isset($settings['function'])) { + $value = $settings['function']($data); + } + $model->{$property} = $value; + } + } + return $model; + } + protected function saveNew(array $columns, array $values): int + { + $columns_string = implode(', ', array_map(function($column) {return "`{$column}`";}, $columns)); + $columns_questions = implode(', ', array_fill(0, count($columns), '?')); + $query = "INSERT INTO `{$this->getTable()}` ({$columns_string}) VALUES ($columns_questions)"; + $this->connection->execute($query, $values); + return $this->connection->getPDO()->lastInsertId(); + } + protected function update(Model $model, array $columns, array $data): Define\Model + { + $changes = []; + $values = []; + foreach ($columns as $column) { + if (isset($data[$column])) { + $changes []= $column; + $values []= $data[$column]; + } + } + if (count($changes) === 0) { + return $model; + } + $columns_string = implode(', ', array_map(function($property) {return "`{$property}` = ?";}, $changes)); + $query = "UPDATE `{$this->getTable()}` SET {$columns_string} WHERE `{$this->getKey()}` = ?"; + $values []= $model->id; + $this->connection->execute($query, $values); + $id = $model->id; + $model = $this->create($data); + $model->id = $id; + return $model; + } + protected function fetchOne(string $query, ?array $data = null): Define\Model + { + $result = $this->connection->execute($query, $data)->fetch(PDO::FETCH_ASSOC); + if ($result === false) { + throw new EmptyResult($query); + } + return $this->load($result); + } + protected function fetchMany(string $query, ?array $data = null): array + { + $results = $this->connection->execute($query, $data)->fetchAll(PDO::FETCH_ASSOC); + if ($results === false) { + throw new EmptyResult($query); + } + return array_map([$this, 'load'], $results); + } + protected function fetchAsArray(string $query, ?array $data = null): array + { + $results = $this->connection->execute($query, $data)->fetchAll(PDO::FETCH_ASSOC); + if ($results === false) { + throw new EmptyResult($query); + } + return $results; + } +} diff --git a/app/common/Implement/Connection.php b/app/common/Implement/Connection.php new file mode 100644 index 0000000..bcb6eab --- /dev/null +++ b/app/common/Implement/Connection.php @@ -0,0 +1,61 @@ +connection)) { + if ($this->database->needsUser()) { + $this->connection = new PDO($this->database->getDSN(), $this->database->user, $this->database->password); + } else { + $this->connection = new PDO($this->database->getDSN()); + } + } + return $this; + } + public function getPDO(): PDO + { + $this->connect(); + return $this->connection; + } + + public function query(string $query): PDOStatement + { + $this->connect(); + $statement = $this->connection->query($query); + if ($statement === false) { + throw new PDOException("Query failed: '{$query}'"); + } + return $statement; + } + public function prepare(string $query): PDOStatement + { + $this->connect(); + $statement = $this->connection->prepare($query); + if ($statement === false) { + throw new PDOException("Query failed: '{$query}'"); + } + return $statement; + } + public function execute(string $query, ?array $data = null): PDOStatement + { + if ($data === null) { + return $this->query($query); + } + $statement = $this->prepare($query); + $status = $statement->execute($data); + if ($status === false) { + throw new PDOException("Query could not be executed: '{$query}'"); + } + return $statement; + } +} diff --git a/app/common/Implement/Database/MySQL.php b/app/common/Implement/Database/MySQL.php new file mode 100644 index 0000000..b2bca28 --- /dev/null +++ b/app/common/Implement/Database/MySQL.php @@ -0,0 +1,24 @@ +host};dbname={$this->name}"; + if ($this->port !== 3306) { + $dsn .= ";port={$this->port}"; + } + return $dsn; + } + public function needsUser(): bool + { + return true; + } +} diff --git a/app/common/Implement/Exception/EmptyResult.php b/app/common/Implement/Exception/EmptyResult.php new file mode 100644 index 0000000..2a8e3ef --- /dev/null +++ b/app/common/Implement/Exception/EmptyResult.php @@ -0,0 +1,15 @@ +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 literal 0 HcmV?d00001 diff --git a/app/public/assets/images/Isotipo 64.png b/app/public/assets/images/Isotipo 64.png new file mode 100644 index 0000000000000000000000000000000000000000..8b503d19529984b3b75b81357d953ac44e0bbfd6 GIT binary patch literal 6361 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 bI{n`OS|NRY86>_D00000NkvXXu0mjfU{o%_ literal 0 HcmV?d00001 diff --git a/app/public/assets/images/logo_cabezal.png b/app/public/assets/images/logo_cabezal.png new file mode 100644 index 0000000000000000000000000000000000000000..29fd0595347b55901e215dc2a07ac5e75426a69e GIT binary patch literal 23004 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 diff --git a/app/public/robots.txt b/app/public/robots.txt new file mode 100644 index 0000000..1f53798 --- /dev/null +++ b/app/public/robots.txt @@ -0,0 +1,2 @@ +User-agent: * +Disallow: / diff --git a/app/resources/routes/01_api.php b/app/resources/routes/01_api.php new file mode 100644 index 0000000..a8f19fa --- /dev/null +++ b/app/resources/routes/01_api.php @@ -0,0 +1,13 @@ +group('/api', function($app) { + $folder = implode(DIRECTORY_SEPARATOR, [__DIR__, 'api']); + if (file_exists($folder)) { + $files = new FilesystemIterator($folder); + foreach ($files as $file) { + if ($file->isDir()) { + continue; + } + include_once $file->getRealPath(); + } + } +}); diff --git a/app/resources/routes/03_proyectos.php b/app/resources/routes/03_proyectos.php new file mode 100644 index 0000000..02303aa --- /dev/null +++ b/app/resources/routes/03_proyectos.php @@ -0,0 +1,6 @@ +group('/proyectos', function($app) { + $app->get('[/]', Proyectos::class); +}); diff --git a/app/resources/routes/04_ventas.php b/app/resources/routes/04_ventas.php new file mode 100644 index 0000000..93a94c7 --- /dev/null +++ b/app/resources/routes/04_ventas.php @@ -0,0 +1,10 @@ +group('/ventas', function($app) { + $files = new FilesystemIterator(implode(DIRECTORY_SEPARATOR, [__DIR__, 'ventas'])); + foreach ($files as $file) { + if ($file->isDir()) { + continue; + } + include_once $file->getRealPath(); + } +}); diff --git a/app/resources/routes/98_login.php b/app/resources/routes/98_login.php new file mode 100644 index 0000000..4521062 --- /dev/null +++ b/app/resources/routes/98_login.php @@ -0,0 +1,8 @@ +group('/login', function($app) { + $app->post('[/]', [Login::class, 'login']); + $app->get('[/]', [Login::class, 'form']); +}); +$app->get('/logout', [Login::class, 'logout']); diff --git a/app/resources/routes/99_base.php b/app/resources/routes/99_base.php new file mode 100644 index 0000000..c8c764e --- /dev/null +++ b/app/resources/routes/99_base.php @@ -0,0 +1,4 @@ +get('[/]', Base::class); diff --git a/app/resources/routes/api/proyectos.php b/app/resources/routes/api/proyectos.php new file mode 100644 index 0000000..a0bf995 --- /dev/null +++ b/app/resources/routes/api/proyectos.php @@ -0,0 +1,6 @@ +group('/proyectos', function($app) { + $app->get('[/]', [Proyectos::class, 'list']); +}); diff --git a/app/resources/routes/api/ventas.php b/app/resources/routes/api/ventas.php new file mode 100644 index 0000000..361f498 --- /dev/null +++ b/app/resources/routes/api/ventas.php @@ -0,0 +1,13 @@ +group('/ventas', function($app) { + $folder = implode(DIRECTORY_SEPARATOR, [__DIR__, 'ventas']); + if (file_exists($folder)) { + $files = new FilesystemIterator($folder); + foreach ($files as $file) { + if ($file->isDir()) { + continue; + } + include_once $file->getRealPath(); + } + } +}); diff --git a/app/resources/routes/api/ventas/precios.php b/app/resources/routes/api/ventas/precios.php new file mode 100644 index 0000000..0ad9ba4 --- /dev/null +++ b/app/resources/routes/api/ventas/precios.php @@ -0,0 +1,6 @@ +group('/precios', function($app) { + $app->post('[/]', [Precios::class, 'proyecto']); +}); diff --git a/app/resources/routes/ventas/cuotas.php b/app/resources/routes/ventas/cuotas.php new file mode 100644 index 0000000..981dccd --- /dev/null +++ b/app/resources/routes/ventas/cuotas.php @@ -0,0 +1,9 @@ +group('/cuotas', function($app) { + $app->get('/pendientes[/]', [Cuotas::class, 'pendientes']); +}); +$app->group('/cuota', function($app) { + $app->post('/depositar[/]', [Cuotas::class, 'depositar']); +}); diff --git a/app/resources/routes/ventas/precios.php b/app/resources/routes/ventas/precios.php new file mode 100644 index 0000000..c035216 --- /dev/null +++ b/app/resources/routes/ventas/precios.php @@ -0,0 +1,6 @@ +group('/precios', function($app) { + $app->get('[/]', Precios::class); +}); diff --git a/app/resources/views/guest.blade.php b/app/resources/views/guest.blade.php new file mode 100644 index 0000000..8acdfe6 --- /dev/null +++ b/app/resources/views/guest.blade.php @@ -0,0 +1,7 @@ +@extends('layout.base') + +@section('page_content') +
    + Bienvenid@ a Incoviba +
    +@endsection diff --git a/app/resources/views/home.blade.php b/app/resources/views/home.blade.php new file mode 100644 index 0000000..06597bf --- /dev/null +++ b/app/resources/views/home.blade.php @@ -0,0 +1,26 @@ +@extends('layout.base') + +@section('page_content') +
    +

    Bienvenid@ {{$user->name}}

    +
    + @if ($cuotas_hoy > 0) + Existe{{$cuotas_hoy > 1 ? 'n' : ''}} {{$cuotas_hoy}} deposito{{$cuotas_hoy > 1 ? 's' : ''}} para hoy. +
    + @endif + @if ($cuotas_pendientes > 0) + + Existe{{$cuotas_pendientes > 1 ? 'n' : ''}} {{$cuotas_pendientes}} cuota{{$cuotas_pendientes > 1 ? 's' : ''}} pendiente{{$cuotas_pendientes > 1 ? 's' : ''}}. + + @endif +
    +
    +
    + @include('home.cuotas_por_vencer') +
    +
    + @include('home.cierres_vigentes') +
    +
    +
    +@endsection diff --git a/app/resources/views/home/cierres_vigentes.blade.php b/app/resources/views/home/cierres_vigentes.blade.php new file mode 100644 index 0000000..fe974e0 --- /dev/null +++ b/app/resources/views/home/cierres_vigentes.blade.php @@ -0,0 +1,24 @@ +

    Cierres Vigentes

    +
    + @foreach($cierres_vigentes as $proyecto => $estados) +
    +
    +
    + {{$proyecto}} [{{$estados['total']}}] +
    +
    +
    Promesados
    +
    {{$estados['promesados']}}
    +
    +
    +
    Pendientes
    +
    {{$estados['pendientes']}}
    +
    +
    +
    Rechazados
    +
    {{$estados['rechazados']}}
    +
    +
    +
    + @endforeach +
    diff --git a/app/resources/views/home/cuotas_por_vencer.blade.php b/app/resources/views/home/cuotas_por_vencer.blade.php new file mode 100644 index 0000000..a0df444 --- /dev/null +++ b/app/resources/views/home/cuotas_por_vencer.blade.php @@ -0,0 +1,22 @@ +

    Cuotas Por Vencer

    +
    + @foreach ($cuotas_por_vencer as $date => $proyectos) +
    +
    +
    + {{$format->localDate($date, "EEE. dd 'de' MMMM 'de' yyyy", true)}} +
    + @foreach ($proyectos as $proyecto => $cuotas) +
    +
    + + {{$proyecto}} + +
    +
    {{$cuotas}}
    +
    + @endforeach +
    +
    + @endforeach +
    diff --git a/app/resources/views/layout/base.blade.php b/app/resources/views/layout/base.blade.php new file mode 100644 index 0000000..9deb8c1 --- /dev/null +++ b/app/resources/views/layout/base.blade.php @@ -0,0 +1,5 @@ + + +@include('layout.head') +@include('layout.body') + diff --git a/app/resources/views/layout/body.blade.php b/app/resources/views/layout/body.blade.php new file mode 100644 index 0000000..fb0cc48 --- /dev/null +++ b/app/resources/views/layout/body.blade.php @@ -0,0 +1,5 @@ + + @include('layout.body.header') + @yield('page_content') + @include('layout.body.footer') + diff --git a/app/resources/views/layout/body/footer.blade.php b/app/resources/views/layout/body/footer.blade.php new file mode 100644 index 0000000..c3b1007 --- /dev/null +++ b/app/resources/views/layout/body/footer.blade.php @@ -0,0 +1,4 @@ +
    + +
    +@include('layout.body.scripts') diff --git a/app/resources/views/layout/body/header.blade.php b/app/resources/views/layout/body/header.blade.php new file mode 100644 index 0000000..48d779d --- /dev/null +++ b/app/resources/views/layout/body/header.blade.php @@ -0,0 +1,7 @@ +
    + + logo + + @include('layout.body.header.menu') +
    +
    diff --git a/app/resources/views/layout/body/header/menu.blade.php b/app/resources/views/layout/body/header/menu.blade.php new file mode 100644 index 0000000..392dc36 --- /dev/null +++ b/app/resources/views/layout/body/header/menu.blade.php @@ -0,0 +1,17 @@ + diff --git a/app/resources/views/layout/body/header/menu/contabilidad.blade.php b/app/resources/views/layout/body/header/menu/contabilidad.blade.php new file mode 100644 index 0000000..7ed6b0c --- /dev/null +++ b/app/resources/views/layout/body/header/menu/contabilidad.blade.php @@ -0,0 +1,8 @@ +
    + Contabilidad + +
    + Pagos Mes + Resumen +
    +
    diff --git a/app/resources/views/layout/body/header/menu/guest.blade.php b/app/resources/views/layout/body/header/menu/guest.blade.php new file mode 100644 index 0000000..8c7399b --- /dev/null +++ b/app/resources/views/layout/body/header/menu/guest.blade.php @@ -0,0 +1 @@ +Ingresar diff --git a/app/resources/views/layout/body/header/menu/herramientas.blade.php b/app/resources/views/layout/body/header/menu/herramientas.blade.php new file mode 100644 index 0000000..45b0b52 --- /dev/null +++ b/app/resources/views/layout/body/header/menu/herramientas.blade.php @@ -0,0 +1,7 @@ +
    + Herramientas + +
    + Valores Monetarios +
    +
    diff --git a/app/resources/views/layout/body/header/menu/inmobiliarias.blade.php b/app/resources/views/layout/body/header/menu/inmobiliarias.blade.php new file mode 100644 index 0000000..9aa161c --- /dev/null +++ b/app/resources/views/layout/body/header/menu/inmobiliarias.blade.php @@ -0,0 +1 @@ +Inmobiliarias diff --git a/app/resources/views/layout/body/header/menu/operadores.blade.php b/app/resources/views/layout/body/header/menu/operadores.blade.php new file mode 100644 index 0000000..c30b9c0 --- /dev/null +++ b/app/resources/views/layout/body/header/menu/operadores.blade.php @@ -0,0 +1,9 @@ +
    + Operadores + +
    + Listado + Ventas + Informe +
    +
    diff --git a/app/resources/views/layout/body/header/menu/proyectos.blade.php b/app/resources/views/layout/body/header/menu/proyectos.blade.php new file mode 100644 index 0000000..c72eb69 --- /dev/null +++ b/app/resources/views/layout/body/header/menu/proyectos.blade.php @@ -0,0 +1,8 @@ +
    + Proyectos + +
    + Listado + Unidades +
    +
    diff --git a/app/resources/views/layout/body/header/menu/search.blade.php b/app/resources/views/layout/body/header/menu/search.blade.php new file mode 100644 index 0000000..cd4315e --- /dev/null +++ b/app/resources/views/layout/body/header/menu/search.blade.php @@ -0,0 +1 @@ + diff --git a/app/resources/views/layout/body/header/menu/user.blade.php b/app/resources/views/layout/body/header/menu/user.blade.php new file mode 100644 index 0000000..e2bd013 --- /dev/null +++ b/app/resources/views/layout/body/header/menu/user.blade.php @@ -0,0 +1,31 @@ +
    + {{$user->name}} + +
    + Cambiar Clave + @if ($user->isAdmin()) + Administración + @endif +
    Salir
    +
    +
    + +@push('page_scripts') + +@endpush diff --git a/app/resources/views/layout/body/header/menu/ventas.blade.php b/app/resources/views/layout/body/header/menu/ventas.blade.php new file mode 100644 index 0000000..7d669cc --- /dev/null +++ b/app/resources/views/layout/body/header/menu/ventas.blade.php @@ -0,0 +1,41 @@ +
    + Ventas + +
    +
    + Listados + +
    + Precios + Cierres + Ventas +
    + Cuotas + +
    + Pendientes + Abonar +
    +
    + Pagos Pendientes + Consolidado Ventas +
    +
    +
    + Informes + +
    + Ventas + Escrituras + Gantt de Entregas + Resciliaciones +
    +
    + Importar Precios + Evaluar Cierre + + Nueva Venta + + +
    +
    diff --git a/app/resources/views/layout/body/scripts.blade.php b/app/resources/views/layout/body/scripts.blade.php new file mode 100644 index 0000000..9b8faa6 --- /dev/null +++ b/app/resources/views/layout/body/scripts.blade.php @@ -0,0 +1,4 @@ + + + +@stack('page_scripts') diff --git a/app/resources/views/layout/body/scripts/datatables.blade.php b/app/resources/views/layout/body/scripts/datatables.blade.php new file mode 100644 index 0000000..980cdf7 --- /dev/null +++ b/app/resources/views/layout/body/scripts/datatables.blade.php @@ -0,0 +1,4 @@ +@push('page_scripts') + + +@endpush diff --git a/app/resources/views/layout/head.blade.php b/app/resources/views/layout/head.blade.php new file mode 100644 index 0000000..98233b9 --- /dev/null +++ b/app/resources/views/layout/head.blade.php @@ -0,0 +1,10 @@ + + + @hasSection('page_title') + Incoviba - @yield('page_title') + @else + Incoviba + @endif + + @include('layout.head.styles') + diff --git a/app/resources/views/layout/head/styles.blade.php b/app/resources/views/layout/head/styles.blade.php new file mode 100644 index 0000000..60ed4f9 --- /dev/null +++ b/app/resources/views/layout/head/styles.blade.php @@ -0,0 +1,3 @@ + + +@stack('page_styles') diff --git a/app/resources/views/layout/head/styles/datatables.blade.php b/app/resources/views/layout/head/styles/datatables.blade.php new file mode 100644 index 0000000..a5dcca3 --- /dev/null +++ b/app/resources/views/layout/head/styles/datatables.blade.php @@ -0,0 +1,3 @@ +@push('page_styles') + +@endpush diff --git a/app/resources/views/login/form.blade.php b/app/resources/views/login/form.blade.php new file mode 100644 index 0000000..31e38ff --- /dev/null +++ b/app/resources/views/login/form.blade.php @@ -0,0 +1,60 @@ +@extends('layout.base') + +@section('page_content') +
    +
    +
    + + +
    +
    + + +
    + +
    +
    +@endsection + +@push('page_scripts') + +@endpush diff --git a/app/resources/views/ventas/cuotas/pendientes.blade.php b/app/resources/views/ventas/cuotas/pendientes.blade.php new file mode 100644 index 0000000..00a4ba1 --- /dev/null +++ b/app/resources/views/ventas/cuotas/pendientes.blade.php @@ -0,0 +1,108 @@ +@extends('layout.base') + +@section('page_content') +
    +

    Cuotas Pendientes

    +
    +
    Total
    +
    {{count($cuotas_pendientes)}}
    +
    {{$format->pesos(array_reduce($cuotas_pendientes, function($sum, $cuota) {return $sum + $cuota['Valor'];}, 0))}}
    +
    +
    ' . ucwords(str_replace('_', ' ', $fuente->tipo)) . '' . $fuente->obj->pie()->venta()->proyecto()->descripcion - . '' . $fuente->obj->pie()->venta()->unidad()->descripcion . '' - . $fuente->obj->pie()->venta()->propietario()->nombreCompleto() - . '' . format('shortDate', $rebote->estado()->fecha) . '' . format('pesos', $rebote->valor('pesos'), true) . '
    + + + + + + + + + + + + + + + + + @foreach($cuotas_pendientes as $cuota) + + + + + + + + + + + + + + @endforeach + +
    ProyectoDepartamentoDepartamento SortValorDíaCuotaPropietarioBancoFecha Cheque (Días)Fecha ISODepositar
    {{$cuota['Proyecto']}} + + {{$cuota['Departamento']}} + + {{str_pad($cuota['Departamento'], 4, '0', STR_PAD_LEFT)}}{{$format->pesos($cuota['Valor'])}}{{$cuota['Dia']}}{{$cuota['Numero']}}{{$cuota['Propietario']}}{{$cuota['Banco']}}{{$cuota['Fecha Cheque']}} ({{$cuota['Vencida']}}){{$cuota['Fecha ISO']}} + +
    + +@endsection + +@include('layout.head.styles.datatables') +@include('layout.body.scripts.datatables') + +@push('page_scripts') + +@endpush diff --git a/app/resources/views/ventas/precios/list.blade.php b/app/resources/views/ventas/precios/list.blade.php new file mode 100644 index 0000000..101e4de --- /dev/null +++ b/app/resources/views/ventas/precios/list.blade.php @@ -0,0 +1,676 @@ +@extends('layout.base') + + +@section('page_title') + Precios - Listado +@endsection + +@section('page_content') +
    +

    Listado de Precios

    +
    +

    +
    +
    +
    +
    + + +
    + +
    +
    +

    + +
    +
    +
    + +@endsection + +@push('page_styles') + +@endpush + +@push('page_scripts') + +@endpush diff --git a/app/setup/app.php b/app/setup/app.php new file mode 100644 index 0000000..a17667e --- /dev/null +++ b/app/setup/app.php @@ -0,0 +1,45 @@ +isDir()) { + continue; + } + $builder->addDefinitions($file->getRealPath()); + } + } + $app = Bridge::create($builder->build()); + $folder = implode(DIRECTORY_SEPARATOR, [ + __DIR__, + 'middlewares' + ]); + if (file_exists($folder)) { + $files = new FilesystemIterator($folder); + foreach ($files as $file) { + if ($file->isDir()) { + continue; + } + require_once $file->getRealPath(); + } + } + return $app; +} +return buildApp(); diff --git a/app/setup/composer.php b/app/setup/composer.php new file mode 100644 index 0000000..b451f96 --- /dev/null +++ b/app/setup/composer.php @@ -0,0 +1,6 @@ +add($app->getContainer()->get(Incoviba\Middleware\Authentication::class)); diff --git a/app/setup/middlewares/98_logs.php b/app/setup/middlewares/98_logs.php new file mode 100644 index 0000000..b81e521 --- /dev/null +++ b/app/setup/middlewares/98_logs.php @@ -0,0 +1,2 @@ +getContainer()->get(Psr\Log\LoggerInterface::class)); diff --git a/app/setup/middlewares/99_routes.php b/app/setup/middlewares/99_routes.php new file mode 100644 index 0000000..a08c17c --- /dev/null +++ b/app/setup/middlewares/99_routes.php @@ -0,0 +1,12 @@ +getContainer()->get('folders')->get('routes'); + $files = new FilesystemIterator($folder); + foreach ($files as $file) { + if ($file->isDir()) { + continue; + } + include_once $file->getRealPath(); + } +} +loadRoutes($app); diff --git a/app/setup/settings/env.php b/app/setup/settings/env.php new file mode 100644 index 0000000..580b775 --- /dev/null +++ b/app/setup/settings/env.php @@ -0,0 +1,2 @@ + function() { + return new DI\Container([ + 'base' => dirname(__FILE__, 3), + 'resources' => DI\String('{base}/resources'), + 'routes' => DI\String('{resources}/routes'), + 'cache' => DI\String('{base}/cache'), + 'templates' => DI\String('{resources}/views') + ]); + } +]; diff --git a/app/setup/settings/urls.php b/app/setup/settings/urls.php new file mode 100644 index 0000000..d07f846 --- /dev/null +++ b/app/setup/settings/urls.php @@ -0,0 +1,21 @@ + function() { + $urls = [ + 'base' => $_ENV['APP_URL'] ?? '', + ]; + $urls['api'] = implode('/', [ + $urls['base'], + 'api' + ]); + $urls['assets'] = implode('/', [ + $urls['base'], + 'assets' + ]); + $urls['images'] = implode('/', [ + $urls['assets'], + 'images' + ]); + return (object) $urls; + } +]; diff --git a/app/setup/setups/database.php b/app/setup/setups/database.php new file mode 100644 index 0000000..3cfd071 --- /dev/null +++ b/app/setup/setups/database.php @@ -0,0 +1,18 @@ + function(ContainerInterface $container) { + return new Incoviba\Common\Implement\Database\MySQL( + $container->has('MYSQL_HOST') ? $container->get('MYSQL_HOST') : 'db', + $container->get('MYSQL_DATABASE'), + $container->get('MYSQL_USER'), + $container->get('MYSQL_PASSWORD') + ); + }, + Incoviba\Common\Define\Connection::class => function(ContainerInterface $container) { + return new Incoviba\Common\Implement\Connection( + $container->get(Incoviba\Common\Define\Database::class) + ); + } +]; diff --git a/app/setup/setups/logs.php b/app/setup/setups/logs.php new file mode 100644 index 0000000..0ccd933 --- /dev/null +++ b/app/setup/setups/logs.php @@ -0,0 +1,32 @@ + function(ContainerInterface $container) { + return new Monolog\Logger('incoviba', [ + new Monolog\Handler\FilterHandler( + (new Monolog\Handler\RotatingFileHandler('/logs/debug.log')) + ->setFormatter(new Monolog\Formatter\LineFormatter(null, null, false, false, true)), + Monolog\Level::Debug, + Monolog\Level::Notice + ), + new Monolog\Handler\FilterHandler( + (new Monolog\Handler\RotatingFileHandler('/logs/error.log')) + ->setFormatter(new Monolog\Formatter\LineFormatter(null, null, false, false, true)), + Monolog\Level::Warning, + Monolog\Level::Error + ), + new Monolog\Handler\FilterHandler( + (new Monolog\Handler\RotatingFileHandler('/logs/critical.log')) + ->setFormatter(new Monolog\Formatter\LineFormatter(null, null, false, false, true)), + Monolog\Level::Critical + ) + ], [ + $container->get(Monolog\Processor\PsrLogMessageProcessor::class), + $container->get(Monolog\Processor\WebProcessor::class), + $container->get(Monolog\Processor\IntrospectionProcessor::class), + $container->get(Monolog\Processor\MemoryUsageProcessor::class), + $container->get(Monolog\Processor\MemoryPeakUsageProcessor::class) + ]); + } +]; diff --git a/app/setup/setups/middlewares.php b/app/setup/setups/middlewares.php new file mode 100644 index 0000000..5c5f23f --- /dev/null +++ b/app/setup/setups/middlewares.php @@ -0,0 +1,15 @@ + function(ContainerInterface $container) { + return $container->get(Nyholm\Psr7\Factory\Psr17Factory::class); + }, + Incoviba\Middleware\Authentication::class => function(ContainerInterface $container) { + return new Incoviba\Middleware\Authentication( + $container->get(Psr\Http\Message\ResponseFactoryInterface::class), + $container->get(Incoviba\Service\Login::class), + implode('/', [$container->get('APP_URL'), 'login']) + ); + } +]; diff --git a/app/setup/setups/services.php b/app/setup/setups/services.php new file mode 100644 index 0000000..3f4906f --- /dev/null +++ b/app/setup/setups/services.php @@ -0,0 +1,14 @@ + function(ContainerInterface $container) { + return new Incoviba\Service\Login( + $container->get(Incoviba\Repository\Login::class), + $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') : '' + ); + } +]; diff --git a/app/setup/setups/views.php b/app/setup/setups/views.php new file mode 100644 index 0000000..41cf638 --- /dev/null +++ b/app/setup/setups/views.php @@ -0,0 +1,23 @@ + function(ContainerInterface $container) { + $folders = $container->get('folders'); + $global_variables = [ + 'urls' => $container->get('urls'), + 'money_url' => '', + 'login' => $container->get(Incoviba\Service\Login::class), + 'format' => $container->get(Incoviba\Service\Format::class), + ]; + if ($global_variables['login']->isIn()) { + $global_variables['user'] = $global_variables['login']->getUser(); + } + return new Incoviba\Common\Alias\View( + $folders->get('templates'), + $folders->get('cache'), + null, + $global_variables + ); + } +]; diff --git a/app/src/Controller/Base.php b/app/src/Controller/Base.php new file mode 100644 index 0000000..2cd225d --- /dev/null +++ b/app/src/Controller/Base.php @@ -0,0 +1,90 @@ +isIn()) { + return $this->home($response, $view, $cuotaRepository, $cierreRepository); + } + return $this->login($response, $view); + } + + protected function home(ResponseInterface $response, View $view, Repository\Venta\Cuota $cuotaRepository, Repository\Venta\Cierre $cierreRepository): ResponseInterface + { + $cuotas_hoy = count($cuotaRepository->fetchHoy()) ?? 0; + $cuotas_pendientes = count($cuotaRepository->fetchPendientes()) ?? 0; + $cuotas_por_vencer = $this->getCuotasPorVencer($cuotaRepository); + $cierres_vigentes = $this->getCierresVigentes($cierreRepository); + return $view->render($response, 'home', compact('cuotas_hoy', 'cuotas_pendientes', 'cuotas_por_vencer', 'cierres_vigentes')); + } + protected function login(ResponseInterface $response, View $view): ResponseInterface + { + return $view->render($response, 'guest'); + } + protected function getCuotasPorVencer(Repository\Venta\Cuota $cuotaRepository): array + { + $cuotas = $cuotaRepository->fetchDatosPorVencer(); + $output = []; + foreach ($cuotas as $row) { + $fecha = $row['Fecha']; + $date = new DateTimeImmutable($fecha); + if (($weekday = $date->format('N')) > 5) { + $day_diff = 7 - $weekday + 1; + $date = $date->add(new DateInterval("P{$day_diff}D")); + $fecha = $date->format('Y-m-d'); + } + if (!isset($output[$fecha])) { + $output[$fecha] = []; + } + if (!isset($output[$fecha][$row['Proyecto']])) { + $output[$fecha][$row['Proyecto']] = 0; + } + $output[$fecha][$row['Proyecto']] += $row['Cantidad']; + } + foreach ($output as $fecha => $day) { + uksort($day, function($a, $b) { + return strcmp($a, $b); + }); + $output[$fecha] = $day; + } + return $output; + } + protected function getCierresVigentes(Repository\Venta\Cierre $cierreRepository): array + { + $cierres = $cierreRepository->fetchDatosVigentes(); + $output = []; + $estados = [ + 'revisado' => 'pendientes', + 'rechazado' => 'rechazados', + 'aprobado' => 'pendientes', + 'vendido' => 'promesados', + 'abandonado' => 'rechazados', + 'promesado' => 'promesados', + 'resciliado' => 'rechazados' + ]; + foreach ($cierres as $row) { + if (!isset($output[$row['Proyecto']])) { + $output[$row['Proyecto']] = [ + 'promesados' => 0, + 'pendientes' => 0, + 'rechazados' => 0, + 'total' => 0 + ]; + } + $estado = $estados[$row['Estado']]; + $output[$row['Proyecto']][$estado] += $row['Cantidad']; + $output[$row['Proyecto']]['total'] += $row['Cantidad']; + } + return $output; + } +} diff --git a/app/src/Controller/Login.php b/app/src/Controller/Login.php new file mode 100644 index 0000000..70467f5 --- /dev/null +++ b/app/src/Controller/Login.php @@ -0,0 +1,55 @@ +hasHeader('Referer') ? $request->getHeaderLine('Referer') : $view->get('urls')->base; + if ($service->isIn()) { + $redirect_uri = str_replace('/login', '', $redirect_uri); + return $response->withStatus(301)->withHeader('Location', $redirect_uri); + } + if ($request->hasHeader('X-Redirect-URI')) { + $redirect_uri = $request->getHeaderLine('X-Redirect-URI'); + } + return $view->render($response, 'login.form', compact('redirect_uri')); + } + public function login(ServerRequestInterface $request, ResponseInterface $response, Repository\User $userRepository, Service\Login $service): ResponseInterface + { + $body = $request->getParsedBody(); + $user = $userRepository->fetchByName($body['name']); + $output = [ + 'name' => $user->name, + 'login' => false + ]; + if ($user->validate($body['password'])) { + $output['login'] = $service->login($user); + } + $response->getBody()->write(json_encode($output)); + return $response->withHeader('Content-Type', 'application/json'); + } + public function logout(ServerRequestInterface $request, ResponseInterface $response, Repository\Login $loginRepository, Service\Login $service): ResponseInterface + { + $output = [ + 'name' => '', + 'logout' => false + ]; + try { + $user = $service->getUser(); + $output = [ + 'name' => $user->name, + 'logout' => $service->logout($user) + ]; + } catch (PDOException) {} + $response->getBody()->write(json_encode($output)); + return $response->withHeader('Content-Type', 'application/json'); + } +} diff --git a/app/src/Controller/Proyectos.php b/app/src/Controller/Proyectos.php new file mode 100644 index 0000000..9ef8c47 --- /dev/null +++ b/app/src/Controller/Proyectos.php @@ -0,0 +1,21 @@ +render($response, 'proyectos.list'); + } + public function list(ServerRequestInterface $request, ResponseInterface $response, Repository\Proyecto $proyectoRepository): ResponseInterface + { + $proyectos = $proyectoRepository->fetchAllActive(); + $response->getBody()->write(json_encode(['proyectos' => $proyectos, 'total' => count($proyectos)])); + return $response->withHeader('Content-Type', 'application/json'); + } +} diff --git a/app/src/Controller/Users.php b/app/src/Controller/Users.php new file mode 100644 index 0000000..cfa82ff --- /dev/null +++ b/app/src/Controller/Users.php @@ -0,0 +1,11 @@ +fetchPendientes(); + $cuotas_pendientes = []; + $today = new DateTimeImmutable(); + $formatter = new IntlDateFormatter('es_ES'); + $formatter->setPattern('EEEE dd'); + foreach ($cuotas as $cuota) { + $date = new DateTimeImmutable($cuota['fecha']); + $day = clone $date; + $weekday = $date->format('N'); + if ($weekday > 5) { + $diff = 7 - $weekday + 1; + $day = $day->add(new DateInterval("P{$diff}D")); + } + $cuotas_pendientes []= [ + 'id' => $cuota['cuota_id'], + 'venta_id' => $cuota['venta_id'], + 'Proyecto' => $cuota['Proyecto'], + 'Departamento' => $cuota['Departamento'], + 'Valor' => $cuota['Valor'], + 'Dia' => $formatter->format($day), + 'Numero' => $cuota['Numero'], + 'Propietario' => $cuota['Propietario'], + 'Banco' => $cuota['Banco'], + 'Fecha Cheque' => $date->format('d-m-Y'), + 'Vencida' => $today->diff($date)->days, + 'Fecha ISO' => $date->format('Y-m-d') + ]; + } + return $view->render($response, 'ventas.cuotas.pendientes', compact('cuotas_pendientes')); + } + public function depositar(ServerRequestInterface $request, ResponseInterface $response, Repository\Venta\Cuota $cuotaRepository, Service\Ventas\Pago $pagoService): ResponseInterface + { + $body = $request->getBody(); + $json = json_decode($body->getContents()); + $cuota_id = $json->cuota_id; + $cuota = $cuotaRepository->fetchById($cuota_id); + $output = [ + 'cuota_id' => $cuota_id, + 'depositada' => $pagoService->depositar($cuota->pago) + ]; + $response->getBody()->write(json_encode($output)); + return $response->withHeader('Content-Type', 'application/json'); + } +} diff --git a/app/src/Controller/Ventas/Precios.php b/app/src/Controller/Ventas/Precios.php new file mode 100644 index 0000000..c4ef615 --- /dev/null +++ b/app/src/Controller/Ventas/Precios.php @@ -0,0 +1,24 @@ +render($response, 'ventas.precios.list'); + } + public function proyecto(ServerRequestInterface $request, ResponseInterface $response, Service\Ventas\Precio $precioService): ResponseInterface + { + $body = $request->getBody(); + $json = json_decode($body->getContents()); + $proyecto_id = $json->proyecto_id; + $precios = $precioService->getByProyecto($proyecto_id); + $response->getBody()->write(json_encode(['precios' => $precios, 'total' => count($precios)])); + return $response->withHeader('Content-Type', 'application/json'); + } +} diff --git a/app/src/Middleware/Authentication.php b/app/src/Middleware/Authentication.php new file mode 100644 index 0000000..32d3e9f --- /dev/null +++ b/app/src/Middleware/Authentication.php @@ -0,0 +1,48 @@ +service->isIn() or $this->isValid($request)) { + return $handler->handle($request); + } + $response = $this->responseFactory->createResponse(301, 'Not logged in'); + return $response->withHeader('Location', $this->login_url) + ->withHeader('X-Redirected-URI', (string) $request->getUri()); + } + + protected function isValid(ServerRequestInterface $request): bool + { + $uri = $request->getUri(); + $current_path = $uri->getPath(); + $current_url = implode('', [ + "{$uri->getScheme()}://", + $uri->getHost() . ($uri->getPort() !== null ? ":{$uri->getPort()}" : ''), + $uri->getPath() + ]); + + $valid_paths = [ + '/', + ]; + if (in_array($current_path, $valid_paths, true)) { + return true; + } + $valid_uris = [ + $this->login_url, + ]; + if (in_array($current_url, $valid_uris, true)) { + return true; + } + return false; + } +} diff --git a/app/src/Model/Banco.php b/app/src/Model/Banco.php new file mode 100644 index 0000000..1852ff2 --- /dev/null +++ b/app/src/Model/Banco.php @@ -0,0 +1,16 @@ + $this->nombre ?? '' + ]); + } +} diff --git a/app/src/Model/Comuna.php b/app/src/Model/Comuna.php new file mode 100644 index 0000000..3bf746d --- /dev/null +++ b/app/src/Model/Comuna.php @@ -0,0 +1,18 @@ + $this->descripcion, + 'provincia' => $this->provincia + ]); + } +} diff --git a/app/src/Model/Direccion.php b/app/src/Model/Direccion.php new file mode 100644 index 0000000..7795ad5 --- /dev/null +++ b/app/src/Model/Direccion.php @@ -0,0 +1,22 @@ + $this->calle, + 'numero' => $this->numero, + 'extra' => $this->extra, + 'comuna' => $this->comuna + ]); + } +} diff --git a/app/src/Model/Inmobiliaria.php b/app/src/Model/Inmobiliaria.php new file mode 100644 index 0000000..cc7778c --- /dev/null +++ b/app/src/Model/Inmobiliaria.php @@ -0,0 +1,38 @@ +rut, 0, ',', '.'), + $this->dv + ]); + } + + public function jsonSerialize(): mixed + { + return [ + 'rut' => $this->rut, + 'dv' => $this->dv ?? '', + 'rut_formateado' => $this->rut(), + 'razon' => $this->razon ?? '', + 'abreviacion' => $this->abreviacion ?? '', + 'cuenta' => $this->cuenta ?? '', + 'banco' => $this->banco ?? '', + 'tipo_sociedad' => $this->tipoSociedad ?? '' + ]; + } +} diff --git a/app/src/Model/Inmobiliaria/TipoSociedad.php b/app/src/Model/Inmobiliaria/TipoSociedad.php new file mode 100644 index 0000000..dc71047 --- /dev/null +++ b/app/src/Model/Inmobiliaria/TipoSociedad.php @@ -0,0 +1,16 @@ + $this->abreviacion + ]); + } +} diff --git a/app/src/Model/Login.php b/app/src/Model/Login.php new file mode 100644 index 0000000..fb66590 --- /dev/null +++ b/app/src/Model/Login.php @@ -0,0 +1,25 @@ + $this->user->id, + 'selector' => $this->selector, + 'token' => $this->token, + 'date_time' => $this->dateTime->format('Y-m-d H:i:s'), + 'status' => $this->status + ]); + } +} diff --git a/app/src/Model/Provincia.php b/app/src/Model/Provincia.php new file mode 100644 index 0000000..1f2f387 --- /dev/null +++ b/app/src/Model/Provincia.php @@ -0,0 +1,18 @@ + $this->descripcion, + 'region' => $this->region + ]); + } +} diff --git a/app/src/Model/Proyecto.php b/app/src/Model/Proyecto.php new file mode 100644 index 0000000..f9f21d2 --- /dev/null +++ b/app/src/Model/Proyecto.php @@ -0,0 +1,32 @@ + $this->inmobiliaria, + 'descripcion' => $this->descripcion, + 'direccion' => $this->direccion, + 'terreno' => $this->terreno, + 'superficie' => $this->superficie, + 'corredor' => $this->corredor, + 'pisos' => $this->pisos, + 'subterraneos' => $this->subterraneos + ]); + } +} diff --git a/app/src/Model/Proyecto/ProyectoTipoUnidad.php b/app/src/Model/Proyecto/ProyectoTipoUnidad.php new file mode 100644 index 0000000..a755bb7 --- /dev/null +++ b/app/src/Model/Proyecto/ProyectoTipoUnidad.php @@ -0,0 +1,42 @@ +util, $this->logia, $this->terraza], function($sum, $item) {return $sum + $item;}, 0); + } + public function vendible(): float + { + return array_reduce([$this->util, $this->logia, $this->terraza / 2], function($sum, $item) {return $sum + $item;}, 0); + } + + public function jsonSerialize(): mixed + { + return array_merge(parent::jsonSerialize(), [ + 'proyecto' => $this->proyecto, + 'tipo_unidad' => $this->tipoUnidad, + 'nombre' => $this->nombre, + 'abreviacion' => $this->abreviacion, + 'util' => $this->util, + 'logia' => $this->logia, + 'terraza' => $this->terraza, + 'superficie' => $this->superficie(), + 'vendible' => $this->vendible(), + 'descripcion' => $this->descripcion + ]); + } +} diff --git a/app/src/Model/Proyecto/Superficie.php b/app/src/Model/Proyecto/Superficie.php new file mode 100644 index 0000000..72d6e5f --- /dev/null +++ b/app/src/Model/Proyecto/Superficie.php @@ -0,0 +1,8 @@ + $this->descripcion, + 'numeral' => $this->numeral, + 'numeracion' => $this->numeracion ?? 0 + ]); + } +} diff --git a/app/src/Model/Role.php b/app/src/Model/Role.php new file mode 100644 index 0000000..e27c6a9 --- /dev/null +++ b/app/src/Model/Role.php @@ -0,0 +1,7 @@ + $this->descripcion + ]); + } +} diff --git a/app/src/Model/User.php b/app/src/Model/User.php new file mode 100644 index 0000000..2647b88 --- /dev/null +++ b/app/src/Model/User.php @@ -0,0 +1,28 @@ +password); + } + public function isAdmin(): bool + { + return false; + } + + public function jsonSerialize(): mixed + { + return array_merge(parent::jsonSerialize(), [ + 'name' => $this->name + ]); + } +} diff --git a/app/src/Model/Venta/Cierre.php b/app/src/Model/Venta/Cierre.php new file mode 100644 index 0000000..25d3009 --- /dev/null +++ b/app/src/Model/Venta/Cierre.php @@ -0,0 +1,26 @@ + $this->proyecto->id, + 'precio' => $this->precio, + 'date_time' => $this->dateTime->format('Y-m-d H:i:s'), + 'relacionado' => $this->relacionado, + 'propietario' => $this->propietario->rut + ]); + } +} diff --git a/app/src/Model/Venta/Cuota.php b/app/src/Model/Venta/Cuota.php new file mode 100644 index 0000000..188f4c0 --- /dev/null +++ b/app/src/Model/Venta/Cuota.php @@ -0,0 +1,38 @@ + $this->pie->id, + 'fecha' => $this->fecha->format('Y-m-d H:i:s'), + 'valor' => $this->valor, + 'estado' => $this->estado ?? false, + 'banco' => $this->banco, + 'fecha_pago' => $this->fechaPago->format('Y-m-d H:i:s') ?? '', + 'abonado' => $this->abonado ?? false, + 'fecha_abonado' => $this->fechaAbonado->format('Y-m-d H:i:s') ?? '', + 'uf' => $this->uf ?? 1, + 'pago' => $this->pago ?? '', + 'numero' => $this->numero ?? '' + ]); + } +} diff --git a/app/src/Model/Venta/Datos.php b/app/src/Model/Venta/Datos.php new file mode 100644 index 0000000..b9a7ebd --- /dev/null +++ b/app/src/Model/Venta/Datos.php @@ -0,0 +1,27 @@ + $this->sexo ?? '', + 'estado_civil' => $this->estado_civil ?? '', + 'profesion' => $this->profesion ?? '', + 'direccion' => $this->direccion ?? '', + 'telefono' => $this->telefono ?? '', + 'email' => $this->email ?? '' + ]; + } +} diff --git a/app/src/Model/Venta/EstadoPago.php b/app/src/Model/Venta/EstadoPago.php new file mode 100644 index 0000000..e94f8d8 --- /dev/null +++ b/app/src/Model/Venta/EstadoPago.php @@ -0,0 +1,22 @@ + $this->pago->id, + 'fecha' => $this->fecha->format('Y-m-d'), + 'tipo_estado_pago_id' => $this->tipoEstadoPago->id + ]); + } + +} diff --git a/app/src/Model/Venta/EstadoPrecio.php b/app/src/Model/Venta/EstadoPrecio.php new file mode 100644 index 0000000..815793f --- /dev/null +++ b/app/src/Model/Venta/EstadoPrecio.php @@ -0,0 +1,21 @@ + $this->precio->id, + 'tipo_estado_precio' => $this->tipoEstadoPrecio, + 'fecha' => $this->fecha->format('Y-m-d') + ]); + } +} diff --git a/app/src/Model/Venta/Pago.php b/app/src/Model/Venta/Pago.php new file mode 100644 index 0000000..08f5da9 --- /dev/null +++ b/app/src/Model/Venta/Pago.php @@ -0,0 +1,32 @@ + $this->valor, + 'banco' => $this->banco ?? '', + 'tipo_pago' => $this->tipoPago ?? '', + 'identificador' => $this->identificador ?? '', + 'fecha' => $this->fecha->format('Y-m-d H:i:S') ?? '', + 'uf' => $this->uf ?? 1, + 'pagador' => $this->pagador ?? '', + 'asociado' => $this->asociado ?? '' + ]); + } +} diff --git a/app/src/Model/Venta/Pie.php b/app/src/Model/Venta/Pie.php new file mode 100644 index 0000000..3a1f4ad --- /dev/null +++ b/app/src/Model/Venta/Pie.php @@ -0,0 +1,27 @@ + $this->fecha->format('Y-m-d H:i:s'), + 'valor' => $this->valor, + 'uf' => $this->uf ?? 1, + 'cuotas' => $this->cuotas, + 'asociado' => $this->asociado ?? '', + 'reajuste' => $this->reajuste ?? '' + ]); + } +} diff --git a/app/src/Model/Venta/Precio.php b/app/src/Model/Venta/Precio.php new file mode 100644 index 0000000..0b2094e --- /dev/null +++ b/app/src/Model/Venta/Precio.php @@ -0,0 +1,23 @@ + $this->unidad, + 'valor' => $this->valor, + 'estado_precio' => $this->current ?? [], + 'estados' => $this->estados ?? null + ]); + } +} diff --git a/app/src/Model/Venta/Propietario.php b/app/src/Model/Venta/Propietario.php new file mode 100644 index 0000000..77300eb --- /dev/null +++ b/app/src/Model/Venta/Propietario.php @@ -0,0 +1,46 @@ +rut, 0, ',', '.'), + $this->dv + ]); + } + public function nombreCompleto(): string + { + return implode(' ', [ + $this->nombres, + implode(' ', $this->apellidos) + ]); + } + + public function jsonSerialize(): mixed + { + return array_merge([ + 'rut' => $this->rut, + 'dv' => $this->dv, + 'rut_formateado' => $this->rut(), + 'nombres' => $this->nombres, + 'apellidos' => $this->apellidos, + 'nombre_completo' => $this->nombreCompleto(), + ], $this->datos->jsonSerialize(), [ + 'representante' => $this->representante ?? '', + 'otro' => $this->otro ?? '' + ]); + } +} diff --git a/app/src/Model/Venta/TipoEstadoPago.php b/app/src/Model/Venta/TipoEstadoPago.php new file mode 100644 index 0000000..2d00621 --- /dev/null +++ b/app/src/Model/Venta/TipoEstadoPago.php @@ -0,0 +1,8 @@ + $this->orden + ]); + } +} diff --git a/app/src/Model/Venta/Unidad.php b/app/src/Model/Venta/Unidad.php new file mode 100644 index 0000000..3040504 --- /dev/null +++ b/app/src/Model/Venta/Unidad.php @@ -0,0 +1,25 @@ + $this->subtipo, + 'piso' => $this->piso, + 'descripcion' => $this->descripcion, + 'orientacion' => $this->orientacion, + 'proyecto_tipo_unidad' => $this->proyectoTipoUnidad + ]); + } +} diff --git a/app/src/Repository/Banco.php b/app/src/Repository/Banco.php new file mode 100644 index 0000000..7a35492 --- /dev/null +++ b/app/src/Repository/Banco.php @@ -0,0 +1,35 @@ +setTable('banco'); + } + + public function create(?array $data = null): Define\Model + { + $map = [ + 'nombre' => [] + ]; + return $this->parseData(new Model\Banco(), $data, $map); + } + public function save(Define\Model $model): Define\Model + { + $model->id = $this->saveNew( + ['nombre'], + [$model->nombre] + ); + return $model; + } + public function edit(Define\Model $model, array $new_data): Define\Model + { + return $this->update($model, ['nombre'], $new_data); + } +} diff --git a/app/src/Repository/Comuna.php b/app/src/Repository/Comuna.php new file mode 100644 index 0000000..ddb54e1 --- /dev/null +++ b/app/src/Repository/Comuna.php @@ -0,0 +1,51 @@ +setTable('comuna'); + } + + public function create(?array $data = null): Define\Model + { + $map = [ + 'descripcion' => [], + 'provincia' => [ + 'function' => function($data) { + return $this->provinciaRepository->fetchById($data['provincia']); + } + ] + ]; + return $this->parseData(new Model\Comuna(), $data, $map); + } + public function save(Define\Model $model): Define\Model + { + $model->id = $this->saveNew( + ['descripcion', 'provincia'], + [$model->descripcion, $model->provincia->id] + ); + return $model; + } + public function edit(Define\Model $model, array $new_data): Define\Model + { + return $this->update($model, ['descripcion', 'provincia'], $new_data); + } + + public function fetchByDescripcion(string $descripcion): Define\Model + { + $query = "SELECT * FROM `{$this->getTable()}` WHERE `descripcion` = ?"; + return $this->fetchOne($query, [$descripcion]); + } + public function fetchByProvincia(int $provincia_id): array + { + $query = "SELECT * FROM `{$this->getTable()}` WHERE `provincia` = ?"; + return $this->fetchMany($query, [$provincia_id]); + } +} diff --git a/app/src/Repository/Direccion.php b/app/src/Repository/Direccion.php new file mode 100644 index 0000000..87bd955 --- /dev/null +++ b/app/src/Repository/Direccion.php @@ -0,0 +1,48 @@ +setTable('direccion'); + } + + public function create(?array $data = null): Define\Model + { + $map = [ + 'calle' => [], + 'numero' => [], + 'extra' => [], + 'comuna' => [ + 'function' => function($data) { + return $this->comunaRepository->fetchById($data['comuna']); + } + ] + ]; + return $this->parseData(new Model\Direccion(), $data, $map); + } + public function save(Define\Model $model): Define\Model + { + $model->id = $this->saveNew( + ['calle', 'numero', 'extra', 'comuna'], + [$model->calle, $model->numero, $model->extra, $model->comuna->id] + ); + return $model; + } + public function edit(Define\Model $model, array $new_data): Define\Model + { + return $this->update($model, ['calle', 'numero', 'extra', 'comuna'], $new_data); + } + + public function fetchByCalleAndNumero(string $calle, int $numero): array + { + $query = "SELECT * FROM `{$this->getTable()}` WHERE `calle` = ? AND `numero` = ?"; + return $this->fetchMany($query, [$calle, $numero]); + } +} diff --git a/app/src/Repository/Inmobiliaria.php b/app/src/Repository/Inmobiliaria.php new file mode 100644 index 0000000..7ae90c6 --- /dev/null +++ b/app/src/Repository/Inmobiliaria.php @@ -0,0 +1,55 @@ +setTable('inmobiliaria'); + } + + protected function getKey(): string + { + return 'rut'; + } + + public function create(?array $data = null): Define\Model + { + $map = [ + 'dv' => [], + 'razon' => [], + 'abreviacion' => [], + 'cuenta' => [], + 'banco' => [ + 'function' => function($data) { + return $this->bancoRepository->fetchById($data['banco']); + } + ], + 'sociedad' => [ + 'property' => 'tipoSociedad', + 'function' => function($data) { + return $this->tipoSociedadRepository->fetchById($data['sociedad']); + } + ] + ]; + return $this->parseData(new Model\Inmobiliaria(), $data, $map); + } + public function save(Define\Model $model): Define\Model + { + $model->rut = $this->saveNew( + ['dv', 'razon', 'abreviacion', 'cuenta', 'banco', 'sociedad'], + [$model->dv, $model->razon, $model->abreviacion, $model->cuenta, $model->banco->id, $model->tipoSociedad->id] + ); + return $model; + } + public function edit(Define\Model $model, array $new_data): Define\Model + { + return $this->update($model, ['dv', 'razon', 'abreviacion', 'cuenta', 'banco', 'sociedad'], $new_data); + } +} diff --git a/app/src/Repository/Inmobiliaria/TipoSociedad.php b/app/src/Repository/Inmobiliaria/TipoSociedad.php new file mode 100644 index 0000000..0d2a05f --- /dev/null +++ b/app/src/Repository/Inmobiliaria/TipoSociedad.php @@ -0,0 +1,36 @@ +setTable('tipo_sociedad'); + } + + public function create(?array $data = null): Define\Model + { + $map = [ + 'descripcion' => [], + 'abreviacion' => [] + ]; + return $this->parseData(new Model\Inmobiliaria\TipoSociedad(), $data, $map); + } + public function save(Define\Model $model): Define\Model + { + $model->id = $this->saveNew( + ['descripcion', 'abreviacion'], + [$model->descripcion, $model->abreviacion] + ); + return $model; + } + public function edit(Define\Model $model, array $new_data): Define\Model + { + return $this->update($model, ['descripcion', 'abreviacion'], $new_data); + } +} diff --git a/app/src/Repository/Login.php b/app/src/Repository/Login.php new file mode 100644 index 0000000..0cfa3e4 --- /dev/null +++ b/app/src/Repository/Login.php @@ -0,0 +1,77 @@ +setTable('logins'); + } + + + public function create(?array $data = null): Define\Model + { + $map = [ + 'user_id' => [ + 'property' => 'user', + 'function' => function($data) { + return $this->userRepository->fetchById($data['user_id']); + } + ], + 'selector' => [], + 'token' => [], + 'time' => [ + 'property' => 'dateTime', + 'function' => function($data) { + return new DateTimeImmutable($data['time']); + } + ], + 'status' => [ + 'function' => function($data) { + return $data['status'] != 0; + } + ] + ]; + return $this->parseData(new Model\Login(), $data, $map); + } + + public function save(Define\Model $model): Define\Model + { + $model->id = $this->saveNew( + ['user_id', 'selector', 'token', 'time', 'status'], + [$model->user->id, $model->selector, $model->token, $model->dateTime->format('Y-m-d H:i:s'), $model->status ? 1 : 0]); + return $model; + } + + public function edit(Define\Model $model, array $new_data): Define\Model + { + return $this->update($model, ['user_id', 'selector', 'token', 'time', 'status'], $new_data); + } + + public function fetchByUser(int $user_id): array + { + $query = "SELECT * FROM `{$this->getTable()}` WHERE `user_id` = ?"; + return $this->fetchMany($query, [$user_id]); + } + public function fetchActiveByUser(int $user_id): Model\Login + { + $query = "SELECT * FROM `{$this->getTable()}` WHERE `user_id` = ? AND `status` = 1"; + return $this->fetchOne($query, [$user_id]); + } + public function fetchBySelectorAndToken(string $selector, string $token): Model\Login + { + $query = "SELECT * FROM `{$this->getTable()}` WHERE `selector` = ? AND `token` = ?"; + return $this->fetchOne($query, [$selector, $token]); + } + public function fetchActiveBySelector(string $selector): Model\Login + { + $query = "SELECT * FROM `{$this->getTable()}` WHERE `selector` = ? AND `status` = 1"; + return $this->fetchOne($query, [$selector]); + } +} diff --git a/app/src/Repository/Provincia.php b/app/src/Repository/Provincia.php new file mode 100644 index 0000000..3e8406e --- /dev/null +++ b/app/src/Repository/Provincia.php @@ -0,0 +1,51 @@ +setTable('provincia'); + } + + public function create(?array $data = null): Define\Model + { + $map = [ + 'descripcion' => [], + 'region' => [ + 'function' => function($data) { + return $this->regionRepository->fetchById($data['region']); + } + ] + ]; + return $this->parseData(new Model\Provincia(), $data, $map); + } + public function save(Define\Model $model): Define\Model + { + $model->id = $this->saveNew( + ['descripcion', 'region'], + [$model->descripcion, $model->region->id] + ); + return $model; + } + public function edit(Define\Model $model, array $new_data): Define\Model + { + return $this->update($model, ['descripcion', 'region'], $new_data); + } + + public function fetchByDescripcion(string $description): Define\Model + { + $query = "SELECT * FROM `{$this->getTable()}` WHERE `descripcion` = ?"; + return $this->fetchOne($query, [$description]); + } + public function fetchByRegion(int $region_id): array + { + $query = "SELECT * FROM `{$this->getTable()}` WHERE `region` = ?"; + return $this->fetchMany($query, [$region_id]); + } +} diff --git a/app/src/Repository/Proyecto.php b/app/src/Repository/Proyecto.php new file mode 100644 index 0000000..0c8d4e8 --- /dev/null +++ b/app/src/Repository/Proyecto.php @@ -0,0 +1,88 @@ +setTable('proyecto'); + } + + public function create(?array $data = null): Define\Model + { + $map = [ + 'inmobiliaria' => [ + 'function' => function($data) { + return $this->inmobiliariaRepository->fetchById($data['inmobiliaria']); + } + ], + 'descripcion' => [], + 'direccion' => [ + 'function' => function($data) { + return $this->direccionRepository->fetchById($data['direccion']); + } + ], + 'superficie_terreno' => [ + 'property' => 'terreno', + 'function' => function($data) { + $terreno = new Model\Proyecto\Terreno(); + $terreno->superficie = $data['superficie_terreno']; + $terreno->valor = $data['valor_terreno']; + return $terreno; + } + ], + 'superficie_sobre_nivel' => [ + 'property' => 'superficie', + 'function' => function($data) { + $superficie = new Model\Proyecto\Superficie(); + $superficie->sobre_nivel = $data['superficie_sobre_nivel']; + $superficie->bajo_nivel = $data['superficie_bajo_nivel']; + return $superficie; + } + ], + 'corredor' => [], + 'pisos' => [], + 'subterraneos' => [] + ]; + return $this->parseData(new Model\Proyecto(), $data, $map); + } + public function save(Define\Model $model): Define\Model + { + $model->id = $this->saveNew( + ['inmobiliaria', 'descripcion', 'direccion', 'superficie_terreno', 'valor_terreno', 'corredor', + 'superficie_sobre_nivel', 'superficie_bajo_nivel', 'pisos', 'subterraneos'], + [$model->inmobiliaria->rut, $model->descripcion, $model->direccion->id, $model->terreno->superficie, + $model->terreno->valor, $model->corredor, $model->superficie->sobre_nivel, + $model->superficie->bajo_nivel, $model->pisos, $model->subterraneos] + ); + return $model; + } + public function edit(Define\Model $model, array $new_data): Define\Model + { + return $this->update($model, ['inmobiliaria', 'descripcion', 'direccion', 'superficie_terreno', + 'valor_terreno', 'corredor', 'superficie_sobre_nivel', 'superficie_bajo_nivel', 'pisos', + 'subterraneos'], $new_data); + } + public function fetchByName(string $name): Define\Model + { + $query = "SELECT * FROM `{$this->getTable()}` WHERE `name` = ?"; + return $this->fetchOne($query, [$name]); + } + public function fetchAllActive(): array + { + $query = "SELECT a.* +FROM `{$this->getTable()}` a + JOIN (SELECT e1.* FROM `estado_proyecto` e1 JOIN (SELECT MAX(`id`) AS 'id', `proyecto` FROM `estado_proyecto` GROUP BY `proyecto`) e0 ON e0.`id` = e1.`id`) ep ON ep.`proyecto` = a.`id` + JOIN `tipo_estado_proyecto` tep ON tep.`id` = ep.`estado` + JOIN `etapa_proyecto` et ON et.`id` = tep.`etapa` +WHERE et.`orden` BETWEEN 4 AND 8 +ORDER BY a.`descripcion`"; + return $this->fetchMany($query); + } +} diff --git a/app/src/Repository/Proyecto/ProyectoTipoUnidad.php b/app/src/Repository/Proyecto/ProyectoTipoUnidad.php new file mode 100644 index 0000000..1500f26 --- /dev/null +++ b/app/src/Repository/Proyecto/ProyectoTipoUnidad.php @@ -0,0 +1,54 @@ +setTable('proyecto_tipo_unidad'); + } + + public function create(?array $data = null): Define\Model + { + $map = [ + 'proyecto' => [ + 'function' => function($data) { + return $this->proyectoRepository->fetchById($data['proyecto']); + } + ], + 'tipo' => [ + 'property' => 'tipoUnidad', + 'function' => function($data) { + return $this->tipoUnidadRepository->fetchById($data['tipo']); + } + ], + 'nombre' => [], + 'abreviacion' => [], + 'm2' => [ + 'property' => 'util' + ], + 'logia' => [], + 'terraza' => [], + 'descripcion' => [] + ]; + return $this->parseData(new Model\Proyecto\ProyectoTipoUnidad(), $data, $map); + } + public function save(Define\Model $model): Define\Model + { + $model->id = $this->saveNew( + ['proyecto', 'tipo', 'nombre', 'abreviacion', 'm2', 'logia', 'terraza', 'descripcion'], + [$model->proyecto->id, $model->tipoUnidad->id, $model->nombre, $model->abreviacion, $model->util, $model->logia, $model->terraza, $model->descripcion] + ); + return $model; + } + public function edit(Define\Model $model, array $new_data): Define\Model + { + return $this->update($model, ['proyecto', 'tipo', 'nombre', 'abreviacion', 'util', 'logia', 'terraza', 'descripcion'], $new_data); + } +} diff --git a/app/src/Repository/Region.php b/app/src/Repository/Region.php new file mode 100644 index 0000000..34287e6 --- /dev/null +++ b/app/src/Repository/Region.php @@ -0,0 +1,53 @@ +setTable('region'); + } + + public function create(?array $data = null): Define\Model + { + $map = [ + 'descripcion' => [], + 'numeral' => [], + 'numeracion' => [] + ]; + return $this->parseData(new Model\Region(), $data, $map); + } + public function save(Define\Model $model): Define\Model + { + $model->id = $this->saveNew( + ['descripcion', 'numeral', 'numeracion'], + [$model->descripcion, $model->numeral, $model->numeracion] + ); + return $model; + } + public function edit(Define\Model $model, array $new_data): Define\Model + { + return $this->update($model, ['descripcion', 'numeral', 'numeracion'], $new_data); + } + + public function fetchByDescripcion(string $descripcion): Define\Model + { + $query = "SELECT * FROM `{$this->getTable()}` WHERE `descripcion` = ?"; + return $this->fetchOne($query, [$descripcion]); + } + public function fetchByNumeral(string $numeral): Define\Model + { + $query = "SELECT * FROM `{$this->getTable()}` WHERE `numeral` = ?"; + return $this->fetchOne($query, [$numeral]); + } + public function fetchByNumeracion(int $numeracion): Define\Model + { + $query = "SELECT * FROM `{$this->getTable()}` WHERE `numeracion` = ?"; + return $this->fetchOne($query, [$numeracion]); + } +} diff --git a/app/src/Repository/User.php b/app/src/Repository/User.php new file mode 100644 index 0000000..97ae151 --- /dev/null +++ b/app/src/Repository/User.php @@ -0,0 +1,46 @@ +setTable('users'); + } + + public function create(?array $data = null): Define\Model + { + $map = [ + 'name' => [], + 'password' => [], + 'enabled' => [ + 'function' => function($data) { + return $data['enabled'] != 0; + } + ] + ]; + return $this->parseData(new Model\User(), $data, $map); + } + + public function save(Define\Model $model): Define\Model + { + $model->id = $this->saveNew(['name', 'password', 'enabled'], [$model->name, $model->password, $model->enabled ? 1 : 0]); + return $model; + } + + public function edit(Define\Model $model, array $new_data): Define\Model + { + return $this->update($model, ['name', 'password', 'enabled'], $new_data); + } + + public function fetchByName(string $name): Model\User + { + $query = "SELECT * FROM `{$this->getTable()}` WHERE `name` = ?"; + return $this->fetchOne($query, [$name]); + } +} diff --git a/app/src/Repository/Venta/Cierre.php b/app/src/Repository/Venta/Cierre.php new file mode 100644 index 0000000..6366347 --- /dev/null +++ b/app/src/Repository/Venta/Cierre.php @@ -0,0 +1,82 @@ +setTable('cierre'); + } + + public function create(?array $data = null): Define\Model + { + $map = [ + 'proyecto' => [ + 'function' => function($data) { + return $this->proyectoRepository->fetchById($data['proyecto']); + } + ], + 'precio' => [], + 'fecha' => [ + 'property' => 'dateTime', + 'function' => function($data) { + return new DateTimeImmutable($data['fecha']); + } + ], + 'relacionado' => [ + 'function' => function($data) { + return $data['relacionado'] !== 0; + } + ], + 'propietario' => [ + 'function' => function($data) { + return $this->propietarioRepository->fetchById($data['propietario']); + } + ] + ]; + return $this->parseData(new Model\Venta\Cierre(), $data, $map); + } + + public function save(Define\Model $model): Define\Model + { + $model->id = $this->saveNew( + ['proyecto', 'precio', 'fecha', 'relacionado', 'propietario'], + [$model->proyecto->id, $model->precio, $model->fecha->format('Y-m-d H:i:s'), $model->relacionado ? 1 : 0, $model->propietario->rut] + ); + return $model; + } + + public function edit(Define\Model $model, array $new_data): Define\Model + { + return $this->update($model, ['proyecto', 'precio', 'fecha', 'relacionado', 'propietario'], $new_data); + } + + public function fetchDatosVigentes(): array + { + $query = " +SELECT `proyecto`.`descripcion` AS 'Proyecto', tec.`descripcion` AS 'Estado', COUNT(a.`id`) AS 'Cantidad' +FROM `{$this->getTable()}` a + JOIN (SELECT e1.* + FROM `estado_cierre` e1 + JOIN (SELECT MAX(`id`) AS id, `cierre` FROM `estado_cierre` GROUP BY `cierre`) e0 ON e0.`id` = e1.`id`) ec ON ec.`cierre` = a.`id` + JOIN `tipo_estado_cierre` tec ON tec.`id` = ec.`tipo` + JOIN `proyecto` ON `proyecto`.`id` = a.`proyecto` +GROUP BY `proyecto`.`descripcion`, tec.`descripcion`"; + $results = $this->connection->execute($query)->fetchAll(PDO::FETCH_ASSOC); + if ($results === false) { + throw new EmptyResult($query); + } + return $results; + } +} diff --git a/app/src/Repository/Venta/Cuota.php b/app/src/Repository/Venta/Cuota.php new file mode 100644 index 0000000..341d554 --- /dev/null +++ b/app/src/Repository/Venta/Cuota.php @@ -0,0 +1,161 @@ +setTable('cuota'); + } + + public function create(?array $data = null): Define\Model + { + $map = [ + 'pie' => [ + 'function' => function($data) { + return $this->pieRepository->fetchById($data['pie']); + } + ], + 'fecha' => [ + 'function' => function($data) { + return new DateTimeImmutable($data['fecha']); + } + ], + 'valor' => [], + 'estado' => [ + 'function' => function($data) { + return $data['estado'] !== 0; + } + ], + 'banco' => [ + 'function' => function($data) { + if ($data['banco'] === null or $data['banco'] === '') { + return null; + } + return $this->bancoRepository->fetchById($data['banco']); + } + ], + 'fecha_pago' => [ + 'property' => 'fechaPago', + 'function' => function($data) { + if ($data['fecha_pago'] === null) { + return null; + } + return new DateTimeImmutable($data['fecha_pago']); + } + ], + 'abonado' => [ + 'function' => function($data) { + if ($data['abonado'] === null) { + return null; + } + return $data['abonado'] !== 0; + } + ], + 'fecha_abonado' => [ + 'property' => 'fechaAbonado', + 'function' => function($data) { + if ($data['fecha_abonado'] === null) { + return null; + } + return new DateTimeImmutable($data['fecha_abonado']); + } + ], + 'uf' => [], + 'pago' => [ + 'function' => function($data) { + if ($data['pago'] === null) { + return null; + } + return $this->pagoRepository->fetchById($data['pago']); + } + ], + 'numero' => [] + ]; + return $this->parseData(new Model\Venta\Cuota(), $data, $map); + } + + public function save(Define\Model $model): Define\Model + { + $model->id = $this->saveNew( + ['pie', 'fecha', 'valor', 'estado', 'banco', 'fecha_pago', 'abonado', 'fecha_abonado', 'uf', 'pago', 'numero'], + [$model->pie->id, $model->fecha->format('Y-m-d H:i:s'), $model->valor, $model->estado ? 1 : 0, $model?->banco->id, + $model?->fechaPago->format('Y-m-d H:i:s'), $model?->abonado ? 1 : 0, $model?->fechaAbonado->format('Y-m-d H:i:s'), + $model?->uf, $model?->pago->id, $model?->numero] + ); + return $model; + } + + public function edit(Define\Model $model, array $new_data): Define\Model + { + return $this->update($model, ['pie', 'fecha', 'valor', 'estado', 'banco', 'fecha_pago', 'abonado', 'fecha_abonado', 'uf', 'pago', 'numero'], $new_data); + } + + public function fetchHoy(): array + { + $query = "SELECT a.* +FROM `{$this->getTable()}` a + JOIN `pago` ON `pago`.`id` = a.`pago` + JOIN (SELECT e1.* FROM `estado_pago` e1 JOIN (SELECT MAX(`id`) AS `id`, `pago` FROM `estado_pago` GROUP BY `pago`) e0 ON e0.`id` = e1.`id`) ep ON ep.`pago` = `pago`.`id` + JOIN `tipo_estado_pago` tep ON tep.`id` = ep.`estado` + JOIN `venta` ON `venta`.`pie` = a.`pie` + JOIN (SELECT ev1.* FROM `estado_venta` ev1 JOIN (SELECT MAX(`id`) AS 'id', `venta` FROM `estado_venta` GROUP BY `venta`) ev0 ON ev0.`id` = ev1.`id`) ev ON ev.`venta` = `venta`.`id` + JOIN `tipo_estado_venta` tev ON tev.`id` = ev.`estado` +WHERE tep.`descripcion` = 'no pagado' AND `pago`.`fecha` = CURDATE() + AND tev.`descripcion` IN ('vigente', 'escriturando', 'firmado por inmobiliaria')"; + return $this->fetchMany($query); + } + public function fetchPendientes(): array + { + $query = "SELECT a.`id` AS 'cuota_id', `venta`.`id` AS 'venta_id', `proyecto`.`descripcion` AS 'Proyecto', `unidad`.`descripcion` AS 'Departamento', + `pago`.`valor` AS 'Valor', `pago`.`fecha`, CONCAT_WS(' - ', a.`numero`, `pie`.`cuotas`) AS 'Numero', `banco`.`nombre` AS 'Banco', + CONCAT_WS(' ', `propietario`.`nombres`, `propietario`.`apellido_paterno`, `propietario`.`apellido_materno`) AS 'Propietario' +FROM `{$this->getTable()}` a + JOIN `pago` ON `pago`.`id` = a.`pago` + JOIN (SELECT e1.* FROM `estado_pago` e1 JOIN (SELECT MAX(`id`) AS 'id', `pago` FROM `estado_pago` GROUP BY `pago`) e0 ON e0.`id` = e1.`id`) ep ON ep.`pago` = `pago`.`id` + JOIN `tipo_estado_pago` tep ON tep.`id` = ep.`estado` + JOIN `pie` ON `pie`.`id` = a.`pie` + JOIN `venta` ON `venta`.`pie` = a.`pie` + JOIN (SELECT ev1.* FROM `estado_venta` ev1 JOIN (SELECT MAX(`id`) AS 'id', `venta` FROM `estado_venta` GROUP BY `venta`) ev0 ON ev0.`id` = ev1.`id`) ev ON ev.`venta` = `venta`.`id` + JOIN `tipo_estado_venta` tev ON tev.`id` = ev.`estado` + JOIN `propietario` ON `propietario`.`rut` = `venta`.`propietario` + JOIN `propiedad_unidad` pu ON pu.`propiedad` = `venta`.`propiedad` + JOIN `unidad` ON `unidad`.`id` = pu.`unidad` AND pu.`principal` = 1 + JOIN `proyecto_tipo_unidad` ptu ON ptu.`id` = `unidad`.`pt` + JOIN `proyecto` ON `proyecto`.`id` = ptu.`proyecto` + JOIN `banco` ON `banco`.`id` = `pago`.`banco` +WHERE tep.`descripcion` = 'no pagado' AND `pago`.`fecha` < CURDATE() + AND tev.`descripcion` IN ('vigente', 'escriturando', 'firmado por inmobiliaria') +ORDER BY `pago`.`fecha` DESC"; + return $this->fetchAsArray($query); + } + public function fetchDatosPorVencer(): array + { + $query = "SELECT `pago`.`fecha` AS 'Fecha', `proyecto`.`descripcion` AS 'Proyecto', COUNT(a.`id`) AS 'Cantidad' +FROM `{$this->getTable()}` a + JOIN `pago` ON `pago`.`id` = a.`pago` + JOIN (SELECT e1.* FROM `estado_pago` e1 JOIN (SELECT MAX(`id`) AS 'id', `pago` FROM `estado_pago` GROUP BY `pago`) e0 ON e0.`id` = e1.`id`) ep ON ep.`pago` = `pago`.`id` + JOIN `tipo_estado_pago` tep ON tep.`id` = ep.`estado` + JOIN `venta` ON `venta`.`pie` = a.`pie` + JOIN (SELECT ev1.* FROM `estado_venta` ev1 JOIN (SELECT MAX(`id`) AS 'id', `venta` FROM `estado_venta` GROUP BY `venta`) ev0 ON ev0.`id` = ev1.`id`) ev ON ev.`venta` = `venta`.`id` + JOIN `tipo_estado_venta` tev ON tev.`id` = ev.`estado` + JOIN `propiedad_unidad` pu ON pu.`propiedad` = `venta`.`propiedad` AND pu.`principal` = 1 + JOIN `unidad` ON `unidad`.`id` = pu.`unidad` + JOIN `proyecto_tipo_unidad` ptu ON ptu.`id` = `unidad`.`pt` + JOIN `proyecto` ON `proyecto`.`id` = ptu.`proyecto` +WHERE tep.`descripcion` = 'no pagado' AND `pago`.`fecha` BETWEEN DATE_ADD(CURDATE(), INTERVAL 1 DAY) AND DATE_ADD(CURDATE(), INTERVAL 1 MONTH) + AND tev.`descripcion` IN ('vigente', 'escriturando', 'firmado por inmobiliaria') +GROUP BY `pago`.`fecha`, `proyecto`.`descripcion` +ORDER BY `pago`.`fecha`, `proyecto`.`descripcion`"; + return $this->fetchAsArray($query); + } +} diff --git a/app/src/Repository/Venta/EstadoPago.php b/app/src/Repository/Venta/EstadoPago.php new file mode 100644 index 0000000..406647f --- /dev/null +++ b/app/src/Repository/Venta/EstadoPago.php @@ -0,0 +1,67 @@ +setTable('estado_pago'); + } + + public function create(?array $data = null): Define\Model + { + $map = [ + 'pago' => [ + 'function' => function($data) { + return $this->pagoRepository->fetchById($data['pago']); + } + ], + 'estado' => [ + 'property' => 'tipoEstadoPago', + 'function' => function($data) { + return $this->tipoEstadoPagoRepository->fetchById($data['estado']); + } + ], + 'fecha' => [ + 'function' => function($data) { + return new DateTimeImmutable($data['fecha']); + } + ] + ]; + return $this->parseData(new Model\Venta\EstadoPago(), $data, $map); + } + + public function save(Define\Model $model): Define\Model + { + $model->id = $this->saveNew( + ['pago', 'estado', 'fecha'], + [$model->pago->id, $model->tipoEstadoPago->id, $model->fecha->format('Y-m-d')] + ); + return $model; + } + + public function edit(Define\Model $model, array $new_data): Define\Model + { + return $this->update($model, ['pago', 'estado', 'fecha'], $new_data); + } + + public function fetchByPago(int $pago_id): array + { + $query = "SELECT * FROM `{$this->getTable()}` WHERE `pago` = ?"; + return $this->fetchMany($query, [$pago_id]); + } + public function fetchByPagoAndEstado(int $pago_id, int $estado_id): Define\Model + { + $query = "SELECT * FROM `{$this->getTable()}` WHERE `pago` = ? AND `estado` = ?"; + return $this->fetchOne($query, [$pago_id, $estado_id]); + } +} diff --git a/app/src/Repository/Venta/EstadoPrecio.php b/app/src/Repository/Venta/EstadoPrecio.php new file mode 100644 index 0000000..c223e30 --- /dev/null +++ b/app/src/Repository/Venta/EstadoPrecio.php @@ -0,0 +1,65 @@ +setTable('estado_precio'); + } + + public function create(?array $data = null): Define\Model + { + $map = [ + 'precio' => [ + 'function' => function($data) { + return $this->precioRepository->fetchById($data['precio']); + } + ], + 'estado' => [ + 'property' => 'tipoEstadoPrecio', + 'function' => function($data) { + return $this->tipoEstadoPrecioRepository->fetchById($data['estado']); + } + ], + 'fecha' => [ + 'function' => function($data) { + return new DateTimeImmutable($data['fecha']); + } + ] + ]; + return $this->parseData(new Model\Venta\EstadoPrecio(), $data, $map); + } + public function save(Define\Model $model): Define\Model + { + $model->id = $this->saveNew( + ['precio', 'estado', 'fecha'], + [$model->precio->id, $model->tipoEstadoPrecio->id, $model->fecha->format('Y-m-d')] + ); + return $model; + } + public function edit(Define\Model $model, array $new_data): Define\Model + { + return $this->update($model, ['precio', 'estado', 'fecha'], $new_data); + } + + public function fetchByPrecio(int $precio_id): array + { + $query = "SELECT * FROM `{$this->getTable()}` WHERE `precio` = ?"; + return $this->fetchMany($query, [$precio_id]); + } + public function fetchCurrentByPrecio(int $precio_id): Define\Model + { + $query = "SELECT e1.* +FROM `{$this->getTable()}` e1 JOIN (SELECT MAX(`id`) AS 'id', `precio` FROM `{$this->getTable()}` GROUP BY `precio`) e0 ON e0.`id` = e1.`id` +WHERE e1.`precio` = ?"; + return $this->fetchOne($query, [$precio_id]); + } +} diff --git a/app/src/Repository/Venta/Pago.php b/app/src/Repository/Venta/Pago.php new file mode 100644 index 0000000..ec9b6e6 --- /dev/null +++ b/app/src/Repository/Venta/Pago.php @@ -0,0 +1,73 @@ +setTable('pago'); + } + + public function create(?array $data = null): Define\Model + { + $map = [ + 'valor' => [], + 'banco' => [ + 'function' => function($data) { + if ($data['banco'] === null or $data['banco'] === 0) { + return null; + } + return $this->bancoRepository->fetchById($data['banco']); + } + ], + 'tipo' => [ + 'property' => 'tipoPago', + 'function' => function($data) { + if ($data['tipo'] === null) { + return null; + } + return $this->tipoPagoRepository->fetchById($data['tipo']); + } + ], + 'identificador' => [], + 'fecha' => [ + 'function' => function($data) { + if ($data['fecha'] === null) { + return null; + } + return new DateTimeImmutable($data['fecha']); + } + ], + 'uf' => [], + 'pagador' => [], + 'asociado' => [ + 'function' => function($data) { + if ($data['asociado'] === null) { + return null; + } + return $this->fetchById($data['asociado']); + } + ] + ]; + return $this->parseData(new Model\Venta\Pago(), $data, $map); + } + public function save(Define\Model $model): Define\Model + { + $model->id = $this->saveNew( + ['valor', 'banco', 'tipo', 'identificador', 'fecha', 'uf', 'pagador', 'asociado'], + [$model->valor, $model?->banco->id, $model?->tipoPago->id, $model?->identificador, $model?->fecha->format('Y-m-d H:i:s'), $model?->uf, $model?->pagador, $model?->asociado->id] + ); + return $model; + } + public function edit(Define\Model $model, array $new_data): Define\Model + { + return $this->update($model, ['valor', 'banco', 'tipo', 'identificador', 'fecha', 'uf', 'pagador', 'asociado'], $new_data); + } +} diff --git a/app/src/Repository/Venta/Pie.php b/app/src/Repository/Venta/Pie.php new file mode 100644 index 0000000..37b8d2c --- /dev/null +++ b/app/src/Repository/Venta/Pie.php @@ -0,0 +1,60 @@ +setTable('pie'); + } + + public function create(?array $data = null): Define\Model + { + $map = [ + 'fecha' => [ + 'function' => function($data) { + return new DateTimeImmutable($data['fecha']); + } + ], + 'valor' => [], + 'uf' => [], + 'cuotas' => [], + 'asociado' => [ + 'function' => function($data) { + if ($data['asociado'] === null or $data['asociado'] === 0) { + return null; + } + return $this->fetchById($data['asociado']); + } + ], + 'reajuste' => [ + 'function' => function($data) { + if ($data['reajuste'] === null or $data['reajuste'] === 0) { + return null; + } + return $this->pagoRepository->fetchById($data['reajuste']); + } + ] + ]; + return $this->parseData(new Model\Venta\Pie(), $data, $map); + } + public function save(Define\Model $model): Define\Model + { + $model->id = $this->saveNew( + ['fecha', 'valor', 'uf', 'cuotas', 'asociado', 'reajuste'], + [$model->fecha->format('Y-m-d H:i:s'), $model->valor, $model?->uf, $model->cuotas, $model?->asociado->id, $model?->reajuste->id] + ); + return $model; + } + public function edit(Define\Model $model, array $new_data): Define\Model + { + return $this->update($model, ['fecha', 'valor', 'uf', 'cuotas', 'asociado', 'reajuste'], $new_data); + } +} diff --git a/app/src/Repository/Venta/Precio.php b/app/src/Repository/Venta/Precio.php new file mode 100644 index 0000000..f7bb16d --- /dev/null +++ b/app/src/Repository/Venta/Precio.php @@ -0,0 +1,55 @@ +setTable('precio'); + } + + public function create(?array $data = null): Define\Model + { + $map = [ + 'unidad' => [ + 'function' => function($data) { + return $this->unidadRepository->fetchById($data['unidad']); + } + ], + 'valor' => [] + ]; + return $this->parseData(new Model\Venta\Precio(), $data, $map); + } + public function save(Define\Model $model): Define\Model + { + $model->id = $this->saveNew( + ['unidad', 'valor'], + [$model->unidad->id, $model->valor] + ); + return $model; + } + public function edit(Define\Model $model, array $new_data): Define\Model + { + return $this->update($model, ['unidad', 'valor'], $new_data); + } + + public function fetchByProyecto(int $proyecto_id): array + { + $query = "SELECT a.* +FROM `{$this->getTable()}` a + JOIN (SELECT e1.* FROM `estado_precio` e1 JOIN (SELECT MAX(`id`) AS 'id', `precio` FROM `estado_precio` GROUP BY `precio`) e0 ON e0.`id` = e1.`id`) ep ON ep.`precio` = a.`id` + JOIN `tipo_estado_precio` tep ON tep.`id` = ep.`estado` + JOIN `unidad` ON `unidad`.`id` = a.`unidad` + JOIN `proyecto_tipo_unidad` ptu ON ptu.`id` = `unidad`.`pt` + JOIN `tipo_unidad` tu ON tu.`id` = ptu.`tipo` +WHERE ptu.`proyecto` = ? AND tep.`descripcion` = 'vigente' +ORDER BY tu.`orden`, ptu.`nombre`, `unidad`.`subtipo`, LPAD(`unidad`.`descripcion`, 4, '0')"; + return $this->fetchMany($query, [$proyecto_id]); + } +} diff --git a/app/src/Repository/Venta/Propietario.php b/app/src/Repository/Venta/Propietario.php new file mode 100644 index 0000000..8e0dce6 --- /dev/null +++ b/app/src/Repository/Venta/Propietario.php @@ -0,0 +1,82 @@ +setTable('propietario'); + } + + protected function getKey(): string + { + return 'rut'; + } + + public function create(?array $data = null): Define\Model + { + $map = [ + 'dv' => [], + 'nombres' => [], + 'apellido_paterno' => [ + 'property' => 'apellidos', + 'function' => function($data) { + $arr = [ + 'paterno' => $data['apellido_paterno'] + ]; + if ($data['apellido_materno'] !== '') { + $arr['materno'] = $data['apellido_materno']; + } + return $arr; + } + ], + 'direccion' => [ + 'property' => 'datos', + 'function' => function($data) { + $datos = new Model\Venta\Datos(); + if ($data['direccion'] !== null and $data['direccion'] !== 0) { + $datos->direccion = $this->direccionRepository->fetchById($data['direccion']); + } + return $datos; + } + ], + 'representante' => [ + 'function' => function($data) { + if ($data['representante'] === null or $data['representante'] === 0) { + return null; + } + return $this->fetchById($data['representante']); + } + ], + 'otro' => [ + 'function' => function($data) { + if ($data['otro'] === null) { + return null; + } + return $data['otro'] !== 0; + } + ] + ]; + return $this->parseData(new Model\Venta\Propietario(), $data, $map); + } + + public function save(Define\Model $model): Define\Model + { + $model->rut = $this->saveNew( + ['dv', 'nombres', 'apellido_paterno', 'apellido_materno'], + [$model->dv, $model->nombres, $model->apellidos['paterno'], $model->apellidos['materno']] + ); + return $model; + } + + public function edit(Define\Model $model, array $new_data): Define\Model + { + return $this->update($model, ['dv', 'nombres', 'apellido_paterno', 'apellido_materno'], $new_data); + } +} diff --git a/app/src/Repository/Venta/TipoEstadoPago.php b/app/src/Repository/Venta/TipoEstadoPago.php new file mode 100644 index 0000000..80f8a0b --- /dev/null +++ b/app/src/Repository/Venta/TipoEstadoPago.php @@ -0,0 +1,40 @@ +setTable('tipo_estado_pago'); + } + + public function create(?array $data = null): Define\Model + { + $map = ['descripcion' => []]; + return $this->parseData(new Model\Venta\TipoEstadoPago(), $data, $map); + } + public function save(Define\Model $model): Define\Model + { + $model->id = $this->saveNew( + ['descripcion'], + [$model->descripcion] + ); + return $model; + } + public function edit(Define\Model $model, array $new_data): Define\Model + { + return $this->update($model, ['descripcion'], $new_data); + } + + public function fetchByDescripcion(string $descripcion): Define\Model + { + $query = "SELECT * FROM `{$this->getTable()}` WHERE `descripcion` = ?"; + return $this->fetchOne($query, [$descripcion]); + } +} diff --git a/app/src/Repository/Venta/TipoEstadoPrecio.php b/app/src/Repository/Venta/TipoEstadoPrecio.php new file mode 100644 index 0000000..1955b2e --- /dev/null +++ b/app/src/Repository/Venta/TipoEstadoPrecio.php @@ -0,0 +1,35 @@ +setTable('tipo_estado_precio'); + } + + public function create(?array $data = null): Define\Model + { + $map = [ + 'descripcion' => [] + ]; + return $this->parseData(new Model\Venta\TipoEstadoPrecio(), $data, $map); + } + public function save(Define\Model $model): Define\Model + { + $model->id = $this->saveNew( + ['descripcion'], + [$model->descripcion] + ); + return $model; + } + public function edit(Define\Model $model, array $new_data): Define\Model + { + return $this->update($model, ['descripcion'], $new_data); + } +} diff --git a/app/src/Repository/Venta/TipoPago.php b/app/src/Repository/Venta/TipoPago.php new file mode 100644 index 0000000..dda6865 --- /dev/null +++ b/app/src/Repository/Venta/TipoPago.php @@ -0,0 +1,35 @@ +setTable('tipo_pago'); + } + + public function create(?array $data = null): Define\Model + { + $map = [ + 'descripcion' => [] + ]; + return $this->parseData(new Model\Venta\TipoPago(), $data, $map); + } + public function save(Define\Model $model): Define\Model + { + $model->id = $this->saveNew( + ['descripcion'], + [$model->descripcion] + ); + return $model; + } + public function edit(Define\Model $model, array $new_data): Define\Model + { + return $this->update($model, ['descripcion'], $new_data); + } +} diff --git a/app/src/Repository/Venta/TipoUnidad.php b/app/src/Repository/Venta/TipoUnidad.php new file mode 100644 index 0000000..13474bb --- /dev/null +++ b/app/src/Repository/Venta/TipoUnidad.php @@ -0,0 +1,39 @@ +setTable('tipo_unidad'); + } + + public function create(?array $data = null): Define\Model + { + $map = [ + 'descripcion' => [], + 'orden' => [] + ]; + return $this->parseData(new Model\Venta\TipoUnidad(), $data, $map); + } + public function save(Define\Model $model): Define\Model + { + $model->id = $this->saveNew( + ['descripcion', 'orden'], + [$model->descripcion, $model->orden] + ); + return $model; + } + public function edit(Define\Model $model, array $new_data): Define\Model + { + return $this->update($model, ['descripcion', 'orden'], $new_data); + } +} + + diff --git a/app/src/Repository/Venta/Unidad.php b/app/src/Repository/Venta/Unidad.php new file mode 100644 index 0000000..4783c40 --- /dev/null +++ b/app/src/Repository/Venta/Unidad.php @@ -0,0 +1,47 @@ +setTable('unidad'); + } + + public function create(?array $data = null): Define\Model + { + $map = [ + 'subtipo' => [], + 'piso' => [], + 'descripcion' => [], + 'orientacion' => [], + 'pt' => [ + 'property' => 'proyectoTipoUnidad', + 'function' => function($data) { + return $this->proyectoTipoUnidadRepository->fetchById($data['pt']); + } + ] + ]; + return $this->parseData(new Model\Venta\Unidad(), $data, $map); + } + + public function save(Define\Model $model): Define\Model + { + $model->id = $this->saveNew( + ['subtipo', 'piso', 'descripcion', 'orientacion', 'pt'], + [$model->subtipo, $model->piso, $model->descripcion, $model->orientacion, $model->proyectoTipoUnidad->id] + ); + return $model; + } + + public function edit(Define\Model $model, array $new_data): Define\Model + { + return $this->update($model, ['subtipo', 'piso', 'descripcion', 'orientacion', 'pt'], $new_data); + } +} diff --git a/app/src/Service/Format.php b/app/src/Service/Format.php new file mode 100644 index 0000000..ec9177b --- /dev/null +++ b/app/src/Service/Format.php @@ -0,0 +1,24 @@ +setPattern($format); + return $formatter->format($date); + + } + public function pesos(string $valor): string + { + return '$' . number_format($valor, 0, ',', '.'); + } +} diff --git a/app/src/Service/Login.php b/app/src/Service/Login.php new file mode 100644 index 0000000..175be0d --- /dev/null +++ b/app/src/Service/Login.php @@ -0,0 +1,135 @@ +loadCookie(); + } + + protected string $selector = ''; + protected string $token = ''; + + public function isIn(): bool + { + try { + $login = $this->repository->fetchActiveBySelector($this->selector); + if (!$this->validToken($login)) { + return false; + } + $now = new DateTimeImmutable(); + if ($login->dateTime->add(new DateInterval("PT{$this->max_login_time}H")) > $now) { + return true; + } + } catch (PDOException|EmptyResult) { + } + return false; + } + public function getUser(): Model\User + { + $login = $this->repository->fetchActiveBySelector($this->selector); + if (!$this->validToken($login)) { + throw new Exception('User not found'); + } + return $login->user; + } + + public function login(Model\User $user): bool + { + try { + $login = $this->repository->fetchActiveByUser($user->id); + $this->logout($login->user); + } catch (PDOException|EmptyResult) { + } + + try { + $now = new DateTimeImmutable(); + $login = $this->repository->create([ + 'user_id' => $user->id, + 'time' => $now->format('Y-m-d H:i:s'), + 'status' => 1 + ]); + list('selector' => $selector, 'token' => $token) = $this->generateToken($login); + $login->selector = $selector; + $login->token = password_hash($token, PASSWORD_DEFAULT); + $this->repository->save($login); + $this->saveCookie($selector, $token, $login->dateTime->add(new DateInterval("PT{$this->max_login_time}H"))); + return true; + } catch (PDOException|Exception) { + return false; + } + } + public function logout(Model\User $user): bool + { + $this->removeCookie(); + try { + $logins = $this->repository->fetchByUser($user->id); + } catch (PDOException) { + return true; + } + try { + foreach ($logins as $login) { + $this->repository->edit($login, ['status' => 0]); + } + return true; + } catch (PDOException) { + return false; + } + } + + protected function loadCookie(): void + { + if (!isset($_COOKIE[$this->cookie_name])) { + return; + } + $cookie = $_COOKIE[$this->cookie_name]; + list($this->selector, $this->token) = explode($this->cookie_separator, $cookie); + } + protected function saveCookie(string $selector, string $token, DateTimeInterface $expires): void + { + setcookie( + $this->cookie_name, + implode($this->cookie_separator, [$selector, $token]), + $expires->getTimestamp(), + $this->path, + $this->domain + ); + $this->selector = $selector; + $this->token = $token; + } + protected function removeCookie(): void + { + setcookie( + $this->cookie_name, + '', + (new DateTimeImmutable())->getTimestamp(), + $this->path, + $this->domain + ); + } + + protected function validToken(Model\Login $login): bool + { + return password_verify($this->token, $login->token); + } + protected function generateToken(Model\Login $login) + { + $selector = bin2hex(random_bytes(12)); + $token = bin2hex(random_bytes(20)); + return ['selector' => $selector, 'token' => $token]; + } +} diff --git a/app/src/Service/Ventas/Pago.php b/app/src/Service/Ventas/Pago.php new file mode 100644 index 0000000..f931f38 --- /dev/null +++ b/app/src/Service/Ventas/Pago.php @@ -0,0 +1,31 @@ +tipoEstadoPagoRepository->fetchByDescripcion('depositado'); + $data = [ + 'pago' => $pago->id, + 'estado' => $tipo_estado->id, + 'fecha' => (new DateTimeImmutable())->format('Y-m-d') + ]; + try { + $estado = $this->estadoPagoRepository->create($data); + $this->estadoPagoRepository->save($estado); + return true; + } catch (PDOException) { + return false; + } + } +} diff --git a/app/src/Service/Ventas/Precio.php b/app/src/Service/Ventas/Precio.php new file mode 100644 index 0000000..b03174a --- /dev/null +++ b/app/src/Service/Ventas/Precio.php @@ -0,0 +1,19 @@ +precioRepository->fetchByProyecto($proyecto_id); + foreach ($precios as &$precio) { + $precio->estados = $this->estadoPrecioRepository->fetchByPrecio($precio->id); + $precio->current = $this->estadoPrecioRepository->fetchCurrentByPrecio($precio->id); + } + return $precios; + } +} From 43cd955061293eb81e88e8b7dc76cb6b94410895 Mon Sep 17 00:00:00 2001 From: Juan Pablo Vial Date: Tue, 25 Jul 2023 17:03:57 -0400 Subject: [PATCH 006/163] Venta->Listado->Cierres --- app/resources/routes/api/ventas/cierres.php | 6 + app/resources/routes/ventas/cierres.php | 6 + .../views/ventas/cierres/list.blade.php | 360 ++++++++++++++++++ app/src/Controller/Ventas/Cierres.php | 24 ++ app/src/Model/Venta/Cierre.php | 12 +- app/src/Model/Venta/EstadoCierre.php | 21 + app/src/Model/Venta/TipoEstadoCierre.php | 16 + app/src/Repository/Venta/Cierre.php | 13 +- app/src/Repository/Venta/EstadoCierre.php | 66 ++++ app/src/Repository/Venta/TipoEstadoCierre.php | 40 ++ app/src/Repository/Venta/Unidad.php | 14 +- app/src/Service/Ventas/Cierre.php | 23 ++ 12 files changed, 596 insertions(+), 5 deletions(-) create mode 100644 app/resources/routes/api/ventas/cierres.php create mode 100644 app/resources/routes/ventas/cierres.php create mode 100644 app/resources/views/ventas/cierres/list.blade.php create mode 100644 app/src/Controller/Ventas/Cierres.php create mode 100644 app/src/Model/Venta/EstadoCierre.php create mode 100644 app/src/Model/Venta/TipoEstadoCierre.php create mode 100644 app/src/Repository/Venta/EstadoCierre.php create mode 100644 app/src/Repository/Venta/TipoEstadoCierre.php create mode 100644 app/src/Service/Ventas/Cierre.php diff --git a/app/resources/routes/api/ventas/cierres.php b/app/resources/routes/api/ventas/cierres.php new file mode 100644 index 0000000..c242b05 --- /dev/null +++ b/app/resources/routes/api/ventas/cierres.php @@ -0,0 +1,6 @@ +group('/cierres', function($app) { + $app->post('[/]', [Cierres::class, 'proyecto']); +}); diff --git a/app/resources/routes/ventas/cierres.php b/app/resources/routes/ventas/cierres.php new file mode 100644 index 0000000..52c0e2d --- /dev/null +++ b/app/resources/routes/ventas/cierres.php @@ -0,0 +1,6 @@ +group('/cierres', function($app) { + $app->get('[/]', Cierres::class); +}); diff --git a/app/resources/views/ventas/cierres/list.blade.php b/app/resources/views/ventas/cierres/list.blade.php new file mode 100644 index 0000000..334d2bf --- /dev/null +++ b/app/resources/views/ventas/cierres/list.blade.php @@ -0,0 +1,360 @@ +@extends('layout.base') + + +@section('page_title') + Cierres - Listado +@endsection + +@section('page_content') +
    +

    Listado de Cierres

    + + + + + + + +
    Proyecto
    +
    +@endsection + +@push('page_styles') + +@endpush + +@push('page_scripts') + +@endpush diff --git a/app/src/Controller/Ventas/Cierres.php b/app/src/Controller/Ventas/Cierres.php new file mode 100644 index 0000000..7c4d325 --- /dev/null +++ b/app/src/Controller/Ventas/Cierres.php @@ -0,0 +1,24 @@ +render($response, 'ventas.cierres.list'); + } + public function proyecto(ServerRequestInterface $request, ResponseInterface $response, Service\Ventas\Cierre $service): ResponseInterface + { + $body = $request->getBody(); + $json = json_decode($body->getContents()); + $proyecto_id = $json->proyecto_id; + $cierres = $service->getByProyecto($proyecto_id); + $response->getBody()->write(json_encode(['cierres' => $cierres, 'total' => count($cierres)])); + return $response->withHeader('Content-Type', 'application/json'); + } +} diff --git a/app/src/Model/Venta/Cierre.php b/app/src/Model/Venta/Cierre.php index 25d3009..8eb00f5 100644 --- a/app/src/Model/Venta/Cierre.php +++ b/app/src/Model/Venta/Cierre.php @@ -13,14 +13,22 @@ class Cierre extends Ideal\Model public bool $relacionado; public Propietario $propietario; + public array $estados = []; + public ?EstadoCierre $current = null; + + public array $unidades = []; + public function jsonSerialize(): mixed { return array_merge(parent::jsonSerialize(), [ - 'proyecto_id' => $this->proyecto->id, + 'proyecto' => $this->proyecto, 'precio' => $this->precio, 'date_time' => $this->dateTime->format('Y-m-d H:i:s'), 'relacionado' => $this->relacionado, - 'propietario' => $this->propietario->rut + 'propietario' => $this->propietario->rut, + 'estados' => $this->estados, + 'estado_cierre' => $this->current, + 'unidades' => $this->unidades ]); } } diff --git a/app/src/Model/Venta/EstadoCierre.php b/app/src/Model/Venta/EstadoCierre.php new file mode 100644 index 0000000..2a94606 --- /dev/null +++ b/app/src/Model/Venta/EstadoCierre.php @@ -0,0 +1,21 @@ + $this->cierre->id, + 'tipo_estado_cierre' => $this->tipoEstadoCierre, + 'fecha' => $this->fecha->format('Y-m-d') + ]); + } +} diff --git a/app/src/Model/Venta/TipoEstadoCierre.php b/app/src/Model/Venta/TipoEstadoCierre.php new file mode 100644 index 0000000..58a6d5b --- /dev/null +++ b/app/src/Model/Venta/TipoEstadoCierre.php @@ -0,0 +1,16 @@ + $this->vigente + ]); + } +} diff --git a/app/src/Repository/Venta/Cierre.php b/app/src/Repository/Venta/Cierre.php index 6366347..6de51f9 100644 --- a/app/src/Repository/Venta/Cierre.php +++ b/app/src/Repository/Venta/Cierre.php @@ -71,7 +71,7 @@ FROM `{$this->getTable()}` a FROM `estado_cierre` e1 JOIN (SELECT MAX(`id`) AS id, `cierre` FROM `estado_cierre` GROUP BY `cierre`) e0 ON e0.`id` = e1.`id`) ec ON ec.`cierre` = a.`id` JOIN `tipo_estado_cierre` tec ON tec.`id` = ec.`tipo` - JOIN `proyecto` ON `proyecto`.`id` = a.`proyecto` + JOIN `proyecto` ON `proyecto`.`id` = a.`proyecto` AND tec.`descripcion` NOT IN ('revisado') GROUP BY `proyecto`.`descripcion`, tec.`descripcion`"; $results = $this->connection->execute($query)->fetchAll(PDO::FETCH_ASSOC); if ($results === false) { @@ -79,4 +79,15 @@ GROUP BY `proyecto`.`descripcion`, tec.`descripcion`"; } return $results; } + public function fetchByProyecto(int $proyecto_id): array + { + $query = "SELECT a.* +FROM `{$this->getTable()}` a + JOIN (SELECT e1.* + FROM `estado_cierre` e1 + JOIN (SELECT MAX(`id`) AS id, `cierre` FROM `estado_cierre` GROUP BY `cierre`) e0 ON e0.`id` = e1.`id`) ec ON ec.`cierre` = a.`id` + JOIN `tipo_estado_cierre` tec ON tec.`id` = ec.`tipo` +WHERE `proyecto` = ? AND tec.`descripcion` NOT IN ('revisado')"; + return $this->fetchMany($query, [$proyecto_id]); + } } diff --git a/app/src/Repository/Venta/EstadoCierre.php b/app/src/Repository/Venta/EstadoCierre.php new file mode 100644 index 0000000..ed82284 --- /dev/null +++ b/app/src/Repository/Venta/EstadoCierre.php @@ -0,0 +1,66 @@ +setTable('estado_cierre'); + } + + public function create(?array $data = null): Define\Model + { + $map = [ + 'cierre' => [ + 'function' => function($data) { + return $this->cierreRepository->fetchById($data['cierre']); + } + ], + 'tipo' => [ + 'property' => 'tipoEstadoCierre', + 'function' => function($data) { + return $this->tipoEstadoCierreRepository->fetchById($data['tipo']); + } + ], + 'fecha' => [ + 'function' => function($data) { + return new DateTimeImmutable($data['fecha']); + } + ] + ]; + return $this->parseData(new Model\Venta\EstadoCierre(), $data, $map); + } + public function save(Define\Model $model): Define\Model + { + $model->id = $this->saveNew( + ['cierre', 'tipo', 'fecha'], + [$model->cierre->id, $model->tipoEstadoCierre->id, $model->fecha->format('Y-m-d')] + ); + return $model; + } + public function edit(Define\Model $model, array $new_data): Define\Model + { + return $this->update($model, ['cierre', 'tipo', 'fecha'], $new_data); + } + + public function fetchByCierre(int $cierre_id): array + { + $query = "SELECT * FROM `{$this->getTable()}` WHERE `cierre` = ?"; + return $this->fetchMany($query, [$cierre_id]); + } + public function fetchCurrentByCierre(int $cierre_id): Define\Model + { + $query = "SELECT e1.* +FROM `{$this->getTable()}` e1 + JOIN (SELECT MAX(`id`) AS 'id', `cierre` FROM `{$this->getTable()}` GROUP BY `cierre`) e0 ON e0.`id` = e1.`id` +WHERE e1.`cierre` = ?"; + return $this->fetchOne($query, [$cierre_id]); + } +} diff --git a/app/src/Repository/Venta/TipoEstadoCierre.php b/app/src/Repository/Venta/TipoEstadoCierre.php new file mode 100644 index 0000000..7883c82 --- /dev/null +++ b/app/src/Repository/Venta/TipoEstadoCierre.php @@ -0,0 +1,40 @@ +setTable('tipo_estado_cierre'); + } + + public function create(?array $data = null): Define\Model + { + $map = [ + 'descripcion' => [], + 'vigente' => [ + 'function' => function($data) { + return $data['vigente'] != 0; + } + ] + ]; + return $this->parseData(new Model\Venta\TipoEstadoCierre(), $data, $map); + } + public function save(Define\Model $model): Define\Model + { + $model->id = $this->saveNew( + ['descripcion', 'vigente'], + [$model->descripcion, $model->vigente ? 1 : 0] + ); + return $model; + } + public function edit(Define\Model $model, array $new_data): Define\Model + { + return $this->update($model, ['descripcion', 'vigente'], $new_data); + } +} diff --git a/app/src/Repository/Venta/Unidad.php b/app/src/Repository/Venta/Unidad.php index 4783c40..271997f 100644 --- a/app/src/Repository/Venta/Unidad.php +++ b/app/src/Repository/Venta/Unidad.php @@ -30,7 +30,6 @@ class Unidad extends Ideal\Repository ]; return $this->parseData(new Model\Venta\Unidad(), $data, $map); } - public function save(Define\Model $model): Define\Model { $model->id = $this->saveNew( @@ -39,9 +38,20 @@ class Unidad extends Ideal\Repository ); return $model; } - public function edit(Define\Model $model, array $new_data): Define\Model { return $this->update($model, ['subtipo', 'piso', 'descripcion', 'orientacion', 'pt'], $new_data); } + + public function fetchByCierre(int $cierre_id): array + { + $query = "SELECT a.* +FROM `{$this->getTable()}` a + JOIN `unidad_cierre` uc ON uc.`unidad` = a.`id` + JOIN `proyecto_tipo_unidad` ptu ON ptu.`id` = a.`pt` + JOIN `tipo_unidad` tu ON tu.`id` = ptu.`tipo` +WHERE uc.`cierre` = ? +ORDER BY tu.`orden`, LPAD(a.`descripcion`, 4, '0')"; + return $this->fetchMany($query, [$cierre_id]); + } } diff --git a/app/src/Service/Ventas/Cierre.php b/app/src/Service/Ventas/Cierre.php new file mode 100644 index 0000000..c066022 --- /dev/null +++ b/app/src/Service/Ventas/Cierre.php @@ -0,0 +1,23 @@ +cierreRepository->fetchByProyecto($proyecto_id); + foreach ($cierres as &$cierre) { + $cierre->estados = $this->estadoCierreRepository->fetchByCierre($cierre->id); + $cierre->current = $this->estadoCierreRepository->fetchCurrentByCierre($cierre->id); + $cierre->unidades = $this->unidadRepository->fetchByCierre($cierre->id); + } + return $cierres; + } +} From 38383f52958b50a75149991608f0c7c1f2b1b9b7 Mon Sep 17 00:00:00 2001 From: Juan Pablo Vial Date: Tue, 25 Jul 2023 20:25:28 -0400 Subject: [PATCH 007/163] Accordion --- .../views/ventas/cierres/list.blade.php | 185 ++++++------------ 1 file changed, 59 insertions(+), 126 deletions(-) diff --git a/app/resources/views/ventas/cierres/list.blade.php b/app/resources/views/ventas/cierres/list.blade.php index 334d2bf..859ca54 100644 --- a/app/resources/views/ventas/cierres/list.blade.php +++ b/app/resources/views/ventas/cierres/list.blade.php @@ -8,17 +8,14 @@ @section('page_content')

    Listado de Cierres

    - - - - - - - -
    Proyecto
    +

    Proyectos

    +
    @endsection +@include('layout.head.styles.datatables') +@include('layout.body.scripts.datatables') + @push('page_styles') +@endpush + +@push('page_scripts') + +@endpush diff --git a/app/resources/views/ventas/add.blade.php b/app/resources/views/ventas/add.blade.php index 75bb644..7359c0a 100644 --- a/app/resources/views/ventas/add.blade.php +++ b/app/resources/views/ventas/add.blade.php @@ -3,7 +3,7 @@ @section('page_content')

    Nueva Venta

    -
    +
    diff --git a/app/resources/views/ventas/precios/list.blade.php b/app/resources/views/ventas/precios/list.blade.php index 5820b22..5b4ae22 100644 --- a/app/resources/views/ventas/precios/list.blade.php +++ b/app/resources/views/ventas/precios/list.blade.php @@ -75,48 +75,46 @@ @push('page_scripts') @endpush diff --git a/app/src/Controller/API/Proyectos.php b/app/src/Controller/API/Proyectos.php index d547dae..5ed2152 100644 --- a/app/src/Controller/API/Proyectos.php +++ b/app/src/Controller/API/Proyectos.php @@ -21,6 +21,19 @@ class Proyectos } catch (EmptyResult) {} return $this->withJson($response, $output); } + public function escriturando(ServerRequestInterface $request, ResponseInterface $response, Repository\Proyecto $proyectoRepository): ResponseInterface + { + $output = [ + 'total' => 0, + 'proyectos' => [] + ]; + try { + $proyectos = $proyectoRepository->fetchAllEscriturando(); + $output['proyectos'] = $proyectos; + $output['total'] = count($proyectos); + } catch (EmptyResult) {} + return $this->withJson($response, $output); + } public function unidades(ServerRequestInterface $request, ResponseInterface $response, Repository\Venta\Unidad $unidadRepository, int $proyecto_id): ResponseInterface { $output = ['proyecto_id' => $proyecto_id, 'unidades' => [], 'total' => 0]; diff --git a/app/src/Controller/API/Ventas.php b/app/src/Controller/API/Ventas.php new file mode 100644 index 0000000..bdfc853 --- /dev/null +++ b/app/src/Controller/API/Ventas.php @@ -0,0 +1,138 @@ +getBody(); + $json = json_decode($body->getContents()); + $proyecto_id = $json->proyecto_id; + $output = [ + 'proyecto' => [ + 'id' => $proyecto_id + ], + 'total' => 0 + ]; + try { + $ventas = $service->fetchActivaByProyecto($proyecto_id); + $output['ventas'] = array_map(function(Model\Venta $venta) {return $venta->id;}, $ventas); + $output['proyecto']['descripcion'] = $ventas[0]->proyecto()->descripcion; + $output['total'] = count($ventas); + } catch (EmptyResult) {} + return $this->withJson($response, $output); + } + public function get(ServerRequestInterface $request, ResponseInterface $response, Service\Venta $service, int $venta_id): ResponseInterface + { + try { + $venta = $service->getById($venta_id); + $output = compact('venta'); + } catch (EmptyResult $exception) { + $output = [ + 'error' => [ + 'code' => $exception->getCode(), + 'message' => str_replace([PHP_EOL, "\r"], [' ', ''], $exception->getMessage()) + ] + ]; + } + return $this->withJson($response, $output); + } + public function porFirmar(ServerRequestInterface $request, ResponseInterface $response, Service\Venta $ventaService): ResponseInterface + { + $body = $request->getBody(); + $json = json_decode($body->getContents()); + $proyecto_id = $json->proyecto_id; + $output = [ + 'proyecto_id' => $proyecto_id, + 'promesas' => 0 + ]; + try { + $ventas = $ventaService->getByProyecto($proyecto_id); + $promesas = array_filter($ventas, function(Model\Venta $venta) { + return $venta->currentEstado()->tipoEstadoVenta->descripcion === 'vigente'; + }); + $output['promesas'] = count($promesas); + } catch (EmptyResult) {} + return $this->withJson($response, $output); + } + public function escrituras(ServerRequestInterface $request, ResponseInterface $response, Service\Venta $ventaService, Service\Venta\Pago $pagoService): ResponseInterface + { + $body = $request->getBody(); + $json = json_decode($body->getContents()); + $proyecto_id = $json->proyecto_id; + $output = [ + 'proyecto_id' => $proyecto_id, + 'escrituras' => [ + 'firmar' => 0, + 'pagar' => 0, + 'abonar' => 0 + ] + ]; + try { + $ventas = $ventaService->getEscriturasByProyecto($proyecto_id); + $porFirmar = array_filter($ventas, function(Model\Venta $venta) { + return $venta->currentEstado()->tipoEstadoVenta->descripcion === 'escriturando'; + }); + $output['escrituras']['firmar'] = count($porFirmar); + unset($porFirmar); + $escrituras = array_filter($ventas, function(Model\Venta $venta) { + return $venta->currentEstado()->tipoEstadoVenta->descripcion === 'firmado por inmobiliaria'; + }); + unset($ventas); + $porPagar = array_filter($escrituras, function(Model\Venta $venta) use ($pagoService) { + $pagos = $pagoService->getByVenta($venta->id); + $porPagar = array_filter($pagos, function(Model\Venta\Pago $pago) { + return $pago->currentEstado->tipoEstadoPago->descripcion === 'no pagado'; + }); + return count($porPagar) > 0; + }); + $output['escrituras']['pagar'] = count($porPagar); + unset($porPagar); + $porAbonar = array_filter($escrituras, function(Model\Venta $venta) use ($pagoService) { + $pagos = $pagoService->getByVenta($venta->id); + $porPagar = array_filter($pagos, function(Model\Venta\Pago $pago) { + return $pago->currentEstado->tipoEstadoPago->descripcion === 'depositado'; + }); + return count($porPagar) > 0; + }); + $output['escrituras']['abonar'] = count($porAbonar); + unset($porAbonar); + } catch (EmptyResult) {} + return $this->withJson($response, $output); + } + public function comentarios(ServerRequestInterface $request, ResponseInterface $response, Service\Venta $service, Repository\Venta\Comentario $comentarioRepository, int $venta_id): ResponseInterface + { + $venta = $service->getById($venta_id); + $output = ['total' => 0]; + try { + $comentarios = $comentarioRepository->fetchByVenta($venta->id); + $output['total'] = count($comentarios); + $output['comentarios'] = $comentarios; + } catch (EmptyResult) {} + return $this->withJson($response, $output); + } + public function add(ServerRequestInterface $request, ResponseInterface $response, Service\Venta $ventaService): ResponseInterface + { + $data = $request->getParsedBody(); + $output = [ + 'status' => false, + 'errors' => [] + ]; + try { + $ventaService->add($data); + $output['status'] = true; + } catch (\Exception $exception) { + $output['errors'] = $exception; + } + return $this->withJson($response, $output); + } +} diff --git a/app/src/Controller/API/Ventas/Unidades.php b/app/src/Controller/API/Ventas/Unidades.php new file mode 100644 index 0000000..f04deeb --- /dev/null +++ b/app/src/Controller/API/Ventas/Unidades.php @@ -0,0 +1,56 @@ +getBody(); + $json = json_decode($body->getContents()); + $proyecto_id = $json->proyecto_id; + $output = [ + 'proyecto_id' => $proyecto_id, + 'unidades' => [ + 'total' => [ + 'departamentos' => 0, + 'estacionamientos' => 0, + 'bodegas' => 0, + ], + 'departamentos' => 0, + 'estacionamientos' => 0, + 'bodegas' => 0, + ] + ]; + try { + $totalUnidades = $unidadRepository->fetchByProyecto($proyecto_id); + $unidades = $unidadRepository->fetchDisponiblesByProyecto($proyecto_id); + + $tiposUnidades = $tipoUnidadRepository->fetchAll(); + foreach ($tiposUnidades as $tipoUnidad) { + $tempUnidades = array_filter($totalUnidades, function(Model\Venta\Unidad $unidad) use ($tipoUnidad) { + return $unidad->proyectoTipoUnidad->tipoUnidad->id === $tipoUnidad->id; + }); + if (count($tempUnidades) > 0) { + $output['unidades']['total']["{$tipoUnidad->descripcion}s"] = count($tempUnidades); + } + $tempUnidades = array_filter($unidades, function(Model\Venta\Unidad $unidad) use ($tipoUnidad) { + return $unidad->proyectoTipoUnidad->tipoUnidad->id === $tipoUnidad->id; + }); + if (count($tempUnidades) === 0) { + continue; + } + $output['unidades']["{$tipoUnidad->descripcion}s"] = count($tempUnidades); + } + } catch (EmptyResult) {} + return $this->withJson($response, $output); + } +} diff --git a/app/src/Controller/Ventas.php b/app/src/Controller/Ventas.php index 3b54065..22583ba 100644 --- a/app/src/Controller/Ventas.php +++ b/app/src/Controller/Ventas.php @@ -28,39 +28,6 @@ class Ventas $venta = $service->getByProyectoAndUnidad($proyecto_nombre, $unidad_descripcion); return $view->render($response, 'ventas.show', compact('venta')); } - public function proyecto(ServerRequestInterface $request, ResponseInterface $response, Repository\Venta $service): ResponseInterface - { - $body = $request->getBody(); - $json = json_decode($body->getContents()); - $proyecto_id = $json->proyecto_id; - $output = [ - 'proyecto' => [ - 'id' => $proyecto_id - ], - 'total' => 0 - ]; - try { - $ventas = $service->fetchActivaByProyecto($proyecto_id); - $output['ventas'] = array_map(function(Model\Venta $venta) {return $venta->id;}, $ventas); - $output['proyecto']['descripcion'] = $ventas[0]->proyecto()->descripcion; - $output['total'] = count($ventas); - } catch (EmptyResult) {} - $response->getBody()->write(json_encode($output)); - return $response->withHeader('Content-Type', 'application/json'); - } - public function get(ServerRequestInterface $request, ResponseInterface $response, Service\Venta $service, int $venta_id): ResponseInterface - { - try { - $venta = $service->getById($venta_id); - $response->getBody()->write(json_encode(compact('venta'))); - } catch (EmptyResult $exception) { - $response->getBody()->write(json_encode(['error' => [ - 'code' => $exception->getCode(), - 'message' => str_replace([PHP_EOL, "\r"], [' ', ''], $exception->getMessage()) - ]])); - } - return $response->withHeader('Content-Type', 'application/json'); - } public function edit(ServerRequestInterface $request, ResponseInterface $response, View $view, Service\Venta $service, int $venta_id): ResponseInterface { $venta = $service->getById($venta_id); @@ -90,18 +57,6 @@ class Ventas } return $view->render($response, 'ventas.propiedades.edit', compact('propiedad', 'proyecto', 'tiposUnidades', 'unidades', 'venta_id')); } - public function comentarios(ServerRequestInterface $request, ResponseInterface $response, Service\Venta $service, Repository\Venta\Comentario $comentarioRepository, int $venta_id): ResponseInterface - { - $venta = $service->getById($venta_id); - $output = ['total' => 0]; - try { - $comentarios = $comentarioRepository->fetchByVenta($venta->id); - $output['total'] = count($comentarios); - $output['comentarios'] = $comentarios; - } catch (EmptyResult) {} - $response->getBody()->write(json_encode($output)); - return $response->withHeader('Content-Type', 'application/json'); - } public function add(ServerRequestInterface $request, ResponseInterface $response, View $view, Repository\Region $regionRepository, Repository\Proyecto $proyectoRepository): ResponseInterface { $regiones = $regionRepository->fetchAll(); @@ -111,22 +66,6 @@ class Ventas $proyectos = $proyectoRepository->fetchAllActive(); return $view->render($response, 'ventas.add', compact('regiones', 'proyectos')); } - public function doAdd(ServerRequestInterface $request, ResponseInterface $response, Service\Venta $ventaService): ResponseInterface - { - $data = $request->getParsedBody(); - $output = [ - 'status' => false, - 'errors' => [] - ]; - try { - $ventaService->add($data); - $output['status'] = true; - } catch (\Exception $exception) { - $output['errors'] = $exception; - } - $response->getBody()->write(json_encode($output)); - return $response->withHeader('Content-Type', 'application/json'); - } public function cuotas(ServerRequestInterface $request, ResponseInterface $response, Service\Venta $ventaService, View $view, int $venta_id): ResponseInterface { $venta = $ventaService->getById($venta_id); diff --git a/app/src/Model/Proyecto/ProyectoTipoUnidad.php b/app/src/Model/Proyecto/ProyectoTipoUnidad.php index e05f9d9..8c7a6bf 100644 --- a/app/src/Model/Proyecto/ProyectoTipoUnidad.php +++ b/app/src/Model/Proyecto/ProyectoTipoUnidad.php @@ -7,7 +7,7 @@ use Incoviba\Model; class ProyectoTipoUnidad extends Ideal\Model { public Model\Proyecto $proyecto; - public Model\Venta\TipoUnidad $tipoUnidad; + public Model\Proyecto\TipoUnidad $tipoUnidad; public string $nombre; public string $abreviacion; public float $util; diff --git a/app/src/Model/Venta/TipoUnidad.php b/app/src/Model/Proyecto/TipoUnidad.php similarity index 87% rename from app/src/Model/Venta/TipoUnidad.php rename to app/src/Model/Proyecto/TipoUnidad.php index 4c1af89..7f7954a 100644 --- a/app/src/Model/Venta/TipoUnidad.php +++ b/app/src/Model/Proyecto/TipoUnidad.php @@ -1,5 +1,5 @@ etapaRepository->fetchByDescripcion('Proyecto'); + $etapaTerminado = $this->etapaRepository->fetchByDescripcion('Terminado'); $query = "SELECT a.* FROM `{$this->getTable()}` a - JOIN (SELECT e1.* FROM `estado_proyecto` e1 JOIN (SELECT MAX(`id`) AS 'id', `proyecto` FROM `estado_proyecto` GROUP BY `proyecto`) e0 ON e0.`id` = e1.`id`) ep ON ep.`proyecto` = a.`id` - JOIN `tipo_estado_proyecto` tep ON tep.`id` = ep.`estado` - JOIN `etapa_proyecto` et ON et.`id` = tep.`etapa` -WHERE et.`orden` BETWEEN 4 AND 8 + {$this->joinEstado()} +WHERE et.`orden` BETWEEN {$etapaProyecto->orden} AND ({$etapaTerminado->orden} - 1) ORDER BY a.`descripcion`"; return $this->fetchMany($query); } + public function fetchAllEscriturando(): array + { + $etapaRecepcion = $this->etapaRepository->fetchByDescripcion('Recepción'); + $etapaTerminado = $this->etapaRepository->fetchByDescripcion('Terminado'); + $query = "SELECT a.* +FROM `{$this->getTable()}` a + {$this->joinEstado()} +WHERE et.`orden` BETWEEN {$etapaRecepcion->orden} AND ({$etapaTerminado->orden} - 1) +ORDER BY a.`descripcion`"; + return $this->fetchMany($query); + } + + protected function joinEstado(): string + { + return "JOIN ( + SELECT e2.* + FROM `estado_proyecto` e2 + JOIN ( + SELECT MAX(e1.`id`) AS 'id', e1.`proyecto` + FROM `estado_proyecto` e1 + JOIN ( + SELECT MAX(`id`) AS 'id', `proyecto`, `fecha` + FROM `estado_proyecto` + GROUP BY `proyecto`, `fecha` + ) e0 ON e1.`id` = e0.`id` + GROUP BY `proyecto` + ) e01 ON e01.`id` = e2.`id` + ) ep ON ep.`proyecto` = a.`id` + JOIN `tipo_estado_proyecto` tep ON tep.`id` = ep.`estado` + JOIN `etapa_proyecto` et ON et.`id` = tep.`etapa`"; + } } diff --git a/app/src/Repository/Proyecto/Etapa.php b/app/src/Repository/Proyecto/Etapa.php index e81a1a6..4ab3bbb 100644 --- a/app/src/Repository/Proyecto/Etapa.php +++ b/app/src/Repository/Proyecto/Etapa.php @@ -28,4 +28,10 @@ class Etapa extends Ideal\Repository { return $this->update($model, ['descripcion', 'orden'], $new_data); } + + public function fetchByDescripcion(string $descripcion): Model\Proyecto\Etapa + { + $query = "SELECT * FROM `{$this->getTable()}` WHERE `descripcion` = ?"; + return $this->fetchOne($query, [$descripcion]); + } } diff --git a/app/src/Repository/Proyecto/ProyectoTipoUnidad.php b/app/src/Repository/Proyecto/ProyectoTipoUnidad.php index 4beb4ac..737f767 100644 --- a/app/src/Repository/Proyecto/ProyectoTipoUnidad.php +++ b/app/src/Repository/Proyecto/ProyectoTipoUnidad.php @@ -9,7 +9,7 @@ use Incoviba\Repository; class ProyectoTipoUnidad extends Ideal\Repository { - public function __construct(Define\Connection $connection, protected Repository\Proyecto $proyectoRepository, protected Repository\Venta\TipoUnidad $tipoUnidadRepository) + public function __construct(Define\Connection $connection, protected Repository\Proyecto $proyectoRepository, protected Repository\Proyecto\TipoUnidad $tipoUnidadRepository) { parent::__construct($connection); $this->setTable('proyecto_tipo_unidad'); diff --git a/app/src/Repository/Venta/TipoUnidad.php b/app/src/Repository/Proyecto/TipoUnidad.php similarity index 87% rename from app/src/Repository/Venta/TipoUnidad.php rename to app/src/Repository/Proyecto/TipoUnidad.php index 035a9a2..1290c4f 100644 --- a/app/src/Repository/Venta/TipoUnidad.php +++ b/app/src/Repository/Proyecto/TipoUnidad.php @@ -1,8 +1,8 @@ parseData(new Model\Venta\TipoUnidad(), $data, $map); + return $this->parseData(new Model\Proyecto\TipoUnidad(), $data, $map); } public function save(Define\Model $model): Define\Model { diff --git a/app/src/Repository/Venta.php b/app/src/Repository/Venta.php index 3944586..c8f28ef 100644 --- a/app/src/Repository/Venta.php +++ b/app/src/Repository/Venta.php @@ -220,4 +220,17 @@ FROM `{$this->getTable()}` a WHERE CONCAT_WS(' ', `propietario`.`nombres`, `propietario`.`apellido_paterno`, `propietario`.`apellido_materno`) LIKE ?"; return $this->fetchMany($query, [$propietario]); } + public function fetchEscriturasByProyecto(int $proyecto_id): array + { + $query = "SELECT DISTINCT a.* +FROM `{$this->getTable()}` a + JOIN `propiedad_unidad` pu ON pu.`propiedad` = a.`propiedad` + JOIN `unidad` ON `unidad`.`id` = pu.`unidad` + JOIN `proyecto_tipo_unidad` ptu ON ptu.`id` = `unidad`.`id` + JOIN (SELECT e1.* FROM `estado_venta` e1 JOIN (SELECT MAX(`id`) AS 'id', `venta` FROM `estado_venta` GROUP BY `venta`) e0 ON e0.`id` = e1.`id`) ev ON ev.`venta` = a.`id` + JOIN `tipo_estado_venta` tev ON tev.`id` = ev.`estado` +WHERE ptu.`proyecto` = ? AND tev.`descripcion` IN ('firmado por inmobiliaria', 'escriturando') +GROUP BY a.`id`"; + return $this->fetchMany($query, [$proyecto_id]); + } } diff --git a/app/src/Repository/Venta/Pago.php b/app/src/Repository/Venta/Pago.php index 04e380b..451789e 100644 --- a/app/src/Repository/Venta/Pago.php +++ b/app/src/Repository/Venta/Pago.php @@ -60,4 +60,44 @@ class Pago extends Ideal\Repository { return $this->update($model, ['valor', 'banco', 'tipo', 'identificador', 'fecha', 'uf', 'pagador', 'asociado'], $new_data); } + + public function fetchByVenta(int $venta_id): array + { + $query = "SELECT a.* +FROM ( + SELECT a.*, venta.id AS venta_id, 'cuota' AS fuente + FROM pago a + JOIN cuota ON cuota.pago = a.id + JOIN venta ON venta.pie = cuota.pie + UNION ALL + SELECT a.*, venta.id AS venta_id, 'reajuste' AS fuente + FROM pago a + JOIN pie ON pie.reajuste = a.id + JOIN venta ON venta.pie = pie.id + UNION ALL + SELECT a.*, venta.id AS venta_id, 'credito' AS fuente + FROM pago a + JOIN credito ON credito.pago = a.id + JOIN venta ON venta.credito = credito.id + UNION ALL + SELECT a.*, venta.id AS venta_id, 'escritura' AS fuente + FROM pago a + JOIN escritura ON escritura.pago = a.id + JOIN venta ON venta.escritura = escritura.id + UNION ALL + SELECT a.*, venta.id AS venta_id, 'subsidio' AS fuente + FROM pago a + JOIN subsidio ON subsidio.subsidio = a.id + JOIN venta ON venta.subsidio = subsidio.id + UNION ALL + SELECT a.*, venta.id AS venta_id, 'ahorro' AS fuente + FROM pago a + JOIN subsidio ON subsidio.pago = a.id + JOIN venta ON venta.subsidio = subsidio.id + ) a + JOIN (SELECT e1.* FROM estado_pago e1 JOIN (SELECT MAX(id) AS id, pago FROM estado_pago GROUP BY pago) e0 ON e0.id = e1.id) ep ON ep.pago = a.id + JOIN tipo_estado_pago tep ON tep.id = ep.estado +WHERE venta_id = ?"; + return $this->fetchMany($query, [$venta_id]); + } } diff --git a/app/src/Service/Search.php b/app/src/Service/Search.php index 82421e8..3a704bd 100644 --- a/app/src/Service/Search.php +++ b/app/src/Service/Search.php @@ -2,12 +2,12 @@ namespace Incoviba\Service; use Incoviba\Common\Implement\Exception\EmptyResult; -use Incoviba\Repository; use Incoviba\Model; +use Incoviba\Repository; class Search { - public function __construct(protected Venta $ventaService, protected Repository\Venta $ventaRepository, protected Repository\Venta\Unidad $unidadRepository, protected Repository\Venta\TipoUnidad $tipoUnidadRepository) {} + public function __construct(protected Venta $ventaService, protected Repository\Venta $ventaRepository, protected Repository\Venta\Unidad $unidadRepository, protected Repository\Proyecto\TipoUnidad $tipoUnidadRepository) {} public function query(string $query, string $tipo): array { @@ -127,7 +127,7 @@ class Search protected function getTiposUnidades(): array { if (!isset($this->tipos)) { - $this->tipos = array_map(function(Model\Venta\TipoUnidad $tipoUnidad) { + $this->tipos = array_map(function(Model\Proyecto\TipoUnidad $tipoUnidad) { return $tipoUnidad->descripcion; }, $this->tipoUnidadRepository->fetchAll()); } diff --git a/app/src/Service/Venta.php b/app/src/Service/Venta.php index 93fdd1d..01215b7 100644 --- a/app/src/Service/Venta.php +++ b/app/src/Service/Venta.php @@ -28,18 +28,12 @@ class Venta public function getByProyecto(int $proyecto_id): array { $ventas = $this->ventaRepository->fetchByProyecto($proyecto_id); - foreach ($ventas as &$venta) { - $venta = $this->process($venta); - } - return $ventas; + return array_map([$this, 'process'], $ventas); } public function getActivaByProyecto(int $proyecto_id): array { $ventas = $this->ventaRepository->fetchActivaByProyecto($proyecto_id); - foreach ($ventas as &$venta) { - $venta = $this->process($venta); - } - return $ventas; + return array_map([$this, 'process'], $ventas); } public function getByProyectoAndUnidad(string $proyecto_nombre, int $unidad_descripcion): Model\Venta { @@ -49,26 +43,22 @@ class Venta public function getByUnidad(string $unidad, string $tipo): array { $ventas = $this->ventaRepository->fetchByUnidad($unidad, $tipo); - foreach ($ventas as &$venta) { - $venta = $this->process($venta); - } - return $ventas; + return array_map([$this, 'process'], $ventas); } public function getByPropietario(string $propietario): array { $ventas = $this->ventaRepository->fetchByPropietario($propietario); - foreach ($ventas as &$venta) { - $venta = $this->process($venta); - } - return $ventas; + return array_map([$this, 'process'], $ventas); } public function getByPrecio(string $precio): array { $ventas = $this->ventaRepository->fetchByPrecio($precio); - foreach ($ventas as &$venta) { - $venta = $this->process($venta); - } - return $ventas; + return array_map([$this, 'process'], $ventas); + } + public function getEscriturasByProyecto(int $proyecto_id): array + { + $ventas = $this->ventaRepository->fetchEscriturasByProyecto($proyecto_id); + return array_map([$this, 'process'], $ventas); } protected function process(Model\Venta $venta): Model\Venta diff --git a/app/src/Service/Venta/Pago.php b/app/src/Service/Venta/Pago.php index cff2779..3f8d161 100644 --- a/app/src/Service/Venta/Pago.php +++ b/app/src/Service/Venta/Pago.php @@ -69,15 +69,12 @@ class Pago public function getById(int $pago_id): Model\Venta\Pago { $pago = $this->pagoRepository->fetchById($pago_id); - $pago->estados = $this->estadoPagoRepository->fetchByPago($pago_id); - $pago->currentEstado = $this->estadoPagoRepository->fetchCurrentByPago($pago_id); - if (($pago->uf === null or $pago->uf === 0.0) and $pago->fecha < new DateTimeImmutable()) { - $pago->uf = $this->moneyService->getUF($pago->fecha); - if ($pago->uf !== 0.0) { - $this->pagoRepository->edit($pago, ['uf' => $pago->uf]); - } - } - return $pago; + return $this->process($pago); + } + + public function getByVenta(int $venta_id): array + { + return array_map([$this, 'process'], $this->pagoRepository->fetchByVenta($venta_id)); } public function getPendientes(): array @@ -121,4 +118,17 @@ class Pago $pago->currentEstado = $estado; return $pago; } + + protected function process($pago): Model\Venta\Pago + { + $pago->estados = $this->estadoPagoRepository->fetchByPago($pago->id); + $pago->currentEstado = $this->estadoPagoRepository->fetchCurrentByPago($pago->id); + if (($pago->uf === null or $pago->uf === 0.0) and $pago->fecha < new DateTimeImmutable()) { + $pago->uf = $this->moneyService->getUF($pago->fecha); + if ($pago->uf !== 0.0) { + $this->pagoRepository->edit($pago, ['uf' => $pago->uf]); + } + } + return $pago; + } } diff --git a/docker-compose.yml b/docker-compose.yml index 88027bf..09ec208 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -41,6 +41,8 @@ services: volumes: - dbdata:/var/lib/mysql - ./incoviba.sql.gz:/docker-entrypoint-initdb.d/incoviba.sql.gz + ports: + - "33060:3306" networks: - default - adminer_network From 850a475ef6e989a60735244fbe29e7b7f1dd57b8 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Thu, 19 Oct 2023 18:58:48 -0300 Subject: [PATCH 019/163] Cuando no tiene resultados en cuotas, entregar vacio --- app/src/Controller/API/Ventas/Cuotas.php | 57 ++++++++++++++---------- 1 file changed, 33 insertions(+), 24 deletions(-) diff --git a/app/src/Controller/API/Ventas/Cuotas.php b/app/src/Controller/API/Ventas/Cuotas.php index 05df9df..f47b94e 100644 --- a/app/src/Controller/API/Ventas/Cuotas.php +++ b/app/src/Controller/API/Ventas/Cuotas.php @@ -3,6 +3,7 @@ namespace Incoviba\Controller\API\Ventas; use DateTimeImmutable; use DateInterval; +use Incoviba\Common\Implement\Exception\EmptyResult; use Incoviba\Controller\API\withJson; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; @@ -15,44 +16,52 @@ class Cuotas public function hoy(ServerRequestInterface $request, ResponseInterface $response, Repository\Venta\Cuota $cuotaRepository): ResponseInterface { $output = [ - 'cuotas' => count($cuotaRepository->fetchHoy()) ?? 0 + 'cuotas' => 0 ]; + try { + $output['cuotas'] = count($cuotaRepository->fetchHoy()); + } catch (EmptyResult) {} return $this->withJson($response, $output); } public function pendiente(ServerRequestInterface $request, ResponseInterface $response, Repository\Venta\Cuota $cuotaRepository): ResponseInterface { $output = [ - 'cuotas' => count($cuotaRepository->fetchPendientes()) ?? 0 + 'cuotas' => 0 ]; + try { + $output['cuotas'] = count($cuotaRepository->fetchPendientes()); + } catch (EmptyResult) {} return $this->withJson($response, $output); } public function porVencer(ServerRequestInterface $request, ResponseInterface $response, Repository\Venta\Cuota $cuotaRepository, Service\Format $formatService): ResponseInterface { - $cuotas = $cuotaRepository->fetchDatosPorVencer(); $output = []; - foreach ($cuotas as $row) { - $fecha = $row['Fecha']; - $date = new DateTimeImmutable($fecha); - if (($weekday = $date->format('N')) > 5) { - $day_diff = 7 - $weekday + 1; - $date = $date->add(new DateInterval("P{$day_diff}D")); - $fecha = $date->format('Y-m-d'); + try { + $cuotas = $cuotaRepository->fetchDatosPorVencer(); + foreach ($cuotas as $row) { + $fecha = $row['Fecha']; + $date = new DateTimeImmutable($fecha); + if (($weekday = $date->format('N')) > 5) { + $day_diff = 7 - $weekday + 1; + $date = $date->add(new DateInterval("P{$day_diff}D")); + $fecha = $date->format('Y-m-d'); + } + $key = $formatService->localDate($fecha, "EEE. dd 'de' MMMM 'de' yyyy", true); + if (!isset($output[$key])) { + $output[$key] = []; + } + if (!isset($output[$key][$row['Proyecto']])) { + $output[$key][$row['Proyecto']] = 0; + } + $output[$key][$row['Proyecto']] += $row['Cantidad']; } - $key = $formatService->localDate($fecha, "EEE. dd 'de' MMMM 'de' yyyy", true); - if (!isset($output[$key])) { - $output[$key] = []; + foreach ($output as $key => $day) { + uksort($day, function($a, $b) { + return strcmp($a, $b); + }); + $output[$key] = $day; } - if (!isset($output[$key][$row['Proyecto']])) { - $output[$key][$row['Proyecto']] = 0; - } - $output[$key][$row['Proyecto']] += $row['Cantidad']; - } - foreach ($output as $key => $day) { - uksort($day, function($a, $b) { - return strcmp($a, $b); - }); - $output[$key] = $day; - } + } catch (EmptyResult) {} return $this->withJson($response, ['cuotas' => $output]); } } From ada0434caff6edc3ba104493c7274bcfd92af39c Mon Sep 17 00:00:00 2001 From: Aldarien Date: Thu, 19 Oct 2023 19:10:08 -0300 Subject: [PATCH 020/163] Error log cuotas --- app/src/Controller/API/Ventas/Cuotas.php | 6 ++++++ php-errors.ini | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/Controller/API/Ventas/Cuotas.php b/app/src/Controller/API/Ventas/Cuotas.php index f47b94e..25a8545 100644 --- a/app/src/Controller/API/Ventas/Cuotas.php +++ b/app/src/Controller/API/Ventas/Cuotas.php @@ -37,7 +37,11 @@ class Cuotas { $output = []; try { + $benchmark = [ + 'start' => microtime(true) + ]; $cuotas = $cuotaRepository->fetchDatosPorVencer(); + $benchmark['cuotas'] = microtime(true) - $benchmark['start']; foreach ($cuotas as $row) { $fecha = $row['Fecha']; $date = new DateTimeImmutable($fecha); @@ -61,6 +65,8 @@ class Cuotas }); $output[$key] = $day; } + $benchmark['run'] = microtime(true) - $benchmark['start']; + error_log(var_export($benchmark,true)); } catch (EmptyResult) {} return $this->withJson($response, ['cuotas' => $output]); } diff --git a/php-errors.ini b/php-errors.ini index c791df7..aed1ffb 100644 --- a/php-errors.ini +++ b/php-errors.ini @@ -1,3 +1,3 @@ display_errors=no log_errors=yes -error_log=/logs/php_errors.log +error_log=/logs/errors.log From 742c0327c28465c5ada2db7a11651a652c42367b Mon Sep 17 00:00:00 2001 From: Aldarien Date: Thu, 19 Oct 2023 19:39:27 -0300 Subject: [PATCH 021/163] Improving cuotas por vencer --- app/src/Repository/Venta/Cuota.php | 51 +++++++++++++++++++++--------- 1 file changed, 36 insertions(+), 15 deletions(-) diff --git a/app/src/Repository/Venta/Cuota.php b/app/src/Repository/Venta/Cuota.php index b9d87ab..9e3de82 100644 --- a/app/src/Repository/Venta/Cuota.php +++ b/app/src/Repository/Venta/Cuota.php @@ -138,22 +138,43 @@ ORDER BY `pago`.`fecha` DESC"; } public function fetchDatosPorVencer(): array { - $query = "SELECT `pago`.`fecha` AS 'Fecha', `proyecto`.`descripcion` AS 'Proyecto', COUNT(a.`id`) AS 'Cantidad' + $query = "SELECT p1.`fecha` AS 'Fecha', v1.`descripcion` AS 'Proyecto', COUNT(a.`id`) AS 'Cantidad' FROM `{$this->getTable()}` a - JOIN `pago` ON `pago`.`id` = a.`pago` - JOIN (SELECT e1.* FROM `estado_pago` e1 JOIN (SELECT MAX(`id`) AS 'id', `pago` FROM `estado_pago` GROUP BY `pago`) e0 ON e0.`id` = e1.`id`) ep ON ep.`pago` = `pago`.`id` - JOIN `tipo_estado_pago` tep ON tep.`id` = ep.`estado` - JOIN `venta` ON `venta`.`pie` = a.`pie` - JOIN (SELECT ev1.* FROM `estado_venta` ev1 JOIN (SELECT MAX(`id`) AS 'id', `venta` FROM `estado_venta` GROUP BY `venta`) ev0 ON ev0.`id` = ev1.`id`) ev ON ev.`venta` = `venta`.`id` - JOIN `tipo_estado_venta` tev ON tev.`id` = ev.`estado` - JOIN `propiedad_unidad` pu ON pu.`propiedad` = `venta`.`propiedad` AND pu.`principal` = 1 - JOIN `unidad` ON `unidad`.`id` = pu.`unidad` - JOIN `proyecto_tipo_unidad` ptu ON ptu.`id` = `unidad`.`pt` - JOIN `proyecto` ON `proyecto`.`id` = ptu.`proyecto` -WHERE tep.`descripcion` = 'no pagado' AND `pago`.`fecha` BETWEEN DATE_ADD(CURDATE(), INTERVAL 1 DAY) AND DATE_ADD(CURDATE(), INTERVAL 1 MONTH) - AND tev.`descripcion` IN ('vigente', 'escriturando', 'firmado por inmobiliaria') -GROUP BY `pago`.`fecha`, `proyecto`.`descripcion` -ORDER BY `pago`.`fecha`, `proyecto`.`descripcion`"; + JOIN ( + SELECT `pago`.`id`, `pago`.`fecha` + FROM `pago` + JOIN ( + SELECT e1.* + FROM `estado_pago` e1 + JOIN ( + SELECT MAX(`id`) AS 'id', `pago` + FROM `estado_pago` + GROUP BY `pago` + ) e0 ON e0.`id` = e1.`id` + ) ep ON ep.`pago` = `pago`.`id` + JOIN `tipo_estado_pago` tep ON tep.`id` = ep.`estado` AND tep.`descripcion` = 'no pagado' + ) p1 ON p1.id = a.`pago` + JOIN ( + SELECT `venta`.`pie`, `venta`.`propiedad`, `proyecto`.`descripcion` + FROM `venta` + JOIN ( + SELECT ev1.* + FROM `estado_venta` ev1 + JOIN ( + SELECT MAX(`id`) AS 'id', `venta` + FROM `estado_venta` + GROUP BY `venta` + ) ev0 ON ev0.`id` = ev1.`id` + ) ev ON ev.`venta` = `venta`.`id` + JOIN `tipo_estado_venta` tev ON tev.`id` = ev.`estado` AND tev.`descripcion` IN ('vigente', 'escriturando', 'firmado por inmobiliaria') + JOIN `propiedad_unidad` pu ON pu.`propiedad` = `venta`.`propiedad` AND pu.`principal` = 1 + JOIN `unidad` ON `unidad`.`id` = pu.`unidad` + JOIN `proyecto_tipo_unidad` ptu ON ptu.`id` = `unidad`.`pt` + JOIN `proyecto` ON `proyecto`.`id` = ptu.`proyecto` + ) v1 ON v1.`pie` = a.`pie` +WHERE p1.`fecha` BETWEEN DATE_ADD(CURDATE(), INTERVAL 1 DAY) AND DATE_ADD(CURDATE(), INTERVAL 1 MONTH) +GROUP BY p1.`fecha`, v1.`descripcion` +ORDER BY p1.`fecha`, v1.`descripcion`"; return $this->fetchAsArray($query); } public function fetchVigenteByPie(int $pie_id): array From dc217d876a91c51fdf687502781bb536bb9610e0 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Thu, 19 Oct 2023 20:46:52 -0300 Subject: [PATCH 022/163] Redis service --- app/common/Implement/Exception/EmptyRedis.php | 15 +++ app/composer.json | 1 + app/setup/setups/services.php | 7 ++ app/src/Controller/API/Ventas.php | 90 +++++++++------ app/src/Controller/API/Ventas/Cuotas.php | 103 +++++++++++------- app/src/Controller/API/Ventas/Unidades.php | 52 +++++---- app/src/Controller/API/withJson.php | 2 +- app/src/Controller/API/withRedis.php | 24 ++++ app/src/Service/Redis.php | 18 +++ docker-compose.yml | 13 +++ 10 files changed, 228 insertions(+), 97 deletions(-) create mode 100644 app/common/Implement/Exception/EmptyRedis.php create mode 100644 app/src/Controller/API/withRedis.php create mode 100644 app/src/Service/Redis.php diff --git a/app/common/Implement/Exception/EmptyRedis.php b/app/common/Implement/Exception/EmptyRedis.php new file mode 100644 index 0000000..cc6ac45 --- /dev/null +++ b/app/common/Implement/Exception/EmptyRedis.php @@ -0,0 +1,15 @@ +register('uf', $mindicador) ->register('ipc', $mindicador); }, + Predis\Client::class => function(ContainerInterface $container) { + return new Predis\Client([ + 'scheme' => 'tcp', + 'host' => $container->get('REDIS_HOST'), + 'port' => $container->get('REDIS_PORT') + ]); + } ]; diff --git a/app/src/Controller/API/Ventas.php b/app/src/Controller/API/Ventas.php index bdfc853..87deea0 100644 --- a/app/src/Controller/API/Ventas.php +++ b/app/src/Controller/API/Ventas.php @@ -1,6 +1,8 @@ withJson($response, $output); } - public function porFirmar(ServerRequestInterface $request, ResponseInterface $response, Service\Venta $ventaService): ResponseInterface + public function porFirmar(ServerRequestInterface $request, ResponseInterface $response, Service\Venta $ventaService, Service\Redis $redisService): ResponseInterface { $body = $request->getBody(); $json = json_decode($body->getContents()); $proyecto_id = $json->proyecto_id; + $today = new DateTimeImmutable(); + $redisKey = "promesas_por_firmar-{$proyecto_id}-{$today->format('Y-m-d')}"; + $output = [ 'proyecto_id' => $proyecto_id, 'promesas' => 0 ]; try { - $ventas = $ventaService->getByProyecto($proyecto_id); - $promesas = array_filter($ventas, function(Model\Venta $venta) { - return $venta->currentEstado()->tipoEstadoVenta->descripcion === 'vigente'; - }); - $output['promesas'] = count($promesas); - } catch (EmptyResult) {} + $output = $this->fetchRedis($redisService, $redisKey); + } catch (EmptyRedis) { + try { + $ventas = $ventaService->getByProyecto($proyecto_id); + $promesas = array_filter($ventas, function(Model\Venta $venta) { + return $venta->currentEstado()->tipoEstadoVenta->descripcion === 'vigente'; + }); + $output['promesas'] = count($promesas); + $this->saveRedis($redisService, $redisKey, $output); + } catch (EmptyResult) {} + } return $this->withJson($response, $output); } - public function escrituras(ServerRequestInterface $request, ResponseInterface $response, Service\Venta $ventaService, Service\Venta\Pago $pagoService): ResponseInterface + public function escrituras(ServerRequestInterface $request, ResponseInterface $response, Service\Venta $ventaService, Service\Venta\Pago $pagoService, Service\Redis $redisService): ResponseInterface { $body = $request->getBody(); $json = json_decode($body->getContents()); $proyecto_id = $json->proyecto_id; + $today = new DateTimeImmutable(); + $redisKey = "escrituras-{$proyecto_id}-{$today->format('Y-m-d')}"; + $output = [ 'proyecto_id' => $proyecto_id, 'escrituras' => [ @@ -78,35 +91,40 @@ class Ventas ] ]; try { - $ventas = $ventaService->getEscriturasByProyecto($proyecto_id); - $porFirmar = array_filter($ventas, function(Model\Venta $venta) { - return $venta->currentEstado()->tipoEstadoVenta->descripcion === 'escriturando'; - }); - $output['escrituras']['firmar'] = count($porFirmar); - unset($porFirmar); - $escrituras = array_filter($ventas, function(Model\Venta $venta) { - return $venta->currentEstado()->tipoEstadoVenta->descripcion === 'firmado por inmobiliaria'; - }); - unset($ventas); - $porPagar = array_filter($escrituras, function(Model\Venta $venta) use ($pagoService) { - $pagos = $pagoService->getByVenta($venta->id); - $porPagar = array_filter($pagos, function(Model\Venta\Pago $pago) { - return $pago->currentEstado->tipoEstadoPago->descripcion === 'no pagado'; + $output = $this->fetchRedis($redisService, $redisKey); + } catch (EmptyRedis) { + try { + $ventas = $ventaService->getEscriturasByProyecto($proyecto_id); + $porFirmar = array_filter($ventas, function(Model\Venta $venta) { + return $venta->currentEstado()->tipoEstadoVenta->descripcion === 'escriturando'; }); - return count($porPagar) > 0; - }); - $output['escrituras']['pagar'] = count($porPagar); - unset($porPagar); - $porAbonar = array_filter($escrituras, function(Model\Venta $venta) use ($pagoService) { - $pagos = $pagoService->getByVenta($venta->id); - $porPagar = array_filter($pagos, function(Model\Venta\Pago $pago) { - return $pago->currentEstado->tipoEstadoPago->descripcion === 'depositado'; + $output['escrituras']['firmar'] = count($porFirmar); + unset($porFirmar); + $escrituras = array_filter($ventas, function(Model\Venta $venta) { + return $venta->currentEstado()->tipoEstadoVenta->descripcion === 'firmado por inmobiliaria'; }); - return count($porPagar) > 0; - }); - $output['escrituras']['abonar'] = count($porAbonar); - unset($porAbonar); - } catch (EmptyResult) {} + unset($ventas); + $porPagar = array_filter($escrituras, function(Model\Venta $venta) use ($pagoService) { + $pagos = $pagoService->getByVenta($venta->id); + $porPagar = array_filter($pagos, function(Model\Venta\Pago $pago) { + return $pago->currentEstado->tipoEstadoPago->descripcion === 'no pagado'; + }); + return count($porPagar) > 0; + }); + $output['escrituras']['pagar'] = count($porPagar); + unset($porPagar); + $porAbonar = array_filter($escrituras, function(Model\Venta $venta) use ($pagoService) { + $pagos = $pagoService->getByVenta($venta->id); + $porPagar = array_filter($pagos, function(Model\Venta\Pago $pago) { + return $pago->currentEstado->tipoEstadoPago->descripcion === 'depositado'; + }); + return count($porPagar) > 0; + }); + $output['escrituras']['abonar'] = count($porAbonar); + unset($porAbonar); + $this->saveRedis($redisService, $redisKey, $output); + } catch (EmptyResult) {} + } return $this->withJson($response, $output); } public function comentarios(ServerRequestInterface $request, ResponseInterface $response, Service\Venta $service, Repository\Venta\Comentario $comentarioRepository, int $venta_id): ResponseInterface diff --git a/app/src/Controller/API/Ventas/Cuotas.php b/app/src/Controller/API/Ventas/Cuotas.php index 25a8545..32e8da5 100644 --- a/app/src/Controller/API/Ventas/Cuotas.php +++ b/app/src/Controller/API/Ventas/Cuotas.php @@ -3,71 +3,94 @@ namespace Incoviba\Controller\API\Ventas; use DateTimeImmutable; use DateInterval; -use Incoviba\Common\Implement\Exception\EmptyResult; -use Incoviba\Controller\API\withJson; +use Incoviba\Controller\API\withRedis; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; +use Incoviba\Common\Implement\Exception\EmptyRedis; +use Incoviba\Common\Implement\Exception\EmptyResult; +use Incoviba\Controller\API\withJson; use Incoviba\Repository; use Incoviba\Service; class Cuotas { - use withJson; - public function hoy(ServerRequestInterface $request, ResponseInterface $response, Repository\Venta\Cuota $cuotaRepository): ResponseInterface + use withJson, withRedis; + public function hoy(ServerRequestInterface $request, ResponseInterface $response, Repository\Venta\Cuota $cuotaRepository, Service\Redis $redisService): ResponseInterface { + $today = new DateTimeImmutable(); + $redisKey = "cuotas_hoy-{$today->format('Y-m-d')}"; $output = [ 'cuotas' => 0 ]; try { - $output['cuotas'] = count($cuotaRepository->fetchHoy()); - } catch (EmptyResult) {} + $output['cuotas'] = $this->fetchRedis($redisService, $redisKey); + } catch (EmptyRedis) { + try { + $output['cuotas'] = count($cuotaRepository->fetchHoy()); + $this->saveRedis($redisService, $redisKey, $output['cuotas']); + } catch (EmptyResult) {} + } return $this->withJson($response, $output); } - public function pendiente(ServerRequestInterface $request, ResponseInterface $response, Repository\Venta\Cuota $cuotaRepository): ResponseInterface + public function pendiente(ServerRequestInterface $request, ResponseInterface $response, Repository\Venta\Cuota $cuotaRepository, Service\Redis $redisService): ResponseInterface { + $today = new DateTimeImmutable(); + $redisKey = "cuotas_pendientes-{$today->format('Y-m-d')}"; $output = [ 'cuotas' => 0 ]; try { - $output['cuotas'] = count($cuotaRepository->fetchPendientes()); - } catch (EmptyResult) {} + $output['cuotas'] = $this->fetchRedis($redisService, $redisKey); + } catch (EmptyRedis) { + try { + $output['cuotas'] = count($cuotaRepository->fetchPendientes()); + $this->saveRedis($redisService, $redisKey, $output['cuotas']); + } catch (EmptyResult) {} + } return $this->withJson($response, $output); } - public function porVencer(ServerRequestInterface $request, ResponseInterface $response, Repository\Venta\Cuota $cuotaRepository, Service\Format $formatService): ResponseInterface + public function porVencer(ServerRequestInterface $request, ResponseInterface $response, Repository\Venta\Cuota $cuotaRepository, Service\Redis $redisService, Service\Format $formatService): ResponseInterface { - $output = []; + $today = new DateTimeImmutable(); + $redisKey = "cuotas_por_vencer-{$today->format('Y-m-d')}"; try { - $benchmark = [ - 'start' => microtime(true) - ]; - $cuotas = $cuotaRepository->fetchDatosPorVencer(); - $benchmark['cuotas'] = microtime(true) - $benchmark['start']; - foreach ($cuotas as $row) { - $fecha = $row['Fecha']; - $date = new DateTimeImmutable($fecha); - if (($weekday = $date->format('N')) > 5) { - $day_diff = 7 - $weekday + 1; - $date = $date->add(new DateInterval("P{$day_diff}D")); - $fecha = $date->format('Y-m-d'); + $output = $this->fetchRedis($redisService, $redisKey); + } catch (EmptyRedis) { + $output = []; + try { + $benchmark = [ + 'start' => microtime(true) + ]; + $cuotas = $cuotaRepository->fetchDatosPorVencer(); + $benchmark['cuotas'] = microtime(true) - $benchmark['start']; + foreach ($cuotas as $row) { + $fecha = $row['Fecha']; + $date = new DateTimeImmutable($fecha); + if (($weekday = $date->format('N')) > 5) { + $day_diff = 7 - $weekday + 1; + $date = $date->add(new DateInterval("P{$day_diff}D")); + $fecha = $date->format('Y-m-d'); + } + $key = $formatService->localDate($fecha, "EEE. dd 'de' MMMM 'de' yyyy", true); + if (!isset($output[$key])) { + $output[$key] = []; + } + if (!isset($output[$key][$row['Proyecto']])) { + $output[$key][$row['Proyecto']] = 0; + } + $output[$key][$row['Proyecto']] += $row['Cantidad']; } - $key = $formatService->localDate($fecha, "EEE. dd 'de' MMMM 'de' yyyy", true); - if (!isset($output[$key])) { - $output[$key] = []; + foreach ($output as $key => $day) { + uksort($day, function($a, $b) { + return strcmp($a, $b); + }); + $output[$key] = $day; } - if (!isset($output[$key][$row['Proyecto']])) { - $output[$key][$row['Proyecto']] = 0; - } - $output[$key][$row['Proyecto']] += $row['Cantidad']; - } - foreach ($output as $key => $day) { - uksort($day, function($a, $b) { - return strcmp($a, $b); - }); - $output[$key] = $day; - } - $benchmark['run'] = microtime(true) - $benchmark['start']; - error_log(var_export($benchmark,true)); - } catch (EmptyResult) {} + $benchmark['run'] = microtime(true) - $benchmark['start']; + error_log(var_export($benchmark,true)); + $this->saveRedis($redisService, $redisKey, $output); + } catch (EmptyResult) {} + } return $this->withJson($response, ['cuotas' => $output]); } } diff --git a/app/src/Controller/API/Ventas/Unidades.php b/app/src/Controller/API/Ventas/Unidades.php index f04deeb..398f3af 100644 --- a/app/src/Controller/API/Ventas/Unidades.php +++ b/app/src/Controller/API/Ventas/Unidades.php @@ -1,22 +1,29 @@ getBody(); $json = json_decode($body->getContents()); $proyecto_id = $json->proyecto_id; + $today = new DateTimeImmutable(); + $redisKey = "unidades_disponibles-{$proyecto_id}-{$today->format('Y-m-d')}"; + $output = [ 'proyecto_id' => $proyecto_id, 'unidades' => [ @@ -31,26 +38,31 @@ class Unidades ] ]; try { - $totalUnidades = $unidadRepository->fetchByProyecto($proyecto_id); - $unidades = $unidadRepository->fetchDisponiblesByProyecto($proyecto_id); + $output = $this->fetchRedis($redisService, $redisKey); + } catch (EmptyRedis) { + try { + $totalUnidades = $unidadRepository->fetchByProyecto($proyecto_id); + $unidades = $unidadRepository->fetchDisponiblesByProyecto($proyecto_id); - $tiposUnidades = $tipoUnidadRepository->fetchAll(); - foreach ($tiposUnidades as $tipoUnidad) { - $tempUnidades = array_filter($totalUnidades, function(Model\Venta\Unidad $unidad) use ($tipoUnidad) { - return $unidad->proyectoTipoUnidad->tipoUnidad->id === $tipoUnidad->id; - }); - if (count($tempUnidades) > 0) { - $output['unidades']['total']["{$tipoUnidad->descripcion}s"] = count($tempUnidades); + $tiposUnidades = $tipoUnidadRepository->fetchAll(); + foreach ($tiposUnidades as $tipoUnidad) { + $tempUnidades = array_filter($totalUnidades, function(Model\Venta\Unidad $unidad) use ($tipoUnidad) { + return $unidad->proyectoTipoUnidad->tipoUnidad->id === $tipoUnidad->id; + }); + if (count($tempUnidades) > 0) { + $output['unidades']['total']["{$tipoUnidad->descripcion}s"] = count($tempUnidades); + } + $tempUnidades = array_filter($unidades, function(Model\Venta\Unidad $unidad) use ($tipoUnidad) { + return $unidad->proyectoTipoUnidad->tipoUnidad->id === $tipoUnidad->id; + }); + if (count($tempUnidades) === 0) { + continue; + } + $output['unidades']["{$tipoUnidad->descripcion}s"] = count($tempUnidades); } - $tempUnidades = array_filter($unidades, function(Model\Venta\Unidad $unidad) use ($tipoUnidad) { - return $unidad->proyectoTipoUnidad->tipoUnidad->id === $tipoUnidad->id; - }); - if (count($tempUnidades) === 0) { - continue; - } - $output['unidades']["{$tipoUnidad->descripcion}s"] = count($tempUnidades); - } - } catch (EmptyResult) {} + $this->saveRedis($redisService, $redisKey, $output); + } catch (EmptyResult) {} + } return $this->withJson($response, $output); } } diff --git a/app/src/Controller/API/withJson.php b/app/src/Controller/API/withJson.php index 78aa191..1a6e2f4 100644 --- a/app/src/Controller/API/withJson.php +++ b/app/src/Controller/API/withJson.php @@ -5,7 +5,7 @@ use Psr\Http\Message\ResponseInterface; trait withJson { - public function withJson(ResponseInterface $response, array $data = []): ResponseInterface + public function withJson(ResponseInterface $response, array|object $data = []): ResponseInterface { $response->getBody()->write(json_encode($data)); return $response->withHeader('Content-Type', 'application/json'); diff --git a/app/src/Controller/API/withRedis.php b/app/src/Controller/API/withRedis.php new file mode 100644 index 0000000..0913c11 --- /dev/null +++ b/app/src/Controller/API/withRedis.php @@ -0,0 +1,24 @@ +get($redisKey); + if ($jsonString === null) { + throw new EmptyRedis($redisKey); + } + return json_decode($jsonString); + } + public function saveRedis(Service\Redis $redisService, string $redisKey, mixed $value): void + { + if (is_array($value) or is_object($value)) { + $value = json_encode($value); + } + $redisService->set($redisKey, $value); + } +} diff --git a/app/src/Service/Redis.php b/app/src/Service/Redis.php new file mode 100644 index 0000000..5a9845a --- /dev/null +++ b/app/src/Service/Redis.php @@ -0,0 +1,18 @@ +client->get($name); + } + public function set(string $name, mixed $value): void + { + $this->client->set($name, $value); + } +} diff --git a/docker-compose.yml b/docker-compose.yml index 09ec208..3e628b8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -47,6 +47,18 @@ services: - default - adminer_network + redis: + profiles: + - cache + image: redis + container_name: incoviba_redis + <<: *restart + env_file: ${APP_PATH:-.}/.redis.env + volumes: + - incoviba_redis:/data + ports: + - "63790:6379" + python: profiles: - python @@ -74,6 +86,7 @@ services: volumes: dbdata: {} + incoviba_redis: {} networks: adminer_network: {} From e536f0f8f31808e6b46c23b56d8a3c67effdee6d Mon Sep 17 00:00:00 2001 From: Aldarien Date: Thu, 19 Oct 2023 21:49:57 -0300 Subject: [PATCH 023/163] Redis expiration 1 day --- app/src/Service/Redis.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/Service/Redis.php b/app/src/Service/Redis.php index 5a9845a..1d7f050 100644 --- a/app/src/Service/Redis.php +++ b/app/src/Service/Redis.php @@ -2,6 +2,7 @@ namespace Incoviba\Service; use Predis\Client; +use Incoviba\Common\Implement\Exception\EmptyRedis; class Redis { @@ -9,10 +10,13 @@ class Redis public function get(string $name): mixed { + if (!$this->client->exists($name)) { + throw new EmptyRedis($name); + } return $this->client->get($name); } public function set(string $name, mixed $value): void { - $this->client->set($name, $value); + $this->client->set($name, $value, 'EX', 60 * 60 * 24); } } From 54ac535a49bfc5b48de8fcff1ddb7227e51d134c Mon Sep 17 00:00:00 2001 From: Aldarien Date: Thu, 19 Oct 2023 22:01:00 -0300 Subject: [PATCH 024/163] Remove benchmark --- app/src/Controller/API/Ventas/Cuotas.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app/src/Controller/API/Ventas/Cuotas.php b/app/src/Controller/API/Ventas/Cuotas.php index 32e8da5..9e4bd87 100644 --- a/app/src/Controller/API/Ventas/Cuotas.php +++ b/app/src/Controller/API/Ventas/Cuotas.php @@ -58,11 +58,7 @@ class Cuotas } catch (EmptyRedis) { $output = []; try { - $benchmark = [ - 'start' => microtime(true) - ]; $cuotas = $cuotaRepository->fetchDatosPorVencer(); - $benchmark['cuotas'] = microtime(true) - $benchmark['start']; foreach ($cuotas as $row) { $fecha = $row['Fecha']; $date = new DateTimeImmutable($fecha); @@ -86,8 +82,6 @@ class Cuotas }); $output[$key] = $day; } - $benchmark['run'] = microtime(true) - $benchmark['start']; - error_log(var_export($benchmark,true)); $this->saveRedis($redisService, $redisKey, $output); } catch (EmptyResult) {} } From 4734417fe297905957d55184a2e6e8ed288f0853 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Thu, 19 Oct 2023 22:43:21 -0300 Subject: [PATCH 025/163] Estado Recepcion Final en Proyecto --- app/resources/routes/api/proyectos.php | 1 + app/resources/views/proyectos/list.blade.php | 114 ++++++++---------- .../API/Proyectos/EstadosProyectos.php | 13 ++ app/src/Repository/Proyecto.php | 2 +- .../Repository/Proyecto/EstadoProyecto.php | 8 ++ 5 files changed, 75 insertions(+), 63 deletions(-) diff --git a/app/resources/routes/api/proyectos.php b/app/resources/routes/api/proyectos.php index 5216427..784b0d1 100644 --- a/app/resources/routes/api/proyectos.php +++ b/app/resources/routes/api/proyectos.php @@ -9,4 +9,5 @@ $app->group('/proyecto/{proyecto_id}', function($app) { $app->get('/estados[/]', [Proyectos\EstadosProyectos::class, 'byProyecto']); $app->get('/estado[/]', [Proyectos\EstadosProyectos::class, 'currentByProyecto']); $app->get('/inicio[/]', [Proyectos\EstadosProyectos::class, 'firstByProyecto']); + $app->get('/recepcion[/]', [Proyectos\EstadosProyectos::class, 'recepcionByProyecto']); }); diff --git a/app/resources/views/proyectos/list.blade.php b/app/resources/views/proyectos/list.blade.php index f0dc90d..3dbdb83 100644 --- a/app/resources/views/proyectos/list.blade.php +++ b/app/resources/views/proyectos/list.blade.php @@ -11,6 +11,7 @@ Etapa Estado Tiempo Total + Tiempo RF @@ -21,6 +22,7 @@ + @endforeach @@ -38,7 +40,8 @@ this.id = id this.estados = { start: null, - current: null + current: null, + recepcion: null } } get() { @@ -60,6 +63,21 @@ }).then(data => { this.estados.current = data.estado }) + }, + recepcion: () => { + return fetch('{{$urls->api}}/proyecto/' + this.id + '/recepcion').then(response => { + if (response.ok) { + if (response.status === 204) { + return null + } + return response.json() + } + }).then(data => { + if (data === null) { + return + } + this.estados.recepcion = data.estado + }) } } } @@ -87,10 +105,10 @@ if (diff >= 30) { diff /= 30 frame = 'meses' - } - if (diff >= 12) { - diff /= 12 - frame = 'años' + if (diff >= 12) { + diff /= 12 + frame = 'años' + } } if (diff > 0) { estado += ' (hace ' + Math.floor(diff) + ' ' + frame + ')' @@ -111,83 +129,55 @@ if (diff >= 30) { diff /= 30 frame = 'meses' - } - if (diff >= 12) { - diff /= 12 - frame = 'años' + if (diff >= 12) { + diff /= 12 + frame = 'años' + } } - row.find('.tiempo').html('Hace ' + Math.floor(diff) + ' ' + frame) + row.find('.tiempo').html(Math.floor(diff) + ' ' + frame) + }, + recepcion: () => { + if (this.estados.recepcion === null) { + return + } + let diff = (today - new Date(this.estados.recepcion.fecha.date)) / (1000 * 60 * 60 * 24) + if (isNaN(diff) || diff === 0) { + return + } + + let frame = 'dias' + if (diff >= 30) { + diff /= 30 + frame = 'meses' + if (diff >= 12) { + diff /= 12 + frame = 'años' + } + } + + row.find('.recepcion').html(Math.floor(diff) + ' ' + frame) } } } } - function showTiempo(proyecto_id, tiempo) { - if (tiempo.trim() === '') { - return - } - const row = $(".proyecto[data-id='" + proyecto_id + "']") - row.find('.tiempo').html(tiempo) - } - function getEstados(proyecto_id) { - return fetch('{{$urls->api}}/proyecto/' + proyecto_id + '/estados').then(response => { - if (response.ok) { - return response.json() - } - }).then(data => { - let tiempo = 0 - const current = new Date(data.estados.at(-1).fecha.date) - const start = new Date(data.estados[0].fecha.date) - tiempo = (current - start) / (1000 * 60 * 60 * 24) - if (isNaN(tiempo) || tiempo === 0) { - return - } - let frame = 'días' - if (tiempo > 30) { - tiempo /= 30 - frame = 'meses' - } - if (tiempo > 12) { - tiempo /= 12 - frame = 'años' - } - showTiempo(data.proyecto_id, 'Hace ' + Math.ceil(tiempo) + ' ' + frame) - }) - } - function showEtapa(proyecto_id, etapa) { - const row = $(".proyecto[data-id='" + proyecto_id + "']") - row.find('.etapa').html(etapa) - } - function showEstado(proyecto_id, estado) { - const row = $(".proyecto[data-id='" + proyecto_id + "']") - row.find('.estado').html(estado) - } - function getEstado(proyecto_id) { - return fetch('{{$urls->api}}/proyecto/' + proyecto_id + '/estado').then(response => { - if (response.ok) { - return response.json() - } - }).then(data => { - showEtapa(data.proyecto_id, data.estado.tipo_estado_proyecto.etapa.descripcion) - showEstado(data.proyecto_id, data.estado.tipo_estado_proyecto.descripcion) - }) - } + function loadEstados(proyecto_id) { const proyecto = new Proyecto(proyecto_id) const promises = [] promises.push(proyecto.get().start()) promises.push(proyecto.get().current()) + promises.push(proyecto.get().recepcion()) Promise.all(promises).then(() => { proyecto.show().etapa() proyecto.show().current() proyecto.show().tiempo() + proyecto.show().recepcion() }) } $(document).ready(() => { @foreach ($proyectos as $proyecto) loadEstados('{{$proyecto->id}}') - /*getEstado('{{$proyecto->id}}') - getEstados('{{$proyecto->id}}')*/ @endforeach }) diff --git a/app/src/Controller/API/Proyectos/EstadosProyectos.php b/app/src/Controller/API/Proyectos/EstadosProyectos.php index bc03d06..9fc451f 100644 --- a/app/src/Controller/API/Proyectos/EstadosProyectos.php +++ b/app/src/Controller/API/Proyectos/EstadosProyectos.php @@ -50,4 +50,17 @@ class EstadosProyectos } return $this->withJson($response, $output); } + public function recepcionByProyecto(ServerRequestInterface $request, ResponseInterface $response, Repository\Proyecto\EstadoProyecto $estadoProyectoRepository, int $proyecto_id): ResponseInterface + { + $output = [ + 'proyecto_id' => $proyecto_id, + 'estado' => null + ]; + try { + $output['estado'] = $estadoProyectoRepository->fetchRecepcionByProyecto($proyecto_id); + } catch (EmptyResult) { + return $this->emptyBody($response); + } + return $this->withJson($response, $output); + } } diff --git a/app/src/Repository/Proyecto.php b/app/src/Repository/Proyecto.php index 924d62b..21b1c7e 100644 --- a/app/src/Repository/Proyecto.php +++ b/app/src/Repository/Proyecto.php @@ -102,7 +102,7 @@ ORDER BY a.`descripcion`"; SELECT MAX(e1.`id`) AS 'id', e1.`proyecto` FROM `estado_proyecto` e1 JOIN ( - SELECT MAX(`id`) AS 'id', `proyecto`, `fecha` + SELECT `id`, `proyecto`, MAX(`fecha`) as 'fecha' FROM `estado_proyecto` GROUP BY `proyecto`, `fecha` ) e0 ON e1.`id` = e0.`id` diff --git a/app/src/Repository/Proyecto/EstadoProyecto.php b/app/src/Repository/Proyecto/EstadoProyecto.php index b27a0ca..ff6ece5 100644 --- a/app/src/Repository/Proyecto/EstadoProyecto.php +++ b/app/src/Repository/Proyecto/EstadoProyecto.php @@ -70,4 +70,12 @@ FROM `{$this->getTable()}` a WHERE a.`proyecto` = ?"; return $this->fetchOne($query, [$proyecto_id]); } + public function fetchRecepcionByProyecto(int $proyecto_id): Model\Proyecto\EstadoProyecto + { + $query = "SELECT a.* +FROM `{$this->getTable()}` a + JOIN `tipo_estado_proyecto` tep ON tep.`id` = a.`estado` +WHERE a.`proyecto` = ? AND tep.`descripcion` = 'Recepción Final'"; + return $this->fetchOne($query, [$proyecto_id]); + } } From b4742a501e2fbf3d512af746748c91d5c1cbbe3b Mon Sep 17 00:00:00 2001 From: Aldarien Date: Fri, 20 Oct 2023 19:03:29 -0300 Subject: [PATCH 026/163] Show Proyecto --- app/resources/routes/03_proyectos.php | 3 + app/resources/routes/api/proyectos.php | 7 + app/resources/routes/api/ventas/precios.php | 2 +- app/resources/views/proyectos/list.blade.php | 6 +- app/resources/views/proyectos/show.blade.php | 470 +++++++++++++++++++ app/src/Controller/API/Proyectos.php | 96 +++- app/src/Controller/API/Ventas.php | 4 +- app/src/Controller/API/Ventas/Precios.php | 36 ++ app/src/Controller/API/Ventas/Unidades.php | 2 +- app/src/Controller/Proyectos.php | 8 +- app/src/Controller/Ventas/Precios.php | 21 - app/src/Model/Proyecto.php | 18 + app/src/Model/Proyecto/Superficie.php | 5 + app/src/Model/Venta/Propiedad.php | 6 +- app/src/Repository/Proyecto.php | 4 + app/src/Service/Redis.php | 4 +- 16 files changed, 644 insertions(+), 48 deletions(-) create mode 100644 app/resources/views/proyectos/show.blade.php create mode 100644 app/src/Controller/API/Ventas/Precios.php diff --git a/app/resources/routes/03_proyectos.php b/app/resources/routes/03_proyectos.php index 4f31a20..7c734ea 100644 --- a/app/resources/routes/03_proyectos.php +++ b/app/resources/routes/03_proyectos.php @@ -5,3 +5,6 @@ $app->group('/proyectos', function($app) { $app->get('/unidades[/]', [Proyectos::class, 'unidades']); $app->get('[/]', Proyectos::class); }); +$app->group('/proyecto/{proyecto_id}', function($app) { + $app->get('[/]', [Proyectos::class, 'show']); +}); diff --git a/app/resources/routes/api/proyectos.php b/app/resources/routes/api/proyectos.php index 784b0d1..3d8cca7 100644 --- a/app/resources/routes/api/proyectos.php +++ b/app/resources/routes/api/proyectos.php @@ -10,4 +10,11 @@ $app->group('/proyecto/{proyecto_id}', function($app) { $app->get('/estado[/]', [Proyectos\EstadosProyectos::class, 'currentByProyecto']); $app->get('/inicio[/]', [Proyectos\EstadosProyectos::class, 'firstByProyecto']); $app->get('/recepcion[/]', [Proyectos\EstadosProyectos::class, 'recepcionByProyecto']); + $app->group('/superficies', function($app) { + $app->get('/vendible[/]', [Proyectos::class, 'superficies']); + }); + $app->group('/unidades', function($app) { + $app->get('/disponibles[/]', [Proyectos::class, 'disponibles']); + $app->get('[/]', [Proyectos::class, 'unidades']); + }); }); diff --git a/app/resources/routes/api/ventas/precios.php b/app/resources/routes/api/ventas/precios.php index 2f04166..6546f48 100644 --- a/app/resources/routes/api/ventas/precios.php +++ b/app/resources/routes/api/ventas/precios.php @@ -1,5 +1,5 @@ group('/precios', function($app) { $app->post('[/]', [Precios::class, 'proyecto']); diff --git a/app/resources/views/proyectos/list.blade.php b/app/resources/views/proyectos/list.blade.php index 3dbdb83..98fd8c2 100644 --- a/app/resources/views/proyectos/list.blade.php +++ b/app/resources/views/proyectos/list.blade.php @@ -17,7 +17,11 @@ @foreach ($proyectos as $proyecto) - {{$proyecto->descripcion}} + + + {{$proyecto->descripcion}} + + {{$proyecto->inmobiliaria()->nombreCompleto()}} diff --git a/app/resources/views/proyectos/show.blade.php b/app/resources/views/proyectos/show.blade.php new file mode 100644 index 0000000..88986fd --- /dev/null +++ b/app/resources/views/proyectos/show.blade.php @@ -0,0 +1,470 @@ +@extends('layout.base') + +@section('page_title') + Proyecto {{$proyecto->descripcion}} +@endsection + +@section('page_content') +
    +

    + Proyecto {{$proyecto->descripcion}} - {{$proyecto->inmobiliaria()->razon}} +

    + @php + $today = new DateTimeImmutable(); + @endphp + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Dirección{{$proyecto->direccion()}}
    Inmobiliaria{{$proyecto->inmobiliaria()->nombreCompleto()}}
    Inicio + {{$proyecto->estados()[0]->tipoEstadoProyecto->descripcion}} + [{{$proyecto->estados()[0]->tipoEstadoProyecto->etapa->descripcion}}] + ({{$proyecto->estados()[0]->fecha->format('d-m-Y')}}) + ({{$today->diff($proyecto->estados()[0]->fecha)->format('%y años antes')}}) +
    Estado + {{$proyecto->currentEstado()->tipoEstadoProyecto->descripcion}} + [{{$proyecto->currentEstado()->tipoEstadoProyecto->etapa->descripcion}}] + ({{$proyecto->currentEstado()->fecha->format('d-m-Y')}}) + ({{$today->diff($proyecto->currentEstado()->fecha)->format('%y años antes')}}) + + + +
    Superficies + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + Total + + + + {{$format->number($proyecto->superficie->total(), 2)}}m² + +
    Bajo Nivel{{$format->number($proyecto->superficie->bajo_nivel, 2)}}m²
    Sobre Nivel{{$format->number($proyecto->superficie->sobre_nivel, 2)}}m²
    + + Vendible + + + +
    Vendido
    Por Vender
    +
    Unidades
    Ventas
    Stock
    Proyección
    +
    +@endsection + +@include('layout.body.scripts.chartjs') + +@push('page_scripts') + +@endpush diff --git a/app/src/Controller/API/Proyectos.php b/app/src/Controller/API/Proyectos.php index 5ed2152..2cf3608 100644 --- a/app/src/Controller/API/Proyectos.php +++ b/app/src/Controller/API/Proyectos.php @@ -3,13 +3,15 @@ namespace Incoviba\Controller\API; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; +use Incoviba\Common\Implement\Exception\EmptyRedis; use Incoviba\Common\Implement\Exception\EmptyResult; use Incoviba\Repository; use Incoviba\Model; +use Incoviba\Service; class Proyectos { - use withJson; + use withJson, withRedis; public function list(ServerRequestInterface $request, ResponseInterface $response, Repository\Proyecto $proyectoRepository): ResponseInterface { @@ -34,26 +36,88 @@ class Proyectos } catch (EmptyResult) {} return $this->withJson($response, $output); } - public function unidades(ServerRequestInterface $request, ResponseInterface $response, Repository\Venta\Unidad $unidadRepository, int $proyecto_id): ResponseInterface + public function unidades(ServerRequestInterface $request, ResponseInterface $response, + Repository\Venta\Unidad $unidadRepository, Service\Redis $redisService, + int $proyecto_id): ResponseInterface { $output = ['proyecto_id' => $proyecto_id, 'unidades' => [], 'total' => 0]; + $redisKey = "unidades-proyecto-{$proyecto_id}"; try { - $unidades = $unidadRepository->fetchDisponiblesByProyecto($proyecto_id); - $tipos = []; - foreach ($unidades as $unidad) { - if (!isset($tipos[$unidad->proyectoTipoUnidad->tipoUnidad->descripcion])) { - $tipos[$unidad->proyectoTipoUnidad->tipoUnidad->descripcion] = []; + $output = $this->fetchRedis($redisService, $redisKey); + } catch (EmptyRedis) { + try { + $unidades = $unidadRepository->fetchByProyecto($proyecto_id); + $tipos = []; + foreach ($unidades as $unidad) { + if (!isset($tipos[$unidad->proyectoTipoUnidad->tipoUnidad->descripcion])) { + $tipos[$unidad->proyectoTipoUnidad->tipoUnidad->descripcion] = []; + } + $tipos[$unidad->proyectoTipoUnidad->tipoUnidad->descripcion] []= $unidad; } - $tipos[$unidad->proyectoTipoUnidad->tipoUnidad->descripcion] []= $unidad; - } - foreach ($tipos as &$subtipo) { - usort($subtipo, function(Model\Venta\Unidad $a, Model\Venta\Unidad $b) { - return strcmp(str_pad($a->descripcion, 4, '0', STR_PAD_LEFT), str_pad($b->descripcion, 4, '0', STR_PAD_LEFT)); - }); - } - $output['unidades'] = $tipos; - $output['total'] = count($unidades); + foreach ($tipos as &$subtipo) { + usort($subtipo, function(Model\Venta\Unidad $a, Model\Venta\Unidad $b) { + return strcmp(str_pad($a->descripcion, 4, '0', STR_PAD_LEFT), str_pad($b->descripcion, 4, '0', STR_PAD_LEFT)); + }); + } + $output['unidades'] = $tipos; + $output['total'] = count($unidades); + $this->saveRedis($redisService, $redisKey, $output); + } catch (EmptyResult) {} + } + return $this->withJson($response, $output); + } + public function disponibles(ServerRequestInterface $request, ResponseInterface $response, Repository\Venta\Unidad $unidadRepository, int $proyecto_id): ResponseInterface + { + $output = [ + 'proyecto_id' => $proyecto_id, + 'unidades' => [] + ]; + try { + $output['unidades'] = $unidadRepository->fetchDisponiblesByProyecto($proyecto_id); } catch (EmptyResult) {} return $this->withJson($response, $output); } + public function superficies(ServerRequestInterface $request, ResponseInterface $response, + Repository\Proyecto $proyectoRepository, Repository\Venta $ventaRepository, + Repository\Venta\Unidad $unidadRepository, Service\Redis $redisService, + Service\Format $formatService, int $proyecto_id): ResponseInterface + { + $output = [ + 'proyecto_id' => $proyecto_id, + 'superficies' => [ + 'vendible' => 0, + 'vendido' => 0, + 'por_vender' => 0 + ], + 'formatted' => [ + 'vendible' => '0m²', + 'vendido' => '0m²', + 'por_vender' => '0m²' + ] + ]; + $redisKey = "superficices-proyecto-{$proyecto_id}"; + try { + $output = $this->fetchRedis($redisService, $redisKey); + } catch (EmptyRedis) { + try { + $ventas = $ventaRepository->fetchActivaByProyecto($proyecto_id); + $unidades = $unidadRepository->fetchDisponiblesByProyecto($proyecto_id); + + $output['superficies']['vendido'] = array_reduce($ventas, function($sum, Model\Venta $venta) { + return $sum + array_reduce($venta->propiedad()->unidades, function($sum, Model\Venta\Unidad $unidad) { + return $sum + $unidad->proyectoTipoUnidad->vendible(); + }); + }, 0); + $output['formatted']['vendido'] = "{$formatService->number($output['superficies']['vendido'], 2)}m²"; + $output['superficies']['por_vender'] = array_reduce($unidades, function($sum, Model\Venta\Unidad $unidad) { + return $sum + $unidad->proyectoTipoUnidad->vendible(); + }); + $output['formatted']['por_vender'] = "{$formatService->number($output['superficies']['por_vender'], 2)}m²"; + $output['superficies']['vendible'] = $output['superficies']['vendido'] + $output['superficies']['por_vender']; + $output['formatted']['vendible'] = "{$formatService->number($output['superficies']['vendible'], 2)}m²"; + $this->saveRedis($redisService, $redisKey, $output, 60 * 60); + } catch (EmptyResult) {} + } + return $this->withJson($response, $output); + } } diff --git a/app/src/Controller/API/Ventas.php b/app/src/Controller/API/Ventas.php index 87deea0..2604ae1 100644 --- a/app/src/Controller/API/Ventas.php +++ b/app/src/Controller/API/Ventas.php @@ -54,7 +54,7 @@ class Ventas $json = json_decode($body->getContents()); $proyecto_id = $json->proyecto_id; $today = new DateTimeImmutable(); - $redisKey = "promesas_por_firmar-{$proyecto_id}-{$today->format('Y-m-d')}"; + $redisKey = "promesas_por_firmar-proyecto-{$proyecto_id}-{$today->format('Y-m-d')}"; $output = [ 'proyecto_id' => $proyecto_id, @@ -80,7 +80,7 @@ class Ventas $json = json_decode($body->getContents()); $proyecto_id = $json->proyecto_id; $today = new DateTimeImmutable(); - $redisKey = "escrituras-{$proyecto_id}-{$today->format('Y-m-d')}"; + $redisKey = "escrituras-proyecto-{$proyecto_id}-{$today->format('Y-m-d')}"; $output = [ 'proyecto_id' => $proyecto_id, diff --git a/app/src/Controller/API/Ventas/Precios.php b/app/src/Controller/API/Ventas/Precios.php new file mode 100644 index 0000000..927e815 --- /dev/null +++ b/app/src/Controller/API/Ventas/Precios.php @@ -0,0 +1,36 @@ +getBody(); + $json = json_decode($body->getContents()); + $proyecto_id = $json->proyecto_id; + $output = ['total' => 0]; + try { + $precios = $precioService->getByProyecto($proyecto_id); + $output['precios'] = $precios; + $output['total'] = count($precios); + } catch (EmptyResult) {} + return $this->withJson($response, $output); + } + public function unidad(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\Precio $precioService, int $unidad_id): ResponseInterface + { + try { + $precio = $precioService->getVigenteByUnidad($unidad_id); + return $this->withJson($response, compact('precio')); + } catch (EmptyResult) { + return $this->emptyBody($response); + } + } +} diff --git a/app/src/Controller/API/Ventas/Unidades.php b/app/src/Controller/API/Ventas/Unidades.php index 398f3af..9f8538f 100644 --- a/app/src/Controller/API/Ventas/Unidades.php +++ b/app/src/Controller/API/Ventas/Unidades.php @@ -22,7 +22,7 @@ class Unidades $json = json_decode($body->getContents()); $proyecto_id = $json->proyecto_id; $today = new DateTimeImmutable(); - $redisKey = "unidades_disponibles-{$proyecto_id}-{$today->format('Y-m-d')}"; + $redisKey = "unidades_disponibles-proyecto-{$proyecto_id}-{$today->format('Y-m-d')}"; $output = [ 'proyecto_id' => $proyecto_id, diff --git a/app/src/Controller/Proyectos.php b/app/src/Controller/Proyectos.php index 81c53b9..4f62910 100644 --- a/app/src/Controller/Proyectos.php +++ b/app/src/Controller/Proyectos.php @@ -4,8 +4,9 @@ namespace Incoviba\Controller; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Incoviba\Common\Alias\View; -use Incoviba\Repository; use Incoviba\Model; +use Incoviba\Repository; +use Incoviba\Service; class Proyectos { @@ -29,4 +30,9 @@ class Proyectos }); return $view->render($response, 'proyectos.unidades', compact('proyectos')); } + public function show(ServerRequestInterface $request, ResponseInterface $response, View $view, Service\Proyecto $proyectoService, int $proyecto_id): ResponseInterface + { + $proyecto = $proyectoService->getById($proyecto_id); + return $view->render($response, 'proyectos.show', compact('proyecto')); + } } diff --git a/app/src/Controller/Ventas/Precios.php b/app/src/Controller/Ventas/Precios.php index 6a96459..890d749 100644 --- a/app/src/Controller/Ventas/Precios.php +++ b/app/src/Controller/Ventas/Precios.php @@ -1,7 +1,6 @@ $proyecto->id, 'descripcion' => $proyecto->descripcion];}, $proyectoService->getVendibles()); return $view->render($response, 'ventas.precios.list', compact('proyectos')); } - public function proyecto(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\Precio $precioService): ResponseInterface - { - $body = $request->getBody(); - $json = json_decode($body->getContents()); - $proyecto_id = $json->proyecto_id; - $output = ['total' => 0]; - try { - $precios = $precioService->getByProyecto($proyecto_id); - $output['precios'] = $precios; - $output['total'] = count($precios); - } catch (EmptyResult) {} - $response->getBody()->write(json_encode($output)); - return $response->withHeader('Content-Type', 'application/json'); - } - public function unidad(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\Precio $precioService, int $unidad_id): ResponseInterface - { - $precio = $precioService->getVigenteByUnidad($unidad_id); - $response->getBody()->write(json_encode(['precio' => $precio])); - return $response->withHeader('Content-Type', 'application/json'); - } } diff --git a/app/src/Model/Proyecto.php b/app/src/Model/Proyecto.php index a0ab993..d4a2e69 100644 --- a/app/src/Model/Proyecto.php +++ b/app/src/Model/Proyecto.php @@ -1,6 +1,7 @@ inmobiliaria)) { @@ -29,6 +33,20 @@ class Proyecto extends Ideal\Model } return $this->direccion; } + public function estados(): array + { + if (!isset($this->estados)) { + $this->estados = $this->runFactory('estados'); + } + return $this->estados; + } + public function currentEstado(): Proyecto\EstadoProyecto + { + if (!isset($this->currentEstado)) { + $this->currentEstado = $this->runFactory('currentEstado'); + } + return $this->currentEstado; + } public function jsonSerialize(): mixed { diff --git a/app/src/Model/Proyecto/Superficie.php b/app/src/Model/Proyecto/Superficie.php index 72d6e5f..da7e1a9 100644 --- a/app/src/Model/Proyecto/Superficie.php +++ b/app/src/Model/Proyecto/Superficie.php @@ -5,4 +5,9 @@ class Superficie { public float $sobre_nivel; public float $bajo_nivel; + + public function total(): float + { + return $this->bajo_nivel + $this->sobre_nivel; + } } diff --git a/app/src/Model/Venta/Propiedad.php b/app/src/Model/Venta/Propiedad.php index 0e18cea..546a984 100644 --- a/app/src/Model/Venta/Propiedad.php +++ b/app/src/Model/Venta/Propiedad.php @@ -9,15 +9,15 @@ class Propiedad extends Ideal\Model public function departamentos(): array { - return array_filter($this->unidades, function(Unidad $unidad) {return $unidad->proyectoTipoUnidad->tipoUnidad->descripcion === 'departamento';}); + return array_values(array_filter($this->unidades, function(Unidad $unidad) {return $unidad->proyectoTipoUnidad->tipoUnidad->descripcion === 'departamento';})); } public function estacionamientos(): array { - return array_filter($this->unidades, function(Unidad $unidad) {return $unidad->proyectoTipoUnidad->tipoUnidad->descripcion === 'estacionamiento';}); + return array_values(array_filter($this->unidades, function(Unidad $unidad) {return $unidad->proyectoTipoUnidad->tipoUnidad->descripcion === 'estacionamiento';})); } public function bodegas(): array { - return array_filter($this->unidades, function(Unidad $unidad) {return $unidad->proyectoTipoUnidad->tipoUnidad->descripcion === 'bodega';}); + return array_values(array_filter($this->unidades, function(Unidad $unidad) {return $unidad->proyectoTipoUnidad->tipoUnidad->descripcion === 'bodega';})); } protected float $vendible; diff --git a/app/src/Repository/Proyecto.php b/app/src/Repository/Proyecto.php index 21b1c7e..e03de3b 100644 --- a/app/src/Repository/Proyecto.php +++ b/app/src/Repository/Proyecto.php @@ -92,6 +92,10 @@ WHERE et.`orden` BETWEEN {$etapaRecepcion->orden} AND ({$etapaTerminado->orden} ORDER BY a.`descripcion`"; return $this->fetchMany($query); } + public function fetchSuperficieVendido(int $proyecto_id): float + { + + } protected function joinEstado(): string { diff --git a/app/src/Service/Redis.php b/app/src/Service/Redis.php index 1d7f050..d8d61ce 100644 --- a/app/src/Service/Redis.php +++ b/app/src/Service/Redis.php @@ -15,8 +15,8 @@ class Redis } return $this->client->get($name); } - public function set(string $name, mixed $value): void + public function set(string $name, mixed $value, int $expirationTTL = 60 * 60 * 24): void { - $this->client->set($name, $value, 'EX', 60 * 60 * 24); + $this->client->set($name, $value, 'EX', $expirationTTL); } } From 9ab051595459575ff2c9045a8e7d3a156fddb655 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Wed, 22 Nov 2023 19:08:19 -0300 Subject: [PATCH 027/163] Facturacion --- app/common/Define/Connection.php | 1 + app/common/Define/Model.php | 1 + app/common/Define/Query.php | 15 + app/common/Define/Query/Builder.php | 33 ++ app/common/Define/Query/Create.php | 31 ++ .../Define/Query/Create/CreateDefinition.php | 59 +++ app/common/Define/Query/Delete.php | 12 + app/common/Define/Query/Insert.php | 32 ++ app/common/Define/Query/Select.php | 62 +++ app/common/Define/Query/Update.php | 13 + app/common/Define/Repository/Mapper.php | 4 + app/common/Ideal/Query.php | 12 + app/common/Ideal/Repository.php | 28 +- app/common/Implement/Connection.php | 6 +- .../Implement/Database/Query/Builder.php | 29 ++ .../Implement/Database/Query/Create.php | 102 +++++ .../Database/Query/Create/Definition.php | 104 +++++ .../Implement/Database/Query/Delete.php | 89 ++++ .../Implement/Database/Query/Insert.php | 87 ++++ .../Implement/Database/Query/Select.php | 215 ++++++++++ .../Implement/Database/Query/Update.php | 113 ++++++ app/resources/routes/api/money.php | 7 + app/resources/routes/api/ventas.php | 1 + .../routes/api/ventas/facturacion.php | 6 + app/resources/routes/ventas/facturacion.php | 6 + .../views/proyectos/unidades.blade.php | 1 + .../views/ventas/facturacion.blade.php | 384 ++++++++++++++++++ .../views/ventas/facturacion/show.blade.php | 11 + app/setup/middlewares/97_not_found.php | 1 + app/setup/setups/database.php | 3 +- app/src/Controller/API/Money.php | 123 ++++++ app/src/Controller/API/Ventas.php | 19 +- app/src/Controller/API/Ventas/Facturacion.php | 36 ++ app/src/Controller/API/withRedis.php | 6 +- app/src/Controller/Ventas/Facturacion.php | 21 + app/src/Middleware/Errors.php | 31 ++ app/src/Model/Proyecto/Superficie.php | 13 +- app/src/Model/Proyecto/Terreno.php | 15 +- app/src/Model/Venta/Unidad.php | 4 +- app/src/Repository/Proyecto.php | 50 ++- app/src/Repository/Venta/Unidad.php | 86 ++-- app/src/Service/Money.php | 11 + app/src/Service/Money/MiIndicador.php | 7 + app/src/Service/Proyecto.php | 4 + app/src/Service/Venta/Unidad.php | 23 +- 45 files changed, 1846 insertions(+), 71 deletions(-) create mode 100644 app/common/Define/Query.php create mode 100644 app/common/Define/Query/Builder.php create mode 100644 app/common/Define/Query/Create.php create mode 100644 app/common/Define/Query/Create/CreateDefinition.php create mode 100644 app/common/Define/Query/Delete.php create mode 100644 app/common/Define/Query/Insert.php create mode 100644 app/common/Define/Query/Select.php create mode 100644 app/common/Define/Query/Update.php create mode 100644 app/common/Ideal/Query.php create mode 100644 app/common/Implement/Database/Query/Builder.php create mode 100644 app/common/Implement/Database/Query/Create.php create mode 100644 app/common/Implement/Database/Query/Create/Definition.php create mode 100644 app/common/Implement/Database/Query/Delete.php create mode 100644 app/common/Implement/Database/Query/Insert.php create mode 100644 app/common/Implement/Database/Query/Select.php create mode 100644 app/common/Implement/Database/Query/Update.php create mode 100644 app/resources/routes/api/money.php create mode 100644 app/resources/routes/api/ventas/facturacion.php create mode 100644 app/resources/routes/ventas/facturacion.php create mode 100644 app/resources/views/ventas/facturacion.blade.php create mode 100644 app/resources/views/ventas/facturacion/show.blade.php create mode 100644 app/src/Controller/API/Money.php create mode 100644 app/src/Controller/API/Ventas/Facturacion.php create mode 100644 app/src/Controller/Ventas/Facturacion.php create mode 100644 app/src/Middleware/Errors.php diff --git a/app/common/Define/Connection.php b/app/common/Define/Connection.php index 577c094..a35af54 100644 --- a/app/common/Define/Connection.php +++ b/app/common/Define/Connection.php @@ -11,4 +11,5 @@ interface Connection public function prepare(string $query): PDOStatement; public function execute(string $query, ?array $data = null): PDOStatement; public function getPDO(): PDO; + public function getQueryBuilder(): Query\Builder; } diff --git a/app/common/Define/Model.php b/app/common/Define/Model.php index d7910fd..2f42207 100644 --- a/app/common/Define/Model.php +++ b/app/common/Define/Model.php @@ -5,4 +5,5 @@ use JsonSerializable; interface Model extends JsonSerializable { + public function addFactory(string $property, Repository\Factory $factory): Model; } diff --git a/app/common/Define/Query.php b/app/common/Define/Query.php new file mode 100644 index 0000000..f22208a --- /dev/null +++ b/app/common/Define/Query.php @@ -0,0 +1,15 @@ +build(); + } +} diff --git a/app/common/Ideal/Repository.php b/app/common/Ideal/Repository.php index cb49210..993d62c 100644 --- a/app/common/Ideal/Repository.php +++ b/app/common/Ideal/Repository.php @@ -31,18 +31,25 @@ abstract class Repository implements Define\Repository public function remove(Define\Model $model): void { - $query = "DELETE FROM `{$this->getTable()}` WHERE `{$this->getKey()}` = ?"; - $this->connection->execute($query, [$model->getId()]); + $query = $this->connection->getQueryBuilder() + ->delete()->from($this->getTable()) + ->where("{$this->getKey()} = ?"); + $this->connection->execute($query, [$model->id]); } public function fetchById(int $id): Define\Model { - $query = "SELECT * FROM `{$this->getTable()}` WHERE `{$this->getKey()}` = ?"; + $query = $this->connection->getQueryBuilder() + ->select() + ->from($this->getTable()) + ->where("{$this->getKey()} = ?"); return $this->fetchOne($query, [$id]); } public function fetchAll(): array { - $query = "SELECT * FROM `{$this->getTable()}`"; + $query = $this->connection->getQueryBuilder() + ->select() + ->from($this->getTable()); return $this->fetchMany($query); } @@ -96,9 +103,11 @@ abstract class Repository implements Define\Repository } protected function saveNew(array $columns, array $values): int { - $columns_string = implode(', ', array_map(function($column) {return "`{$column}`";}, $columns)); - $columns_questions = implode(', ', array_fill(0, count($columns), '?')); - $query = "INSERT INTO `{$this->getTable()}` ({$columns_string}) VALUES ($columns_questions)"; + $query = $this->connection->getQueryBuilder() + ->insert() + ->into($this->getTable()) + ->columns($columns) + ->values(array_fill(0, count($columns), '?')); $this->connection->execute($query, $values); return $this->connection->getPDO()->lastInsertId(); } @@ -117,7 +126,10 @@ abstract class Repository implements Define\Repository return $model; } $columns_string = implode(', ', array_map(function($property) {return "`{$property}` = ?";}, $changes)); - $query = "UPDATE `{$this->getTable()}` SET {$columns_string} WHERE `{$this->getKey()}` = ?"; + $query = $this->connection->getQueryBuilder() + ->update($this->getTable()) + ->set($columns_string) + ->where("{$this->getKey()} = ?"); $values []= $model->{$this->getKey()}; $this->connection->execute($query, $values); return $this->fetchById($model->{$this->getKey()}); diff --git a/app/common/Implement/Connection.php b/app/common/Implement/Connection.php index bcb6eab..761151a 100644 --- a/app/common/Implement/Connection.php +++ b/app/common/Implement/Connection.php @@ -8,7 +8,7 @@ use Incoviba\Common\Define; class Connection implements Define\Connection { - public function __construct(protected Define\Database $database) {} + public function __construct(protected Define\Database $database, protected Database\Query\Builder $queryBuilder) {} protected PDO $connection; public function connect(): Define\Connection @@ -27,6 +27,10 @@ class Connection implements Define\Connection $this->connect(); return $this->connection; } + public function getQueryBuilder(): Database\Query\Builder + { + return $this->queryBuilder; + } public function query(string $query): PDOStatement { diff --git a/app/common/Implement/Database/Query/Builder.php b/app/common/Implement/Database/Query/Builder.php new file mode 100644 index 0000000..82a3c5f --- /dev/null +++ b/app/common/Implement/Database/Query/Builder.php @@ -0,0 +1,29 @@ +table($table_name); + } + + public function select(array|string $columns = '*'): Select + { + return (new Select())->columns($columns); + } + public function insert(): Insert + { + return new Insert(); + } + public function update(string $table): Update + { + return (new Update())->table($table); + } + public function delete(): Delete + { + return new Delete(); + } +} diff --git a/app/common/Implement/Database/Query/Create.php b/app/common/Implement/Database/Query/Create.php new file mode 100644 index 0000000..2c21bfe --- /dev/null +++ b/app/common/Implement/Database/Query/Create.php @@ -0,0 +1,102 @@ +name = $name; + return $this; + } + public function definitions(Define\Query\Create\CreateDefinition|array|string $create_definitions): Define\Query\Create + { + if (is_array($create_definitions)) { + foreach ($create_definitions as $definition) { + $this->addDefinition($definition); + } + return $this; + } + return $this->addDefinition($create_definitions); + } + public function options(array|string $table_options): Define\Query\Create + { + if (is_string($table_options)) { + return $this->addOption($table_options); + } + foreach ($table_options as $option) { + $this->addOption($option); + } + return $this; + } + public function partition(array|string $partition_options): Define\Query\Create + { + if (is_string($partition_options)) { + return $this->addPartition($partition_options); + } + foreach ($partition_options as $option) { + $this->addPartition($option); + } + return $this; + } + public function build(): string + { + $query = [ + "CREATE TABLE {$this->name}", + $this->getDefinitions(), + $this->getOptions(), + $this->getPartitions() + ]; + return implode('', $query); + } + + protected function addDefinition(string $definition): Create + { + if (!isset($this->definitions)) { + $this->definitions = []; + } + $this->definitions []= $definition; + return $this; + } + protected function addOption(string $option): Create + { + if (!isset($this->options)) { + $this->options = []; + } + $this->options []= $option; + return $this; + } + protected function addPartition(string $partition): Create + { + if (!isset($this->partitions)) { + $this->partitions = []; + } + $this->partitions []= $partition; + return $this; + } + protected function getDefinitions(): string + { + return ' (' . implode(', ', $this->definitions) . ')'; + } + protected function getOptions(): string + { + if (!isset($this->options) or count($this->options) <= 0) { + return ''; + } + return ' ' . implode(' ', $this->options); + } + protected function getPartitions(): string + { + if (!isset($this->partitions) or count($this->partitions) <= 0) { + return ''; + } + return ' PARTITION BY (' . implode(', ', $this->partitions) . ')'; + } +} diff --git a/app/common/Implement/Database/Query/Create/Definition.php b/app/common/Implement/Database/Query/Create/Definition.php new file mode 100644 index 0000000..a81680c --- /dev/null +++ b/app/common/Implement/Database/Query/Create/Definition.php @@ -0,0 +1,104 @@ +name = $name; + return $this; + } + public function type(string $type, ?int $size = null): CreateDefinition + { + $this->type = $type; + if ($size !== null) { + $this->size = $size; + } + return $this; + } + public function primary(): CreateDefinition + { + $this->primary = true; + return $this; + } + public function autoIncrement(): CreateDefinition + { + $this->auto_increment = true; + return $this; + } + public function unsigned(): CreateDefinition + { + $this->unsigned = true; + return $this; + } + public function default(mixed $value): CreateDefinition + { + $this->default = $value; + return $this; + } + public function foreign(string $reference_table, string $reference_column = 'id', int $on_delete = CreateDefinition::CASCADE, int $on_update = CreateDefinition::CASCADE): CreateDefinition + { + $this->foreign_table = $reference_table; + $this->foreign_key = $reference_column; + $this->foreign_delete = $on_delete; + $this->foreign_update = $on_update; + return $this; + } + + public function __toString(): string + { + $type = $this->type ?? 'int'; + if (isset($this->size)) { + $type = "{$type}({$this->size})"; + } elseif (in_array($type, ['varchar'])) { + $type = "{$type}(255)"; + } + $output = [ + "`{$this->name}`", + $type + ]; + if (isset($this->unsigned)) { + $output []= 'UNSIGNED'; + } + if (isset($this->default)) { + $default = $this->default; + if (in_array($this->type, ['varchar', 'text', 'char'])) { + $default = "'{$default}'"; + } + $output []= "DEFAULT {$default}"; + } + if (isset($this->auto_increment)) { + $output []= 'AUTO_INCREMENT'; + } + if (isset($this->primary)) { + $output []= 'PRIMARY KEY'; + } + if (isset($this->foreign_table)) { + $output []= "REFERENCES `{$this->foreign_table}` (`{$this->foreign_key}`)"; + $on = [ + 'RESTRICT', + 'CASCADE', + 'SET_NULL', + 'NO_ACTION', + 'SET_DEFAULT' + ]; + $output []= "ON DELETE {$on[$this->foreign_delete]}"; + $output []= "ON UPDATE {$on[$this->foreign_update]}"; + } + return implode(' ', $output); + } +} diff --git a/app/common/Implement/Database/Query/Delete.php b/app/common/Implement/Database/Query/Delete.php new file mode 100644 index 0000000..c193d98 --- /dev/null +++ b/app/common/Implement/Database/Query/Delete.php @@ -0,0 +1,89 @@ +table = $table; + return $this; + } + public function where(array|string $conditions): Delete + { + if (is_string($conditions)) { + return $this->addCondition($conditions); + } + foreach ($conditions as $condition) { + $this->addCondition($condition); + } + return $this; + } + public function order(array|string $sorting): Delete + { + if (is_string($sorting)) { + return $this->addOrder($sorting); + } + foreach ($sorting as $order) { + $this->addOrder($order); + } + return $this; + } + public function limit(int $limit): Delete + { + $this->limit = $limit; + return $this; + } + public function build(): string + { + $query = [ + "DELETE FROM {$this->table}", + $this->getConditions(), + $this->getSorting(), + $this->getLimit() + ]; + return implode('', $query); + } + + protected function addCondition(string $condition): Delete + { + if (!isset($this->conditions)) { + $this->conditions = []; + } + $this->conditions []= $condition; + return $this; + } + protected function getConditions(): string + { + return ' WHERE ' . implode(' AND ', $this->conditions); + } + protected function addOrder(string $order): Delete + { + if (!isset($this->sorts)) { + $this->sorts = []; + } + $this->sorts []= $order; + return $this; + } + protected function getSorting(): string + { + if (!isset($this->sorts) or count($this->sorts) === 0) { + return ''; + } + return ' ORDER BY ' . implode(', ', $this->sorts); + } + protected function getLimit(): string + { + if (!isset($this->limit) or $this->limit <= 0) { + return ''; + } + return " LIMIT {$this->limit}"; + } +} diff --git a/app/common/Implement/Database/Query/Insert.php b/app/common/Implement/Database/Query/Insert.php new file mode 100644 index 0000000..6c9b7cf --- /dev/null +++ b/app/common/Implement/Database/Query/Insert.php @@ -0,0 +1,87 @@ +table = $table; + if ($columns !== null) { + return $this->columns($columns); + } + return $this; + } + public function columns(array $columns): Insert + { + foreach ($columns as $column) { + $this->addColumn($column); + } + return $this; + } + public function values(array $values): Insert + { + foreach ($values as $value) { + $this->addValue($value); + } + return $this; + } + public function select(Define\Query\Select $select): Insert + { + $this->select = $select; + return $this; + } + public function build(): string + { + $query = [ + "INSERT INTO {$this->table}" + ]; + if (isset($this->select)) { + $query []= " {$this->select}"; + return implode('', $query); + } + $query []= $this->getColumns(); + $query []= $this->getValues(); + return implode('', $query); + } + + protected function addColumn(string $column): Insert + { + if (!isset($this->columns)) { + $this->columns = []; + } + $this->columns []= $column; + return $this; + } + protected function addValue(mixed $value): Insert + { + if (!isset($this->values)) { + $this->values = []; + } + $this->values []= $value; + return $this; + } + protected function getColumns(): string + { + return ' (' . implode(', ', array_map(function(string $column) {return "`{$column}`";}, $this->columns)) . ')'; + } + protected function getValues(): string + { + return ' VALUES (' . implode(', ', array_map(function($value) { + if ($value === '?') { + return $value; + } + if ($value === (int) $value) { + return $value; + } + return "'{$value}'"; + }, $this->values)) . ')'; + } +} diff --git a/app/common/Implement/Database/Query/Select.php b/app/common/Implement/Database/Query/Select.php new file mode 100644 index 0000000..0f7a88b --- /dev/null +++ b/app/common/Implement/Database/Query/Select.php @@ -0,0 +1,215 @@ +addColumn($expressions); + } + foreach ($expressions as $expression) { + $this->addColumn($expression); + } + return $this; + } + public function from(string $table): Select + { + $this->table = $table; + return $this; + } + public function joined(array|string $joins): Select + { + if (is_string($joins)) { + return $this->addJoin($joins); + } + foreach ($joins as $join) { + $this->addJoin($join); + } + return $this; + } + public function where(array|string $conditions): Select + { + if (is_string($conditions)) { + return $this->addCondition($conditions); + } + foreach ($conditions as $condition) { + $this->addCondition($condition); + } + return $this; + } + public function group(array|string $grouping): Select + { + if (is_string($grouping)) { + return $this->addGroup($grouping); + } + foreach ($grouping as $group) { + $this->addGroup($group); + } + return $this; + } + public function having(array|string $conditions): Select + { + if (is_string($conditions)) { + return $this->addCondition($conditions); + } + foreach ($conditions as $condition) { + $this->addCondition($condition); + } + return $this; + } + public function order(array|string $sorting): Select + { + if (is_string($sorting)) { + return $this->addOrder($sorting); + } + foreach ($sorting as $order) { + $this->addOrder($order); + } + return $this; + } + public function limit(int $limit, ?int $offset = null): Select + { + $this->limit = $limit; + if ($offset !== null) { + return $this->offset($offset); + } + return $this; + } + public function offset(int $offset): Select + { + $this->offset = $offset; + return $this; + } + public function build(): string + { + $query = [ + "SELECT {$this->getColumns()} FROM {$this->table}", + $this->getJoins(), + $this->getConditions(), + $this->getGroups(), + $this->getHaving(), + $this->getOrder(), + $this->getLimit() + ]; + return implode('', $query); + } + + protected function addColumn(string $expression): Select + { + if (!isset($this->columns)) { + $this->columns = []; + } + $this->columns []= $expression; + return $this; + } + protected function addJoin(string $join): Select + { + if (!isset($this->joins)) { + $this->joins = []; + } + $this->joins []= $join; + return $this; + } + protected function addCondition(string $condition): Select + { + if (!isset($this->coditions)) { + $this->conditions = []; + } + $this->conditions []= $condition; + return $this; + } + protected function addGroup(string $group): Select + { + if (!isset($this->groups)) { + $this->groups = []; + } + $this->groups []= $group; + return $this; + } + protected function addHaving(string $having): Select + { + if (!isset($this->haves)) { + $this->haves = []; + } + $this->haves []= $having; + return $this; + } + protected function addOrder(string $order): Select + { + if (!isset($this->orders)) { + $this->orders = []; + } + $this->orders []= $order; + return $this; + } + protected function getColumns(): string + { + if (!isset($this->columns) or count($this->columns) === 0) { + return '*'; + } + return implode(', ', $this->columns); + } + protected function getJoins(): string + { + if (!isset($this->joins) or count($this->joins) === 0) { + return ''; + } + return ' ' . implode(' ', $this->joins); + } + protected function getConditions(): string + { + if (!isset($this->conditions) or count($this->conditions) === 0) { + return ''; + } + return ' WHERE ' . implode(' AND ', $this->conditions); + } + protected function getGroups(): string + { + if (!isset($this->groups) or count($this->groups) === 0) { + return ''; + } + return ' GROUP BY ' . implode(', ', $this->groups); + } + protected function getHaving(): string + { + if (!isset($this->haves) or count($this->haves) === 0) { + return ''; + } + return ' HAVING ' . implode(' AND ', $this->haves); + } + protected function getOrder(): string + { + if (!isset($this->orders) or count($this->orders) === 0) { + return ''; + } + return ' ORDER BY ' . implode(', ', $this->orders); + } + protected function getLimit(): string + { + if (!isset($this->limit) or $this->limit <= 0) { + return ''; + } + return " LIMIT {$this->limit}{$this->getOffset()}"; + } + protected function getOffset(): string + { + if (!isset($this->offset) or $this->offset <= 0) { + return ''; + } + return " OFFSET {$this->offset}"; + } +} diff --git a/app/common/Implement/Database/Query/Update.php b/app/common/Implement/Database/Query/Update.php new file mode 100644 index 0000000..f671363 --- /dev/null +++ b/app/common/Implement/Database/Query/Update.php @@ -0,0 +1,113 @@ +table = $table; + return $this; + } + public function set(array|string $column_pairs): Define\Query\Update + { + if (is_string($column_pairs)) { + return $this->addSet($column_pairs); + } + foreach ($column_pairs as $pair) { + $this->addSet($pair); + } + return $this; + } + public function where(array|string $conditions): Define\Query\Update + { + if (is_string($conditions)) { + return $this->addCondition($conditions); + } + foreach ($conditions as $condition) { + $this->addCondition($condition); + } + return $this; + } + public function order(array|string $ordering): Define\Query\Update + { + if (is_string($ordering)) { + return $this->addOrder($ordering); + } + foreach ($ordering as $order) { + $this->addOrder($order); + } + return $this; + } + public function limit(int $limit): Define\Query\Update + { + $this->limit = $limit; + return $this; + } + public function build(): string + { + $query = [ + "UPDATE {$this->table}", + $this->getSet(), + $this->getConditions(), + $this->getOrder(), + $this->getLimit() + ]; + return implode('', $query); + } + + protected function addSet(string $pair): Update + { + if (!isset($this->setPairs)) { + $this->setPairs = []; + } + $this->setPairs []= $pair; + return $this; + } + protected function addCondition(string $condition): Update + { + if (!isset($this->conditions)) { + $this->conditions = []; + } + $this->conditions []= $condition; + return $this; + } + protected function addOrder(string $order): Update + { + if (!isset($this->orders)) { + $this->orders = []; + } + $this->orders []= $order; + return $this; + } + protected function getSet(): string + { + return ' SET ' . implode(', ', $this->setPairs); + } + protected function getConditions(): string + { + return ' WHERE ' . implode(' AND ', $this->conditions); + } + protected function getOrder(): string + { + if (!isset($this->orders) or count($this->orders) === 0) { + return ''; + } + return ' ORDER BY ' . implode(', ', $this->orders); + } + protected function getLimit(): string + { + if (!isset($this->limit) or $this->limit <= 0) { + return ''; + } + return " LIMIT {$this->limit}"; + } +} diff --git a/app/resources/routes/api/money.php b/app/resources/routes/api/money.php new file mode 100644 index 0000000..2f3fb4c --- /dev/null +++ b/app/resources/routes/api/money.php @@ -0,0 +1,7 @@ +group('/money', function($app) { + $app->post('/ipc[/]', [Money::class, 'ipc']); + $app->post('[/]', [Money::class, 'get']); +}); diff --git a/app/resources/routes/api/ventas.php b/app/resources/routes/api/ventas.php index a635e6b..894128d 100644 --- a/app/resources/routes/api/ventas.php +++ b/app/resources/routes/api/ventas.php @@ -22,6 +22,7 @@ $app->group('/ventas', function($app) { $app->post('[/]', [Ventas::class, 'proyecto']); }); $app->group('/venta/{venta_id}', function($app) { + $app->get('/unidades', [Ventas::class, 'unidades']); $app->get('/comentarios', [Ventas::class, 'comentarios']); $app->get('[/]', [Ventas::class, 'get']); }); diff --git a/app/resources/routes/api/ventas/facturacion.php b/app/resources/routes/api/ventas/facturacion.php new file mode 100644 index 0000000..cae92a8 --- /dev/null +++ b/app/resources/routes/api/ventas/facturacion.php @@ -0,0 +1,6 @@ +group('/facturacion', function($app) { + $app->get('/proyecto/{proyecto_id}[/]', [Facturacion::class, 'proyecto']); +}); diff --git a/app/resources/routes/ventas/facturacion.php b/app/resources/routes/ventas/facturacion.php new file mode 100644 index 0000000..b49f175 --- /dev/null +++ b/app/resources/routes/ventas/facturacion.php @@ -0,0 +1,6 @@ +group('/facturacion', function($app) { + $app->get('[/]', Facturacion::class); +}); diff --git a/app/resources/views/proyectos/unidades.blade.php b/app/resources/views/proyectos/unidades.blade.php index c61af0c..75cfd88 100644 --- a/app/resources/views/proyectos/unidades.blade.php +++ b/app/resources/views/proyectos/unidades.blade.php @@ -224,6 +224,7 @@ const proyecto_id = element.data('proyecto') this.get().tipos(proyecto_id) }) + $('#data').hide() } } $(document).ready(() => { diff --git a/app/resources/views/ventas/facturacion.blade.php b/app/resources/views/ventas/facturacion.blade.php new file mode 100644 index 0000000..7878c84 --- /dev/null +++ b/app/resources/views/ventas/facturacion.blade.php @@ -0,0 +1,384 @@ +@extends('layout.base') + +@section('page_content') +
    +

    Matriz Facturación

    +

    +
    +
    Proyectos
    +
    +
    + + +
    +
    +
    +

    + +
    +
    +@endsection + +@include('layout.head.styles.datatables') +@include('layout.body.scripts.datatables') + +@push('page_scripts') + +@endpush diff --git a/app/resources/views/ventas/facturacion/show.blade.php b/app/resources/views/ventas/facturacion/show.blade.php new file mode 100644 index 0000000..07e844e --- /dev/null +++ b/app/resources/views/ventas/facturacion/show.blade.php @@ -0,0 +1,11 @@ +@extends('layout.base') + +@section('page_content') +
    + +
    + +
    + +
    +@endsection diff --git a/app/setup/middlewares/97_not_found.php b/app/setup/middlewares/97_not_found.php index 9a61f5f..14d5c25 100644 --- a/app/setup/middlewares/97_not_found.php +++ b/app/setup/middlewares/97_not_found.php @@ -1,2 +1,3 @@ add($app->getContainer()->get(Incoviba\Middleware\NotFound::class)); +$app->add($app->getContainer()->get(Incoviba\Middleware\Errors::class)); diff --git a/app/setup/setups/database.php b/app/setup/setups/database.php index 3cfd071..5ef8d8f 100644 --- a/app/setup/setups/database.php +++ b/app/setup/setups/database.php @@ -12,7 +12,8 @@ return [ }, Incoviba\Common\Define\Connection::class => function(ContainerInterface $container) { return new Incoviba\Common\Implement\Connection( - $container->get(Incoviba\Common\Define\Database::class) + $container->get(Incoviba\Common\Define\Database::class), + $container->get(Incoviba\Common\Implement\Database\Query\Builder::class) ); } ]; diff --git a/app/src/Controller/API/Money.php b/app/src/Controller/API/Money.php new file mode 100644 index 0000000..74d0527 --- /dev/null +++ b/app/src/Controller/API/Money.php @@ -0,0 +1,123 @@ +getParsedBody(); + $output = [ + 'input' => $data + ]; + $output[$data['provider']] = 0; + $redisKey = $data['provider']; + $date = new DateTimeImmutable($data['fecha']); + if (isset($data['start'])) { + $start = new DateTimeImmutable($data['start']); + } + $value = $this->getValue($redisService, $redisKey, $moneyService, $date, $data['provider']); + if (isset($start)) { + $months = $date->diff($start)->m; + $current = clone $start; + $value = $this->getValue($redisService, $redisKey, $moneyService, $current, $data['provider']); + for ($i = 1; $i <= $months; $i ++) { + $current = $current->add(new DateInterval("P{$i}M")); + $value += $this->getValue($redisService, $redisKey, $moneyService, $current, $data['provider']); + } + } + $output[$data['provider']] = $value; + return $this->withJson($response, $output); + } + + protected array $data; + protected function getValue(Service\Redis $redisService, string $redisKey, Service\Money $moneyService, DateTimeInterface $date, string $provider): float + { + if (isset($this->data[$date->format('Y-m-d')])) { + return $this->data[$date->format('Y-m-d')]; + } + try { + $this->data = (array) $this->fetchRedis($redisService, $redisKey); + if (!isset($this->data[$date->format('Y-m-d')])) { + throw new EmptyRedis($redisKey); + } + } catch (EmptyRedis) { + $result = $moneyService->get($provider, $date); + $this->data[$date->format('Y-m-d')] = $result; + $this->saveRedis($redisService, $redisKey, $this->data, $this->time); + } + return $this->data[$date->format('Y-m-d')]; + } + /*public function uf(ServerRequestInterface $request, ResponseInterface $response, Service\Redis $redisService, Service\Money $moneyService): ResponseInterface + { + $body = $request->getParsedBody(); + $output = [ + 'input' => $body, + 'uf' => 0 + ]; + $redisKey = 'uf'; + $date = new DateTimeImmutable($body['fecha']); + try { + $ufs = $this->fetchRedis($redisService, $redisKey); + if (!isset($ufs[$date->format('Y-m-d')])) { + throw new EmptyRedis($redisKey); + } + } catch (EmptyRedis) { + error_log(var_export($ufs,true)); + if (!isset($ufs)) { + $ufs = []; + } + $uf = $moneyService->getUF($date); + $ufs[$date->format('Y-m-d')] = $uf; + $this->saveRedis($redisService, $redisKey, $ufs, 60 * 60 * 24 * 30); + } + $output['uf'] = $ufs[$date->format('Y-m-d')]; + return $this->withJson($response, $output); + }*/ + public function ipc(ServerRequestInterface $request, ResponseInterface $response, Service\Redis $redisService, Service\Money $moneyService): ResponseInterface + { + $data = $request->getParsedBody(); + $output = [ + 'input' => $data, + 'date_string' => '', + 'ipc' => 0 + ]; + $redisKey = 'ipc'; + $start = new DateTimeImmutable($data['start']); + $end = new DateTimeImmutable($data['end']); + $now = new DateTimeImmutable(); + if ($end > $now) { + return $this->withJson($response, $output); + } + $dateKey = "{$start->format('Y-m')}-{$end->format('Y-m')}"; + $months = $start->diff($end)->m; + $current = new DateTimeImmutable((($start <= $end) ? $start : $end)->format('Y-m-15')); + $value = 0; + $ipcs = []; + try { + $ipcs = (array) $this->fetchRedis($redisService, $redisKey); + } catch (EmptyRedis) {} + for ($i = 1; $i < $months; $i ++) { + $current = $current->add(new DateInterval("P1M")); + if (!isset($ipcs[$current->format('Y-m')])) { + $ipcs[$current->format('Y-m')] = $moneyService->getIPC($current); + $this->saveRedis($redisService, $redisKey, $ipcs, $this->time); + } + $value += $ipcs[$current->format('Y-m')]; + } + $output['date_string'] = $dateKey; + $output['ipc'] = $value; + return $this->withJson($response, $output); + } +} diff --git a/app/src/Controller/API/Ventas.php b/app/src/Controller/API/Ventas.php index 2604ae1..c069dd3 100644 --- a/app/src/Controller/API/Ventas.php +++ b/app/src/Controller/API/Ventas.php @@ -2,9 +2,9 @@ namespace Incoviba\Controller\API; use DateTimeImmutable; -use Incoviba\Common\Implement\Exception\EmptyRedis; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; +use Incoviba\Common\Implement\Exception\EmptyRedis; use Incoviba\Common\Implement\Exception\EmptyResult; use Incoviba\Model; use Incoviba\Repository; @@ -153,4 +153,21 @@ class Ventas } return $this->withJson($response, $output); } + public function unidades(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\Unidad $unidadService, int $venta_id): ResponseInterface + { + $output = [ + 'venta_id' => $venta_id, + 'unidades' => [] + ]; + try { + $unidades = $unidadService->getByVenta($venta_id); + $output['unidades'] = json_decode(json_encode($unidades)); + array_walk($output['unidades'], function($unidad, $index, $unidades) { + $unidad->prorrateo = $unidades[$index]->prorrateo; + $unidad->precios = $unidades[$index]->precios; + $unidad->current_precio = $unidades[$index]->currentPrecio; + }, $unidades); + } catch (EmptyResult) {} + return $this->withJson($response, $output); + } } diff --git a/app/src/Controller/API/Ventas/Facturacion.php b/app/src/Controller/API/Ventas/Facturacion.php new file mode 100644 index 0000000..2f94857 --- /dev/null +++ b/app/src/Controller/API/Ventas/Facturacion.php @@ -0,0 +1,36 @@ + $proyecto_id, + 'ventas' => [] + ]; + $today = new DateTimeImmutable(); + $redisKey = "ventas_facturacion-proyecto-{$proyecto_id}-{$today->format('Y-m-d')}"; + try { + $output['ventas'] = $this->fetchRedis($redisService, $redisKey); + } catch (EmptyRedis) { + try { + $output['ventas'] = $ventaService->getActivaByProyecto($proyecto_id); + $this->saveRedis($redisService, $redisKey, $output['ventas']); + } catch (EmptyResult) {} + } + return $this->withJson($response, $output); + } +} diff --git a/app/src/Controller/API/withRedis.php b/app/src/Controller/API/withRedis.php index 0913c11..364d129 100644 --- a/app/src/Controller/API/withRedis.php +++ b/app/src/Controller/API/withRedis.php @@ -14,11 +14,15 @@ trait withRedis } return json_decode($jsonString); } - public function saveRedis(Service\Redis $redisService, string $redisKey, mixed $value): void + public function saveRedis(Service\Redis $redisService, string $redisKey, mixed $value, ?int $expiration = null): void { if (is_array($value) or is_object($value)) { $value = json_encode($value); } + if ($expiration !== null) { + $redisService->set($redisKey, $value, $expiration); + return; + } $redisService->set($redisKey, $value); } } diff --git a/app/src/Controller/Ventas/Facturacion.php b/app/src/Controller/Ventas/Facturacion.php new file mode 100644 index 0000000..90581a9 --- /dev/null +++ b/app/src/Controller/Ventas/Facturacion.php @@ -0,0 +1,21 @@ +getEscriturando(); + return $view->render($response, 'ventas.facturacion', compact('proyectos')); + } + public function show(ServerRequestInterface $request, ResponseInterface $response, View $view, Service\Venta $ventaService, int $venta_id): ResponseInterface + { + $venta = $ventaService->getById($venta_id); + return $view->render($response, 'ventas.facturacion.show', compact('venta')); + } +} diff --git a/app/src/Middleware/Errors.php b/app/src/Middleware/Errors.php new file mode 100644 index 0000000..17cde71 --- /dev/null +++ b/app/src/Middleware/Errors.php @@ -0,0 +1,31 @@ +handle($request); + } catch (Exception $exception) { + $this->logger->notice($exception); + } catch (Error $error) { + $this->logger->error($error); + } + $response = $this->responseFactory->createResponse(404); + if (str_contains($request->getUri()->getPath(), '/api')) { + return $response; + } + return $this->view->render($response, 'construccion'); + } +} diff --git a/app/src/Model/Proyecto/Superficie.php b/app/src/Model/Proyecto/Superficie.php index da7e1a9..5127e3d 100644 --- a/app/src/Model/Proyecto/Superficie.php +++ b/app/src/Model/Proyecto/Superficie.php @@ -1,7 +1,9 @@ bajo_nivel + $this->sobre_nivel; } + + public function jsonSerialize(): mixed + { + return [ + 'sobre_nivel' => $this->sobre_nivel, + 'bajo_nivel' => $this->bajo_nivel, + 'total' => $this->total() + ]; + } } diff --git a/app/src/Model/Proyecto/Terreno.php b/app/src/Model/Proyecto/Terreno.php index ce9c2fe..adcdaad 100644 --- a/app/src/Model/Proyecto/Terreno.php +++ b/app/src/Model/Proyecto/Terreno.php @@ -1,8 +1,21 @@ $this->superficie, + 'valor' => $this->valor, + 'date' => $this->date?->format('Y-m-d') + ]; + } } diff --git a/app/src/Model/Venta/Unidad.php b/app/src/Model/Venta/Unidad.php index 6d66454..d5efdab 100644 --- a/app/src/Model/Venta/Unidad.php +++ b/app/src/Model/Venta/Unidad.php @@ -12,6 +12,7 @@ class Unidad extends Ideal\Model public string $descripcion; public ?string $orientacion = ''; public Model\Proyecto\ProyectoTipoUnidad $proyectoTipoUnidad; + public ?float $prorrateo; public array $precios = []; public ?Precio $currentPrecio = null; @@ -50,7 +51,8 @@ class Unidad extends Ideal\Model 'piso' => $this->piso, 'descripcion' => $this->descripcion, 'orientacion' => $this->orientacion, - 'proyecto_tipo_unidad' => $this->proyectoTipoUnidad + 'proyecto_tipo_unidad' => $this->proyectoTipoUnidad, + 'prorrateo' => $this->prorrateo ]); } } diff --git a/app/src/Repository/Proyecto.php b/app/src/Repository/Proyecto.php index e03de3b..eb7a26b 100644 --- a/app/src/Repository/Proyecto.php +++ b/app/src/Repository/Proyecto.php @@ -1,6 +1,7 @@ superficie = $data['superficie_terreno']; $terreno->valor = $data['valor_terreno']; + $terreno->date = null; + if (isset($data['fecha_terreno']) and $data['fecha_terreno'] !== '') { + $terreno->date = new DateTimeImmutable($data['fecha_terreno']); + } return $terreno; })) ->register('superficie_sobre_nivel', (new Implement\Repository\Mapper()) @@ -67,36 +72,55 @@ class Proyecto extends Ideal\Repository } public function fetchByName(string $name): Define\Model { - $query = "SELECT * FROM `{$this->getTable()}` WHERE `name` = ?"; + $query = $this->connection->getQueryBuilder() + ->select($this->columns()) + ->from("{$this->getTable()} a") + ->joined($this->joinTerreno()) + ->where("name = ?"); return $this->fetchOne($query, [$name]); } public function fetchAllActive(): array { $etapaProyecto = $this->etapaRepository->fetchByDescripcion('Proyecto'); $etapaTerminado = $this->etapaRepository->fetchByDescripcion('Terminado'); - $query = "SELECT a.* -FROM `{$this->getTable()}` a - {$this->joinEstado()} -WHERE et.`orden` BETWEEN {$etapaProyecto->orden} AND ({$etapaTerminado->orden} - 1) -ORDER BY a.`descripcion`"; + $query = $this->connection->getQueryBuilder() + ->select($this->columns()) + ->from("{$this->getTable()} a") + ->joined($this->joinTerreno()) + ->joined($this->joinEstado()) + ->where("et.orden BETWEEN {$etapaProyecto->orden} AND ({$etapaTerminado->orden} - 1)") + ->order('a.descripcion'); return $this->fetchMany($query); } public function fetchAllEscriturando(): array { $etapaRecepcion = $this->etapaRepository->fetchByDescripcion('Recepción'); $etapaTerminado = $this->etapaRepository->fetchByDescripcion('Terminado'); - $query = "SELECT a.* -FROM `{$this->getTable()}` a - {$this->joinEstado()} -WHERE et.`orden` BETWEEN {$etapaRecepcion->orden} AND ({$etapaTerminado->orden} - 1) -ORDER BY a.`descripcion`"; + $query = $this->connection->getQueryBuilder() + ->select($this->columns()) + ->from("{$this->getTable()} a") + ->joined($this->joinTerreno()) + ->joined($this->joinEstado()) + ->where("et.orden BETWEEN {$etapaRecepcion->orden} AND ({$etapaTerminado->orden} - 1)") + ->order('a.descripcion'); return $this->fetchMany($query); } - public function fetchSuperficieVendido(int $proyecto_id): float + /*public function fetchSuperficieVendido(int $proyecto_id): float { - } + }*/ + protected function columns(): string + { + return "a.id, a.inmobiliaria, a.descripcion, a.direccion, a.superficie_terreno, + COALESCE(pt.valor, a.valor_terreno) AS valor_terreno, COALESCE(pt.fecha, '') AS fecha_terreno, a.corredor, + a.superficie_sobre_nivel, a.superficie_bajo_nivel, a.pisos, a.subterraneos"; + } + protected function joinTerreno(): string + { + return "LEFT OUTER JOIN (SELECT pt1.* FROM proyecto_terreno pt1 JOIN ( + SELECT MAX(id) AS id, proyecto_id FROM proyecto_terreno) pt0 ON pt0.id = pt1.id) pt ON pt.proyecto_id = a.id"; + } protected function joinEstado(): string { return "JOIN ( diff --git a/app/src/Repository/Venta/Unidad.php b/app/src/Repository/Venta/Unidad.php index 341665e..252cfa9 100644 --- a/app/src/Repository/Venta/Unidad.php +++ b/app/src/Repository/Venta/Unidad.php @@ -17,7 +17,7 @@ class Unidad extends Ideal\Repository public function create(?array $data = null): Model\Venta\Unidad { - $map = (new Implement\Repository\MapperParser(['subtipo', 'piso', 'descripcion', 'orientacion'])) + $map = (new Implement\Repository\MapperParser(['subtipo', 'piso', 'descripcion', 'orientacion', 'prorrateo'])) ->register('pt', (new Implement\Repository\Mapper()) ->setProperty('proyectoTipoUnidad') ->setFunction(function($data) { @@ -38,62 +38,88 @@ class Unidad extends Ideal\Repository return $this->update($model, ['subtipo', 'piso', 'descripcion', 'orientacion', 'pt'], $new_data); } + public function fetchByVenta(int $venta_id): array + { + $query = $this->connection->getQueryBuilder() + ->select('a.*, up.prorrateo') + ->from("{$this->getTable()} a") + ->joined($this->joinProrrateo()) + ->joined('JOIN propiedad_unidad pu ON pu.unidad = a.id + JOIN venta ON venta.propiedad = pu.propiedad') + ->where('venta.id = ?'); + return $this->fetchMany($query, [$venta_id]); + } public function fetchByPropiedad(int $propiedad_id): array { - $query = "SELECT a.* -FROM `{$this->getTable()}` a - JOIN `propiedad_unidad` pu ON pu.`unidad` = a.`id` -WHERE pu.`propiedad` = ? -GROUP BY a.`id`"; + $query = $this->connection->getQueryBuilder() + ->select('a.*, up.prorrateo') + ->from("{$this->getTable()} a") + ->joined($this->joinProrrateo()) + ->joined('JOIN `propiedad_unidad` pu ON pu.`unidad` = a.`id`') + ->where('pu.propiedad = ?') + ->group('a.id'); return $this->fetchMany($query, [$propiedad_id]); } public function fetchByCierre(int $cierre_id): array { - $query = "SELECT a.* -FROM `{$this->getTable()}` a - JOIN `unidad_cierre` uc ON uc.`unidad` = a.`id` + $query = $this->connection->getQueryBuilder() + ->select('a.*, up.prorrateo') + ->from("{$this->getTable()} a") + ->joined($this->joinProrrateo()) + ->joined("JOIN `unidad_cierre` uc ON uc.`unidad` = a.`id` JOIN `proyecto_tipo_unidad` ptu ON ptu.`id` = a.`pt` - JOIN `tipo_unidad` tu ON tu.`id` = ptu.`tipo` -WHERE uc.`cierre` = ? -GROUP BY a.`id` -ORDER BY tu.`orden`, LPAD(a.`descripcion`, 4, '0')"; + JOIN `tipo_unidad` tu ON tu.`id` = ptu.`tipo`") + ->where('uc.cierre = ?') + ->group('a.id') + ->order("tu.orden, LPAD(a.descripcion, 4, '0')"); return $this->fetchMany($query, [$cierre_id]); } public function fetchByProyecto(int $proyecto_id): array { - $query = "SELECT a.* -FROM `{$this->getTable()}` a - JOIN `proyecto_tipo_unidad` ptu ON ptu.`id` = a.`pt` - JOIN `tipo_unidad` tu ON tu.`id` = ptu.`tipo` -WHERE ptu.`proyecto` = ? -ORDER BY tu.`orden`"; + $query = $this->connection->getQueryBuilder() + ->select('a.*, up.prorrateo') + ->from("{$this->getTable()} a") + ->joined($this->joinProrrateo()) + ->joined("JOIN `proyecto_tipo_unidad` ptu ON ptu.`id` = a.`pt` + JOIN `tipo_unidad` tu ON tu.`id` = ptu.`tipo`") + ->where('ptu.proyecto = ?') + ->order('tu.orden'); return $this->fetchMany($query, [$proyecto_id]); } public function fetchDisponiblesByProyecto(int $proyecto_id): array { - $query = "SELECT DISTINCT a.* -FROM `{$this->getTable()}` a - JOIN `proyecto_tipo_unidad` ptu ON ptu.`id` = a.`pt` + $query = $this->connection->getQueryBuilder() + ->select('DISTINCT a.*, up.prorrateo') + ->from("{$this->getTable()} a") + ->joined($this->joinProrrateo()) + ->joined("JOIN `proyecto_tipo_unidad` ptu ON ptu.`id` = a.`pt` JOIN `tipo_unidad` tu ON tu.`id` = ptu.`tipo` LEFT OUTER JOIN `propiedad_unidad` pu ON pu.`unidad` = a.`id` LEFT OUTER JOIN `venta` ON `venta`.`propiedad` = `pu`.`propiedad` LEFT OUTER JOIN (SELECT ev1.* FROM `estado_venta` ev1 JOIN (SELECT MAX(`id`) as 'id', `venta` FROM `estado_venta`) ev0 ON ev0.`id` = ev1.`id`) ev ON ev.`venta` = `venta`.`id` - LEFT OUTER JOIN `tipo_estado_venta` tev ON tev.`id` = ev.`estado` -WHERE ptu.`proyecto` = ? AND (pu.`id` IS NULL OR `venta`.`id` IS NULL OR tev.`activa` = 0) -ORDER BY tu.`orden`"; + LEFT OUTER JOIN `tipo_estado_venta` tev ON tev.`id` = ev.`estado`") + ->where("ptu.`proyecto` = ? AND (pu.`id` IS NULL OR `venta`.`id` IS NULL OR tev.`activa` = 0)") + ->order('tu.orden'); return $this->fetchMany($query, [$proyecto_id]); } public function fetchDisponiblesByDescripcionAndTipo(string $descripcion, string $tipo): array { - $query = "SELECT DISTINCT a.* -FROM `{$this->getTable()}` a - JOIN `proyecto_tipo_unidad` ptu ON ptu.`id` = a.`pt` + $query = $this->connection->getQueryBuilder() + ->select('DISTINCT a.*, up.prorrateo') + ->from("{$this->getTable()} a") + ->joined($this->joinProrrateo()) + ->joined("JOIN `proyecto_tipo_unidad` ptu ON ptu.`id` = a.`pt` JOIN `tipo_unidad` tu ON tu.`id` = ptu.`tipo` LEFT OUTER JOIN `propiedad_unidad` pu ON pu.`unidad` = a.`id` LEFT OUTER JOIN `venta` ON `venta`.`propiedad` = pu.`propiedad` LEFT OUTER JOIN (SELECT ev1.* FROM `estado_venta` ev1 JOIN (SELECT MAX(`id`) as 'id', `venta` FROM `estado_venta`) ev0 ON ev0.`id` = ev1.`id`) ev ON ev.`venta` = `venta`.`id` - LEFT OUTER JOIN `tipo_estado_venta` tev ON tev.`id` = ev.`estado` -WHERE a.`descripcion` LIKE ? AND tu.`descripcion` = ? AND (pu.`id` IS NULL OR `venta`.`id` IS NULL OR tev.`activa` = 0)"; + LEFT OUTER JOIN `tipo_estado_venta` tev ON tev.`id` = ev.`estado`") + ->where("a.`descripcion` LIKE ? AND tu.`descripcion` = ? AND (pu.`id` IS NULL OR `venta`.`id` IS NULL OR tev.`activa` = 0)"); return $this->fetchMany($query, [$descripcion, $tipo]); } + + protected function joinProrrateo(): string + { + return "LEFT OUTER JOIN unidad_prorrateo up ON up.unidad_id = a.id"; + } } diff --git a/app/src/Service/Money.php b/app/src/Service/Money.php index 3cb7df8..b4d581c 100644 --- a/app/src/Service/Money.php +++ b/app/src/Service/Money.php @@ -2,6 +2,8 @@ namespace Incoviba\Service; use DateTimeInterface; +use DateTimeImmutable; +use DateInterval; use Incoviba\Common\Define\Money\Provider; use Incoviba\Common\Implement\Exception\EmptyResponse; use Incoviba\Service\Money\MiIndicador; @@ -22,6 +24,15 @@ class Money return $this->providers[$name]; } + public function get(string $provider, DateTimeInterface $dateTime): float + { + try { + $upper = strtoupper($provider); + return $this->getProvider($provider)->get(MiIndicador::getSymbol($provider), $dateTime); + } catch (EmptyResponse) { + return 0; + } + } public function getUF(DateTimeInterface $dateTime): float { try { diff --git a/app/src/Service/Money/MiIndicador.php b/app/src/Service/Money/MiIndicador.php index 113bc30..a223250 100644 --- a/app/src/Service/Money/MiIndicador.php +++ b/app/src/Service/Money/MiIndicador.php @@ -36,4 +36,11 @@ class MiIndicador implements Provider } return $json->serie[0]->valor; } + public static function getSymbol(string $identifier): string + { + $upper = strtoupper($identifier); + $output = ''; + eval("\$output = self::{$upper};"); + return $output; + } } diff --git a/app/src/Service/Proyecto.php b/app/src/Service/Proyecto.php index c6de619..2facad9 100644 --- a/app/src/Service/Proyecto.php +++ b/app/src/Service/Proyecto.php @@ -15,6 +15,10 @@ class Proyecto { return $this->proyectoRepository->fetchAllActive(); } + public function getEscriturando(): array + { + return $this->proyectoRepository->fetchAllEscriturando(); + } public function getById(int $venta_id): Model\Proyecto { return $this->process($this->proyectoRepository->fetchById($venta_id)); diff --git a/app/src/Service/Venta/Unidad.php b/app/src/Service/Venta/Unidad.php index b690a2f..899580e 100644 --- a/app/src/Service/Venta/Unidad.php +++ b/app/src/Service/Venta/Unidad.php @@ -15,35 +15,32 @@ class Unidad public function getById(int $unidad_id): Model\Venta\Unidad { - $unidad = $this->unidadRepository->fetchById($unidad_id); - $this->fillPrecios($unidad); - return $unidad; + return $this->process($this->unidadRepository->fetchById($unidad_id)); + } + public function getByVenta(int $venta_id): array + { + return array_map([$this, 'process'], $this->unidadRepository->fetchByVenta($venta_id)); } public function getByPropiedad(int $propiedad_id): array { - $unidades = $this->unidadRepository->fetchByPropiedad($propiedad_id); - array_walk($unidades, [$this, 'fillPrecios']); - return $unidades; + return array_map([$this, 'process'], $this->unidadRepository->fetchByPropiedad($propiedad_id)); } public function getByCierre(int $cierre_id): array { - $unidades = $this->unidadRepository->fetchByCierre($cierre_id); - array_walk($unidades, [$this, 'fillPrecios']); - return $unidades; + return array_map([$this, 'process'], $this->unidadRepository->fetchByCierre($cierre_id)); } public function getDisponiblesByProyecto(int $proyecto_id): array { - $unidades = $this->unidadRepository->fetchDisponiblesByProyecto($proyecto_id); - //array_walk($unidades, [$this, 'fillPrecios']); - return $unidades; + return $this->unidadRepository->fetchDisponiblesByProyecto($proyecto_id); } - protected function fillPrecios(&$unidad): void + protected function process($unidad): Model\Venta\Unidad { try { $unidad->precios = $this->precioService->getByUnidad($unidad->id); $unidad->currentPrecio = $this->precioService->getVigenteByUnidad($unidad->id); } catch (EmptyResult) { } + return $unidad; } } From bf03e85975551d213ee6f7656d73608874ae8635 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Thu, 23 Nov 2023 00:53:49 -0300 Subject: [PATCH 028/163] Redis --- app/resources/routes/api/direcciones.php | 2 +- app/resources/routes/api/provincias.php | 2 +- app/resources/routes/api/regiones.php | 3 +- app/resources/views/login/form.blade.php | 10 +- app/resources/views/search.blade.php | 9 +- app/setup/setups/middlewares.php | 2 + app/src/Controller/API/Direcciones.php | 65 ++++++++++ app/src/Controller/API/Money.php | 18 +-- app/src/Controller/API/Provincias.php | 39 ++++++ app/src/Controller/API/Proyectos.php | 72 +++++++---- .../API/Proyectos/EstadosProyectos.php | 71 ++++++++--- app/src/Controller/API/Regiones.php | 39 ++++++ app/src/Controller/API/Ventas.php | 115 ++++++++++++------ app/src/Controller/API/Ventas/Cierres.php | 85 ++++++++----- app/src/Controller/API/Ventas/Cuotas.php | 24 ++-- app/src/Controller/API/Ventas/Facturacion.php | 17 +-- app/src/Controller/API/Ventas/Precios.php | 43 +++++-- app/src/Controller/API/Ventas/Unidades.php | 8 +- app/src/Controller/Direcciones.php | 39 ------ app/src/Controller/Inmobiliarias.php | 32 ++++- app/src/Controller/Login.php | 13 +- app/src/Controller/Provincias.php | 28 ----- app/src/Controller/Proyectos.php | 59 ++++++--- app/src/Controller/Regiones.php | 28 ----- app/src/Controller/Ventas.php | 28 +++-- app/src/Controller/{API => }/withRedis.php | 2 +- app/src/Middleware/Authentication.php | 15 ++- app/src/Repository/Proyecto.php | 2 +- app/src/Repository/Venta/Subsidio.php | 11 +- app/src/Service/Proyecto.php | 10 +- app/src/Service/Search.php | 18 ++- app/src/Service/Venta.php | 4 +- 32 files changed, 599 insertions(+), 314 deletions(-) create mode 100644 app/src/Controller/API/Direcciones.php create mode 100644 app/src/Controller/API/Provincias.php create mode 100644 app/src/Controller/API/Regiones.php delete mode 100644 app/src/Controller/Direcciones.php delete mode 100644 app/src/Controller/Provincias.php delete mode 100644 app/src/Controller/Regiones.php rename app/src/Controller/{API => }/withRedis.php (95%) diff --git a/app/resources/routes/api/direcciones.php b/app/resources/routes/api/direcciones.php index 5f2d740..61ea957 100644 --- a/app/resources/routes/api/direcciones.php +++ b/app/resources/routes/api/direcciones.php @@ -1,5 +1,5 @@ group('/direcciones', function($app) { $app->group('/region/{region_id:[0-9]+}', function($app) { diff --git a/app/resources/routes/api/provincias.php b/app/resources/routes/api/provincias.php index 188986c..f7bccb7 100644 --- a/app/resources/routes/api/provincias.php +++ b/app/resources/routes/api/provincias.php @@ -1,5 +1,5 @@ group('/provincia/{provincia_id}', function($app) { $app->get('/comunas', [Provincias::class, 'comunas']); diff --git a/app/resources/routes/api/regiones.php b/app/resources/routes/api/regiones.php index 14ccd9c..3f48645 100644 --- a/app/resources/routes/api/regiones.php +++ b/app/resources/routes/api/regiones.php @@ -1,5 +1,6 @@ group('/regiones', function($app) {}); $app->group('/region/{region_id}', function($app) { diff --git a/app/resources/views/login/form.blade.php b/app/resources/views/login/form.blade.php index 31e38ff..1352f74 100644 --- a/app/resources/views/login/form.blade.php +++ b/app/resources/views/login/form.blade.php @@ -34,11 +34,11 @@ } }).then(data => { if (data.login === true) { - @if(isset($redirect_uri)) - window.location = '{{$redirect_uri}}' - @else - window.location = '{{$urls->base}}' - @endif + @if(isset($redirect_uri)) + window.location = '{{$redirect_uri}}' + @else + window.location = '{{$urls->base}}' + @endif } }) } diff --git a/app/resources/views/search.blade.php b/app/resources/views/search.blade.php index 6bcd790..59dbc46 100644 --- a/app/resources/views/search.blade.php +++ b/app/resources/views/search.blade.php @@ -6,7 +6,7 @@
    -
    +
    @@ -65,6 +65,9 @@ unidad += '' } + const numberFormat = new Intl.NumberFormat('es-CL', {minimumFractionDigits: 2, maximumFractionDigits: 2}) + const superficie = numberFormat.format(Math.round(this.unidad.proyecto_tipo_unidad.superficie * 100) / 100) + return $('').append( $('').append( $('').attr('href', '{{$urls->base}}/proyecto/' + this.proyecto.id).html(this.proyecto.descripcion) @@ -76,9 +79,9 @@ ).append( $('').append(propietario) ).append( - $('').addClass('right aligned').html(Math.round(this.unidad.proyecto_tipo_unidad.superficie * 100) / 100 + ' m²') + $('').addClass('right aligned').html(superficie + ' m²') ).append( - $('').addClass('right aligned').html(this.unidad.precio) + $('').addClass('right aligned').html(numberFormat.format(this.unidad.precio)) ).append( $('').html(fecha) ).append( diff --git a/app/setup/setups/middlewares.php b/app/setup/setups/middlewares.php index 5c5f23f..df7a7e2 100644 --- a/app/setup/setups/middlewares.php +++ b/app/setup/setups/middlewares.php @@ -9,6 +9,8 @@ return [ return new Incoviba\Middleware\Authentication( $container->get(Psr\Http\Message\ResponseFactoryInterface::class), $container->get(Incoviba\Service\Login::class), + $container->get(Psr\Log\LoggerInterface::class), + $container->get(Incoviba\Common\Alias\View::class), implode('/', [$container->get('APP_URL'), 'login']) ); } diff --git a/app/src/Controller/API/Direcciones.php b/app/src/Controller/API/Direcciones.php new file mode 100644 index 0000000..f7527c9 --- /dev/null +++ b/app/src/Controller/API/Direcciones.php @@ -0,0 +1,65 @@ + 0, 'comunas' => []]; + $redisKey = 'comunas'; + try { + $output['comunas'] = $this->fetchRedis($redisService, $redisKey); + $output['total'] = count($output['comunas']); + } catch (EmptyRedis) { + $provinciaKey = 'provincias'; + try { + $temp_provincias = $this->fetchRedis($redisService, $provinciaKey); + } catch (EmptyRedis) { + $temp_provincias = $provinciaRepository->fetchByRegion($region_id); + $this->saveRedis($redisService, $provinciaKey, $temp_provincias, 60 * 60 * 24 * 30); + } + $comunas = []; + foreach($temp_provincias as $provincia) { + $temp_comunas = $comunaRepository->fetchByProvincia($provincia->id); + $comunas = array_merge($comunas, $temp_comunas); + } + usort($comunas, function(Model\Comuna $a, Model\Comuna $b) { + return strcoll($a->descripcion, $b->descripcion); + }); + $output = ['comunas' => $comunas, 'total' => count($comunas)]; + $this->saveRedis($redisService, $redisKey, $comunas, 60 * 60 * 24 * 30); + } + return $this->withJson($response, $output); + } + public function findComunas(ServerRequestInterface $request, ResponseInterface $response, Service\Redis $redisService, + Repository\Comuna $comunaRepository): ResponseInterface + { + $body = $request->getBody(); + $json = json_decode($body->getContents()); + $output = ['input' => $json, 'total' => 0, 'comunas' => []]; + $redisKey = "comunas:direccion:{$json->direccion}"; + try { + $output['comunas'] = $this->fetchRedis($redisService, $redisKey); + } catch (EmptyRedis) { + try { + $comunas = $comunaRepository->fetchByDireccion($json->direccion); + $output['comunas'] = $comunas; + $output['total'] = count($comunas); + $this->saveRedis($redisService, $redisKey, $comunas); + } catch (EmptyResult) {} + } + return $this->withJson($response, $output); + } +} diff --git a/app/src/Controller/API/Money.php b/app/src/Controller/API/Money.php index 74d0527..252bfc8 100644 --- a/app/src/Controller/API/Money.php +++ b/app/src/Controller/API/Money.php @@ -1,13 +1,14 @@ getParsedBody(); $output = [ @@ -42,7 +44,8 @@ class Money } protected array $data; - protected function getValue(Service\Redis $redisService, string $redisKey, Service\Money $moneyService, DateTimeInterface $date, string $provider): float + protected function getValue(Service\Redis $redisService, string $redisKey, Service\Money $moneyService, + DateTimeInterface $date, string $provider): float { if (isset($this->data[$date->format('Y-m-d')])) { return $this->data[$date->format('Y-m-d')]; @@ -85,7 +88,8 @@ class Money $output['uf'] = $ufs[$date->format('Y-m-d')]; return $this->withJson($response, $output); }*/ - public function ipc(ServerRequestInterface $request, ResponseInterface $response, Service\Redis $redisService, Service\Money $moneyService): ResponseInterface + public function ipc(ServerRequestInterface $request, ResponseInterface $response, Service\Redis $redisService, + Service\Money $moneyService): ResponseInterface { $data = $request->getParsedBody(); $output = [ diff --git a/app/src/Controller/API/Provincias.php b/app/src/Controller/API/Provincias.php new file mode 100644 index 0000000..99c55b5 --- /dev/null +++ b/app/src/Controller/API/Provincias.php @@ -0,0 +1,39 @@ + $provincia_id, + 'comunas' => [] + ]; + $redisKey = "comunas:provincia:{$provincia_id}"; + try { + $output['comunas'] = $this->fetchRedis($redisService, $redisKey); + } catch (EmptyRedis) { + try { + $comunas = $comunaRepository->fetchByProvincia($provincia_id); + usort($comunas, function(Model\Comuna $a, Model\Comuna $b) { + return strcmp($a->descripcion, $b->descripcion); + }); + $output['comunas'] = $comunas; + $this->saveRedis($redisService, $redisKey, $comunas, 60 * 60 * 24 * 30); + } catch (EmptyResult) {} + } + return $this->withJson($response, $output); + } +} diff --git a/app/src/Controller/API/Proyectos.php b/app/src/Controller/API/Proyectos.php index 2cf3608..cff4441 100644 --- a/app/src/Controller/API/Proyectos.php +++ b/app/src/Controller/API/Proyectos.php @@ -1,39 +1,51 @@ 0]; + $output = ['total' => 0, 'proyectos' => []]; + $redisKey = 'proyectos:activos'; try { - $proyectos = $proyectoRepository->fetchAllActive(); - $output['proyectos'] = $proyectos; - $output['total'] = count($proyectos); - } catch (EmptyResult) {} + $output['proyectos'] = $this->fetchRedis($redisService, $redisKey); + $output['total'] = count($output['proyectos']); + } catch (EmptyRedis) { + try { + $output['proyectos'] = $proyectoRepository->fetchAllActive(); + $output['total'] = count($output['proyectos']); + $this->saveRedis($redisService, $redisKey, $output['proyectos']); + } catch (EmptyResult) {} + } return $this->withJson($response, $output); } - public function escriturando(ServerRequestInterface $request, ResponseInterface $response, Repository\Proyecto $proyectoRepository): ResponseInterface + public function escriturando(ServerRequestInterface $request, ResponseInterface $response, + Service\Redis $redisService, Repository\Proyecto $proyectoRepository): ResponseInterface { - $output = [ - 'total' => 0, - 'proyectos' => [] - ]; + $output = ['total' => 0, 'proyectos' => []]; + $redisKey = 'proyectos:escriturando'; try { - $proyectos = $proyectoRepository->fetchAllEscriturando(); - $output['proyectos'] = $proyectos; - $output['total'] = count($proyectos); - } catch (EmptyResult) {} + $output['proyectos'] = $this->fetchRedis($redisService, $redisKey); + $output['total'] = count($output['proyectos']); + } catch (EmptyRedis) { + try { + $output['proyectos'] = $proyectoRepository->fetchAllEscriturando(); + $output['total'] = count($output['proyectos']); + $this->saveRedis($redisService, $redisKey, $output['proyectos']); + } catch (EmptyResult) {} + } return $this->withJson($response, $output); } public function unidades(ServerRequestInterface $request, ResponseInterface $response, @@ -41,7 +53,7 @@ class Proyectos int $proyecto_id): ResponseInterface { $output = ['proyecto_id' => $proyecto_id, 'unidades' => [], 'total' => 0]; - $redisKey = "unidades-proyecto-{$proyecto_id}"; + $redisKey = "unidades:proyecto:{$proyecto_id}"; try { $output = $this->fetchRedis($redisService, $redisKey); } catch (EmptyRedis) { @@ -66,21 +78,29 @@ class Proyectos } return $this->withJson($response, $output); } - public function disponibles(ServerRequestInterface $request, ResponseInterface $response, Repository\Venta\Unidad $unidadRepository, int $proyecto_id): ResponseInterface + public function disponibles(ServerRequestInterface $request, ResponseInterface $response, + Service\Redis $redisService, Repository\Venta\Unidad $unidadRepository, + int $proyecto_id): ResponseInterface { $output = [ 'proyecto_id' => $proyecto_id, 'unidades' => [] ]; + $redisKey = "unidades:disponibles:proyecto:{$proyecto_id}"; try { - $output['unidades'] = $unidadRepository->fetchDisponiblesByProyecto($proyecto_id); - } catch (EmptyResult) {} + $output['unidades'] = $this->fetchRedis($redisService, $redisKey); + } catch (EmptyRedis) { + try { + $output['unidades'] = $unidadRepository->fetchDisponiblesByProyecto($proyecto_id); + $this->saveRedis($redisService, $redisKey, $output['unidades']); + } catch (EmptyResult) {} + } return $this->withJson($response, $output); } public function superficies(ServerRequestInterface $request, ResponseInterface $response, - Repository\Proyecto $proyectoRepository, Repository\Venta $ventaRepository, - Repository\Venta\Unidad $unidadRepository, Service\Redis $redisService, - Service\Format $formatService, int $proyecto_id): ResponseInterface + Repository\Venta $ventaRepository, Repository\Venta\Unidad $unidadRepository, + Service\Redis $redisService, Service\Format $formatService, + int $proyecto_id): ResponseInterface { $output = [ 'proyecto_id' => $proyecto_id, @@ -95,7 +115,7 @@ class Proyectos 'por_vender' => '0m²' ] ]; - $redisKey = "superficices-proyecto-{$proyecto_id}"; + $redisKey = "superficices:proyecto:{$proyecto_id}"; try { $output = $this->fetchRedis($redisService, $redisKey); } catch (EmptyRedis) { diff --git a/app/src/Controller/API/Proyectos/EstadosProyectos.php b/app/src/Controller/API/Proyectos/EstadosProyectos.php index 9fc451f..8634565 100644 --- a/app/src/Controller/API/Proyectos/EstadosProyectos.php +++ b/app/src/Controller/API/Proyectos/EstadosProyectos.php @@ -1,65 +1,98 @@ $proyecto_id, 'estados' => [] ]; + $redisKey = "estados:proyecto:{$proyecto_id}"; try { - $output['estados'] = $estadoProyectoRepository->fetchByProyecto($proyecto_id); - } catch (EmptyResult) { - return $this->emptyBody($response); + $output['estados'] = $this->fetchRedis($redisService, $redisKey); + } catch (EmptyRedis) { + try { + $output['estados'] = $estadoProyectoRepository->fetchByProyecto($proyecto_id); + $this->saveRedis($redisService, $redisKey, $output['estados']); + } catch (EmptyResult) { + return $this->emptyBody($response); + } } return $this->withJson($response, $output); } - public function currentByProyecto(ServerRequestInterface $request, ResponseInterface $response, Repository\Proyecto\EstadoProyecto $estadoProyectoRepository, int $proyecto_id): ResponseInterface + public function currentByProyecto(ServerRequestInterface $request, ResponseInterface $response, Service\Redis $redisService, + Repository\Proyecto\EstadoProyecto $estadoProyectoRepository, int $proyecto_id): ResponseInterface { $output = [ 'proyecto_id' => $proyecto_id, 'estado' => null ]; + $redisKey = "estado:proyecto:{$proyecto_id}"; try { - $output['estado'] = $estadoProyectoRepository->fetchCurrentByProyecto($proyecto_id); - } catch (EmptyResult) { - return $this->emptyBody($response); + $output['estado'] = $this->fetchRedis($redisService, $redisKey); + } catch (EmptyRedis) { + try { + $output['estado'] = $estadoProyectoRepository->fetchCurrentByProyecto($proyecto_id); + $this->saveRedis($redisService, $redisKey, $output['estado']); + } catch (EmptyResult) { + return $this->emptyBody($response); + } } return $this->withJson($response, $output); } - public function firstByProyecto(ServerRequestInterface $request, ResponseInterface $response, Repository\Proyecto\EstadoProyecto $estadoProyectoRepository, int $proyecto_id): ResponseInterface + public function firstByProyecto(ServerRequestInterface $request, ResponseInterface $response, Service\Redis $redisService, + Repository\Proyecto\EstadoProyecto $estadoProyectoRepository, int $proyecto_id): ResponseInterface { $output = [ 'proyecto_id' => $proyecto_id, 'estado' => null ]; + $redisKey = "estado:proyecto:{$proyecto_id}:first"; try { - $output['estado'] = $estadoProyectoRepository->fetchFirstByProyecto($proyecto_id); - } catch (EmptyResult) { - return $this->emptyBody($response); + $output['estado'] = $this->fetchRedis($redisService, $redisKey); + } catch (EmptyRedis) { + try { + $output['estado'] = $estadoProyectoRepository->fetchFirstByProyecto($proyecto_id); + $this->saveRedis($redisService, $redisKey, $output['estado']); + } catch (EmptyResult) { + return $this->emptyBody($response); + } } return $this->withJson($response, $output); } - public function recepcionByProyecto(ServerRequestInterface $request, ResponseInterface $response, Repository\Proyecto\EstadoProyecto $estadoProyectoRepository, int $proyecto_id): ResponseInterface + public function recepcionByProyecto(ServerRequestInterface $request, ResponseInterface $response, + Service\Redis $redisService, + Repository\Proyecto\EstadoProyecto $estadoProyectoRepository, + int $proyecto_id): ResponseInterface { $output = [ 'proyecto_id' => $proyecto_id, 'estado' => null ]; + $redisKey = "recepcion:proyecto:{$proyecto_id}"; try { - $output['estado'] = $estadoProyectoRepository->fetchRecepcionByProyecto($proyecto_id); - } catch (EmptyResult) { - return $this->emptyBody($response); + $output['estado'] = $this->fetchRedis($redisService, $redisKey); + } catch (EmptyRedis) { + try { + $output['estado'] = $estadoProyectoRepository->fetchRecepcionByProyecto($proyecto_id); + $this->saveRedis($redisService, $redisKey, $output['estado']); + } catch (EmptyResult) { + return $this->emptyBody($response); + } } return $this->withJson($response, $output); } diff --git a/app/src/Controller/API/Regiones.php b/app/src/Controller/API/Regiones.php new file mode 100644 index 0000000..75ac94f --- /dev/null +++ b/app/src/Controller/API/Regiones.php @@ -0,0 +1,39 @@ + $region_id, + 'provincias' => [] + ]; + $redisKey = "provincias:region:{$region_id}"; + try { + $output['provincias'] = $this->fetchRedis($redisService, $redisKey); + } catch (EmptyRedis) { + try { + $provincias = $provinciaRepository->fetchByRegion($region_id); + usort($provincias, function(Model\Provincia $a, Model\Provincia $b) { + return strcmp($a->descripcion, $b->descripcion); + }); + $output['provincias'] = $provincias; + $this->saveRedis($redisService, $redisKey, $output['provincias'], 60 * 60 * 24 * 30); + } catch (EmptyResult) {} + } + return $this->withJson($response, $output); + } +} diff --git a/app/src/Controller/API/Ventas.php b/app/src/Controller/API/Ventas.php index c069dd3..770cc12 100644 --- a/app/src/Controller/API/Ventas.php +++ b/app/src/Controller/API/Ventas.php @@ -2,19 +2,21 @@ namespace Incoviba\Controller\API; use DateTimeImmutable; -use Psr\Http\Message\ResponseInterface; -use Psr\Http\Message\ServerRequestInterface; use Incoviba\Common\Implement\Exception\EmptyRedis; use Incoviba\Common\Implement\Exception\EmptyResult; +use Incoviba\Controller\withRedis; use Incoviba\Model; use Incoviba\Repository; use Incoviba\Service; +use Psr\Http\Message\ResponseInterface; +use Psr\Http\Message\ServerRequestInterface; class Ventas { use withJson, withRedis; - public function proyecto(ServerRequestInterface $request, ResponseInterface $response, Repository\Venta $service): ResponseInterface + public function proyecto(ServerRequestInterface $request, ResponseInterface $response, Service\Redis $redisService, + Repository\Proyecto $proyectoRepository, Repository\Venta $ventaRepository): ResponseInterface { $body = $request->getBody(); $json = json_decode($body->getContents()); @@ -25,26 +27,50 @@ class Ventas ], 'total' => 0 ]; + $proyectosKey = "proyectos"; try { - $ventas = $service->fetchActivaByProyecto($proyecto_id); - $output['ventas'] = array_map(function(Model\Venta $venta) {return $venta->id;}, $ventas); - $output['proyecto']['descripcion'] = $ventas[0]->proyecto()->descripcion; - $output['total'] = count($ventas); - } catch (EmptyResult) {} + $proyectos = $this->fetchRedis($redisService, $proyectosKey); + } catch (EmptyRedis) { + $proyectos = $proyectoRepository->fetchAllActive(); + $this->saveRedis($redisService, $proyectosKey, $proyectos); + } + $proyecto = array_values(array_filter($proyectos, function($proyecto) use ($proyecto_id) {return $proyecto->id === $proyecto_id;}))[0]; + $output['proyecto']['descripcion'] = $proyecto->descripcion; + + $redisKey = "ventas:proyecto:{$proyecto_id}"; + try { + $output['ventas'] = $this->fetchRedis($redisService, $redisKey); + $output['total'] = count($output['ventas']); + } catch (EmptyRedis) { + try { + $ventas = $ventaRepository->fetchActivaByProyecto($proyecto_id); + $output['ventas'] = array_map(function(Model\Venta $venta) {return $venta->id;}, $ventas); + $output['total'] = count($ventas); + $this->saveRedis($redisService, $redisKey, $output['ventas']); + } catch (EmptyResult) {} + } return $this->withJson($response, $output); } - public function get(ServerRequestInterface $request, ResponseInterface $response, Service\Venta $service, int $venta_id): ResponseInterface + public function get(ServerRequestInterface $request, ResponseInterface $response, Service\Redis $redisService, + Service\Venta $service, int $venta_id): ResponseInterface { + $redisKey = "venta:{$venta_id}"; try { - $venta = $service->getById($venta_id); + $venta = $this->fetchRedis($redisService, $redisKey); $output = compact('venta'); - } catch (EmptyResult $exception) { - $output = [ - 'error' => [ - 'code' => $exception->getCode(), - 'message' => str_replace([PHP_EOL, "\r"], [' ', ''], $exception->getMessage()) - ] - ]; + } catch (EmptyRedis) { + try { + $venta = $service->getById($venta_id); + $output = compact('venta'); + $this->saveRedis($redisService, $redisKey, $venta); + } catch (EmptyResult $exception) { + $output = [ + 'error' => [ + 'code' => $exception->getCode(), + 'message' => str_replace([PHP_EOL, "\r"], [' ', ''], $exception->getMessage()) + ] + ]; + } } return $this->withJson($response, $output); } @@ -54,7 +80,7 @@ class Ventas $json = json_decode($body->getContents()); $proyecto_id = $json->proyecto_id; $today = new DateTimeImmutable(); - $redisKey = "promesas_por_firmar-proyecto-{$proyecto_id}-{$today->format('Y-m-d')}"; + $redisKey = "promesas:por_firmar:proyecto:{$proyecto_id}:{$today->format('Y-m-d')}"; $output = [ 'proyecto_id' => $proyecto_id, @@ -80,7 +106,7 @@ class Ventas $json = json_decode($body->getContents()); $proyecto_id = $json->proyecto_id; $today = new DateTimeImmutable(); - $redisKey = "escrituras-proyecto-{$proyecto_id}-{$today->format('Y-m-d')}"; + $redisKey = "escrituras:proyecto:{$proyecto_id}:{$today->format('Y-m-d')}"; $output = [ 'proyecto_id' => $proyecto_id, @@ -127,18 +153,27 @@ class Ventas } return $this->withJson($response, $output); } - public function comentarios(ServerRequestInterface $request, ResponseInterface $response, Service\Venta $service, Repository\Venta\Comentario $comentarioRepository, int $venta_id): ResponseInterface + public function comentarios(ServerRequestInterface $request, ResponseInterface $response, Service\Redis $redisService, + Service\Venta $service, Repository\Venta\Comentario $comentarioRepository, int $venta_id): ResponseInterface { $venta = $service->getById($venta_id); - $output = ['total' => 0]; + $output = ['total' => 0, 'comentarios' => []]; + $redisKey = "comentarios:venta:{$venta_id}"; try { - $comentarios = $comentarioRepository->fetchByVenta($venta->id); - $output['total'] = count($comentarios); - $output['comentarios'] = $comentarios; - } catch (EmptyResult) {} + $output['comentarios'] = $this->fetchRedis($redisService, $redisKey); + $output['total'] = count($output['comentarios']); + } catch (EmptyRedis) { + try { + $comentarios = $comentarioRepository->fetchByVenta($venta->id); + $output['total'] = count($comentarios); + $output['comentarios'] = $comentarios; + $this->saveRedis($redisService, $redisKey, $output['comentarios']); + } catch (EmptyResult) {} + } return $this->withJson($response, $output); } - public function add(ServerRequestInterface $request, ResponseInterface $response, Service\Venta $ventaService): ResponseInterface + public function add(ServerRequestInterface $request, ResponseInterface $response, Service\Redis $redisService, + Service\Venta $ventaService): ResponseInterface { $data = $request->getParsedBody(); $output = [ @@ -146,28 +181,36 @@ class Ventas 'errors' => [] ]; try { - $ventaService->add($data); + $venta = $ventaService->add($data); + $this->saveRedis($redisService, "venta:{$venta->id}", $venta); $output['status'] = true; } catch (\Exception $exception) { $output['errors'] = $exception; } return $this->withJson($response, $output); } - public function unidades(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\Unidad $unidadService, int $venta_id): ResponseInterface + public function unidades(ServerRequestInterface $request, ResponseInterface $response, Service\Redis $redisService, + Service\Venta\Unidad $unidadService, int $venta_id): ResponseInterface { $output = [ 'venta_id' => $venta_id, 'unidades' => [] ]; + $redisKey = "unidades:venta:{$venta_id}"; try { - $unidades = $unidadService->getByVenta($venta_id); - $output['unidades'] = json_decode(json_encode($unidades)); - array_walk($output['unidades'], function($unidad, $index, $unidades) { - $unidad->prorrateo = $unidades[$index]->prorrateo; - $unidad->precios = $unidades[$index]->precios; - $unidad->current_precio = $unidades[$index]->currentPrecio; - }, $unidades); - } catch (EmptyResult) {} + $output['unidades'] = $this->fetchRedis($redisService, $redisKey); + } catch (EmptyRedis) { + try { + $unidades = $unidadService->getByVenta($venta_id); + $output['unidades'] = json_decode(json_encode($unidades)); + array_walk($output['unidades'], function($unidad, $index, $unidades) { + $unidad->prorrateo = $unidades[$index]->prorrateo; + $unidad->precios = $unidades[$index]->precios; + $unidad->current_precio = $unidades[$index]->currentPrecio; + }, $unidades); + $this->saveRedis($redisService, $redisKey, $output['unidades']); + } catch (EmptyResult) {} + } return $this->withJson($response, $output); } } diff --git a/app/src/Controller/API/Ventas/Cierres.php b/app/src/Controller/API/Ventas/Cierres.php index 5531e7e..7acf4d9 100644 --- a/app/src/Controller/API/Ventas/Cierres.php +++ b/app/src/Controller/API/Ventas/Cierres.php @@ -1,55 +1,74 @@ getBody(); $json = json_decode($body->getContents()); $proyecto_id = $json->proyecto_id; - $output = ['total' => 0]; + $output = ['total' => 0, 'cierres' => []]; + $redisKey = "cierres:proyecto:{$proyecto_id}"; try { - $cierres = $service->getByProyecto($proyecto_id); - $output['cierres'] = $cierres; - $output['total'] = count($cierres); - } catch (EmptyResult) {} + $output['cierres'] = $this->fetchRedis($redisService, $redisKey); + $output['total'] = count($output['cierres']); + } catch (EmptyRedis) { + try { + $cierres = $service->getByProyecto($proyecto_id); + $output['cierres'] = $cierres; + $this->saveRedis($redisService, $redisKey, $output['cierres']); + $output['total'] = count($cierres); + } catch (EmptyResult) {} + } return $this->withJson($response, $output); } - public function vigentes(ServerRequestInterface $request, ResponseInterface $response, Repository\Venta\Cierre $cierreRepository): ResponseInterface + public function vigentes(ServerRequestInterface $request, ResponseInterface $response, Service\Redis $redisService, + Repository\Venta\Cierre $cierreRepository): ResponseInterface { - $cierres = $cierreRepository->fetchDatosVigentes(); - $output = []; - $estados = [ - 'revisado' => 'pendientes', - 'rechazado' => 'rechazados', - 'aprobado' => 'pendientes', - 'vendido' => 'promesados', - 'abandonado' => 'rechazados', - 'promesado' => 'promesados', - 'resciliado' => 'rechazados' - ]; - foreach ($cierres as $row) { - if (!isset($output[$row['Proyecto']])) { - $output[$row['Proyecto']] = [ - 'promesados' => 0, - 'pendientes' => 0, - 'rechazados' => 0, - 'total' => 0 + $output = ['cierres' => []]; + $redisKey = "cierres:vigentes"; + try { + $output['cierres'] = $this->fetchRedis($redisService, $redisKey); + } catch (EmptyRedis) { + try { + $cierres = $cierreRepository->fetchDatosVigentes(); + $estados = [ + 'revisado' => 'pendientes', + 'rechazado' => 'rechazados', + 'aprobado' => 'pendientes', + 'vendido' => 'promesados', + 'abandonado' => 'rechazados', + 'promesado' => 'promesados', + 'resciliado' => 'rechazados' ]; - } - $estado = $estados[$row['Estado']]; - $output[$row['Proyecto']][$estado] += $row['Cantidad']; - $output[$row['Proyecto']]['total'] += $row['Cantidad']; + foreach ($cierres as $row) { + if (!isset($output['cierres'][$row['Proyecto']])) { + $output['cierres'][$row['Proyecto']] = [ + 'promesados' => 0, + 'pendientes' => 0, + 'rechazados' => 0, + 'total' => 0 + ]; + } + $estado = $estados[$row['Estado']]; + $output['cierres'][$row['Proyecto']][$estado] += $row['Cantidad']; + $output['cierres'][$row['Proyecto']]['total'] += $row['Cantidad']; + } + $this->saveRedis($redisService, $redisKey, $output['cierres']); + } catch (EmptyRedis) {} } - return $this->withJson($response, ['cierres' => $output]); + return $this->withJson($response, $output); } } diff --git a/app/src/Controller/API/Ventas/Cuotas.php b/app/src/Controller/API/Ventas/Cuotas.php index 9e4bd87..102c324 100644 --- a/app/src/Controller/API/Ventas/Cuotas.php +++ b/app/src/Controller/API/Ventas/Cuotas.php @@ -1,24 +1,25 @@ format('Y-m-d')}"; + $redisKey = "cuotas:hoy:{$today->format('Y-m-d')}"; $output = [ 'cuotas' => 0 ]; @@ -32,10 +33,11 @@ class Cuotas } return $this->withJson($response, $output); } - public function pendiente(ServerRequestInterface $request, ResponseInterface $response, Repository\Venta\Cuota $cuotaRepository, Service\Redis $redisService): ResponseInterface + public function pendiente(ServerRequestInterface $request, ResponseInterface $response, + Repository\Venta\Cuota $cuotaRepository, Service\Redis $redisService): ResponseInterface { $today = new DateTimeImmutable(); - $redisKey = "cuotas_pendientes-{$today->format('Y-m-d')}"; + $redisKey = "cuotas:pendientes:{$today->format('Y-m-d')}"; $output = [ 'cuotas' => 0 ]; @@ -49,10 +51,12 @@ class Cuotas } return $this->withJson($response, $output); } - public function porVencer(ServerRequestInterface $request, ResponseInterface $response, Repository\Venta\Cuota $cuotaRepository, Service\Redis $redisService, Service\Format $formatService): ResponseInterface + public function porVencer(ServerRequestInterface $request, ResponseInterface $response, + Repository\Venta\Cuota $cuotaRepository, Service\Redis $redisService, + Service\Format $formatService): ResponseInterface { $today = new DateTimeImmutable(); - $redisKey = "cuotas_por_vencer-{$today->format('Y-m-d')}"; + $redisKey = "cuotas:por_vencer:{$today->format('Y-m-d')}"; try { $output = $this->fetchRedis($redisService, $redisKey); } catch (EmptyRedis) { diff --git a/app/src/Controller/API/Ventas/Facturacion.php b/app/src/Controller/API/Ventas/Facturacion.php index 2f94857..14477da 100644 --- a/app/src/Controller/API/Ventas/Facturacion.php +++ b/app/src/Controller/API/Ventas/Facturacion.php @@ -2,27 +2,28 @@ namespace Incoviba\Controller\API\Ventas; use DateTimeImmutable; +use Incoviba\Common\Implement\Exception\EmptyRedis; +use Incoviba\Common\Implement\Exception\EmptyResult; +use Incoviba\Controller\API\emptyBody; +use Incoviba\Controller\API\withJson; +use Incoviba\Controller\withRedis; +use Incoviba\Service; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; -use Incoviba\Service; -use Incoviba\Controller\API\withJson; -use Incoviba\Controller\API\withRedis; -use Incoviba\Controller\API\emptyBody; -use Incoviba\Common\Implement\Exception\EmptyResult; -use Incoviba\Common\Implement\Exception\EmptyRedis; class Facturacion { use withJson, withRedis, emptyBody; - public function proyecto(ServerRequestInterface $request, ResponseInterface $response, Service\Redis $redisService, Service\Venta $ventaService, int $proyecto_id): ResponseInterface + public function proyecto(ServerRequestInterface $request, ResponseInterface $response, Service\Redis $redisService, + Service\Venta $ventaService, int $proyecto_id): ResponseInterface { $output = [ 'proyecto_id' => $proyecto_id, 'ventas' => [] ]; $today = new DateTimeImmutable(); - $redisKey = "ventas_facturacion-proyecto-{$proyecto_id}-{$today->format('Y-m-d')}"; + $redisKey = "ventas:facturacion:proyecto:{$proyecto_id}:{$today->format('Y-m-d')}"; try { $output['ventas'] = $this->fetchRedis($redisService, $redisKey); } catch (EmptyRedis) { diff --git a/app/src/Controller/API/Ventas/Precios.php b/app/src/Controller/API/Ventas/Precios.php index 927e815..63b3cf9 100644 --- a/app/src/Controller/API/Ventas/Precios.php +++ b/app/src/Controller/API/Ventas/Precios.php @@ -1,36 +1,53 @@ getBody(); $json = json_decode($body->getContents()); $proyecto_id = $json->proyecto_id; - $output = ['total' => 0]; + $output = ['total' => 0, 'precios' => []]; + $redisKey = "precios:proyecto:{$proyecto_id}"; try { - $precios = $precioService->getByProyecto($proyecto_id); - $output['precios'] = $precios; - $output['total'] = count($precios); - } catch (EmptyResult) {} + $output['precios'] = $this->fetchRedis($redisService, $redisKey); + $output['total'] = count($output['precios']); + } catch (EmptyRedis) { + try { + $precios = $precioService->getByProyecto($proyecto_id); + $output['precios'] = $precios; + $output['total'] = count($precios); + $this->saveRedis($redisService, $redisKey, $output['precios']); + } catch (EmptyResult) {} + } return $this->withJson($response, $output); } - public function unidad(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\Precio $precioService, int $unidad_id): ResponseInterface + public function unidad(ServerRequestInterface $request, ResponseInterface $response, Service\Redis $redisService, + Service\Venta\Precio $precioService, int $unidad_id): ResponseInterface { + $redisKey = "precio:unidad:{$unidad_id}"; try { - $precio = $precioService->getVigenteByUnidad($unidad_id); + $precio = $this->fetchRedis($redisService, $redisKey); return $this->withJson($response, compact('precio')); - } catch (EmptyResult) { - return $this->emptyBody($response); + } catch (EmptyRedis) { + try { + $precio = $precioService->getVigenteByUnidad($unidad_id); + $this->saveRedis($redisService, $redisKey, $precio); + return $this->withJson($response, compact('precio')); + } catch (EmptyResult) { + return $this->emptyBody($response); + } } } } diff --git a/app/src/Controller/API/Ventas/Unidades.php b/app/src/Controller/API/Ventas/Unidades.php index 9f8538f..cc1843e 100644 --- a/app/src/Controller/API/Ventas/Unidades.php +++ b/app/src/Controller/API/Ventas/Unidades.php @@ -3,14 +3,14 @@ namespace Incoviba\Controller\API\Ventas; use DateTimeImmutable; use Incoviba\Common\Implement\Exception\EmptyRedis; -use Psr\Http\Message\ResponseInterface; -use Psr\Http\Message\ServerRequestInterface; use Incoviba\Common\Implement\Exception\EmptyResult; use Incoviba\Controller\API\withJson; -use Incoviba\Controller\API\withRedis; +use Incoviba\Controller\withRedis; use Incoviba\Model; use Incoviba\Repository; use Incoviba\Service; +use Psr\Http\Message\ResponseInterface; +use Psr\Http\Message\ServerRequestInterface; class Unidades { @@ -22,7 +22,7 @@ class Unidades $json = json_decode($body->getContents()); $proyecto_id = $json->proyecto_id; $today = new DateTimeImmutable(); - $redisKey = "unidades_disponibles-proyecto-{$proyecto_id}-{$today->format('Y-m-d')}"; + $redisKey = "unidades:disponibles:proyecto:{$proyecto_id}:{$today->format('Y-m-d')}"; $output = [ 'proyecto_id' => $proyecto_id, diff --git a/app/src/Controller/Direcciones.php b/app/src/Controller/Direcciones.php deleted file mode 100644 index 18024bf..0000000 --- a/app/src/Controller/Direcciones.php +++ /dev/null @@ -1,39 +0,0 @@ -fetchByRegion($region_id); - $comunas = []; - foreach($temp_provincias as $provincia) { - $temp_comunas = $comunaRepository->fetchByProvincia($provincia->id); - $comunas = array_merge($comunas, $temp_comunas); - } - usort($comunas, function(Model\Comuna $a, Model\Comuna $b) { - return strcoll($a->descripcion, $b->descripcion); - }); - $response->getBody()->write(json_encode(['comunas' => $comunas, 'total' => count($comunas)])); - return $response->withHeader('Content-Type', 'application/json'); - } - public function findComunas(ServerRequestInterface $request, ResponseInterface $response, Repository\Comuna $comunaRepository): ResponseInterface - { - $body = $request->getBody(); - $json = json_decode($body->getContents()); - $output = ['total' => 0]; - try { - $comunas = $comunaRepository->fetchByDireccion($json->direccion); - $output['comunas'] = $comunas; - $output['total'] = count($comunas); - } catch (EmptyResult) {} - $response->getBody()->write(json_encode($output)); - return $response->withHeader('Content-Type', 'application/json'); - } -} diff --git a/app/src/Controller/Inmobiliarias.php b/app/src/Controller/Inmobiliarias.php index 8d1ad37..3387909 100644 --- a/app/src/Controller/Inmobiliarias.php +++ b/app/src/Controller/Inmobiliarias.php @@ -4,18 +4,42 @@ 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\Repository; +use Incoviba\Service; class Inmobiliarias { - public function __invoke(ServerRequestInterface $request, ResponseInterface $response, View $view, Repository\Inmobiliaria $inmobiliariaRepository): ResponseInterface + use withRedis; + + public function __invoke(ServerRequestInterface $request, ResponseInterface $response, View $view, + Service\Redis $redisService, Repository\Inmobiliaria $inmobiliariaRepository): ResponseInterface { - $inmobiliarias = $inmobiliariaRepository->fetchAll(); + $redisKey = 'inmobiliarias'; + $inmobiliarias = []; + try { + $inmobiliarias = array_map(function($row) use ($inmobiliariaRepository) { + return $inmobiliariaRepository->load((array) $row); + }, $this->fetchRedis($redisService, $redisKey)); + } catch (EmptyRedis) { + try { + $inmobiliarias = $inmobiliariaRepository->fetchAll(); + $this->saveRedis($redisService, $redisKey, $inmobiliarias); + } catch (EmptyResult) {} + } return $view->render($response, 'inmobiliarias.list', compact('inmobiliarias')); } - public function show(ServerRequestInterface $request, ResponseInterface $response, View $view, Repository\Inmobiliaria $inmobiliariaRepository, int $inmobiliaria_rut): ResponseInterface + public function show(ServerRequestInterface $request, ResponseInterface $response, View $view, + Service\Redis $redisService, Repository\Inmobiliaria $inmobiliariaRepository, int $inmobiliaria_rut): ResponseInterface { - $inmobiliaria = $inmobiliariaRepository->fetchById($inmobiliaria_rut); + $redisKey = "inmobiliaria:{$inmobiliaria_rut}"; + try { + $inmobiliaria = $inmobiliariaRepository->load((array) $this->fetchRedis($redisService, $redisKey)); + } catch (EmptyResult) { + $inmobiliaria = $inmobiliariaRepository->fetchById($inmobiliaria_rut); + $this->saveRedis($redisService, $redisKey, $inmobiliaria); + } return $view->render($response, 'inmobiliaria.show', compact('inmobiliaria')); } } diff --git a/app/src/Controller/Login.php b/app/src/Controller/Login.php index 44fb96c..ed22278 100644 --- a/app/src/Controller/Login.php +++ b/app/src/Controller/Login.php @@ -12,19 +12,10 @@ class Login { public function form(ServerRequestInterface $request, ResponseInterface $response, View $view, Service\Login $service): ResponseInterface { - $redirect_uri = $request->hasHeader('Referer') ? $request->getHeaderLine('Referer') : $view->get('urls')->base; if ($service->isIn()) { - $redirect_uri = str_replace('/login', '', $redirect_uri); - return $response->withStatus(301)->withHeader('Location', $redirect_uri); + return $response->withStatus(301)->withHeader('Location', $view->get('urls')->base); } - if ($request->hasHeader('X-Redirect-URI')) { - $redirect_uri = $request->getHeaderLine('X-Redirect-URI'); - } - $query = $request->getQueryParams(); - if (isset($query['url'])) { - $redirect_uri = base64_decode(urldecode($query['url'])); - } - return $view->render($response, 'login.form', compact('redirect_uri')); + return $view->render($response, 'login.form'); } public function login(ServerRequestInterface $request, ResponseInterface $response, Repository\User $userRepository, Service\Login $service): ResponseInterface { diff --git a/app/src/Controller/Provincias.php b/app/src/Controller/Provincias.php deleted file mode 100644 index 36c3a11..0000000 --- a/app/src/Controller/Provincias.php +++ /dev/null @@ -1,28 +0,0 @@ - $provincia_id, - 'comunas' => [] - ]; - try { - $comunas = $comunaRepository->fetchByProvincia($provincia_id); - usort($comunas, function(Model\Comuna $a, Model\Comuna $b) { - return strcmp($a->descripcion, $b->descripcion); - }); - $output['comunas'] = $comunas; - } catch (EmptyResult) {} - $response->getBody()->write(json_encode($output)); - return $response->withHeader('Content-Type', 'application/json'); - } -} diff --git a/app/src/Controller/Proyectos.php b/app/src/Controller/Proyectos.php index 4f62910..106de6b 100644 --- a/app/src/Controller/Proyectos.php +++ b/app/src/Controller/Proyectos.php @@ -4,35 +4,62 @@ 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\Model; use Incoviba\Repository; use Incoviba\Service; class Proyectos { - public function __invoke(ServerRequestInterface $request, ResponseInterface $response, View $view, Repository\Proyecto $proyectoRepository): ResponseInterface + use withRedis; + + public function __invoke(ServerRequestInterface $request, ResponseInterface $response, View $view, + Repository\Proyecto $proyectoRepository): ResponseInterface { - $proyectos = $proyectoRepository->fetchAll(); - usort($proyectos, function(Model\Proyecto $a, Model\Proyecto $b) { - return strcmp($a->descripcion, $b->descripcion); - }); + $proyectos = []; + try { + $proyectos = $proyectoRepository->fetchAll(); + usort($proyectos, function(Model\Proyecto $a, Model\Proyecto $b) { + return strcmp($a->descripcion, $b->descripcion); + }); + } catch (EmptyResult) {} return $view->render($response, 'proyectos.list', compact('proyectos')); } - public function unidades(ServerRequestInterface $request, ResponseInterface $response, View $view, Repository\Proyecto $proyectoRepository, Repository\Venta\Unidad $unidadRepository): ResponseInterface + public function unidades(ServerRequestInterface $request, ResponseInterface $response, View $view, + Service\Redis $redisService, Repository\Proyecto $proyectoRepository, + Repository\Venta\Unidad $unidadRepository): ResponseInterface { - $proyectos = $proyectoRepository->fetchAll(); - $proyectos = array_filter($proyectos, function(Model\Proyecto $proyecto) use ($unidadRepository) { - $unidades = $unidadRepository->fetchByProyecto($proyecto->id); - return count($unidades) > 0; - }); - usort($proyectos, function(Model\Proyecto $a, Model\Proyecto $b) { - return strcmp($a->descripcion, $b->descripcion); - }); + $proyectos = []; + $redisKey = "proyectos:con_unidades"; + try { + $proyectos = $this->fetchRedis($redisService, $redisKey); + } catch (EmptyRedis) { + try { + $proyectos = $proyectoRepository->fetchAll(); + $proyectos = array_filter($proyectos, function(Model\Proyecto $proyecto) use ($unidadRepository) { + $unidades = $unidadRepository->fetchByProyecto($proyecto->id); + return count($unidades) > 0; + }); + usort($proyectos, function(Model\Proyecto $a, Model\Proyecto $b) { + return strcmp($a->descripcion, $b->descripcion); + }); + $this->saveRedis($redisService, $redisKey, $proyectos); + } catch (EmptyResult) {} + } return $view->render($response, 'proyectos.unidades', compact('proyectos')); } - public function show(ServerRequestInterface $request, ResponseInterface $response, View $view, Service\Proyecto $proyectoService, int $proyecto_id): ResponseInterface + public function show(ServerRequestInterface $request, ResponseInterface $response, View $view, + Service\Redis $redisService, Service\Proyecto $proyectoService, + Repository\Proyecto $proyectoRepository, int $proyecto_id): ResponseInterface { - $proyecto = $proyectoService->getById($proyecto_id); + $redisKey = "proyecto:{$proyecto_id}"; + try { + $proyecto = $proyectoService->getById($proyectoRepository->load((array) $this->fetchRedis($redisService, $redisKey))); + } catch (EmptyRedis) { + $proyecto = $proyectoService->getById($proyecto_id); + $this->saveRedis($redisService, $redisKey, $proyecto); + } return $view->render($response, 'proyectos.show', compact('proyecto')); } } diff --git a/app/src/Controller/Regiones.php b/app/src/Controller/Regiones.php deleted file mode 100644 index 8d43598..0000000 --- a/app/src/Controller/Regiones.php +++ /dev/null @@ -1,28 +0,0 @@ - $region_id, - 'provincias' => [] - ]; - try { - $provincias = $provinciaRepository->fetchByRegion($region_id); - usort($provincias, function(Model\Provincia $a, Model\Provincia $b) { - return strcmp($a->descripcion, $b->descripcion); - }); - $output['provincias'] = $provincias; - } catch (EmptyResult) {} - $response->getBody()->write(json_encode($output)); - return $response->withHeader('Content-Type', 'application/json'); - } -} diff --git a/app/src/Controller/Ventas.php b/app/src/Controller/Ventas.php index 22583ba..c079d48 100644 --- a/app/src/Controller/Ventas.php +++ b/app/src/Controller/Ventas.php @@ -1,28 +1,42 @@ $proyecto->id, 'descripcion' => $proyecto->descripcion];}, $proyectoService->getVendibles()); + $redisKey = "proyectos:vendibles"; + try { + $proyectos = $proyectoService->process($proyectoRepository->load((array) $this->fetchRedis($redisService, $redisKey))); + } catch (EmptyRedis) { + $proyectos = array_map(function(Model\Proyecto $proyecto) { + return ['id' => $proyecto->id, 'descripcion' => $proyecto->descripcion]; + }, $proyectoService->getVendibles()); + $this->saveRedis($redisService, $redisKey, $proyectos); + } return $view->render($response, 'ventas.list', compact('proyectos')); } - public function show(ServerRequestInterface $request, ResponseInterface $response, View $view, Service\Venta $service, int $venta_id): ResponseInterface + public function show(ServerRequestInterface $request, ResponseInterface $response, View $view, + Service\Venta $service, int $venta_id): ResponseInterface { $venta = $service->getById($venta_id); return $view->render($response, 'ventas.show', compact('venta')); } - public function showUnidad(ServerRequestInterface $request, ResponseInterface $response, View $view, Service\Venta $service, string $proyecto_nombre, int $unidad_descripcion): ResponseInterface + public function showUnidad(ServerRequestInterface $request, ResponseInterface $response, View $view, + Service\Venta $service, string $proyecto_nombre, int $unidad_descripcion): ResponseInterface { $proyecto_nombre = urldecode($proyecto_nombre); $venta = $service->getByProyectoAndUnidad($proyecto_nombre, $unidad_descripcion); diff --git a/app/src/Controller/API/withRedis.php b/app/src/Controller/withRedis.php similarity index 95% rename from app/src/Controller/API/withRedis.php rename to app/src/Controller/withRedis.php index 364d129..0cc5bab 100644 --- a/app/src/Controller/API/withRedis.php +++ b/app/src/Controller/withRedis.php @@ -1,5 +1,5 @@ service->isIn() or $this->isValid($request)) { return $handler->handle($request); } - $response = $this->responseFactory->createResponse(301, 'Not logged in'); - $uri = urlencode(base64_encode((string) $request->getUri())); - return $response->withHeader('Location', implode('?', [$this->login_url, "url={$uri}"])) + $this->logger->notice("Not logged in."); + $response = $this->responseFactory->createResponse(301, 'Not logged in') ->withHeader('Referer', (string) $request->getUri()) ->withHeader('X-Redirected-URI', (string) $request->getUri()); + return $this->view->render($response, 'login.form', ['redirect_uri' => (string) $request->getUri()]); } protected function isValid(ServerRequestInterface $request): bool diff --git a/app/src/Repository/Proyecto.php b/app/src/Repository/Proyecto.php index eb7a26b..be015ce 100644 --- a/app/src/Repository/Proyecto.php +++ b/app/src/Repository/Proyecto.php @@ -76,7 +76,7 @@ class Proyecto extends Ideal\Repository ->select($this->columns()) ->from("{$this->getTable()} a") ->joined($this->joinTerreno()) - ->where("name = ?"); + ->where("descripcion = ?"); return $this->fetchOne($query, [$name]); } public function fetchAllActive(): array diff --git a/app/src/Repository/Venta/Subsidio.php b/app/src/Repository/Venta/Subsidio.php index f79ae24..180b72f 100644 --- a/app/src/Repository/Venta/Subsidio.php +++ b/app/src/Repository/Venta/Subsidio.php @@ -16,7 +16,16 @@ class Subsidio extends Ideal\Repository public function create(?array $data = null): Model\Venta\Subsidio { - $map = new Implement\Repository\MapperParser(['pago', 'subsidio']); + $map = (new Implement\Repository\MapperParser()) + ->register('pago', (new Implement\Repository\Mapper()) + ->setProperty('ahorro') + ->setFunction(function($data) { + return $this->pagoRepository->fetchById($data['pago']); + })) + ->register('subsidio', (new Implement\Repository\Mapper()) + ->setFunction(function($data) { + return $this->pagoRepository->fetchById($data['subsidio']); + })); return $this->parseData(new Model\Venta\Subsidio(), $data, $map); } public function save(Define\Model $model): Model\Venta\Subsidio diff --git a/app/src/Service/Proyecto.php b/app/src/Service/Proyecto.php index 2facad9..70b6332 100644 --- a/app/src/Service/Proyecto.php +++ b/app/src/Service/Proyecto.php @@ -19,11 +19,15 @@ class Proyecto { return $this->proyectoRepository->fetchAllEscriturando(); } - public function getById(int $venta_id): Model\Proyecto + public function getById(int $proyecto_id): Model\Proyecto { - return $this->process($this->proyectoRepository->fetchById($venta_id)); + return $this->process($this->proyectoRepository->fetchById($proyecto_id)); } - protected function process(Model\Proyecto $proyecto): Model\Proyecto + public function getByName(string $name): Model\Proyecto + { + return $this->process($this->proyectoRepository->fetchByName($name)); + } + public function process(Model\Proyecto $proyecto): Model\Proyecto { $proyecto->addFactory('estados', (new Implement\Repository\Factory()) ->setCallable([$this->estadoProyecto, 'fetchByProyecto']) diff --git a/app/src/Service/Search.php b/app/src/Service/Search.php index 3a704bd..08f6633 100644 --- a/app/src/Service/Search.php +++ b/app/src/Service/Search.php @@ -2,12 +2,18 @@ namespace Incoviba\Service; use Incoviba\Common\Implement\Exception\EmptyResult; +use Incoviba\Common\Implement\Exception\EmptyResponse; use Incoviba\Model; use Incoviba\Repository; class Search { - public function __construct(protected Venta $ventaService, protected Repository\Venta $ventaRepository, protected Repository\Venta\Unidad $unidadRepository, protected Repository\Proyecto\TipoUnidad $tipoUnidadRepository) {} + public function __construct( + protected Proyecto $proyectoService, + protected Venta $ventaService, + protected Repository\Venta $ventaRepository, + protected Repository\Venta\Unidad $unidadRepository, + protected Repository\Proyecto\TipoUnidad $tipoUnidadRepository) {} public function query(string $query, string $tipo): array { @@ -39,7 +45,12 @@ class Search } protected function find(string $query, string $tipo): array { - $queries = explode(' ', $query); + preg_match_all('/["\']([\s\w]+)["\']|(\w+)/i', $query, $matches, PREG_SET_ORDER | PREG_UNMATCHED_AS_NULL); + $queries = array_map(function($match) { + array_shift($match); + $valid = array_filter($match, function($line) {return $line !== null;}); + return implode(' ', $valid); + }, $matches); $tiposUnidades = $this->getTiposUnidades(); $results = []; foreach ($queries as $q) { @@ -113,7 +124,8 @@ class Search protected function findProyecto(string $query): array { try { - return $this->ventaService->getByProyecto($query); + $proyecto = $this->proyectoService->getByName($query); + return $this->ventaService->getByProyecto($proyecto->id); } catch (EmptyResult) { return []; } diff --git a/app/src/Service/Venta.php b/app/src/Service/Venta.php index 01215b7..512bfac 100644 --- a/app/src/Service/Venta.php +++ b/app/src/Service/Venta.php @@ -72,7 +72,7 @@ class Venta return $venta; } - public function add(array $data): void + public function add(array $data): Model\Venta { $fecha = new DateTimeImmutable($data['fecha_venta']); $data['uf'] = $this->moneyService->getUF($fecha); @@ -103,6 +103,8 @@ class Venta 'fecha' => $venta->fecha->format('Y-m-d') ]); $this->estadoVentaRepository->save($estado); + + return $venta; } protected function addPropietario(array $data): Model\Venta\Propietario { From e1ef31dccd083d3a5f09d57d4f5662f3c0773c16 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Thu, 23 Nov 2023 23:35:19 -0300 Subject: [PATCH 029/163] Search update and optimization --- app/resources/views/search.blade.php | 115 ++++++++++++++++++--- app/src/Controller/API/Ventas/Unidades.php | 18 ++++ app/src/Controller/Ventas.php | 2 +- app/src/Model/Venta.php | 2 +- app/src/Model/Venta/Propiedad.php | 25 ++++- app/src/Model/Venta/Unidad.php | 7 +- app/src/Repository/Venta.php | 41 +++++++- app/src/Repository/Venta/Unidad.php | 15 +++ app/src/Service/Search.php | 30 +++--- cli/bin/index.php | 13 +++ 10 files changed, 232 insertions(+), 36 deletions(-) create mode 100644 cli/bin/index.php diff --git a/app/resources/views/search.blade.php b/app/resources/views/search.blade.php index 59dbc46..9f9af42 100644 --- a/app/resources/views/search.blade.php +++ b/app/resources/views/search.blade.php @@ -45,6 +45,7 @@ draw() { const tipo = this.unidad.proyecto_tipo_unidad.tipo_unidad.descripcion let unidad = tipo.charAt(0).toUpperCase() + tipo.slice(1) + ' ' + this.unidad.descripcion + let precio = 0 let propietario = '' let fecha = '' let fecha_entrega = '' @@ -61,8 +62,10 @@ if (typeof this.venta.entrega !== 'undefined') { fecha_entrega = dateFormatter.format(new Date(this.venta.entrega.fecha)) } + precio = this.venta.valor } else { unidad += '' + precio = this.unidad.current_precio.valor } const numberFormat = new Intl.NumberFormat('es-CL', {minimumFractionDigits: 2, maximumFractionDigits: 2}) @@ -81,7 +84,7 @@ ).append( $('').addClass('right aligned').html(superficie + ' m²') ).append( - $('').addClass('right aligned').html(numberFormat.format(this.unidad.precio)) + $('').addClass('right aligned').html(numberFormat.format(precio)) ).append( $('').html(fecha) ).append( @@ -104,29 +107,84 @@ const uri = '{{$urls->api}}/search' this.data = [] return fetch(uri, {method: 'post', body: data}).then(response => { - this.draw().clear() if (response.ok) { return response.json() } + }).catch(error => { + this.draw().clear() + this.draw().error(error) }).then(data => { - if (typeof data.results !== 'undefined' && data.results.length > 0) { - data.results.forEach(row => { - if (typeof row.proyecto_tipo_unidad === 'undefined') { - const r = new Row({unidad: row.propiedad.departamentos[0], proyecto: row.proyecto}) - r.venta = row - this.data.push(r) - } else { - this.data.push(new Row({unidad: row, proyecto: row.proyecto_tipo_unidad.proyecto})) - } - }) - this.draw().table() + this.draw().clear() + if (typeof data.results === 'undefined' || data.results.length === 0) { + this.draw().empty() return } - this.draw().empty() + const progress = this.draw().progress(data.results.length) + const promises = [] + data.results.forEach(row => { + if (row.tipo === 'venta') { + promises.push(this.get().venta(row.id).then(json => { + const venta = json.venta + progress.progress('increment') + const r = new Row({unidad: venta.propiedad.unidades[0], proyecto: venta.proyecto}) + r.venta = venta + this.data.push(r) + }).catch(error => { + progress.progress('increment') + console.error(row) + console.error(error) + })) + return + } + promises.push(this.get().unidad(row.id).then(json => { + const unidad = json.unidad + progress.progress('increment') + this.data.push(new Row({unidad: unidad, proyecto: unidad.proyecto_tipo_unidad.proyecto})) + }).catch(error => { + progress.progress('increment') + console.error(row) + console.error(error) + })) + }) + Promise.all(promises).then(() => { + this.sort() + this.draw().clear() + this.draw().table() + }) + }) + }, + unidad: id => { + const url = '{{$urls->api}}/ventas/unidad/' + id + return fetch(url).then(response => { + if (response.ok) { + return response.json() + } + }) + }, + venta: id => { + const url = '{{$urls->api}}/venta/' + id + return fetch(url).then(response => { + if (response.ok) { + return response.json() + } }) } } }, + sort: function() { + this.data.sort((a, b) => { + const p = a.proyecto.descripcion.localeCompare(b.proyecto.descripcion) + if (p === 0) { + const t = a.unidad.proyecto_tipo_unidad.tipo_unidad.descripcion + .localeCompare(b.unidad.proyecto_tipo_unidad.tipo_unidad.descripcion) + if (t === 0) { + return a.unidad.descripcion.localeCompare(b.unidad.descripcion) + } + return t + } + return p + }) + }, draw: function() { return { clear: () => { @@ -213,6 +271,35 @@ $('
    ').addClass('content').html('No se han encontrado resultados.') ) ) + }, + error: error => { + this.draw().separator() + $(this.id).append( + $('
    ').addClass('ui icon error message').append( + $('').addClass('exclamation triangle icon') + ).append( + $('
    ').addClass('content').html(error) + ) + ) + }, + progress: cantidad => { + this.draw().separator() + const progress = $('
    ').addClass('ui active progress').append( + $('
    ').addClass('bar').append( + $('
    ').addClass('centered progress') + ) + ).append( + $('
    ').addClass('label').html('Cargando datos') + ) + progress.progress({ + total: cantidad, + label: 'ratio', + text: { + ratio: '{value} de {total} ({percent}%)' + } + }) + $(this.id).append(progress) + return progress } } }, diff --git a/app/src/Controller/API/Ventas/Unidades.php b/app/src/Controller/API/Ventas/Unidades.php index cc1843e..1d29f81 100644 --- a/app/src/Controller/API/Ventas/Unidades.php +++ b/app/src/Controller/API/Ventas/Unidades.php @@ -16,6 +16,24 @@ class Unidades { use withJson, withRedis; + public function get(ServerRequestInterface $request, ResponseInterface $response, Service\Redis $redisService, + Service\Venta\Unidad $unidadService, int $unidad_id): ResponseInterface + { + $output = [ + 'unidad_id' => $unidad_id, + 'unidad' => null + ]; + $redisKey = "unidad:{$unidad_id}"; + try { + $output['unidad'] = $this->fetchRedis($redisService, $redisKey); + } catch (EmptyRedis) { + try { + $output['unidad'] = $unidadService->getById($unidad_id); + $this->saveRedis($redisService, $redisKey, $output['unidad']); + } catch (EmptyResult) {} + } + return $this->withJson($response, $output); + } public function disponibles(ServerRequestInterface $request, ResponseInterface $response, Repository\Venta\Unidad $unidadRepository, Repository\Proyecto\TipoUnidad $tipoUnidadRepository, Service\Redis $redisService): ResponseInterface { $body = $request->getBody(); diff --git a/app/src/Controller/Ventas.php b/app/src/Controller/Ventas.php index c079d48..1be7461 100644 --- a/app/src/Controller/Ventas.php +++ b/app/src/Controller/Ventas.php @@ -20,7 +20,7 @@ class Ventas { $redisKey = "proyectos:vendibles"; try { - $proyectos = $proyectoService->process($proyectoRepository->load((array) $this->fetchRedis($redisService, $redisKey))); + $proyectos = $this->fetchRedis($redisService, $redisKey); } catch (EmptyRedis) { $proyectos = array_map(function(Model\Proyecto $proyecto) { return ['id' => $proyecto->id, 'descripcion' => $proyecto->descripcion]; diff --git a/app/src/Model/Venta.php b/app/src/Model/Venta.php index 5e8a502..fa2610c 100644 --- a/app/src/Model/Venta.php +++ b/app/src/Model/Venta.php @@ -66,7 +66,7 @@ class Venta extends Ideal\Model public function proyecto(): Proyecto { - return $this->propiedad()->departamentos()[0]->proyectoTipoUnidad->proyecto; + return $this->propiedad()->proyecto(); } protected float $valor_util; diff --git a/app/src/Model/Venta/Propiedad.php b/app/src/Model/Venta/Propiedad.php index 546a984..47e8094 100644 --- a/app/src/Model/Venta/Propiedad.php +++ b/app/src/Model/Venta/Propiedad.php @@ -2,22 +2,40 @@ namespace Incoviba\Model\Venta; use Incoviba\Common\Ideal; +use Incoviba\Model; class Propiedad extends Ideal\Model { public array $unidades; + protected array $departamentos; public function departamentos(): array { - return array_values(array_filter($this->unidades, function(Unidad $unidad) {return $unidad->proyectoTipoUnidad->tipoUnidad->descripcion === 'departamento';})); + if (!isset($this->departamentos)) { + $this->departamentos = array_values(array_filter($this->unidades, function(Unidad $unidad) {return $unidad->proyectoTipoUnidad->tipoUnidad->descripcion === 'departamento';})); + } + return $this->departamentos; } + protected array $estacionamientos; public function estacionamientos(): array { - return array_values(array_filter($this->unidades, function(Unidad $unidad) {return $unidad->proyectoTipoUnidad->tipoUnidad->descripcion === 'estacionamiento';})); + if (!isset($this->estacionamientos)) { + $this->estacionamientos = array_values(array_filter($this->unidades, function(Unidad $unidad) {return $unidad->proyectoTipoUnidad->tipoUnidad->descripcion === 'estacionamiento';})); + } + return $this->estacionamientos; } + protected array $bodegas; public function bodegas(): array { - return array_values(array_filter($this->unidades, function(Unidad $unidad) {return $unidad->proyectoTipoUnidad->tipoUnidad->descripcion === 'bodega';})); + if (!isset($this->bodegas)) { + $this->bodegas = array_values(array_filter($this->unidades, function(Unidad $unidad) {return $unidad->proyectoTipoUnidad->tipoUnidad->descripcion === 'bodega';})); + } + return $this->bodegas; + } + + public function proyecto(): Model\Proyecto + { + return $this->unidades[0]->proyectoTipoUnidad->proyecto; } protected float $vendible; @@ -46,6 +64,7 @@ class Propiedad extends Ideal\Model public function jsonSerialize(): mixed { return [ + 'unidades' => $this->unidades, 'departamentos' => $this->departamentos(), 'estacionamientos' => $this->estacionamientos(), 'bodegas' => $this->bodegas(), diff --git a/app/src/Model/Venta/Unidad.php b/app/src/Model/Venta/Unidad.php index d5efdab..05a54fb 100644 --- a/app/src/Model/Venta/Unidad.php +++ b/app/src/Model/Venta/Unidad.php @@ -46,7 +46,7 @@ class Unidad extends Ideal\Model public function jsonSerialize(): mixed { - return array_merge(parent::jsonSerialize(), [ + $output = array_merge(parent::jsonSerialize(), [ 'subtipo' => $this->subtipo, 'piso' => $this->piso, 'descripcion' => $this->descripcion, @@ -54,5 +54,10 @@ class Unidad extends Ideal\Model 'proyecto_tipo_unidad' => $this->proyectoTipoUnidad, 'prorrateo' => $this->prorrateo ]); + if (isset($this->precios)) { + $output['precios'] = $this->precios; + $output['current_precio'] = $this->currentPrecio; + } + return $output; } } diff --git a/app/src/Repository/Venta.php b/app/src/Repository/Venta.php index c8f28ef..d550dfb 100644 --- a/app/src/Repository/Venta.php +++ b/app/src/Repository/Venta.php @@ -1,7 +1,7 @@ fetchMany($query, [$proyecto_id]); } + public function fetchIdsByProyecto(int $proyecto_id): array + { + $query = "SELECT a.`id` +FROM `{$this->getTable()}` a + JOIN `propiedad_unidad` pu ON pu.`propiedad` = a.`propiedad` + JOIN `unidad` ON `unidad`.`id` = pu.`unidad` AND pu.`principal` = 1 + JOIN `proyecto_tipo_unidad` ptu ON ptu.`id` = `unidad`.`pt` + JOIN (SELECT e1.* FROM `estado_venta` e1 JOIN (SELECT MAX(`id`) AS 'id', `venta` FROM `estado_venta` GROUP BY `venta`) e0 ON e0.`id` = e1.`id`) ev ON ev.`venta` = a.`id` + JOIN `tipo_estado_venta` tev ON tev.`id` = ev.`estado` +WHERE ptu.`proyecto` = ? AND tev.`activa` +GROUP BY a.`id`"; + return $this->connection->execute($query, [$proyecto_id])->fetchAll(PDO::FETCH_ASSOC); + } public function fetchActivaByProyecto(int $proyecto_id): array { $query = "SELECT a.* @@ -197,11 +210,27 @@ FROM `{$this->getTable()}` a WHERE `unidad`.`descripcion` LIKE ? AND tu.`descripcion` = ?"; return $this->fetchMany($query, [$unidad, $tipo]); } + public function fetchIdsByUnidad(string $unidad, string $tipo): array + { + $query = "SELECT a.id +FROM `{$this->getTable()}` a + JOIN `propiedad_unidad` pu ON pu.`propiedad` = a.`propiedad` + JOIN `unidad` ON `unidad`.`id` = pu.`unidad` + JOIN `proyecto_tipo_unidad` ptu ON ptu.`id` = `unidad`.`pt` + JOIN `tipo_unidad` tu ON tu.`id` = ptu.`tipo` +WHERE `unidad`.`descripcion` LIKE ? AND tu.`descripcion` = ?"; + return $this->connection->execute($query, [$unidad, $tipo])->fetchAll(PDO::FETCH_ASSOC); + } public function fetchByPrecio(string $precio): array { $query = "SELECT * FROM `{$this->getTable()}` WHERE `valor_uf` = ?"; return $this->fetchMany($query, [$precio]); } + public function fetchIdsByPrecio(string $precio): array + { + $query = "SELECT `id` FROM `{$this->getTable()}` WHERE `valor_uf` = ?"; + return $this->connection->execute($query, [$precio])->fetchAll(PDO::FETCH_ASSOC); + } public function fetchByPropietario(string $propietario): array { $query = "SELECT a.* @@ -212,6 +241,16 @@ WHERE CONCAT_WS('-', `propietario`.`rut`, `propietario`.`dv`) LIKE :propietario OR CONCAT_WS(' ', `propietario`.`nombres`, `propietario`.`apellido_paterno`, `propietario`.`apellido_materno`) LIKE :propietario"; return $this->fetchMany($query, [':propietario' => "%{$propietario}%"]); } + public function fetchIdsByPropietario(string $propietario): array + { + $query = "SELECT a.id +FROM `{$this->getTable()}` a + JOIN `propietario` ON `propietario`.`rut` = a.`propietario` +WHERE CONCAT_WS('-', `propietario`.`rut`, `propietario`.`dv`) LIKE :propietario OR `propietario`.`nombres` LIKE :propietario + OR `propietario`.`apellido_paterno` LIKE :propietario OR `propietario`.`apellido_materno` LIKE :propietario + OR CONCAT_WS(' ', `propietario`.`nombres`, `propietario`.`apellido_paterno`, `propietario`.`apellido_materno`) LIKE :propietario"; + return $this->connection->execute($query, [':propietario' => "%{$propietario}%"])->fetchAll(PDO::FETCH_ASSOC); + } public function fetchByPropietarioNombreCompleto(string $propietario): array { $query = "SELECT a.* diff --git a/app/src/Repository/Venta/Unidad.php b/app/src/Repository/Venta/Unidad.php index 252cfa9..8605d32 100644 --- a/app/src/Repository/Venta/Unidad.php +++ b/app/src/Repository/Venta/Unidad.php @@ -1,6 +1,7 @@ where("a.`descripcion` LIKE ? AND tu.`descripcion` = ? AND (pu.`id` IS NULL OR `venta`.`id` IS NULL OR tev.`activa` = 0)"); return $this->fetchMany($query, [$descripcion, $tipo]); } + public function fetchDisponiblesIdsByDescripcionAndTipo(string $descripcion, string $tipo): array + { + $query = $this->connection->getQueryBuilder() + ->select('a.id') + ->from("{$this->getTable()} a") + ->joined("JOIN `proyecto_tipo_unidad` ptu ON ptu.`id` = a.`pt` + JOIN `tipo_unidad` tu ON tu.`id` = ptu.`tipo` + LEFT OUTER JOIN `propiedad_unidad` pu ON pu.`unidad` = a.`id` + LEFT OUTER JOIN `venta` ON `venta`.`propiedad` = pu.`propiedad` + LEFT OUTER JOIN (SELECT ev1.* FROM `estado_venta` ev1 JOIN (SELECT MAX(`id`) as 'id', `venta` FROM `estado_venta`) ev0 ON ev0.`id` = ev1.`id`) ev ON ev.`venta` = `venta`.`id` + LEFT OUTER JOIN `tipo_estado_venta` tev ON tev.`id` = ev.`estado`") + ->where("a.`descripcion` LIKE ? AND tu.`descripcion` = ? AND (pu.`id` IS NULL OR `venta`.`id` IS NULL OR tev.`activa` = 0)"); + return $this->connection->execute($query, [$descripcion, $tipo])->fetchAll(PDO::FETCH_ASSOC); + } protected function joinProrrateo(): string { diff --git a/app/src/Service/Search.php b/app/src/Service/Search.php index 08f6633..5b66a4e 100644 --- a/app/src/Service/Search.php +++ b/app/src/Service/Search.php @@ -22,7 +22,8 @@ class Search } else { $results = $this->find($query, $tipo); } - return $this->sort($results); + return $results; + //return $this->sort($results); } protected function findCualquiera(string $query): array @@ -45,7 +46,7 @@ class Search } protected function find(string $query, string $tipo): array { - preg_match_all('/["\']([\s\w]+)["\']|(\w+)/i', $query, $matches, PREG_SET_ORDER | PREG_UNMATCHED_AS_NULL); + preg_match_all('/["\']([\s\w]+)["\']|(\w+)/iu', $query, $matches, PREG_SET_ORDER | PREG_UNMATCHED_AS_NULL); $queries = array_map(function($match) { array_shift($match); $valid = array_filter($match, function($line) {return $line !== null;}); @@ -56,7 +57,7 @@ class Search foreach ($queries as $q) { $this->add($results, $this->findVentas($q, $tipo)); if (in_array($tipo, $tiposUnidades)) { - $this->add($results, $this->findUnidadesDisponibles($q, $tipo)); + $this->add($results, $this->findUnidadesDisponibles($q, $tipo), false); } } return $results; @@ -91,7 +92,7 @@ class Search protected function findUnidadesDisponibles(string $query, string $tipo): array { try { - return $this->unidadRepository->fetchDisponiblesByDescripcionAndTipo($query, $tipo); + return $this->unidadRepository->fetchDisponiblesIdsByDescripcionAndTipo($query, $tipo); } catch (EmptyResponse) { return []; } @@ -99,7 +100,7 @@ class Search protected function findUnidad(string $query, string $tipo): array { try { - return $this->ventaService->getByUnidad($query, $tipo); + return $this->ventaRepository->fetchIdsByUnidad($query, $tipo); } catch (EmptyResult) { return []; } @@ -107,7 +108,7 @@ class Search protected function findPropietario(string $query): array { try { - return $this->ventaService->getByPropietario($query); + return $this->ventaRepository->fetchIdsByPropietario($query); } catch (EmptyResult) { return []; } @@ -116,7 +117,7 @@ class Search { try { $precio = str_replace(['$', '.', ','], ['', '', '.'], $query); - return $this->ventaService->getByPrecio($precio); + return $this->ventaRepository->fetchIdsByPrecio($precio); } catch (EmptyResult) { return []; } @@ -125,7 +126,7 @@ class Search { try { $proyecto = $this->proyectoService->getByName($query); - return $this->ventaService->getByProyecto($proyecto->id); + return $this->ventaRepository->fetchIdsByProyecto($proyecto->id); } catch (EmptyResult) { return []; } @@ -145,22 +146,21 @@ class Search } return $this->tipos; } - protected function add(array &$results, array $found): void + protected function add(array &$results, array $found, bool $is_venta = true): void { foreach ($found as $item) { if (!$this->inResults($item, $results)) { + $item['tipo'] = 'venta'; + if (!$is_venta) { + $item['tipo'] = 'unidad'; + } $results []= $item; } } } protected function inResults($item, array $results): bool { - foreach ($results as $result) { - if (get_class($item) === get_class($result) and $item->id === $result->id) { - return true; - } - } - return false; + return in_array($item, $results, true); } protected function sort(&$results): array { diff --git a/cli/bin/index.php b/cli/bin/index.php new file mode 100644 index 0000000..9e47d85 --- /dev/null +++ b/cli/bin/index.php @@ -0,0 +1,13 @@ +run(); +} catch (Error $error) { + $app->getContainer()->get(Psr\Log\LoggerInterface::class)->error($error); +} catch (Exception $exception) { + $app->getContainer()->get(Psr\Log\LoggerInterface::class)->notice($exception); +} From a82db6e1dab41f7bc71b26769f934f435fe8f9dc Mon Sep 17 00:00:00 2001 From: Aldarien Date: Fri, 24 Nov 2023 10:24:42 -0300 Subject: [PATCH 030/163] FIX: trailing slash in ventas url --- app/resources/views/layout/body/header/menu/ventas.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/resources/views/layout/body/header/menu/ventas.blade.php b/app/resources/views/layout/body/header/menu/ventas.blade.php index b2a914a..2cea6c4 100644 --- a/app/resources/views/layout/body/header/menu/ventas.blade.php +++ b/app/resources/views/layout/body/header/menu/ventas.blade.php @@ -8,7 +8,7 @@
    Precios Cierres - Ventas + Ventas
    Cuotas From b66ef435c652da8c3c0f68c8ab1365fe8093cef4 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Fri, 24 Nov 2023 20:28:08 -0300 Subject: [PATCH 031/163] FIX: Escritura y saldo --- app/resources/views/ventas/show/escritura.blade.php | 4 ++-- app/resources/views/ventas/show/forma_pago/total.blade.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/resources/views/ventas/show/escritura.blade.php b/app/resources/views/ventas/show/escritura.blade.php index 5fc371d..29ed21e 100644 --- a/app/resources/views/ventas/show/escritura.blade.php +++ b/app/resources/views/ventas/show/escritura.blade.php @@ -1,9 +1,9 @@
    ESCRITURA
    -@if ($venta->formaPago()->escritura !== null) +@if (in_array($venta->currentEstado()->tipoEstadoVenta->descripcion, ['escriturando', 'firmado por inmobiliaria', 'archivado']))
    - Escriturado {{$venta->formaPago()->escritura->fecha->format('d-m-Y')}} + Escriturado {{$venta->currentEstado()->fecha->format('d-m-Y')}} Informe diff --git a/app/resources/views/ventas/show/forma_pago/total.blade.php b/app/resources/views/ventas/show/forma_pago/total.blade.php index 06d3ac9..388df73 100644 --- a/app/resources/views/ventas/show/forma_pago/total.blade.php +++ b/app/resources/views/ventas/show/forma_pago/total.blade.php @@ -16,7 +16,7 @@ - @if ($venta->saldo() / $venta->valor > 0.01) + @if (abs($venta->saldo() / $venta->valor) > 0.01) Δ {{$format->ufs($venta->saldo())}} From 2726bc5074cfe5d89802d42b0cc334fa351d3ceb Mon Sep 17 00:00:00 2001 From: Aldarien Date: Fri, 24 Nov 2023 20:41:41 -0300 Subject: [PATCH 032/163] Cleanup old version --- app_old/.adminer.env.sample | 2 - app_old/.db.env.sample | 4 - app_old/.env.sample | 2 - app_old/.gitignore | 10 - app_old/aldarien/asset/.gitignore | 11 - app_old/aldarien/asset/LICENSE | 21 - app_old/aldarien/asset/README.md | 2 - app_old/aldarien/asset/app/Contract/Asset.php | 21 - .../aldarien/asset/app/Helper/functions.php | 5 - app_old/aldarien/asset/app/Service/Asset.php | 88 - app_old/aldarien/asset/composer.json | 26 - app_old/aldarien/asset/phpunit.xml | 17 - app_old/aldarien/asset/tests/AssetTest.php | 25 - app_old/aldarien/config/.gitignore | 13 - app_old/aldarien/config/.travis.yml | 3 - app_old/aldarien/config/LICENSE | 21 - app_old/aldarien/config/README.md | 4 - .../aldarien/config/app/Contract/Config.php | 31 - .../config/app/Contract/YamlWrapper.php | 21 - .../aldarien/config/app/Helper/functions.php | 9 - .../aldarien/config/app/Service/Config.php | 150 - .../aldarien/config/bootstrap/autoload.php | 3 - app_old/aldarien/config/composer.json | 28 - app_old/aldarien/config/phpunit.xml | 17 - app_old/aldarien/config/tests/ConfigTest.php | 90 - app_old/aldarien/contract/.gitignore | 6 - app_old/aldarien/contract/LICENSE | 21 - .../contract/app/Definition/Contract.php | 20 - app_old/aldarien/contract/composer.json | 18 - app_old/aldarien/format/.gitignore | 11 - app_old/aldarien/format/LICENSE | 21 - app_old/aldarien/format/README.md | 2 - app_old/aldarien/format/app/Helper/Format.php | 43 - app_old/aldarien/format/composer.json | 23 - app_old/aldarien/format/config/app.php | 5 - app_old/aldarien/format/phpunit.xml | 17 - app_old/aldarien/format/tests/FormatTest.php | 59 - app_old/aldarien/response/.gitignore | 7 - app_old/aldarien/response/LICENSE | 21 - app_old/aldarien/response/README.md | 2 - .../response/app/Contract/Response.php | 27 - .../response/app/Helper/functions.php | 11 - .../response/app/Service/Response.php | 62 - .../aldarien/response/bootstrap/autoload.php | 3 - app_old/aldarien/response/composer.json | 26 - app_old/aldarien/response/phpunit.xml | 17 - .../aldarien/response/tests/ResponseTest.php | 22 - app_old/aldarien/root/.gitignore | 5 - app_old/aldarien/root/LICENSE | 21 - app_old/aldarien/root/README.md | 22 - .../aldarien/root/app/Helper/functions.php | 5 - app_old/aldarien/root/composer.json | 21 - app_old/aldarien/root/phpunit.xml | 19 - app_old/aldarien/root/src/Root.php | 48 - app_old/aldarien/root/tests/RootTest.php | 61 - app_old/aldarien/session/.gitignore | 11 - app_old/aldarien/session/LICENSE | 21 - app_old/aldarien/session/README.md | 2 - .../aldarien/session/app/Contract/Session.php | 29 - app_old/aldarien/session/composer.json | 24 - app_old/aldarien/url/.gitignore | 12 - app_old/aldarien/url/LICENSE | 21 - app_old/aldarien/url/README.md | 2 - app_old/aldarien/url/app/Contract/URL.php | 21 - app_old/aldarien/url/app/Helper/functions.php | 8 - app_old/aldarien/url/app/Service/URL.php | 83 - app_old/aldarien/url/composer.json | 29 - app_old/aldarien/view/.gitignore | 10 - app_old/aldarien/view/LICENSE | 21 - app_old/aldarien/view/README.md | 2 - app_old/aldarien/view/app/Contract/View.php | 30 - .../aldarien/view/app/Helper/functions.php | 5 - app_old/aldarien/view/app/Service/View.php | 27 - app_old/aldarien/view/composer.json | 28 - app_old/aldarien/view/config/locations.php | 8 - app_old/aldarien/view/phpunit.xml | 17 - app_old/aldarien/view/public/index.php | 5 - .../view/resources/views/base.blade.php | 9 - app_old/aldarien/view/tests/ViewTest.php | 22 - app_old/app/Alias/Connection.php | 50 - app_old/app/Alias/Excel/Style/Mes.php | 18 - app_old/app/Alias/Format.php | 17 - app_old/app/Alias/Model.php | 87 - app_old/app/Alias/NewEstado.php | 21 - app_old/app/Alias/NewModel.php | 9 - app_old/app/Alias/NewTipo.php | 15 - app_old/app/Alias/OldModel.php | 8 - app_old/app/Alias/PHPExcel.php | 155 - app_old/app/Alias/RemoteConnection.php | 17 - app_old/app/Command/Money/Get.php | 87 - app_old/app/Command/Money/Lookup.php | 52 - app_old/app/Contract/Auth.php | 27 - app_old/app/Contract/Route.php | 27 - app_old/app/Controller/API/Unidades.php | 41 - app_old/app/Controller/Admin.php | 233 -- app_old/app/Controller/Ajax.php | 215 -- app_old/app/Controller/Auth.php | 59 - app_old/app/Controller/Bonos.php | 67 - app_old/app/Controller/Buscar.php | 340 --- app_old/app/Controller/Cierres.php | 428 --- app_old/app/Controller/Comentarios.php | 39 - app_old/app/Controller/Contabilidad.php | 100 - app_old/app/Controller/Creditos.php | 207 -- app_old/app/Controller/Cuotas.php | 230 -- app_old/app/Controller/Devoluciones.php | 19 - app_old/app/Controller/Escrituras.php | 212 -- app_old/app/Controller/FormaPago.php | 98 - app_old/app/Controller/Home.php | 85 - app_old/app/Controller/Informes.php | 830 ----- app_old/app/Controller/Inmobiliarias.php | 74 - app_old/app/Controller/Operadores.php | 47 - app_old/app/Controller/Other.php | 71 - app_old/app/Controller/Pagares.php | 271 -- app_old/app/Controller/Pagos.php | 358 --- app_old/app/Controller/Pies.php | 104 - app_old/app/Controller/Postventas.php | 69 - app_old/app/Controller/Precios.php | 177 -- app_old/app/Controller/Propietarios.php | 129 - .../app/Controller/ProyectoTipoUnidades.php | 77 - app_old/app/Controller/Proyectos.php | 327 -- app_old/app/Controller/Reajustes.php | 90 - app_old/app/Controller/Registros.php | 39 - app_old/app/Controller/Subsidios.php | 184 -- app_old/app/Controller/Temas.php | 111 - app_old/app/Controller/Unidades.php | 126 - app_old/app/Controller/UnidadesBloqueadas.php | 83 - app_old/app/Controller/Ventas.php | 605 ---- app_old/app/Definition/Controller.php | 31 - app_old/app/Definition/hasEstado.php | 38 - app_old/app/Definition/hasRUT.php | 20 - app_old/app/Exception/PropertyNotFound.php | 16 - app_old/app/Helper/Color.php | 169 -- app_old/app/Helper/Line.php | 61 - app_old/app/Helper/functions.php | 128 - app_old/app/Middleware/Auth.php | 38 - app_old/app/Service/Auth.php | 165 - app_old/app/Service/Borrador.php | 118 - app_old/app/Service/DBToModel.php | 158 - app_old/app/Service/Factory.php | 204 -- app_old/app/Service/Informador.php | 463 --- .../Service/Informe/Contabilidad/Resumen.php | 190 -- app_old/app/Service/Informe/Informe.php | 55 - app_old/app/Service/Money.php | 55 - app_old/app/Service/Register.php | 34 - app_old/app/Service/Remote.php | 19 - app_old/app/Service/Replacer.php | 127 - app_old/app/Service/Route.php | 131 - app_old/bin/Pipfile | 12 - app_old/bin/console | 3 - app_old/bin/index.php | 8 - app_old/bin/informes/Pipfile | 16 - app_old/bin/informes/app.py | 14 - app_old/bin/informes/controllers/ventas.py | 141 - app_old/bootstrap/autoload.php | 8 - app_old/bootstrap/database.php | 29 - app_old/bootstrap/dotenv.php | 12 - app_old/bootstrap/errors.php | 7 - app_old/bootstrap/logs.php | 26 - app_old/bootstrap/routes.php | 21 - app_old/cli/app.php | 48 - app_old/cli/cli/config.php | 26 - app_old/cli/cli/middlewares.php | 9 - app_old/cli/cli/setups.php | 44 - app_old/cli/composer.php | 6 - app_old/composer.json | 69 - app_old/config/app.php | 9 - app_old/config/databases.php | 24 - app_old/config/incoviba.php | 6 - app_old/config/locations.php | 16 - app_old/fontify.json | 7 - app_old/incoviba/modelos/.gitignore | 3 - .../incoviba/modelos/common/Alias/Model.php | 87 - .../modelos/common/Alias/NewEstado.php | 20 - .../modelos/common/Alias/NewModel.php | 9 - .../incoviba/modelos/common/Alias/NewTipo.php | 15 - .../modelos/common/Alias/OldModel.php | 8 - .../incoviba/modelos/common/Factory/Model.php | 204 -- app_old/incoviba/modelos/composer.json | 26 - .../incoviba/modelos/src/common/Action.php | 12 - app_old/incoviba/modelos/src/common/Auth.php | 63 - .../incoviba/modelos/src/common/Location.php | 23 - .../modelos/src/common/Permission.php | 49 - .../incoviba/modelos/src/common/Registry.php | 64 - .../modelos/src/common/RegistryData.php | 16 - app_old/incoviba/modelos/src/common/Role.php | 164 - app_old/incoviba/modelos/src/common/User.php | 104 - .../incoviba/modelos/src/common/UserRole.php | 26 - .../modelos/src/nuevo/Common/Banco.php | 22 - .../modelos/src/nuevo/Common/Comuna.php | 27 - .../modelos/src/nuevo/Common/Direccion.php | 24 - .../incoviba/modelos/src/nuevo/Common/M2.php | 33 - .../modelos/src/nuevo/Common/Provincia.php | 27 - .../modelos/src/nuevo/Common/Region.php | 24 - .../incoviba/modelos/src/nuevo/Common/UF.php | 33 - .../modelos/src/nuevo/Inmobiliaria/Agente.php | 47 - .../Inmobiliaria/CategoriaCuentaContable.php | 21 - .../modelos/src/nuevo/Inmobiliaria/Cobro.php | 36 - .../src/nuevo/Inmobiliaria/Contrato.php | 37 - .../modelos/src/nuevo/Inmobiliaria/Cuenta.php | 31 - .../src/nuevo/Inmobiliaria/CuentaContable.php | 44 - .../src/nuevo/Inmobiliaria/EstadoCobro.php | 26 - .../src/nuevo/Inmobiliaria/Inmobiliaria.php | 50 - .../src/nuevo/Inmobiliaria/Participacion.php | 27 - .../src/nuevo/Inmobiliaria/Representante.php | 56 - .../modelos/src/nuevo/Inmobiliaria/Socio.php | 23 - .../src/nuevo/Inmobiliaria/TipoAgente.php | 22 - .../src/nuevo/Inmobiliaria/TipoCobro.php | 22 - .../src/nuevo/Inmobiliaria/TipoContrato.php | 22 - .../nuevo/Inmobiliaria/TipoEstadoCobro.php | 22 - .../Inmobiliaria/TransaccionContable.php | 46 - .../src/nuevo/Proyecto/EstadoProyecto.php | 25 - .../modelos/src/nuevo/Proyecto/Etapa.php | 22 - .../modelos/src/nuevo/Proyecto/Participe.php | 27 - .../modelos/src/nuevo/Proyecto/Proyecto.php | 132 - .../src/nuevo/Proyecto/ProyectoParticipe.php | 27 - .../modelos/src/nuevo/Proyecto/Tema.php | 75 - .../src/nuevo/Proyecto/TipoEstadoProyecto.php | 28 - .../modelos/src/nuevo/Proyecto/TipoUnidad.php | 21 - .../src/nuevo/Proyecto/UnidadProyecto.php | 50 - .../modelos/src/nuevo/Venta/Cierre.php | 59 - .../modelos/src/nuevo/Venta/Comentario.php | 23 - .../modelos/src/nuevo/Venta/Cuota.php | 27 - .../modelos/src/nuevo/Venta/Entrega.php | 47 - .../modelos/src/nuevo/Venta/EstadoCierre.php | 26 - .../src/nuevo/Venta/EstadoObservacion.php | 26 - .../modelos/src/nuevo/Venta/EstadoPago.php | 25 - .../src/nuevo/Venta/EstadoPostventa.php | 27 - .../modelos/src/nuevo/Venta/EstadoVenta.php | 25 - .../modelos/src/nuevo/Venta/FondoVenta.php | 31 - .../modelos/src/nuevo/Venta/FormaPago.php | 35 - .../modelos/src/nuevo/Venta/Medicion.php | 24 - .../modelos/src/nuevo/Venta/Observacion.php | 20 - .../incoviba/modelos/src/nuevo/Venta/Pago.php | 35 - .../incoviba/modelos/src/nuevo/Venta/Pie.php | 39 - .../modelos/src/nuevo/Venta/Postventa.php | 38 - .../src/nuevo/Venta/PostventaObservacion.php | 27 - .../modelos/src/nuevo/Venta/Premio.php | 27 - .../modelos/src/nuevo/Venta/Propiedad.php | 30 - .../modelos/src/nuevo/Venta/Propietario.php | 71 - .../src/nuevo/Venta/ProyectoTipoMedicion.php | 28 - .../modelos/src/nuevo/Venta/Reserva.php | 30 - .../src/nuevo/Venta/TipoEstadoCierre.php | 10 - .../src/nuevo/Venta/TipoEstadoObservacion.php | 10 - .../src/nuevo/Venta/TipoEstadoPago.php | 14 - .../src/nuevo/Venta/TipoEstadoPostventa.php | 17 - .../src/nuevo/Venta/TipoEstadoVenta.php | 14 - .../modelos/src/nuevo/Venta/TipoFondo.php | 14 - .../modelos/src/nuevo/Venta/TipoMedicion.php | 10 - .../modelos/src/nuevo/Venta/TipoPago.php | 14 - .../modelos/src/nuevo/Venta/TipoPremio.php | 14 - .../modelos/src/nuevo/Venta/Unidad.php | 47 - .../src/nuevo/Venta/UnidadPropiedad.php | 27 - .../modelos/src/nuevo/Venta/UnidadReserva.php | 27 - .../modelos/src/nuevo/Venta/Venta.php | 104 - .../incoviba/modelos/src/old/Common/Banco.php | 29 - .../modelos/src/old/Common/Comuna.php | 22 - .../modelos/src/old/Common/Direccion.php | 36 - .../modelos/src/old/Common/Provincia.php | 26 - .../modelos/src/old/Common/Region.php | 44 - .../modelos/src/old/Inmobiliaria/Cuenta.php | 23 - .../src/old/Inmobiliaria/Inmobiliaria.php | 135 - .../Inmobiliaria/RelacionInmobiliarias.php | 24 - .../src/old/Inmobiliaria/TipoSociedad.php | 12 - .../modelos/src/old/Proyecto/Agente.php | 41 - .../modelos/src/old/Proyecto/AgenteTipo.php | 20 - .../src/old/Proyecto/AvanceConstruccion.php | 86 - .../modelos/src/old/Proyecto/Cobro.php | 35 - .../modelos/src/old/Proyecto/Costo.php | 21 - .../modelos/src/old/Proyecto/EstadoCobro.php | 25 - .../src/old/Proyecto/EstadoProyecto.php | 30 - .../src/old/Proyecto/EstadoProyectoAgente.php | 29 - .../src/old/Proyecto/EtapaProyecto.php | 18 - .../modelos/src/old/Proyecto/Pagare.php | 142 - .../modelos/src/old/Proyecto/Proyectista.php | 21 - .../modelos/src/old/Proyecto/Proyectistas.php | 17 - .../modelos/src/old/Proyecto/Proyecto.php | 873 ------ .../src/old/Proyecto/ProyectoAgente.php | 54 - .../src/old/Proyecto/ProyectoTipoUnidad.php | 165 - .../src/old/Proyecto/RelacionAgentes.php | 16 - .../src/old/Proyecto/RenovacionPagare.php | 90 - .../modelos/src/old/Proyecto/TipoAgente.php | 24 - .../modelos/src/old/Proyecto/TipoCobro.php | 17 - .../modelos/src/old/Proyecto/TipoElemento.php | 12 - .../src/old/Proyecto/TipoEstadoCobro.php | 17 - .../src/old/Proyecto/TipoEstadoProyecto.php | 23 - .../old/Proyecto/TipoEstadoProyectoAgente.php | 12 - .../src/old/Proyecto/TipoMonedaPagare.php | 12 - .../src/old/Proyecto/TipoProyectista.php | 17 - .../src/old/Proyecto/TipoTipologia.php | 27 - .../modelos/src/old/Proyecto/Tipologia.php | 12 - .../modelos/src/old/Venta/BonoPie.php | 22 - .../incoviba/modelos/src/old/Venta/Cierre.php | 341 --- .../modelos/src/old/Venta/Comentario.php | 22 - .../modelos/src/old/Venta/Credito.php | 29 - .../incoviba/modelos/src/old/Venta/Cuota.php | 72 - .../modelos/src/old/Venta/Entrega.php | 21 - .../modelos/src/old/Venta/Escritura.php | 29 - .../modelos/src/old/Venta/EstadoCierre.php | 30 - .../modelos/src/old/Venta/EstadoPago.php | 27 - .../modelos/src/old/Venta/EstadoPrecio.php | 33 - .../modelos/src/old/Venta/EstadoProblema.php | 17 - .../src/old/Venta/EstadoUnidadBloqueada.php | 30 - .../modelos/src/old/Venta/EstadoVenta.php | 27 - .../incoviba/modelos/src/old/Venta/Pago.php | 159 - .../incoviba/modelos/src/old/Venta/Pie.php | 228 -- .../incoviba/modelos/src/old/Venta/Precio.php | 81 - .../modelos/src/old/Venta/Problema.php | 16 - .../modelos/src/old/Venta/Promocion.php | 23 - .../modelos/src/old/Venta/PromocionVenta.php | 24 - .../modelos/src/old/Venta/Propiedad.php | 117 - .../modelos/src/old/Venta/PropiedadUnidad.php | 25 - .../modelos/src/old/Venta/Propietario.php | 66 - .../modelos/src/old/Venta/Subsidio.php | 44 - .../src/old/Venta/TipoEstadoCierre.php | 13 - .../modelos/src/old/Venta/TipoEstadoPago.php | 17 - .../src/old/Venta/TipoEstadoPrecio.php | 12 - .../old/Venta/TipoEstadoUnidadBloqueada.php | 19 - .../modelos/src/old/Venta/TipoEstadoVenta.php | 21 - .../modelos/src/old/Venta/TipoPago.php | 17 - .../modelos/src/old/Venta/TipoUnidad.php | 17 - .../modelos/src/old/Venta/TipoValorCierre.php | 12 - .../incoviba/modelos/src/old/Venta/Unidad.php | 251 -- .../modelos/src/old/Venta/UnidadBloqueada.php | 42 - .../modelos/src/old/Venta/UnidadCierre.php | 22 - .../modelos/src/old/Venta/ValorCierre.php | 22 - .../incoviba/modelos/src/old/Venta/Venta.php | 514 ---- .../modelos/src/old/Venta/Venta.php.save | 517 ---- app_old/package.json | 58 - app_old/public/Pipfile | 11 - app_old/public/api/.htaccess | 4 - app_old/public/api/index.php | 8 - app_old/public/api/keys | 1 - app_old/public/css/app.css | 14 - app_old/public/css/custom.css | 6 - app_old/public/fonts/FontAwesome.otf | Bin 134808 -> 0 bytes app_old/public/fonts/fontawesome-webfont.eot | Bin 165742 -> 0 bytes app_old/public/fonts/fontawesome-webfont.svg | 2671 ----------------- app_old/public/fonts/fontawesome-webfont.ttf | Bin 165548 -> 0 bytes app_old/public/fonts/fontawesome-webfont.woff | Bin 98024 -> 0 bytes .../public/fonts/fontawesome-webfont.woff2 | Bin 77160 -> 0 bytes .../fonts/glyphicons-halflings-regular.eot | Bin 20127 -> 0 bytes .../fonts/glyphicons-halflings-regular.svg | 288 -- .../fonts/glyphicons-halflings-regular.ttf | Bin 45404 -> 0 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 23424 -> 0 bytes .../fonts/glyphicons-halflings-regular.woff2 | Bin 18028 -> 0 bytes app_old/public/images/Isotipo 16.png | Bin 3552 -> 0 bytes app_old/public/images/Isotipo 32.png | Bin 4572 -> 0 bytes app_old/public/images/Isotipo 64.png | Bin 6361 -> 0 bytes app_old/public/images/logo_cabezal.png | Bin 23004 -> 0 bytes app_old/public/index.php | 8 - app_old/public/index.php.old | 288 -- app_old/public/install/create_admin.php | 40 - app_old/public/install/create_guest.php | 36 - app_old/public/install/create_user_base.php | 128 - app_old/public/install/end_install.php | 7 - app_old/public/install/index.php | 7 - app_old/public/install/log_locations.php | 39 - app_old/public/install/next_step.php | 20 - app_old/public/js/admin.js | 81 - app_old/public/js/app.js | 89 - app_old/public/js/ventas/pies/cuotas/add.js | 56 - app_old/public/links.log | 6 - app_old/public/precios.csv | 1 - app_old/resources/js/app.js | 30 - app_old/resources/js/binaryIndexOf.js | 28 - app_old/resources/js/bootstrap.js | 11 - app_old/resources/js/chart.js | 2 - app_old/resources/js/jquery.filterTable.js | 68 - app_old/resources/less/Controller/Admin.php | 233 -- app_old/resources/less/Controller/Ajax.php | 215 -- app_old/resources/less/Controller/Auth.php | 56 - app_old/resources/less/Controller/Bonos.php | 57 - app_old/resources/less/Controller/Buscar.php | 340 --- app_old/resources/less/Controller/Cierres.php | 428 --- .../resources/less/Controller/Comentarios.php | 39 - .../less/Controller/Contabilidad.php | 102 - .../resources/less/Controller/Creditos.php | 207 -- app_old/resources/less/Controller/Cuotas.php | 230 -- .../less/Controller/Devoluciones.php | 19 - .../resources/less/Controller/Escrituras.php | 212 -- .../resources/less/Controller/FormaPago.php | 98 - .../resources/less/Controller/Informes.php | 950 ------ .../less/Controller/Informes.php.save | 901 ------ .../less/Controller/Inmobiliarias.php | 74 - .../resources/less/Controller/Operadores.php | 47 - app_old/resources/less/Controller/Other.php | 71 - app_old/resources/less/Controller/Pagares.php | 271 -- app_old/resources/less/Controller/Pagos.php | 358 --- app_old/resources/less/Controller/Pies.php | 104 - .../resources/less/Controller/Postventas.php | 69 - app_old/resources/less/Controller/Precios.php | 166 - .../less/Controller/Propietarios.php | 129 - .../less/Controller/ProyectoTipoUnidades.php | 77 - .../resources/less/Controller/Proyectos.php | 327 -- .../resources/less/Controller/Reajustes.php | 90 - .../resources/less/Controller/Registros.php | 39 - .../resources/less/Controller/Subsidios.php | 184 -- app_old/resources/less/Controller/Temas.php | 111 - .../resources/less/Controller/Unidades.php | 126 - .../less/Controller/UnidadesBloqueadas.php | 83 - app_old/resources/less/Controller/Ventas.php | 623 ---- app_old/resources/less/_variables.less | 9 - app_old/resources/less/app.less | 9 - app_old/resources/less/bootstrap.less | 2 - app_old/resources/less/custom.less | 50 - app_old/resources/less/print.less | 101 - app_old/resources/less/submenu.less | 42 - app_old/resources/routes/api.php | 8 - app_old/resources/routes/api/unidades.php | 6 - app_old/resources/routes/cli.php | 5 - app_old/resources/routes/ui/01_auth.php | 15 - app_old/resources/routes/ui/99_base.php | 4 - app_old/resources/views/admin/base.blade.php | 43 - app_old/resources/views/admin/menu.blade.php | 40 - .../views/admin/menu/models.blade.php | 3 - .../views/admin/menu/registros.blade.php | 3 - .../views/admin/menu/roles.blade.php | 4 - .../views/admin/menu/users.blade.php | 4 - .../resources/views/admin/models.blade.php | 31 - .../registros/controles_avance.blade.php | 31 - .../views/admin/registros/list.blade.php | 41 - .../views/admin/registros/show.blade.php | 62 - .../resources/views/admin/roles/add.blade.php | 17 - .../admin/roles/add_permissions.blade.php | 40 - .../views/admin/roles/add_users.blade.php | 24 - .../views/admin/roles/list.blade.php | 32 - .../views/admin/roles/show.blade.php | 63 - .../resources/views/admin/users/add.blade.php | 21 - .../views/admin/users/add_role.blade.php | 24 - .../views/admin/users/list.blade.php | 29 - .../views/admin/users/show.blade.php | 62 - app_old/resources/views/auth/base.blade.php | 57 - .../views/auth/change_pass.blade.php | 78 - app_old/resources/views/auth/login.blade.php | 17 - app_old/resources/views/benchmark.blade.php | 7 - .../resources/views/buscar/buscar.blade.php | 79 - .../views/buscar/resultado.blade.php | 46 - app_old/resources/views/calendario.blade.php | 17 - app_old/resources/views/cierres.blade.php | 31 - .../resources/views/construccion.blade.php | 5 - .../views/contabilidad/pago.blade.php | 20 - .../views/contabilidad/pagos.blade.php | 74 - app_old/resources/views/form/fecha.blade.php | 38 - app_old/resources/views/guest.blade.php | 57 - app_old/resources/views/home.blade.php | 28 - .../views/informes/comisiones.blade.php | 49 - .../views/informes/contabilidad.blade.php | 68 - .../views/informes/escrituras.blade.php | 6 - .../views/informes/gantt_entregas.blade.php | 6 - .../views/informes/para_comision.blade.php | 25 - .../views/informes/proyectos.blade.php | 12 - .../views/informes/resciliaciones.blade.php | 6 - .../informes/resumen_contabilidad.blade.php | 71 - .../resources/views/informes/ventas.blade.php | 6 - .../views/inmobiliarias/add.blade.php | 50 - .../views/inmobiliarias/edit.blade.php | 54 - .../views/inmobiliarias/list.blade.php | 31 - .../views/inmobiliarias/show.blade.php | 47 - .../resources/views/install/admin.blade.php | 47 - .../resources/views/install/base.blade.php | 38 - app_old/resources/views/install/end.blade.php | 5 - .../resources/views/install/start.blade.php | 6 - app_old/resources/views/layout/base.blade.php | 31 - .../resources/views/layout/footer.blade.php | 0 .../resources/views/layout/header.blade.php | 16 - .../views/layout/icons/abonar.blade.php | 1 - .../views/layout/icons/add.blade.php | 5 - .../views/layout/icons/edit.blade.php | 5 - .../views/layout/icons/pagar.blade.php | 1 - .../views/layout/icons/remove.blade.php | 5 - .../views/layout/icons/show.blade.php | 9 - app_old/resources/views/layout/menu.blade.php | 69 - .../views/layout/menu.blade.php.save | 62 - .../views/layout/menu/herramientas.blade.php | 3 - .../views/layout/menu/informes.blade.php | 4 - .../views/layout/menu/inmobiliarias.blade.php | 3 - .../views/layout/menu/login.blade.php | 8 - .../views/layout/menu/operadores.blade.php | 12 - .../views/layout/menu/proyectos.blade.php | 4 - .../views/layout/menu/ventas.blade.php | 24 - .../views/other/capacidades.blade.php | 21 - .../views/other/entregar_multiple.blade.php | 26 - .../views/print/devolucion.blade.php | 136 - .../resources/views/proyectos/add.blade.php | 80 - .../views/proyectos/advance.blade.php | 98 - .../views/proyectos/avance.blade.php | 15 - .../views/proyectos/avances/edit.blade.php | 39 - .../views/proyectos/avances_row.blade.php | 27 - .../views/proyectos/construccion.blade.php | 336 --- .../views/proyectos/disponibles.blade.php | 36 - .../views/proyectos/estimado.blade.php | 42 - .../views/proyectos/historia.blade.php | 74 - .../views/proyectos/historia.blade.php.old | 82 - .../resources/views/proyectos/list.blade.php | 42 - .../views/proyectos/operadores/add.blade.php | 29 - .../views/proyectos/pagares/add.blade.php | 62 - .../pagares/add_renovacion.blade.php | 44 - .../views/proyectos/pagares/edit.blade.php | 66 - .../pagares/edit_renovacion.blade.php | 45 - .../views/proyectos/pagares/show.blade.php | 100 - .../views/proyectos/por_vender.blade.php | 66 - .../views/proyectos/reservas/base.blade.php | 72 - .../resources/views/proyectos/show.blade.php | 230 -- .../views/proyectos/superficies.blade.php | 97 - .../proyectos/tipo_unidades/add.blade.php | 44 - .../proyectos/tipo_unidades/edit.blade.php | 43 - .../views/proyectos/unidades/add.blade.php | 110 - .../views/proyectos/unidades/add2.blade.php | 86 - .../views/proyectos/unidades/assign.blade.php | 38 - .../views/proyectos/unidades/edit.blade.php | 52 - .../views/proyectos/unidades/list.blade.php | 198 -- .../proyectos/unidades/proyectos.blade.php | 29 - .../views/proyectos/ventas.blade.php | 87 - app_old/resources/views/temas/add.blade.php | 31 - app_old/resources/views/temas/edit.blade.php | 36 - app_old/resources/views/temas/list.blade.php | 57 - app_old/resources/views/ventas/add.blade.php | 561 ---- .../resources/views/ventas/archivar.blade.php | 16 - .../views/ventas/bonos/add.blade.php | 29 - .../views/ventas/bonos/edit.blade.php | 29 - .../resources/views/ventas/ceder.blade.php | 143 - .../views/ventas/cierres/add.blade.php | 374 --- .../views/ventas/cierres/edit.blade.php | 473 --- .../views/ventas/cierres/evaluar.blade.php | 447 --- .../views/ventas/cierres/list.blade.php | 190 -- .../views/ventas/cierres/show.blade.php | 168 -- .../views/ventas/comentarios/add.blade.php | 23 - .../views/ventas/consolidacion/pago.blade.php | 12 - .../ventas/consolidacion/proyectos.blade.php | 13 - .../views/ventas/consolidacion/show.blade.php | 60 - .../views/ventas/creditos/abonar.blade.php | 31 - .../views/ventas/creditos/add.blade.php | 61 - .../views/ventas/creditos/edit.blade.php | 42 - .../views/ventas/creditos/pagar.blade.php | 31 - .../ventas/creditos/pendientes.blade.php | 35 - .../views/ventas/creditos/show.blade.php | 53 - .../resources/views/ventas/desist.blade.php | 44 - .../views/ventas/devolucion.blade.php | 63 - app_old/resources/views/ventas/edit.blade.php | 546 ---- .../resources/views/ventas/entregar.blade.php | 125 - .../views/ventas/escrituras/abonar.blade.php | 25 - .../views/ventas/escrituras/add.blade.php | 219 -- .../views/ventas/escrituras/edit.blade.php | 53 - .../views/ventas/escrituras/informe.blade.php | 95 - .../views/ventas/escrituras/pagar.blade.php | 24 - .../resources/views/ventas/firmar.blade.php | 16 - .../views/ventas/forma_pago.blade.php | 283 -- .../views/ventas/forma_pago/edit.blade.php | 227 -- app_old/resources/views/ventas/list.blade.php | 42 - .../operadores/unidades/bloquear.blade.php | 61 - .../ventas/operadores/unidades/list.blade.php | 82 - .../views/ventas/pagos/edit.blade.php | 77 - .../views/ventas/pagos/pendientes.blade.php | 268 -- .../views/ventas/pagos/show.blade.php | 61 - .../views/ventas/pies/cuotas/abonar.blade.php | 197 -- .../views/ventas/pies/cuotas/add.blade.php | 123 - .../views/ventas/pies/cuotas/edit.blade.php | 69 - .../views/ventas/pies/cuotas/estado.blade.php | 10 - .../ventas/pies/cuotas/pendientes.blade.php | 139 - .../views/ventas/pies/cuotas/show.blade.php | 64 - .../views/ventas/pies/edit.blade.php | 23 - .../views/ventas/pies/reajustar.blade.php | 48 - .../ventas/pies/reajustes/abonar.blade.php | 25 - .../ventas/pies/reajustes/edit.blade.php | 53 - .../ventas/pies/reajustes/pagar.blade.php | 24 - .../views/ventas/pies/resumen.blade.php | 276 -- .../views/ventas/pies/totales.blade.php | 15 - .../views/ventas/postventas/add.blade.php | 71 - .../views/ventas/postventas/show.blade.php | 26 - .../views/ventas/precios/add.blade.php | 130 - .../views/ventas/precios/import.blade.php | 37 - .../views/ventas/precios/list.blade.php | 134 - .../views/ventas/precios/proyectos.blade.php | 14 - .../views/ventas/propietarios/edit.blade.php | 246 -- .../views/ventas/proyectos.blade.php | 18 - .../views/ventas/resciliaciones.blade.php | 38 - app_old/resources/views/ventas/show.blade.php | 287 -- .../views/ventas/sort_title.blade.php | 24 - .../views/ventas/subsidios/abonar.blade.php | 23 - .../views/ventas/subsidios/add.blade.php | 32 - .../views/ventas/subsidios/edit.blade.php | 32 - .../views/ventas/subsidios/pagar.blade.php | 23 - app_old/setup/api/config.php | 14 - app_old/setup/api/setups.php | 15 - app_old/setup/app.php | 61 - app_old/setup/common/config.php | 40 - app_old/setup/composer.php | 6 - app_old/setup/database.php | 29 - app_old/setup/env/config.php | 18 - app_old/setup/router.php | 5 - app_old/setup/settings/01_env.php | 18 - app_old/setup/settings/02_common.php | 40 - app_old/setup/settings/03_api.php | 8 - app_old/setup/settings/04_ui.php | 11 - app_old/setup/setups/04_ui.php | 15 - app_old/ui/app.php | 45 - app_old/ui/composer.php | 6 - app_old/ui/middlewares/01_auth.php | 2 - app_old/ui/middlewares/02_databases.php | 20 - app_old/ui/middlewares/98_logs.php | 2 - app_old/ui/middlewares/99_routes.php | 15 - app_old/ui/settings/01_env.php | 4 - app_old/ui/settings/02_folders.php | 12 - app_old/ui/settings/03_urls.php | 8 - app_old/ui/settings/04_databases.php | 20 - app_old/ui/setups/01_views.php | 20 - app_old/ui/setups/03_services.php | 8 - app_old/ui/setups/98_logs.php | 30 - app_old/webpack.config.js | 10 - 609 files changed, 43154 deletions(-) delete mode 100644 app_old/.adminer.env.sample delete mode 100644 app_old/.db.env.sample delete mode 100644 app_old/.env.sample delete mode 100644 app_old/.gitignore delete mode 100644 app_old/aldarien/asset/.gitignore delete mode 100644 app_old/aldarien/asset/LICENSE delete mode 100644 app_old/aldarien/asset/README.md delete mode 100644 app_old/aldarien/asset/app/Contract/Asset.php delete mode 100644 app_old/aldarien/asset/app/Helper/functions.php delete mode 100644 app_old/aldarien/asset/app/Service/Asset.php delete mode 100644 app_old/aldarien/asset/composer.json delete mode 100644 app_old/aldarien/asset/phpunit.xml delete mode 100644 app_old/aldarien/asset/tests/AssetTest.php delete mode 100644 app_old/aldarien/config/.gitignore delete mode 100644 app_old/aldarien/config/.travis.yml delete mode 100644 app_old/aldarien/config/LICENSE delete mode 100644 app_old/aldarien/config/README.md delete mode 100644 app_old/aldarien/config/app/Contract/Config.php delete mode 100644 app_old/aldarien/config/app/Contract/YamlWrapper.php delete mode 100644 app_old/aldarien/config/app/Helper/functions.php delete mode 100644 app_old/aldarien/config/app/Service/Config.php delete mode 100644 app_old/aldarien/config/bootstrap/autoload.php delete mode 100644 app_old/aldarien/config/composer.json delete mode 100644 app_old/aldarien/config/phpunit.xml delete mode 100644 app_old/aldarien/config/tests/ConfigTest.php delete mode 100644 app_old/aldarien/contract/.gitignore delete mode 100644 app_old/aldarien/contract/LICENSE delete mode 100644 app_old/aldarien/contract/app/Definition/Contract.php delete mode 100644 app_old/aldarien/contract/composer.json delete mode 100644 app_old/aldarien/format/.gitignore delete mode 100644 app_old/aldarien/format/LICENSE delete mode 100644 app_old/aldarien/format/README.md delete mode 100644 app_old/aldarien/format/app/Helper/Format.php delete mode 100644 app_old/aldarien/format/composer.json delete mode 100644 app_old/aldarien/format/config/app.php delete mode 100644 app_old/aldarien/format/phpunit.xml delete mode 100644 app_old/aldarien/format/tests/FormatTest.php delete mode 100644 app_old/aldarien/response/.gitignore delete mode 100644 app_old/aldarien/response/LICENSE delete mode 100644 app_old/aldarien/response/README.md delete mode 100644 app_old/aldarien/response/app/Contract/Response.php delete mode 100644 app_old/aldarien/response/app/Helper/functions.php delete mode 100644 app_old/aldarien/response/app/Service/Response.php delete mode 100644 app_old/aldarien/response/bootstrap/autoload.php delete mode 100644 app_old/aldarien/response/composer.json delete mode 100644 app_old/aldarien/response/phpunit.xml delete mode 100644 app_old/aldarien/response/tests/ResponseTest.php delete mode 100644 app_old/aldarien/root/.gitignore delete mode 100644 app_old/aldarien/root/LICENSE delete mode 100644 app_old/aldarien/root/README.md delete mode 100644 app_old/aldarien/root/app/Helper/functions.php delete mode 100644 app_old/aldarien/root/composer.json delete mode 100644 app_old/aldarien/root/phpunit.xml delete mode 100644 app_old/aldarien/root/src/Root.php delete mode 100644 app_old/aldarien/root/tests/RootTest.php delete mode 100644 app_old/aldarien/session/.gitignore delete mode 100644 app_old/aldarien/session/LICENSE delete mode 100644 app_old/aldarien/session/README.md delete mode 100644 app_old/aldarien/session/app/Contract/Session.php delete mode 100644 app_old/aldarien/session/composer.json delete mode 100644 app_old/aldarien/url/.gitignore delete mode 100644 app_old/aldarien/url/LICENSE delete mode 100644 app_old/aldarien/url/README.md delete mode 100644 app_old/aldarien/url/app/Contract/URL.php delete mode 100644 app_old/aldarien/url/app/Helper/functions.php delete mode 100644 app_old/aldarien/url/app/Service/URL.php delete mode 100644 app_old/aldarien/url/composer.json delete mode 100644 app_old/aldarien/view/.gitignore delete mode 100644 app_old/aldarien/view/LICENSE delete mode 100644 app_old/aldarien/view/README.md delete mode 100644 app_old/aldarien/view/app/Contract/View.php delete mode 100644 app_old/aldarien/view/app/Helper/functions.php delete mode 100644 app_old/aldarien/view/app/Service/View.php delete mode 100644 app_old/aldarien/view/composer.json delete mode 100644 app_old/aldarien/view/config/locations.php delete mode 100644 app_old/aldarien/view/phpunit.xml delete mode 100644 app_old/aldarien/view/public/index.php delete mode 100644 app_old/aldarien/view/resources/views/base.blade.php delete mode 100644 app_old/aldarien/view/tests/ViewTest.php delete mode 100644 app_old/app/Alias/Connection.php delete mode 100644 app_old/app/Alias/Excel/Style/Mes.php delete mode 100644 app_old/app/Alias/Format.php delete mode 100644 app_old/app/Alias/Model.php delete mode 100644 app_old/app/Alias/NewEstado.php delete mode 100644 app_old/app/Alias/NewModel.php delete mode 100644 app_old/app/Alias/NewTipo.php delete mode 100644 app_old/app/Alias/OldModel.php delete mode 100644 app_old/app/Alias/PHPExcel.php delete mode 100644 app_old/app/Alias/RemoteConnection.php delete mode 100644 app_old/app/Command/Money/Get.php delete mode 100644 app_old/app/Command/Money/Lookup.php delete mode 100644 app_old/app/Contract/Auth.php delete mode 100644 app_old/app/Contract/Route.php delete mode 100644 app_old/app/Controller/API/Unidades.php delete mode 100644 app_old/app/Controller/Admin.php delete mode 100644 app_old/app/Controller/Ajax.php delete mode 100644 app_old/app/Controller/Auth.php delete mode 100644 app_old/app/Controller/Bonos.php delete mode 100644 app_old/app/Controller/Buscar.php delete mode 100644 app_old/app/Controller/Cierres.php delete mode 100644 app_old/app/Controller/Comentarios.php delete mode 100644 app_old/app/Controller/Contabilidad.php delete mode 100644 app_old/app/Controller/Creditos.php delete mode 100644 app_old/app/Controller/Cuotas.php delete mode 100644 app_old/app/Controller/Devoluciones.php delete mode 100644 app_old/app/Controller/Escrituras.php delete mode 100644 app_old/app/Controller/FormaPago.php delete mode 100644 app_old/app/Controller/Home.php delete mode 100644 app_old/app/Controller/Informes.php delete mode 100644 app_old/app/Controller/Inmobiliarias.php delete mode 100644 app_old/app/Controller/Operadores.php delete mode 100644 app_old/app/Controller/Other.php delete mode 100644 app_old/app/Controller/Pagares.php delete mode 100644 app_old/app/Controller/Pagos.php delete mode 100644 app_old/app/Controller/Pies.php delete mode 100644 app_old/app/Controller/Postventas.php delete mode 100644 app_old/app/Controller/Precios.php delete mode 100644 app_old/app/Controller/Propietarios.php delete mode 100644 app_old/app/Controller/ProyectoTipoUnidades.php delete mode 100644 app_old/app/Controller/Proyectos.php delete mode 100644 app_old/app/Controller/Reajustes.php delete mode 100644 app_old/app/Controller/Registros.php delete mode 100644 app_old/app/Controller/Subsidios.php delete mode 100644 app_old/app/Controller/Temas.php delete mode 100644 app_old/app/Controller/Unidades.php delete mode 100644 app_old/app/Controller/UnidadesBloqueadas.php delete mode 100644 app_old/app/Controller/Ventas.php delete mode 100644 app_old/app/Definition/Controller.php delete mode 100644 app_old/app/Definition/hasEstado.php delete mode 100644 app_old/app/Definition/hasRUT.php delete mode 100644 app_old/app/Exception/PropertyNotFound.php delete mode 100644 app_old/app/Helper/Color.php delete mode 100644 app_old/app/Helper/Line.php delete mode 100644 app_old/app/Helper/functions.php delete mode 100644 app_old/app/Middleware/Auth.php delete mode 100644 app_old/app/Service/Auth.php delete mode 100644 app_old/app/Service/Borrador.php delete mode 100644 app_old/app/Service/DBToModel.php delete mode 100644 app_old/app/Service/Factory.php delete mode 100644 app_old/app/Service/Informador.php delete mode 100644 app_old/app/Service/Informe/Contabilidad/Resumen.php delete mode 100644 app_old/app/Service/Informe/Informe.php delete mode 100644 app_old/app/Service/Money.php delete mode 100644 app_old/app/Service/Register.php delete mode 100644 app_old/app/Service/Remote.php delete mode 100644 app_old/app/Service/Replacer.php delete mode 100644 app_old/app/Service/Route.php delete mode 100644 app_old/bin/Pipfile delete mode 100644 app_old/bin/console delete mode 100644 app_old/bin/index.php delete mode 100644 app_old/bin/informes/Pipfile delete mode 100644 app_old/bin/informes/app.py delete mode 100644 app_old/bin/informes/controllers/ventas.py delete mode 100644 app_old/bootstrap/autoload.php delete mode 100644 app_old/bootstrap/database.php delete mode 100644 app_old/bootstrap/dotenv.php delete mode 100644 app_old/bootstrap/errors.php delete mode 100644 app_old/bootstrap/logs.php delete mode 100644 app_old/bootstrap/routes.php delete mode 100644 app_old/cli/app.php delete mode 100644 app_old/cli/cli/config.php delete mode 100644 app_old/cli/cli/middlewares.php delete mode 100644 app_old/cli/cli/setups.php delete mode 100644 app_old/cli/composer.php delete mode 100644 app_old/composer.json delete mode 100644 app_old/config/app.php delete mode 100644 app_old/config/databases.php delete mode 100644 app_old/config/incoviba.php delete mode 100644 app_old/config/locations.php delete mode 100644 app_old/fontify.json delete mode 100644 app_old/incoviba/modelos/.gitignore delete mode 100644 app_old/incoviba/modelos/common/Alias/Model.php delete mode 100644 app_old/incoviba/modelos/common/Alias/NewEstado.php delete mode 100644 app_old/incoviba/modelos/common/Alias/NewModel.php delete mode 100644 app_old/incoviba/modelos/common/Alias/NewTipo.php delete mode 100644 app_old/incoviba/modelos/common/Alias/OldModel.php delete mode 100644 app_old/incoviba/modelos/common/Factory/Model.php delete mode 100644 app_old/incoviba/modelos/composer.json delete mode 100644 app_old/incoviba/modelos/src/common/Action.php delete mode 100644 app_old/incoviba/modelos/src/common/Auth.php delete mode 100644 app_old/incoviba/modelos/src/common/Location.php delete mode 100644 app_old/incoviba/modelos/src/common/Permission.php delete mode 100644 app_old/incoviba/modelos/src/common/Registry.php delete mode 100644 app_old/incoviba/modelos/src/common/RegistryData.php delete mode 100644 app_old/incoviba/modelos/src/common/Role.php delete mode 100644 app_old/incoviba/modelos/src/common/User.php delete mode 100644 app_old/incoviba/modelos/src/common/UserRole.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Common/Banco.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Common/Comuna.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Common/Direccion.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Common/M2.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Common/Provincia.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Common/Region.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Common/UF.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Agente.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Inmobiliaria/CategoriaCuentaContable.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Cobro.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Contrato.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Cuenta.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Inmobiliaria/CuentaContable.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Inmobiliaria/EstadoCobro.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Inmobiliaria.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Participacion.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Representante.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Socio.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Inmobiliaria/TipoAgente.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Inmobiliaria/TipoCobro.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Inmobiliaria/TipoContrato.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Inmobiliaria/TipoEstadoCobro.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Inmobiliaria/TransaccionContable.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Proyecto/EstadoProyecto.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Proyecto/Etapa.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Proyecto/Participe.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Proyecto/Proyecto.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Proyecto/ProyectoParticipe.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Proyecto/Tema.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Proyecto/TipoEstadoProyecto.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Proyecto/TipoUnidad.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Proyecto/UnidadProyecto.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Venta/Cierre.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Venta/Comentario.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Venta/Cuota.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Venta/Entrega.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Venta/EstadoCierre.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Venta/EstadoObservacion.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Venta/EstadoPago.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Venta/EstadoPostventa.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Venta/EstadoVenta.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Venta/FondoVenta.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Venta/FormaPago.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Venta/Medicion.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Venta/Observacion.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Venta/Pago.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Venta/Pie.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Venta/Postventa.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Venta/PostventaObservacion.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Venta/Premio.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Venta/Propiedad.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Venta/Propietario.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Venta/ProyectoTipoMedicion.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Venta/Reserva.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Venta/TipoEstadoCierre.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Venta/TipoEstadoObservacion.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Venta/TipoEstadoPago.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Venta/TipoEstadoPostventa.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Venta/TipoEstadoVenta.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Venta/TipoFondo.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Venta/TipoMedicion.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Venta/TipoPago.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Venta/TipoPremio.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Venta/Unidad.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Venta/UnidadPropiedad.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Venta/UnidadReserva.php delete mode 100644 app_old/incoviba/modelos/src/nuevo/Venta/Venta.php delete mode 100644 app_old/incoviba/modelos/src/old/Common/Banco.php delete mode 100644 app_old/incoviba/modelos/src/old/Common/Comuna.php delete mode 100644 app_old/incoviba/modelos/src/old/Common/Direccion.php delete mode 100644 app_old/incoviba/modelos/src/old/Common/Provincia.php delete mode 100644 app_old/incoviba/modelos/src/old/Common/Region.php delete mode 100644 app_old/incoviba/modelos/src/old/Inmobiliaria/Cuenta.php delete mode 100644 app_old/incoviba/modelos/src/old/Inmobiliaria/Inmobiliaria.php delete mode 100644 app_old/incoviba/modelos/src/old/Inmobiliaria/RelacionInmobiliarias.php delete mode 100644 app_old/incoviba/modelos/src/old/Inmobiliaria/TipoSociedad.php delete mode 100644 app_old/incoviba/modelos/src/old/Proyecto/Agente.php delete mode 100644 app_old/incoviba/modelos/src/old/Proyecto/AgenteTipo.php delete mode 100644 app_old/incoviba/modelos/src/old/Proyecto/AvanceConstruccion.php delete mode 100644 app_old/incoviba/modelos/src/old/Proyecto/Cobro.php delete mode 100644 app_old/incoviba/modelos/src/old/Proyecto/Costo.php delete mode 100644 app_old/incoviba/modelos/src/old/Proyecto/EstadoCobro.php delete mode 100644 app_old/incoviba/modelos/src/old/Proyecto/EstadoProyecto.php delete mode 100644 app_old/incoviba/modelos/src/old/Proyecto/EstadoProyectoAgente.php delete mode 100644 app_old/incoviba/modelos/src/old/Proyecto/EtapaProyecto.php delete mode 100644 app_old/incoviba/modelos/src/old/Proyecto/Pagare.php delete mode 100644 app_old/incoviba/modelos/src/old/Proyecto/Proyectista.php delete mode 100644 app_old/incoviba/modelos/src/old/Proyecto/Proyectistas.php delete mode 100644 app_old/incoviba/modelos/src/old/Proyecto/Proyecto.php delete mode 100644 app_old/incoviba/modelos/src/old/Proyecto/ProyectoAgente.php delete mode 100644 app_old/incoviba/modelos/src/old/Proyecto/ProyectoTipoUnidad.php delete mode 100644 app_old/incoviba/modelos/src/old/Proyecto/RelacionAgentes.php delete mode 100644 app_old/incoviba/modelos/src/old/Proyecto/RenovacionPagare.php delete mode 100644 app_old/incoviba/modelos/src/old/Proyecto/TipoAgente.php delete mode 100644 app_old/incoviba/modelos/src/old/Proyecto/TipoCobro.php delete mode 100644 app_old/incoviba/modelos/src/old/Proyecto/TipoElemento.php delete mode 100644 app_old/incoviba/modelos/src/old/Proyecto/TipoEstadoCobro.php delete mode 100644 app_old/incoviba/modelos/src/old/Proyecto/TipoEstadoProyecto.php delete mode 100644 app_old/incoviba/modelos/src/old/Proyecto/TipoEstadoProyectoAgente.php delete mode 100644 app_old/incoviba/modelos/src/old/Proyecto/TipoMonedaPagare.php delete mode 100644 app_old/incoviba/modelos/src/old/Proyecto/TipoProyectista.php delete mode 100644 app_old/incoviba/modelos/src/old/Proyecto/TipoTipologia.php delete mode 100644 app_old/incoviba/modelos/src/old/Proyecto/Tipologia.php delete mode 100644 app_old/incoviba/modelos/src/old/Venta/BonoPie.php delete mode 100644 app_old/incoviba/modelos/src/old/Venta/Cierre.php delete mode 100644 app_old/incoviba/modelos/src/old/Venta/Comentario.php delete mode 100644 app_old/incoviba/modelos/src/old/Venta/Credito.php delete mode 100644 app_old/incoviba/modelos/src/old/Venta/Cuota.php delete mode 100644 app_old/incoviba/modelos/src/old/Venta/Entrega.php delete mode 100644 app_old/incoviba/modelos/src/old/Venta/Escritura.php delete mode 100644 app_old/incoviba/modelos/src/old/Venta/EstadoCierre.php delete mode 100644 app_old/incoviba/modelos/src/old/Venta/EstadoPago.php delete mode 100644 app_old/incoviba/modelos/src/old/Venta/EstadoPrecio.php delete mode 100644 app_old/incoviba/modelos/src/old/Venta/EstadoProblema.php delete mode 100644 app_old/incoviba/modelos/src/old/Venta/EstadoUnidadBloqueada.php delete mode 100644 app_old/incoviba/modelos/src/old/Venta/EstadoVenta.php delete mode 100644 app_old/incoviba/modelos/src/old/Venta/Pago.php delete mode 100644 app_old/incoviba/modelos/src/old/Venta/Pie.php delete mode 100644 app_old/incoviba/modelos/src/old/Venta/Precio.php delete mode 100644 app_old/incoviba/modelos/src/old/Venta/Problema.php delete mode 100644 app_old/incoviba/modelos/src/old/Venta/Promocion.php delete mode 100644 app_old/incoviba/modelos/src/old/Venta/PromocionVenta.php delete mode 100644 app_old/incoviba/modelos/src/old/Venta/Propiedad.php delete mode 100644 app_old/incoviba/modelos/src/old/Venta/PropiedadUnidad.php delete mode 100644 app_old/incoviba/modelos/src/old/Venta/Propietario.php delete mode 100644 app_old/incoviba/modelos/src/old/Venta/Subsidio.php delete mode 100644 app_old/incoviba/modelos/src/old/Venta/TipoEstadoCierre.php delete mode 100644 app_old/incoviba/modelos/src/old/Venta/TipoEstadoPago.php delete mode 100644 app_old/incoviba/modelos/src/old/Venta/TipoEstadoPrecio.php delete mode 100644 app_old/incoviba/modelos/src/old/Venta/TipoEstadoUnidadBloqueada.php delete mode 100644 app_old/incoviba/modelos/src/old/Venta/TipoEstadoVenta.php delete mode 100644 app_old/incoviba/modelos/src/old/Venta/TipoPago.php delete mode 100644 app_old/incoviba/modelos/src/old/Venta/TipoUnidad.php delete mode 100644 app_old/incoviba/modelos/src/old/Venta/TipoValorCierre.php delete mode 100644 app_old/incoviba/modelos/src/old/Venta/Unidad.php delete mode 100644 app_old/incoviba/modelos/src/old/Venta/UnidadBloqueada.php delete mode 100644 app_old/incoviba/modelos/src/old/Venta/UnidadCierre.php delete mode 100644 app_old/incoviba/modelos/src/old/Venta/ValorCierre.php delete mode 100644 app_old/incoviba/modelos/src/old/Venta/Venta.php delete mode 100644 app_old/incoviba/modelos/src/old/Venta/Venta.php.save delete mode 100644 app_old/package.json delete mode 100644 app_old/public/Pipfile delete mode 100644 app_old/public/api/.htaccess delete mode 100644 app_old/public/api/index.php delete mode 100644 app_old/public/api/keys delete mode 100644 app_old/public/css/app.css delete mode 100644 app_old/public/css/custom.css delete mode 100644 app_old/public/fonts/FontAwesome.otf delete mode 100644 app_old/public/fonts/fontawesome-webfont.eot delete mode 100644 app_old/public/fonts/fontawesome-webfont.svg delete mode 100644 app_old/public/fonts/fontawesome-webfont.ttf delete mode 100644 app_old/public/fonts/fontawesome-webfont.woff delete mode 100644 app_old/public/fonts/fontawesome-webfont.woff2 delete mode 100644 app_old/public/fonts/glyphicons-halflings-regular.eot delete mode 100644 app_old/public/fonts/glyphicons-halflings-regular.svg delete mode 100644 app_old/public/fonts/glyphicons-halflings-regular.ttf delete mode 100644 app_old/public/fonts/glyphicons-halflings-regular.woff delete mode 100644 app_old/public/fonts/glyphicons-halflings-regular.woff2 delete mode 100644 app_old/public/images/Isotipo 16.png delete mode 100644 app_old/public/images/Isotipo 32.png delete mode 100644 app_old/public/images/Isotipo 64.png delete mode 100644 app_old/public/images/logo_cabezal.png delete mode 100644 app_old/public/index.php delete mode 100644 app_old/public/index.php.old delete mode 100644 app_old/public/install/create_admin.php delete mode 100644 app_old/public/install/create_guest.php delete mode 100644 app_old/public/install/create_user_base.php delete mode 100644 app_old/public/install/end_install.php delete mode 100644 app_old/public/install/index.php delete mode 100644 app_old/public/install/log_locations.php delete mode 100644 app_old/public/install/next_step.php delete mode 100644 app_old/public/js/admin.js delete mode 100644 app_old/public/js/app.js delete mode 100644 app_old/public/js/ventas/pies/cuotas/add.js delete mode 100644 app_old/public/links.log delete mode 100644 app_old/public/precios.csv delete mode 100644 app_old/resources/js/app.js delete mode 100644 app_old/resources/js/binaryIndexOf.js delete mode 100644 app_old/resources/js/bootstrap.js delete mode 100644 app_old/resources/js/chart.js delete mode 100644 app_old/resources/js/jquery.filterTable.js delete mode 100644 app_old/resources/less/Controller/Admin.php delete mode 100644 app_old/resources/less/Controller/Ajax.php delete mode 100644 app_old/resources/less/Controller/Auth.php delete mode 100644 app_old/resources/less/Controller/Bonos.php delete mode 100644 app_old/resources/less/Controller/Buscar.php delete mode 100644 app_old/resources/less/Controller/Cierres.php delete mode 100644 app_old/resources/less/Controller/Comentarios.php delete mode 100644 app_old/resources/less/Controller/Contabilidad.php delete mode 100644 app_old/resources/less/Controller/Creditos.php delete mode 100644 app_old/resources/less/Controller/Cuotas.php delete mode 100644 app_old/resources/less/Controller/Devoluciones.php delete mode 100644 app_old/resources/less/Controller/Escrituras.php delete mode 100644 app_old/resources/less/Controller/FormaPago.php delete mode 100644 app_old/resources/less/Controller/Informes.php delete mode 100644 app_old/resources/less/Controller/Informes.php.save delete mode 100644 app_old/resources/less/Controller/Inmobiliarias.php delete mode 100644 app_old/resources/less/Controller/Operadores.php delete mode 100644 app_old/resources/less/Controller/Other.php delete mode 100644 app_old/resources/less/Controller/Pagares.php delete mode 100644 app_old/resources/less/Controller/Pagos.php delete mode 100644 app_old/resources/less/Controller/Pies.php delete mode 100644 app_old/resources/less/Controller/Postventas.php delete mode 100644 app_old/resources/less/Controller/Precios.php delete mode 100644 app_old/resources/less/Controller/Propietarios.php delete mode 100644 app_old/resources/less/Controller/ProyectoTipoUnidades.php delete mode 100644 app_old/resources/less/Controller/Proyectos.php delete mode 100644 app_old/resources/less/Controller/Reajustes.php delete mode 100644 app_old/resources/less/Controller/Registros.php delete mode 100644 app_old/resources/less/Controller/Subsidios.php delete mode 100644 app_old/resources/less/Controller/Temas.php delete mode 100644 app_old/resources/less/Controller/Unidades.php delete mode 100644 app_old/resources/less/Controller/UnidadesBloqueadas.php delete mode 100644 app_old/resources/less/Controller/Ventas.php delete mode 100644 app_old/resources/less/_variables.less delete mode 100644 app_old/resources/less/app.less delete mode 100644 app_old/resources/less/bootstrap.less delete mode 100644 app_old/resources/less/custom.less delete mode 100644 app_old/resources/less/print.less delete mode 100644 app_old/resources/less/submenu.less delete mode 100644 app_old/resources/routes/api.php delete mode 100644 app_old/resources/routes/api/unidades.php delete mode 100644 app_old/resources/routes/cli.php delete mode 100644 app_old/resources/routes/ui/01_auth.php delete mode 100644 app_old/resources/routes/ui/99_base.php delete mode 100644 app_old/resources/views/admin/base.blade.php delete mode 100644 app_old/resources/views/admin/menu.blade.php delete mode 100644 app_old/resources/views/admin/menu/models.blade.php delete mode 100644 app_old/resources/views/admin/menu/registros.blade.php delete mode 100644 app_old/resources/views/admin/menu/roles.blade.php delete mode 100644 app_old/resources/views/admin/menu/users.blade.php delete mode 100644 app_old/resources/views/admin/models.blade.php delete mode 100644 app_old/resources/views/admin/registros/controles_avance.blade.php delete mode 100644 app_old/resources/views/admin/registros/list.blade.php delete mode 100644 app_old/resources/views/admin/registros/show.blade.php delete mode 100644 app_old/resources/views/admin/roles/add.blade.php delete mode 100644 app_old/resources/views/admin/roles/add_permissions.blade.php delete mode 100644 app_old/resources/views/admin/roles/add_users.blade.php delete mode 100644 app_old/resources/views/admin/roles/list.blade.php delete mode 100644 app_old/resources/views/admin/roles/show.blade.php delete mode 100644 app_old/resources/views/admin/users/add.blade.php delete mode 100644 app_old/resources/views/admin/users/add_role.blade.php delete mode 100644 app_old/resources/views/admin/users/list.blade.php delete mode 100644 app_old/resources/views/admin/users/show.blade.php delete mode 100644 app_old/resources/views/auth/base.blade.php delete mode 100644 app_old/resources/views/auth/change_pass.blade.php delete mode 100644 app_old/resources/views/auth/login.blade.php delete mode 100644 app_old/resources/views/benchmark.blade.php delete mode 100644 app_old/resources/views/buscar/buscar.blade.php delete mode 100644 app_old/resources/views/buscar/resultado.blade.php delete mode 100644 app_old/resources/views/calendario.blade.php delete mode 100644 app_old/resources/views/cierres.blade.php delete mode 100644 app_old/resources/views/construccion.blade.php delete mode 100644 app_old/resources/views/contabilidad/pago.blade.php delete mode 100644 app_old/resources/views/contabilidad/pagos.blade.php delete mode 100644 app_old/resources/views/form/fecha.blade.php delete mode 100644 app_old/resources/views/guest.blade.php delete mode 100644 app_old/resources/views/home.blade.php delete mode 100644 app_old/resources/views/informes/comisiones.blade.php delete mode 100644 app_old/resources/views/informes/contabilidad.blade.php delete mode 100644 app_old/resources/views/informes/escrituras.blade.php delete mode 100644 app_old/resources/views/informes/gantt_entregas.blade.php delete mode 100644 app_old/resources/views/informes/para_comision.blade.php delete mode 100644 app_old/resources/views/informes/proyectos.blade.php delete mode 100644 app_old/resources/views/informes/resciliaciones.blade.php delete mode 100644 app_old/resources/views/informes/resumen_contabilidad.blade.php delete mode 100644 app_old/resources/views/informes/ventas.blade.php delete mode 100644 app_old/resources/views/inmobiliarias/add.blade.php delete mode 100644 app_old/resources/views/inmobiliarias/edit.blade.php delete mode 100644 app_old/resources/views/inmobiliarias/list.blade.php delete mode 100644 app_old/resources/views/inmobiliarias/show.blade.php delete mode 100644 app_old/resources/views/install/admin.blade.php delete mode 100644 app_old/resources/views/install/base.blade.php delete mode 100644 app_old/resources/views/install/end.blade.php delete mode 100644 app_old/resources/views/install/start.blade.php delete mode 100644 app_old/resources/views/layout/base.blade.php delete mode 100644 app_old/resources/views/layout/footer.blade.php delete mode 100644 app_old/resources/views/layout/header.blade.php delete mode 100644 app_old/resources/views/layout/icons/abonar.blade.php delete mode 100644 app_old/resources/views/layout/icons/add.blade.php delete mode 100644 app_old/resources/views/layout/icons/edit.blade.php delete mode 100644 app_old/resources/views/layout/icons/pagar.blade.php delete mode 100644 app_old/resources/views/layout/icons/remove.blade.php delete mode 100644 app_old/resources/views/layout/icons/show.blade.php delete mode 100644 app_old/resources/views/layout/menu.blade.php delete mode 100644 app_old/resources/views/layout/menu.blade.php.save delete mode 100644 app_old/resources/views/layout/menu/herramientas.blade.php delete mode 100644 app_old/resources/views/layout/menu/informes.blade.php delete mode 100644 app_old/resources/views/layout/menu/inmobiliarias.blade.php delete mode 100644 app_old/resources/views/layout/menu/login.blade.php delete mode 100644 app_old/resources/views/layout/menu/operadores.blade.php delete mode 100644 app_old/resources/views/layout/menu/proyectos.blade.php delete mode 100644 app_old/resources/views/layout/menu/ventas.blade.php delete mode 100644 app_old/resources/views/other/capacidades.blade.php delete mode 100644 app_old/resources/views/other/entregar_multiple.blade.php delete mode 100644 app_old/resources/views/print/devolucion.blade.php delete mode 100644 app_old/resources/views/proyectos/add.blade.php delete mode 100644 app_old/resources/views/proyectos/advance.blade.php delete mode 100644 app_old/resources/views/proyectos/avance.blade.php delete mode 100644 app_old/resources/views/proyectos/avances/edit.blade.php delete mode 100644 app_old/resources/views/proyectos/avances_row.blade.php delete mode 100644 app_old/resources/views/proyectos/construccion.blade.php delete mode 100644 app_old/resources/views/proyectos/disponibles.blade.php delete mode 100644 app_old/resources/views/proyectos/estimado.blade.php delete mode 100644 app_old/resources/views/proyectos/historia.blade.php delete mode 100644 app_old/resources/views/proyectos/historia.blade.php.old delete mode 100644 app_old/resources/views/proyectos/list.blade.php delete mode 100644 app_old/resources/views/proyectos/operadores/add.blade.php delete mode 100644 app_old/resources/views/proyectos/pagares/add.blade.php delete mode 100644 app_old/resources/views/proyectos/pagares/add_renovacion.blade.php delete mode 100644 app_old/resources/views/proyectos/pagares/edit.blade.php delete mode 100644 app_old/resources/views/proyectos/pagares/edit_renovacion.blade.php delete mode 100644 app_old/resources/views/proyectos/pagares/show.blade.php delete mode 100644 app_old/resources/views/proyectos/por_vender.blade.php delete mode 100644 app_old/resources/views/proyectos/reservas/base.blade.php delete mode 100644 app_old/resources/views/proyectos/show.blade.php delete mode 100644 app_old/resources/views/proyectos/superficies.blade.php delete mode 100644 app_old/resources/views/proyectos/tipo_unidades/add.blade.php delete mode 100644 app_old/resources/views/proyectos/tipo_unidades/edit.blade.php delete mode 100644 app_old/resources/views/proyectos/unidades/add.blade.php delete mode 100644 app_old/resources/views/proyectos/unidades/add2.blade.php delete mode 100644 app_old/resources/views/proyectos/unidades/assign.blade.php delete mode 100644 app_old/resources/views/proyectos/unidades/edit.blade.php delete mode 100644 app_old/resources/views/proyectos/unidades/list.blade.php delete mode 100644 app_old/resources/views/proyectos/unidades/proyectos.blade.php delete mode 100644 app_old/resources/views/proyectos/ventas.blade.php delete mode 100644 app_old/resources/views/temas/add.blade.php delete mode 100644 app_old/resources/views/temas/edit.blade.php delete mode 100644 app_old/resources/views/temas/list.blade.php delete mode 100644 app_old/resources/views/ventas/add.blade.php delete mode 100644 app_old/resources/views/ventas/archivar.blade.php delete mode 100644 app_old/resources/views/ventas/bonos/add.blade.php delete mode 100644 app_old/resources/views/ventas/bonos/edit.blade.php delete mode 100644 app_old/resources/views/ventas/ceder.blade.php delete mode 100644 app_old/resources/views/ventas/cierres/add.blade.php delete mode 100644 app_old/resources/views/ventas/cierres/edit.blade.php delete mode 100644 app_old/resources/views/ventas/cierres/evaluar.blade.php delete mode 100644 app_old/resources/views/ventas/cierres/list.blade.php delete mode 100644 app_old/resources/views/ventas/cierres/show.blade.php delete mode 100644 app_old/resources/views/ventas/comentarios/add.blade.php delete mode 100644 app_old/resources/views/ventas/consolidacion/pago.blade.php delete mode 100644 app_old/resources/views/ventas/consolidacion/proyectos.blade.php delete mode 100644 app_old/resources/views/ventas/consolidacion/show.blade.php delete mode 100644 app_old/resources/views/ventas/creditos/abonar.blade.php delete mode 100644 app_old/resources/views/ventas/creditos/add.blade.php delete mode 100644 app_old/resources/views/ventas/creditos/edit.blade.php delete mode 100644 app_old/resources/views/ventas/creditos/pagar.blade.php delete mode 100644 app_old/resources/views/ventas/creditos/pendientes.blade.php delete mode 100644 app_old/resources/views/ventas/creditos/show.blade.php delete mode 100644 app_old/resources/views/ventas/desist.blade.php delete mode 100644 app_old/resources/views/ventas/devolucion.blade.php delete mode 100644 app_old/resources/views/ventas/edit.blade.php delete mode 100644 app_old/resources/views/ventas/entregar.blade.php delete mode 100644 app_old/resources/views/ventas/escrituras/abonar.blade.php delete mode 100644 app_old/resources/views/ventas/escrituras/add.blade.php delete mode 100644 app_old/resources/views/ventas/escrituras/edit.blade.php delete mode 100644 app_old/resources/views/ventas/escrituras/informe.blade.php delete mode 100644 app_old/resources/views/ventas/escrituras/pagar.blade.php delete mode 100644 app_old/resources/views/ventas/firmar.blade.php delete mode 100644 app_old/resources/views/ventas/forma_pago.blade.php delete mode 100644 app_old/resources/views/ventas/forma_pago/edit.blade.php delete mode 100644 app_old/resources/views/ventas/list.blade.php delete mode 100644 app_old/resources/views/ventas/operadores/unidades/bloquear.blade.php delete mode 100644 app_old/resources/views/ventas/operadores/unidades/list.blade.php delete mode 100644 app_old/resources/views/ventas/pagos/edit.blade.php delete mode 100644 app_old/resources/views/ventas/pagos/pendientes.blade.php delete mode 100644 app_old/resources/views/ventas/pagos/show.blade.php delete mode 100644 app_old/resources/views/ventas/pies/cuotas/abonar.blade.php delete mode 100644 app_old/resources/views/ventas/pies/cuotas/add.blade.php delete mode 100644 app_old/resources/views/ventas/pies/cuotas/edit.blade.php delete mode 100644 app_old/resources/views/ventas/pies/cuotas/estado.blade.php delete mode 100644 app_old/resources/views/ventas/pies/cuotas/pendientes.blade.php delete mode 100644 app_old/resources/views/ventas/pies/cuotas/show.blade.php delete mode 100644 app_old/resources/views/ventas/pies/edit.blade.php delete mode 100644 app_old/resources/views/ventas/pies/reajustar.blade.php delete mode 100644 app_old/resources/views/ventas/pies/reajustes/abonar.blade.php delete mode 100644 app_old/resources/views/ventas/pies/reajustes/edit.blade.php delete mode 100644 app_old/resources/views/ventas/pies/reajustes/pagar.blade.php delete mode 100644 app_old/resources/views/ventas/pies/resumen.blade.php delete mode 100644 app_old/resources/views/ventas/pies/totales.blade.php delete mode 100644 app_old/resources/views/ventas/postventas/add.blade.php delete mode 100644 app_old/resources/views/ventas/postventas/show.blade.php delete mode 100644 app_old/resources/views/ventas/precios/add.blade.php delete mode 100644 app_old/resources/views/ventas/precios/import.blade.php delete mode 100644 app_old/resources/views/ventas/precios/list.blade.php delete mode 100644 app_old/resources/views/ventas/precios/proyectos.blade.php delete mode 100644 app_old/resources/views/ventas/propietarios/edit.blade.php delete mode 100644 app_old/resources/views/ventas/proyectos.blade.php delete mode 100644 app_old/resources/views/ventas/resciliaciones.blade.php delete mode 100644 app_old/resources/views/ventas/show.blade.php delete mode 100644 app_old/resources/views/ventas/sort_title.blade.php delete mode 100644 app_old/resources/views/ventas/subsidios/abonar.blade.php delete mode 100644 app_old/resources/views/ventas/subsidios/add.blade.php delete mode 100644 app_old/resources/views/ventas/subsidios/edit.blade.php delete mode 100644 app_old/resources/views/ventas/subsidios/pagar.blade.php delete mode 100644 app_old/setup/api/config.php delete mode 100644 app_old/setup/api/setups.php delete mode 100644 app_old/setup/app.php delete mode 100644 app_old/setup/common/config.php delete mode 100644 app_old/setup/composer.php delete mode 100644 app_old/setup/database.php delete mode 100644 app_old/setup/env/config.php delete mode 100644 app_old/setup/router.php delete mode 100644 app_old/setup/settings/01_env.php delete mode 100644 app_old/setup/settings/02_common.php delete mode 100644 app_old/setup/settings/03_api.php delete mode 100644 app_old/setup/settings/04_ui.php delete mode 100644 app_old/setup/setups/04_ui.php delete mode 100644 app_old/ui/app.php delete mode 100644 app_old/ui/composer.php delete mode 100644 app_old/ui/middlewares/01_auth.php delete mode 100644 app_old/ui/middlewares/02_databases.php delete mode 100644 app_old/ui/middlewares/98_logs.php delete mode 100644 app_old/ui/middlewares/99_routes.php delete mode 100644 app_old/ui/settings/01_env.php delete mode 100644 app_old/ui/settings/02_folders.php delete mode 100644 app_old/ui/settings/03_urls.php delete mode 100644 app_old/ui/settings/04_databases.php delete mode 100644 app_old/ui/setups/01_views.php delete mode 100644 app_old/ui/setups/03_services.php delete mode 100644 app_old/ui/setups/98_logs.php delete mode 100644 app_old/webpack.config.js diff --git a/app_old/.adminer.env.sample b/app_old/.adminer.env.sample deleted file mode 100644 index 7e78794..0000000 --- a/app_old/.adminer.env.sample +++ /dev/null @@ -1,2 +0,0 @@ -ADMINER_DESIGN=dracula -ADMINER_PLUGINS=dump-json diff --git a/app_old/.db.env.sample b/app_old/.db.env.sample deleted file mode 100644 index 18b1117..0000000 --- a/app_old/.db.env.sample +++ /dev/null @@ -1,4 +0,0 @@ -MYSQL_DATABASE= -MYSQL_PASSWORD= -MYSQL_ROOT_PASSWORD= -MYSQL_USER= diff --git a/app_old/.env.sample b/app_old/.env.sample deleted file mode 100644 index 31fe938..0000000 --- a/app_old/.env.sample +++ /dev/null @@ -1,2 +0,0 @@ -BASE_URL= -MYSQL_HOST= diff --git a/app_old/.gitignore b/app_old/.gitignore deleted file mode 100644 index 94a1003..0000000 --- a/app_old/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -**/*.env -**/vendor/ -**/composer.lock -**/node_modules/ -**/package-lock.json -**/Pipfile.lock -**/logs/ -**/cache/ -**/modules/ -**/.idea/ diff --git a/app_old/aldarien/asset/.gitignore b/app_old/aldarien/asset/.gitignore deleted file mode 100644 index 3b12249..0000000 --- a/app_old/aldarien/asset/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -composer.phar -/vendor/ - -# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file -# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file -# composer.lock - -#Eclipse IDE -.settings -.buildpath -.project diff --git a/app_old/aldarien/asset/LICENSE b/app_old/aldarien/asset/LICENSE deleted file mode 100644 index 55dc05a..0000000 --- a/app_old/aldarien/asset/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2017 Aldarien - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/app_old/aldarien/asset/README.md b/app_old/aldarien/asset/README.md deleted file mode 100644 index 1580798..0000000 --- a/app_old/aldarien/asset/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# asset -Asset manager module for my apps diff --git a/app_old/aldarien/asset/app/Contract/Asset.php b/app_old/aldarien/asset/app/Contract/Asset.php deleted file mode 100644 index 30b02c2..0000000 --- a/app_old/aldarien/asset/app/Contract/Asset.php +++ /dev/null @@ -1,21 +0,0 @@ -get($identifier); - } -} -?> diff --git a/app_old/aldarien/asset/app/Helper/functions.php b/app_old/aldarien/asset/app/Helper/functions.php deleted file mode 100644 index b0688e2..0000000 --- a/app_old/aldarien/asset/app/Helper/functions.php +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file diff --git a/app_old/aldarien/asset/app/Service/Asset.php b/app_old/aldarien/asset/app/Service/Asset.php deleted file mode 100644 index e7c36b7..0000000 --- a/app_old/aldarien/asset/app/Service/Asset.php +++ /dev/null @@ -1,88 +0,0 @@ -dir = config('locations.public'); - } - public function get($identifier) - { - $asset = $this->find($identifier); - return $asset->url; - } - protected function find($identifier) - { - $type = $this->getType($identifier); - $asset = null; - if ($type == false) { - foreach (array_keys($this->assets) as $type) { - if (($asset = $this->getAsset($identifier, $type))) { - break; - } - } - } else { - $asset = $this->getAsset($identifier, $type); - } - return $asset; - } - protected function getType($identifier) - { - if (strpos($identifier, '.') !== false) { - list($name, $ext) = explode('.', $identifier); - return $ext; - } - return false; - } - protected function getAsset($identifier, $type) - { - if (!isset($this->assets[$type])) { - $this->loadAssets($type); - } - if (!isset($this->assets[$type])) { - return null; - } - - foreach ($this->assets[$type] as $asset) { - if ($this->compareIdentifier($asset, $identifier)) { - return $asset; - } - } - return null; - } - protected function loadAssets($type) - { - $dir = $this->dir . '/' . $type . '/*.' . $type; - $files = glob($dir); - foreach ($files as $file) { - $url = $this->url($file); - $identifier = pathinfo($file)['filename']; - - $this->assets[$type] []= (object) ['identifier' => $identifier, 'url' => $url, 'type' => $type]; - } - } - protected function url($file) - { - $url = '/' . config('app.project') . '/' . str_replace('\\', '/', str_replace(realpath(config('locations.public')), '', dirname(realpath($file)))) . '/' . basename(realpath($file)); - $url = preg_replace('/\/+/', '/', $url); - return $url; - } - protected function compareIdentifier($asset, $identifier) - { - if (strpos($identifier, '.') !== false) { - list($name, $ext) = explode('.', $identifier); - if ($asset->identifier == $name and $asset->type == $ext) { - return true; - } - } else { - if ($asset->identifier == $identifier) { - return true; - } - } - return false; - } -} diff --git a/app_old/aldarien/asset/composer.json b/app_old/aldarien/asset/composer.json deleted file mode 100644 index dd2c217..0000000 --- a/app_old/aldarien/asset/composer.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name" : "aldarien/asset", - "description" : "Asset manager module for my apps", - "type" : "library", - "require" : { - "aldarien/config" : "*", - "aldarien/contract" : "*" - }, - "require-dev" : { - "phpunit/phpunit" : "*" - }, - "license" : "MIT", - "authors" : [{ - "name" : "Aldarien", - "email" : "aldarien85@gmail.com" - } - ], - "autoload" : { - "psr-4" : { - "App\\" : "app" - }, - "files": [ - "app/Helper/functions.php" - ] - } -} diff --git a/app_old/aldarien/asset/phpunit.xml b/app_old/aldarien/asset/phpunit.xml deleted file mode 100644 index e60ecbd..0000000 --- a/app_old/aldarien/asset/phpunit.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - ./tests/ - - - - - ./app - - - \ No newline at end of file diff --git a/app_old/aldarien/asset/tests/AssetTest.php b/app_old/aldarien/asset/tests/AssetTest.php deleted file mode 100644 index e53f0ad..0000000 --- a/app_old/aldarien/asset/tests/AssetTest.php +++ /dev/null @@ -1,25 +0,0 @@ -assertEquals(asset('style.css'), '/css/style.css'); - } -} -?> \ No newline at end of file diff --git a/app_old/aldarien/config/.gitignore b/app_old/aldarien/config/.gitignore deleted file mode 100644 index 47c4114..0000000 --- a/app_old/aldarien/config/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -composer.phar -/vendor/ - -# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file -# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file -# composer.lock - -config - -# Eclipse IDE -.settings -.buildpath -.project \ No newline at end of file diff --git a/app_old/aldarien/config/.travis.yml b/app_old/aldarien/config/.travis.yml deleted file mode 100644 index a792980..0000000 --- a/app_old/aldarien/config/.travis.yml +++ /dev/null @@ -1,3 +0,0 @@ -language: php -php: '7.1' -install: composer update diff --git a/app_old/aldarien/config/LICENSE b/app_old/aldarien/config/LICENSE deleted file mode 100644 index 55dc05a..0000000 --- a/app_old/aldarien/config/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2017 Aldarien - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/app_old/aldarien/config/README.md b/app_old/aldarien/config/README.md deleted file mode 100644 index dfed35b..0000000 --- a/app_old/aldarien/config/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# config -Config module that recovers configuration files - -[![Build Status](https://travis-ci.org/Aldarien/config.svg?branch=1.0.1)](https://travis-ci.org/Aldarien/config) diff --git a/app_old/aldarien/config/app/Contract/Config.php b/app_old/aldarien/config/app/Contract/Config.php deleted file mode 100644 index 9664aca..0000000 --- a/app_old/aldarien/config/app/Contract/Config.php +++ /dev/null @@ -1,31 +0,0 @@ -get($name); - } - public static function set($name, $value) - { - $instance = self::getInstance(); - return $instance->set($name, $value); - } - public static function addFile($filename) - { - $instance = self::getInstance(); - return $instance->loadFile($filename); - } -} -?> diff --git a/app_old/aldarien/config/app/Contract/YamlWrapper.php b/app_old/aldarien/config/app/Contract/YamlWrapper.php deleted file mode 100644 index 0ab60f6..0000000 --- a/app_old/aldarien/config/app/Contract/YamlWrapper.php +++ /dev/null @@ -1,21 +0,0 @@ - \ No newline at end of file diff --git a/app_old/aldarien/config/app/Helper/functions.php b/app_old/aldarien/config/app/Helper/functions.php deleted file mode 100644 index e073f18..0000000 --- a/app_old/aldarien/config/app/Helper/functions.php +++ /dev/null @@ -1,9 +0,0 @@ - diff --git a/app_old/aldarien/config/app/Service/Config.php b/app_old/aldarien/config/app/Service/Config.php deleted file mode 100644 index 072e38f..0000000 --- a/app_old/aldarien/config/app/Service/Config.php +++ /dev/null @@ -1,150 +0,0 @@ -dir = $dir; - $this->load(); - } - protected function load() - { - $files = glob($this->dir . '/*.{php,json,yml}', GLOB_BRACE); - foreach ($files as $file) { - $info = pathinfo($file); - $name = $info['filename']; - - $d = $this->getData($file); - $data[$name] = $d; - $data = array_merge($data, $this->translateArray($d, $name)); - foreach ($data as $key => $value) { - $this->add($key, $value); - } - } - } - public function loadFile(string $filename) - { - if (!file_exists(realpath($filename))) { - return false; - } - $info = pathinfo($filename); - $name = $info['filename']; - $d = $this->getData($filename); - $data[$name] = $d; - $data = array_merge($data, $this->translateArray($d, $name)); - foreach ($data as $key => $value) { - $this->add($key, $value); - } - return true; - } - protected function getData($filename) - { - $info = pathinfo($filename); - - switch ($info['extension']) { - case 'php': - return include_once $filename; - case 'json': - return json_decode(file_get_contents($filename), true); - case 'yml': - return YamlWrapper::load($filename); - default: - throw new \DomainException('Invalid file extension for ' . $filename); - } - } - protected function translateArray($array, $level) - { - $output = []; - foreach ($array as $k1 => $l1) { - $key = $level . '.' . $k1; - if (is_array($l1)) { - $output[$key] = $l1; - $output = array_merge($output, $this->translateArray($l1, $key)); - } else { - $output[$key] = $l1; - } - } - return $output; - } - protected function add($field, $value) - { - if (isset($this->data[$field])) { - if ($this->data[$field] == $value) { - return; - } - if (is_array($this->data[$field])) { - $this->data[$field] = $this->merge($this->data[$field], $this->replace($value)); - } else { - $this->data[$field] = $this->replace($value); - } - } else { - $this->data[$field] = $this->replace($value); - } - } - protected function merge($arr1, $arr2) - { - $output = $arr1; - foreach ($arr2 as $k => $value) { - if (isset($arr1[$k])) { - if ($arr1[$k] == $value) { - continue; - } - if (is_array($arr1[$k])) { - $output[$k] = $this->merge($arr1[$k], $value); - } else { - $output[$k] = array_merge([$arr1[$k]], $value); - } - } else { - $output[$k] = $value; - } - } - return $output; - } - protected function replace($value) - { - if (is_array($value)) { - foreach ($value as $k => $v) { - $value[$k] = $this->replace($v); - } - return $value; - } - if (strpos($value, '{') !== false) { - while(strpos($value, '{') !== false) { - $ini = strpos($value, '{') + 1; - $end = strpos($value, '}', $ini); - $rep = substr($value, $ini, $end - $ini); - $new = $this->get($rep); - if ($new === null) { - $new = ''; - } - $value = str_replace('{' . $rep . '}', $new, $value); - } - } - return $value; - } - - public function get($name = null) - { - if ($name == null) { - return $this->data; - } - if (isset($this->data[$name])) { - return $this->data[$name]; - } - return null; - } - public function set($name, $value) - { - $this->add($name, $value); - } -} -?> diff --git a/app_old/aldarien/config/bootstrap/autoload.php b/app_old/aldarien/config/bootstrap/autoload.php deleted file mode 100644 index 42765bd..0000000 --- a/app_old/aldarien/config/bootstrap/autoload.php +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/app_old/aldarien/config/composer.json b/app_old/aldarien/config/composer.json deleted file mode 100644 index ff4255b..0000000 --- a/app_old/aldarien/config/composer.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "name": "aldarien/config", - "description": "Config module for my apps", - "type": "library", - "license": "MIT", - "authors": [ - { - "name": "Aldarien", - "email": "aldarien85@gmail.com" - } - ], - "require": { - "aldarien/contract": "*", - "aldarien/root": "*", - "symfony/yaml": "*" - }, - "autoload": { - "psr-4": { - "App\\": "app" - }, - "files": [ - "app/Helper/functions.php" - ] - }, - "require-dev": { - "phpunit/phpunit": "^6.3" - } -} diff --git a/app_old/aldarien/config/phpunit.xml b/app_old/aldarien/config/phpunit.xml deleted file mode 100644 index db312e1..0000000 --- a/app_old/aldarien/config/phpunit.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - ./tests/ - - - - - ./app - - - \ No newline at end of file diff --git a/app_old/aldarien/config/tests/ConfigTest.php b/app_old/aldarien/config/tests/ConfigTest.php deleted file mode 100644 index 187e0a3..0000000 --- a/app_old/aldarien/config/tests/ConfigTest.php +++ /dev/null @@ -1,90 +0,0 @@ - 'Config', 'test_array' => ['data1' => 1, 'data2' => 2]]; ?>"; - file_put_contents(dirname(__DIR__) . '/config/app.php', $str); - $data = ['name' => 'Config', 'test_array' => ['data1' => 1, 'data2' => 2]]; - file_put_contents(dirname(__DIR__) . '/config/json.json', json_encode($data)); - file_put_contents(dirname(__DIR__) . '/config/yaml.yml', YamlWrapper::dump($data)); - $data = ['last_name' => 'Config']; - file_put_contents(dirname(__DIR__) . '/config/yaml.json', json_encode($data)); - } - public function testGetNamePhp() - { - $name = 'Config'; - - $this->assertEquals($name, config('app.name')); - } - public function testGetNameJson() - { - $name = 'Config'; - - $this->assertEquals($name, config('json.name')); - } - public function testGetNameYaml() - { - $name = 'Config'; - - $this->assertEquals($name, config('yaml.name')); - } - public function testSetNamehp() - { - $new_name = 'Config_Test'; - config('app.name', $new_name); - $this->assertEquals($new_name, config('app.name')); - } - public function testSetNameJson() - { - $new_name = 'Config_Test'; - config('json.name', $new_name); - $this->assertEquals($new_name, config('json.name')); - } - public function testSetNameYaml() - { - $new_name = 'Config_Test'; - config('yaml.name', $new_name); - $this->assertEquals($new_name, config('yaml.name')); - } - public function testArrayGetPhp() - { - $this->assertArrayHasKey('data1', config('app.test_array')); - } - public function testArrayGetJson() - { - $this->assertArrayHasKey('data1', config('json.test_array')); - } - public function testArrayGetYaml() - { - $this->assertArrayHasKey('data1', config('yaml.test_array')); - } - public function testSameSectionName() - { - $this->assertEquals('Config', config('yaml.last_name')); - } - public function testDuplicateValue() - { - config('json.name', 'Config2'); - $this->assertEquals('Config2', config('json.name')); - } - public function testAddFile() - { - $filename = dirname(__DIR__) . '/composer.json'; - App\Contract\Config::addFile($filename); - $this->assertEquals('aldarien/config', config('composer.name')); - } - public function tearDown() - { - unlink(dirname(__DIR__) . '/config/app.php'); - unlink(dirname(__DIR__) . '/config/json.json'); - unlink(dirname(__DIR__) . '/config/yaml.yml'); - unlink(dirname(__DIR__) . '/config/yaml.json'); - rmdir(dirname(__DIR__) . '/config'); - } -} -?> \ No newline at end of file diff --git a/app_old/aldarien/contract/.gitignore b/app_old/aldarien/contract/.gitignore deleted file mode 100644 index c422267..0000000 --- a/app_old/aldarien/contract/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -composer.phar -/vendor/ - -# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file -# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file -# composer.lock diff --git a/app_old/aldarien/contract/LICENSE b/app_old/aldarien/contract/LICENSE deleted file mode 100644 index 55dc05a..0000000 --- a/app_old/aldarien/contract/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2017 Aldarien - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/app_old/aldarien/contract/app/Definition/Contract.php b/app_old/aldarien/contract/app/Definition/Contract.php deleted file mode 100644 index 4cc88ca..0000000 --- a/app_old/aldarien/contract/app/Definition/Contract.php +++ /dev/null @@ -1,20 +0,0 @@ - diff --git a/app_old/aldarien/contract/composer.json b/app_old/aldarien/contract/composer.json deleted file mode 100644 index 96ef067..0000000 --- a/app_old/aldarien/contract/composer.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "aldarien/contract", - "description": "Contract trait for my apps", - "type": "library", - "license": "MIT", - "authors": [ - { - "name": "Aldarien", - "email": "aldarien85@gmail.com" - } - ], - "require": {}, - "autoload": { - "psr-4": { - "App\\": "app" - } - } -} diff --git a/app_old/aldarien/format/.gitignore b/app_old/aldarien/format/.gitignore deleted file mode 100644 index 6ee50e6..0000000 --- a/app_old/aldarien/format/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -composer.phar -/vendor/ - -# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file -# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file -# composer.lock - -# Eclipse IDE -.settings -.buildpath -.project \ No newline at end of file diff --git a/app_old/aldarien/format/LICENSE b/app_old/aldarien/format/LICENSE deleted file mode 100644 index 55dc05a..0000000 --- a/app_old/aldarien/format/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2017 Aldarien - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/app_old/aldarien/format/README.md b/app_old/aldarien/format/README.md deleted file mode 100644 index d4f839f..0000000 --- a/app_old/aldarien/format/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# format -Module for formatting data, mostly numbers diff --git a/app_old/aldarien/format/app/Helper/Format.php b/app_old/aldarien/format/app/Helper/Format.php deleted file mode 100644 index 9836f38..0000000 --- a/app_old/aldarien/format/app/Helper/Format.php +++ /dev/null @@ -1,43 +0,0 @@ -format("d \d\\e F Y"); - } - public static function shortDate(string $date) - { - $d = \Carbon\Carbon::parse($date, config('app.timezone')); - return $d->format('d-m-Y'); - } - public static function localDate(string $date) - { - $d = \Carbon\Carbon::parse($date, config('app.timezone')); - setlocale(LC_TIME, 'es'); - return $d->formatLocalized('%d de %B de %Y'); - } - public static function m2(float $number, bool $print = false) - { - return self::number($number, 2) . (($print) ? ' m²' : ''); - } - public static function percent(float $number, bool $print = false) - { - return self::number($number, 2) . (($print) ? '%' : ''); - } -} -?> \ No newline at end of file diff --git a/app_old/aldarien/format/composer.json b/app_old/aldarien/format/composer.json deleted file mode 100644 index 59d058d..0000000 --- a/app_old/aldarien/format/composer.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name" : "aldarien/format", - "description" : "Module for formatting data, mostly numbers", - "type" : "library", - "require-dev" : { - "phpunit/phpunit" : "*", - "aldarien/config": "*" - }, - "license" : "MIT", - "authors" : [{ - "name" : "Aldarien", - "email" : "aldarien85@gmail.com" - } - ], - "autoload" : { - "psr-4" : { - "App\\" : "app" - } - }, - "require": { - "nesbot/carbon": "^2" - } -} diff --git a/app_old/aldarien/format/config/app.php b/app_old/aldarien/format/config/app.php deleted file mode 100644 index 9e747f9..0000000 --- a/app_old/aldarien/format/config/app.php +++ /dev/null @@ -1,5 +0,0 @@ - 'America/Santiago' -]; -?> \ No newline at end of file diff --git a/app_old/aldarien/format/phpunit.xml b/app_old/aldarien/format/phpunit.xml deleted file mode 100644 index e60ecbd..0000000 --- a/app_old/aldarien/format/phpunit.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - ./tests/ - - - - - ./app - - - \ No newline at end of file diff --git a/app_old/aldarien/format/tests/FormatTest.php b/app_old/aldarien/format/tests/FormatTest.php deleted file mode 100644 index bcc6bd5..0000000 --- a/app_old/aldarien/format/tests/FormatTest.php +++ /dev/null @@ -1,59 +0,0 @@ -number, 3); - $this->assertEquals($output, $result); - } - public function testPesosPrint() - { - $output = '$ 5.049.872'; - $result = Format::pesos($this->number, true); - $this->assertEquals($output, $result); - } - public function testUFPrint() - { - $output = '5.049.872,32 UF'; - $result = Format::ufs($this->number, true); - $this->assertEquals($output, $result); - } - public function testDate() - { - $output = '25 de March 2016'; - $result = Format::date($this->date); - $this->assertEquals($output, $result); - } - public function testShortDate() - { - $output = '25-03-2016'; - $result = Format::shortDate($this->date); - $this->assertEquals($output, $result); - } - public function testLocalDate() - { - $output = '25 de marzo de 2016'; - $result = Format::localDate($this->date); - $this->assertEquals($output, $result); - } - public function testM2Print() - { - $output = '5.049.872,32 m²'; - $result = Format::m2($this->number, true); - $this->assertEquals($output, $result); - } - public function testPercentPrint() - { - $output = '5.049.872,32%'; - $result = Format::percent($this->number, true); - $this->assertEquals($output, $result); - } -} -?> \ No newline at end of file diff --git a/app_old/aldarien/response/.gitignore b/app_old/aldarien/response/.gitignore deleted file mode 100644 index 265bf84..0000000 --- a/app_old/aldarien/response/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -#Eclipse IDE -.settings -.buildpath -.project - -#Composer -vendor diff --git a/app_old/aldarien/response/LICENSE b/app_old/aldarien/response/LICENSE deleted file mode 100644 index 55dc05a..0000000 --- a/app_old/aldarien/response/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2017 Aldarien - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/app_old/aldarien/response/README.md b/app_old/aldarien/response/README.md deleted file mode 100644 index 80c6096..0000000 --- a/app_old/aldarien/response/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# response -Response handler module for my apps diff --git a/app_old/aldarien/response/app/Contract/Response.php b/app_old/aldarien/response/app/Contract/Response.php deleted file mode 100644 index 4b0089e..0000000 --- a/app_old/aldarien/response/app/Contract/Response.php +++ /dev/null @@ -1,27 +0,0 @@ - \ No newline at end of file diff --git a/app_old/aldarien/response/app/Helper/functions.php b/app_old/aldarien/response/app/Helper/functions.php deleted file mode 100644 index 32c48f8..0000000 --- a/app_old/aldarien/response/app/Helper/functions.php +++ /dev/null @@ -1,11 +0,0 @@ - \ No newline at end of file diff --git a/app_old/aldarien/response/app/Service/Response.php b/app_old/aldarien/response/app/Service/Response.php deleted file mode 100644 index d0f3e24..0000000 --- a/app_old/aldarien/response/app/Service/Response.php +++ /dev/null @@ -1,62 +0,0 @@ -gump = new \GUMP(); - } - public function sanitize() - { - if ($_POST) { - $this->post = $this->correctNumbers($this->gump->sanitize($_POST)); - } - if ($_GET) { - $this->get = $this->correctNumbers($this->gump->sanitize($_GET)); - } - } - public function correctNumbers(array $data) - { - $output = []; - foreach ($data as $key => $value) { - if (is_float(str_replace(',', '.', $value))) { - $output[$key] = str_replace(',', '.', $value); - } else { - $output[$key] = $value; - } - } - return $output; - } - public function get($query = null) - { - if ($this->get == null) { - $this->sanitize(); - } - if ($query == null) { - return $this->get; - } - if (isset($this->get[$query])) { - return $this->get[$query]; - } - return false; - } - public function post($query = null) - { - if ($this->post == null) { - $this->sanitize(); - } - if ($query == null) { - return $this->post; - } - if (isset($this->post[$query])) { - return $this->post[$query]; - } - return false; - } -} -?> diff --git a/app_old/aldarien/response/bootstrap/autoload.php b/app_old/aldarien/response/bootstrap/autoload.php deleted file mode 100644 index b5e8220..0000000 --- a/app_old/aldarien/response/bootstrap/autoload.php +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/app_old/aldarien/response/composer.json b/app_old/aldarien/response/composer.json deleted file mode 100644 index a337f86..0000000 --- a/app_old/aldarien/response/composer.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name" : "aldarien/response", - "description" : "Response handler module for my apps", - "type" : "library", - "require" : { - "wixel/gump" : "^2.0.0", - "aldarien/contract" : "*" - }, - "require-dev" : { - "phpunit/phpunit" : "*" - }, - "license" : "MIT", - "authors" : [{ - "name" : "Aldarien", - "email" : "jpvial@gmail.com" - } - ], - "autoload" : { - "psr-4" : { - "App\\" : "app" - }, - "files": [ - "app/Helper/functions.php" - ] - } -} diff --git a/app_old/aldarien/response/phpunit.xml b/app_old/aldarien/response/phpunit.xml deleted file mode 100644 index db312e1..0000000 --- a/app_old/aldarien/response/phpunit.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - ./tests/ - - - - - ./app - - - \ No newline at end of file diff --git a/app_old/aldarien/response/tests/ResponseTest.php b/app_old/aldarien/response/tests/ResponseTest.php deleted file mode 100644 index 67d603c..0000000 --- a/app_old/aldarien/response/tests/ResponseTest.php +++ /dev/null @@ -1,22 +0,0 @@ -value; - $_POST['test'] = $this->value; - } - public function testGet() - { - $this->assertEquals($this->value, get('test')); - } - public function testPost() - { - $this->assertEquals($this->value, post('test')); - } -} -?> \ No newline at end of file diff --git a/app_old/aldarien/root/.gitignore b/app_old/aldarien/root/.gitignore deleted file mode 100644 index f7e7961..0000000 --- a/app_old/aldarien/root/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -.buildpath -.project -.settings -*.lock -vendor \ No newline at end of file diff --git a/app_old/aldarien/root/LICENSE b/app_old/aldarien/root/LICENSE deleted file mode 100644 index 55dc05a..0000000 --- a/app_old/aldarien/root/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2017 Aldarien - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/app_old/aldarien/root/README.md b/app_old/aldarien/root/README.md deleted file mode 100644 index 039cbc3..0000000 --- a/app_old/aldarien/root/README.md +++ /dev/null @@ -1,22 +0,0 @@ -# root -get root directory path for your project - -## Usage - -add `Root::root('project')` or `root('project')` or `Root::root()` or `root()` where you need the root directory of your proyect. - -## Example - -For the structure: - -~~~ -/usr/share/www/projects -- myProject --- src --- tests -~~~ - -using `Root::root('myProject')` - -outputs: -`/usr/share/www/projects/myProject` diff --git a/app_old/aldarien/root/app/Helper/functions.php b/app_old/aldarien/root/app/Helper/functions.php deleted file mode 100644 index 86fd2eb..0000000 --- a/app_old/aldarien/root/app/Helper/functions.php +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file diff --git a/app_old/aldarien/root/composer.json b/app_old/aldarien/root/composer.json deleted file mode 100644 index 784dfb7..0000000 --- a/app_old/aldarien/root/composer.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name" : "aldarien/root", - "description" : "Find the root path for your proyect", - "authors" : [{ - "name" : "Aldarien" - } - ], - "license": "MIT", - "require-dev" : { - "phpunit/phpunit" : "*", - "kint-php/kint" : "*" - }, - "autoload" : { - "psr-4" : { - "Proyect\\Root\\" : "src" - }, - "files": [ - "app/Helper/functions.php" - ] - } -} diff --git a/app_old/aldarien/root/phpunit.xml b/app_old/aldarien/root/phpunit.xml deleted file mode 100644 index 63ecd1c..0000000 --- a/app_old/aldarien/root/phpunit.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - tests - - - - - src - - - diff --git a/app_old/aldarien/root/src/Root.php b/app_old/aldarien/root/src/Root.php deleted file mode 100644 index 13058df..0000000 --- a/app_old/aldarien/root/src/Root.php +++ /dev/null @@ -1,48 +0,0 @@ -$proyect_name/public/index.php calls for $proyect_name/bootstrap/autoload.php, - * you just need to - * - * include root() . '/bootstrap/autoload.php' - * - * @param string $proyect_name - * @return string - */ - public static function root(string $proyect_name = '') - { - $dir = realpath(__DIR__); - if ($proyect_name == '') { - return self::findComposerFile($dir); - } else { - $ini = strpos($dir, $proyect_name) + strlen($proyect_name); - } - $path = substr($dir, $ini); - $cnt = substr_count($path, DIRECTORY_SEPARATOR); - $root = DIRECTORY_SEPARATOR; - for ($i = 0; $i < $cnt; $i ++) { - $root .= '..' . DIRECTORY_SEPARATOR; - } - - return realpath($dir . $root); - } - protected static function findComposerFile($dir) - { - if (file_exists($dir . '/vendor/')) { - return $dir; - } - - $root = realpath('/'); - if (realpath($dir) == $root) { - return null; - } - - $dir = dirname($dir); - return self::findComposerFile($dir); - } -} -?> diff --git a/app_old/aldarien/root/tests/RootTest.php b/app_old/aldarien/root/tests/RootTest.php deleted file mode 100644 index 1deed6c..0000000 --- a/app_old/aldarien/root/tests/RootTest.php +++ /dev/null @@ -1,61 +0,0 @@ -getCurrentDir(); - $this->assertEquals($this->getRoot(), $this->current_dir); - $this->assertEquals($this->getBaseRoot(), $this->current_dir); - } - public function testBaseRootFunction() - { - $this->getCurrentDir(); - $this->assertEquals($this->getFRoot(), $this->current_dir); - $this->assertEquals($this->getFBaseRoot(), $this->current_dir); - } - public function testSrcRoot() - { - $this->changeDir('src'); - $this->assertEquals(realpath($this->getRoot() . '/src'), $this->current_dir); - $this->assertEquals(realpath($this->getBaseRoot() . '/src'), $this->current_dir); - } - public function testSrcRootFunction() - { - $this->changeDir('src'); - $this->assertEquals(realpath($this->getFRoot() . '/src'), $this->current_dir); - $this->assertEquals(realpath($this->getFBaseRoot() . '/src'), $this->current_dir); - } - - private function getCurrentDir() - { - $this->current_dir = getcwd(); - } - private function changeDir($dir) - { - chdir($dir); - $this->getCurrentDir(); - } - private function getRoot() - { - return Root::root($this->proyect_name); - } - private function getBaseRoot() - { - return Root::root(); - } - private function getFRoot() - { - return root($this->proyect_name); - } - private function getFBaseRoot() - { - return root(); - } -} -?> \ No newline at end of file diff --git a/app_old/aldarien/session/.gitignore b/app_old/aldarien/session/.gitignore deleted file mode 100644 index 6ee50e6..0000000 --- a/app_old/aldarien/session/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -composer.phar -/vendor/ - -# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file -# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file -# composer.lock - -# Eclipse IDE -.settings -.buildpath -.project \ No newline at end of file diff --git a/app_old/aldarien/session/LICENSE b/app_old/aldarien/session/LICENSE deleted file mode 100644 index 55dc05a..0000000 --- a/app_old/aldarien/session/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2017 Aldarien - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/app_old/aldarien/session/README.md b/app_old/aldarien/session/README.md deleted file mode 100644 index 6825213..0000000 --- a/app_old/aldarien/session/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# session -Session wrapper for aura/session diff --git a/app_old/aldarien/session/app/Contract/Session.php b/app_old/aldarien/session/app/Contract/Session.php deleted file mode 100644 index 2968a8f..0000000 --- a/app_old/aldarien/session/app/Contract/Session.php +++ /dev/null @@ -1,29 +0,0 @@ -newInstance($_COOKIE); - } - public static function get($segment, $name) - { - $instance = self::getInstance(); - $segment = $instance->getSegment($segment); - return $segment->get($name); - } - public static function set($segment, $name, $value) - { - $instance = self::getInstance(); - $segment = $instance->getSegment($segment); - $segment->set($name, $value); - } -} -?> \ No newline at end of file diff --git a/app_old/aldarien/session/composer.json b/app_old/aldarien/session/composer.json deleted file mode 100644 index 7fe764d..0000000 --- a/app_old/aldarien/session/composer.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "aldarien/session", - "description": "Session wrapper for aura/session", - "type": "library", - "require": { - "aura/session": "*", - "aldarien/contract": "*" - }, - "require-dev": { - "phpunit/phpunit": "*" - }, - "license": "MIT", - "authors": [ - { - "name": "Aldarien", - "email": "aldarien85@gmail.com" - } - ], - "autoload": { - "psr-4": { - "App\\": "app" - } - } -} diff --git a/app_old/aldarien/url/.gitignore b/app_old/aldarien/url/.gitignore deleted file mode 100644 index a06a2f1..0000000 --- a/app_old/aldarien/url/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -composer.phar -/vendor/ - -# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file -# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file -# composer.lock - -.settings -.buildpath -.project - -# Eclipse IDE \ No newline at end of file diff --git a/app_old/aldarien/url/LICENSE b/app_old/aldarien/url/LICENSE deleted file mode 100644 index 55dc05a..0000000 --- a/app_old/aldarien/url/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2017 Aldarien - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/app_old/aldarien/url/README.md b/app_old/aldarien/url/README.md deleted file mode 100644 index 0c1a426..0000000 --- a/app_old/aldarien/url/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# url -Get relative path url diff --git a/app_old/aldarien/url/app/Contract/URL.php b/app_old/aldarien/url/app/Contract/URL.php deleted file mode 100644 index 14d7ef0..0000000 --- a/app_old/aldarien/url/app/Contract/URL.php +++ /dev/null @@ -1,21 +0,0 @@ -url($path, $variables); - } -} -?> \ No newline at end of file diff --git a/app_old/aldarien/url/app/Helper/functions.php b/app_old/aldarien/url/app/Helper/functions.php deleted file mode 100644 index 6e9435e..0000000 --- a/app_old/aldarien/url/app/Helper/functions.php +++ /dev/null @@ -1,8 +0,0 @@ - \ No newline at end of file diff --git a/app_old/aldarien/url/app/Service/URL.php b/app_old/aldarien/url/app/Service/URL.php deleted file mode 100644 index 49a601d..0000000 --- a/app_old/aldarien/url/app/Service/URL.php +++ /dev/null @@ -1,83 +0,0 @@ -root = $this->findRoot(); - $this->relative = $this->findRelative(); - } - - protected function findRoot() - { - $base = $_SERVER['HTTP_HOST'] . ((isset($_SERVER['HTTP_PORT'])) ? ':' . $_SERVER['HTTP_PORT'] : ''); - $scheme = 'http'; - if (isset($_SERVER['REQUEST_SCHEME'])) { - $scheme = $_SERVER['REQUEST_SCHEME']; - } - if (isset($_SERVER['HTTPS'])) { - $scheme = 'https'; - } - $uri = Http::createFromString(\Sabre\Uri\resolve($scheme . '://' . $base, $_SERVER['SCRIPT_NAME'])); - $host = new Host($uri->getHost()); - if ($host->isAbsolute()) { - return $host->getRegistrableDomain(); - } - $base = $host . (($uri->getPort()) ? ':' . $uri->getPort() : ''); - return ($uri->getScheme() ?: 'http') . '://' . $base; - } - protected function findRelative() - { - $uri = Http::createFromString($_SERVER['SCRIPT_NAME']); - $normalized = (new HierarchicalPath($uri->getPath()))->withoutLeadingSlash()->withoutTrailingSlash()->withoutDotSegments()->withoutEmptySegments(); - if ($normalized->getDirname() == '.') { - return ''; - } - return $normalized->getDirname(); - } - - - public function url($path = '', $variables = null) - { - $uri = Http::createFromString($path); - if ($uri->getHost() != $this->root and $uri->getHost() != '') { - return $path; - } - - $uri = \Sabre\Uri\resolve($this->getBaseUrl(), $path); - try { - $host = new Host(Http::createFromString($uri)->getHost()); - } catch (\League\Uri\Exception $e) { - $uri = \Sabre\Uri\resolve($this->getBaseUrl(), '../../') . '/' . basename($path); - $host = new Host(Http::createFromString($uri)->getHost()); - } - - $base = new Host(Http::createFromString($this->root)->getHost()); - if ($host . '' != $base . '') { - $host = new Host(Http::createFromString($this->root)->getHost()); - $page = str_replace($this->root, '', $uri); - $uri = \Sabre\Uri\resolve(Http::createFromString($this->root)->getScheme() . '://' . $host->getRegistrableDomain(). '/', $page); - } - - if ($variables != null) { - $uri = \Sabre\Uri\resolve($uri, '?' . http_build_query($variables)); - } - $uri = \Sabre\Uri\normalize($uri); - - return $uri; - } - protected function getBaseUrl() - { - $url = \Sabre\Uri\normalize(trim($this->root . '/' . $this->relative, '/') . '/'); - return $url; - } -} -?> diff --git a/app_old/aldarien/url/composer.json b/app_old/aldarien/url/composer.json deleted file mode 100644 index 779ed73..0000000 --- a/app_old/aldarien/url/composer.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "name" : "aldarien/url", - "description" : "Get relative path uri", - "type" : "library", - "require" : { - "aldarien/contract" : "*", - "aldarien/root" : "*", - "league/uri": "*", - "league/uri-components": "*", - "sabre/uri": "*" - }, - "require-dev" : { - "phpunit/phpunit" : "*" - }, - "license" : "MIT", - "authors" : [{ - "name" : "Aldarien", - "email" : "jpvial@gmail.com" - } - ], - "autoload" : { - "psr-4" : { - "App\\" : "app" - }, - "files": [ - "app/Helper/functions.php" - ] - } -} diff --git a/app_old/aldarien/view/.gitignore b/app_old/aldarien/view/.gitignore deleted file mode 100644 index 120b68f..0000000 --- a/app_old/aldarien/view/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -composer.phar -/vendor/ - -# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file -# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file -# composer.lock - -.settings -.buildpath -.project diff --git a/app_old/aldarien/view/LICENSE b/app_old/aldarien/view/LICENSE deleted file mode 100644 index 55dc05a..0000000 --- a/app_old/aldarien/view/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2017 Aldarien - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/app_old/aldarien/view/README.md b/app_old/aldarien/view/README.md deleted file mode 100644 index b888dbd..0000000 --- a/app_old/aldarien/view/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# view -View module for my apps diff --git a/app_old/aldarien/view/app/Contract/View.php b/app_old/aldarien/view/app/Contract/View.php deleted file mode 100644 index 1d0c5b9..0000000 --- a/app_old/aldarien/view/app/Contract/View.php +++ /dev/null @@ -1,30 +0,0 @@ - "http://{$remote->getIP()}:8008", - 'headers' => ['Accept' => 'application/json'] - ]))); - return new ViewService(['money' => $money]); - } - public static function show($template, $variables = null) - { - $instance = self::getInstance(); - return $instance->show($template, $variables); - } -} -?> diff --git a/app_old/aldarien/view/app/Helper/functions.php b/app_old/aldarien/view/app/Helper/functions.php deleted file mode 100644 index ba0e9e1..0000000 --- a/app_old/aldarien/view/app/Helper/functions.php +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/app_old/aldarien/view/app/Service/View.php b/app_old/aldarien/view/app/Service/View.php deleted file mode 100644 index 7217696..0000000 --- a/app_old/aldarien/view/app/Service/View.php +++ /dev/null @@ -1,27 +0,0 @@ -views = config('locations.views'); - $this->cache = config('locations.cache'); - - $this->blade = new BladeOne($this->views, $this->cache, null, $variables); - } - public function show($template, $vars = null) - { - if ($vars) { - return $this->blade->run($template, $vars); - } - return $this->blade->run($template); - } -} -?> diff --git a/app_old/aldarien/view/composer.json b/app_old/aldarien/view/composer.json deleted file mode 100644 index 5d283ab..0000000 --- a/app_old/aldarien/view/composer.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "name": "aldarien/view", - "description": "View module for my apps", - "type": "library", - "require": { - "eftec/bladeone": "*", - "aldarien/contract": "*", - "aldarien/config": "*" - }, - "license": "MIT", - "authors": [ - { - "name": "Aldarien", - "email": "aldarien85@gmail.com" - } - ], - "autoload": { - "psr-4": { - "App\\": "app" - }, - "files": [ - "app/Helper/functions.php" - ] - }, - "require-dev": { - "phpunit/phpunit": "*" - } -} diff --git a/app_old/aldarien/view/config/locations.php b/app_old/aldarien/view/config/locations.php deleted file mode 100644 index 1dd0425..0000000 --- a/app_old/aldarien/view/config/locations.php +++ /dev/null @@ -1,8 +0,0 @@ - root(), - 'cache' => '{locations.base}/cache', - 'resources' => '{locations.base}/resources', - 'views' => '{locations.resources}/views' -]; -?> \ No newline at end of file diff --git a/app_old/aldarien/view/phpunit.xml b/app_old/aldarien/view/phpunit.xml deleted file mode 100644 index e60ecbd..0000000 --- a/app_old/aldarien/view/phpunit.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - ./tests/ - - - - - ./app - - - \ No newline at end of file diff --git a/app_old/aldarien/view/public/index.php b/app_old/aldarien/view/public/index.php deleted file mode 100644 index 1070f11..0000000 --- a/app_old/aldarien/view/public/index.php +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file diff --git a/app_old/aldarien/view/resources/views/base.blade.php b/app_old/aldarien/view/resources/views/base.blade.php deleted file mode 100644 index 8cafca1..0000000 --- a/app_old/aldarien/view/resources/views/base.blade.php +++ /dev/null @@ -1,9 +0,0 @@ - - - - View - - -View test - - \ No newline at end of file diff --git a/app_old/aldarien/view/tests/ViewTest.php b/app_old/aldarien/view/tests/ViewTest.php deleted file mode 100644 index 85f4aa6..0000000 --- a/app_old/aldarien/view/tests/ViewTest.php +++ /dev/null @@ -1,22 +0,0 @@ - - - - View - - -View test - - -DATA; - $this->assertEquals($output, view('base')); - } -} -?> \ No newline at end of file diff --git a/app_old/app/Alias/Connection.php b/app_old/app/Alias/Connection.php deleted file mode 100644 index 1eea52a..0000000 --- a/app_old/app/Alias/Connection.php +++ /dev/null @@ -1,50 +0,0 @@ -connection)) { - $r = 0; - $exception = null; - while ($r < $this->retries) { - try { - $dsn = $this->getDsn(); - $this->connection = new PDO($dsn, $this->username, $this->password); - return $this->connection; - } catch (PDOException $e) { - if ($exception !== null) { - $e = new PDOException($e->getMessage(), $e->getCode(), $exception); - } - $exception = $e; - usleep(500); - } - $r ++; - } - throw $exception; - } - return $this->connection; - } - protected function getDsn(): string - { - $dsn = "mysql:host={$this->host};dbname={$this->database}"; - if (isset($this->port)) { - $dsn .= ";port={$this->port}"; - } - return $dsn; - } -} diff --git a/app_old/app/Alias/Excel/Style/Mes.php b/app_old/app/Alias/Excel/Style/Mes.php deleted file mode 100644 index 368246b..0000000 --- a/app_old/app/Alias/Excel/Style/Mes.php +++ /dev/null @@ -1,18 +0,0 @@ -setNumFormat('mmm-YY'); - $format->setAlign('center'); - } -} diff --git a/app_old/app/Alias/Format.php b/app_old/app/Alias/Format.php deleted file mode 100644 index 0ca615c..0000000 --- a/app_old/app/Alias/Format.php +++ /dev/null @@ -1,17 +0,0 @@ - diff --git a/app_old/app/Alias/Model.php b/app_old/app/Alias/Model.php deleted file mode 100644 index 59ada5e..0000000 --- a/app_old/app/Alias/Model.php +++ /dev/null @@ -1,87 +0,0 @@ -id; - $orm = $this->orm; - $ref = new \ReflectionObject($orm); - if (!$ref->hasProperty('_dirty_fields')) { - return; - } - $dirty = $ref->getProperty('_dirty_fields'); - $dirty->setAccessible(true); - $new_values = $dirty->getValue($orm); - $changes = array_combine(array_keys($new_values), array_fill(0, count($new_values), ['old' => '', 'new' => ''])); - if ($this->isNew()) { - $old = (object) array_combine(array_keys($new_values), array_fill(0, count($new_values), '')); - } else { - $old = model(get_called_class())->findOne($this->{$this->getId()}); - } - foreach ($new_values as $column => $value) { - $changes[$column] = ['column' => $column, 'old' => $old->$column, 'new' => $value]; - } - $action = '[' . get_called_class() . ']'; - doLog($user, $action, $changes); - } - public function getId() - { - if (property_exists(get_called_class(), '_id_column')) { - return static::$_id_column; - } - return $this->id; - } - public function save() - { - $ref = new \ReflectionObject($this); - if ($ref->hasProperty('_timestamps')) { - $ref = $ref->getProperty('_timestamps'); - $ref->setAccessible(true); - if ($ref->getValue()) { - if ($this->is_new()) { - $this->setExpr('created_at', 'NOW()'); - } - $this->setExpr('updated_at', 'NOW()'); - } - } - if (!\ORM::getDb()->inTransaction()) { - \ORM::getDb()->beginTransaction(); - } - try { - parent::save(); - if (\ORM::getDb()->inTransaction()) { - \ORM::getDb()->commit(); - } - } catch (\Exception $e) { - if (\ORM::getDb()->inTransaction()) { - \ORM::getDb()->rollBack(); - } - throw $e; - } - $this->log(); - } - public function __call($method, $args) - { - if (!method_exists($this, $method)) { - $str = '' . Stringy::create($method)->underscored(); - if (method_exists($this, $str)) { - return call_user_func_array([$this, $str], $args); - } - throw new \BadMethodCallException($method . ' not found in ' . get_class($this)); - } - return call_user_func_array([$this, $str], $args); - } -} -?> diff --git a/app_old/app/Alias/NewEstado.php b/app_old/app/Alias/NewEstado.php deleted file mode 100644 index d884bb6..0000000 --- a/app_old/app/Alias/NewEstado.php +++ /dev/null @@ -1,21 +0,0 @@ -fecha, config('app.timezone')); - } -} -?> diff --git a/app_old/app/Alias/NewModel.php b/app_old/app/Alias/NewModel.php deleted file mode 100644 index 1c513b4..0000000 --- a/app_old/app/Alias/NewModel.php +++ /dev/null @@ -1,9 +0,0 @@ - \ No newline at end of file diff --git a/app_old/app/Alias/NewTipo.php b/app_old/app/Alias/NewTipo.php deleted file mode 100644 index b5fa3fb..0000000 --- a/app_old/app/Alias/NewTipo.php +++ /dev/null @@ -1,15 +0,0 @@ - \ No newline at end of file diff --git a/app_old/app/Alias/OldModel.php b/app_old/app/Alias/OldModel.php deleted file mode 100644 index b3f9730..0000000 --- a/app_old/app/Alias/OldModel.php +++ /dev/null @@ -1,8 +0,0 @@ - diff --git a/app_old/app/Alias/PHPExcel.php b/app_old/app/Alias/PHPExcel.php deleted file mode 100644 index ab98f53..0000000 --- a/app_old/app/Alias/PHPExcel.php +++ /dev/null @@ -1,155 +0,0 @@ -name = $name; - $this->filename = $filename; - } - public function addColumns($fields) - { - $columns = []; - foreach ($fields as $i => $field) { - if (is_object($field)) { - if (isset($field->style)) { - $style = $this->getExcelStyle($field->style); - } else { - $style = $this->getExcelStyle(); - } - $column = new ExcelHelper\Column($field->name, $field->name, 10, $style); - } elseif (is_array($field)) { - if (isset($field['style'])) { - $style = $this->getExcelStyle($field['style']); - } else { - $style = $this->getExcelStyle(); - } - $column = new ExcelHelper\Column($field['name'], $field['name'], 10, $style); - } else { - $style = $this->getExcelStyle(); - $column = new ExcelHelper\Column($field, $field, 10, $style); - } - $columns []= $column; - } - $collection = new ExcelHelper\ColumnCollection($columns); - $this->columns = $collection; - } - protected function getExcelStyle($style = 'text') - { - switch (strtolower($style)) { - case 'date': - return new ExcelHelper\CellStyle\Date(); - case 'mes': - return new \App\Alias\Excel\Style\Mes(); - case 'currency': - case 'amount': - return new ExcelHelper\CellStyle\Amount(); - case 'number': - case 'integer': - return new ExcelHelper\CellStyle\Integer(); - case 'percent': - case 'percentage': - return new ExcelHelper\CellStyle\Percentage(); - case 'text': - case 'string': - default: - return new ExcelHelper\CellStyle\Text(); - } - } - public function addData($data) - { - if ($this->data == null) { - $this->data = []; - } - $this->data = array_merge($data); - } - public function addRow($rowData) - { - if ($this->data == null) { - $this->data = []; - } - $this->data []= $rowData; - } - public function addTotals($totals) - { - $columns = (array) $this->columns; - $columns = array_pop($columns); - $ts = []; - foreach ($columns as $column) { - $col = $column->getHeading(); - if (isset($totals[$col])) { - $ts[$col] = $this->getTotal($col, $totals[$col]); - continue; - } - $ts[$col] = ''; - } - $this->data []= $ts; - } - protected function getTotal($col, $aggr) - { - $col_num = $this->getColNumber($col); - $col = $this->getColName($col_num); - switch(strtolower($aggr)) { - case 'sum': - $num = 109; - break; - case 'count': - $num = 102; - break; - case 'counta': - $num = 103; - break; - default: - $num = 0; - } - if ($num > 0) { - $end = count($this->data) + 2; - $str = "=SUBTOTAL({$num};{$col}3:{$col}{$end})"; - return $str; - } - return $aggr; - } - protected function getColNumber($col) - { - $columns = (array) $this->columns; - $columns = array_keys(array_pop($columns)); - return array_search($col, $columns); - } - protected function getColName($col_num) - { - $cols = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'; - $N = strlen($cols); - $name = ''; - if ($col_num > $N) { - $name .= $cols[floor($col_num / $N)]; - $col_num = $N * ($col_num / $N - floor($col_num / $N)); - } - $name .= $cols[$col_num]; - return $name; - } - public function informe() - { - header("Content-Type: application/octet-stream; charset=utf-8"); - header('Content-Transfer-Encoding: binary'); - header('Content-Disposition: attachment; filename="' . $this->filename . '"'); - header('Cache-Control: max-age=0'); - - $pE = new ExcelHelper\TableWorkbook('php://output'); - $ws = $pE->addWorksheet($this->name); - - $table = new ExcelHelper\Table($ws, 0, 0, $this->name, new \ArrayIterator($this->data)); - $table->setColumnCollection($this->columns); - - $pE->writeTable($table); - - $pE->close(); - } -} diff --git a/app_old/app/Alias/RemoteConnection.php b/app_old/app/Alias/RemoteConnection.php deleted file mode 100644 index 475225e..0000000 --- a/app_old/app/Alias/RemoteConnection.php +++ /dev/null @@ -1,17 +0,0 @@ -retries - ); - } -} diff --git a/app_old/app/Command/Money/Get.php b/app_old/app/Command/Money/Get.php deleted file mode 100644 index 606c8b1..0000000 --- a/app_old/app/Command/Money/Get.php +++ /dev/null @@ -1,87 +0,0 @@ -title('Get Money'); - - $dates = $this->getDates(); - foreach ($dates as $date_string => $ids) { - $date = $this->parseDate($date_string); - $response = $this->service->getUF($date); - if ($response->total === 0) { - continue; - } - foreach ($ids as $id) { - $this->queueUpdate($id, $response->uf->value); - } - } - $this->updateUF(); - return Command::SUCCESS; - } - - protected function getDates(): array - { - $query = "SELECT id, fecha FROM pago WHERE uf IS NULL AND fecha BETWEEN 0 AND DATE_ADD(CURDATE(), INTERVAL 9 DAY) ORDER BY fecha"; - $statement = $this->connection->connect()->query($query); - $rows = $statement->fetchAll(PDO::FETCH_ASSOC); - if (count($rows) === 0) { - return []; - } - $dates = []; - foreach ($rows as $row) { - if (!isset($dates[$row['fecha']])) { - $dates[$row['fecha']] = []; - } - $dates[$row['fecha']] []= (int) $row['id']; - } - return $dates; - } - protected function parseDate(string $date_string): DateTimeInterface - { - return new DateTimeImmutable($date_string); - } - protected array $rows; - protected function queueUpdate(int $id, float $value): void - { - $this->rows []= [$value, $id]; - } - protected function updateUF(): void - { - $query = "UPDATE pago SET uf = ? WHERE id = ?"; - $statement = $this->connection->connect()->prepare($query); - foreach ($this->rows as $row) { - $this->connection->connect()->beginTransaction(); - try { - $statement->execute($row); - $this->connection->connect()->commit(); - } catch (PDOException $e) { - $this->connection->connect()->rollBack(); - } - } - } -} diff --git a/app_old/app/Command/Money/Lookup.php b/app_old/app/Command/Money/Lookup.php deleted file mode 100644 index 2b87b28..0000000 --- a/app_old/app/Command/Money/Lookup.php +++ /dev/null @@ -1,52 +0,0 @@ -title('Lookup Money'); - - while (true) { - $io->info('Checking pending'); - if ($this->hasPendingMoney()) { - $io->success('Running money get UF'); - $io->note($this->runGetUF()); - } - } - return Command::SUCCESS; - } - - protected function hasPendingMoney(): bool - { - $query = "SELECT 1 FROM pago WHERE uf IS NULL AND fecha BETWEEN 0 AND DATE_ADD(CURDATE(), INTERVAL 9 DAY)"; - $statement = $this->connection->connect()->query($query); - return $statement->rowCount() > 0; - } - protected function runGetUF(): string - { - $command = "/code/bin/console money:uf:get"; - $result = shell_exec($command); - if (!$result or $result === null) { - throw new \Exception(); - } - return $result; - } -} diff --git a/app_old/app/Contract/Auth.php b/app_old/app/Contract/Auth.php deleted file mode 100644 index fb2e3b6..0000000 --- a/app_old/app/Contract/Auth.php +++ /dev/null @@ -1,27 +0,0 @@ - \ No newline at end of file diff --git a/app_old/app/Contract/Route.php b/app_old/app/Contract/Route.php deleted file mode 100644 index fd4a84c..0000000 --- a/app_old/app/Contract/Route.php +++ /dev/null @@ -1,27 +0,0 @@ - \ No newline at end of file diff --git a/app_old/app/Controller/API/Unidades.php b/app_old/app/Controller/API/Unidades.php deleted file mode 100644 index b7abead..0000000 --- a/app_old/app/Controller/API/Unidades.php +++ /dev/null @@ -1,41 +0,0 @@ -findOne($id_proyecto); - if (!$proyecto) { - throw new \InvalidArgumentException('Proyecto identificado por ' . $id_proyecto . ' no existe.'); - } - $unidades = $proyecto->unidades($id_tipo); - $unidades = array_filter($unidades, function($item) { - return !$item->isVendida() and !$item->isReservada(); - }); - $unidades = array_map(function($item) { - return $item->asArray(); - }, $unidades); - usort($unidades, function($a, $b) { - $ap = strpos($a['descripcion'], ' '); - $ad = $a['descripcion']; - if ($ap != false) { - $ad = substr($ad, 0, $ap); - } - $bd = $b['descripcion']; - $bp = strpos($b['descripcion'], ' '); - if ($bp != false) { - $bd = substr($bd, 0, $bp); - } - return strcmp( - str_pad($ad, 4, '0', \STR_PAD_LEFT), - str_pad($bd, 4, '0', \STR_PAD_LEFT) - ); - }); - $output = array_values($unidades); - $response->getBody()->write(\json_encode($output)); - return $response->withHeader('Content-Type', 'application/json'); - } -} diff --git a/app_old/app/Controller/Admin.php b/app_old/app/Controller/Admin.php deleted file mode 100644 index 137057c..0000000 --- a/app_old/app/Controller/Admin.php +++ /dev/null @@ -1,233 +0,0 @@ -list(); - } - public static function listNamespaces() - { - $base = [ - 'Common', - 'Inmobiliaria', - 'Proyecto', - 'Venta' - ]; - $nss = [ - 'Incoviba' => [ - 'old' => $base, - 'new' => $base - ] - ]; - - echo json_encode(['namespaces' => self::collapseMultiArray($nss)]); - } - protected static function collapseMultiArray($array, $level = '') - { - $output = []; - foreach ($array as $key => $subarray) { - if (is_array($subarray)) { - $output = array_merge($output, self::collapseMultiArray($subarray, $level . '\\' . $key)); - } else { - $output []= $level . '\\' . $subarray; - } - } - - return $output; - } - public static function createModel() - { - $db = post('database'); - $ns = post('namespace'); - $table = post('table'); - - $modeler = new DBToModel($db); - echo $modeler->create($ns, $table); - } - public static function list_roles() - { - $roles = \Model::factory(\Incoviba\common\Role::class)->findMany(); - echo view('admin.roles.list', compact('roles')); - } - public static function add_role() - { - echo view('admin.roles.add'); - } - public static function do_add_role() - { - $role = \Model::factory(\Incoviba\common\Role::class)->where('description', post('description'))->findOne(); - if ($role === false) { - $role = \Model::factory(\Incoviba\common\Role::class)->create(['description' => post('description')]); - $role->save(); - } - header('Location: ' . nUrl('admin', 'add_role')); - } - public static function role() - { - $role = \Model::factory(\Incoviba\common\Role::class)->findOne(get('role')); - $actions = model(Action::class)->orderByAsc('description')->findMany(); - $permissions = []; - foreach ($actions as $action) { - $permissions []= (object) ['description' => $action->description, 'status' => false, 'inherited' => false]; - } - array_walk($permissions, function(&$el, $i, $role) { - if ($role->checkAccess($el->description)) { - $el->status = true; - if ($role->isInherited($el->description)) { - $el->inherited = true; - } - } - }, $role); - echo view('admin.roles.show', compact('role', 'permissions')); - } - public static function add_role_permissions() - { - $role = \Model::factory(\Incoviba\common\Role::class)->findOne(get('role')); - $locations = \Model::factory(\Incoviba\common\Location::class)->findMany(); - $actions = model(\Incoviba\common\Action::class)->findMany(); - echo view('admin.roles.add_permissions', compact('role', 'locations', 'actions')); - } - public static function do_add_role_permissions() - { - $role = \Model::factory(\Incoviba\common\Role::class)->findOne(get('role')); - $actions = model(\Incoviba\common\Action::class)->findMany(); - foreach ($actions as $action) { - $p = \Model::factory(\Incoviba\common\Permission::class)->where('type', 2)->where('ext_id', $role->id)->where('action_id', $action->id)->findOne(); - if (array_search($action->id, post('allowed'))) { - if (!$p) { - $data = [ - 'type' => 2, - 'ext_id' => $role->id, - 'action_id' => $action->id - ]; - $p = model(\Incoviba\common\Permission::class)->create($data); - } - $p->status = 1; - } else { - if ($p !== false) { - $p->status = 0; - } - } - if ($p !== false) { - $p->save(); - } - } - header('Location: ' . nUrl('admin', 'role', ['role' => $role->id])); - } - public static function list_users() - { - $users = \Model::factory(\Incoviba\common\User::class)->orderByAsc('name')->findMany(); - echo view('admin.users.list', compact('users')); - } - public static function add_user() - { - echo view('admin.users.add'); - } - public static function do_add_user() - { - $user = \Model::factory(\Incoviba\common\User::class)->where('name', post('name'))->findOne(); - if ($user === false) { - $user = \Model::factory(\Incoviba\common\User::class)->create(); - $user->name = post('name'); - $user->password(post('password')); - - $user->save(); - } - header('Location: ' . url('', ['p' => 'admin', 'a' => 'add_user'])); - } - public static function user() - { - $user = \Model::factory(\Incoviba\common\User::class)->findOne(get('user')); - echo view('admin.users.show', compact('user')); - } - public static function add_user_role() - { - if (get('user') !== false) { - $user = \Model::factory(\Incoviba\common\User::class)->findOne(get('user')); - $roles = \Model::factory(\Incoviba\common\Role::class)->findMany(); - return view('admin.users.add_role', compact('user', 'roles')); - } elseif (get('role') !== false) { - $role = \Model::factory(\Incoviba\common\Role::class)->findOne(get('role')); - $users = \Model::factory(\Incoviba\common\User::class)->findMany(); - return view('admin.roles.add_users', compact('users', 'role')); - } - } - public static function do_add_user_role() - { - if (get('user') !== false) { - $user = \Model::factory(\Incoviba\common\User::class)->findOne(get('user')); - foreach (post('role') as $r_id) { - $role = \Model::factory(\Incoviba\common\Role::class)->findOne($r_id); - - $usrRl = \Model::factory(\Incoviba\common\UserRole::class)->where('user', $user->id)->where('role', $role->id)->findOne(); - if ($usrRl === false) { - $usrRl = \Model::factory(\Incoviba\common\UserRole::class)->create(['user' => $user->id, 'role' => $role->id]); - $usrRl->save(); - } - } - header('Location: ' . url('', ['p' => 'admin', 'a' => 'user', 'user' => $user->id])); - } elseif (get('role') !== false) { - $role = \Model::factory(\Incoviba\common\Role::class)->findOne(get('role')); - foreach (post('users') as $u_id) { - $user = \Model::factory(\Incoviba\common\User::class)->findOne($u_id); - - $usrRl = \Model::factory(\Incoviba\common\UserRole::class)->where('user', $user->id)->where('role', $role->id)->findOne(); - if ($usrRl === false) { - $usrRl = \Model::factory(\Incoviba\common\UserRole::class)->create(['user' => $user->id, 'role' => $role->id]); - $usrRl->save(); - } - } - header('Location: ' . url('', ['p' => 'admin', 'a' => 'role', 'role' => $role->id])); - } - } - public static function remove_user_role() - { - $q = "DELETE FROM user_roles WHERE user = ? AND role = ?"; - $st = \ORM::getDb()->prepare($q); - $st->execute([get('user'), get('role')]); - header('Location: ' . nUrl('admin')); - } - public static function delete_user() - { - $q = "DELETE FROM user_roles WHERE user = ?"; - $st = \ORM::getDb()->prepare($q); - $st->execute([get('user')]); - $q = "DELETE FROM logins WHERE user = ?"; - $st = \ORM::getDb()->prepare($q); - $st->execute([get('user')]); - $q = "DELETE FROM permissions WHERE type = 1 AND ext_id = ?"; - $st = \ORM::getDb()->prepare($q); - $st->execute([get('user')]); - $user = \model(\Incoviba\common\User::class)->findOne(get('user')); - $user->delete(); - header('Location: ' . nUrl('admin', 'list_users')); - } - public static function reset_user() - { - $user = model(\Incoviba\common\User::class)->findOne(get('user')); - $user->password('123456'); - $user->save(); - header('Location: ' . nUrl('admin', 'user', ['user' => $user->id])); - } -} -?> diff --git a/app_old/app/Controller/Ajax.php b/app_old/app/Controller/Ajax.php deleted file mode 100644 index 912c979..0000000 --- a/app_old/app/Controller/Ajax.php +++ /dev/null @@ -1,215 +0,0 @@ -whereNotEqual('nombre', '')->order_by_asc('nombre')->findMany(); - foreach ($bancos as &$banco) { - $banco = $banco->as_array('nombre')['nombre']; - } - return json_encode($bancos); - } - protected static function buscarBanco() - { - $q = get('q'); - if ($q == null) { - $q = get('query'); - if ($q == null) { - return ''; - } - } - $bancos = \Model::factory(\Incoviba\old\Common\Banco::class)->whereLike('nombre', '%' . $q . '%')->order_by_asc('nombre')->findMany(); - foreach ($bancos as &$banco) { - $banco = $banco->as_array('nombre')['nombre']; - } - return json_encode($bancos); - } - public static function comunas() - { - $id = post('region'); - $comunas = \Model::factory(\Incoviba\old\Common\Comuna::class) - ->select('comuna.*') - ->join('provincia', ['provincia.id', '=', 'comuna.provincia']) - ->where('provincia.region', $id) - ->order_by_asc('comuna.descripcion') - ->findMany(); - - foreach ($comunas as &$comuna) { - $comuna = $comuna->as_array('id', 'descripcion'); - } - return json_encode($comunas); - } - public static function propietario() - { - $id = post('rut'); - $propietario = \Model::factory(\Incoviba\old\Venta\Propietario::class)->where('rut', $id)->findOne(); - if ($propietario) { - $propietario = $propietario->as_array(); - return json_encode($propietario); - } - return null; - } - public static function direccion() - { - $id = post('direccion'); - $direccion = \Model::factory(\Incoviba\old\Common\Direccion::class)->findOne($id); - $comuna = $direccion->comuna(); - $provincia = $comuna->provincia(); - $region = $provincia->region(); - $direccion = $direccion->as_array(); - $direccion['comuna'] = $comuna->as_array(); - $direccion['comuna']['provincia'] = $provincia->as_array(); - $direccion['comuna']['provincia']['region'] = $region->as_array(); - return json_encode($direccion); - } - public static function tipo_unidades() - { - $id = post('proyecto'); - $proyecto = \Model::factory(\Incoviba\old\Proyecto\Proyecto::class)->findOne($id); - $tipos = $proyecto->tipoUnidades(); - foreach ($tipos as &$tipo) { - $tipo = $tipo->as_array(); - } - return json_encode($tipos); - } - public static function unidades() - { - $id_proyecto = post('proyecto'); - $id_tipo = post('tipo'); - - $proyecto = model(\Incoviba\old\Proyecto\Proyecto::class)->findOne($id_proyecto); - $unidades = $proyecto->unidadesDisponibles($id_tipo); - foreach ($unidades as &$unidad) { - $tipologia = $unidad->tipologia(); - $unidad = $unidad->as_array(); - $unidad['tipologia'] = $tipologia->as_array(); - if ($tipologia->tipologia()) { - $unidad['tipologia']['tipologia'] = (array) $tipologia->tipologia(); - continue; - } - $unidad['tipologia']['tipologia'] = ['descripcion' => $tipologia->abreviacion]; - } - return json_encode($unidades); - } - public static function unidades_precios() - { - $proyecto = model(\Incoviba\old\Proyecto\Proyecto::class)->findOne(post('proyecto')); - $unidades = $proyecto->unidades(); - usort($unidades, function($a, $b) { - $t = $a->tipo - $b->tipo; - if ($t == 0) { - return (int) $a->descripcion - (int) $b->descripcion; - } - return $t; - }); - $output = []; - foreach ($unidades as $u) { - $info = [ - 'id' => $u->id, - 'abreviacion' => $u->abreviacion, - 'descripcion' => $u->descripcion, - 'valor' => '--' - ]; - if ($u->precio()) { - $info['valor'] = format('ufs', $u->precio()->valor, null, true); - } - $output []= $info; - } - return json_encode($output); - } - public static function operadores() - { - $id_proyecto = post('proyecto'); - $proyecto = \Model::factory(\Incoviba\old\Proyecto\Proyecto::class)->findOne($id_proyecto); - $operadores = $proyecto->operadores(); - foreach ($operadores as &$operador) { - $operador = [ - 'id' => $operador->id, - 'abreviacion' => $operador->abreviacion - ]; - } - return json_encode($operadores); - } - public static function promociones() - { - $id = post('proyecto'); - $proyecto = \Model::factory(\Incoviba\old\Proyecto\Proyecto::class)->findOne($id); - $promociones = $proyecto->promociones(); - foreach ($promociones as &$promocion) { - $promocion = $promocion->as_array(); - } - return json_encode($promociones); - } - public static function nombres() - { - $nss = model(Propietario::class)->select('nombres')->orderByAsc('nombres')->findMany(); - $nombres = []; - foreach ($nss as $n) { - $ns = explode(' ', $n->nombres); - foreach ($ns as $nombre) { - $nombres []= $nombre; - } - } - $nombres = array_values(array_unique($nombres)); - return json_encode($nombres); - } - public static function apellidos() - { - $aps = model(Propietario::class)->select('apellido_paterno')->orderByAsc('apellido_paterno')->findMany(); - $apellidos = []; - foreach ($aps as $ap) { - $apellidos []= $ap->apellido_paterno; - } - $aps = model(Propietario::class)->select('apellido_materno')->orderByAsc('apellido_materno')->findMany(); - foreach ($aps as $ap) { - $apellidos []= $ap->apellido_paterno; - } - $apellidos = array_values(array_unique($apellidos)); - sort($apellidos); - return json_encode($apellidos); - } - public static function calles() - { - $results = model(Direccion::class)->select('calle')->orderByAsc('calle')->findMany(); - $calles = []; - foreach ($results as $result) { - $calles []= $result->calle; - } - $calles = array_values(array_unique($calles)); - return json_encode($calles); - } - public static function inmobiliarias() - { - $q = post('rut'); - $inmobiliaria = model(Inmobiliaria::class)->findOne($q); - return json_encode($inmobiliaria->as_array()); - } -} -?> diff --git a/app_old/app/Controller/Auth.php b/app_old/app/Controller/Auth.php deleted file mode 100644 index 74c9d78..0000000 --- a/app_old/app/Controller/Auth.php +++ /dev/null @@ -1,59 +0,0 @@ -render($response, 'auth.login'); - } - public function do_login(ServerRequestInterface $request, ResponseInterface $response): ResponseInterface - { - $post = $request->getParsedBody(); - $name = $post['name']; - $password = $post['password']; - $bool = sAuth::login($name, $password); - if ($bool) { - return $response->withStatus(301)->withHeader('Location', '/'); - } - return $response->withStatus(301)->withHeader('Location', '/auth/login'); - } - public function logout(ServerRequestInterface $request, ResponseInterface $response): ResponseInterface - { - sAuth::logout(); - return $response - ->withStatus(301) - ->withHeader('Location', '/'); - } - public function check_pass(ServerRequestInterface $request, ResponseInterface $response): ResponseInterface - { - if (\password_verify(post('password'), sAuth::User()->password)) { - $response->getBody()->write('OK'); - } else { - $response->getBody()->write('KO'); - } - return $response; - } - public function change_pass(ServerRequestInterface $request, ResponseInterface $response, View $view): ResponseInterface - { - return $view->render($response, 'auth.change_pass'); - } - public function do_change_pass(ServerRequestInterface $request, ResponseInterface $response): ResponseInterface - { - $post = $request->getParsedBody(); - if (\password_verify($post['old'], sAuth::User()->password)) { - if ($post['new'] == $post['new2']) { - $user = sAuth::User(); - $user->password($post['new']); - $user->save(); - return $response->withStatus(301)->withHeader('Location', '/'); - } - } - return $response->withStatus(301)->withHeader('Location', '/auth/change_pass'); - } -} diff --git a/app_old/app/Controller/Bonos.php b/app_old/app/Controller/Bonos.php deleted file mode 100644 index 32daaa5..0000000 --- a/app_old/app/Controller/Bonos.php +++ /dev/null @@ -1,67 +0,0 @@ -findOne($id_venta); - return view('ventas.bonos.add', compact('venta')); - } - public static function do_add() - { - $id_venta = get('venta'); - $venta = model(Venta::class)->findOne($id_venta); - if ($venta->bono_pie != 0) { - header('Location: ' . nUrl('ventas', 'show', ['venta' => $venta->id])); - return; - } - $uf = uf($venta->fecha()); - $valor = post('valor'); - $data = [ - 'fecha' => $venta->fecha, - 'valor' => $valor * $uf->uf->value, - 'tipo' => 8, - 'uf' => $uf->uf->value - ]; - $pago = model(Pago::class)->create($data); - $pago->save(); - $data = [ - 'valor' => $valor, - 'pago' => $pago->id - ]; - $bono = model(BonoPie::class)->create($data); - $bono->save(); - $venta->bono_pie = $bono->id; - $venta->save(); - header('Location: ' . nUrl('ventas', 'show', ['venta' => $venta->id])); - } - public static function edit() - { - $id_venta = get('venta'); - $venta = model(Venta::class)->findOne($id_venta); - return view('ventas.bonos.edit', compact('venta')); - } - public static function do_edit() - { - $id_venta = get('venta'); - $venta = model(Venta::class)->findOne($id_venta); - $bono = $venta->bonoPie(); - $valor = post('valor') * $bono->pago()->uf(); - $pago = $bono->pago(); - if ($valor != $bono->pago()->valor()) { - $pago->valor = $valor; - $pago->save(); - } - header('Location: ' . nUrl('ventas', 'show', ['venta' => $venta->id])); - exit(); - } -} diff --git a/app_old/app/Controller/Buscar.php b/app_old/app/Controller/Buscar.php deleted file mode 100644 index ef62a9e..0000000 --- a/app_old/app/Controller/Buscar.php +++ /dev/null @@ -1,340 +0,0 @@ - $results]); - } - protected static function getResults() - { - $q = get('q'); - if ($q == null) { - $q = get('query'); - } - $t = get('t'); - if ($t == null) { - $t = get('tipo'); - } - $t = urldecode($t); - if ($t == null) { - $t = 'cualquiera'; - } - - $results = null; - if ($q != null) { - $q = urldecode($q); - $results = self::buscar($q, $t); - } - return $results; - } - public static function buscar($query, $tipo) - { - $method = 'buscar' . str_replace(' ', '', ucwords($tipo)); - if (is_callable(['self', $method])) { - $results = self::$method(self::prepareQuery($query)); - $results = self::removeDuplicates($results); - $results = self::sort($results); - return $results; - } - return []; - } - protected static function prepareQuery($query) - { - $query = str_replace('"', '"', $query); - $data = explode(' ', $query); - $regex = "~(?=\\S)[^'\"\\s]*(?:'[^']*'[^'\"\\s]*|\"[^\"]*\"[^'\"\\s]*)*~"; - preg_match_all($regex, $query, $data); - $data = $data[0]; - foreach ($data as &$l) { - $l = str_replace('"', '', str_replace("'", '', $l)); - } - if (is_array($data) and count($data) == 1) { - $data = $data[0]; - } - return $data; - } - protected static function removeDuplicates($results) - { - $output = []; - foreach ($results as $result) { - if (array_search($result, $output) === false) { - $output []= $result; - } - } - return $output; - } - protected static function sort($results) - { - usort($results, function($a, $b) { - $py = strcmp($a->proyecto()->descripcion, $b->proyecto()->descripcion); - if ($py == 0) { - if (!method_exists($a, 'unidad') and !method_exists($b, 'unidad')) { - return $a->descripcion - $b->descripcion; - } - if (!method_exists($a, 'unidad')) { - return $a->descripcion - $b->unidad()->descripcion; - } - if (!method_exists($b, 'unidad')) { - return $a->unidad()->descripcion - $b->descripcion; - } - - $u = $a->unidad()->descripcion - $b->unidad()->descripcion; - if ($u == 0) { - return strcmp($a->propietario()->apellido_paterno, $b->propietario()->apellido_paterno); - } - return $u; - } - return $py; - }); - return $results; - } - protected static function buscarCualquiera($query) - { - $results = []; - foreach (self::$tipos as $tipo) { - if ($tipo == 'cualquiera') { - continue; - } - $method = 'buscar' . str_replace(' ', '', ucwords($tipo)); - - if (is_callable(['self', $method])) { - $results = array_merge($results, self::$method($query)); - } - } - return $results; - } - protected static function buscarDepartamento($query) - { - if (is_array($query)) { - $results = []; - foreach ($query as $segment) { - $results = array_merge($results, self::buscarDepartamento($segment)); - } - } else { - $results = \Model::factory(Venta::class) - ->select('venta.*') - ->join('propiedad', ['propiedad.id', '=', 'venta.propiedad']) - ->join('unidad', ['unidad.id', '=', 'propiedad.unidad_principal']) - ->whereLike('unidad.descripcion', '%' . $query . '%') - ->findMany(); - } - return $results; - } - protected static function buscarEstacionamiento($query) - { - if (is_array($query)) { - $results = []; - foreach ($query as $segment) { - $results = array_merge($results, self::buscarEstacionamiento($segment)); - } - } else { - $results = \Model::factory(Venta::class) - ->select('venta.*') - ->join('propiedad', ['propiedad.id', '=', 'venta.propiedad']) - ->join('unidad', "`propiedad`.`estacionamientos` LIKE `unidad`.`id` OR `propiedad`.`estacionamientos` LIKE CONCAT('%;', `unidad`.`id`) OR `propiedad`.`estacionamientos` LIKE CONCAT(`unidad`.`id`, ';%') OR `propiedad`.`estacionamientos` LIKE CONCAT('%;', `unidad`.`id`, ';%')") - ->where('unidad.descripcion', $query) - ->findMany(); - } - return $results; - } - protected static function buscarBodega($query) - { - if (is_array($query)) { - $results = []; - foreach ($query as $segment) { - $results = array_merge($results, self::buscarBodega($segment)); - } - } else { - $results = \Model::factory(Venta::class) - ->select('venta.*') - ->join('propiedad', ['propiedad.id', '=', 'venta.propiedad']) - ->join('unidad', "`propiedad`.`bodegas` LIKE `unidad`.`id` OR `propiedad`.`bodegas` LIKE CONCAT('%;', `unidad`.`id`) OR `propiedad`.`bodegas` LIKE CONCAT(`unidad`.`id`, ';%') OR `propiedad`.`bodegas` LIKE CONCAT('%;', `unidad`.`id`, ';%')") - ->where('unidad.descripcion', $query) - ->findMany(); - } - return $results; - } - protected static function buscarPropietario($query) - { - if (is_array($query)) { - $results = []; - foreach ($query as $segment) { - $results = array_merge($results, self::buscarPropietario($segment)); - } - } else { - $results = self::buscarPropietarioNombres($query); - $results = array_merge($results, self::buscarPropietarioApellido($query)); - $results = array_merge($results, self::buscarPropietarioNombreCompleto($query)); - } - return $results; - } - protected static function buscarPropietarioNombres($query) - { - $results = \Model::factory(Venta::class) - ->select('venta.*') - ->join('propietario', ['propietario.rut', '=', 'venta.propietario']) - ->whereLike('propietario.nombres', '%' . $query . '%') - ->findMany(); - return $results; - } - protected static function buscarPropietarioApellido($query) - { - $results = \Model::factory(Venta::class) - ->select('venta.*') - ->join('propietario', ['propietario.rut', '=', 'venta.propietario']) - ->whereAnyIs([ - ['propietario.apellido_paterno' => '%' . $query . '%'], - ['propietario.apellido_materno' => '%' . $query . '%'] - ], 'LIKE') - ->findMany(); - return $results; - } - protected static function buscarPropietarioNombreCompleto($query) - { - $results = \Model::factory(Venta::class) - ->select('venta.*') - ->join('propietario', ['propietario.rut', '=', 'venta.propietario']) - ->whereRaw("CONCAT_WS(' ', propietario.nombres, propietario.apellido_paterno, propietario.apellido_materno) LIKE '%" . $query . "%'") - ->findMany(); - return $results; - } - protected static function buscarPrecioVenta($query) - { - if (is_array($query)) { - $results = []; - foreach ($query as $segment) { - $results = array_merge($results, self::buscarPrecioVenta($segment)); - } - } else { - $query = str_replace([',', '.'], ['.', ''], $query); - $results = \Model::factory(Venta::class)->where('valor_uf', $query)->findMany(); - } - return $results; - } - protected static function buscarProyecto($query) - { - if (is_array($query)) { - $results = []; - foreach ($query as $segment) { - $results = array_merge($results, self::buscarProyecto($segment)); - } - } else { - $results = model(Venta::class) - ->select('venta.*') - ->join('propiedad', ['propiedad.id', '=', 'venta.propiedad']) - ->join('unidad', ['unidad.id', '=', 'propiedad.unidad_principal']) - ->join('proyecto', ['proyecto.id', '=', 'unidad.proyecto']) - ->whereLike('proyecto.descripcion', '%' . $query . '%') - ->findMany(); - } - return $results; - } - protected static function buscarPago($query) - { - if (is_array($query)) { - $results = []; - foreach ($query as $segment) { - $results = array_merge($results, self::buscarPrecioVenta($segment)); - } - } else { - $query = str_replace(',', '.', str_replace('.', '', $query)); - $query2 = (float) $query; - if ($query != $query2) { - return []; - } - if (!is_float($query2)) { - return []; - } - $query = $query2; - $results = self::buscarValorCuota($query); - $results = array_merge($results, self::buscarReajuste($query)); - $results = array_merge($results, self::buscarEscritura($query)); - $results = array_merge($results, self::buscarSubsidio($query)); - $results = array_merge($results, self::buscarCredito($query)); - } - return $results; - } - protected static function buscarValorCuota($query) - { - $results = \Model::factory(Venta::class) - ->select('venta.*') - ->join('cuota', ['cuota.pie', '=', 'venta.pie']) - ->join('pago', ['pago.id', '=', 'cuota.pago']) - ->whereRaw("`pago`.`valor` = " . $query . " OR `pago`.`valor` / `pago`.`uf` = " . $query) - ->findMany(); - return $results; - } - protected static function buscarReajuste($query) - { - $results = \Model::factory(Venta::class) - ->select('venta.*') - ->join('pie', ['pie.id', '=', 'venta.pie']) - ->join('pago', ['pago.id', '=', 'pie.reajuste']) - ->whereRaw("`pago`.`valor` = " . $query . " OR `pago`.`valor` / `pago`.`uf` = " . $query) - ->findMany(); - return $results; - } - protected static function buscarEscritura($query) - { - $results = \Model::factory(Venta::class) - ->select('venta.*') - ->join('escritura', ['escritura.id', '=', 'venta.escritura']) - ->join('pago', ['pago.id', '=', 'escritura.pago']) - ->whereRaw("`pago`.`valor` = " . $query . " OR `pago`.`valor` / `pago`.`uf` = " . $query) - ->findMany(); - return $results; - } - protected static function buscarSubsidio($query) - { - $results = \Model::factory(Venta::class) - ->select('venta.*') - ->join('subsidio', ['subsidio.id', '=', 'venta.subsidio']) - ->join('pago', ['pago.id', '=', 'subsidio.pago']) - ->whereRaw("`pago`.`valor` = " . $query . " OR `pago`.`valor` / `pago`.`uf` = " . $query) - ->findMany(); - return $results; - } - protected static function buscarCredito($query) - { - $results = \Model::factory(Venta::class) - ->select('venta.*') - ->join('credito', ['credito.id', '=', 'venta.credito']) - ->join('pago', ['pago.id', '=', 'credito.pago']) - ->whereRaw("`pago`.`valor` = " . $query . " OR `pago`.`valor` / `pago`.`uf` = " . $query) - ->findMany(); - return $results; - } - protected static function buscarUnidad($query) - { - if (is_array($query)) { - $results = []; - foreach ($query as $segment) { - $results = array_merge($results, self::buscarUnidad($segment)); - } - } else { - $results = model(Unidad::class)->where('descripcion', $query)->findMany(); - foreach ($results as $i => $u) { - if ($u->venta()) { - unset($results[$i]); - } - } - } - return $results; - } -} -?> diff --git a/app_old/app/Controller/Cierres.php b/app_old/app/Controller/Cierres.php deleted file mode 100644 index 46a76b9..0000000 --- a/app_old/app/Controller/Cierres.php +++ /dev/null @@ -1,428 +0,0 @@ -select('proyecto.*') - ->join('estado_proyecto', ['estado.proyecto', '=', 'proyecto.id'], 'estado') - ->join('tipo_estado_proyecto', ['tipo.id', '=', 'estado.estado'], 'tipo') - ->join('etapa_proyecto', ['etapa.id', '=', 'tipo.etapa'], 'etapa') - ->whereGte('etapa.orden', 3) - ->orderByAsc('proyecto.descripcion') - ->groupBy('proyecto.id') - ->findMany(); - $regiones = model(Region::class)->order_by_asc('numeracion')->findMany(); - return view('ventas.cierres.add', compact('proyectos', 'regiones')); - } - public static function agregar() - { - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $id_proyecto = post('proyecto'); - $proyecto = model(Proyecto::class)->findOne($id_proyecto); - $id_agente = post('agente'); - $agente = model(Agente::class)->findOne($id_agente); - - $direccion = model(Direccion::class) - ->where('calle', post('calle')) - ->where('numero', post('numero')) - ->where('extra', post('extra')) - ->where('comuna', post('comuna')) - ->findOne(); - if (!$direccion) { - $data = [ - 'calle' => post('calle'), - 'numero' => post('numero'), - 'extra' => post('extra'), - 'comuna' => post('comuna') - ]; - $direccion = model(Direccion::class)->create($data); - $direccion->save(); - } - - list($rut, $dv) = explode('-', str_replace('.', '', post('rut'))); - $propietario = model(Propietario::class)->findOne($rut); - if (!$propietario) { - $data = [ - 'rut' => $rut, - 'dv' => $dv, - 'nombres' => trim(post('nombres')), - 'apellido_paterno' => post('paterno'), - 'apellido_materno' => post('materno'), - 'sexo' => post('sexo'), - 'estado_civil' => post('estado_civil'), - 'profesion' => post('profesion'), - 'direccion' => $direccion->id, - 'telefono' => post('codigo_telefono') . post('telefono'), - 'email' => post('email') . '@' . post('email_domain'), - 'representante' => 0, - 'otro' => 0 - ]; - $propietario = model(Propietario::class)->create($data); - $propietario->save(); - } - - $unis = json_decode(post('unidades')); - $id_principal = array_shift($unis); - $unidad = model(Unidad::class)->findOne(post('unidad' . $id_principal)); - $u = model(U::class)->findOne($unidad->id); - if (!$u) { - $unidad->save(); - } - $data = [ - 'unidad_id' => $unidad->id - ]; - $reserva = model(Reserva::class)->create($data); - $reserva->save(); - foreach ($unis as $id_unidad) { - $unidad = model(Unidad::class)->findOne(post('unidad' . $id_unidad)); - $data = [ - 'reserva_id' => $reserva->id, - 'unidad_id' => $unidad->id - ]; - $ur = model(UnidadReserva::class)->create($data); - $ur->save(); - } - - $data = [ - 'proyecto_id' => $proyecto->id, - 'agente_id' => $agente->id, - 'propietario_rut' => $propietario->rut, - 'reserva_id' => $reserva->id, - 'fecha' => $f->format('Y-m-d'), - 'valor' => correctNumber(post('valor')), - 'pie' => correctNumber(post('pie')), - 'credito' => correctNumber(post('credito')), - 'estado' => 1 - ]; - $cierre = model(Cierre::class)->create($data); - $cierre->save(); - header('Location: ' . url('', ['p' => 'cierres', 'a' => 'list'])); - } - public static function list() - { - $proyectos = Cierre::proyectos(); - - return view('ventas.cierres.list', compact('proyectos')); - } - public static function show() - { - $id = get('cierre'); - $cierre = model(Cierre::class)->findOne($id); - - return view('ventas.cierres.show', compact('cierre')); - } - public static function guardar() - { - $proyecto = \model(Proyecto::class)->findOne(post('proyecto')); - $fecha = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $unidad = \model(Unidad::class)->findOne(post('departamento')); - $relacionado = (post('relacionado') === true) ? true : false; - $subrelacionado = (post('subrelacionado') === true) ? true : false; - $precio = (float) post('precio') ?: 0; - $input = [ - 'proyecto' => $proyecto, - 'fecha' => $fecha, - 'departamento' => $unidad, - 'precio' => $precio, - 'relacionado' => $relacionado, - 'subrelacionado' => $subrelacionado, - 'unidades' => [], - 'pie' => (float) post('pie') - ]; - $ebs = 0; - if (post('unidades') != '') { - $unidades = json_decode(html_entity_decode(post('unidades')), true); - foreach ($unidades as $un) { - $u = \model(Unidad::class)->findOne($un); - $input['unidades'] []= $u; - if ($u->precio($fecha) !== false) { - $ebs += $u->precio($fecha)->valor; - } - } - } - $promo = 0; - if (post('promocion') != null) { - $promo = (float) post('promocion'); - $input['promocion'] = $promo; - } - $bono = 0; - if (post('bono') != null) { - $bono = (float) post('bono'); - $input['bono'] = $bono; - } - $operador = 0; - if (post('operador') != null) { - $operador = ($precio - $bono - $promo) * (float) post('operador') / 100; - $input['operador'] = $operador; - } - - $cierre = Cierre::find($proyecto, $unidad, $precio)->findOne(); - if ($cierre === false) { - $cierre = model(Cierre::class)->create(); - $cierre->guardar((object) $input); - } - $output = ['status' => 'ok', 'cierre' => $cierre->asArray()]; - return json_encode($output); - } - public static function aprobar() - { - $fecha = Carbon::today(config('app.timezone')); - $cierre = model(Cierre::class)->findOne(post('cierre')); - if ($cierre->estado()->tipo()->descripcion == "revisado" or $cierre->estado()->tipo()->descripcion == "rechazado") { - $cierre->aprobar($fecha); - return json_encode(['estado' => 'aprobado']); - } - return json_encode(['estado' => 'no vigente']); - } - public static function rechazar() - { - $fecha = Carbon::today(config('app.timezone')); - $cierre = model(Cierre::class)->findOne(post('cierre')); - if ($cierre->estado()->tipo()->vigente == 1) { - $cierre->rechazar($fecha); - return json_encode(['estado' => 'rechazado']); - } - return json_encode(['estado' => 'no vigente']); - } - public static function abandonar() - { - $id = get('cierre'); - $cierre = model(Cierre::class)->findOne($id); - $tipo = model(TipoEstadoCierre::class)->where('descripcion', 'abandonado')->findOne(); - $today = Carbon::today(config('app.timezone')); - $data = [ - 'cierre' => $cierre->id, - 'tipo' => $tipo->id, - 'fecha' => $today->format('Y-m-d') - ]; - $estado = model(EstadoCierre::class)->create($data); - $estado->save(); - header('Location: ' . url('', ['p' => 'cierres', 'a' => 'list'])); - } - public static function promesar() - { - $id = get('cierre'); - $cierre = model(Cierre::class)->findOne($id); - $tipo = model(TipoEstadoCierre::class)->where('descripcion', 'promesado')->findOne(); - $today = Carbon::today(config('app.timezone')); - $data = [ - 'cierre' => $cierre->id, - 'tipo' => $tipo->id, - 'fecha' => $today->format('Y-m-d') - ]; - $estado = model(EstadoCierre::class)->create($data); - $estado->save(); - header('Location: ' . url('', ['p' => 'cierres', 'a' => 'show', 'cierre' => $cierre->id])); - } - public static function borrador() - { - $id = get('cierre'); - $cierre = model(Cierre::class)->findOne($id); - - $borrador = new Borrador($cierre); - d($borrador->show()); - $borrador->create(); - } - public static function evalue() - { - $proyectos = \model(Proyecto::class)->orderByAsc('descripcion')->findMany(); - return view('ventas.cierres.evaluar', ['proyectos' => $proyectos, 'locations' => config('locations')]); - } - public static function evaluar() - { - $proyecto = \model(Proyecto::class)->findOne(post('proyecto')); - $fecha = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $unidad = \model(Unidad::class)->findOne(post('departamento')); - $relacionado = (post('relacionado') === 'true') ? true : false; - $subrelacionado = (post('subrelacionado') === 'true') ? true : false; - $precio = (float) post('precio') ?: 0; - $neto = $precio; - $ebs = 0; - if (post('unidades') != '') { - $unidades = json_decode(html_entity_decode(post('unidades')), true); - foreach ($unidades as $un) { - $u = \model(Unidad::class)->findOne($un); - if ($u->precio($fecha) !== false) { - $ebs += $u->precio($fecha)->valor; - } - } - } - $promocion = 0; - if (post('promocion') != null) { - $promocion = (float) post('promocion'); - } - $bono = 0; - if (post('bono') != null) { - $bono = (float) post('bono'); - } - $operador = 0; - if (post('operador') != null) { - $operador = ($precio - $bono - $promocion) * (float) post('operador') / 100; - } - $rel = 0; - if ($relacionado) { - $rel = ($unidad->precio($fecha)->valor) * 6 / 100; - } - if ($subrelacionado) { - $rel = ($unidad->precio($fecha)->valor) * 3 / 100; - } - $neto = $precio - $bono - $promocion - $operador - $ebs; - - $output = [ - 'unidad' => [ - 'tipo' => [ - 'nombre' => $unidad->tipologia()->nombre, - 'tipologia' => $unidad->tipologia()->tipologia()->descripcion - ], - 'superficie' => format('m2', $unidad->m2()) . ' m²' - ], - 'oferta' => [ - 'bruto' => format('ufs', $precio, null, true), - 'neto' => format('ufs', $neto, null, true), - 'uf_m2' => format('ufs', $neto / $unidad->m2('vendible'), null, true) . '/m²', - 'fecha' => format('shortDate', $unidad->precio($fecha)->inicio()->fecha()) - ], - 'lista' => [ - 'precio' => format('ufs', $unidad->precio($fecha)->valor, null, true), - 'uf_m2' => format('ufs', $unidad->precio($fecha)->valor / $unidad->m2('vendible'), null, true) . '/m²' - ], - 'precios' => [ - 'bruto' => format('ufs', $precio, null, true), - 'neto' => format('ufs', $neto, null, true), - 'departamento' => format('ufs', $unidad->precio($fecha)->valor, null, true), - 'relacionado' => format('ufs', $unidad->precio($fecha)->valor - $rel, null, true), - 'fecha' => format('shortDate', $unidad->precio($fecha)->inicio()->fecha()) - ], - 'uf_m2' => [ - 'neto' => format('ufs', $neto / $unidad->m2('vendible'), null, true) . '/m²', - 'departamento' => format('ufs', $unidad->precio($fecha)->valor / $unidad->m2('vendible'), null, true) . '/m²', - 'relacionado' => format('ufs', ($unidad->precio($fecha)->valor - $rel) / $unidad->m2('vendible'), null, true) . '/²' - ], - 'evaluacion' => Cierre::evaluar($neto, $unidad, $fecha, $rel), - 'estado' => ['id' => 0, 'descripcion' => 'no existe'] - ]; - if ($rel > 0) { - $output ['relacionado'] = [ - 'precio' => format('ufs', $unidad->precio($fecha)->valor - $rel, null, true), - 'uf_m2' => format('ufs', ($unidad->precio($fecha)->valor - $rel) / $unidad->m2('vendible'), null, true) . '/²' - ]; - } - $estado = Cierre::find($proyecto, $unidad, $precio)->findOne(); - if ($estado) { - $output['estado'] = [ - 'id' => $estado->estado()->tipo()->id, - 'cierre' => $estado->id, - 'descripcion' => $estado->estado()->tipo()->descripcion, - 'fecha' => format('shortDate', $estado->estado()->fecha) - ]; - } - - return json_encode($output); - } - public static function edit() - { - $cierre = model(Cierre::class)->findOne(get('cierre')); - $proyectos = model(Proyecto::class)->findMany(); - $regiones = model(Region::class)->findMany(); - $valores = model(TipoValorCierre::class)->findMany(); - return view('ventas.cierres.edit', compact('cierre', 'proyectos', 'regiones', 'valores')); - } - public static function do_edit() - { - $cierre = model(Cierre::class)->findOne(get('cierre')); - - $data = [ - 'calle' => post('calle'), - 'numero' => post('numero'), - 'extra' => post('extra'), - 'comuna' => post('comuna') - ]; - $direccion = (new Factory(Direccion::class))->where($data)->find(); - if (!$direccion) { - $direccion = model(Direccion::class)->create($data); - $direccion->save(); - } - if (post('rut') != '') { - $data = [ - 'rut' => explode('-', str_replace('.', '', post('rut')))[0], - ]; - $propietario = (new Factory(Propietario::class))->where($data)->find(); - if (!$propietario) { - $data = array_merge($data, [ - 'nombres' => post('nombres'), - 'apellido_paterno' => post('paterno'), - 'apellido_materno' => post('materno'), - 'dv' => (post('rut')) ? explode('-', str_replace('.', '', post('rut')))[1] : '', - 'sexo' => post('sexo'), - 'estado_civil' => post('estado_civil'), - 'profesion' => post('profesion'), - 'telefono' => post('codigo_telefono') . post('telefono'), - 'email' => post('email') . '@' . post('email_domain'), - 'direccion' => $direccion->id - ]); - $propietario = model(Propietario::class)->create($data); - $propietario->save(); - } - } - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $data = [ - 'proyecto' => post('proyecto'), - 'precio' => post('precio'), - 'fecha' => $f->format('Y-m-d'), - 'relacionado' => (post('relacionado')) ? 1 : 0, - 'propietario' => (isset($propietario) and $propietario) ? $propietario->rut : 0 - ]; - foreach ($data as $field => $value) { - if ($value != $cierre->$field) { - $cierre->$field = $value; - } - } - $cierre->save(); - - $valores = model(TipoValorCierre::class)->findMany(); - foreach ($valores as $valor) { - if (post($valor->descripcion) == '') { - continue; - } - if ($cierre->valor($valor->descripcion)) { - if ($cierre->valor($valor->descripcion)->valor != post($valor->descripcion)) { - $v = $cierre->valor($valor->descripcion); - $v->valor = post($valor->descripcion); - $v->save(); - } - continue; - } - $data = [ - 'tipo' => $valor->descripcion, - 'valor' => post($valor->descripcion) - ]; - $cierre->addValor($data); - } - header('Location: ' . nUrl('cierres', 'show', ['cierre' => $cierre->id])); - } -} -?> diff --git a/app_old/app/Controller/Comentarios.php b/app_old/app/Controller/Comentarios.php deleted file mode 100644 index 494fcc6..0000000 --- a/app_old/app/Controller/Comentarios.php +++ /dev/null @@ -1,39 +0,0 @@ -findOne(get('venta')); - echo view('ventas.comentarios.add', compact('venta')); - } - public static function agregar() - { - $venta = \Model::factory(\Incoviba\old\Venta\Venta::class)->findOne(get('venta')); - if ($venta === false) { - throw new Exception('Venta no existe.'); - } - $data = [ - 'venta' => $venta->id, - 'fecha' => \Carbon\Carbon::now(config('app.timezone'))->format('Y-m-d H:i:s'), - 'texto' => post('comentario') - ]; - $comentario = \Model::factory(\Incoviba\old\Venta\Comentario::class)->create($data); - $comentario->save(); - header('Location: ' . nUrl('ventas', 'show', ['venta' => $venta->id])); - } - public static function delete() - { - $comentario = \Model::factory(\Incoviba\old\Venta\Comentario::class)->findOne(get('comentario')); - $venta = $comentario->venta(); - $comentario->estado = 0; - $comentario->save(); - header('Location: ' . nUrl('ventas', 'show', ['venta' => $venta->id])); - } -} -?> diff --git a/app_old/app/Controller/Contabilidad.php b/app_old/app/Controller/Contabilidad.php deleted file mode 100644 index 4b19a77..0000000 --- a/app_old/app/Controller/Contabilidad.php +++ /dev/null @@ -1,100 +0,0 @@ -orderByAsc('descripcion')->findMany(); - foreach ($proyectos as &$proyecto) { - $arr = $proyecto->asArray(); - $arr['direccion'] = $proyecto->direccion()->asArray(); - $arr['direccion']['comuna'] = $proyecto->direccion()->comuna()->asArray(); - $arr['inmobiliaria'] = $proyecto->inmobiliaria()->asArray(); - $proyecto = $arr; - } - return json_encode(compact('proyectos')); - } - public static function get_fechas() { - $id_proyecto = get('proyecto'); - $proyecto = model(Proyecto::class)->findOne($id_proyecto); - $cuotas = []; - foreach ($proyecto->ventas() as $venta) { - $cs = $venta->pie()->cuotas(); - $cuotas = array_merge($cs, array_filter($cs, function($item) { - $tipo = $item->pago()->estado()->tipo(); - return ($tipo == 'depositado' or $tipo == 'abonado'); - })); - } - $fechas = array_map(function($item) { - return [ - 'timestamp' => $item->pago()->estado()->fecha()->timestamp, - 'short' => $item->pago()->estado()->fecha()->format('Y-m-d'), - 'long' => $item->pago()->estado()->fecha()->format('d / m / Y') - ]; - }, $cuotas); - usort($fechas, function($a, $b) { - return $b['timestamp'] - $a['timestamp']; - }); - return json_encode(compact('fechas')); - } - public static function get_pagos_fechas() { - $id_proyecto = get('proyecto'); - $fecha = Carbon::parse(get('fecha')); - $proyecto = model(Proyecto::class)->findOne($id_proyecto); - $pagos = []; - foreach ($proyecto->ventas() as $venta) { - foreach ($venta->pie()->cuotas() as $cuota) { - if ($cuota->pago()->estado()->fecha() == $fecha) { - $pagos []= [ - 'Departamento' => $venta->propiedad()->unidad()->descripcion, - 'Valor' => [ - 'UF' => $cuota->pago()->valor('ufs'), - 'Pesos' => $cuota->pago()->valor() - ], - 'Numero' => $cuota->numero(), - 'Total' => $venta->pie()->cuotas - ]; - break; - } - } - } - return json_encode(compact('pagos')); - } - public static function pagos_fecha() { - $fecha = Carbon::now(); - return view('contabilidad.pagos', compact('fecha')); - } - public static function show_pagos() { - $id_proyecto = get('proyecto'); - $fecha = Carbon::parse(get('fecha')); - $proyecto = model(Proyecto::class)->findOne($id_proyecto); - $pagos = []; - foreach ($proyecto->ventas() as $venta) { - foreach ($venta->pie()->cuotas() as $cuota) { - if ($cuota->pago()->estado()->fecha() == $fecha) { - $pagos []= (object) [ - 'Departamento' => $venta->propiedad()->unidad()->descripcion, - 'Valor' => (object) [ - 'UF' => $cuota->pago()->valor('ufs'), - 'Pesos' => $cuota->pago()->valor() - ], - 'Numero' => $cuota->numero(), - 'Total' => $venta->pie()->cuotas - ]; - break; - } - } - } - return view('contabilidad.pago', compact('proyecto', 'fecha', 'pagos')); - } -} diff --git a/app_old/app/Controller/Creditos.php b/app_old/app/Controller/Creditos.php deleted file mode 100644 index 60a72da..0000000 --- a/app_old/app/Controller/Creditos.php +++ /dev/null @@ -1,207 +0,0 @@ -findOne($id); - return view('ventas.creditos.add', compact('venta')); - } - public static function agregado() - { - $id = get('venta'); - if ($id == null) { - header('Location: .'); - } - $venta = \Model::factory(Venta::class)->findOne($id); - - $banco = \Model::factory(Banco::class)->where('nombre', post('banco'))->findOne(); - $f = Carbon::createFromDate(post('y'), post('m'), post('d'), config('app.timezone')); - $uf = uf($f); - - $pago = \Model::factory(Pago::class)->create(); - $pago->banco = $banco->id; - $pago->fecha = $f->format('Y-m-d'); - $pago->uf = $uf->uf->value; - $pago->valor = post('valor') * $pago->uf; - $pago->tipo = 2; - - $credito = \Model::factory(Credito::class)->create(); - $credito->banco = $pago->banco; - $credito->valor = $pago->valor; - $credito->fecha = $pago->fecha; - $credito->uf = $pago->uf; - - $pago->new(); - - $credito->pago = $pago->id; - $credito->save(); - - $venta->credito = $credito->id; - $venta->save(); - header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); - } - public static function pagar() - { - $id = get('venta'); - $venta = \Model::factory(Venta::class)->findOne($id); - return view('ventas.creditos.pagar', compact('venta')); - } - public static function pagando() - { - $id = get('venta'); - $venta = \Model::factory(Venta::class)->findOne($id); - $valor = str_replace(',', '.', str_replace('.', '', post('valor'))); - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - - $pago = $venta->credito()->pago(); - if ($pago->valor != $valor) { - $pago->valor = $valor; - } - - $estado = \Model::factory(EstadoPago::class)->create(); - $estado->pago = $pago->id; - $estado->fecha = $f->format('Y-m-d'); - $estado->estado = 1; - $estado->save(); - - if ($pago->is_dirty('valor')) { - $pago->save(); - } - header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); - } - public static function abonar() - { - $id = get('venta'); - $venta = \Model::factory(Venta::class)->findOne($id); - return view('ventas.creditos.abonar', compact('venta')); - } - public static function abonando() - { - $id = get('venta'); - $venta = \Model::factory(Venta::class)->findOne($id); - $valor = str_replace(',', '.', str_replace('.', '', post('valor'))); - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - - $pago = $venta->credito()->pago(); - if ($pago->valor != $valor) { - $pago->valor = $valor; - } - - $estado = \Model::factory(EstadoPago::class)->create(); - $estado->pago = $pago->id; - $estado->fecha = $f->format('Y-m-d'); - $estado->estado = 2; - - $estado->save(); - - if ($pago->is_dirty('valor')) { - $pago->save(); - } - header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); - } - public static function show() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - - return view('ventas.creditos.show', compact('venta')); - } - public static function edit() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - - return view('ventas.creditos.edit', compact('venta')); - } - public static function editado() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - - $pago = $venta->credito()->pago(); - - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $uf = uf($f); - $banco = model(Banco::class)->where('nombre', post('banco'))->findOne(); - $valor = correctNumber(post('valor')) * $uf->uf->value; - - $fields = ['valor', 'uf', 'fecha', 'banco']; - $data = ['valor' => $valor, 'uf' => $uf->uf->value, 'fecha' => $f->format('Y-m-d'), 'banco' => $banco->id]; - - $change = false; - foreach ($fields as $field) { - if ($pago->$field != $data[$field]) { - $change = true; - $pago->$field = $data[$field]; - if ($field == 'fecha') { - $eps = $pago->estados(); - foreach ($eps as $ep) { - if ($ep->estado == 0) { - $ep->fecha = $data[$field]; - $ep->save(); - break; - } - } - } - } - } - - if ($change) { - $pago->save(); - } - header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); - } - public static function remove() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - - $pago = $venta->credito()->pago(); - $f = Carbon::today(config('app.timezone')); - - $data = [ - 'pago' => $pago->id, - 'estado' => -3, - 'fecha' => $f->format('Y-m-d') - ]; - $estado = model(EstadoPago::class)->create($data); - $estado->save(); - $venta->credito = 0; - $venta->save(); - header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); - } - public static function pendientes() - { - $creditos = model(Credito::class) - ->select('credito.*') - ->join('venta', ['venta.credito', '=', 'credito.id']) - ->join('pago', ['pago.id', '=', 'credito.pago']) - ->rawJoin('JOIN (SELECT ep.* FROM (SELECT pago, MAX(id) AS id FROM estado_pago GROUP BY pago) e0 JOIN estado_pago ep ON ep.id = e0.id)', ['estado_pago.pago', '=', 'pago.id'], 'estado_pago') - ->whereLt('estado_pago.estado', 2) - ->where('venta.estado', 1) - ->orderByAsc('estado_pago.fecha') - ->findMany(); - return view('ventas.creditos.pendientes', compact('creditos')); - } -} -?> diff --git a/app_old/app/Controller/Cuotas.php b/app_old/app/Controller/Cuotas.php deleted file mode 100644 index 4d457ba..0000000 --- a/app_old/app/Controller/Cuotas.php +++ /dev/null @@ -1,230 +0,0 @@ -findOne($id); - - return view('ventas.pies.cuotas.show', compact('cuota')); - } - public static function edit() - { - $id = get('cuota'); - $cuota = \Model::factory(Cuota::class)->findOne($id); - return view('ventas.pies.cuotas.edit', compact('cuota')); - } - public static function editar() - { - $id = get('cuota'); - $cuota = \Model::factory(Cuota::class)->findOne($id); - - $cuota->numero = post('numero'); - $cuota->{'valor_$'} = post('valor'); - $banco = \Model::factory(\Incoviba\old\Common\Banco::class)->where('nombre', post('banco'))->findOne(); - if ($banco) { - $cuota->banco = $banco->id; - } else { - $cuota->banco = 0; - } - $f = \Carbon\Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $cuota->fecha = $f->format('Y-m-d'); - $pago = $cuota->pago(); - $pago->valor = post('valor'); - $pago->banco = $banco->id; - $pago->identificador = post('identificador'); - $pago->fecha = $f->format('Y-m-d'); - $uf = uf($f); - if ($uf->total > 0) { - $pago->uf = $uf->uf->value; - } else { - $pago->uf = 0; - } - - $pago->save(); - $cuota->save(); - header('Location: ' . url('', ['p' => 'pies', 'a' => 'resumen', 'pie' => $cuota->pie()->id])); - } - public static function edited() - { - $id = get('cuota'); - $cuota = \Model::factory(Cuota::class)->findOne($id); - $pago = $cuota->pago(); - foreach ($_POST as $key => $value) { - $pago->$key = $value; - } - $pago->save(); - } - public static function pendientes() - { - $f = \Carbon\Carbon::today(config('app.timezone')); - $cuotas = \Model::factory(Cuota::class) - ->select('cuota.*') - ->join('pago', ['pago.id', '=', 'cuota.pago']) - ->join('venta', ['venta.pie', '=', 'cuota.pie']) - ->raw_join('JOIN (SELECT e1.* FROM (SELECT pago, MAX(id) AS id FROM estado_pago GROUP BY pago) e0 JOIN estado_pago e1 ON e1.id = e0.id)', ['ep.pago', '=', 'pago.id'], 'ep') - ->where('ep.estado', 0) - ->where('venta.estado', 1) - ->whereLte('pago.fecha', $f->format('Y-m-d')) - ->order_by_asc('pago.fecha') - ->findMany(); - $sum = 0; - if (count($cuotas) > 0) { - $sum = array_reduce($cuotas, function($carry, $item) { - $carry += $item->pago()->valor; - return $carry; - }); - } - setlocale(LC_TIME, 'es'); - return view('ventas.pies.cuotas.pendientes', compact('cuotas', 'sum')); - } - public static function depositar() - { - $id = post('cuota'); - $cuota = \Model::factory(Cuota::class)->findOne($id); - if ($cuota->pago()->estado()->estado == 1) { - return 'ok'; - } - $estado = \Model::factory(EstadoPago::class)->create(); - $estado->pago = $cuota->pago()->id; - $estado->estado = 1; - $f = Carbon::parse(post('fecha'), config('app.timezone')); - $estado->fecha = $f->format('Y-m-d'); - $estado->save(); - return 'ok'; - } - public static function remove() - { - $id = get('cuota'); - $cuota = \Model::factory(Cuota::class)->findOne($id); - - $estado = \Model::factory(EstadoPago::class)->create(); - $estado->pago = $cuota->pago()->id; - $estado->estado = -3; - $f = Carbon::today(config('app.timezone')); - $estado->fecha = $f->format('Y-m-d'); - $estado->save(); - header('Location: ' . url('', ['p' => 'pies', 'a' => 'resumen', 'pie' => $cuota->pie()->id])); - } - public static function para_abonar() - { - $cuotas = \Model::factory(Cuota::class) - ->select('cuota.*') - ->join('pago', ['pago.id', '=', 'cuota.pago']) - ->join('venta', ['venta.pie', '=', 'cuota.pie']) - ->raw_join('JOIN (SELECT e1.* FROM (SELECT pago, MAX(id) AS id FROM estado_pago GROUP BY pago) e0 JOIN estado_pago e1 ON e1.id = e0.id)', ['ep.pago', '=', 'pago.id'], 'ep') - ->where('ep.estado', 1) - ->where('venta.estado', 1) - ->order_by_asc('ep.fecha') - ->findMany(); - $ini = get('start'); - if ($ini == null) { - $ini = 0; - } - $n = get('step'); - if ($n == 0) { - $n = 30; - } - $total = count($cuotas); - $cuotas = array_slice($cuotas, $ini, $n); - $pages = ceil($total / $n); - $current = ($ini + $n) / $n; - return view('ventas.pies.cuotas.abonar', compact('cuotas', 'total', 'pages', 'current')); - } - public static function abonar() - { - $id = post('cuota'); - $cuota = \Model::factory(Cuota::class)->findOne($id); - if ($cuota->pago()->estado()->estado == 2) { - return 'ok'; - } - $estado = \Model::factory(EstadoPago::class)->create(); - $estado->pago = $cuota->pago()->id; - $estado->estado = 2; - $f = Carbon::parse(post('fecha'), config('app.timezone')); - $estado->fecha = $f->format('Y-m-d'); - $estado->save(); - return 'ok'; - } - public static function rebotar() - { - $id = post('cuota'); - $cuota = \Model::factory(Cuota::class)->findOne($id); - if ($cuota->pago()->estado()->estado == -1) { - return 'ok'; - } - $estado = \Model::factory(EstadoPago::class)->create(); - $estado->pago = $cuota->pago()->id; - $estado->estado = -1; - $f = Carbon::parse(post('fecha'), config('app.timezone')); - $estado->fecha = $f->format('Y-m-d'); - $estado->save(); - return 'ok'; - } - public static function add() - { - $id = get('pie'); - $pie = \Model::factory(Pie::class)->findOne($id); - return view('ventas.pies.cuotas.add', compact('pie')); - } - public static function agregar() - { - $id = get('pie'); - $pie = \Model::factory(Pie::class)->findOne($id); - - $cant = $pie->cuotas - count($pie->cuotas()); - for ($i = 0; $i < $cant; $i ++) { - if (trim(post('valor' . $i)) == '') { - continue; - } - $banco = \Model::factory(Banco::class)->where('nombre', post('banco' . $i))->findOne(); - $f = Carbon::createFromDate(post('year' . $i), post('month' . $i), post('day' . $i), config('app.timezone')); - $uf = uf($f); - $valor = correctNumber(post('valor' . $i)); - - $pago = \Model::factory(Pago::class)->create(); - $pago->banco = $banco->id; - $pago->fecha = $f->format('Y-m-d'); - if ($uf and $uf->total > 0) { - $pago->uf = $uf->uf->value; - } else { - $pago->uf = 0; - } - $pago->tipo = 1; - $pago->valor = $valor; - $pago->identificador = post('identificador' . $i); - - $cuota = \Model::factory(Cuota::class)->create(); - $cuota->pie = $pie->id; - $cuota->fecha = $pago->fecha; - $cuota->{'valor_$'} = $pago->valor; - $cuota->estado = 0; - $cuota->banco = $pago->banco; - $cuota->uf = $pago->uf; - $cuota->numero = post('numero' . $i); - - $pago->new(); - - $cuota->pago = $pago->id; - $cuota->save(); - header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $pie->venta()->id])); - } - } -} -?> diff --git a/app_old/app/Controller/Devoluciones.php b/app_old/app/Controller/Devoluciones.php deleted file mode 100644 index 8d9c41c..0000000 --- a/app_old/app/Controller/Devoluciones.php +++ /dev/null @@ -1,19 +0,0 @@ -findOne($id); - - return view('print.devolucion', compact('venta')); - } -} -?> diff --git a/app_old/app/Controller/Escrituras.php b/app_old/app/Controller/Escrituras.php deleted file mode 100644 index f2cb056..0000000 --- a/app_old/app/Controller/Escrituras.php +++ /dev/null @@ -1,212 +0,0 @@ -findOne($id); - return view('ventas.escrituras.add', compact('venta')); - } - public static function agregar() - { - $id = get('venta'); - $venta = \Model::factory(Venta::class)->findOne($id); - - $f = Carbon::createFromDate(post('escritura_year'), post('escritura_month'), post('escritura_day'), config('app.timezone')); - $venta->escriturado = $f->format('Y-m-d'); - - if (post('valor_reajuste')) { - $reajuste = \Model::factory(Pago::class)->create(); - $reajuste->valor = correctNumber(post('valor_reajuste')); - $fp = Carbon::createFromDate(post('reajuste_year'), post('reajuste_month'), post('reajuste_day'), config('app.timezone')); - $reajuste->fecha = $fp->format('Y-m-d'); - $reajuste->uf = (float) uf($fp)->uf->value; - $reajuste->newPagado(); - - $pie = $venta->pie(); - $pie->reajuste = $reajuste->id; - $pie->save(); - } - if (post('escritura_valor') or post('escritura_valor_uf')) { - $pago = \Model::factory(Pago::class)->create(); - $fp = Carbon::createFromDate(post('pago_escritura_year'), post('pago_escritura_month'), post('pago_escritura_day'), config('app.timezone')); - $pago->fecha = $fp->format('Y-m-d'); - $pago->uf = (float) uf($fp)->uf->value; - if (post('escritura_valor')) { - $pago->valor = correctNumber(post('escritura_valor')); - $pago->newPagado(); - } else { - $pago->valor = correctNumber(post('escritura_valor_uf')) * $pago->uf; - $pago->new(); - } - - $escritura = \Model::factory(Escritura::class)->create(); - $escritura->pago = $pago->id; - $escritura->valor = $pago->valor('uf'); - $escritura->fecha = $pago->fecha; - $escritura->save(); - - $venta->escritura = $escritura->id; - } - if (post('subsidio_ahorrado') or post('subsidio_valor')) { - $total = post('subsidio_ahorrado') + post('subsidio_valor'); - $subsidio = \Model::factory(Subsidio::class)->create(); - $pago = \Model::factory(Pago::class)->create(); - $pago->fecha = $f->format('Y-m-d'); - $pago->uf = (float) uf($f)->uf->value; - $pago->valor = correctNumber(post('subsidio_ahorrado')) * $pago->uf; - $pago->new(); - $subsidio->pago = $pago->id; - $pago = \Model::factory(Pago::class)->create(); - $pago->fecha = $f->format('Y-m-d'); - $pago->uf = (float) uf($f)->uf->value; - $pago->valor = correctNumber(post('subsidio_valor')) * $pago->uf; - $pago->new(); - $subsidio->subsidio = $pago->id; - $subsidio->save(); - - $venta->subsidio = $subsidio->id; - } - if (post('credito_valor')) { - $pago = \Model::factory(Pago::class)->create(); - $pago->fecha = $f->format('Y-m-d'); - $pago->uf = (float) uf($f)->uf->value; - $valor = post('credito_valor'); - if (strpos($valor, ',') !== false) { - $valor = correctNumber($valor); - } - $pago->valor = $valor * $pago->uf; - $banco = \Model::factory(Banco::class)->where('nombre', post('credito_banco'))->findOne(); - $pago->banco = $banco->id; - $pago->new(); - - $credito = \Model::factory(Credito::class)->create(); - $credito->pago = $pago->id; - $credito->save(); - - $venta->credito = $credito->id; - } elseif (post('credito_banco')) { - $pago = $venta->credito()->pago(); - $banco = \Model::factory(Banco::class)->where('nombre', post('credito_banco'))->findOne(); - $pago->banco = $banco->id; - $pago->save(); - } - - $tipo = \Model::factory(TipoEstadoVenta::class)->where('descripcion', 'escriturando')->findOne(); - $data = [ - 'venta' => $venta->id, - 'estado' => $tipo->id, - 'fecha' => $venta->escriturado - ]; - $estado = \Model::factory(EstadoVenta::class)->create($data); - $estado->save(); - $venta->save(); - header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); - } - public static function edit() - { - $id = get('venta'); - $venta = \Model::factory(Venta::class)->findOne($id); - echo view('ventas.escrituras.edit', compact('venta')); - } - public static function editar() - { - $id = get('venta'); - $venta = \Model::factory(Venta::class)->findOne($id); - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $uf = uf($f); - - $valor = correctNumber(post('valor')); - if ($valor == '') { - $valor_uf = correctNumber(post('valor_uf')); - $valor = $valor_uf * $uf->uf->value; - } - $pago = $venta->escritura()->pago(); - if ($pago->valor != $valor) { - $pago->valor = $valor; - } - if ($pago->fecha != $f->format('Y-m-d')) { - $pago->fecha = $f->format('Y-m-d'); - $pago->uf = $uf->uf->value; - } - - $pago->save(); - header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); - } - public static function informe() - { - $id = get('venta'); - $venta = \Model::factory(Venta::class)->findOne($id); - return view('ventas.escrituras.informe', compact('venta')); - } - public static function pagar() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - - return view('ventas.escrituras.pagar', compact('venta')); - } - public static function pagado() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - - $data = [ - 'pago' => $venta->escritura()->pago()->id, - 'fecha' => $f->format('Y-m-d'), - 'estado' => 1 - ]; - $estado = model(EstadoPago::class)->create($data); - $estado->save(); - header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); - } - public static function abonar() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - - return view('ventas.escrituras.abonar', compact('venta')); - } - public static function abonado() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - - $data = [ - 'pago' => $venta->escritura()->pago()->id, - 'fecha' => $f->format('Y-m-d'), - 'estado' => 2 - ]; - $estado = model(EstadoPago::class)->create($data); - $estado->save(); - header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); - } -} -?> diff --git a/app_old/app/Controller/FormaPago.php b/app_old/app/Controller/FormaPago.php deleted file mode 100644 index 6ccc7b3..0000000 --- a/app_old/app/Controller/FormaPago.php +++ /dev/null @@ -1,98 +0,0 @@ -findOne($id); - - return view('ventas.forma_pago.edit', compact('venta')); - } - public static function editar() - { - d(post()); - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - - $valor = correctNumber(post('valor_pie')); - $cuotas = post('cuotas_pie'); - if ($venta->pie != 0) { - $pie = $venta->pie(); - $changed = false; - if ($pie->valor != $valor) { - $pie->valor = $valor; - $changed = true; - } - if ($pie->cuotas != $cuotas) { - $pie->cuotas = $cuotas; - $changed = true; - } - if ($changed) { - d($pie); - } - - $valor = correctNumber(post('valor_reajuste')); - $f = Carbon::createFromDate(post('year_reajuste'), post('month_reajuste'), post('day_reajuste'), config('app.timezone')); - $uf = uf($f); - $reajuste = $pie->reajuste(); - $changed = false; - if ($reajuste->valor != $valor) { - $reajuste->valor = $valor; - $changed = true; - } - if ($reajuste->fecha != $f->format('Y-m-d')) { - $reajuste->fecha = $f->format('Y-m-d'); - $reajuste->uf = $uf->uf->value; - $changed = true; - } - if ($changed) { - d($reajuste); - } - } elseif ($valor != '') { - $f = Carbon::parse($venta->fecha, config('app.timezone')); - $uf = uf($f); - $data = [ - 'valor' => $valor, - 'cuotas' => $cuotas, - 'uf' => $uf->uf->value, - 'fecha' => $f->format('Y-m-d') - ]; - $pie = model(Pie::class)->create($data); - d($pie); - } - - $valor = correctNumber(post('valor_escritura')); - $f = Carbon::createFromDate(post('year_escritura'), post('month_escritura'), post('day_escritura'), config('app.timezone')); - if ($venta->escritura != 0) { - $escritura = $venta->escritura(); - d($escritura); - } elseif ($valor != '') { - $data = [ - 'valor' => $valor, - 'fecha' => $f->format('Y-m-d'), - 'uf' => $uf->uf->value, - 'tipo' => 7 - ]; - $pago = model(Pago::class)->create($data); - $pago->newPagado(); - $data['pago'] = $pago->id; - unset($data['tipo']); - $escritura = model(Escritura::class)->create($data); - $escritura->save(); - $venta->escritura = $escritura->id; - $venta->save(); - } - } -} -?> diff --git a/app_old/app/Controller/Home.php b/app_old/app/Controller/Home.php deleted file mode 100644 index fa31ea6..0000000 --- a/app_old/app/Controller/Home.php +++ /dev/null @@ -1,85 +0,0 @@ -getCantidadCuotasDias(); - $cierres = $this->getCierres(); - $pendientes = $this->getCantidadCuotasPendientes(); - $hoy = $this->getCantidadCuotasHoy(); - return $view->render($response, 'home', compact('pendientes', 'hoy', 'dias', 'cierres')); - } - - protected array $proyectos; - protected function getProyectos(): array - { - if (!isset($this->proyectos)) { - $this->proyectos = model(Proyecto::class)->findMany(); - } - return $this->proyectos; - } - protected function getCantidadCuotasPendientes(): int - { - $pendientes = 0; - $proyectos = $this->getProyectos(); - foreach ($proyectos as $proyecto) { - $pendientes += $proyecto->cuotasPendientes(); - } - return $pendientes; - } - protected function getCantidadCuotasDias(): array - { - $dias = []; - $proyectos = $this->getProyectos(); - foreach ($proyectos as $proyecto) { - foreach ($proyecto->cuotasMes() as $cuota) { - $f = $cuota->pago()->fecha(); - if ($f->isoWeekday() == 6 or $f->isoWeekDay() == 7) { - $f = $f->copy()->addDays(2)->startOfWeek(); - } - $dia = $f->format('Y-m-d'); - if (!isset($dias[$dia])) { - $dias[$dia] = [$proyecto->descripcion => 0]; - } - if (!isset($dias[$dia][$proyecto->descripcion])) { - $dias[$dia][$proyecto->descripcion] = 0; - } - $dias[$dia][$proyecto->descripcion] ++; - } - } - uksort($dias, function($a, $b) { - return strcmp($a, $b); - }); - return $dias; - } - protected function getCantidadCuotasHoy(): int - { - $hoy = 0; - $proyectos = $this->getProyectos(); - foreach ($proyectos as $proyecto) { - $hoy += $proyecto->cuotasHoy(); - } - return $hoy; - } - protected function getCierres(): array - { - $cierres = []; - $proyectos = $this->getProyectos(); - foreach ($proyectos as $proyecto) { - if (count($proyecto->cierres()) > 0) { - $cierres[$proyecto->descripcion] = (object) ['total' => count($proyecto->cierres()),'vigentes' => $proyecto->cierres(3), 'rechazados' => $proyecto->cierres(-1), 'pendientes' => $proyecto->cierres(2)]; - } - } - uksort($cierres, function($a, $b) { - return strcmp($a, $b); - }); - return $cierres; - } -} diff --git a/app_old/app/Controller/Informes.php b/app_old/app/Controller/Informes.php deleted file mode 100644 index 4ab5631..0000000 --- a/app_old/app/Controller/Informes.php +++ /dev/null @@ -1,830 +0,0 @@ -find_one($id_proyecto); - $ini = \Carbon\Carbon::parse($proyecto->estado()->fecha, config('app.timezone')); - #$informe = new Informador('Carta Gantt Proyecto - ' . $proyecto->descripcion); - $name = 'Carta Gantt Proyecto - ' . $proyecto->descripcion; - $hoy = Carbon::now(config('app.timezone')); - $filename = str_replace('ñ', 'n', $name . ' - ' . $hoy->format('Y-m-d') . '.xls'); - $informe = new PHPExcel($name, $filename); - - $columnas = ['Departamento', 'Propietario', 'Entrega', 'Estado']; - $today = \Carbon\Carbon::today(config('app.timezone')); - $end = $today->copy()->addDays(30); - $dif = $end->diffInDays($ini); - for ($i = 0; $i <= $dif; $i ++) { - $f = $ini->copy()->addDays($i); - if ($f->isWeekend()) { - continue; - } - $columnas []= $f->format('Y-m-d'); - } - $informe->addColumns($columnas); - - $data = []; - foreach ($proyecto->entregas() as $venta) { - $info = []; - $info []= $venta->unidad()->descripcion; - $info []= $venta->propietario()->findOne()->nombreCompleto(); - $fe = Carbon::parse($venta->entrega()->find_one()->fecha, config('app.timezone')); - $info []= $fe->format('Y-m-d'); - $info []= ''; - - for ($i = 0; $i <= $dif; $i ++) { - $f = $ini->copy()->addDays($i); - if ($f->isWeekend()) { - continue; - } - if ($f >= $fe and $f <= $fe->copy()->addDays(14)) { - $info []= 'X'; - } else { - $info []= ''; - } - } - - $data []= $info; - } - $informe->addDatas($data); - - return $informe->informe(); - } else { - $proyectos = model(Proyecto::class)->order_by_asc('descripcion')->find_many(); - return view('informes.gantt_entregas', compact('proyectos')); - } - } - public static function escrituras() - { - if (get('proyecto')) { - set_time_limit(60); - $id_proyecto = get('proyecto'); - $proyecto = model(Proyecto::class)->find_one($id_proyecto); - - #$informe = new Informador('Escrituras - ' . $proyecto->descripcion); - $name = 'Escrituras'; - $hoy = Carbon::now(config('app.timezone')); - $filename = str_replace('ñ', 'n', $name . ' - ' . $proyecto->descripcion . ' - ' . $hoy->format('Y-m-d') . '.xls'); - $informe = new PHPExcel($name, $filename); - - $columnas = [ - 'Departamento', - 'Estacionamientos', - 'Bodegas', - 'Propietario', - (object) ['name' => 'Promesa', 'style' => 'number'], - ['name' => 'Bono Pie', 'style' => 'amount'], - ['name' => 'Pie Pagado', 'style' => 'amount'], - ['name' => 'Reajuste', 'style' => 'amount'], - ['name' => 'Abono Contado', 'style' => 'amount'], - ['name' => 'Subsidio', 'style' => 'amount'], - 'Estado Subsidio', - ['name' => 'Credito', 'style' => 'amount'], - 'Banco', - 'Estado Credito', - ['name' => 'Saldo', 'style' => 'amount'], - ['name' => 'Escritura', 'style' => 'amount'], - ['name' => 'Entrega', 'style' => 'date'] - ]; - $informe->addColumns($columnas); - - //$ventas = $proyecto->escrituras(); - $ventas = $proyecto->ventas(); - - $data = []; - foreach ($ventas as $venta) { - $info = []; - $info['Departamento'] = $venta->unidad()->descripcion; - $ests = []; - foreach ($venta->propiedad()->estacionamientos() as $e) { - $ests []= $e->descripcion; - } - $bods = []; - foreach ($venta->propiedad()->bodegas() as $b) { - $bods []= $b->descripcion; - } - $info['Estacionamientos'] = implode(' - ', $ests); - $info['Bodegas'] = implode(' - ', $bods); - $info['Propietario'] = $venta->propietario()->nombreCompleto(); - $info['Promesa'] = $venta->valor_uf; - $saldo = $venta->valor_uf; - $info['Bono Pie'] = ''; - if ($venta->bono_pie != 0) { - $info['Bono Pie'] = $venta->bonoPie()->pago()->valor('ufs'); - $saldo -= $venta->bonoPie()->pago()->valor('ufs'); - } - $info['Pie'] = ''; - $info['Reajuste'] = ''; - if ($venta->pie != 0) { - $info['Pie'] = $venta->pie()->valorPagado(); - $saldo -= $venta->pie()->valorPagado(); - if ($venta->pie()->reajuste != 0) { - $info['Reajuste'] = $venta->pie()->reajuste()->valor('ufs'); - $saldo -= $venta->pie()->reajuste()->valor('ufs'); - } - } - $info['Abono Contado'] = ''; - if ($venta->escritura != 0) { - $info['Abono Contado'] = $venta->escritura()->pago()->valor('ufs'); - $saldo -= $venta->escritura()->pago()->valor('ufs'); - } - $info['Subsidio'] = ''; - $info['Estado Subsidio'] = ''; - if ($venta->subsidio != 0) { - $info['Subsidio'] = $venta->subsidio()->total('ufs'); - $info['Estado Subsidio'] = implode(' - ', [ - $venta->subsidio()->subsidio()->estado()->tipo()->descripcion, - $venta->subsidio()->pago()->estado()->tipo()->descripcion - ]); - $saldo -= $venta->subsidio()->total('ufs'); - } - $info['Credito'] = ''; - $info['Banco'] = ''; - $info['Estado Credito'] = ''; - if ($venta->credito != 0) { - $info['Credito'] = $venta->credito()->pago()->valor('ufs'); - $saldo -= $venta->credito()->pago()->valor('ufs'); - if ($venta->credito()->pago()->banco != 0) { - $info['Banco'] = $venta->credito()->pago()->banco()->nombre; - } - $info['Estado Credito'] = $venta->credito()->pago()->estado()->tipo()->descripcion; - } - $info['Saldo'] = -$saldo; - $info['Escritura'] = ''; - if ($venta->escriturado != 0) { - $info['Escritura'] = $venta->escriturado; - } - $info['Entrega'] = ''; - if ($venta->entregado != 0) { - $info['Entrega'] = $venta->entregado; - } - - $data []= $info; - } - $informe->addData($data); - - return $informe->informe(); - } else { - $proyectos = model(Proyecto::class)->order_by_asc('descripcion')->find_many(); - return view('informes.escrituras', compact('proyectos')); - } - } - public static function consolidacion() - { - $id_proyecto = get('proyecto'); - $proyecto = model(Proyecto::class)->findOne($id_proyecto); - - $ventas = $proyecto->ventas(); - set_time_limit(count($ventas)); - - $f = Carbon::today(config('app.timezone')); - setlocale(LC_TIME, 'es'); - - $data = [ - [$proyecto->descripcion], - [strftime('%d de %B de %Y', $f->timestamp)], - [''], - [''] - ]; - $columns = [ - ['name' => 'Fecha', 'style' => 'date'], - 'Glosa', - ['name' => 'Debe', 'style' => 'number'], - ['name' => 'Haber', 'style' => 'number'], - ['name' => 'Saldo', 'style' => 'number'], - 'Comentario' - ]; - $bold_rows = []; - - foreach ($ventas as $venta) { - $data []= ['Departamento ' . $venta->unidad()->descripcion . ' (' . format('ufs', $venta->valor_uf) . ' UF)']; - $data []= $columns; - $bold_rows []= count($data) - 1; - $ufs = 0; - $debe = 0; - $haber = 0; - $sum = 0; - if ($venta->pie != 0) { - $cuotas = $venta->pie()->cuotas(); - foreach ($cuotas as $cuota) { - $sum += $cuota->pago()->valor(); - $ufs += $cuota->pago()->valor('ufs'); - $haber += $cuota->pago()->valor(); - $info = [ - $cuota->pago()->estado()->fecha, - 'Pie - Cuota ' . $cuota->numero() . ' - ' . $venta->pie()->cuotas . ' (' . format('ufs', $cuota->pago()->valor('ufs')) . ' UF)', - '', - $cuota->pago()->valor(), - $sum - ]; - if ($cuota->pago()->estado()->estado < 2) { - $info []= 'No ha sido abonada.'; - } - $data []= $info; - } - if ($venta->pie()->reajuste != 0) { - $sum += $venta->pie()->reajuste()->valor(); - $ufs += $venta->pie()->reajuste()->valor('ufs'); - $haber += $venta->pie()->reajuste()->valor(); - $info = [ - $venta->pie()->reajuste()->estado()->fecha, - 'Reajuste (' . format('ufs', $venta->pie()->reajuste()->valor('ufs')) . ' UF)', - '', - $venta->pie()->reajuste()->valor(), - $sum - ]; - if ($venta->pie()->reajuste()->estado()->estado < 2) { - $info []= 'No ha sido abonado.'; - } - $data []= $info; - } - } - if ($venta->escritura != 0) { - $sum += $venta->escritura()->pago()->valor(); - $ufs += $venta->escritura()->pago()->valor('ufs'); - $haber += $venta->escritura()->pago()->valor(); - $info = [ - $venta->escritura()->pago()->estado()->fecha, - 'Abono Escritura (' . format('ufs', $venta->escritura()->pago()->valor('ufs')) . ' UF)', - '', - $venta->escritura()->pago()->valor(), - $sum - ]; - if ($venta->escritura()->pago()->estado()->estado < 2) { - $info []= 'No ha sido abonado.'; - } - $data []= $info; - } - if ($venta->credito != 0) { - $sum += $venta->credito()->pago()->valor(); - $ufs += $venta->credito()->pago()->valor('ufs'); - $haber += $venta->credito()->pago()->valor(); - $info = [ - $venta->credito()->pago()->estado()->fecha, - 'Crédito (' . format('ufs', $venta->credito()->pago()->valor('ufs')) . ' UF)', - '', - $venta->credito()->pago()->valor(), - $sum - ]; - if ($venta->credito()->pago()->estado()->estado < 2) { - $info []= 'No ha sido pagado.'; - } - $data []= $info; - } - if ($venta->bono_pie != 0) { - try { - $sum -= $venta->bonoPie()->pago()->valor(); - $debe += $venta->bonoPie()->pago()->valor(); - $info = [ - $venta->bonoPie()->pago()->estado()->fecha, - 'Bono Pie (' . format('ufs', $venta->bonoPie()->pago()->valor('ufs')) . ' UF)'. - $venta->bonoPie()->pago()->valor(), - '', - $sum - ]; - $data []= $info; - $sum += $venta->bonoPie()->pago()->valor(); - $haber += $venta->bonoPie()->pago()->valor(); - $info = [ - $venta->bonoPie()->pago()->estado()->fecha, - 'Bono Pie (' . format('ufs', $venta->bonoPie()->pago()->valor('ufs')) . ' UF)'. - '', - $venta->bonoPie()->pago()->valor(), - $sum - ]; - $data []= $info; - } catch (\Exception $e) { - - } - } - $info = [ - '', - 'TOTAL (' . format('ufs', $ufs) . ' UF)', - $debe, - $haber, - $sum - ]; - $data []= $info; - $bold_rows []= count($data) - 1; - - $data []= ['']; - } - /** - * Departamento # - * Fecha |Glosa |Debe |Haber |Saldo - * |Pie - Cuota 1 - n (# UF) |- |$# | - * |Reajuste (# UF) |- |$# | - * |Abono Escritura (# UF) |- |$# | - * |Crédito (# UF) |- |$# | - * |Bono Pie (# UF) |$# |- | - * |Bono Pie (# UF) |- |$# | - * |Devolución (# UF) |$# |- | - * - |TOTAL (# UF) | | | - */ - - array_walk($data, function(&$e, $i) use ($columns) { - if (count($e) < count($columns)) { - $n = count($columns) - count($e); - for ($j = 0; $j < $n; $j ++) { - $e []= ''; - } - } - }); - - #$informe = new Informador('Consolidación - ' . $proyecto->descripcion); - $name = 'Consolidación'; - $hoy = Carbon::now(config('app.timezone')); - $filename = str_replace('ñ', 'n', $name . ' - ' . $proyecto->descripcion . ' - ' . $hoy->format('Y-m-d') . '.xls'); - $informe = new PHPExcel($name, $filename); - $informe->addColumns($columns); - $informe->addData($data); - - return $informe->informe(); - } - public static function creditos_pendientes() - { - function creditos() { - $creditos = model(Credito::class) - ->select('credito.*') - ->join('venta', ['venta.credito', '=', 'credito.id']) - ->join('pago', ['pago.id', '=', 'credito.pago']) - ->rawJoin('JOIN (SELECT ep.* FROM (SELECT pago, MAX(id) AS id FROM estado_pago GROUP BY pago) e0 JOIN estado_pago ep ON ep.id = e0.id)', ['estado_pago.pago', '=', 'pago.id'], 'estado_pago') - ->whereLt('estado_pago.estado', 2) - ->where('venta.estado', 1) - ->orderByAsc('estado_pago.fecha') - ->findMany(); - foreach ($creditos as $credito) { - yield $credito; - } - } - $informe = new Informador('Créditos Pendientes'); - - $columnas = ['Proyecto', 'Departamento', 'Valor', 'Fecha Escritura', 'Estado']; - $informe->addColumns($columnas); - - $row = 0; - foreach (creditos() as $credito) { - $informe->addData($row, $credito->venta()->proyecto()->descripcion, 'Proyecto'); - $informe->addData($row, $credito->venta()->unidad()->descripcion, 'Departamento'); - $informe->addData($row, $credito->pago()->valor('ufs'), 'Valor'); - $informe->addData($row, (($credito->venta()->escriturado) ? $credito->venta()->escriturado : $credito->pago()->estado()->fecha), 'Fecha Escritura'); - $informe->addData($row, ucwords($credito->pago()->estado()->tipo()->descripcion), 'Estado'); - - $row ++; - } - - $date = [ - 'numberFormat' => ['short-date'] - ]; - $ufs = [ - 'numberFormat' => ['thousands'] - ]; - $formats = ['Valor' => $ufs, 'Fecha Escritura' => $date]; - $informe->addFormats($formats); - - return $informe->informe(); - } - public static function ventas() - { - if (get('proyecto')) { - ini_set('memory_limit', "1G"); - ini_set('max_execution_time', '3600'); - $id = get('proyecto'); - $proyecto = model(Proyecto::class)->findOne($id); - $ventas = $proyecto->ventas(); - - /*usort($ventas, function($a, $b) { - return $a->fecha()->timestamp - $b->fecha()->timestamp; - });*/ - - $procasa = model(Agente::class)->findOne(1); - $pa = model(ProyectoAgente::class)->where('agente', $procasa->id)->where('proyecto', $proyecto->id)->findOne(); - if ($pa) { - $comision = $pa->comision / 100; - } else { - $comision = 0.03; - } - - #$informe = new Informador('Ventas - ' . $proyecto->descripcion); - $name = 'Informe de Ventas'; - $hoy = Carbon::now(config('app.timezone')); - $filename = str_replace('ñ', 'n', $name . ' - ' . $proyecto->descripcion . ' - ' . $hoy->format('Y-m-d') . '.xlsx'); - //$informe = new PHPExcel($name, $filename); - - $columnas = [ - 'Propietario', - 'Departamento', - ['name' => 'Estacionamientos', 'style' => 'number'], - ['name' => 'Bodegas', 'style' => 'number'], - 'Fecha Venta', - ['name' => 'Mes', 'style' => 'mes'], - 'Tipo', - ['name' => 'm² Ponderados', 'style' => 'amount'], - ['name' => 'Valor Promesa', 'style' => 'amount'], - ['name' => 'Pie', 'style' => 'amount'], - ['name' => 'Pie Pagado', 'style' => 'amount'], - ['name' => '% Pie Pagado', 'style' => 'percent'], - ['name' => 'Bono Pie', 'style' => 'amount'], - 'Operador', - ['name' => 'Valor Operador', 'style' => 'amount'], - ['name' => 'Premios', 'style' => 'amount'], - ['name' => 'Subsidio', 'style' => 'amount'], - ['name' => 'Ahorro', 'style' => 'amount'], - ['name' => 'Credito', 'style' => 'amount'], - 'Banco', - ['name' => 'Valor Ests & Bods', 'style' => 'amount'], - ['name' => 'Valor Neto', 'style' => 'amount'], - ['name' => 'UF/m²*', 'style' => 'amount'], - ['name' => 'Comision', 'style' => 'amount'], - ['name' => 'Venta s/Comision', 'style' => 'amount'], - ['name' => 'Precio', 'style' => 'Amount'] - ]; - //$informe->addColumns($columnas); - - $data = []; - foreach ($ventas as $venta) { - $info = []; - $info['Propietario'] = mb_strtoupper($venta->propietario()->nombreCompleto()); - $info['Departamento'] = implode(' - ', array_map(function($item) { - return $item->descripcion; - }, $venta->propiedad()->departamentos())); - $es = $venta->propiedad()->estacionamientos(); - $info['Estacionamientos'] = implode(', ', array_map(function($item) { - return $item->descripcion; - }, $es)); - $bs = $venta->propiedad()->bodegas(); - $info['Bodegas'] = implode(', ', array_map(function($item) { - return $item->descripcion; - }, $bs)); - $info['Fecha Venta'] = $venta->fecha()->format('Y-m-d'); - $info['Mes'] = $venta->fecha()->format('M-y'); - $info['Tipo'] = $venta->unidad()->abreviacion; - $info['m² Ponderados'] = $venta->unidad()->m2('vendible'); - $info['Valor Promesa'] = $venta->valor_uf; - $info['Pie'] = 0; - if ($venta->pie()) { - $info['Pie'] = $venta->pie()->valor; - } - $info['Pie Pagado'] = 0; - $info['% Pie Pagado'] = 0; - if ($venta->pie()) { - $info['Pie Pagado'] = $venta->pie()->valorPagado('uf'); - $info['% Pie Pagado'] = $venta->pie()->valorPagado('uf') / $venta->valor_uf; - } - - $info['Bono Pie'] = ($venta->bono_pie == 0 or $venta->bonoPie() === false) ? '' : $venta->bonoPie()->pago()->valor('ufs'); - $info['Operador'] = ($venta->agente and $venta->agente()->agente()->tipo == 19) ? $venta->agente()->agente()->descripcion : ''; - $info['Valor Operador'] = $venta->valorComision(); - //$promos = 0; - $ps = $venta->promociones(); - $info['Premios'] = array_reduce($ps, function($sum, $item) { - return $sum + $item->valor; - }); - $info['Subsidio'] = 0; - $info['Ahorro'] = 0; - if ($venta->subsidio != 0) { - $info['Subsidio'] = $venta->subsidio()->subsidio()->valor('ufs'); - $info['Ahorro'] = $venta->subsidio()->pago()->valor('ufs'); - } - $info['Credito'] = 0; - $info['Banco'] = ''; - if ($venta->credito != 0 and $venta->credito()->pago()) { - $info['Credito'] = $venta->credito()?->pago()->valor('ufs'); - if ($venta->credito()?->pago()->banco != 0) { - $info['Banco'] = $venta->credito()?->pago()->banco()->nombre; - } - } - $info['Valor Ests & Bods'] = $venta->valorEstacionamientosYBodegas(); - $info['Valor Neto'] = $venta->valorFinal(); - $info['UF/m²*'] = $venta->uf_m2(); - $info['Comision'] = $venta->valorFinal() * $comision; - $info['Venta s/Comision'] = $venta->valorFinal() - $info['Comision']; - $fecha = $venta->fecha(); - $info['Precio'] = 0; - try { - $info['Precio'] = array_reduce($venta->propiedad()->departamentos(), function($sum, $item) use ($fecha) { - if (!$item->precio($fecha)) { - return $sum; - } - return $sum + $item->precio($fecha)->valor; - }); - } catch (\Exception $e) { - } - - $data []= $info; - } - - $body = [ - "Proyecto" => $proyecto->descripcion, - "Compañía" => $proyecto->inmobiliaria()->abreviacion, - "data" => $data - ]; - $client = new Client(['base_uri' => "{$_ENV['PYTHON_HOST']}"]); - $response = $client->post('/ventas', ['json' => $body]); - - header("Content-Type: application/octet-stream; charset=utf-8"); - header('Content-Transfer-Encoding: binary'); - header('Content-Disposition: attachment; filename="' . $filename . '"'); - header('Cache-Control: max-age=0'); - return $response->getBody(); - //file_put_contents('php://output', $output); - - } else { - $proyectos = model(Proyecto::class)->order_by_asc('descripcion')->find_many(); - return view('informes.ventas', compact('proyectos')); - } - } - public static function resumen_contabilidad() - { - if (get('proyecto')) { - $id = get('proyecto'); - $fecha = get('fecha'); - - $service = new Resumen(); - $service->build($id, new \DateTimeImmutable($fecha)); - return ''; - } else { - $proyectos = model(Proyecto::class)->order_by_asc('descripcion')->find_many(); - return view('informes.resumen_contabilidad', compact('proyectos')); - } - } - public static function contabilidad() - { - if (get('proyecto')) { - $id = get('proyecto'); - $fecha = get('fecha'); - $mes = null; - if ($fecha != null) { - $mes = Carbon::parse($fecha); - } - $proyecto = model(Proyecto::class)->findOne($id); - $q = "SELECT pago.*, venta.id AS vid, venta.tipo AS ctipo, venta.pie AS pie - FROM ( - SELECT pago.id, banco.nombre AS banco, pago.fecha, pago.valor, pago.uf, ep.estado, ep.fecha AS efecha - FROM pago JOIN banco ON banco.id = pago.banco JOIN (( - SELECT pago, MAX(id) AS id FROM estado_pago GROUP BY pago) e0 JOIN estado_pago ep ON ep.id = e0.id) ON ep.pago = pago.id - WHERE ep.estado > 0 "; - if ($mes != null) { - $q .= "AND (pago.fecha BETWEEN '" . $mes->format('Y-m-01') . "' AND '" . $mes->format('Y-m-t') . "' - OR ep.fecha BETWEEN '" . $mes->format('Y-m-01') . "' AND '" . $mes->format('Y-m-t') . "')"; - } - $q .= ") pago JOIN (SELECT venta.* - FROM (( - SELECT venta.id, venta.pie, venta.propiedad, credito.pago, 'credito' AS tipo - FROM venta JOIN credito ON credito.id = venta.credito) - UNION ALL ( - SELECT venta.id, venta.pie, venta.propiedad, escritura.pago, 'escritura' AS tipo - FROM venta JOIN escritura ON escritura.id = venta.escritura) - UNION ALL ( - SELECT venta.id, venta.pie, venta.propiedad, cuota.pago, 'cuota' AS tipo - FROM venta JOIN cuota ON cuota.pie = venta.pie)) venta - JOIN propiedad ON propiedad.id = venta.propiedad - JOIN unidad ON unidad.id = propiedad.unidad_principal - WHERE unidad.proyecto = ?) venta - ON venta.pago = pago.id"; - $st = \ORM::getDB()->prepare($q); - $st->execute([$id]); - if ($st->rowCount() > 0) { - $R = $st->fetchAll(\PDO::FETCH_OBJ); - - //$informe = new Informador('Contabilidad - ' . (($mes != null) ? $mes->format('Y-m') . ' - ' : '') . $proyecto->descripcion); - $name = 'Contabilidad'; - $hoy = Carbon::now(config('app.timezone')); - $filename = str_replace('ñ', 'n', 'Contabilidad - ' . (($mes != null) ? $mes->format('Y-m') . ' - ' : '') . $proyecto->descripcion . ' - ' . $hoy->format('Y-m-d') . '.xls'); - - $informe = new PHPExcel($name, $filename); - - $columnas = ['Proyecto', 'Fecha', 'Banco', 'Departamento', 'RUT', 'Propietario', 'Glosa', 'Glosa2', (object) ['name' => 'Valor', 'style' => 'integer'], (object) ['name' => 'Valor UF', 'style' => 'currency']]; - $informe->addColumns($columnas); - $data = []; - foreach ($R as $r) { - $info = []; - $info['Proyecto'] = $proyecto->descripcion; - $f1 = \Carbon\Carbon::parse($r->fecha, config('app.timezone')); - $f2 = \Carbon\Carbon::parse($r->efecha, config('app.timezone')); - $info['Fecha'] = ($f1->max($f2))->format('Y-m-d'); - $info['Banco'] = $r->banco; - $venta = model(Venta::class)->findOne($r->vid); - $info['Departamento'] = $venta->unidad()->descripcion; - $info['RUT'] = $venta->propietario()->rut(); - $info['Propietario'] = $venta->propietario()->nombreCompleto(); - $info['Glosa'] = ucwords($r->ctipo); - $info['Glosa2'] = ''; - if ($r->ctipo == 'cuota') { - $cuota = model(Cuota::class)->where('pago', $r->id)->findOne(); - - $info['Glosa'] = 'Pie - ' . format('ufs', $cuota->pie()->valor('ufs'), null, true); - - $info['Glosa2'] = $cuota->numero() . ' - ' . $cuota->pie()->cuotas; - } - $info['Valor'] = $r->valor; - $info['Valor UF'] = '0'; - if ($r->uf > 0) { - $info['Valor UF'] = $r->valor / $r->uf; - } - $data []= $info; - } - - $informe->addData($data); - - return $informe->informe(); - } - } else { - setlocale(LC_TIME, 'es_ES'); - $proyectos = model(Proyecto::class)->order_by_asc('descripcion')->find_many(); - return view('informes.contabilidad', compact('proyectos')); - } - } - public static function para_comision() - { - $proyectos = model(Proyecto::class)->orderByAsc('descripcion')->findMany(); - return view('informes.para_comision', compact('proyectos')); - } - public static function comisiones() - { - $id = post('proyecto'); - $proyecto = model(Proyecto::class)->findOne($id); - $unidades = explode('-', str_replace([';', '.', ':', ' ', PHP_EOL, '|', '+', ','], '-', post('unidades'))); - $ventas = model(Venta::class) - ->select('venta.*') - ->join('propiedad', ['propiedad.id', '=', 'venta.propiedad']) - ->join('unidad', ['unidad.id', '=', 'propiedad.unidad_principal']) - ->where('unidad.proyecto', $proyecto->id) - ->where('venta.estado', 1) - ->whereIn('unidad.descripcion', $unidades) - ->orderByExpr('FIELD(unidad.descripcion, ' . implode(', ', $unidades) . ')') - ->findMany(); - $ids = []; - $totales = (object) ['precio' => 0, 'neto' => 0, 'comision' => 0]; - foreach ($ventas as $venta) { - $ids []= $venta->id; - $totales->precio += $venta->valor_uf; - $totales->neto += $venta->valorCorredora(); - $totales->comision += $venta->valorCorredora() * 1.5 / 100; - } - return view('informes.comisiones', compact('ventas', 'proyecto', 'totales', 'ids')); - } - public static function comisiones_xlsx() - { - $id_ventas = explode(',', get('ventas')); - $ventas = model(Venta::class) - ->whereIn('id', $id_ventas) - ->orderByExpr('FIELD(id, ' . implode(', ', $id_ventas) . ')') - ->findMany(); - - $informe = new Informador('Comisiones - ' . $ventas[0]->proyecto()->descripcion); - $columnas = ['Departamento', 'Estacionamientos', 'Bodegas', 'Propietario', 'Precio', '% Com', 'Com UF']; - $informe->addColumns($columnas); - $data = []; - foreach ($ventas as $venta) { - $info = []; - $info['Departamento'] = $venta->unidad()->descripcion; - $info['Estacionamientos'] = implode(' - ', $venta->propiedad()->estacionamientos('array')); - $info['Bodegas'] = implode(' - ', $venta->propiedad()->bodegas('array')); - $info['Propietario'] = $venta->propietario()->nombreCompleto(); - $info['Precio'] = "'" . format('ufs', $venta->valorCorredora()); - $info['% Com'] = '1,5 %'; - $info['Com UF'] = "'" . format('ufs', $venta->valorCorredora() * 1.5 / 100); - $data []= $info; - } - - $informe->addDatas($data); - - return $informe->informe(); - } - public static function cuotas() - { - $id_venta = get('venta'); - $venta = model(Venta::class)->findOne($id_venta); - - $name = 'Cuotas - ' . $venta->unidad()->descripcion; - $hoy = Carbon::now(config('app.timezone')); - $filename = str_replace('ñ', 'n', $name . ' - ' . $venta->proyecto()->descripcion . ' - ' . $hoy->format('Y-m-d') . '.xls'); - $informe = new PHPExcel($name, $filename); - $columnas = [ - ['name' => 'Cuota', 'style' => 'number'], - ['name' => 'Fecha Cuota', 'style' => 'date'], - 'Banco', - 'Identificador', - ['name' => 'Valor $', 'style' => 'number'], - ['name' => 'Valor UF', 'style' => 'currency'], - ['name' => 'Fecha Pago', 'style' => 'date'] - ]; - $informe->addColumns($columnas); - $data = []; - foreach ($venta->pie()->cuotas() as $cuota) { - $info = []; - $info['Cuota'] = $cuota->numero(); - $info['Fecha Cuota'] = $cuota->pago()->fecha()->format('Y-m-d'); - $info['Banco'] = $cuota->pago()->banco()->descripcion; - $info['Identificador'] = $cuota->pago()->identificador; - $info['Valor $'] = $cuota->pago()->valor(); - $info['Valor UF'] = $cuota->pago()->valor('ufs'); - $info['Fecha Pago'] = $cuota->pago()->estado()->fecha()->format('Y-m-d'); - $data []= $info; - } - $informe->addData($data); - - return $informe->informe(); - } - public static function resciliaciones() - { - if (get('proyecto')) { - $id = get('proyecto'); - $proyecto = model(Proyecto::class)->findOne($id); - $ventas = $proyecto->resciliaciones(); - - usort($ventas, function($a, $b) { - return $a->fecha()->timestamp - $b->fecha()->timestamp; - }); - - $name = 'Resciliaciones'; - $hoy = Carbon::now(config('app.timezone')); - $filename = str_replace('ñ', 'n', $name . ' - ' . $proyecto->descripcion . ' - ' . $hoy->format('Y-m-d') . '.xls'); - $informe = new PHPExcel($name, $filename); - - $columnas = [ - 'Propietario', - ['name' => 'Departamento', 'style' => 'number'], - ['name' => 'Estacionamientos', 'style' => 'number'], - ['name' => 'Bodegas', 'style' => 'number'], - 'Fecha Venta', - 'Fecha Resciliación', - ['name' => 'Mes', 'style' => 'mes'], - 'Tipo', - ['name' => 'm² Ponderados', 'style' => 'amount'], - ['name' => 'Valor Promesa', 'style' => 'amount'], - ]; - $informe->addColumns($columnas); - - $data = []; - foreach ($ventas as $venta) { - $info = []; - $info['Propietario'] = mb_strtoupper($venta->propietario()->nombreCompleto()); - $info['Departamento'] = $venta->unidad()->descripcion; - $ests = []; - if ($venta->propiedad()->estacionamientos != '') { - $es = $venta->propiedad()->estacionamientos(); - foreach ($es as $e) { - $ests []= $e->descripcion; - } - } - $info['Estacionamientos'] = implode(', ', $ests); - $bods = []; - if ($venta->propiedad()->bodegas != '') { - $bs = $venta->propiedad()->bodegas(); - foreach ($bs as $b) { - $bods []= $b->descripcion; - } - } - $info['Bodegas'] = implode(', ', $bods); - $info['Fecha Venta'] = $venta->fecha()->format('d.m.Y'); - $info['Fecha Resciliación'] = $venta->estado()->fecha()->format('d.m.Y'); - $info['Mes'] = $venta->estado()->fecha()->format('M-y'); - $info['Tipo'] = $venta->unidad()->abreviacion; - $info['m² Ponderados'] = $venta->unidad()->m2('vendible'); - $info['Valor Promesa'] = $venta->valor_uf; - - $data []= $info; - } - $informe->addData($data); - - $totals = [ - 'Departamento' => 'count', - 'Estacionamientos' => 'count', - 'Bodegas' => 'count', - 'm² Ponderados' => 'sum', - 'Valor Promesa' => 'sum' - ]; - $informe->addTotals($totals); - - return $informe->informe(); - } else { - $proyectos = model(Proyecto::class)->order_by_asc('descripcion')->find_many(); - return view('informes.resciliaciones', compact('proyectos')); - } - } -} diff --git a/app_old/app/Controller/Inmobiliarias.php b/app_old/app/Controller/Inmobiliarias.php deleted file mode 100644 index f0b8910..0000000 --- a/app_old/app/Controller/Inmobiliarias.php +++ /dev/null @@ -1,74 +0,0 @@ -orderByAsc('abreviacion')->findMany(); - return view('inmobiliarias.list', compact('inmobiliarias')); - } - public static function show() - { - $rut = get('rut'); - $inmobiliaria = model(Inmobiliaria::class)->findOne($rut); - return view('inmobiliarias.show', compact('inmobiliaria')); - } - public static function add() - { - $sociedades = model(TipoSociedad::class)->findMany(); - return view('inmobiliarias.add', compact('sociedades')); - } - public static function agregar() - { - list($rut, $dv) = explode('-', str_replace('.', '', post('rut'))); - - $inmobiliaria = model(Inmobiliaria::class)->findOne($rut); - if ($inmobiliaria) { - header('Location: ' . url('', ['p' => 'inmobiliarias', 'a' => 'show', 'rut' => $inmobiliaria->rut])); - die(); - } - - $inmobiliaria = model(Inmobiliaria::class)->create(); - $inmobiliaria->rut = $rut; - $inmobiliaria->dv = $dv; - $inmobiliaria->razon = post('razon'); - $inmobiliaria->abreviacion = post('abrev'); - $inmobiliaria->sociedad = post('sociedad'); - - $inmobiliaria->save(); - header('Location: ' . url('', ['p' => 'inmobiliarias', 'a' => 'show', 'rut' => $inmobiliaria->rut])); - } - public static function edit() - { - $sociedades = model(TipoSociedad::class)->findMany(); - $rut = get('rut'); - $inmobiliaria = model(Inmobiliaria::class)->findOne($rut); - $bancos = model(Banco::class)->findMany(); - usort($bancos, function($a, $b) { - return strcmp($a->nombre, $b->nombre); - }); - return view('inmobiliarias.edit', compact('inmobiliaria', 'bancos', 'sociedades')); - } - public static function do_edit() - { - $rut = get('rut'); - $inmobiliaria = model(Inmobiliaria::class)->findOne($rut); - foreach (post() as $field => $value) { - if ($value != '' and $inmobiliaria->{$field} != $value) { - $inmobiliaria->{$field} = $value; - } - } - - $inmobiliaria->save(); - header('Location: ' . nUrl('inmobiliarias', 'show', ['rut' => $inmobiliaria->rut])); - } -} -?> diff --git a/app_old/app/Controller/Operadores.php b/app_old/app/Controller/Operadores.php deleted file mode 100644 index 765ba2a..0000000 --- a/app_old/app/Controller/Operadores.php +++ /dev/null @@ -1,47 +0,0 @@ -findOne(get('proyecto')); - $operadores = model(Agente::class) - ->select('agente.*') - ->join('agente_tipo', ['agente_tipo.agente', '=', 'agente.id']) - ->join('tipo_agente', ['tipo_agente.id', '=', 'agente_tipo.tipo']) - ->where('tipo_agente.descripcion', 'operador') - ->orderByAsc('agente.abreviacion') - ->findMany(); - $vigentes = array_map(function($item) { - return $item->agente()->agente(); - }, $proyecto->operadoresVigentes()); - echo view('proyectos.operadores.add', compact('proyecto', 'operadores', 'vigentes')); - } - public static function add() - { - $proyecto = model(Proyecto::class)->findOne(get('proyecto')); - $fecha = Carbon::today(config('app.timezone')); - foreach (post('operadores') as $op) { - $operador = model(Agente::class)->findOne($op); - $at = $operador->tipos(19); - $data = [ - 'proyecto' => $proyecto->id, - 'agente' => $at->id, - 'fecha' => $fecha->format('Y-m-d'), - 'comision' => 2 - ]; - $pa = model(ProyectoAgente::class)->create($data); - $pa->new(); - } - header('Location: ' . nUrl('proyectos', 'show', ['proyecto' => $proyecto->id])); - } -} diff --git a/app_old/app/Controller/Other.php b/app_old/app/Controller/Other.php deleted file mode 100644 index eb90f31..0000000 --- a/app_old/app/Controller/Other.php +++ /dev/null @@ -1,71 +0,0 @@ -create(); - $unidad = \Model::factory(Unidad::class)->where('descripcion', $info[0])->where('proyecto', post('proyecto'))->find_one(); - if (!$unidad->venta()->find_one()) { - echo 'x'; - continue; - } - $venta = $unidad->venta()->find_one(); - $entrega->fecha = \Carbon\Carbon::parse($info[1])->format('Y-m-d'); - if ($venta->entrega == '0') { - $entrega->save(); - $venta->entrega = $entrega->id; - $venta->save(); - echo '.'; - } else { - echo 'x'; - } - } - } else { - $proyectos = \Model::factory(Proyecto::class)->order_by_asc('descripcion')->find_many(); - return view('other.entregar_multiple', compact('proyectos')); - } - } - public static function capacidades() - { - $capacidades = []; - $controllers = glob(config('locations.app') . '/Controller/*.php'); - foreach ($controllers as $controller) { - if (basename($controller) == 'Admin.php' or basename($controller) == 'Other.php') { - continue; - } - $class = Stringy::create($controller)->replace(config('locations.app'), '/App')->replace('.php', '')->replace('/', '\\')->__toString(); - $ref = new \ReflectionClass($class); - $static = $ref->getMethods(\ReflectionMethod::IS_STATIC && \ReflectionMethod::IS_PUBLIC); - foreach ($static as $method) { - if ($method->name == 'setDefault' or $method->name == 'index') { - continue; - } - $capacidades []= $method; - } - } - return view('other.capacidades', compact('capacidades')); - } -} -?> \ No newline at end of file diff --git a/app_old/app/Controller/Pagares.php b/app_old/app/Controller/Pagares.php deleted file mode 100644 index f05b24e..0000000 --- a/app_old/app/Controller/Pagares.php +++ /dev/null @@ -1,271 +0,0 @@ -findOne(get('pagare')); - return view('proyectos.pagares.show', compact('pagare')); - } - public static function add() - { - $proyecto = model(Proyecto::class)->findOne(get('proyecto')); - return view('proyectos.pagares.add', compact('proyecto')); - } - public static function do_add() - { - $proyecto = model(Proyecto::class)->findOne(get('proyecto')); - $data = post(); - - $data['id'] = $data['numero']; - unset($data['numero']); - $data['proyecto'] = $proyecto->id; - $moneda = model(TipoMonedaPagare::class)->where('descripcion', $data['moneda'])->findOne(); - $data['moneda'] = $moneda->id; - - $fecha = ['year', 'month', 'day']; - $fecha_arr = array_filter($data, function($item) use ($fecha) { - return (array_search($item, $fecha) !== false); - }, \ARRAY_FILTER_USE_KEY); - uksort($fecha_arr, function($a, $b) use ($fecha) { - return array_search($a, $fecha) - array_search($b, $fecha); - }); - foreach ($fecha as $f) { - unset($data[$f]); - } - array_walk($fecha_arr, function(&$item) { - if (strlen($item) < 4) { - $item = str_pad($item, 2, '0', \STR_PAD_LEFT); - } - }); - $data['fecha'] = implode('-', $fecha_arr); - - foreach ($fecha as &$key) { - $key .= '_banco'; - } - $fecha_arr = array_filter($data, function($item) use ($fecha) { - return (array_search($item, $fecha) !== false); - }, \ARRAY_FILTER_USE_KEY); - uksort($fecha_arr, function($a, $b) use ($fecha) { - return array_search($a, $fecha) - array_search($b, $fecha); - }); - foreach ($fecha as $f) { - unset($data[$f]); - } - array_walk($fecha_arr, function(&$item) { - if (strlen($item) < 4) { - $item = str_pad($item, 2, '0', \STR_PAD_LEFT); - } - }); - $data['fecha_banco'] = implode('-', $fecha_arr); - - $data['abonado'] = (int) $data['abonado']; - if ($data['abonado'] == 0) { - $data['fecha'] = '0000-00-00'; - } - - $pagare = model(Pagare::class)->create($data); - $pagare->save(); - header('Location: ' . nUrl('pagares', 'show', ['pagare' => $pagare->id])); - } - public static function edit() - { - $pagare = model(Pagare::class)->findOne(get('pagare')); - return view('proyectos.pagares.edit', compact('pagare')); - } - public static function do_edit() - { - $pagare = model(Pagare::class)->findOne(get('pagare')); - - $data = post(); - if ($pagare->id != $data['numero']) { - foreach ($pagare->renovaciones() as $renovacion) { - $renovacion->pagare = $data['numero']; - $renovacion->save(); - } - $pagare->id = $data['numero']; - $changed = true; - } - unset($data['numero']); - $moneda = model(TipoMonedaPagare::class)->where('descripcion', $data['moneda'])->findOne(); - $data['moneda'] = $moneda->id; - $fecha = ['year', 'month', 'day']; - $fecha_arr = array_filter($data, function($item) use ($fecha) { - return (array_search($item, $fecha) !== false); - }, \ARRAY_FILTER_USE_KEY); - uksort($fecha_arr, function($a, $b) use ($fecha) { - return array_search($a, $fecha) - array_search($b, $fecha); - }); - foreach ($fecha as $f) { - unset($data[$f]); - } - array_walk($fecha_arr, function(&$item) { - if (strlen($item) < 4) { - $item = str_pad($item, 2, '0', \STR_PAD_LEFT); - } - }); - $data['fecha'] = implode('-', $fecha_arr); - - foreach ($fecha as &$key) { - $key .= '_banco'; - } - $fecha_arr = array_filter($data, function($item) use ($fecha) { - return (array_search($item, $fecha) !== false); - }, \ARRAY_FILTER_USE_KEY); - uksort($fecha_arr, function($a, $b) use ($fecha) { - return array_search($a, $fecha) - array_search($b, $fecha); - }); - foreach ($fecha as $f) { - unset($data[$f]); - } - array_walk($fecha_arr, function(&$item) { - if (strlen($item) < 4) { - $item = str_pad($item, 2, '0', \STR_PAD_LEFT); - } - }); - $data['fecha_banco'] = implode('-', $fecha_arr); - - $data['abonado'] = (int) $data['abonado']; - if ($data['abonado'] == 0) { - $data['fecha'] = '0000-00-00'; - } - - $changed = false; - foreach ($data as $k => $v) { - if ($pagare->$k != $v) { - $pagare->$k = $v; - $changed = true; - if (strpos($k, 'fecha') !== false) { - $pagare->uf = 0; - } - } - } - - if ($changed) { - $pagare->save(); - } - header('Location: ' . nUrl('pagares', 'show', ['pagare' => $pagare->id])); - } - public static function edit_renovacion() - { - $renovacion = model(RenovacionPagare::class)->findOne(get('renovacion')); - return view('proyectos.pagares.edit_renovacion', compact('renovacion')); - } - public static function do_edit_renovacion() - { - $renovacion = model(RenovacionPagare::class)->findOne(get('renovacion')); - - $data = post(); - $fecha = ['year', 'month', 'day']; - $fecha_arr = array_filter($data, function($item) use ($fecha) { - return (array_search($item, $fecha) !== false); - }, \ARRAY_FILTER_USE_KEY); - uksort($fecha_arr, function($a, $b) use ($fecha) { - return array_search($a, $fecha) - array_search($b, $fecha); - }); - foreach ($fecha as $f) { - unset($data[$f]); - } - array_walk($fecha_arr, function(&$item) { - if (strlen($item) < 4) { - $item = str_pad($item, 2, '0', \STR_PAD_LEFT); - } - }); - $data['fecha'] = implode('-', $fecha_arr); - - foreach ($fecha as &$key) { - $key .= '_banco'; - } - $fecha_arr = array_filter($data, function($item) use ($fecha) { - return (array_search($item, $fecha) !== false); - }, \ARRAY_FILTER_USE_KEY); - uksort($fecha_arr, function($a, $b) use ($fecha) { - return array_search($a, $fecha) - array_search($b, $fecha); - }); - foreach ($fecha as $f) { - unset($data[$f]); - } - array_walk($fecha_arr, function(&$item) { - if (strlen($item) < 4) { - $item = str_pad($item, 2, '0', \STR_PAD_LEFT); - } - }); - $data['fecha_banco'] = implode('-', $fecha_arr); - - $changed = false; - foreach ($data as $k => $v) { - if ($renovacion->$k != $v) { - $renovacion->$k = $v; - $changed = true; - if (strpos($k, 'fecha') !== false) { - $renovacion->uf = 0; - } - } - } - if ($changed) { - $renovacion->save(); - } - header('Location: ' . nUrl('pagares', 'show', ['pagare' => $renovacion->pagare])); - } - public static function add_renovacion() - { - $pagare = model(Pagare::class)->findOne(get('pagare')); - return view('proyectos.pagares.add_renovacion', compact('pagare')); - } - public static function do_add_renovacion() - { - $pagare = model(Pagare::class)->findOne(get('pagare')); - $data = post(); - - $data['pagare'] = $pagare->id; - $fecha = ['year', 'month', 'day']; - $fecha_arr = array_filter($data, function($item) use ($fecha) { - return (array_search($item, $fecha) !== false); - }, \ARRAY_FILTER_USE_KEY); - uksort($fecha_arr, function($a, $b) use ($fecha) { - return array_search($a, $fecha) - array_search($b, $fecha); - }); - foreach ($fecha as $f) { - unset($data[$f]); - } - array_walk($fecha_arr, function(&$item) { - if (strlen($item) < 4) { - $item = str_pad($item, 2, '0', \STR_PAD_LEFT); - } - }); - $data['fecha'] = implode('-', $fecha_arr); - - foreach ($fecha as &$key) { - $key .= '_banco'; - } - $fecha_arr = array_filter($data, function($item) use ($fecha) { - return (array_search($item, $fecha) !== false); - }, \ARRAY_FILTER_USE_KEY); - uksort($fecha_arr, function($a, $b) use ($fecha) { - return array_search($a, $fecha) - array_search($b, $fecha); - }); - foreach ($fecha as $f) { - unset($data[$f]); - } - array_walk($fecha_arr, function(&$item) { - if (strlen($item) < 4) { - $item = str_pad($item, 2, '0', \STR_PAD_LEFT); - } - }); - $data['fecha_banco'] = implode('-', $fecha_arr); - - $renovacion = model(RenovacionPagare::class)->create($data); - $renovacion->save(); - - header('Location: ' . nUrl('pagares', 'show', ['pagare' => $renovacion->pagare])); - } -} diff --git a/app_old/app/Controller/Pagos.php b/app_old/app/Controller/Pagos.php deleted file mode 100644 index f279b9e..0000000 --- a/app_old/app/Controller/Pagos.php +++ /dev/null @@ -1,358 +0,0 @@ -findOne($id); - $tipos = model(TipoPago::class)->orderByAsc('descripcion')->findMany(); - $estados = model(TipoEstadoPago::class)->orderByAsc('descripcion')->findMany(); - - return view('ventas.pagos.edit', compact('pago', 'asociado', 'id_asociado', 'tipos', 'estados')); - } - public static function editar() - { - $id = get('pago'); - $pago = model(Pago::class)->findOne($id); - - $fp = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $tipo = model(TipoPago::class)->findOne(post('tipo')); - $valor = correctNumber(post('valor')); - $banco = model(Banco::class)->where('nombre', post('banco'))->findOne(); - - $fe = Carbon::createFromDate(post('yearestado'), post('monthestado'), post('dayestado'), config('app.timezone')); - $estado = model(TipoEstadoPago::class)->findOne(post('estado')); - $uf = uf($fe); - - $est = $pago->estado(); - if ($est->fecha != $fe->format('Y-m-d')) { - $est->fecha = $fe->format('Y-m-d'); - $pago->uf = $uf->uf->value; - } - if ($est->estado != $estado->id) { - $est->estado = $estado->id; - } - - if ($pago->fecha != $fp->format('Y-m-d')) { - $pago->fecha = $fp->format('Y-m-d'); - } - if ($pago->tipo != $tipo->id) { - $pago->tipo = $tipo->id; - } - if ($pago->valor != $valor) { - $pago->valor = $valor; - } - if ($pago->identificador != post('identificador')) { - $pago->identificador = post('identificador'); - } - if ($pago->pagador != post('pagador')) { - $pago->pagador = post('pagador'); - } - if ($pago->banco != $banco->id) { - $pago->banco = $banco->id; - } - - $est->save(); - $pago->save(); - header('Location: ' . url('', ['p' => get('asociado') . 's', 'a' => 'show', get('asociado') => get(get('asociado'))])); - } - public static function pendientes() - { - $ventas = model(Venta::class) - ->select('venta.*') - ->rawJoin('JOIN (SELECT e1.* FROM estado_venta e1 JOIN (SELECT venta, MAX(id) AS id FROM estado_venta GROUP BY venta) e0 ON e0.id = e1.id)', ['ev.venta', '=', 'venta.id'], 'ev') - ->join('tipo_estado_venta', ['te.id', '=', 'ev.estado'], 'te') - ->join('propiedad', ['propiedad.id', '=', 'venta.propiedad']) - ->join('unidad', ['unidad.id', '=', 'propiedad.unidad_principal']) - ->join('proyecto', ['proyecto.id', '=', 'unidad.proyecto']) - ->where('te.activa', 1) - ->orderByAsc('proyecto.descripcion') - ->orderByExpr('LPAD(unidad.descripcion, 4, "0")') - ->findMany(); - $n = 30; - $mod = floor(count($ventas) / $n); - $i_rest = count($ventas) - count($ventas) % $mod + 1; - $rest = count($ventas) - $i_rest; - $lots = (object) ['size' => $mod, 'N' => $n, 'rest' => (object) [ - 'size' => $rest, - 'start' => $i_rest - ] - ]; - return view('ventas.pagos.pendientes', compact('ventas', 'lots')); - } - public static function para_pendientes() - { - $timezone = config('app.timezone'); - $today = Carbon::today($timezone); - $days = []; - $fechas = []; - for ($i = $today->copy()->subDays(15); $i <= $today->copy()->addDays(15); $i = $i->copy()->addDay()) { - $days []= $i->format('Y-m-d'); - $fechas []= $i->format('d-m-Y'); - } - $pagos_pendientes = model(Pago::class) - ->select('estado_pago.fecha') - ->selectExpr('COUNT(pago.id)', 'cantidad') - ->join('cuota', ['cuota.pago', '=', 'pago.id']) - ->join('venta', ['venta.pie', '=', 'cuota.pie']) - ->filter('filterEstado') - ->where('estado_pago.estado', 0) - ->where('venta.estado', 1) - ->whereGte('estado_pago.fecha', $today->copy()->subDays(15)->format('Y-m-d')) - ->whereLte('estado_pago.fecha', $today->copy()->addDays(15)->format('Y-m-d')) - ->orderByAsc('estado_pago.fecha') - ->groupBy('estado_pago.fecha') - ->findMany(); - $valores = array_fill(0, count($days), 0); - $anteriores = model(Pago::class) - ->join('cuota', ['cuota.pago', '=', 'pago.id']) - ->join('venta', ['venta.pie', '=', 'cuota.pie']) - ->filter('filterEstado') - ->where('estado_pago.estado', 0) - ->where('venta.estado', 1) - ->whereLt('estado_pago.fecha', $today->copy()->subDays(15)->format('Y-m-d')) - ->count(); - foreach ($pagos_pendientes as $pago) { - $valores[array_search($pago->fecha()->format('Y-m-d'), $days)] = $pago->cantidad; - } - $acum = []; - $sum = 0; - foreach ($valores as $valor) { - $sum += $valor; - $acum []= $sum; - } - $t = array_search($today->format('Y-m-d'), $days); - $color = array_merge( - array_fill(0, $t, 'red'), - ['blue'], - array_fill(0, count($days) - $t, 'green') - ); - $pagos = ['data' => $acum, 'historico' => $anteriores, 'backgroundColor' => $color]; - $abonos_pendientes = model(Pago::class) - ->select('estado_pago.fecha') - ->selectExpr('COUNT(pago.id)', 'cantidad') - ->filter('filterEstado') - ->where('estado_pago.estado', 1) - ->whereGte('estado_pago.fecha', $today->copy()->subDays(15)->format('Y-m-d')) - ->whereLt('estado_pago.fecha', $today->copy()->format('Y-m-d')) - ->orderByAsc('estado_pago.fecha') - ->groupBy('estado_pago.fecha') - ->findMany(); - $anteriores = model(Pago::class) - ->join('cuota', ['cuota.pago', '=', 'pago.id']) - ->join('venta', ['venta.pie', '=', 'cuota.pie']) - ->filter('filterEstado') - ->where('estado_pago.estado', 1) - ->where('venta.estado', 1) - ->whereLt('estado_pago.fecha', $today->copy()->subDays(15)->format('Y-m-d')) - ->count(); - $valores = array_fill(0, count($days), 0); - foreach ($abonos_pendientes as $pago) { - $valores[array_search($pago->fecha()->format('Y-m-d'), $days)] = $pago->cantidad; - } - $acum = []; - $sum = 0; - foreach ($valores as $valor) { - $sum += $valor; - $acum []= $sum; - } - $color = array_fill(0, count($pagos), 'rgb(200, 0, 0)'); - $abonos = ['data' => $acum, 'historico' => $anteriores, 'backgroundColor' => $color]; - $output = ['count' => count($days), 'fechas' => $fechas, 'pagos' => $pagos, 'abonos' => $abonos]; - echo json_encode($output); - } - public static function para_abonar() - { - $ids = json_decode(post('ids')); - //$id = get('id'); - function checkPago(&$pagos, $tipo, $pago) { - if (!$pago) { - return; - } - if (!$pago->estado()) { - $pagos []= [ - 'tipo' => $tipo, - 'pago' => $pago->asArray(), - 'estado' => -1 - ]; - return; - } - if ($pago->estado()->tipo()->descripcion == 'depositado') { - $pagos []= [ - 'tipo' => $tipo, - 'pago' => $pago->asArray(), - 'fecha' => format('shortDate', $pago->estado()->fecha), - 'valor' => format('pesos', $pago->valor, true), - 'estado' => 1 - ]; - } - } - $output = []; - foreach ($ids as $id) { - $venta = model(Venta::class)->findOne($id); - if ($venta->estado()->tipo()->activa == 0) { - $output []= ['status' => -1, 'venta' => $venta->id]; - continue; - } - $pagos = []; - if ($venta->pie()) { - foreach ($venta->pie()->cuotas() as $cuota) { - checkPago($pagos, 'Pie', $cuota->pago()); - } - if ($venta->pie()->reajuste()) { - checkPago($pagos, 'Reajuste', $venta->pie()->reajuste()); - } - } - if ($venta->credito()) { - checkPago($pagos, 'Credito', $venta->credito()->pago()); - } - if ($venta->escritura()) { - checkPago($pagos, 'Abono Escritura', $venta->escritura()->pago()); - } - if ($venta->subsidio()) { - checkPago($pagos, 'Subsidio', $venta->subsidio()->subsidio()); - checkPago($pagos, 'Ahorro', $venta->subsidio()->pago()); - } - if (count($pagos) <= 0) { - $output []= ['status' => -1, 'venta' => $venta->id]; - continue; - } - $output []= [ - 'status' => 1, - 'proyecto' => $venta->proyecto()->descripcion, - 'venta' => $venta->id, - 'propietario' => $venta->propietario()->nombreCompleto(), - 'departamento' => $venta->unidad()->descripcion, - 'pagos' => $pagos - ]; - } - return json_encode($output); - } - public static function rebotes() - { - $ids = json_decode(post('ids')); - $response = []; - foreach ($ids as $id) { - //$id = get('id'); - $venta = model(Venta::class)->findOne($id); - $rebotes = $venta->pagos(-1); - if (count($rebotes) < 1) { - $response []= ['status' => -1, 'venta' => $venta->id]; - continue; - } - usort($rebotes, function($a, $b) { - return $b->estado()->fecha()->diffInDays($a->estado()->fecha(), false); - }); - - $output = []; - $textos = []; - foreach ($rebotes as $rebote) { - $fuente = $rebote->fuente()[0]; - $text = '' . ucwords(str_replace('_', ' ', $fuente->tipo)) . ''; - $info = ['tipo' => ucwords(str_replace('_', ' ', $fuente->tipo))]; - switch ($fuente->tipo) { - case('cuota'): - $text .= '' . $fuente->obj->pie()->venta()->proyecto()->descripcion - . '' . $fuente->obj->pie()->venta()->unidad()->descripcion . '' - . $fuente->obj->pie()->venta()->propietario()->nombreCompleto() - . '' . format('shortDate', $rebote->estado()->fecha) . ''; - $info['proyecto'] = $fuente->obj->pie()->venta()->proyecto()->descripcion; - $info['venta'] = $fuente->obj->pie()->venta()->id; - $info['departamento'] = $fuente->obj->pie()->venta()->unidad()->descripcion; - $info['propietario'] = $fuente->obj->pie()->venta()->propietario()->nombreCompleto(); - $info['fecha'] = format('shortDate', $rebote->estado()->fecha); - break; - } - $text .= '' . format('pesos', $rebote->valor('pesos'), true) . ''; - $info['valor'] = format('pesos', $rebote->valor('pesos'), true); - $output []= array_merge(['id' => $rebote->id], $info); - $textos []= ['id' => $rebote->id, 'text' => $text]; - } - $response []= ['status' => 1, 'venta' => $venta->id, 'textos' => $textos, 'rebotes' => $output]; - } - - return json_encode($response); - } - public static function show() - { - $id = get('pago'); - $asociado = get('asociado'); - $id_asociado = get($asociado); - - $pago = model(Pago::class)->findOne($id); - - return view('ventas.pagos.show', compact('pago', 'asociado', 'id_asociado')); - } - public static function pagar() - { - $id = get('pago'); - $pago = model(Pago::class)->findOne($id); - $asociado = get('asociado'); - $id_asociado = get($asociado); - - return view('ventas.pagos.pagar', compact('pago', 'asociado', 'id_asociado')); - } - public static function pagando() - { - $id = get('pago'); - $pago = model(Pago::class)->findOne($id); - $asociado = get('asociado'); - $id_asociado = get($asociado); - - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $data = [ - 'fecha' => $f->format('Y-m-d'), - 'pago' => $pago->id, - 'estado' => 1 - ]; - $estado = model(EstadoPago::class)->create($data); - - $estado->save(); - header('Location: ' . url('', ['p' => $asociado . 's', 'a' => 'show', $asociado => $id_asociado])); - } - public static function abonar() - { - $id = get('pago'); - $pago = model(Pago::class)->findOne($id); - $asociado = get('asociado'); - $id_asociado = get($asociado); - - return view('ventas.pagos.abonar', compact('pago', 'asociado', 'id_asociado')); - } - public static function abonando() - { - $id = get('pago'); - $pago = model(Pago::class)->findOne($id); - $asociado = get('asociado'); - $id_asociado = get($asociado); - - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $data = [ - 'fecha' => $f->format('Y-m-d'), - 'pago' => $pago->id, - 'estado' => 2 - ]; - $estado = model(EstadoPago::class)->create($data); - - $estado->save(); - header('Location: ' . url('', ['p' => $asociado . 's', 'a' => 'show', $asociado => $id_asociado])); - } -} -?> diff --git a/app_old/app/Controller/Pies.php b/app_old/app/Controller/Pies.php deleted file mode 100644 index 38c2fcb..0000000 --- a/app_old/app/Controller/Pies.php +++ /dev/null @@ -1,104 +0,0 @@ -findOne($proyecto); - $ventas = $proyecto->ventas(); - self::sort($ventas); - return view('ventas.list', compact('proyecto', 'ventas')); - } - public static function listProyectos() - { - $proyectos = \Model::factory(Proyecto::class) - ->select('proyecto.*') - ->join('estado_proyecto', ['estado.proyecto', '=', 'proyecto.id'], 'estado') - ->join('tipo_estado_proyecto', ['tipo.id', '=', 'estado.estado'], 'tipo') - ->join('etapa_proyecto', ['etapa.id', '=', 'tipo.etapa'], 'etapa') - ->whereGte('etapa.orden', 4) - ->groupBy('proyecto.id') - ->findMany(); - echo view('ventas.proyectos', compact('proyectos')); - } - public static function resumen() - { - $id = get('pie'); - $pie = \Model::factory(\Incoviba\old\Venta\Pie::class)->findOne($id); - $venta = $pie->venta(); - return view('ventas.pies.resumen', compact('venta')); - } - public static function reajustar() - { - $id = get('venta'); - $venta = \Model::factory(Venta::class)->findOne($id); - return view('ventas.pies.reajustar', compact('venta')); - } - public static function reajuste() - { - $id = get('venta'); - $venta = \Model::factory(Venta::class)->findOne($id); - - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $pago = \Model::factory(Pago::class)->create(); - $pago->fecha = $f->format('Y-m-d'); - $pago->uf = (float) uf($f)->uf->value; - $pago->valor = str_replace('.', '', post('valor')); - - $pago->new(); - - $pie = $venta->pie(); - $pie->reajuste = $pago->id; - $pie->save(); - header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); - } - public static function edit() - { - $id = get('venta'); - $venta = \Model::factory(Venta::class)->findOne($id); - return view('ventas.pies.edit', compact('venta')); - } - public static function editar() - { - $id = get('venta'); - $venta = \Model::factory(Venta::class)->findOne($id); - $pie = $venta->pie(); - $valor = correctNumber(post('valor')); - if ($pie->valor != $valor) { - $pie->valor = $valor; - } - if ($pie->cuotas != post('cuotas')) { - $pie->cuotas = post('cuotas'); - } - - $pie->save(); - header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); - } - public static function asociar() - { - $id = get('pie'); - $pie = \Model::factory(Pie::class)->findOne($id); - $pie->asociado = post('asociado'); - - $pie->save(); - header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $pie->venta()->id])); - } -} -?> diff --git a/app_old/app/Controller/Postventas.php b/app_old/app/Controller/Postventas.php deleted file mode 100644 index 7b38cb6..0000000 --- a/app_old/app/Controller/Postventas.php +++ /dev/null @@ -1,69 +0,0 @@ -findOne($id); - - return view('ventas.postventas.add', compact('venta')); - } - public static function agregar() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $observaciones = json_decode(post('observaciones')); - $postventa = model(Postventa::class)->create(); - $postventa->venta_id = $venta->id; - $postventa->save(); - - $estado = model(EstadoPostventa::class)->create(); - $estado->postventa_id = $postventa->id; - $estado->tipo_estado_postventa_id = 1; - $estado->fecha = $f->format('Y-m-d'); - $estado->save(); - - foreach ($observaciones as $o) { - $observacion = model(Observacion::class)->create(); - $observacion->texto = post('observacion' . $o); - - $observacion->save(); - - $estado = model(EstadoObservacion::class)->create(); - $estado->observacion_id = $observacion->id; - $estado->tipo_estado_observacion_id = 1; - $estado->fecha = $f->format('Y-m-d'); - $estado->save(); - - $po = model(PostventaObservacion::class)->create(); - $po->postventa_id = $postventa->id; - $po->observacion_id = $observacion->id; - $po->save(); - } - header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); - } - public static function show() - { - $id = get('postventa'); - $postventa = model(Postventa::class)->findOne($id); - $venta = model(Venta::class)->findOne($postventa->venta_id); - - return view('ventas.postventas.show', compact('postventa', 'venta')); - } -} -?> diff --git a/app_old/app/Controller/Precios.php b/app_old/app/Controller/Precios.php deleted file mode 100644 index 20db97b..0000000 --- a/app_old/app/Controller/Precios.php +++ /dev/null @@ -1,177 +0,0 @@ -orderByAsc('descripcion')->findMany(); - return view('ventas.precios.proyectos', compact('proyectos')); - } - public static function list() - { - $proyecto = \model(Proyecto::class)->findOne(get('proyecto')); - return view('ventas.precios.list', compact('proyecto')); - } - public static function import() - { - $proyectos = \model(Proyecto::class)->orderByAsc('descripcion')->findMany(); - return view('ventas.precios.import', compact('proyectos')); - } - public static function importar() - { - $proyecto = \model(Proyecto::class)->findOne(post('proyecto')); - $fecha = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $file = explode(PHP_EOL, trim(file_get_contents($_FILES['archivo']['tmp_name']))); - $columnas = explode(';', array_shift($file)); - $tr = model(TipoEstadoPrecio::class)->where('descripcion', 'reemplazado')->findOne()->id; - $tv = model(TipoEstadoPrecio::class)->where('descripcion', 'vigente')->findOne()->id; - foreach ($file as $line) { - if (trim($line) == '') { - continue; - } - $info = explode(';', $line); - $tipo = \model(TipoUnidad::class)->where('descripcion', $info[0])->findOne(); - $unidad = \model(Unidad::class)->where('tipo', $tipo->id)->where('descripcion', $info[1])->where('proyecto', $proyecto->id)->findOne(); - if (!$unidad) { - continue; - } - - try { - self::reemplazar($unidad->id, $info[2], $fecha, $tr, $tv); - } catch (\Exception $e) { - continue; - } - } - header('Location: ' . nUrl('precios', 'list', ['proyecto' => $proyecto->id])); - } - public static function add() - { - $proyecto = \model(Proyecto::class)->findOne(get('proyecto')); - return view('ventas.precios.add', compact('proyecto')); - } - public static function agregar() - { - $proyecto = get('proyecto'); - $fecha = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $precios = []; - foreach (post() as $name => $valor) { - if ($valor == '' or strpos($name, 'precio') === false) { - continue; - } - list($tipo, $id) = explode(':', $name); - $tipo = trim(str_replace('precio', '', $tipo), '_'); - $id = explode('-', $id); - switch (count($id)) { - case 1: - $precios []= ['tipo' => 'pt', 'id' => $id[0], 'valor' => $valor]; - break; - case 2: - $exists = false; - foreach ($precios as $precio) { - if ($precio['tipo'] == 'pt' and $precio['id'] == $id[0]) { - $exists = true; - break; - } - } - if (!$exists) { - $precios []= ['tipo' => 'subtipo', 'id' => $id[1], 'pt' => $id[0], 'valor' => $valor]; - } - break; - case 3: - $exists = false; - foreach ($precios as $precio) { - if ($precio['tipo'] == 'pt' and $precio['id'] == $id[0]) { - $exists = true; - break; - } - if ($precio['tipo'] == 'subtipo' and 'id' == $id[1] and 'pt' == $id[0]) { - $exists = true; - break; - } - } - if (!$exists) { - $precios []= ['tipo' => 'unidad', 'id' => $id[2], 'valor' => $valor]; - } - break; - } - } - foreach ($precios as $precio) { - $precio = (object) $precio; - try { - switch ($precio->tipo) { - case 'pt': - $pt = model(ProyectoTipoUnidad::class)->findOne($precio->id); - $pt->setPrecios($fecha, $precio->valor); - break; - case 'subtipo': - $pt = model(ProyectoTipoUnidad::class)->findOne($precio->pt); - $pt->setPreciosSubtipo($precios->id, $fecha, $precio->valor); - break; - case 'unidad': - $unidad = model(Unidad::class)->findOne($precio->id); - $unidad->setPrecio($fecha, $precio->valor); - break; - } - } catch(\Exception $e) { - continue; - } - } - header('Location: ' . nUrl('precios', 'list', ['proyecto' => $proyecto])); - } - protected static function reemplazar(int $unidad_id, float $valor, \DateTime $fecha, int $tr = 0, int $tv = 0) - { - if ($tr == 0) { - $tr = model(TipoEstadoPrecio::class)->where('descripcion', 'reemplazado')->findOne()->id; - } - if ($tv == 0) { - $tv = model(TipoEstadoPrecio::class)->where('descripcion', 'vigente')->findOne()->id; - } - $olds = \model(Precio::class)->where('unidad', $unidad_id)->findMany(); - if ($olds !== false) { - foreach ($olds as $old) { - if (!$old->vigente()) { - continue; - } - $data = [ - 'precio' => $old->id, - 'fecha' => $fecha->format('Y-m-d'), - 'estado' => $tr - ]; - $estado = \model(EstadoPrecio::class)->create($data); - $estado->save(); - } - } - $data = [ - 'unidad' => $unidad_id, - 'valor' => $valor - ]; - $precio = (new Factory(Precio::class))->where($data)->find(); - if (!$precio) { - $precio = \model(Precio::class)->create($data); - $precio->save(); - } - $data = [ - 'precio' => $precio->id, - 'fecha' => $fecha->format('Y-m-d'), - 'estado' => $tv - ]; - $estado = \model(EstadoPrecio::class)->create($data); - $estado->save(); - } -} diff --git a/app_old/app/Controller/Propietarios.php b/app_old/app/Controller/Propietarios.php deleted file mode 100644 index 5d38ee7..0000000 --- a/app_old/app/Controller/Propietarios.php +++ /dev/null @@ -1,129 +0,0 @@ -findOne($id); - $propietario = $venta->propietario(); - $regiones = model(Region::class)->orderByAsc('numeracion')->findMany(); - - return view('ventas.propietarios.edit', compact('venta', 'propietario', 'regiones')); - } - public static function editar() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - - $info = post(); - list($info['rut'], $info['dv']) = explode('-', str_replace('.', '', $info['rut'])); - $propietario = model(Propietario::class)->findOne($info['rut']); - if (!$propietario) { - $propietario = model(Propietario::class)->create(); - } - if ($propietario->direccion != 0) { - $direccion = $propietario->direccion(); - } else { - $direccion = model(Direccion::class) - ->where('calle', post('calle')) - ->where('numero', post('numero')) - ->where('extra', post('extra')) - ->where('comuna', post('comuna')) - ->findOne(); - if (!$direccion) { - $data = [ - 'calle' => post('calle'), - 'numero' => post('numero'), - 'extra' => post('extra'), - 'comuna' => post('comuna') - ]; - $direccion = model(Direccion::class)->create($data); - } - } - - if (isset($info['empresa'])) { - $info['apellido_paterno'] = ''; - $info['apellido_materno'] = ''; - } - - if ($propietario->representante != 0) { - list($info['rep_rut'], $info['rep_dv']) = explode('-', str_replace('.', '', $info['rep_rut'])); - $representante = $propietario->representante(); - } elseif (isset($info['rep_rut'])) { - list($info['rep_rut'], $info['rep_dv']) = explode('-', str_replace('.', '', $info['rep_rut'])); - $representante= model(Propietario::class)->findOne($info['rep_rut']); - if (!$representante) { - $representante= model(Propietario::class)->create(); - } - } - - $fields = ['rut', 'dv', 'nombres', 'apellido_paterno', 'apellido_materno']; - $change = false; - foreach ($fields as $key) { - if ($propietario->$key != $info[$key]) { - $propietario->$key = $info[$key]; - $change = true; - } - } - if ($direccion->isNew()) { - $direccion->save(); - } - if ($propietario->direccion != $direccion->id) { - $propietario->direccion = $direccion->id; - $change = true; - } - if ($change) { - d($propietario); - $propietario->save(); - } - - if (isset($info['rep_rut'])) { - $change = false; - if ($representante->rut != $info['rep_rut']) { - $representante->rut = $info['rep_rut']; - $representante->dv = $info['rep_dv']; - $change = true; - } - if ($representante->nombres != $info['rep_nombres']) { - $representante->nombres = $info['rep_nombres']; - $change = true; - } - if ($representante->apellido_paterno != $info['rep_apaterno']) { - $representante->apellido_paterno = $info['rep_apaterno']; - $change = true; - } - if ($representante->apellido_materno != $info['rep_amaterno']) { - $representante->apellido_materno = $info['rep_amaterno']; - $change = true; - } - if ($representante->direccion != $direccion->id) { - $representante->direccion = $direccion->id; - $change = true; - } - if ($change) { - $representante->save(); - } - if ($propietario->representante != $representante->rut) { - $propietario->representante = $representante->rut; - $propietario->save(); - } - } - - if ($venta->propietario != $propietario->rut) { - $venta->propietario = $propietario->rut; - $venta->save(); - } - header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); - } -} -?> diff --git a/app_old/app/Controller/ProyectoTipoUnidades.php b/app_old/app/Controller/ProyectoTipoUnidades.php deleted file mode 100644 index 32c0c1d..0000000 --- a/app_old/app/Controller/ProyectoTipoUnidades.php +++ /dev/null @@ -1,77 +0,0 @@ -findOne($id); - $tipos = model(TipoUnidad::class)->findMany(); - - return view('proyectos.tipo_unidades.edit', compact('tipo', 'tipos')); - } - public static function editar() - { - $id = get('tipo_unidad'); - $tipo = model(ProyectoTipoUnidad::class)->findOne($id); - - $changed = false; - foreach (post() as $field => $value) { - if ($tipo->{$field} != $value) { - $tipo->{$field} = $value; - $changed = true; - } - } - if ($changed) { - $tipo->save(); - } - header('Location: ' . nUrl('proyectos', 'list_unidades', ['proyecto' => $tipo->proyecto()->id])); - } - public static function add_unidad() - { - $id = get('tipo_unidad'); - $tipo = model(ProyectoTipoUnidad::class)->findOne($id); - if ($tipo->tipo()->descripcion == 'departamento') { - return view('proyectos.unidades.add', compact('tipo')); - } - return view('proyectos.unidades.add2', compact('tipo')); - } - public static function assign() - { - $id = get('proyecto'); - $proyecto = model(Proyecto::class)->findOne($id); - $tipos = model(ProyectoTipoUnidad::class)->where('proyecto', $proyecto->id)->findMany(); - $libres = model(Unidad::class)->where('proyecto', $proyecto->id)->where('pt', 0)->findMany(); - - return view('proyectos.unidades.assign', compact('proyecto', 'tipos', 'libres')); - } - public static function asignar() - { - $id = get('proyecto'); - $proyecto = model(Proyecto::class)->findOne($id); - - $libres = model(Unidad::class)->where('proyecto', $proyecto->id)->where('pt', 0)->findMany(); - foreach ($libres as $unidad) { - $unidad->pt = post('tipo' . $unidad->id); - $unidad->save(); - } - header('Location: ' . nUrl('proyectos', 'list_unidades', ['proyecto' => $proyecto->id])); - } -} diff --git a/app_old/app/Controller/Proyectos.php b/app_old/app/Controller/Proyectos.php deleted file mode 100644 index 9c69ad5..0000000 --- a/app_old/app/Controller/Proyectos.php +++ /dev/null @@ -1,327 +0,0 @@ -where('inmobiliaria', $id_inmobiliaria); - } else { - $proyectos = model(Proyecto::class); - } - $proyectos = $proyectos->order_by_asc('descripcion')->findMany(); - return view('proyectos.list', compact('proyectos')); - } - public static function show() - { - $id_proyecto = get('proyecto'); - if ($id_proyecto == null) { - header('Location: ' . url('', ['p' => 'proyectos', 'a' => 'list'])); - } - $proyecto = model(Proyecto::class)->findOne($id_proyecto); - $estados = model(TipoEstadoProyecto::class)->findMany(); - foreach ($estados as &$estado) { - $estado = $estado->asArray()['orden'] + 1; - } - $colors = []; - - $ventas_pt = (object) ['fields' => [], 'data' => [], 'totales' => [], 'vendidas' => []]; - $ventas = $proyecto->ventas('fecha'); - $months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']; - if (count($ventas) > 0) { - $inicio = $ventas[0]->fecha()->format('Y'); - $fin = $ventas[count($ventas) - 1]->fecha()->format('Y'); - $end = $ventas[count($ventas) - 1]->fecha()->format('M'); - for ($y = $inicio; $y <= $fin; $y ++) { - foreach ($months as $month) { - $ventas_pt->fields []= $y . ' ' . $month; - if ($y == $fin and $month == $end) { - break; - } - } - } - } - - foreach ($proyecto->tipologias() as $tipo) { - if (!isset($ventas_pt->data[$tipo->tipologia->descripcion])) { - $ventas_pt->data[$tipo->tipologia->descripcion] = []; - $ventas_pt->data[$tipo->tipologia->descripcion] = array_fill(0, count($ventas_pt->fields), 0); - $ventas_pt->totales[$tipo->tipologia->descripcion] = 0; - $ventas_pt->vendidas[$tipo->tipologia->descripcion] = 0; - } - foreach ($tipo->tipos as $pt) { - foreach ($pt->ventas('fecha') as $venta) { - $ventas_pt->data[$tipo->tipologia->descripcion][array_search($venta->fecha()->format('Y M'), $ventas_pt->fields)] ++; - $ventas_pt->vendidas[$tipo->tipologia->descripcion] ++; - } - $ventas_pt->totales[$tipo->tipologia->descripcion] += count($pt->unidades()); - } - } - foreach ($ventas_pt->data as $tipo => $data) { - $acum = 0; - foreach ($data as $i => $cantidad) { - $acum += $cantidad; - $ventas_pt->data[$tipo][$i] = round($acum / $ventas_pt->totales[$tipo] * 100, 2); - } - } - $meses = ['Ene', 'Feb', 'Mar', 'Abr', 'May', 'Jun', 'Jul', 'Ago', 'Sep', 'Oct', 'Nov', 'Dic']; - array_walk($ventas_pt->fields, function(&$item) use ($meses, $months) { - $item = str_replace($months, $meses, $item); - }); - - for ($i = 0; $i < 10; $i ++) { - $colors[$i] = 'rgb(' . mt_rand(0, 255) . ', ' . mt_rand(0, 255) . ', ' . mt_rand(0, 255) . ')'; - } - return view('proyectos.show', compact('proyecto', 'estados', 'colors', 'ventas_pt')); - } - public static function historial() - { - $proyecto = model(Proyecto::class)->findOne(get('proyecto')); - return view('proyectos.historia', compact('proyecto')); - } - public static function advance() - { - $id_proyecto = get('proyecto'); - $proyecto = model(Proyecto::class)->findOne($id_proyecto); - $estados = model(TipoEstadoProyecto::class)->whereGt('orden', $proyecto->estado()->tipo()->orden)->orderByAsc('orden')->findMany(); - - return view('proyectos.advance', compact('proyecto', 'estados')); - } - public static function avanzar() - { - $id_proyecto = get('proyecto'); - $proyecto = model(Proyecto::class)->findOne($id_proyecto); - $id_tipo = post('estado'); - $tipo = model(TipoEstadoProyecto::class)->findOne($id_tipo); - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - - $tipos = model(TipoEstadoProyecto::class) - ->whereGt('orden', $proyecto->estado()->tipo()->orden) - ->whereLte('orden', $tipo->orden) - ->orderByAsc('orden') - ->findMany(); - - foreach ($tipos as $t) { - $estado = model(EstadoProyecto::class)->create(); - $estado->proyecto = $proyecto->id; - $estado->estado = $t->id; - $estado->fecha = $f->format('Y-m-d'); - $estado->save(); - } - header('Location: ' . url('', ['p' => 'proyectos', 'a' => 'show', 'proyecto' => $proyecto->id])); - } - public static function avance() - { - $id = get('proyecto'); - $proyecto = model(Proyecto::class)->findOne($id); - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $av = post('avance') / 100; - $ep = (double) post('estado_pago'); - $avance = model(AvanceConstruccion::class) - ->where('proyecto', $proyecto->id) - ->where('fecha', $f->format('Y-m-d')) - ->findOne(); - if (!$avance) { - $data = [ - 'proyecto' => $proyecto->id, - 'fecha' => $f->format('Y-m-d'), - 'numero' => post('numero'), - 'avance' => $av, - 'estado_pago' => $ep - ]; - $avance = model(AvanceConstruccion::class)->create($data); - } - $avance->save(); - header('Location: ' . url('', ['p' => 'proyectos', 'a' => 'historial', 'proyecto' => $proyecto->id])); - } - public static function add() - { - $rut = get('inmobiliaria'); - - $inmobiliarias = model(Inmobiliaria::class)->orderByAsc('abreviacion')->findMany(); - $regiones = model(Region::class)->orderByAsc('numeracion')->findMany(); - - return view('proyectos.add', compact('inmobiliarias', 'rut', 'regiones')); - } - public static function agregar() - { - $proyecto = model(Proyecto::class)->where('descripcion', post('descripcion'))->where('inmobiliaria', post('inmobiliaria'))->find_one(); - if ($proyecto) { - header('Location: ' . url('', ['p' => 'proyectos', 'a' => 'show', 'proyecto' => $proyecto->id])); - die(); - } - $proyecto = model(Proyecto::class)->create(); - $proyecto->descripcion = post('descripcion'); - $proyecto->inmobiliaria = post('inmobiliaria'); - - $direccion = model(Direccion::class) - ->where('calle', post('calle')) - ->where('numero', post('numero')) - ->where('extra', post('extra')) - ->where('comuna', post('comuna')) - ->findOne(); - if (!$direccion) { - $direccion = model(Direccion::class)->create(); - $direccion->calle = post('calle'); - $direccion->numero = post('numero'); - $direccion->extra = post('extra'); - $direccion->comuna = post('comuna'); - $direccion->save(); - } - - $proyecto->direccion = $direccion->id; - $proyecto->save(); - - $fecha = Carbon::parse(post('year'), post('month'), post('day'), config('app.timezone')); - $estado = model(EstadoProyecto::class)->create(); - $estado->proyecto = $proyecto->id; - $estado->estado = 1; - $estado->fecha = $fecha->format('Y-m-d'); - $estado->save(); - header('Location: ' . url('', ['p' => 'proyectos', 'a' => 'show', 'proyecto' => $proyecto->id])); - } - public static function disponibles() - { - $id = get('proyecto'); - $proyecto = model(Proyecto::class)->findOne($id); - - return view('proyectos.disponibles', compact('proyecto')); - } - public static function list_unidades() - { - $id = get('proyecto'); - $proyecto = model(Proyecto::class)->findOne($id); - $libres = model(Unidad::class)->where('proyecto', $proyecto->id)->where('pt', 0)->findMany(); - - return view('proyectos.unidades.list', compact('proyecto', 'libres')); - } - public static function add_tipo_unidad() - { - $id = get('proyecto'); - $proyecto = model(Proyecto::class)->findOne($id); - $tipos = model(TipoUnidad::class)->findMany(); - - return view('proyectos.tipo_unidades.add', compact('proyecto', 'tipos')); - } - public static function agregar_tipo_unidad() - { - $id = get('proyecto'); - $proyecto = model(Proyecto::class)->findOne($id); - $data = post(); - $data['proyecto'] = $proyecto->id; - $tipo = model(ProyectoTipoUnidad::class)->where('proyecto', $data['proyecto']) - ->where('tipo', $data['tipo'])->where('nombre', $data['nombre'])->findOne(); - if ($tipo === false) { - $tipo = model(ProyectoTipoUnidad::class)->create($data); - $tipo->save(); - } - header('Location: ' . nUrl('proyectos', 'list_unidades', ['proyecto' => $proyecto->id])); - } - public static function construccion() - { - $id = get('proyecto'); - $proyecto = model(Proyecto::class)->findOne($id); - return view('proyectos.construccion', compact('proyecto')); - } - public static function editar_avance() - { - $avance = model(AvanceConstruccion::class)->findOne(get('avance')); - return view('proyectos.avances.edit', compact('avance')); - } - public static function edit_avance() - { - $avance = model(AvanceConstruccion::class)->findOne(get('avance')); - $cols = [ - 'day', - 'month', - 'year', - 'avance', - 'estado_pago', - 'pagado', - 'day_pago', - 'month_pago', - 'year_pago' - ]; - $data = array_filter(post(), function($key) use ($cols) { - return (array_search($key, $cols) !== false); - }, \ARRAY_FILTER_USE_KEY); - $data['fecha'] = implode('-', [$data['year'], $data['month'], $data['day']]); - unset($data['year']); - unset($data['month']); - unset($data['day']); - $data['fecha_pagado'] = implode('-', [$data['year_pago'], $data['month_pago'], $data['day_pago']]); - unset($data['year_pago']); - unset($data['month_pago']); - unset($data['day_pago']); - $data['avance'] /= 100; - $avance->edit($data); - - header('Location: ' . nUrl('proyectos', 'construccion', ['proyecto' => $avance->proyecto])); - } - public static function reservas() - { - $proyecto = model(Proyecto::class)->findOne(get('proyecto')); - $pisos = []; - $totales = []; - foreach ($proyecto->unidades('departamento') as $unidad) { - if (!isset($pisos[$unidad->piso - 1])) { - $piso = (object) ['descripcion' => $unidad->piso, 'unidades' => []]; - $pisos[$unidad->piso - 1] = $piso; - } - if (!isset($totales[$unidad->linea()])) { - $totales[$unidad->linea()] = (object) ['ventas' => 0, 'reservas' => 0]; - } - $pisos[$unidad->piso - 1]->unidades[$unidad->linea()] = $unidad; - if ($unidad->isVendida()) { - $totales[$unidad->linea()]->ventas ++; - } - if ($unidad->isReservada()) { - $totales[$unidad->linea()]->reservas ++; - } - } - ksort($pisos); - $max_unidades = 0; - foreach ($pisos as $piso) { - if (count($piso->unidades) > $max_unidades) { - $max_unidades = count($piso->unidades); - } - } - return view('proyectos.reservas.base', compact('proyecto', 'pisos', 'max_unidades', 'totales')); - } - public static function unidades() - { - if (get('proyecto')) { - $proyecto = model(Proyecto::class)->findOne(get('proyecto')); - $libres = model(Unidad::class)->where('proyecto', $proyecto->id)->where('pt', 0)->findMany(); - - return view('proyectos.unidades.list', compact('proyecto', 'libres')); - } - $proyectos = model(Proyecto::class)->order_by_asc('descripcion')->findMany(); - return view('proyectos.unidades.proyectos', compact('proyectos')); - } -} -?> diff --git a/app_old/app/Controller/Reajustes.php b/app_old/app/Controller/Reajustes.php deleted file mode 100644 index 4c6c938..0000000 --- a/app_old/app/Controller/Reajustes.php +++ /dev/null @@ -1,90 +0,0 @@ -findOne($id); - return view('ventas.pies.reajustes.edit', compact('venta')); - } - public static function editar() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $uf = uf($f); - - $valor = correctNumber(post('valor')); - if ($valor == '') { - $valor_uf = correctNumber(post('valor_uf')); - $valor = $valor_uf * $uf->uf->value; - } - $pago = $venta->pie()->reajuste(); - if ($pago->valor != $valor) { - $pago->valor = $valor; - } - if ($pago->fecha != $f->format('Y-m-d')) { - $pago->fecha = $f->format('Y-m-d'); - $pago->uf = $uf->uf->value; - } - - $pago->save(); - header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); - } - public static function pagar() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - - return view('ventas.pies.reajustes.pagar', compact('venta')); - } - public static function pagado() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - - $data = [ - 'pago' => $venta->pie()->reajuste()->id, - 'fecha' => $f->format('Y-m-d'), - 'estado' => 1 - ]; - $estado = model(EstadoPago::class)->create($data); - $estado->save(); - header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); - } - public static function abonar() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - - return view('ventas.pies.reajustes.abonar', compact('venta')); - } - public static function abonado() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - - $data = [ - 'pago' => $venta->pie()->reajuste()->id, - 'fecha' => $f->format('Y-m-d'), - 'estado' => 2 - ]; - $estado = model(EstadoPago::class)->create($data); - $estado->save(); - header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); - } -} -?> diff --git a/app_old/app/Controller/Registros.php b/app_old/app/Controller/Registros.php deleted file mode 100644 index 546fece..0000000 --- a/app_old/app/Controller/Registros.php +++ /dev/null @@ -1,39 +0,0 @@ -orderByDesc('time')->findMany(); - $ini = new Color(0, 100, 0); - $end = new Color(255, 255, 255); - $colores = self::colores($end, $ini, 100); - return view('admin.registros.list', compact('registros', 'colores')); - } - public static function show() - { - $registro = model(RModel::class)->findOne(get('registro')); - $ini = new Color(0, 100, 0); - $end = new Color(255, 255, 255); - $colores = self::colores($end, $ini, 100); - return view('admin.registros.show', compact('registro', 'colores')); - } - protected static function colores($ini, $end, $max) - { - $current = $ini->toVector(); - $colores = []; - $line = new Line($ini->toVector(), $end->toVector()); - for ($i = 0; $i < $max; $i ++) { - $colores[$i] = new Color($current); - $current = $line->move($current, $line->length() / $max); - } - return $colores; - } -} diff --git a/app_old/app/Controller/Subsidios.php b/app_old/app/Controller/Subsidios.php deleted file mode 100644 index 5107fc3..0000000 --- a/app_old/app/Controller/Subsidios.php +++ /dev/null @@ -1,184 +0,0 @@ -findOne($id); - echo view('ventas.subsidios.add', compact('venta')); - } - public static function do_add() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $uf = uf($f); - - $pago1 = model(Pago::class)->create(); - $valor = post('ahorro_uf') * $uf->uf->value; - if (post('ahorro') != null) { - $valor = post('ahorro'); - } - $pago1->valor = $valor; - $pago1->fecha = $f->format('Y-m-d'); - $pago1->uf = $uf->uf->value; - - $pago2 = model(Pago::class)->create(); - $valor = post('subsidio_uf') * $uf->uf->value; - if (post('subsidio') != null) { - $valor = post('subsidio'); - } - $pago2->valor = $valor; - $pago2->fecha = $f->format('Y-m-d'); - $pago2->uf = $uf->uf->value; - - $pago1->new(); - $pago2->new(); - - $subsidio = model(Subsidio::class)->create(); - $subsidio->pago = $pago1->id; - $subsidio->subsidio = $pago2->id; - - $subsidio->save(); - $venta->subsidio = $subsidio->id(); - $venta->save(); - header('Location: ' . nUrl('ventas', 'show', ['venta' => $venta->id])); - } - public static function edit() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - echo view('ventas.subsidios.edit', compact('venta')); - } - public static function do_edit() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $uf = uf($f); - - $pago1 = $venta->subsidio()->pago(); - $valor = post('ahorro_uf') * $uf->uf->value; - if (post('ahorro') != null) { - $valor = post('ahorro'); - } - $pago1->valor = $valor; - $pago1->fecha = $f->format('Y-m-d'); - $pago1->uf = $uf->uf->value; - - $pago2 = $venta->subsidio()->subsidio(); - $valor = post('subsidio_uf') * $uf->uf->value; - if (post('subsidio') != null) { - $valor = post('subsidio'); - } - $pago2->valor = $valor; - $pago2->fecha = $f->format('Y-m-d'); - $pago2->uf = $uf->uf->value; - - $pago1->save(); - $pago2->save(); - header('Location: ' . nUrl('ventas', 'show', ['venta' => $venta->id])); - } - public static function pagar() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - $tipo = get('tipo'); - switch($tipo) { - case 'subsidio': - $pago = $venta->subsidio()->subsidio(); - break; - case 'pago': - $pago = $venta->subsidio()->pago(); - break; - default: - $pago = null; - } - echo view('ventas.subsidios.pagar', compact('venta', 'pago')); - } - public static function do_pagar() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $tipo = post('tipo'); - switch($tipo) { - case 'subsidio': - $pago = $venta->subsidio()->subsidio(); - break; - case 'pago': - $pago = $venta->subsidio()->pago(); - break; - default: - $pago = null; - } - $pago->valor = post('valor'); - $tipo = model(TipoEstadoPago::class)->where('descripcion', 'depositado')->findOne(); - $data = [ - 'pago' => $pago->id, - 'fecha' => $f->format('Y-m-d'), - 'estado' => $tipo->id - ]; - $estado = model(EstadoPago::class)->create($data); - $pago->save(); - $estado->save(); - header('Location: ' . nUrl('ventas', 'show', ['venta' => $venta->id])); - } - public static function abonar() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - $tipo = get('tipo'); - switch($tipo) { - case 'subsidio': - $pago = $venta->subsidio()->subsidio(); - break; - case 'pago': - $pago = $venta->subsidio()->pago(); - break; - default: - $pago = null; - } - echo view('ventas.subsidios.abonar', compact('venta', 'pago')); - } - public static function do_abonar() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $tipo = post('tipo'); - switch($tipo) { - case 'subsidio': - $pago = $venta->subsidio()->subsidio(); - break; - case 'pago': - $pago = $venta->subsidio()->pago(); - break; - default: - $pago = null; - } - $pago->valor = post('valor'); - $tipo = model(TipoEstadoPago::class)->where('descripcion', 'abonado')->findOne(); - $data = [ - 'pago' => $pago->id, - 'fecha' => $f->format('Y-m-d'), - 'estado' => $tipo->id - ]; - $estado = model(EstadoPago::class)->create($data); - $pago->save(); - $estado->save(); - header('Location: ' . nUrl('ventas', 'show', ['venta' => $venta->id])); - } -} diff --git a/app_old/app/Controller/Temas.php b/app_old/app/Controller/Temas.php deleted file mode 100644 index 24b121a..0000000 --- a/app_old/app/Controller/Temas.php +++ /dev/null @@ -1,111 +0,0 @@ -orderByAsc('descripcion')->findMany(); - return view('temas.add', compact('proyectos')); - } - public static function agregar() - { - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $data = [ - "proyecto_id" => post('proyecto'), - "inicio" => $f->format('Y-m-d'), - "texto" => post('texto') - ]; - $tema = model(Tema::class)->create($data); - - $tema->save(); - header('Location: ' . url('', ['p' => 'temas', 'a' => 'list'])); - } - public static function list() - { - $temas = model(Tema::class)->findMany(); - $t = Carbon::today(config('app.timezone')); - foreach ($temas as $i => $tema) { - if ($tema->cierre()->year != -1 and $t->diff($tema->cierre())->days > 10) { - unset($temas[$i]); - } - } - $temas = array_values($temas); - usort($temas, function($a, $b) { - $p = strcmp($a->proyecto()->descripcion, $b->proyecto()->descripcion); - if ($p == 0) { - $f = $b->inicio()->diff($a->inicio())->format('%r%a'); - if ($f == 0) { - return $a->id - $b->id; - } - return $f; - } - return $p; - }); - - return view('temas.list', compact('temas')); - } - public static function edit() - { - $id = get('tema'); - $tema = model(Tema::class)->findOne($id); - $proyectos = model(Proyecto::class)->orderByAsc('descripcion')->findMany(); - return view('temas.edit', compact('tema', 'proyectos')); - } - public static function editar() - { - $id = get('tema'); - $tema = model(Tema::class)->findOne($id); - - $proyecto = post('proyecto'); - $changed = false; - if ($tema->proyecto_id != $proyecto) { - $tema->proyecto_id = $proyecto; - $changed = true; - } - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - if ($tema->inicio() != $f) { - $tema->inicio = $f->format('Y-m-d'); - $changed = true; - } - $texto = post('texto'); - if ($tema->texto != $texto) { - $tema->texto = $texto; - $changed = true; - } - - if ($changed) { - $tema->save(); - } - header('Location: ' . url('', ['p' => 'temas', 'a' => 'list'])); - } - public static function cerrar() - { - $id = get('tema'); - $tema = model(Tema::class)->findOne($id); - $f = Carbon::today(config('app.timezone')); - $tema->cierre = $f->format('Y-m-d'); - - $tema->save(); - header('Location: ' . url('', ['p' => 'temas', 'a' => 'list'])); - } - public static function abrir() - { - $id = get('tema'); - $tema = model(Tema::class)->findOne($id)->as_array(); - unset($tema['id'], $tema['cierre'], $tema['created_at'], $tema['updated_at']); - - $tema = model(Tema::class)->create($tema); - - $tema->save(); - header('Location: ' . url('', ['p' => 'temas', 'a' => 'list'])); - } -} -?> diff --git a/app_old/app/Controller/Unidades.php b/app_old/app/Controller/Unidades.php deleted file mode 100644 index 9f0da01..0000000 --- a/app_old/app/Controller/Unidades.php +++ /dev/null @@ -1,126 +0,0 @@ -findOne($id); - $len = strlen(post('total')); - - $unis = json_decode(post('unidades')); - $data = []; - foreach ($unis as $n_unidad) { - if ($tipo->tipo()->descripcion == 'departamento') { - $ini = post('piso_ini' . $n_unidad); - $end = post('piso_end' . $n_unidad); - $subtipo = post('linea' . $n_unidad); - $orientacion = post('orientacion' . $n_unidad); - for ($piso = $ini; $piso <= $end; $piso ++) { - $descripcion = $piso . str_pad(post('linea' . $n_unidad), $len, '0', \STR_PAD_LEFT); - - $data []= [ - 'proyecto' => $tipo->proyecto()->id, - 'tipo' => $tipo->tipo()->id, - 'subtipo' => $subtipo, - 'piso' => $piso, - 'descripcion' => $descripcion, - 'abreviacion' => $tipo->abreviacion, - 'm2' => $tipo->m2, - 'terraza' => $tipo->terraza, - 'logia' => $tipo->logia, - 'orientacion' => $orientacion, - 'pt' => $tipo->id - ]; - } - } else { - $descripcion = post('descripcion' . $n_unidad); - $piso = post('piso' . $n_unidad); - $data []= [ - 'proyecto' => $tipo->proyecto()->id, - 'tipo' => $tipo->tipo()->id, - 'piso' => $piso, - 'descripcion' => $descripcion, - 'abreviacion' => $tipo->abreviacion, - 'm2' => $tipo->m2, - 'terraza' => $tipo->terraza, - 'logia' => $tipo->logia, - 'pt' => $tipo->id - ]; - } - } - - foreach ($data as $uni) { - $unidad = model(Unidad::class) - ->where('descripcion', $uni['descripcion']) - ->where('proyecto', $uni['proyecto']) - ->where('tipo', $uni['tipo']) - ->findOne(); - if ($unidad) { - continue; - } - $unidad = model(Unidad::class)->create($uni); - $unidad->save(); - } - header('Location: ' . url('', ['p' => 'proyectos', 'a' => 'list_unidades', 'proyecto' => $tipo->proyecto()->id])); - } - public static function edit() - { - $id = get('unidad'); - $unidad = model(Unidad::class)->findOne($id); - $tipos = model(ProyectoTipoUnidad::class)->where('proyecto', $unidad->proyecto()->id)->findMany(); - $abreviaciones = ['N', 'NE', 'E', 'SE', 'S', 'SO', 'O', 'NO']; - $descripciones = ['Norte', 'Noreste', 'Este', 'Sureste', 'Sur', 'Suroeste', 'Oeste', 'Noroeste']; - $orientaciones = []; - foreach ($abreviaciones as $i => $ab) { - $orientaciones []= (object) ['abreviacion' => $ab, 'descripcion' => $descripciones[$i]]; - } - - return view('proyectos.unidades.edit', compact('unidad', 'tipos', 'orientaciones')); - } - public static function editar() - { - $id = get('unidad'); - $unidad = model(Unidad::class)->findOne($id); - - $change = false; - $fields = ['descripcion', 'tipo', 'piso', 'linea', 'orientacion']; - foreach ($fields as $field) { - $f = $field; - if ($f == 'tipo') { - $f = 'pt'; - } - if ($f == 'linea') { - $f = 'subtipo'; - } - if ($unidad->{$f} != post($field)) { - $unidad->{$f} = post($field); - $change = true; - } - } - - if ($change) { - $unidad->save(); - } - header('Location: ' . nUrl('proyectos', 'list_unidades', ['proyecto' => $unidad->proyecto()->id])); - } - public static function remove() - { - $id = get('unidad'); - $unidad = model(Unidad::class)->findOne($id); - $unidad->delete(); - - $id = get('proyecto'); - header('Location: ' . nUrl('proyectos', 'list_unidades', ['proyecto' => $id])); - } -} -?> diff --git a/app_old/app/Controller/UnidadesBloqueadas.php b/app_old/app/Controller/UnidadesBloqueadas.php deleted file mode 100644 index 9bd4107..0000000 --- a/app_old/app/Controller/UnidadesBloqueadas.php +++ /dev/null @@ -1,83 +0,0 @@ -findMany(); - echo view('ventas.operadores.unidades.list', compact('proyectos')); - } - public static function add() - { - $proyectos = model(Proyecto::class)->findMany(); - echo view('ventas.operadores.unidades.add', compact('proyectos')); - } - public static function bloquear() - { - $operador = model(ProyectoAgente::class)->findOne(get('operador')); - echo view('ventas.operadores.unidades.bloquear', compact('operador')); - } - public static function do_bloquear() - { - $operador = model(ProyectoAgente::class)->findOne(get('operador')); - $fecha = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $unidades = self::getUnidades([], 'departamentos', 1); - $unidades = self::getUnidades($unidades, 'estacionamientos', 2); - $unidades = self::getUnidades($unidades, 'bodegas', 3); - if (post('unidad') != null) { - foreach (post('unidad') as $u) { - $unidad = model(Unidad::class)->findOne($u); - if (array_search($unidad, $unidades) === false) { - $unidades []= $unidad; - } - } - } - - foreach ($unidades as $unidad) { - $data = [ - 'agente' => $operador->id, - 'unidad' => $unidad->id - ]; - $ub = model(UnidadBloqueada::class)->create($data); - $ub->new($fecha); - } - header('Location: ' . nUrl('unidades_bloqueadas', 'list')); - } - protected static function getUnidades(array $unidades, string $name, int $tipo): array - { - if (trim(post($name)) == '') { - return $unidades; - } - $unis = []; - $separators = [PHP_EOL, ';', ',', '-']; - foreach ($separators as $separator) { - if (strpos(post($name), $separator) !== false) { - $unis = explode($separator, post($name)); - break; - } - } - if (count($unis) == 0) { - return $unidades; - } - array_walk($unis, function(&$item) { - $item = trim($item); - $item = model(Unidad::class)->where('descripcion', $item)->where('tipo', 1)->findOne(); - }); - foreach ($unis as $uni) { - if (array_search($uni, $unidades) === false) { - $unidades []= $uni; - } - } - return $unidades; - } -} diff --git a/app_old/app/Controller/Ventas.php b/app_old/app/Controller/Ventas.php deleted file mode 100644 index 31f1e61..0000000 --- a/app_old/app/Controller/Ventas.php +++ /dev/null @@ -1,605 +0,0 @@ -findOne($proyecto); - $ventas = $proyecto->ventas(); - self::sort($ventas); - return view('ventas.list', compact('proyecto', 'ventas')); - } - protected static function sort(&$ventas) - { - $sort = get('sort'); - if ($sort == null) { - $sort = 'departamento'; - } - $direction = get('sort_dir'); - if ($direction == null) { - $direction = 1; - } - switch ($sort) { - case 'departamento': - usort($ventas, function($a, $b) use ($direction) { - return ($a->propiedad()->unidad()->descripcion - $b->propiedad()->unidad()->descripcion) * $direction; - }); - break; - case 'propietario': - usort($ventas, function($a, $b) use ($direction) { - $pa = trim($a->propietario()->nombreCompleto(true), ', '); - $pb = trim($b->propietario()->nombreCompleto(true), ', '); - return $direction * strcasecmp($pa, $pb); - }); - break; - case 'valor_uf': - usort($ventas, function($a, $b) use ($direction) { - return $direction * ($a->valor_uf - $b->valor_uf); - }); - break; - case 'uf_m2': - usort($ventas, function($a, $b) use ($direction) { - return $direction * ($a->uf_m2() - $b->uf_m2()); - }); - break; - case 'fecha_venta': - usort($ventas, function($a, $b) use ($direction) { - return ($a->fecha()->timestamp - $b->fecha()->timestamp) * $direction; - }); - break; - } - if ($direction == 'desc') { - $ventas = array_reverse($ventas); - } - } - public static function listProyectos() - { - $proyectos = model(Proyecto::class) - ->select('proyecto.*') - ->join('estado_proyecto', ['estado.proyecto', '=', 'proyecto.id'], 'estado') - ->join('tipo_estado_proyecto', ['tipo.id', '=', 'estado.estado'], 'tipo') - ->join('etapa_proyecto', ['etapa.id', '=', 'tipo.etapa'], 'etapa') - ->whereGte('etapa.orden', 4) - ->orderByAsc('proyecto.descripcion') - ->groupBy('proyecto.id') - ->findMany(); - echo view('ventas.proyectos', compact('proyectos')); - } - public static function show() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - - return view('ventas.show', compact('venta')); - } - public static function new() - { - $proyectos = model(Proyecto::class) - ->select('proyecto.*') - ->join('estado_proyecto', ['estado.proyecto', '=', 'proyecto.id'], 'estado') - ->join('tipo_estado_proyecto', ['tipo.id', '=', 'estado.estado'], 'tipo') - ->join('etapa_proyecto', ['etapa.id', '=', 'tipo.etapa'], 'etapa') - ->whereGte('etapa.orden', 3) - ->orderByAsc('proyecto.descripcion') - ->groupBy('proyecto.id') - ->findMany(); - $regiones = model(Region::class)->order_by_asc('numeracion')->findMany(); - return view('ventas.add', compact('proyectos', 'regiones')); - } - public static function agregar() - { - error_log(var_export(post(), true)); - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $t = Carbon::today(config('app.timezone')); - $uf = uf($f); - error_log(var_export($uf, true)); - - $calle = trim(post('calle')); - $numero = post('numero'); - $extra = trim(post('extra')); - $comuna = post('comuna'); - $direccion = model(Direccion::class) - ->where('calle', $calle) - ->where('numero', $numero) - ->where('extra', $extra) - ->where('comuna', $comuna) - ->findOne(); - if (!$direccion) { - $direccion = model(Direccion::class)->create(); - $direccion->calle = $calle; - $direccion->numero = $numero; - $direccion->extra = $extra; - $direccion->comuna = $comuna; - $direccion->save(); - } - - list($rut, $dv) = explode('-', str_replace('.', '', post('rut'))); - $propietario = model(Propietario::class)->where('rut', $rut)->findOne(); - if (!$propietario) { - $propietario = model(Propietario::class)->create(); - $propietario->rut = $rut; - $propietario->dv = $dv; - $propietario->nombres = trim(post('nombres')); - $propietario->apellido_paterno = trim(post('paterno')); - $propietario->apellido_materno = trim(post('materno')); - $propietario->direccion = $direccion->id; - if (post('otro') != null) { - $propietario->otro = 1; - } - - $propietario->save(); - } - - $unis = json_decode(post('unidades')); - $id_principal = array_shift($unis); - $principal = model(Unidad::class)->findOne(post('unidad' . $id_principal)); - // Revisar si existe la propiedad y si está vigente. - $propiedad = model(Propiedad::class)->create(); - $propiedad->unidad_principal = $principal->id; - $propiedad->save(); - $data = [ - 'propiedad' => $propiedad->id, - 'unidad' => $principal->id, - 'principal' => 1 - ]; - $pu = model(PropiedadUnidad::class)->create($data); - $pu->save(); - foreach ($unis as $id_unidad) { - $data = [ - 'propiedad' => $propiedad->id, - 'unidad' => post('unidad' . $id_unidad), - 'principal' => 0 - ]; - $pu = model(PropiedadUnidad::class)->create($data); - $pu->save(); - } - - $venta = model(Venta::class)->create(); - $venta->propietario = $propietario->rut; - $venta->propiedad = $propiedad->id; - if (post('pie')) { - $pie = model(Pie::class)->create(); - $pie->valor = post('pie'); - $pie->fecha = $f->format('Y-m-d'); - $pie->cuotas = post('cuotas'); - if ($uf->total > 0) { - $pie->uf = $uf->uf->value; - } - $pie->save(); - - $venta->pie = $pie->id; - } - if (post('bono_pie')) { - $bono = model(BonoPie::class)->create(); - $bono->valor = post('bono_pie'); - - $pago = model(Pago::class)->create(); - $pago->fecha = $f->format('Y-m-d'); - if ($uf->total > 0) { - $pago->uf = $uf->uf->value; - } - $pago->valor = $bono->valor * $uf->uf->value; - $pago->tipo = 8; - $pago->new(); - - $bono->pago = $pago->id; - $bono->save(); - - $venta->bono_pie = $bono->id; - } - if (post('credito')) { - $pago = model(Pago::class)->create(); - $pago->fecha = $f->format('Y-m-d'); - if ($uf->total > 0) { - $pago->uf = $uf->uf->value; - } - $pago->valor = post('credito') * $uf->uf->value; - $pago->tipo = 2; - $pago->new(); - - $credito = model(Credito::class)->create(); - $credito->pago = $pago->id; - $credito->save(); - - $venta->credito = $credito->id; - } - - $venta->fecha = $f->format('Y-m-d'); - $venta->valor_uf = str_replace(',', '.', post('valor')); - $venta->fecha_ingreso = $t->format('Y-m-d'); - if (post('operador') != 0) { - $venta->agente = post('operador'); - } - if ($uf->total > 0) { - $venta->uf = $uf->uf->value; - } - $venta->new(); - - if (post('promociones') != 0) { - $promos = json_decode(post('promociones')); - foreach ($promos as $id_promo) { - $promocion = model(Promocion::class)->findOne(post('promocion' . $id_promo)); - $promo = model(PromocionVenta::class)->create(); - $promo->promocion = $promocion->id; - $promo->venta = $venta->id; - $promo->valor = post('promo' . $id_promo); - $promo->save(); - } - } - header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); - } - public static function edit() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - $proyectos = model(Proyecto::class)->order_by_asc('descripcion')->findMany(); - $regiones = model(Region::class)->order_by_asc('numeracion')->findMany(); - return view('ventas.edit', compact('venta', 'proyectos', 'regiones')); - } - public static function editar() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $uf = uf($f); - - $valor = correctNumber(post('valor')); - $change = false; - if ($venta->fecha != $f->format('Y-m-d')) { - $venta->fecha = $f->format('Y-m-d'); - $venta->uf = $uf->uf->value; - $change = true; - } - if ($venta->valor_uf != $valor) { - $venta->valor_uf = $valor; - $change = true; - } - if ($change) { - $venta->save(); - } - - $direccion = $venta->propietario()->direccion(); - $calle = post('calle'); - $numero = post('numero'); - $extra = post('extra'); - $comuna = post('comuna'); - $change = false; - if ($direccion->calle != $calle) { - $direccion->calle = $calle; - $change = true; - } - if ($direccion->numero != $numero) { - $direccion->numero = $numero; - $change = true; - } - if ($direccion->extra != $extra) { - $direccion->extra = $extra; - $change = true; - } - if ($direccion->comuna != $comuna) { - $direccion->comuna = $comuna; - $change = true; - } - if ($change) { - $direccion->save(); - } - - $propietario = $venta->propietario(); - list($rut, $dv) = explode('-', str_replace('.', '', post('rut'))); - $nombres = post('nombres'); - $paterno = post('paterno'); - $materno = post('materno'); - $change = false; - if ($propietario->rut != $rut) { - $propietario->rut = $rut; - $propietario->dv = $dv; - $venta->propietario = $rut; - $venta->save(); - $change = true; - } - if ($propietario->nombres != $nombres) { - $propietario->nombres = $nombres; - $change = true; - } - if ($propietario->apellido_paterno != $paterno) { - $propietario->apellido_paterno = $paterno; - $change = true; - } - if ($propietario->apellido_materno != $materno) { - $propietario->apellido_materno = $materno; - $change = true; - } - if ($change) { - $propietario->save(); - } - - $unidades = json_decode(post('unidades')); - if (count($unidades) > 0) { - $propiedad = $venta->propiedad(); - $ests = explode(';', $propiedad->estacionamientos); - $bods = explode(';', $propiedad->bodegas); - $change = false; - foreach ($unidades as $n) { - $id = post('unidad' . $n); - $unidad = model(Unidad::class)->findOne($id); - if ($unidad->tipo == 1 and $propiedad->unidad_principal != $unidad->id) { - $propiedad->unidad_principal = $unidad->id; - $change = true; - } - if ($unidad->tipo == 2 and array_search($unidad->id, $ests) === false) { - $ests []= $unidad->id; - } - if ($unidad->tipo == 3 and array_search($unidad->id, $bods) === false) { - $bods []= $unidad->id; - } - } - $ests = implode(';', $ests); - $bods = implode(';', $bods); - if ($propiedad->estacionamientos != $ests) { - $propiedad->estacionamientos = $ests; - $change = true; - } - if ($propiedad->bodegas != $bods) { - $propiedad->bodegas = $bods; - $change = true; - } - if ($change) { - $propiedad->save(); - } - } - - if (post('pie')) { - $pie = $venta->pie(); - $valor = correctNumber(post('pie')); - $cuotas = post('cuotas'); - $change = false; - if ($pie->valor != $valor) { - $pie->valor = $valor; - $change = true; - } - if ($pie->cuotas != $cuotas) { - $pie->cuotas = $cuotas; - $change = true; - } - if ($change) { - $pie->save(); - } - } - - $credito = $venta->credito(); - $valor = post('credito'); - header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); - } - public static function desistir() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - - return view('ventas.desist', compact('venta')); - } - public static function desistiendo() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $valor = correctNumber(post('pago')); - $uf = uf($f); - - $venta->estado = 0; - $tipo = model(TipoEstadoVenta::class)->where('descripcion', 'desistida')->findOne(); - $data = [ - 'venta' => $venta->id, - 'estado' => $tipo->id, - 'fecha' => $f->format('Y-m-d') - ]; - $estado = model(EstadoVenta::class)->create($data); - $propiedad = $venta->propiedad(); - $propiedad->estado = 0; - $pago = model(Pago::class)->create(); - $pago->fecha = $f->format('Y-m-d'); - $pago->valor = (double) $valor; - $pago->uf = $uf->uf->value; - $pago->tipo = 1; - - $pago->new(); - $propiedad->save(); - $estado->save(); - $venta->resciliacion = $pago->id; - $venta->save(); - header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); - } - public static function ceder() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - - return view('ventas.ceder', compact('venta')); - } - public static function cediendo() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - $nueva_venta = model(Venta::class)->create(); - - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - - list($rut, $dv) = explode('-', str_replace('.', '', post('rut'))); - $propietario = model(Propietario::class)->where('rut', $rut)->findOne(); - if (!$propietario) { - $propietario = model(Propietario::class)->create(); - $propietario->rut = $rut; - $propietario->dv = $dv; - $propietario->nombres = trim(post('nombres')); - $propietario->apellido_paterno = trim(post('paterno')); - $propietario->apellido_materno = trim(post('materno')); - $propietario->direccion = $direccion->id; - if (post('otro') != null) { - $propietario->otro = 1; - } - - $propietario->save(); - } - - $nueva_venta->fecha_ingreso = $f->format(); - $nueva_venta->estado = 1; - $cols = [ - 'propiedad', - 'pie', - 'bono_pie', - 'credito', - 'escritura', - 'subsidio', - 'fecha', - 'valor_uf', - 'agente', - 'uf' - ]; - foreach ($cols as $col) { - $nueva_venta->{$col} = $venta->{$col}; - } - $nueva_venta->new(); - - $venta->estado = -1; - $tipo = model(TipoEstadoVenta::class)->where('descripcion', 'cedida')->findOne(); - $data = [ - 'venta' => $venta->id, - 'estado' => $tipo->id, - 'fecha' => $f->format('Y-m-d') - ]; - $estado = model(EstadoVenta::class)->create($data); - $estado->save(); - - $venta->save(); - header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); - } - public static function entregar() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - - return view('ventas.entregar', compact('venta')); - } - public static function consolidacion() - { - if (get('proyecto')) { - $id_proyecto = get('proyecto'); - $proyecto = model(Proyecto::class)->findOne($id_proyecto); - - $ventas = $proyecto->ventas(); - set_time_limit(count($ventas)); - - $f = Carbon::today(config('app.timezone')); - setlocale(LC_TIME, 'es'); - - return view('ventas.consolidacion.show', compact('ventas', 'f')); - } else { - $proyectos = model(Proyecto::class)->order_by_asc('descripcion')->find_many(); - return view('ventas.consolidacion.proyectos', compact('proyectos')); - } - } - public static function devolucion() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - $uf = uf(Carbon::now(config('app.config')))->uf->value; - $valor = round($venta->saldo() * $uf); - - return view('ventas.devolucion', compact('venta', 'valor', 'uf')); - } - public static function devolver() - { - $id = get('venta'); - $venta = model(Venta::class)->findOne($id); - - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $uf = uf($f); - $valor = correctNumber(post('valor')); - - $data = [ - 'fecha' => $f->format('Y-m-d'), - 'valor' => $valor, - 'tipo' => 1, - 'uf' => $uf->uf->value, - 'identificador' => post('identificador'), - 'banco' => 0 - ]; - - $banco = model(Banco::class)->where('nombre', post('banco'))->findOne(); - if ($banco) { - $data['banco'] = $banco->id; - } - - $pago = model(Pago::class)->create($data); - $pago->newPagado(); - - $venta->devolucion = $pago->id; - $venta->save(); - header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); - } - public static function resciliaciones() - { - $resciliaciones = model(Venta::class)->where('estado', 0)->findMany(); - - return view('ventas.resciliaciones', compact('resciliaciones')); - } - public static function firmar() - { - $venta = \model(Venta::class)->findOne(get('venta')); - return view('ventas.firmar', compact('venta')); - } - public static function firmando() - { - $venta = \model(Venta::class)->findOne(get('venta')); - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $venta->firmar($f); - header('Location: ' . nUrl('ventas', 'show', ['venta' => $venta->id])); - - } - public static function archivar() - { - $venta = \model(Venta::class)->findOne(get('venta')); - return view('ventas.archivar', compact('venta')); - } - public static function archivando() - { - $venta = \model(Venta::class)->findOne(get('venta')); - $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); - $venta->archivar($f); - header('Location: ' . nUrl('ventas', 'show', ['venta' => $venta->id])); - } -} -?> diff --git a/app_old/app/Definition/Controller.php b/app_old/app/Definition/Controller.php deleted file mode 100644 index c0e3dae..0000000 --- a/app_old/app/Definition/Controller.php +++ /dev/null @@ -1,31 +0,0 @@ -isPublic()) { - - return self::{$action}(); - } - } - if (self::$default == null and \method_exists(self::class, 'setDefault')) { - self::setDefault(); - } - if (self::$default == null) { - header('Location: .'); - return; - } - return self::$default; - } -} -?> \ No newline at end of file diff --git a/app_old/app/Definition/hasEstado.php b/app_old/app/Definition/hasEstado.php deleted file mode 100644 index 014fe8a..0000000 --- a/app_old/app/Definition/hasEstado.php +++ /dev/null @@ -1,38 +0,0 @@ -getTable(); - $self = Stringy::create(get_class($this)); - $ns = $self->substr(0, $self->indexOfLast('\\')); - $self = $self->substr($self->indexOfLast('\\') + 1); - $column = $self->underscored(); - $class = $ns . '\\Estado' . $self; - if (substr($table, -1, 1) == 's') { - $column .= '_id'; - } - - return $this->has_many($class, $column)->findMany(); - } - public function estado() - { - $table = $this->getTable(); - $self = Stringy::create(get_class($this)); - $ns = $self->substr(0, $self->indexOfLast('\\')); - $self = $self->substr($self->indexOfLast('\\') + 1); - $column = $self->underscored(); - $class = $ns . '\\Estado' . $self; - if (substr($table, -1, 1) == 's') { - $column .= '_id'; - } - - $id = $this->has_many($class, $column)->max('id'); - return $this->has_many($class, $column)->findOne($id); - } -} -?> \ No newline at end of file diff --git a/app_old/app/Definition/hasRUT.php b/app_old/app/Definition/hasRUT.php deleted file mode 100644 index 8ba3d80..0000000 --- a/app_old/app/Definition/hasRUT.php +++ /dev/null @@ -1,20 +0,0 @@ -rut) . '-' . $this->dv; - } -} -?> \ No newline at end of file diff --git a/app_old/app/Exception/PropertyNotFound.php b/app_old/app/Exception/PropertyNotFound.php deleted file mode 100644 index a35e537..0000000 --- a/app_old/app/Exception/PropertyNotFound.php +++ /dev/null @@ -1,16 +0,0 @@ -class = $class; - $this->property = $property; - $msg = "Property '" . $property . "' for class '" . $class . "' not found."; - parent::__construct($msg); - } -} \ No newline at end of file diff --git a/app_old/app/Helper/Color.php b/app_old/app/Helper/Color.php deleted file mode 100644 index 68c3199..0000000 --- a/app_old/app/Helper/Color.php +++ /dev/null @@ -1,169 +0,0 @@ -color = $args[0]; - break; - } - $this->color = $this->hex2dec($this->hex2array($args[0])); - break; - case 2: - if (is_array($args[0])) { - $this->color = $args[0]; - $this->color []= $args[1]; - break; - } - $color = $this->hex2array($args[0]); - $color []= $args[1]; - $this->color = $this->hex2dec($color); - break; - case 3: - case 4: - if (is_numeric($args[0])) { - $this->color = $args; - break; - } - $this->color = $this->hex2dec($args); - break; - } - } - protected function hex2dec(array $hex) - { - return array_map('hexdec', $hex); - } - protected function dec2hex(array $bin) - { - return array_map('dechex', $bin); - } - protected function hex2array(string $hex) - { - switch (strlen($hex)) { - case 3: - case 4: - case 6: - case 7: - return str_split($hex, 2); - default: - throw new OutOfBoundsException('The string ' . $hex . ' is not a correct color code.'); - } - } - protected function array2hex(array $arr) - { - return implode('', $arr); - } - - public function convertTo($type) - { - switch (strtolower($type)) { - case 'hex': - if (is_numeric($this->color[0])) { - $this->color = $this->dec2hex($this->color); - } - break; - case 'dec': - if (!is_numeric($this->color[0])) { - $this->color = $this->hex2dec($this->color); - } - break; - default: - throw new InvalidArgumentException($type . ' is not a valid argument.'); - } - } - public function add($base_color, $amount) - { - $changed = false; - if (!is_numeric($this->color)) { - $this->convertTo('dec'); - $changed = true; - } - switch (strtolower($base_color)) { - case 'r': - $base_color = 0; - break; - case 'g': - $base_color = 1; - break; - case 'b': - $base_color = 2; - break; - case 'a': - $base_color = 3; - break; - default: - throw new OutOfBoundsException("Base color '" . $base_color . "' does not exist."); - } - $this->color[$base_color] += $amount; - if ($changed) { - $this->convertTo('hex'); - } - } - public function print() - { - $this->convertTo('hex'); - return implode('', $this->color); - } - public function toRGB() - { - $changed = false; - $this->convertTo('dec'); - $str = 'rgb(' . implode(', ', array_map(function($a) { - return round($a, 2); - }, $this->color)) . ')'; - if ($changed) { - $this->convertTo('hex'); - } - return $str; - } - public function __toString() - { - return $this->print(); - } - public function toArray() - { - return $this->color; - } - public function toVector() - { - $changed = false; - $this->convertTo('dec'); - $arr = $this->toArray(); - if ($changed) { - $this->convertTo('hex'); - } - return $arr; - } - public function luminosity() - { - $changed = false; - $this->convertTo('dec'); - //sqrt( 0.299*R^2 + 0.587*G^2 + 0.114*B^2 ) - $str = sqrt(0.299 * pow($this->color[0], 2) + 0.587 * pow($this->color[1], 2) + 0.114 * pow($this->color[2], 2)) / 255 * 100; - if ($changed) { - $this->convertTo('hex'); - } - return $str; - } - public function isDark() - { - if ($this->luminosity() < 50) { - return true; - } - return false; - } - public function isBright() - { - if ($this->luminosity() > 75) { - return true; - } - return false; - } -} diff --git a/app_old/app/Helper/Line.php b/app_old/app/Helper/Line.php deleted file mode 100644 index 02cc0d9..0000000 --- a/app_old/app/Helper/Line.php +++ /dev/null @@ -1,61 +0,0 @@ -origin = $point_a; - $this->length = $this->distance($point_a, $point_b); - $this->direction = $this->gradient($point_a, $point_b); - } - public function origin() - { - return $this->origin; - } - public function length() - { - return $this->length; - } - public function direction() - { - return $this->direction; - } - /** - * Calculate the gradient to move from point a to point b - * @param array $point_a [Vector] - * @param array $point_b [Vector] - * @return array [Vector] - */ - public function gradient($point_a, $point_b) - { - $distance = $this->distance($point_a, $point_b); - return array_map(function($a, $b) use ($distance) { - return ($a - $b) / $distance; - }, $point_b, $point_a); - } - // sqrt((a0-b0)²+(a1-b1)²+(a2-b2)²) - public function distance($point_a, $point_b) - { - return sqrt(array_sum(array_map(function($a, $b) { - return pow($a - $b, 2); - }, $point_a, $point_b))); - } - /** - * Move from point in the direction of the gradient acording to step_size - * @param array $point [Vector] - * @param int $step_size [step size] - * @return array [Vector] - */ - public function move($point, $step_size) - { - $gradient = $this->direction; - return array_map(function($a, $b) use ($step_size) { - return $a + $b * $step_size; - }, $point, $gradient); - } -} diff --git a/app_old/app/Helper/functions.php b/app_old/app/Helper/functions.php deleted file mode 100644 index 1ba6021..0000000 --- a/app_old/app/Helper/functions.php +++ /dev/null @@ -1,128 +0,0 @@ - "http://{$remote->getIP()}:8080", - 'headers' => [ - 'Accept' => 'application/json' - ] - ])))->getUF($date); -} -function format($tipo, $valor, $format = null, $print = false) { - if ($valor === null) { - $valor = 0; - } - if (strtolower($tipo) == 'localdate') { - $d = \Carbon\Carbon::parse($valor); - $d->locale('es_ES'); - if ($format == null) { - $format = 'DD [de] MMMM [de] YYYY'; - } - return $d->isoFormat($format); - } - if (method_exists('\App\Helper\Format', $tipo)) { - if ($print) { - return \App\Helper\Format::$tipo($valor, $print); - } else { - return \App\Helper\Format::$tipo($valor); - } - } else { - switch ($tipo) { - case 'localDate': - if (isset($format)) { - $intl = new IntlDateFormatter('es_ES', IntlDateFormatter::SHORT, IntlDateFormatter::SHORT, 'America/Santiago'); - $intl->setPattern($format); - return ucwords($intl->format($valor)); - } - case 'percent': - return \App\Helper\Format::number($valor, 2); - case 'rut': - return \App\Helper\Format::number($valor, 0); - } - } -} -function model(string $class_name) { - return \Model::factory($class_name); -} -function correctNumber($number) { - if (strpos($number, ',') !== false) { - return str_replace(',', '.', str_replace('.', '', $number)); - } elseif (substr_count($number, '.') > 1) { - return str_replace('.', '', $number); - } - return $number; -} -function parseRanges($range, $numeric = true, $negatives = true) { - $rns = preg_split('/[,;]+/', $range); - $data = []; - foreach ($rns as $p) { - if (!$negatives) { - if (strpos($p, '-') !== false) { - list($ini, $end) = explode('-', $p); - $data = array_merge($data, range($ini, $end)); - continue; - } - } - if ($numeric) { - $data []= (float) $p; - continue; - } - $data []= $p; - } - return $data; -} -function nUrl($p, $a = null, $data = null) { - $query = ['p' => $p]; - if ($a != null) { - $query['a'] = $a; - if ($data != null) { - $query = array_merge($query, $data); - } - } - return url('', $query); -} -function api($p, $a, $data = null) { - $url = baseUrl() . '/' . 'api'; - $url .= '?' . 'p=' . $p . '&a=' . $a . '&API_KEY=1'; - if ($data != null) { - $url .= '&' . implode('&', array_map(function($val, $k) { - return $k . '=' . $val; - }, $data)); - } - return $url; -} -function doLog($user, $action, $variables) { - App\Service\Register::log($user, $action, $variables); -} -?> diff --git a/app_old/app/Middleware/Auth.php b/app_old/app/Middleware/Auth.php deleted file mode 100644 index 523c942..0000000 --- a/app_old/app/Middleware/Auth.php +++ /dev/null @@ -1,38 +0,0 @@ -skipRoutes($request) or $this->service->isIn()) { - return $handler->handle($request); - } - return $this->redirect('guest'); - } - - protected function skipRoutes(ServerRequestInterface $request): bool - { - $uri = $request->getUri(); - $route = $uri->getPath(); - $routes = [ - '/guest', - '/auth/login' - ]; - return in_array($route, $routes, true); - } - protected function redirect(string $route): ResponseInterface - { - $response = $this->responseFactory->createResponse(301, 'Not authorized'); - return $this->view->render($response, $route); - } -} diff --git a/app_old/app/Service/Auth.php b/app_old/app/Service/Auth.php deleted file mode 100644 index 7f021ac..0000000 --- a/app_old/app/Service/Auth.php +++ /dev/null @@ -1,165 +0,0 @@ -getCookie(); - } - protected function getCookie() - { - if (isset($_COOKIE['rememberMe'])) { - list($s, $t) = \explode(':', $_COOKIE['rememberMe']); - $this->selector = $s; - $this->token = $t; - } - } - protected function saveCookie() - { - $now = \Carbon\Carbon::now(config('app.timezone')); - $exp = $now->addHours(config('app.login_hours')); - \setcookie('rememberMe', $this->selector . ':' . $this->token, $exp->timestamp); - } - protected function clearCookie() - { - \setcookie('rememberMe', '', \Carbon\Carbon::now(config('app.timezone'))->timestamp); - } - protected function generateToken() - { - $this->selector = bin2hex(\random_bytes(12)); - $this->token = bin2hex(\random_bytes(20)); - } - public function login($username, $password) - { - $user = \Model::factory(User::class)->where('name', $username)->where('enabled', 1)->findOne(); - if ($user !== false) { - if (\password_verify($password, $user->password) === false) { - $this->clearCookie(); - return false; - } - - $this->generateToken(); - $now = \Carbon\Carbon::now(config('app.timezone')); - $exp = $now->addHours(-config('app.login_hours')); - $auth = \Model::factory(\Incoviba\common\Auth::class)->where('user_id', $user->id)->whereGt('time', $exp->timestamp)->where('status', 1)->findOne(); - if ($auth !== false) { - $auth->time('now'); - $auth->selector = $this->selector; - $auth->token($this->token); - $auth->save(); - $this->saveCookie(); - return true; - } - - $auth = \Model::factory(\Incoviba\common\Auth::class)->create(); - $auth->user_id = $user->id; - $auth->time('now'); - $auth->selector = $this->selector; - $auth->token($this->token); - - try { - $auth->save(); - $this->saveCookie(); - return true; - } catch (\Exception $e) { - $this->clearCookie(); - return false; - } - } - return false; - } - public function isIn() - { - if ($this->selector == null) { - return false; - } - $auths = \Model::factory(\Incoviba\common\Auth::class)->where('selector', $this->selector)->findMany(); - if ($auths === false) { - $this->clearCookie(); - return false; - } - foreach ($auths as $auth) { - if (\password_verify($this->token, $auth->token)) { - return $auth->isIn(); - } - } - return false; - } - public function User() - { - if ($this->selector == null) { - return false; - } - $auths = \Model::factory(\Incoviba\common\Auth::class)->where('selector', $this->selector)->findMany(); - if ($auths === false) { - return false; - } - foreach ($auths as $auth) { - if (\password_verify($this->token, $auth->token)) { - return $auth->user(); - } - } - return false; - } - public function hasAccess() - { - if ($this->selector == null) { - return false; - } - $auths = \Model::factory(\Incoviba\common\Auth::class)->where('selector', $this->selector)->findMany(); - if ($auths === false) { - return false; - } - foreach ($auths as $auth) { - if (\password_verify($this->token, $auth->token)) { - return $auth->user()->hasAccess(); - } - } - return false; - } - public function checkAccess($controller, $action = null) - { - if ($this->selector == null) { - return false; - } - $auths = \Model::factory(\Incoviba\common\Auth::class)->where('selector', $this->selector)->findMany(); - if ($auths === false) { - return false; - } - foreach ($auths as $auth) { - if (\password_verify($this->token, $auth->token)) { - return $auth->user()->checkAccess($controller, $action); - } - } - return false; - } - public function logout() - { - $this->clearCookie(); - if ($this->selector == null) { - return true; - } - $auths = \Model::factory(\Incoviba\common\Auth::class)->where('selector', $this->selector)->findMany(); - if ($auths === false) { - return true; - } - foreach ($auths as $auth) { - if (\password_verify($this->token, $auth->token)) { - $auth->status = 0; - try { - $auth->save(); - return true; - } catch (\Exception $e) { - return false; - } - } - } - return true; - } -} diff --git a/app_old/app/Service/Borrador.php b/app_old/app/Service/Borrador.php deleted file mode 100644 index 4f4b3af..0000000 --- a/app_old/app/Service/Borrador.php +++ /dev/null @@ -1,118 +0,0 @@ -cierre = $cierre; - $this->lineas = []; - } - protected function add(string $str, int $new_line = 0) - { - $this->lineas []= $str; - if ($new_line > 0) { - $this->newLine($new_line); - } - } - protected function newLine($n = 1) - { - for ($i = 0; $i < $n; $i ++) { - $this->lineas []= ''; - } - } - protected function load() - { - $this->word = IOFactory::load('borrador-' . $this->cierre->proyecto()->nombre . '.docx'); - } - protected function extract() - { - $this->load(); - $data = []; - foreach ($this->word->getSections() as $section) { - foreach ($section->getElements() as $element) { - $r = $this->elementGet($element); - $data []= $r; - } - } - if (count($data) > 0) { - $this->text = $data; - } - } - protected function elementGet($element) - { - if ($element instanceof TextBreak) { - return PHP_EOL; - } - if ($element instanceof TextRun) { - $data = []; - foreach ($element->getElements() as $e) { - $data []= $this->elementGet($e); - } - return implode('', $data); - } - if (!method_exists($element, 'getText')) { - d($element); - } - return $element->getText(); - } - protected function build() - { - if ($this->text == null) { - $this->extract(); - } - foreach ($this->text as $line) { - if ($line == PHP_EOL) { - $this->newLine(); - continue; - } - if (strpos($line, '[[') !== false) { - $replacer = new Replacer(); - $this->add($replacer->replace($line, $this->cierre)); - continue; - } - $this->add($line); - } - } - public function create() - { - $output = new PhpWord(); - - $output->getSettings()->setDecimalSymbol(','); - $output->getSettings()->setThemeFontLang(new Language(Language::ES_ES)); - - $section = $output->addSection(); - foreach ($this->lineas as $linea) { - if ($linea == '') { - $section->addTextBreak(); - continue; - } - $section->addText($linea); - } - - $output->getSettings()->setTrackRevisions(true); - - $writer = IOFactory::createWriter($output); - $filename = 'Borrador ' . $this->cierre->propietario()->nombreCompleto() . ' con ' . $this->cierre->proyecto()->inmobiliaria()->razon_social . '.docx'; - $writer->save($filename); - } - public function show() - { - $this->build(); - return implode(PHP_EOL, $this->lineas); - } -} -?> \ No newline at end of file diff --git a/app_old/app/Service/DBToModel.php b/app_old/app/Service/DBToModel.php deleted file mode 100644 index 158e85c..0000000 --- a/app_old/app/Service/DBToModel.php +++ /dev/null @@ -1,158 +0,0 @@ -name = $name; - $this->db = \ORM::get_db($name); - } - - public function run() - { - $this->getTables(); - foreach ($this->tables as $table) { - if ($this->createClass($table)) { - echo 'ok
    ', PHP_EOL; - } - } - } - protected function getType($type) - { - if (strpos($type, '(') !== false) { - $type = substr($type, 0, strpos($type, '(')); - } - if (strpos($type, ' ') !== false) { - $type = substr($type, 0, strpos($type, ' ')); - } - switch ($type) { - case 'int': - case 'float': - case 'double': - case 'char': - return trim($type); - case 'date': - case 'datetime': - return trim(strtolower($type)); - case 'varchar': - case 'text': - case 'blob': - return 'string'; - case 'bigint': - case 'tinyint': - case 'enum': - return 'int'; - default: - d($type); - } - } - protected function getTables() - { - $q = "SHOW TABLES"; - $st = $this->db->query($q); - $results = $st->fetchAll(\PDO::FETCH_COLUMN); - $this->tables = []; - foreach ($results as $result) { - $this->tables []= $result; - } - } - protected function getColumns($table) - { - $q = "SHOW COLUMNS FROM `" . $table . "`"; - $st = $this->db->query($q); - $results = $st->fetchAll(\PDO::FETCH_OBJ); - return $results; - } - protected function phpDoc($columns) - { - $str = ['/**']; - $str []= ' *'; - foreach ($columns as $column) { - $str []= ' * @property ' . $this->getType($column->Type) . ' ' . $column->Field; - } - $str []= ' *'; - $str []= ' */'; - - return implode(PHP_EOL, $str); - } - protected function className($table) - { - $name = Stringy::create($table)->upperCamelize(); - return $name; - } - protected function createClass($table) - { - $class = '' . $this->className($table); - $columns = $this->getColumns($table); - $docs = $this->phpDoc($columns); - - $output = ['name}';"; - $output []= '}'; - $output []= '?>'; - - //d(implode(PHP_EOL, $output)); - - $filename = realpath(root() . '/src') . DIRECTORY_SEPARATOR . $class . '.php'; - return file_put_contents($filename, implode(PHP_EOL, $output)); - } - public function create($namespace, $table) - { - $class = '' . $this->className($table); - $columns = $this->getColumns($table); - $docs = $this->phpDoc($columns); - - $namespace = trim($namespace, '\\'); - - $output = ['name}';"; - $output []= '}'; - $output []= '?>'; - $output = implode(PHP_EOL, $output); - - $namespace = explode('\\', $namespace); - array_shift($namespace); - $namespace = implode('/', $namespace); - - $filename = realpath(root() . '/src/' . $namespace) . DIRECTORY_SEPARATOR . $class . '.php'; - - $result = [ - 'result' => false, - 'filename' => $filename, - 'output' => $output - ]; - if (!file_exists($filename)) { - $result['result'] = file_put_contents($filename, $output); - } else { - $result['result'] = true; - } - return json_encode($result); - } - public function list() - { - $this->getTables(); - $output = []; - foreach ($this->tables as $table) { - $output []= ['table' => $table, 'model' => '' . $this->className($table)]; - } - - return json_encode(['models' => $output]); - } -} -?> \ No newline at end of file diff --git a/app_old/app/Service/Factory.php b/app_old/app/Service/Factory.php deleted file mode 100644 index ac7386a..0000000 --- a/app_old/app/Service/Factory.php +++ /dev/null @@ -1,204 +0,0 @@ -class = $class; - $this->is_aggregator = true; - if (is_subclass_of($class, 'Model')) { - $this->is_aggregator = false; - } - } - public function new() - { - $class = $this->class; - if ($this->is_aggregator) { - return new $class(); - } - return model($class)->create(); - } - public function create($data) - { - $class = $this->class; - if ($this->is_aggregator) { - $obj = new $class(); - $obj->create($data); - return $obj; - } - return model($class)->create($data); - } - /** - * [column => value, column => [value, operator]] - * @var array - */ - protected $conditions; - public function where(array $data) - { - if ($this->conditions == null) { - $this->conditions = $data; - return $this; - } - $this->conditions = array_merge($this->conditions, $data); - return $this; - } - /** - * [column, column => order] - * @var array - */ - protected $order; - public function order(array $data) - { - if ($this->order == null) { - $this->order = $data; - return $this; - } - $this->order = array_merge($this->order, $data); - return $this; - } - protected $limit; - public function limit(array $data) - { - if (!isset($data['limit'])) { - $data['limit'] = $data[0]; - } - if (!isset($data['offset'])) { - $data['offset'] = 0; - if (isset($data[1])) { - $data['offset'] = $data[1]; - } - } - $this->limit = (object) ['limit' => $data['limit'], 'offset' => $data['offset']]; - return $this; - } - protected $many; - public function find($many = false) - { - $this->many = $many; - if ($this->is_aggregator) { - return $this->findAggregator(); - } - return $this->findModel(); - } - - protected function findModel() - { - $objs = model($this->class); - $objs = $this->parseLimit($this->parseOrder($this->parseConditions($objs))); - - if ($this->many) { - return $objs->findMany(); - } - return $objs->findOne(); - } - protected function parseConditions($orm) - { - if ($this->conditions == null) { - return $orm; - } - foreach ($this->conditions as $column => $value) { - if (is_array($value)) { - list($value, $op) = $value; - switch ($op) { - case '>': - case 'gt': - $orm = $orm->whereGt($column, $value); - break; - } - } else { - $orm = $orm->where($column, $value); - } - } - return $orm; - } - protected function parseOrder($orm) - { - if ($this->order == null) { - return $orm; - } - foreach ($this->order as $column => $order) { - if (is_numeric($column)) { - $column = $order; - $order = 'asc'; - } - switch (strtolower($order)) { - case 'asc': - default: - $orm = $orm->orderByAsc($column); - break; - case 'desc': - $orm = $orm->orderByDesc($column); - break; - case 'expr': - $orm = $orm->orderByExpr($column); - break; - } - } - return $orm; - } - protected function parseLimit($orm) - { - if ($this->limit == null) { - return $orm; - } - $orm = $orm->limit($this->limit->limit); - if (isset($this->limit->offset)) { - $orm = $orm->offset($this->limit->offset); - } - return $orm; - } - protected function findAggregator() - { - $model = $this->modelName($this->class); - $ids = $this->getIds($model); - $class = $this->class; - if (count($ids) == 0) { - return false; - } - if ($this->many) { - $objs = []; - foreach ($ids as $id) { - $objs []= new $class($id); - } - } else { - $objs = new $class($ids[0]); - } - return $objs; - } - protected function getIds($model) - { - $id = $this->getModelId($model); - $table = $this->getTable($model); - $st = \ORM::forTable($table)->select($id); - $st = $this->parseConditions($st); - $results = $st->findArray(); - $output = array_map(function($a) use($id) { - return $a[$id]; - }, $results); - return $output; - } - protected function modelName($class) - { - $arr = explode("\\", $class); - \array_push($arr, end($arr)); - return implode("\\", $arr); - } - protected function getModelId($model) - { - $table = $this->getTable($model); - $query = "SHOW KEYS FROM {$table} WHERE Key_name = 'PRIMARY'"; - $st = \ORM::getDb()->query($query); - $results = $st->fetchAll(\PDO::FETCH_OBJ); - return $results[0]->Column_name; - } - protected function getTable($model) - { - $arr = explode("\\", $model); - return Stringy::create(end($arr))->toLowerCase() . ''; - } -} diff --git a/app_old/app/Service/Informador.php b/app_old/app/Service/Informador.php deleted file mode 100644 index c64db26..0000000 --- a/app_old/app/Service/Informador.php +++ /dev/null @@ -1,463 +0,0 @@ -title = $title; - } else { - $this->title = 'Informe'; - } - } - - public function addColumn(string $title, $col = '') - { - if ($col == '') { - if ($this->columns == null) { - $i = 0; - } else{ - $i = count($this->columns); - } - $col = $this->mapColumn($i); - } - - if (isset($this->columns[$col])) { - $columns = []; - foreach ($this->columns as $c => $data) { - if (ord($c) < ord($col)) { - $columns[$c] = $data; - } elseif (ord($c) == ord($col)) { - $columns[$col] = $title; - } else { - $columns[chr(ord($c) + 1)] = $data; - } - } - $this->columns = $columns; - } else { - $this->columns[$col] = $title; - } - } - public function mapColumn($n) - { - $letters = range('A', 'Z'); - $max = count($letters); - $r = $n / $max + 1; - $p = floor($r - 1) - 1; - $i = $n % $max; - if ($r >= 2) { - return $letters[$p] . $letters[$i]; - } - return $letters[$i]; - } - public function getColumn($col_title) - { - return array_search($col_title, $this->columns); - } - public function getColumnNumber($col) - { - $letters = range('A', 'Z'); - if (strlen($col) > 1) { - $ls = str_split($col); - $n = 0; - foreach ($ls as $i => $l) { - $n += array_search($l, $letters) + $i * count($letters) + 1; - } - return $n; - } - return array_search($col, $letters); - } - public function addColumns(array $columns) - { - foreach ($columns as $column) { - $this->addColumn($column); - } - } - public function addData(int $row, $data, $col = '') - { - if (!isset($this->data[$row])) { - $this->data[$row] = []; - } - if ($col == '') { - $i = count($this->data[$row]); - $col = $this->mapColumn($i); - } elseif (ctype_print($col)) { - $col = $this->getColumn($col); - } else { - $col = $this->mapColumn($col); - } - - if (isset($this->data[$row][$col])) { - $data_array = []; - foreach ($this->data[$row] as $c => $d) { - if (ord($c) < ord($col)) { - $data_array[$c] = $d; - } elseif (ord($c) == ord($col)) { - $data_array[$col] = $this->parseData($data); - } else { - $data_array[chr(ord($c) + 1)] = $d; - } - } - $this->data[$row] = $data_array; - } else { - $this->data[$row][$col] = $this->parseData($data); - } - } - protected function parseData($data) - { - if ($this->isDate($data)) { - // Date - return Date::PHPToExcel($data); - } - return $data; - } - protected function isDate($data) - { - try { - if (strpos($data, '-') === false) { - return false; - } - $fecha = explode('-', $data); - if (count($fecha) != 3) { - return false; - } - list($year, $month, $day) = $fecha; - if (strlen($year) == 4 and strlen($month) <= 2 and strlen($day) <= 2) { - return true; - } - if (ctype_digit($year) and ctype_digit($month) and ctype_digit($day)) { - $f = Carbon::parse($data, config('app.timezone')); - return true; - } - return false; - } catch(\Exception $e) { - return false; - } - return false; - } - public function addDataRow(int $row, array $data_array) - { - foreach ($data_array as $data) { - $this->addData($row, $data); - } - } - public function addDatas(array $data_matrix) - { - foreach ($data_matrix as $row => $data_array) { - $this->addDataRow($row, $data_array); - } - } - protected function findTitleColumn($title) - { - return array_search($title, $this->columns); - } - public function addFormat($format, $title = '') - { - $col = 'A'; - if ($title == '') { - $i = count($this->col_formats); - $col = $this->mapColumn($i); - } else { - $col = $this->findTitleColumn($title); - } - - if (isset($this->col_formats[$col])) { - $columns = []; - foreach ($this->col_formats as $c => $data) { - if (ord($c) < ord($col)) { - $columns[$c] = $data; - } elseif (ord($c) == ord($col)) { - $columns[$col] = $this->translateFormat($format); - } else { - $columns[chr(ord($c) + 1)] = $data; - } - } - $this->col_formats = $columns; - } else { - $this->col_formats[$col] = $this->translateFormat($format); - } - - uksort($this->col_formats, function($ak, $bk) { - return strcmp($ak, $bk); - }); - } - protected function translateFormat(array $format) - { - $translated = []; - foreach ($format as $category => $values) { - switch ($category) { - case 'numberFormat': - $data = $this->translateNumberFormat($values); - break; - case 'alignment': - $data = $this->translateAlignment($values); - break; - case 'font': - $data = $this->translateFont($values); - break; - case 'fill': - $data = $this->translateFill($values); - break; - case 'borders': - $data = $this->translateBorders($values); - break; - } - $translated[$category] = $data; - } - return $translated; - } - protected function translateNumberFormat(array $values) - { - $translated = []; - foreach ($values as $value) { - switch ($value) { - case 'short-date': - $translated['formatCode'] = 'dd-mm-yyyy'; - break; - case 'date': - $translated['formatCode'] = 'dd mmmm, yyyy'; - break; - case 'thousands': - $translated['formatCode'] = NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1; - break; - case 'pesos': - $translated['formatCode'] = '$ #.###'; - break; - default: - $translated['formatCode'] = $value; - } - } - return $translated; - } - protected function translateAlignment(array $values) - { - $translated = []; - foreach ($values as $type => $value) { - switch ($type) { - case 'horizontal': - switch ($value) { - case 'center': - $new = Alignment::HORIZONTAL_CENTER; - break; - } - break; - case 'vertical': - switch ($value) { - case 'middle': - case 'center': - $new = Alignment::VERTICAL_CENTER; - } - default: - $new = $value; - break; - } - $translated[$type] = $new; - } - return $translated; - } - protected function translateFont(array $values) - { - $translated = []; - foreach ($values as $type => $value) { - switch ($type) { - case 'color': - $new = $this->translateColor($value); - break; - default: - $new = $value; - break; - } - $translated[$type] = $new; - } - return $translated; - } - protected function translateFill(array $values) - { - $translated = []; - foreach ($values as $type => $value) { - switch ($type) { - case 'fillType': - switch ($value) { - case 'solid': - $new = Fill::FILL_SOLID; - break; - default: - $new = $value; - break; - } - break; - case 'color': - $new = $this->translateColor($value); - break; - default: - $new = $value; - break; - } - $translated[$type] = $new; - } - return $translated; - } - protected function translateBorders(array $values) - { - $translated = []; - foreach ($format as $category => $value) { - switch ($category) { - case 'allBorders': - case 'left': - case 'right': - case 'top': - case 'bottom': - case 'diagonal': - case 'vertical': - case 'horizontal': - $data = $this->translateBorder($value); - break; - default: - $data = $value; - } - $translated[$category] = $data; - } - return $translated; - } - protected function translateBorder(array $values) - { - $translated = []; - foreach ($values as $type => $value) { - switch ($type) { - case 'color': - $new = $this->translateColor($value); - break; - default: - $new = $value; - break; - } - $translated[$type] = $new; - } - return $translated; - } - protected function translateColor($color) - { - $color_definitions = [ - 'red' => 'ff0000', - 'light-red' => 'ffcccc', - 'dark-red' => 'a00000' - ]; - if (is_array($color)) { - $t = dechex(255 * $color['transparency'] / 100); - $c = $color_definitions[$color['color']]; - $hex = $t . $c; - return ['argb' => $hex]; - } - return ['rgb' => $color_definitions[$color]]; - } - public function addFormats(array $formats) - { - foreach ($formats as $title => $format) { - $this->addFormat($format, $title); - } - } - public function addTotal(string $col) - { - if (isset($this->columns[$col])) { - $sum = 0; - foreach ($this->data as $row => $data) { - $sum += $data[$col]; - } - $this->totals[$col] = $sum; - } - } - public function addAverage(string $col) - { - $this->addTotal($col); - $this->totals[$col] /= count($this->data); - } - - protected function fillData() - { - foreach ($this->data as $row => $data) { - $this->data[$row] = $this->fillAndSort($data); - } - if (count($this->totals) > 0) { - $this->totals = $this->fillAndSort($this->totals); - } - } - protected function fillAndSort(array $row) - { - foreach ($this->columns as $val) { - if (!isset($row[$val])) { - $row[$val] = ''; - } - } - function sortArrayByArray(Array $array, Array $orderArray) { - $ordered = array(); - foreach($orderArray as $key) { - if(array_key_exists($key, $array)) { - $ordered[$key] = $array[$key]; - unset($array[$key]); - } - } - return $ordered + $array; - } - $row = sortArrayByArray($row, $this->columns); - - return $row; - } - - public function informe() - { - $ea = new Spreadsheet(); - $ea->getProperties()->setCreator('Juan Pablo Vial B.'); - $ea->getProperties()->setTitle($this->title); - $ea->getProperties()->setCompany('Incoviba S.A.'); - - $ews = $ea->getActiveSheet(); - - $ews->fromArray(array($this->columns), '', 'A1'); - $ews->fromArray($this->data, '', 'A2'); - $end = 2; - if ($this->totals != null and count($this->totals) > 0) { - $ews->fromArray($this->totals, '', 'A' . count($data) + 2); - $end = 3; - } - - if ($this->col_formats != null and count($this->col_formats) > 0) { - foreach ($this->col_formats as $col => $format) { - $ews->getStyleByColumnAndRow($this->getColumnNumber($col), 2, $this->getColumnNumber($col), count($this->data) + $end)->applyFromArray($format); - } - } - - for ($col = 0; $col < count($this->columns); $col ++) { - $ews->getColumnDimensionByColumn($col)->setAutoSize(true); - } - - $ews->setAutoFilterByColumnAndRow(0, 1, count($this->columns) - 1, count($this->data)); - - $hoy = Carbon::now(config('app.timezone')); - $filename = str_replace('ñ', 'n', $this->title . ' - ' . $hoy->format('Y-m-d') . '.xlsx'); - - $writer = IOFactory::createWriter($ea, "Xlsx"); - - header("Content-Type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet; charset=utf-8"); - header('Content-Transfer-Encoding: binary'); - header('Content-Disposition: attachment; filename="' . $filename . '"'); - header('Cache-Control: max-age=0'); - - $writer->save('php://output'); - } -} -?> diff --git a/app_old/app/Service/Informe/Contabilidad/Resumen.php b/app_old/app/Service/Informe/Contabilidad/Resumen.php deleted file mode 100644 index e20266a..0000000 --- a/app_old/app/Service/Informe/Contabilidad/Resumen.php +++ /dev/null @@ -1,190 +0,0 @@ -separator = $separator; - } - - protected function getVentas($id_proyecto) - { - $proyecto = model(Proyecto::class)->findOne($id_proyecto); - $ventas = $proyecto->ventas(); - $output = []; - foreach ($ventas as $venta) { - $found = false; - foreach ($output as $v) { - if ($v->unidad()->descripcion == $venta->unidad()->descripcion) { - $found = true; - break; - } - } - if (!$found) { - $output []= $venta; - } - } - return $output; - } - protected function startOfYear(DateTimeInterface $up_to) - { - return new DateTimeImmutable((clone $up_to)->sub(new DateInterval('P1Y'))->format('31-12-Y')); - } - protected function defaultValueDate(DateTimeInterface $up_to, $glosa = '') - { - return (object) ['fecha' => $this->startOfYear($up_to), 'valor' => 0, 'glosa' => $glosa, 'estado' => '']; - } - protected function extractValueDate(Pago $pago, $glosa = '') - { - return (object) ['fecha' => $pago->fecha(), 'valor' => $pago->valor, 'glosa' => $glosa, 'estado' => $pago->estado()->tipo()->descripcion]; - } - protected function getAnticipos(Venta $venta, DateTimeInterface $up_to) - { - if ($venta->pie == 0) { - return [$this->defaultValueDate($up_to)]; - } - $cuotas = $venta->pie()->cuotas('fecha', $up_to); - $ly = $this->startOfYear($up_to); - $older = array_reduce($cuotas, function($sum, $item) use ($ly) { - if ($item->pago()->estado()->tipo()->active != 1 or strtolower($item->pago()->estado()->tipo()->descripcion) == 'no pagado') { - return $sum; - } - if ($item->pago()->fecha() >= $ly) { - return $sum; - } - return $sum + $item->pago()->valor; - }); - $current = array_filter($cuotas, function($item) use ($ly) { - return $item->pago()->fecha() >= $ly; - }); - foreach ($current as &$item) { - $item = $this->extractValueDate($item->pago(), "Cuota {$item->numero}"); - } - return array_merge([(object) ['fecha' => $ly, 'valor' => $older, 'glosa' => 'Anticipo acumulado', 'estado' => 'Pagado']], $current); - } - protected function getReajuste(Venta $venta, DateTimeInterface $up_to) - { - if ($venta->pie == 0 or $venta->pie()->reajuste == null) { - return $this->defaultValueDate($up_to, 'Reajuste'); - } - return $this->extractValueDate($venta->pie()->reajuste(), 'Reajuste'); - } - protected function getAbono(Venta $venta, DateTimeInterface $up_to) - { - if ($venta->escritura == 0) { - return $this->defaultValueDate($up_to, 'Abono'); - } - return $this->extractValueDate($venta->escritura()->pago(), 'Abono'); - } - protected function getBono(Venta $venta, DateTimeInterface $up_to) - { - if ($venta->bono_pie == 0) { - return $this->defaultValueDate($up_to, 'Bono Pie'); - } - return $this->extractValueDate($venta->bonoPie()->pago(), 'Bono Pie'); - } - protected function getCredito(Venta $venta, DateTimeInterface $up_to) - { - if ($venta->credito == 0) { - return $this->defaultValueDate($up_to, 'Credito'); - } - return $this->extractValueDate($venta->credito()->pago(), 'Credito'); - } - protected function getSubsidio(Venta $venta, DateTimeInterface $up_to) - { - if ($venta->subsidio == 0) { - return [$this->defaultValueDate($up_to, 'Ahorro'), $this->defaultValueDate($up_to, 'Subsidio')]; - } - return [$this->extractValueDate($venta->subsidio()->pago(), 'Ahorro'), $this->extractValueDate($venta->subsidio()->subsidio(), 'Subsidio')]; - } - protected function getResciliacion(Venta $venta, DateTimeInterface $up_to) - { - if ($venta->resciliacion == null) { - return $this->defaultValueDate($up_to, 'Resciliacion'); - } - return $this->extractValueDate($venta->resciliacion()->pago(), 'Resciliacion'); - } - protected function getPagos(Venta $venta, DateTimeInterface $up_to) - { - $pagos = []; - $pagos = array_merge($pagos, $this->getAnticipos($venta, $up_to)); - $pagos []= $this->getReajuste($venta, $up_to); - $pagos []= $this->getAbono($venta, $up_to); - $pagos []= $this->getBono($venta, $up_to); - $pagos []= $this->getCredito($venta, $up_to); - $pagos = array_merge($pagos, $this->getSubsidio($venta, $up_to)); - return array_filter($pagos, function($item) { - return $item->valor != 0; - }); - } - - protected function buildLine(Venta $venta, $pago) - { - if ($pago->valor > 0) { - return ['', $venta->unidad()->descripcion, $pago->fecha->format('d/m/Y'), $pago->glosa, '', $pago->valor, $pago->estado]; - } - return ['', $venta->unidad()->descripcion, $pago->fecha->format('d/m/Y'), $pago->glosa, -$pago->valor, '', $pago->estado]; - } - protected function buildLibro(Venta $venta, DateTimeInterface $up_to) - { - $pagos = $this->getPagos($venta, $up_to); - $output = [ - ['', "Cuenta: Anticipos Dpto {$venta->unidad()->descripcion}"], - ['', 'Fecha', 'Glosa', 'Haber', 'Debe', 'Estado'] - ]; - $debe = 0; - $haber = 0; - foreach ($pagos as $pago) { - $output []= $this->buildLine($venta, $pago); - if ($pago->valor > 0) { - $debe += $pago->valor; - } - else { - $haber -= $pago->valor; - } - } - $output []= ['', '', '', 'Total', $haber, $debe]; - return $output; - } - - public function build(int $id_proyecto, DateTimeInterface $up_to) - { - ini_set('max_execution_time', 60 * 60); - $ventas = $this->getVentas($id_proyecto); - - $output = ["Libro Mayor {$ventas[0]->proyecto()->descripcion}", '']; - foreach ($ventas as $venta) { - $output = array_merge($output, $this->buildLibro($venta, $up_to)); - } - - $filename = "Contabilidad - Resumen - {$ventas[0]->proyecto()->descripcion} - {$up_to->format('Y-m-d')}.xlsx"; - $informe = new Informe(); - $informe->createSpreadsheet() - ->addArray($output) - ->formatColumn('E') - ->formatColumn('F') - ->send($filename); - } -} diff --git a/app_old/app/Service/Informe/Informe.php b/app_old/app/Service/Informe/Informe.php deleted file mode 100644 index 8254a10..0000000 --- a/app_old/app/Service/Informe/Informe.php +++ /dev/null @@ -1,55 +0,0 @@ -spreadsheet = new Spreadsheet(); - return $this; - } - protected function formatArray(array $data) - { - $maxCols = 0; - foreach ($data as $row) { - if (!is_array($row)) { - continue; - } - if (count($row) > $maxCols) { - $maxCols = count($row); - } - } - foreach ($data as &$row) { - if (!is_array($row)) { - $row = [$row]; - } - if (count($row) < $maxCols) { - $row = array_merge($row, array_fill(0, $maxCols - count($row), '')); - } - } - return $data; - } - public function addArray(array $data, string $start = 'A1') - { - $this->spreadsheet->getActiveSheet()->fromArray($this->formatArray($data), null, $start); - return $this; - } - public function formatColumn(string $column) - { - $this->spreadsheet->getActiveSheet()->getStyle("{$column}:{$column}")->getNumberFormat()->setFormatCode('#,##0'); - return $this; - } - public function send(string $filename) - { - header('Content-Type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'); - header("Content-Disposition: attachment;filename=\"{$filename}\""); - header('Cache-Control: max-age=0'); - - $writer = IOFactory::createWriter($this->spreadsheet, 'Xlsx'); - $writer->save('php://output'); - } -} diff --git a/app_old/app/Service/Money.php b/app_old/app/Service/Money.php deleted file mode 100644 index 2472e62..0000000 --- a/app_old/app/Service/Money.php +++ /dev/null @@ -1,55 +0,0 @@ -parseDate($date); - if (!$this->checkNextMonthValueCalculationByDate($date)) { - return $this->emptyResult(); - } - - $response = $this->client->get('api/uf/value/' . $date->format('Y-m-d')); - - if (!$this->isOk($response)) { - return $this->emptyResult(); - } - - $body = $response->getBody()->getContents(); - if (trim($response->getBody()) === '') { - return $this->emptyResult(); - } - return json_decode($body); - } - - protected function parseDate(string|DateTimeInterface $date): DateTimeInterface - { - if (is_string($date)) { - $date = Carbon::parse($date, config('app.timezone')); - } - return $date; - } - protected function checkNextMonthValueCalculationByDate(DateTimeInterface $date): bool - { - $next_m_9 = Carbon::today(config('app.timezone'))->copy()->endOfMonth()->addDays(9); - $date = Carbon::parse($date); - return $date->lessThan($next_m_9); - } - protected function isOk(ResponseInterface $response): bool - { - $statusCode = $response->getStatusCode(); - return $statusCode >= 200 and $statusCode < 300; - } - protected function emptyResult(): object - { - return (object) ['total' => 0]; - } -} diff --git a/app_old/app/Service/Register.php b/app_old/app/Service/Register.php deleted file mode 100644 index 03f96e0..0000000 --- a/app_old/app/Service/Register.php +++ /dev/null @@ -1,34 +0,0 @@ - $user, - 'action' => $action, - 'time' => Carbon::now(config('app.timezone'))->toDateTimeString()//->format('Y-m-d HH:mm:ss') - ]; - $registry = model(RModel::class) - ->where('user', $user) - ->where('action', $action) - ->where('time', $data['time']) - ->findOne(); - if (!$registry) { - $registry = model(RModel::class)->create($data); - $registry->save(); - } - foreach ($variables as $data) { - $data['registry'] = $registry->id; - $log = (new Factory(RegistryData::class))->where($data)->find(); - if (!$log) { - $log = model(RegistryData::class)->create($data); - $log->save(); - } - } - } -} diff --git a/app_old/app/Service/Remote.php b/app_old/app/Service/Remote.php deleted file mode 100644 index 77418a2..0000000 --- a/app_old/app/Service/Remote.php +++ /dev/null @@ -1,19 +0,0 @@ -connection->connect(); - $statement = $connection->query($query); - $result = $statement->fetch(PDO::FETCH_ASSOC); - return $result['ip']; - } -} diff --git a/app_old/app/Service/Replacer.php b/app_old/app/Service/Replacer.php deleted file mode 100644 index bf61513..0000000 --- a/app_old/app/Service/Replacer.php +++ /dev/null @@ -1,127 +0,0 @@ -parseLine($line); - - $output = $line; - foreach ($instructions as $instruction) { - $output = str_replace($instruction['original'], $this->buildLine($instruction['instruction'], $data), $output); - } - return $output; - } - protected function parseLine($line) - { - $ini_el = '[['; - $end_el = ']]'; - - $instructions = []; - $offset = 0; - while (strpos($line, $ini_el, $offset) !== false) { - $ini = strpos($line, $ini_el, $offset) + strlen($ini_el); - $end = strpos($line, $end_el, $offset); - $find = substr($line, $ini, $end - $ini); - $instructions []= ['original' => $ini_el . $find . $end_el, 'instruction' => $find]; - $offset = $end + 1; - } - return $instructions; - } - protected function buildLine($instructions, $data) - { - if (strpos($instructions, '|') !== false) { - $instructions = explode('|', $instructions); - } else { - $instructions = [$instructions]; - } - $output = ''; - foreach ($instructions as $instruction) { - $output = $this->buildReplace($instruction, $data, $output); - } - return $output; - } - protected function buildReplace($instruction, $data, $output = null) - { - if (strpos($instruction, '(') !== false) { - $ini = strpos($instruction, '(') + 1; - $end = strpos($instruction, ')'); - $mod = substr($instruction, $ini, $end - $ini); - $instruction = substr($instruction, 0, $ini - 1); - } - switch ($instruction) { - case 'UPPER': - return strtoupper($output); - case 'LOWER': - return strtolower($output); - case 'ISSET': - if ($output != '') { - return ', ' . $output; - } - return ''; - case 'UFS': - return format('ufs', $output); - case 'PESOS': - return format('pesos', $output); - } - - if (isset($mod)) { - $obj = $this->find($instruction . '(' . $mod .')', $data); - } else { - $obj = $this->find($instruction, $data); - } - if ($obj) { - return $obj; - } - if (is_object($output) and method_exists($output, $instruction)) { - if (isset($mod)) { - return $output->$instruction($mod); - } - return $output->$instruction(); - } - if (is_object($output) and isset($output->$instruction)) { - return $output->$instruction; - } - if ($instruction == 'strftime') { - setlocale(LC_TIME, 'es-CL', 'es'); - $f = Carbon::parse($output, config('app.timezone')); - $output = strftime($mod, $f->timestamp); - return $output; - } - - d($output, $instruction, function_exists($instruction), is_object($output), is_object($output) and isset($output->$instruction)); - } - protected function find($instruction, $data) - { - if (strpos($instruction, '(') !== false) { - $ini = strpos($instruction, '(') + 1; - $end = strpos($instruction, ')'); - $mod = substr($instruction, $ini, $end - $ini); - $instruction = substr($instruction, 0, $ini - 1); - } - if (method_exists($data, $instruction)) { - if (isset($mod)) { - return $data->$instruction($mod); - } - return $data->$instruction(); - } - if (isset($data->$instruction)) { - return $data->$instruction; - } - switch ($instruction) { - case 'Unidades': - $str = 'Departamento ' . $data->reserva()->unidad()->numeracion; - foreach ($data->reserva()->unidades() as $unidad) { - $str .= ', ' . ucwords($unidad->unidadProyecto()->tipo()->descripcion) . ' ' . $unidad->numeracion; - } - return $str; - case 'inmobiliaria': - return $data->proyecto()->inmobiliaria(); - } - return false; - } -} -?> \ No newline at end of file diff --git a/app_old/app/Service/Route.php b/app_old/app/Service/Route.php deleted file mode 100644 index f910f87..0000000 --- a/app_old/app/Service/Route.php +++ /dev/null @@ -1,131 +0,0 @@ -add($t, $query, $callback); - } - } else { - switch (strtoupper($type)) { - case 'GET': - $this->get($query, $callback); - break; - case 'POST': - $this->post($query, $callback); - break; - } - } - } - public function get($query, $callback) - { - if ($this->exists('get', $query)) { - return; - } - $this->routes['get'][$query] = (object) ['query' => $query, 'callback' => $this->parseCallback($callback)]; - } - public function post($query, $callback) - { - if ($this->exists('post', $query)) { - return; - } - $this->routes['post'][$query] = (object) ['query' => $query, 'callback' => $this->parseCallback($callback)]; - } - protected function exists($type, $query) - { - return isset($this->routes['post'][$query]); - } - protected function parseCallback($callback) - { - if (is_callable($callback)) { - return $callback; - } - elseif (is_object($callback)) { - return [$callback, 'index']; - } - elseif (is_string($callback) and strpos($callback, '@') !== false) { - list($class, $method) = explode('@', $callback); - $class = '\\App\\Controller\\' . $class; - if (method_exists($class, $method)) { - return [$class, $method]; - } - } - elseif (is_string($callback)) { - $class = '\\App\\Controller\\' . $callback; - return [$class, 'index']; - } - } - public function route() - { - $url = $_SERVER['SCRIPT_NAME']; - $query = $_SERVER['QUERY_STRING']; - $method = $_SERVER['REQUEST_METHOD']; - $route = null; - switch (strtoupper($method)) { - case 'GET': - $route = $this->getGet($url, $query); - break; - case 'POST': - $route = $this->getPost($url, $query); - break; - } - if ($route) { - return $this->run($route->callback); - } - return false; - } - protected function getGet($url, $query) - { - if (isset($this->routes['get'][$url])) { - return $this->routes['get'][$url]; - } - $p = get('p'); - if ($p == null) { - $p = get('page'); - if ($p == null) { - $p = get('m'); - if ($p == null) { - $p = get('module'); - } - } - } - if (isset($this->routes['get'][$p])) { - return $this->routes['get'][$p]; - } - return false; - } - protected function getPost($url, $query) - { - if (isset($this->routes['post'][$url])) { - return $this->routes['post'][$url]; - } - $p = get('p'); - if ($p == null) { - $p = get('page'); - if ($p == null) { - $p = get('m'); - if ($p == null) { - $p = get('module'); - } - } - } - if (isset($this->routes['post'][$p])) { - return $this->routes['post'][$p]; - } - return false; - } - protected function run($callback) - { - return call_user_func($callback); - } -} -?> \ No newline at end of file diff --git a/app_old/bin/Pipfile b/app_old/bin/Pipfile deleted file mode 100644 index 8108982..0000000 --- a/app_old/bin/Pipfile +++ /dev/null @@ -1,12 +0,0 @@ -[[source]] -name = "pypi" -url = "https://pypi.org/simple" -verify_ssl = true - -[dev-packages] - -[packages] -gunicorn = "*" - -[requires] -python_version = "3.8" diff --git a/app_old/bin/console b/app_old/bin/console deleted file mode 100644 index 11aaaef..0000000 --- a/app_old/bin/console +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -php /code/bin/index.php "$@" diff --git a/app_old/bin/index.php b/app_old/bin/index.php deleted file mode 100644 index ff23b96..0000000 --- a/app_old/bin/index.php +++ /dev/null @@ -1,8 +0,0 @@ -run(); diff --git a/app_old/bin/informes/Pipfile b/app_old/bin/informes/Pipfile deleted file mode 100644 index e8687af..0000000 --- a/app_old/bin/informes/Pipfile +++ /dev/null @@ -1,16 +0,0 @@ -[[source]] -name = "pypi" -url = "https://pypi.org/simple" -verify_ssl = true - -[dev-packages] - -[packages] -pandas = "*" -xlsxwriter = "*" -httpx = "*" -flask = "*" -numpy = "*" - -[requires] -python_version = "3.8" diff --git a/app_old/bin/informes/app.py b/app_old/bin/informes/app.py deleted file mode 100644 index ff2a8f0..0000000 --- a/app_old/bin/informes/app.py +++ /dev/null @@ -1,14 +0,0 @@ -import argparse -from flask import Flask -from controllers.ventas import ventas_blueprint - - -app = Flask(__name__) -app.register_blueprint(ventas_blueprint, url_prefix='/ventas') - - -if __name__ == '__main__': - parser = argparse.ArgumentParser() - parser.add_argument('-p', '--port', default=8011) - args = parser.parse_args() - app.run(port=args.port, debug=True) diff --git a/app_old/bin/informes/controllers/ventas.py b/app_old/bin/informes/controllers/ventas.py deleted file mode 100644 index ab3ffce..0000000 --- a/app_old/bin/informes/controllers/ventas.py +++ /dev/null @@ -1,141 +0,0 @@ -from flask import Blueprint, request, Response -import io -import json -import pandas as pd -import numpy as np -import datetime - - -ventas_blueprint = Blueprint('ventas', __name__,) - - -def format_data(data): - df = pd.DataFrame(data) - int_columns = ['Departamento', 'Estacionamientos', 'Bodegas'] - for col in int_columns: - df[col] = pd.to_numeric(df[col], errors='ignore') - float_columns = ['Valor Promesa', 'Pie', 'Pie Pagado', '% Pie Pagado', 'Bono Pie', 'Valor Operador', - 'Premios', 'Subsidio', 'Ahorro', 'Credito', 'Valor Ests & Bods', 'Valor Neto', - 'UF/m²*', 'Comision', 'Venta s/Comision', 'Precio'] - for col in float_columns: - if col in df.columns: - df[col] = pd.to_numeric(df[col], errors='coerce') - df = df.replace(np.nan, 0, regex=True) - - df['Fecha Venta'] = pd.to_datetime(df['Fecha Venta'], format='%Y-%m-%d') - df = df.sort_values(by=['Fecha Venta', 'Departamento']) - df['Fecha Venta'] = df['Fecha Venta'].dt.strftime('%d.%m.%Y') - - return df - - -def format_columns(workbook, columns): - column_settings = [{'header': column} for column in columns] - - center_format = workbook.add_format({'align': 'center'}) - amount_format = workbook.add_format({'num_format': '#,##0.00'}) - percent_format = workbook.add_format({'num_format': '0.00%'}) - - amount_columns = ['m² Ponderados', 'Valor Promesa', 'Pie', 'Pie Pagado', 'Bono Pie', 'Valor Operador', 'Premios', - 'Subsidio', 'Ahorro', 'Credito', 'Valor Ests & Bods', 'Valor Neto', 'UF/m²*', 'Comision', - 'Venta s/Comision', 'Precio'] - center_columns = ['Departamento', 'Estacionamientos', 'Bodegas'] - sum_columns = ['m² Ponderados', 'Valor Promesa', 'Pie', 'Pie Pagado', 'Bono Pie', 'Subsidio', 'Ahorro', 'Credito', - 'Valor Operador', 'Premios', 'Valor Ests & Bods', 'Valor Neto', 'Comision'] - count_columns = ['Departamento', 'Estacionamientos', 'Bodegas'] - - for (k, col) in enumerate(column_settings): - if col['header'] in amount_columns: - column_settings[k]['format'] = amount_format - if col['header'] in center_columns: - column_settings[k]['format'] = center_format - if col['header'] in sum_columns: - column_settings[k]['total_function'] = 'sum' - if col['header'] in count_columns: - column_settings[k]['total_function'] = 'count' - if col['header'] == '% Pie Pagado': - column_settings[k]['format'] = percent_format - if col['header'] == 'Propietario': - column_settings[k]['total_string'] = 'TOTAL' - - return column_settings - - -def format_excel(workbook, worksheet, data): - center_format = workbook.add_format({'align': 'center'}) - amount_format = workbook.add_format({'num_format': '#,##0.00'}) - percent_format = workbook.add_format({'num_format': '0.00%'}) - - amount_columns = ['m² Ponderados', 'Valor Promesa', 'Pie', 'Pie Pagado', 'Bono Pie', 'Valor Operador', 'Premios', - 'Subsidio', 'Ahorro', 'Credito', 'Valor Ests & Bods', 'Valor Neto', 'UF/m²*', 'Comision', - 'Venta s/Comision', 'Precio'] - center_columns = ['Departamento', 'Estacionamientos', 'Bodegas'] - - for col in amount_columns: - if col not in data.columns: - continue - k = data.columns.get_loc(col) + 1 - worksheet.set_column(k, k, cell_format=amount_format) - for col in center_columns: - if col not in data.columns: - continue - k = data.columns.get_loc(col) + 1 - worksheet.set_column(k, k, cell_format=center_format) - col = '% Pie Pagado' - k = data.columns.get_loc(col) + 1 - worksheet.set_column(k, k, cell_format=percent_format) - - return worksheet - - -@ventas_blueprint.route('', methods=['POST']) -def ventas(): - data = json.loads(request.data) - output = io.BytesIO() - writer = pd.ExcelWriter('tmp.xlsx', engine='xlsxwriter') - df = format_data(data['data']) - - start_row = 4 - if 'Compañía' in data: - start_row += 1 - df.to_excel(writer, startrow=start_row+1, startcol=1, header=False, index=False, sheet_name='Ventas') - wb = writer.book - wb.filename = output - - title_format = wb.add_format({'font_size': 16, 'bold': True}) - ws = writer.sheets['Ventas'] - (max_row, max_col) = df.shape - - if 'Compañía' in data: - ws.merge_range(1, 1, 1, max_col, data['Compañía']) - ws.merge_range(start_row-3, 1, start_row-3, max_col, data['Proyecto'], cell_format=title_format) - ws.write_string(start_row-2, 1, 'Ventas') - column_settings = format_columns(wb, df.columns) - ws.add_table(start_row, 1, max_row+start_row+1, max_col, {'name': 'Ventas', 'total_row': 1, - 'columns': column_settings, - 'style': 'Table Style Medium 1'}) - ws = format_excel(wb, ws, df) - - column_widths = { - 'B': 46, - 'C': 16, - 'D': 18, - 'E': 10, - 'F': 13, - 'G': 7, - 'H': 8, - 'I': 16, - 'J': 16, - 'K': 13, - 'L': 14 - } - for (col, wd) in column_widths.items(): - ws.set_column('{0}:{0}'.format(col), wd) - - writer.save() - output.seek(0) - date = datetime.date.today() - filename = "Informe de Ventas - {0} - {1}.xlsx".format(data['Proyecto'], date.strftime('%Y-%m-%d')) - return Response(output, mimetype="application/ms-excel", - headers={"Content-Disposition": "attachment;filename={0}".format(filename), - "Content-Type": 'application/octet-stream; charset=utf-8'}) diff --git a/app_old/bootstrap/autoload.php b/app_old/bootstrap/autoload.php deleted file mode 100644 index 318f80d..0000000 --- a/app_old/bootstrap/autoload.php +++ /dev/null @@ -1,8 +0,0 @@ - diff --git a/app_old/bootstrap/database.php b/app_old/bootstrap/database.php deleted file mode 100644 index 4372bf2..0000000 --- a/app_old/bootstrap/database.php +++ /dev/null @@ -1,29 +0,0 @@ - $data) { - load($data, $name); -} - -function load($data, $name = '') { - if (!isset($data['port'])) { - $port = 3306; - } else { - $port = $data['port']; - } - $dsn = 'mysql:host=' . $data['host'] . ';port=' . $port . ';dbname=' . $data['database'] . ';charset=utf8'; - - if ($name != '') { - ORM::configure($dsn, null, $name); - ORM::configure('username', $data['username'], $name); - ORM::configure('password', $data['password'], $name); - } else { - ORM::configure($dsn, null); - ORM::configure('username', $data['username']); - ORM::configure('password', $data['password']); - } -} - -Model::$short_table_names = true; diff --git a/app_old/bootstrap/dotenv.php b/app_old/bootstrap/dotenv.php deleted file mode 100644 index 799a5b1..0000000 --- a/app_old/bootstrap/dotenv.php +++ /dev/null @@ -1,12 +0,0 @@ -isDir() or $file->getExtension() != 'env') { - continue; - } - $env = Dotenv::createImmutable($file->getPath(), $file->getBasename()); - $env->load(); -} diff --git a/app_old/bootstrap/errors.php b/app_old/bootstrap/errors.php deleted file mode 100644 index 0e54dc4..0000000 --- a/app_old/bootstrap/errors.php +++ /dev/null @@ -1,7 +0,0 @@ -pushHandler(new \Whoops\Handler\PrettyPageHandler); - $whoops->register(); -}*/ -?> diff --git a/app_old/bootstrap/logs.php b/app_old/bootstrap/logs.php deleted file mode 100644 index 249be53..0000000 --- a/app_old/bootstrap/logs.php +++ /dev/null @@ -1,26 +0,0 @@ -underscored(); - Route::add(['GET', 'POST'], $route, $name); -} - -Route::add(['GET', 'POST'], 'buscar', 'Buscar'); -?> \ No newline at end of file diff --git a/app_old/cli/app.php b/app_old/cli/app.php deleted file mode 100644 index 5406139..0000000 --- a/app_old/cli/app.php +++ /dev/null @@ -1,48 +0,0 @@ -addDefinitions($filename); -} -$app = new class() extends Application -{ - protected ContainerInterface $container; - public function getContainer(): ContainerInterface - { - return $this->container; - } - public function setContainer(ContainerInterface $container) - { - $this->container = $container; - return $this; - } -}; -$app->setContainer($builder->build()); - -$filename = implode(DIRECTORY_SEPARATOR, [ - __DIR__, - 'cli', - 'middlewares.php' -]); -if (file_exists($filename)) { - include_once $filename; -} - -return $app; diff --git a/app_old/cli/cli/config.php b/app_old/cli/cli/config.php deleted file mode 100644 index 7760f90..0000000 --- a/app_old/cli/cli/config.php +++ /dev/null @@ -1,26 +0,0 @@ - function() { - $container = new DI\Container([ - ORM::DEFAULT_CONNECTION => new DI\Container([ - 'host' => $_ENV['MYSQL_HOST'], - 'database' => $_ENV['MYSQL_DATABASE'], - 'username' => $_ENV['MYSQL_USER'], - 'password' => $_ENV['MYSQL_PASSWORD'] - ]), - 'remote' => new DI\Container([ - 'host' => $_ENV['REMOTE_HOST'], - 'database' => $_ENV['REMOTE_DATABASE'], - 'username' => $_ENV['REMOTE_USER'], - 'password' => $_ENV['REMOTE_PASSWORD'] - ]) - ]); - if (isset($_ENV['MYSQL_PORT'])) { - $container->get(ORM::DEFAULT_CONNECTION)->set('port', $_ENV['MYSQL_PORT']); - } - if (isset($_ENV['REMOTE_PORT'])) { - $container->get('remote')->set('port', $_ENV['REMOTE_PORT']); - } - return $container; - } -]; diff --git a/app_old/cli/cli/middlewares.php b/app_old/cli/cli/middlewares.php deleted file mode 100644 index b8068c4..0000000 --- a/app_old/cli/cli/middlewares.php +++ /dev/null @@ -1,9 +0,0 @@ -getContainer()->get(Psr\Log\LoggerInterface::class)); diff --git a/app_old/cli/cli/setups.php b/app_old/cli/cli/setups.php deleted file mode 100644 index 6c4a99f..0000000 --- a/app_old/cli/cli/setups.php +++ /dev/null @@ -1,44 +0,0 @@ - function(ContainerInterface $container) { - return new Monolog\Logger('cli', [ - new Monolog\Handler\FilterHandler(new Monolog\Handler\RotatingFileHandler('/logs/cli.debug.log'), Monolog\Level::Debug, Monolog\Level::Notice), - new Monolog\Handler\FilterHandler(new Monolog\Handler\RotatingFileHandler('/logs/cli.error.log'), Monolog\Level::Warning) - ], [ - new Monolog\Processor\PsrLogMessageProcessor(), - new Monolog\Processor\IntrospectionProcessor(), - new Monolog\Processor\MemoryUsageProcessor(), - new Monolog\Processor\MemoryPeakUsageProcessor() - ]); - }, - GuzzleHttp\Client::class => function(ContainerInterface $container) { - return new GuzzleHttp\Client([ - 'base_uri' => "http://{$container->get(App\Service\Remote::class)->getIP()}:8008", - 'headers' => [ - 'Accept' => 'application/json' - ] - ]); - }, - \App\Alias\RemoteConnection::class => function(ContainerInterface $container) { - return new \App\Alias\RemoteConnection(); - }, - App\Service\Remote::class => function(ContainerInterface $container) { - return new App\Service\Remote($container->get(\App\Alias\RemoteConnection::class)); - }, - App\Service\Money::class => function(ContainerInterface $container) { - return new App\Service\Money($container->get(GuzzleHttp\Client::class)); - }, - \App\Alias\Connection::class => function(ContainerInterface $container) { - $data = $container->get('databases')->get(ORM::DEFAULT_CONNECTION); - return new \App\Alias\Connection( - $data->get('host'), - $data->get('database'), - $data->get('username'), - $data->get('password'), - $data->has('port') ? $data->get('port') : null - ); - }, -]; diff --git a/app_old/cli/composer.php b/app_old/cli/composer.php deleted file mode 100644 index 2d27ee1..0000000 --- a/app_old/cli/composer.php +++ /dev/null @@ -1,6 +0,0 @@ - 'America/Santiago', - 'locale' => 'es', - 'database' => 'mysql', - 'debug' => false, - 'benchmark' => false, - 'login_hours' => 5*24 -]; diff --git a/app_old/config/databases.php b/app_old/config/databases.php deleted file mode 100644 index 14e279f..0000000 --- a/app_old/config/databases.php +++ /dev/null @@ -1,24 +0,0 @@ - [ - 'host' => $_ENV['MYSQL_HOST'], - 'database' => $_ENV['MYSQL_DATABASE'], - 'username' => $_ENV['MYSQL_USER'], - 'password' => $_ENV['MYSQL_PASSWORD'] - ], - 'mysql_copy' => [ - 'host' => 'localhost', - 'database' => 'incoviba3', - 'username' => 'incoviba', - 'password' => $_ENV['MYSQL_PASSWORD'] - ] - ]; - if (isset($_ENV['MYSQL_PORT'])) { - $arr['mysql']['port'] = $_ENV['MYSQL_PORT']; - } - return $arr; -} -return buildDatabaseConfig(); diff --git a/app_old/config/incoviba.php b/app_old/config/incoviba.php deleted file mode 100644 index d21d9e8..0000000 --- a/app_old/config/incoviba.php +++ /dev/null @@ -1,6 +0,0 @@ - [ - 'caducidad' => 30 - ] -]; diff --git a/app_old/config/locations.php b/app_old/config/locations.php deleted file mode 100644 index 05442b6..0000000 --- a/app_old/config/locations.php +++ /dev/null @@ -1,16 +0,0 @@ - root(), - 'cache' => '{locations.base}/cache', - 'public' => '{locations.base}/public', - 'resources' => '{locations.base}/resources', - 'views' => '{locations.resources}/views', - 'src' => '{locations.base}/src', - //'languages' => '{locations.resources}/languages' - 'app' => '{locations.base}/app', - 'controllers' => '{locations.app}/Controller', - 'money' => 'provm.cl/optimus/money', - 'api' => '192.168.1.100/intranet/api', - 'api_url' => '/api' -]; -?> diff --git a/app_old/fontify.json b/app_old/fontify.json deleted file mode 100644 index 923703c..0000000 --- a/app_old/fontify.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "modules": [ - "bootstrap", - "font-awesome" - ], - "dest": "public" -} \ No newline at end of file diff --git a/app_old/incoviba/modelos/.gitignore b/app_old/incoviba/modelos/.gitignore deleted file mode 100644 index 9aa7c69..0000000 --- a/app_old/incoviba/modelos/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Composer -/vendor/ -composer.lock diff --git a/app_old/incoviba/modelos/common/Alias/Model.php b/app_old/incoviba/modelos/common/Alias/Model.php deleted file mode 100644 index 88ef3c9..0000000 --- a/app_old/incoviba/modelos/common/Alias/Model.php +++ /dev/null @@ -1,87 +0,0 @@ -id; - $orm = $this->orm; - $ref = new \ReflectionObject($orm); - if (!$ref->hasProperty('_dirty_fields')) { - return; - } - $dirty = $ref->getProperty('_dirty_fields'); - $dirty->setAccessible(true); - $new_values = $dirty->getValue($orm); - $changes = array_combine(array_keys($new_values), array_fill(0, count($new_values), ['old' => '', 'new' => ''])); - if ($this->isNew()) { - $old = (object) array_combine(array_keys($new_values), array_fill(0, count($new_values), '')); - } else { - $old = model(get_called_class())->findOne($this->{$this->getId()}); - } - foreach ($new_values as $column => $value) { - $changes[$column] = ['column' => $column, 'old' => $old->$column, 'new' => $value]; - } - $action = '[' . get_called_class() . ']'; - doLog($user, $action, $changes); - } - public function getId() - { - if (property_exists(get_called_class(), '_id_column')) { - return static::$_id_column; - } - return $this->id; - } - public function save() - { - $ref = new \ReflectionObject($this); - if ($ref->hasProperty('_timestamps')) { - $ref = $ref->getProperty('_timestamps'); - $ref->setAccessible(true); - if ($ref->getValue()) { - if ($this->is_new()) { - $this->setExpr('created_at', 'NOW()'); - } - $this->setExpr('updated_at', 'NOW()'); - } - } - if (!\ORM::getDb()->inTransaction()) { - \ORM::getDb()->beginTransaction(); - } - try { - parent::save(); - if (\ORM::getDb()->inTransaction()) { - \ORM::getDb()->commit(); - } - } catch (\Exception $e) { - if (\ORM::getDb()->inTransaction()) { - \ORM::getDb()->rollBack(); - } - throw $e; - } - $this->log(); - } - public function __call($method, $args) - { - if (!method_exists($this, $method)) { - $str = '' . Stringy::create($method)->underscored(); - if (method_exists($this, $str)) { - return call_user_func_array([$this, $str], $args); - } - throw new \BadMethodCallException($method . ' not found in ' . get_class($this)); - } - return call_user_func_array([$this, $str], $args); - } -} -?> diff --git a/app_old/incoviba/modelos/common/Alias/NewEstado.php b/app_old/incoviba/modelos/common/Alias/NewEstado.php deleted file mode 100644 index 2ec1ba1..0000000 --- a/app_old/incoviba/modelos/common/Alias/NewEstado.php +++ /dev/null @@ -1,20 +0,0 @@ -fecha, config('app.timezone')); - } -} -?> diff --git a/app_old/incoviba/modelos/common/Alias/NewModel.php b/app_old/incoviba/modelos/common/Alias/NewModel.php deleted file mode 100644 index fbc209c..0000000 --- a/app_old/incoviba/modelos/common/Alias/NewModel.php +++ /dev/null @@ -1,9 +0,0 @@ - diff --git a/app_old/incoviba/modelos/common/Alias/NewTipo.php b/app_old/incoviba/modelos/common/Alias/NewTipo.php deleted file mode 100644 index e33d83c..0000000 --- a/app_old/incoviba/modelos/common/Alias/NewTipo.php +++ /dev/null @@ -1,15 +0,0 @@ - diff --git a/app_old/incoviba/modelos/common/Alias/OldModel.php b/app_old/incoviba/modelos/common/Alias/OldModel.php deleted file mode 100644 index f12a3cd..0000000 --- a/app_old/incoviba/modelos/common/Alias/OldModel.php +++ /dev/null @@ -1,8 +0,0 @@ - diff --git a/app_old/incoviba/modelos/common/Factory/Model.php b/app_old/incoviba/modelos/common/Factory/Model.php deleted file mode 100644 index 2aef844..0000000 --- a/app_old/incoviba/modelos/common/Factory/Model.php +++ /dev/null @@ -1,204 +0,0 @@ -class = $class; - $this->is_aggregator = true; - if (is_subclass_of($class, 'Model')) { - $this->is_aggregator = false; - } - } - public function new() - { - $class = $this->class; - if ($this->is_aggregator) { - return new $class(); - } - return model($class)->create(); - } - public function create($data) - { - $class = $this->class; - if ($this->is_aggregator) { - $obj = new $class(); - $obj->create($data); - return $obj; - } - return model($class)->create($data); - } - /** - * [column => value, column => [value, operator]] - * @var array - */ - protected $conditions; - public function where(array $data) - { - if ($this->conditions == null) { - $this->conditions = $data; - return $this; - } - $this->conditions = array_merge($this->conditions, $data); - return $this; - } - /** - * [column, column => order] - * @var array - */ - protected $order; - public function order(array $data) - { - if ($this->order == null) { - $this->order = $data; - return $this; - } - $this->order = array_merge($this->order, $data); - return $this; - } - protected $limit; - public function limit(array $data) - { - if (!isset($data['limit'])) { - $data['limit'] = $data[0]; - } - if (!isset($data['offset'])) { - $data['offset'] = 0; - if (isset($data[1])) { - $data['offset'] = $data[1]; - } - } - $this->limit = (object) ['limit' => $data['limit'], 'offset' => $data['offset']]; - return $this; - } - protected $many; - public function find($many = false) - { - $this->many = $many; - if ($this->is_aggregator) { - return $this->findAggregator(); - } - return $this->findModel(); - } - - protected function findModel() - { - $objs = model($this->class); - $objs = $this->parseLimit($this->parseOrder($this->parseConditions($objs))); - - if ($this->many) { - return $objs->findMany(); - } - return $objs->findOne(); - } - protected function parseConditions($orm) - { - if ($this->conditions == null) { - return $orm; - } - foreach ($this->conditions as $column => $value) { - if (is_array($value)) { - list($value, $op) = $value; - switch ($op) { - case '>': - case 'gt': - $orm = $orm->whereGt($column, $value); - break; - } - } else { - $orm = $orm->where($column, $value); - } - } - return $orm; - } - protected function parseOrder($orm) - { - if ($this->order == null) { - return $orm; - } - foreach ($this->order as $column => $order) { - if (is_numeric($column)) { - $column = $order; - $order = 'asc'; - } - switch (strtolower($order)) { - case 'asc': - default: - $orm = $orm->orderByAsc($column); - break; - case 'desc': - $orm = $orm->orderByDesc($column); - break; - case 'expr': - $orm = $orm->orderByExpr($column); - break; - } - } - return $orm; - } - protected function parseLimit($orm) - { - if ($this->limit == null) { - return $orm; - } - $orm = $orm->limit($this->limit->limit); - if (isset($this->limit->offset)) { - $orm = $orm->offset($this->limit->offset); - } - return $orm; - } - protected function findAggregator() - { - $model = $this->modelName($this->class); - $ids = $this->getIds($model); - $class = $this->class; - if (count($ids) == 0) { - return false; - } - if ($this->many) { - $objs = []; - foreach ($ids as $id) { - $objs []= new $class($id); - } - } else { - $objs = new $class($ids[0]); - } - return $objs; - } - protected function getIds($model) - { - $id = $this->getModelId($model); - $table = $this->getTable($model); - $st = \ORM::forTable($table)->select($id); - $st = $this->parseConditions($st); - $results = $st->findArray(); - $output = array_map(function($a) use($id) { - return $a[$id]; - }, $results); - return $output; - } - protected function modelName($class) - { - $arr = explode("\\", $class); - \array_push($arr, end($arr)); - return implode("\\", $arr); - } - protected function getModelId($model) - { - $table = $this->getTable($model); - $query = "SHOW KEYS FROM {$table} WHERE Key_name = 'PRIMARY'"; - $st = \ORM::getDb()->query($query); - $results = $st->fetchAll(\PDO::FETCH_OBJ); - return $results[0]->Column_name; - } - protected function getTable($model) - { - $arr = explode("\\", $model); - return Stringy::create(end($arr))->toLowerCase() . ''; - } -} diff --git a/app_old/incoviba/modelos/composer.json b/app_old/incoviba/modelos/composer.json deleted file mode 100644 index 55767f2..0000000 --- a/app_old/incoviba/modelos/composer.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "name": "incoviba/modelos", - "description": "Modelos para Incoviba", - "type": "library", - "require": { - "j4mie/paris": "^1.5", - "nesbot/carbon": "^2.28" - }, - "require-dev": { - "phpunit/phpunit": "^8.5", - "kint-php/kint": "^3.3" - }, - "license": "UNLICENSED", - "authors": [ - { - "name": "Aldarien", - "email": "aldarien85@gmail.com" - } - ], - "autoload": { - "psr-4": { - "Incoviba\\Common\\": "common", - "Incoviba\\": "src" - } - } -} diff --git a/app_old/incoviba/modelos/src/common/Action.php b/app_old/incoviba/modelos/src/common/Action.php deleted file mode 100644 index 8a46229..0000000 --- a/app_old/incoviba/modelos/src/common/Action.php +++ /dev/null @@ -1,12 +0,0 @@ -belongsTo(User::class, 'user_id')->findOne(); - } - public function token($token = null) - { - if ($token == null) { - return false; - } - $this->token = \password_hash($token, \PASSWORD_DEFAULT); - } - public function time($time = null) - { - if ($time == null) { - return Carbon::parse($this->time, config('app.timezone')); - } - if (!\is_a($time, \DateTime::class)) { - $time = Carbon::parse($time, config('app.timezone')); - } - $this->time = $time; - } - public function save() - { - if (!\is_string($this->time)) { - $this->time = $this->time->format('Y-m-d H:i:s'); - } - parent::save(); - } - public function isIn() - { - if ($this->status == 0) { - return false; - } - $now = Carbon::now(config('app.timezone')); - $diff = $now->diffAsCarbonInterval($this->time, true); - if ($diff->totalHours > config('app.login_hours')) { - return false; - } - return true; - } -} -?> diff --git a/app_old/incoviba/modelos/src/common/Location.php b/app_old/incoviba/modelos/src/common/Location.php deleted file mode 100644 index 5d3323d..0000000 --- a/app_old/incoviba/modelos/src/common/Location.php +++ /dev/null @@ -1,23 +0,0 @@ -hasMany(Permission::class, 'location')->findMany(); - } -} -?> diff --git a/app_old/incoviba/modelos/src/common/Permission.php b/app_old/incoviba/modelos/src/common/Permission.php deleted file mode 100644 index c283e7e..0000000 --- a/app_old/incoviba/modelos/src/common/Permission.php +++ /dev/null @@ -1,49 +0,0 @@ -all == 0) { - return $this->belongsTo(Location::class, 'location')->findOne(); - } - if ($this->locations == null) { - $this->locations = \Model::factory(Location::class)->findMany(); - } - return $this->locations; - }*/ - public function who() - { - switch ($this->type) { - case 1: - return $this->belongsTo(User::class, 'ext_id')->findOne(); - case 2: - return $this->belongsTo(Role::class, 'ext_id')->findOne(); - } - } - public function action() - { - return $this->belongsTo(Action::class, 'action_id')->findOne(); - } -} -?> diff --git a/app_old/incoviba/modelos/src/common/Registry.php b/app_old/incoviba/modelos/src/common/Registry.php deleted file mode 100644 index aae8a0a..0000000 --- a/app_old/incoviba/modelos/src/common/Registry.php +++ /dev/null @@ -1,64 +0,0 @@ -belongsTo(User::class, 'user')->findOne(); - } - protected $model; - public function model() - { - if ($this->model == null) { - list($model, $actions) = explode(']', $this->action); - $model = str_replace(['Incoviba\\old\\', 'Incoviba\\nuevo\\', '\\'], ['', '', '->'], trim($model, '[')); - $this->model = $model; - } - return $this->model; - } - protected $actions; - public function actions() - { - if ($this->actions == null) { - list($model, $actions) = explode(']', $this->action); - $actions = explode(', ', trim($actions)); - $resultados = []; - foreach ($actions as $action) { - if (strpos($action, ': ') !== false) { - list($columna, $valor) = explode(': ', $action); - } else { - $columna = ''; - $valor = $action; - } - if (strpos($valor, ' -> ') !== false) { - list($old, $new) = explode(' -> ', $valor); - } else { - $old = ''; - $new = $valor; - } - $resultados[$columna] = (object) ['old' => $old, 'new' => $new]; - } - $this->actions = $resultados; - } - return $this->actions; - } - public function time(Carbon $time = null) - { - if ($time == null) { - return Carbon::parse($this->time); - } - $this->time = $time->toDateTimeString(); - } -} diff --git a/app_old/incoviba/modelos/src/common/RegistryData.php b/app_old/incoviba/modelos/src/common/RegistryData.php deleted file mode 100644 index 18dee39..0000000 --- a/app_old/incoviba/modelos/src/common/RegistryData.php +++ /dev/null @@ -1,16 +0,0 @@ -inherits != 0) { - return $this->belongsTo(Role::class, 'inherits')->findOne(); - } - return false; - } - protected $permissions; - public function permissions() - { - if ($this->permissions == null) { - $permissions = $this->hasMany(Permission::class, 'ext_id')->where('permissions.type', 2)->findMany(); - if ($this->inherits()) { - $permissions = array_merge($permissions, $this->inherits()->permissions()); - } - usort($permissions, function($a, $b) { - return strcmp($a->action()->description, $b->action()->description); - }); - $this->permissions = $permissions; - } - return $this->permissions; - } - public function users() - { - return $this->hasManyThrough(User::class, UserRole::class, 'role', 'user')->findMany(); - } - public function hasAccess($route) - { - $action = $route->getArgument('action'); - $action = (new Factory(Action::class))->where(['description' => $action])->find(); - if (!$action) { - return false; - } - - $data = [ - 'type' => 2, - 'ext_id' => $this->id, - 'action_id' => $action->id, - 'status' => 1 - ]; - $permission = (new Factory(Permission::class))->where($data)->find(); - if ($permission !== false) { - return true; - } - - if ($this->inherits()) { - return $this->inherits()->hasAccess($route); - } - return false; - } - public function checkAccess($action_name) - { - $action = (new Factory(Action::class))->where(['description' => $action_name])->find(); - if (!$action) { - throw new \Exception('Action ' . $action_name . ' not found.'); - } - $permission = (new Factory(Permission::class))->where([ - 'type' => 2, - 'ext_id' => $this->id, - 'action_id' => $action->id, - 'status' => 1 - ])->find(); - if ($permission !== false) { - return true; - } - if ($this->inherits()) { - return $this->inherits()->checkAccess($action_name); - } - return false; - } - public function addPermission($action_name) - { - if ($this->checkAccess($action_name)) { - return; - } - $action = (new Factory(Action::class))->where(['description' => $action_name])->find(); - if (!$action) { - throw new \InvalidArgumentException($action_name . ' not found.'); - } - $data = [ - 'type' => 2, - 'ext_id' => $this->id, - 'action_id' => $action->id - ]; - $permission = (new Factory(Permission::class))->where($data)->find(); - if (!$permission) { - $permission = (new Factory(Permission::class))->create($data); - } - $permission->status = 1; - $permission->save(); - } - public function removePermission($action_name) - { - if (!$this->checkAccess($action_name)) { - return; - } - $action = (new Factory(Action::class))->where(['description' => $action_name])->find(); - if (!$action) { - throw new \InvalidArgumentException($action_name . ' not found.'); - } - $data = [ - 'type' => 2, - 'ext_id' => $this->id, - 'action_id' => $action->id - ]; - $permission = (new Factory(Permission::class))->where($data)->find(); - if (!$permission) { - return; - } - $permission->status = 0; - $permission->save(); - } - public function hasUser($user) - { - $user = \Model::factory(User::class) - ->select('users.*') - ->join('user_roles', ['user_roles.user', '=', 'users.id']) - ->join('roles', ['roles.id', '=', 'user_roles.role']) - ->where('roles.id', $this->id) - ->whereAnyIs([['users.name' => $user], ['users.id' => $user]]) - ->findOne(); - if ($user !== false) { - return true; - } - return false; - } - public function isInherited($action_name) - { - if (!$this->checkAccess($action_name)) { - return false; - } - $action = (new Factory(Action::class))->where(['description' => $action_name])->find(); - $permission = (new Factory(Permission::class))->where([ - 'type' => 2, - 'ext_id' => $this->id, - 'action_id' => $action->id, - 'status' => 1 - ])->find(); - if ($permission !== false) { - return false; - } - return true; - } -} -?> diff --git a/app_old/incoviba/modelos/src/common/User.php b/app_old/incoviba/modelos/src/common/User.php deleted file mode 100644 index 7d4844e..0000000 --- a/app_old/incoviba/modelos/src/common/User.php +++ /dev/null @@ -1,104 +0,0 @@ -password = \password_hash($password, \PASSWORD_BCRYPT); - } - protected $permissions = null; - public function permissions() - { - if ($this->permissions == null) { - $permissions = $this->hasMany(Permission::class, 'ext_id')->where('permissions.type', 1)->findMany(); - if ($permissions == false) { - $permissions = []; - } - foreach ($this->roles() as $role) { - $rp = $role->permissions(); - if ($rp !== false) { - $permissions = array_merge($permissions, $rp); - } - } - if (count($permissions) == 0) { - $permissions = false; - } - $this->permissions = $permissions; - } - return $this->permissions; - } - public function roles() - { - return $this->hasManyThrough(Role::class, UserRole::class, 'user', 'role')->findMany(); - } - public function hasAccess($route) - { - foreach ($this->roles() as $role) { - if ($role->hasAccess($route) === true) { - return true; - } - } - - $action = $route->getArgument('action'); - $action = (new Factory(Action::class))->where(['description' => $action])->find(); - if (!$action) { - return false; - } - - $data = [ - 'type' => 1, - 'ext_id' => $this->id, - 'action_id' => $action->id, - 'status' => 1 - ]; - $permission = (new Factory(Permission::class))->where($data)->find(); - if ($permission !== false) { - return true; - } - return false; - } - public function checkAccess($action_name) - { - foreach ($this->roles() as $role) { - if ($role->checkAccess($action_name) === true) { - return true; - } - } - $action = (new Factory(Action::class))->where(['description' => $action_name])->find(); - - $permission = (new Factory(Permission::class))->where([ - 'type' => 1, - 'ext_id' => $this->id, - 'action_id' => $action->id, - 'status' => 1 - ])->find(); - if ($permission !== false) { - return true; - } - return false; - } - public function hasRole($role) - { - foreach ($this->roles() as $r) { - if ($r->description == $role or $r->id == $role) { - return true; - } - } - return false; - } -} diff --git a/app_old/incoviba/modelos/src/common/UserRole.php b/app_old/incoviba/modelos/src/common/UserRole.php deleted file mode 100644 index 646bf01..0000000 --- a/app_old/incoviba/modelos/src/common/UserRole.php +++ /dev/null @@ -1,26 +0,0 @@ -belongsTo(User::class, 'user')->findOne(); - } - public function role() - { - return $this->belongsTo(Role::class, 'role')->findOne(); - } -} -?> diff --git a/app_old/incoviba/modelos/src/nuevo/Common/Banco.php b/app_old/incoviba/modelos/src/nuevo/Common/Banco.php deleted file mode 100644 index 365cbb8..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Common/Banco.php +++ /dev/null @@ -1,22 +0,0 @@ -has_many(\Incoviba\nuevo\Inmobiliaria\Cuenta::class, 'banco_id')->findMany(); - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Common/Comuna.php b/app_old/incoviba/modelos/src/nuevo/Common/Comuna.php deleted file mode 100644 index 4e25192..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Common/Comuna.php +++ /dev/null @@ -1,27 +0,0 @@ -belongs_to(Provincia::class, 'provincia_id')->findOne(); - } - public function direcciones() - { - return $this->has_many(Direccion::class, 'comuna_id')->findMany(); - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Common/Direccion.php b/app_old/incoviba/modelos/src/nuevo/Common/Direccion.php deleted file mode 100644 index b195681..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Common/Direccion.php +++ /dev/null @@ -1,24 +0,0 @@ -belongs_to(Comuna::class, 'comuna_id')->findOne(); - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Common/M2.php b/app_old/incoviba/modelos/src/nuevo/Common/M2.php deleted file mode 100644 index 9c4f05d..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Common/M2.php +++ /dev/null @@ -1,33 +0,0 @@ -has_many(\Incoviba\nuevo\Proyecto\UnidadProyecto::class, 'm2_id')->findMany(); - } - public function vendibles() - { - return $this->util + $this->logia + $this->terraza / 2 + $this->cubierta / 3; - } - public function total() - { - return $this->util + $this->logia + $this->terraza + $this->cubierta; - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Common/Provincia.php b/app_old/incoviba/modelos/src/nuevo/Common/Provincia.php deleted file mode 100644 index 2f74d80..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Common/Provincia.php +++ /dev/null @@ -1,27 +0,0 @@ -belongs_to(Region::class, 'region_id')->findOne(); - } - public function comunas() - { - return $this->has_many(Comuna::class, 'provincia_id')->findMany(); - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Common/Region.php b/app_old/incoviba/modelos/src/nuevo/Common/Region.php deleted file mode 100644 index e3e211e..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Common/Region.php +++ /dev/null @@ -1,24 +0,0 @@ -has_many(Provincia::class, 'region_id')->findMany(); - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Common/UF.php b/app_old/incoviba/modelos/src/nuevo/Common/UF.php deleted file mode 100644 index 53f7329..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Common/UF.php +++ /dev/null @@ -1,33 +0,0 @@ -fecha, config('app.timezone')); - $uf = uf($fecha); - - if ($uf != null) { - $this->valor = $uf->uf->value; - } - } - -} diff --git a/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Agente.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Agente.php deleted file mode 100644 index 2b7d828..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Agente.php +++ /dev/null @@ -1,47 +0,0 @@ -belongsTo(Representante::class, 'representante_rut', 'rut')->findOne(); - } - public function direccion() - { - return $this->belongsTo(Direccion::class, 'direccion_id')->findOne(); - } - public function tipo() - { - return $this->belongsTo(TipoAgente::class, 'tipo_agente_id')->findOne(); - } - public function contratos() - { - return $this->hasMany(Contrato::class, 'agente_id')->findMany(); - } - public function comision($inmobiliaria_rut) - { - return $this->hasMany(Contrato::class, 'agente_id')->where('inmobiliaria_rut', $inmobiliaria_rut)->sum('valor'); - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/CategoriaCuentaContable.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/CategoriaCuentaContable.php deleted file mode 100644 index 8c6de25..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/CategoriaCuentaContable.php +++ /dev/null @@ -1,21 +0,0 @@ -hasMany(CuentaContable::class, 'categoria_id')->findMany(); - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Cobro.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Cobro.php deleted file mode 100644 index ed856f2..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Cobro.php +++ /dev/null @@ -1,36 +0,0 @@ -belongsTo(Contrato::class, 'contrato_id')->findOne(); - } - public function tipo() - { - return $this->belongsTo(TipoCobro::class, 'tipo_cobro_id')->findOne(); - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Contrato.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Contrato.php deleted file mode 100644 index 903f7f6..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Contrato.php +++ /dev/null @@ -1,37 +0,0 @@ -belongsTo(Inmobiliaria::class, 'inmobiliaria_rut', 'rut')->findOne(); - } - public function agente() - { - return $this->belongsTo(Agente::class, 'agente_id')->findOne(); - } - public function tipo() - { - return $this->belongsTo(TipoContrato::class, 'tipo_contrato_id')->findOne(); - } - public function cobros() - { - return $this->hasMany(Cobro::class, 'contrato_id')->findMany(); - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Cuenta.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Cuenta.php deleted file mode 100644 index 94dbfc8..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Cuenta.php +++ /dev/null @@ -1,31 +0,0 @@ -belongsTo(Inmobiliaria::class, 'inmobiliaria_rut', 'rut')->findOne(); - } - public function banco() - { - return $this->belongsTo(Banco::class, 'banco_id')->findOne(); - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/CuentaContable.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/CuentaContable.php deleted file mode 100644 index 7c28136..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/CuentaContable.php +++ /dev/null @@ -1,44 +0,0 @@ -belongsTo(Inmobiliaria::class, 'inmobiliaria_rut', 'rut')->findOne(); - } - public function categoria() - { - return $this->belongsTo(CategoriaCuentaContable::class, 'categoria_id')->findOne(); - } - public function cargos() - { - return $this->hasMany(TransaccionContable::class, 'cuenta_de')->findMany(); - } - public function abonos() - { - return $this->hasMany(TransaccionContable::class, 'cuenta_para')->findMany(); - } - public function transacciones() - { - $transacciones = model(TransaccionContable::class)->whereAnyIs([['cuenta_de', $this->id], ['cuenta_para', $this->id]])->orderByAsc('fecha')->findMany(); - return $transacciones; - } - public function unidades() - { - return null; - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/EstadoCobro.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/EstadoCobro.php deleted file mode 100644 index 251c914..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/EstadoCobro.php +++ /dev/null @@ -1,26 +0,0 @@ -belongsTo(Cobro::class, 'cobro_id')->findOne(); - } - public function estado() - { - return $this->belongsTo(TipoEstadoCobro::class, 'estado_id')->findOne(); - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Inmobiliaria.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Inmobiliaria.php deleted file mode 100644 index c28388a..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Inmobiliaria.php +++ /dev/null @@ -1,50 +0,0 @@ -belongs_to(Direccion::class, 'direccion_id')->findOne(); - } - public function representante() - { - return $this->belongs_to(Representante::class, 'representante_rut', 'rut')->findOne(); - } - public function estado() - { - return ($estado != 0); - } - - public function proyectos() - { - return $this->has_many(Proyecto::class, 'inmobiliaria_rut', 'rut')->findMany(); - } - public function inversionistas() - { - return $this->has_many_through(Socio::class, Participacion::class, 'socio_id', 'inmobiliaria_rut', 'rut')->findMany(); - } -} -?> \ No newline at end of file diff --git a/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Participacion.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Participacion.php deleted file mode 100644 index f56388a..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Participacion.php +++ /dev/null @@ -1,27 +0,0 @@ -belongsTo(Inmobiliaria::class, 'inmobiliaria_rut', 'rut')->findOne(); - } - public function socio() - { - return $this->belongsTo(Socio::class, 'socio_rut', 'rut')->findOne(); - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Representante.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Representante.php deleted file mode 100644 index 1bc76b3..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Representante.php +++ /dev/null @@ -1,56 +0,0 @@ -belongsTo(Direccion::class, 'direccion_id')->findMany(); - } - public function nombreCompleto() - { - return $this->nombres . ' ' . $this->apellidos; - } - - public function inmobiliarias() - { - return $this->hasMany(Inmobiliaria::class, 'representante_rut', 'rut')->findMany(); - } - public function agentes() - { - return $this->hasMany(Agente::class, 'representante_rut', 'rut')->findMany(); - } - public function apelativo() - { - if ($this->sexo == 'f') { - return 'doña'; - } - return 'don'; - } - public function articulo() - { - if ($this->sexo == 'f') { - return 'la'; - } - return 'el'; - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Socio.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Socio.php deleted file mode 100644 index dddd84e..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Socio.php +++ /dev/null @@ -1,23 +0,0 @@ -hasMany(Participacion::class, 'socio_rut', 'rut')->findMany(); - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/TipoAgente.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/TipoAgente.php deleted file mode 100644 index 7455f90..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/TipoAgente.php +++ /dev/null @@ -1,22 +0,0 @@ -hasMany(Agente::class, 'tipo_agente_id')->findMany(); - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/TipoCobro.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/TipoCobro.php deleted file mode 100644 index 3bb0f1a..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/TipoCobro.php +++ /dev/null @@ -1,22 +0,0 @@ -hasMany(Cobro::class, 'tipo_cobro_id')->findMany(); - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/TipoContrato.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/TipoContrato.php deleted file mode 100644 index 15ae99d..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/TipoContrato.php +++ /dev/null @@ -1,22 +0,0 @@ -hasMany(Contrato::class)->findMany(); - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/TipoEstadoCobro.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/TipoEstadoCobro.php deleted file mode 100644 index 777e97f..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/TipoEstadoCobro.php +++ /dev/null @@ -1,22 +0,0 @@ -hasMany(EstadoCobro::class, 'estado_id')->findMany(); - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/TransaccionContable.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/TransaccionContable.php deleted file mode 100644 index ddbbed5..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/TransaccionContable.php +++ /dev/null @@ -1,46 +0,0 @@ -belongsTo(CuentaContable::class, 'cuenta_de'); - } - public function para() - { - return $this->belongsTo(CuentaContable::class, 'cuenta_para'); - } - - public function valor($tipo = 'pesos') - { - if ($tipo == 'ufs') { - $uf = model(UF::class)->where('fecha', $this->fecha)->findOne(); - if (!$uf) { - $uf = model(UF::class)->create(); - $uf->fecha = $this->fecha; - $uf->getValor(); - $uf->save(); - } - return ($this->valor / $uf->valor) ?: 0; - } - return $this->valor; - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Proyecto/EstadoProyecto.php b/app_old/incoviba/modelos/src/nuevo/Proyecto/EstadoProyecto.php deleted file mode 100644 index c400628..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Proyecto/EstadoProyecto.php +++ /dev/null @@ -1,25 +0,0 @@ -belongsTo(Proyecto::class, 'proyecto_id')->findOne(); - } - public function estado() - { - return $this->belongsTo(TipoEstadoProyecto::class, 'estado_id')->findOne(); - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Proyecto/Etapa.php b/app_old/incoviba/modelos/src/nuevo/Proyecto/Etapa.php deleted file mode 100644 index 9dbda32..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Proyecto/Etapa.php +++ /dev/null @@ -1,22 +0,0 @@ -hasMany(TipoEstadoProyecto::class, 'etapa_id')->findMany(); - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Proyecto/Participe.php b/app_old/incoviba/modelos/src/nuevo/Proyecto/Participe.php deleted file mode 100644 index 1aafd6f..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Proyecto/Participe.php +++ /dev/null @@ -1,27 +0,0 @@ -hasManyThrough(Proyecto::class, ProyectoParticipe::class, 'proyecto_id', 'participe_rut', 'rut')->findMany(); - } - public function participaciones() - { - return $this->hasMany(ProyectoParticipe::class, 'participe_rut', 'rut')->findMany(); - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Proyecto/Proyecto.php b/app_old/incoviba/modelos/src/nuevo/Proyecto/Proyecto.php deleted file mode 100644 index 922573e..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Proyecto/Proyecto.php +++ /dev/null @@ -1,132 +0,0 @@ -belongsTo(Inmobiliaria::class, 'inmobiliaria_rut', 'rut')->findOne(); - } - public function direccion() - { - return $this->belongsTo(Direccion::class, 'direccion_id')->findOne(); - } - - public function participaciones() - { - return $this->hasMany(ProyectoParticipe::class, 'proyecto_id')->findMany(); - } - public function participes() - { - return $this->hasManyThrough(Participe::class, ProyectoParticipe::class, 'proyecto_id', 'participe_rut', 'rut')->findMany(); - } - public function unidades() - { - return $this->hasMany(UnidadProyecto::class, 'proyecto_id')->findMany(); - } - public function cantidad($tipo = 'departamento') - { - $total = 0; - $unidades = $this->unidades; - foreach ($unidades as $unidad) { - if ($unidad->tipo->descripcion == $tipo) { - $total += $unidad->unidades->count(); - } - } - return $total; - } - public function unidadesPrincipales() - { - if ($this->tipoUnidades()) { - return $this->cantidad('departamento'); - } else { - return $this->cantidad('casa'); - } - } - public function pisos() - { - $max_piso = 0; - $unidades = $this->unidades; - foreach ($unidades as $unidad) { - $piso = $unidad->unidades->max('piso'); - if ($max_piso < $piso) { - $max_piso = $piso; - } - } - return $max_piso; - } - public function m2Construidos() - { - $total = 0; - $unidades = $this->unidades; - foreach ($unidades as $unidad) { - $total += $unidad->m2->total() * $unidad->unidades->count(); - } - return $total; - } - public function tipoUnidades() - { - return (!$this->unidades->isEmpty() and $this->unidades[0]->tipo->descripcion == 'departamento'); - } - public function ventas() - { - $ventas = []; - foreach ($this->unidades as $up) { - foreach ($up->unidades as $u) { - if (isset($u->propiedad)) { - $ventas->add($u->propiedad->venta); - } - } - } - $ventas = sort($ventas, function($a, $b) { - return $a->propiedad->unidadPrincipal->numeracion - $b->propiedad->unidadPrincipal->numeracion; - }); - return $ventas; - } - public function ventasActivas() - { - $ventas = $this->ventas(); - $output = []; - foreach ($ventas as $venta) { - $estado = $venta->ultimoEstado()->estado->descripcion; - if ($estado == 'promesado' or $estado == 'escriturado' or $estado == 'entregado') { - $output []= $venta; - } - } - return $output; - } - public function pVendido() - { - return $this->ventasActivas()->count() / $this->unidadesPrincipales(); - } - public function m2Vendidos() - { - $ventas = $this->ventasActivas(); - $sum = 0; - foreach ($ventas as $venta) { - $sum += $venta->propiedad->unidadPrincipal->unidadProyecto->m2->vendibles(); - } - return $sum; - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Proyecto/ProyectoParticipe.php b/app_old/incoviba/modelos/src/nuevo/Proyecto/ProyectoParticipe.php deleted file mode 100644 index 743e218..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Proyecto/ProyectoParticipe.php +++ /dev/null @@ -1,27 +0,0 @@ -belongsTo(Proyecto::class, 'proyecto_id')->findOne(); - } - public function participe() - { - $this->belongsTo(Participe::class, 'participe_rut', 'rut')->findOne(); - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Proyecto/Tema.php b/app_old/incoviba/modelos/src/nuevo/Proyecto/Tema.php deleted file mode 100644 index 8f665e5..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Proyecto/Tema.php +++ /dev/null @@ -1,75 +0,0 @@ -belongsTo(Proyecto::class)->findOne(); - if ($proyecto) { - return $proyecto; - } - return $this->belongsTo(P::class)->findOne(); - } - public function inicio() - { - return Carbon::parse($this->inicio, config('app.timezone')); - } - public function cierre() - { - return Carbon::parse($this->cierre, config('app.timezone')); - } - public function texto() - { - $text = $this->texto; - $text = explode("\n", $text); - foreach ($text as &$line) { - $line = trim(rtrim($line, '.')) . '.'; - if ($line != ltrim($line, '-')) { - $line = ' ' . $line; - } - } - $text = implode('
    ', $text); - - preg_match_all('/\[\[.*\]\]/', $text, $matches); - $search = []; - $replace = []; - if (count($matches[0]) > 0) { - foreach ($matches[0] as $match) { - $search []= $match; - list($model, $where, $value) = explode(':', str_replace(['[',']'], ['', ''], $match)); - $class = '\\Incoviba\\old\\' . $model; - $obj = model($class)->where($where, $value)->findOne(); - - $str = $value; - if ($obj->venta()) { - $str = '' . $value . ''; - } - $replace []= $str; - } - } - - $text = str_replace($search, $replace, $text); - - return $text; - } -} -?> \ No newline at end of file diff --git a/app_old/incoviba/modelos/src/nuevo/Proyecto/TipoEstadoProyecto.php b/app_old/incoviba/modelos/src/nuevo/Proyecto/TipoEstadoProyecto.php deleted file mode 100644 index 8d87e4d..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Proyecto/TipoEstadoProyecto.php +++ /dev/null @@ -1,28 +0,0 @@ -belongsTo(Etapa::class, 'etapa_id')->findOne(); - } - - public function estados() - { - return $this->hasMany(EstadoProyecto::class, 'estado_id')->findMany(); - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Proyecto/TipoUnidad.php b/app_old/incoviba/modelos/src/nuevo/Proyecto/TipoUnidad.php deleted file mode 100644 index 2eb403d..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Proyecto/TipoUnidad.php +++ /dev/null @@ -1,21 +0,0 @@ -hasMany(UnidadProyecto::class, 'tipo_id')->findMany(); - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Proyecto/UnidadProyecto.php b/app_old/incoviba/modelos/src/nuevo/Proyecto/UnidadProyecto.php deleted file mode 100644 index 0cd665c..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Proyecto/UnidadProyecto.php +++ /dev/null @@ -1,50 +0,0 @@ -belongsTo(Proyecto::class, 'proyecto_id')->findOne(); - } - public function m2() - { - return $this->belongsTo(M2::class, 'm2_id')->findOne(); - } - public function tipo() - { - return $this->belongsTo(TipoUnidad::class, 'tipo_id')->findOne(); - } - public function unidades() - { - return $this->hasMany(Unidad::class, 'unidad_proyecto_id')->findMany(); - } - public function orientaciones() - { - $orientaciones = []; - foreach ($this->unidades as $unidad) { - if (array_search($unidad->orientacion, $orientaciones) === false) { - $orientaciones []= $unidad->orientacion; - } - } - return $orientaciones; - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Venta/Cierre.php b/app_old/incoviba/modelos/src/nuevo/Venta/Cierre.php deleted file mode 100644 index ce5a28e..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Venta/Cierre.php +++ /dev/null @@ -1,59 +0,0 @@ -belongsTo(Proyecto::class, 'proyecto_id')->findOne(); - } - public function agente() - { - return $this->belongsTo(Agente::class, 'agente_id')->findOne(); - } - public function propietario() - { - return $this->belongsTo(Propietario::class, 'propietario_rut')->findOne(); - } - public function reserva() - { - return $this->belongsTo(Reserva::class, 'reserva_id')->findOne(); - } - public function fecha() - { - return Carbon::parse($this->fecha, config('app.timezone')); - } - public function pie($type = 'ufs') - { - if ($type == 'ufs') { - return $this->pie; - } - $uf = uf($this->fecha()); - return $this->pie * $uf->uf->value; - } -} -?> \ No newline at end of file diff --git a/app_old/incoviba/modelos/src/nuevo/Venta/Comentario.php b/app_old/incoviba/modelos/src/nuevo/Venta/Comentario.php deleted file mode 100644 index 4c99f66..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Venta/Comentario.php +++ /dev/null @@ -1,23 +0,0 @@ -belongsTo(Venta::class, 'venta_id')->findOne(); - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Venta/Cuota.php b/app_old/incoviba/modelos/src/nuevo/Venta/Cuota.php deleted file mode 100644 index d273578..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Venta/Cuota.php +++ /dev/null @@ -1,27 +0,0 @@ -belongsTo(Pie::class, 'pie_id')->findOne(); - } - public function pago() - { - return $this->belongsTo(Pago::class, 'pago_id')->findOne(); - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Venta/Entrega.php b/app_old/incoviba/modelos/src/nuevo/Venta/Entrega.php deleted file mode 100644 index fb15691..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Venta/Entrega.php +++ /dev/null @@ -1,47 +0,0 @@ -belongs_to(Venta::class, 'venta_id')->findOne(); - } - - public function fondos() - { - return $this->has_many_through(Pago::class, FondoEntrega::class, 'entrega_id', 'pago_id')->findMany(); - } - public function mediciones() - { - return $this->has_many_through(Medicion::class, MedicionEntrega::class, 'entrega_id', 'medicion_id')->findMany(); - } - public function observaciones() - { - return $this->has_many_through(Observacion::class, EntregaObservacion::class, 'entrega_id', 'observacion_id')->findMany(); - } - public function observacionesPendientes() - { - return $this->has_many_through(Observacion::class, EntregaObservacion::class, 'entrega_id', 'observacion_id') - ->select('observaciones.*') - ->rawJoin('JOIN (SELECT e1.* FROM (SELECT MAX(id) AS id, observacion_id FROM estado_observaciones GROUP BY observacion_id) e0 JOIN estado_observaciones e1 ON e1.id = e0.id)', ['ep.observacion_id', '=', 'observaciones.id'], 'ep') - ->leftOuterJoin('tipo_estado_observaciones', ['tipo_estado_observaciones.id', '=', 'ep.tipo_estado_observacion_id']) - ->where('tipo_estado_observaciones.descripcion', 'ingresada') - ->findMany(); - } -} -?> \ No newline at end of file diff --git a/app_old/incoviba/modelos/src/nuevo/Venta/EstadoCierre.php b/app_old/incoviba/modelos/src/nuevo/Venta/EstadoCierre.php deleted file mode 100644 index d9be83e..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Venta/EstadoCierre.php +++ /dev/null @@ -1,26 +0,0 @@ -belongsTo(Cierre::class)->findOne(); - } - public function estado() - { - return $this->belongsTo(TipoEstadoCierre::class)->findOne(); - } -} -?> \ No newline at end of file diff --git a/app_old/incoviba/modelos/src/nuevo/Venta/EstadoObservacion.php b/app_old/incoviba/modelos/src/nuevo/Venta/EstadoObservacion.php deleted file mode 100644 index e4fc984..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Venta/EstadoObservacion.php +++ /dev/null @@ -1,26 +0,0 @@ -belongs_to(Observacion::class, 'observacion_id')->findOne(); - } - public function tipo() - { - return $this->belongs_to(TipoEstadoObservacion::class, 'tipo_estado_observacion_id')->findOne(); - } -} -?> \ No newline at end of file diff --git a/app_old/incoviba/modelos/src/nuevo/Venta/EstadoPago.php b/app_old/incoviba/modelos/src/nuevo/Venta/EstadoPago.php deleted file mode 100644 index a163d9d..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Venta/EstadoPago.php +++ /dev/null @@ -1,25 +0,0 @@ -belongsTo(Pago::class, 'pago_id')->findOne(); - } - public function estado() - { - return $this->belongsTo(TipoEstadoPago::class, 'estado_id')->findOne(); - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Venta/EstadoPostventa.php b/app_old/incoviba/modelos/src/nuevo/Venta/EstadoPostventa.php deleted file mode 100644 index ba8b6be..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Venta/EstadoPostventa.php +++ /dev/null @@ -1,27 +0,0 @@ -belongs_to(Postventa::class, 'postventa_id')->findOne(); - } - public function tipo() - { - return $this->belongs_to(TipoEstadoPostventa::class, 'tipo_estado_postventa_id')->findOne(); - } -} -?> \ No newline at end of file diff --git a/app_old/incoviba/modelos/src/nuevo/Venta/EstadoVenta.php b/app_old/incoviba/modelos/src/nuevo/Venta/EstadoVenta.php deleted file mode 100644 index 52ac3df..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Venta/EstadoVenta.php +++ /dev/null @@ -1,25 +0,0 @@ -belongsTo(Venta::class, 'venta_id')->findOne(); - } - public function estado() - { - return $this->belongsTo(TipoEstadoVenta::class, 'estado_id')->findOne(); - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Venta/FondoVenta.php b/app_old/incoviba/modelos/src/nuevo/Venta/FondoVenta.php deleted file mode 100644 index 7e5c689..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Venta/FondoVenta.php +++ /dev/null @@ -1,31 +0,0 @@ -belongs_to(Venta::class, 'venta_id')->findOne(); - } - public function tipo() - { - return $this->belongs_to(TipoFondo::class, 'tipo_id')->findOne(); - } - public function pago() - { - return $this->belongs_to(Pago::class, 'pago_id')->findOne(); - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Venta/FormaPago.php b/app_old/incoviba/modelos/src/nuevo/Venta/FormaPago.php deleted file mode 100644 index 43ffff0..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Venta/FormaPago.php +++ /dev/null @@ -1,35 +0,0 @@ -belongsTo(Pie::class, 'pie_id')->findOne(); - } - public function escritura() - { - return $this->belongsTo(Pago::class, 'escritura_id')->findOne(); - } - public function credito() - { - return $this->belongsTo(Pago::class, 'credito_id')->findOne(); - } - public function subsidio() - { - return $this->belongs_to(Subsidio::class, 'subsidio_id')->findOne(); - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Venta/Medicion.php b/app_old/incoviba/modelos/src/nuevo/Venta/Medicion.php deleted file mode 100644 index 4e8c25f..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Venta/Medicion.php +++ /dev/null @@ -1,24 +0,0 @@ -belongs_to(TipoMedicion::class, 'tipo_medicion_id')->findOne(); - } -} -?> \ No newline at end of file diff --git a/app_old/incoviba/modelos/src/nuevo/Venta/Observacion.php b/app_old/incoviba/modelos/src/nuevo/Venta/Observacion.php deleted file mode 100644 index af3d10e..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Venta/Observacion.php +++ /dev/null @@ -1,20 +0,0 @@ - \ No newline at end of file diff --git a/app_old/incoviba/modelos/src/nuevo/Venta/Pago.php b/app_old/incoviba/modelos/src/nuevo/Venta/Pago.php deleted file mode 100644 index 2aa1d18..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Venta/Pago.php +++ /dev/null @@ -1,35 +0,0 @@ -belongsTo(TipoPago::class, 'tipo_id')->findOne(); - } - public function banco() - { - return $this->belongsTo(Banco::class, 'banco_id')->findOne(); - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Venta/Pie.php b/app_old/incoviba/modelos/src/nuevo/Venta/Pie.php deleted file mode 100644 index 70a292a..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Venta/Pie.php +++ /dev/null @@ -1,39 +0,0 @@ -belongsTo(Pie::class, 'asociado_id'); - if ($pie) { - return $pie->findOne(); - } - return null; - } - public function Cuotas() - { - return $this->hasMany(Cuota::class, 'pie_id')->findMany(); - } - public function CuotasPagadas() - { - return $this->hasMany(Cuota::class, 'pie_id')->filter(function($cuota) { - $estado = $cuota->pago->ultimoEstado()->estado->descripcion; - return ($estado == 'depositado' or $estado == 'abonado'); - }); - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Venta/Postventa.php b/app_old/incoviba/modelos/src/nuevo/Venta/Postventa.php deleted file mode 100644 index defd340..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Venta/Postventa.php +++ /dev/null @@ -1,38 +0,0 @@ -belongs_to(Venta::class, 'venta_id')->findOne(); - } - public function observaciones() - { - return $this->has_many_through(Observacion::class, PostventaObservacion::class, 'postventa_id', 'observacion_id')->findMany(); - } - public function observacionesPendientes() - { - return $this->has_many_through(Observacion::class, PostventaObservacion::class, 'postventa_id', 'observacion_id') - ->select('observaciones.*') - ->rawJoin('JOIN (SELECT e1.* FROM (SELECT MAX(id) AS id, observacion_id FROM estado_observaciones GROUP BY observacion_id) e0 JOIN estado_observaciones e1 ON e1.id = e0.id)', ['ep.observacion_id', '=', 'observaciones.id'], 'ep') - ->leftOuterJoin('tipo_estado_observaciones', ['tipo_estado_observaciones.id', '=', 'ep.tipo_estado_observacion_id']) - ->where('tipo_estado_observaciones.descripcion', 'ingresada') - ->findMany(); - } -} -?> \ No newline at end of file diff --git a/app_old/incoviba/modelos/src/nuevo/Venta/PostventaObservacion.php b/app_old/incoviba/modelos/src/nuevo/Venta/PostventaObservacion.php deleted file mode 100644 index f16309a..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Venta/PostventaObservacion.php +++ /dev/null @@ -1,27 +0,0 @@ -belongs_to(Postventa::class, 'postventa_id')->findOne(); - } - public function observacion() - { - return $this->belongs_to(Observacion::class, 'observacion_id')->findOne(); - } -} -?> \ No newline at end of file diff --git a/app_old/incoviba/modelos/src/nuevo/Venta/Premio.php b/app_old/incoviba/modelos/src/nuevo/Venta/Premio.php deleted file mode 100644 index 0ea45c0..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Venta/Premio.php +++ /dev/null @@ -1,27 +0,0 @@ -belongsTo(Venta::class, 'venta_id')->findOne(); - } - public function tipo() - { - return $this->belongsTo(TipoPremio::class, 'tipo_id')->findOne(); - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Venta/Propiedad.php b/app_old/incoviba/modelos/src/nuevo/Venta/Propiedad.php deleted file mode 100644 index edc7299..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Venta/Propiedad.php +++ /dev/null @@ -1,30 +0,0 @@ -belongsTo(Unidad::class, 'unidad_id')->findOne(); - } - public function unidades() - { - return $this->hasMany(UnidadPropiedad::class, 'propiedad_id')->findMany(); - } - public function venta() - { - return $this->hasMany(Venta::class, 'propiedad_id')->findOne(); - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Venta/Propietario.php b/app_old/incoviba/modelos/src/nuevo/Venta/Propietario.php deleted file mode 100644 index be00555..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Venta/Propietario.php +++ /dev/null @@ -1,71 +0,0 @@ -belongsTo(Direccion::class, 'direccion_id')->findOne(); - } - public function representante() - { - $prop = $this->belongsTo(Propietario::class, 'representante_rut', 'rut'); - if ($prop) { - return $prop->findOne(); - } - return null; - } - public function otro() - { - $prop = $this->belongsTo(Propietario::class, 'otro_rut', 'rut'); - if ($prop) { - return $prop->findOne(); - } - return null; - } - - public function nombreCompleto() - { - return implode(' ', [$this->nombres, $this->apellido_paterno, $this->apellido_materno]); - } - - public function represntado() - { - $prop = $this->has_many(Propietario::class, 'representante_rut', 'rut'); - if ($prop) { - return $prop->findOne(); - } - return null; - } - public function ventas() - { - return $this->hasMany(Venta::class, 'propietario_rut', 'rut')->findMany(); - } - public function articulo() - { - if ($this->sexo == 'f') { - return 'la'; - } - return 'el'; - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Venta/ProyectoTipoMedicion.php b/app_old/incoviba/modelos/src/nuevo/Venta/ProyectoTipoMedicion.php deleted file mode 100644 index 6d479c7..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Venta/ProyectoTipoMedicion.php +++ /dev/null @@ -1,28 +0,0 @@ -belongs_to(Proyecto::class, 'proyecto_id')->findOne(); - } - public function tipo() - { - return $this->belongs_to(TipoMedicion::class, 'tipo_medicion_id')->findOne(); - } -} -?> \ No newline at end of file diff --git a/app_old/incoviba/modelos/src/nuevo/Venta/Reserva.php b/app_old/incoviba/modelos/src/nuevo/Venta/Reserva.php deleted file mode 100644 index 3f68449..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Venta/Reserva.php +++ /dev/null @@ -1,30 +0,0 @@ -belongsTo(Unidad::class, 'unidad_id')->findOne(); - } - public function unidades() - { - return $this->hasMany(UnidadReserva::class, 'reserva_id')->findMany(); - } -} -?> \ No newline at end of file diff --git a/app_old/incoviba/modelos/src/nuevo/Venta/TipoEstadoCierre.php b/app_old/incoviba/modelos/src/nuevo/Venta/TipoEstadoCierre.php deleted file mode 100644 index 50498bc..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Venta/TipoEstadoCierre.php +++ /dev/null @@ -1,10 +0,0 @@ - \ No newline at end of file diff --git a/app_old/incoviba/modelos/src/nuevo/Venta/TipoEstadoObservacion.php b/app_old/incoviba/modelos/src/nuevo/Venta/TipoEstadoObservacion.php deleted file mode 100644 index ba0eb69..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Venta/TipoEstadoObservacion.php +++ /dev/null @@ -1,10 +0,0 @@ - \ No newline at end of file diff --git a/app_old/incoviba/modelos/src/nuevo/Venta/TipoEstadoPago.php b/app_old/incoviba/modelos/src/nuevo/Venta/TipoEstadoPago.php deleted file mode 100644 index 0224436..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Venta/TipoEstadoPago.php +++ /dev/null @@ -1,14 +0,0 @@ -hasMany(EstadoPago::class, 'estado_id')->findMany(); - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Venta/TipoEstadoPostventa.php b/app_old/incoviba/modelos/src/nuevo/Venta/TipoEstadoPostventa.php deleted file mode 100644 index 3a50841..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Venta/TipoEstadoPostventa.php +++ /dev/null @@ -1,17 +0,0 @@ - \ No newline at end of file diff --git a/app_old/incoviba/modelos/src/nuevo/Venta/TipoEstadoVenta.php b/app_old/incoviba/modelos/src/nuevo/Venta/TipoEstadoVenta.php deleted file mode 100644 index 044dcbf..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Venta/TipoEstadoVenta.php +++ /dev/null @@ -1,14 +0,0 @@ -hasMany(EstadoVenta::class, 'estado_id')->findMany(); - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Venta/TipoFondo.php b/app_old/incoviba/modelos/src/nuevo/Venta/TipoFondo.php deleted file mode 100644 index 0374e5f..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Venta/TipoFondo.php +++ /dev/null @@ -1,14 +0,0 @@ -hasMany(FontoVenta::class, 'tipo_id')->findMany(); - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Venta/TipoMedicion.php b/app_old/incoviba/modelos/src/nuevo/Venta/TipoMedicion.php deleted file mode 100644 index 64d21cd..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Venta/TipoMedicion.php +++ /dev/null @@ -1,10 +0,0 @@ - \ No newline at end of file diff --git a/app_old/incoviba/modelos/src/nuevo/Venta/TipoPago.php b/app_old/incoviba/modelos/src/nuevo/Venta/TipoPago.php deleted file mode 100644 index 0ce8a64..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Venta/TipoPago.php +++ /dev/null @@ -1,14 +0,0 @@ -hasMany(Pago::class, 'tipo_id')->findMany(); - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Venta/TipoPremio.php b/app_old/incoviba/modelos/src/nuevo/Venta/TipoPremio.php deleted file mode 100644 index 381cc39..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Venta/TipoPremio.php +++ /dev/null @@ -1,14 +0,0 @@ -hasMany(Premio::class, 'tipo_id')->findMany(); - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Venta/Unidad.php b/app_old/incoviba/modelos/src/nuevo/Venta/Unidad.php deleted file mode 100644 index 7e43358..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Venta/Unidad.php +++ /dev/null @@ -1,47 +0,0 @@ -belongsTo(UnidadProyecto::class, 'unidad_proyecto_id')->findOne(); - } - public function uPropiedad() - { - $up = $this->hasMany(UnidadPropiedad::class, 'unidad_id'); - if ($up) { - return $up->findOne(); - } - return null; - } - public function propiedad() - { - $prop = $this->hasMany(Propiedad::class, 'unidad_id'); - if ($prop) { - return $prop->findOne(); - } - return null; - } - public function cuentas() - { - return $this->belongsTo(CuentaContable::class, 'cuenta_unidades', 'unidad_id', 'cuenta_id')->findMany(); - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Venta/UnidadPropiedad.php b/app_old/incoviba/modelos/src/nuevo/Venta/UnidadPropiedad.php deleted file mode 100644 index d8a8465..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Venta/UnidadPropiedad.php +++ /dev/null @@ -1,27 +0,0 @@ -belongsTo(Propiedad::class, 'propiedad_id')->findOne(); - } - public function unidad() - { - return $this->belongsTo(Unidad::class, 'unidad_id')->findOne(); - } -} diff --git a/app_old/incoviba/modelos/src/nuevo/Venta/UnidadReserva.php b/app_old/incoviba/modelos/src/nuevo/Venta/UnidadReserva.php deleted file mode 100644 index f0355cb..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Venta/UnidadReserva.php +++ /dev/null @@ -1,27 +0,0 @@ -belongsTo(Reserva::class, 'reserva_id')->findOne(); - } - public function unidad() - { - return $this->belongsTo(Unidad::class, 'unidad_id')->findOne(); - } -} -?> \ No newline at end of file diff --git a/app_old/incoviba/modelos/src/nuevo/Venta/Venta.php b/app_old/incoviba/modelos/src/nuevo/Venta/Venta.php deleted file mode 100644 index d5bad0d..0000000 --- a/app_old/incoviba/modelos/src/nuevo/Venta/Venta.php +++ /dev/null @@ -1,104 +0,0 @@ -belongs_to(Propietario::class, 'propietario_rut', 'rut')->findOne(); - } - public function propiedad() - { - return $this->belongs_to(Propiedad::class, 'propiedad_id')->findOne(); - } - public function formaPago() - { - return $this->belongs_to(FormaPago::class, 'forma_pago_id')->findOne(); - } - public function agente() - { - $agente = $this->belongs_to(Agente::class, 'agente_id'); - if ($agente) { - return $agente->findOne(); - } - return null; - } - - public function valor() - { - return $this->valor_promesa * $this->uf; - } - public function proyecto() - { - return $this->propiedad->unidadPrincipal->unidadProyecto->proyecto(); - } - public function comision() - { - return $this->agente->comision($this->proyecto->inmobiliaria->rut); - } - public function ufM2() - { - if (!$this->agente) { - return 0; - } - return ($this->valor_promesa - $this->premios->sum('valor') - $this->comision() - $this->propiedad->unidades->sum('valor')) / $this->propiedad->unidadPrincipal->unidadProyecto->m2->vendibles(); - } - public function fechaPromesa() - { - return Carbon::parse($this->fecha_promesa, config('app.timezone')); - } - - public function premios() - { - $premios = $this->has_many(Premio::class, 'venta_id'); - if ($premios) { - return $premios->findMany(); - } - return []; - } - public function comentarios() - { - $comentarios = $this->has_many(Comentario::class, 'venta_id'); - if ($comentarios) { - return $comentarios->findMany(); - } - return []; - } - public function fondos() - { - return $this->has_many(FondoVenta::class, 'venta_id')->findMany(); - } - public function postventas() - { - $postventas = $this->has_many(Postventa::class, 'venta_id'); - if ($postventas) { - return $postventas->findMany(); - } - return null; - } -} diff --git a/app_old/incoviba/modelos/src/old/Common/Banco.php b/app_old/incoviba/modelos/src/old/Common/Banco.php deleted file mode 100644 index d11cb22..0000000 --- a/app_old/incoviba/modelos/src/old/Common/Banco.php +++ /dev/null @@ -1,29 +0,0 @@ -nombre) { - case 'Estado': - case 'Chile': - case 'Edwards': - $str .= 'Banco '; - } - $str .= $this->nombre; - return $str; - } -} -?> diff --git a/app_old/incoviba/modelos/src/old/Common/Comuna.php b/app_old/incoviba/modelos/src/old/Common/Comuna.php deleted file mode 100644 index 58266a6..0000000 --- a/app_old/incoviba/modelos/src/old/Common/Comuna.php +++ /dev/null @@ -1,22 +0,0 @@ -belongs_to(Provincia::class, 'provincia')->findOne(); - } -} -?> diff --git a/app_old/incoviba/modelos/src/old/Common/Direccion.php b/app_old/incoviba/modelos/src/old/Common/Direccion.php deleted file mode 100644 index 2ab38fc..0000000 --- a/app_old/incoviba/modelos/src/old/Common/Direccion.php +++ /dev/null @@ -1,36 +0,0 @@ -belongs_to(Comuna::class, 'comuna')->findOne(); - } - - public function completa($comuna = false) - { - $str = $this->calle . ' ' . $this->numero; - if ($this->extra != '') { - $str .= ', ' . $this->extra; - } - if ($comuna) { - $str .= ', ' . $this->comuna()->descripcion; - } - return $str; - } -} -?> diff --git a/app_old/incoviba/modelos/src/old/Common/Provincia.php b/app_old/incoviba/modelos/src/old/Common/Provincia.php deleted file mode 100644 index 8571dca..0000000 --- a/app_old/incoviba/modelos/src/old/Common/Provincia.php +++ /dev/null @@ -1,26 +0,0 @@ -belongsTo(Region::class, 'region')->findOne(); - } - public function comunas() - { - return $this->hasMany(Comuna::class, 'provincia')->findMany(); - } -} -?> diff --git a/app_old/incoviba/modelos/src/old/Common/Region.php b/app_old/incoviba/modelos/src/old/Common/Region.php deleted file mode 100644 index b182609..0000000 --- a/app_old/incoviba/modelos/src/old/Common/Region.php +++ /dev/null @@ -1,44 +0,0 @@ -provincias == null) { - $this->provincias = $this->hasMany(Provincia::class, 'region')->findMany(); - } - return $this->provincias; - } - public function comunas() - { - if ($this->comunas == null) { - $provincias = $this->provincias(); - $comunas = []; - foreach ($provincias as $prov) { - $comunas = array_merge($comunas, $prov->comunas()); - } - usort($comunas, function($a, $b) { - return strcmp($a->descripcion, $b->descripcion); - }); - $this->comunas = $comunas; - } - return $this->comunas; - } -} -?> diff --git a/app_old/incoviba/modelos/src/old/Inmobiliaria/Cuenta.php b/app_old/incoviba/modelos/src/old/Inmobiliaria/Cuenta.php deleted file mode 100644 index dc14e8c..0000000 --- a/app_old/incoviba/modelos/src/old/Inmobiliaria/Cuenta.php +++ /dev/null @@ -1,23 +0,0 @@ -belongsTo(Inmobiliaria::class, 'inmobiliaria', 'rut')->findOne(); - } - public function banco() - { - return $this->belongsTo(Banco::class, 'banco')->findOne(); - } -} diff --git a/app_old/incoviba/modelos/src/old/Inmobiliaria/Inmobiliaria.php b/app_old/incoviba/modelos/src/old/Inmobiliaria/Inmobiliaria.php deleted file mode 100644 index 5f7f9d7..0000000 --- a/app_old/incoviba/modelos/src/old/Inmobiliaria/Inmobiliaria.php +++ /dev/null @@ -1,135 +0,0 @@ -cuenta()->banco(); - //return $this->belongsTo(Banco::class, 'banco')->findOne(); - } - public function proyectos() - { - return $this->hasMany(Proyecto::class, 'inmobiliaria', 'rut')->orderByAsc('descripcion')->findMany(); - } - public function nombre(bool $tipo = false) - { - return $this->abreviacion . (($tipo) ? ' ' . $this->sociedad()->abreviacion . '.' : ''); - } - public function rut() - { - return format('rut', $this->rut) . '-' . $this->dv; - } - public function sociedad() { - return $this->belongsTo(TipoSociedad::class, 'sociedad')->findOne(); - } - public function razon(bool $tipo = false, bool $abreviado = false) { - return $this->razon . (($tipo) ? ' ' . (($abreviado) ? $this->sociedad()->abreviacion . '.' : $this->sociedad()->descripcion) : ''); - } - /** - * $data = ['descripcion', 'calle', 'numero', 'extra', 'comuna'] - */ - public function addProyecto(array $data) - { - //$proyecto = model(Proyecto::class)->where('inmobiliaria', $this->rut)->where('descripcion', $data['descripcion'])->findOne(); - $data = [ - 'inmobiliaria' => $this->rut, - 'descripcion' => $data['descripcion'] - ]; - $proyecto = (new Factory(Proyecto::class))->where($data)->find(); - if (!$proyecto) { - //$proyecto = model(Proyecto::class)->create(); - $proyecto = (new Factory(Proyecto::class))->create($data); - /*$proyecto->inmobiliaria = $this->rut; - $proyecto->descripcion = $data['descripcion'];*/ - $proyecto->setDireccion($data); - $proyecto->save(); - } - } - public function removeProyecto(array $data) - { - $proyecto = (new Factory(Proyecto::class))->where([ - 'inmobiliaria' => $this->rut, - 'descripcion' => $data['descripcion'] - ])->find(); - if ($proyecto) { - $proyecto->delete(); - } - } - public function cuenta() - { - if (count($this->cuentas()) == 0) { - return false; - } - return $this->cuentas()[0]; - } - public function cuentas() - { - return $this->hasMany(Cuenta::class, 'inmobiliaria', 'rut')->findMany(); - } - public function addCuenta(array $data) - { - if (!is_numeric($data['banco'])) { - $banco = (new Factory(Banco::class))->where(['descripcion' => $data['banco']])->find(); - $data['banco'] = $banco->id; - } - $data = [ - 'inmobiliaria' => $this->rut, - 'cuenta' => $data['cuenta'], - 'banco' => $data['banco'] - ]; - $cuenta = (new Factory(Cuenta::class))->where($data)->find(); - if (!$cuenta) { - $cuenta = (new Factory(Cuenta::class))->create($data); - $cuenta->save(); - } - } - public function removeCuenta(array $data) - { - $cuenta = (new Factory(Cuenta::class))->where(['inmobiliaria' => $this->rut]); - if (isset($data['cuenta'])) { - $cuenta = $cuenta->where(['cuenta' => $data['cuenta']]); - } - if (isset($data['banco'])) { - if (!is_numeric($data['banco'])) { - $banco = (new Factory(Banco::class))->where(['descripcion' => $data['banco']])->find(); - $data['banco'] = $banco->id; - } - $cuenta = $cuenta->where(['banco' => $data['banco']]); - } - $cuenta = $cuenta->find(); - if ($cuenta) { - $cuenta->delete(); - } - } - public function modify(array $data) - { - $fields = ['rut', 'dv', 'razon', 'abreviacion']; - foreach ($data as $column => $value) { - if (array_search($column, $fields) !== false) { - $this->$column = $value; - } - } - $this->cuenta()->modify($data); - } -} -?> diff --git a/app_old/incoviba/modelos/src/old/Inmobiliaria/RelacionInmobiliarias.php b/app_old/incoviba/modelos/src/old/Inmobiliaria/RelacionInmobiliarias.php deleted file mode 100644 index b86593d..0000000 --- a/app_old/incoviba/modelos/src/old/Inmobiliaria/RelacionInmobiliarias.php +++ /dev/null @@ -1,24 +0,0 @@ -belongsTo(Inmobiliaria::class, 'padre', 'rut')->findOne(); - } - public function hijo() - { - return $this->belongsTo(Inmobiliaria::class, 'hijo', 'rut')->findOne(); - } -} -?> diff --git a/app_old/incoviba/modelos/src/old/Inmobiliaria/TipoSociedad.php b/app_old/incoviba/modelos/src/old/Inmobiliaria/TipoSociedad.php deleted file mode 100644 index d2f0ce0..0000000 --- a/app_old/incoviba/modelos/src/old/Inmobiliaria/TipoSociedad.php +++ /dev/null @@ -1,12 +0,0 @@ -belongs_to(Direccion::class, 'direccion')->findOne(); - } - public function tipo() - { - return $this->belongs_to(TipoAgente::class, 'tipo')->findOne(); - } - public function tipos(int $tipo = 0) - { - if ($tipo == 0) { - return $this->hasMany(AgenteTipo::class, 'agente')->findMany(); - } - return $this->hasMany(AgenteTipo::class, 'agente')->where('tipo', $tipo)->findOne(); - } -} -?> diff --git a/app_old/incoviba/modelos/src/old/Proyecto/AgenteTipo.php b/app_old/incoviba/modelos/src/old/Proyecto/AgenteTipo.php deleted file mode 100644 index 91be4e3..0000000 --- a/app_old/incoviba/modelos/src/old/Proyecto/AgenteTipo.php +++ /dev/null @@ -1,20 +0,0 @@ -belongsTo(Agente::class, 'agente')->findOne(); - } - public function tipo() - { - return $this->belongsTo(TipoAgente::class, 'tipo')->findOne(); - } -} \ No newline at end of file diff --git a/app_old/incoviba/modelos/src/old/Proyecto/AvanceConstruccion.php b/app_old/incoviba/modelos/src/old/Proyecto/AvanceConstruccion.php deleted file mode 100644 index 93b30a4..0000000 --- a/app_old/incoviba/modelos/src/old/Proyecto/AvanceConstruccion.php +++ /dev/null @@ -1,86 +0,0 @@ -belongsTo(Proyecto::class, 'proyecto')->findOne(); - } - public function fecha(\DateTime $fecha = null) - { - if ($fecha == null) { - return Carbon::parse($this->fecha, config('app.timezone')); - } - $this->fecha = $fecha->format('Y-m-d'); - } - protected $pagare; - public function pagare() - { - if ($this->pagare == null) { - $this->pagare = $this->hasMany(Pagare::class, 'estado_pago', 'numero') - ->where('proyecto', $this->proyecto) - ->findOne(); - } - return $this->pagare; - } - protected $pagares; - public function pagares() - { - if ($this->pagares == null) { - $this->pagares = $this->hasMany(Pagare::class, 'estado_pago', 'numero') - ->where('proyecto', $this->proyecto) - ->findMany(); - } - return $this->pagares; - } - public function uf() - { - if ($this->uf == 0) { - $uf = uf($this->fecha()); - if ($uf->total > 0) { - $this->uf = $uf->uf->value; - $this->save(); - } - } - return $this->uf; - } - public function pagado($tipo = 'ufs') - { - if ($tipo == 'ufs') { - return $this->pagado / $this->uf(); - } - return $this->pagado; - } - public function fechaPago(\DateTime $fecha = null) - { - if ($fecha == null) { - return Carbon::parse($this->fecha_pagado, config('app.timezone')); - } - $this->fecha_pagado = $fecha->format('Y-m-d'); - } - public function edit(array $data) - { - foreach ($data as $column => $value) { - if (isset($this->$column) and $this->$column != $value) { - $this->$column = $value; - } - } - $this->save(); - } -} diff --git a/app_old/incoviba/modelos/src/old/Proyecto/Cobro.php b/app_old/incoviba/modelos/src/old/Proyecto/Cobro.php deleted file mode 100644 index 47a1a0a..0000000 --- a/app_old/incoviba/modelos/src/old/Proyecto/Cobro.php +++ /dev/null @@ -1,35 +0,0 @@ -has_one(Proyecto::class); - } - public function agente() - { - return $this->has_one(Agente::class); - } - public function tipo() - { - return $this->has_one(TipoCobro::class); - } -} -?> diff --git a/app_old/incoviba/modelos/src/old/Proyecto/Costo.php b/app_old/incoviba/modelos/src/old/Proyecto/Costo.php deleted file mode 100644 index ef0de2e..0000000 --- a/app_old/incoviba/modelos/src/old/Proyecto/Costo.php +++ /dev/null @@ -1,21 +0,0 @@ -has_one(Proyecto::class, 'proyecto')->findOne(); - } -} -?> diff --git a/app_old/incoviba/modelos/src/old/Proyecto/EstadoCobro.php b/app_old/incoviba/modelos/src/old/Proyecto/EstadoCobro.php deleted file mode 100644 index 787edb7..0000000 --- a/app_old/incoviba/modelos/src/old/Proyecto/EstadoCobro.php +++ /dev/null @@ -1,25 +0,0 @@ -has_one(Cobro::class, 'cobro')->findOne(); - } - public function tipo() - { - return $this->has_one(TipoEstadoCobro::class, 'estado')->findOne(); - } -} -?> diff --git a/app_old/incoviba/modelos/src/old/Proyecto/EstadoProyecto.php b/app_old/incoviba/modelos/src/old/Proyecto/EstadoProyecto.php deleted file mode 100644 index 245fe0f..0000000 --- a/app_old/incoviba/modelos/src/old/Proyecto/EstadoProyecto.php +++ /dev/null @@ -1,30 +0,0 @@ -belongs_to(Proyecto::class, 'proyecto')->findOne(); - } - public function tipo() - { - return $this->belongs_to(TipoEstadoProyecto::class, 'estado')->findOne(); - } - public function fecha() - { - return Carbon::parse($this->fecha, config('app.timezone')); - } -} -?> diff --git a/app_old/incoviba/modelos/src/old/Proyecto/EstadoProyectoAgente.php b/app_old/incoviba/modelos/src/old/Proyecto/EstadoProyectoAgente.php deleted file mode 100644 index 0811ce8..0000000 --- a/app_old/incoviba/modelos/src/old/Proyecto/EstadoProyectoAgente.php +++ /dev/null @@ -1,29 +0,0 @@ -belongsTo(ProyectoAgente::class, 'agente')->findOne(); - } - public function fecha(\DateTime $fecha = null) { - if ($fecha == null) { - return Carbon::parse($this->fecha, config('app.timezone')); - } - $this->fecha = $fecha->format('Y-m-d'); - } - public function tipo() - { - return $this->belongsTo(TipoEstadoProyectoAgente::class, 'tipo')->findOne(); - } -} diff --git a/app_old/incoviba/modelos/src/old/Proyecto/EtapaProyecto.php b/app_old/incoviba/modelos/src/old/Proyecto/EtapaProyecto.php deleted file mode 100644 index e98c087..0000000 --- a/app_old/incoviba/modelos/src/old/Proyecto/EtapaProyecto.php +++ /dev/null @@ -1,18 +0,0 @@ - diff --git a/app_old/incoviba/modelos/src/old/Proyecto/Pagare.php b/app_old/incoviba/modelos/src/old/Proyecto/Pagare.php deleted file mode 100644 index ab5bd4d..0000000 --- a/app_old/incoviba/modelos/src/old/Proyecto/Pagare.php +++ /dev/null @@ -1,142 +0,0 @@ -belongsTo(Proyecto::class, 'proyecto')->findOne(); - } - public function moneda() - { - return $this->belongsTo(TipoMonedaPagare::class, 'moneda')->findOne(); - } - public function renovaciones() - { - return $this->hasMany(RenovacionPagare::class, 'pagare')->findMany(); - } - public function fecha(\DateTime $fecha = null) - { - if ($fecha == null) { - return Carbon::parse($this->fecha, config('app.timezone')); - } - $this->fecha = $fecha->format('Y-m-d'); - } - public function fechaBanco(\DateTime $fecha = null) - { - if ($fecha == null) { - return Carbon::parse($this->fecha_banco, config('app.timezone')); - } - $this->fecha_banco = $fecha->format('Y-m-d'); - } - public function vencimiento() - { - return $this->fechaBanco()->addDays($this->duracion); - } - public function uf() - { - if ($this->uf == 0 and $this->fecha != '0000-00-00') { - $uf = uf($this->fecha()); - if ($uf->total > 0) { - $this->uf = $uf->uf->value; - $this->save(); - } - } - return $this->uf; - } - protected $valores; - public function valor($tipo = 'ufs') - { - if ($this->valores == null) { - $valores = []; - switch (strtolower($this->moneda()->descripcion)) { - case 'uf': - $valores = (object) ['uf' => $this->capital, 'pesos' => $this->capital * $this->uf()]; - break; - case 'pesos': - $valores = (object) ['uf' => $this->capital / $this->uf(), 'pesos' => $this->capital]; - break; - } - $this->valores = $valores; - } - switch (strtolower($tipo)) { - case 'uf': - case 'ufs': - return $this->valores->uf; - case 'peso': - case 'pesos': - case '$': - return $this->valores->pesos; - } - } - public function abonado($tipo = 'ufs') - { - if ($tipo == 'ufs') { - if ($this->uf() > 0) { - return $this->abonado / $this->uf(); - } - return 0; - } - return $this->abonado; - } - public function edit(array $data) - { - foreach ($data as $column => $value) { - if (isset($this->$column) and $this->$column != $value) { - $this->$column = $value; - } - } - $this->save(); - } - protected $intereses; - public function intereses($tipo = 'ufs') { - if ($this->intereses == null) { - $this->intereses = (object) ['uf' => 0, 'pesos' => 0]; - if ($this->renovaciones()) { - $arr = $this->renovaciones(); - $this->intereses->uf = array_reduce($arr, function($accum, $item) { - return $accum + $item->intereses(); - }); - $this->intereses->pesos = array_reduce($arr, function($accum, $item) { - return $accum + $item->intereses('pesos'); - }); - } - } - switch (strtolower($tipo)) { - case 'uf': - case 'ufs': - return $this->intereses->uf; - case 'peso': - case 'pesos': - case '$': - return $this->intereses->pesos; - } - if ($fecha == null) { - $fecha = $this->vencimiento(); - } - $dif = $fecha->diffInDays($this->fecha()); - $duracion = ($dif > $this->duracion) ? $this->duracion : $dif; - return $this->valor() * ($this->tasa / 365 * $duracion) / 100; - } - public function estado_pago() { - if ($this->estado_pago == 0) { - return false; - } - return $this->belongsTo(AvanceConstruccion::class, 'estado_pago', 'numero')->findOne(); - } -} diff --git a/app_old/incoviba/modelos/src/old/Proyecto/Proyectista.php b/app_old/incoviba/modelos/src/old/Proyecto/Proyectista.php deleted file mode 100644 index 95c40fe..0000000 --- a/app_old/incoviba/modelos/src/old/Proyecto/Proyectista.php +++ /dev/null @@ -1,21 +0,0 @@ - diff --git a/app_old/incoviba/modelos/src/old/Proyecto/Proyectistas.php b/app_old/incoviba/modelos/src/old/Proyecto/Proyectistas.php deleted file mode 100644 index a004d21..0000000 --- a/app_old/incoviba/modelos/src/old/Proyecto/Proyectistas.php +++ /dev/null @@ -1,17 +0,0 @@ - diff --git a/app_old/incoviba/modelos/src/old/Proyecto/Proyecto.php b/app_old/incoviba/modelos/src/old/Proyecto/Proyecto.php deleted file mode 100644 index aac09ae..0000000 --- a/app_old/incoviba/modelos/src/old/Proyecto/Proyecto.php +++ /dev/null @@ -1,873 +0,0 @@ -belongs_to(Inmobiliaria::class, 'inmobiliaria', 'rut')->findOne(); - } - public function direccion() - { - return $this->belongs_to(Direccion::class, 'direccion')->findOne(); - } - public function unidades($tipo = null) - { - if ($tipo == null) { - if (!isset($this->unidades) or !isset($this->unidades->total)) { - $unidades = []; - if (isset($this->unidades)) { - $unidades = (array) $this->unidades; - } - $unidades['total'] = $this->has_many(Unidad::class, 'proyecto')->findMany(); - $this->unidades = (object) $unidades; - } - return $this->unidades->total; - } - switch ($tipo) { - case 1: - case 'departamento': - case 'departamentos': - $tipo = 'departamento'; - $id_tipo = 1; - break; - case 2: - case 'estacionamiento': - case 'estacionamientos': - $tipo = 'estacionamiento'; - $id_tipo = 2; - break; - case 3: - case 'bodega': - case 'bodegas': - $tipo = 'bodega'; - $id_tipo = 3; - break; - default: - return $this->unidades(); - } - if (!isset($this->unidades) or !isset($this->unidades->{$tipo})) { - $unidades = []; - if (isset($this->unidades)) { - $unidades = (array) $this->unidades; - } - $unidades[$tipo] = $this->has_many(Unidad::class, 'proyecto')->where('tipo', $id_tipo)->findMany(); - $this->unidades = (object) $unidades; - } - return $this->unidades->{$tipo}; - } - public function unidadesDisponibles($tipo = null) - { - switch ($tipo) { - case 1: - case 'departamento': - case 'departamentos': - $tipo = 'departamento'; - $id_tipo = 1; - break; - case 2: - case 'estacionamiento': - case 'estacionamientos': - $tipo = 'estacionamiento'; - $id_tipo = 2; - break; - case 3: - case 'bodega': - case 'bodegas': - $tipo = 'bodega'; - $id_tipo = 3; - break; - default: - $tipo = 'total'; - $id_tipo = null; - } - if (!isset($this->unidades) or !isset($this->unidades->disponibles) or !isset($this->unidades->disponibles->{$tipo})) { - $unidades = ['disponibles' => []]; - if (isset($this->unidades)) { - $unidades = (array) $this->unidades; - $unidades['disponibles'] = []; - if (isset($this->unidades->disponibles)) { - $unidades['disponibles'] = (array) $this->unidades->disponibles; - } - } - /*$q_s = "SELECT u.* - FROM - (SELECT * FROM unidad WHERE proyecto = ? ORDER BY tipo) AS u - LEFT JOIN - (SELECT unidad.* - FROM venta - JOIN propiedad ON propiedad.id = venta.propiedad - JOIN unidad ON unidad.id = propiedad.unidad_principal - WHERE venta.estado = 1) AS v ON v.id = u.id - LEFT JOIN - (SELECT unidad.* - FROM venta - JOIN propiedad ON propiedad.id = venta.propiedad - JOIN unidad ON propiedad.estacionamientos LIKE unidad.id - OR propiedad.estacionamientos LIKE CONCAT(unidad.id, ';%') - OR propiedad.estacionamientos LIKE CONCAT('%;', unidad.id) - OR propiedad.estacionamientos LIKE CONCAT('%;', unidad.id, ';%') - WHERE venta.estado = 1) AS e ON e.id = u.id - LEFT JOIN - (SELECT unidad.* - FROM venta - JOIN propiedad ON propiedad.id = venta.propiedad - JOIN unidad ON propiedad.bodegas LIKE unidad.id - OR propiedad.bodegas LIKE CONCAT(unidad.id, ';%') - OR propiedad.bodegas LIKE CONCAT('%;', unidad.id) - OR propiedad.bodegas LIKE CONCAT('%;', unidad.id, ';%') - WHERE venta.estado = 1) AS b ON b.id = u.id - WHERE v.id IS NULL AND e.id IS NULL AND b.id IS NULL";*/ - $q_s = "SELECT u.* - FROM - (SELECT * FROM unidad WHERE proyecto = ? ORDER BY tipo) AS u - LEFT JOIN (SELECT unidad.* - FROM unidad - JOIN propiedad_unidad pu ON pu.unidad = unidad.id - JOIN venta ON venta.propiedad = pu.propiedad - JOIN (SELECT e1.* FROM estado_venta e1 - JOIN (SELECT venta, MAX(id) AS id FROM estado_venta GROUP BY venta) e0 ON e0.id = e1.id) ev ON ev.venta = venta.id - WHERE ev.estado = 1) AS v ON v.id = u.id - WHERE v.id IS NULL"; - $q_p = " ORDER BY u.tipo, LPAD(u.descripcion, 4, '0')"; - switch (strtolower($id_tipo)) { - case null: - default: - $q = $q_s . $q_p; - break; - case 1: - case 'departamento': - case 'departamentos': - $q = $q_s . ' AND u.tipo = 1' . $q_p; - break; - case 2: - case 'estacionamiento': - case 'estacionamientos': - $q = $q_s . ' AND u.tipo = 2' . $q_p; - break; - case 3: - case 'bodega': - case 'bodegas': - $q = $q_s . ' AND u.tipo = 3' . $q_p; - break; - } - $disponibles = model(Unidad::class)->rawQuery($q, [$this->id])->findMany(); - $unidades['disponibles'][$tipo] = $disponibles; - $unidades['disponibles'] = (object) $unidades['disponibles']; - $this->unidades = (object) $unidades; - } - return $this->unidades->disponibles->{$tipo}; - } - public function proyectoTipoUnidades() - { - return $this->hasMany(ProyectoTipoUnidad::class, 'proyecto')->orderByAsc('tipo')->findMany(); - } - public function tipoUnidades() - { - if (!isset($this->tipos_unidades)) { - $tipos = \Model::factory(TipoUnidad::class) - ->select('tipo_unidad.*') - ->join('unidad', ['unidad.tipo', '=', 'tipo_unidad.id']) - ->join('proyecto', ['proyecto.id', '=', 'unidad.proyecto']) - ->where('proyecto.id', $this->id) - ->order_by_asc('tipo_unidad.id') - ->group_by('tipo_unidad.id') - ->findMany(); - $this->tipos_unidades = $tipos; - } - return $this->tipos_unidades; - } - public function ventas($order = 'departamento') - { - if (!isset($this->ventas)) { - $ventas = model(Venta::class) - ->select('venta.*') - ->join('propiedad', ['propiedad.id', '=', 'venta.propiedad']) - ->join('unidad', ['unidad.id', '=', 'propiedad.unidad_principal']) - ->rawJoin('JOIN (SELECT `e1`.* FROM (SELECT `venta`, MAX(`id`) AS `id` FROM `estado_venta` GROUP BY `venta`) AS `e0` JOIN `estado_venta` AS `e1` ON `e1`.`id` = `e0`.`id`)', ['estado_venta.venta', '=', 'venta.id'], 'estado_venta') - ->join('tipo_estado_venta', ['tipo_estado_venta.id', '=', 'estado_venta.estado']) - ->where('unidad.proyecto', $this->id) - ->where('unidad.tipo', 1) - ->where('tipo_estado_venta.activa', 1); - switch (strtolower($order)) { - case 'fecha': - $ventas = $ventas->orderByAsc('venta.fecha'); - case 'departamento': - default: - $ventas = $ventas->orderByExpr('LPAD(`unidad`.`descripcion`, 4, "0")'); - break; - } - $ventas = $ventas->find_many(); - $this->ventas = $ventas; - } - return $this->ventas; - } - protected $resciliaciones; - public function resciliaciones() - { - if ($this->resciliaciones == null) { - $resciliaciones = model(Venta::class) - ->select('venta.*') - ->join('propiedad', ['propiedad.id', '=', 'venta.propiedad']) - ->join('unidad', ['unidad.id', '=', 'propiedad.unidad_principal']) - ->rawJoin('JOIN (SELECT `e1`.* FROM (SELECT `venta`, MAX(`id`) AS `id` FROM `estado_venta` GROUP BY `venta`) AS `e0` JOIN `estado_venta` AS `e1` ON `e1`.`id` = `e0`.`id`)', ['estado_venta.venta', '=', 'venta.id'], 'estado_venta') - ->join('tipo_estado_venta', ['tipo_estado_venta.id', '=', 'estado_venta.estado']) - ->where('unidad.proyecto', $this->id) - ->where('unidad.tipo', 1) - ->where('tipo_estado_venta.activa', 0) - ->orderByExpr('LPAD(`unidad`.`descripcion`, 4, "0")') - ->find_many() - ; - $this->resciliaciones = $resciliaciones; - } - return $this->resciliaciones; - } - public function escrituras() - { - if (!isset($escrituras)) { - $ventas = model(Venta::class) - ->select('venta.*') - ->join('propiedad', ['propiedad.id', '=', 'venta.propiedad']) - ->join('unidad', ['unidad.id', '=', 'propiedad.unidad_principal']) - ->where('unidad.proyecto', $this->id) - ->where('venta.estado', 1) - ->where('unidad.tipo', 1) - ->whereNotEqual('venta.escriturado', '0') - ->orderByExpr('LPAD(unidad.descripcion, 4, "0")') - ->find_many() - ; - $this->escrituras = $ventas; - } - return $this->escrituras; - } - public function entregas() - { - if (!isset($this->entregas)) { - $entregas = []; - $escrituras = $this->escrituras(); - foreach ($escrituras as $escritura) { - if ($escritura->entrega == '0') { - continue; - } - $entregas []= $escritura; - } - usort($entregas, function($a, $b) { - $fa = \Carbon\Carbon::parse($a->entrega()->find_one()->fecha); - $fb = \Carbon\Carbon::parse($b->entrega()->find_one()->fecha); - $dif = $fb->diffInDays($fa, false); - if ($dif == 0) { - return $a->unidad()->descripcion - $b->unidad()->descripcion; - } - return $dif; - }); - $this->entregas = $entregas; - } - return $this->entregas; - } - public function estados() - { - return $this->has_many(EstadoProyecto::class, 'proyecto')->orderByAsc('fecha')->findMany(); - } - public function estado() - { - if (!isset($this->estado)) { - $id = $this->has_many(EstadoProyecto::class, 'proyecto')->max('id'); - $this->estado = $this->has_many(EstadoProyecto::class, 'proyecto')->findOne($id); - } - return $this->estado; - } - public function avances() - { - return $this->hasMany(AvanceConstruccion::class, 'proyecto')->orderByAsc('fecha')->findMany(); - } - protected $avance; - public function avance() - { - if ($this->avance == null and $this->avances()) { - $avance = array_reduce($this->avances(), function($carry, $item) { - return ($carry += $item->avance); - }); - $this->avance = $avance; - } - return $this->avance; - } - protected $inicio; - public function inicio() - { - if (!isset($this->inicio) or $this->inicio == null) { - $id = $this->has_many(EstadoProyecto::class, 'proyecto')->min('id'); - $this->inicio = $this->has_many(EstadoProyecto::class, 'proyecto')->findOne($id); - } - return $this->inicio; - } - public function valores() - { - if (!isset($this->valores)) { - $ventas = $this->ventas(); - - /** - * vendidos - * departamentos - * cantidad - * ingreso - * neto - * bruto // suma estacionamientos, bodegas, comision y premios - * pagado - * abonado - * precio - * minimo - * promedio - * maximo - * mts - * minimo - * promedio // total dividido cantidad - * maximo - * total - * uf_m2 - * minimo // minimo de precio dividido mts - * promedio // ingreso neto dividido mts total - * maximo // maximo de precio dividido mts - * estacionamientos // valor estacionamientos - * bodegas // valor bodegas - * comision // valor comisiones - * premios // valor total cada premio - * estimados // idem vendidos, pero valores estimados proporcional a mts - * totales // vendidos + estimados - */ - - $premios = model(Promocion::class)->findMany(); - $valores = (object) [ - 'vendidos' => new BaseValores(), - 'estimados' => new BaseValores(), - 'totales' => new BaseValores() - ]; - foreach ($valores as &$name) { - $name->basePremios($premios); - } - if ($ventas) { - $valores->vendidos->ingreso->neto = 0; - $valores->vendidos->ingreso->neto = array_reduce($ventas, function($sum, $item) { - return $sum + $item->valorFinal(); - }); - foreach ($ventas as $venta) { - //$valores->vendidos->ingreso->neto += $venta->valorFinal(); - $valores->vendidos->ingreso->bruto += $venta->valor_uf; - $valores->vendidos->ingreso->pagado += $venta->valorPagado(); - $valores->vendidos->ingreso->abonado += $venta->valorAbonado(); - - $valores->vendidos->departamentos->cantidad ++; - if ($venta->unidad()->precio($venta->fecha())) { - $valores->vendidos->departamentos->addPrecio($venta->unidad()->precio($venta->fecha())->valor); - } - $valores->vendidos->departamentos->addMts('totales', $venta->unidad()->m2('total')); - $valores->vendidos->departamentos->addMts('vendibles', $venta->unidad()->m2()); - - //$valores->vendidos->otros->cantidad += ($venta->estacionamientos() or $venta->bodegas()) : - $valores->vendidos->otros->valor += $venta->valorEstacionamientosYBodegas(); - if ($venta->bono_pie) { - $valores->vendidos->bono->cantidad ++; - $valores->vendidos->bono->valor += $venta->bonoPie()->pago()->valor('ufs'); - } - $valores->vendidos->comision += $venta->valorComision(); - $ps = $venta->promociones(); - if (count($ps) > 0) { - foreach ($ps as $promo) { - if ($promo->descripcion != '') { - $valores->vendidos->premios->{$promo->descripcion} += $promo->valor; - } - } - } - } - $valores->vendidos->departamentos->setPromedios(); - } - - $valores->estimados->departamentos->cantidad = count($this->unidades(1)) - count($this->ventas()); - $valores->estimados->departamentos->mts->vendibles->total = 0; - $valores->estimados->departamentos->mts->vendibles->promedio = 0; - $valores->estimados->departamentos->precio->promedio = 0; - $valores->estimados->departamentos->uf_m2->promedio = 0; - if ($valores->estimados->departamentos->cantidad > 0) { - $valores->estimados->departamentos->mts->vendibles->total = array_reduce($this->unidadesDisponibles(1), function($sum, $item) { - return $sum + $item->m2(); - }); - $valores->estimados->departamentos->mts->vendibles->promedio = $valores->estimados->departamentos->mts->vendibles->total / $valores->estimados->departamentos->cantidad; - $valores->estimados->ingreso->neto = array_reduce($this->unidadesDisponibles(1), function($sum, $item) { - if (!$item->precio()) { - return $sum; - } - return $sum + $item->precio()->valor; - }); - if ($valores->estimados->ingreso->neto == null) { - $valores->estimados->ingreso->neto = 0; - } - $valores->estimados->departamentos->precio->promedio = $valores->estimados->ingreso->neto / $valores->estimados->departamentos->cantidad; - $valores->estimados->departamentos->uf_m2->promedio = $valores->estimados->ingreso->neto / $valores->estimados->departamentos->mts->vendibles->total; - } - - $valores->estimados->otros->cantidad = count($this->unidadesDisponibles(2)) + count($this->unidadesDisponibles(3)); - $valores->estimados->otros->valor = count($this->unidadesDisponibles(2)) * 330 + count($this->unidadesDisponibles(3)) * 50; - foreach ($premios as $premio) { - $valores->estimados->premios->{$premio->descripcion} = 0; - if ($valores->vendidos->ingreso->neto > 0) { - $valores->estimados->premios->{$premio->descripcion} = $valores->vendidos->premios() * $valores->estimados->ingreso->neto / $valores->vendidos->ingreso->neto; - } - } - $valores->estimados->bono->valor = 0; - $valores->estimados->comision = 0; - if ($valores->vendidos->ingreso->neto > 0) { - $valores->estimados->bono->valor = $valores->vendidos->bono->valor * $valores->estimados->ingreso->neto / $valores->vendidos->ingreso->neto; - $valores->estimados->comision = $valores->vendidos->comision * $valores->estimados->ingreso->neto / $valores->vendidos->ingreso->neto; - } - $valores->estimados->ingreso->bruto = $valores->estimados->ingreso->neto - + $valores->estimados->otros->valor - + $valores->estimados->bono->valor - + $valores->estimados->premios() - + $valores->estimados->comision; - - $this->valores = $valores; - } - - return $this->valores; - } - public function agentes() - { - if (!isset($this->agentes)) { - $this->agentes = \Model::factory(Agente::class) - ->select('agente.*') - ->join('proyecto_agente', ['proyecto_agente.agente', '=', 'agente.id']) - ->where('proyecto_agente.proyecto', $this->id) - ->orderByAsc('agente.abreviacion') - ->findMany(); - } - return $this->agentes; - } - public function operadores() - { - if (!isset($this->operadores)) { - $this->operadores = \Model::factory(Agente::class) - ->select('agente.*') - ->select('agente_tipo.id', 'agente_tipo') - ->join('agente_tipo', ['agente_tipo.agente', '=', 'agente.id']) - ->join('proyecto_agente', ['proyecto_agente.agente', '=', 'agente_tipo.id']) - ->where('agente_tipo.tipo', 19) - ->where('proyecto_agente.proyecto', $this->id) - ->orderByAsc('agente.abreviacion') - ->groupBy('agente_tipo.id') - ->findMany(); - } - return $this->operadores; - } - public function operadoresVigentes() - { - return $this->hasMany(ProyectoAgente::class, 'proyecto') - ->select('proyecto_agente.*') - ->join('agente_tipo', ['agente_tipo.id', '=', 'proyecto_agente.agente']) - ->rawJoin('JOIN (SELECT e1.* FROM estado_proyecto_agente e1 JOIN (SELECT agente, MAX(id) AS id FROM estado_proyecto_agente GROUP BY agente) e0 ON e0.id = e1.id)', ['ep.agente', '=', 'proyecto_agente.id'], 'ep') - ->where('agente_tipo.tipo', 19) - ->where('ep.tipo', 1) - ->findMany(); - } - public function promociones() - { - if (!isset($this->promociones)) { - $this->promociones = \Model::factory(Promocion::class) - ->select('promocion.*') - ->join('promocion_venta', ['promocion_venta.promocion', '=', 'promocion.id']) - ->join('venta', ['venta.id', '=', 'promocion_venta.venta']) - ->join('propiedad', ['propiedad.id', '=', 'venta.propiedad']) - ->join('unidad', ['unidad.id', '=', 'propiedad.unidad_principal']) - ->where('unidad.proyecto', $this->id) - ->groupBy('promocion.id') - ->orderByAsc('promocion.titulo') - ->findMany(); - } - return $this->promociones; - } - public function pisos() - { - if ($this->pisos == 0) { - $pisos = $this->has_many(Unidad::class, 'proyecto')->where('tipo', 1)->max('piso'); - if (!$pisos) { - return 0; - } - $this->pisos = $pisos; - $this->save(); - } - return $this->pisos; - } - public function cuotasHoy() - { - if (!isset($this->cuotas) or !isset($this->cuotas->hoy)) { - $cuotas = []; - if (isset($this->cuotas)) { - $cuotas = (array) $this->cuotas; - } - $f = Carbon::today(config('app.timezone')); - $cuotas['hoy'] = model(Venta::class) - ->join('propiedad', ['propiedad.id', '=', 'venta.propiedad']) - ->join('unidad', ['unidad.id', '=', 'propiedad.unidad_principal']) - ->join('cuota', ['cuota.pie', '=', 'venta.pie']) - ->join('pago', ['pago.id', '=', 'cuota.pago']) - ->raw_join('JOIN (SELECT e1.* FROM (SELECT pago, MAX(id) AS id FROM estado_pago GROUP BY pago) e0 JOIN estado_pago e1 ON e1.id = e0.id)', ['ep.pago', '=', 'pago.id'], 'ep') - ->where('unidad.proyecto', $this->id) - ->where('venta.estado', 1) - ->where('pago.fecha', $f->format('Y-m-d')) - ->whereLt('ep.estado', 1) - ->whereGte('ep.estado', 0) - ->count('cuota.id'); - $this->cuotas = (object) $cuotas; - } - return $this->cuotas->hoy; - } - public function cuotasPendientes() - { - if (!isset($this->cuotas) or !isset($this->cuotas->pendientes)) { - $cuotas = []; - if (isset($this->cuotas)) { - $cuotas = (array) $this->cuotas; - } - $f = Carbon::today(config('app.timezone')); - $cuotas['pendientes'] = model(Cuota::class) - ->join('venta', ['cuota.pie', '=', 'venta.pie']) - ->join('propiedad', ['propiedad.id', '=', 'venta.propiedad']) - ->join('unidad', ['unidad.id', '=', 'propiedad.unidad_principal']) - ->join('pago', ['pago.id', '=', 'cuota.pago']) - ->raw_join('JOIN (SELECT e1.* FROM (SELECT pago, MAX(id) AS id FROM estado_pago GROUP BY pago) e0 JOIN estado_pago e1 ON e1.id = e0.id)', ['ep.pago', '=', 'pago.id'], 'ep') - ->where('unidad.proyecto', $this->id) - ->where('venta.estado', 1) - ->whereLt('pago.fecha', $f->format('Y-m-d')) - ->whereLt('ep.estado', 1) - ->whereGte('ep.estado', 0) - ->count('cuota.id'); - $this->cuotas = (object) $cuotas; - } - return $this->cuotas->pendientes; - } - public function cuotasMes() - { - if (!isset($this->cuotas) or !isset($this->cuotas->mes)) { - $cuotas = []; - if (isset($this->cuotas)) { - $cuotas = (array) $this->cuotas; - } - $f = Carbon::today(config('app.timezone')); - $cuotas['mes'] = model(Cuota::class) - ->join('venta', ['cuota.pie', '=', 'venta.pie']) - ->join('propiedad', ['propiedad.id', '=', 'venta.propiedad']) - ->join('unidad', ['unidad.id', '=', 'propiedad.unidad_principal']) - ->join('pago', ['pago.id', '=', 'cuota.pago']) - ->raw_join('JOIN (SELECT e1.* FROM (SELECT pago, MAX(id) AS id FROM estado_pago GROUP BY pago) e0 JOIN estado_pago e1 ON e1.id = e0.id)', ['ep.pago', '=', 'pago.id'], 'ep') - ->where('unidad.proyecto', $this->id) - ->where('venta.estado', 1) - ->whereGt('pago.fecha', $f->format('Y-m-d')) - ->whereLte('pago.fecha', $f->copy()->addMonth(1)->format('Y-m-d')) - ->where('ep.estado', 0) - ->findMany(); - $this->cuotas = (object) $cuotas; - } - return $this->cuotas->mes; - } - public function tiposMediciones() - { - $tipos = $this->has_many_through(\Incoviba\nuevo\Venta\TipoMedicion::class, \Incoviba\nuevo\Venta\ProyectoTipoMedicion::class, 'proyecto_id', 'tipo_medicion_id'); - if ($tipos) { - return $tipos->orderByAsc('descripcion')->findMany(); - } - return null; - } - public function superficie($tipo = 'total') - { - if (!isset($this->superficies) or !isset($this->superficies->{$tipo})) { - $superficies = []; - if (isset($this->superficies)) { - $superficies = (array) $this->superficies; - } - switch (strtolower($tipo)) { - case 'total': - $superficies['total'] = $this->superficie('snt') + $this->superficie('bnt'); - break; - case 'terreno': - $superficies['terreno'] = $this->superficie_terreno; - break; - case 'sobre_nivel': - case 'snt': - $superficies['snt'] = $superficies['sobre_nivel'] = $this->superficie_sobre_nivel; - break; - case 'bajo_nivel': - case 'bnt': - $superficies['bnt'] = $superficies['bajo_nivel'] = $this->superficie_bajo_nivel; - break; - case 'vendible': - $superficies['vendible'] = 0; - if ($this->unidades()) { - $metros = $this->hasMany(Unidad::class, 'proyecto')->selectExpr('SUM(m2 + logia + terraza /2)', 'metros')->where('tipo', 1)->groupBy('proyecto')->findOne(); - $superficies['vendible'] = $metros->metros; - } - break; - case 'vendida': - $superficies['vendida'] = 0; - if ($this->ventas()) { - $metros = model(Venta::class) - ->selectExpr('SUM(unidad.m2 + unidad.logia + unidad.terraza / 2)', 'metros') - ->join('propiedad', ['propiedad.id', '=', 'venta.propiedad']) - ->join('unidad', ['unidad.id', '=', 'propiedad.unidad_principal']) - ->where('unidad.proyecto', $this->id) - ->where('venta.estado', 1) - ->where('unidad.tipo', 1) - ->groupBy('unidad.proyecto') - ->findOne(); - if ($metros) { - $superficies['vendida'] = $metros->metros; - } - } - break; - case 'por vender': - $superficies['por vender'] = $this->superficie('vendible') - $this->superficie('vendida'); - break; - default: - return 0; - } - $this->superficies = (object) $superficies; - } - return $this->superficies->{$tipo}; - } - public function setDireccion(array $data) - { - if (!is_numeric($data['comuna'])) { - $comuna = model(Comuna::class)->where('descripcion', $data['comuna'])->findOne(); - $data['comuna'] = $comuna->id; - } - $direccion = model(Direccion::class) - ->where('calle', $data['calle']) - ->where('numero', $data['numero']) - ->where('extra', $data['extra']) - ->where('comuna', $data['comuna']) - ->findOne(); - $this->direccion = $direccion->id; - } - public function addAgente(array $data) - { - $data = ['agente' => $data['agente'], 'tipo' => $data['tipo']]; - $agente = (new Factory(AgenteTipo::class))->create($data); - $agente->save(); - $this->agentes []= $agente; - } - protected $tipologias; - public function tipologias() - { - if ($this->tipologias == null) { - $pts = $this->proyectoTipoUnidades(); - $tipologias = []; - foreach ($pts as $pt) { - if ($pt->tipologia()) { - if (!isset($tipologias[$pt->tipologia()->tipologia->descripcion])) { - $tipologias[$pt->tipologia()->tipologia->descripcion] = (object) ['tipologia' => $pt->tipologia()->tipologia, 'tipos' => []]; - } - $tipologias[$pt->tipologia()->tipologia->descripcion]->tipos []= $pt; - continue; - } - } - $this->tipologias = $tipologias; - } - return $this->tipologias; - } - public function pagares() - { - return $this->hasMany(Pagare::class, 'proyecto')->findMany(); - } - protected $cierres; - public function cierres(int $vigentes = 0) - { - if (!isset($this->cierres[$vigentes]) or $this->cierres[$vigentes] == null) { - $orm = model(Cierre::class) - ->select('cierre.*') - ->rawJoin( - 'join (select e1.* from estado_cierre e1 join (select cierre, max(id) as id from estado_cierre group by cierre) e0 on e0.id = e1.id)', - ['ec.cierre', '=', 'cierre.id'], - 'ec') - ->join('tipo_estado_cierre', ['tipo_estado_cierre.id', '=', 'ec.tipo']) - ->join('proyecto', ['proyecto.id', '=', 'cierre.proyecto']) - ->join('unidad_cierre', ['unidad_cierre.cierre', '=', 'cierre.id']) - ->join('unidad', ['unidad.id', '=', 'unidad_cierre.unidad']) - ->where('proyecto.id', $this->id) - ->where('unidad_cierre.principal', 1) - ->orderByAsc('proyecto.descripcion') - ->orderByDesc('tipo_estado_cierre.vigente') - ->orderByDesc('cierre.fecha') - ->orderByExpr('LPAD(unidad.descripcion, 4, "0")') - ->groupBy('cierre.id'); - switch ($vigentes) { - case Cierre::VIGENTES: - $orm = $orm->where('tipo_estado_cierre.vigente', 1); - break; - case Cierre::NO_VIGENTES: - $orm = $orm->where('tipo_estado_cierre.vigente', 0); - break; - case Cierre::VIGENTES + 1: - $orm = $orm - ->where('tipo_estado_cierre.vigente', 1) - ->whereNotLike('tipo_estado_cierre.descripcion', 'promesado') - ; - break; - case Cierre::VIGENTES + 2: - $orm = $orm - ->where('tipo_estado_cierre.vigente', 1) - ->whereLike('tipo_estado_cierre.descripcion', 'promesado') - ; - break; - } - $this->cierres[$vigentes] = $orm->findMany(); - } - return $this->cierres[$vigentes]; - } - public function tipos() { - return $this->hasMany(ProyectoTipoUnidad::class, 'proyecto')->findMany(); - } -} - -class Departamentos { - public $cantidad; - public $precio; - public $mts; - public $uf_m2; - public function __construct() { - $this->cantidad = 0; - $base = [ - 'minimo' => 1000000, - 'promedio' => 0, - 'maximo' => -1 - ]; - $this->precio = (object) $base; - $this->mts = (object) [ - 'totales' => (object) array_merge($base, ['total' => 0]), - 'vendibles' => (object) array_merge($base, ['total' => 0]) - ]; - $this->uf_m2 = (object) $base; - } - protected function setMin(&$var, $val) { - if ($var > $val) { - $var = $val; - } - } - protected function setMax(&$var, $val) { - if ($var < $val) { - $var = $val; - } - } - public function addPrecio($val) { - $this->precio->promedio += $val; - $this->setMin($this->precio->minimo, $val); - $this->setMax($this->precio->maximo, $val); - $this->uf_m2->promedio += $val; - - return $this; - } - public function addMts($name, $val) { - $this->mts->$name->total += $val; - $this->mts->$name->promedio += $val; - $this->setMin($this->mts->{$name}->minimo, $val); - $this->setMax($this->mts->{$name}->maximo, $val); - - return $this; - } - public function addUfM2($val) { - $this->setMin($this->uf_m2->minimo, $val); - $this->setMax($this->uf_m2->maximo, $val); - - return $this; - } - public function setPromedios() { - $this->precio->promedio /= $this->cantidad; - $this->mts->totales->promedio /= $this->cantidad; - $this->mts->vendibles->promedio /= $this->cantidad; - $this->uf_m2->promedio /= $this->mts->vendibles->total; - - return $this; - } -}; -class BaseValores { - public $ingreso; - public $departamentos; - public $otros; - public $bono; - public $comision; - public $premios; - - public function __construct() { - $this->ingreso = (object) [ - 'neto' => 0, - 'bruto' => 0, - 'pagado' => 0, - 'abonado' => 0 - ]; - $this->departamentos = new Departamentos(); - $this->otros = (object) [ - 'cantidad' => 0, - 'valor' => 0 - ]; - $this->bono = (object) [ - 'cantidad' => 0, - 'valor' => 0 - ]; - $this->comision = 0; - $this->premios = []; - } - public function basePremios(array $premios) { - foreach ($premios as $premio) { - $this->premios[$premio->descripcion] = 0; - } - $this->premios = (object) $this->premios; - - return $this; - } - protected $total_premios; - public function premios() { - if ($this->total_premios == null) { - $this->total_premios = array_reduce((array) $this->premios, function($sum, $item) { - return $sum + $item; - }); - } - return $this->total_premios; - } -}; diff --git a/app_old/incoviba/modelos/src/old/Proyecto/ProyectoAgente.php b/app_old/incoviba/modelos/src/old/Proyecto/ProyectoAgente.php deleted file mode 100644 index dba7430..0000000 --- a/app_old/incoviba/modelos/src/old/Proyecto/ProyectoAgente.php +++ /dev/null @@ -1,54 +0,0 @@ -belongsTo(Proyecto::class, 'proyecto')->findOne(); - } - public function agente() - { - return $this->belongsTo(AgenteTipo::class, 'agente')->findOne(); - } - public function estado() - { - return $this->hasMany(EstadoProyectoAgente::class, 'agente') - ->orderByDesc('id')->findOne(); - } - public function estados() - { - return $this->hasMany(EstadoProyectoAgente::class, 'agente')->findMany(); - } - public function unidadesBloqueadas() - { - return $this->hasMany(UnidadBloqueada::class, 'agente')->findMany(); - } - public function new() - { - parent::save(); - $tipo = model(TipoEstadoProyectoAgente::class)->where('descripcion', 'vigente')->findOne(); - $data = [ - 'agente' => $this->id, - 'fecha' => $this->fecha, - 'tipo' => $tipo->id - ]; - $estado = model(EstadoProyectoAgente::class)->create($data); - $estado->save(); - } -} -?> diff --git a/app_old/incoviba/modelos/src/old/Proyecto/ProyectoTipoUnidad.php b/app_old/incoviba/modelos/src/old/Proyecto/ProyectoTipoUnidad.php deleted file mode 100644 index d0d97ee..0000000 --- a/app_old/incoviba/modelos/src/old/Proyecto/ProyectoTipoUnidad.php +++ /dev/null @@ -1,165 +0,0 @@ -belongsTo(Proyecto::class, 'proyecto')->findOne(); - } - public function unidades() - { - return $this->hasMany(Unidad::class, 'pt')->orderByExpr('LPAD(subtipo, 3, "0")')->orderByExpr('LPAD(descripcion, 4, "0")')->findMany(); - } - public function tipo() - { - return $this->belongsTo(TipoUnidad::class, 'tipo')->findOne(); - } - public function m2($tipo = 'vendible') - { - return $this->m2 + $this->logia + $this->terraza / (($tipo == 'vendible') ? 2 : 1); - } - public function lineas() - { - if ($this->lineas == null) { - $lineas = []; - foreach ($this->unidades() as $unidad) { - if (array_search($unidad->subtipo, $lineas) === false) { - $lineas []= $unidad->subtipo; - } - } - sort($lineas); - $this->lineas = implode(', ', $lineas); - } - return $this->lineas; - } - public function precio($fecha = null) - { - $sum = 0; - $cnt = 0; - foreach ($this->unidades() as $unidad) { - if ($unidad->precio($fecha)) { - $sum += $unidad->precio($fecha)->valor; - $cnt ++; - } - } - if ($cnt == 0) { - return 0; - } - return $sum / $cnt; - } - protected $precios; - public function precioSubtipo($subtipo, $fecha = null) - { - if (!isset($this->precios[$subtipo])) { - $sum = 0; - $cnt = 0; - foreach ($this->unidades() as $unidad) { - if ($unidad->subtipo == $subtipo and $unidad->precio($fecha)) { - $sum += $unidad->precio($fecha)->valor; - $cnt ++; - } - } - if ($this->precios == null) { - $this->precios = []; - } - $prom = 0; - if ($cnt > 0) { - $prom = $sum / $cnt; - } - $this->precios[$subtipo] = $prom; - } - return $this->precios[$subtipo]; - } - public function setPrecios($fecha, $valor) - { - foreach ($this->unidades() as $unidad) { - $unidad->setPrecio($fecha, $valor); - } - } - public function setPreciosSubtipo($subtipo, $fecha, $valor) - { - foreach ($this->unidades() as $unidad) { - if ($unidad->subtipo == $subtipo) { - $unidad->setPrecio($fecha, $valor); - } - } - } - protected $tipologia; - public function tipologia() - { - if ($this->tipologia == null) { - $tipologias = $this->hasMany(TipoTipologia::class, 'tipo')->findMany(); - if (!$tipologias) { - $this->tipologia = false; - return false; - } - usort($tipologias, function($a, $b) { - return $a->elemento()->orden - $b->elemento()->orden; - }); - $tipologia = ['tipologia' => $tipologias[0]->tipologia(), 'detalles' => $tipologias]; - $resumen = []; - $detalle = []; - foreach ($tipologias as $t) { - if (strpos($t->elemento()->descripcion, 'cocina ') !== false) { - $resumen []= $t->elemento()->abreviacion; - $detalle []= $t->elemento()->descripcion; - continue; - } - $resumen []= $t->cantidad . '' . $t->elemento()->abreviacion; - $detalle []= $t->cantidad . ' ' . $t->elemento()->descripcion . (($t->cantidad > 1) ? 's' : ''); - } - $tipologia['descripcion'] = implode('/', $resumen); - $tipologia['detalle'] = implode(', ', $detalle) . '.'; - - $this->tipologia = (object) $tipologia; - } - return $this->tipologia; - } - protected $ventas; - public function ventas($order = 'departamento') - { - if ($this->ventas == null) { - $ventas = model(Venta::class) - ->select('venta.*') - ->join('propiedad', ['propiedad.id', '=', 'venta.propiedad']) - ->join('unidad', ['unidad.id', '=', 'propiedad.unidad_principal']) - ->join('proyecto_tipo_unidad', ['proyecto_tipo_unidad.id', '=', 'unidad.pt']) - ->rawJoin('JOIN (SELECT e1.* FROM estado_venta e1 JOIN (SELECT venta, MAX(id) AS id FROM estado_venta GROUP BY venta) e0 ON e0.id = e1.id)', ['ev.venta', '=', 'venta.id'], 'ev') - ->join('tipo_estado_venta', ['tipo_estado_venta.id', '=', 'ev.estado']) - ->where('tipo_estado_venta.activa', 1) - ->where('proyecto_tipo_unidad.id', $this->id); - switch (strtolower($order)) { - case 'fecha': - $ventas = $ventas->orderByAsc('venta.fecha'); - case 'departamento': - default: - $ventas = $ventas->orderByExpr('LPAD(unidad.descripcion, 4, "0")'); - break; - } - $ventas = $ventas->findMany(); - $this->ventas = $ventas; - } - return $this->ventas; - } -} diff --git a/app_old/incoviba/modelos/src/old/Proyecto/RelacionAgentes.php b/app_old/incoviba/modelos/src/old/Proyecto/RelacionAgentes.php deleted file mode 100644 index bf29ce5..0000000 --- a/app_old/incoviba/modelos/src/old/Proyecto/RelacionAgentes.php +++ /dev/null @@ -1,16 +0,0 @@ - diff --git a/app_old/incoviba/modelos/src/old/Proyecto/RenovacionPagare.php b/app_old/incoviba/modelos/src/old/Proyecto/RenovacionPagare.php deleted file mode 100644 index 783f4f9..0000000 --- a/app_old/incoviba/modelos/src/old/Proyecto/RenovacionPagare.php +++ /dev/null @@ -1,90 +0,0 @@ -belongsTo(Pagare::class, 'pagare')->findOne(); - } - public function fecha(\DateTime $fecha = null) - { - if ($fecha == null) { - return Carbon::parse($this->fecha, config('app.timezone')); - } - $this->fecha = $fecha->format('Y-m-d'); - } - public function fechaBanco(\DateTime $fecha = null) - { - if ($fecha == null) { - return Carbon::parse($this->fecha_banco, config('app.timezone')); - } - $this->fecha_banco = $fecha->format('Y-m-d'); - } - public function vencimiento() - { - return $this->fecha()->addDays($this->duracion); - } - public function uf() - { - if ($this->uf == 0) { - $uf = uf($this->fecha()); - if ($uf->total > 0) { - $this->uf = $uf->uf->value; - $this->save(); - } - } - return $this->uf; - } - protected $valores; - public function valor($tipo = 'ufs') - { - if ($this->valores == null) { - $valores = []; - switch (strtolower($this->pagare()->moneda()->descripcion)) { - case 'uf': - $valores = (object) ['uf' => $this->insoluto, 'pesos' => $this->insoluto * $this->uf()]; - break; - case 'pesos': - $valores = (object) ['uf' => $this->insoluto / $this->uf(), 'pesos' => $this->insoluto]; - break; - } - $this->valores = $valores; - } - switch (strtolower($tipo)) { - case 'uf': - case 'ufs': - return $this->valores->uf; - case 'peso': - case 'pesos': - return $this->valores->pesos; - } - } - protected $intereses_arr; - public function intereses($tipo = 'ufs') { - if ($this->intereses_arr == null) { - $this->intereses_arr = (object) ['uf' => $this->intereses / $this->uf(), 'pesos' => $this->intereses]; - } - switch (strtolower($tipo)) { - case 'uf': - case 'ufs': - return $this->intereses_arr->uf; - case 'peso': - case 'pesos': - return $this->intereses_arr->pesos; - } - } -} diff --git a/app_old/incoviba/modelos/src/old/Proyecto/TipoAgente.php b/app_old/incoviba/modelos/src/old/Proyecto/TipoAgente.php deleted file mode 100644 index 3611f44..0000000 --- a/app_old/incoviba/modelos/src/old/Proyecto/TipoAgente.php +++ /dev/null @@ -1,24 +0,0 @@ -hasManyThrough(Agente::class, AgenteTipo::class, 'tipo', 'agente')->findMany(); - } -} -?> diff --git a/app_old/incoviba/modelos/src/old/Proyecto/TipoCobro.php b/app_old/incoviba/modelos/src/old/Proyecto/TipoCobro.php deleted file mode 100644 index 20adb76..0000000 --- a/app_old/incoviba/modelos/src/old/Proyecto/TipoCobro.php +++ /dev/null @@ -1,17 +0,0 @@ - diff --git a/app_old/incoviba/modelos/src/old/Proyecto/TipoElemento.php b/app_old/incoviba/modelos/src/old/Proyecto/TipoElemento.php deleted file mode 100644 index a7e636b..0000000 --- a/app_old/incoviba/modelos/src/old/Proyecto/TipoElemento.php +++ /dev/null @@ -1,12 +0,0 @@ - diff --git a/app_old/incoviba/modelos/src/old/Proyecto/TipoEstadoProyecto.php b/app_old/incoviba/modelos/src/old/Proyecto/TipoEstadoProyecto.php deleted file mode 100644 index d65896c..0000000 --- a/app_old/incoviba/modelos/src/old/Proyecto/TipoEstadoProyecto.php +++ /dev/null @@ -1,23 +0,0 @@ -belongs_to(EtapaProyecto::class, 'etapa')->findOne(); - } -} -?> diff --git a/app_old/incoviba/modelos/src/old/Proyecto/TipoEstadoProyectoAgente.php b/app_old/incoviba/modelos/src/old/Proyecto/TipoEstadoProyectoAgente.php deleted file mode 100644 index deb2c51..0000000 --- a/app_old/incoviba/modelos/src/old/Proyecto/TipoEstadoProyectoAgente.php +++ /dev/null @@ -1,12 +0,0 @@ - diff --git a/app_old/incoviba/modelos/src/old/Proyecto/TipoTipologia.php b/app_old/incoviba/modelos/src/old/Proyecto/TipoTipologia.php deleted file mode 100644 index a6cdc3d..0000000 --- a/app_old/incoviba/modelos/src/old/Proyecto/TipoTipologia.php +++ /dev/null @@ -1,27 +0,0 @@ -belongsTo(ProyectoTipoUnidad::class, 'tipo')->findOne(); - } - public function tipologia() - { - return $this->belongsTo(Tipologia::class, 'tipologia')->findOne(); - } - public function elemento() - { - return $this->belongsTo(TipoElemento::class, 'elemento')->findOne(); - } -} diff --git a/app_old/incoviba/modelos/src/old/Proyecto/Tipologia.php b/app_old/incoviba/modelos/src/old/Proyecto/Tipologia.php deleted file mode 100644 index eab84d8..0000000 --- a/app_old/incoviba/modelos/src/old/Proyecto/Tipologia.php +++ /dev/null @@ -1,12 +0,0 @@ -belongs_to(Pago::class, 'pago')->findOne(); - } -} -?> diff --git a/app_old/incoviba/modelos/src/old/Venta/Cierre.php b/app_old/incoviba/modelos/src/old/Venta/Cierre.php deleted file mode 100644 index ad9027a..0000000 --- a/app_old/incoviba/modelos/src/old/Venta/Cierre.php +++ /dev/null @@ -1,341 +0,0 @@ -select('cierre.*') - ->join('unidad_cierre', ['unidad_cierre.cierre', '=', 'cierre.id']) - ->where('cierre.proyecto', $proyecto->id) - ->where('unidad_cierre.unidad', $unidad->id) - ->where('cierre.precio', $precio); - } - public static function vigentes() - { - return model(Cierre::class) - ->select('cierre.*') - ->join('estado_cierre', ['estado_cierre.cierre', '=', 'cierre.id']) - ->join('tipo_estado_cierre', ['tipo_estado_cierre.id', '=', 'estado_cierre.tipo']) - ->join('proyecto', ['proyecto.id', '=', 'cierre.proyecto']) - ->where('tipo_estado_cierre.vigente', 1) - ->orderByAsc('proyecto.descripcion') - ->orderByAsc('cierre.fecha') - ->groupBy('cierre.id') - ->findMany(); - } - public static function proyectos() - { - return model(Proyecto::class) - ->select('proyecto.*') - ->join('cierre', ['proyecto.id', '=', 'cierre.proyecto']) - ->join('estado_cierre', ['estado_cierre.cierre', '=', 'cierre.id']) - ->join('tipo_estado_cierre', ['tipo_estado_cierre.id', '=', 'estado_cierre.tipo']) - ->where('tipo_estado_cierre.vigente', 1) - ->orderByAsc('proyecto.descripcion') - ->orderByAsc('cierre.fecha') - ->groupBy('proyecto.id') - ->findMany(); - } - - public function proyecto() - { - return $this->belongsTo(Proyecto::class, 'proyecto')->findOne(); - } - public function unidades() - { - return $this->hasMany(UnidadCierre::class, 'cierre')->where('principal', 0)->findMany(); - } - public function unidadPrincipal() - { - return $this->hasMany(UnidadCierre::class, 'cierre')->where('principal', 1)->findOne(); - } - public function fecha(\DateTime $fecha = null) - { - if ($fecha == null) { - return Carbon::parse($this->fecha, config('app.timezone')); - } - $this->fecha = $fecha->format('Y-m-d'); - } - public function propietario() - { - $propietario = $this->belongsTo(Propietario::class, 'propietario'); - if ($propietario) { - return $propietario->findOne(); - } - return false; - } - public function uf_m2() - { - return $this->neto() / $this->unidadPrincipal()->unidad()->m2(); - } - public function neto() - { - $valor = $this->precio; - foreach ($this->unidades() as $unidad) { - $valor -= $unidad->unidad()->precio($this->fecha())->valor; - } - foreach ($this->valores() as $v) { - if ($v->tipo()->descripcion == 'pie') { - continue; - } - $valor -= $v->valor; - } - return $valor; - } - public function valores() - { - return $this->hasMany(ValorCierre::class, 'cierre')->findMany(); - } - public function valor($tipo = 'pie') - { - return $this->hasMany(ValorCierre::class, 'cierre') - ->select('valor_cierre.*') - ->join('tipo_valor_cierre', ['tipo_valor_cierre.id', '=', 'valor_cierre.tipo']) - ->where('tipo_valor_cierre.descripcion', $tipo) - ->findOne(); - } - public function estados() - { - return $this->hasMany(EstadoCierre::class, 'cierre')->findMany(); - } - public function estado(\DateTime $fecha = null) - { - if ($fecha == null) { - $estado = $this->hasMany(EstadoCierre::class, 'cierre')->orderByDesc('id')->findOne(); - if ($estado->tipo()->vigente == 1 and $this->oldest()) { - if ($this->promesa() and $estado->tipo()->descripcion != 'promesado') { - $tipo = model(TipoEstadoCierre::class)->where('descripcion', 'promesado')->findOne(); - $data = [ - 'cierre' => $this->id, - 'tipo' => $tipo->id, - 'fecha' => $this->promesa()->fecha - ]; - $estado = model(EstadoCierre::class)->create($data); - $estado->save(); - } - } - } else { - $estado = $this->hasMany(EstadoCierre::class, 'cierre')->whereLte('fecha', $fecha->format('Y-m-d'))->orderByDesc('id')->findOne(); - } - return $estado; - } - public function isVigente(): bool { - if ($this->estado()->tipo()->vigente == 1) { - return true; - } - return false; - } - public function new(\DateTime $fecha) - { - $this->save(); - $tipo = model(TipoEstadoCierre::class)->where('descripcion', 'revisado')->findOne(); - $data = [ - 'cierre' => $this->id, - 'tipo' => $tipo->id, - 'fecha' => $fecha->format('Y-m-d') - ]; - $estado = model(EstadoCierre::class)->create($data); - $estado->save(); - - if ($this->other()) { - $this->replace($fecha); - } - } - protected function cierresUnidad() { - $up = $this->unidadPrincipal(); - if (!$up) { - return false; - } - $up = $up->id; - $cierres = model(Cierre::class) - ->select('cierre.*') - ->join('unidad_cierre', ['unidad_cierre.cierre', '=', 'cierre.id']) - ->where('unidad_cierre.unidad', $up) - ->findMany(); - $id = $this->id; - $cierres = array_filter($cierres, function($item) use ($id) { - return ($id != $item->id); - }); - return $cierres; - } - protected function other(): bool { - $cierres = $this->cierresUnidad(); - if ($cierres and count($cierres) > 0) { - return true; - } - return false; - } - protected function oldest(): bool { - if ($this->other()) { - $last = $this->cierresUnidad()[count($this->cierresUnidad()) - 1]; - if ($last->fecha < $this->fecha) { - return true; - } - return false; - } - return true; - } - protected function replace(\DateTime $fecha) { - $cierres = $this->cierresUnidad(); - $tipo = model(TipoEstadoCierre::class)->where('descripcion', 'abandonado')->findOne(); - array_walk($cierres, function($item) use ($tipo, $fecha) { - $data = [ - 'cierre' => $item->id, - 'tipo' => $tipo->id, - 'fecha' => $fecha->format('Y-m-d') - ]; - $estado = model(EstadoCierre::class)->create($data); - $estado->save(); - }); - } - public function addUnidad(array $data) - { - $data['cierre'] = $this->id; - $unidad = model(UnidadCierre::class)->create($data); - $unidad->save(); - } - public function addValor(array $data) - { - $data['cierre'] = $this->id; - $tipo = model(TipoValorCierre::class)->where('descripcion', $data['tipo'])->findOne(); - $data['tipo'] = $tipo->id; - $valor = model(ValorCierre::class)->create($data); - $valor->save(); - } - public static function evaluar($precio_neto, $unidad, $fecha, $relacionado = false) - { - $precio_oferta = round($precio_neto, 2); - $precio_lista = round($unidad->precio($fecha)->valor * (($relacionado) ? (1 - 0.06) : 1), 2); - if ($precio_oferta >= $precio_lista) { - return true; - } - return false; - } - public function guardar(object $input) - { - $this->proyecto = $input->proyecto->id; - $this->precio = $input->precio; - $this->fecha = $input->fecha->format('Y-m-d'); - $this->relacionado = 0; - if (isset($input->relacionado) and $input->relacionado) { - $this->relacionado = 1; - } - if (isset($input->subrelacionado) and $input->subrelacionado) { - $this->relacionado = 2; - } - $fecha = Carbon::today(config('app.timezone')); - $this->new($fecha); - - $data = [ - 'unidad' => $input->departamento->id, - 'principal' => 1 - ]; - $this->addUnidad($data); - - foreach ($input->unidades as $unidad) { - $data = ['unidad' => $unidad->id]; - $this->addUnidad($data); - } - - if (isset($input->pie)) { - $data = [ - 'tipo' => 'pie', - 'valor' => $input->pie - ]; - $this->addValor($data); - } - if (isset($input->bono)) { - $data = [ - 'tipo' => 'bono pie', - 'valor' => $input->bono - ]; - $this->addValor($data); - } - if (isset($input->promocion)) { - $data = [ - 'tipo' => 'premio', - 'valor' => $input->promocion - ]; - $this->addValor($data); - } - if (isset($input->operador)) { - $data = [ - 'tipo' => 'operador', - 'valor' => $input->operador * $this->precio / 100 - ]; - $this->addValor($data); - } - } - public function aprobar(\DateTime $fecha) - { - $tipo = model(TipoEstadoCierre::class)->where('descripcion', 'aprobado')->findOne(); - $data = [ - 'cierre' => $this->id, - 'tipo' => $tipo->id - ]; - $estado = (new Factory(EstadoCierre::class))->where($data)->find(); - if (!$estado) { - $data['fecha'] = $fecha->format('Y-m-d'); - $estado = model(EstadoCierre::class)->create($data); - $estado->save(); - } - } - public function rechazar(\DateTime $fecha) - { - $tipo = model(TipoEstadoCierre::class)->where('descripcion', 'rechazado')->findOne(); - $data = [ - 'cierre' => $this->id, - 'tipo' => $tipo->id - ]; - $estado = (new Factory(EstadoCierre::class))->where($data)->find(); - if (!$estado) { - $data['fecha'] = $fecha->format('Y-m-d'); - $estado = model(EstadoCierre::class)->create($data); - $estado->save(); - } - } - protected $promesa; - public function promesa() - { - if ($this->promesa == null) { - $propiedad = model(Propiedad::class)->where('unidad_principal', $this->unidadPrincipal()->unidad)->findOne(); - if (!$propiedad) { - return false; - } - $this->promesa = model(Venta::class)->where('propiedad', $propiedad->id)->where('estado', 1)->findOne(); - if ($this->promesa != null and $this->propietario == 0) { - $this->propietario = $this->promesa->propietario; - $this->save(); - } - } - return $this->promesa; - } - public function isRelacionado() { - return ($this->relacionado == 1) ? true : false; - } - public function isSubrelacionado() { - return ($this->relacionado == 2) ? true : false; - } - public function periodo() { - $today = Carbon::today(config('app.timezone')); - $dif = $today->diffInDays($this->fecha()); - return $dif; - } -} diff --git a/app_old/incoviba/modelos/src/old/Venta/Comentario.php b/app_old/incoviba/modelos/src/old/Venta/Comentario.php deleted file mode 100644 index f6953ab..0000000 --- a/app_old/incoviba/modelos/src/old/Venta/Comentario.php +++ /dev/null @@ -1,22 +0,0 @@ -belongsTo(Venta::class, 'venta')->findOne(); - } -} -?> diff --git a/app_old/incoviba/modelos/src/old/Venta/Credito.php b/app_old/incoviba/modelos/src/old/Venta/Credito.php deleted file mode 100644 index 33d1315..0000000 --- a/app_old/incoviba/modelos/src/old/Venta/Credito.php +++ /dev/null @@ -1,29 +0,0 @@ -belongs_to(Pago::class, 'pago')->findOne(); - } - public function venta() - { - return $this->hasOne(Venta::class, 'credito')->findOne(); - } -} -?> diff --git a/app_old/incoviba/modelos/src/old/Venta/Cuota.php b/app_old/incoviba/modelos/src/old/Venta/Cuota.php deleted file mode 100644 index e52aeb1..0000000 --- a/app_old/incoviba/modelos/src/old/Venta/Cuota.php +++ /dev/null @@ -1,72 +0,0 @@ -belongs_to(Pago::class, 'pago')->findOne(); - } - public function pie() - { - return $this->belongs_to(Pie::class, 'pie')->findOne(); - } - public function uf() - { - if ($this->uf == 0) { - $uf = $this->pago()->uf(); - if ($uf == 1) { - $uf = $this->pie()->uf(); - } - $this->uf = $uf; - } - return $this->uf; - } - public function valor($tipo = 'pesos') - { - $valor = $this->pago()->valor; - if ($tipo == 'pesos') { - return $valor; - } - $uf = $this->uf(); - if ($uf == 0) { - return 0; - } - return $valor / $uf; - } - public function numero() - { - if ($this->numero == '') { - $cuotas = $this->pie()->cuotas('fecha'); - $n = 0; - foreach ($cuotas as $cuota) { - $n ++; - if ($cuota->id == $this->id) { - $this->numero = $n; - $this->save(); - break; - } - } - } - return $this->numero; - } -} -?> diff --git a/app_old/incoviba/modelos/src/old/Venta/Entrega.php b/app_old/incoviba/modelos/src/old/Venta/Entrega.php deleted file mode 100644 index 035a227..0000000 --- a/app_old/incoviba/modelos/src/old/Venta/Entrega.php +++ /dev/null @@ -1,21 +0,0 @@ - diff --git a/app_old/incoviba/modelos/src/old/Venta/Escritura.php b/app_old/incoviba/modelos/src/old/Venta/Escritura.php deleted file mode 100644 index 0763e7d..0000000 --- a/app_old/incoviba/modelos/src/old/Venta/Escritura.php +++ /dev/null @@ -1,29 +0,0 @@ -belongs_to(Pago::class, 'pago')->findOne(); - } - - public function valor(string $tipo = 'pesos') - { - return $this->pago()->valor($tipo); - } -} -?> diff --git a/app_old/incoviba/modelos/src/old/Venta/EstadoCierre.php b/app_old/incoviba/modelos/src/old/Venta/EstadoCierre.php deleted file mode 100644 index e3ec49a..0000000 --- a/app_old/incoviba/modelos/src/old/Venta/EstadoCierre.php +++ /dev/null @@ -1,30 +0,0 @@ -belongsTo(Cierre::class, 'cierre')->findOne(); - } - public function tipo() - { - return $this->belongsTo(TipoEstadoCierre::class, 'tipo')->findOne(); - } - public function fecha(\DateTime $fecha = null) - { - if ($fecha == null) { - return Carbon::parse($this->fecha, config('app.timezone')); - } - $this->fecha = $fecha->format('Y-m-d'); - } -} diff --git a/app_old/incoviba/modelos/src/old/Venta/EstadoPago.php b/app_old/incoviba/modelos/src/old/Venta/EstadoPago.php deleted file mode 100644 index 7f18da1..0000000 --- a/app_old/incoviba/modelos/src/old/Venta/EstadoPago.php +++ /dev/null @@ -1,27 +0,0 @@ -belongs_to(TipoEstadoPago::class, 'estado')->findOne(); - } - public function fecha() - { - return Carbon::parse($this->fecha, config('app.timezone')); - } -} -?> diff --git a/app_old/incoviba/modelos/src/old/Venta/EstadoPrecio.php b/app_old/incoviba/modelos/src/old/Venta/EstadoPrecio.php deleted file mode 100644 index 58c3657..0000000 --- a/app_old/incoviba/modelos/src/old/Venta/EstadoPrecio.php +++ /dev/null @@ -1,33 +0,0 @@ -belongsTo(Precio::class, 'precio')->findOne(); - } - public function fecha($fecha = null) - { - if ($fecha == null) { - return Carbon::parse($this->fecha, config('app.timezone')); - } - if (is_a($fecha, \DateTime::class)) { - $fecha = $fecha->format('Y-m-d'); - } - $this->fecha = $fecha; - } - public function estado() - { - return $this->belongsTo(TipoEstadoPrecio::class, 'estado')->findOne(); - } -} diff --git a/app_old/incoviba/modelos/src/old/Venta/EstadoProblema.php b/app_old/incoviba/modelos/src/old/Venta/EstadoProblema.php deleted file mode 100644 index c6b8ce2..0000000 --- a/app_old/incoviba/modelos/src/old/Venta/EstadoProblema.php +++ /dev/null @@ -1,17 +0,0 @@ - diff --git a/app_old/incoviba/modelos/src/old/Venta/EstadoUnidadBloqueada.php b/app_old/incoviba/modelos/src/old/Venta/EstadoUnidadBloqueada.php deleted file mode 100644 index f11ea1b..0000000 --- a/app_old/incoviba/modelos/src/old/Venta/EstadoUnidadBloqueada.php +++ /dev/null @@ -1,30 +0,0 @@ -belongsTo(UnidadBloqueada::class, 'unidad')->findOne(); - } - public function fecha(\DateTime $fecha = null) - { - if ($fecha == null) { - return Carbon::parse($this->fecha, config('app.timezone')); - } - $this->fecha = $fecha->format('Y-m-d'); - } - public function tipo() - { - return $this->belongsTo(TipoEstadoUnidadBloqueada::class, 'tipo')->findOne(); - } -} diff --git a/app_old/incoviba/modelos/src/old/Venta/EstadoVenta.php b/app_old/incoviba/modelos/src/old/Venta/EstadoVenta.php deleted file mode 100644 index 5e75070..0000000 --- a/app_old/incoviba/modelos/src/old/Venta/EstadoVenta.php +++ /dev/null @@ -1,27 +0,0 @@ -belongsTo(Venta::class, 'venta')->findOne(); - } - public function tipo() - { - return $this->belongsTo(TipoEstadoVenta::class, 'estado')->findOne(); - } - public function fecha() - { - return Carbon::parse($this->fecha, config('app.timezone')); - } -} diff --git a/app_old/incoviba/modelos/src/old/Venta/Pago.php b/app_old/incoviba/modelos/src/old/Venta/Pago.php deleted file mode 100644 index 9b2d4ed..0000000 --- a/app_old/incoviba/modelos/src/old/Venta/Pago.php +++ /dev/null @@ -1,159 +0,0 @@ -belongs_to(Banco::class, 'banco'); - if ($banco) { - return $banco->findOne(); - } - return null; - } - public function tipo() - { - return $this->belongs_to(TipoPago::class, 'tipo')->findOne(); - } - public function estados($order = 'fecha', $direction = 'desc') - { - $estados = $this->has_many(EstadoPago::class, 'pago'); - if ($direction == 'desc') { - $estados->orderByDesc($order); - if ($order != 'id') { - $estados->orderByDesc('id'); - } - } else { - $estados->orderByAsc($order); - if ($order != 'id') { - $estados->orderByAsc('id'); - } - } - return $estados->findMany(); - } - public function estado() - { - $estado = $this->has_many(EstadoPago::class, 'pago')->order_by_desc('id')->findOne(); - return $estado; - } - public function fecha() - { - return Carbon::parse($this->fecha, config('app.timezone')); - } - public function uf() - { - if ($this->uf == 0) { - $uf = uf($this->fecha); - if (!$uf or $uf->total == 0) { - return 1; - } - if ($uf->total > 0) { - $this->uf = $uf->uf->value; - $this->save(); - } - } - return $this->uf; - } - public function valor($tipo = 'pesos') - { - $valor = $this->valor; - if ($tipo == 'ufs') { - $uf = $this->uf(); - if ($uf == 1 and method_exists($this->fuente()[0]->obj, 'uf')) { - $uf = $this->fuente()[0]->obj->uf(); - } - if ($uf == 0) { - $uf = 1; - } - $valor /= $uf; - if ($this->asociado() and $this->asociado == 0) { - $valor += $this->asociado()->valor('ufs'); - } - return $valor; - } - if ($this->asociado() and $this->asociado == 0) { - $valor += $this->asociado()->valor(); - } - return $valor; - } - public function new() - { - $this->save(); - - $estado = \Model::factory(EstadoPago::class)->create(); - $estado->pago = $this->id; - $estado->fecha = $this->fecha; - $estado->estado = 0; - $estado->save(); - } - public function newPagado() - { - $this->new(); - - $estado = \Model::factory(EstadoPago::class)->create(); - $estado->pago = $this->id; - $estado->fecha = $this->fecha; - $estado->estado = 1; - $estado->save(); - } - public function fuente() - { - $results = []; - $cuota = model(Cuota::class)->where('pago', $this->id)->findOne(); - if ($cuota) { - $results []= (object) ['tipo' => 'cuota', 'obj' => $cuota]; - } - $credito = model(Credito::class)->where('pago', $this->id)->findOne(); - if ($credito) { - $results []= (object) ['tipo' => 'credito', 'obj' => $credito]; - } - $escritura = model(Escritura::class)->where('pago', $this->id)->findOne(); - if ($escritura) { - $results []= (object) ['tipo' => 'escritura', 'obj' => $escritura]; - } - $subsidio = model(Subsidio::class)->where('pago', $this->id)->findOne(); - if ($subsidio) { - $results []= (object) ['tipo' => 'subsidio', 'obj' => $subsidio]; - } - $bono = model(BonoPie::class)->where('pago', $this->id)->findOne(); - if ($bono) { - $results []= (object) ['tipo' => 'bono_pie', 'obj' => $bono]; - } - return $results; - } - public function asociado() - { - if ($this->asociado == 0) { - return $this->hasOne(Pago::class, 'asociado')->findOne(); - } - return $this->belongsTo(Pago::class, 'asociado')->findOne(); - } - - public static function filterEstado(\ORM $orm) - { - return $orm->rawJoin( - 'JOIN (SELECT ep.* FROM (SELECT pago, MAX(id) AS id FROM estado_pago GROUP BY pago) e0 JOIN estado_pago ep ON ep.id = e0.id)', - ['estado_pago.pago', '=', 'pago.id'], - 'estado_pago' - ); - } -} -?> diff --git a/app_old/incoviba/modelos/src/old/Venta/Pie.php b/app_old/incoviba/modelos/src/old/Venta/Pie.php deleted file mode 100644 index 18e505f..0000000 --- a/app_old/incoviba/modelos/src/old/Venta/Pie.php +++ /dev/null @@ -1,228 +0,0 @@ -asociado != 0) { - return $this->asociado()->cuotas(); - } - $cuotas = $this->hasMany(Cuota::class, 'pie') - ->select('cuota.*') - ->join('pago', ['pago.id', '=', 'cuota.pago']) - ->rawJoin('JOIN (SELECT e1.* FROM (SELECT pago, MAX(id) AS id FROM estado_pago GROUP BY pago) e0 JOIN estado_pago e1 ON e1.id = e0.id)', ['ep.pago', '=', 'pago.id'], 'ep') - ->join('tipo_estado_pago', ['tipo_estado_pago.id', '=', 'ep.estado']) - ->whereNotEqual('tipo_estado_pago.descripcion', 'reemplazado') - ->whereNotEqual('tipo_estado_pago.descripcion', 'anulado'); - if ($fecha != null) { - $cuota = $cuotas->whereLte('ep.fecha', $fecha->format('Y-m-d')); - } - switch ($order) { - case 'numero': - case 'number': - default: - $cuotas = $cuotas->orderByAsc('cuota.numero'); - case 'fecha': - case 'date': - $cuotas = $cuotas->orderByAsc('pago.fecha') - ->orderByDesc('pago.valor'); - break; - } - $cuotas = $cuotas->findMany(); - return $cuotas; - } - public function pagadas($fecha = null) - { - $estado = model(TipoEstadoPago::class)->where('descripcion', 'depositado')->findOne(); - $cuotas = $this->cuotas('numero', $fecha); - foreach ($cuotas as $i => &$cuota) { - if ($cuota->pago()->estado()->estado < $estado->id) { - unset($cuotas[$i]); - } - } - array_values($cuotas); - return $cuotas; - } - public function abonadas($fecha = null) - { - $estado = model(TipoEstadoPago::class)->where('descripcion', 'abonado')->findOne(); - $cuotas = $this->pagadas($fecha); - foreach ($cuotas as $i => &$cuota) { - if ($cuota->pago()->estado()->estado != $estado->id) { - unset($cuotas[$i]); - } - } - array_values($cuotas); - return $cuotas; - } - public function rebotadas() - { - $estado = model(TipoEstadoPago::class)->where('descripcion', 'devuelto')->findOne(); - $cuotas = $this->cuotas(); - foreach ($cuotas as $i => &$cuota) { - if ($cuota->pago()->estado()->estado != $estado->id) { - unset($cuotas[$i]); - } - } - array_values($cuotas); - return $cuotas; - } - public function valorPesos() - { - return $this->valor * $this->uf(); - } - public function valorPagado($tipo = 'uf', $fecha = null) - { - $cuotas = $this->pagadas($fecha); - $sum = 0; - foreach ($cuotas as $cuota) { - $pago = $cuota->pago(); - if ($tipo == 'uf' or $tipo == 'ufs') { - if ($pago->uf() == 0) { - $sum += $pago->valor / $this->uf(); - continue; - } - $sum += $pago->valor / $pago->uf(); - } else { - $sum += $pago->valor; - } - } - - return $sum * $this->proporcion(); - } - public function valorAbonado($tipo = 'uf', $fecha = null) - { - $cuotas = $this->abonadas($fecha); - $sum = 0; - foreach ($cuotas as $cuota) { - $pago = $cuota->pago(); - if ($tipo == 'uf' or $tipo == 'ufs') { - if ($pago->uf() == 0) { - $sum += $pago->valor / $this->uf(); - continue; - } - $sum += $pago->valor / $pago->uf; - } else { - $sum += $pago->valor; - } - } - - return $sum * $this->proporcion(); - } - public function reajuste() - { - $reajuste = $this->belongsTo(Pago::class, 'reajuste'); - if ($reajuste) { - $reajuste = $reajuste->findOne(); - return $reajuste; - } - return null; - } - public function venta() - { - return $this->has_one(Venta::class, 'pie')->findOne(); - } - public function asociado() - { - $pie = $this->belongs_to(Pie::class, 'asociado')->findOne(); - if ($pie) { - return $pie; - } - return null; - } - private $asociados = null; - public function asociados() - { - if ($this->asociados == null) { - $pie = $this->has_many(Pie::class, 'asociado'); - if (!$pie) { - return null; - } - $asociados = $pie->findMany(); - usort($asociados, function($a, $b) { - return strcmp($a->venta()->unidad()->descripcion, $b->venta()->unidad()->descripcion); - }); - $this->asociados = $asociados; - } - return $this->asociados; - } - public function proporcion() - { - $pie = $this; - if ($this->asociado != 0) { - $pie = $this->asociado(); - } - if ($pie->asociados() != null) { - $pies = $pie->asociados(); - $base = $pie->valor; - foreach ($pies as $p) { - $base += $p->valor; - } - - return $this->valor / $base; - } - return 1; - } - public function pendientes() - { - return count($this->cuotas()) - count($this->pagadas()); - } - public function pagos($estado = 0) - { - $pagos = model(Pago::class) - ->select('pago.*') - ->join('cuota', ['cuota.pago', '=', 'pago.id']) - ->filter('filterEstado') - ->where('estado_pago.estado', $estado) - ->where('cuota.pie', $this->id) - ->findMany(); - if ($this->reajuste != 0 and $this->reajuste()->estado()->estado == $estado) { - $pagos []= $this->reajuste(); - } - return $pagos; - } - public function uf() - { - if ($this->uf == 0) { - $uf = uf($this->fecha); - if (!$uf) { - return 1; - } - if ($uf->total > 0) { - $this->uf = $uf->uf->value; - $this->save(); - } - } - return $this->uf; - } - public function valor($tipo = 'pesos') - { - switch ($tipo) { - case 'uf': - case 'ufs': - return $this->valor; - break; - case 'peso': - case 'pesos': - default: - return $this->valorPesos(); - break; - } - } -} -?> diff --git a/app_old/incoviba/modelos/src/old/Venta/Precio.php b/app_old/incoviba/modelos/src/old/Venta/Precio.php deleted file mode 100644 index a80c5ed..0000000 --- a/app_old/incoviba/modelos/src/old/Venta/Precio.php +++ /dev/null @@ -1,81 +0,0 @@ -belongsTo(Unidad::class, 'unidad')->findOne(); - } - public function estados() - { - return $this->hasMany(EstadoPrecio::class, 'precio')->findMany(); - } - public function estado() - { - return \model(EstadoPrecio::class) - ->select('estado_precio.*') - ->rawJoin('JOIN (SELECT precio, MAX(id) AS id FROM estado_precio GROUP BY precio)', ['e0.id', '=', 'estado_precio.id'], 'e0') - ->where('estado_precio.precio', $this->id) - ->findOne(); - } - public function inicio() - { - return \model(EstadoPrecio::class) - ->where('estado_precio.precio', $this->id) - ->orderByAsc('id') - ->findOne(); - } - public function vigente() - { - if ($this->estado()->estado()->descripcion == 'vigente') { - return true; - } - return false; - } - public function reemplazar($fecha) - { - if ($this->estado()->estado()->descripcion == 'reemplazado') { - return; - } - $tipo = model(TipoEstadoPrecio::class)->where('descripcion', 'reemplazado')->findOne(); - $data = [ - 'precio' => $this->id, - 'fecha' => $fecha->format('Y-m-d'), - 'estado' => $tipo->id - ]; - $estado = model(EstadoPrecio::class)->create($data); - $estado->save(); - } - public function actualizar($fecha) - { - $tipo = model(TipoEstadoPrecio::class)->where('descripcion', 'vigente')->findOne(); - $data = [ - 'precio' => $this->id, - 'fecha' => $fecha->format('Y-m-d'), - 'estado' => $tipo->id - ]; - $estado = model(EstadoPrecio::class)->create($data); - $estado->save(); - } - public function new($fecha) - { - $this->save(); - - $tipo = model(TipoEstadoPrecio::class)->where('descripcion', 'vigente')->findOne(); - $data = [ - 'precio' => $this->id, - 'fecha' => $fecha->format('Y-m-d'), - 'estado' => $tipo->id - ]; - $estado = model(EstadoPrecio::class)->create($data); - $estado->save(); - } -} diff --git a/app_old/incoviba/modelos/src/old/Venta/Problema.php b/app_old/incoviba/modelos/src/old/Venta/Problema.php deleted file mode 100644 index 080b363..0000000 --- a/app_old/incoviba/modelos/src/old/Venta/Problema.php +++ /dev/null @@ -1,16 +0,0 @@ - diff --git a/app_old/incoviba/modelos/src/old/Venta/Promocion.php b/app_old/incoviba/modelos/src/old/Venta/Promocion.php deleted file mode 100644 index 5515566..0000000 --- a/app_old/incoviba/modelos/src/old/Venta/Promocion.php +++ /dev/null @@ -1,23 +0,0 @@ -belongsTo(Proyecto::class, 'proyecto')->findOne(); - } -} -?> diff --git a/app_old/incoviba/modelos/src/old/Venta/PromocionVenta.php b/app_old/incoviba/modelos/src/old/Venta/PromocionVenta.php deleted file mode 100644 index 641f3a5..0000000 --- a/app_old/incoviba/modelos/src/old/Venta/PromocionVenta.php +++ /dev/null @@ -1,24 +0,0 @@ -belongsTo(Promocion::class, 'promocion')->findOne(); - } - public function venta() - { - return $this->belongsTo(Venta::class, 'venta')->findOne(); - } -} -?> diff --git a/app_old/incoviba/modelos/src/old/Venta/Propiedad.php b/app_old/incoviba/modelos/src/old/Venta/Propiedad.php deleted file mode 100644 index f99a3a0..0000000 --- a/app_old/incoviba/modelos/src/old/Venta/Propiedad.php +++ /dev/null @@ -1,117 +0,0 @@ -belongs_to(Unidad::class, 'unidad_principal')->findOne(); - } - protected $unidades; - public function unidades() { - if ($this->unidades == null) { - $this->unidades = $this->hasMany(PropiedadUnidad::class, 'propiedad')->findMany(); - } - return $this->unidades; - } - protected $departamentos; - public function departamentos() { - if ($this->departamentos == null) { - $this->departamentos = array_map(function($item) { - return $item->unidad(); - }, array_filter($this->unidades(), function($item) { - return ($item->unidad()->tipo()->descripcion == 'departamento'); - })); - } - return $this->departamentos; - } - public function estacionamientos($mod = null) - { - if ($this->estacionamientos_arr == null) { - if (($unidades = $this->unidades()) !== false) { - $estacionamientos = array_filter($unidades, function($item) { - return ($item->unidad()->tipo()->descripcion == 'estacionamiento'); - }); - $this->estacionamientos_arr = array_map(function($item) { - return $item->unidad(); - }, $estacionamientos); - } else { - $ests = explode(';', $this->estacionamientos); - $estacionamientos = []; - foreach ($ests as $e) { - $estacionamiento = \Model::factory(Unidad::class)->findOne($e); - if ($estacionamiento) { - $estacionamientos []= $estacionamiento; - } - } - $this->estacionamientos_arr = $estacionamientos; - } - } - if ($mod != null) { - switch ($mod) { - case 'array': - $result = []; - foreach ($this->estacionamientos_arr as $est) { - $result []= $est->descripcion; - } - return $result; - } - } - return $this->estacionamientos_arr; - } - public function bodegas($mod = null) - { - if ($this->bodegas_arr == null) { - if (($unidades = $this->unidades()) !== false) { - $bodegas = array_filter($unidades, function($item) { - return ($item->unidad()->tipo()->descripcion == 'bodega'); - }); - $this->bodegas_arr = array_map(function($item) { - return $item->unidad(); - }, $bodegas); - } else { - $bods = explode(';', $this->bodegas); - $bodegas = []; - foreach ($bods as $b) { - $bodega = \Model::factory(Unidad::class)->findOne($b); - if ($bodega) { - $bodegas []= $bodega; - } - } - $this->bodegas_arr = $bodegas; - } - } - if ($mod != null) { - switch ($mod) { - case 'array': - $result = []; - foreach ($this->bodegas_arr as $bod) { - $result []= $bod->descripcion; - } - return $result; - } - } - return $this->bodegas_arr; - } - public function venta() - { - return $this->has_one(Venta::class, 'propiedad')->findOne(); - } -} -?> diff --git a/app_old/incoviba/modelos/src/old/Venta/PropiedadUnidad.php b/app_old/incoviba/modelos/src/old/Venta/PropiedadUnidad.php deleted file mode 100644 index b3f9b81..0000000 --- a/app_old/incoviba/modelos/src/old/Venta/PropiedadUnidad.php +++ /dev/null @@ -1,25 +0,0 @@ -propiedad_model == null) { - $this->propiedad_model = $this->belongsTo(Propiedad::class, 'propiedad')->findOne(); - } - return $this->propiedad_model; - } - protected $unidad_model; - public function unidad() { - if ($this->unidad_model == null) { - $this->unidad_model = $this->belongsTo(Unidad::class, 'unidad')->findOne(); - } - return $this->unidad_model; - } - protected $is_principal; - public function isPrincipal() { - return ($this->principal == 0) ? false : true; - } -} diff --git a/app_old/incoviba/modelos/src/old/Venta/Propietario.php b/app_old/incoviba/modelos/src/old/Venta/Propietario.php deleted file mode 100644 index 353a30a..0000000 --- a/app_old/incoviba/modelos/src/old/Venta/Propietario.php +++ /dev/null @@ -1,66 +0,0 @@ -belongs_to(Direccion::class, 'direccion')->findOne(); - } - public function nombreCompleto($ap = false) - { - $str = ''; - if ($ap) { - $str = $this->apellido_paterno . ' ' . $this->apellido_materno . ', ' . $this->nombres; - } else { - $str = $this->nombres . ' ' . $this->apellido_paterno . ' ' . $this->apellido_materno; - } - return $str; - } - public function representante() - { - $r = $this->belongsTo(Propietario::class, 'representante', 'rut'); - if ($r) { - return $r->findOne(); - } - return null; - } - public function ventas() { - return $this->hasMany(Venta::class, 'propietario', 'rut') - ->select('venta.*') - ->join('propiedad', ['propiedad.id', '=', 'venta.propiedad']) - ->join('unidad', ['unidad.id', '=', 'propiedad.unidad_principal']) - ->join('proyecto', ['proyecto.id', '=', 'unidad.proyecto']) - ->orderByAsc('proyecto.descripcion') - ->orderByExpr("LPAD(unidad.descripcion, 4, '0')") - ->findMany(); - } - public function rut() - { - return format('rut', $this->rut) . '-' . $this->dv; - } -} -?> diff --git a/app_old/incoviba/modelos/src/old/Venta/Subsidio.php b/app_old/incoviba/modelos/src/old/Venta/Subsidio.php deleted file mode 100644 index 7728f41..0000000 --- a/app_old/incoviba/modelos/src/old/Venta/Subsidio.php +++ /dev/null @@ -1,44 +0,0 @@ -belongs_to(Pago::class, 'pago')->findOne(); - } - public function subsidio() - { - $pago = $this->belongs_to(Pago::class, 'subsidio'); - if ($pago) { - return $pago->findOne(); - } - return null; - } - public function total($tipo = 'pesos') - { - $sum = 0; - if ($tipo == 'pesos') { - $sum = $this->pago()->valor; - if ($this->subsidio != 0) { - $sum += $this->subsidio()->valor; - } - } else { - $sum = $this->pago()->valor('ufs'); - if ($this->subsidio != 0) { - $sum += $this->subsidio()->valor('ufs'); - } - } - return $sum; - } -} -?> diff --git a/app_old/incoviba/modelos/src/old/Venta/TipoEstadoCierre.php b/app_old/incoviba/modelos/src/old/Venta/TipoEstadoCierre.php deleted file mode 100644 index 881e3ac..0000000 --- a/app_old/incoviba/modelos/src/old/Venta/TipoEstadoCierre.php +++ /dev/null @@ -1,13 +0,0 @@ - diff --git a/app_old/incoviba/modelos/src/old/Venta/TipoEstadoPrecio.php b/app_old/incoviba/modelos/src/old/Venta/TipoEstadoPrecio.php deleted file mode 100644 index 43aee68..0000000 --- a/app_old/incoviba/modelos/src/old/Venta/TipoEstadoPrecio.php +++ /dev/null @@ -1,12 +0,0 @@ -activo == 1) { - return true; - } - return false; - } -} diff --git a/app_old/incoviba/modelos/src/old/Venta/TipoEstadoVenta.php b/app_old/incoviba/modelos/src/old/Venta/TipoEstadoVenta.php deleted file mode 100644 index 28105d1..0000000 --- a/app_old/incoviba/modelos/src/old/Venta/TipoEstadoVenta.php +++ /dev/null @@ -1,21 +0,0 @@ -hasMany(EstadoVenta::class, 'estado')->findMany(); - } - public function activa() - { - return ($this->activa == 1) ? true : false; - } -} diff --git a/app_old/incoviba/modelos/src/old/Venta/TipoPago.php b/app_old/incoviba/modelos/src/old/Venta/TipoPago.php deleted file mode 100644 index 8fc3efb..0000000 --- a/app_old/incoviba/modelos/src/old/Venta/TipoPago.php +++ /dev/null @@ -1,17 +0,0 @@ - diff --git a/app_old/incoviba/modelos/src/old/Venta/TipoUnidad.php b/app_old/incoviba/modelos/src/old/Venta/TipoUnidad.php deleted file mode 100644 index 731f8cd..0000000 --- a/app_old/incoviba/modelos/src/old/Venta/TipoUnidad.php +++ /dev/null @@ -1,17 +0,0 @@ - diff --git a/app_old/incoviba/modelos/src/old/Venta/TipoValorCierre.php b/app_old/incoviba/modelos/src/old/Venta/TipoValorCierre.php deleted file mode 100644 index a35385c..0000000 --- a/app_old/incoviba/modelos/src/old/Venta/TipoValorCierre.php +++ /dev/null @@ -1,12 +0,0 @@ -belongs_to(Proyecto::class, 'proyecto')->findOne(); - } - protected $propiedad; - public function propiedad() - { - if ($this->propiedad == null) { - $this->propiedad = $this->hasMany(PropiedadUnidad::class, 'unidad')->findOne(); - } - return $this->propiedad; - - if ($this->tipo()->descripcion == 'departamento') { - $propiedad = $this->has_one(Propiedad::class, 'unidad_principal'); - if ($propiedad) { - return $propiedad->findOne(); - } - return null; - } - if ($this->tipo()->descripcion == 'estacionamiento') { - // id | id; | ;id | ;id; - $propiedad = model(Propiedad::class)->whereLike('estacionamientos', $this->id)->findOne(); - if ($propiedad) { - return $propiedad; - } - $propiedad = model(Propiedad::class)->whereLike('estacionamientos', '%;' . $this->id)->findOne(); - if ($propiedad) { - return $propiedad; - } - $propiedad = model(Propiedad::class)->whereLike('estacionamientos', $this->id . ';%')->findOne(); - if ($propiedad) { - return $propiedad; - } - $propiedad = model(Propiedad::class)->whereLike('estacionamientos', '%;' . $this->id . ';%')->findOne(); - if ($propiedad) { - return $propiedad; - } - return null; - } - if ($this->tipo()->descripcion == 'bodega') { - // id | id; | ;id | ;id; - $propiedad = model(Propiedad::class)->whereLike('bodegas', $this->id)->findOne(); - if ($propiedad) { - return $propiedad; - } - $propiedad = model(Propiedad::class)->whereLike('bodegas', '%;' . $this->id)->findOne(); - if ($propiedad) { - return $propiedad; - } - $propiedad = model(Propiedad::class)->whereLike('bodegas', $this->id . ';%')->findOne(); - if ($propiedad) { - return $propiedad; - } - $propiedad = model(Propiedad::class)->whereLike('bodegas', '%;' . $this->id . ';%')->findOne(); - if ($propiedad) { - return $propiedad; - } - return null; - } - } - public function tipo() - { - return $this->belongs_to(TipoUnidad::class, 'tipo')->findOne(); - } - private $venta = null; - public function venta() - { - if ($this->venta == null) { - $propiedad = $this->propiedad(); - if ($propiedad) { - $venta = $propiedad->propiedad()->venta(); - if ($venta) { - $this->venta = $venta; - } - } - } - return $this->venta; - } - private $m2t = null; - public function m2($tipo = 'vendible') - { - if ($this->m2t == null or !isset($this->m2t->{$tipo})) { - if ($this->m2t == null) { - $this->m2t = []; - } else { - $this->m2t = (Array) $this->m2t; - } - - $this->m2t[$tipo] = $this->tipologia()->m2($tipo); - $this->m2t = (object) $this->m2t; - } - return $this->m2t->{$tipo}; - } - public function precios() - { - return $this->hasMany(Precio::class, 'unidad')->findMany(); - } - public function precio($fecha = null) - { - if ($fecha == null) { - return \model(Precio::class) - ->select('precio.*') - ->rawJoin('JOIN (SELECT e1.* FROM (SELECT precio, MAX(id) AS id FROM estado_precio GROUP BY precio) e0 JOIN estado_precio e1 ON e1.id = e0.id)', ['ep.precio', '=', 'precio.id'], 'ep') - ->where('unidad', $this->id) - ->where('ep.estado', 1) - ->findOne(); - } - return \model(Precio::class) - ->select('precio.*') - ->join('estado_precio', ['ep.precio', '=', 'precio.id'], 'ep') - ->where('precio.unidad', $this->id) - ->where('ep.estado', 1) - ->whereLte('ep.fecha', $fecha->format('Y-m-d')) - ->orderByDesc('ep.fecha') - ->orderByDesc('ep.id') - ->findOne(); - } - public function setPrecio($fecha, $valor) - { - $exists = false; - // Dejar valores antiguos reemplazados (estado = 'reemplazado') - foreach ($this->precios() as $precio) { - if (!$precio->vigente()) { - continue; - } - // Ya existe precio a este valor - if ($precio->valor == $valor) { - // La fecha es anterior - if ($precio->estado()->fecha != $fecha->format('Y-m-d')) { - $precio->actualizar($fecha); - } - $exists = true; - continue; - } - $precio->reemplazar($fecha); - } - if ($exists) { - return; - } - // Agregar precio - $data = [ - 'unidad' => $this->id, - 'valor' => $valor - ]; - $precio = model(Precio::class)->create($data); - $precio->new($fecha); - } - public function tipologia() - { - return $this->belongsTo(ProyectoTipoUnidad::class, 'pt')->findOne(); - } - protected $is_vendida; - public function isVendida() { - if ($this->is_vendidad == null) { - $this->is_vendida = false; - try { - $p = $this->propiedad(); - if ($p) { - $v = $p->venta(); - if ($v) { - $this->is_vendida = true; - } - } - } catch(\Exception $e) {} - } - return $this->is_vendida; - } - protected $cierres; - public function cierres() { - if ($this->cierres == null) { - $ucs = $this->hasMany(UnidadCierre::class, 'unidad')->findMany(); - if (!$ucs) { - $this->cierres = false; - return $this->cierres; - } - $cierres = []; - foreach ($ucs as $uc) { - $c = $uc->cierre(); - if ($c) { - $cierres []= $c; - } - } - usort($cierres, function($a, $b) { - return $a->fecha()->diffInDays($b->fecha()); - }); - $this->cierres = $cierres; - } - return $this->cierres; - } - public function cierre() { - if ($this->cierres()) { - return $this->cierres[count($this->cierres) - 1]; - } - return false; - } - protected $is_reservada; - public function isReservada() { - if ($this->is_reservada == null) { - $this->is_reservada = false; - if (!$this->isVendida()) { - $cierres = $this->cierres(); - if ($cierres) { - foreach ($cierres as $cierre) { - if ($cierre->isVigente()) { - $this->is_reservada = true; - } - } - } - } - } - return $this->is_reservada; - } - protected $linea; - public function linea() { - if ($this->linea == null) { - if ($this->tipo == 1) { - $this->linea = (int) \substr($this->descripcion, -2); - } - } - return $this->linea; - } -} -?> diff --git a/app_old/incoviba/modelos/src/old/Venta/UnidadBloqueada.php b/app_old/incoviba/modelos/src/old/Venta/UnidadBloqueada.php deleted file mode 100644 index dc05771..0000000 --- a/app_old/incoviba/modelos/src/old/Venta/UnidadBloqueada.php +++ /dev/null @@ -1,42 +0,0 @@ -belongsTo(ProyectoAgente::class, 'agente')->findOne(); - } - public function unidad() - { - return $this->belongsTo(Unidad::class, 'unidad')->findOne(); - } - public function estados() - { - return $this->hasMany(EstadoUnidadBloqueada::class, 'unidad')->orderByAsc('fecha')->findMany(); - } - public function estado() - { - return $this->hasMany(EstadoUnidadBloqueada::class, 'unidad')->orderByDesc('fecha')->findOne(); - } - public function new(\DateTime $fecha) - { - parent::save(); - $tipo = model(TipoEstadoUnidadBloqueada::class)->where('descripcion', 'bloqueada')->findOne(); - $data = [ - 'unidad' => $this->id, - 'fecha' => $fecha->format('Y-m-d'), - 'tipo' => $tipo->id - ]; - $estado = model(EstadoUnidadBloqueada::class)->create($data); - $estado->save(); - } -} diff --git a/app_old/incoviba/modelos/src/old/Venta/UnidadCierre.php b/app_old/incoviba/modelos/src/old/Venta/UnidadCierre.php deleted file mode 100644 index 4da11c8..0000000 --- a/app_old/incoviba/modelos/src/old/Venta/UnidadCierre.php +++ /dev/null @@ -1,22 +0,0 @@ -belongsTo(Cierre::class, 'cierre')->findOne(); - } - public function unidad() - { - return $this->belongsTo(Unidad::class, 'unidad')->findOne(); - } -} diff --git a/app_old/incoviba/modelos/src/old/Venta/ValorCierre.php b/app_old/incoviba/modelos/src/old/Venta/ValorCierre.php deleted file mode 100644 index e5fd823..0000000 --- a/app_old/incoviba/modelos/src/old/Venta/ValorCierre.php +++ /dev/null @@ -1,22 +0,0 @@ -belongsTo(Cierre::class, 'cierre')->findOne(); - } - public function tipo() - { - return $this->belongsTo(TipoValorCierre::class, 'tipo')->findOne(); - } -} diff --git a/app_old/incoviba/modelos/src/old/Venta/Venta.php b/app_old/incoviba/modelos/src/old/Venta/Venta.php deleted file mode 100644 index e36ebb9..0000000 --- a/app_old/incoviba/modelos/src/old/Venta/Venta.php +++ /dev/null @@ -1,514 +0,0 @@ -belongs_to(Propietario::class, 'propietario', 'rut')->findOne(); - } - public function propiedad() - { - return $this->belongs_to(Propiedad::class, 'propiedad')->findOne(); - } - public function bonoPie() - { - $bono = $this->belongs_to(BonoPie::class, 'bono_pie'); - if ($bono) { - return $bono->findOne(); - } - return null; - } - public function pie() - { - $pie = $this->belongs_to(Pie::class, 'pie'); - if ($pie) { - return $pie->findOne(); - } - return null; - } - public function entrega() - { - if ($this->entrega != '0') { - return $this->belongs_to(Entrega::class, 'entrega')->findOne(); - } - return null; - } - public function fecha() - { - return Carbon::parse($this->fecha, new \DateTimeZone(config('app.timezone'))); - } - public function proyecto() - { - return $this->propiedad()->unidad()->proyecto(); - } - public function unidad() - { - return $this->propiedad()->unidad(); - } - public function agente() - { - $agente = $this->belongs_to(ProyectoAgente::class, 'agente'); - if ($agente) { - return $agente->findOne(); - } - return null; - } - public function comision() - { - if (!isset($this->comision)) { - $pa = $this->agente(); - if ($pa and $pa->agente()->tipo == 19) { - $this->comision = $pa->comision / 100; - } else { - $this->comision = 0; - } - } - return $this->comision; - } - public function valorComision() - { - $bono_pie = $this->bonoPie(); - if ($this->bono_pie != 0) { - $bono_pie = $bono_pie->pago()->valor('ufs'); - } else { - $bono_pie = 0; - } - return ($this->valor_uf - $bono_pie) * $this->comision(); - } - protected $superficie_departamentos; - public function superficie() { - if ($this->superficie_departamentos == null) { - $this->superficie_departamentos = array_reduce($this->propiedad()->departamentos(), function($sum, $item) { - return $sum + $item->m2(); - }); - } - return $this->superficie_departamentos; - } - protected $valor_departamentos; - public function valorDepartamentos() { - if ($this->valor_departamentos == null) { - $fecha = $this->fecha(); - $this->valor_departamentos = array_reduce($this->propiedad()->departamentos(), function($sum, $item) use ($fecha) { - return $sum + (isset($item->precio($fecha)->valor)) ? $item->precio($fecha)->valor : 0; - }); - } - return $this->valor_departamentos; - } - protected $valor_unidades; - public function valorUnidades() { - if ($this->valor_unidades == null) { - $fecha = $this->fecha(); - $this->valor_unidades = array_reduce($this->propiedad()->unidades(), function($sum, $item) use ($fecha) { - return $sum + (isset($item->unidad()->precio($fecha)->valor)) ? $item->unidad()->precio($fecha)->valor : 0; - }); - } - return $this->valor_unidades; - } - public function valorEstacionamientos() - { - $estacionamientos = $this->propiedad()->estacionamientos(); - $sum = 0; - foreach ($estacionamientos as $estacionamiento) { - $sum += (isset($estacionamiento->precio($this->fecha())->valor)) ? $estacionamiento->precio($this->fecha())->valor : 0; - } - return $sum; - } - public function valorBodegas() - { - $bodegas = $this->propiedad()->bodegas(); - $sum = 0; - foreach ($bodegas as $bodega) { - $sum += (isset($bodega->precio($this->fecha())->valor)) ? $bodega->precio($this->fecha())->valor : 0; - } - return $sum; - } - public function valorEstacionamientosYBodegas() - { - return $this->valorEstacionamientos() + $this->valorBodegas(); - } - public function valorCorredora() - { - if ($this->valor_corredora == null) { - $bono_pie = $this->bonoPie(); - if ($this->bono_pie != 0) { - $bono_pie = $bono_pie->pago()->valor('ufs'); - } else { - $bono_pie = 0; - } - $promos = 0; - $ps = $this->promociones(); - if (count($ps) > 0) { - foreach ($ps as $promo) { - $promos += $promo->valor; - } - } - $this->valor_corredora = $this->valor_uf - $bono_pie - $promos; - } - return $this->valor_corredora; - } - public function valorFinal() - { - if (!isset($this->valor_neto)) { - $comision = $this->valorComision(); - $bono_pie = $this->bonoPie(); - if ($this->bono_pie != 0) { - $bono_pie = $bono_pie->pago()->valor('ufs'); - } else { - $bono_pie = 0; - } - $ests = $this->valorEstacionamientos(); - $bods = $this->valorBodegas(); - $promos = 0; - $ps = $this->promociones(); - if (count($ps) > 0) { - foreach ($ps as $promo) { - $promos += $promo->valor; - } - } - $this->valor_neto = $this->valor_uf - $bono_pie - $comision - $ests - $bods - $promos; - } - return $this->valor_neto; - } - public function uf_m2() - { - $m2 = array_reduce($this->propiedad()->departamentos(), function($sum, $item) { - return $sum + $item->m2(); - }); - return $this->valorFinal() / $m2; - } - public function escritura() - { - $escritura = $this->belongs_to(Escritura::class, 'escritura'); - if ($escritura) { - return $escritura->findOne(); - } - return null; - } - public function credito() - { - $credito = $this->belongs_to(Credito::class, 'credito'); - if ($credito) { - return $credito->findOne(); - } - return null; - } - public function comentarios() - { - return $this->has_many(Comentario::class, 'venta')->findMany(); - } - public function subsidio() - { - $subsidio = $this->belongs_to(Subsidio::class, 'subsidio'); - if ($subsidio) { - return $subsidio->findOne(); - } - return null; - } - - public function resciliacion() - { - $res = $this->belongs_to(Pago::class, 'resciliacion'); - if ($res) { - return $res->findOne(); - } - return null; - } - public function postventas() - { - $postventas = $this->has_many(\Incoviba\nuevo\Venta\Postventa::class, 'venta_id'); - if ($postventas) { - return $postventas->findMany(); - } - return null; - } - public function promociones() - { - if ($this->promociones == null) { - $pvs = model(PromocionVenta::class)->where('venta', $this->id)->findMany(); - $this->promociones = $pvs; - } - return $this->promociones; - } - public function devolucion() - { - $devolucion = $this->belongsTo(Pago::class, 'devolucion'); - if ($devolucion) { - return $devolucion->findOne(); - } - return null; - } - public function anticipo($tipo = 'ufs') - { - if (!isset($this->anticipo[$tipo])) { - $anticipo = 0; - if ($this->pie != 0) { - if ($tipo == 'ufs') { - $anticipo += $this->pieReajustado($tipo); - } else { - $anticipo += $this->pie()->valorPagado($tipo); - } - if ($this->pie()->reajuste != 0) { - $anticipo += $this->pie()->reajuste()->valor($tipo); - } - } - if ($this->escritura != 0) { - $anticipo += $this->escritura()->pago()->valor($tipo); - } - if ($this->saldo('ufs') > 0) { - $anticipo -= $this->saldo($tipo); - } - $this->anticipo[$tipo] = $anticipo; - } - - return $this->anticipo[$tipo]; - } - public function saldo($tipo = 'ufs') - { - if (!isset($this->saldo[$tipo])) { - if ($tipo == 'pesos') { - $this->saldo[$tipo] = $this->saldo() * $this->uf(); - return $this->saldo[$tipo]; - } - $saldo = $this->valor($tipo); - if ($this->bono_pie != 0) { - $saldo -= $this->bonoPie()->pago()->valor($tipo); - } - if ($this->pie != 0) { - $saldo -= $this->pie()->valorPagado($tipo); - if ($this->pie()->reajuste != 0) { - $saldo -= $this->pie()->reajuste()->valor($tipo); - } - } - if ($this->escritura != 0) { - $saldo -= $this->escritura()->pago()->valor($tipo); - } - if ($this->subsidio != 0) { - $saldo -= $this->subsidio()->total($tipo); - } - if ($this->credito != 0) { - $saldo -= $this->credito()->pago()->valor($tipo); - } - if ($this->devolucion) { - $saldo += $this->devolucion()->valor($tipo); - } - if ($this->resciliacion) { - $saldo += $this->resciliacion()->valor($tipo); - } - $this->saldo[$tipo] = -$saldo; - } - - return $this->saldo[$tipo]; - } - public function valor($tipo = 'ufs') - { - if ($tipo == 'ufs') { - return $this->valor_uf; - } - return $this->valor_uf * $this->uf(); - } - protected $valores; - public function valorPagado($tipo = 'ufs') - { - if ($this->valores == null or !isset($this->valores->pagado->ufs)) { - $valores = []; - if (isset($this->valores)) { - $valores = (array) $valores; - } - $valores['pagado'] = (object) ['ufs' => 0, 'pesos' => 0]; - if ($this->pie()) { - $valores['pagado']->ufs = $this->pie()->valorPagado(); - $valores['pagado']->pesos = $this->pie()->valorPagado('pesos'); - } - $this->valores = (object) $valores; - } - return $this->valores->pagado->{$tipo}; - } - public function valorAbonado($tipo = 'ufs') - { - if ($this->valores == null or !isset($this->valores->abonado->{$tipo})) { - $valores = []; - if (isset($this->valores)) { - $valores = (array) $valores; - } - $valores['abonado'] = (object) ['ufs' => 0, 'pesos' => 0]; - if ($this->pie()) { - $valores['abonado']->ufs = $this->pie()->valorAbonado(); - $valores['abonado']->pesos = $this->pie()->valorAbonado('pesos'); - } - $this->valores = (object) $valores; - } - return $this->valores->abonado->{$tipo}; - } - public function pagado($tipo = 'ufs') - { - if (!isset($this->pagado[$tipo])) { - if (abs($this->saldo()) / $this->valor() > 0.01 or $tipo == 'pesos') { - $total = 0; - $total += $this->anticipo($tipo); - - if ($this->subsidio != 0) { - $total += $this->subsidio()->total($tipo); - } - if ($this->credito != 0) { - $total += $this->credito()->pago()->valor($tipo); - } - if ($this->devolucion) { - $total -= $this->devolucion()->valor($tipo); - } - if ($this->resciliacion) { - $total -= $this->resciliacion()->valor($tipo); - } - - $this->pagado[$tipo] = $total; - } else { - $this->pagado[$tipo] = $this->valor($tipo); - } - } - return $this->pagado[$tipo]; - } - public function pieReajustado($tipo = 'ufs') - { - if (abs($this->saldo()) / $this->valor() > 0.01) { - return $this->pie()->valorPagado($tipo); - } - $valor = $this->pie()->valorPagado($tipo) - $this->saldo($tipo); - return $valor; - } - public function uf() - { - if ($this->uf == null) { - $f = $this->fecha(); - $uf = uf($f); - if ($uf == null) { - return 1; - } - $this->uf = $uf->uf->value; - } - - return $this->uf; - } - public function pagos($estado = 0) - { - $results = []; - if ($this->pie != 0) { - $results = array_merge($results, $this->pie()->pagos($estado)); - } - if ($this->escritura != 0 and $this->escritura()->pago() and $this->escritura()->pago()->estado()->estado == $estado) { - $results []= $this->escritura()->pago(); - } - if ($this->credito != 0 and $this->credito()->pago()->estado()->estado == $estado) { - $results []= $this->credito()->pago(); - } - if ($this->subsidio != 0 and $this->subsidio()->pago()->estado()->estado == $estado) { - $results []= $this->subsidio()->pago(); - } - - usort($results, function($a, $b) { - return $a->estado()->fecha()->diffInDays($b->estado()->fecha(), false); - }); - return $results; - } - public function new() - { - parent::save(); - $tipo = model(TipoEstadoVenta::class)->where('descripcion', 'vigente')->findOne(); - $data = [ - 'venta' => $this->id, - 'estado' => $tipo->id, - 'fecha' => $this->fecha - ]; - $estado = model(EstadoVenta::class)->create($data); - $estado->save(); - } - public function estados() - { - return $this->hasMany(EstadoVenta::class, 'venta')->findMany(); - } - public function estado($estado = null) - { - if ($estado == null) { - return model(EstadoVenta::class) - ->select('estado_venta.*') - ->rawJoin('JOIN (SELECT venta, MAX(id) AS id FROM estado_venta GROUP BY venta)', ['estado_venta.id', '=', 'e0.id'], 'e0') - ->where('estado_venta.venta', $this->id) - ->findOne(); - } - return model(EstadoVenta::class) - ->select('estado_venta.*') - ->join('tipo_estado_venta', ['tipo_estado_venta.id', '=', 'estado_venta.estado']) - ->where('estado_venta.venta', $this->id) - ->where('tipo_estado_venta.descripcion', $estado) - ->orderByDesc('estado_venta.fecha') - ->findOne(); - } - public function firmar(Carbon $fecha) - { - $estado = $this->estado(); - if ($estado->tipo()->descripcion == 'firmado por inmobiliaria') { - return true; - } - $tipo = model(TipoEstadoVenta::class)->where('descripcion', 'firmado por inmobiliaria')->findOne(); - $data = [ - 'venta' => $this->id, - 'estado' => $tipo->id, - 'fecha' => $fecha->format('Y-m-d') - ]; - $estado = model(EstadoVenta::class)->create($data)->save(); - return true; - } - public function archivar(Carbon $fecha) - { - $estado = $this->estado(); - if ($estado->estado()->tipo()->descripcion == 'archivado') { - return true; - } - $tipo = model(TipoEstadoVenta::class)->where('descripcion', 'archivado')->findOne(); - $data = [ - 'venta' => $this->id, - 'estado' => $tipo->id, - 'fecha' => $fecha->format('Y-m-d') - ]; - $estado = model(EstadoVenta::class)->create($data)->save(); - return true; - } -} diff --git a/app_old/incoviba/modelos/src/old/Venta/Venta.php.save b/app_old/incoviba/modelos/src/old/Venta/Venta.php.save deleted file mode 100644 index d28df00..0000000 --- a/app_old/incoviba/modelos/src/old/Venta/Venta.php.save +++ /dev/null @@ -1,517 +0,0 @@ -belongs_to(Propietario::class, 'propietario', 'rut')->findOne(); - } - public function propiedad() - { - return $this->belongs_to(Propiedad::class, 'propiedad')->findOne(); - } - public function bonoPie() - { - $bono = $this->belongs_to(BonoPie::class, 'bono_pie'); - if ($bono) { - return $bono->findOne(); - } - return null; - } - public function pie() - { - $pie = $this->belongs_to(Pie::class, 'pie'); - if ($pie) { - return $pie->findOne(); - } - return null; - } - public function entrega() - { - if ($this->entrega != '0') { - return $this->belongs_to(Entrega::class, 'entrega')->findOne(); - } - return null; - } - public function fecha() - { - return Carbon::parse($this->fecha, new \DateTimeZone(config('app.timezone'))); - } - public function proyecto() - { - return $this->propiedad()->unidad()->proyecto(); - } - public function unidad() - { - return $this->propiedad()->unidad(); - } - public function agente() - { - $agente = $this->belongs_to(ProyectoAgente::class, 'agente'); - if ($agente) { - return $agente->findOne(); - } - return null; - } - public function comision() - { - if (!isset($this->comision)) { - $pa = $this->agente(); - if ($pa and $pa->agente()->tipo == 19) { - $this->comision = $pa->comision / 100; - } else { - $this->comision = 0; - } - } - return $this->comision; - } - public function valorComision() - { - $bono_pie = $this->bonoPie(); - if ($this->bono_pie != 0) { - $bono_pie = $bono_pie->pago()->valor('ufs'); - } else { - $bono_pie = 0; - } - return ($this->valor_uf - $bono_pie) * $this->comision(); - } - protected $superficie_departamentos; - public function superficie() { - if ($this->superficie_departamentos == null) { - $this->superficie_departamentos = array_reduce($this->propiedad()->departamentos(), function($sum, $item) { - return $sum + $item->m2(); - }); - } - return $this->superficie_departamentos; - } - protected $valor_departamentos; - public function valorDepartamentos() { - if ($this->valor_departamentos == null) { - $fecha = $this->fecha(); - $this->valor_departamentos = array_reduce($this->propiedad()->departamentos(), function($sum, $item) use ($fecha) { - return $sum + $item->precio($fecha)->valor; - }); - } - return $this->valor_departamentos; - } - protected $valor_unidades; - public function valorUnidades() { - if ($this->valor_unidades == null) { - $fecha = $this->fecha(); - $this->valor_unidades = array_reduce($this->propiedad()->unidades(), function($sum, $item) use ($fecha) { - return $sum + $item->unidad()->precio($fecha)->valor; - }); - } - return $this->valor_unidades; - } - public function valorEstacionamientos() - { - $estacionamientos = $this->propiedad()->estacionamientos(); - $sum = 0; - foreach ($estacionamientos as $estacionamiento) { - $sum += $estacionamiento->precio($this->fecha())->valor; - } - return $sum; - } - public function valorBodegas() - { - $bodegas = $this->propiedad()->bodegas(); - $sum = 0; - foreach ($bodegas as $bodega) { - $sum += $bodega->precio($this->fecha())->valor; - } - return $sum; - } - public function valorEstacionamientosYBodegas() - { - return $this->valorEstacionamientos() + $this->valorBodegas(); - } - public function valorCorredora() - { - if ($this->valor_corredora == null) { - $bono_pie = $this->bonoPie(); - if ($this->bono_pie != 0) { - $bono_pie = $bono_pie->pago()->valor('ufs'); - } else { - $bono_pie = 0; - } - $promos = 0; - $ps = $this->promociones(); - if (count($ps) > 0) { - foreach ($ps as $promo) { - $promos += $promo->valor; - } - } - $this->valor_corredora = $this->valor_uf - $bono_pie - $promos; - } - return $this->valor_corredora; - } - public function valorFinal() - { - if (!isset($this->valor_neto)) { - $comision = $this->valorComision(); - $bono_pie = $this->bonoPie(); - if ($this->bono_pie != 0) { - $bono_pie = $bono_pie->pago()->valor('ufs'); - } else { - $bono_pie = 0; - } - $ests = $this->valorEstacionamientos(); - $bods = $this->valorBodegas(); - $promos = 0; - $ps = $this->promociones(); - if (count($ps) > 0) { - foreach ($ps as $promo) { - $promos += $promo->valor; - } - } - $this->valor_neto = $this->valor_uf - $bono_pie - $comision - $ests - $bods - $promos; - } - return $this->valor_neto; - } - public function uf_m2() - { - $m2 = array_reduce($this->propiedad()->departamentos(), function($sum, $item) { - return $sum + $item->m2(); - }); - return $this->valorFinal() / $m2; - } - public function escritura() - { - $escritura = $this->belongs_to(Escritura::class, 'escritura'); - if ($escritura) { - return $escritura->findOne(); - } - return null; - } - public function credito() - { - $credito = $this->belongs_to(Credito::class, 'credito'); - if ($credito) { - return $credito->findOne(); - } - return null; - } - public function comentarios() - { - return $this->has_many(Comentario::class, 'venta')->findMany(); - } - public function subsidio() - { - $subsidio = $this->belongs_to(Subsidio::class, 'subsidio'); - if ($subsidio) { - return $subsidio->findOne(); - } - return null; - } - - public function resciliacion() - { - $res = $this->belongs_to(Pago::class, 'resciliacion'); - if ($res) { - return $res->findOne(); - } - return null; - } - public function postventas() - { - $postventas = $this->has_many(\Incoviba\nuevo\Venta\Postventa::class, 'venta_id'); - if ($postventas) { - return $postventas->findMany(); - } - return null; - } - public function promociones() - { - if ($this->promociones == null) { - $pvs = model(PromocionVenta::class)->where('venta', $this->id)->findMany(); - $this->promociones = $pvs; - } - return $this->promociones; - } - public function devolucion() - { - $devolucion = $this->belongsTo(Pago::class, 'devolucion'); - if ($devolucion) { - return $devolucion->findOne(); - } - return null; - } - public function anticipo($tipo = 'ufs') - { - if (!isset($this->anticipo[$tipo])) { - $anticipo = 0; - if ($this->pie != 0) { - if ($tipo == 'ufs') { - $anticipo += $this->pieReajustado($tipo); - } else { - $anticipo += $this->pie()->valorPagado($tipo); - } - if ($this->pie()->reajuste != 0) { - $anticipo += $this->pie()->reajuste()->valor($tipo); - } - } - if ($this->escritura != 0) { - $anticipo += $this->escritura()->pago()->valor($tipo); - } - if ($this->saldo('ufs') > 0) { - $anticipo -= $this->saldo($tipo); - } - $this->anticipo[$tipo] = $anticipo; - } - - return $this->anticipo[$tipo]; - } - public function saldo($tipo = 'ufs') - { - if (!isset($this->saldo[$tipo])) { - if ($tipo == 'pesos') { - $this->saldo[$tipo] = $this->saldo() * $this->uf(); - return $this->saldo[$tipo]; - } - $saldo = $this->valor($tipo); - if ($this->bono_pie != 0) { - $saldo -= $this->bonoPie()->pago()->valor($tipo); - } - if ($this->pie != 0) { - $saldo -= $this->pie()->valorPagado($tipo); - if ($this->pie()->reajuste != 0) { - $saldo -= $this->pie()->reajuste()->valor($tipo); - } - } - if ($this->escritura != 0) { - $saldo -= $this->escritura()->pago()->valor($tipo); - } - if ($this->subsidio != 0) { - $saldo -= $this->subsidio()->total($tipo); - } - if ($this->credito != 0) { - $saldo -= $this->credito()->pago()->valor($tipo); - } - if ($this->devolucion) { - $saldo += $this->devolucion()->valor($tipo); - } - if ($this->resciliacion) { - $saldo += $this->resciliacion()->valor($tipo); - } - $this->saldo[$tipo] = -$saldo; - } - - return $this->saldo[$tipo]; - } - public function valor($tipo = 'ufs') - { - if ($tipo == 'ufs') { - return $this->valor_uf; - } - return $this->valor_uf * $this->uf(); - } - protected $valores; - public function valorPagado($tipo = 'ufs') - { - if ($this->valores == null or !isset($this->valores->pagado->ufs)) { - $valores = []; - if (isset($this->valores)) { - $valores = (array) $valores; - } - $valores['pagado'] = (object) ['ufs' => 0, 'pesos' => 0]; - if ($this->pie()) { - $valores['pagado']->ufs = $this->pie()->valorPagado(); - $valores['pagado']->pesos = $this->pie()->valorPagado('pesos'); - } - $this->valores = (object) $valores; - } - return $this->valores->pagado->{$tipo}; - } - public function valorAbonado($tipo = 'ufs') - { - if ($this->valores == null or !isset($this->valores->abonado->{$tipo})) { - $valores = []; - if (isset($this->valores)) { - $valores = (array) $valores; - } - $valores['abonado'] = (object) ['ufs' => 0, 'pesos' => 0]; - if ($this->pie()) { - $valores['abonado']->ufs = $this->pie()->valorAbonado(); - $valores['abonado']->pesos = $this->pie()->valorAbonado('pesos'); - } - $this->valores = (object) $valores; - } - return $this->valores->abonado->{$tipo}; - } - public function pagado($tipo = 'ufs') - { - if (!isset($this->pagado[$tipo])) { - if (abs($this->saldo()) / $this->valor() > 0.01 or $tipo == 'pesos') { - $total = 0; - $total += $this->anticipo($tipo); - - if ($this->subsidio != 0) { - $total += $this->subsidio()->total($tipo); - } - if ($this->credito != 0) { - $total += $this->credito()->pago()->valor($tipo); - } - if ($this->devolucion) { - $total -= $this->devolucion()->valor($tipo); - } - if ($this->resciliacion) { - $total -= $this->resciliacion()->valor($tipo); - } - - $this->pagado[$tipo] = $total; - } else { - $this->pagado[$tipo] = $this->valor($tipo); - } - } - return $this->pagado[$tipo]; - } - public function pieReajustado($tipo = 'ufs') - { - if (abs($this->saldo()) / $this->valor() > 0.01) { - return $this->pie()->valorPagado($tipo); - } - $valor = $this->pie()->valorPagado($tipo) - $this->saldo($tipo); - return $valor; - } - public function uf() - { - if ($this->uf == null) { - $f = $this->fecha(); - $uf = uf($f); - if ($uf == null) { - return 1; - } - -!d($uf); - $this->uf = $uf->uf->value; - } - - return $this->uf; - } - public function pagos($estado = 0) - { - $results = []; - if ($this->pie != 0) { - $results = array_merge($results, $this->pie()->pagos($estado)); - } - if ($this->escritura != 0 and $this->escritura()->pago() and $this->escritura()->pago()->estado()->estado == $estado) { - $results []= $this->escritura()->pago(); - } - if ($this->credito != 0 and $this->credito()->pago()->estado()->estado == $estado) { - $results []= $this->credito()->pago(); - } - if ($this->subsidio != 0 and $this->subsidio()->pago()->estado()->estado == $estado) { - $results []= $this->subsidio()->pago(); - } - - usort($results, function($a, $b) { - return $a->estado()->fecha()->diffInDays($b->estado()->fecha(), false); - }); - return $results; - } - public function new() - { - parent::save(); - $tipo = model(TipoEstadoVenta::class)->where('descripcion', 'vigente')->findOne(); - $data = [ - 'venta' => $this->id, - 'estado' => $tipo->id, - 'fecha' => $this->fecha - ]; - $estado = model(EstadoVenta::class)->create($data); - $estado->save(); - } - public function estados() - { - return $this->hasMany(EstadoVenta::class, 'venta')->findMany(); - } - public function estado($estado = null) - { - if ($estado == null) { - return model(EstadoVenta::class) - ->select('estado_venta.*') - ->rawJoin('JOIN (SELECT venta, MAX(id) AS id FROM estado_venta GROUP BY venta)', ['estado_venta.id', '=', 'e0.id'], 'e0') - ->where('estado_venta.venta', $this->id) - ->findOne(); - } - return model(EstadoVenta::class) - ->select('estado_venta.*') - ->join('tipo_estado_venta', ['tipo_estado_venta.id', '=', 'estado_venta.estado']) - ->where('estado_venta.venta', $this->id) - ->where('tipo_estado_venta.descripcion', $estado) - ->orderByDesc('estado_venta.fecha') - ->findOne(); - } - public function firmar(Carbon $fecha) - { - $estado = $this->estado(); - if ($estado->tipo()->descripcion == 'firmado por inmobiliaria') { - return true; - } - $tipo = model(TipoEstadoVenta::class)->where('descripcion', 'firmado por inmobiliaria')->findOne(); - $data = [ - 'venta' => $this->id, - 'estado' => $tipo->id, - 'fecha' => $fecha->format('Y-m-d') - ]; - $estado = model(EstadoVenta::class)->create($data)->save(); - return true; - } - public function archivar(Carbon $fecha) - { - $estado = $this->estado(); - if ($estado->estado()->tipo()->descripcion == 'archivado') { - return true; - } - $tipo = model(TipoEstadoVenta::class)->where('descripcion', 'archivado')->findOne(); - $data = [ - 'venta' => $this->id, - 'estado' => $tipo->id, - 'fecha' => $fecha->format('Y-m-d') - ]; - $estado = model(EstadoVenta::class)->create($data)->save(); - return true; - } -} -?> diff --git a/app_old/package.json b/app_old/package.json deleted file mode 100644 index 4c0b879..0000000 --- a/app_old/package.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "name": "incoviba_transition", - "version": "1.0.0", - "description": "", - "main": "index.js", - "directories": { - "test": "tests" - }, - "scripts": { - "test": "mocha", - "dev": "npm run development", - "development": "run-p dev:css dev:js fonts", - "prod": "npm run production", - "production": "npm run build:css && npm run build:js", - "dev:css": "lessc resources/less/app.less public/css/app.css", - "build:css": "lessc -x resources/less/app.less public/css/app.css", - "dev:js": "webpack --mode development", - "dev:js2": "browserify resources/js/app.js -o public/js/app.js", - "build:js": "webpack --mode production", - "fonts": "fontify", - "watch": "run-p watch:css watch:js", - "watch:css": "chokidar --verbose resources/less/*.less -c \"npm run watching:css\"", - "watch:js": "chokidar --verbose resources/js/*.js -c \"npm run watching:js\"", - "watching:css": "run-p dev:css notify:css", - "watching:js": "run-p dev:js notify:js", - "notify:css": "notify -t \"Less\" -m \"Done with less\" -s -i https://upload.wikimedia.org/wikipedia/commons/a/a5/Twemoji_26a0.svg", - "notify:js": "notify -t \"Js\" -m \"Done with js\" -s -i https://upload.wikimedia.org/wikipedia/commons/a/a5/Twemoji_26a0.svg" - }, - "author": "", - "license": "ISC", - "devDependencies": { - "@babel/core": "^7.0.0-beta.51", - "@babel/preset-env": "^7.0.0-beta.51", - "ajv": "^5.5.2", - "bootstrap": "^3.3.7", - "bootstrap-3-typeahead": "^4.0.2", - "browserify": "^14.5.0", - "chart.js": "^2.7.2", - "chartist": "^0.11.0", - "chartjs-plugin-annotation": "^0.5.7", - "chartjs-plugin-barchart-background": "^1.3.0", - "chokidar-cli": "^1.2.0", - "font-awesome": "^4.7.0", - "fontify": "0.0.2", - "jquery": "^3.3.1", - "jquery-ui": "^1.12.1", - "jquery-ui-bootstrap": "^1.0.0", - "jquery.rut": "^1.1.2", - "less": "^3.0.4", - "mocha": "^5.2.0", - "node-notifier-cli": "^1.1.2", - "npm-run-all": "^4.1.3", - "webpack": "^4.14.0", - "webpack-cli": "^3.0.8", - "zxcvbn": "^4.4.2" - }, - "dependencies": {} -} diff --git a/app_old/public/Pipfile b/app_old/public/Pipfile deleted file mode 100644 index b5846df..0000000 --- a/app_old/public/Pipfile +++ /dev/null @@ -1,11 +0,0 @@ -[[source]] -name = "pypi" -url = "https://pypi.org/simple" -verify_ssl = true - -[dev-packages] - -[packages] - -[requires] -python_version = "3.8" diff --git a/app_old/public/api/.htaccess b/app_old/public/api/.htaccess deleted file mode 100644 index 66ef8f6..0000000 --- a/app_old/public/api/.htaccess +++ /dev/null @@ -1,4 +0,0 @@ -RewriteEngine On -RewriteCond %{REQUEST_FILENAME} !-f -RewriteCond %{REQUEST_FILENAME} !-d -RewriteRule ^ index.php [QSA,L] diff --git a/app_old/public/api/index.php b/app_old/public/api/index.php deleted file mode 100644 index cec7741..0000000 --- a/app_old/public/api/index.php +++ /dev/null @@ -1,8 +0,0 @@ -run(); diff --git a/app_old/public/api/keys b/app_old/public/api/keys deleted file mode 100644 index 7660873..0000000 --- a/app_old/public/api/keys +++ /dev/null @@ -1 +0,0 @@ -[1] diff --git a/app_old/public/css/app.css b/app_old/public/css/app.css deleted file mode 100644 index ab445ec..0000000 --- a/app_old/public/css/app.css +++ /dev/null @@ -1,14 +0,0 @@ -/*! - * Bootstrap v3.3.7 (http://getbootstrap.com) - * Copyright 2011-2016 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - *//*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}h1{font-size:2em;margin:0.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace, monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height:auto}input[type="search"]{-webkit-appearance:textfield;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:bold}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */@media print{*,*:before,*:after{background:transparent !important;color:#000 !important;box-shadow:none !important;text-shadow:none !important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="#"]:after,a[href^="javascript:"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100% !important}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}.navbar{display:none}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000 !important}.label{border:1px solid #000}.table{border-collapse:collapse !important}.table td,.table th{background-color:#fff !important}.table-bordered th,.table-bordered td{border:1px solid #ddd !important}}@font-face{font-family:'Glyphicons Halflings';src:url('../fonts/glyphicons-halflings-regular.eot');src:url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),url('../fonts/glyphicons-halflings-regular.woff2') format('woff2'),url('../fonts/glyphicons-halflings-regular.woff') format('woff'),url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'),url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:normal;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\002a"}.glyphicon-plus:before{content:"\002b"}.glyphicon-euro:before,.glyphicon-eur:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.glyphicon-cd:before{content:"\e201"}.glyphicon-save-file:before{content:"\e202"}.glyphicon-open-file:before{content:"\e203"}.glyphicon-level-up:before{content:"\e204"}.glyphicon-copy:before{content:"\e205"}.glyphicon-paste:before{content:"\e206"}.glyphicon-alert:before{content:"\e209"}.glyphicon-equalizer:before{content:"\e210"}.glyphicon-king:before{content:"\e211"}.glyphicon-queen:before{content:"\e212"}.glyphicon-pawn:before{content:"\e213"}.glyphicon-bishop:before{content:"\e214"}.glyphicon-knight:before{content:"\e215"}.glyphicon-baby-formula:before{content:"\e216"}.glyphicon-tent:before{content:"\26fa"}.glyphicon-blackboard:before{content:"\e218"}.glyphicon-bed:before{content:"\e219"}.glyphicon-apple:before{content:"\f8ff"}.glyphicon-erase:before{content:"\e221"}.glyphicon-hourglass:before{content:"\231b"}.glyphicon-lamp:before{content:"\e223"}.glyphicon-duplicate:before{content:"\e224"}.glyphicon-piggy-bank:before{content:"\e225"}.glyphicon-scissors:before{content:"\e226"}.glyphicon-bitcoin:before{content:"\e227"}.glyphicon-btc:before{content:"\e227"}.glyphicon-xbt:before{content:"\e227"}.glyphicon-yen:before{content:"\00a5"}.glyphicon-jpy:before{content:"\00a5"}.glyphicon-ruble:before{content:"\20bd"}.glyphicon-rub:before{content:"\20bd"}.glyphicon-scale:before{content:"\e230"}.glyphicon-ice-lolly:before{content:"\e231"}.glyphicon-ice-lolly-tasted:before{content:"\e232"}.glyphicon-education:before{content:"\e233"}.glyphicon-option-horizontal:before{content:"\e234"}.glyphicon-option-vertical:before{content:"\e235"}.glyphicon-menu-hamburger:before{content:"\e236"}.glyphicon-modal-window:before{content:"\e237"}.glyphicon-oil:before{content:"\e238"}.glyphicon-grain:before{content:"\e239"}.glyphicon-sunglasses:before{content:"\e240"}.glyphicon-text-size:before{content:"\e241"}.glyphicon-text-color:before{content:"\e242"}.glyphicon-text-background:before{content:"\e243"}.glyphicon-object-align-top:before{content:"\e244"}.glyphicon-object-align-bottom:before{content:"\e245"}.glyphicon-object-align-horizontal:before{content:"\e246"}.glyphicon-object-align-left:before{content:"\e247"}.glyphicon-object-align-vertical:before{content:"\e248"}.glyphicon-object-align-right:before{content:"\e249"}.glyphicon-triangle-right:before{content:"\e250"}.glyphicon-triangle-left:before{content:"\e251"}.glyphicon-triangle-bottom:before{content:"\e252"}.glyphicon-triangle-top:before{content:"\e253"}.glyphicon-console:before{content:"\e254"}.glyphicon-superscript:before{content:"\e255"}.glyphicon-subscript:before{content:"\e256"}.glyphicon-menu-left:before{content:"\e257"}.glyphicon-menu-right:before{content:"\e258"}.glyphicon-menu-down:before{content:"\e259"}.glyphicon-menu-up:before{content:"\e260"}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:10px;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333;background-color:#fff}input,button,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#337ab7;text-decoration:none}a:hover,a:focus{color:#23527c;text-decoration:underline}a:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.img-responsive,.thumbnail>img,.thumbnail a>img,.carousel-inner>.item>img,.carousel-inner>.item>a>img{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out;display:inline-block;max-width:100%;height:auto}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}[role="button"]{cursor:pointer}h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small,.h1 small,.h2 small,.h3 small,.h4 small,.h5 small,.h6 small,h1 .small,h2 .small,h3 .small,h4 .small,h5 .small,h6 .small,.h1 .small,.h2 .small,.h3 .small,.h4 .small,.h5 .small,.h6 .small{font-weight:normal;line-height:1;color:#777}h1,.h1,h2,.h2,h3,.h3{margin-top:20px;margin-bottom:10px}h1 small,.h1 small,h2 small,.h2 small,h3 small,.h3 small,h1 .small,.h1 .small,h2 .small,.h2 .small,h3 .small,.h3 .small{font-size:65%}h4,.h4,h5,.h5,h6,.h6{margin-top:10px;margin-bottom:10px}h4 small,.h4 small,h5 small,.h5 small,h6 small,.h6 small,h4 .small,.h4 .small,h5 .small,.h5 .small,h6 .small,.h6 .small{font-size:75%}h1,.h1{font-size:36px}h2,.h2{font-size:30px}h3,.h3{font-size:24px}h4,.h4{font-size:18px}h5,.h5{font-size:14px}h6,.h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:300;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}}small,.small{font-size:85%}mark,.mark{background-color:#fcf8e3;padding:.2em}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-lowercase{text-transform:lowercase}.text-uppercase{text-transform:uppercase}.text-capitalize{text-transform:capitalize}.text-muted{color:#777}.text-primary{color:#337ab7}a.text-primary:hover,a.text-primary:focus{color:#286090}.text-success{color:#3c763d}a.text-success:hover,a.text-success:focus{color:#2b542c}.text-info{color:#31708f}a.text-info:hover,a.text-info:focus{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:hover,a.text-warning:focus{color:#66512c}.text-danger{color:#a94442}a.text-danger:hover,a.text-danger:focus{color:#843534}.bg-primary{color:#fff;background-color:#337ab7}a.bg-primary:hover,a.bg-primary:focus{background-color:#286090}.bg-success{background-color:#dff0d8}a.bg-success:hover,a.bg-success:focus{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:hover,a.bg-info:focus{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:hover,a.bg-warning:focus{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:hover,a.bg-danger:focus{background-color:#e4b9b9}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ul,ol{margin-top:0;margin-bottom:10px}ul ul,ol ul,ul ol,ol ol{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;list-style:none;margin-left:-5px}.list-inline>li{display:inline-block;padding-left:5px;padding-right:5px}dl{margin-top:0;margin-bottom:20px}dt,dd{line-height:1.42857143}dt{font-weight:bold}dd{margin-left:0}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;clear:left;text-align:right;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}}abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #777}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}blockquote p:last-child,blockquote ul:last-child,blockquote ol:last-child{margin-bottom:0}blockquote footer,blockquote small,blockquote .small{display:block;font-size:80%;line-height:1.42857143;color:#777}blockquote footer:before,blockquote small:before,blockquote .small:before{content:'\2014 \00A0'}.blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;border-right:5px solid #eee;border-left:0;text-align:right}.blockquote-reverse footer:before,blockquote.pull-right footer:before,.blockquote-reverse small:before,blockquote.pull-right small:before,.blockquote-reverse .small:before,blockquote.pull-right .small:before{content:''}.blockquote-reverse footer:after,blockquote.pull-right footer:after,.blockquote-reverse small:after,blockquote.pull-right small:after,.blockquote-reverse .small:after,blockquote.pull-right .small:after{content:'\00A0 \2014'}address{margin-bottom:20px;font-style:normal;line-height:1.42857143}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;background-color:#f9f2f4;border-radius:4px}kbd{padding:2px 4px;font-size:90%;color:#fff;background-color:#333;border-radius:3px;box-shadow:inset 0 -1px 0 rgba(0,0,0,0.25)}kbd kbd{padding:0;font-size:100%;font-weight:bold;box-shadow:none}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857143;word-break:break-all;word-wrap:break-word;color:#333;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{margin-right:auto;margin-left:auto;padding-left:15px;padding-right:15px}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{margin-right:auto;margin-left:auto;padding-left:15px;padding-right:15px}.row{margin-left:-15px;margin-right:-15px}.col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12{position:relative;min-height:1px;padding-left:15px;padding-right:15px}.col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:auto}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:auto}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0%}@media (min-width:768px){.col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-0{right:auto}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666667%}.col-sm-push-10{left:83.33333333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666667%}.col-sm-push-7{left:58.33333333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666667%}.col-sm-push-4{left:33.33333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.66666667%}.col-sm-push-1{left:8.33333333%}.col-sm-push-0{left:auto}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-0{margin-left:0%}}@media (min-width:992px){.col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666667%}.col-md-pull-10{right:83.33333333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666667%}.col-md-pull-7{right:58.33333333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666667%}.col-md-pull-4{right:33.33333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.66666667%}.col-md-pull-1{right:8.33333333%}.col-md-pull-0{right:auto}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666667%}.col-md-push-10{left:83.33333333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666667%}.col-md-push-7{left:58.33333333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666667%}.col-md-push-4{left:33.33333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.66666667%}.col-md-push-1{left:8.33333333%}.col-md-push-0{left:auto}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-0{margin-left:0%}}@media (min-width:1200px){.col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-0{right:auto}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666667%}.col-lg-push-10{left:83.33333333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666667%}.col-lg-push-7{left:58.33333333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666667%}.col-lg-push-4{left:33.33333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.66666667%}.col-lg-push-1{left:8.33333333%}.col-lg-push-0{left:auto}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-0{margin-left:0%}}table{background-color:transparent}caption{padding-top:8px;padding-bottom:8px;color:#777;text-align:left}th{text-align:left}.table{width:100%;max-width:100%;margin-bottom:20px}.table>thead>tr>th,.table>tbody>tr>th,.table>tfoot>tr>th,.table>thead>tr>td,.table>tbody>tr>td,.table>tfoot>tr>td{padding:8px;line-height:1.42857143;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>th,.table>caption+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>td,.table>thead:first-child>tr:first-child>td{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>thead>tr>th,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>tbody>tr>td,.table-condensed>tfoot>tr>td{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>tbody>tr>td,.table-bordered>tfoot>tr>td{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>thead>tr>td{border-bottom-width:2px}.table-striped>tbody>tr:nth-of-type(odd){background-color:#f9f9f9}.table-hover>tbody>tr:hover{background-color:#f5f5f5}table col[class*="col-"]{position:static;float:none;display:table-column}table td[class*="col-"],table th[class*="col-"]{position:static;float:none;display:table-cell}.table>thead>tr>td.active,.table>tbody>tr>td.active,.table>tfoot>tr>td.active,.table>thead>tr>th.active,.table>tbody>tr>th.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>tbody>tr.active>td,.table>tfoot>tr.active>td,.table>thead>tr.active>th,.table>tbody>tr.active>th,.table>tfoot>tr.active>th{background-color:#f5f5f5}.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover,.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr:hover>.active,.table-hover>tbody>tr.active:hover>th{background-color:#e8e8e8}.table>thead>tr>td.success,.table>tbody>tr>td.success,.table>tfoot>tr>td.success,.table>thead>tr>th.success,.table>tbody>tr>th.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>tbody>tr.success>td,.table>tfoot>tr.success>td,.table>thead>tr.success>th,.table>tbody>tr.success>th,.table>tfoot>tr.success>th{background-color:#dff0d8}.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover,.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr:hover>.success,.table-hover>tbody>tr.success:hover>th{background-color:#d0e9c6}.table>thead>tr>td.info,.table>tbody>tr>td.info,.table>tfoot>tr>td.info,.table>thead>tr>th.info,.table>tbody>tr>th.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>tbody>tr.info>td,.table>tfoot>tr.info>td,.table>thead>tr.info>th,.table>tbody>tr.info>th,.table>tfoot>tr.info>th{background-color:#d9edf7}.table-hover>tbody>tr>td.info:hover,.table-hover>tbody>tr>th.info:hover,.table-hover>tbody>tr.info:hover>td,.table-hover>tbody>tr:hover>.info,.table-hover>tbody>tr.info:hover>th{background-color:#c4e3f3}.table>thead>tr>td.warning,.table>tbody>tr>td.warning,.table>tfoot>tr>td.warning,.table>thead>tr>th.warning,.table>tbody>tr>th.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>tbody>tr.warning>td,.table>tfoot>tr.warning>td,.table>thead>tr.warning>th,.table>tbody>tr.warning>th,.table>tfoot>tr.warning>th{background-color:#fcf8e3}.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover,.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr:hover>.warning,.table-hover>tbody>tr.warning:hover>th{background-color:#faf2cc}.table>thead>tr>td.danger,.table>tbody>tr>td.danger,.table>tfoot>tr>td.danger,.table>thead>tr>th.danger,.table>tbody>tr>th.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>tbody>tr.danger>td,.table>tfoot>tr.danger>td,.table>thead>tr.danger>th,.table>tbody>tr.danger>th,.table>tfoot>tr.danger>th{background-color:#f2dede}.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover,.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr:hover>.danger,.table-hover>tbody>tr.danger:hover>th{background-color:#ebcccc}.table-responsive{overflow-x:auto;min-height:0.01%}@media screen and (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>thead>tr>th,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tfoot>tr>td{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>thead>tr>th:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0}.table-responsive>.table-bordered>thead>tr>th:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>th,.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>td{border-bottom:0}}fieldset{padding:0;margin:0;border:0;min-width:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;max-width:100%;margin-bottom:5px;font-weight:bold}input[type="search"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type="radio"],input[type="checkbox"]{margin:4px 0 0;margin-top:1px \9;line-height:normal}input[type="file"]{display:block}input[type="range"]{display:block;width:100%}select[multiple],select[size]{height:auto}input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}output{display:block;padding-top:7px;font-size:14px;line-height:1.42857143;color:#555}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.42857143;color:#555;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-webkit-transition:border-color ease-in-out .15s, box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s, box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s, box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6)}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control::-ms-expand{border:0;background-color:transparent}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{background-color:#eee;opacity:1}.form-control[disabled],fieldset[disabled] .form-control{cursor:not-allowed}textarea.form-control{height:auto}input[type="search"]{-webkit-appearance:none}@media screen and (-webkit-min-device-pixel-ratio:0){input[type="date"].form-control,input[type="time"].form-control,input[type="datetime-local"].form-control,input[type="month"].form-control{line-height:34px}input[type="date"].input-sm,input[type="time"].input-sm,input[type="datetime-local"].input-sm,input[type="month"].input-sm,.input-group-sm input[type="date"],.input-group-sm input[type="time"],.input-group-sm input[type="datetime-local"],.input-group-sm input[type="month"]{line-height:30px}input[type="date"].input-lg,input[type="time"].input-lg,input[type="datetime-local"].input-lg,input[type="month"].input-lg,.input-group-lg input[type="date"],.input-group-lg input[type="time"],.input-group-lg input[type="datetime-local"],.input-group-lg input[type="month"]{line-height:46px}}.form-group{margin-bottom:15px}.radio,.checkbox{position:relative;display:block;margin-top:10px;margin-bottom:10px}.radio label,.checkbox label{min-height:20px;padding-left:20px;margin-bottom:0;font-weight:normal;cursor:pointer}.radio input[type="radio"],.radio-inline input[type="radio"],.checkbox input[type="checkbox"],.checkbox-inline input[type="checkbox"]{position:absolute;margin-left:-20px;margin-top:4px \9}.radio+.radio,.checkbox+.checkbox{margin-top:-5px}.radio-inline,.checkbox-inline{position:relative;display:inline-block;padding-left:20px;margin-bottom:0;vertical-align:middle;font-weight:normal;cursor:pointer}.radio-inline+.radio-inline,.checkbox-inline+.checkbox-inline{margin-top:0;margin-left:10px}input[type="radio"][disabled],input[type="checkbox"][disabled],input[type="radio"].disabled,input[type="checkbox"].disabled,fieldset[disabled] input[type="radio"],fieldset[disabled] input[type="checkbox"]{cursor:not-allowed}.radio-inline.disabled,.checkbox-inline.disabled,fieldset[disabled] .radio-inline,fieldset[disabled] .checkbox-inline{cursor:not-allowed}.radio.disabled label,.checkbox.disabled label,fieldset[disabled] .radio label,fieldset[disabled] .checkbox label{cursor:not-allowed}.form-control-static{padding-top:7px;padding-bottom:7px;margin-bottom:0;min-height:34px}.form-control-static.input-lg,.form-control-static.input-sm{padding-left:0;padding-right:0}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}textarea.input-sm,select[multiple].input-sm{height:auto}.form-group-sm .form-control{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.form-group-sm select.form-control{height:30px;line-height:30px}.form-group-sm textarea.form-control,.form-group-sm select[multiple].form-control{height:auto}.form-group-sm .form-control-static{height:30px;min-height:32px;padding:6px 10px;font-size:12px;line-height:1.5}.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-lg{height:46px;line-height:46px}textarea.input-lg,select[multiple].input-lg{height:auto}.form-group-lg .form-control{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.form-group-lg select.form-control{height:46px;line-height:46px}.form-group-lg textarea.form-control,.form-group-lg select[multiple].form-control{height:auto}.form-group-lg .form-control-static{height:46px;min-height:38px;padding:11px 16px;font-size:18px;line-height:1.3333333}.has-feedback{position:relative}.has-feedback .form-control{padding-right:42.5px}.form-control-feedback{position:absolute;top:0;right:0;z-index:2;display:block;width:34px;height:34px;line-height:34px;text-align:center;pointer-events:none}.input-lg+.form-control-feedback,.input-group-lg+.form-control-feedback,.form-group-lg .form-control+.form-control-feedback{width:46px;height:46px;line-height:46px}.input-sm+.form-control-feedback,.input-group-sm+.form-control-feedback,.form-group-sm .form-control+.form-control-feedback{width:30px;height:30px;line-height:30px}.has-success .help-block,.has-success .control-label,.has-success .radio,.has-success .checkbox,.has-success .radio-inline,.has-success .checkbox-inline,.has-success.radio label,.has-success.checkbox label,.has-success.radio-inline label,.has-success.checkbox-inline label{color:#3c763d}.has-success .form-control{border-color:#3c763d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;border-color:#3c763d;background-color:#dff0d8}.has-success .form-control-feedback{color:#3c763d}.has-warning .help-block,.has-warning .control-label,.has-warning .radio,.has-warning .checkbox,.has-warning .radio-inline,.has-warning .checkbox-inline,.has-warning.radio label,.has-warning.checkbox label,.has-warning.radio-inline label,.has-warning.checkbox-inline label{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.has-warning .form-control:focus{border-color:#66512c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #c0a16b;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;border-color:#8a6d3b;background-color:#fcf8e3}.has-warning .form-control-feedback{color:#8a6d3b}.has-error .help-block,.has-error .control-label,.has-error .radio,.has-error .checkbox,.has-error .radio-inline,.has-error .checkbox-inline,.has-error.radio label,.has-error.checkbox label,.has-error.radio-inline label,.has-error.checkbox-inline label{color:#a94442}.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;border-color:#a94442;background-color:#f2dede}.has-error .form-control-feedback{color:#a94442}.has-feedback label~.form-control-feedback{top:25px}.has-feedback label.sr-only~.form-control-feedback{top:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .form-control-static{display:inline-block}.form-inline .input-group{display:inline-table;vertical-align:middle}.form-inline .input-group .input-group-addon,.form-inline .input-group .input-group-btn,.form-inline .input-group .form-control{width:auto}.form-inline .input-group>.form-control{width:100%}.form-inline .control-label{margin-bottom:0;vertical-align:middle}.form-inline .radio,.form-inline .checkbox{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.form-inline .radio label,.form-inline .checkbox label{padding-left:0}.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{position:relative;margin-left:0}.form-inline .has-feedback .form-control-feedback{top:0}}.form-horizontal .radio,.form-horizontal .checkbox,.form-horizontal .radio-inline,.form-horizontal .checkbox-inline{margin-top:0;margin-bottom:0;padding-top:7px}.form-horizontal .radio,.form-horizontal .checkbox{min-height:27px}.form-horizontal .form-group{margin-left:-15px;margin-right:-15px}@media (min-width:768px){.form-horizontal .control-label{text-align:right;margin-bottom:0;padding-top:7px}}.form-horizontal .has-feedback .form-control-feedback{right:15px}@media (min-width:768px){.form-horizontal .form-group-lg .control-label{padding-top:11px;font-size:18px}}@media (min-width:768px){.form-horizontal .form-group-sm .control-label{padding-top:6px;font-size:12px}}.btn{display:inline-block;margin-bottom:0;font-weight:normal;text-align:center;vertical-align:middle;touch-action:manipulation;cursor:pointer;background-image:none;border:1px solid transparent;white-space:nowrap;padding:6px 12px;font-size:14px;line-height:1.42857143;border-radius:4px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.btn:focus,.btn:active:focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn.active.focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn:hover,.btn:focus,.btn.focus{color:#333;text-decoration:none}.btn:active,.btn.active{outline:0;background-image:none;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{cursor:not-allowed;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none}a.btn.disabled,fieldset[disabled] a.btn{pointer-events:none}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default:focus,.btn-default.focus{color:#333;background-color:#e6e6e6;border-color:#8c8c8c}.btn-default:hover{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default:active,.btn-default.active,.open>.dropdown-toggle.btn-default{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default:active:hover,.btn-default.active:hover,.open>.dropdown-toggle.btn-default:hover,.btn-default:active:focus,.btn-default.active:focus,.open>.dropdown-toggle.btn-default:focus,.btn-default:active.focus,.btn-default.active.focus,.open>.dropdown-toggle.btn-default.focus{color:#333;background-color:#d4d4d4;border-color:#8c8c8c}.btn-default:active,.btn-default.active,.open>.dropdown-toggle.btn-default{background-image:none}.btn-default.disabled:hover,.btn-default[disabled]:hover,fieldset[disabled] .btn-default:hover,.btn-default.disabled:focus,.btn-default[disabled]:focus,fieldset[disabled] .btn-default:focus,.btn-default.disabled.focus,.btn-default[disabled].focus,fieldset[disabled] .btn-default.focus{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#333}.btn-primary{color:#fff;background-color:#337ab7;border-color:#2e6da4}.btn-primary:focus,.btn-primary.focus{color:#fff;background-color:#286090;border-color:#122b40}.btn-primary:hover{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary:active,.btn-primary.active,.open>.dropdown-toggle.btn-primary{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary:active:hover,.btn-primary.active:hover,.open>.dropdown-toggle.btn-primary:hover,.btn-primary:active:focus,.btn-primary.active:focus,.open>.dropdown-toggle.btn-primary:focus,.btn-primary:active.focus,.btn-primary.active.focus,.open>.dropdown-toggle.btn-primary.focus{color:#fff;background-color:#204d74;border-color:#122b40}.btn-primary:active,.btn-primary.active,.open>.dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled:hover,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary:hover,.btn-primary.disabled:focus,.btn-primary[disabled]:focus,fieldset[disabled] .btn-primary:focus,.btn-primary.disabled.focus,.btn-primary[disabled].focus,fieldset[disabled] .btn-primary.focus{background-color:#337ab7;border-color:#2e6da4}.btn-primary .badge{color:#337ab7;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success:focus,.btn-success.focus{color:#fff;background-color:#449d44;border-color:#255625}.btn-success:hover{color:#fff;background-color:#449d44;border-color:#398439}.btn-success:active,.btn-success.active,.open>.dropdown-toggle.btn-success{color:#fff;background-color:#449d44;border-color:#398439}.btn-success:active:hover,.btn-success.active:hover,.open>.dropdown-toggle.btn-success:hover,.btn-success:active:focus,.btn-success.active:focus,.open>.dropdown-toggle.btn-success:focus,.btn-success:active.focus,.btn-success.active.focus,.open>.dropdown-toggle.btn-success.focus{color:#fff;background-color:#398439;border-color:#255625}.btn-success:active,.btn-success.active,.open>.dropdown-toggle.btn-success{background-image:none}.btn-success.disabled:hover,.btn-success[disabled]:hover,fieldset[disabled] .btn-success:hover,.btn-success.disabled:focus,.btn-success[disabled]:focus,fieldset[disabled] .btn-success:focus,.btn-success.disabled.focus,.btn-success[disabled].focus,fieldset[disabled] .btn-success.focus{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info:focus,.btn-info.focus{color:#fff;background-color:#31b0d5;border-color:#1b6d85}.btn-info:hover{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info:active,.btn-info.active,.open>.dropdown-toggle.btn-info{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info:active:hover,.btn-info.active:hover,.open>.dropdown-toggle.btn-info:hover,.btn-info:active:focus,.btn-info.active:focus,.open>.dropdown-toggle.btn-info:focus,.btn-info:active.focus,.btn-info.active.focus,.open>.dropdown-toggle.btn-info.focus{color:#fff;background-color:#269abc;border-color:#1b6d85}.btn-info:active,.btn-info.active,.open>.dropdown-toggle.btn-info{background-image:none}.btn-info.disabled:hover,.btn-info[disabled]:hover,fieldset[disabled] .btn-info:hover,.btn-info.disabled:focus,.btn-info[disabled]:focus,fieldset[disabled] .btn-info:focus,.btn-info.disabled.focus,.btn-info[disabled].focus,fieldset[disabled] .btn-info.focus{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning:focus,.btn-warning.focus{color:#fff;background-color:#ec971f;border-color:#985f0d}.btn-warning:hover{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning:active,.btn-warning.active,.open>.dropdown-toggle.btn-warning{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning:active:hover,.btn-warning.active:hover,.open>.dropdown-toggle.btn-warning:hover,.btn-warning:active:focus,.btn-warning.active:focus,.open>.dropdown-toggle.btn-warning:focus,.btn-warning:active.focus,.btn-warning.active.focus,.open>.dropdown-toggle.btn-warning.focus{color:#fff;background-color:#d58512;border-color:#985f0d}.btn-warning:active,.btn-warning.active,.open>.dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled:hover,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning:hover,.btn-warning.disabled:focus,.btn-warning[disabled]:focus,fieldset[disabled] .btn-warning:focus,.btn-warning.disabled.focus,.btn-warning[disabled].focus,fieldset[disabled] .btn-warning.focus{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger:focus,.btn-danger.focus{color:#fff;background-color:#c9302c;border-color:#761c19}.btn-danger:hover{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger:active,.btn-danger.active,.open>.dropdown-toggle.btn-danger{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger:active:hover,.btn-danger.active:hover,.open>.dropdown-toggle.btn-danger:hover,.btn-danger:active:focus,.btn-danger.active:focus,.open>.dropdown-toggle.btn-danger:focus,.btn-danger:active.focus,.btn-danger.active.focus,.open>.dropdown-toggle.btn-danger.focus{color:#fff;background-color:#ac2925;border-color:#761c19}.btn-danger:active,.btn-danger.active,.open>.dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled:hover,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger:hover,.btn-danger.disabled:focus,.btn-danger[disabled]:focus,fieldset[disabled] .btn-danger:focus,.btn-danger.disabled.focus,.btn-danger[disabled].focus,fieldset[disabled] .btn-danger.focus{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-link{color:#337ab7;font-weight:normal;border-radius:0}.btn-link,.btn-link:active,.btn-link.active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:hover,.btn-link:focus,.btn-link:active{border-color:transparent}.btn-link:hover,.btn-link:focus{color:#23527c;text-decoration:underline;background-color:transparent}.btn-link[disabled]:hover,fieldset[disabled] .btn-link:hover,.btn-link[disabled]:focus,fieldset[disabled] .btn-link:focus{color:#777;text-decoration:none}.btn-lg,.btn-group-lg>.btn{padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.btn-sm,.btn-group-sm>.btn{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-xs,.btn-group-xs>.btn{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:5px}input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}tr.collapse.in{display:table-row}tbody.collapse.in{display:table-row-group}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition-property:height, visibility;transition-property:height, visibility;-webkit-transition-duration:.35s;transition-duration:.35s;-webkit-transition-timing-function:ease;transition-timing-function:ease}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px dashed;border-top:4px solid \9;border-right:4px solid transparent;border-left:4px solid transparent}.dropup,.dropdown{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;font-size:14px;text-align:left;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,0.175);box-shadow:0 6px 12px rgba(0,0,0,0.175);background-clip:padding-box}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:1.42857143;color:#333;white-space:nowrap}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{text-decoration:none;color:#262626;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{color:#fff;text-decoration:none;outline:0;background-color:#337ab7}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{color:#777}.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{text-decoration:none;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);cursor:not-allowed}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-menu-right{left:auto;right:0}.dropdown-menu-left{left:0;right:auto}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.42857143;color:#777;white-space:nowrap}.dropdown-backdrop{position:fixed;left:0;right:0;bottom:0;top:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px dashed;border-bottom:4px solid \9;content:""}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:2px}@media (min-width:768px){.navbar-right .dropdown-menu{left:auto;right:0}.navbar-right .dropdown-menu-left{left:0;right:auto}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group>.btn,.btn-group-vertical>.btn{position:relative;float:left}.btn-group>.btn:hover,.btn-group-vertical>.btn:hover,.btn-group>.btn:focus,.btn-group-vertical>.btn:focus,.btn-group>.btn:active,.btn-group-vertical>.btn:active,.btn-group>.btn.active,.btn-group-vertical>.btn.active{z-index:2}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar .btn,.btn-toolbar .btn-group,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-bottom-right-radius:0;border-top-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-bottom-left-radius:0;border-top-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-top-right-radius:0}.btn-group>.btn-group:last-child:not(:first-child)>.btn:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-left:8px;padding-right:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-left:12px;padding-right:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-right-radius:4px;border-top-left-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-right-radius:0;border-top-left-radius:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-right-radius:0;border-top-left-radius:0}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group{float:none;display:table-cell;width:1%}.btn-group-justified>.btn-group .btn{width:100%}.btn-group-justified>.btn-group .dropdown-menu{left:auto}[data-toggle="buttons"]>.btn input[type="radio"],[data-toggle="buttons"]>.btn-group>.btn input[type="radio"],[data-toggle="buttons"]>.btn input[type="checkbox"],[data-toggle="buttons"]>.btn-group>.btn input[type="checkbox"]{position:absolute;clip:rect(0, 0, 0, 0);pointer-events:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*="col-"]{float:none;padding-left:0;padding-right:0}.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.input-group .form-control:focus{z-index:3}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn,select[multiple].input-group-lg>.form-control,select[multiple].input-group-lg>.input-group-addon,select[multiple].input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn,select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.input-group-addon,select[multiple].input-group-sm>.input-group-btn>.btn{height:auto}.input-group-addon,.input-group-btn,.input-group .form-control{display:table-cell}.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child),.input-group .form-control:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:normal;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type="radio"],.input-group-addon input[type="checkbox"]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle),.input-group-btn:last-child>.btn-group:not(:last-child)>.btn{border-bottom-right-radius:0;border-top-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:first-child>.btn-group:not(:first-child)>.btn{border-bottom-left-radius:0;border-top-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;font-size:0;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:hover,.input-group-btn>.btn:focus,.input-group-btn>.btn:active{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{z-index:2;margin-left:-1px}.nav{margin-bottom:0;padding-left:0;list-style:none}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:hover,.nav>li>a:focus{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#777}.nav>li.disabled>a:hover,.nav>li.disabled>a:focus{color:#777;text-decoration:none;background-color:transparent;cursor:not-allowed}.nav .open>a,.nav .open>a:hover,.nav .open>a:focus{background-color:#eee;border-color:#337ab7}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.42857143;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{color:#555;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent;cursor:default}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{text-align:center;margin-bottom:5px}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{border:1px solid #ddd}@media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:hover,.nav-pills>li.active>a:focus{color:#fff;background-color:#337ab7}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{text-align:center;margin-bottom:5px}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:hover,.nav-tabs-justified>.active>a:focus{border:1px solid #ddd}@media (min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:hover,.nav-tabs-justified>.active>a:focus{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-right-radius:0;border-top-left-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}@media (min-width:768px){.navbar{border-radius:4px}}@media (min-width:768px){.navbar-header{float:left}}.navbar-collapse{overflow-x:visible;padding-right:15px;padding-left:15px;border-top:1px solid transparent;box-shadow:inset 0 1px 0 rgba(255,255,255,0.1);-webkit-overflow-scrolling:touch}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar-collapse{width:auto;border-top:0;box-shadow:none}.navbar-collapse.collapse{display:block !important;height:auto !important;padding-bottom:0;overflow:visible !important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse,.navbar-fixed-bottom .navbar-collapse{padding-left:0;padding-right:0}}.navbar-fixed-top .navbar-collapse,.navbar-fixed-bottom .navbar-collapse{max-height:340px}@media (max-device-width:480px) and (orientation:landscape){.navbar-fixed-top .navbar-collapse,.navbar-fixed-bottom .navbar-collapse{max-height:200px}}.container>.navbar-header,.container-fluid>.navbar-header,.container>.navbar-collapse,.container-fluid>.navbar-collapse{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.container>.navbar-header,.container-fluid>.navbar-header,.container>.navbar-collapse,.container-fluid>.navbar-collapse{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030}@media (min-width:768px){.navbar-fixed-top,.navbar-fixed-bottom{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;padding:15px 15px;font-size:18px;line-height:20px;height:50px}.navbar-brand:hover,.navbar-brand:focus{text-decoration:none}.navbar-brand>img{display:block}@media (min-width:768px){.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;margin-right:15px;padding:9px 10px;margin-top:8px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:0}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;box-shadow:none}.navbar-nav .open .dropdown-menu>li>a,.navbar-nav .open .dropdown-menu .dropdown-header{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:hover,.navbar-nav .open .dropdown-menu>li>a:focus{background-image:none}}@media (min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}}.navbar-form{margin-left:-15px;margin-right:-15px;padding:10px 15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);margin-top:8px;margin-bottom:8px}@media (min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .form-control-static{display:inline-block}.navbar-form .input-group{display:inline-table;vertical-align:middle}.navbar-form .input-group .input-group-addon,.navbar-form .input-group .input-group-btn,.navbar-form .input-group .form-control{width:auto}.navbar-form .input-group>.form-control{width:100%}.navbar-form .control-label{margin-bottom:0;vertical-align:middle}.navbar-form .radio,.navbar-form .checkbox{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.navbar-form .radio label,.navbar-form .checkbox label{padding-left:0}.navbar-form .radio input[type="radio"],.navbar-form .checkbox input[type="checkbox"]{position:relative;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}.navbar-form .form-group:last-child{margin-bottom:0}}@media (min-width:768px){.navbar-form{width:auto;border:0;margin-left:0;margin-right:0;padding-top:0;padding-bottom:0;-webkit-box-shadow:none;box-shadow:none}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-right-radius:0;border-top-left-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{margin-bottom:0;border-top-right-radius:4px;border-top-left-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media (min-width:768px){.navbar-text{float:left;margin-left:15px;margin-right:15px}}@media (min-width:768px){.navbar-left{float:left !important}.navbar-right{float:right !important;margin-right:-15px}.navbar-right~.navbar-right{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:hover,.navbar-default .navbar-brand:focus{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:hover,.navbar-default .navbar-nav>li>a:focus{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:hover,.navbar-default .navbar-nav>.active>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:hover,.navbar-default .navbar-nav>.disabled>a:focus{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:hover,.navbar-default .navbar-toggle:focus{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:hover,.navbar-default .navbar-nav>.open>a:focus{background-color:#e7e7e7;color:#555}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-default .btn-link{color:#777}.navbar-default .btn-link:hover,.navbar-default .btn-link:focus{color:#333}.navbar-default .btn-link[disabled]:hover,fieldset[disabled] .navbar-default .btn-link:hover,.navbar-default .btn-link[disabled]:focus,fieldset[disabled] .navbar-default .btn-link:focus{color:#ccc}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#9d9d9d}.navbar-inverse .navbar-brand:hover,.navbar-inverse .navbar-brand:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a:hover,.navbar-inverse .navbar-nav>li>a:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:hover,.navbar-inverse .navbar-nav>.active>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:hover,.navbar-inverse .navbar-nav>.disabled>a:focus{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:hover,.navbar-inverse .navbar-toggle:focus{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:hover,.navbar-inverse .navbar-nav>.open>a:focus{background-color:#080808;color:#fff}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#9d9d9d}.navbar-inverse .navbar-link:hover{color:#fff}.navbar-inverse .btn-link{color:#9d9d9d}.navbar-inverse .btn-link:hover,.navbar-inverse .btn-link:focus{color:#fff}.navbar-inverse .btn-link[disabled]:hover,fieldset[disabled] .navbar-inverse .btn-link:hover,.navbar-inverse .btn-link[disabled]:focus,fieldset[disabled] .navbar-inverse .btn-link:focus{color:#444}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{content:"/\00a0";padding:0 5px;color:#ccc}.breadcrumb>.active{color:#777}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;line-height:1.42857143;text-decoration:none;color:#337ab7;background-color:#fff;border:1px solid #ddd;margin-left:-1px}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-bottom-left-radius:4px;border-top-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-bottom-right-radius:4px;border-top-right-radius:4px}.pagination>li>a:hover,.pagination>li>span:hover,.pagination>li>a:focus,.pagination>li>span:focus{z-index:2;color:#23527c;background-color:#eee;border-color:#ddd}.pagination>.active>a,.pagination>.active>span,.pagination>.active>a:hover,.pagination>.active>span:hover,.pagination>.active>a:focus,.pagination>.active>span:focus{z-index:3;color:#fff;background-color:#337ab7;border-color:#337ab7;cursor:default}.pagination>.disabled>span,.pagination>.disabled>span:hover,.pagination>.disabled>span:focus,.pagination>.disabled>a,.pagination>.disabled>a:hover,.pagination>.disabled>a:focus{color:#777;background-color:#fff;border-color:#ddd;cursor:not-allowed}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px;line-height:1.3333333}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-bottom-left-radius:6px;border-top-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-bottom-right-radius:6px;border-top-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px;line-height:1.5}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-bottom-left-radius:3px;border-top-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-bottom-right-radius:3px;border-top-right-radius:3px}.pager{padding-left:0;margin:20px 0;list-style:none;text-align:center}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:hover,.pager li>a:focus{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:hover,.pager .disabled>a:focus,.pager .disabled>span{color:#777;background-color:#fff;cursor:not-allowed}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:bold;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}a.label:hover,a.label:focus{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.btn .label{position:relative;top:-1px}.label-default{background-color:#777}.label-default[href]:hover,.label-default[href]:focus{background-color:#5e5e5e}.label-primary{background-color:#337ab7}.label-primary[href]:hover,.label-primary[href]:focus{background-color:#286090}.label-success{background-color:#5cb85c}.label-success[href]:hover,.label-success[href]:focus{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:hover,.label-info[href]:focus{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:hover,.label-warning[href]:focus{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:hover,.label-danger[href]:focus{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:bold;color:#fff;line-height:1;vertical-align:middle;white-space:nowrap;text-align:center;background-color:#777;border-radius:10px}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.btn-xs .badge,.btn-group-xs>.btn .badge{top:0;padding:1px 5px}a.badge:hover,a.badge:focus{color:#fff;text-decoration:none;cursor:pointer}.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#337ab7;background-color:#fff}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding-top:30px;padding-bottom:30px;margin-bottom:30px;color:inherit;background-color:#eee}.jumbotron h1,.jumbotron .h1{color:inherit}.jumbotron p{margin-bottom:15px;font-size:21px;font-weight:200}.jumbotron>hr{border-top-color:#d5d5d5}.container .jumbotron,.container-fluid .jumbotron{border-radius:6px;padding-left:15px;padding-right:15px}.jumbotron .container{max-width:100%}@media screen and (min-width:768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container .jumbotron,.container-fluid .jumbotron{padding-left:60px;padding-right:60px}.jumbotron h1,.jumbotron .h1{font-size:63px}}.thumbnail{display:block;padding:4px;margin-bottom:20px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:border .2s ease-in-out;-o-transition:border .2s ease-in-out;transition:border .2s ease-in-out}.thumbnail>img,.thumbnail a>img{margin-left:auto;margin-right:auto}a.thumbnail:hover,a.thumbnail:focus,a.thumbnail.active{border-color:#337ab7}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:bold}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable,.alert-dismissible{padding-right:35px}.alert-dismissable .close,.alert-dismissible .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{background-color:#dff0d8;border-color:#d6e9c6;color:#3c763d}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{background-color:#d9edf7;border-color:#bce8f1;color:#31708f}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{background-color:#fcf8e3;border-color:#faebcc;color:#8a6d3b}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{background-color:#f2dede;border-color:#ebccd1;color:#a94442}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{overflow:hidden;height:20px;margin-bottom:20px;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1)}.progress-bar{float:left;width:0%;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#337ab7;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-webkit-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress-striped .progress-bar,.progress-bar-striped{background-image:-webkit-linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-size:40px 40px}.progress.active .progress-bar,.progress-bar.active{-webkit-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:-webkit-linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent)}.media{margin-top:15px}.media:first-child{margin-top:0}.media,.media-body{zoom:1;overflow:hidden}.media-body{width:10000px}.media-object{display:block}.media-object.img-thumbnail{max-width:none}.media-right,.media>.pull-right{padding-left:10px}.media-left,.media>.pull-left{padding-right:10px}.media-left,.media-right,.media-body{display:table-cell;vertical-align:top}.media-middle{vertical-align:middle}.media-bottom{vertical-align:bottom}.media-heading{margin-top:0;margin-bottom:5px}.media-list{padding-left:0;list-style:none}.list-group{margin-bottom:20px;padding-left:0}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-right-radius:4px;border-top-left-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}a.list-group-item,button.list-group-item{color:#555}a.list-group-item .list-group-item-heading,button.list-group-item .list-group-item-heading{color:#333}a.list-group-item:hover,button.list-group-item:hover,a.list-group-item:focus,button.list-group-item:focus{text-decoration:none;color:#555;background-color:#f5f5f5}button.list-group-item{width:100%;text-align:left}.list-group-item.disabled,.list-group-item.disabled:hover,.list-group-item.disabled:focus{background-color:#eee;color:#777;cursor:not-allowed}.list-group-item.disabled .list-group-item-heading,.list-group-item.disabled:hover .list-group-item-heading,.list-group-item.disabled:focus .list-group-item-heading{color:inherit}.list-group-item.disabled .list-group-item-text,.list-group-item.disabled:hover .list-group-item-text,.list-group-item.disabled:focus .list-group-item-text{color:#777}.list-group-item.active,.list-group-item.active:hover,.list-group-item.active:focus{z-index:2;color:#fff;background-color:#337ab7;border-color:#337ab7}.list-group-item.active .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading,.list-group-item.active .list-group-item-heading>small,.list-group-item.active:hover .list-group-item-heading>small,.list-group-item.active:focus .list-group-item-heading>small,.list-group-item.active .list-group-item-heading>.small,.list-group-item.active:hover .list-group-item-heading>.small,.list-group-item.active:focus .list-group-item-heading>.small{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:hover .list-group-item-text,.list-group-item.active:focus .list-group-item-text{color:#c7ddef}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success,button.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading,button.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:hover,button.list-group-item-success:hover,a.list-group-item-success:focus,button.list-group-item-success:focus{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,button.list-group-item-success.active,a.list-group-item-success.active:hover,button.list-group-item-success.active:hover,a.list-group-item-success.active:focus,button.list-group-item-success.active:focus{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info,button.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading,button.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:hover,button.list-group-item-info:hover,a.list-group-item-info:focus,button.list-group-item-info:focus{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,button.list-group-item-info.active,a.list-group-item-info.active:hover,button.list-group-item-info.active:hover,a.list-group-item-info.active:focus,button.list-group-item-info.active:focus{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning,button.list-group-item-warning{color:#8a6d3b}a.list-group-item-warning .list-group-item-heading,button.list-group-item-warning .list-group-item-heading{color:inherit}a.list-group-item-warning:hover,button.list-group-item-warning:hover,a.list-group-item-warning:focus,button.list-group-item-warning:focus{color:#8a6d3b;background-color:#faf2cc}a.list-group-item-warning.active,button.list-group-item-warning.active,a.list-group-item-warning.active:hover,button.list-group-item-warning.active:hover,a.list-group-item-warning.active:focus,button.list-group-item-warning.active:focus{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger,button.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading,button.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:hover,button.list-group-item-danger:hover,a.list-group-item-danger:focus,button.list-group-item-danger:focus{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,button.list-group-item-danger.active,a.list-group-item-danger.active:hover,button.list-group-item-danger.active:hover,a.list-group-item-danger.active:focus,button.list-group-item-danger.active:focus{color:#fff;background-color:#a94442;border-color:#a94442}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,0.05);box-shadow:0 1px 1px rgba(0,0,0,0.05)}.panel-body{padding:15px}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-right-radius:3px;border-top-left-radius:3px}.panel-heading>.dropdown .dropdown-toggle{color:inherit}.panel-title{margin-top:0;margin-bottom:0;font-size:16px;color:inherit}.panel-title>a,.panel-title>small,.panel-title>.small,.panel-title>small>a,.panel-title>.small>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.list-group,.panel>.panel-collapse>.list-group{margin-bottom:0}.panel>.list-group .list-group-item,.panel>.panel-collapse>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel>.list-group:first-child .list-group-item:first-child,.panel>.panel-collapse>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-right-radius:3px;border-top-left-radius:3px}.panel>.list-group:last-child .list-group-item:last-child,.panel>.panel-collapse>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.panel-heading+.panel-collapse>.list-group .list-group-item:first-child{border-top-right-radius:0;border-top-left-radius:0}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.list-group+.panel-footer{border-top-width:0}.panel>.table,.panel>.table-responsive>.table,.panel>.panel-collapse>.table{margin-bottom:0}.panel>.table caption,.panel>.table-responsive>.table caption,.panel>.panel-collapse>.table caption{padding-left:15px;padding-right:15px}.panel>.table:first-child,.panel>.table-responsive:first-child>.table:first-child{border-top-right-radius:3px;border-top-left-radius:3px}.panel>.table:first-child>thead:first-child>tr:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child{border-top-left-radius:3px}.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child{border-top-right-radius:3px}.panel>.table:last-child,.panel>.table-responsive:last-child>.table:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table:last-child>tbody:last-child>tr:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child{border-bottom-left-radius:3px;border-bottom-right-radius:3px}.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive,.panel>.table+.panel-body,.panel>.table-responsive+.panel-body{border-top:1px solid #ddd}.panel>.table>tbody:first-child>tr:first-child th,.panel>.table>tbody:first-child>tr:first-child td{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0}.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0}.panel>.table-bordered>thead>tr:first-child>td,.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,.panel>.table-bordered>tbody>tr:first-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,.panel>.table-bordered>thead>tr:first-child>th,.panel>.table-responsive>.table-bordered>thead>tr:first-child>th,.panel>.table-bordered>tbody>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th{border-bottom:0}.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}.panel>.table-responsive{border:0;margin-bottom:0}.panel-group{margin-bottom:20px}.panel-group .panel{margin-bottom:0;border-radius:4px}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse>.panel-body,.panel-group .panel-heading+.panel-collapse>.list-group{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}.panel-default>.panel-heading .badge{color:#f5f5f5;background-color:#333}.panel-default>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#337ab7}.panel-primary>.panel-heading{color:#fff;background-color:#337ab7;border-color:#337ab7}.panel-primary>.panel-heading+.panel-collapse>.panel-body{border-top-color:#337ab7}.panel-primary>.panel-heading .badge{color:#337ab7;background-color:#fff}.panel-primary>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#337ab7}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse>.panel-body{border-top-color:#d6e9c6}.panel-success>.panel-heading .badge{color:#dff0d8;background-color:#3c763d}.panel-success>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#d6e9c6}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse>.panel-body{border-top-color:#bce8f1}.panel-info>.panel-heading .badge{color:#d9edf7;background-color:#31708f}.panel-info>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#bce8f1}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse>.panel-body{border-top-color:#faebcc}.panel-warning>.panel-heading .badge{color:#fcf8e3;background-color:#8a6d3b}.panel-warning>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ebccd1}.panel-danger>.panel-heading .badge{color:#f2dede;background-color:#a94442}.panel-danger>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ebccd1}.embed-responsive{position:relative;display:block;height:0;padding:0;overflow:hidden}.embed-responsive .embed-responsive-item,.embed-responsive iframe,.embed-responsive embed,.embed-responsive object,.embed-responsive video{position:absolute;top:0;left:0;bottom:0;height:100%;width:100%;border:0}.embed-responsive-16by9{padding-bottom:56.25%}.embed-responsive-4by3{padding-bottom:75%}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,0.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:bold;line-height:1;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}.close:hover,.close:focus{color:#000;text-decoration:none;cursor:pointer;opacity:.5;filter:alpha(opacity=50)}button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none}.modal-open{overflow:hidden}.modal{display:none;overflow:hidden;position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;-webkit-overflow-scrolling:touch;outline:0}.modal.fade .modal-dialog{-webkit-transform:translate(0, -25%);-ms-transform:translate(0, -25%);-o-transform:translate(0, -25%);transform:translate(0, -25%);-webkit-transition:-webkit-transform 0.3s ease-out;-moz-transition:-moz-transform 0.3s ease-out;-o-transition:-o-transform 0.3s ease-out;transition:transform 0.3s ease-out}.modal.in .modal-dialog{-webkit-transform:translate(0, 0);-ms-transform:translate(0, 0);-o-transform:translate(0, 0);transform:translate(0, 0)}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal-dialog{position:relative;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;border:1px solid #999;border:1px solid rgba(0,0,0,0.2);border-radius:6px;-webkit-box-shadow:0 3px 9px rgba(0,0,0,0.5);box-shadow:0 3px 9px rgba(0,0,0,0.5);background-clip:padding-box;outline:0}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{opacity:0;filter:alpha(opacity=0)}.modal-backdrop.in{opacity:.5;filter:alpha(opacity=50)}.modal-header{padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.42857143}.modal-body{position:relative;padding:15px}.modal-footer{padding:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer .btn+.btn{margin-left:5px;margin-bottom:0}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,0.5);box-shadow:0 5px 15px rgba(0,0,0,0.5)}.modal-sm{width:300px}}@media (min-width:992px){.modal-lg{width:900px}}.tooltip{position:absolute;z-index:1070;display:block;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-style:normal;font-weight:normal;letter-spacing:normal;line-break:auto;line-height:1.42857143;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;white-space:normal;word-break:normal;word-spacing:normal;word-wrap:normal;font-size:12px;opacity:0;filter:alpha(opacity=0)}.tooltip.in{opacity:.9;filter:alpha(opacity=90)}.tooltip.top{margin-top:-3px;padding:5px 0}.tooltip.right{margin-left:3px;padding:0 5px}.tooltip.bottom{margin-top:3px;padding:5px 0}.tooltip.left{margin-left:-3px;padding:0 5px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;background-color:#000;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-left .tooltip-arrow{bottom:0;right:5px;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-right .tooltip-arrow{bottom:0;left:5px;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-left .tooltip-arrow{top:0;right:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-right .tooltip-arrow{top:0;left:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.popover{position:absolute;top:0;left:0;z-index:1060;display:none;max-width:276px;padding:1px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-style:normal;font-weight:normal;letter-spacing:normal;line-break:auto;line-height:1.42857143;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;white-space:normal;word-break:normal;word-spacing:normal;word-wrap:normal;font-size:14px;background-color:#fff;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2)}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{margin:0;padding:8px 14px;font-size:14px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover>.arrow,.popover>.arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover>.arrow{border-width:11px}.popover>.arrow:after{border-width:10px;content:""}.popover.top>.arrow{left:50%;margin-left:-11px;border-bottom-width:0;border-top-color:#999;border-top-color:rgba(0,0,0,0.25);bottom:-11px}.popover.top>.arrow:after{content:" ";bottom:1px;margin-left:-10px;border-bottom-width:0;border-top-color:#fff}.popover.right>.arrow{top:50%;left:-11px;margin-top:-11px;border-left-width:0;border-right-color:#999;border-right-color:rgba(0,0,0,0.25)}.popover.right>.arrow:after{content:" ";left:1px;bottom:-10px;border-left-width:0;border-right-color:#fff}.popover.bottom>.arrow{left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,0.25);top:-11px}.popover.bottom>.arrow:after{content:" ";top:1px;margin-left:-10px;border-top-width:0;border-bottom-color:#fff}.popover.left>.arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:rgba(0,0,0,0.25)}.popover.left>.arrow:after{content:" ";right:1px;border-right-width:0;border-left-color:#fff;bottom:-10px}.carousel{position:relative}.carousel-inner{position:relative;overflow:hidden;width:100%}.carousel-inner>.item{display:none;position:relative;-webkit-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>img,.carousel-inner>.item>a>img{line-height:1}@media all and (transform-3d),(-webkit-transform-3d){.carousel-inner>.item{-webkit-transition:-webkit-transform 0.6s ease-in-out;-moz-transition:-moz-transform 0.6s ease-in-out;-o-transition:-o-transform 0.6s ease-in-out;transition:transform 0.6s ease-in-out;-webkit-backface-visibility:hidden;-moz-backface-visibility:hidden;backface-visibility:hidden;-webkit-perspective:1000px;-moz-perspective:1000px;perspective:1000px}.carousel-inner>.item.next,.carousel-inner>.item.active.right{-webkit-transform:translate3d(100%, 0, 0);transform:translate3d(100%, 0, 0);left:0}.carousel-inner>.item.prev,.carousel-inner>.item.active.left{-webkit-transform:translate3d(-100%, 0, 0);transform:translate3d(-100%, 0, 0);left:0}.carousel-inner>.item.next.left,.carousel-inner>.item.prev.right,.carousel-inner>.item.active{-webkit-transform:translate3d(0, 0, 0);transform:translate3d(0, 0, 0);left:0}}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;left:0;bottom:0;width:15%;opacity:.5;filter:alpha(opacity=50);font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,0.6);background-color:rgba(0,0,0,0)}.carousel-control.left{background-image:-webkit-linear-gradient(left, rgba(0,0,0,0.5) 0%, rgba(0,0,0,0.0001) 100%);background-image:-o-linear-gradient(left, rgba(0,0,0,0.5) 0%, rgba(0,0,0,0.0001) 100%);background-image:linear-gradient(to right, rgba(0,0,0,0.5) 0%, rgba(0,0,0,0.0001) 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1)}.carousel-control.right{left:auto;right:0;background-image:-webkit-linear-gradient(left, rgba(0,0,0,0.0001) 0%, rgba(0,0,0,0.5) 100%);background-image:-o-linear-gradient(left, rgba(0,0,0,0.0001) 0%, rgba(0,0,0,0.5) 100%);background-image:linear-gradient(to right, rgba(0,0,0,0.0001) 0%, rgba(0,0,0,0.5) 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1)}.carousel-control:hover,.carousel-control:focus{outline:0;color:#fff;text-decoration:none;opacity:.9;filter:alpha(opacity=90)}.carousel-control .icon-prev,.carousel-control .icon-next,.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right{position:absolute;top:50%;margin-top:-10px;z-index:5;display:inline-block}.carousel-control .icon-prev,.carousel-control .glyphicon-chevron-left{left:50%;margin-left:-10px}.carousel-control .icon-next,.carousel-control .glyphicon-chevron-right{right:50%;margin-right:-10px}.carousel-control .icon-prev,.carousel-control .icon-next{width:20px;height:20px;line-height:1;font-family:serif}.carousel-control .icon-prev:before{content:'\2039'}.carousel-control .icon-next:before{content:'\203a'}.carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;margin-left:-30%;padding-left:0;list-style:none;text-align:center}.carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;border:1px solid #fff;border-radius:10px;cursor:pointer;background-color:#000 \9;background-color:rgba(0,0,0,0)}.carousel-indicators .active{margin:0;width:12px;height:12px;background-color:#fff}.carousel-caption{position:absolute;left:15%;right:15%;bottom:20px;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,0.6)}.carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-prev,.carousel-control .icon-next{width:30px;height:30px;margin-top:-10px;font-size:30px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{margin-right:-10px}.carousel-caption{left:20%;right:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.clearfix:before,.clearfix:after,.dl-horizontal dd:before,.dl-horizontal dd:after,.container:before,.container:after,.container-fluid:before,.container-fluid:after,.row:before,.row:after,.form-horizontal .form-group:before,.form-horizontal .form-group:after,.btn-toolbar:before,.btn-toolbar:after,.btn-group-vertical>.btn-group:before,.btn-group-vertical>.btn-group:after,.nav:before,.nav:after,.navbar:before,.navbar:after,.navbar-header:before,.navbar-header:after,.navbar-collapse:before,.navbar-collapse:after,.pager:before,.pager:after,.panel-body:before,.panel-body:after,.modal-header:before,.modal-header:after,.modal-footer:before,.modal-footer:after{content:" ";display:table}.clearfix:after,.dl-horizontal dd:after,.container:after,.container-fluid:after,.row:after,.form-horizontal .form-group:after,.btn-toolbar:after,.btn-group-vertical>.btn-group:after,.nav:after,.navbar:after,.navbar-header:after,.navbar-collapse:after,.pager:after,.panel-body:after,.modal-header:after,.modal-footer:after{clear:both}.center-block{display:block;margin-left:auto;margin-right:auto}.pull-right{float:right !important}.pull-left{float:left !important}.hide{display:none !important}.show{display:block !important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none !important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-xs,.visible-sm,.visible-md,.visible-lg{display:none !important}.visible-xs-block,.visible-xs-inline,.visible-xs-inline-block,.visible-sm-block,.visible-sm-inline,.visible-sm-inline-block,.visible-md-block,.visible-md-inline,.visible-md-inline-block,.visible-lg-block,.visible-lg-inline,.visible-lg-inline-block{display:none !important}@media (max-width:767px){.visible-xs{display:block !important}table.visible-xs{display:table !important}tr.visible-xs{display:table-row !important}th.visible-xs,td.visible-xs{display:table-cell !important}}@media (max-width:767px){.visible-xs-block{display:block !important}}@media (max-width:767px){.visible-xs-inline{display:inline !important}}@media (max-width:767px){.visible-xs-inline-block{display:inline-block !important}}@media (min-width:768px) and (max-width:991px){.visible-sm{display:block !important}table.visible-sm{display:table !important}tr.visible-sm{display:table-row !important}th.visible-sm,td.visible-sm{display:table-cell !important}}@media (min-width:768px) and (max-width:991px){.visible-sm-block{display:block !important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline{display:inline !important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline-block{display:inline-block !important}}@media (min-width:992px) and (max-width:1199px){.visible-md{display:block !important}table.visible-md{display:table !important}tr.visible-md{display:table-row !important}th.visible-md,td.visible-md{display:table-cell !important}}@media (min-width:992px) and (max-width:1199px){.visible-md-block{display:block !important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline{display:inline !important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline-block{display:inline-block !important}}@media (min-width:1200px){.visible-lg{display:block !important}table.visible-lg{display:table !important}tr.visible-lg{display:table-row !important}th.visible-lg,td.visible-lg{display:table-cell !important}}@media (min-width:1200px){.visible-lg-block{display:block !important}}@media (min-width:1200px){.visible-lg-inline{display:inline !important}}@media (min-width:1200px){.visible-lg-inline-block{display:inline-block !important}}@media (max-width:767px){.hidden-xs{display:none !important}}@media (min-width:768px) and (max-width:991px){.hidden-sm{display:none !important}}@media (min-width:992px) and (max-width:1199px){.hidden-md{display:none !important}}@media (min-width:1200px){.hidden-lg{display:none !important}}.visible-print{display:none !important}@media print{.visible-print{display:block !important}table.visible-print{display:table !important}tr.visible-print{display:table-row !important}th.visible-print,td.visible-print{display:table-cell !important}}.visible-print-block{display:none !important}@media print{.visible-print-block{display:block !important}}.visible-print-inline{display:none !important}@media print{.visible-print-inline{display:inline !important}}.visible-print-inline-block{display:none !important}@media print{.visible-print-inline-block{display:inline-block !important}}@media print{.hidden-print{display:none !important}}.dropdown-submenu{position:relative}.dropdown-submenu .dropdown-menu{top:0;left:100%;margin-top:-6px;margin-left:-1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px;border-radius:0 6px 6px 6px}.dropdown-submenu:hover>.dropdown-menu{display:block}.dropdown-submenu:hover>.dropdown-menu a:after{border-left-color:#fff}.dropdown-submenu a:after{display:block;content:" ";float:right;width:0;height:0;border-color:transparent;border-style:solid;border-width:5px 0 5px 5px;border-left-color:#ccc;margin-top:5px;margin-right:-10px}.dropdown-submenu .pull-left{float:none}.dropdown-submenu .pull-left .dropdown-menu{left:-100%;margin-left:10px;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px}@media print{header,footer,.benchmark{display:none}}#print{width:100%}#print div.title{font-size:15pt;font-weight:bold;border-bottom:3px solid black;text-align:center}#print table.data-box{width:100%;border-collapse:collapse}#print table.data-box td{border:thin solid black;padding-left:2px}#print table.details{width:100%;border-collapse:collapse}#print table.details thead{color:white;background-color:black;font-weight:bold}#print table.details tbody tr{border:thin solid black}#print table.details tbody tr:nth-child(odd){background-color:lightgray}#print table.details tbody tr.total{font-weight:bold}#print table.details tbody tr.total td{border-top-style:double;border-top-width:3px}#print table.details td,#print table.details th{border:thin solid black;padding-left:2px}#print label{font-variant:small-caps;font-size:10pt}#print div.data{float:left}#print div.data-value{float:right}#print div.total{float:left;font-weight:bold}#print div.total-value{float:right;font-weight:bold}#print br.clear{clear:both}#print table.signature{width:75%}#print table.signature tr.double{height:24pt}#print table.signature tr.triple{height:36pt}#print table.signature tr.quadruple{height:48pt}#print table.signature tr td{padding-left:2px;border:thin solid black}#print table.signature tr td:nth-child(2){width:70%}.logo_cabezal{padding:1%}.logo_cabezal img{height:100.00000003px}.dropdown-submenu{position:relative}.dropdown-submenu .dropdown-menu{top:0;left:100%;margin-top:-1px}.error{background-color:#d84f4b}.page-heading{padding:3px 10px;margin:auto 0;background-color:#14153c;color:white}.page-heading a{color:inherit}.section-heading{background-color:#808080 !important;color:white !important}.section-heading a{color:inherit !important}.subsection-heading{background-color:#d3d3d3 !important}.agregar,.remover,.click{cursor:pointer}/*! - * jQuery UI Bootstrap 0.2.5 - * Theme created by @gustavohenke for the jQuery UI Framework 1.9+ - * - * Useful links: - * http://jqueryui.com - * http://gustavohenke.github.com/jquery-ui-bootstrap - * - * Licensed under MIT. - */.ui-widget{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px}.ui-widget input,.ui-widget select,.ui-widget textarea,.ui-widget button{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif}.ui-widget-content{border:1px solid #ddd;background:#fff;color:#222222}.ui-widget-content a{color:#222222}.ui-widget-header{border:1px solid #aaaaaa;color:#222222;font-weight:bold}.ui-widget-header a{color:#222222}.ui-state-default,.ui-widget-content .ui-state-default,.ui-widget-header .ui-state-default{font-weight:normal;color:#555555}.ui-state-default a,.ui-state-default a:link,.ui-state-default a:visited{color:#555555;text-decoration:none}.ui-state-default,.ui-widget-content .ui-state-default{border:1px solid #bbb;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(top, #ffffff, #e6e6e6);background-image:-moz-linear-gradient(top, #ffffff, #e6e6e6);background-image:-ms-linear-gradient(top, #ffffff, #e6e6e6);background-image:-o-linear-gradient(top, #ffffff, #e6e6e6);background-image:linear-gradient(to bottom, #ffffff, #e6e6e6);color:#555;text-shadow:0 1px 1px rgba(255,255,255,0.75)}.ui-state-hover,.ui-widget-content .ui-state-hover,.ui-widget-header .ui-state-hover{border:1px solid #999999;background-position:0 -15px;font-weight:normal;-webkit-transition:.1s linear background-position;-moz-transition:.1s linear background-position;-ms-transition:.1s linear background-position;-o-transition:.1s linear background-position;transition:.1s linear background-position}.ui-state-hover a,.ui-state-hover a:hover,.ui-state-hover a:link,.ui-state-hover a:visited{color:#212121;text-decoration:none}.ui-state-active,.ui-widget-content .ui-state-active,.ui-widget-header .ui-state-active{border:1px solid #aaaaaa;font-weight:normal}.ui-state-active a,.ui-state-active a:link,.ui-state-active a:visited{color:#212121;text-decoration:none}.ui-state-highlight,.ui-widget-content .ui-state-highlight,.ui-widget-header .ui-state-highlight{border:1px solid #fbeed5;background:#fcf8e3;color:#c09853}.ui-state-highlight a,.ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a{color:#363636}.ui-state-error,.ui-widget-content .ui-state-error,.ui-widget-header .ui-state-error{border:1px solid #eed3d7;background:#f2dede;color:#b94a48}.ui-state-error a,.ui-widget-content .ui-state-error a,.ui-widget-header .ui-state-error a{color:#cd0a0a}.ui-state-error-text,.ui-widget-content .ui-state-error-text,.ui-widget-header .ui-state-error-text{color:#cd0a0a}.ui-state-disabled,.ui-widget-content .ui-state-disabled,.ui-widget-header .ui-state-disabled{opacity:.35;filter:alpha(opacity=35);background-image:none}.ui-state-disabled .ui-icon{filter:alpha(opacity=35)}.ui-icon{width:16px;height:16px;background-image:url(images/ui-icons_333333_256x240.png)}.ui-widget-content .ui-icon{background-image:url(images/ui-icons_333333_256x240.png)}.ui-widget-header .ui-icon{background-image:url(images/ui-icons_333333_256x240.png)}.ui-state-default .ui-icon{background-image:url(images/ui-icons_888888_256x240.png)}.ui-state-hover .ui-icon,.ui-state-focus .ui-icon{background-image:url(images/ui-icons_454545_256x240.png)}.ui-state-active .ui-icon{background-image:url(images/ui-icons_454545_256x240.png)}.ui-state-highlight .ui-icon{background-image:url(images/ui-icons_888888_256x240.png)}.ui-state-error .ui-icon,.ui-state-error-text .ui-icon{background-image:url(images/ui-icons_B94A48_256x240.png)}.ui-icon-carat-1-n{background-position:0 0}.ui-icon-carat-1-ne{background-position:-16px 0}.ui-icon-carat-1-e{background-position:-32px 0}.ui-icon-carat-1-se{background-position:-48px 0}.ui-icon-carat-1-s{background-position:-64px 0}.ui-icon-carat-1-sw{background-position:-80px 0}.ui-icon-carat-1-w{background-position:-96px 0}.ui-icon-carat-1-nw{background-position:-112px 0}.ui-icon-carat-2-n-s{background-position:-128px 0}.ui-icon-carat-2-e-w{background-position:-144px 0}.ui-icon-triangle-1-n{background-position:0 -16px}.ui-icon-triangle-1-ne{background-position:-16px -16px}.ui-icon-triangle-1-e{background-position:-32px -16px}.ui-icon-triangle-1-se{background-position:-48px -16px}.ui-icon-triangle-1-s{background-position:-64px -16px}.ui-icon-triangle-1-sw{background-position:-80px -16px}.ui-icon-triangle-1-w{background-position:-96px -16px}.ui-icon-triangle-1-nw{background-position:-112px -16px}.ui-icon-triangle-2-n-s{background-position:-128px -16px}.ui-icon-triangle-2-e-w{background-position:-144px -16px}.ui-icon-arrow-1-n{background-position:0 -32px}.ui-icon-arrow-1-ne{background-position:-16px -32px}.ui-icon-arrow-1-e{background-position:-32px -32px}.ui-icon-arrow-1-se{background-position:-48px -32px}.ui-icon-arrow-1-s{background-position:-64px -32px}.ui-icon-arrow-1-sw{background-position:-80px -32px}.ui-icon-arrow-1-w{background-position:-96px -32px}.ui-icon-arrow-1-nw{background-position:-112px -32px}.ui-icon-arrow-2-n-s{background-position:-128px -32px}.ui-icon-arrow-2-ne-sw{background-position:-144px -32px}.ui-icon-arrow-2-e-w{background-position:-160px -32px}.ui-icon-arrow-2-se-nw{background-position:-176px -32px}.ui-icon-arrowstop-1-n{background-position:-192px -32px}.ui-icon-arrowstop-1-e{background-position:-208px -32px}.ui-icon-arrowstop-1-s{background-position:-224px -32px}.ui-icon-arrowstop-1-w{background-position:-240px -32px}.ui-icon-arrowthick-1-n{background-position:0 -48px}.ui-icon-arrowthick-1-ne{background-position:-16px -48px}.ui-icon-arrowthick-1-e{background-position:-32px -48px}.ui-icon-arrowthick-1-se{background-position:-48px -48px}.ui-icon-arrowthick-1-s{background-position:-64px -48px}.ui-icon-arrowthick-1-sw{background-position:-80px -48px}.ui-icon-arrowthick-1-w{background-position:-96px -48px}.ui-icon-arrowthick-1-nw{background-position:-112px -48px}.ui-icon-arrowthick-2-n-s{background-position:-128px -48px}.ui-icon-arrowthick-2-ne-sw{background-position:-144px -48px}.ui-icon-arrowthick-2-e-w{background-position:-160px -48px}.ui-icon-arrowthick-2-se-nw{background-position:-176px -48px}.ui-icon-arrowthickstop-1-n{background-position:-192px -48px}.ui-icon-arrowthickstop-1-e{background-position:-208px -48px}.ui-icon-arrowthickstop-1-s{background-position:-224px -48px}.ui-icon-arrowthickstop-1-w{background-position:-240px -48px}.ui-icon-arrowreturnthick-1-w{background-position:0 -64px}.ui-icon-arrowreturnthick-1-n{background-position:-16px -64px}.ui-icon-arrowreturnthick-1-e{background-position:-32px -64px}.ui-icon-arrowreturnthick-1-s{background-position:-48px -64px}.ui-icon-arrowreturn-1-w{background-position:-64px -64px}.ui-icon-arrowreturn-1-n{background-position:-80px -64px}.ui-icon-arrowreturn-1-e{background-position:-96px -64px}.ui-icon-arrowreturn-1-s{background-position:-112px -64px}.ui-icon-arrowrefresh-1-w{background-position:-128px -64px}.ui-icon-arrowrefresh-1-n{background-position:-144px -64px}.ui-icon-arrowrefresh-1-e{background-position:-160px -64px}.ui-icon-arrowrefresh-1-s{background-position:-176px -64px}.ui-icon-arrow-4{background-position:0 -80px}.ui-icon-arrow-4-diag{background-position:-16px -80px}.ui-icon-extlink{background-position:-32px -80px}.ui-icon-newwin{background-position:-48px -80px}.ui-icon-refresh{background-position:-64px -80px}.ui-icon-shuffle{background-position:-80px -80px}.ui-icon-transfer-e-w{background-position:-96px -80px}.ui-icon-transferthick-e-w{background-position:-112px -80px}.ui-icon-folder-collapsed{background-position:0 -96px}.ui-icon-folder-open{background-position:-16px -96px}.ui-icon-document{background-position:-32px -96px}.ui-icon-document-b{background-position:-48px -96px}.ui-icon-note{background-position:-64px -96px}.ui-icon-mail-closed{background-position:-80px -96px}.ui-icon-mail-open{background-position:-96px -96px}.ui-icon-suitcase{background-position:-112px -96px}.ui-icon-comment{background-position:-128px -96px}.ui-icon-person{background-position:-144px -96px}.ui-icon-print{background-position:-160px -96px}.ui-icon-trash{background-position:-176px -96px}.ui-icon-locked{background-position:-192px -96px}.ui-icon-unlocked{background-position:-208px -96px}.ui-icon-bookmark{background-position:-224px -96px}.ui-icon-tag{background-position:-240px -96px}.ui-icon-home{background-position:0 -112px}.ui-icon-flag{background-position:-16px -112px}.ui-icon-calendar{background-position:-32px -112px}.ui-icon-cart{background-position:-48px -112px}.ui-icon-pencil{background-position:-64px -112px}.ui-icon-clock{background-position:-80px -112px}.ui-icon-disk{background-position:-96px -112px}.ui-icon-calculator{background-position:-112px -112px}.ui-icon-zoomin{background-position:-128px -112px}.ui-icon-zoomout{background-position:-144px -112px}.ui-icon-search{background-position:-160px -112px}.ui-icon-wrench{background-position:-176px -112px}.ui-icon-gear{background-position:-192px -112px}.ui-icon-heart{background-position:-208px -112px}.ui-icon-star{background-position:-224px -112px}.ui-icon-link{background-position:-240px -112px}.ui-icon-cancel{background-position:0 -128px}.ui-icon-plus{background-position:-16px -128px}.ui-icon-plusthick{background-position:-32px -128px}.ui-icon-minus{background-position:-48px -128px}.ui-icon-minusthick{background-position:-64px -128px}.ui-icon-close{background-position:-80px -128px}.ui-icon-closethick{background-position:-96px -128px}.ui-icon-key{background-position:-112px -128px}.ui-icon-lightbulb{background-position:-128px -128px}.ui-icon-scissors{background-position:-144px -128px}.ui-icon-clipboard{background-position:-160px -128px}.ui-icon-copy{background-position:-176px -128px}.ui-icon-contact{background-position:-192px -128px}.ui-icon-image{background-position:-208px -128px}.ui-icon-video{background-position:-224px -128px}.ui-icon-script{background-position:-240px -128px}.ui-icon-alert{background-position:0 -144px}.ui-icon-info{background-position:-16px -144px}.ui-icon-notice{background-position:-32px -144px}.ui-icon-help{background-position:-48px -144px}.ui-icon-check{background-position:-64px -144px}.ui-icon-bullet{background-position:-80px -144px}.ui-icon-radio-on{background-position:-96px -144px}.ui-icon-radio-off{background-position:-112px -144px}.ui-icon-pin-w{background-position:-128px -144px}.ui-icon-pin-s{background-position:-144px -144px}.ui-icon-play{background-position:0 -160px}.ui-icon-pause{background-position:-16px -160px}.ui-icon-seek-next{background-position:-32px -160px}.ui-icon-seek-prev{background-position:-48px -160px}.ui-icon-seek-end{background-position:-64px -160px}.ui-icon-seek-start{background-position:-80px -160px}.ui-icon-seek-first{background-position:-80px -160px}.ui-icon-stop{background-position:-96px -160px}.ui-icon-eject{background-position:-112px -160px}.ui-icon-volume-off{background-position:-128px -160px}.ui-icon-volume-on{background-position:-144px -160px}.ui-icon-power{background-position:0 -176px}.ui-icon-signal-diag{background-position:-16px -176px}.ui-icon-signal{background-position:-32px -176px}.ui-icon-battery-0{background-position:-48px -176px}.ui-icon-battery-1{background-position:-64px -176px}.ui-icon-battery-2{background-position:-80px -176px}.ui-icon-battery-3{background-position:-96px -176px}.ui-icon-circle-plus{background-position:0 -192px}.ui-icon-circle-minus{background-position:-16px -192px}.ui-icon-circle-close{background-position:-32px -192px}.ui-icon-circle-triangle-e{background-position:-48px -192px}.ui-icon-circle-triangle-s{background-position:-64px -192px}.ui-icon-circle-triangle-w{background-position:-80px -192px}.ui-icon-circle-triangle-n{background-position:-96px -192px}.ui-icon-circle-arrow-e{background-position:-112px -192px}.ui-icon-circle-arrow-s{background-position:-128px -192px}.ui-icon-circle-arrow-w{background-position:-144px -192px}.ui-icon-circle-arrow-n{background-position:-160px -192px}.ui-icon-circle-zoomin{background-position:-176px -192px}.ui-icon-circle-zoomout{background-position:-192px -192px}.ui-icon-circle-check{background-position:-208px -192px}.ui-icon-circlesmall-plus{background-position:0 -208px}.ui-icon-circlesmall-minus{background-position:-16px -208px}.ui-icon-circlesmall-close{background-position:-32px -208px}.ui-icon-squaresmall-plus{background-position:-48px -208px}.ui-icon-squaresmall-minus{background-position:-64px -208px}.ui-icon-squaresmall-close{background-position:-80px -208px}.ui-icon-grip-dotted-vertical{background-position:0 -224px}.ui-icon-grip-dotted-horizontal{background-position:-16px -224px}.ui-icon-grip-solid-vertical{background-position:-32px -224px}.ui-icon-grip-solid-horizontal{background-position:-48px -224px}.ui-icon-gripsmall-diagonal-se{background-position:-64px -224px}.ui-icon-grip-diagonal-se{background-position:-80px -224px}.ui-corner-all,.ui-corner-top,.ui-corner-left,.ui-corner-tl{-moz-border-radius-topleft:4px;-webkit-border-top-left-radius:4px;-khtml-border-top-left-radius:4px;border-top-left-radius:4px}.ui-corner-all,.ui-corner-top,.ui-corner-right,.ui-corner-tr{-moz-border-radius-topright:4px;-webkit-border-top-right-radius:4px;-khtml-border-top-right-radius:4px;border-top-right-radius:4px}.ui-corner-all,.ui-corner-bottom,.ui-corner-left,.ui-corner-bl{-moz-border-radius-bottomleft:4px;-webkit-border-bottom-left-radius:4px;-khtml-border-bottom-left-radius:4px;border-bottom-left-radius:4px}.ui-corner-all,.ui-corner-bottom,.ui-corner-right,.ui-corner-br{-moz-border-radius-bottomright:4px;-webkit-border-bottom-right-radius:4px;-khtml-border-bottom-right-radius:4px;border-bottom-right-radius:4px}.ui-widget-overlay{background:#aaa;opacity:.3;filter:alpha(opacity=30)}.ui-widget-shadow{margin:-8px 0 0 -8px;padding:8px;background:#aaaaaa;opacity:.3;filter:alpha(opacity=30);-moz-border-radius:8px;-khtml-border-radius:8px;-webkit-border-radius:8px;border-radius:8px}.ui-button,.ui-button.ui-state-default,.ui-slider .ui-slider-handle{-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.ui-buttonset .ui-button.ui-state-active,.ui-slider .ui-slider-handle.ui-state-active{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.ui-button[disabled],.ui-button.ui-state-disabled{background-image:none;opacity:0.65;filter:alpha(opacity=65)}.ui-tabs{border:0}.ui-tabs .ui-tabs-nav{margin-bottom:5px;border-width:0 0 1px;border-bottom-color:#ddd;background:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.ui-tabs .ui-tabs-nav li{padding-bottom:1px;border-color:transparent;background:none;filter:none}.ui-tabs .ui-tabs-nav li a{padding:0 15px;line-height:34px;color:#0088CC}.ui-tabs .ui-tabs-nav li:hover{background:#eee}.ui-tabs .ui-tabs-nav li a:hover{color:#005580}.ui-tabs .ui-tabs-nav li.ui-tabs-active,.ui-tabs .ui-tabs-nav li.ui-tabs-active:hover{border:1px solid #ddd;border-bottom-color:#fff;background:#fff}.ui-tabs .ui-tabs-nav li.ui-tabs-active a{color:#555}.ui-tabs .ui-tabs-panel{padding:0}.ui-dialog{padding:0;-webkit-box-shadow:0 3px 7px rgba(0,0,0,0.3);-moz-box-shadow:0 3px 7px rgba(0,0,0,0.3);box-shadow:0 3px 7px rgba(0,0,0,0.3)}.ui-dialog .ui-dialog-titlebar{padding:9px 15px;border-width:0 0 1px;border-color:#eee;font-size:18px;background:transparent;-webkit-border-radius:0;-khtml-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.ui-dialog .ui-dialog-titlebar-close{right:15px}.ui-dialog a.ui-dialog-titlebar-close{color:#CCC}.ui-dialog a.ui-dialog-titlebar-close.ui-state-hover{border:none;background:transparent}.ui-dialog a.ui-dialog-titlebar-close:hover,.ui-dialog a.ui-dialog-titlebar-close:focus{padding:1px;color:#454545}.ui-dialog .ui-dialog-buttonpane{border-color:#ddd;background:#f5f5f5;text-align:right;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff}.ui-datepicker{width:20em;padding:0}.ui-datepicker .ui-datepicker-header{border-width:0 0 1px;border-color:#ddd;background:#f6f6f6;-webkit-border-radius:4px 4px 0 0;-khtml-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0}.ui-datepicker .ui-datepicker-prev-hover,.ui-datepicker .ui-datepicker-next-hover{top:2px;border:0;background:transparent}.ui-datepicker .ui-datepicker-prev-hover{left:2px}.ui-datepicker .ui-datepicker-next-hover{right:2px}.ui-datepicker td .ui-state-default{padding:5px;border:none;background:transparent;text-align:center;-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:0 1px 2px rgba(0,0,0,0.05);box-shadow:0 1px 2px rgba(0,0,0,0.05);-webkit-border-radius:4px;-khtml-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.ui-datepicker th{color:#555}.ui-datepicker td.ui-datepicker-week-col{padding-left:5px}.ui-datepicker td .ui-state-active{background:#bfbfbf;color:#fff}.ui-accordion .ui-accordion-content{padding:1em}.ui-spinner{border:0}.ui-spinner .ui-spinner-input{margin:0}.ui-spinner a.ui-spinner-button{border:1px solid #ddd}.ui-spinner a.ui-spinner-up{border-bottom-width:0}.ui-spinner a.ui-spinner-down{border-top-width:0}.ui-menu .ui-menu-item a{padding:6px .5em}.ui-menu .ui-menu-item a.ui-state-focus,.ui-menu .ui-menu-item a.ui-state-active{margin:0}.ui-menu .ui-menu-item a.ui-state-active{border:0}.ui-tooltip{border:0;background:transparent;opacity:0.8;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.ui-tooltip .ui-tooltip-content{padding:3px 8px;background:#000;color:#fff;-webkit-border-radius:4px;-khtml-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.ui-autocomplete{z-index:3 !important}.ui-progressbar .ui-progressbar-value,.ui-slider .ui-slider-range,.ui-menu .ui-menu-item a.ui-state-focus,.ui-menu .ui-menu-item a.ui-state-active,.ui-widget-content .ui-priority-primary,.ui-datepicker td .ui-state-hover,.ui-datepicker .ui-datepicker-today a{background-color:#006dcc;background-image:-khtml-gradient(linear, left top, left bottom, from(#08c), to(#04c));background-image:-moz-linear-gradient(top, #08c, #04c);background-image:-ms-linear-gradient(top, #08c, #04c);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #08c), color-stop(100%, #04c));background-image:-webkit-linear-gradient(top, #08c, #04c);background-image:-o-linear-gradient(top, #08c, #04c);background-image:linear-gradient(top, #08c, #04c);color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.ui-button.ui-priority-primary{border-color:#04c #04c #002a80}.ui-priority-primary.ui-state-hover{background-color:#04c;-webkit-transition:background-position .1s linear;-moz-transition:background-position .1s linear;-o-transition:background-position .1s linear;transition:background-position .1s linear}.ui-icon.ui-icon-inline{display:inline-block}.ui-progressbar-striped .ui-progressbar-value{background-color:#0079CC;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, rgba(255,255,255,0.15)), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, rgba(255,255,255,0.15)), color-stop(.75, rgba(255,255,255,0.15)), color-stop(.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);-webkit-background-size:4em 4em;-moz-background-size:4em 4em;-o-background-size:4em 4em;background-size:4em 4em}@-webkit-keyframes progressbar-stripes{from{background-position:4em 0}to{background-position:0 0}}@-moz-keyframes progressbar-stripes{from{background-position:4em 0}to{background-position:0 0}}@-o-keyframes progressbar-stripes{from{background-position:0 0}to{background-position:4em 0}}@keyframes progressbar-stripes{from{background-position:4em 0}to{background-position:0 0}}.ui-progressbar-striped.ui-progressbar-animated .ui-progressbar-value{-webkit-animation:progressbar-stripes 1.5s linear infinite;-moz-animation:progressbar-stripes 1.5s linear infinite;-ms-animation:progressbar-stripes 1.5s linear infinite;-o-animation:progressbar-stripes 1.5s linear infinite;animation:progressbar-stripes 1.5s linear infinite} \ No newline at end of file diff --git a/app_old/public/css/custom.css b/app_old/public/css/custom.css deleted file mode 100644 index 3cd0e32..0000000 --- a/app_old/public/css/custom.css +++ /dev/null @@ -1,6 +0,0 @@ -.success { - background-color: #a0ff80 !important; -} -.warning { - background-color: #ffe050 !important; -} diff --git a/app_old/public/fonts/FontAwesome.otf b/app_old/public/fonts/FontAwesome.otf deleted file mode 100644 index 401ec0f36e4f73b8efa40bd6f604fe80d286db70..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 134808 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 diff --git a/app_old/public/fonts/fontawesome-webfont.eot b/app_old/public/fonts/fontawesome-webfont.eot deleted file mode 100644 index e9f60ca953f93e35eab4108bd414bc02ddcf3928..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 165742 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 G*yFsbY~cLNXLP73aA74Mq6M9f^&YV`isWW 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

    5q!RY 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 - - - -Created by FontForge 20120731 at Mon Oct 24 17:37:40 2016 - By ,,, -Copyright Dave Gandy 2016. All rights reserved. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app_old/public/fonts/fontawesome-webfont.ttf b/app_old/public/fonts/fontawesome-webfont.ttf deleted file mode 100644 index 35acda2fa1196aad98c2adf4378a7611dd713aa3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 165548 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 z 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 d0mRO}xo^G_%I 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 SdSQM28?+M|D(2r_;{O0|uQ74} diff --git a/app_old/public/fonts/fontawesome-webfont.woff2 b/app_old/public/fonts/fontawesome-webfont.woff2 deleted file mode 100644 index 4d13fc60404b91e398a37200c4a77b645cfd9586..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 77160 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 diff --git a/app_old/public/fonts/glyphicons-halflings-regular.eot b/app_old/public/fonts/glyphicons-halflings-regular.eot deleted file mode 100644 index b93a4953fff68df523aa7656497ee339d6026d64..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20127 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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app_old/public/fonts/glyphicons-halflings-regular.ttf b/app_old/public/fonts/glyphicons-halflings-regular.ttf deleted file mode 100644 index 1413fc609ab6f21774de0cb7e01360095584f65b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 45404 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 G`u_lkUM?>H diff --git a/app_old/public/fonts/glyphicons-halflings-regular.woff2 b/app_old/public/fonts/glyphicons-halflings-regular.woff2 deleted file mode 100644 index 64539b54c3751a6d9adb44c8e3a45ba5a73b77f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18028 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 diff --git a/app_old/public/images/Isotipo 16.png b/app_old/public/images/Isotipo 16.png deleted file mode 100644 index 9ff28113c90e94ad8191cbca9e1c27e4b4640cf1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3552 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 diff --git a/app_old/public/images/Isotipo 64.png b/app_old/public/images/Isotipo 64.png deleted file mode 100644 index 8b503d19529984b3b75b81357d953ac44e0bbfd6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6361 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 bI{n`OS|NRY86>_D00000NkvXXu0mjfU{o%_ diff --git a/app_old/public/images/logo_cabezal.png b/app_old/public/images/logo_cabezal.png deleted file mode 100644 index 29fd0595347b55901e215dc2a07ac5e75426a69e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23004 zcmbTdbySqy_dYyyhae%{9U>(y0@B^xB`w_`N(j=@E#2KQgd&Y}4Bg!f&F@B^&+~o$ zd)Indi7lQ2L}slTXPV|V=i6QQcZOS zUkJK*{#G_LAYRr%1rM1*%jzk zf&sh4yp}}{cn*5w75O$F^yVE*Kzb6LDkuvcWHexEvIbIO1sT!%Z;pck(yx-eVL-a^ zlz1>%F(3+D^H6b+l>n%8MB|GDNb4o&xrJ;GA83XZ^io>WLJCyb00IwVqg8{D(Lpbj zLq9Wu;Jraczo@A_K%bI9&)=PD3Z5{RV{b75mP)P`Y@*?l2-HPpbwbkAWFuo3mL_0+ z&SMN~obraP%QN}Kt3WQS<+DK$C@TgJIPKZJ$1rC3@GwtgJ*FY+ZU^Ecm5IsP!^TL7 z;~NlY#l`RU0}Fc%QGftqfZan5?IFCC0a}(TG~A*Z>rEXfYiCaL%<;)K64}vBv$GrP z>oYPvZ*`6PHGLl}y9~ja_qNx5f_Ko1<@QyYz*qW#lJHl{U4!Rxc_bsTD4$Fqn^BT? z4QP*dq~laQ(k4w>OwZSpahxK>QzFh@3WO(7S$|(BqMW!9$g#Oh)Vz zZ%Dbo%2vT~j+ks+>W!E}j#xLw$Qhjst$`@;qQ8)FjVb3sVNAYgQAZ*ZB!9l5?39AX z38$gx3w^FkB^$#n#i8;=jY3_D^i=2rEMJJ;yXF{yU!YeX?}A$;IpPDWm4znI>%^K0 zd5J!~%Rw78bKyvd!p}+_{ZLCJ6v30dHCkeYH5Vl;*838?O^C$VWBZcrXZPEx*DNS; zrUO+}rRXI;i7GWp;ab8jOh>BR;c)^bz$iTM?r$lK$wZ~J zeNyhCr;00-t)**zcHKj0@`@uwONxbh3MUGe9osuptcRBdCrs=WeN!~7bXBg}7|z(c zF?$v29hRb0E-51FxV||vn`$J!coqugU!T|0*Sps_*NN9DPjyk#P2M==Ua77!sPw;= zd9i`L!L@;Cp7cso{d_~1WZo{3sqhkc)1@(qnGQ3D7L?X0&;Z9hQB$xkUJp4tk z+Dl%Jy`-&VtYimuEv9-VAH0};)NeB1=)Ms%v8xpo=NB&)qp6>%52!^I8L0Y}zf^y|7IF6u`+~!yjCO;73^|8_MbEaa8xmjkd$oJJ zn}Q2TbS=ahbQ;8Y^kG85AKXq3f~4%d^C!w;`rU8D@{GS3C$4;oY5Fbree&JccUTeD zKlRpV*6e=T{rpacNJmL0E59p$n4%)zl+TziASWQ#J2W_yGc=XVohrmJ{c0<9D|I?` zsliCcLx-ilu)fh;x_VtFU;D7W)&8>%pLU*>x{iL$yR!5$+NqYZmV##mO$u=eB^gte z-IXWxef32RFDf@?5a-M5?dpAvElmh48-A2`AI7!C`8NB0y%$2l2${t!A=M%EbFTgH zoL_@~F=aUIP{jAgdBP66rPc`c$PDLNJ?;Qwk9E3g>bRsOfn}3(&{=4BnC!;^wnSmJ zRN|itzuMMiTrQmSSG>k9(o<_vyABHHD-L-Mtq(&WnS)%Jj2YUT&ZFJG#Fmveev6=G zetT)NRO+WFrWj~hw?)lv${wRxHeK0}=UxmoJ|Yml6#kI8CcGxdyZCBR+i;K<-0-Vm zK(X5)!|?Nxm_PNS*`wFvZ%{!1EsP~xSfFU2F6`}^=|6{j)(jSjbPUxZ`puEZ z?fx4g=DZ|+Bc33>m}<$P$XCHC!_6dI%=TVzj<=bsS>z|1h4$d2R=Sq7tt<&28&f%t zy>0u_-N9MNYWgbLnm0ib`!9V*&+Or@^UnqNMQk`M{0VR5LKR-eAB$o$72-$Gp5nUG zMxuIlk#<>9vH#}z9XcbX$3&)ZD#ax46}unP%I!(>gENn1qv;cUQFN;uhTK9be+GVv z8-?8~A^tXwpxBsbr?c!1M|vl3gM7c8sEN~*QlR{EZ= zTF}XJ9(4^5fjL+Mu~e|}OFfg_q+-c|W@5Qt8=aTDO`t(%|HsZc7@Ivbb<~Z|zI%}A z1ARp;cI~A))AXBZ$J8^j?F{T<1W_}Ze9o+h&qi!qCx%|+G> zUCe~y#LYxZdyLt+T8t%)+JlQriFx+KA%^*upn9>U?;V1Tt>y)N!$SfhYPo9XYBy>; zhhqzM#?x2!zYmGMTQ9lxC+Brrq4&al?epp|>hhBoljgV5w>40a^04BatAtxS{W1kR zr-NR&F}QmqYRvlSrin??F(EaTs43<>Nz7jI_J{N%cUBA@4E3*RKUb+8#XZ+|peRdF zG7SDXw+Qdj6{K-;H&RPd_V;g7PE+2cs;1oPn&>tw4hsLC+FkUzlbk2VO5+mL_LMnO z>$9HQ`8XbDc{&o2{w>|tkL?;_G@n!Ny=6MQ^d8IMs2SU3WlZ8Rd`qBJU|8?8(dD#y zegjvtQ8T52-_UN?WmoVaZd|dqC9Nf;yh+cd>CmgK&f5aIL!7}oyl~#;d4m5qHJQOD zw9t0urQ`I)~eWQc>d-pqv1o-S290 zZ+iH5((mlV)5N$AJDiKgrtrJUBTF&NXfiI^7}eq(|SEuoTyQDEt{7 zt*)ysR7VSL<6gwYJ;K8!o!yyovd#l|lfqO=MIHq5q6L8hfSG{5P?Ii;g5G9kRp<_xTu=P-2Q@l65ix}?+Ns>i;98sQYIz`xfzYnwZ|Z)P=vc) z-1MlecTsjHb*H$M_d>Z03pe9U_OcRN4E7>74GH!&?`Ef|QNk zn}hDd=>ki9tXR^mO^NOY;+~ZJJ(gUG)t`TNaPUrsN;qTAyVrlz<)L zG&`qwAJ)_uFaOtJmFkY(9T{?PLF&?n`he@Pm^_LodAt zOAbR{x+2L77d+HfJKy<5$G*8zGE+4pQ~Q;zkC!k@1`;h2NLsXTW1o&1&p^u~+FWe2*jmzT0N09a_Nr&s$Y=%<-eQ+u z_>)U|F28t<-c>?XI7Jnr`}-gH5SpFcay&3I_!|t~EE*vVF83kVE0&*-U;NqeC?vf30)DutvCg6@hfJvE@*u|ju;+_==7r3qcCq7=8EZqm z;yzgumZg^>lN zihJop$5tOeH5SHv?>y<)2WZ0@G^XFWS&CX_z%+U9(b4 z=1We-)wcfoMR;vk>E8e_qnAd4&4f*r%$4y3Ux1x2w%nPg@lboY+nB?nAk|CT1Z}Z# z_&kh~cz?Y*0l(8+?s-;z;DvBZg#Ck3!yh(yDs#yWSD&?}d|$t5wz4^=k9?4+T#f4= z&+cCyU&F4a-Ca|b&5ah4)Z36fN*`M7=RsQy zZQm`z$}KD+kA6dkEb|jcvhHJ^R2fu`QW1>J#SMruO`>5vvR!Vwac(IqW1i!0P_v&t z1P{+EdUUJC()<(bC}SA#9->tze0C#Rt zzvhkRBQMsyaSN5Z#_wo?d_0E=t0%XbZ5gZQL{ltGa63H6>$4*)O1%N%k~)y`!qRo@LA| z(7HixwaRTIBmozIvz&Qh>9&N}*m%%pic`aP5T*(#$f6C)RKn&R6%e(MexWzJHt!LARx0aW?&eK_jvYF{qg@4bPBNNW| zDTZdDdBczE#P%lJP$zM8$-vzUY5`I;YBw-;-C%c(?r4L)DhM}2 z?m>;1eSj2EE>PyJt~b|(r>=g#lwu%gJ+Ys2@vp0vX^I9A!SrBdj>1FUH|jqy>W*NM zV0e47hKXV97m605BD^FBG$+Ca?J6AjIWI6SP|rpx&gLJXjmWXJ`3|qP3jQmGSNg^~ z@p~X87!gpR4*aODXDHzQ<59`UbSNAg30CBI9TgtPyQ{F%u3-i{-%z|7ZGYeH?mR7wm6zymnEL$q%550Ci$_crB>NIX zsO&BS9iA=!rS4nO?7vTNuOjrlu|@dBzpbDSZV{d>Le$kC*3H)0?qFc(dgV*%`+S%d z*r*@NkY>2d$@DSbC|mXAvEpJe!-u-{y`x>Ux~}ZMK_N~rts6Th?$$x5HjQvo+f;uk z!g`$t2*B5X=sCkW@>J5SZZ+~88!YrKjG*3vE$!#GrbIj9+h3P)7<$Kr0a6&0WgKH& zBoo`lq*bN~)u7LeqIjmK6ddee@OY;oaQkqBU#^<)LGIJ(ko(`waV-R?!ZUUAnw#V` zt{uBuevEC74>)DB6n{(Atn^qDxFg{5S;a2S@*vOjM8?GC+}!76d<`erA<5iL)~{im z=KN%YdhROF3v@c^y~s4}^D}|*FSmQD|1_8?e8_B`S!cR_2Iw$Ubl(EjyRIq!vYi60 ztTE3*uu|yQ4V`Tk6Kv^9@4CdZ{jp+Ovu;g5Ro0J$uf$61KYng58Mt}F?P!Z$d`mi7 zFf>{B$fNA>qm0`XOdhCff*md&XzWVwCc;t(%U)Q_zt@y08zPsasZ^}^e{kd*m_bE| zQ5lMV9KxeHt-$3O{YBR%K?9=WjNd>dSCpacP6Doj55@G!Pxxtxs`W+ZkuCe+0>ka|u}{k8#6iw)y; z8Lwd~0Bs_eZ~IiW(94>!#wk%PA2+aVbTh*bFdX~i9K1( zB5(qAO~sejwi-FB^(jSf{FjRedu(ltTo#-b-1Wz?45lh}!J71mevdRA!rw(6{DH_9fP~x6l;RfV057XHg6MU?kUGR}oir5l1)k zOyZ2|s`E)kjDORpIxcrXnssiJ8gbGWb|!D=Tb=56jjDS8iYB-jtR&nMLVQ@P3DW8N z?B+GU`LxS9Ql_)0ok?i7r9V@f?L(~K0TnY4bFpu{kndQf`QaMT7>s7k?(ygk3LgE( zcOSgRQM2{Mw7E9Q?v^x9TXr6`WpKCZnsP1=3wvvUzONt18&Lj;8}jW(9-~8@$hbIX zzm`6_=A*Zm)oOH0ZvyYvH0ARjp)Vv-X)bDv2-w<82IGyV_sX$-<>hs>0oV4#_dpp~ z8yjR#K6*C`!a~rVi?=q{1p2N<)4i zw&_p72_q_min`hawA-;&+`m-du=n;JvQ;^2dm!8J^5dup4GO87x6<Y>`z@`(o?eC-jg>;JDtE`2k~`{*}!7Zik6@p(me9 zJLc3bx3h)7b_d9tDlO;+h$I*q=n_C10eG^>s3IFGX#(?wR^IX6-LCPf1Qnlsa_G%d z?E1wOnnw{prfIPn5gVxxC+$EA43D}8S$fTgc1NWzwEgWHWK?d|F8VZtHd*@DB7WO& z3^I@D|JnN>Y2p=+51Gz`_28zH9;*NkHzm-pCbHbi6kG1h+LHMD_`)DzT366WKRqcn z9k67_z$Vyn8BD0=PNSsmr+rYU*G^}5RIELES)TGeKo;4_d9HK(3*U_0NYokX`3?ba zvY2%`88ou(YP6R`+b@E4g)#P3fQ|9FT;O{5X$UMje8fnnmzCZN`bfR-rtmu7q$l&! zyjIpZev_ygh!uzl)G3wau2Wf?M_{9!*cg%Ve2dK@W!=)42kr(hOW#`BZ@Z?8TOO9l zhqOOFm;ihbr2hq9aArev878O0=m&|>Z<*oYupjeU#}=sa3khSzy@M@5Wp=e>Up!d}80qUN+d4zidnFJJlyl_+&S zLENX)VPLt<22c3pJ^-6;cW8<+Vsn9NLMzRxkl=?%viy1S9@29Ii%AAC_?rPV0?O|_ z8V4-EO3TrJzqtT^pUgaa|DjAO;gFn@{55PN$yFvodx#wKW>)7xvR1`kXhYK(rqbP= zPP)vQo# zE!@DUKv!ym$vkl02EkXM;=7zGw26t2Ra5t-i}3Xhda=AaAC>KzR&4D4loqPa@F5dS zj3^hj+%SPaP7|dCujOB-Xua)aboi|T9n9=^Mjxuw1tf2&pW3L@N8G$%N&X7BR``AV zpxsC$#010FZV@S($82*|yCWltES_C9zotLY{2L8YTV(;ffsq`cTasYo4T8wjynMXY z@!N|ghtW^5yrtG5Y(_Ag1N;Zc6?Q#$?=ObmA8 z2wg}72LiHhrH2?iwhl(Oa<=H=A$koAihr3jO;ec4+FJU<8{7&QCqk18SVz6<>$S}i z6ojK5VPC@+TuV~U+{_z(Rx@uWRIjPMzQi0h^GGf@?^YNzbQKa?nB$k_?HLH_g=qm z{?F2Pmc1$|r(_6`Uqs~um!qp|dNGvGkQX;v)DG{4qiBy5i`f~}|L`)JD!|kt0`|zQ znCD@lg6*&mT5gw(i!b#r)=;kHZ@G~fD7%$F3}7y?H?xM zRUD%7pugBVyUVJ|^B?=Clx&L^ofJh%!bQQ-a)fqIg6qsJt#N0w^cy72e`xxx{L-Yy zhyG=TfCgh-1^oCRUfxawj@OT#U_(GEv^eGMaXF-{dcIeLAnMA^!dO5;?5W`6q%yDq zItVQD87&c}-9~}I)ttS)Wfs`2vNxKfH@lx=EenQ6*#Gib8hcpXeD9TU(gyfzm{Ci2<&52*sODS_4jJo1z?J z16Xp{neN!%+%lqMiWX}TuSNavcoU13Ts}=zDgWQd{5;~KNA7_!BaFCp#rm>xKf+05 z`vcNZ*MqvHut@!Sx%SuV>wlfB^V%w$DaC_yh5>O4is&pHmjp%-vBx-c(iN<3Uhu~kz}a@DIZ;Kt&3&8{|D&>7xX&_TN+S*8 zRxRjt{r-d#`|c^?QHl_Ai_e|&$u9?s=jCPp(b=vFUmhJ6v1i%G4;GU}z!j3%T-({= zGF=R3NTzu@7Vr5_rhd?UAd1aZ0EZ^gNQ(uw=gGuIyq+&=_EVDIDf!C}X;4r#(`oG5 z1&(pBLnt+(U<$rv6w8|hx!o^*yI!*-XnnMm?;}gur+w-gVG8m1LLJxI^70TE06;y+ z2As(#zHpCX%Zs7uBjU^3K2t1sZdd%Tq7v-326DJqpx)lB!Q)F z^SH8zQJH1`_KL9_0v1DzVW^8qrT`4fdN*56$nS?y`(%B4;6&9*S))ajWZ#4fY4^R5GRn8iN<9bYSXHx?^ zzGVm+M4iC2_+=h^={Q4^Z0D-aZTP3|D8>g6m?(`PfKT%1zxpdA4x;;uK1`B76#hj$ zX4*N=UE>1bWEDw7bP@;B=zgg_e{!|BN{+C$KfF@j-(>*%%@ah~SMgfCDr%N{G8z?5 zJ_BZ(E~=iASJx*2SIaJ0c3im5EF}j$jM=vx-6aBO^GF)<69? znJw^tpD2ULWgqyBzjU$x5v~0Ek|a+QJWSjBHyxj7%YdH2hy728pa0APfm8f_CWG=* zx;~9%pT=8H)7(ED02qh->D7Qzw12(_1pN8_|9gQ<{9gn7|9%38I^ky-t@;|LU#{Bw z-iPeUtrQ6d@o;-Yf<0N5Rk1B6s~gLq=tiiOQCv+->DJR8wsm+(e&wJ%z4*%K2Dd@_~4cc?}`+0ul9DVz@-DdCgP zV1J=L`heRU>_R-lM#9C^9@sESDB69=HyXO=9olv|Co1~anY9+}Tf+$LQeHXmww6~Z z=<0DJ<^2aLofC2cFmDI1^`JdJ4IidPkaovY>w;2Kk^1?)J z3w7+1LFA7|$AbUJWHN@jJ%M@^4c zr^kk-we&5rVzh*Z4X_EsEV%6zym`tF2IZUdO7D2oKs%}rhjiZY#gh}Jr-6ebTMxHv z-vOVY{xe{BzT`{~hbty*s}{V(sEh+*v9Wu2fTBJB=Q$m5jh-?I2QKg|Vn0S;+cj0A z5@BwSN-6(s!^H5cuU@Si%46nO|-wlU*VzkEMxlARb_ zJNQL?srhu<1ehOYWkj{Of3+z^Pws8^;RkR4jDV_+PR<`=eJXsJb8(X}Q9Wf7;?fGJ zYrW=u*h(TBUmQ1)ghl9qX!^6(mbje9uHULb17WXxJ`jVac4y37)yw5byu(k(dcIzs zX1Jub7QS~j5=-Px&7B4CQVb2f3}BNwTg%tjQ%T=_vUp#zpcUA>w?6g+Z_{vZHaQc# zv>b-u-w&tpIbUCBMsaY9+#N2Vp`I2M&!u!@E`*C=&W4|!j+JK2XLvt|{wYmTp{LY( z4V8&?n7$dY<^p+Op5QO!E8d4D+$U4o)n<&;l72(i1b6BE#Udx?;|}I^!t>DicLYx% z2-Ifmhr1NpLDk)_O$Kf6xsQyl9$1D29(f`~R+#Wv`xOpn>-IL))Z+I{{)UhVS0zQy znz`vli!kEA)VmrO@3W!KH1`L)+3T#$t(r-Vbk}E3f@3on@&)UL%D;8+dW#%)*NJz| zQ3%1%kDi@fQS{foupYV=n14rPz<`VmW;gH}Y`f%Kz^wC#+kyi&U~?O=0a?JdA2o5} zvBo@3PE6!dFevxWNEtm-dOmj2wXgh&Peht{i0JYPx58VMa7Gb7Eltr9DF+kH;d1wqox{M>;^#<_KP%^{d&Y^&>rs@bPG-d zv;;5xN++xu{Y@4Sf_z4+Z~#9kM; z254g7i3~y^9p*ba3&{J}Z_COGnSII&N%RH61c|o0=OofRMAO;fpWqi@!$4OI zGN!1BkAn9B^DOh%$c;!Iy-;&Cz11^Ew*ncs3^_rOm@O&>3n1Q@_f-}izBUipgfm=~D~h`^XiUugKFs@-Pj z5}X|!!XQ>iF1e(=jUf**3gL@j!J1*qHBHtzu}8-F!roDea^dk=0s+;ldL5>K0e#5t z*V06Fx_>m$rfby-jkWpod&OneWwZe|wBMJu1Di4KiPcr$#k_R6Azx_;OacrQ~Tn+wx>FsIZ$U=yjnyhhxa(f zT!1}4BvV|-uQ%E&)t6(GZea4-l>c|@e04f1+(xR;2@$l7@Ee1Kq$t0W7k*)#?bc}0 zLY%C0+v`{6A^>7K5pu^omJbaWKD^BP#!Z zQDpo{`2)joy1BsZJ1)0+a{&if#aNv-HW{oiOBh4#`Wi8?d8!;@bqoW-1v88o1MiaHg$8*^ofP8R&xPE}51CiATVK~+e`3+E zR)bN@AIJOnO?W#~{Jr@E*|TyBq-Fg9H?}aX{d%}}rfwc`*jS;H2?y}A553VTQkl$Q zDoR2!-)o^J>lhT1^K;a6uH1}RGm>E{mpFODJ3^7Gj?TKub%(SoOf2XQi=+Fq7pNYu z>@pAeVkX4=+RX)^Ags8QB^)GP?RsZ_uc8CnUIzyiu~D9{qL42Ew=DBboS`#$1hX%> zcXOD~PEdC9N-hl|LgWLo6AsQJj_>)R91Xyqrc}uj#ToZ~1DP;*sZ@E@zH(qHhhQFv z2`vsLJ3l{PSE;~x)UUs>ULGXWc;s4cXX$mIC_>mE z5mXpoG9kE@(pvec?AwQc_Yw|j!;BUXgI&@tKh?S_`9%=DOOk#=9%P=Hl6hWt)Z`V5 zsT@U?{#IxaOGHj%G_EAg$}T?%qv403w9Y2~fEy+%aB24Lea&P}Qtu%E;@Ac&BiLb7 zojtqL3Z75Y^jHnqMdoFI51y4y2Vh6x^$X^`rj;>{%;xs2;r#Z=dPe`3+f24*VK1@B z13iM!tU_29Nuq6~?H2qpgoHn@mvw$tFn6X7#(?qyk%s_cJF8HVNOmdYj`DI)X#ptd zsPEZ-zF*KW-7_0-y9^!m^$Lm>fy-vWB`XkT9Q2gY1ps#>4z2b#0I^)o_}(f-T^}^8 z;a!>Sq3&nY#woCyIT=Q#Yj`h*MdK`ahhFvvlzG~F^0dvqpU9wR61$Om9-D%O(_qQW zaeQ5GOV1?q1MaQxV*QInqz}x>r$X*H$Fe{k-32GMH`!Shw(HcdPO!w}F@ zxDmr{)t$P_w;7>-mt-uoL=h5LkL<9xzCtqFX*}R)mGdwjBzlXn97mLCJ4csrFav{S z%~{9Q=oSC=!$Doac$0G@@m$CKB|X4_DwYRc?ZF|zv9Ir<E@ObQF0*z@1CczU1`zIMQnlvloOQI`0t!O{TS)7?bNBo%ABh~4*I#ojN zSO{FCu$*>_EJKv^M9;hyzDONJS;LS@4-wzMSzHe4eY*z$F;L{3@DHaw!4KN43b#g; z?pzvSu}4in6K{N@<*lR!dxS6%JqOZ#QMd-bt0!`)*zf|PX5G8I=<88EM&a<1_0bRR z8=#l(YWQKENw<-RAigF$^G>Q$q_>>a`r#;`($+FtO>SgMeRN0219`a=0Do;!$ZHWC zqelJipmDAKZf^mJZ{^b?+Wkx>`ir6Mk&bbRXuOLCTgws>p@u;4R6cn?fI<6KMolvf z3c!)PmYk1hFA_YWvu|us_wkgp>7#d_ac-bx0Z4(jlucTu_fU4p84D5f2ZXKyWSOTa zWm|tvS7P{cdDd7$^sC(OnjldCiChS|1F)`ihuI~t` z#q972xF&el{nfDxntyNJMYyQhULbd2b=_~<#=fzx^ADFxuzN)Oat$ny8eY1_p(xHO z_TyZfJT+5YliA^yMn~9~4OQj>djNIj&IucfV)d;_96)@$txDrdtTOdqZ{8ytllV4i zjYcAGfAGz@xwEFrCaag{(Ck$?mMStHFm|YiN^NJd6_eW|lrt#B zC{v++_@z=W+^bMSn4(E+c|w3r$-;bdMJf8sCHFe#^RyG9kqJ(r`D|p^hBEg)+d~Gt z-zzmY0A{)U+KTI|UUopby0!_)=F^dhe=8OLavGx|RXtw-o+r2S_+4krn!mmMCPu_IGKivX~gP zB&jQh7-R$w-8xK9dtwDU$lTDT5F&sfxL)galnoO+>_k+=+ac;Tp`_0YG*AYrrSEjX zOV&SHAjdJC)v{uOQ9_)8i%K7TS1QD;rDFOCyXTKQUNK%hxb~ zhU5|_iYp{TU5`Sk-W#-%){g|HqkQE#?gi?HlvQh}W57UZKYi$->nfDJPvy;xC&YDnTk>@bwK;tm7YY(rzZrO)iFu=5U2Cv7?ch8(u6WZ(Pu=RS3Dwu=z^6#-3J3p@c1JRjrJndGC9n*x)5^#-JdTJ)e$?wyNGf~ zU5=z=D@+~4w#@fGryVt+1(1J_X1LA}h@9Bw33PPZY5t%JY|)Z=6vfdjyuTL zzGIQEEC)feDl6ZJ#+Z{)HD>D;{5-z9eZeA7s*EH`|9nCBSg1z0^T57?YMi+wl2gsz z1}9#TN+s&s4r*zhWk_08P|?WvDN3klGG+_$`$jt^<^HjdcJ8&H7846Ni82oY)iy8J zjg^pcv-MC*zSYqCUn3)$N;tz%h&4Q~=FZGHU4TryN?b}ek;U_KIR66tJ6pw|Exc** zB5r0-ibsYPz~vNR;&CU?Gy(s1F9!GDGv(e`rZ8Y|KzQKv=>(?~t$|VKGIWjPdjdmp zl92$~l@2u7W8P&PqjBp{mhkSVcgCsL4iCGDJ?q09oaE1ah&M44^fr32+=PPCrtj4# zDMrS0RPdU`dy&kqx>XdxMcH?vf=KWj`}QeEP2A0s7Ks3(2n+&72!fw(G(jyEO5)Tn zy=Wf|NFCMTbm;^M3@ouQc3zk5yyZQ~chL$pd@#`hh=Rv`T}#vb5y5D^9Weq;w$BJD z<{f?3szUg0F)@zHqU=@rPaaIFaBLN{4r20jGUMpIL+f8Yv3?zBNScM`WlEj0nbGG; z3rvoA2YN)!e(;9<@#5}5YRQ?Pd|lu;G2m!6kQFxrElkB#s@HmGXt?K&#x;E_tK-g` z;_=~1+3S2e*NA3X2ewC}gubRxaab(>n9mgQ(VCZolkf)i4E-)Cl=|OexdE zge(1ne>76o{dUXcSsm6gh7bb~r9-R!3~qC=n6(1+swi1xK76p5UekiC6JsO>nTeHk z1&FxZZvF$0{gdhE(eMD#4>T8uf+0Xuf*2aTFA)q_||5(4&&ym!2!EZ(>SuWo05`N#y3DythK4ks_>{O z+;zUs?)v%~;&avnl1Yf&f?0;8VDJ7Q6R;MjOXb&|O3Wg#Pjg~rbW;6^p^dS52dT0Z zom{W_TMr9ouhHyY-KzULIJAK3fIXGu4RPzxO9ONvzJ6KycfD}EAPGb)cU?j#vC*60 zjz@sEx|XyWdmlz69NZz>;v40}pD6X}NykH6#JI|6og?LFWG1CdARcS89uKyQKF*aN zW3bz|6sm2vSYMGNVLDcu3p7ahoFuwpBnVNj+d#GPR~sTbt1UyYYk=aD0_(wnEoBP? zk?riTqY*SlLbU!;6;xM*_MYRyzE4B>jGi@8x^Gc!kgp$7epRdIx>XF;&B zBv7Py20PK+uX6&=gf$0@W({EHWI|rk%UHYSZsLm5@{|XP7pbEOXxEPiNYr83MX{A_kAFNh!X_uUPwd*;*PPx`K^vwMQW2;0& zYV!g1_5-@0h%sNANd>{3_dlZ^o76jWHFV_W>zKAH6$E$|&3yUotDfoFO(v5G@hdAu zw{a`>_se+Ro$SrnL2!h5sC=NSr?AELt_|$S*?DKfXy%;Fo*OH_Gp!p;Uo9$FM89afJ*>g~Hh(dSAQgEF%Txe&Tu_*<=fzgQc!6R~-E>T9|6z9b6q{@} zrNj_Tgq$bY!P}(RU9O8eb)x>6di$1zY5QydsNbs3l4*P0APnb?SL}KvK!R=08r2sd zQ?yqYAj#W|lH|K*)nmfmi++|;g}p)m7gasR1+E>A0<)%qMOZ%;Xl0d<{DLY& zB%FSK&CccNMOSecaMKyvEP;K!Sup3#G35u(2Fn8#f?mpP&em!)4;^M2bBqHFYX0L< z`w4g*r1u--{w|&ec5&bH51i(tS zX9B!o2xcFb4^Ha+XChuHHp1kcAgqlo1Hm`Q!e9UKum4NA-)z5e=)sHjd72LNT2=|bdOyD+t z1jQ1^At`JOhf9QU%)sZw*J3byCfYC;^X2JLzWmuEn3sTF zFyP`MLk-x9U>~^^C8FAvp4jj~bU$+!>dYo}C?IXfYi(5vRE(5F**x%j(Rt{>Hd{a$d;(mVOnx_; z9kwuQ@0~#&vKwan_NLBUKoOWd2}i&IuPECY#vEr>KZ1MPw<6*45j^^>ea7qB-DV6HBUJ3VY_)!^;5n7Bxo_A1)~L*!o69A0Y=L}D_e`@8w# z75Anj26N|(*s#we!Mp9)zJ`DS3w!tGD+)elu!yqaEh5ZNQ*BKY4y07&Ar4^L9I?iY zP$siUJ#(p0;Tug8B8z9}+qFe+OgJDR3le9H8&LxCrv%^S*AH=P_?3MIvUfSP&ku@8 z(P}IvIXq9#M!4)(^jsNg=If+ zV~AE4AQJ*6l%_*%uq`01bOuS7pH_=(i(4}T9%}Vf9Hs^CEQf)b5@gNXGK#l-ao+`SyZr?d-fJ zdcEFfSrmvc4y8-sH^#x{EU@n^j!BipD$nAx@KQ%Mx2)DsOr;0y5)DTw+ZZ*?!M&rE zEriMZlUN5@y0%p@uo;5vAOq0Ga}d46dYatD0|9NWd{SB|xrSm?740xkaRJz+NY%J; zo%)R-CPmQjS&(H`F3p^C$~C<%TFE-xW34UycG!R@3)+JO2*umA9yhOx#10}B7>+^y z{o}-@(-OP8Gn!Y?)O#A9%^@s@!0gpks<{S-f&E#Xb0$Wg5j$XX_H4Nt^hMxzb^2b8 zqYfAmv0q*$YD}&h%gFd;U5}^IcaC6?B!X6jLBhfF{KN;tWQyS9y;({^$?J?;FIm4% z;Ks#BEQ@+HeByM`+sMr+{=>4wfLr~U5bs)3<_^K*EuvBdg_l_ftUu~YjTYT{RY+_i zL(|;%by#^y63goqcRCG<-)3^!wDVI5uTjpiJ4;>a$s8TUacFV-amL6j2w7TurM8ra zPU^WQz}Mx62mbkDSBbFQE+vCw7(>omHyHxJ=nm>L()I%i34DXJTyb}4vhaxvECH}9 zTUH8NJIOohcYd`z>J-^t@m<{0c z$YFFl1+z$6@LIGK985bZis@mt6`M=(!yV7_ZcLom)&@6~ z3f}5Je6a+$xknRhMkiauZCDt&BjM+WMg}<{z>P<;;2@Am?#Qr9>5#zOsXXh>14M&U zc%_j^L5Fhj?WmOZ@AtLi4D`Qh+S2nD6?ERU*l?6nN_`s_A72+wA*;T{k;OB4`*k5- zW+6c0z<>8LB?r1-e^?FPo;=pk#=_O#qCG&~C zK$uJHxX!T zQK;+6Ny6V0pf^kHauSJQSngK?Kbex}_o$9et1!qjZmLmJ&?-9*B8BqU?(k>#a)w%a zAx+}+lHm~eCgUh9tSLk0aeS9l1OX|r;et3=T4!0!OC@n>v2c-uiKsNIKazm`Qsk3R zF#X_(#6z^|_fKfZidakq<{J5Os^BsvTNE;%*OdECP{kj&Vu#`y;cDR`f4z9IA9n3RWi9r8u&Z*7<$^lDj0CN5BgqmdT?> zd%?6}KQFgbfFIV&WvwoA&VpuZgS`dFjcS16$a!m@`(ek|0e->f2wxzTB4sG#70#O97|d)Y&RG+x0iT zU3m-+udMKwo;Kj3#t%#F*%F%*EOc!4zj?`ISA@!9&kBvQy!<_weSXu>ajgZ;o$<9_ zqH^)VmZ(|hHG4Z+pL6^r`DD}GABn}9_0n~_STBy2*73Z&3~T8OKArdGOSu`QaQB^s zg!AoYe!gB7V`();c>t*&bnw$>Y2KquX*P@WeQ-p98^dK8PY;TZlKIh(D;HPiy2(lG zzA%2BQz|GY!#mD$Usk$%oI`1)Y_2n#HFfl~ywczSdDK{Z>ZE~XjHSg!Y4a}5!Rwih zPFBit;Q73_Dbb5n5etQw4ZLJA@m=^D{g~th`&yiL9erqx6P%d8)w_d>WGdxfMrfzw$+I%d2ZQq4W@Ms>!|>ztzd`}=EC z9u&i{4W4kneNLfvKT-gvtXs`Ozdfl0sN0n7ObCr==Y$D`>HnAz#rpHliL}01XD8`* z{3Bda4taJ?yy;woGNnw}xP9??XeCf0YDgIZwpZWe8nWkpX}1@ofM{P`>IuY>Fd}wA z31EG@wKm_(xAj}EX5EW|;+kQhlC-0*llYvw(qBWNS!}pm_;-w9K!8xA)#1vkAB<-F@nNkLMhUy)UbSqf32aU%ymjzxV0O#X_c+N%8@9 zW_0vt1ZzM^v;f}$uP{S(hWBkCB`6MfE)d0vYhT!X+(LaaV;6qiOMhYZw$y*kzZdMS z*#JpD@?vPa$!X3Io<8o&&Uu6-HC)IJ@(?|}%pUW7tUd@d>Vyu?f<|BattW1eKb5LW z0PJNxiRGc~01OWKFLT<*mNC{tTAk$q%BJ%&#ESaqjs*C~y$3B;MW`|)E8zW;A=ukR zJME&X$?236h0OoRU_`Y<-AlQ{cRNMaXnCJ@uismgBt=l9!(CQK?&b^-e78Aj=Cn>I zTjzdrGP7L%fUHW2=B4w2&iK{4Mh114Y5=V!3j{e%7n+}|E~ z@7nrZ*6KGWO~Sf0A!bo_^NbL!JG^c5u1-NTlCnV>R1*jOXav@3_k0A1MGqj|0yGVG z5iY;FjJV{~N9aLqv~w1l;$Tj0XQ=uKqb}v@4pjder8|KvcA>Z?x`nEkuDIyg>uicZ7v3p1aV%lRs97M9oh~W zF(EDPSXM4^-~^}#P;lg@pG*b0()hV-)c1)2p}?O8=99eF$3FXJI?N6m+O`>{mG`~9xjD`!dTVzpN7-Bi?`K0sKZitG{FoT8^7#R7i@*Vr`%Up zGycO-Vmi?@+s8YUWjexOuuv$ks?pupfqGrB$$_yR@N_mEci!YXd$mm!!+9{IVBj+} zM&V|)9uT^>K^CLhn>R}n35Y}TmYBv*)l^71CHNY!lODqF4ZX&10P_s*E|oA(7$>=| z5SpsGXuybmm_KRF7yMVu8 z7I5;>f48A;jcg_oZhbk!l`o#x+EtZ_&)?~Krgro+8EQ;$srZ(uZTtjv3-ZzHF5fLh zx*RBm5(9iNZ6uGAZcEL`+q-!)>YjIn?H&86;R@u%SterpR(qL;oW!@9n5KMm6zT3i z6Cyvhd`EjLNy~kRV%ffzqfqEm9lhd)pr|HbW33z<`=9aKOj{caJh%} z*}f}3#cGR3&}|@VG4}0_KWoA|B^W9yVQA>?Qhf%N_qEVg^Q2&V1IzM3Li9nw(`mDS~$@bxo#`t8_kaa5Nht)rWa-2s1sDL z;(N3&QH!B6k;%I6_D`~jWofoMz7o$j>bUr1G{n7Ddf6i8KL8Ju!pD($<+!Pj04%`Y z<{hdjuLDrkd3MGB6t-gYRCY^hbvUy;C^Cw4MG`qKA{P-CB!*baU7d)JJCne)GDo2) zfGx}JlSbe0=$G8c{EKVM3n9b|A>c#rR-q>lhXHC@$$6t+z+U)u#9Q={xZuCJ5oY=5 z<0t#T@%w=7)o=edau76vl~aT7Gx6FTiyQ!_m15`VbTvu?X%9}Rh+{v@RL#7Uk^2_a!sq*LSWN2=j#G&0{Poein59;3@|sodJVsl0QqZGD!=b%ad#7cvjmE;< z+yoKJ08I1F4>8=q&go{g3zOWHZF+i5aFf;ioqT<=-#ny=1-|@q#gHu0saS81Z0J+a zTSPc2GXS4ghP($3wP--mK(WdmM4(2Z1?Fx+Hd)5lzj^R!)N~-hY*Y7oHgLdmiV(N@ zy3>s6;+K5mIpGesq)z`TXN?N75ZBVn2T7Oqf>qm2ixoNxirEgn?7u-XlF{?8d7+ry zm=%{ME~PK2u-d&?-znuMY*bd+FQTl}8^)U7i^9{-2!!Z;{uF==d>B$`Ou+0k8%u$L zBtH=jKm`4zOK&7$qlD=Sh+jJ+bcaaF2v}aPjP0I7d?fcN@9K}$vAXKN`j6~jR98(r z>fHFF`T{+@RG%C54d-i|V{t#Q98 zXz?Dx4l%4K_?}Gb)rx`))a4y0g%2Mr!Wx)7hm_z2YD+}77f}rhgG4;5} zQ~>iPDZwB7V#R>aV54=q9`R}g|7hit%;g=8wuP$pEWT{2&s zvvs~I^KMXR5JbM7fTo)0^z+2^O2#}`cNuY|1N4gcVxTJXgX&i6!|O9q=S4okVr;US~~2XZn~BAs3_; zIsGT%a^%spO~D&8kzk{%9l(ACl=G}mmxkY=SqEXW1R$<%KgSdtX0Nb59T=mzu>O;8 zH+yH180m*bY%oZBu@tw)z>L^ERX~1WrdA7o@XA84xNoxBs8P{CcNssL!?V{LDU-Rk@C!9f_$zeafWxYY{+n0_sq(KD zBP+jOYTn2F6WJZTpi1%zvK!qw${Vdp#ZCtTa5sX=Z|uMR9nhsBb5*+ZpL7(oeT($J zb8#Rj^*7-0H$d}$49@+(-Qa(W=KXJrun(); diff --git a/app_old/public/index.php.old b/app_old/public/index.php.old deleted file mode 100644 index b99fc7b..0000000 --- a/app_old/public/index.php.old +++ /dev/null @@ -1,288 +0,0 @@ -debug and $this->benchmark) { - $this->time = microtime(true); - } - } - - public function stop() - { - if ($this->debug and $this->benchmark) { - $this->time = microtime(true) - $this->time; - } - } - - public function show() - { - if ($this->debug and $this->benchmark) { - $this->logger->debug("Time {$this->time}"); - echo view('benchmark', ['benchmark' => $this->time]); - } - } -} - -class Request -{ - public function __construct() - { - sanitize(); - } - - protected array $server; - protected array $headers; - protected object $uri; - protected array $query; - protected object $body; - - public function getServerParams(): array - { - return $this->server; - } - public function getHeaders(): array - { - return $this->headers; - } - public function getUri(): object - { - return $this->uri; - } - public function getQueryParams(): array - { - return $this->query; - } - public function getBody(): object - { - return $this->body; - } - - public static function createFromGlobals(): Request - { - $request = new Request(); - $request->server = $_SERVER; - $request->headers = apache_request_headers(); - $request->uri = (object) parse_url($_SERVER['REQUEST_URI']); - $request->query = $_GET; - $request->body = new class() { - public function __construct() - { - $this->contents = fopen('php://stdin', 'r'); - } - - protected $contents; - - public function getContent(): string - { - return stream_get_contents($this->contents); - } - }; - return $request; - } -} - -class Container -{ - public function __construct(array $definitions = []) - { - foreach ($definitions as $name => $value) - { - $this->set($name, $value); - } - if (!isset($definitions[Container::class])) { - $this->set(Container::class, $this); - } - } - - protected array $definitions; - - public function get(string $name) - { - if (!isset($this->definitions[$name]) and class_exists($name)) { - $this->set($name, $name); - } - return $this->eval($this->definitions[$name]); - } - - public function set(string $name, $value): Container - { - $this->definitions[$name] = $value; - return $this; - } - - protected function eval($value) - { - if (is_callable($value)) { - return $this->evalCallable($value); - } - if (is_string($value) and class_exists($value)) { - return $this->evalNewClass($value); - } - return $value; - } - protected function evalCallable(callable $value) - { - $args = $this->getMethodParameters(new ReflectionFunction($value)); - return call_user_func_array($value, $args); - } - protected function evalNewClass(string $class) - { - $ref = new reflectionClass($class); - $args = $this->getMethodParameters($ref->getConstructor()); - return $ref->newInstanceArgs($args); - } - protected function getMethodParameters(ReflectionFunctionAbstract $function) - { - return array_map(function(ReflectionParameter $parameter) { - return $this->get($parameter->getType()->getName()); - }, $function->getParameters()); - } -} - -class App -{ - public function __construct( - protected Auth $authWrapper, - protected Request $request, - protected Monolog\Logger $logger, - protected Benchmark $benchmark, - ) {} - - public function run() - { - header("Access-Control-Allow-Origin: *"); - - Monolog\ErrorHandler::register($this->logger); - - $this->benchmark->start(); - - Carbon::setLocale(config('app.locale')); - setlocale(LC_TIME, 'es_ES'); - - try { - $this->authWrapper->isIn(); - } catch (PDOException $e) { - $this->logger->error($e); - header('Location: install'); - die(); - } - - $get = $this->request->getQueryParams(); - try { - if ($this->authWrapper->isIn()) { - if ((($get['p'] ?? false) !== false or ($get['page'] ?? false) !== false or ($get['m'] ?? false) !== false or ($get['module'] ?? false) !== false)) { - if (($route = route()) !== false) { - echo $route; - } else { - echo view('construccion'); - } - } else { - $proyectos = model(Proyecto::class)->findMany(); - $dias = []; - $cierres = []; - $pendientes = 0; - $hoy = 0; - foreach ($proyectos as $proyecto) { - $pendientes += $proyecto->cuotasPendientes(); - $hoy += $proyecto->cuotasHoy(); - foreach ($proyecto->cuotasMes() as $cuota) { - $f = $cuota->pago()->fecha(); - if ($f->isoWeekday() == 6 or $f->isoWeekDay() == 7) { - $f = $f->copy()->addDays(2)->startOfWeek(); - } - $dia = $f->format('Y-m-d'); - if (!isset($dias[$dia])) { - $dias[$dia] = [$proyecto->descripcion => 0]; - } - if (!isset($dias[$dia][$proyecto->descripcion])) { - $dias[$dia][$proyecto->descripcion] = 0; - } - $dias[$dia][$proyecto->descripcion] ++; - } - if (count($proyecto->cierres()) > 0) { - $cierres[$proyecto->descripcion] = (object) ['total' => count($proyecto->cierres()),'vigentes' => $proyecto->cierres(3), 'rechazados' => $proyecto->cierres(-1), 'pendientes' => $proyecto->cierres(2)]; - } - } - uksort($dias, function($a, $b) { - return strcmp($a, $b); - }); - uksort($cierres, function($a, $b) { - return strcmp($a, $b); - }); - echo view('home', compact('pendientes', 'hoy', 'dias', 'cierres')); - } - } elseif (($get['p'] ?? false) === 'auth' or ($get['page'] ?? false) === 'auth') { - $route = route(); - if ($route !== false) { - echo $route; - } else { - echo view('guest'); - } - } else { - echo view('guest'); - } - } catch (Exception $e) { - $this->logger->warning($e); - die(); - } catch (Error $e) { - $this->logger->error($e); - die(); - } - - $this->benchmark->stop(); - - if (($get['ajax'] ?? false) !== '1' and ($get['p'] ?? false) !== 'ajax' and ($get['p'] ?? false) !== 'informes') { - $this->benchmark->show(); - } - } -} - -$container = new Container([ - Monolog\Logger::class => function() { - return (new Monolog\Logger('global')) - ->pushHandler((new Handler\FilterHandler( - (new Handler\RotatingFileHandler('/logs/php.log')) - ->setFormatter(new Formatter\LineFormatter(null, null, true)), - Level::Debug, - Level::Notice - ))) - ->pushHandler((new Handler\FilterHandler( - (new Handler\NativeMailerHandler('jpvial@incoviba.cl', 'Error - Incoviba', 'alert@incoviba.cl')) - ->setFormatter(new Formatter\HtmlFormatter()), - Level::Warning, - Level::Emergency - ))) - ->pushProcessor(new Processor\PsrLogMessageProcessor()) - ->pushProcessor(new Processor\IntrospectionProcessor()) - ->pushProcessor(new Processor\HostnameProcessor()) - ->pushProcessor(new Processor\WebProcessor()) - ->pushProcessor(new Processor\MemoryPeakUsageProcessor()); - }, - Request::class => function() { - return Request::createFromGlobals(); - }, - Auth::class => function() { - return new Auth(); - }, - Benchmark::class => function(Container $container) { - return new Benchmark($container->get(Monolog\Logger::class), config('app.debug'), config('app.benchmark')); - } -]); - -$app = $container->get(App::class); -$app->run(); diff --git a/app_old/public/install/create_admin.php b/app_old/public/install/create_admin.php deleted file mode 100644 index 5d03999..0000000 --- a/app_old/public/install/create_admin.php +++ /dev/null @@ -1,40 +0,0 @@ -where('name', post('name'))->findOne(); - if ($user === false) { - $user = Model::factory(\Incoviba\common\User::class)->create(); - $user->name = post('name'); - $user->password(post('password')); - - $user->save(); - echo 'Created'; - } - $role = Model::factory(\Incoviba\common\Role::class)->where('description', 'administrador')->findOne(); - if ($role == false) { - $role = Model::factory(\Incoviba\common\Role::class)->create(['description' => 'administrador']); - $role->save(); - } - $usrRl = Model::factory(\Incoviba\common\UserRole::class)->where('user', $user->id)->where('role', $role->id)->findOne(); - if ($usrRl == false) { - $usrRl = Model::factory(\Incoviba\common\UserRole::class)->create(['user' => $user->id, 'role' => $role->id]); - $usrRl->save(); - } - $perm = Model::factory(\Incoviba\common\Permission::class)->where('type', 2)->where('ext_id', $role->id)->where('all', 1)->where('access', 1)->findOne(); - if ($perm == false) { - $perm = Model::factory(\Incoviba\common\Permission::class)->create([ - 'type' => 2, - 'ext_id' => $role->id, - 'all' => 1, - 'access' => 1 - ]); - $perm->save(); - } - header('Location: next_step.php?step=create_admin'); -} else { - echo view('install.admin'); -} -?> diff --git a/app_old/public/install/create_guest.php b/app_old/public/install/create_guest.php deleted file mode 100644 index 53492ba..0000000 --- a/app_old/public/install/create_guest.php +++ /dev/null @@ -1,36 +0,0 @@ -where('name', 'guest')->findOne(); -if ($user === false) { - $user = Model::factory(\Incoviba\common\User::class)->create(['name' => 'guest']); - $user->save(); -} -$role = Model::factory(\Incoviba\common\Role::class)->where('description', 'guest')->findOne(); -if ($role === false) { - $role = Model::factory(\Incoviba\common\Role::class)->create(['description' => 'guest']); - $role->save(); -} -$usrRl = Model::factory(\Incoviba\common\UserRole::class)->where('user', $user->id)->where('role', $role->id)->findOne(); -if ($usrRl === false) { - $usrRl = Model::factory(\Incoviba\common\UserRole::class)->create(['user' => $user->id, 'role' => $role->id]); - $usrRl->save(); -} -$locations = Model::factory(\Incoviba\common\Location::class)->where('controller', 'auth')->findMany(); -foreach ($locations as $location) { - $permission = Model::factory(\Incoviba\common\Permission::class)->where('type', 2)->where('ext_id', $role->id)->where('access', 1)->where('location', $location->id)->findOne(); - if ($permission === false) { - $permission = Model::factory(\Incoviba\common\Permission::class)->create([ - 'type' => 2, - 'ext_id' => $role->id, - 'access' => 1, - 'location' => $location->id - ]); - $permission->save(); - } -} - -header('Location: next_step.php?step=create_guest'); -?> diff --git a/app_old/public/install/create_user_base.php b/app_old/public/install/create_user_base.php deleted file mode 100644 index 4fe56d4..0000000 --- a/app_old/public/install/create_user_base.php +++ /dev/null @@ -1,128 +0,0 @@ - 0) { - $q .= ', PRIMARY KEY (' . implode(', ', $keys) . ')'; - } - if (count($foreigns) > 0) { - $q .= ', CONSTRAINT ' . implode(', CONSTRAINT ', $foreigns); - } - $q .= ') ENGINE=InnoDB DEFAULT CHARSET=utf8;'; - - return $q; -} - -$cnt = 0; -$queries = []; -foreach ($models as $model) { - $class = '\\Incoviba\\common\\' . $model; - $ref = new ReflectionClass($class); - - $table = $ref->getProperty('_table')->getValue(); - $comments = explode(PHP_EOL, $ref->getDocComment()); - - $columns = []; - $keys = []; - $foreigns = []; - foreach ($comments as $comment) { - if (strpos($comment, '@property') === false) { - continue; - } - $info = explode(' ', substr($comment, strpos($comment, '@property') + strlen('@property '))); - $column = extractColumn($table, $info, $keys, $foreigns); - - $columns []= columnQuery($column); - } - - $q = tableQuery($table, $columns, $keys, $foreigns); - $queries []= $q; -} -try { - \ORM::getDb()->beginTransaction(); - foreach ($queries as $q) { - \ORM::getDb()->query($q); - } - \ORM::getDb()->commit(); - header('Location: next_step.php?step=create_user_base'); -} catch (Exception $e) { - \ORM::getDb()->rollBack(); - throw $e; -} -?> diff --git a/app_old/public/install/end_install.php b/app_old/public/install/end_install.php deleted file mode 100644 index 94eafcc..0000000 --- a/app_old/public/install/end_install.php +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/app_old/public/install/index.php b/app_old/public/install/index.php deleted file mode 100644 index 9a5d75c..0000000 --- a/app_old/public/install/index.php +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/app_old/public/install/log_locations.php b/app_old/public/install/log_locations.php deleted file mode 100644 index 9de5bc5..0000000 --- a/app_old/public/install/log_locations.php +++ /dev/null @@ -1,39 +0,0 @@ -underscored(); - $class = '\\App\\Controller\\' . $name; - $ref = new ReflectionClass($class); - $methods = $ref->getMethods(ReflectionMethod::IS_STATIC); - - try { - foreach ($methods as $method) { - $data = [ - 'controller' => $controller, - 'action' => $method->name - ]; - $location = Model::factory(\Incoviba\common\Location::class)->where('controller', $controller)->where('action', $method->name)->findOne(); - if ($location !== false) { - continue; - } - - $location = Model::factory(\Incoviba\common\Location::class)->create($data); - $location->save(); - $cnt ++; - } - } catch (Exception $e) { - d($e); - $errors ++; - } -} - -if ($errors == 0) { - header('Location: next_step.php?step=log_locations'); -} -?> diff --git a/app_old/public/install/next_step.php b/app_old/public/install/next_step.php deleted file mode 100644 index c370b67..0000000 --- a/app_old/public/install/next_step.php +++ /dev/null @@ -1,20 +0,0 @@ - diff --git a/app_old/public/js/admin.js b/app_old/public/js/admin.js deleted file mode 100644 index a5a69bc..0000000 --- a/app_old/public/js/admin.js +++ /dev/null @@ -1,81 +0,0 @@ -$(document).ready(function() { - $('#databases').submit(function(e) { - e.preventDefault(); - - var db = $("[name='database']").val(); - var models = []; - var namespaces = []; - $.post('?p=admin&action=listModels', {"database": db}).done(function(data) { - //console.debug(data); - var info = $.parseJSON(data); - //console.debug(info.models); - - models = info.models; - //console.debug(models); - - $.post('?p=admin&action=listNamespaces').done(function(data) { - //console.debug(data); - info = $.parseJSON(data); - //console.debug(info.models); - - namespaces = info.namespaces; - //console.debug(namespaces); - - $.each(models, function(i, elem) { - var div = $('

    ').attr('class', 'row'); - div.append($('
    ').attr('class', 'col-md-2').html(elem.model)); - var div2 = $('
    ').attr('class', 'row'); - $.each(namespaces, function(j, ns) { - div2.append($('
    ').attr('class', 'col-md-3').append($('').attr('class', 'ns').attr('data-table', elem.table).attr('data-ns', ns).html(ns))); - }); - div.append($('
    ').attr('class', 'col-md-9').append(div2)); - div.append($('
    ').attr('class', 'col-md-1 remove').append($('').attr('class', 'glyphicon glyphicon-remove'))); - $('#results').append(div); - }); - - $('.ns').css('cursor', 'pointer'); - $('.remove').css('cursor', 'pointer'); - - $('.ns').mouseover(function(e) { - $(this).parent().addClass('bg-success'); - $(this).parent().parent().parent().parent().addClass('bg-warning'); - }).mouseout(function(e) { - $(this).parent().removeClass('bg-success'); - $(this).parent().parent().parent().parent().removeClass('bg-warning'); - }); - - $('.remove').mouseover(function(e) { - $(this).parent().addClass('bg-danger'); - }).mouseout(function(e) { - $(this).parent().removeClass('bg-danger'); - }); - - $('.ns').click(function(e) { - var table = $(this).attr('data-table'); - var ns = $(this).attr('data-ns'); - execute(table, ns); - }); - $('.remove').click(function(e) { - $(this).parent().remove(); - }); - }); - }); - - return false; - }); -}); - -function execute(table, ns) { - console.debug(table, ns); - var db = $("[name='database']").val(); - $.post('?p=admin&action=createModel', {"table": table, "namespace": ns, "database": db}).done(function(data) { - console.debug(data); - var info = $.parseJSON(data); - console.debug(info); - if (info.result) { - $(".ns[data-table='" + table + "']").parent().parent().parent().parent().remove(); - } else { - alert('Error'); - } - }); -} \ No newline at end of file diff --git a/app_old/public/js/app.js b/app_old/public/js/app.js deleted file mode 100644 index 7e4c9f3..0000000 --- a/app_old/public/js/app.js +++ /dev/null @@ -1,89 +0,0 @@ -!function(e){var a={};function i(t){if(a[t])return a[t].exports;var n=a[t]={i:t,l:!1,exports:{}};return e[t].call(n.exports,n,n.exports,i),n.l=!0,n.exports}i.m=e,i.c=a,i.d=function(e,a,t){i.o(e,a)||Object.defineProperty(e,a,{enumerable:!0,get:t})},i.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},i.t=function(e,a){if(1&a&&(e=i(e)),8&a)return e;if(4&a&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(i.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&a&&"string"!=typeof e)for(var n in e)i.d(t,n,function(a){return e[a]}.bind(null,n));return t},i.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return i.d(a,"a",a),a},i.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},i.p="",i(i.s=219)}([function(e,a,i){(function(e){e.exports=function(){"use strict";var a,t;function n(){return a.apply(null,arguments)}function r(e){return e instanceof Array||"[object Array]"===Object.prototype.toString.call(e)}function s(e){return null!=e&&"[object Object]"===Object.prototype.toString.call(e)}function o(e){return void 0===e}function l(e){return"number"==typeof e||"[object Number]"===Object.prototype.toString.call(e)}function d(e){return e instanceof Date||"[object Date]"===Object.prototype.toString.call(e)}function c(e,a){var i,t=[];for(i=0;i>>0,t=0;t0)for(i=0;i=0;return(r?i?"+":"":"-")+Math.pow(10,Math.max(0,n)).toString().substr(1)+t}var I=/(\[[^\[]*\])|(\\)?([Hh]mm(ss)?|Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Qo?|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|kk?|mm?|ss?|S{1,9}|x|X|zz?|ZZ?|.)/g,F=/(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g,N={},R={};function $(e,a,i,t){var n=t;"string"==typeof t&&(n=function(){return this[t]()}),e&&(R[e]=n),a&&(R[a[0]]=function(){return W(n.apply(this,arguments),a[1],a[2])}),i&&(R[i]=function(){return this.localeData().ordinal(n.apply(this,arguments),e)})}function B(e){return e.match(/\[[\s\S]/)?e.replace(/^\[|\]$/g,""):e.replace(/\\/g,"")}function V(e,a){return e.isValid()?(a=U(a,e.localeData()),N[a]=N[a]||function(e){var a,i,t=e.match(I);for(a=0,i=t.length;a=0&&F.test(e);)e=e.replace(F,t),F.lastIndex=0,i-=1;return e}var J=/\d/,G=/\d\d/,K=/\d{3}/,Z=/\d{4}/,X=/[+-]?\d{6}/,Q=/\d\d?/,ee=/\d\d\d\d?/,ae=/\d\d\d\d\d\d?/,ie=/\d{1,3}/,te=/\d{1,4}/,ne=/[+-]?\d{1,6}/,re=/\d+/,se=/[+-]?\d+/,oe=/Z|[+-]\d\d:?\d\d/gi,le=/Z|[+-]\d\d(?::?\d\d)?/gi,de=/[0-9]{0,256}['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFF07\uFF10-\uFFEF]{1,256}|[\u0600-\u06FF\/]{1,256}(\s*?[\u0600-\u06FF]{1,256}){1,2}/i,ce={};function ue(e,a,i){ce[e]=T(a)?a:function(e,t){return e&&i?i:a}}function me(e,a){return u(ce,e)?ce[e](a._strict,a._locale):new RegExp(function(e){return he(e.replace("\\","").replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g,function(e,a,i,t,n){return a||i||t||n}))}(e))}function he(e){return e.replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&")}var ge={};function pe(e,a){var i,t=a;for("string"==typeof e&&(e=[e]),l(a)&&(t=function(e,i){i[a]=x(e)}),i=0;i68?1900:2e3)};var De,Te=qe("FullYear",!0);function qe(e,a){return function(i){return null!=i?(He(this,e,i),n.updateOffset(this,a),this):Se(this,e)}}function Se(e,a){return e.isValid()?e._d["get"+(e._isUTC?"UTC":"")+a]():NaN}function He(e,a,i){e.isValid()&&!isNaN(i)&&("FullYear"===a&&Ye(e.year())&&1===e.month()&&29===e.date()?e._d["set"+(e._isUTC?"UTC":"")+a](i,e.month(),Ce(i,e.month())):e._d["set"+(e._isUTC?"UTC":"")+a](i))}function Ce(e,a){if(isNaN(e)||isNaN(a))return NaN;var i=function(e,a){return(e%a+a)%a}(a,12);return e+=(a-i)/12,1===i?Ye(e)?29:28:31-i%7%2}De=Array.prototype.indexOf?Array.prototype.indexOf:function(e){var a;for(a=0;a=0&&isFinite(a.getUTCFullYear())&&a.setUTCFullYear(e),a}function $e(e,a,i){var t=7+a-i,n=(7+Re(e,0,t).getUTCDay()-a)%7;return-n+t-1}function Be(e,a,i,t,n){var r,s,o=(7+i-t)%7,l=$e(e,t,n),d=1+7*(a-1)+o+l;return d<=0?s=Le(r=e-1)+d:d>Le(e)?(r=e+1,s=d-Le(e)):(r=e,s=d),{year:r,dayOfYear:s}}function Ve(e,a,i){var t,n,r=$e(e.year(),a,i),s=Math.floor((e.dayOfYear()-r-1)/7)+1;return s<1?(n=e.year()-1,t=s+Ue(n,a,i)):s>Ue(e.year(),a,i)?(t=s-Ue(e.year(),a,i),n=e.year()+1):(n=e.year(),t=s),{week:t,year:n}}function Ue(e,a,i){var t=$e(e,a,i),n=$e(e+1,a,i);return(Le(e)-t+n)/7}$("w",["ww",2],"wo","week"),$("W",["WW",2],"Wo","isoWeek"),C("week","w"),C("isoWeek","W"),E("week",5),E("isoWeek",5),ue("w",Q),ue("ww",Q,G),ue("W",Q),ue("WW",Q,G),be(["w","ww","W","WW"],function(e,a,i,t){a[t.substr(0,1)]=x(e)}),$("d",0,"do","day"),$("dd",0,0,function(e){return this.localeData().weekdaysMin(this,e)}),$("ddd",0,0,function(e){return this.localeData().weekdaysShort(this,e)}),$("dddd",0,0,function(e){return this.localeData().weekdays(this,e)}),$("e",0,0,"weekday"),$("E",0,0,"isoWeekday"),C("day","d"),C("weekday","e"),C("isoWeekday","E"),E("day",11),E("weekday",11),E("isoWeekday",11),ue("d",Q),ue("e",Q),ue("E",Q),ue("dd",function(e,a){return a.weekdaysMinRegex(e)}),ue("ddd",function(e,a){return a.weekdaysShortRegex(e)}),ue("dddd",function(e,a){return a.weekdaysRegex(e)}),be(["dd","ddd","dddd"],function(e,a,i,t){var n=i._locale.weekdaysParse(e,t,i._strict);null!=n?a.d=n:g(i).invalidWeekday=e}),be(["d","e","E"],function(e,a,i,t){a[t]=x(e)});var Je="Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),Ge="Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),Ke="Su_Mo_Tu_We_Th_Fr_Sa".split("_"),Ze=de,Xe=de,Qe=de;function ea(){function e(e,a){return a.length-e.length}var a,i,t,n,r,s=[],o=[],l=[],d=[];for(a=0;a<7;a++)i=h([2e3,1]).day(a),t=this.weekdaysMin(i,""),n=this.weekdaysShort(i,""),r=this.weekdays(i,""),s.push(t),o.push(n),l.push(r),d.push(t),d.push(n),d.push(r);for(s.sort(e),o.sort(e),l.sort(e),d.sort(e),a=0;a<7;a++)o[a]=he(o[a]),l[a]=he(l[a]),d[a]=he(d[a]);this._weekdaysRegex=new RegExp("^("+d.join("|")+")","i"),this._weekdaysShortRegex=this._weekdaysRegex,this._weekdaysMinRegex=this._weekdaysRegex,this._weekdaysStrictRegex=new RegExp("^("+l.join("|")+")","i"),this._weekdaysShortStrictRegex=new RegExp("^("+o.join("|")+")","i"),this._weekdaysMinStrictRegex=new RegExp("^("+s.join("|")+")","i")}function aa(){return this.hours()%12||12}function ia(e,a){$(e,0,0,function(){return this.localeData().meridiem(this.hours(),this.minutes(),a)})}function ta(e,a){return a._meridiemParse}$("H",["HH",2],0,"hour"),$("h",["hh",2],0,aa),$("k",["kk",2],0,function(){return this.hours()||24}),$("hmm",0,0,function(){return""+aa.apply(this)+W(this.minutes(),2)}),$("hmmss",0,0,function(){return""+aa.apply(this)+W(this.minutes(),2)+W(this.seconds(),2)}),$("Hmm",0,0,function(){return""+this.hours()+W(this.minutes(),2)}),$("Hmmss",0,0,function(){return""+this.hours()+W(this.minutes(),2)+W(this.seconds(),2)}),ia("a",!0),ia("A",!1),C("hour","h"),E("hour",13),ue("a",ta),ue("A",ta),ue("H",Q),ue("h",Q),ue("k",Q),ue("HH",Q,G),ue("hh",Q,G),ue("kk",Q,G),ue("hmm",ee),ue("hmmss",ae),ue("Hmm",ee),ue("Hmmss",ae),pe(["H","HH"],we),pe(["k","kk"],function(e,a,i){var t=x(e);a[we]=24===t?0:t}),pe(["a","A"],function(e,a,i){i._isPm=i._locale.isPM(e),i._meridiem=e}),pe(["h","hh"],function(e,a,i){a[we]=x(e),g(i).bigHour=!0}),pe("hmm",function(e,a,i){var t=e.length-2;a[we]=x(e.substr(0,t)),a[_e]=x(e.substr(t)),g(i).bigHour=!0}),pe("hmmss",function(e,a,i){var t=e.length-4,n=e.length-2;a[we]=x(e.substr(0,t)),a[_e]=x(e.substr(t,2)),a[xe]=x(e.substr(n)),g(i).bigHour=!0}),pe("Hmm",function(e,a,i){var t=e.length-2;a[we]=x(e.substr(0,t)),a[_e]=x(e.substr(t))}),pe("Hmmss",function(e,a,i){var t=e.length-4,n=e.length-2;a[we]=x(e.substr(0,t)),a[_e]=x(e.substr(t,2)),a[xe]=x(e.substr(n))});var na,ra=qe("Hours",!0),sa={calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},longDateFormat:{LTS:"h:mm:ss A",LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY h:mm A",LLLL:"dddd, MMMM D, YYYY h:mm A"},invalidDate:"Invalid date",ordinal:"%d",dayOfMonthOrdinalParse:/\d{1,2}/,relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",ss:"%d seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},months:Pe,monthsShort:Oe,week:{dow:0,doy:6},weekdays:Je,weekdaysMin:Ke,weekdaysShort:Ge,meridiemParse:/[ap]\.?m?\.?/i},oa={},la={};function da(e){return e?e.toLowerCase().replace("_","-"):e}function ca(a){var t=null;if(!oa[a]&&void 0!==e&&e&&e.exports)try{t=na._abbr,i(168)("./"+a),ua(t)}catch(e){}return oa[a]}function ua(e,a){var i;return e&&((i=o(a)?ha(e):ma(e,a))?na=i:"undefined"!=typeof console&&console.warn&&console.warn("Locale "+e+" not found. Did you forget to load it?")),na._abbr}function ma(e,a){if(null!==a){var i,t=sa;if(a.abbr=e,null!=oa[e])D("defineLocaleOverride","use moment.updateLocale(localeName, config) to change an existing locale. moment.defineLocale(localeName, config) should only be used for creating a new locale See http://momentjs.com/guides/#/warnings/define-locale/ for more info."),t=oa[e]._config;else if(null!=a.parentLocale)if(null!=oa[a.parentLocale])t=oa[a.parentLocale]._config;else{if(null==(i=ca(a.parentLocale)))return la[a.parentLocale]||(la[a.parentLocale]=[]),la[a.parentLocale].push({name:e,config:a}),null;t=i._config}return oa[e]=new S(q(t,a)),la[e]&&la[e].forEach(function(e){ma(e.name,e.config)}),ua(e),oa[e]}return delete oa[e],null}function ha(e){var a;if(e&&e._locale&&e._locale._abbr&&(e=e._locale._abbr),!e)return na;if(!r(e)){if(a=ca(e))return a;e=[e]}return function(e){for(var a,i,t,n,r=0;r0;){if(t=ca(n.slice(0,a).join("-")))return t;if(i&&i.length>=a&&j(n,i,!0)>=a-1)break;a--}r++}return na}(e)}function ga(e){var a,i=e._a;return i&&-2===g(e).overflow&&(a=i[ke]<0||i[ke]>11?ke:i[ve]<1||i[ve]>Ce(i[ye],i[ke])?ve:i[we]<0||i[we]>24||24===i[we]&&(0!==i[_e]||0!==i[xe]||0!==i[je])?we:i[_e]<0||i[_e]>59?_e:i[xe]<0||i[xe]>59?xe:i[je]<0||i[je]>999?je:-1,g(e)._overflowDayOfYear&&(ave)&&(a=ve),g(e)._overflowWeeks&&-1===a&&(a=ze),g(e)._overflowWeekday&&-1===a&&(a=Me),g(e).overflow=a),e}function pa(e,a,i){return null!=e?e:null!=a?a:i}function ba(e){var a,i,t,r,s,o=[];if(!e._d){for(t=function(e){var a=new Date(n.now());return e._useUTC?[a.getUTCFullYear(),a.getUTCMonth(),a.getUTCDate()]:[a.getFullYear(),a.getMonth(),a.getDate()]}(e),e._w&&null==e._a[ve]&&null==e._a[ke]&&function(e){var a,i,t,n,r,s,o,l;if(null!=(a=e._w).GG||null!=a.W||null!=a.E)r=1,s=4,i=pa(a.GG,e._a[ye],Ve(qa(),1,4).year),t=pa(a.W,1),((n=pa(a.E,1))<1||n>7)&&(l=!0);else{r=e._locale._week.dow,s=e._locale._week.doy;var d=Ve(qa(),r,s);i=pa(a.gg,e._a[ye],d.year),t=pa(a.w,d.week),null!=a.d?((n=a.d)<0||n>6)&&(l=!0):null!=a.e?(n=a.e+r,(a.e<0||a.e>6)&&(l=!0)):n=r}t<1||t>Ue(i,r,s)?g(e)._overflowWeeks=!0:null!=l?g(e)._overflowWeekday=!0:(o=Be(i,t,n,r,s),e._a[ye]=o.year,e._dayOfYear=o.dayOfYear)}(e),null!=e._dayOfYear&&(s=pa(e._a[ye],t[ye]),(e._dayOfYear>Le(s)||0===e._dayOfYear)&&(g(e)._overflowDayOfYear=!0),i=Re(s,0,e._dayOfYear),e._a[ke]=i.getUTCMonth(),e._a[ve]=i.getUTCDate()),a=0;a<3&&null==e._a[a];++a)e._a[a]=o[a]=t[a];for(;a<7;a++)e._a[a]=o[a]=null==e._a[a]?2===a?1:0:e._a[a];24===e._a[we]&&0===e._a[_e]&&0===e._a[xe]&&0===e._a[je]&&(e._nextDay=!0,e._a[we]=0),e._d=(e._useUTC?Re:function(e,a,i,t,n,r,s){var o=new Date(e,a,i,t,n,r,s);return e<100&&e>=0&&isFinite(o.getFullYear())&&o.setFullYear(e),o}).apply(null,o),r=e._useUTC?e._d.getUTCDay():e._d.getDay(),null!=e._tzm&&e._d.setUTCMinutes(e._d.getUTCMinutes()-e._tzm),e._nextDay&&(e._a[we]=24),e._w&&void 0!==e._w.d&&e._w.d!==r&&(g(e).weekdayMismatch=!0)}}var fa=/^\s*((?:[+-]\d{6}|\d{4})-(?:\d\d-\d\d|W\d\d-\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?::\d\d(?::\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/,ya=/^\s*((?:[+-]\d{6}|\d{4})(?:\d\d\d\d|W\d\d\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?:\d\d(?:\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/,ka=/Z|[+-]\d\d(?::?\d\d)?/,va=[["YYYYYY-MM-DD",/[+-]\d{6}-\d\d-\d\d/],["YYYY-MM-DD",/\d{4}-\d\d-\d\d/],["GGGG-[W]WW-E",/\d{4}-W\d\d-\d/],["GGGG-[W]WW",/\d{4}-W\d\d/,!1],["YYYY-DDD",/\d{4}-\d{3}/],["YYYY-MM",/\d{4}-\d\d/,!1],["YYYYYYMMDD",/[+-]\d{10}/],["YYYYMMDD",/\d{8}/],["GGGG[W]WWE",/\d{4}W\d{3}/],["GGGG[W]WW",/\d{4}W\d{2}/,!1],["YYYYDDD",/\d{7}/]],wa=[["HH:mm:ss.SSSS",/\d\d:\d\d:\d\d\.\d+/],["HH:mm:ss,SSSS",/\d\d:\d\d:\d\d,\d+/],["HH:mm:ss",/\d\d:\d\d:\d\d/],["HH:mm",/\d\d:\d\d/],["HHmmss.SSSS",/\d\d\d\d\d\d\.\d+/],["HHmmss,SSSS",/\d\d\d\d\d\d,\d+/],["HHmmss",/\d\d\d\d\d\d/],["HHmm",/\d\d\d\d/],["HH",/\d\d/]],_a=/^\/?Date\((\-?\d+)/i;function xa(e){var a,i,t,n,r,s,o=e._i,l=fa.exec(o)||ya.exec(o);if(l){for(g(e).iso=!0,a=0,i=va.length;a0&&g(e).unusedInput.push(s),o=o.slice(o.indexOf(i)+i.length),d+=i.length),R[r]?(i?g(e).empty=!1:g(e).unusedTokens.push(r),fe(r,i,e)):e._strict&&!i&&g(e).unusedTokens.push(r);g(e).charsLeftOver=l-d,o.length>0&&g(e).unusedInput.push(o),e._a[we]<=12&&!0===g(e).bigHour&&e._a[we]>0&&(g(e).bigHour=void 0),g(e).parsedDateParts=e._a.slice(0),g(e).meridiem=e._meridiem,e._a[we]=function(e,a,i){var t;return null==i?a:null!=e.meridiemHour?e.meridiemHour(a,i):null!=e.isPM?((t=e.isPM(i))&&a<12&&(a+=12),t||12!==a||(a=0),a):a}(e._locale,e._a[we],e._meridiem),ba(e),ga(e)}else La(e);else xa(e)}function Da(e){var a=e._i,i=e._f;return e._locale=e._locale||ha(e._l),null===a||void 0===i&&""===a?b({nullInput:!0}):("string"==typeof a&&(e._i=a=e._locale.preparse(a)),w(a)?new v(ga(a)):(d(a)?e._d=a:r(i)?function(e){var a,i,t,n,r;if(0===e._f.length)return g(e).invalidFormat=!0,void(e._d=new Date(NaN));for(n=0;nthis?this:e:b()});function Ca(e,a){var i,t;if(1===a.length&&r(a[0])&&(a=a[0]),!a.length)return qa();for(i=a[0],t=1;tr&&(a=r),function(e,a,i,t,n){var r=Be(e,a,i,t,n),s=Re(r.year,0,r.dayOfYear);return this.year(s.getUTCFullYear()),this.month(s.getUTCMonth()),this.date(s.getUTCDate()),this}.call(this,e,a,i,t,n))}$(0,["gg",2],0,function(){return this.weekYear()%100}),$(0,["GG",2],0,function(){return this.isoWeekYear()%100}),ni("gggg","weekYear"),ni("ggggg","weekYear"),ni("GGGG","isoWeekYear"),ni("GGGGG","isoWeekYear"),C("weekYear","gg"),C("isoWeekYear","GG"),E("weekYear",1),E("isoWeekYear",1),ue("G",se),ue("g",se),ue("GG",Q,G),ue("gg",Q,G),ue("GGGG",te,Z),ue("gggg",te,Z),ue("GGGGG",ne,X),ue("ggggg",ne,X),be(["gggg","ggggg","GGGG","GGGGG"],function(e,a,i,t){a[t.substr(0,2)]=x(e)}),be(["gg","GG"],function(e,a,i,t){a[t]=n.parseTwoDigitYear(e)}),$("Q",0,"Qo","quarter"),C("quarter","Q"),E("quarter",7),ue("Q",J),pe("Q",function(e,a){a[ke]=3*(x(e)-1)}),$("D",["DD",2],"Do","date"),C("date","D"),E("date",9),ue("D",Q),ue("DD",Q,G),ue("Do",function(e,a){return e?a._dayOfMonthOrdinalParse||a._ordinalParse:a._dayOfMonthOrdinalParseLenient}),pe(["D","DD"],ve),pe("Do",function(e,a){a[ve]=x(e.match(Q)[0])});var si=qe("Date",!0);$("DDD",["DDDD",3],"DDDo","dayOfYear"),C("dayOfYear","DDD"),E("dayOfYear",4),ue("DDD",ie),ue("DDDD",K),pe(["DDD","DDDD"],function(e,a,i){i._dayOfYear=x(e)}),$("m",["mm",2],0,"minute"),C("minute","m"),E("minute",14),ue("m",Q),ue("mm",Q,G),pe(["m","mm"],_e);var oi=qe("Minutes",!1);$("s",["ss",2],0,"second"),C("second","s"),E("second",15),ue("s",Q),ue("ss",Q,G),pe(["s","ss"],xe);var li,di=qe("Seconds",!1);for($("S",0,0,function(){return~~(this.millisecond()/100)}),$(0,["SS",2],0,function(){return~~(this.millisecond()/10)}),$(0,["SSS",3],0,"millisecond"),$(0,["SSSS",4],0,function(){return 10*this.millisecond()}),$(0,["SSSSS",5],0,function(){return 100*this.millisecond()}),$(0,["SSSSSS",6],0,function(){return 1e3*this.millisecond()}),$(0,["SSSSSSS",7],0,function(){return 1e4*this.millisecond()}),$(0,["SSSSSSSS",8],0,function(){return 1e5*this.millisecond()}),$(0,["SSSSSSSSS",9],0,function(){return 1e6*this.millisecond()}),C("millisecond","ms"),E("millisecond",16),ue("S",ie,J),ue("SS",ie,G),ue("SSS",ie,K),li="SSSS";li.length<=9;li+="S")ue(li,re);function ci(e,a){a[je]=x(1e3*("0."+e))}for(li="S";li.length<=9;li+="S")pe(li,ci);var ui=qe("Milliseconds",!1);$("z",0,0,"zoneAbbr"),$("zz",0,0,"zoneName");var mi=v.prototype;function hi(e){return e}mi.add=Xa,mi.calendar=function(e,a){var i=e||qa(),t=Na(i,this).startOf("day"),r=n.calendarFormat(this,t)||"sameElse",s=a&&(T(a[r])?a[r].call(this,i):a[r]);return this.format(s||this.localeData().calendar(r,this,qa(i)))},mi.clone=function(){return new v(this)},mi.diff=function(e,a,i){var t,n,r;if(!this.isValid())return NaN;if(!(t=Na(e,this)).isValid())return NaN;switch(n=6e4*(t.utcOffset()-this.utcOffset()),a=A(a)){case"year":r=ei(this,t)/12;break;case"month":r=ei(this,t);break;case"quarter":r=ei(this,t)/3;break;case"second":r=(this-t)/1e3;break;case"minute":r=(this-t)/6e4;break;case"hour":r=(this-t)/36e5;break;case"day":r=(this-t-n)/864e5;break;case"week":r=(this-t-n)/6048e5;break;default:r=this-t}return i?r:_(r)},mi.endOf=function(e){return void 0===(e=A(e))||"millisecond"===e?this:("date"===e&&(e="day"),this.startOf(e).add(1,"isoWeek"===e?"week":e).subtract(1,"ms"))},mi.format=function(e){e||(e=this.isUtc()?n.defaultFormatUtc:n.defaultFormat);var a=V(this,e);return this.localeData().postformat(a)},mi.from=function(e,a){return this.isValid()&&(w(e)&&e.isValid()||qa(e).isValid())?Ua({to:this,from:e}).locale(this.locale()).humanize(!a):this.localeData().invalidDate()},mi.fromNow=function(e){return this.from(qa(),e)},mi.to=function(e,a){return this.isValid()&&(w(e)&&e.isValid()||qa(e).isValid())?Ua({from:this,to:e}).locale(this.locale()).humanize(!a):this.localeData().invalidDate()},mi.toNow=function(e){return this.to(qa(),e)},mi.get=function(e){return T(this[e=A(e)])?this[e]():this},mi.invalidAt=function(){return g(this).overflow},mi.isAfter=function(e,a){var i=w(e)?e:qa(e);return!(!this.isValid()||!i.isValid())&&("millisecond"===(a=A(o(a)?"millisecond":a))?this.valueOf()>i.valueOf():i.valueOf()9999?V(i,a?"YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]":"YYYYYY-MM-DD[T]HH:mm:ss.SSSZ"):T(Date.prototype.toISOString)?a?this.toDate().toISOString():new Date(this.valueOf()+60*this.utcOffset()*1e3).toISOString().replace("Z",V(i,"Z")):V(i,a?"YYYY-MM-DD[T]HH:mm:ss.SSS[Z]":"YYYY-MM-DD[T]HH:mm:ss.SSSZ")},mi.inspect=function(){if(!this.isValid())return"moment.invalid(/* "+this._i+" */)";var e="moment",a="";this.isLocal()||(e=0===this.utcOffset()?"moment.utc":"moment.parseZone",a="Z");var i="["+e+'("]',t=0<=this.year()&&this.year()<=9999?"YYYY":"YYYYYY",n=a+'[")]';return this.format(i+t+"-MM-DD[T]HH:mm:ss.SSS"+n)},mi.toJSON=function(){return this.isValid()?this.toISOString():null},mi.toString=function(){return this.clone().locale("en").format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ")},mi.unix=function(){return Math.floor(this.valueOf()/1e3)},mi.valueOf=function(){return this._d.valueOf()-6e4*(this._offset||0)},mi.creationData=function(){return{input:this._i,format:this._f,locale:this._locale,isUTC:this._isUTC,strict:this._strict}},mi.year=Te,mi.isLeapYear=function(){return Ye(this.year())},mi.weekYear=function(e){return ri.call(this,e,this.week(),this.weekday(),this.localeData()._week.dow,this.localeData()._week.doy)},mi.isoWeekYear=function(e){return ri.call(this,e,this.isoWeek(),this.isoWeekday(),1,4)},mi.quarter=mi.quarters=function(e){return null==e?Math.ceil((this.month()+1)/3):this.month(3*(e-1)+this.month()%3)},mi.month=We,mi.daysInMonth=function(){return Ce(this.year(),this.month())},mi.week=mi.weeks=function(e){var a=this.localeData().week(this);return null==e?a:this.add(7*(e-a),"d")},mi.isoWeek=mi.isoWeeks=function(e){var a=Ve(this,1,4).week;return null==e?a:this.add(7*(e-a),"d")},mi.weeksInYear=function(){var e=this.localeData()._week;return Ue(this.year(),e.dow,e.doy)},mi.isoWeeksInYear=function(){return Ue(this.year(),1,4)},mi.date=si,mi.day=mi.days=function(e){if(!this.isValid())return null!=e?this:NaN;var a=this._isUTC?this._d.getUTCDay():this._d.getDay();return null!=e?(e=function(e,a){return"string"!=typeof e?e:isNaN(e)?"number"==typeof(e=a.weekdaysParse(e))?e:null:parseInt(e,10)}(e,this.localeData()),this.add(e-a,"d")):a},mi.weekday=function(e){if(!this.isValid())return null!=e?this:NaN;var a=(this.day()+7-this.localeData()._week.dow)%7;return null==e?a:this.add(e-a,"d")},mi.isoWeekday=function(e){if(!this.isValid())return null!=e?this:NaN;if(null!=e){var a=function(e,a){return"string"==typeof e?a.weekdaysParse(e)%7||7:isNaN(e)?null:e}(e,this.localeData());return this.day(this.day()%7?a:a-7)}return this.day()||7},mi.dayOfYear=function(e){var a=Math.round((this.clone().startOf("day")-this.clone().startOf("year"))/864e5)+1;return null==e?a:this.add(e-a,"d")},mi.hour=mi.hours=ra,mi.minute=mi.minutes=oi,mi.second=mi.seconds=di,mi.millisecond=mi.milliseconds=ui,mi.utcOffset=function(e,a,i){var t,r=this._offset||0;if(!this.isValid())return null!=e?this:NaN;if(null!=e){if("string"==typeof e){if(null===(e=Fa(le,e)))return this}else Math.abs(e)<16&&!i&&(e*=60);return!this._isUTC&&a&&(t=Ra(this)),this._offset=e,this._isUTC=!0,null!=t&&this.add(t,"m"),r!==e&&(!a||this._changeInProgress?Za(this,Ua(e-r,"m"),1,!1):this._changeInProgress||(this._changeInProgress=!0,n.updateOffset(this,!0),this._changeInProgress=null)),this}return this._isUTC?r:Ra(this)},mi.utc=function(e){return this.utcOffset(0,e)},mi.local=function(e){return this._isUTC&&(this.utcOffset(0,e),this._isUTC=!1,e&&this.subtract(Ra(this),"m")),this},mi.parseZone=function(){if(null!=this._tzm)this.utcOffset(this._tzm,!1,!0);else if("string"==typeof this._i){var e=Fa(oe,this._i);null!=e?this.utcOffset(e):this.utcOffset(0,!0)}return this},mi.hasAlignedHourOffset=function(e){return!!this.isValid()&&(e=e?qa(e).utcOffset():0,(this.utcOffset()-e)%60==0)},mi.isDST=function(){return this.utcOffset()>this.clone().month(0).utcOffset()||this.utcOffset()>this.clone().month(5).utcOffset()},mi.isLocal=function(){return!!this.isValid()&&!this._isUTC},mi.isUtcOffset=function(){return!!this.isValid()&&this._isUTC},mi.isUtc=$a,mi.isUTC=$a,mi.zoneAbbr=function(){return this._isUTC?"UTC":""},mi.zoneName=function(){return this._isUTC?"Coordinated Universal Time":""},mi.dates=M("dates accessor is deprecated. Use date instead.",si),mi.months=M("months accessor is deprecated. Use month instead",We),mi.years=M("years accessor is deprecated. Use year instead",Te),mi.zone=M("moment().zone is deprecated, use moment().utcOffset instead. http://momentjs.com/guides/#/warnings/zone/",function(e,a){return null!=e?("string"!=typeof e&&(e=-e),this.utcOffset(e,a),this):-this.utcOffset()}),mi.isDSTShifted=M("isDSTShifted is deprecated. See http://momentjs.com/guides/#/warnings/dst-shifted/ for more information",function(){if(!o(this._isDSTShifted))return this._isDSTShifted;var e={};if(y(e,this),(e=Da(e))._a){var a=e._isUTC?h(e._a):qa(e._a);this._isDSTShifted=this.isValid()&&j(e._a,a.toArray())>0}else this._isDSTShifted=!1;return this._isDSTShifted});var gi=S.prototype;function pi(e,a,i,t){var n=ha(),r=h().set(t,a);return n[i](r,e)}function bi(e,a,i){if(l(e)&&(a=e,e=void 0),e=e||"",null!=a)return pi(e,a,i,"month");var t,n=[];for(t=0;t<12;t++)n[t]=pi(e,t,i,"month");return n}function fi(e,a,i,t){"boolean"==typeof e?(l(a)&&(i=a,a=void 0),a=a||""):(i=a=e,e=!1,l(a)&&(i=a,a=void 0),a=a||"");var n,r=ha(),s=e?r._week.dow:0;if(null!=i)return pi(a,(i+s)%7,t,"day");var o=[];for(n=0;n<7;n++)o[n]=pi(a,(n+s)%7,t,"day");return o}gi.calendar=function(e,a,i){var t=this._calendar[e]||this._calendar.sameElse;return T(t)?t.call(a,i):t},gi.longDateFormat=function(e){var a=this._longDateFormat[e],i=this._longDateFormat[e.toUpperCase()];return a||!i?a:(this._longDateFormat[e]=i.replace(/MMMM|MM|DD|dddd/g,function(e){return e.slice(1)}),this._longDateFormat[e])},gi.invalidDate=function(){return this._invalidDate},gi.ordinal=function(e){return this._ordinal.replace("%d",e)},gi.preparse=hi,gi.postformat=hi,gi.relativeTime=function(e,a,i,t){var n=this._relativeTime[i];return T(n)?n(e,a,i,t):n.replace(/%d/i,e)},gi.pastFuture=function(e,a){var i=this._relativeTime[e>0?"future":"past"];return T(i)?i(a):i.replace(/%s/i,a)},gi.set=function(e){var a,i;for(i in e)T(a=e[i])?this[i]=a:this["_"+i]=a;this._config=e,this._dayOfMonthOrdinalParseLenient=new RegExp((this._dayOfMonthOrdinalParse.source||this._ordinalParse.source)+"|"+/\d{1,2}/.source)},gi.months=function(e,a){return e?r(this._months)?this._months[e.month()]:this._months[(this._months.isFormat||Ae).test(a)?"format":"standalone"][e.month()]:r(this._months)?this._months:this._months.standalone},gi.monthsShort=function(e,a){return e?r(this._monthsShort)?this._monthsShort[e.month()]:this._monthsShort[Ae.test(a)?"format":"standalone"][e.month()]:r(this._monthsShort)?this._monthsShort:this._monthsShort.standalone},gi.monthsParse=function(e,a,i){var t,n,r;if(this._monthsParseExact)return function(e,a,i){var t,n,r,s=e.toLocaleLowerCase();if(!this._monthsParse)for(this._monthsParse=[],this._longMonthsParse=[],this._shortMonthsParse=[],t=0;t<12;++t)r=h([2e3,t]),this._shortMonthsParse[t]=this.monthsShort(r,"").toLocaleLowerCase(),this._longMonthsParse[t]=this.months(r,"").toLocaleLowerCase();return i?"MMM"===a?-1!==(n=De.call(this._shortMonthsParse,s))?n:null:-1!==(n=De.call(this._longMonthsParse,s))?n:null:"MMM"===a?-1!==(n=De.call(this._shortMonthsParse,s))?n:-1!==(n=De.call(this._longMonthsParse,s))?n:null:-1!==(n=De.call(this._longMonthsParse,s))?n:-1!==(n=De.call(this._shortMonthsParse,s))?n:null}.call(this,e,a,i);for(this._monthsParse||(this._monthsParse=[],this._longMonthsParse=[],this._shortMonthsParse=[]),t=0;t<12;t++){if(n=h([2e3,t]),i&&!this._longMonthsParse[t]&&(this._longMonthsParse[t]=new RegExp("^"+this.months(n,"").replace(".","")+"$","i"),this._shortMonthsParse[t]=new RegExp("^"+this.monthsShort(n,"").replace(".","")+"$","i")),i||this._monthsParse[t]||(r="^"+this.months(n,"")+"|^"+this.monthsShort(n,""),this._monthsParse[t]=new RegExp(r.replace(".",""),"i")),i&&"MMMM"===a&&this._longMonthsParse[t].test(e))return t;if(i&&"MMM"===a&&this._shortMonthsParse[t].test(e))return t;if(!i&&this._monthsParse[t].test(e))return t}},gi.monthsRegex=function(e){return this._monthsParseExact?(u(this,"_monthsRegex")||Ne.call(this),e?this._monthsStrictRegex:this._monthsRegex):(u(this,"_monthsRegex")||(this._monthsRegex=Fe),this._monthsStrictRegex&&e?this._monthsStrictRegex:this._monthsRegex)},gi.monthsShortRegex=function(e){return this._monthsParseExact?(u(this,"_monthsRegex")||Ne.call(this),e?this._monthsShortStrictRegex:this._monthsShortRegex):(u(this,"_monthsShortRegex")||(this._monthsShortRegex=Ie),this._monthsShortStrictRegex&&e?this._monthsShortStrictRegex:this._monthsShortRegex)},gi.week=function(e){return Ve(e,this._week.dow,this._week.doy).week},gi.firstDayOfYear=function(){return this._week.doy},gi.firstDayOfWeek=function(){return this._week.dow},gi.weekdays=function(e,a){return e?r(this._weekdays)?this._weekdays[e.day()]:this._weekdays[this._weekdays.isFormat.test(a)?"format":"standalone"][e.day()]:r(this._weekdays)?this._weekdays:this._weekdays.standalone},gi.weekdaysMin=function(e){return e?this._weekdaysMin[e.day()]:this._weekdaysMin},gi.weekdaysShort=function(e){return e?this._weekdaysShort[e.day()]:this._weekdaysShort},gi.weekdaysParse=function(e,a,i){var t,n,r;if(this._weekdaysParseExact)return function(e,a,i){var t,n,r,s=e.toLocaleLowerCase();if(!this._weekdaysParse)for(this._weekdaysParse=[],this._shortWeekdaysParse=[],this._minWeekdaysParse=[],t=0;t<7;++t)r=h([2e3,1]).day(t),this._minWeekdaysParse[t]=this.weekdaysMin(r,"").toLocaleLowerCase(),this._shortWeekdaysParse[t]=this.weekdaysShort(r,"").toLocaleLowerCase(),this._weekdaysParse[t]=this.weekdays(r,"").toLocaleLowerCase();return i?"dddd"===a?-1!==(n=De.call(this._weekdaysParse,s))?n:null:"ddd"===a?-1!==(n=De.call(this._shortWeekdaysParse,s))?n:null:-1!==(n=De.call(this._minWeekdaysParse,s))?n:null:"dddd"===a?-1!==(n=De.call(this._weekdaysParse,s))?n:-1!==(n=De.call(this._shortWeekdaysParse,s))?n:-1!==(n=De.call(this._minWeekdaysParse,s))?n:null:"ddd"===a?-1!==(n=De.call(this._shortWeekdaysParse,s))?n:-1!==(n=De.call(this._weekdaysParse,s))?n:-1!==(n=De.call(this._minWeekdaysParse,s))?n:null:-1!==(n=De.call(this._minWeekdaysParse,s))?n:-1!==(n=De.call(this._weekdaysParse,s))?n:-1!==(n=De.call(this._shortWeekdaysParse,s))?n:null}.call(this,e,a,i);for(this._weekdaysParse||(this._weekdaysParse=[],this._minWeekdaysParse=[],this._shortWeekdaysParse=[],this._fullWeekdaysParse=[]),t=0;t<7;t++){if(n=h([2e3,1]).day(t),i&&!this._fullWeekdaysParse[t]&&(this._fullWeekdaysParse[t]=new RegExp("^"+this.weekdays(n,"").replace(".","\\.?")+"$","i"),this._shortWeekdaysParse[t]=new RegExp("^"+this.weekdaysShort(n,"").replace(".","\\.?")+"$","i"),this._minWeekdaysParse[t]=new RegExp("^"+this.weekdaysMin(n,"").replace(".","\\.?")+"$","i")),this._weekdaysParse[t]||(r="^"+this.weekdays(n,"")+"|^"+this.weekdaysShort(n,"")+"|^"+this.weekdaysMin(n,""),this._weekdaysParse[t]=new RegExp(r.replace(".",""),"i")),i&&"dddd"===a&&this._fullWeekdaysParse[t].test(e))return t;if(i&&"ddd"===a&&this._shortWeekdaysParse[t].test(e))return t;if(i&&"dd"===a&&this._minWeekdaysParse[t].test(e))return t;if(!i&&this._weekdaysParse[t].test(e))return t}},gi.weekdaysRegex=function(e){return this._weekdaysParseExact?(u(this,"_weekdaysRegex")||ea.call(this),e?this._weekdaysStrictRegex:this._weekdaysRegex):(u(this,"_weekdaysRegex")||(this._weekdaysRegex=Ze),this._weekdaysStrictRegex&&e?this._weekdaysStrictRegex:this._weekdaysRegex)},gi.weekdaysShortRegex=function(e){return this._weekdaysParseExact?(u(this,"_weekdaysRegex")||ea.call(this),e?this._weekdaysShortStrictRegex:this._weekdaysShortRegex):(u(this,"_weekdaysShortRegex")||(this._weekdaysShortRegex=Xe),this._weekdaysShortStrictRegex&&e?this._weekdaysShortStrictRegex:this._weekdaysShortRegex)},gi.weekdaysMinRegex=function(e){return this._weekdaysParseExact?(u(this,"_weekdaysRegex")||ea.call(this),e?this._weekdaysMinStrictRegex:this._weekdaysMinRegex):(u(this,"_weekdaysMinRegex")||(this._weekdaysMinRegex=Qe),this._weekdaysMinStrictRegex&&e?this._weekdaysMinStrictRegex:this._weekdaysMinRegex)},gi.isPM=function(e){return"p"===(e+"").toLowerCase().charAt(0)},gi.meridiem=function(e,a,i){return e>11?i?"pm":"PM":i?"am":"AM"},ua("en",{dayOfMonthOrdinalParse:/\d{1,2}(th|st|nd|rd)/,ordinal:function(e){var a=e%10,i=1===x(e%100/10)?"th":1===a?"st":2===a?"nd":3===a?"rd":"th";return e+i}}),n.lang=M("moment.lang is deprecated. Use moment.locale instead.",ua),n.langData=M("moment.langData is deprecated. Use moment.localeData instead.",ha);var yi=Math.abs;function ki(e,a,i,t){var n=Ua(a,i);return e._milliseconds+=t*n._milliseconds,e._days+=t*n._days,e._months+=t*n._months,e._bubble()}function vi(e){return e<0?Math.floor(e):Math.ceil(e)}function wi(e){return 4800*e/146097}function _i(e){return 146097*e/4800}function xi(e){return function(){return this.as(e)}}var ji=xi("ms"),zi=xi("s"),Mi=xi("m"),Li=xi("h"),Yi=xi("d"),Di=xi("w"),Ti=xi("M"),qi=xi("y");function Si(e){return function(){return this.isValid()?this._data[e]:NaN}}var Hi=Si("milliseconds"),Ci=Si("seconds"),Ai=Si("minutes"),Pi=Si("hours"),Oi=Si("days"),Ei=Si("months"),Wi=Si("years"),Ii=Math.round,Fi={ss:44,s:45,m:45,h:22,d:26,M:11},Ni=Math.abs;function Ri(e){return(e>0)-(e<0)||+e}function $i(){if(!this.isValid())return this.localeData().invalidDate();var e,a,i=Ni(this._milliseconds)/1e3,t=Ni(this._days),n=Ni(this._months);e=_(i/60),a=_(e/60),i%=60,e%=60;var r=_(n/12),s=n%=12,o=t,l=a,d=e,c=i?i.toFixed(3).replace(/\.?0+$/,""):"",u=this.asSeconds();if(!u)return"P0D";var m=u<0?"-":"",h=Ri(this._months)!==Ri(u)?"-":"",g=Ri(this._days)!==Ri(u)?"-":"",p=Ri(this._milliseconds)!==Ri(u)?"-":"";return m+"P"+(r?h+r+"Y":"")+(s?h+s+"M":"")+(o?g+o+"D":"")+(l||d||c?"T":"")+(l?p+l+"H":"")+(d?p+d+"M":"")+(c?p+c+"S":"")}var Bi=Pa.prototype;return Bi.isValid=function(){return this._isValid},Bi.abs=function(){var e=this._data;return this._milliseconds=yi(this._milliseconds),this._days=yi(this._days),this._months=yi(this._months),e.milliseconds=yi(e.milliseconds),e.seconds=yi(e.seconds),e.minutes=yi(e.minutes),e.hours=yi(e.hours),e.months=yi(e.months),e.years=yi(e.years),this},Bi.add=function(e,a){return ki(this,e,a,1)},Bi.subtract=function(e,a){return ki(this,e,a,-1)},Bi.as=function(e){if(!this.isValid())return NaN;var a,i,t=this._milliseconds;if("month"===(e=A(e))||"year"===e)return a=this._days+t/864e5,i=this._months+wi(a),"month"===e?i:i/12;switch(a=this._days+Math.round(_i(this._months)),e){case"week":return a/7+t/6048e5;case"day":return a+t/864e5;case"hour":return 24*a+t/36e5;case"minute":return 1440*a+t/6e4;case"second":return 86400*a+t/1e3;case"millisecond":return Math.floor(864e5*a)+t;default:throw new Error("Unknown unit "+e)}},Bi.asMilliseconds=ji,Bi.asSeconds=zi,Bi.asMinutes=Mi,Bi.asHours=Li,Bi.asDays=Yi,Bi.asWeeks=Di,Bi.asMonths=Ti,Bi.asYears=qi,Bi.valueOf=function(){return this.isValid()?this._milliseconds+864e5*this._days+this._months%12*2592e6+31536e6*x(this._months/12):NaN},Bi._bubble=function(){var e,a,i,t,n,r=this._milliseconds,s=this._days,o=this._months,l=this._data;return r>=0&&s>=0&&o>=0||r<=0&&s<=0&&o<=0||(r+=864e5*vi(_i(o)+s),s=0,o=0),l.milliseconds=r%1e3,e=_(r/1e3),l.seconds=e%60,a=_(e/60),l.minutes=a%60,i=_(a/60),l.hours=i%24,s+=_(i/24),n=_(wi(s)),o+=n,s-=vi(_i(n)),t=_(o/12),o%=12,l.days=s,l.months=o,l.years=t,this},Bi.clone=function(){return Ua(this)},Bi.get=function(e){return e=A(e),this.isValid()?this[e+"s"]():NaN},Bi.milliseconds=Hi,Bi.seconds=Ci,Bi.minutes=Ai,Bi.hours=Pi,Bi.days=Oi,Bi.weeks=function(){return _(this.days()/7)},Bi.months=Ei,Bi.years=Wi,Bi.humanize=function(e){if(!this.isValid())return this.localeData().invalidDate();var a=this.localeData(),i=function(e,a,i){var t=Ua(e).abs(),n=Ii(t.as("s")),r=Ii(t.as("m")),s=Ii(t.as("h")),o=Ii(t.as("d")),l=Ii(t.as("M")),d=Ii(t.as("y")),c=n<=Fi.ss&&["s",n]||n0,c[4]=i,function(e,a,i,t,n){return n.relativeTime(a||1,!!i,e,t)}.apply(null,c)}(this,!e,a);return e&&(i=a.pastFuture(+this,i)),a.postformat(i)},Bi.toISOString=$i,Bi.toString=$i,Bi.toJSON=$i,Bi.locale=ai,Bi.localeData=ti,Bi.toIsoString=M("toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)",$i),Bi.lang=ii,$("X",0,0,"unix"),$("x",0,0,"valueOf"),ue("x",se),ue("X",/[+-]?\d+(\.\d{1,3})?/),pe("X",function(e,a,i){i._d=new Date(1e3*parseFloat(e,10))}),pe("x",function(e,a,i){i._d=new Date(x(e))}),n.version="2.22.2",function(e){a=e}(qa),n.fn=mi,n.min=function(){return Ca("isBefore",[].slice.call(arguments,0))},n.max=function(){return Ca("isAfter",[].slice.call(arguments,0))},n.now=function(){return Date.now?Date.now():+new Date},n.utc=h,n.unix=function(e){return qa(1e3*e)},n.months=function(e,a){return bi(e,a,"months")},n.isDate=d,n.locale=ua,n.invalid=b,n.duration=Ua,n.isMoment=w,n.weekdays=function(e,a,i){return fi(e,a,i,"weekdays")},n.parseZone=function(){return qa.apply(null,arguments).parseZone()},n.localeData=ha,n.isDuration=Oa,n.monthsShort=function(e,a){return bi(e,a,"monthsShort")},n.weekdaysMin=function(e,a,i){return fi(e,a,i,"weekdaysMin")},n.defineLocale=ma,n.updateLocale=function(e,a){if(null!=a){var i,t,n=sa;null!=(t=ca(e))&&(n=t._config),a=q(n,a),(i=new S(a)).parentLocale=oa[e],oa[e]=i,ua(e)}else null!=oa[e]&&(null!=oa[e].parentLocale?oa[e]=oa[e].parentLocale:null!=oa[e]&&delete oa[e]);return oa[e]},n.locales=function(){return L(oa)},n.weekdaysShort=function(e,a,i){return fi(e,a,i,"weekdaysShort")},n.normalizeUnits=A,n.relativeTimeRounding=function(e){return void 0===e?Ii:"function"==typeof e&&(Ii=e,!0)},n.relativeTimeThreshold=function(e,a){return void 0!==Fi[e]&&(void 0===a?Fi[e]:(Fi[e]=a,"s"===e&&(Fi.ss=a-1),!0))},n.calendarFormat=function(e,a){var i=e.diff(a,"days",!0);return i<-6?"sameElse":i<-1?"lastWeek":i<0?"lastDay":i<1?"sameDay":i<2?"nextDay":i<7?"nextWeek":"sameElse"},n.prototype=mi,n.HTML5_FMT={DATETIME_LOCAL:"YYYY-MM-DDTHH:mm",DATETIME_LOCAL_SECONDS:"YYYY-MM-DDTHH:mm:ss",DATETIME_LOCAL_MS:"YYYY-MM-DDTHH:mm:ss.SSS",DATE:"YYYY-MM-DD",TIME:"HH:mm",TIME_SECONDS:"HH:mm:ss",TIME_MS:"HH:mm:ss.SSS",WEEK:"YYYY-[W]WW",MONTH:"YYYY-MM"},n}()}).call(this,i(169)(e))},function(e,a,i){"use strict";e.exports=i(9),e.exports.easing=i(195),e.exports.canvas=i(194),e.exports.options=i(193)},function(e,a,i){"use strict";var t=i(1);e.exports={_set:function(e,a){return t.merge(this[e]||(this[e]={}),a)}}},function(e,a,i){var t; -/*! - * jQuery JavaScript Library v3.3.1 - * https://jquery.com/ - * - * Includes Sizzle.js - * https://sizzlejs.com/ - * - * Copyright JS Foundation and other contributors - * Released under the MIT license - * https://jquery.org/license - * - * Date: 2018-01-20T17:24Z - */ -/*! - * jQuery JavaScript Library v3.3.1 - * https://jquery.com/ - * - * Includes Sizzle.js - * https://sizzlejs.com/ - * - * Copyright JS Foundation and other contributors - * Released under the MIT license - * https://jquery.org/license - * - * Date: 2018-01-20T17:24Z - */ -!function(a,i){"use strict";"object"==typeof e&&"object"==typeof e.exports?e.exports=a.document?i(a,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return i(e)}:i(a)}("undefined"!=typeof window?window:this,function(i,n){"use strict";var r=[],s=i.document,o=Object.getPrototypeOf,l=r.slice,d=r.concat,c=r.push,u=r.indexOf,m={},h=m.toString,g=m.hasOwnProperty,p=g.toString,b=p.call(Object),f={},y=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType},k=function(e){return null!=e&&e===e.window},v={type:!0,src:!0,noModule:!0};function w(e,a,i){var t,n=(a=a||s).createElement("script");if(n.text=e,i)for(t in v)i[t]&&(n[t]=i[t]);a.head.appendChild(n).parentNode.removeChild(n)}function _(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?m[h.call(e)]||"object":typeof e}var x=function(e,a){return new x.fn.init(e,a)},j=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;function z(e){var a=!!e&&"length"in e&&e.length,i=_(e);return!y(e)&&!k(e)&&("array"===i||0===a||"number"==typeof a&&a>0&&a-1 in e)}x.fn=x.prototype={jquery:"3.3.1",constructor:x,length:0,toArray:function(){return l.call(this)},get:function(e){return null==e?l.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var a=x.merge(this.constructor(),e);return a.prevObject=this,a},each:function(e){return x.each(this,e)},map:function(e){return this.pushStack(x.map(this,function(a,i){return e.call(a,i,a)}))},slice:function(){return this.pushStack(l.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var a=this.length,i=+e+(e<0?a:0);return this.pushStack(i>=0&&i+~]|"+P+")"+P+"*"),$=new RegExp("="+P+"*([^\\]'\"]*?)"+P+"*\\]","g"),B=new RegExp(W),V=new RegExp("^"+O+"$"),U={ID:new RegExp("^#("+O+")"),CLASS:new RegExp("^\\.("+O+")"),TAG:new RegExp("^("+O+"|[*])"),ATTR:new RegExp("^"+E),PSEUDO:new RegExp("^"+W),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+P+"*(even|odd|(([+-]|)(\\d*)n|)"+P+"*(?:([+-]|)"+P+"*(\\d+)|))"+P+"*\\)|)","i"),bool:new RegExp("^(?:"+A+")$","i"),needsContext:new RegExp("^"+P+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+P+"*((?:-\\d)?\\d*)"+P+"*\\)|)(?=[^-]|$)","i")},J=/^(?:input|select|textarea|button)$/i,G=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,X=/[+~]/,Q=new RegExp("\\\\([\\da-f]{1,6}"+P+"?|("+P+")|.)","ig"),ee=function(e,a,i){var t="0x"+a-65536;return t!=t||i?a:t<0?String.fromCharCode(t+65536):String.fromCharCode(t>>10|55296,1023&t|56320)},ae=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,a){return a?"\0"===e?"�":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},te=function(){m()},ne=ye(function(e){return!0===e.disabled&&("form"in e||"label"in e)},{dir:"parentNode",next:"legend"});try{S.apply(D=H.call(w.childNodes),w.childNodes),D[w.childNodes.length].nodeType}catch(e){S={apply:D.length?function(e,a){q.apply(e,H.call(a))}:function(e,a){for(var i=e.length,t=0;e[i++]=a[t++];);e.length=i-1}}}function re(e,a,t,n){var r,o,d,c,u,g,f,y=a&&a.ownerDocument,_=a?a.nodeType:9;if(t=t||[],"string"!=typeof e||!e||1!==_&&9!==_&&11!==_)return t;if(!n&&((a?a.ownerDocument||a:w)!==h&&m(a),a=a||h,p)){if(11!==_&&(u=Z.exec(e)))if(r=u[1]){if(9===_){if(!(d=a.getElementById(r)))return t;if(d.id===r)return t.push(d),t}else if(y&&(d=y.getElementById(r))&&k(a,d)&&d.id===r)return t.push(d),t}else{if(u[2])return S.apply(t,a.getElementsByTagName(e)),t;if((r=u[3])&&i.getElementsByClassName&&a.getElementsByClassName)return S.apply(t,a.getElementsByClassName(r)),t}if(i.qsa&&!M[e+" "]&&(!b||!b.test(e))){if(1!==_)y=a,f=e;else if("object"!==a.nodeName.toLowerCase()){for((c=a.getAttribute("id"))?c=c.replace(ae,ie):a.setAttribute("id",c=v),o=(g=s(e)).length;o--;)g[o]="#"+c+" "+fe(g[o]);f=g.join(","),y=X.test(e)&&pe(a.parentNode)||a}if(f)try{return S.apply(t,y.querySelectorAll(f)),t}catch(e){}finally{c===v&&a.removeAttribute("id")}}}return l(e.replace(F,"$1"),a,t,n)}function se(){var e=[];return function a(i,n){return e.push(i+" ")>t.cacheLength&&delete a[e.shift()],a[i+" "]=n}}function oe(e){return e[v]=!0,e}function le(e){var a=h.createElement("fieldset");try{return!!e(a)}catch(e){return!1}finally{a.parentNode&&a.parentNode.removeChild(a),a=null}}function de(e,a){for(var i=e.split("|"),n=i.length;n--;)t.attrHandle[i[n]]=a}function ce(e,a){var i=a&&e,t=i&&1===e.nodeType&&1===a.nodeType&&e.sourceIndex-a.sourceIndex;if(t)return t;if(i)for(;i=i.nextSibling;)if(i===a)return-1;return e?1:-1}function ue(e){return function(a){return"input"===a.nodeName.toLowerCase()&&a.type===e}}function me(e){return function(a){var i=a.nodeName.toLowerCase();return("input"===i||"button"===i)&&a.type===e}}function he(e){return function(a){return"form"in a?a.parentNode&&!1===a.disabled?"label"in a?"label"in a.parentNode?a.parentNode.disabled===e:a.disabled===e:a.isDisabled===e||a.isDisabled!==!e&&ne(a)===e:a.disabled===e:"label"in a&&a.disabled===e}}function ge(e){return oe(function(a){return a=+a,oe(function(i,t){for(var n,r=e([],i.length,a),s=r.length;s--;)i[n=r[s]]&&(i[n]=!(t[n]=i[n]))})})}function pe(e){return e&&void 0!==e.getElementsByTagName&&e}for(a in i=re.support={},r=re.isXML=function(e){var a=e&&(e.ownerDocument||e).documentElement;return!!a&&"HTML"!==a.nodeName},m=re.setDocument=function(e){var a,n,s=e?e.ownerDocument||e:w;return s!==h&&9===s.nodeType&&s.documentElement?(g=(h=s).documentElement,p=!r(h),w!==h&&(n=h.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",te,!1):n.attachEvent&&n.attachEvent("onunload",te)),i.attributes=le(function(e){return e.className="i",!e.getAttribute("className")}),i.getElementsByTagName=le(function(e){return e.appendChild(h.createComment("")),!e.getElementsByTagName("*").length}),i.getElementsByClassName=K.test(h.getElementsByClassName),i.getById=le(function(e){return g.appendChild(e).id=v,!h.getElementsByName||!h.getElementsByName(v).length}),i.getById?(t.filter.ID=function(e){var a=e.replace(Q,ee);return function(e){return e.getAttribute("id")===a}},t.find.ID=function(e,a){if(void 0!==a.getElementById&&p){var i=a.getElementById(e);return i?[i]:[]}}):(t.filter.ID=function(e){var a=e.replace(Q,ee);return function(e){var i=void 0!==e.getAttributeNode&&e.getAttributeNode("id");return i&&i.value===a}},t.find.ID=function(e,a){if(void 0!==a.getElementById&&p){var i,t,n,r=a.getElementById(e);if(r){if((i=r.getAttributeNode("id"))&&i.value===e)return[r];for(n=a.getElementsByName(e),t=0;r=n[t++];)if((i=r.getAttributeNode("id"))&&i.value===e)return[r]}return[]}}),t.find.TAG=i.getElementsByTagName?function(e,a){return void 0!==a.getElementsByTagName?a.getElementsByTagName(e):i.qsa?a.querySelectorAll(e):void 0}:function(e,a){var i,t=[],n=0,r=a.getElementsByTagName(e);if("*"===e){for(;i=r[n++];)1===i.nodeType&&t.push(i);return t}return r},t.find.CLASS=i.getElementsByClassName&&function(e,a){if(void 0!==a.getElementsByClassName&&p)return a.getElementsByClassName(e)},f=[],b=[],(i.qsa=K.test(h.querySelectorAll))&&(le(function(e){g.appendChild(e).innerHTML="    ",e.querySelectorAll("[msallowcapture^='']").length&&b.push("[*^$]="+P+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||b.push("\\["+P+"*(?:value|"+A+")"),e.querySelectorAll("[id~="+v+"-]").length||b.push("~="),e.querySelectorAll(":checked").length||b.push(":checked"),e.querySelectorAll("a#"+v+"+*").length||b.push(".#.+[+~]")}),le(function(e){e.innerHTML="";var a=h.createElement("input");a.setAttribute("type","hidden"),e.appendChild(a).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&b.push("name"+P+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&b.push(":enabled",":disabled"),g.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&b.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),b.push(",.*:")})),(i.matchesSelector=K.test(y=g.matches||g.webkitMatchesSelector||g.mozMatchesSelector||g.oMatchesSelector||g.msMatchesSelector))&&le(function(e){i.disconnectedMatch=y.call(e,"*"),y.call(e,"[s!='']:x"),f.push("!=",W)}),b=b.length&&new RegExp(b.join("|")),f=f.length&&new RegExp(f.join("|")),a=K.test(g.compareDocumentPosition),k=a||K.test(g.contains)?function(e,a){var i=9===e.nodeType?e.documentElement:e,t=a&&a.parentNode;return e===t||!(!t||1!==t.nodeType||!(i.contains?i.contains(t):e.compareDocumentPosition&&16&e.compareDocumentPosition(t)))}:function(e,a){if(a)for(;a=a.parentNode;)if(a===e)return!0;return!1},L=a?function(e,a){if(e===a)return u=!0,0;var t=!e.compareDocumentPosition-!a.compareDocumentPosition;return t||(1&(t=(e.ownerDocument||e)===(a.ownerDocument||a)?e.compareDocumentPosition(a):1)||!i.sortDetached&&a.compareDocumentPosition(e)===t?e===h||e.ownerDocument===w&&k(w,e)?-1:a===h||a.ownerDocument===w&&k(w,a)?1:c?C(c,e)-C(c,a):0:4&t?-1:1)}:function(e,a){if(e===a)return u=!0,0;var i,t=0,n=e.parentNode,r=a.parentNode,s=[e],o=[a];if(!n||!r)return e===h?-1:a===h?1:n?-1:r?1:c?C(c,e)-C(c,a):0;if(n===r)return ce(e,a);for(i=e;i=i.parentNode;)s.unshift(i);for(i=a;i=i.parentNode;)o.unshift(i);for(;s[t]===o[t];)t++;return t?ce(s[t],o[t]):s[t]===w?-1:o[t]===w?1:0},h):h},re.matches=function(e,a){return re(e,null,null,a)},re.matchesSelector=function(e,a){if((e.ownerDocument||e)!==h&&m(e),a=a.replace($,"='$1']"),i.matchesSelector&&p&&!M[a+" "]&&(!f||!f.test(a))&&(!b||!b.test(a)))try{var t=y.call(e,a);if(t||i.disconnectedMatch||e.document&&11!==e.document.nodeType)return t}catch(e){}return re(a,h,null,[e]).length>0},re.contains=function(e,a){return(e.ownerDocument||e)!==h&&m(e),k(e,a)},re.attr=function(e,a){(e.ownerDocument||e)!==h&&m(e);var n=t.attrHandle[a.toLowerCase()],r=n&&Y.call(t.attrHandle,a.toLowerCase())?n(e,a,!p):void 0;return void 0!==r?r:i.attributes||!p?e.getAttribute(a):(r=e.getAttributeNode(a))&&r.specified?r.value:null},re.escape=function(e){return(e+"").replace(ae,ie)},re.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},re.uniqueSort=function(e){var a,t=[],n=0,r=0;if(u=!i.detectDuplicates,c=!i.sortStable&&e.slice(0),e.sort(L),u){for(;a=e[r++];)a===e[r]&&(n=t.push(r));for(;n--;)e.splice(t[n],1)}return c=null,e},n=re.getText=function(e){var a,i="",t=0,r=e.nodeType;if(r){if(1===r||9===r||11===r){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)i+=n(e)}else if(3===r||4===r)return e.nodeValue}else for(;a=e[t++];)i+=n(a);return i},(t=re.selectors={cacheLength:50,createPseudo:oe,match:U,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(Q,ee),e[3]=(e[3]||e[4]||e[5]||"").replace(Q,ee),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||re.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&re.error(e[0]),e},PSEUDO:function(e){var a,i=!e[6]&&e[2];return U.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":i&&B.test(i)&&(a=s(i,!0))&&(a=i.indexOf(")",i.length-a)-i.length)&&(e[0]=e[0].slice(0,a),e[2]=i.slice(0,a)),e.slice(0,3))}},filter:{TAG:function(e){var a=e.replace(Q,ee).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===a}},CLASS:function(e){var a=j[e+" "];return a||(a=new RegExp("(^|"+P+")"+e+"("+P+"|$)"))&&j(e,function(e){return a.test("string"==typeof e.className&&e.className||void 0!==e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(e,a,i){return function(t){var n=re.attr(t,e);return null==n?"!="===a:!a||(n+="","="===a?n===i:"!="===a?n!==i:"^="===a?i&&0===n.indexOf(i):"*="===a?i&&n.indexOf(i)>-1:"$="===a?i&&n.slice(-i.length)===i:"~="===a?(" "+n.replace(I," ")+" ").indexOf(i)>-1:"|="===a&&(n===i||n.slice(0,i.length+1)===i+"-"))}},CHILD:function(e,a,i,t,n){var r="nth"!==e.slice(0,3),s="last"!==e.slice(-4),o="of-type"===a;return 1===t&&0===n?function(e){return!!e.parentNode}:function(a,i,l){var d,c,u,m,h,g,p=r!==s?"nextSibling":"previousSibling",b=a.parentNode,f=o&&a.nodeName.toLowerCase(),y=!l&&!o,k=!1;if(b){if(r){for(;p;){for(m=a;m=m[p];)if(o?m.nodeName.toLowerCase()===f:1===m.nodeType)return!1;g=p="only"===e&&!g&&"nextSibling"}return!0}if(g=[s?b.firstChild:b.lastChild],s&&y){for(k=(h=(d=(c=(u=(m=b)[v]||(m[v]={}))[m.uniqueID]||(u[m.uniqueID]={}))[e]||[])[0]===_&&d[1])&&d[2],m=h&&b.childNodes[h];m=++h&&m&&m[p]||(k=h=0)||g.pop();)if(1===m.nodeType&&++k&&m===a){c[e]=[_,h,k];break}}else if(y&&(k=h=(d=(c=(u=(m=a)[v]||(m[v]={}))[m.uniqueID]||(u[m.uniqueID]={}))[e]||[])[0]===_&&d[1]),!1===k)for(;(m=++h&&m&&m[p]||(k=h=0)||g.pop())&&((o?m.nodeName.toLowerCase()!==f:1!==m.nodeType)||!++k||(y&&((c=(u=m[v]||(m[v]={}))[m.uniqueID]||(u[m.uniqueID]={}))[e]=[_,k]),m!==a)););return(k-=n)===t||k%t==0&&k/t>=0}}},PSEUDO:function(e,a){var i,n=t.pseudos[e]||t.setFilters[e.toLowerCase()]||re.error("unsupported pseudo: "+e);return n[v]?n(a):n.length>1?(i=[e,e,"",a],t.setFilters.hasOwnProperty(e.toLowerCase())?oe(function(e,i){for(var t,r=n(e,a),s=r.length;s--;)e[t=C(e,r[s])]=!(i[t]=r[s])}):function(e){return n(e,0,i)}):n}},pseudos:{not:oe(function(e){var a=[],i=[],t=o(e.replace(F,"$1"));return t[v]?oe(function(e,a,i,n){for(var r,s=t(e,null,n,[]),o=e.length;o--;)(r=s[o])&&(e[o]=!(a[o]=r))}):function(e,n,r){return a[0]=e,t(a,null,r,i),a[0]=null,!i.pop()}}),has:oe(function(e){return function(a){return re(e,a).length>0}}),contains:oe(function(e){return e=e.replace(Q,ee),function(a){return(a.textContent||a.innerText||n(a)).indexOf(e)>-1}}),lang:oe(function(e){return V.test(e||"")||re.error("unsupported lang: "+e),e=e.replace(Q,ee).toLowerCase(),function(a){var i;do{if(i=p?a.lang:a.getAttribute("xml:lang")||a.getAttribute("lang"))return(i=i.toLowerCase())===e||0===i.indexOf(e+"-")}while((a=a.parentNode)&&1===a.nodeType);return!1}}),target:function(a){var i=e.location&&e.location.hash;return i&&i.slice(1)===a.id},root:function(e){return e===g},focus:function(e){return e===h.activeElement&&(!h.hasFocus||h.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:he(!1),disabled:he(!0),checked:function(e){var a=e.nodeName.toLowerCase();return"input"===a&&!!e.checked||"option"===a&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!t.pseudos.empty(e)},header:function(e){return G.test(e.nodeName)},input:function(e){return J.test(e.nodeName)},button:function(e){var a=e.nodeName.toLowerCase();return"input"===a&&"button"===e.type||"button"===a},text:function(e){var a;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(a=e.getAttribute("type"))||"text"===a.toLowerCase())},first:ge(function(){return[0]}),last:ge(function(e,a){return[a-1]}),eq:ge(function(e,a,i){return[i<0?i+a:i]}),even:ge(function(e,a){for(var i=0;i=0;)e.push(t);return e}),gt:ge(function(e,a,i){for(var t=i<0?i+a:i;++t1?function(a,i,t){for(var n=e.length;n--;)if(!e[n](a,i,t))return!1;return!0}:e[0]}function ve(e,a,i,t,n){for(var r,s=[],o=0,l=e.length,d=null!=a;o-1&&(r[d]=!(s[d]=u))}}else f=ve(f===s?f.splice(g,f.length):f),n?n(null,s,f,l):S.apply(s,f)})}function _e(e){for(var a,i,n,r=e.length,s=t.relative[e[0].type],o=s||t.relative[" "],l=s?1:0,c=ye(function(e){return e===a},o,!0),u=ye(function(e){return C(a,e)>-1},o,!0),m=[function(e,i,t){var n=!s&&(t||i!==d)||((a=i).nodeType?c(e,i,t):u(e,i,t));return a=null,n}];l1&&ke(m),l>1&&fe(e.slice(0,l-1).concat({value:" "===e[l-2].type?"*":""})).replace(F,"$1"),i,l0,n=e.length>0,r=function(r,s,o,l,c){var u,g,b,f=0,y="0",k=r&&[],v=[],w=d,x=r||n&&t.find.TAG("*",c),j=_+=null==w?1:Math.random()||.1,z=x.length;for(c&&(d=s===h||s||c);y!==z&&null!=(u=x[y]);y++){if(n&&u){for(g=0,s||u.ownerDocument===h||(m(u),o=!p);b=e[g++];)if(b(u,s||h,o)){l.push(u);break}c&&(_=j)}i&&((u=!b&&u)&&f--,r&&k.push(u))}if(f+=y,i&&y!==f){for(g=0;b=a[g++];)b(k,v,s,o);if(r){if(f>0)for(;y--;)k[y]||v[y]||(v[y]=T.call(l));v=ve(v)}S.apply(l,v),c&&!r&&v.length>0&&f+a.length>1&&re.uniqueSort(l)}return c&&(_=j,d=w),k};return i?oe(r):r}(r,n))).selector=e}return o},l=re.select=function(e,a,i,n){var r,l,d,c,u,m="function"==typeof e&&e,h=!n&&s(e=m.selector||e);if(i=i||[],1===h.length){if((l=h[0]=h[0].slice(0)).length>2&&"ID"===(d=l[0]).type&&9===a.nodeType&&p&&t.relative[l[1].type]){if(!(a=(t.find.ID(d.matches[0].replace(Q,ee),a)||[])[0]))return i;m&&(a=a.parentNode),e=e.slice(l.shift().value.length)}for(r=U.needsContext.test(e)?0:l.length;r--&&(d=l[r],!t.relative[c=d.type]);)if((u=t.find[c])&&(n=u(d.matches[0].replace(Q,ee),X.test(l[0].type)&&pe(a.parentNode)||a))){if(l.splice(r,1),!(e=n.length&&fe(l)))return S.apply(i,n),i;break}}return(m||o(e,h))(n,a,!p,i,!a||X.test(e)&&pe(a.parentNode)||a),i},i.sortStable=v.split("").sort(L).join("")===v,i.detectDuplicates=!!u,m(),i.sortDetached=le(function(e){return 1&e.compareDocumentPosition(h.createElement("fieldset"))}),le(function(e){return e.innerHTML="","#"===e.firstChild.getAttribute("href")})||de("type|href|height|width",function(e,a,i){if(!i)return e.getAttribute(a,"type"===a.toLowerCase()?1:2)}),i.attributes&&le(function(e){return e.innerHTML="",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||de("value",function(e,a,i){if(!i&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),le(function(e){return null==e.getAttribute("disabled")})||de(A,function(e,a,i){var t;if(!i)return!0===e[a]?a.toLowerCase():(t=e.getAttributeNode(a))&&t.specified?t.value:null}),re}(i);x.find=M,x.expr=M.selectors,x.expr[":"]=x.expr.pseudos,x.uniqueSort=x.unique=M.uniqueSort,x.text=M.getText,x.isXMLDoc=M.isXML,x.contains=M.contains,x.escapeSelector=M.escape;var L=function(e,a,i){for(var t=[],n=void 0!==i;(e=e[a])&&9!==e.nodeType;)if(1===e.nodeType){if(n&&x(e).is(i))break;t.push(e)}return t},Y=function(e,a){for(var i=[];e;e=e.nextSibling)1===e.nodeType&&e!==a&&i.push(e);return i},D=x.expr.match.needsContext;function T(e,a){return e.nodeName&&e.nodeName.toLowerCase()===a.toLowerCase()}var q=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function S(e,a,i){return y(a)?x.grep(e,function(e,t){return!!a.call(e,t,e)!==i}):a.nodeType?x.grep(e,function(e){return e===a!==i}):"string"!=typeof a?x.grep(e,function(e){return u.call(a,e)>-1!==i}):x.filter(a,e,i)}x.filter=function(e,a,i){var t=a[0];return i&&(e=":not("+e+")"),1===a.length&&1===t.nodeType?x.find.matchesSelector(t,e)?[t]:[]:x.find.matches(e,x.grep(a,function(e){return 1===e.nodeType}))},x.fn.extend({find:function(e){var a,i,t=this.length,n=this;if("string"!=typeof e)return this.pushStack(x(e).filter(function(){for(a=0;a1?x.uniqueSort(i):i},filter:function(e){return this.pushStack(S(this,e||[],!1))},not:function(e){return this.pushStack(S(this,e||[],!0))},is:function(e){return!!S(this,"string"==typeof e&&D.test(e)?x(e):e||[],!1).length}});var H,C=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(x.fn.init=function(e,a,i){var t,n;if(!e)return this;if(i=i||H,"string"==typeof e){if(!(t="<"===e[0]&&">"===e[e.length-1]&&e.length>=3?[null,e,null]:C.exec(e))||!t[1]&&a)return!a||a.jquery?(a||i).find(e):this.constructor(a).find(e);if(t[1]){if(a=a instanceof x?a[0]:a,x.merge(this,x.parseHTML(t[1],a&&a.nodeType?a.ownerDocument||a:s,!0)),q.test(t[1])&&x.isPlainObject(a))for(t in a)y(this[t])?this[t](a[t]):this.attr(t,a[t]);return this}return(n=s.getElementById(t[2]))&&(this[0]=n,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):y(e)?void 0!==i.ready?i.ready(e):e(x):x.makeArray(e,this)}).prototype=x.fn,H=x(s);var A=/^(?:parents|prev(?:Until|All))/,P={children:!0,contents:!0,next:!0,prev:!0};function O(e,a){for(;(e=e[a])&&1!==e.nodeType;);return e}x.fn.extend({has:function(e){var a=x(e,this),i=a.length;return this.filter(function(){for(var e=0;e-1:1===i.nodeType&&x.find.matchesSelector(i,e))){r.push(i);break}return this.pushStack(r.length>1?x.uniqueSort(r):r)},index:function(e){return e?"string"==typeof e?u.call(x(e),this[0]):u.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,a){return this.pushStack(x.uniqueSort(x.merge(this.get(),x(e,a))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),x.each({parent:function(e){var a=e.parentNode;return a&&11!==a.nodeType?a:null},parents:function(e){return L(e,"parentNode")},parentsUntil:function(e,a,i){return L(e,"parentNode",i)},next:function(e){return O(e,"nextSibling")},prev:function(e){return O(e,"previousSibling")},nextAll:function(e){return L(e,"nextSibling")},prevAll:function(e){return L(e,"previousSibling")},nextUntil:function(e,a,i){return L(e,"nextSibling",i)},prevUntil:function(e,a,i){return L(e,"previousSibling",i)},siblings:function(e){return Y((e.parentNode||{}).firstChild,e)},children:function(e){return Y(e.firstChild)},contents:function(e){return T(e,"iframe")?e.contentDocument:(T(e,"template")&&(e=e.content||e),x.merge([],e.childNodes))}},function(e,a){x.fn[e]=function(i,t){var n=x.map(this,a,i);return"Until"!==e.slice(-5)&&(t=i),t&&"string"==typeof t&&(n=x.filter(t,n)),this.length>1&&(P[e]||x.uniqueSort(n),A.test(e)&&n.reverse()),this.pushStack(n)}});var E=/[^\x20\t\r\n\f]+/g;function W(e){return e}function I(e){throw e}function F(e,a,i,t){var n;try{e&&y(n=e.promise)?n.call(e).done(a).fail(i):e&&y(n=e.then)?n.call(e,a,i):a.apply(void 0,[e].slice(t))}catch(e){i.apply(void 0,[e])}}x.Callbacks=function(e){e="string"==typeof e?function(e){var a={};return x.each(e.match(E)||[],function(e,i){a[i]=!0}),a}(e):x.extend({},e);var a,i,t,n,r=[],s=[],o=-1,l=function(){for(n=n||e.once,t=a=!0;s.length;o=-1)for(i=s.shift();++o-1;)r.splice(i,1),i<=o&&o--}),this},has:function(e){return e?x.inArray(e,r)>-1:r.length>0},empty:function(){return r&&(r=[]),this},disable:function(){return n=s=[],r=i="",this},disabled:function(){return!r},lock:function(){return n=s=[],i||a||(r=i=""),this},locked:function(){return!!n},fireWith:function(e,i){return n||(i=[e,(i=i||[]).slice?i.slice():i],s.push(i),a||l()),this},fire:function(){return d.fireWith(this,arguments),this},fired:function(){return!!t}};return d},x.extend({Deferred:function(e){var a=[["notify","progress",x.Callbacks("memory"),x.Callbacks("memory"),2],["resolve","done",x.Callbacks("once memory"),x.Callbacks("once memory"),0,"resolved"],["reject","fail",x.Callbacks("once memory"),x.Callbacks("once memory"),1,"rejected"]],t="pending",n={state:function(){return t},always:function(){return r.done(arguments).fail(arguments),this},catch:function(e){return n.then(null,e)},pipe:function(){var e=arguments;return x.Deferred(function(i){x.each(a,function(a,t){var n=y(e[t[4]])&&e[t[4]];r[t[1]](function(){var e=n&&n.apply(this,arguments);e&&y(e.promise)?e.promise().progress(i.notify).done(i.resolve).fail(i.reject):i[t[0]+"With"](this,n?[e]:arguments)})}),e=null}).promise()},then:function(e,t,n){var r=0;function s(e,a,t,n){return function(){var o=this,l=arguments,d=function(){var i,d;if(!(e=r&&(t!==I&&(o=void 0,l=[i]),a.rejectWith(o,l))}};e?c():(x.Deferred.getStackHook&&(c.stackTrace=x.Deferred.getStackHook()),i.setTimeout(c))}}return x.Deferred(function(i){a[0][3].add(s(0,i,y(n)?n:W,i.notifyWith)),a[1][3].add(s(0,i,y(e)?e:W)),a[2][3].add(s(0,i,y(t)?t:I))}).promise()},promise:function(e){return null!=e?x.extend(e,n):n}},r={};return x.each(a,function(e,i){var s=i[2],o=i[5];n[i[1]]=s.add,o&&s.add(function(){t=o},a[3-e][2].disable,a[3-e][3].disable,a[0][2].lock,a[0][3].lock),s.add(i[3].fire),r[i[0]]=function(){return r[i[0]+"With"](this===r?void 0:this,arguments),this},r[i[0]+"With"]=s.fireWith}),n.promise(r),e&&e.call(r,r),r},when:function(e){var a=arguments.length,i=a,t=Array(i),n=l.call(arguments),r=x.Deferred(),s=function(e){return function(i){t[e]=this,n[e]=arguments.length>1?l.call(arguments):i,--a||r.resolveWith(t,n)}};if(a<=1&&(F(e,r.done(s(i)).resolve,r.reject,!a),"pending"===r.state()||y(n[i]&&n[i].then)))return r.then();for(;i--;)F(n[i],s(i),r.reject);return r.promise()}});var N=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;x.Deferred.exceptionHook=function(e,a){i.console&&i.console.warn&&e&&N.test(e.name)&&i.console.warn("jQuery.Deferred exception: "+e.message,e.stack,a)},x.readyException=function(e){i.setTimeout(function(){throw e})};var R=x.Deferred();function $(){s.removeEventListener("DOMContentLoaded",$),i.removeEventListener("load",$),x.ready()}x.fn.ready=function(e){return R.then(e).catch(function(e){x.readyException(e)}),this},x.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--x.readyWait:x.isReady)||(x.isReady=!0,!0!==e&&--x.readyWait>0||R.resolveWith(s,[x]))}}),x.ready.then=R.then,"complete"===s.readyState||"loading"!==s.readyState&&!s.documentElement.doScroll?i.setTimeout(x.ready):(s.addEventListener("DOMContentLoaded",$),i.addEventListener("load",$));var B=function(e,a,i,t,n,r,s){var o=0,l=e.length,d=null==i;if("object"===_(i))for(o in n=!0,i)B(e,a,o,i[o],!0,r,s);else if(void 0!==t&&(n=!0,y(t)||(s=!0),d&&(s?(a.call(e,t),a=null):(d=a,a=function(e,a,i){return d.call(x(e),i)})),a))for(;o1,null,!0)},removeData:function(e){return this.each(function(){Q.remove(this,e)})}}),x.extend({queue:function(e,a,i){var t;if(e)return a=(a||"fx")+"queue",t=X.get(e,a),i&&(!t||Array.isArray(i)?t=X.access(e,a,x.makeArray(i)):t.push(i)),t||[]},dequeue:function(e,a){a=a||"fx";var i=x.queue(e,a),t=i.length,n=i.shift(),r=x._queueHooks(e,a);"inprogress"===n&&(n=i.shift(),t--),n&&("fx"===a&&i.unshift("inprogress"),delete r.stop,n.call(e,function(){x.dequeue(e,a)},r)),!t&&r&&r.empty.fire()},_queueHooks:function(e,a){var i=a+"queueHooks";return X.get(e,i)||X.access(e,i,{empty:x.Callbacks("once memory").add(function(){X.remove(e,[a+"queue",i])})})}}),x.fn.extend({queue:function(e,a){var i=2;return"string"!=typeof e&&(a=e,e="fx",i--),arguments.length\x20\t\r\n\f]+)/i,ge=/^$|^module$|\/(?:java|ecma)script/i,pe={option:[1,""],thead:[1,"","
    "],col:[2,"","
    "],tr:[2,"","
    "],td:[3,"","
    "],_default:[0,"",""]};function be(e,a){var i;return i=void 0!==e.getElementsByTagName?e.getElementsByTagName(a||"*"):void 0!==e.querySelectorAll?e.querySelectorAll(a||"*"):[],void 0===a||a&&T(e,a)?x.merge([e],i):i}function fe(e,a){for(var i=0,t=e.length;i-1)n&&n.push(r);else if(d=x.contains(r.ownerDocument,r),s=be(u.appendChild(r),"script"),d&&fe(s),i)for(c=0;r=s[c++];)ge.test(r.type||"")&&i.push(r);return u}!function(){var e=s.createDocumentFragment().appendChild(s.createElement("div")),a=s.createElement("input");a.setAttribute("type","radio"),a.setAttribute("checked","checked"),a.setAttribute("name","t"),e.appendChild(a),f.checkClone=e.cloneNode(!0).cloneNode(!0).lastChild.checked,e.innerHTML="",f.noCloneChecked=!!e.cloneNode(!0).lastChild.defaultValue}();var ve=s.documentElement,we=/^key/,_e=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,xe=/^([^.]*)(?:\.(.+)|)/;function je(){return!0}function ze(){return!1}function Me(){try{return s.activeElement}catch(e){}}function Le(e,a,i,t,n,r){var s,o;if("object"==typeof a){for(o in"string"!=typeof i&&(t=t||i,i=void 0),a)Le(e,o,i,t,a[o],r);return e}if(null==t&&null==n?(n=i,t=i=void 0):null==n&&("string"==typeof i?(n=t,t=void 0):(n=t,t=i,i=void 0)),!1===n)n=ze;else if(!n)return e;return 1===r&&(s=n,(n=function(e){return x().off(e),s.apply(this,arguments)}).guid=s.guid||(s.guid=x.guid++)),e.each(function(){x.event.add(this,a,n,t,i)})}x.event={global:{},add:function(e,a,i,t,n){var r,s,o,l,d,c,u,m,h,g,p,b=X.get(e);if(b)for(i.handler&&(i=(r=i).handler,n=r.selector),n&&x.find.matchesSelector(ve,n),i.guid||(i.guid=x.guid++),(l=b.events)||(l=b.events={}),(s=b.handle)||(s=b.handle=function(a){return void 0!==x&&x.event.triggered!==a.type?x.event.dispatch.apply(e,arguments):void 0}),d=(a=(a||"").match(E)||[""]).length;d--;)h=p=(o=xe.exec(a[d])||[])[1],g=(o[2]||"").split(".").sort(),h&&(u=x.event.special[h]||{},h=(n?u.delegateType:u.bindType)||h,u=x.event.special[h]||{},c=x.extend({type:h,origType:p,data:t,handler:i,guid:i.guid,selector:n,needsContext:n&&x.expr.match.needsContext.test(n),namespace:g.join(".")},r),(m=l[h])||((m=l[h]=[]).delegateCount=0,u.setup&&!1!==u.setup.call(e,t,g,s)||e.addEventListener&&e.addEventListener(h,s)),u.add&&(u.add.call(e,c),c.handler.guid||(c.handler.guid=i.guid)),n?m.splice(m.delegateCount++,0,c):m.push(c),x.event.global[h]=!0)},remove:function(e,a,i,t,n){var r,s,o,l,d,c,u,m,h,g,p,b=X.hasData(e)&&X.get(e);if(b&&(l=b.events)){for(d=(a=(a||"").match(E)||[""]).length;d--;)if(h=p=(o=xe.exec(a[d])||[])[1],g=(o[2]||"").split(".").sort(),h){for(u=x.event.special[h]||{},m=l[h=(t?u.delegateType:u.bindType)||h]||[],o=o[2]&&new RegExp("(^|\\.)"+g.join("\\.(?:.*\\.|)")+"(\\.|$)"),s=r=m.length;r--;)c=m[r],!n&&p!==c.origType||i&&i.guid!==c.guid||o&&!o.test(c.namespace)||t&&t!==c.selector&&("**"!==t||!c.selector)||(m.splice(r,1),c.selector&&m.delegateCount--,u.remove&&u.remove.call(e,c));s&&!m.length&&(u.teardown&&!1!==u.teardown.call(e,g,b.handle)||x.removeEvent(e,h,b.handle),delete l[h])}else for(h in l)x.event.remove(e,h+a[d],i,t,!0);x.isEmptyObject(l)&&X.remove(e,"handle events")}},dispatch:function(e){var a,i,t,n,r,s,o=x.event.fix(e),l=new Array(arguments.length),d=(X.get(this,"events")||{})[o.type]||[],c=x.event.special[o.type]||{};for(l[0]=o,a=1;a=1))for(;d!==this;d=d.parentNode||this)if(1===d.nodeType&&("click"!==e.type||!0!==d.disabled)){for(r=[],s={},i=0;i-1:x.find(n,this,null,[d]).length),s[n]&&r.push(t);r.length&&o.push({elem:d,handlers:r})}return d=this,l\x20\t\r\n\f]*)[^>]*)\/>/gi,De=/\s*$/g;function Se(e,a){return T(e,"table")&&T(11!==a.nodeType?a:a.firstChild,"tr")&&x(e).children("tbody")[0]||e}function He(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function Ce(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Ae(e,a){var i,t,n,r,s,o,l,d;if(1===a.nodeType){if(X.hasData(e)&&(r=X.access(e),s=X.set(a,r),d=r.events))for(n in delete s.handle,s.events={},d)for(i=0,t=d[n].length;i1&&"string"==typeof g&&!f.checkClone&&Te.test(g))return e.each(function(n){var r=e.eq(n);p&&(a[0]=g.call(this,n,r.html())),Oe(r,a,i,t)});if(m&&(r=(n=ke(a,e[0].ownerDocument,!1,e,t)).firstChild,1===n.childNodes.length&&(n=r),r||t)){for(o=(s=x.map(be(n,"script"),He)).length;u")},clone:function(e,a,i){var t,n,r,s,o=e.cloneNode(!0),l=x.contains(e.ownerDocument,e);if(!(f.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||x.isXMLDoc(e)))for(s=be(o),t=0,n=(r=be(e)).length;t0&&fe(s,!l&&be(e,"script")),o},cleanData:function(e){for(var a,i,t,n=x.event.special,r=0;void 0!==(i=e[r]);r++)if(K(i)){if(a=i[X.expando]){if(a.events)for(t in a.events)n[t]?x.event.remove(i,t):x.removeEvent(i,t,a.handle);i[X.expando]=void 0}i[Q.expando]&&(i[Q.expando]=void 0)}}}),x.fn.extend({detach:function(e){return Ee(this,e,!0)},remove:function(e){return Ee(this,e)},text:function(e){return B(this,function(e){return void 0===e?x.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return Oe(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||Se(this,e).appendChild(e)})},prepend:function(){return Oe(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var a=Se(this,e);a.insertBefore(e,a.firstChild)}})},before:function(){return Oe(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return Oe(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,a=0;null!=(e=this[a]);a++)1===e.nodeType&&(x.cleanData(be(e,!1)),e.textContent="");return this},clone:function(e,a){return e=null!=e&&e,a=null==a?e:a,this.map(function(){return x.clone(this,e,a)})},html:function(e){return B(this,function(e){var a=this[0]||{},i=0,t=this.length;if(void 0===e&&1===a.nodeType)return a.innerHTML;if("string"==typeof e&&!De.test(e)&&!pe[(he.exec(e)||["",""])[1].toLowerCase()]){e=x.htmlPrefilter(e);try{for(;i=0&&(l+=Math.max(0,Math.ceil(e["offset"+a[0].toUpperCase()+a.slice(1)]-r-l-o-.5))),l}function Qe(e,a,i){var t=Ie(e),n=Ne(e,a,t),r="border-box"===x.css(e,"boxSizing",!1,t),s=r;if(We.test(n)){if(!i)return n;n="auto"}return s=s&&(f.boxSizingReliable()||n===e.style[a]),("auto"===n||!parseFloat(n)&&"inline"===x.css(e,"display",!1,t))&&(n=e["offset"+a[0].toUpperCase()+a.slice(1)],s=!0),(n=parseFloat(n)||0)+Xe(e,a,i||(r?"border":"content"),s,t,n)+"px"}function ea(e,a,i,t,n){return new ea.prototype.init(e,a,i,t,n)}x.extend({cssHooks:{opacity:{get:function(e,a){if(a){var i=Ne(e,"opacity");return""===i?"1":i}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,a,i,t){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var n,r,s,o=G(a),l=Be.test(a),d=e.style;if(l||(a=Ke(o)),s=x.cssHooks[a]||x.cssHooks[o],void 0===i)return s&&"get"in s&&void 0!==(n=s.get(e,!1,t))?n:d[a];"string"===(r=typeof i)&&(n=ne.exec(i))&&n[1]&&(i=le(e,a,n),r="number"),null!=i&&i==i&&("number"===r&&(i+=n&&n[3]||(x.cssNumber[o]?"":"px")),f.clearCloneStyle||""!==i||0!==a.indexOf("background")||(d[a]="inherit"),s&&"set"in s&&void 0===(i=s.set(e,i,t))||(l?d.setProperty(a,i):d[a]=i))}},css:function(e,a,i,t){var n,r,s,o=G(a);return Be.test(a)||(a=Ke(o)),(s=x.cssHooks[a]||x.cssHooks[o])&&"get"in s&&(n=s.get(e,!0,i)),void 0===n&&(n=Ne(e,a,t)),"normal"===n&&a in Ue&&(n=Ue[a]),""===i||i?(r=parseFloat(n),!0===i||isFinite(r)?r||0:n):n}}),x.each(["height","width"],function(e,a){x.cssHooks[a]={get:function(e,i,t){if(i)return!$e.test(x.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?Qe(e,a,t):oe(e,Ve,function(){return Qe(e,a,t)})},set:function(e,i,t){var n,r=Ie(e),s="border-box"===x.css(e,"boxSizing",!1,r),o=t&&Xe(e,a,t,s,r);return s&&f.scrollboxSize()===r.position&&(o-=Math.ceil(e["offset"+a[0].toUpperCase()+a.slice(1)]-parseFloat(r[a])-Xe(e,a,"border",!1,r)-.5)),o&&(n=ne.exec(i))&&"px"!==(n[3]||"px")&&(e.style[a]=i,i=x.css(e,a)),Ze(0,i,o)}}}),x.cssHooks.marginLeft=Re(f.reliableMarginLeft,function(e,a){if(a)return(parseFloat(Ne(e,"marginLeft"))||e.getBoundingClientRect().left-oe(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),x.each({margin:"",padding:"",border:"Width"},function(e,a){x.cssHooks[e+a]={expand:function(i){for(var t=0,n={},r="string"==typeof i?i.split(" "):[i];t<4;t++)n[e+re[t]+a]=r[t]||r[t-2]||r[0];return n}},"margin"!==e&&(x.cssHooks[e+a].set=Ze)}),x.fn.extend({css:function(e,a){return B(this,function(e,a,i){var t,n,r={},s=0;if(Array.isArray(a)){for(t=Ie(e),n=a.length;s1)}}),x.Tween=ea,ea.prototype={constructor:ea,init:function(e,a,i,t,n,r){this.elem=e,this.prop=i,this.easing=n||x.easing._default,this.options=a,this.start=this.now=this.cur(),this.end=t,this.unit=r||(x.cssNumber[i]?"":"px")},cur:function(){var e=ea.propHooks[this.prop];return e&&e.get?e.get(this):ea.propHooks._default.get(this)},run:function(e){var a,i=ea.propHooks[this.prop];return this.options.duration?this.pos=a=x.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=a=e,this.now=(this.end-this.start)*a+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),i&&i.set?i.set(this):ea.propHooks._default.set(this),this}},ea.prototype.init.prototype=ea.prototype,ea.propHooks={_default:{get:function(e){var a;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(a=x.css(e.elem,e.prop,""))&&"auto"!==a?a:0},set:function(e){x.fx.step[e.prop]?x.fx.step[e.prop](e):1!==e.elem.nodeType||null==e.elem.style[x.cssProps[e.prop]]&&!x.cssHooks[e.prop]?e.elem[e.prop]=e.now:x.style(e.elem,e.prop,e.now+e.unit)}}},ea.propHooks.scrollTop=ea.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},x.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},x.fx=ea.prototype.init,x.fx.step={};var aa,ia,ta=/^(?:toggle|show|hide)$/,na=/queueHooks$/;function ra(){ia&&(!1===s.hidden&&i.requestAnimationFrame?i.requestAnimationFrame(ra):i.setTimeout(ra,x.fx.interval),x.fx.tick())}function sa(){return i.setTimeout(function(){aa=void 0}),aa=Date.now()}function oa(e,a){var i,t=0,n={height:e};for(a=a?1:0;t<4;t+=2-a)n["margin"+(i=re[t])]=n["padding"+i]=e;return a&&(n.opacity=n.width=e),n}function la(e,a,i){for(var t,n=(da.tweeners[a]||[]).concat(da.tweeners["*"]),r=0,s=n.length;r1)},removeAttr:function(e){return this.each(function(){x.removeAttr(this,e)})}}),x.extend({attr:function(e,a,i){var t,n,r=e.nodeType;if(3!==r&&8!==r&&2!==r)return void 0===e.getAttribute?x.prop(e,a,i):(1===r&&x.isXMLDoc(e)||(n=x.attrHooks[a.toLowerCase()]||(x.expr.match.bool.test(a)?ca:void 0)),void 0!==i?null===i?void x.removeAttr(e,a):n&&"set"in n&&void 0!==(t=n.set(e,i,a))?t:(e.setAttribute(a,i+""),i):n&&"get"in n&&null!==(t=n.get(e,a))?t:null==(t=x.find.attr(e,a))?void 0:t)},attrHooks:{type:{set:function(e,a){if(!f.radioValue&&"radio"===a&&T(e,"input")){var i=e.value;return e.setAttribute("type",a),i&&(e.value=i),a}}}},removeAttr:function(e,a){var i,t=0,n=a&&a.match(E);if(n&&1===e.nodeType)for(;i=n[t++];)e.removeAttribute(i)}}),ca={set:function(e,a,i){return!1===a?x.removeAttr(e,i):e.setAttribute(i,i),i}},x.each(x.expr.match.bool.source.match(/\w+/g),function(e,a){var i=ua[a]||x.find.attr;ua[a]=function(e,a,t){var n,r,s=a.toLowerCase();return t||(r=ua[s],ua[s]=n,n=null!=i(e,a,t)?s:null,ua[s]=r),n}});var ma=/^(?:input|select|textarea|button)$/i,ha=/^(?:a|area)$/i;function ga(e){return(e.match(E)||[]).join(" ")}function pa(e){return e.getAttribute&&e.getAttribute("class")||""}function ba(e){return Array.isArray(e)?e:"string"==typeof e&&e.match(E)||[]}x.fn.extend({prop:function(e,a){return B(this,x.prop,e,a,arguments.length>1)},removeProp:function(e){return this.each(function(){delete this[x.propFix[e]||e]})}}),x.extend({prop:function(e,a,i){var t,n,r=e.nodeType;if(3!==r&&8!==r&&2!==r)return 1===r&&x.isXMLDoc(e)||(a=x.propFix[a]||a,n=x.propHooks[a]),void 0!==i?n&&"set"in n&&void 0!==(t=n.set(e,i,a))?t:e[a]=i:n&&"get"in n&&null!==(t=n.get(e,a))?t:e[a]},propHooks:{tabIndex:{get:function(e){var a=x.find.attr(e,"tabindex");return a?parseInt(a,10):ma.test(e.nodeName)||ha.test(e.nodeName)&&e.href?0:-1}}},propFix:{for:"htmlFor",class:"className"}}),f.optSelected||(x.propHooks.selected={get:function(e){var a=e.parentNode;return a&&a.parentNode&&a.parentNode.selectedIndex,null},set:function(e){var a=e.parentNode;a&&(a.selectedIndex,a.parentNode&&a.parentNode.selectedIndex)}}),x.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){x.propFix[this.toLowerCase()]=this}),x.fn.extend({addClass:function(e){var a,i,t,n,r,s,o,l=0;if(y(e))return this.each(function(a){x(this).addClass(e.call(this,a,pa(this)))});if((a=ba(e)).length)for(;i=this[l++];)if(n=pa(i),t=1===i.nodeType&&" "+ga(n)+" "){for(s=0;r=a[s++];)t.indexOf(" "+r+" ")<0&&(t+=r+" ");n!==(o=ga(t))&&i.setAttribute("class",o)}return this},removeClass:function(e){var a,i,t,n,r,s,o,l=0;if(y(e))return this.each(function(a){x(this).removeClass(e.call(this,a,pa(this)))});if(!arguments.length)return this.attr("class","");if((a=ba(e)).length)for(;i=this[l++];)if(n=pa(i),t=1===i.nodeType&&" "+ga(n)+" "){for(s=0;r=a[s++];)for(;t.indexOf(" "+r+" ")>-1;)t=t.replace(" "+r+" "," ");n!==(o=ga(t))&&i.setAttribute("class",o)}return this},toggleClass:function(e,a){var i=typeof e,t="string"===i||Array.isArray(e);return"boolean"==typeof a&&t?a?this.addClass(e):this.removeClass(e):y(e)?this.each(function(i){x(this).toggleClass(e.call(this,i,pa(this),a),a)}):this.each(function(){var a,n,r,s;if(t)for(n=0,r=x(this),s=ba(e);a=s[n++];)r.hasClass(a)?r.removeClass(a):r.addClass(a);else void 0!==e&&"boolean"!==i||((a=pa(this))&&X.set(this,"__className__",a),this.setAttribute&&this.setAttribute("class",a||!1===e?"":X.get(this,"__className__")||""))})},hasClass:function(e){var a,i,t=0;for(a=" "+e+" ";i=this[t++];)if(1===i.nodeType&&(" "+ga(pa(i))+" ").indexOf(a)>-1)return!0;return!1}});var fa=/\r/g;x.fn.extend({val:function(e){var a,i,t,n=this[0];return arguments.length?(t=y(e),this.each(function(i){var n;1===this.nodeType&&(null==(n=t?e.call(this,i,x(this).val()):e)?n="":"number"==typeof n?n+="":Array.isArray(n)&&(n=x.map(n,function(e){return null==e?"":e+""})),(a=x.valHooks[this.type]||x.valHooks[this.nodeName.toLowerCase()])&&"set"in a&&void 0!==a.set(this,n,"value")||(this.value=n))})):n?(a=x.valHooks[n.type]||x.valHooks[n.nodeName.toLowerCase()])&&"get"in a&&void 0!==(i=a.get(n,"value"))?i:"string"==typeof(i=n.value)?i.replace(fa,""):null==i?"":i:void 0}}),x.extend({valHooks:{option:{get:function(e){var a=x.find.attr(e,"value");return null!=a?a:ga(x.text(e))}},select:{get:function(e){var a,i,t,n=e.options,r=e.selectedIndex,s="select-one"===e.type,o=s?null:[],l=s?r+1:n.length;for(t=r<0?l:s?r:0;t-1)&&(i=!0);return i||(e.selectedIndex=-1),r}}}}),x.each(["radio","checkbox"],function(){x.valHooks[this]={set:function(e,a){if(Array.isArray(a))return e.checked=x.inArray(x(e).val(),a)>-1}},f.checkOn||(x.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),f.focusin="onfocusin"in i;var ya=/^(?:focusinfocus|focusoutblur)$/,ka=function(e){e.stopPropagation()};x.extend(x.event,{trigger:function(e,a,t,n){var r,o,l,d,c,u,m,h,p=[t||s],b=g.call(e,"type")?e.type:e,f=g.call(e,"namespace")?e.namespace.split("."):[];if(o=h=l=t=t||s,3!==t.nodeType&&8!==t.nodeType&&!ya.test(b+x.event.triggered)&&(b.indexOf(".")>-1&&(b=(f=b.split(".")).shift(),f.sort()),c=b.indexOf(":")<0&&"on"+b,(e=e[x.expando]?e:new x.Event(b,"object"==typeof e&&e)).isTrigger=n?2:3,e.namespace=f.join("."),e.rnamespace=e.namespace?new RegExp("(^|\\.)"+f.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,e.result=void 0,e.target||(e.target=t),a=null==a?[e]:x.makeArray(a,[e]),m=x.event.special[b]||{},n||!m.trigger||!1!==m.trigger.apply(t,a))){if(!n&&!m.noBubble&&!k(t)){for(d=m.delegateType||b,ya.test(d+b)||(o=o.parentNode);o;o=o.parentNode)p.push(o),l=o;l===(t.ownerDocument||s)&&p.push(l.defaultView||l.parentWindow||i)}for(r=0;(o=p[r++])&&!e.isPropagationStopped();)h=o,e.type=r>1?d:m.bindType||b,(u=(X.get(o,"events")||{})[e.type]&&X.get(o,"handle"))&&u.apply(o,a),(u=c&&o[c])&&u.apply&&K(o)&&(e.result=u.apply(o,a),!1===e.result&&e.preventDefault());return e.type=b,n||e.isDefaultPrevented()||m._default&&!1!==m._default.apply(p.pop(),a)||!K(t)||c&&y(t[b])&&!k(t)&&((l=t[c])&&(t[c]=null),x.event.triggered=b,e.isPropagationStopped()&&h.addEventListener(b,ka),t[b](),e.isPropagationStopped()&&h.removeEventListener(b,ka),x.event.triggered=void 0,l&&(t[c]=l)),e.result}},simulate:function(e,a,i){var t=x.extend(new x.Event,i,{type:e,isSimulated:!0});x.event.trigger(t,null,a)}}),x.fn.extend({trigger:function(e,a){return this.each(function(){x.event.trigger(e,a,this)})},triggerHandler:function(e,a){var i=this[0];if(i)return x.event.trigger(e,a,i,!0)}}),f.focusin||x.each({focus:"focusin",blur:"focusout"},function(e,a){var i=function(e){x.event.simulate(a,e.target,x.event.fix(e))};x.event.special[a]={setup:function(){var t=this.ownerDocument||this,n=X.access(t,a);n||t.addEventListener(e,i,!0),X.access(t,a,(n||0)+1)},teardown:function(){var t=this.ownerDocument||this,n=X.access(t,a)-1;n?X.access(t,a,n):(t.removeEventListener(e,i,!0),X.remove(t,a))}}});var va=i.location,wa=Date.now(),_a=/\?/;x.parseXML=function(e){var a;if(!e||"string"!=typeof e)return null;try{a=(new i.DOMParser).parseFromString(e,"text/xml")}catch(e){a=void 0}return a&&!a.getElementsByTagName("parsererror").length||x.error("Invalid XML: "+e),a};var xa=/\[\]$/,ja=/\r?\n/g,za=/^(?:submit|button|image|reset|file)$/i,Ma=/^(?:input|select|textarea|keygen)/i;function La(e,a,i,t){var n;if(Array.isArray(a))x.each(a,function(a,n){i||xa.test(e)?t(e,n):La(e+"["+("object"==typeof n&&null!=n?a:"")+"]",n,i,t)});else if(i||"object"!==_(a))t(e,a);else for(n in a)La(e+"["+n+"]",a[n],i,t)}x.param=function(e,a){var i,t=[],n=function(e,a){var i=y(a)?a():a;t[t.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==i?"":i)};if(Array.isArray(e)||e.jquery&&!x.isPlainObject(e))x.each(e,function(){n(this.name,this.value)});else for(i in e)La(i,e[i],a,n);return t.join("&")},x.fn.extend({serialize:function(){return x.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=x.prop(this,"elements");return e?x.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!x(this).is(":disabled")&&Ma.test(this.nodeName)&&!za.test(e)&&(this.checked||!me.test(e))}).map(function(e,a){var i=x(this).val();return null==i?null:Array.isArray(i)?x.map(i,function(e){return{name:a.name,value:e.replace(ja,"\r\n")}}):{name:a.name,value:i.replace(ja,"\r\n")}}).get()}});var Ya=/%20/g,Da=/#.*$/,Ta=/([?&])_=[^&]*/,qa=/^(.*?):[ \t]*([^\r\n]*)$/gm,Sa=/^(?:GET|HEAD)$/,Ha=/^\/\//,Ca={},Aa={},Pa="*/".concat("*"),Oa=s.createElement("a");function Ea(e){return function(a,i){"string"!=typeof a&&(i=a,a="*");var t,n=0,r=a.toLowerCase().match(E)||[];if(y(i))for(;t=r[n++];)"+"===t[0]?(t=t.slice(1)||"*",(e[t]=e[t]||[]).unshift(i)):(e[t]=e[t]||[]).push(i)}}function Wa(e,a,i,t){var n={},r=e===Aa;function s(o){var l;return n[o]=!0,x.each(e[o]||[],function(e,o){var d=o(a,i,t);return"string"!=typeof d||r||n[d]?r?!(l=d):void 0:(a.dataTypes.unshift(d),s(d),!1)}),l}return s(a.dataTypes[0])||!n["*"]&&s("*")}function Ia(e,a){var i,t,n=x.ajaxSettings.flatOptions||{};for(i in a)void 0!==a[i]&&((n[i]?e:t||(t={}))[i]=a[i]);return t&&x.extend(!0,e,t),e}Oa.href=va.href,x.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:va.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(va.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Pa,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":x.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,a){return a?Ia(Ia(e,x.ajaxSettings),a):Ia(x.ajaxSettings,e)},ajaxPrefilter:Ea(Ca),ajaxTransport:Ea(Aa),ajax:function(e,a){"object"==typeof e&&(a=e,e=void 0),a=a||{};var t,n,r,o,l,d,c,u,m,h,g=x.ajaxSetup({},a),p=g.context||g,b=g.context&&(p.nodeType||p.jquery)?x(p):x.event,f=x.Deferred(),y=x.Callbacks("once memory"),k=g.statusCode||{},v={},w={},_="canceled",j={readyState:0,getResponseHeader:function(e){var a;if(c){if(!o)for(o={};a=qa.exec(r);)o[a[1].toLowerCase()]=a[2];a=o[e.toLowerCase()]}return null==a?null:a},getAllResponseHeaders:function(){return c?r:null},setRequestHeader:function(e,a){return null==c&&(e=w[e.toLowerCase()]=w[e.toLowerCase()]||e,v[e]=a),this},overrideMimeType:function(e){return null==c&&(g.mimeType=e),this},statusCode:function(e){var a;if(e)if(c)j.always(e[j.status]);else for(a in e)k[a]=[k[a],e[a]];return this},abort:function(e){var a=e||_;return t&&t.abort(a),z(0,a),this}};if(f.promise(j),g.url=((e||g.url||va.href)+"").replace(Ha,va.protocol+"//"),g.type=a.method||a.type||g.method||g.type,g.dataTypes=(g.dataType||"*").toLowerCase().match(E)||[""],null==g.crossDomain){d=s.createElement("a");try{d.href=g.url,d.href=d.href,g.crossDomain=Oa.protocol+"//"+Oa.host!=d.protocol+"//"+d.host}catch(e){g.crossDomain=!0}}if(g.data&&g.processData&&"string"!=typeof g.data&&(g.data=x.param(g.data,g.traditional)),Wa(Ca,g,a,j),c)return j;for(m in(u=x.event&&g.global)&&0==x.active++&&x.event.trigger("ajaxStart"),g.type=g.type.toUpperCase(),g.hasContent=!Sa.test(g.type),n=g.url.replace(Da,""),g.hasContent?g.data&&g.processData&&0===(g.contentType||"").indexOf("application/x-www-form-urlencoded")&&(g.data=g.data.replace(Ya,"+")):(h=g.url.slice(n.length),g.data&&(g.processData||"string"==typeof g.data)&&(n+=(_a.test(n)?"&":"?")+g.data,delete g.data),!1===g.cache&&(n=n.replace(Ta,"$1"),h=(_a.test(n)?"&":"?")+"_="+wa+++h),g.url=n+h),g.ifModified&&(x.lastModified[n]&&j.setRequestHeader("If-Modified-Since",x.lastModified[n]),x.etag[n]&&j.setRequestHeader("If-None-Match",x.etag[n])),(g.data&&g.hasContent&&!1!==g.contentType||a.contentType)&&j.setRequestHeader("Content-Type",g.contentType),j.setRequestHeader("Accept",g.dataTypes[0]&&g.accepts[g.dataTypes[0]]?g.accepts[g.dataTypes[0]]+("*"!==g.dataTypes[0]?", "+Pa+"; q=0.01":""):g.accepts["*"]),g.headers)j.setRequestHeader(m,g.headers[m]);if(g.beforeSend&&(!1===g.beforeSend.call(p,j,g)||c))return j.abort();if(_="abort",y.add(g.complete),j.done(g.success),j.fail(g.error),t=Wa(Aa,g,a,j)){if(j.readyState=1,u&&b.trigger("ajaxSend",[j,g]),c)return j;g.async&&g.timeout>0&&(l=i.setTimeout(function(){j.abort("timeout")},g.timeout));try{c=!1,t.send(v,z)}catch(e){if(c)throw e;z(-1,e)}}else z(-1,"No Transport");function z(e,a,s,o){var d,m,h,v,w,_=a;c||(c=!0,l&&i.clearTimeout(l),t=void 0,r=o||"",j.readyState=e>0?4:0,d=e>=200&&e<300||304===e,s&&(v=function(e,a,i){for(var t,n,r,s,o=e.contents,l=e.dataTypes;"*"===l[0];)l.shift(),void 0===t&&(t=e.mimeType||a.getResponseHeader("Content-Type"));if(t)for(n in o)if(o[n]&&o[n].test(t)){l.unshift(n);break}if(l[0]in i)r=l[0];else{for(n in i){if(!l[0]||e.converters[n+" "+l[0]]){r=n;break}s||(s=n)}r=r||s}if(r)return r!==l[0]&&l.unshift(r),i[r]}(g,j,s)),v=function(e,a,i,t){var n,r,s,o,l,d={},c=e.dataTypes.slice();if(c[1])for(s in e.converters)d[s.toLowerCase()]=e.converters[s];for(r=c.shift();r;)if(e.responseFields[r]&&(i[e.responseFields[r]]=a),!l&&t&&e.dataFilter&&(a=e.dataFilter(a,e.dataType)),l=r,r=c.shift())if("*"===r)r=l;else if("*"!==l&&l!==r){if(!(s=d[l+" "+r]||d["* "+r]))for(n in d)if((o=n.split(" "))[1]===r&&(s=d[l+" "+o[0]]||d["* "+o[0]])){!0===s?s=d[n]:!0!==d[n]&&(r=o[0],c.unshift(o[1]));break}if(!0!==s)if(s&&e.throws)a=s(a);else try{a=s(a)}catch(e){return{state:"parsererror",error:s?e:"No conversion from "+l+" to "+r}}}return{state:"success",data:a}}(g,v,j,d),d?(g.ifModified&&((w=j.getResponseHeader("Last-Modified"))&&(x.lastModified[n]=w),(w=j.getResponseHeader("etag"))&&(x.etag[n]=w)),204===e||"HEAD"===g.type?_="nocontent":304===e?_="notmodified":(_=v.state,m=v.data,d=!(h=v.error))):(h=_,!e&&_||(_="error",e<0&&(e=0))),j.status=e,j.statusText=(a||_)+"",d?f.resolveWith(p,[m,_,j]):f.rejectWith(p,[j,_,h]),j.statusCode(k),k=void 0,u&&b.trigger(d?"ajaxSuccess":"ajaxError",[j,g,d?m:h]),y.fireWith(p,[j,_]),u&&(b.trigger("ajaxComplete",[j,g]),--x.active||x.event.trigger("ajaxStop")))}return j},getJSON:function(e,a,i){return x.get(e,a,i,"json")},getScript:function(e,a){return x.get(e,void 0,a,"script")}}),x.each(["get","post"],function(e,a){x[a]=function(e,i,t,n){return y(i)&&(n=n||t,t=i,i=void 0),x.ajax(x.extend({url:e,type:a,dataType:n,data:i,success:t},x.isPlainObject(e)&&e))}}),x._evalUrl=function(e){return x.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,throws:!0})},x.fn.extend({wrapAll:function(e){var a;return this[0]&&(y(e)&&(e=e.call(this[0])),a=x(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&a.insertBefore(this[0]),a.map(function(){for(var e=this;e.firstElementChild;)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(e){return y(e)?this.each(function(a){x(this).wrapInner(e.call(this,a))}):this.each(function(){var a=x(this),i=a.contents();i.length?i.wrapAll(e):a.append(e)})},wrap:function(e){var a=y(e);return this.each(function(i){x(this).wrapAll(a?e.call(this,i):e)})},unwrap:function(e){return this.parent(e).not("body").each(function(){x(this).replaceWith(this.childNodes)}),this}}),x.expr.pseudos.hidden=function(e){return!x.expr.pseudos.visible(e)},x.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},x.ajaxSettings.xhr=function(){try{return new i.XMLHttpRequest}catch(e){}};var Fa={0:200,1223:204},Na=x.ajaxSettings.xhr();f.cors=!!Na&&"withCredentials"in Na,f.ajax=Na=!!Na,x.ajaxTransport(function(e){var a,t;if(f.cors||Na&&!e.crossDomain)return{send:function(n,r){var s,o=e.xhr();if(o.open(e.type,e.url,e.async,e.username,e.password),e.xhrFields)for(s in e.xhrFields)o[s]=e.xhrFields[s];for(s in e.mimeType&&o.overrideMimeType&&o.overrideMimeType(e.mimeType),e.crossDomain||n["X-Requested-With"]||(n["X-Requested-With"]="XMLHttpRequest"),n)o.setRequestHeader(s,n[s]);a=function(e){return function(){a&&(a=t=o.onload=o.onerror=o.onabort=o.ontimeout=o.onreadystatechange=null,"abort"===e?o.abort():"error"===e?"number"!=typeof o.status?r(0,"error"):r(o.status,o.statusText):r(Fa[o.status]||o.status,o.statusText,"text"!==(o.responseType||"text")||"string"!=typeof o.responseText?{binary:o.response}:{text:o.responseText},o.getAllResponseHeaders()))}},o.onload=a(),t=o.onerror=o.ontimeout=a("error"),void 0!==o.onabort?o.onabort=t:o.onreadystatechange=function(){4===o.readyState&&i.setTimeout(function(){a&&t()})},a=a("abort");try{o.send(e.hasContent&&e.data||null)}catch(e){if(a)throw e}},abort:function(){a&&a()}}}),x.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),x.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return x.globalEval(e),e}}}),x.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),x.ajaxTransport("script",function(e){var a,i;if(e.crossDomain)return{send:function(t,n){a=x(" - - @stack('styles') - - -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    - @include('admin.menu') -
    -
    -
    -
    -
    -
    -
    - @yield('content') -
    -
    -
    -@include('layout.footer') -@stack('scripts') - - \ No newline at end of file diff --git a/app_old/resources/views/admin/menu.blade.php b/app_old/resources/views/admin/menu.blade.php deleted file mode 100644 index f98cf2d..0000000 --- a/app_old/resources/views/admin/menu.blade.php +++ /dev/null @@ -1,40 +0,0 @@ - diff --git a/app_old/resources/views/admin/menu/models.blade.php b/app_old/resources/views/admin/menu/models.blade.php deleted file mode 100644 index 905537c..0000000 --- a/app_old/resources/views/admin/menu/models.blade.php +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/app_old/resources/views/admin/menu/registros.blade.php b/app_old/resources/views/admin/menu/registros.blade.php deleted file mode 100644 index c86be14..0000000 --- a/app_old/resources/views/admin/menu/registros.blade.php +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/app_old/resources/views/admin/menu/roles.blade.php b/app_old/resources/views/admin/menu/roles.blade.php deleted file mode 100644 index f885743..0000000 --- a/app_old/resources/views/admin/menu/roles.blade.php +++ /dev/null @@ -1,4 +0,0 @@ - diff --git a/app_old/resources/views/admin/menu/users.blade.php b/app_old/resources/views/admin/menu/users.blade.php deleted file mode 100644 index 6061b94..0000000 --- a/app_old/resources/views/admin/menu/users.blade.php +++ /dev/null @@ -1,4 +0,0 @@ - diff --git a/app_old/resources/views/admin/models.blade.php b/app_old/resources/views/admin/models.blade.php deleted file mode 100644 index 95c40e7..0000000 --- a/app_old/resources/views/admin/models.blade.php +++ /dev/null @@ -1,31 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -
    DB to Models
    -
    - -
    -
    DB
    -
    - -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    -@endsection - -@push('scripts') - -@endpush \ No newline at end of file diff --git a/app_old/resources/views/admin/registros/controles_avance.blade.php b/app_old/resources/views/admin/registros/controles_avance.blade.php deleted file mode 100644 index 9cfd93e..0000000 --- a/app_old/resources/views/admin/registros/controles_avance.blade.php +++ /dev/null @@ -1,31 +0,0 @@ -
    -
    - @if ($start > 0) - - - - @endif -
    -
    - @if ($start > 0) - - - - @endif -
    -
    {{$start + 1}} - {{$end}}
    -
    - @if ($end < $total) - - - - @endif -
    -
    - @if ($end < $total) - - - - @endif -
    -
    diff --git a/app_old/resources/views/admin/registros/list.blade.php b/app_old/resources/views/admin/registros/list.blade.php deleted file mode 100644 index f744930..0000000 --- a/app_old/resources/views/admin/registros/list.blade.php +++ /dev/null @@ -1,41 +0,0 @@ -@extends('admin.base') - -@section('content') -
    -
    Registros
    -
    - @include('admin.registros.controles_avance') - - - - - - - - - - - - @foreach ($registros as $registro) - - - - - - - - @endforeach - -
    UsuarioRolesFecha - HoraModeloCambios
    {{$registro->user()->name}} - @foreach ($registro->user()->roles() as $rol) - {{ucwords($rol->description)}} - @endforeach - {{$registro->time()->format('d-m-Y - H:i:s')}} hrs.{{$registro->model()}}{{count($registro->actions())}}
    - @include('admin.registros.controles_avance') -
    -
    -@endsection diff --git a/app_old/resources/views/admin/registros/show.blade.php b/app_old/resources/views/admin/registros/show.blade.php deleted file mode 100644 index 7c0a98f..0000000 --- a/app_old/resources/views/admin/registros/show.blade.php +++ /dev/null @@ -1,62 +0,0 @@ -@extends('admin.base') - -@section('content') -
    -
    Ver Registro
    -
    -
    -
    Usuario
    -
    {{$registro->user()->name}}
    -
    -
    -
    Roles
    -
    - @foreach ($registro->user()->roles() as $rol) - {{ucwords($rol->description)}} - @endforeach -
    -
    -
    -
    Fecha - Hora
    -
    {{$registro->time()->format('d-m-Y - H:i:s')}}
    -
    -
    -
    Modelo
    -
    {{$registro->model()}}
    -
    -
    -
    Cambios
    -
    - - - - - - - - - - - - - @foreach ($registro->actions() as $column => $action) - - - - - - @endforeach - -
    ColumnaValor
    AntiguoNuevo
    {{$column}}{{$action->old}}{{$action->new}}
    -
    -
    -
    - Volver -
    -
    -
    -@endsection diff --git a/app_old/resources/views/admin/roles/add.blade.php b/app_old/resources/views/admin/roles/add.blade.php deleted file mode 100644 index dc9274e..0000000 --- a/app_old/resources/views/admin/roles/add.blade.php +++ /dev/null @@ -1,17 +0,0 @@ -@extends('admin.base') - -@section('content') -
    -
    Agregar Rol
    -
    -
    -
    -
    -
    Descripción
    -
    -
    -
    -
    -
    -
    -@endsection diff --git a/app_old/resources/views/admin/roles/add_permissions.blade.php b/app_old/resources/views/admin/roles/add_permissions.blade.php deleted file mode 100644 index d18c126..0000000 --- a/app_old/resources/views/admin/roles/add_permissions.blade.php +++ /dev/null @@ -1,40 +0,0 @@ -@extends('admin.base') - -@section('content') -
    -
    Agregar Permisos - {{$role->description}}
    -
    -
    -
    -
    -
    Permitidos
    -
    -
    - -
    Denegados
    -
    -
    - */ ?> -
    -
    -
    - -@endsection diff --git a/app_old/resources/views/admin/roles/add_users.blade.php b/app_old/resources/views/admin/roles/add_users.blade.php deleted file mode 100644 index 34e2e7e..0000000 --- a/app_old/resources/views/admin/roles/add_users.blade.php +++ /dev/null @@ -1,24 +0,0 @@ -@extends('admin.base') - -@section('content') -
    -
    Agregar Usuario - {{$role->description}}
    -
    -
    -
    -
    -
    Ususarios
    -
    -
    -
    -
    -
    -
    -@endsection diff --git a/app_old/resources/views/admin/roles/list.blade.php b/app_old/resources/views/admin/roles/list.blade.php deleted file mode 100644 index efbd9bc..0000000 --- a/app_old/resources/views/admin/roles/list.blade.php +++ /dev/null @@ -1,32 +0,0 @@ -@extends('admin.base') - -@section('content') -
    -
    Roles
    -
    -
    - - - - - - - - - - -@foreach ($roles as $role) - - - - - - -@endforeach - -
    DescripciónNivelUsuarios
    {{$role->description}}{{$role->level}} - @foreach ($role->users() as $user) - {{$user->name}} - @endforeach -
    -@endsection diff --git a/app_old/resources/views/admin/roles/show.blade.php b/app_old/resources/views/admin/roles/show.blade.php deleted file mode 100644 index 97a0d57..0000000 --- a/app_old/resources/views/admin/roles/show.blade.php +++ /dev/null @@ -1,63 +0,0 @@ -@extends('admin.base') - -@section('content') -
    -
    {{$role->description}}
    -
    -
    -
    Usuarios
    -
    -
    - - @foreach ($role->users() as $user) - - - - - @endforeach -
    {{$user->name}}
    -
    -
    Permisos
    -
    -
    -@if ($role->permissions()) - - - - - - - - - - @foreach ($permissions as $permission) - - - - - - @endforeach - -
    AcciónEstadoHeredado
    {{$permission->description}} - @if ($permission->status) Permitido @else Denegado @endif - - @if ($permission->inherited) - Si - @else - No - @endif -
    -@endif -@endsection diff --git a/app_old/resources/views/admin/users/add.blade.php b/app_old/resources/views/admin/users/add.blade.php deleted file mode 100644 index 5f67fdb..0000000 --- a/app_old/resources/views/admin/users/add.blade.php +++ /dev/null @@ -1,21 +0,0 @@ -@extends('admin.base') - -@section('content') -
    -
    Agregar Ususario
    -
    -
    -
    -
    -
    Usuario
    -
    -
    -
    -
    Password
    -
    -
    -
    -
    -
    -
    -@endsection diff --git a/app_old/resources/views/admin/users/add_role.blade.php b/app_old/resources/views/admin/users/add_role.blade.php deleted file mode 100644 index acad3d7..0000000 --- a/app_old/resources/views/admin/users/add_role.blade.php +++ /dev/null @@ -1,24 +0,0 @@ -@extends('admin.base') - -@section('content') -
    -
    Agregar Rol - {{$user->name}}
    -
    -
    -
    -
    -
    Rol
    -
    -
    -
    -
    -
    -
    -@endsection diff --git a/app_old/resources/views/admin/users/list.blade.php b/app_old/resources/views/admin/users/list.blade.php deleted file mode 100644 index d660684..0000000 --- a/app_old/resources/views/admin/users/list.blade.php +++ /dev/null @@ -1,29 +0,0 @@ -@extends('admin.base') - -@section('content') -
    -
    Usuarios
    -
    -
    - - - - - - - - -@foreach ($users as $user) - - - - - -@endforeach - -
    NombreRoles
    {{$user->name}} - @foreach ($user->roles() as $role) - {{$role->description}} - @endforeach -
    -@endsection diff --git a/app_old/resources/views/admin/users/show.blade.php b/app_old/resources/views/admin/users/show.blade.php deleted file mode 100644 index 8efdee3..0000000 --- a/app_old/resources/views/admin/users/show.blade.php +++ /dev/null @@ -1,62 +0,0 @@ -@extends('admin.base') - -@section('content') -
    -
    {{$user->name}}
    -
    - - Resetear Clave - -
    -
    Roles
    -
    -
    - - @foreach ($user->roles() as $role) - - - - - @endforeach -
    {{$role->description}}
    -
    -
    Permisos
    -
    -
    -@if ($user->permissions()) - - - - - - - - - - @foreach ($user->permissions() as $permission) - - - - - - @endforeach - -
    PáginasRolAcceso
    - {{$permission->action()->description}} - - @if ($permission->type == 2) - {{$permission->who()->description}} - @endif - - @if ($permission->all == 0) - @if ($permission->access == 1) - Permitido - @else - Denegado - @endif - @else - Permitido - @endif -
    -@endif -@endsection diff --git a/app_old/resources/views/auth/base.blade.php b/app_old/resources/views/auth/base.blade.php deleted file mode 100644 index c1e7338..0000000 --- a/app_old/resources/views/auth/base.blade.php +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - @if (isset($titulo)) - {{$titulo}} - - @endif - Incoviba S. A. - - - - - @stack('styles') - - -
    -
    -
    -
    -
    - Logo -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    -
    - @yield('content') -
    -
    -
    -@include('layout.footer') -@stack('scripts') - - diff --git a/app_old/resources/views/auth/change_pass.blade.php b/app_old/resources/views/auth/change_pass.blade.php deleted file mode 100644 index 859c91e..0000000 --- a/app_old/resources/views/auth/change_pass.blade.php +++ /dev/null @@ -1,78 +0,0 @@ -@extends('auth.base') - -@section('content') -
    -
    Cambio de Cláve
    -
    -
    -
    -
    -
    Cláve anterior
    -
    -
    -
    -
    -
    Cláve nueva
    -
    -
    -
    -
    -
    Repetir cláve
    -
    -
    -
    -
    -
    -
    -
    -@endsection - -@push('scripts') - -@endpush diff --git a/app_old/resources/views/auth/login.blade.php b/app_old/resources/views/auth/login.blade.php deleted file mode 100644 index d36013e..0000000 --- a/app_old/resources/views/auth/login.blade.php +++ /dev/null @@ -1,17 +0,0 @@ -@extends('auth.base') - -@section('content') -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -@endsection diff --git a/app_old/resources/views/benchmark.blade.php b/app_old/resources/views/benchmark.blade.php deleted file mode 100644 index 65e2ccb..0000000 --- a/app_old/resources/views/benchmark.blade.php +++ /dev/null @@ -1,7 +0,0 @@ -
    -
    -
    -
    Tiempo demorado
    -
    {{$benchmark->time}} s
    -
    -
    \ No newline at end of file diff --git a/app_old/resources/views/buscar/buscar.blade.php b/app_old/resources/views/buscar/buscar.blade.php deleted file mode 100644 index 6312bb0..0000000 --- a/app_old/resources/views/buscar/buscar.blade.php +++ /dev/null @@ -1,79 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -
    Buscar
    -
    -
    - -
    -
    -
    -
    -
    - - {{ucwords($tipos[0])}} -
    - @foreach ($tipos as $i => $tipo) - @if ($tipo == 'cualquiera') - @continue - @endif -
    - - {{ucwords($tipo)}} -
    - @endforeach -
    -
    -
    -
    -
    -@if ($results != null) -
    -
    Resultados
    -
    - - - - - - - - - - - - - - - @if (isset($results) and is_array($results) and count($results) > 0) - @foreach ($results as $resultado) - @include('buscar.resultado', ['resultado' => $resultado]) - @endforeach - @endif - -
    ProyectoDepartamentoPropietarioTipom²Valor [UF]Fecha VentaFecha Entrega
    -
    -
    -@endif -@endsection diff --git a/app_old/resources/views/buscar/resultado.blade.php b/app_old/resources/views/buscar/resultado.blade.php deleted file mode 100644 index 9d47106..0000000 --- a/app_old/resources/views/buscar/resultado.blade.php +++ /dev/null @@ -1,46 +0,0 @@ - - - proyecto()->descripcion . '"'), 't' => 'proyecto'])}}"> - {{$resultado->proyecto()->descripcion}} - - - @if (method_exists($resultado, 'unidad')) - - - {{$resultado->unidad()->descripcion}} - @if ($resultado->estado == 0) - (r) - @elseif ($resultado->estado == -1) - (c) - @endif - - - - - propietario()->nombreCompleto() . '"'), 't' => 'propietario'])}}"> - {{$resultado->propietario()->nombreCompleto()}} - - - {{ucwords($resultado->unidad()->tipo()->descripcion)}} - {{\App\Helper\Format::m2($resultado->unidad()->m2())}} - {{\App\Helper\Format::ufs($resultado->valor_uf)}} - {{\App\Helper\Format::shortDate($resultado->fecha)}} - - @if ($resultado->entrega != 0) - {{\App\Helper\Format::shortDate($resultado->entrega()->fecha)}} - @endif - - @else - - {{$resultado->descripcion}} - - {{ucwords($resultado->tipo()->descripcion)}} - {{\App\Helper\Format::m2($resultado->m2())}} - @if ($resultado->valor) - {{format('ufs', $resultado->valor)}} - @else - - @endif - - @endif - \ No newline at end of file diff --git a/app_old/resources/views/calendario.blade.php b/app_old/resources/views/calendario.blade.php deleted file mode 100644 index 3a415fa..0000000 --- a/app_old/resources/views/calendario.blade.php +++ /dev/null @@ -1,17 +0,0 @@ -
    - @foreach ($dias as $dia => $proyectos) -
    -
    {{format('localDate', $dia, 'ddd DD [de] MMMM [de] YYYY', true)}}
    -
    - @foreach ($proyectos as $proyecto => $cantidad) -
    -
    -
    {{$proyecto}}
    -
    -
    {{$cantidad}}
    -
    - @endforeach -
    -
    - @endforeach -
    diff --git a/app_old/resources/views/cierres.blade.php b/app_old/resources/views/cierres.blade.php deleted file mode 100644 index aca4e46..0000000 --- a/app_old/resources/views/cierres.blade.php +++ /dev/null @@ -1,31 +0,0 @@ -

    Cierres Vigentes

    -
    - @foreach ($cierres as $proyecto => $cierre) -
    -
    {{$proyecto}} [{{$cierre->total}}]
    -
    -
    -
    -
    Promesados
    -
    -
    {{count($cierre->vigentes)}}
    -
    -
    -
    -
    Pendientes
    - @if (count($cierre->pendientes) > 0) -
    Desde {{$cierre->pendientes[0]->periodo()}} días atrás
    - @endif -
    -
    {{count($cierre->pendientes)}}
    -
    -
    -
    -
    Rechazados
    -
    -
    {{count($cierre->rechazados)}}
    -
    -
    -
    - @endforeach -
    diff --git a/app_old/resources/views/construccion.blade.php b/app_old/resources/views/construccion.blade.php deleted file mode 100644 index 2e4a1f9..0000000 --- a/app_old/resources/views/construccion.blade.php +++ /dev/null @@ -1,5 +0,0 @@ -@extends('layout.base') - -@section('content') -Sección en construcción. -@endsection \ No newline at end of file diff --git a/app_old/resources/views/contabilidad/pago.blade.php b/app_old/resources/views/contabilidad/pago.blade.php deleted file mode 100644 index dd024a0..0000000 --- a/app_old/resources/views/contabilidad/pago.blade.php +++ /dev/null @@ -1,20 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Pagos del Mes - {{$proyecto->descripcion}} - {{$proyecto->inmobiliaria()->abreviacion}}

    -
    -

    {{$fecha->format('d / m / Y')}}

    - {{!d($pagos)}} - - @foreach ($pagos as $pago) - - - - - - - - @endforeach -
    {{$pago->Departamento}}{{$pago->Numero}}{{$pago->Total}}{{format('ufs', $pago->Valor->UF)}}{{format('pesos', $pago->Valor->Pesos)}}
    -@endsection diff --git a/app_old/resources/views/contabilidad/pagos.blade.php b/app_old/resources/views/contabilidad/pagos.blade.php deleted file mode 100644 index eda0d3e..0000000 --- a/app_old/resources/views/contabilidad/pagos.blade.php +++ /dev/null @@ -1,74 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Pagos del Mes

    -
    - - - - - - - - - - - - - -
    Proyectos
    NombreInmobiliaria
    -@endsection - - -@push('scripts') - -@endpush diff --git a/app_old/resources/views/form/fecha.blade.php b/app_old/resources/views/form/fecha.blade.php deleted file mode 100644 index 9137a8f..0000000 --- a/app_old/resources/views/form/fecha.blade.php +++ /dev/null @@ -1,38 +0,0 @@ - -
    -
    -
    \ No newline at end of file diff --git a/app_old/resources/views/guest.blade.php b/app_old/resources/views/guest.blade.php deleted file mode 100644 index 6692a1e..0000000 --- a/app_old/resources/views/guest.blade.php +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - @if (isset($titulo)) - {{$titulo}} - - @endif - Incoviba S. A. - - - - - @stack('styles') - - -
    -
    -
    -
    -
    - Logo -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    -
    - Hola invitad@, favor ingresar. -
    -
    -
    -@include('layout.footer') -@stack('scripts') - - diff --git a/app_old/resources/views/home.blade.php b/app_old/resources/views/home.blade.php deleted file mode 100644 index ccc52ff..0000000 --- a/app_old/resources/views/home.blade.php +++ /dev/null @@ -1,28 +0,0 @@ -@extends('layout.base') - -@section('content') -@if ($hoy > 0) -
    -
    Hay {{$hoy}} deposito{{($hoy > 1) ? 's' : ''}} para hoy.
    -
    -@endif -@if ($pendientes > 0) -
    -
    Existe{{($pendientes > 1) ? 'n' : ''}} {{$pendientes}} cuota{{($pendientes > 1) ? 's' : ''}} pendiente{{($pendientes > 1) ? 's' : ''}}.
    -
    -@endif - - -@if (count($dias) > 0) - -@endif -@if (count($cierres) > 0) - -@endif - -
    - @include('calendario') - - @include('cierres') -
    -@endsection diff --git a/app_old/resources/views/informes/comisiones.blade.php b/app_old/resources/views/informes/comisiones.blade.php deleted file mode 100644 index 235e714..0000000 --- a/app_old/resources/views/informes/comisiones.blade.php +++ /dev/null @@ -1,49 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Comisiones - {{$proyecto->descripcion}}

    -
    - - - - - - - - - - - - - - - - - - - - - @foreach ($ventas as $venta) - - - - - - - - - - - - @endforeach - - - - - - - -
    DepartamentoPropietarioEstacionamientosBodegasPrecioComisiónOperador
    PromesaNeto%UF
    {{$venta->unidad()->descripcion}}{{$venta->propietario()->nombreCompleto()}}{{implode(' - ', $venta->propiedad()->estacionamientos('array'))}}{{implode(' - ', $venta->propiedad()->bodegas('array'))}}{{format('ufs', $venta->valor_uf, null, true)}}{{format('ufs', $venta->valorCorredora(), null, true)}}1,5 %{{format('ufs', $venta->valorCorredora() * 1.5 / 100, null, true)}}{{($venta->agente != 0 and $venta->agente()->agente != 1) ? $venta->agente()->agente()->descripcion : ''}}
    Total{{format('ufs', $totales->precio, null, true)}}{{format('ufs', $totales->neto, null, true)}}1,5 %{{format('ufs', $totales->comision, null, true)}}
    - -@endsection diff --git a/app_old/resources/views/informes/contabilidad.blade.php b/app_old/resources/views/informes/contabilidad.blade.php deleted file mode 100644 index ff48b18..0000000 --- a/app_old/resources/views/informes/contabilidad.blade.php +++ /dev/null @@ -1,68 +0,0 @@ -@extends('layout.base') - -@section('content') -

    Contabilidad

    -
    -
    -
    Mes
    -
    -
    -
    -
    -@include('informes.proyectos', ['a' => 'contabilidad']) -
    -@endsection - -@push('scripts') - -@endpush diff --git a/app_old/resources/views/informes/escrituras.blade.php b/app_old/resources/views/informes/escrituras.blade.php deleted file mode 100644 index 069a1c7..0000000 --- a/app_old/resources/views/informes/escrituras.blade.php +++ /dev/null @@ -1,6 +0,0 @@ -@extends('layout.base') - -@section('content') -

    Escrituras

    -@include('informes.proyectos', ['a' => 'escrituras']) -@endsection \ No newline at end of file diff --git a/app_old/resources/views/informes/gantt_entregas.blade.php b/app_old/resources/views/informes/gantt_entregas.blade.php deleted file mode 100644 index cca849f..0000000 --- a/app_old/resources/views/informes/gantt_entregas.blade.php +++ /dev/null @@ -1,6 +0,0 @@ -@extends('layout.base') - -@section('content') -

    Gantt de Entregas

    -@include('informes.proyectos', ['a' => 'gantt_entregas']) -@endsection \ No newline at end of file diff --git a/app_old/resources/views/informes/para_comision.blade.php b/app_old/resources/views/informes/para_comision.blade.php deleted file mode 100644 index 5c369e4..0000000 --- a/app_old/resources/views/informes/para_comision.blade.php +++ /dev/null @@ -1,25 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Comisiones

    -
    -
    -
    -
    -
    Proyecto
    -
    -
    -
    -
    Unidades
    -
    -
    -
    -
    -
    - -@endsection diff --git a/app_old/resources/views/informes/proyectos.blade.php b/app_old/resources/views/informes/proyectos.blade.php deleted file mode 100644 index f85f302..0000000 --- a/app_old/resources/views/informes/proyectos.blade.php +++ /dev/null @@ -1,12 +0,0 @@ -
    -
    Proyectos
    - -
    diff --git a/app_old/resources/views/informes/resciliaciones.blade.php b/app_old/resources/views/informes/resciliaciones.blade.php deleted file mode 100644 index 5a527c3..0000000 --- a/app_old/resources/views/informes/resciliaciones.blade.php +++ /dev/null @@ -1,6 +0,0 @@ -@extends('layout.base') - -@section('content') -

    Resciliaciones

    -@include('informes.proyectos', ['a' => 'resciliaciones']) -@endsection diff --git a/app_old/resources/views/informes/resumen_contabilidad.blade.php b/app_old/resources/views/informes/resumen_contabilidad.blade.php deleted file mode 100644 index abd6a68..0000000 --- a/app_old/resources/views/informes/resumen_contabilidad.blade.php +++ /dev/null @@ -1,71 +0,0 @@ -@extends('layout.base') - -@section('content') -

    Resumen para Contabilidad

    - -
    -
    -
    Hasta Mes
    -
    -
    -
    -
    -@include('informes.proyectos', ['a' => 'resumen_contabilidad']) -
    -@endsection - -@push('scripts') - -@endpush diff --git a/app_old/resources/views/informes/ventas.blade.php b/app_old/resources/views/informes/ventas.blade.php deleted file mode 100644 index 0072b3f..0000000 --- a/app_old/resources/views/informes/ventas.blade.php +++ /dev/null @@ -1,6 +0,0 @@ -@extends('layout.base') - -@section('content') -

    Ventas

    -@include('informes.proyectos', ['a' => 'ventas']) -@endsection diff --git a/app_old/resources/views/inmobiliarias/add.blade.php b/app_old/resources/views/inmobiliarias/add.blade.php deleted file mode 100644 index e1fb3f0..0000000 --- a/app_old/resources/views/inmobiliarias/add.blade.php +++ /dev/null @@ -1,50 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Agregar Inmobiliaria

    -
    -
    -
    -
    -
    RUT
    -
    -
    -
    -
    Razón Social
    -
    -
    - -
    -
    -
    -
    Abreviación
    -
    -
    -
    -
    -
    -
    -@endsection - -@push('scripts') - -@endpush diff --git a/app_old/resources/views/inmobiliarias/edit.blade.php b/app_old/resources/views/inmobiliarias/edit.blade.php deleted file mode 100644 index 036da70..0000000 --- a/app_old/resources/views/inmobiliarias/edit.blade.php +++ /dev/null @@ -1,54 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Editar {{$inmobiliaria->abreviacion}}

    -
    -
    -
    -
    -
    RUT
    -
    -
    -
    -
    -
    Abreviación
    -
    -
    -
    -
    Razón Social
    -
    -
    - -
    -
    -
    -
    Banco
    -
    -
    -
    -
    Cuenta
    -
    -
    -
    -
    -
    -
    -@endsection diff --git a/app_old/resources/views/inmobiliarias/list.blade.php b/app_old/resources/views/inmobiliarias/list.blade.php deleted file mode 100644 index 6a130ae..0000000 --- a/app_old/resources/views/inmobiliarias/list.blade.php +++ /dev/null @@ -1,31 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -
    Inmobiliarias
    -
    - - - -
    -
    -
    -
    - @foreach ($inmobiliarias as $inmobiliaria) -
    -
    -
    - {{$inmobiliaria->nombre()}} -
    -
    - {{$inmobiliaria->rut()}} -
    -
    - {{$inmobiliaria->razon(true)}} -
    -
    -
    - @endforeach -
    -
    -@endsection diff --git a/app_old/resources/views/inmobiliarias/show.blade.php b/app_old/resources/views/inmobiliarias/show.blade.php deleted file mode 100644 index baa2de8..0000000 --- a/app_old/resources/views/inmobiliarias/show.blade.php +++ /dev/null @@ -1,47 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -
    -

    Inmobiliaria {{$inmobiliaria->nombre()}}

    -
    -
    - - - -
    -
    -
    -
    -
    RUT
    -
    {{format('rut', $inmobiliaria->rut)}}-{{$inmobiliaria->dv}}
    -
    -
    -
    Razón Social
    -
    {{$inmobiliaria->razon(true)}}
    -
    -@if ($inmobiliaria->banco != 0) -
    -
    Cuenta
    -
    {{$inmobiliaria->banco()->nombre}}
    -
    {{$inmobiliaria->cuenta}}
    -
    -@endif -
    -
    -
    Proyectos
    -
    -
    -
    -
    - - @foreach ($inmobiliaria->proyectos() as $proyecto) - - - - - @endforeach -
    {{$proyecto->descripcion}}{{$proyecto->estado()->tipo()->etapa()->descripcion}}
    -
    -
    -@endsection diff --git a/app_old/resources/views/install/admin.blade.php b/app_old/resources/views/install/admin.blade.php deleted file mode 100644 index aff2dc3..0000000 --- a/app_old/resources/views/install/admin.blade.php +++ /dev/null @@ -1,47 +0,0 @@ -@extends('install.base') - -@section('content') -

    Create Admin

    -
    -
    -
    Username
    -
    -
    -
    -
    Password
    -
    -
    -
    -
    -
    -
    -
    -@endsection - -@push('scripts') - -@endpush diff --git a/app_old/resources/views/install/base.blade.php b/app_old/resources/views/install/base.blade.php deleted file mode 100644 index 5e0d73f..0000000 --- a/app_old/resources/views/install/base.blade.php +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - @if (isset($titulo)) - {{$titulo}} - - @endif - Incoviba S. A. - - - - - @stack('styles') - - -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    -
    -
    -
    - @yield('content') -
    -
    -
    -@include('layout.footer') -@stack('scripts') - - diff --git a/app_old/resources/views/install/end.blade.php b/app_old/resources/views/install/end.blade.php deleted file mode 100644 index aeb7692..0000000 --- a/app_old/resources/views/install/end.blade.php +++ /dev/null @@ -1,5 +0,0 @@ -@extends('install.base') - -@section('content') -Installation ended. Go to Inicio. Remember to remove install folder. -@endsection diff --git a/app_old/resources/views/install/start.blade.php b/app_old/resources/views/install/start.blade.php deleted file mode 100644 index 2b18d4f..0000000 --- a/app_old/resources/views/install/start.blade.php +++ /dev/null @@ -1,6 +0,0 @@ -@extends('install.base') - -@section('content') -Start Installation -Create Tables -@endsection diff --git a/app_old/resources/views/layout/base.blade.php b/app_old/resources/views/layout/base.blade.php deleted file mode 100644 index ac17257..0000000 --- a/app_old/resources/views/layout/base.blade.php +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - @if (isset($titulo)) - {{$titulo}} - - @endif - Incoviba S. A. - - - - - - - - @stack('styles') - - -@include('layout.header') -
    -
    -
    - @yield('content') -
    -
    -
    -@include('layout.footer') -@stack('scripts') - - diff --git a/app_old/resources/views/layout/footer.blade.php b/app_old/resources/views/layout/footer.blade.php deleted file mode 100644 index e69de29..0000000 diff --git a/app_old/resources/views/layout/header.blade.php b/app_old/resources/views/layout/header.blade.php deleted file mode 100644 index fe8bc64..0000000 --- a/app_old/resources/views/layout/header.blade.php +++ /dev/null @@ -1,16 +0,0 @@ -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    - @include('layout.menu') -
    -
    -
    -
    \ No newline at end of file diff --git a/app_old/resources/views/layout/icons/abonar.blade.php b/app_old/resources/views/layout/icons/abonar.blade.php deleted file mode 100644 index 8530ae1..0000000 --- a/app_old/resources/views/layout/icons/abonar.blade.php +++ /dev/null @@ -1 +0,0 @@ - diff --git a/app_old/resources/views/layout/icons/add.blade.php b/app_old/resources/views/layout/icons/add.blade.php deleted file mode 100644 index 105550d..0000000 --- a/app_old/resources/views/layout/icons/add.blade.php +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/app_old/resources/views/layout/icons/edit.blade.php b/app_old/resources/views/layout/icons/edit.blade.php deleted file mode 100644 index cbd6f12..0000000 --- a/app_old/resources/views/layout/icons/edit.blade.php +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/app_old/resources/views/layout/icons/pagar.blade.php b/app_old/resources/views/layout/icons/pagar.blade.php deleted file mode 100644 index 5d5a5e7..0000000 --- a/app_old/resources/views/layout/icons/pagar.blade.php +++ /dev/null @@ -1 +0,0 @@ - diff --git a/app_old/resources/views/layout/icons/remove.blade.php b/app_old/resources/views/layout/icons/remove.blade.php deleted file mode 100644 index d52922f..0000000 --- a/app_old/resources/views/layout/icons/remove.blade.php +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/app_old/resources/views/layout/icons/show.blade.php b/app_old/resources/views/layout/icons/show.blade.php deleted file mode 100644 index 2fbeba9..0000000 --- a/app_old/resources/views/layout/icons/show.blade.php +++ /dev/null @@ -1,9 +0,0 @@ - diff --git a/app_old/resources/views/layout/menu.blade.php b/app_old/resources/views/layout/menu.blade.php deleted file mode 100644 index e4fef47..0000000 --- a/app_old/resources/views/layout/menu.blade.php +++ /dev/null @@ -1,69 +0,0 @@ - diff --git a/app_old/resources/views/layout/menu.blade.php.save b/app_old/resources/views/layout/menu.blade.php.save deleted file mode 100644 index c82be1c..0000000 --- a/app_old/resources/views/layout/menu.blade.php.save +++ /dev/null @@ -1,62 +0,0 @@ - diff --git a/app_old/resources/views/layout/menu/herramientas.blade.php b/app_old/resources/views/layout/menu/herramientas.blade.php deleted file mode 100644 index 9c8cf05..0000000 --- a/app_old/resources/views/layout/menu/herramientas.blade.php +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/app_old/resources/views/layout/menu/informes.blade.php b/app_old/resources/views/layout/menu/informes.blade.php deleted file mode 100644 index b5a9221..0000000 --- a/app_old/resources/views/layout/menu/informes.blade.php +++ /dev/null @@ -1,4 +0,0 @@ - diff --git a/app_old/resources/views/layout/menu/inmobiliarias.blade.php b/app_old/resources/views/layout/menu/inmobiliarias.blade.php deleted file mode 100644 index cbaf3e8..0000000 --- a/app_old/resources/views/layout/menu/inmobiliarias.blade.php +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/app_old/resources/views/layout/menu/login.blade.php b/app_old/resources/views/layout/menu/login.blade.php deleted file mode 100644 index 5329249..0000000 --- a/app_old/resources/views/layout/menu/login.blade.php +++ /dev/null @@ -1,8 +0,0 @@ - diff --git a/app_old/resources/views/layout/menu/operadores.blade.php b/app_old/resources/views/layout/menu/operadores.blade.php deleted file mode 100644 index 37b3336..0000000 --- a/app_old/resources/views/layout/menu/operadores.blade.php +++ /dev/null @@ -1,12 +0,0 @@ - - diff --git a/app_old/resources/views/layout/menu/proyectos.blade.php b/app_old/resources/views/layout/menu/proyectos.blade.php deleted file mode 100644 index cd4f349..0000000 --- a/app_old/resources/views/layout/menu/proyectos.blade.php +++ /dev/null @@ -1,4 +0,0 @@ - diff --git a/app_old/resources/views/layout/menu/ventas.blade.php b/app_old/resources/views/layout/menu/ventas.blade.php deleted file mode 100644 index 1505f1d..0000000 --- a/app_old/resources/views/layout/menu/ventas.blade.php +++ /dev/null @@ -1,24 +0,0 @@ - diff --git a/app_old/resources/views/other/capacidades.blade.php b/app_old/resources/views/other/capacidades.blade.php deleted file mode 100644 index 54abaa3..0000000 --- a/app_old/resources/views/other/capacidades.blade.php +++ /dev/null @@ -1,21 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Capacidades

    -
    - - -@foreach ($capacidades as $method) -@if ($class != $method->class) -class ?> - - - -@endif - - - -@endforeach -
    {{\Stringy\Stringy::create($method->class)->replace('App\\Controller\\', '')}}
    {{\Stringy\Stringy::create($method->class)->replace('App\\Controller\\', '')}}::{{$method->name}}
    -@endsection \ No newline at end of file diff --git a/app_old/resources/views/other/entregar_multiple.blade.php b/app_old/resources/views/other/entregar_multiple.blade.php deleted file mode 100644 index fe131d5..0000000 --- a/app_old/resources/views/other/entregar_multiple.blade.php +++ /dev/null @@ -1,26 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -
    -
    Archivo
    -
    -
    -
    -
    archivo CSV con separador ';'. 2 columnas: Departamento; Fecha
    -
    -
    -
    Proyecto
    -
    - -
    -
    -
    -
    -
    -
    -@endsection \ No newline at end of file diff --git a/app_old/resources/views/print/devolucion.blade.php b/app_old/resources/views/print/devolucion.blade.php deleted file mode 100644 index 8ed35c1..0000000 --- a/app_old/resources/views/print/devolucion.blade.php +++ /dev/null @@ -1,136 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -
    Devolución Por Pago Excesivo
    -

    - - - - - - - - - - - - - - - - - - - - - - - - -
    Fecha{{$f->formatLocalized('%A, %d de %B de %Y')}}
    Inmobiliaria{{$venta->proyecto()->inmobiliaria()->razon}}
    Proyecto{{$venta->proyecto()->descripcion}}
    Propiedad{{$venta->unidad()->descripcion}}
    Propietario{{$venta->propietario()->nombreCompleto()}}
    -
    - - - - - - - - - - - - @if ($venta->pie) - pie()->valorAbonado('ufs') ?> - - - - - - @if ($venta->pie()->reajuste and $venta->pie()->reajuste()->estado()->estado == 2) - pie()->reajuste()->valor('ufs') ?> - - - - - - @endif - @endif - @if ($venta->escritura and $venta->escritura()->estado()->estado == 2) - pie()->escritura()->valor('ufs') ?> - - - - - - @endif - @if ($venta->subsidio) - subsidio()->total('ufs') ?> - - - - - - @endif - @if ($venta->bono_pie) - bonoPie()->pago()->valor('ufs') ?> - - - - - - @endif - @if ($venta->credito) - credito()->pago()->valor('ufs') ?> - - - - - - @endif - - - - - -
    PagoDetalleValor Pagado
    Pie@if ($venta->pie()->cuotas > 1) {{count($venta->pie()->abonadas())}} cuotas @else contado @endif{{format('ufs', $venta->pie()->valorAbonado('ufs'), null, true)}}
    Reajuste de Pie{{format('ufs', $venta->pie()->reajuste()->valor('ufs'), null, true)}}
    Abono en Escritura{{format('ufs', $venta->escritura()->valor('ufs'), null, true)}}
    SubsidioAhorro: {{format('ufs', $venta->subsidio()->pago()->valor('ufs'), null, true)}}{{format('ufs', $venta->subsidio()->total('ufs'), null, true)}}
    Bono Pie{{format('ufs', $venta->bonoPie()->pago()->valor('ufs'))}}
    CréditoBanco: {{$venta->credito()->pago()->banco()->nombre}}{{format('ufs', $venta->credito()->pago()->valor('ufs'), null, true)}}
    TOTAL{{format('ufs', $sum, null, true)}}
    -
    -
    Valor Venta
    -
    {{format('ufs', $venta->valor('ufs'), null, true)}}
    -
    -
    Devolución
    -
    {{format('ufs', $venta->saldo('ufs'), null, true)}}
    -
    -
    -
    Valor de UF a la fecha
    -
    $ {{format('ufs', $uf = uf($f)->uf->value)}}
    -
    -
    -
    Total a Devolver
    -
    {{format('pesos', $uf * $venta->saldo('ufs'), null, true)}}
    -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - -
    Nombre
    RUT
    Fecha
    Firma
    -
    -@endsection diff --git a/app_old/resources/views/proyectos/add.blade.php b/app_old/resources/views/proyectos/add.blade.php deleted file mode 100644 index f6dc269..0000000 --- a/app_old/resources/views/proyectos/add.blade.php +++ /dev/null @@ -1,80 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Agregar Proyecto

    -
    -
    -
    -
    -
    Nombre
    -
    -
    -
    -
    Inmobiliaria
    -
    -
    -
    -
    Dirección
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    Fecha de Inicio
    - @include('form.fecha') -
    -
    -
    -
    -
    -@endsection - -@push('scripts') - -@endpush diff --git a/app_old/resources/views/proyectos/advance.blade.php b/app_old/resources/views/proyectos/advance.blade.php deleted file mode 100644 index 78b2dd1..0000000 --- a/app_old/resources/views/proyectos/advance.blade.php +++ /dev/null @@ -1,98 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Avanzar Proyecto

    -
    -
    -@if ($proyecto->estado()->tipo()->etapa()->descripcion == 'Construcción' and (float) $proyecto->avances()[count($proyecto->avances())-1]->avance < 1) -
    -
    -

    {{$proyecto->descripcion}}

    -
    -
    -
    {{$proyecto->estado()->tipo()->descripcion}}
    -
    {{format('shortDate', $proyecto->estado()->fecha)}}
    -
    -
    -
    Fecha
    - @include('form.fecha') -
    -
    -
    % Avance
    -
    -
    -
    -
    Estado de Pago
    -
    -
    -
    -
    Valor Estado de Pago [UF]
    -
    -
    -
    -
    -
    -
    -@else -
    -
    -

    {{$proyecto->descripcion}}

    -
    -
    -
    {{$proyecto->estado()->tipo()->descripcion}}
    -
    {{format('shortDate', $proyecto->estado()->fecha)}}
    -
    -
    -
    Nuevo Estado
    -
    -
    -
    -
    Fecha
    -
    -
    -
    -
    -
    -
    -
    -
    -@endif -@endsection diff --git a/app_old/resources/views/proyectos/avance.blade.php b/app_old/resources/views/proyectos/avance.blade.php deleted file mode 100644 index 50eb3be..0000000 --- a/app_old/resources/views/proyectos/avance.blade.php +++ /dev/null @@ -1,15 +0,0 @@ -
    - estado()->tipo()->orden < max($estados) - 1 and count($proyecto->estados()) > 1) { - $tf = \Carbon\Carbon::parse($proyecto->estado()->fecha, config('app.timezone')); - $t0 = \Carbon\Carbon::parse($proyecto->estados()[0]->fecha, config('app.timezone')); - $df = $tf->diffInSeconds($t0); - $hoy = \Carbon\Carbon::now(config('app.timezone')); - $dh = $hoy->diffInSeconds($t0); - $total = $df / $dh; - } - $valor = round(($proyecto->estado()->tipo()->orden + 1) / max($estados) * 100 * $total); - ?> -
    {{$valor}}%
    -
    diff --git a/app_old/resources/views/proyectos/avances/edit.blade.php b/app_old/resources/views/proyectos/avances/edit.blade.php deleted file mode 100644 index d7a621f..0000000 --- a/app_old/resources/views/proyectos/avances/edit.blade.php +++ /dev/null @@ -1,39 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Edit Avance - {{$avance->proyecto()->descripcion}}

    -
    -
    -
    -
    -
    Estado de Pago
    -
    {{$avance->numero}}
    -
    -
    -
    Fecha
    - fecha() ?> - @include('form.fecha') -
    -
    -
    % Avance
    -
    -
    -
    -
    Valor Estado de Pago [UF]
    -
    -
    -
    -
    Pagado [$]
    -
    -
    -
    -
    Fecha
    - fechaPago(); $id = '_pago' ?> - @include('form.fecha') -
    -
    -
    -
    -
    -@endsection diff --git a/app_old/resources/views/proyectos/avances_row.blade.php b/app_old/resources/views/proyectos/avances_row.blade.php deleted file mode 100644 index e6a4ae5..0000000 --- a/app_old/resources/views/proyectos/avances_row.blade.php +++ /dev/null @@ -1,27 +0,0 @@ - - EP {{$avance->numero}} - {{$avance->pagare()->id}} - -
    -
    - {{format('percent', round($avance->avance * 100, 2))}}% - @if ($avance->avance > 0.3) - {{format('percent', round($avance->avance * 100, 2))}}% - @endif -
    -
    - {{format('percent', round(100 - $avance->avance * 100, 2))}}% - @if ($avance->avance <= 0.3) - {{format('percent', round($avance->avance * 100, 2))}}% - @endif -
    -
    - - {{format('shortDate', $avance->fecha)}} - {{format('ufs', $avance->estado_pago)}} - {{format('shortDate', $avance->pagare()->fecha)}} - {{format('ufs', $avance->pagare()->valor())}} - {{format('ufs', $total_avance)}} - {{format('ufs', $total_deuda)}} - {{format('ufs', $total_dif)}} - diff --git a/app_old/resources/views/proyectos/construccion.blade.php b/app_old/resources/views/proyectos/construccion.blade.php deleted file mode 100644 index 6472ba2..0000000 --- a/app_old/resources/views/proyectos/construccion.blade.php +++ /dev/null @@ -1,336 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -
    -

    Construcción Proyecto {{$proyecto->descripcion}}

    -
    -
    -
    -
    -
    -
    Estado de Pago
    -
    Avance
    -
    -
    -
    - @foreach ($proyecto->avances() as $avance) -
    -
    - @if ($avance->numero == 0) - Anticipo - @else - {{$avance->numero}} - @endif -
    -
    -
    -
    - {{format('percent', round($avance->avance * 100, 2))}}% - @if ($avance->avance > 0.3) - {{format('percent', round($avance->avance * 100, 2))}}% - @endif -
    -
    - {{format('percent', round(100 - $avance->avance * 100, 2))}}% - @if ($avance->avance <= 0.3) - {{format('percent', round($avance->avance * 100, 2))}}% - @endif -
    -
    -
    -
    - @endforeach -
    -
    - - - - - - - - - - - - - - - - - - - - - - - (object) [ - 'pagado' => 0, - 'real' => 0, - 'dif' => 0 - ], - 'deuda' => (object) [ - 'pagare' => 0, - 'abonado' => 0, - 'dif' => 0, - 'intereses' => 0 - ], - 'dif' => 0, - 'dif_real' => 0 - ] ?> - @foreach ($proyecto->avances() as $i => $avance) - avance->pagado += $avance->estado_pago; - $totales->avance->real += $avance->pagado(); - if ($avance->pagado() > 0) { - $totales->avance->dif += $avance->pagado() - $avance->estado_pago; - } - if ($avance->pagares()) { - $arr = $avance->pagares(); - $totales->deuda->pagare += array_reduce($arr, function($sum, $item) { - return $sum + $item->valor(); - }); - $totales->deuda->abonado += array_reduce($arr, function($sum, $item) { - return $sum + $item->abonado(); - }); - $totales->deuda->dif += array_reduce($arr, function($sum, $item) { - return $sum + $item->abonado() - $item->valor(); - }); - $totales->deuda->intereses += array_reduce($arr, function($sum, $item) { - return $sum + $item->intereses(); - }); - $totales->dif += array_reduce($arr, function($sum, $item) { - return $sum + $item->valor(); - }) - $avance->estado_pago; - } - ?> - - - - - - - - - - - - - - - @endforeach - - - - - - - - - - - - - -
    - Estado de Pago - - - - Pagado - Pagaré - - - - Deuda
    FechaValorRealDiferenciaFechaValorAbonadoDiferenciaIntereses% Intereses
    - - @if ($avance->numero == 0) - Anticipo - @else - {{$avance->numero}} - @endif - - {{format('shortDate', $avance->fecha)}}{{format('ufs', $avance->estado_pago)}} - @if ($avance->pagado() > 0) - {{format('ufs', $avance->pagado())}} - @endif - - @if ($avance->pagado() > 0) - {{format('ufs', $avance->estado_pago - $avance->pagado())}} - @endif - - @if ($avance->pagares()) - @foreach ($avance->pagares() as $pagare) - - {{$pagare->id}} ({{$pagare->moneda()->descripcion}}) -
    - @endforeach - @else - -- - @endif -     		- @if ($avance->pagares()) - @foreach ($avance->pagares() as $pagare) - {{format('shortDate', $pagare->fecha)}} ({{$pagare->duracion}})
    - @endforeach - @endif -     		- @if ($avance->pagares()) - @foreach ($avance->pagares() as $pagare) - {{format('ufs', $pagare->valor())}}
    - @endforeach - @endif -     		- @if ($avance->pagares()) - @foreach ($avance->pagares() as $pagare) - {{format('ufs', $pagare->abonado())}}
    - @endforeach - @endif -     		- @if ($avance->pagare()) - {{format('ufs', $pagare->abonado() - $pagare->valor())}} - @endif - - @if ($avance->pagares()) - @foreach ($avance->pagares() as $pagare) - {{format('ufs', - $pagare->intereses())}}
    - @endforeach - @endif -     		- @if ($avance->pagares()) - @foreach ($avance->pagares() as $pagare) - {{format('percent', round($pagare->intereses() / $pagare->valor() * 100, 2), null, true)}}
    - @endforeach - @endif -
    Total{{format('ufs', $totales->avance->pagado)}}{{format('ufs', $totales->avance->real)}}{{format('ufs', - $totales->avance->dif)}}{{format('ufs', $totales->deuda->pagare)}}{{format('ufs', $totales->deuda->abonado)}}{{format('ufs', $totales->deuda->dif)}}{{format('ufs', - $totales->deuda->intereses)}}
    -
    -
    - Diferencias en Caja -
    -
    - -
    -
    -
    -
    -@endsection - -@push('scripts') - -@endpush diff --git a/app_old/resources/views/proyectos/disponibles.blade.php b/app_old/resources/views/proyectos/disponibles.blade.php deleted file mode 100644 index ae0ed0b..0000000 --- a/app_old/resources/views/proyectos/disponibles.blade.php +++ /dev/null @@ -1,36 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -
    Unidades Disponibles - {{$proyecto->descripcion}} [{{count($proyecto->unidadesDisponibles())}}]
    -
    -
    -
    - - - - - - - - - - - - @foreach ($proyecto->unidadesDisponibles() as $unidad) - - - - - - - - @endforeach - -
    TipoUnidadPisom² VendiblesValor Referencial
    {{ucwords($unidad->tipo()->descripcion)}}{{$unidad->descripcion}}{{$unidad->piso}} - @if ($unidad->tipo == 1) - {{$unidad->m2('vendible')}} - @endif - {{format('ufs', (($unidad->precio()) ? $unidad->precio()->valor : $unidad->valor) ?: 0, null, true)}}
    -
    -@endsection \ No newline at end of file diff --git a/app_old/resources/views/proyectos/estimado.blade.php b/app_old/resources/views/proyectos/estimado.blade.php deleted file mode 100644 index c650e26..0000000 --- a/app_old/resources/views/proyectos/estimado.blade.php +++ /dev/null @@ -1,42 +0,0 @@ -@if (count($proyecto->ventas()) > 0 and $proyecto->valores()->estimados->departamentos->cantidad > 0) - - Estimado Total - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - UF Total
    - Bruto - Neto -     		UF/m² NetoUF Promedio
    {{format('ufs', $proyecto->valores()->vendidos->ingreso->bruto + $proyecto->valores()->estimados->ingreso->bruto, null, true)}} - {{format('ufs', $proyecto->valores()->vendidos->ingreso->neto + $proyecto->valores()->estimados->ingreso->neto, null, true)}}{{format('ufs', ($proyecto->valores()->vendidos->ingreso->neto + $proyecto->valores()->estimados->ingreso->neto) / $proyecto->superficie('vendible'), null, true)}}{{format('ufs', ($proyecto->valores()->vendidos->ingreso->neto + $proyecto->valores()->estimados->ingreso->neto) / count($proyecto->unidades(1)), null, true)}}
    Estacionamientos y Bodegas
    {{format('ufs', $proyecto->valores()->vendidos->otros->valor + $proyecto->valores()->estimados->otros->valor, null, true)}}
    Total{{format('ufs', $proyecto->valores()->vendidos->ingreso->neto + $proyecto->valores()->estimados->ingreso->neto + $proyecto->valores()->vendidos->otros->valor + $proyecto->valores()->estimados->otros->valor, null, true)}}
    - - -@endif diff --git a/app_old/resources/views/proyectos/historia.blade.php b/app_old/resources/views/proyectos/historia.blade.php deleted file mode 100644 index cc36840..0000000 --- a/app_old/resources/views/proyectos/historia.blade.php +++ /dev/null @@ -1,74 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -
    -

    -
    - Historial Proyecto {{$proyecto->descripcion}} -
    -
    - - - -
    -

    -
    -
    - - - - - - - - - - - estados() as $estado) { - $estados[$estado->fecha] []= $estado; - } - ksort($estados); - $ff = null; - ?> - @foreach ($estados as $fecha => $es) - tipo()->orden - $b->tipo()->orden; - }); - $estado = $es[count($es) - 1]; - ?> - - - - - - - - @endforeach - -
    EtapaEstadoFechaDuración
    - @if ($estado->tipo()->etapa()->descripcion == 'Construcción') - - @endif - {{$estado->tipo()->etapa()->descripcion}} - @if ($estado->tipo()->etapa()->descripcion == 'Construcción') - - @endif - {{$estado->tipo()->descripcion}} - @if ($f->timestamp > 0) - {{$f->format('d M Y')}} - @else - -- - @endif - - @if ($ff !== null) - {{$f->longAbsoluteDiffForHumans($ff)}} - @endif -
    -
    -
    -@endsection diff --git a/app_old/resources/views/proyectos/historia.blade.php.old b/app_old/resources/views/proyectos/historia.blade.php.old deleted file mode 100644 index 62497c9..0000000 --- a/app_old/resources/views/proyectos/historia.blade.php.old +++ /dev/null @@ -1,82 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -
    -

    -
    - Historial Proyecto {{$proyecto->descripcion}} -
    -
    - - - -
    -

    -
    -
    - - - - - - - - - - estados() as $estado) { - $estados[$estado->fecha] []= $estado; - } - ksort($estados); - $ff = \Carbon\Carbon::parse('0', config('app.timezone')); - ?> - @foreach ($estados as $fecha => $es) - tipo()->orden - $b->tipo()->orden; - }); - ?> - - - - - - - @endforeach - -
    FechaDuración
    {{$f->format('d M Y')}} - - - - - - - - - @foreach ($es as $estado) - - - - - @endforeach - -
    EtapaEstado
    - @if ($estado->tipo()->etapa()->descripcion == 'Construcción') - - @endif - {{$estado->tipo()->etapa()->descripcion}} - @if ($estado->tipo()->etapa()->descripcion == 'Construcción') - - @endif - {{$estado->tipo()->descripcion}}
    -     		- @if ($f->diffInYears($ff) < 100) - {{$f->longAbsoluteDiffForHumans($ff)}} - @endif -
    -
    -
    -@endsection diff --git a/app_old/resources/views/proyectos/list.blade.php b/app_old/resources/views/proyectos/list.blade.php deleted file mode 100644 index 51c3365..0000000 --- a/app_old/resources/views/proyectos/list.blade.php +++ /dev/null @@ -1,42 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -
    -
    -
    - Proyectos -
    -
    - - - -
    -
    -
    -
    - - - - - - - - - - - - @foreach ($proyectos as $proyecto) - - - - - - - - @endforeach - -
    ProyectoInmobiliariaEtapaEstadoTiempo Total
    {{$proyecto->descripcion}}{{$proyecto->inmobiliaria()->abreviacion}}{{$proyecto->estado()->tipo()->etapa()->descripcion}}{{$proyecto->estado()->tipo()->descripcion}} ({{\Carbon\Carbon::parse($proyecto->estado()->fecha, config('app.timezone'))->diffForHumans()}}) - {{\Carbon\Carbon::parse($proyecto->estados()[0]->fecha, config('app.timezone'))->diffForHumans()}} -
    -@endsection diff --git a/app_old/resources/views/proyectos/operadores/add.blade.php b/app_old/resources/views/proyectos/operadores/add.blade.php deleted file mode 100644 index 4bf6a7a..0000000 --- a/app_old/resources/views/proyectos/operadores/add.blade.php +++ /dev/null @@ -1,29 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Agregar Operadores - {{$proyecto->descripcion}}

    -
    -
    -
    -
    -
    Operadores
    -
    - -
    -
    -
    -
    - -
    -
    -
    -@endsection diff --git a/app_old/resources/views/proyectos/pagares/add.blade.php b/app_old/resources/views/proyectos/pagares/add.blade.php deleted file mode 100644 index 2975bc8..0000000 --- a/app_old/resources/views/proyectos/pagares/add.blade.php +++ /dev/null @@ -1,62 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Agregar Pagaré - - - -

    -
    -
    -
    -
    -
    Estado Pago
    -
    -
    -
    -
    Número
    -
    -
    -
    -
    Moneda
    -
    - -
    -
    -
    -
    Capital
    -
    -
    -
    -
    Tasa [%]
    -
    -
    -
    -
    Fecha Otorgado
    - - @include('form.fecha') -
    -
    -
    Duración
    -
    -
    -
    -
    Fecha Abonado
    - - @include('form.fecha') -
    -
    -
    Monto Abonado [$]
    -
    -
    -
    -
    - -
    -
    -
    -@endsection diff --git a/app_old/resources/views/proyectos/pagares/add_renovacion.blade.php b/app_old/resources/views/proyectos/pagares/add_renovacion.blade.php deleted file mode 100644 index 5bfa350..0000000 --- a/app_old/resources/views/proyectos/pagares/add_renovacion.blade.php +++ /dev/null @@ -1,44 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Agregar Renovación Pagaré {{$pagare->id}} -

    -
    -
    -
    -
    -
    Fecha
    - - @include('form.fecha') -
    -
    -
    Duración [días]
    -
    -
    * Pagaré {{$pagare->duracion}}
    -
    -
    -
    Monto Insoluto [{{$pagare->moneda()->descripcion}}]
    -
    -
    -
    -
    Tasa [%]
    -
    -
    * Pagaré {{format('percent', $pagare->tasa, null, true)}}
    -
    -
    -
    Intereses [$]
    -
    -
    -
    -
    Fecha Abono
    - - @include('form.fecha') -
    -
    -
    - -
    -
    -
    -@endsection diff --git a/app_old/resources/views/proyectos/pagares/edit.blade.php b/app_old/resources/views/proyectos/pagares/edit.blade.php deleted file mode 100644 index 16e33b3..0000000 --- a/app_old/resources/views/proyectos/pagares/edit.blade.php +++ /dev/null @@ -1,66 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Pagaré {{$pagare->id}}

    -
    -
    -
    -
    -
    Estado Pago
    -
    -
    -
    -
    Número
    -
    -
    -
    -
    Moneda
    -
    - -
    -
    -
    -
    Capital
    -
    -
    -
    -
    Tasa [%]
    -
    -
    -
    -
    Fecha Otorgado
    - fechaBanco(); $id = '_banco' ?> - @include('form.fecha') -
    -
    -
    Duración
    -
    -
    -
    -
    Fecha Abonado
    - fecha(); unset($id) ?> - @include('form.fecha') -
    -
    -
    Monto Abonado [$]
    -
    -
    -
    -
    - -
    -
    -
    -@endsection diff --git a/app_old/resources/views/proyectos/pagares/edit_renovacion.blade.php b/app_old/resources/views/proyectos/pagares/edit_renovacion.blade.php deleted file mode 100644 index 54bae95..0000000 --- a/app_old/resources/views/proyectos/pagares/edit_renovacion.blade.php +++ /dev/null @@ -1,45 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Renovación - {{array_search($renovacion, $renovacion->pagare()->renovaciones()) + 1}} - Pagaré {{$renovacion->pagare}} -

    -
    -
    -
    -
    -
    Fecha
    - fechaBanco(); $id = '_banco' ?> - @include('form.fecha') -
    -
    -
    Duración [días]
    -
    -
    -
    -
    Monto Insoluto [{{$renovacion->pagare()->moneda()->descripcion}}]
    -
    -
    -
    -
    Tasa [%]
    -
    -
    * Pagaré {{format('percent', $renovacion->pagare()->tasa, null, true)}}
    -
    -
    -
    Intereses [$]
    -
    -
    -
    -
    Fecha Abono
    - fecha(); unset($id) ?> - @include('form.fecha') -
    -
    -
    - -
    -
    -
    -@endsection diff --git a/app_old/resources/views/proyectos/pagares/show.blade.php b/app_old/resources/views/proyectos/pagares/show.blade.php deleted file mode 100644 index 25750b5..0000000 --- a/app_old/resources/views/proyectos/pagares/show.blade.php +++ /dev/null @@ -1,100 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -
    - Pagaré {{$pagare->id}} - - - -
    -
    - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Estado Pago - {{$pagare->estado_pago}} -
    Moneda{{$pagare->moneda()->descripcion}}
    Capital{{format('ufs', $pagare->valor(), null, true)}}{{format('pesos', $pagare->valor('pesos'), null, true)}}{{format('shortDate', $pagare->fecha_banco)}}
    Abonado{{format('ufs', $pagare->abonado(), null, true)}}{{format('pesos', $pagare->abonado('pesos'), null, true)}} - @if ($pagare->fecha != '0000-00-00') - {{format('shortDate', $pagare->fecha)}} - @endif -
    Tasa Anualizada{{format('percent', $pagare->tasa, null, true)}}
    Duración{{$pagare->duracion}}{{format('shortDate', $pagare->vencimiento()->format('Y-m-d'))}}
    - @if ($pagare->renovaciones()) - - - - - - - - - - - - - - @foreach ($pagare->renovaciones() as $renovacion) - intereses() ?> - - - - - - @endforeach - - - - - -
    Renovaciones
    Fecha RenovaciónIntereses Pagados - - - -
    - {{format('shortDate', $renovacion->fecha)}} - ({{$renovacion->duracion}}) - {{format('shortDate', $renovacion->vencimiento()->format('Y-m-d'))}} - {{format('ufs', $renovacion->intereses(), null, true)}} - - - -
    Total{{format('ufs', $total, null, true)}}
    - @else - Agregar Renovación - @endif -@endsection diff --git a/app_old/resources/views/proyectos/por_vender.blade.php b/app_old/resources/views/proyectos/por_vender.blade.php deleted file mode 100644 index 4be7573..0000000 --- a/app_old/resources/views/proyectos/por_vender.blade.php +++ /dev/null @@ -1,66 +0,0 @@ -@if (count($proyecto->unidades()) > 0 and $proyecto->valores()->estimados->departamentos->cantidad > 0) - - Por vender - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    #% Por Venderm² promedio
    {{$proyecto->valores()->estimados->departamentos->cantidad}}{{\App\Helper\Format::number($proyecto->valores()->estimados->departamentos->cantidad / count($proyecto->unidades(1)) * 100, 2)}} %{!!format('m2', $proyecto->valores()->estimados->departamentos->mts->vendibles->promedio, null, true)!!}
    UF Estimado
    - Bruto - Neto -     		UF/m² NetoUF promedio
    {{format('ufs', $proyecto->valores()->estimados->ingreso->bruto, null, true)}} - {{format('ufs', $proyecto->valores()->estimados->ingreso->neto, null, true)}}{{format('ufs', $proyecto->valores()->estimados->departamentos->uf_m2->promedio, null, true)}}{{format('ufs', $proyecto->valores()->estimados->departamentos->precio->promedio, null, true)}}
    EstacionamientosBodegasValor Estimado
    {{count($proyecto->unidadesDisponibles(2))}}{{count($proyecto->unidadesDisponibles(3))}}{{format('ufs', $proyecto->valores()->estimados->otros->valor, null, true)}}
    OperadorBono PiePremios
    {{format('ufs', $proyecto->valores()->estimados->comision, null, true)}}{{format('ufs', $proyecto->valores()->estimados->bono->valor, null, true)}}{{format('ufs', $proyecto->valores()->estimados->premios(), null, true)}}
    - - -@endif diff --git a/app_old/resources/views/proyectos/reservas/base.blade.php b/app_old/resources/views/proyectos/reservas/base.blade.php deleted file mode 100644 index eb54ae1..0000000 --- a/app_old/resources/views/proyectos/reservas/base.blade.php +++ /dev/null @@ -1,72 +0,0 @@ -@extends('layout.base') - -@section('content') -

    - - - Ventas y Reservas - {{$proyecto->descripcion}} -

    - - - - - @for ($i = 1; $i <= $max_unidades; $i ++) - - @endfor - - - - @foreach ($pisos as $piso) - - - @for ($i = 1; $i <= $max_unidades; $i ++) - @if (!isset($piso->unidades[$i])) - - @continue - @endif - unidades[$i] ?> - - @endfor - - @endforeach - - - @for ($i = 1; $i <= $max_unidades; $i ++) - - @endfor - - -
    Piso{{$i}}
    {{$piso->descripcion}} - {{$unidad->descripcion}} -
    - {{$unidad->tipologia()->tipologia()->descripcion}} -
    - {{format('ufs', $unidad->precio()->valor, null, true)}} -
    - @if ($unidad->isVendida()) - {{format('shortDate', $unidad->venta()->fecha)}} - @endif -
    - @if ($unidad->isReservada()) - {{format('shortDate', $unidad->cierre()->fecha)}} - @endif -
    -
    - - {{array_reduce($totales, function($sum, $item) { - return $sum + $item->ventas; - })}} - -
    -
    - - {{array_reduce($totales, function($sum, $item) { - return $sum + $item->reservas; - })}} - -
    -     		-
    {{$totales[$i]->ventas}}
    -
    {{$totales[$i]->reservas}}
    -
    -@endsection diff --git a/app_old/resources/views/proyectos/show.blade.php b/app_old/resources/views/proyectos/show.blade.php deleted file mode 100644 index 9f07003..0000000 --- a/app_old/resources/views/proyectos/show.blade.php +++ /dev/null @@ -1,230 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -
    Proyecto - {{$proyecto->descripcion}}
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - @include('proyectos.superficies') - @if (count($proyecto->proyectoTipoUnidades()) > 0) - - - - - - - - - @else - - - - - @endif - @include('proyectos.ventas') - @include('proyectos.por_vender') - @include('proyectos.estimado') - - - - - - - - - -
    Dirección{{$proyecto->direccion()->completa(true)}}
    Inmobiliaria{{$proyecto->inmobiliaria()->abreviacion}}
    Inicio{{$proyecto->estados()[0]->tipo()->descripcion}} [{{$proyecto->estados()[0]->tipo()->etapa()->descripcion}}]] ({{format('shortDate', $proyecto->estados()[0]->fecha)}}) - (estados()[0]->fecha, config('app.timezone')); - ?>{{$f->diffForHumans($today)}}) -
    Estado {{$proyecto->estado()->tipo()->descripcion}} - @if ($proyecto->estado()->tipo()->etapa()->descripcion == 'Construcción') - - @endif - [{{$proyecto->estado()->tipo()->etapa()->descripcion}}] - @if ($proyecto->estado()->tipo()->etapa()->descripcion == 'Construcción') - - @endif - ({{format('shortDate', $proyecto->estado()->fecha)}}) (estado()->fecha, config('app.timezone')); - ?>{{$f->diffForHumans($today)}}) -
    @include('proyectos.avance') -
    Operadores - @if ($proyecto->operadoresVigentes()) - {{array_reduce($proyecto->operadoresVigentes(), function($list, $item) { - return trim($list . ', ' . $item->agente()->agente()->abreviacion, ', '); - })}} - @endif - - - -
    Departamentos{{count($proyecto->unidades(1))}}
    Pisos{{$proyecto->pisos()}}
    Agregar tipo de unidad
    - - -
    - - -
    -
    - -
    -@endsection - -@push('scripts') - @if (count($proyecto->unidades()) > 0) - - @endif -@endpush diff --git a/app_old/resources/views/proyectos/superficies.blade.php b/app_old/resources/views/proyectos/superficies.blade.php deleted file mode 100644 index 024bab4..0000000 --- a/app_old/resources/views/proyectos/superficies.blade.php +++ /dev/null @@ -1,97 +0,0 @@ -@if ($proyecto->superficie('total') != null) - - Superficies - - - - - - - - - - - - - - - - - - - - @if (count($proyecto->ventas()) > 0) - - - - - - - - - @endif -
    Total{!!format('m2', $proyecto->superficie('total'), null, true)!!} - -
    Sobre Nivel{!!format('m2', $proyecto->superficie('snt'), null, true)!!}
    Bajo Nivel{!!format('m2', $proyecto->superficie('bnt'), null, true)!!}
    Vendible{!!format('m2', $proyecto->superficie('vendible'), null, true)!!}
    Vendido{!!format('m2', $proyecto->superficie('vendida'), null, true)!!}
    Por Vender{!!format('m2', $proyecto->superficie('por vender'), null, true)!!}
    - - -@endif - -@push('scripts') -@if ($proyecto->superficie('total') != null) - -@endif -@endpush diff --git a/app_old/resources/views/proyectos/tipo_unidades/add.blade.php b/app_old/resources/views/proyectos/tipo_unidades/add.blade.php deleted file mode 100644 index 91c4043..0000000 --- a/app_old/resources/views/proyectos/tipo_unidades/add.blade.php +++ /dev/null @@ -1,44 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Agregar Tipo Unidad - {{$proyecto->descripcion}}

    -
    -
    -
    -
    -
    Tipo
    -
    -
    -
    -
    Nombre
    -
    -
    -
    -
    Abreviación
    -
    -
    -
    -
    m²
    -
    Interior
    -
    Logia
    -
    Terraza
    -
    -
    -
    -
    -
    -
    -
    -
    Descripción
    -
    -
    -
    -
    -
    -
    -@endsection diff --git a/app_old/resources/views/proyectos/tipo_unidades/edit.blade.php b/app_old/resources/views/proyectos/tipo_unidades/edit.blade.php deleted file mode 100644 index 2632e9a..0000000 --- a/app_old/resources/views/proyectos/tipo_unidades/edit.blade.php +++ /dev/null @@ -1,43 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Editar Tipo Unidad - {{$tipo->proyecto()->descripcion}}

    -
    -
    -
    -
    -
    Tipo
    -
    -
    -
    -
    Nombre
    -
    -
    -
    -
    Abreviación
    -
    -
    -
    -
    m²
    -
    -
    -
    -
    -
    -
    Descripción
    -
    -
    -
    -
    -
    -
    -@endsection diff --git a/app_old/resources/views/proyectos/unidades/add.blade.php b/app_old/resources/views/proyectos/unidades/add.blade.php deleted file mode 100644 index 24fb337..0000000 --- a/app_old/resources/views/proyectos/unidades/add.blade.php +++ /dev/null @@ -1,110 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Agregar Unidades - {{$tipo->proyecto()->descripcion}} - {{$tipo->nombre}}

    -
    -
    -
    -
    Tipo
    -
    {{$tipo->nombre}}
    -
    - @if ($tipo->tipologia()) - {{$tipo->tipologia()->descripcion}} - @else - {{$tipo->abreviacion}} - @endif -
    -
    {{format('m2', $tipo->m2())}} m²
    -
    -
    -
    -
    -
    Total Departamentos por Piso
    -
    -
    -
    - -
    -
    -
    Línea
    -
    -
    Orientación
    -
    - - -
    -
    Pisos
    -
    -
    -
    -
    -
    -
    -
    -
    -@endsection - -@push('scripts') - -@endpush diff --git a/app_old/resources/views/proyectos/unidades/add2.blade.php b/app_old/resources/views/proyectos/unidades/add2.blade.php deleted file mode 100644 index 99ab026..0000000 --- a/app_old/resources/views/proyectos/unidades/add2.blade.php +++ /dev/null @@ -1,86 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Agregar Unidades - {{$tipo->proyecto()->descripcion}} - {{$tipo->nombre}}

    -
    -
    -
    -
    Tipo
    -
    {{$tipo->nombre}}
    -
    {{$tipo->abreviacion}}
    -
    {{format('m2', $tipo->m2())}} m²
    -
    -
    -
    -
    -
    Unidades
    -
    -
    -
    - -
    -
    -
    Descripción
    -
    -
    Piso
    -
    -
    -
    -
    -
    -
    -
    -@endsection - -@push('scripts') - -@endpush diff --git a/app_old/resources/views/proyectos/unidades/assign.blade.php b/app_old/resources/views/proyectos/unidades/assign.blade.php deleted file mode 100644 index da7aea1..0000000 --- a/app_old/resources/views/proyectos/unidades/assign.blade.php +++ /dev/null @@ -1,38 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Asignar Tipo a Unidades - {{$proyecto->descripcion}}

    -
    -
    - - - - - - - - - - @foreach ($libres as $unidad) - - - - - @endforeach - -
    UnidadTipoPT
    {{$unidad->descripcion}}{{$unidad->tipo()->descripcion}}
    -
    -
    -
    -
    -@endsection diff --git a/app_old/resources/views/proyectos/unidades/edit.blade.php b/app_old/resources/views/proyectos/unidades/edit.blade.php deleted file mode 100644 index e19b5a0..0000000 --- a/app_old/resources/views/proyectos/unidades/edit.blade.php +++ /dev/null @@ -1,52 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Editar Unidad - {{$unidad->proyecto()->descripcion}} - {{$unidad->descripcion}}

    -
    -
    -
    -
    -
    Tipo
    -
    -
    -
    -
    Descripción
    -
    -
    -
    -
    Piso
    -
    -
    Línea
    -
    -
    -
    -
    Orientación
    -
    -
    -
    -
    -
    -
    -@endsection diff --git a/app_old/resources/views/proyectos/unidades/list.blade.php b/app_old/resources/views/proyectos/unidades/list.blade.php deleted file mode 100644 index 0df444f..0000000 --- a/app_old/resources/views/proyectos/unidades/list.blade.php +++ /dev/null @@ -1,198 +0,0 @@ -@extends('layout.base') - -@section('content') - -
    -

    Unidades - {{$proyecto->descripcion}}

    -
    - - - - - - - - - - - - - - - - - - @foreach ($proyecto->proyectoTipoUnidades() as $tipo) - - - - - - - - - - - - - - - - - - @endforeach - @if (count($libres) > 0) - - - - - - - - - - @endif - -
    TipoNombreAbreviación#Líneasm² Útilm² Terrazam² Vendiblem² TotalDescripción
    {{ucwords($tipo->tipo()->descripcion)}}{{$tipo->nombre}} - @if ($tipo->tipologia()) - {{$tipo->tipologia()->descripcion}} - @else - {{$tipo->abreviacion}} - @endif - {{count($tipo->unidades())}}{{$tipo->lineas()}}{{format('m2', $tipo->m2 + $tipo->logia)}}{{format('m2', $tipo->terraza)}}{{format('m2', $tipo->m2())}}{{format('m2', $tipo->m2('total'))}} - @if ($tipo->tipologia()) - {{$tipo->tipologia()->detalle}} - @else - {{$tipo->descripcion}} - @endif -
    - - - - - - - - - - - - - - @foreach ($tipo->unidades() as $unidad) - @if ($subtipo != $unidad->subtipo) - subtipo; $cnt[$tipo->nombre."-".$subtipo] = 0; $pisos[$tipo->nombre."-".$subtipo] = [] ?> - - - - - - - - @endif - - - - - - - - nombre."-".$subtipo] ++; - $pisos[$tipo->nombre."-".$subtipo] []= $unidad->piso; - } - ?> - @endforeach - -
    Descripción#PisoLíneaOrientación - - - -
    Línea {{$subtipo}}{{$subtipo}}{{$unidad->orientacion}}
    {{$unidad->descripcion}}{{$unidad->piso}}{{$unidad->subtipo}}{{$unidad->orientacion}} - - -
    -
    Libres
    - - - - - - - - - - - - - @foreach ($libres as $unidad) - - - - - - - - - @endforeach - -
    DescripciónPisoLíneaOrientaciónValor
    {{$unidad->descripcion}}{{$unidad->piso}}{{$unidad->subtipo}}{{$unidad->orientacion}}{{format('ufs', $unidad->valor, null, true)}} - - -
    -
    -@endsection - -@push('scripts') - -@endpush diff --git a/app_old/resources/views/proyectos/unidades/proyectos.blade.php b/app_old/resources/views/proyectos/unidades/proyectos.blade.php deleted file mode 100644 index 53ef4eb..0000000 --- a/app_old/resources/views/proyectos/unidades/proyectos.blade.php +++ /dev/null @@ -1,29 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -
    -
    -
    - Unidades de Proyectos -
    -
    -
    -
    - - - - - - - - - @foreach ($proyectos as $proyecto) - - - - - @endforeach - -
    ProyectoInmobiliaria
    {{$proyecto->descripcion}}{{$proyecto->inmobiliaria()->abreviacion}}
    -@endsection diff --git a/app_old/resources/views/proyectos/ventas.blade.php b/app_old/resources/views/proyectos/ventas.blade.php deleted file mode 100644 index c2bda98..0000000 --- a/app_old/resources/views/proyectos/ventas.blade.php +++ /dev/null @@ -1,87 +0,0 @@ -@if (count($proyecto->ventas()) > 0) - - - Ventas - @if ($proyecto->estado()->tipo()->etapa()->orden >= 4) -
    - - - - @endif - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    #% Vendidom² promedio
    {{count($proyecto->ventas())}}{{\App\Helper\Format::number(count($proyecto->ventas())/count($proyecto->unidades(1)) * 100, 2)}} %{{\App\Helper\Format::number($proyecto->valores()->vendidos->departamentos->mts->vendibles->promedio, 2)}}
    - UF vendido
    - Bruto - Neto -     		UF/m² NetoUF promedio
    - {{format('ufs', $proyecto->valores()->vendidos->ingreso->bruto, null, true)}} - {{\App\Helper\Format::ufs($proyecto->valores()->vendidos->ingreso->neto, true)}} -
    - {{format('ufs', $proyecto->valores()->vendidos->ingreso->abonado, null, true)}} ({{format('ufs', $proyecto->valores()->vendidos->ingreso->pagado, null, true)}}) -     		{{\App\Helper\Format::ufs($proyecto->valores()->vendidos->departamentos->uf_m2->promedio, true)}}{{\App\Helper\Format::ufs($proyecto->valores()->vendidos->departamentos->precio->promedio, true)}}
    EstacionamientosBodegasValor Total
    {{count($proyecto->unidades(2)) - count($proyecto->unidadesDisponibles(2))}}{{count($proyecto->unidades(3)) - count($proyecto->unidadesDisponibles(3))}}{{format('ufs', $proyecto->valores()->vendidos->otros->valor, null, true)}}
    OperadoresBono PiePremios
    {{format('ufs', $proyecto->valores()->vendidos->comision, null, true)}} ({{format('percent', $proyecto->valores()->vendidos->comision / $proyecto->valores()->vendidos->ingreso->neto * 100, null, true)}} Neto){{format('ufs', $proyecto->valores()->vendidos->bono->valor, null, true)}} ({{format('percent', $proyecto->valores()->vendidos->bono->valor / $proyecto->valores()->vendidos->ingreso->neto * 100, null, true)}} Neto){{format('ufs', $proyecto->valores()->vendidos->premios(), null, true)}} ({{format('percent', $proyecto->valores()->vendidos->premios() / $proyecto->valores()->vendidos->ingreso->neto * 100, null, true)}} Neto)
    Ingreso Total{{format('ufs', $proyecto->valores()->vendidos->ingreso->neto + $proyecto->valores()->vendidos->otros->valor, null, true)}}
    - - -@endif diff --git a/app_old/resources/views/temas/add.blade.php b/app_old/resources/views/temas/add.blade.php deleted file mode 100644 index 31488f9..0000000 --- a/app_old/resources/views/temas/add.blade.php +++ /dev/null @@ -1,31 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Nuevo Tema

    -
    -
    -
    -
    -
    Proyecto
    -
    -
    -
    -
    Fecha
    - @include('form.fecha') -
    -
    -
    Contenido
    -
    - -
    -
    -
    -
    -
    -
    -@endsection \ No newline at end of file diff --git a/app_old/resources/views/temas/edit.blade.php b/app_old/resources/views/temas/edit.blade.php deleted file mode 100644 index 6679f7d..0000000 --- a/app_old/resources/views/temas/edit.blade.php +++ /dev/null @@ -1,36 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Editar Tema

    -
    -
    -
    -
    -
    Proyecto
    -
    -
    -
    -
    Fecha
    - inicio() ?> - @include('form.fecha') -
    -
    -
    Contenido
    -
    - -
    -
    -
    -
    -
    -
    -@endsection \ No newline at end of file diff --git a/app_old/resources/views/temas/list.blade.php b/app_old/resources/views/temas/list.blade.php deleted file mode 100644 index 488af9b..0000000 --- a/app_old/resources/views/temas/list.blade.php +++ /dev/null @@ -1,57 +0,0 @@ -@extends('layout.base') - -@section('content') - -
    -
    Temas Abiertos {{strftime('%d de %B de %Y', \Carbon\Carbon::today(config('app.timezone'))->timestamp)}}
    -
    -
    - -@foreach ($temas as $tema) -@if ($tema->proyecto_id != $proyecto) -proyecto_id ?> -
    -
    {{$tema->proyecto()->descripcion}}
    -
    {{$tema->proyecto()->estado()->descripcion}}
    -
    -@endif -
    -
    -
    -
    {{format('shortDate', $tema->inicio)}}
    -
    - @if ($tema->cierre()->year != -1) - {{format('shortDate', $tema->cierre)}} - @endif -
    -
    -
    -
    - {!!$tema->texto()!!} - @if ($tema->cierre()->year != -1) - [Cerrado] - @endif -
    -
    - - @if ($tema->cierre()->year != -1) - - @else - - @endif -
    -
    -@endforeach -@endsection \ No newline at end of file diff --git a/app_old/resources/views/ventas/add.blade.php b/app_old/resources/views/ventas/add.blade.php deleted file mode 100644 index acdacf3..0000000 --- a/app_old/resources/views/ventas/add.blade.php +++ /dev/null @@ -1,561 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -
    Nueva Venta
    -
    -
    -
    -
    -
    Fecha de Venta
    - -
    -
    -
    -
    -
    PROPIETARIO
    -
    -
    -
    RUT
    -
    -
    -
    -
    Nombre
    -
    -
    -
    -
    -
    -
    -
    Dirección
    -
    -
    -
    -
    -
    -
    -
    -
    -
    PROPIEDAD
    -
    -
    -
    Proyecto
    -
    -
    -
    - -
    -
    Unidades
    -
    -
    -
    -
    -
    -
    FORMA DE PAGO
    -
    -
    -
    Valor
    -
    -
    UF
    -
    -
    -
    Pie
    -
    -
    -
    -
    Subsidio
    -
    -
    -
    -
    Crédito
    -
    -
    -
    OTRAS CONDICIONES
    -
    -
    -
    Bono Pie
    -
    -
    -
    -
    Operador
    -
    -
    -
    - -
    -
    Promociones
    -
    -
    -
    -
    -
    -
    -
    -
    -@endsection - -@push('scripts') - -@endpush diff --git a/app_old/resources/views/ventas/archivar.blade.php b/app_old/resources/views/ventas/archivar.blade.php deleted file mode 100644 index 35800cf..0000000 --- a/app_old/resources/views/ventas/archivar.blade.php +++ /dev/null @@ -1,16 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -
    Archivar Venta {{$venta->unidad()->descripcion}}
    -
    -
    -
    -
    Fecha
    - @include('form.fecha') -
    -
    -
    -
    -
    -@endsection diff --git a/app_old/resources/views/ventas/bonos/add.blade.php b/app_old/resources/views/ventas/bonos/add.blade.php deleted file mode 100644 index 15ae5cb..0000000 --- a/app_old/resources/views/ventas/bonos/add.blade.php +++ /dev/null @@ -1,29 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Agregar Bono Pie

    -
    -
    -
    -
    -
    Pie
    -
    - @if ($venta->pie()) - {{format('ufs', $venta->pie()->valor, null, true)}} - @endif -
    -
    -
    -
    -
    Valor
    -
    -
    UF
    -
    -
    -
    - -
    -
    -
    -@endsection diff --git a/app_old/resources/views/ventas/bonos/edit.blade.php b/app_old/resources/views/ventas/bonos/edit.blade.php deleted file mode 100644 index 7cbcb60..0000000 --- a/app_old/resources/views/ventas/bonos/edit.blade.php +++ /dev/null @@ -1,29 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Editar Bono Pie - Venta {{$venta->unidad()->descripcion}}

    -
    -
    -
    -
    -
    Pie
    -
    - @if ($venta->pie()) - {{format('ufs', $venta->pie()->valor('uf'), null, true)}} - @endif -
    -
    -
    -
    -
    Valor
    -
    -
    UF
    -
    -
    -
    - -
    -
    -
    -@endsection diff --git a/app_old/resources/views/ventas/ceder.blade.php b/app_old/resources/views/ventas/ceder.blade.php deleted file mode 100644 index 82fca7d..0000000 --- a/app_old/resources/views/ventas/ceder.blade.php +++ /dev/null @@ -1,143 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Ceder - {{$venta->unidad()->descripcion}} - {{$venta->proyecto()->descripcion}}

    -
    -
    -
    -
    -
    Fecha
    - -
    -
    -
    -
    -
    NUEVO PROPIETARIO
    -
    -
    -
    RUT
    -
    -
    -
    -
    Nombre
    -
    -
    -
    -
    -
    -
    -
    Dirección
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -@endsection - -@push('scripts') - -@endpush diff --git a/app_old/resources/views/ventas/cierres/add.blade.php b/app_old/resources/views/ventas/cierres/add.blade.php deleted file mode 100644 index 0201fb4..0000000 --- a/app_old/resources/views/ventas/cierres/add.blade.php +++ /dev/null @@ -1,374 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Nuevo Cierre

    -
    -
    -
    -
    -
    Fecha
    - @include('form.fecha') -
    -
    PROPIEDAD
    -
    -
    -
    Proyecto
    -
    -
    -
    -
    Agente
    -
    -
    -
    - -
    -
    Unidades
    -
    -
    -
    -
    -
    FORMA DE PAGO
    -
    -
    -
    Valor
    -
    -
    UF
    -
    -
    -
    Pie
    -
    -
    -
    -
    Crédito
    -
    -
    -
    PROPIETARIO
    -
    -
    -
    RUT
    -
    -
    -
    -
    Nombre
    -
    -
    -
    -
    -
    -
    Sexo
    -
    Hombre
    -
    Mujer
    -
    -
    -
    Estado Civil
    -
    -
    -
    -
    Profesión
    -
    -
    -
    -
    Teléfono
    -
    +56
    -
    -
    -
    -
    -
    E-Mail
    -
    -
    @
    -
    -
    -
    -
    Dirección
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -@endsection - -@push('scripts') - -@endpush \ No newline at end of file diff --git a/app_old/resources/views/ventas/cierres/edit.blade.php b/app_old/resources/views/ventas/cierres/edit.blade.php deleted file mode 100644 index aaf9729..0000000 --- a/app_old/resources/views/ventas/cierres/edit.blade.php +++ /dev/null @@ -1,473 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Editar Cierre

    -
    -
    -
    -
    -
    Proyecto
    -
    -
    -
    -
    Fecha
    - fecha() ?> - @include('form.fecha') -
    -
    -
    Departamento
    -
    - -
    -
    -
    -
    Precio
    -
    -
    - @foreach ($cierre->unidades() as $unidad) -
    -
    {{ucwords($unidad->unidad()->tipo()->descripcion)}}
    -
    - -
    -
    - @endforeach - @foreach ($valores as $valor) -
    -
    {{ucwords($valor->descripcion)}}
    -
    - valor($valor->descripcion)) - value="{{$cierre->valor($valor->descripcion)->valor}}" - @endif - class="form-control" /> -
    -
    - @endforeach -
    PROPIETARIO
    -
    -
    -
    RUT
    -
    propietario()) - value="{{$cierre->propietario()->rut()}}" - @endif - class="form-control" />
    -
    -
    -
    Nombre
    -
    propietario()) - value="{{$cierre->propietario()->nombres}}" - @endif - class="form-control" autocomplete="off" />
    -
    propietario()) - value="{{$cierre->propietario()->apellido_paterno}}" - @endif - class="form-control" autocomplete="off" />
    -
    propietario()) - value="{{$cierre->propietario()->apellido_materno}}" - @endif - class="form-control" autocomplete="off" />
    -
    -
    -
    Sexo
    -
    propietario() and $cierre->propietario()->sexo == 'm') - selected="selected" - @endif - class="form-radio" /> Hombre
    -
    propietario() and $cierre->propietario()->sexo == 'f') - selected="selected" - @endif - class="form-radio" /> Mujer
    -
    -
    -
    Estado Civil
    -
    -
    -
    -
    Profesión
    -
    propietario()) - value="{{$cierre->propietario()->profesion}}" - @endif - class="form-control" />
    -
    -
    -
    Teléfono
    -
    +56
    -
    propietario()) - value="{{substr($cierre->propietario()->telefono, 0, 1)}}" - @endif - maxlength="1" class="form-control" />
    -
    propietario()) - value="{{substr($cierre->propietario()->telefono, 1)}}" - @endif - class="form-control" maxlength="8" />
    -
    -
    -
    E-Mail
    -
    propietario()) - value="{{explode('@', $cierre->propietario()->email)[0]}}" - @endif - class="form-control" />
    -
    @
    -
    propietario()) - value="{{explode('@', $cierre->propietario()->email)[1]}}" - @endif - class="form-control" />
    -
    -
    -
    Dirección
    -
    propietario()) - value="{{$cierre->propietario()->direccion()->calle}}" - @endif - class="form-control" autocomplete="off" />
    -
    propietario()) - value="{{$cierre->propietario()->direccion()->numero}}" - @endif - class="form-control" />
    -
    propietario()) - value="{{$cierre->propietario()->direccion()->extra}}" - @endif - class="form-control" autocomplete="off" />
    -
    -
    -
    -
    -
    -
    -
    - -
    -
    -
    -@endsection - -@push('scripts') - -@endpush diff --git a/app_old/resources/views/ventas/cierres/evaluar.blade.php b/app_old/resources/views/ventas/cierres/evaluar.blade.php deleted file mode 100644 index 4074019..0000000 --- a/app_old/resources/views/ventas/cierres/evaluar.blade.php +++ /dev/null @@ -1,447 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Evaluar Cierre

    -
    -
    -
    -
    -
    Proyecto
    -
    -
    -
    -
    Fecha
    - @include('form.fecha') -
    -
    -
    Departamento
    -
    -
    -
    -
    Precio
    -
    -
    -
    -
    Estacionamientos
    -
    -
    Bodegas
    -
    -
    - - - -
    -
    Pie
    -
    -
    -
    -
    Bono Pie
    -
    -
    Promocion
    -
    -
    Relacionado
    Subrelacionado
    -
    - -
    - -
    -
    -
    -
    Operador
    -
    -
    %
    -
    -
    -
    -
    -
    -
    -
    -@endsection - -@push('scripts') - -@endpush diff --git a/app_old/resources/views/ventas/cierres/list.blade.php b/app_old/resources/views/ventas/cierres/list.blade.php deleted file mode 100644 index ae27fec..0000000 --- a/app_old/resources/views/ventas/cierres/list.blade.php +++ /dev/null @@ -1,190 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Cierres

    -
    - - - - - - - - @foreach ($proyectos as $proyecto) - - - - @if (count($proyecto->cierres(2)) > 0) - - - - - - - - - - - - @foreach ($proyecto->cierres(2) as $cierre) - - - - - - - - @endforeach - @endif - @if (count($proyecto->cierres(3)) > 0) - - - - - - - - - - - - @foreach ($proyecto->cierres(3) as $cierre) - - - - - - - - @endforeach - @endif - @if (count($proyecto->cierres(-1))) - - - - - - - - - - - - @foreach ($proyecto->cierres(-1) as $cierre) - - - - - - - - @endforeach - @endif - @endforeach - -
    Proyecto
    - {{$proyecto->descripcion}} - - [{{count($proyecto->cierres())}}] -
    - Aprobado - - [{{count($proyecto->cierres(2))}}] {{format('percent', count($proyecto->cierres(2)) / count($proyecto->cierres()) * 100, null, true)}} -
    DepartamentoFechaValorEstado
    - - {{$cierre->unidadPrincipal()->unidad()->descripcion}} - ({{$cierre->unidadPrincipal()->unidad()->tipologia()->tipologia()->descripcion}}) - - {{format('shortDate', $cierre->fecha)}} - {{format('ufs', $cierre->neto(), null, true)}} - ({{format('ufs', $cierre->uf_m2(), null, true)}}/m²) - - {{ucfirst($cierre->estado()->tipo()->descripcion)}} - @if (!$cierre->propietario()) - (Sin propietario) - @endif -
    - Promesado - - [{{count($proyecto->cierres(3))}}] {{format('percent', count($proyecto->cierres(3)) / count($proyecto->cierres()) * 100, null, true)}} -
    DepartamentoFechaValorEstado
    - - {{$cierre->unidadPrincipal()->unidad()->descripcion}} - ({{$cierre->unidadPrincipal()->unidad()->tipologia()->tipologia()->descripcion}}) - - {{format('shortDate', $cierre->fecha)}} - {{format('ufs', $cierre->precio, null, true)}} - ({{format('ufs', $cierre->precio / $cierre->unidadPrincipal()->unidad()->m2(), null, true)}}/m²) - - @if ($cierre->estado()->tipo()->descripcion == 'promesado') - - @endif - {{ucfirst($cierre->estado()->tipo()->descripcion)}} - @if (!$cierre->propietario()) - (Sin propietario) - @endif - @if ($cierre->estado()->tipo()->descripcion == 'promesado') - - - @endif -
    - Abandonado/Rechazado - - [{{count($proyecto->cierres(-1))}}] {{format('percent', count($proyecto->cierres(-1)) / count($proyecto->cierres()) * 100, null, true)}} -
    DepartamentoFechaValorEstado
    - - {{$cierre->unidadPrincipal()->unidad()->descripcion}} - ({{$cierre->unidadPrincipal()->unidad()->tipologia()->tipologia()->descripcion}}) - - {{format('shortDate', $cierre->fecha)}} - {{format('ufs', $cierre->precio, null, true)}} - ({{format('ufs', $cierre->precio / $cierre->unidadPrincipal()->unidad()->m2(), null, true)}}/m²) - - {{ucfirst($cierre->estado()->tipo()->descripcion)}} - @if (!$cierre->propietario()) - (Sin propietario) - @endif -
    -@endsection - -@push('scripts') - -@endpush diff --git a/app_old/resources/views/ventas/cierres/show.blade.php b/app_old/resources/views/ventas/cierres/show.blade.php deleted file mode 100644 index 24c0212..0000000 --- a/app_old/resources/views/ventas/cierres/show.blade.php +++ /dev/null @@ -1,168 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -
    - - Cierre {{$cierre->unidadPrincipal()->unidad()->descripcion}} - {{$cierre->proyecto()->descripcion}} -
    -
    - -
    -
    -
    -
    Fecha
    -
    {{format('shortDate', $cierre->fecha)}}
    -
    -@if ($cierre->propietario()) -
    PROPIETARIO
    -
    -
    {{$cierre->propietario()->rut()}}
    -
    {{$cierre->propietario()->nombreCompleto()}}
    -
    {{$cierre->propietario()->direccion()->completa(true)}}
    -
    -@endif -
    PROPIEDAD
    -
    -
    {{ucwords($cierre->unidadPrincipal()->unidad()->tipologia()->tipo()->descripcion)}}
    -
    {{$cierre->unidadPrincipal()->unidad()->descripcion}}
    -
    {{$cierre->unidadPrincipal()->unidad()->tipologia()->nombre}}
    -
    {{$cierre->unidadPrincipal()->unidad()->tipologia()->tipologia()->descripcion}}
    -
    {!!format('m2', $cierre->unidadPrincipal()->unidad()->m2(), null, true)!!}
    -
    -@foreach ($cierre->unidades() as $unidad) -
    -
    {{ucwords($unidad->unidad()->tipologia()->tipo()->descripcion)}}
    -
    {{$unidad->unidad()->descripcion}}
    -
    {{format('ufs', $unidad->unidad()->precio($cierre->fecha())->valor, null, true)}}
    -
    -@endforeach -
    Lista
    -
    -
    Fecha
    -
    {{format('shortDate', $cierre->unidadPrincipal()->unidad()->precio($cierre->fecha())->estado()->fecha)}}
    -
    -
    -
    Valor
    -
    {{format('ufs', $cierre->unidadPrincipal()->unidad()->precio($cierre->fecha())->valor, null, true)}}
    -
    {{format('ufs', $cierre->unidadPrincipal()->unidad()->precio($cierre->fecha())->valor / $cierre->unidadPrincipal()->unidad()->m2(), null, true)}}/m²
    -
    -@if ($cierre->isRelacionado()) -
    -
    Valor Relacionado
    -
    {{format('ufs', $cierre->unidadPrincipal()->unidad()->precio($cierre->fecha())->valor * (1-6/100), null, true)}}
    -
    {{format('ufs', $cierre->unidadPrincipal()->unidad()->precio($cierre->fecha())->valor * (1-6/100) / $cierre->unidadPrincipal()->unidad()->m2(), null, true)}}/m²
    -
    -@endif -@if ($cierre->isSubrelacionado()) -
    -
    Valor Relacionado
    -
    {{format('ufs', $cierre->unidadPrincipal()->unidad()->precio($cierre->fecha())->valor * (1-3/100), null, true)}}
    -
    {{format('ufs', $cierre->unidadPrincipal()->unidad()->precio($cierre->fecha())->valor * (1-3/100) / $cierre->unidadPrincipal()->unidad()->m2(), null, true)}}/m²
    -
    -@endif -
    Oferta
    -
    -
    Precio
    -
    {{format('ufs', $cierre->precio, null, true)}}
    -
    -
    - -
    Neto
    -
    {{format('ufs', $cierre->neto(), null, true)}}
    -
    {{format('ufs', $cierre->uf_m2(), null, true)}}/m² - @if ($cierre->uf_m2() >= ($cierre->unidadPrincipal()->unidad()->precio($cierre->fecha())->valor * (($cierre->isRelacionado()) ? (1 - 6/100) : 1) * (($cierre->isSubrelacionado()) ? (1 - 3/100) : 1)) / $cierre->unidadPrincipal()->unidad()->m2()) - - @elseif ($cierre->uf_m2() < ($cierre->unidadPrincipal()->unidad()->precio($cierre->fecha())->valor * (($cierre->isRelacionado()) ? (1 - 6/100) : 1) * (($cierre->isSubrelacionado()) ? (1 - 3/100) : 1)) / $cierre->unidadPrincipal()->unidad()->m2()) - - @endif -
    -     -
    -@if ($cierre->valores()) - @foreach ($cierre->valores() as $valor) -
    -
    {{ucwords($valor->tipo()->descripcion)}}
    -
    {{format('ufs', $valor->valor, null, true)}}
    -
    {{format('percent', $valor->valor / $cierre->precio * 100)}} %
    -
    - @endforeach -@endif -
    Diferencia
    -
    -
    Neto
    -
    {{format('ufs', $cierre->neto() - $cierre->unidadPrincipal()->unidad()->precio($cierre->fecha())->valor, null, true)}}
    -
    -@if ($cierre->isRelacionado()) -
    -
    Neto Relacionado
    -
    {{format('ufs', $cierre->neto() - $cierre->unidadPrincipal()->unidad()->precio($cierre->fecha())->valor * (1 - 6/100), null, true)}}
    -
    -@endif -@if ($cierre->isSubrelacionado()) -
    -
    Neto Relacionado
    -
    {{format('ufs', $cierre->neto() - $cierre->unidadPrincipal()->unidad()->precio($cierre->fecha())->valor * (1 - 3/100), null, true)}}
    -
    -@endif -
    Estado
    -
    -
    -
    - @if ($cierre->estado()->tipo()->descripcion == 'promesado') - - @endif - {{ucwords($cierre->estado()->tipo()->descripcion)}} - ( - {{format('shortDate', $cierre->estado()->fecha)}} - @if ($cierre->estado()->tipo()->descripcion == 'promesado') - / {{format('shortDate', $cierre->promesa()->fecha)}} - @endif - ) - @if ($cierre->estado()->tipo()->descripcion == 'promesado') - - @endif -
    - @if ($cierre->estado()->tipo()->descripcion == 'aprobado') -
    -
    - @elseif ($cierre->estado()->tipo()->descripcion == 'rechazado') -
    - - - -
    -
    - - - -
    - @endif -
    -
    -@endsection - -@push('scripts') - -@endpush diff --git a/app_old/resources/views/ventas/comentarios/add.blade.php b/app_old/resources/views/ventas/comentarios/add.blade.php deleted file mode 100644 index 51a42d1..0000000 --- a/app_old/resources/views/ventas/comentarios/add.blade.php +++ /dev/null @@ -1,23 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -
    {{$venta->proyecto()->descripcion}} - {{$venta->unidad()->descripcion}}
    -
    -
    -
    -
    -
    Fecha
    -
    {{\Carbon\Carbon::now(config('app.timezone'))->format('d-m-Y')}}
    -
    -
    -
    Comentario
    -
    -
    -
    -
    -
    -
    -
    -
    -@endsection diff --git a/app_old/resources/views/ventas/consolidacion/pago.blade.php b/app_old/resources/views/ventas/consolidacion/pago.blade.php deleted file mode 100644 index f256955..0000000 --- a/app_old/resources/views/ventas/consolidacion/pago.blade.php +++ /dev/null @@ -1,12 +0,0 @@ - - {{format('shortDate', $pago->estado()->fecha)}} - {{$glosa}} ({{format('ufs', $pago->valor('ufs'))}} UF) - - $ {{format('pesos', $pago->valor())}} - $ {{format('pesos', $sum)}} - - @if ($pago->estado()->estado < 2) - No esta abonado. - @endif - - \ No newline at end of file diff --git a/app_old/resources/views/ventas/consolidacion/proyectos.blade.php b/app_old/resources/views/ventas/consolidacion/proyectos.blade.php deleted file mode 100644 index d14fff4..0000000 --- a/app_old/resources/views/ventas/consolidacion/proyectos.blade.php +++ /dev/null @@ -1,13 +0,0 @@ -@extends('layout.base') - -@section('content') -

    Consolidación de Ventas

    -
    -
    Proyectos
    - -
    -@endsection \ No newline at end of file diff --git a/app_old/resources/views/ventas/consolidacion/show.blade.php b/app_old/resources/views/ventas/consolidacion/show.blade.php deleted file mode 100644 index 5fc9408..0000000 --- a/app_old/resources/views/ventas/consolidacion/show.blade.php +++ /dev/null @@ -1,60 +0,0 @@ -@extends('layout.base') - -@section('content') -

    Consolidación de Ventas - {{$ventas[0]->proyecto()->descripcion}} Excel

    -

    {{strftime('%d de %B de %Y', $f->timestamp)}}

    -
    -@foreach ($ventas as $venta) -

    Departamento {{$venta->unidad()->descripcion}} ({{format('ufs', $venta->valor_uf)}} UF)

    - - - - - - - - - - - - - -@if ($venta->pie != 0) - @foreach ($venta->pie()->cuotas() as $cuota) - numero() . ' - ' . $venta->pie()->cuotas; $pago = $cuota->pago() ?> - valor(); $ufs += $pago->valor('ufs'); $sum += $pago->valor() ?> - @include('ventas.consolidacion.pago') - @endforeach - @if ($venta->pie()->reajuste != 0) - pie()->reajuste() ?> - valor(); $ufs += $pago->valor('ufs'); $sum += $pago->valor() ?> - @include('ventas.consolidacion.pago') - @endif -@endif -@if ($venta->escritura != 0) - escritura()->pago() ?> - valor(); $ufs += $pago->valor('ufs'); $sum += $pago->valor() ?> - @include('ventas.consolidacion.pago') -@endif -@if ($venta->credito != 0) - credito()->pago() ?> - valor(); $ufs += $pago->valor('ufs'); $sum += $pago->valor() ?> - @include('ventas.consolidacion.pago') -@endif -@if ($venta->devolucion != 0) - devolucion() ?> - valor(); $ufs -= $pago->valor('ufs'); $sum -= $pago->valor() ?> - @include('ventas.consolidacion.pago') -@endif - - - - - - - - - -
    FechaGlosaDebeHaberSaldoComentario
    TOTAL ({{format('ufs', $ufs)}} UF)$ {{format('pesos', $debe)}}$ {{format('pesos', $haber)}}$ {{format('pesos', $sum)}}
    -@endforeach -@endsection \ No newline at end of file diff --git a/app_old/resources/views/ventas/creditos/abonar.blade.php b/app_old/resources/views/ventas/creditos/abonar.blade.php deleted file mode 100644 index 9ee409c..0000000 --- a/app_old/resources/views/ventas/creditos/abonar.blade.php +++ /dev/null @@ -1,31 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -
    Abonar Crédito - {{$venta->unidad()->descripcion}} - {{$venta->proyecto()->descripcion}}
    -
    -
    -
    -
    Crédito
    -
    {{format('ufs', $venta->credito()->pago()->valor('ufs'))}} UF
    -
    -
    -
    Fecha Pago
    -
    {{format('shortDate', $venta->credito()->pago()->estado()->fecha)}}
    -
    -
    -
    Valor [$]
    -
    -
    -
    -
    Fecha Abono
    - credito()->pago()->estado()->fecha) ?> - @include('form.fecha') -
    -
    -
    -
    -
    -
    -
    -@endsection \ No newline at end of file diff --git a/app_old/resources/views/ventas/creditos/add.blade.php b/app_old/resources/views/ventas/creditos/add.blade.php deleted file mode 100644 index 8715ef1..0000000 --- a/app_old/resources/views/ventas/creditos/add.blade.php +++ /dev/null @@ -1,61 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -
    Agregar Crédito - {{$venta->unidad()->descripcion}} - {{$venta->proyecto()->descripcion}}
    -
    -
    -
    -
    Banco
    -
    -
    -
    -
    Valor [UF]
    -
    -
    UF
    -
    -
    -
    Fecha
    -
    - -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -@endsection - -@push('scripts') - -@endpush \ No newline at end of file diff --git a/app_old/resources/views/ventas/creditos/edit.blade.php b/app_old/resources/views/ventas/creditos/edit.blade.php deleted file mode 100644 index 5642c5f..0000000 --- a/app_old/resources/views/ventas/creditos/edit.blade.php +++ /dev/null @@ -1,42 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -
    Editar Crédito - {{$venta->unidad()->descripcion}} - {{$venta->proyecto()->descripcion}}
    -
    -
    -
    -
    Banco
    -
    credito()->pago()->banco != 0) - value="{{$venta->credito()->pago()->banco()->nombre}}" - @endif - />
    -
    -
    -
    Valor [UF]
    -
    -
    UF
    -
    -
    -
    Fecha
    - credito()->pago()->fecha, config('app.timezone')) ?> - @include('form.fecha') -
    -
    -
    -
    -
    -
    -
    -@endsection - -@push('scripts') - -@endpush \ No newline at end of file diff --git a/app_old/resources/views/ventas/creditos/pagar.blade.php b/app_old/resources/views/ventas/creditos/pagar.blade.php deleted file mode 100644 index ea9fe4f..0000000 --- a/app_old/resources/views/ventas/creditos/pagar.blade.php +++ /dev/null @@ -1,31 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -
    Pagar Crédito - {{$venta->unidad()->descripcion}} - {{$venta->proyecto()->descripcion}}
    -
    -
    -
    -
    Crédito
    -
    {{format('ufs', $venta->credito()->pago()->valor('ufs'))}} UF
    -
    -
    -
    Fecha Escritura
    -
    {{format('shortDate', $venta->credito()->pago()->fecha)}}
    -
    -
    -
    Valor [$]
    -
    -
    -
    -
    Fecha Pago
    - credito()->pago()->fecha) ?> - @include('form.fecha') -
    -
    -
    -
    -
    -
    -
    -@endsection \ No newline at end of file diff --git a/app_old/resources/views/ventas/creditos/pendientes.blade.php b/app_old/resources/views/ventas/creditos/pendientes.blade.php deleted file mode 100644 index 34846c1..0000000 --- a/app_old/resources/views/ventas/creditos/pendientes.blade.php +++ /dev/null @@ -1,35 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -
    Créditos Pendientes
    -
    -
    -
    -
    Exportar a Excel
    -
    - - - - - - - - - - - - -@foreach ($creditos as $credito) - - - - - - - - -@endforeach - -
    ProyectoDepartamentoValor [$]Valor [UF]Fecha EscrituraEstado
    {{$credito->venta()->proyecto()->descripcion}}{{$credito->venta()->unidad()->descripcion}}{{format('pesos', $credito->pago()->valor('pesos'), null, true)}}{{format('ufs', $credito->pago()->valor('ufs'), null, true)}}{{format('shortDate', (($credito->venta()->escriturado) ? $credito->venta()->escriturado : $credito->pago()->estado()->fecha))}}{{ucwords($credito->pago()->estado()->tipo()->descripcion)}}
    -@endsection \ No newline at end of file diff --git a/app_old/resources/views/ventas/creditos/show.blade.php b/app_old/resources/views/ventas/creditos/show.blade.php deleted file mode 100644 index c0a3221..0000000 --- a/app_old/resources/views/ventas/creditos/show.blade.php +++ /dev/null @@ -1,53 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -
    -

    -
    -
    - Crédito - {{$venta->unidad()->descripcion}} - {{$venta->proyecto()->descripcion}} -
    -
    - - @include('layout.icons.edit') - -
    -
    -

    -
    -
    -
    -
    Banco
    -
    - @if ($venta->credito()->pago()->banco != 0) - {{$venta->credito()->pago()->banco()->nombre}} - @else - --- - @endif -
    -
    -
    -
    Valor
    -
    {{format('ufs', $venta->credito()->pago()->valor('ufs'), null, true)}}
    -
    {{format('pesos', $venta->credito()->pago()->valor('pesos'), null, true)}}
    -
    -
    -
    Fecha
    -
    {{format('shortDate', $venta->credito()->pago()->fecha)}}
    -
    - - @foreach ($venta->credito()->pago()->estados() as $estado) - tipo()->active == 0) - class="danger" - @endif - > - - - - @endforeach -
    {{ucwords($estado->tipo()->descripcion)}}{{format('shortDate', $estado->fecha)}}
    -
    -
    -@endsection diff --git a/app_old/resources/views/ventas/desist.blade.php b/app_old/resources/views/ventas/desist.blade.php deleted file mode 100644 index b11e95b..0000000 --- a/app_old/resources/views/ventas/desist.blade.php +++ /dev/null @@ -1,44 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Desistir - {{$venta->unidad()->descripcion}} - {{$venta->proyecto()->descripcion}}

    -
    -
    -
    -
    -
    Fecha
    - -
    -
    -
    -
    -
    -
    Devolución [$]
    -
    -
    -
    -
    -
    -
    -@endsection \ No newline at end of file diff --git a/app_old/resources/views/ventas/devolucion.blade.php b/app_old/resources/views/ventas/devolucion.blade.php deleted file mode 100644 index 1697300..0000000 --- a/app_old/resources/views/ventas/devolucion.blade.php +++ /dev/null @@ -1,63 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -
    Devolución - {{$venta->unidad()->descripcion}} - {{$venta->proyecto()->descripcion}}
    -
    -
    -
    -
    -
    Saldo
    -
    {{format('ufs', $venta->saldo('ufs'), null, true)}}
    -
    {{format('pesos', $valor, null, true)}}
    -
    $ {{format('ufs', $uf)}}
    -
    -
    -
    Fecha
    - @include('form.fecha') -
    -
    -
    Valor [$]
    -
    -
    -
    -
    (Identificador)
    -
    -
    -
    -
    (Banco)
    -
    -
    -
    -
    -
    -
    -@endsection - -@push('scripts') - -@endpush diff --git a/app_old/resources/views/ventas/edit.blade.php b/app_old/resources/views/ventas/edit.blade.php deleted file mode 100644 index 4090eb5..0000000 --- a/app_old/resources/views/ventas/edit.blade.php +++ /dev/null @@ -1,546 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -
    Editar Venta - {{$venta->unidad()->descripcion}} - {{$venta->proyecto()->descripcion}}
    -
    -
    -
    -
    -
    Fecha de Venta
    - fecha, config('app.timezone')) ?> - @include('form.fecha') -
    -
    PROPIETARIO
    -
    -
    -
    RUT
    -
    -
    -
    -
    Nombre
    -
    -
    -
    -
    -
    -
    -
    Dirección
    -
    -
    -
    -
    -
    -
    -
    -
    -
    PROPIEDAD
    -
    -
    -
    Proyecto
    -
    -
    -
    - -
    -
    Unidades
    -
    -
    -
    -
    -
    FORMA DE PAGO
    -
    -
    -
    Valor
    -
    -
    UF
    -
    -
    -
    Pie
    -
    -
    -
    -
    Crédito
    -
    -
    -
    OTRAS CONDICIONES
    -
    -
    -
    Bono Pie
    -
    -
    -
    -
    Operador
    -
    -
    -
    - -
    -
    Promociones
    -
    -
    -
    -
    -
    -
    -
    -
    -@endsection - -@push('scripts') - -@endpush \ No newline at end of file diff --git a/app_old/resources/views/ventas/entregar.blade.php b/app_old/resources/views/ventas/entregar.blade.php deleted file mode 100644 index f538e33..0000000 --- a/app_old/resources/views/ventas/entregar.blade.php +++ /dev/null @@ -1,125 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Entregar - {{$venta->unidad()->descripcion}} - {{$venta->proyecto()->descripcion}}

    -
    -
    -
    -
    -
    Fecha
    - @include('form.fecha') -
    -
    -
    Mediciones
    - -
    -
    -
    -
    -
    -
    Observaciones
    - -
    -
    -
    -
    -
    -
    -
    -@endsection - -@push('scripts') - -@endpush \ No newline at end of file diff --git a/app_old/resources/views/ventas/escrituras/abonar.blade.php b/app_old/resources/views/ventas/escrituras/abonar.blade.php deleted file mode 100644 index 517ce7a..0000000 --- a/app_old/resources/views/ventas/escrituras/abonar.blade.php +++ /dev/null @@ -1,25 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Abonar Escritura - {{$venta->unidad()->descripcion}} - {{$venta->proyecto()->descripcion}}

    -
    -
    -
    -
    -
    Fecha Pago
    -
    {{format('shortDate', $venta->escritura()->pago()->estado()->fecha)}}
    -
    -
    -
    Fecha
    - escritura()->pago()->estado()->fecha, config('app.timezone')) ?> - @include('form.fecha') -
    -
    -
    Valor Abonado [$]
    -
    -
    -
    -
    -
    -@endsection \ No newline at end of file diff --git a/app_old/resources/views/ventas/escrituras/add.blade.php b/app_old/resources/views/ventas/escrituras/add.blade.php deleted file mode 100644 index 2efb948..0000000 --- a/app_old/resources/views/ventas/escrituras/add.blade.php +++ /dev/null @@ -1,219 +0,0 @@ -@extends('layout.base', ['titulo' => 'Escriturar']) - -@section('content') -
    -

    Escriturar - {{$venta->unidad()->descripcion}} - {{$venta->proyecto()->descripcion}}

    -
    -
    -
    -
    Faltante
    -
    $ {{format('pesos', -$venta->saldo('pesos'))}}
    -
    {{format('ufs', -$venta->saldo())}} UF
    -
    -
    - -
    -
    Fecha
    - -
    - -
    -
    - -
    -
    - -
    -
    - @if ($venta->pie != 0 and $venta->pie()->reajuste == 0) -
    -
    Reajuste
    -
    -
    -
    Valor [$]
    -
    -
    -
    -
    Fecha
    -
    - -
    -
    - -
    -
    - -
    -
    -
    -
    - @endif - @if ($venta->escritura == 0) -
    -
    Pago en Escritura
    -
    -
    -
    Valor [$]
    -
    -
    -
    -
    (Valor [UF])
    -
    -
    -
    -
    Fecha
    -
    - -
    -
    - -
    -
    - -
    -
    -
    -
    - @endif - @if ($venta->subsidio == 0) -
    -
    Subsidio
    -
    -
    -
    Valor Ahorrado [UF]
    -
    -
    -
    -
    Valor Subsidio [UF]
    -
    -
    -
    -
    Total
    -
    -
    UF
    -
    -
    -
    - @endif - @if ($venta->credito == 0) -
    -
    Crédito
    -
    -
    -
    Banco
    -
    -
    -
    -
    Valor [UF]
    -
    -
    -
    -
    - @elseif ($venta->credito()->pago()->banco == 0) -
    -
    Crédito
    -
    -
    -
    Valor [UF]
    -
    {{format('ufs', $venta->credito()->pago()->valor('ufs'), null, true)}}
    -
    -
    -
    Banco
    -
    -
    -
    -
    - @endif -
    -
    -
    -
    -@endsection - -@push('scripts') - -@endpush diff --git a/app_old/resources/views/ventas/escrituras/edit.blade.php b/app_old/resources/views/ventas/escrituras/edit.blade.php deleted file mode 100644 index b45ea1f..0000000 --- a/app_old/resources/views/ventas/escrituras/edit.blade.php +++ /dev/null @@ -1,53 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -
    Editar Pago de Escritura - {{$venta->unidad()->descripcion}} - {{$venta->proyecto()->descripcion}}
    -
    -
    -
    -
    Valor [$]
    -
    -
    -
    -
    (Valor [UF])
    -
    -
    -
    -
    Fecha
    - escritura()->pago()->fecha, config('app.timezone')) ?> -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -@endsection \ No newline at end of file diff --git a/app_old/resources/views/ventas/escrituras/informe.blade.php b/app_old/resources/views/ventas/escrituras/informe.blade.php deleted file mode 100644 index e20d473..0000000 --- a/app_old/resources/views/ventas/escrituras/informe.blade.php +++ /dev/null @@ -1,95 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -
    Escritura - {{$venta->unidad()->descripcion}} - {{$venta->proyecto()->descripcion}}
    -
    - El departamento {{$venta->unidad()->descripcion}}:
    - @if (count($venta->propiedad()->estacionamientos()) > 0) - @if (count($venta->propiedad()->estacionamientos()) > 1) - tiene los estacionamientos - @foreach ($venta->propiedad()->estacionamientos() as $i => $est) - @if ($i == count($venta->propiedad()->estacionamientos()) - 1) - y - @elseif ($i > 0) - , - @endif - {{$est->descripcion}} - @endforeach - @else - tiene el estacionamiento {{$venta->propiedad()->estacionamientos()[0]->descripcion}} - @endif - @else - no tiene estacionamientos - @endif - y - @if (count($venta->propiedad()->bodegas()) > 0) - @if (count($venta->propiedad()->bodegas()) > 1) - tiene las bodegas - @foreach ($venta->propiedad()->bodegas() as $i => $est) - @if ($i == count($venta->propiedad()->bodegas()) - 1) - y - @elseif ($i > 0) - , - @endif - {{$est->descripcion}} - @endforeach - @else - tiene la bodega {{$venta->propiedad()->bodegas()[0]->descripcion}}. - @endif - @else - no tiene bodegas. - @endif -
    -
    - PRECIO {{format('ufs', $venta->valor('ufs'))}} UF.
    - @if ($venta->pie != 0) - PIE {{count($venta->pie()->cuotas())}} cuota{{(count($venta->pie()->cuotas()) > 1) ? 's que suman' : ' de'}} - $ {{format('pesos', $venta->pie()->valorPagado('pesos'))}} equivalente a {{format('ufs', $venta->pieReajustado())}} UF.
    - @if ($venta->pie()->reajuste != 0) - REAJUSTE - @if ($venta->pie()->reajuste()->estado()->estado >= 1) - $ {{format('pesos', $venta->pie()->reajuste()->valor)}} el {{format('shortDate', $venta->pie()->reajuste()->fecha)}} - equivalente a {{format('ufs', $venta->pie()->reajuste()->valor('ufs'))}} UF. - @else - {{format('ufs', $venta->pie()->reajuste()->valor('ufs'))}} UF por pagar. - @endif -
    - @endif - @endif - @if ($venta->escritura != 0) - ESCRITURA - @if ($venta->escritura()->pago()->estado()->estado >= 1) - $ {{format('pesos', $venta->escritura()->pago()->valor)}} el {{format('shortDate', $venta->escritura()->pago()->fecha)}} - equivalente a {{format('ufs', $venta->escritura()->pago()->valor('ufs'))}} UF. - @else - {{format('ufs', $venta->escritura()->pago()->valor('ufs'))}} UF por pagar. - @endif -
    - @endif - @if ($venta->saldo() / $venta->valor_uf > 0.01) - (DEVOLVER {{format('ufs', $venta->saldo())}} UF).
    - @endif - @if ($venta->anticipo() > 0) - TOTAL ANTICIPO {{format('ufs', $venta->anticipo())}} UF.
    - @endif - @if ($venta->bono_pie != 0) - BONO {{format('ufs', $venta->bonoPie()->pago()->valor('ufs'))}} UF.
    - @endif - @if ($venta->subsidio != 0) - SUBSIDIO {{format('ufs', $venta->subsidio()->pago()->valor('ufs'))}} UF con ahorro y - {{format('ufs', $venta->subsidio()->subsidio()->valor('ufs'))}} UF con subsidio.
    - @endif - @if ($venta->credito != 0) - Saldo {{format('ufs', $venta->credito()->pago()->valor('ufs'))}} UF con CRÉDITO en {{$venta->credito()->pago()->banco()->nombreCompleto()}}.
    - @endif - TOTAL {{format('ufs', $venta->pagado())}} UF. - - @if ($venta->saldo() > 0.0001) -
    -
    - Diferencia {{format('ufs', $venta->saldo())}} UF ({{\App\Helper\Format::number(($venta->saldo()) / $venta->valor_uf * 100, 2)}}%). - @endif -
    -
    -@endsection \ No newline at end of file diff --git a/app_old/resources/views/ventas/escrituras/pagar.blade.php b/app_old/resources/views/ventas/escrituras/pagar.blade.php deleted file mode 100644 index 7524f41..0000000 --- a/app_old/resources/views/ventas/escrituras/pagar.blade.php +++ /dev/null @@ -1,24 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Pagar Escritura - {{$venta->unidad()->descripcion}} - {{$venta->proyecto()->descripcion}}

    -
    -
    -
    -
    -
    Fecha Pago
    -
    {{format('shortDate', $venta->escritura()->pago()->fecha)}}
    -
    -
    -
    Fecha
    - @include('form.fecha') -
    -
    -
    Valor Pagado [$]
    -
    -
    -
    -
    -
    -@endsection \ No newline at end of file diff --git a/app_old/resources/views/ventas/firmar.blade.php b/app_old/resources/views/ventas/firmar.blade.php deleted file mode 100644 index da16f27..0000000 --- a/app_old/resources/views/ventas/firmar.blade.php +++ /dev/null @@ -1,16 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -
    Firmar Venta {{$venta->unidad()->descripcion}}
    -
    - -
    -
    Fecha
    - @include('form.fecha') -
    -
    - -
    -
    -@endsection diff --git a/app_old/resources/views/ventas/forma_pago.blade.php b/app_old/resources/views/ventas/forma_pago.blade.php deleted file mode 100644 index 0824d85..0000000 --- a/app_old/resources/views/ventas/forma_pago.blade.php +++ /dev/null @@ -1,283 +0,0 @@ - - - - - - - -@if ($venta->pie != 0) - - - - - - - - - - - - @if ($venta->pie()->reajuste == 0) - @if ($venta->escriturado == 0) - - - @else - - @endif - @else - - - - - - - - @endif - -@endif -@if ($venta->escritura != 0) - - - - - - - -@endif - - - - - - -@if ($venta->bono_pie != 0) - - - - - - -@else - - - -@endif -@if ($venta->subsidio != 0) - - - - - - - - - - - - - -@else - - - -@endif -@if ($venta->credito != 0) - - - - - - -@elseif ($venta->escriturado == null and $venta->estado == 1) - - - - - - -@endif -@if ($venta->saldo() / $venta->valor_uf > 0.01 or $venta->devolucion) -devolucion) -class="warning" -@endif -> - - @if (!$venta->devolucion) - - - - - @else - - - - @endif - -@endif -@if ($venta->estado == 0) - - - - - @if ($venta->resciliacion) - - @else - - @endif - -@endif - - - - - - - - -
    FORMA DE PAGO
    Pie - @include('layout.icons.edit', ['small' => true]) - {{format('ufs', $venta->pie()->valor)}} UF$ {{format('pesos', $venta->pie()->valorPesos())}}Cuotas - - {{count($venta->pie()->pagadas())}} / {{$venta->pie()->cuotas}} - @if (count($venta->pie()->rebotadas()) > 0) - [-{{count($venta->pie()->rebotadas())}}] - @endif - - @if (count($venta->pie()->cuotas()) < $venta->pie()->cuotas) - - @include('layout.icons.add', ['small' => true]) - - @endif -
    Pagado - {{format('ufs', $venta->pieReajustado())}} UF - - $ {{format('pesos', $venta->pie()->valorPagado('pesos'))}} - - - Reajustar @include('layout.icons.add') - -
    Reajuste - @include('layout.icons.edit', ['small' => true]) - {{format('ufs', $venta->pie()->reajuste()->valor('ufs'))}} UF$ {{format('pesos', $venta->pie()->reajuste()->valor)}}{{format('shortDate', $venta->pie()->reajuste()->estado()->fecha)}} - @if ($venta->pie()->reajuste()->estado()->estado < 1) - - @include('layout.icons.pagar') - - @elseif ($venta->pie()->reajuste()->estado()->estado < 2) - - @include('layout.icons.abonar') - - @else - - @include('layout.icons.edit') - - @endif -
    Escritura - @include('layout.icons.edit', ['small' => true]) - {{format('ufs', $venta->escritura()->pago()->valor('ufs'))}} UF$ {{format('pesos', $venta->escritura()->pago()->valor())}}{{format('shortDate', $venta->escritura()->pago()->estado()->fecha)}} - @if ($venta->escritura()->pago()->estado()->estado == 1) - - @include('layout.icons.abonar') - - @elseif ($venta->escritura()->pago()->estado()->estado == 0) - - @include('layout.icons.pagar') - - @endif -
    Anticipo{{format('ufs', $venta->anticipo())}} UF$ {{format('pesos', $venta->anticipo('pesos'))}}
    Bono Pie - @include('layout.icons.edit', ['small' => true]) - {{format('ufs', $venta->bonoPie()->pago()->valor('ufs'))}} UF$ {{format('pesos', $venta->bonoPie()->pago()->valor)}}
    Bono Pie - @include('layout.icons.add', ['small' => true]) -
    Subsidio - @include('layout.icons.edit', ['small' => true]) - {{format('ufs', $venta->subsidio()->subsidio()->valor('ufs'))}} UF $ {{format('pesos', $venta->subsidio()->subsidio()->valor())}}{{format('shortDate', $venta->subsidio()->subsidio()->estado()->fecha)}} - @if ($venta->subsidio()->subsidio()->estado()->estado < 1) - - @include('layout.icons.pagar') - - @elseif($venta->subsidio()->subsidio()->estado()->estado < 2) - - @include('layout.icons.abonar') - - @endif - - Subsidio - - - -
    {{format('ufs', $venta->subsidio()->pago()->valor('ufs'))}} UF $ {{format('pesos', $venta->subsidio()->pago()->valor())}}{{format('shortDate', $venta->subsidio()->pago()->estado()->fecha)}} - @if ($venta->subsidio()->pago()->estado()->estado < 1) - - @include('layout.icons.pagar') - - @elseif ($venta->subsidio()->pago()->estado()->estado < 2) - - @include('layout.icons.abonar') - - @endif - - Libreta de Ahorro - - - -
    Subsidio - @include('layout.icons.add', ['small' => true]) -
    - Crédito - - @include('layout.icons.show', ['icon' => 'eye-open', 'small' => true]) - - - @include('layout.icons.remove', ['small' => true]) - - {{format('ufs', $venta->credito()->pago()->valor('ufs'))}} UF$ {{format('pesos', $venta->credito()->pago()->valor)}}{{format('shortDate', $venta->credito()->pago()->estado()->fecha)}} - @if ($venta->credito()->pago()->estado()->estado < 1) - - @include('layout.icons.pagar') - - @elseif ($venta->credito()->pago()->estado()->estado < 2) - - @include('layout.icons.abonar') - - @endif - Banco: @if ($venta->credito()->pago()->banco != 0) {{$venta->credito()->pago()->banco()->nombre}} @endif
    Crédito{{format('ufs', $venta->valor_uf - $venta->pagado())}} UF - @include('layout.icons.add') -
    Devolución - @if (!$venta->devolucion) - - @else - - @include('layout.icons.edit') - - @endif - -{{format('ufs', $venta->saldo('ufs'))}} UF-$ {{format('pesos', $venta->saldo('pesos'))}} - @include('layout.icons.add') - -{{format('ufs', $venta->devolucion()->valor('ufs'))}} UF-$ {{format('pesos', $venta->devolucion()->valor('pesos'))}}{{format('shortDate', $venta->devolucion()->estado()->fecha)}} - @if ($venta->devolucion()->estado()->estado < 1) - - @include('layout.icons.pagar') - - @elseif ($venta->devolucion()->estado()->estado < 2) - - @include('layout.icons.abonar') - - @endif -
    Resciliación-{{format('ufs', (($venta->resciliacion) ? $venta->resciliacion()->valor('ufs') : $venta->anticipo('ufs')), null, true)}}-{{format('pesos', (($venta->resciliacion) ? $venta->resciliacion()->valor('pesos') : $venta->anticipo('pesos')), null, true)}} - @if ($venta->resciliacion()->estado()->estado < 1) - - @include('layout.icons.pagar') - - @elseif ($venta->resciliacion()->estado()->estado < 2) - - @include('layout.icons.abonar') - - @endif -
    Total{{format('ufs', $venta->pagado())}} UF$ {{format('pesos', $venta->pagado('pesos'))}}{{format('ufs', $venta->saldo())}} UF
    diff --git a/app_old/resources/views/ventas/forma_pago/edit.blade.php b/app_old/resources/views/ventas/forma_pago/edit.blade.php deleted file mode 100644 index 2b9d7f1..0000000 --- a/app_old/resources/views/ventas/forma_pago/edit.blade.php +++ /dev/null @@ -1,227 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Editar Forma de Pago - {{$venta->unidad()->descripcion}} - {{$venta->proyecto()->descripcion}}

    -
    -
    -@if ($venta->pie != 0) -
    -
    Pie
    -
    -
    -
    -
    Valor [UF]
    -
    -
    -
    -
    Cuotas
    -
    -
    -@if ($venta->pie()->reajuste != 0) -
    -
    Reajuste
    -
    -
    -
    -
    Fecha
    - pie()->reajuste()->fecha, config('app.timezone')) ?> - @include('form.fecha') -
    -
    -
    Valor [$]
    -
    -
    -@else -
    -
    Fecha
    - - @include('form.fecha') -
    -@endif -@endif -
    -
    Escritura
    -
    -
    -@if ($venta->escritura != 0) -
    -
    Fecha
    - escritura()->pago()->fecha, config('app.timezone')) ?> - @include('form.fecha') -
    -
    -
    Valor [$]
    -
    -
    -@else -
    -
    Fecha
    - - @include('form.fecha') -
    -
    -
    Valor [$]
    -
    -
    -@endif -
    -
    Crédito
    -
    -
    -@if ($venta->credito != 0) - -@endif -
    -
    -
    -
    -@endsection - - -@if ($venta->pie != 0) - - Pie - pie()->valorPagado('pesos'); - $total_uf = $venta->pie()->valorPagado(); - $anticipo += $venta->pie()->valorPagado('pesos'); - $anticipo_uf += $venta->pie()->valorPagado() - ?> - {{format('ufs', $venta->pie()->valor)}} UF - $ {{format('pesos', $venta->pie()->valorPesos())}} - Cuotas - - {{count($venta->pie()->pagadas())}} / {{$venta->pie()->cuotas}} - @if (count($venta->pie()->cuotas()) < $venta->pie()->cuotas) - - @endif - - - - Pagado - {{format('ufs', $venta->pie()->valorPagado())}} UF - $ {{format('pesos', $venta->pie()->valorPagado('pesos'))}} - @if ($venta->pie()->reajuste == 0) - @if ($venta->escriturado == 0) - Reajustar - - @else - - @endif - @else - pie()->reajuste()->valor; - $total_uf += $venta->pie()->reajuste()->valor('ufs'); - $anticipo += $venta->pie()->reajuste()->valor; - $anticipo_uf += $venta->pie()->reajuste()->valor('ufs'); - ?> - - - - Reajuste - {{format('ufs', $venta->pie()->reajuste()->valor('ufs'))}} UF - $ {{format('pesos', $venta->pie()->reajuste()->valor)}} - {{format('shortDate', $venta->pie()->reajuste()->estado()->fecha)}} - @if ($venta->pie()->reajuste()->estado()->estado < 2) - ✓ - @endif - - @endif - -@endif -@if ($venta->bono_pie != 0) - - Bono Pie - bonoPie()->pago()->valor; - $total_uf += $venta->bonoPie()->pago()->valor('ufs'); - $anticipo += $venta->bonoPie()->pago()->valor; - $anticipo_uf += $venta->bonoPie()->pago()->valor('ufs'); - ?> - {{format('ufs', $venta->bonoPie()->pago()->valor('ufs'))}} UF - $ {{format('pesos', $venta->bonoPie()->pago()->valor)}} - - -@endif -@if ($venta->escritura != 0) -escritura()->pago()->valor; -$total_uf += $venta->escritura()->pago()->valor('ufs'); -$anticipo += $venta->escritura()->pago()->valor; -$anticipo_uf += $venta->escritura()->pago()->valor('ufs'); -?> - - Escritura - {{format('ufs', $venta->escritura()->pago()->valor('ufs'))}} UF - $ {{format('pesos', $venta->escritura()->pago()->valor)}} - {{format('shortDate', $venta->escritura()->pago()->estado()->fecha)}} - @if ($venta->escritura()->pago()->estado()->estado == 1) - ✓ - @elseif ($venta->escritura()->pago()->estado()->estado == 0) - ✓ - @endif - - - -@endif - - Anticipo - {{format('ufs', $anticipo_uf)}} UF - $ {{format('pesos', $anticipo)}} - - -@if ($venta->subsidio != 0) -subsidio()->total(); $total_uf += $venta->subsidio()->total('ufs') ?> - - Subsidio - {{format('ufs', $venta->subsidio()->total('ufs'))}} UF - $ {{format('pesos', $venta->subsidio()->total())}} - {{format('shortDate', $venta->subsidio()->pago()->fecha)}} - @if ($venta->subsidio()->pago()->estado()->estado < 2) - ✓ - @endif - - -@endif -@if ($venta->credito != 0) - - Crédito @if ($venta->credito != 0) @endif -credito()->pago()->valor; $total_uf += $venta->credito()->pago()->valor('ufs') ?> - {{format('ufs', $venta->credito()->pago()->valor('ufs'))}} UF - $ {{format('pesos', $venta->credito()->pago()->valor)}} - {{format('shortDate', $venta->credito()->pago()->estado()->fecha)}} - @if ($venta->credito()->pago()->estado()->estado < 1) - ✓ - @elseif ($venta->credito()->pago()->estado()->estado < 2) - ✓ - @endif - - Banco: @if ($venta->credito()->pago()->banco != 0) {{$venta->credito()->pago()->banco()->nombre}} @endif -@elseif ($venta->escriturado == null) - - Crédito @if ($venta->credito != 0) @endif - {{format('ufs', $venta->valor_uf - $total_uf)}} UF - - - -@endif - - Total - {{format('ufs', $total_uf)}} UF - $ {{format('pesos', $total)}} - {{format('ufs', $total_uf - $venta->valor_uf)}} UF - - - - - \ No newline at end of file diff --git a/app_old/resources/views/ventas/list.blade.php b/app_old/resources/views/ventas/list.blade.php deleted file mode 100644 index aef16a3..0000000 --- a/app_old/resources/views/ventas/list.blade.php +++ /dev/null @@ -1,42 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Ventas de {{$proyecto->descripcion}} [{{count($ventas)}}]

    -
    - - - - - - - - - - - - - - @foreach ($ventas as $venta) - - - - - - - - - - @endforeach - -
    @include('ventas.sort_title', ['title' => 'Departamento'])@include('ventas.sort_title', ['title' => 'Propietario'])@include('ventas.sort_title', ['title' => 'Valor [UF]'])@include('ventas.sort_title', ['title' => 'Tipología'])@include('ventas.sort_title', ['title' => 'UF/m²'])@include('ventas.sort_title', ['title' => 'Fecha Venta'])@include('ventas.sort_title', ['title' => 'Estado'])
    - - {{trim(array_reduce($venta->propiedad()->departamentos(), function($carry, $item) { - return implode(' - ', [$carry, $item->descripcion]); - }), ' -')}} - {{(count($venta->propiedad()->estacionamientos('array')) > 0) ? ' - E' . implode(', ', $venta->propiedad()->estacionamientos('array')) : ''}} - {{(count($venta->propiedad()->bodegas('array')) > 0) ? ' - B' . implode(', ', $venta->propiedad()->bodegas('array')) : ''}} - - - propietario()->nombreCompleto() . '"')}}">{{$venta->propietario()->nombreCompleto()}} {{\App\Helper\Format::ufs($venta->valor_uf)}}{{$venta->propiedad()->unidad()->tipologia()->tipologia()->descripcion}} ({{format('m2', $venta->propiedad()->unidad()->tipologia()->m2())}} m²){{\App\Helper\Format::ufs($venta->uf_m2())}}{{$venta->fecha()->format('d-m-Y')}}{{ucwords($venta->estado()->tipo()->descripcion)}}
    -@endsection diff --git a/app_old/resources/views/ventas/operadores/unidades/bloquear.blade.php b/app_old/resources/views/ventas/operadores/unidades/bloquear.blade.php deleted file mode 100644 index 096de7b..0000000 --- a/app_old/resources/views/ventas/operadores/unidades/bloquear.blade.php +++ /dev/null @@ -1,61 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Bloquear Unidades - {{$operador->proyecto()->descripcion}}

    -
    -
    -
    Operador
    -
    {{$operador->agente()->agente()->abreviacion}}
    -
    -
    -
    -
    -
    Fecha
    - @include('form.fecha') -
    -
    -
    Departamentos
    -
    -
    -
    -
    Estacionamientos
    -
    -
    -
    -
    Bodegas
    -
    -
    - - - - - - - - - - - - @foreach ($operador->proyecto()->unidadesDisponibles() as $unidad) - - - - - - - - @endforeach - -
    TipoNúmeroTipologíam²
    {{ucwords($unidad->tipo()->descripcion)}}{{$unidad->descripcion}} - @if ($unidad->tipologia()->tipologia()) - {{$unidad->tipologia()->tipologia()->descripcion}} - @endif - {!!format('m2', $unidad->m2(), null, true)!!}
    -
    -
    - -
    -
    -
    -@endsection diff --git a/app_old/resources/views/ventas/operadores/unidades/list.blade.php b/app_old/resources/views/ventas/operadores/unidades/list.blade.php deleted file mode 100644 index 544f1a2..0000000 --- a/app_old/resources/views/ventas/operadores/unidades/list.blade.php +++ /dev/null @@ -1,82 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Unidades Bloqueadas

    -
    - - - - - - - - - @foreach ($proyectos as $proyecto) - - - - - @endforeach - -
    ProyectoOperadores
    {{$proyecto->descripcion}} - - - - - - - - - @foreach ($proyecto->operadoresVigentes() as $operador) - - - - - @endforeach - -
    NombreUnidades
    - {{$operador->agente()->agente()->abreviacion}} - - @if ($operador->unidadesBloqueadas()) - - - - [{{count($operador->unidadesBloqueadas())}}] - - - - - - - - - - - - - - @foreach ($operador->unidadesBloqueadas() as $unidad) - - - - - - - - - - @endforeach - -
    TipoNúmeroTipologíam² VendibleFechaPrecio ListaUF/m²
    - {{ucwords($unidad->unidad()->tipo()->descripcion)}} - {{$unidad->unidad()->descripcion}}{{$unidad->unidad()->tipologia()->tipologia()->descripcion}}{{$unidad->unidad()->m2()}}{{format('shortDate', $unidad->estado()->fecha())}}{{format('ufs', $unidad->unidad()->precio($unidad->estado()->fecha())->valor)}} UF{{format('ufs', $unidad->unidad()->precio($unidad->estado()->fecha())->valor / $unidad->unidad()->m2())}}
    - @else - No hay unidades bloqueadas. - - - - @endif -
    -
    -@endsection diff --git a/app_old/resources/views/ventas/pagos/edit.blade.php b/app_old/resources/views/ventas/pagos/edit.blade.php deleted file mode 100644 index 41d1b25..0000000 --- a/app_old/resources/views/ventas/pagos/edit.blade.php +++ /dev/null @@ -1,77 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Editar Pago

    -
    -
    -
    -
    -
    Fecha
    - fecha, config('app.timezone')) ?> - @include('form.fecha') -
    -
    -
    Tipo
    -
    -
    -
    -
    (Identificador)
    -
    -
    -
    -
    Banco
    -
    banco()) - value="{{$pago->banco()->nombre}}" - @endif - id="banco" autocomplete="off" />
    -
    -
    -
    Valor [$]
    -
    -
    -
    -
    (Pagador)
    -
    -
    -
    -
    Estado
    -
    -
    -
    -
    Fecha Estado
    - estado()->fecha, config('app.timezone')); $id = 'estado' ?> - @include('form.fecha') -
    -
    -
    -
    -
    -@endsection - -@push('scripts') - -@endpush diff --git a/app_old/resources/views/ventas/pagos/pendientes.blade.php b/app_old/resources/views/ventas/pagos/pendientes.blade.php deleted file mode 100644 index 1201fa8..0000000 --- a/app_old/resources/views/ventas/pagos/pendientes.blade.php +++ /dev/null @@ -1,268 +0,0 @@ -@extends('layout.base') - -@section('content') -

    Pagos Pendientes

    -
    -
    Históricos
    -
    -
    -
    -
    -
    - -
    -
    -

    Para Abonar [
    ]

    - - - - - - - - - - - - - -
    ProyectoDepartamentoPropietarioTipoFecha DepositoValor
    -

    Pagos Rebotados Pendientes [
    ]

    - - - - - - - - - - - - - -
    ProyectoDepartamentoPropietarioTipoFecha ReboteValor
    -@endsection - -@push('styles') - -@endpush - -@push('scripts') - -@endpush diff --git a/app_old/resources/views/ventas/pagos/show.blade.php b/app_old/resources/views/ventas/pagos/show.blade.php deleted file mode 100644 index 36db674..0000000 --- a/app_old/resources/views/ventas/pagos/show.blade.php +++ /dev/null @@ -1,61 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -
    Pago
    -
    - -
    -
    -
    -
    -
    Tipo
    -
    - @if ($pago->tipo()) - {{ucwords($pago->tipo()->descripcion)}} - @endif -
    -
    -
    -
    Fecha
    -
    {{format('shortDate', $pago->fecha)}}
    -
    -
    -
    Valor
    -
    {{format('pesos', $pago->valor('pesos'), null, true)}}
    -
    {{format('ufs', $pago->valor('ufs'), null, true)}}
    -
    -
    -
    Valor de UF
    -
    {{format('pesos', $pago->uf, null, true)}}
    -
    -@if ($pago->banco != 0) -
    -
    Banco
    -
    {{$pago->banco()->descripcion}}
    -
    -@endif -@if ($pago->identificador != '') -
    -
    Identificador
    -
    {{$pago->identificador}}
    -
    -@endif - - - - - - - - -@foreach ($pago->estados() as $estado) - - - - -@endforeach - -
    EstadoFecha
    {{ucwords($estado->tipo()->descripcion)}}{{format('shortDate', $estado->fecha)}}
    -Volver -@endsection diff --git a/app_old/resources/views/ventas/pies/cuotas/abonar.blade.php b/app_old/resources/views/ventas/pies/cuotas/abonar.blade.php deleted file mode 100644 index d306560..0000000 --- a/app_old/resources/views/ventas/pies/cuotas/abonar.blade.php +++ /dev/null @@ -1,197 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -
    Abonar Cuotas
    -
    - Hay {{$total}} cuotas para abonar.
    -
    -
    Se están viendo de ha
    -
    -
    en {{$pages}} páginas.
    -
    -
    -
    Filtro
    -
    -
    -
    -
    -
    - @if (get('start') > 0) - - @endif -
    -
    - @if (get('start') > 0) - - @endif -
    -
    {{$current}} / {{$pages}}
    -
    - @if (get('start') + ((get('step')) ? get('step') : 30) < $total) - - @endif -
    -
    - @if (get('start') + ((get('step')) ? get('step') : 30) < $total) - - @endif -
    -
    - - - - - - - - - - - - - - - - - - - @foreach ($cuotas as $cuota) - - - - - - - - - - - - - - @endforeach - -
    ProyectoDepartamentoValor CuotaFecha Depositada
    PropietarioFecha CuotaFecha Abono / Devolución
    {{$cuota->pie()->venta()->proyecto()->descripcion}}{{$cuota->pie()->venta()->unidad()->descripcion}}$ {{format('pesos', $cuota->pago()->valor)}}{{format('shortDate', $cuota->pago()->estado()->fecha)}}✓
    {{$cuota->pie()->venta()->propietario()->nombreCompleto()}}{{format('shortDate', $cuota->pago()->fecha)}} -
    -
    -
    -
    -
    -     		X
    -
    -
    - @if (get('start') > 0) - - @endif -
    -
    - @if (get('start') > 0) - - @endif -
    -
    {{$current}} / {{$pages}}
    -
    - @if (get('start') + ((get('step')) ? get('step') : 30) < $total) - - @endif -
    -
    - @if (get('start') + ((get('step')) ? get('step') : 30) < $total) - - @endif -
    -
    -
    -
    -@endsection - -@push('scripts') - -@endpush diff --git a/app_old/resources/views/ventas/pies/cuotas/add.blade.php b/app_old/resources/views/ventas/pies/cuotas/add.blade.php deleted file mode 100644 index 079543e..0000000 --- a/app_old/resources/views/ventas/pies/cuotas/add.blade.php +++ /dev/null @@ -1,123 +0,0 @@ -@extends('layout.base') @section('content') -
    -
    Agregar Cuotas - Departamento {{$pie->venta()->unidad()->descripcion}} - {{$pie->venta()->proyecto()->descripcion}}
    -
    - @if (count($pie->venta()->propietario()->ventas()) > 1) -
    -
    -
    - -
    -
    -
    -
    - @endif -
    - - - - - - - - - - - - - cuotas - count($pie->cuotas()); $ini = count($pie->cuotas()) + 1 ?> - @for ($n = 0; $n < $cant; $n ++) - - - - - - - - - - @endfor - -
    #FechaBancoIdentificadorValor [$]
    -
    - - -
    -     		-
    - - -
    -     		-
    - - -
    -     		-
    - - -
    -     		-
    - - -
    -
    - -
    -
    -
    -
    -
    -
    -@endsection - -@push('scripts') - - -@endpush diff --git a/app_old/resources/views/ventas/pies/cuotas/edit.blade.php b/app_old/resources/views/ventas/pies/cuotas/edit.blade.php deleted file mode 100644 index 1298777..0000000 --- a/app_old/resources/views/ventas/pies/cuotas/edit.blade.php +++ /dev/null @@ -1,69 +0,0 @@ -@extends('layout.base') @section('content') -
    -
    Editar Cuota - Departamento {{$cuota->pie()->venta()->unidad()->descripcion}} - {{$cuota->pie()->venta()->proyecto()->descripcion}}
    -
    -
    - fecha, config('app.timezone')); $t = \Carbon\Carbon::today(config('app.timezone')) ?> -
    -
    #
    -
    -
    -
    -
    Fecha
    -
    -
    -
    -
    -
    -
    Banco
    -
    -
    -
    -
    Identificador
    -
    -
    -
    -
    Valor [$]
    -
    -
    -
    -
    -
    -
    -
    -
    -@endsection - -@push('scripts') - -@endpush \ No newline at end of file diff --git a/app_old/resources/views/ventas/pies/cuotas/estado.blade.php b/app_old/resources/views/ventas/pies/cuotas/estado.blade.php deleted file mode 100644 index f480bfd..0000000 --- a/app_old/resources/views/ventas/pies/cuotas/estado.blade.php +++ /dev/null @@ -1,10 +0,0 @@ -@if ($cuota->pago()->estado()->tipo()->descripcion == 'abonado') -success -@elseif ($cuota->pago()->estado()->tipo()->descripcion == 'depositado') -warning -@elseif ($cuota->pago()->estado()->tipo()->descripcion == 'devuelto') -error -@elseif ($cuota->pago()->estado()->tipo()->descripcion == 'no pagado') -@else -danger -@endif \ No newline at end of file diff --git a/app_old/resources/views/ventas/pies/cuotas/pendientes.blade.php b/app_old/resources/views/ventas/pies/cuotas/pendientes.blade.php deleted file mode 100644 index ca4d150..0000000 --- a/app_old/resources/views/ventas/pies/cuotas/pendientes.blade.php +++ /dev/null @@ -1,139 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -
    Cuotas Pendientes
    -
    -
    -
    Total
    -
    {{count($cuotas)}}
    -
    $ {{format('pesos', $sum)}}
    -
    -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - @foreach ($cuotas as $cuota) - pago()->fecha, config('app.timezone')); - if ($f->dayOfWeek == \Carbon\Carbon::SATURDAY or $f->dayOfWeek == \Carbon\Carbon::SUNDAY) { - $f->next(\Carbon\Carbon::MONDAY); - } - ?> - - - - - - - - - - - - - - - - @endforeach - -
    ProyectoDepartamento$DíaCuota
    PropietarioBancoFecha ChequeDepositar
    {{$cuota->pie()->venta()->proyecto()->descripcion}}{{$cuota->pie()->venta()->unidad()->descripcion}}$ {{format('pesos', $cuota->pago()->valor)}}{{format('localDate', $f, 'EEEE dd')}}{{str_pad($cuota->numero, 2, '0', STR_PAD_LEFT)}} - {{str_pad($cuota->pie()->cuotas, 2, '0', STR_PAD_LEFT)}}
    {{$cuota->pie()->venta()->propietario()->nombreCompleto()}}@if ($cuota->pago()->banco()) {{$cuota->pago()->banco()->nombre}} @endif{{format('shortDate', $cuota->pago()->fecha)}} - - - - ✓
    -
    -
    -@endsection - -@push('scripts') - -@endpush diff --git a/app_old/resources/views/ventas/pies/cuotas/show.blade.php b/app_old/resources/views/ventas/pies/cuotas/show.blade.php deleted file mode 100644 index b540714..0000000 --- a/app_old/resources/views/ventas/pies/cuotas/show.blade.php +++ /dev/null @@ -1,64 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -
    Cuota - {{$cuota->pie()->venta()->unidad()->descripcion}} - {{$cuota->pie()->venta()->proyecto()->descripcion}}
    -
    -
    -
    -
    -
    Número
    -
    {{$cuota->numero()}}
    -
    -
    -
    Fecha
    -
    {{format('shortDate', $cuota->pago()->fecha)}}
    -
    -
    -
    Identificador
    -
    {{$cuota->pago()->identificador}}
    -
    -
    -
    Banco
    -
    {{($cuota->pago()->banco != 0) ? $cuota->pago()->banco()->nombre : ''}}
    -
    -
    -
    Valor
    -
    $ {{format('pesos', $cuota->pago()->valor())}}
    -
    {{format('ufs', $cuota->pago()->valor('ufs'))}} UF
    -
    -
    -
    Historial
    -
    - - - - - - - - -@foreach ($cuota->pago()->estados() as $estado) - - - - -@endforeach - -
    FechaEstado
    {{format('shortDate', $estado->fecha)}}{{ucwords($estado->tipo()->descripcion)}}
    -@endsection \ No newline at end of file diff --git a/app_old/resources/views/ventas/pies/edit.blade.php b/app_old/resources/views/ventas/pies/edit.blade.php deleted file mode 100644 index 1406a4b..0000000 --- a/app_old/resources/views/ventas/pies/edit.blade.php +++ /dev/null @@ -1,23 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -
    Editar Pie - {{$venta->unidad()->descripcion}} - {{$venta->proyecto()->descripcion}}
    -
    -
    -
    -
    Monto
    -
    -
    UF
    -
    -
    -
    Cuotas
    -
    -
    -
    -
    -
    -
    -
    -
    -@endsection \ No newline at end of file diff --git a/app_old/resources/views/ventas/pies/reajustar.blade.php b/app_old/resources/views/ventas/pies/reajustar.blade.php deleted file mode 100644 index 95b952c..0000000 --- a/app_old/resources/views/ventas/pies/reajustar.blade.php +++ /dev/null @@ -1,48 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -
    Reajustar - {{$venta->unidad()->descripcion}} - {{$venta->proyecto()->descripcion}}
    -
    -
    -
    -
    Pie Pagado
    -
    $ {{format('pesos', $venta->pie()->valorPagado('pesos'))}}
    -
    {{format('ufs', $venta->pie()->valorPagado())}} UF
    -
    -
    -
    Reajuste
    -
    $
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -@endsection \ No newline at end of file diff --git a/app_old/resources/views/ventas/pies/reajustes/abonar.blade.php b/app_old/resources/views/ventas/pies/reajustes/abonar.blade.php deleted file mode 100644 index 62c987a..0000000 --- a/app_old/resources/views/ventas/pies/reajustes/abonar.blade.php +++ /dev/null @@ -1,25 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Abonar Reajuste - {{$venta->unidad()->descripcion}} - {{$venta->proyecto()->descripcion}}

    -
    -
    -
    -
    -
    Fecha Pago
    -
    {{format('shortDate', $venta->pie()->reajuste()->estado()->fecha)}}
    -
    -
    -
    Fecha
    - pie()->reajuste()->estado()->fecha, config('app.timezone')) ?> - @include('form.fecha') -
    -
    -
    Valor Abonado [$]
    -
    -
    -
    -
    -
    -@endsection \ No newline at end of file diff --git a/app_old/resources/views/ventas/pies/reajustes/edit.blade.php b/app_old/resources/views/ventas/pies/reajustes/edit.blade.php deleted file mode 100644 index 035da6c..0000000 --- a/app_old/resources/views/ventas/pies/reajustes/edit.blade.php +++ /dev/null @@ -1,53 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -
    Editar Reajuste - {{$venta->unidad()->descripcion}} - {{$venta->proyecto()->descripcion}}
    -
    - -
    -
    Valor [$]
    -
    -
    -
    -
    (Valor [UF])
    -
    -
    -
    -
    Fecha
    - pie()->reajuste()->fecha, config('app.timezone')) ?> -
    -
    -
    -
    -
    -
    -
    - -
    -
    -@endsection \ No newline at end of file diff --git a/app_old/resources/views/ventas/pies/reajustes/pagar.blade.php b/app_old/resources/views/ventas/pies/reajustes/pagar.blade.php deleted file mode 100644 index 5bd5e28..0000000 --- a/app_old/resources/views/ventas/pies/reajustes/pagar.blade.php +++ /dev/null @@ -1,24 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Pagar Reajuste - {{$venta->unidad()->descripcion}} - {{$venta->proyecto()->descripcion}}

    -
    -
    -
    -
    -
    Fecha Pago
    -
    {{format('shortDate', $venta->pie()->reajuste()->fecha)}}
    -
    -
    -
    Fecha
    - @include('form.fecha') -
    -
    -
    Valor Pagado [$]
    -
    -
    -
    -
    -
    -@endsection \ No newline at end of file diff --git a/app_old/resources/views/ventas/pies/resumen.blade.php b/app_old/resources/views/ventas/pies/resumen.blade.php deleted file mode 100644 index 2ebf3a4..0000000 --- a/app_old/resources/views/ventas/pies/resumen.blade.php +++ /dev/null @@ -1,276 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -
    -

    - {{$venta->unidad()->descripcion}} - {{$venta->unidad()->proyecto()->descripcion}} - @if ($venta->pie()->asociados() != null) -
    - @foreach ($venta->pie()->asociados() as $asociado) - {{$asociado->venta()->unidad()->descripcion}} - @endforeach - @elseif ($venta->pie()->asociado() != null) -
    - {{$venta->pie()->asociado()->venta()->unidad()->descripcion}} - @foreach ($venta->pie()->asociado()->asociados() as $asociado) - @if ($asociado->venta()->id == $venta->id) - @continue - @endif - {{$asociado->venta()->unidad()->descripcion}} - @endforeach - @endif -

    -
    -
    - - - - - - - - - - - - - - - - -
    PIE
    Fecha{{\App\Helper\Format::shortDate($venta->pie()->fecha)}}Valor{{\App\Helper\Format::ufs($venta->pie()->valor)}} UF$ {{\App\Helper\Format::pesos($venta->pie()->valorPesos())}}Cuotas({{count($venta->pie()->abonadas())}}) {{count($venta->pie()->pagadas())}} / {{$venta->pie()->cuotas}} -
    - - - - - - - - - - - - - - - 0, - 'pagado_uf' => 0, - 'por_pagar' => 0, - 'por_pagar_uf' => 0, - 'cuotas' => 0, - 'cuotas_uf' => 0, - 'dif' => 0, - 'dif_uf' => 0 - ]; - $t = \Carbon\Carbon::today(config('app.timezone')); - ?> - @foreach ($venta->pie()->cuotas() as $cuota) - - - - - - - - - - - @endforeach - dif = $venta->pie()->valorPesos() - $total->cuotas; - $total->dif_uf = $venta->pie()->valor - $total->cuotas_uf; - - $valores = (object) [ - 'titulo' => 'Total Pagado', - 'pesos' => $total->pagado, - 'ufs' => $total->pagado_uf - ]; - ?> - @include('ventas.pies.totales', compact('valores')) - titulo = 'Por Pagar'; - $valores->pesos = $total->por_pagar; - $valores->ufs = $total->por_pagar_uf; - ?> - @include('ventas.pies.totales', compact('valores')) - titulo = 'Total Cuotas'; - $valores->pesos = $total->cuotas; - $valores->ufs = $total->cuotas_uf; - ?> - @include('ventas.pies.totales', compact('valores')) - titulo = 'Diferencia c/Pie'; - $valores->pesos = $total->dif; - $valores->ufs = $total->dif_uf; - ?> - @include('ventas.pies.totales', compact('valores')) - -
    #FechaBancoIdentificadorValorUF -
    -
    Fecha
    -
    -
    Deposito
    -
    Abono
    -
    -
    -     		- Depositar
    - Abonar -
    - {{++$cnt}} - {{\App\Helper\Format::shortDate($cuota->pago()->fecha)}}{{($cuota->pago()->banco()) ? $cuota->pago()->banco()->nombre : ''}} - @if ($cuota->pago()->identificador == '') - - @else - {{$cuota->pago()->identificador}} - @endif - $ {{\App\Helper\Format::pesos($cuota->valor())}}{{\App\Helper\Format::ufs($cuota->valor('ufs'))}} UF - {{\App\Helper\Format::shortDate($cuota->pago()->estado()->fecha)}} - - - @if ($cuota->pago()->estado()->estado == 0 or $cuota->pago()->estado()->estado == -1) - por_pagar += $cuota->valor(); - $total->por_pagar_uf += $cuota->valor('ufs'); - ?> -
    -
    -
    -
    -
    -
    -
    -
    - @elseif ($cuota->pago()->estado()->estado == 1) - pagado += $cuota->pago()->valor; - $total->pagado_uf += $cuota->pago()->valor('ufs'); - ?> -
    -
    - pago()->estado()->fecha, config('app.timezone')) ?> -
    -
    -
    -
    -
    - -
    -
    -
    - @else - pagado += $cuota->pago()->valor; - $total->pagado_uf += $cuota->pago()->valor('ufs'); - ?> - @endif - cuotas += $cuota->pago()->valor; - $total->cuotas_uf += $cuota->pago()->valor('ufs'); - ?> -     		-
    - Exportar -
    -
    -@endsection - -@push('scripts') - -@endpush diff --git a/app_old/resources/views/ventas/pies/totales.blade.php b/app_old/resources/views/ventas/pies/totales.blade.php deleted file mode 100644 index 83d1d1f..0000000 --- a/app_old/resources/views/ventas/pies/totales.blade.php +++ /dev/null @@ -1,15 +0,0 @@ -titulo == 'Diferencia c/Pie') - @if ($valores->ufs > 0) - class="danger" - @else - class="success" - @endif -@endif > - - {{$valores->titulo}} - $ {{format('pesos', $valores->pesos)}} - {{format('ufs', $valores->ufs)}} UF - {{format('percent', $valores->ufs / $venta->valor_uf * 100)}} % - - \ No newline at end of file diff --git a/app_old/resources/views/ventas/postventas/add.blade.php b/app_old/resources/views/ventas/postventas/add.blade.php deleted file mode 100644 index 23e1215..0000000 --- a/app_old/resources/views/ventas/postventas/add.blade.php +++ /dev/null @@ -1,71 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Agregar Postventa

    -
    -
    -
    -
    -
    Fecha
    - @include('form.fecha') -
    - -
    -
    Observaciones
    -
    -
    -
    -
    -
    -
    -@endsection - -@push('scripts') - -@endpush \ No newline at end of file diff --git a/app_old/resources/views/ventas/postventas/show.blade.php b/app_old/resources/views/ventas/postventas/show.blade.php deleted file mode 100644 index 7d02816..0000000 --- a/app_old/resources/views/ventas/postventas/show.blade.php +++ /dev/null @@ -1,26 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Postventa - {{$venta->unidad()->descripcion}} - {{$venta->proyecto()->descripcion}}

    -
    -
    -
    -
    Estado
    -
    {{ucwords($postventa->estado()->tipo()->descripcion)}}
    -
    {{format('shortDate', $postventa->estado()->fecha)}}
    -
    -
    -
    -
    Observaciones
    -
    [{{count($postventa->observacionesPendientes())}} / {{count($postventa->observaciones())}}]
    -
    -@foreach ($postventa->observaciones() as $observacion) -
    -
    {{$observacion->texto}}
    -
    {{ucwords($observacion->estado()->tipo()->descripcion)}}
    -
    {{format('shortDate', $observacion->estado()->fecha)}}
    -
    -
    -@endforeach -@endsection \ No newline at end of file diff --git a/app_old/resources/views/ventas/precios/add.blade.php b/app_old/resources/views/ventas/precios/add.blade.php deleted file mode 100644 index 17c7c69..0000000 --- a/app_old/resources/views/ventas/precios/add.blade.php +++ /dev/null @@ -1,130 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Agregar Precios - {{$proyecto->descripcion}}

    -
    -
    -
    -
    -
    Fecha
    - @include('form.fecha') -
    - - - - - - - - - - - - - - - - - - @foreach ($proyecto->proyectoTipoUnidades() as $tipo) - - - - - - - - - - - - - - - @endforeach - -
    TipoNombreAbreviaciónLíneasm² Vendible#Precio
    AnteriorNuevo
    {{ucwords($tipo->tipo()->descripcion)}}{{$tipo->nombre}}{{$tipo->abreviacion}}{{$tipo->lineas()}}{{$tipo->m2()}}{{count($tipo->unidades())}}{{format('ufs', $tipo->precio(), true)}}
    - - - - - - - - - - - - - - - - - - @foreach ($tipo->unidades() as $unidad) - @if ($subtipo != $unidad->subtipo) - subtipo; ?> - - - - - - @endif - - - - - - - - - @endforeach - -
    DescripciónPisoLíneaOrientaciónPrecio
    AnteriorNuevo
    Línea {{$subtipo}}{{format('ufs', $tipo->precioSubtipo($subtipo), true)}}
    {{$unidad->descripcion}}{{$unidad->piso}}{{$unidad->subtipo}}{{$unidad->orientacion}} - @if ($unidad->precio()) - {{format('ufs', $unidad->precio()->valor, true)}} - @else - -- - @endif -
    -
    -
    -
    -
    -
    -@endsection - -@push('scripts') - -@endpush diff --git a/app_old/resources/views/ventas/precios/import.blade.php b/app_old/resources/views/ventas/precios/import.blade.php deleted file mode 100644 index bfe7242..0000000 --- a/app_old/resources/views/ventas/precios/import.blade.php +++ /dev/null @@ -1,37 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Importar Precios

    -
    -
    -
    -
    -
    Proyecto
    -
    -
    -
    -
    Fecha
    - @include('form.fecha') -
    -
    -
    Archivo CSV *
    -
    -
    -
    -

    - (*) Columnas: tipo [departamento, estacionamiento, bodega], numeracion, valor -
    - Muestra -

    -
    -
    -
    -
    -
    -@endsection diff --git a/app_old/resources/views/ventas/precios/list.blade.php b/app_old/resources/views/ventas/precios/list.blade.php deleted file mode 100644 index e2f27a1..0000000 --- a/app_old/resources/views/ventas/precios/list.blade.php +++ /dev/null @@ -1,134 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    -
    -
    - Precios - {{$proyecto->descripcion}} -
    -
    -
    -

    -
    -
    - - - - - - - - - - - - - - - @foreach ($proyecto->ProyectoTipoUnidades() as $tipo) - - - - - - - - - - - - - - - @endforeach - -
    TipoNombreTipologíaLíneasm² Vendibles#Precio PromedioUF/m²
    {{ucwords($tipo->tipo()->descripcion)}}{{$tipo->nombre}} - @if ($tipo->tipologia()) - {{$tipo->tipologia()->descripcion}} - @else - {{$tipo->abreviacion}} - @endif - {{$tipo->lineas()}}{{$tipo->m2()}}{{count($tipo->unidades())}}{{format('ufs', $tipo->precio(), true)}} - @if ($tipo->m2() > 0) - {{format('ufs', $tipo->precio() / $tipo->m2(), true)}}/m² - @else - - - @endif -
    - - - - - - - - - - - - @foreach ($tipo->unidades() as $unidad) - @if ($subtipo != $unidad->subtipo) - subtipo; ?> - - - - - - - @endif - - - @if ($unidad->precio()) - - - - @else - - @endif - - @endforeach - -
    UnidadDesdePrecioUF/m²
    Línea {{$subtipo}}{{format('ufs', $tipo->precioSubtipo($subtipo), null, true)}}{{format('ufs', $tipo->precioSubtipo($subtipo) / $tipo->m2(), null, true)}}/m²
    {{$unidad->descripcion}}{{format('shortDate', $unidad->precio()->estado()->fecha)}}{{format('ufs', $unidad->precio()->valor, null, true)}} - @if ($unidad->m2('vendible') > 0) - {{format('ufs', $unidad->precio()->valor / $unidad->m2('vendible'), null, true)}}/m² - @else - - - @endif - --
    -
    -@endsection - -@push('scripts') - -@endpush diff --git a/app_old/resources/views/ventas/precios/proyectos.blade.php b/app_old/resources/views/ventas/precios/proyectos.blade.php deleted file mode 100644 index 095b5b6..0000000 --- a/app_old/resources/views/ventas/precios/proyectos.blade.php +++ /dev/null @@ -1,14 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Precios

    -
    - - @foreach ($proyectos as $proyecto) - - - @endforeach -
    {{$proyecto->descripcion}} -
    -@endsection diff --git a/app_old/resources/views/ventas/propietarios/edit.blade.php b/app_old/resources/views/ventas/propietarios/edit.blade.php deleted file mode 100644 index b8edef8..0000000 --- a/app_old/resources/views/ventas/propietarios/edit.blade.php +++ /dev/null @@ -1,246 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Editar Propietario

    -
    -
    -
    -
    -
    RUT
    -
    -
    -
    -
    -
    Nombre
    -
    -
    -
    -
    -@if ($propietario->direccion != 0) -
    -
    Dirección
    -
    -
    -
    -
    -
    -
    -
    -
    -@else -
    -
    Dirección
    -
    -
    -
    -
    -
    -
    -
    -
    -@endif -
    -
    -
    -
    -@endsection - -@push('scripts') - -@endpush \ No newline at end of file diff --git a/app_old/resources/views/ventas/proyectos.blade.php b/app_old/resources/views/ventas/proyectos.blade.php deleted file mode 100644 index 043fc60..0000000 --- a/app_old/resources/views/ventas/proyectos.blade.php +++ /dev/null @@ -1,18 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Ventas de Proyectos

    -
    -
    -
    - - @foreach ($proyectos as $proyecto) - - - - @endforeach -
    {{$proyecto->descripcion}}
    -
    -
    -@endsection \ No newline at end of file diff --git a/app_old/resources/views/ventas/resciliaciones.blade.php b/app_old/resources/views/ventas/resciliaciones.blade.php deleted file mode 100644 index fd87e03..0000000 --- a/app_old/resources/views/ventas/resciliaciones.blade.php +++ /dev/null @@ -1,38 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -
    Resciliaciones [{{count($resciliaciones)}}]
    -
    -
    - - - - - - - - - - - - - - -@foreach ($resciliaciones as $resciliacion) - - - - - - - - - - - -@endforeach - -
    ProyectoDepartamentoFecha PromesaFecha ResciliaciónUF/m²Anticipo [UF]Anticipo [$] - Devolución [UF]Devolución [$]
    {{$resciliacion->proyecto()->descripcion}}{{$resciliacion->unidad()->descripcion}}{{format('shortDate', $resciliacion->fecha)}}{{(($resciliacion->resciliacion) ? format('shortDate', $resciliacion->resciliacion()->estado()->fecha) : '')}}{{format('ufs', $resciliacion->uf_m2())}}{{format('ufs', $resciliacion->anticipo())}}{{format('pesos', $resciliacion->anticipo('pesos'))}}{{(($resciliacion->resciliacion) ? format('ufs', $resciliacion->resciliacion()->valor('ufs')) : '')}}{{(($resciliacion->resciliacion) ? format('pesos', $resciliacion->resciliacion()->valor('pesos')) : '')}}
    -@endsection \ No newline at end of file diff --git a/app_old/resources/views/ventas/show.blade.php b/app_old/resources/views/ventas/show.blade.php deleted file mode 100644 index 7ca6a0e..0000000 --- a/app_old/resources/views/ventas/show.blade.php +++ /dev/null @@ -1,287 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -
    Venta - {{$venta->unidad()->descripcion}} - {{$venta->proyecto()->descripcion}}
    -
    -
    - - - - - - - - - - - -
    PROYECTO
    {{$venta->proyecto()->descripcion}}
    - - - - - - - - - - - - - - - -
    PROPIETARIO -
    {{\App\Helper\Format::number($venta->propietario()->rut, 0)}}-{{$venta->propietario()->dv}}{{($venta->propietario()->direccion()) ? $venta->propietario()->direccion()->completa() : ''}}
    - propietario()->nombreCompleto() . '"')])}}"> - {{$venta->propietario()->nombreCompleto()}} - - {{($venta->propietario()->direccion()) ? $venta->propietario()->direccion()->comuna()->descripcion : ''}} -
    -
    - @if ($venta->estado()->tipo()->activa()) -
    - Desistir -
    -
    - Ceder -
    - @else -
    - @if (!$venta->estado()->tipo()->activa() and $venta->estado()->tipo()->descripcion == 'desistida') - Desistida - @if ($venta->resciliacion != null) - ($ {{format('pesos', $venta->resciliacion()->valor)}}) - @endif - @elseif (!$venta->estado()->tipo()->activa() and $venta->estado()->tipo()->descripcion == 'cedida') - Cedida - @endif -
    - @endif -
    - - - - - - - - - - - - - - - - - - - - - - - - - @foreach ($venta->propiedad()->unidades() as $unidad) - @if ($unidad->unidad()->id == $venta->unidad()->id) - @continue - @endif - - - - - - - - - - @endforeach - - - - - - - -
    PROPIEDAD
    UnidadPisoMetros VendiblesValor BaseUF/m²Orientación
    {{ucwords($venta->unidad()->tipo()->descripcion)}} {{$venta->unidad()->tipologia()->tipologia()->descripcion}}{{$venta->unidad()->descripcion}}{{$venta->unidad()->piso}}{{\App\Helper\Format::number($venta->unidad()->m2(), 2)}} m² - @if ($venta->unidad()->precio($venta->fecha())) - {{format('ufs', $venta->unidad()->precio($venta->fecha())->valor)}} UF - @else - {{format('ufs', $venta->unidad()->valor)}} UF - @endif - - @if ($venta->unidad()->precio($venta->fecha())) - {{format('ufs', $venta->unidad()->precio($venta->fecha())->valor / $venta->unidad()->m2(), null, true)}}/m² - @else - {{format('ufs', $venta->unidad()->valor / $venta->unidad()->m2(), null, true)}}/m² - @endif - {{$venta->unidad()->orientacion}}
    - {{ucwords($unidad->unidad()->tipo()->descripcion)}} - @if ($unidad->unidad()->tipo()->descripcion == 'departamento') - {{$unidad->unidad()->tipologia()->tipologia()->descripcion}} - @endif - {{$unidad->unidad()->descripcion}}{{$unidad->unidad()->piso}} - @if ($unidad->unidad()->tipo()->descripcion == 'departamento') - {{\App\Helper\Format::number($unidad->unidad()->m2(), 2)}} m² - @endif - - @if ($unidad->unidad()->precio($venta->fecha())) - {{format('ufs', $unidad->unidad()->precio($venta->fecha())->valor, null, true)}} - @else - {{format('ufs', $unidad->unidad()->valor, null, true)}} - @endif - - @if ($unidad->unidad()->tipo()->descripcion == 'departamento') - @if ($unidad->unidad()->precio($venta->fecha())) - {{format('ufs', $unidad->unidad()->precio($venta->fecha())->valor / $unidad->unidad()->m2(), null, true)}}/m² - @else - {{format('ufs', $unidad->unidad()->valor / $unidad->unidad()->m2(), null, true)}}/m² - @endif - @endif - - @if ($unidad->unidad()->tipo()->descripcion == 'departamento') - {{$unidad->unidad()->orientacion}} - @endif -
    Total - - {{format('ufs', $venta->valorUnidades(), null, true)}} - - - - {{format('ufs', $venta->valorDepartamentos() / $venta->superficie(), null, true)}}/m² - -
    - - - - - - - - - - - - - - - - - - - - - - @if (count($venta->promociones()) > 0) - @foreach ($venta->promociones() as $promo) - - - - - - @endforeach - @endif - -
    VENTA
    Valor TotalValor UtilUF/m²OperadorFecha Promesa
    Fecha Ingreso
    {{format('ufs', $venta->valor_uf)}} UF{{format('ufs', $venta->valorFinal())}} UF{{format('ufs', $venta->uf_m2(), null, true)}}/m²{{format('ufs', $venta->valorComision())}} UF ({{\App\Helper\Format::number($venta->comision() * 100, 2)}}%) - @if ($venta->agente != 0) -
    - {{$venta->agente()->agente()->agente()->descripcion}} - @endif -     		{{format('shortDate', $venta->fecha)}}
    {{format('shortDate', $venta->fecha_ingreso)}}
    {{$promo->promocion()->descripcion}}{{format('ufs', $promo->valor, null, true)}}
    -@include('ventas.forma_pago') - - - - - - - - - - - -
    ESCRITURA
    - @if ($venta->escriturado == 0) - Escriturar - @elseif ($venta->estado()->tipo()->activa()) - Escriturado {{format('shortDate', $venta->estado('escriturando')->fecha)}} Informe - @if ($venta->estado()->tipo()->descripcion == 'escriturando') -
    Firmar - @elseif ($venta->estado()->tipo()->descripcion == 'firmado por inmobiliaria') -
    Firmado {{format('shortDate', $venta->estado('firmado por inmobiliaria')->fecha)}} -
    Archivar - @elseif ($venta->estado()->tipo()->descripcion == 'archivado') -
    Archivado {{format('shortDate', $venta->estado('archivado')->fecha)}} - @endif - @if ($venta->saldo() / $venta->valor_uf > 0.01) -
    Devolver: $ {{format('pesos', $venta->saldo('pesos'))}} ({{format('ufs', $venta->saldo())}} UF) - @endif - @endif -
    - - - - - - - - - - - -
    - @if ($venta->entregado == 0) - ENTREGA - @else - ENTREGADO - @endif -
    - @if ($venta->entregado == 0) - No - @else - Agregar observaciones de entrega. - @endif -
    -@if ($venta->entregado != 0) - - - - - - - - - - @if ($venta->postventas() != null) - @foreach ($venta->postventas() as $postventa) - - - - @endforeach - @endif - -
    POSTVENTA
    -
    ({{format('shortDate', $postventa->estado()->fecha)}}) [{{count($postventa->observacionesPendientes())}} / {{count($postventa->observaciones())}}]
    -@endif - - - - - - - - @foreach ($venta->comentarios() as $comentario) - @if ($comentario->estado == 1) - - - - - - @endif - @endforeach - -
    COMENTARIOS -
    {{format('shortDate', $comentario->fecha)}}{{$comentario->texto}}
    -@endsection diff --git a/app_old/resources/views/ventas/sort_title.blade.php b/app_old/resources/views/ventas/sort_title.blade.php deleted file mode 100644 index b7ea11c..0000000 --- a/app_old/resources/views/ventas/sort_title.blade.php +++ /dev/null @@ -1,24 +0,0 @@ - 'ventas', 'a' => 'list', 'proyecto' => $proyecto->id, 'sort' => $name]; -if (get('sort') == $name or (get('sort') == null and $name == 'departamento')) { - if (get('sort_dir')) { - $url_base['sort_dir'] = get('sort_dir'); - } else { - $url_base['sort_dir'] = 1; - } - $url_base['sort_dir'] *= -1; -} -?> - - {{$title}} - @if (get('sort') == $name or (get('sort') == null and $name == 'departamento')) - @if (get('sort_dir') == 1 or get('sort_dir') == null) - - @else - - - - @endif - @endif - diff --git a/app_old/resources/views/ventas/subsidios/abonar.blade.php b/app_old/resources/views/ventas/subsidios/abonar.blade.php deleted file mode 100644 index 242095e..0000000 --- a/app_old/resources/views/ventas/subsidios/abonar.blade.php +++ /dev/null @@ -1,23 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Abonar Subsidio - {{$venta->proyecto()->descripcion}} - {{$venta->unidad()->descripcion}} - {{ucwords(get('tipo'))}}

    -
    -
    -
    - -
    -
    Fecha
    - fecha, config('app.timezone')); ?> - @include('form.fecha') -
    -
    -
    Valor
    -
    -
    -
    -
    -
    -
    -@endsection diff --git a/app_old/resources/views/ventas/subsidios/add.blade.php b/app_old/resources/views/ventas/subsidios/add.blade.php deleted file mode 100644 index 97c68a0..0000000 --- a/app_old/resources/views/ventas/subsidios/add.blade.php +++ /dev/null @@ -1,32 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Agregar Subsidio - {{$venta->proyecto()->descripcion}} - {{$venta->unidad()->descripcion}}

    -
    -
    -
    -
    -
    Fecha
    - fecha, config('app.timezone')); ?> - @include('form.fecha') -
    -
    -
    $
    -
    UF
    -
    -
    -
    Subsidio
    -
    -
    -
    -
    -
    Ahorro
    -
    -
    -
    -
    -
    -
    -
    -@endsection diff --git a/app_old/resources/views/ventas/subsidios/edit.blade.php b/app_old/resources/views/ventas/subsidios/edit.blade.php deleted file mode 100644 index 62e2e85..0000000 --- a/app_old/resources/views/ventas/subsidios/edit.blade.php +++ /dev/null @@ -1,32 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Subsidio - {{$venta->proyecto()->descripcion}} - {{$venta->unidad()->descripcion}}

    -
    -
    -
    -
    -
    Fecha
    - subsidio()->pago()->fecha, config('app.timezone')); ?> - @include('form.fecha') -
    -
    -
    $
    -
    UF
    -
    -
    -
    Subsidio
    -
    -
    -
    -
    -
    Ahorro
    -
    -
    -
    -
    -
    -
    -
    -@endsection diff --git a/app_old/resources/views/ventas/subsidios/pagar.blade.php b/app_old/resources/views/ventas/subsidios/pagar.blade.php deleted file mode 100644 index 49528da..0000000 --- a/app_old/resources/views/ventas/subsidios/pagar.blade.php +++ /dev/null @@ -1,23 +0,0 @@ -@extends('layout.base') - -@section('content') -
    -

    Pagar Subsidio - {{$venta->proyecto()->descripcion}} - {{$venta->unidad()->descripcion}} - {{ucwords(get('tipo'))}}

    -
    -
    -
    - -
    -
    Fecha
    - fecha, config('app.timezone')); ?> - @include('form.fecha') -
    -
    -
    Valor
    -
    -
    -
    -
    -
    -
    -@endsection diff --git a/app_old/setup/api/config.php b/app_old/setup/api/config.php deleted file mode 100644 index d32fc72..0000000 --- a/app_old/setup/api/config.php +++ /dev/null @@ -1,14 +0,0 @@ - DI\decorate(function($prev, Container $c) { - return $prev . '/api'; - }), - 'locations' => DI\decorate(function($prev, Container $c) { - $arr = (array) $prev; - $arr['cache'] = $prev->base . '/cache'; - $arr['views'] = $prev->resources . '/views'; - return (object) $arr; - }) -]; diff --git a/app_old/setup/api/setups.php b/app_old/setup/api/setups.php deleted file mode 100644 index 0bf6f5d..0000000 --- a/app_old/setup/api/setups.php +++ /dev/null @@ -1,15 +0,0 @@ - function(Container $c) { - return new Slim\Views\Blade( - $c->get('locations')->views, - $c->get('locations')->cache, - null, - [ - 'locations' => $c->get('locations') - ] - ); - } -]; diff --git a/app_old/setup/app.php b/app_old/setup/app.php deleted file mode 100644 index f386aef..0000000 --- a/app_old/setup/app.php +++ /dev/null @@ -1,61 +0,0 @@ -addDefinitions(['environment' => $__environment]); - } - $folders = [ - 'settings', - 'setups' - ]; - foreach ($folders as $f) { - $folder = implode(DIRECTORY_SEPARATOR, [ - __DIR__, - $f - ]); - if (!file_exists($folder)) { - continue; - } - $files = new DirectoryIterator($folder); - foreach ($files as $file) { - if ($file->isDir() or $file->getExtension() != 'php') { - continue; - } - $builder->addDefinitions($file->getRealPath()); - } - } - - $container = $builder->build(); - $app = Bridge::create($container); - if ($app->getContainer()->has('base_url') and $app->getContainer()->get('base_url') != '') { - $app->setBasePath($app->getContainer()->get('base_url')); - } - $app->addRoutingMiddleware(); - - foreach ($folders as $folder) { - $filename = implode(DIRECTORY_SEPARATOR, [ - __DIR__, - $folder, - 'middleware.php' - ]); - if (!file_exists($filename)) { - continue; - } - include_once $filename; - } - - $app->addErrorMiddleware(true, true, true); - - include_once 'database.php'; - - include_once 'router.php'; - - return $app; -} - -return buildApp($__environment); diff --git a/app_old/setup/common/config.php b/app_old/setup/common/config.php deleted file mode 100644 index b16515e..0000000 --- a/app_old/setup/common/config.php +++ /dev/null @@ -1,40 +0,0 @@ - 'America/Santiago', - 'locale' => 'es', - 'database' => 'mysql', - 'login_hours' => 5*24, - 'cierres' => [ - 'caducidad' => 30 - ], - 'databases' => function() { - $arr = [ - 'mysql' => [ - 'host' => $_ENV['MYSQL_HOST'], - //'port' => 3306, - 'database' => $_ENV['MYSQL_DATABASE'], - 'username' => $_ENV['MYSQL_USER'], - 'password' => $_ENV['MYSQL_PASSWORD'] - ], - 'mysql_copy' => [ - 'host' => 'localhost', - 'database' => 'incoviba3', - 'username' => 'incoviba', - 'password' => '5GQYFvRjVw2A4KcD' - ] - ]; - return $arr; - }, - 'locations' => function() { - $arr = ['base' => dirname(__DIR__, 2)]; - $arr['public'] = $arr['base'] . '/public'; - $arr['resources'] = $arr['base'] . '/resources'; - $arr['routes'] = $arr['resources'] . '/routes'; - $arr['src'] = $arr['base'] . '/src'; - $arr['app'] = $arr['base'] . '/app'; - $arr['controllers'] = $arr['app'] . '/Controller'; - $arr['money'] = 'http://provm.cl/optimus/money'; - $arr['api'] = 'http://localhost:8080/api'; - return (object) $arr; - } -]; diff --git a/app_old/setup/composer.php b/app_old/setup/composer.php deleted file mode 100644 index 2d27ee1..0000000 --- a/app_old/setup/composer.php +++ /dev/null @@ -1,6 +0,0 @@ -getContainer()->get('databases'); - -load($databases['mysql']); - -foreach ($databases as $name => $data) { - load($data, $name); -} - -function load($data, $name = '') { - if (!isset($data['port'])) { - $port = 3306; - } else { - $port = $data['port']; - } - $dsn = 'mysql:host=' . $data['host'] . ';port=' . $port . ';dbname=' . $data['database'] . ';charset=utf8'; - - if ($name != '') { - ORM::configure($dsn, null, $name); - ORM::configure('username', $data['username'], $name); - ORM::configure('password', $data['password'], $name); - } else { - ORM::configure($dsn, null); - ORM::configure('username', $data['username']); - ORM::configure('password', $data['password']); - } -} - -Model::$short_table_names = true; diff --git a/app_old/setup/env/config.php b/app_old/setup/env/config.php deleted file mode 100644 index 7c3c1c4..0000000 --- a/app_old/setup/env/config.php +++ /dev/null @@ -1,18 +0,0 @@ -isDir() or $file->getExtension() != 'env') { - continue; - } - $env = Dotenv::createImmutable($file->getPath(), $file->getBasename()); - $env->load(); -} - -return [ - 'debug' => $_ENV['DEBUG'] ?? false, - 'benchmark' => false, - 'base_url' => $_ENV['BASE_URL']//'/incoviba' -]; diff --git a/app_old/setup/router.php b/app_old/setup/router.php deleted file mode 100644 index 298b6b9..0000000 --- a/app_old/setup/router.php +++ /dev/null @@ -1,5 +0,0 @@ -getContainer()->get('locations')->routes, - $__environment . '.php' -]); diff --git a/app_old/setup/settings/01_env.php b/app_old/setup/settings/01_env.php deleted file mode 100644 index 6949ba9..0000000 --- a/app_old/setup/settings/01_env.php +++ /dev/null @@ -1,18 +0,0 @@ -isDir() or $file->getExtension() != 'env') { - continue; - } - $env = Dotenv::createImmutable($file->getPath(), $file->getBasename()); - $env->load(); -} - -return [ - 'debug' => $_ENV['DEBUG'] ?? false, - 'benchmark' => false, - 'base_url' => $_ENV['BASE_URL'] ?? '/incoviba' -]; diff --git a/app_old/setup/settings/02_common.php b/app_old/setup/settings/02_common.php deleted file mode 100644 index b16515e..0000000 --- a/app_old/setup/settings/02_common.php +++ /dev/null @@ -1,40 +0,0 @@ - 'America/Santiago', - 'locale' => 'es', - 'database' => 'mysql', - 'login_hours' => 5*24, - 'cierres' => [ - 'caducidad' => 30 - ], - 'databases' => function() { - $arr = [ - 'mysql' => [ - 'host' => $_ENV['MYSQL_HOST'], - //'port' => 3306, - 'database' => $_ENV['MYSQL_DATABASE'], - 'username' => $_ENV['MYSQL_USER'], - 'password' => $_ENV['MYSQL_PASSWORD'] - ], - 'mysql_copy' => [ - 'host' => 'localhost', - 'database' => 'incoviba3', - 'username' => 'incoviba', - 'password' => '5GQYFvRjVw2A4KcD' - ] - ]; - return $arr; - }, - 'locations' => function() { - $arr = ['base' => dirname(__DIR__, 2)]; - $arr['public'] = $arr['base'] . '/public'; - $arr['resources'] = $arr['base'] . '/resources'; - $arr['routes'] = $arr['resources'] . '/routes'; - $arr['src'] = $arr['base'] . '/src'; - $arr['app'] = $arr['base'] . '/app'; - $arr['controllers'] = $arr['app'] . '/Controller'; - $arr['money'] = 'http://provm.cl/optimus/money'; - $arr['api'] = 'http://localhost:8080/api'; - return (object) $arr; - } -]; diff --git a/app_old/setup/settings/03_api.php b/app_old/setup/settings/03_api.php deleted file mode 100644 index 7e1bc5b..0000000 --- a/app_old/setup/settings/03_api.php +++ /dev/null @@ -1,8 +0,0 @@ - DI\decorate(function($prev, Container $c) { - return $prev . '/api'; - }) -]; diff --git a/app_old/setup/settings/04_ui.php b/app_old/setup/settings/04_ui.php deleted file mode 100644 index f7839c9..0000000 --- a/app_old/setup/settings/04_ui.php +++ /dev/null @@ -1,11 +0,0 @@ - DI\decorate(function($prev, Container $c) { - $arr = (array) $prev; - $arr['cache'] = $prev->base . '/cache'; - $arr['views'] = $prev->resources . '/views'; - return (object) $arr; - }) -]; diff --git a/app_old/setup/setups/04_ui.php b/app_old/setup/setups/04_ui.php deleted file mode 100644 index 0bf6f5d..0000000 --- a/app_old/setup/setups/04_ui.php +++ /dev/null @@ -1,15 +0,0 @@ - function(Container $c) { - return new Slim\Views\Blade( - $c->get('locations')->views, - $c->get('locations')->cache, - null, - [ - 'locations' => $c->get('locations') - ] - ); - } -]; diff --git a/app_old/ui/app.php b/app_old/ui/app.php deleted file mode 100644 index 0c7aed1..0000000 --- a/app_old/ui/app.php +++ /dev/null @@ -1,45 +0,0 @@ -isDir()) { - continue; - } - $builder->addDefinitions($file->getRealPath()); - } -} - -$app = Bridge::create($builder->build()); - -$folder = implode(DIRECTORY_SEPARATOR, [ - __DIR__, - 'middlewares' -]); -if (file_exists($folder)) { - $files = new FilesystemIterator($folder); - foreach ($files as $file) { - if ($file->isDir()) { - continue; - } - require_once $file->getRealPath(); - } -} - -return $app; diff --git a/app_old/ui/composer.php b/app_old/ui/composer.php deleted file mode 100644 index 2d27ee1..0000000 --- a/app_old/ui/composer.php +++ /dev/null @@ -1,6 +0,0 @@ -add($app->getContainer()->get(App\Middleware\Auth::class)); diff --git a/app_old/ui/middlewares/02_databases.php b/app_old/ui/middlewares/02_databases.php deleted file mode 100644 index 3d0841f..0000000 --- a/app_old/ui/middlewares/02_databases.php +++ /dev/null @@ -1,20 +0,0 @@ -port)) { - $port = $settings->port; - } - $dsn = 'mysql:host=' . $settings->host . ';port=' . $port . ';dbname=' . $settings->database . ';charset=utf8'; - - ORM::configure($dsn, null, $name); - ORM::configure('username', $settings->username, $name); - ORM::configure('password', $settings->password, $name); -} - -$databases = $app->getContainer()->get('databases'); -foreach ($databases as $name => $settings) { - loadDatabase($settings, $name); -} - -Model::$short_table_names = true; diff --git a/app_old/ui/middlewares/98_logs.php b/app_old/ui/middlewares/98_logs.php deleted file mode 100644 index b81e521..0000000 --- a/app_old/ui/middlewares/98_logs.php +++ /dev/null @@ -1,2 +0,0 @@ -getContainer()->get(Psr\Log\LoggerInterface::class)); diff --git a/app_old/ui/middlewares/99_routes.php b/app_old/ui/middlewares/99_routes.php deleted file mode 100644 index e3b3da5..0000000 --- a/app_old/ui/middlewares/99_routes.php +++ /dev/null @@ -1,15 +0,0 @@ -getContainer()->get('folders')->get('routes'), - 'ui' - ]); - $files = new FilesystemIterator($folder); - foreach ($files as $file) { - if ($file->isDir()) { - continue; - } - include_once $file->getRealPath(); - } -} -buildRoutes($app); diff --git a/app_old/ui/settings/01_env.php b/app_old/ui/settings/01_env.php deleted file mode 100644 index 9ee040b..0000000 --- a/app_old/ui/settings/01_env.php +++ /dev/null @@ -1,4 +0,0 @@ - $_ENV -]; diff --git a/app_old/ui/settings/02_folders.php b/app_old/ui/settings/02_folders.php deleted file mode 100644 index b216fc3..0000000 --- a/app_old/ui/settings/02_folders.php +++ /dev/null @@ -1,12 +0,0 @@ - function() { - return new DI\Container([ - 'base' => dirname(__FILE__, 3), - 'resources' => DI\String('{base}/resources'), - 'routes' => DI\String('{resources}/routes'), - 'templates' => DI\String('{resources}/views'), - 'cache' => DI\String('{base}/cache') - ]); - } -]; diff --git a/app_old/ui/settings/03_urls.php b/app_old/ui/settings/03_urls.php deleted file mode 100644 index 55d2969..0000000 --- a/app_old/ui/settings/03_urls.php +++ /dev/null @@ -1,8 +0,0 @@ - function() { - return [ - 'base' => 'http://localhost:8080' - ]; - } -]; diff --git a/app_old/ui/settings/04_databases.php b/app_old/ui/settings/04_databases.php deleted file mode 100644 index 54d689e..0000000 --- a/app_old/ui/settings/04_databases.php +++ /dev/null @@ -1,20 +0,0 @@ - function(ContainerInterface $container) { - $env = $container->get('env'); - $arr = [ - ORM::DEFAULT_CONNECTION => (object) [ - 'host' => $env['MYSQL_HOST'], - 'database' => $env['MYSQL_DATABASE'], - 'username' => $env['MYSQL_USER'], - 'password' => $env['MYSQL_PASSWORD'] - ] - ]; - if (isset($env['MYSQL_PORT'])) { - $arr[ORM::DEFAULT_CONNECTION]->port = $env['MYSQL_PORT']; - } - return (object) $arr; - } -]; diff --git a/app_old/ui/setups/01_views.php b/app_old/ui/setups/01_views.php deleted file mode 100644 index 4a20566..0000000 --- a/app_old/ui/setups/01_views.php +++ /dev/null @@ -1,20 +0,0 @@ - function(ContainerInterface $container) { - $folders = $container->get('folders'); - return new Slim\Views\Blade( - $folders->get('templates'), - $folders->get('cache'), - null, - $container->has('urls') ? $container->get('urls') : [] - ); - }, - eftec\bladeone\BladeOne::class => function(ContainerInterface $container) { - return new eftec\bladeone\BladeOne( - $container->get('folders')->get('templates'), - $container->get('folders')->get('cache') - ); - } -]; diff --git a/app_old/ui/setups/03_services.php b/app_old/ui/setups/03_services.php deleted file mode 100644 index af7ff76..0000000 --- a/app_old/ui/setups/03_services.php +++ /dev/null @@ -1,8 +0,0 @@ - function(ContainerInterface $container) { - return $container->get(Nyholm\Psr7\Factory\Psr17Factory::class); - } -]; diff --git a/app_old/ui/setups/98_logs.php b/app_old/ui/setups/98_logs.php deleted file mode 100644 index 224590a..0000000 --- a/app_old/ui/setups/98_logs.php +++ /dev/null @@ -1,30 +0,0 @@ - function(ContainerInterface $container) { - return new Monolog\Logger('ui', [ - new Monolog\Handler\FilterHandler( - new Monolog\Handler\RotatingFileHandler('/logs/ui.debug.log'), - Monolog\Level::Debug, - Monolog\Level::Notice - ), - new Monolog\Handler\FilterHandler( - (new Monolog\Handler\RotatingFileHandler('/logs/ui.error.log')) - ->setFormatter(new Monolog\Formatter\LineFormatter(null, null, true)), - Monolog\Level::Warning, - Monolog\Level::Error - ), - new Monolog\Handler\FilterHandler( - new Monolog\Handler\RotatingFileHandler('/logs/ui.critical.log'), - Monolog\Level::Critical - ) - ], [ - $container->get(Monolog\Processor\PsrLogMessageProcessor::class), - $container->get(Monolog\Processor\WebProcessor::class), - $container->get(Monolog\Processor\IntrospectionProcessor::class), - $container->get(Monolog\Processor\MemoryUsageProcessor::class), - $container->get(Monolog\Processor\MemoryPeakUsageProcessor::class) - ]); - } -]; diff --git a/app_old/webpack.config.js b/app_old/webpack.config.js deleted file mode 100644 index d777df3..0000000 --- a/app_old/webpack.config.js +++ /dev/null @@ -1,10 +0,0 @@ -const path = require('path') - -module.exports = { - context: path.resolve(__dirname), - entry: './resources/js/app.js', - output: { - path: path.resolve(__dirname), - filename: './public/js/app.js' - } -} From 3cadaca746b6b61975c8bb6027956a7e323a4d38 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Fri, 24 Nov 2023 20:42:05 -0300 Subject: [PATCH 033/163] Focus and Dev Kint --- app/composer.json | 1 + app/resources/views/search.blade.php | 1 + 2 files changed, 2 insertions(+) diff --git a/app/composer.json b/app/composer.json index 611c509..5738325 100644 --- a/app/composer.json +++ b/app/composer.json @@ -13,6 +13,7 @@ "slim/slim": "^4.11" }, "require-dev": { + "kint-php/kint": "^5.1", "phpunit/phpunit": "^10.2" }, "authors": [ diff --git a/app/resources/views/search.blade.php b/app/resources/views/search.blade.php index 9f9af42..608e4be 100644 --- a/app/resources/views/search.blade.php +++ b/app/resources/views/search.blade.php @@ -312,6 +312,7 @@ this.get().results() return false }) + $("[name='query']").focus() } } $(document).ready(() => { From ec7d8e69abaae91993f8e73e1b4ef898bcbe7189 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Sat, 25 Nov 2023 00:55:31 -0300 Subject: [PATCH 034/163] FIX: Remove login for API --- app/resources/routes/01_api.php | 2 +- app/resources/routes/02_inmobiliarias.php | 2 +- app/resources/routes/03_proyectos.php | 4 +- app/resources/routes/04_ventas.php | 6 +-- app/resources/routes/97_search.php | 2 +- app/resources/routes/98_login.php | 4 +- app/resources/routes/99_base.php | 2 +- app/resources/views/home.blade.php | 4 +- app/resources/views/home/alertas.blade.php | 8 ++-- .../views/home/cierres_vigentes.blade.php | 2 +- .../views/home/cuotas_por_vencer.blade.php | 2 +- .../views/layout/body/scripts.blade.php | 12 ++++++ app/resources/views/proyectos/list.blade.php | 6 +-- app/resources/views/proyectos/show.blade.php | 12 +++--- .../views/proyectos/unidades.blade.php | 2 +- app/resources/views/search.blade.php | 6 +-- app/resources/views/ventas/add.blade.php | 8 ++-- .../views/ventas/cierres/list.blade.php | 4 +- .../views/ventas/cuotas/abonar.blade.php | 4 +- .../views/ventas/cuotas/pendientes.blade.php | 2 +- app/resources/views/ventas/edit.blade.php | 2 +- .../views/ventas/facturacion.blade.php | 8 ++-- app/resources/views/ventas/list.blade.php | 4 +- .../views/ventas/pagos/pendientes.blade.php | 6 +-- .../views/ventas/precios/list.blade.php | 6 +-- .../views/ventas/propietarios/edit.blade.php | 6 +-- .../views/ventas/show/comentarios.blade.php | 2 +- .../views/ventas/show/forma_pago.blade.php | 4 +- app/setup/middlewares/01_auth.php | 2 +- app/setup/setups/middlewares.php | 9 +++-- app/setup/setups/views.php | 1 + app/src/Controller/API/Money.php | 14 +++---- .../Exception/MissingAuthorizationHeader.php | 13 ++++++ app/src/Middleware/API.php | 40 +++++++++++++++++++ 34 files changed, 140 insertions(+), 71 deletions(-) create mode 100644 app/src/Exception/MissingAuthorizationHeader.php create mode 100644 app/src/Middleware/API.php diff --git a/app/resources/routes/01_api.php b/app/resources/routes/01_api.php index a8f19fa..73fb159 100644 --- a/app/resources/routes/01_api.php +++ b/app/resources/routes/01_api.php @@ -10,4 +10,4 @@ $app->group('/api', function($app) { include_once $file->getRealPath(); } } -}); +})->add($app->getContainer()->get(Incoviba\Middleware\API::class)); diff --git a/app/resources/routes/02_inmobiliarias.php b/app/resources/routes/02_inmobiliarias.php index fd29f8d..8991df7 100644 --- a/app/resources/routes/02_inmobiliarias.php +++ b/app/resources/routes/02_inmobiliarias.php @@ -3,4 +3,4 @@ use Incoviba\Controller\Inmobiliarias; $app->group('/inmobiliarias', function($app) { $app->get('[/]', Inmobiliarias::class); -}); +})->add($app->getContainer()->get(Incoviba\Middleware\Authentication::class)); diff --git a/app/resources/routes/03_proyectos.php b/app/resources/routes/03_proyectos.php index 7c734ea..332e7e7 100644 --- a/app/resources/routes/03_proyectos.php +++ b/app/resources/routes/03_proyectos.php @@ -4,7 +4,7 @@ use Incoviba\Controller\Proyectos; $app->group('/proyectos', function($app) { $app->get('/unidades[/]', [Proyectos::class, 'unidades']); $app->get('[/]', Proyectos::class); -}); +})->add($app->getContainer()->get(Incoviba\Middleware\Authentication::class)); $app->group('/proyecto/{proyecto_id}', function($app) { $app->get('[/]', [Proyectos::class, 'show']); -}); +})->add($app->getContainer()->get(Incoviba\Middleware\Authentication::class)); diff --git a/app/resources/routes/04_ventas.php b/app/resources/routes/04_ventas.php index 4d41b9f..8e02291 100644 --- a/app/resources/routes/04_ventas.php +++ b/app/resources/routes/04_ventas.php @@ -11,10 +11,10 @@ $app->group('/ventas', function($app) { } $app->get('/add[/]', [Ventas::class, 'add']); $app->get('[/]', Ventas::class); -}); +})->add($app->getContainer()->get(Incoviba\Middleware\Authentication::class)); $app->group('/venta/{proyecto_nombre:[A-za-zÑñ\+\ %0-9]+}/{unidad_descripcion:[0-9]+}', function($app) { $app->get('[/]', [Ventas::class, 'showUnidad']); -}); +})->add($app->getContainer()->get(Incoviba\Middleware\Authentication::class)); $app->group('/venta/{venta_id:[0-9]+}', function($app) { $app->group('/propietario', function($app) { $app->get('[/]', [Ventas::class, 'propietario']); @@ -29,4 +29,4 @@ $app->group('/venta/{venta_id:[0-9]+}', function($app) { }); $app->get('/edit[/]', [Ventas::class, 'edit']); $app->get('[/]', [Ventas::class, 'show']); -}); +})->add($app->getContainer()->get(Incoviba\Middleware\Authentication::class)); diff --git a/app/resources/routes/97_search.php b/app/resources/routes/97_search.php index c76b639..79cd977 100644 --- a/app/resources/routes/97_search.php +++ b/app/resources/routes/97_search.php @@ -4,4 +4,4 @@ use Incoviba\Controller\Search; $app->group('/search', function($app) { $app->get('[/{query}[/{tipo}[/]]]', Search::class); $app->post('[/]', Search::class); -}); +})->add($app->getContainer()->get(Incoviba\Middleware\Authentication::class)); diff --git a/app/resources/routes/98_login.php b/app/resources/routes/98_login.php index 4521062..0623659 100644 --- a/app/resources/routes/98_login.php +++ b/app/resources/routes/98_login.php @@ -4,5 +4,5 @@ use Incoviba\Controller\Login; $app->group('/login', function($app) { $app->post('[/]', [Login::class, 'login']); $app->get('[/]', [Login::class, 'form']); -}); -$app->get('/logout', [Login::class, 'logout']); +})->add($app->getContainer()->get(Incoviba\Middleware\Authentication::class)); +$app->get('/logout', [Login::class, 'logout'])->add($app->getContainer()->get(Incoviba\Middleware\Authentication::class)); diff --git a/app/resources/routes/99_base.php b/app/resources/routes/99_base.php index 24b84c0..12e7eb1 100644 --- a/app/resources/routes/99_base.php +++ b/app/resources/routes/99_base.php @@ -2,4 +2,4 @@ use Incoviba\Controller\Base; $app->get('/construccion', [Base::class, 'construccion'])->setName('construccion'); -$app->get('[/]', Base::class); +$app->get('[/]', Base::class)->add($app->getContainer()->get(Incoviba\Middleware\Authentication::class)); diff --git a/app/resources/views/home.blade.php b/app/resources/views/home.blade.php index 134a306..63180f0 100644 --- a/app/resources/views/home.blade.php +++ b/app/resources/views/home.blade.php @@ -28,7 +28,7 @@ return { hoy: () => { const span = $('#cuotas_hoy') - return fetch('{{$urls->api}}/ventas/cuotas/hoy').then(response => { + return fetchAPI('{{$urls->api}}/ventas/cuotas/hoy').then(response => { span.html('') if (response.ok) { return response.json() @@ -48,7 +48,7 @@ }, pendiente: () => { const span = $('#cuotas_pendientes') - return fetch('{{$urls->api}}/ventas/cuotas/pendiente').then(response => { + return fetchAPI('{{$urls->api}}/ventas/cuotas/pendiente').then(response => { span.html('') if (response.ok) { return response.json() diff --git a/app/resources/views/home/alertas.blade.php b/app/resources/views/home/alertas.blade.php index 454cd2b..a1f9378 100644 --- a/app/resources/views/home/alertas.blade.php +++ b/app/resources/views/home/alertas.blade.php @@ -13,7 +13,7 @@ proyectos: () => { this.draw().loading() const url = '{{$urls->api}}/proyectos/escriturando' - return fetch(url).then(response => { + return fetchAPI(url).then(response => { if (response.ok) { return response.json() } @@ -38,7 +38,7 @@ }, unidades: proyecto_id => { const url = '{{$urls->api}}/ventas/unidades/disponibles' - return fetch(url, {method: 'post', headers: {'Content-Type': 'application/json'}, body: JSON.stringify({proyecto_id})}).then(response => { + return fetchAPI(url, {method: 'post', headers: {'Content-Type': 'application/json'}, body: JSON.stringify({proyecto_id})}).then(response => { if (response.ok) { return response.json() } @@ -49,7 +49,7 @@ }, promesas: proyecto_id => { const url = '{{$urls->api}}/ventas/estados/firmar' - return fetch(url, {method: 'post', headers: {'Content-Type': 'application/json'}, body: JSON.stringify({proyecto_id})}).then(response => { + return fetchAPI(url, {method: 'post', headers: {'Content-Type': 'application/json'}, body: JSON.stringify({proyecto_id})}).then(response => { if (response.ok) { return response.json() } @@ -60,7 +60,7 @@ }, escrituras: proyecto_id => { const url = '{{$urls->api}}/ventas/escrituras/estados'; - return fetch(url, {method: 'post', headers: {'Content-Type': 'application/json'}, body: JSON.stringify({proyecto_id})}).then(response => { + return fetchAPI(url, {method: 'post', headers: {'Content-Type': 'application/json'}, body: JSON.stringify({proyecto_id})}).then(response => { if (response.ok) { return response.json() } diff --git a/app/resources/views/home/cierres_vigentes.blade.php b/app/resources/views/home/cierres_vigentes.blade.php index 06f6443..0cf75f2 100644 --- a/app/resources/views/home/cierres_vigentes.blade.php +++ b/app/resources/views/home/cierres_vigentes.blade.php @@ -10,7 +10,7 @@ list.append( $('
    ').addClass('ui inline active loader') ) - fetch('{{$urls->api}}/ventas/cierres/vigentes').then(response => { + fetchAPI('{{$urls->api}}/ventas/cierres/vigentes').then(response => { list.html('') if (response.ok) { return response.json() diff --git a/app/resources/views/home/cuotas_por_vencer.blade.php b/app/resources/views/home/cuotas_por_vencer.blade.php index feb15c0..b8a01a0 100644 --- a/app/resources/views/home/cuotas_por_vencer.blade.php +++ b/app/resources/views/home/cuotas_por_vencer.blade.php @@ -10,7 +10,7 @@ list.append( $('
    ').addClass('ui inline active loader') ) - return fetch('{{$urls->api}}/ventas/cuotas/vencer').then(response => { + return fetchAPI('{{$urls->api}}/ventas/cuotas/vencer').then(response => { list.html('') if (response.ok) { return response.json() diff --git a/app/resources/views/layout/body/scripts.blade.php b/app/resources/views/layout/body/scripts.blade.php index a8010eb..b1925f4 100644 --- a/app/resources/views/layout/body/scripts.blade.php +++ b/app/resources/views/layout/body/scripts.blade.php @@ -2,6 +2,18 @@ +@endpush diff --git a/app/setup/setups/services.php b/app/setup/setups/services.php index 376fa42..9ba91f9 100644 --- a/app/setup/setups/services.php +++ b/app/setup/setups/services.php @@ -16,8 +16,11 @@ return [ 'base_uri' => 'https://mindicador.cl/api/', 'headers' => ['Accept' => 'application/json'] ])); + $ine = new Incoviba\Service\Money\Ine(new GuzzleHttp\Client([ + 'base_uri' => 'https://api-calculadora.ine.cl/ServiciosCalculadoraVariacion' + ])); return (new Incoviba\Service\Money())->register('uf', $mindicador) - ->register('ipc', $mindicador); + ->register('ipc', $ine); }, Predis\Client::class => function(ContainerInterface $container) { return new Predis\Client([ diff --git a/app/setup/setups/views.php b/app/setup/setups/views.php index c632889..0046530 100644 --- a/app/setup/setups/views.php +++ b/app/setup/setups/views.php @@ -10,6 +10,8 @@ return [ 'login' => $container->get(Incoviba\Service\Login::class), 'format' => $container->get(Incoviba\Service\Format::class), 'API_KEY' => $container->get('API_KEY'), + 'UF' => $container->get(Incoviba\Service\UF::class), + 'IPC' => $container->get(Incoviba\Service\IPC::class) ]; if ($global_variables['login']->isIn()) { $global_variables['user'] = $global_variables['login']->getUser(); diff --git a/app/src/Controller/API/Money.php b/app/src/Controller/API/Money.php index 5dab0c6..28a0b14 100644 --- a/app/src/Controller/API/Money.php +++ b/app/src/Controller/API/Money.php @@ -62,34 +62,23 @@ class Money } return $this->data[$provider][$date->format('Y-m-d')]; } - /*public function uf(ServerRequestInterface $request, ResponseInterface $response, Service\Redis $redisService, Service\Money $moneyService): ResponseInterface + public function uf(ServerRequestInterface $request, ResponseInterface $response, Service\UF $ufService): ResponseInterface { $body = $request->getParsedBody(); $output = [ 'input' => $body, 'uf' => 0 ]; - $redisKey = 'uf'; $date = new DateTimeImmutable($body['fecha']); - try { - $ufs = $this->fetchRedis($redisService, $redisKey); - if (!isset($ufs[$date->format('Y-m-d')])) { - throw new EmptyRedis($redisKey); - } - } catch (EmptyRedis) { - error_log(var_export($ufs,true)); - if (!isset($ufs)) { - $ufs = []; - } - $uf = $moneyService->getUF($date); - $ufs[$date->format('Y-m-d')] = $uf; - $this->saveRedis($redisService, $redisKey, $ufs, 60 * 60 * 24 * 30); + $now = new DateTimeImmutable(); + if ($date > $now) { + return $this->withJson($response, $output); } - $output['uf'] = $ufs[$date->format('Y-m-d')]; + $output['uf'] = $ufService->get($date); return $this->withJson($response, $output); - }*/ - public function ipc(ServerRequestInterface $request, ResponseInterface $response, Service\Redis $redisService, - Service\Money $moneyService): ResponseInterface + } + public function ipc(ServerRequestInterface $request, ResponseInterface $response, + Service\IPC $ipcService): ResponseInterface { $data = $request->getParsedBody(); $output = [ @@ -97,7 +86,6 @@ class Money 'date_string' => '', 'ipc' => 0 ]; - $redisKey = 'ipc'; $start = new DateTimeImmutable($data['start']); $end = new DateTimeImmutable($data['end']); $now = new DateTimeImmutable(); @@ -105,23 +93,8 @@ class Money return $this->withJson($response, $output); } $dateKey = "{$start->format('Y-m')}-{$end->format('Y-m')}"; - $months = $start->diff($end)->m; - $current = new DateTimeImmutable((($start <= $end) ? $start : $end)->format('Y-m-15')); - $value = 0; - $ipcs = []; - try { - $ipcs = (array) $this->fetchRedis($redisService, $redisKey); - } catch (EmptyRedis) {} - for ($i = 1; $i < $months; $i ++) { - $current = $current->add(new DateInterval("P1M")); - if (!isset($ipcs[$current->format('Y-m')])) { - $ipcs[$current->format('Y-m')] = $moneyService->getIPC($current); - $this->saveRedis($redisService, $redisKey, $ipcs, $this->time); - } - $value += $ipcs[$current->format('Y-m')]; - } $output['date_string'] = $dateKey; - $output['ipc'] = $value; + $output['ipc'] = $ipcService->get($start, $end); return $this->withJson($response, $output); } } diff --git a/app/src/Controller/API/Ventas/Precios.php b/app/src/Controller/API/Ventas/Precios.php index 63b3cf9..8f8dbe9 100644 --- a/app/src/Controller/API/Ventas/Precios.php +++ b/app/src/Controller/API/Ventas/Precios.php @@ -1,16 +1,17 @@ getParsedBody(); + $output = [ + 'propiedad_unidad_id' => $pu_id, + 'input' => $body, + 'edited' => false + ]; + try { + $pu = $propiedadUnidadService->getById($pu_id); + $propiedadUnidadService->edit($pu, (array) $body); + $output['edited'] = true; + } catch (PDOException | EmptyResult) {} + return $this->withJson($response, $output); + } +} diff --git a/app/src/Model/Direccion.php b/app/src/Model/Direccion.php index 92b8e05..d27a4ff 100644 --- a/app/src/Model/Direccion.php +++ b/app/src/Model/Direccion.php @@ -10,6 +10,20 @@ class Direccion extends Model public string $extra; public Comuna $comuna; + public function simple(): string + { + $arr = [ + implode(' ', [ + $this->calle, + $this->numero + ]) + ]; + if ($this->extra !== '') { + $arr []= $this->extra; + } + return implode(', ', $arr); + } + public function full(): string { return implode(', ', [ diff --git a/app/src/Model/Venta/PropiedadUnidad.php b/app/src/Model/Venta/PropiedadUnidad.php new file mode 100644 index 0000000..a1bbb3a --- /dev/null +++ b/app/src/Model/Venta/PropiedadUnidad.php @@ -0,0 +1,16 @@ + $this->valor + ]); + } +} diff --git a/app/src/Repository/Proyecto.php b/app/src/Repository/Proyecto.php index be015ce..6aac760 100644 --- a/app/src/Repository/Proyecto.php +++ b/app/src/Repository/Proyecto.php @@ -70,13 +70,24 @@ class Proyecto extends Ideal\Repository 'valor_terreno', 'corredor', 'superficie_sobre_nivel', 'superficie_bajo_nivel', 'pisos', 'subterraneos'], $new_data); } + + public function fetchById(int $id): Define\Model + { + $query = $this->connection->getQueryBuilder() + ->select($this->columns()) + ->from("{$this->getTable()} a") + ->joined($this->joinTerreno()) + ->where("a.id = ?"); + return $this->fetchOne($query, [$id]); + } + public function fetchByName(string $name): Define\Model { $query = $this->connection->getQueryBuilder() ->select($this->columns()) ->from("{$this->getTable()} a") ->joined($this->joinTerreno()) - ->where("descripcion = ?"); + ->where("a.descripcion = ?"); return $this->fetchOne($query, [$name]); } public function fetchAllActive(): array diff --git a/app/src/Repository/Venta/Propiedad.php b/app/src/Repository/Venta/Propiedad.php index 173e810..1549295 100644 --- a/app/src/Repository/Venta/Propiedad.php +++ b/app/src/Repository/Venta/Propiedad.php @@ -9,7 +9,7 @@ use Incoviba\Service; class Propiedad extends Ideal\Repository { - public function __construct(Define\Connection $connection, protected Service\Venta\Unidad $unidadService) + public function __construct(Define\Connection $connection, protected Service\Venta\PropiedadUnidad $unidadService) { parent::__construct($connection); $this->setTable('propiedad'); diff --git a/app/src/Repository/Venta/PropiedadUnidad.php b/app/src/Repository/Venta/PropiedadUnidad.php new file mode 100644 index 0000000..9402e5f --- /dev/null +++ b/app/src/Repository/Venta/PropiedadUnidad.php @@ -0,0 +1,118 @@ +setTable('propiedad_unidad'); + } + + public function load(array $data_row): Define\Model + { + $unidad = $this->unidadRepository->fetchById($data_row['unidad']); + $data = [ + 'id' => $unidad->id, + 'subtipo' => $unidad->subtipo, + 'piso' => $unidad->piso, + 'descripcion' => $unidad->descripcion, + 'orientacion' => $unidad->orientacion, + 'prorrateo' => $unidad->prorrateo, + 'pt' => $unidad->proyectoTipoUnidad->id, + 'pu_id' => $data_row['id'], + 'propiedad' => $data_row['propiedad'], + 'valor' => $data_row['valor'] + ]; + return parent::load($data); + } + + public function create(?array $data = null): Model\Venta\PropiedadUnidad + { + $map = (new Implement\Repository\MapperParser(['subtipo', 'piso', 'descripcion', 'orientacion', 'prorrateo', 'valor', 'id'])) + ->register('propiedad', (new Implement\Repository\Mapper()) + ->setProperty('propiedad_id')) + ->register('pt', (new Implement\Repository\Mapper()) + ->setProperty('proyectoTipoUnidad') + ->setFunction(function($data) { + return $this->proyectoTipoUnidadService->getById($data['pt']); + })); + return $this->parseData(new Model\Venta\PropiedadUnidad(), $data, $map); + } + public function save(Define\Model $model): Model\Venta\PropiedadUnidad + { + $model->pu_id = $this->saveNew(['propiedad', 'unidad', 'valor'], [$model->propiedad_id, $model->id, $model->valor]); + return $model; + } + public function edit(Define\Model $model, array $new_data): Model\Venta\PropiedadUnidad + { + return $this->update($model, ['propiedad', 'unidad', 'valor'], $new_data); + } + + public function fetchById(int $id): Define\Model + { + $query = $this->connection->getQueryBuilder() + ->select() + ->from($this->getTable()) + ->where("id = ?"); + return $this->fetchOne($query, [$id]); + } + + public function fetchByVenta(int $venta_id): array + { + $query = $this->connection->getQueryBuilder() + ->select('a.*') + ->from("{$this->getTable()} a") + ->joined('JOIN unidad ON a.unidad = unidad.id + JOIN venta ON venta.propiedad = a.propiedad') + ->where('venta.id = ?'); + return $this->fetchMany($query, [$venta_id]); + } + public function fetchByPropiedad(int $propiedad_id): array + { + $query = $this->connection->getQueryBuilder() + ->select('a.*') + ->from("{$this->getTable()} a") + ->joined('JOIN `unidad` ON a.`unidad` = `unidad`.`id`') + ->where('a.`propiedad` = ?') + ->group('`unidad`.`id`'); + return $this->fetchMany($query, [$propiedad_id]); + } + + protected function update(Define\Model $model, array $columns, array $data): Define\Model + { + $changes = []; + $values = []; + foreach ($columns as $column) { + if (isset($data[$column])) { + $changes []= $column; + $values []= $data[$column]; + } + } + + if (count($changes) === 0) { + return $model; + } + $columns_string = implode(', ', array_map(function($property) {return "`{$property}` = ?";}, $changes)); + $query = $this->connection->getQueryBuilder() + ->update($this->getTable()) + ->set($columns_string) + ->where("id = ?"); + $values []= $model->{$this->getKey()}; + $this->connection->execute($query, $values); + return $this->fetchById($model->{$this->getKey()}); + } + + protected function getKey(): string + { + return 'pu_id'; + } +} diff --git a/app/src/Repository/Venta/Unidad.php b/app/src/Repository/Venta/Unidad.php index 8605d32..925425e 100644 --- a/app/src/Repository/Venta/Unidad.php +++ b/app/src/Repository/Venta/Unidad.php @@ -39,6 +39,16 @@ class Unidad extends Ideal\Repository return $this->update($model, ['subtipo', 'piso', 'descripcion', 'orientacion', 'pt'], $new_data); } + public function fetchById(int $id): Model\Venta\Unidad + { + $query = $this->connection->getQueryBuilder() + ->select('a.*, up.prorrateo') + ->from("{$this->getTable()} a") + ->joined($this->joinProrrateo()) + ->where('a.id = ?'); + return $this->fetchOne($query, [$id]); + } + public function fetchByVenta(int $venta_id): array { $query = $this->connection->getQueryBuilder() diff --git a/app/src/Service/IPC.php b/app/src/Service/IPC.php new file mode 100644 index 0000000..fcba1b4 --- /dev/null +++ b/app/src/Service/IPC.php @@ -0,0 +1,38 @@ + $now) { + return 0; + } + $dateKey = "{$from->format('Y-m')}-{$to->format('Y-m')}"; + $ipcs = []; + try { + $ipcs = json_decode($this->redisService->get($this->redisKey), JSON_OBJECT_AS_ARRAY); + if (!isset($ipcs[$dateKey])) { + throw new EmptyRedis($this->redisKey); + } + } catch (EmptyRedis) { + $ipc = $this->moneyService->getIPC($from, $to); + $ipcs[$dateKey] = $ipc; + $this->redisService->set($this->redisKey, json_encode($ipcs), 60 * 60 * 24 * 30); + } + return $ipcs[$dateKey]; + } + public function readjust(float $base, DateTimeInterface $from, DateTimeInterface $to = new DateTimeImmutable()):float + { + return $base * (1 + $this->get($from, $to->sub(new DateInterval('P1M')))); + } +} diff --git a/app/src/Service/Money.php b/app/src/Service/Money.php index b4d581c..c9a7b8c 100644 --- a/app/src/Service/Money.php +++ b/app/src/Service/Money.php @@ -41,10 +41,10 @@ class Money return 0; } } - public function getIPC(DateTimeInterface $dateTime): float + public function getIPC(DateTimeInterface $start, DateTimeInterface $end): float { try { - return $this->getProvider('ipc')->get(MiIndicador::IPC, $dateTime); + return $this->getProvider('ipc')->getVar($start, $end); } catch (EmptyResponse) { return 0; } diff --git a/app/src/Service/Money/Ine.php b/app/src/Service/Money/Ine.php new file mode 100644 index 0000000..79093fb --- /dev/null +++ b/app/src/Service/Money/Ine.php @@ -0,0 +1,49 @@ +format('Y-m-1')); + $start = $end->sub(new DateInterval('P1M')); + return $this->getVar($start, $end); + } + + public function getVar(DateTimeInterface $start, DateTimeInterface $end): float + { + $base = 1000000000; + $request_query = [ + 'mesInicio' => $start->format('m'), + 'AnioInicio' => $start->format('Y'), + 'mesTermino' => $end->format('m'), + 'AnioTermino' => $end->format('Y'), + 'valor_a_ajustar' => $base + ]; + $request_uri = implode('?', [ + $this->uri, + implode('&', array_map(function($val, $key) { + return "{$key}={$val}"; + }, $request_query, array_keys($request_query))) + ]); + try { + $response = $this->client->get($request_uri); + } catch (GuzzleException) { + throw new EmptyResponse($request_uri); + } + $body = $response->getBody(); + $json = json_decode($body->getContents()); + return ((int) str_replace('.', '', $json[0]->valorajustado) - $base) / $base; + } +} diff --git a/app/src/Service/UF.php b/app/src/Service/UF.php new file mode 100644 index 0000000..434ba42 --- /dev/null +++ b/app/src/Service/UF.php @@ -0,0 +1,35 @@ +redisService->get($this->redisKey), JSON_OBJECT_AS_ARRAY); + if (!isset($ufs[$date->format('Y-m-d')])) { + throw new EmptyRedis($this->redisKey); + } + $uf = $ufs[$date->format('Y-m-d')]; + } catch (EmptyRedis) { + $uf = $this->moneyService->getUF($date); + $ufs[$date->format('Y-m-d')] = $uf; + $this->redisService->set($this->redisKey, json_encode($ufs), 60 * 60 * 24 * 30); + } + return $uf; + } + public function transform(DateTimeInterface $date, float $input, string $from = 'uf'): float + { + + $uf = $this->get($date); + return $input * (($from === 'uf') ? $uf : 1/$uf); + } +} diff --git a/app/src/Service/Venta/PropiedadUnidad.php b/app/src/Service/Venta/PropiedadUnidad.php new file mode 100644 index 0000000..6787b11 --- /dev/null +++ b/app/src/Service/Venta/PropiedadUnidad.php @@ -0,0 +1,39 @@ +process($this->propiedadUnidadRepository->fetchById($unidad_id)); + } + public function getByVenta(int $venta_id): array + { + return array_map([$this, 'process'], $this->propiedadUnidadRepository->fetchByVenta($venta_id)); + } + public function getByPropiedad(int $propiedad_id): array + { + return array_map([$this, 'process'], $this->propiedadUnidadRepository->fetchByPropiedad($propiedad_id)); + } + public function edit(Model\Venta\PropiedadUnidad $propiedadUnidad, array $data): Model\Venta\PropiedadUnidad + { + return $this->process($this->propiedadUnidadRepository->edit($propiedadUnidad, $data)); + } + + protected function process($unidad): Model\Venta\PropiedadUnidad + { + try { + $unidad->precios = $this->precioService->getByUnidad($unidad->id); + $unidad->currentPrecio = $this->precioService->getVigenteByUnidad($unidad->id); + } catch (EmptyResult) { + } + return $unidad; + } +} diff --git a/app/src/Service/Venta/Unidad.php b/app/src/Service/Venta/Unidad.php index 899580e..1fc6f6e 100644 --- a/app/src/Service/Venta/Unidad.php +++ b/app/src/Service/Venta/Unidad.php @@ -10,7 +10,7 @@ class Unidad { public function __construct( protected Repository\Venta\Unidad $unidadRepository, - protected Service\Venta\Precio $precioService + protected Precio $precioService ) {} public function getById(int $unidad_id): Model\Venta\Unidad diff --git a/cli/src/Command/Money/UF.php b/cli/src/Command/Money/UF.php index b7c99e2..7e700ce 100644 --- a/cli/src/Command/Money/UF.php +++ b/cli/src/Command/Money/UF.php @@ -14,9 +14,8 @@ class UF extends Command { $this->logger->debug("Running {$this->getName()}"); $now = new DateTimeImmutable(); - $uri = '/api/money'; + $uri = '/api/money/uf'; $data = [ - 'provider' => 'uf', 'fecha' => $now->format('Y-m-d') ]; $output->writeln("POST {$uri}"); From 62153dd1ef8dbaf26bfd2bf15f1a118f0c5ec250 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Wed, 29 Nov 2023 20:44:13 -0300 Subject: [PATCH 045/163] Editar propiedad en venta --- .../views/ventas/facturacion/show.blade.php | 3 + .../views/ventas/propiedades/edit.blade.php | 181 +++++++++++++----- .../views/ventas/show/propiedad.blade.php | 4 + app/src/Controller/Ventas.php | 2 +- 4 files changed, 145 insertions(+), 45 deletions(-) diff --git a/app/resources/views/ventas/facturacion/show.blade.php b/app/resources/views/ventas/facturacion/show.blade.php index 2bd334c..171bbfa 100644 --- a/app/resources/views/ventas/facturacion/show.blade.php +++ b/app/resources/views/ventas/facturacion/show.blade.php @@ -244,6 +244,9 @@ return { price: (id, value) => { const idx = this.unidades.findIndex(unidad => unidad.pu_id === id) + if (idx === -1) { + return + } const old_value = this.unidades[idx].precio if (old_value === parseFloat(value)) { return diff --git a/app/resources/views/ventas/propiedades/edit.blade.php b/app/resources/views/ventas/propiedades/edit.blade.php index 31ebaa6..11c1788 100644 --- a/app/resources/views/ventas/propiedades/edit.blade.php +++ b/app/resources/views/ventas/propiedades/edit.blade.php @@ -2,12 +2,18 @@ @section('page_content')
    -

    Editar Propiedad - {{$proyecto->descripcion}} {{$propiedad->summary()}}

    +

    + Editar Propiedad - {{$proyecto->descripcion}} + + {{$propiedad->summary()}} + +

    + - + @foreach($propiedad->unidades as $unidad) + @@ -54,51 +66,132 @@ @push('page_scripts') @endpush diff --git a/app/resources/views/ventas/show/propiedad.blade.php b/app/resources/views/ventas/show/propiedad.blade.php index 8d6208c..745b298 100644 --- a/app/resources/views/ventas/show/propiedad.blade.php +++ b/app/resources/views/ventas/show/propiedad.blade.php @@ -16,6 +16,7 @@ + @@ -41,6 +42,9 @@ + @@ -74,7 +74,7 @@ tipo: '{{ucwords($unidad->proyectoTipoUnidad->tipoUnidad->descripcion)}}', descripcion: '{{$unidad->descripcion}}', pid: {{$unidad->pu_id}}, - valor: {{($unidad->valor > 0) ? $unidad->valor : $unidad->precio($venta->fecha)}} + valor: {{($unidad->valor > 0) ? $unidad->valor : $unidad->precio($venta->fecha)->valor}} }, @endforeach ], From e347aaabe9d7b5bda709a8a679f370ac3b7ddfbf Mon Sep 17 00:00:00 2001 From: Aldarien Date: Wed, 29 Nov 2023 21:13:03 -0300 Subject: [PATCH 047/163] Valor PU -> ultimo precio --- app/src/Service/Venta/PropiedadUnidad.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/Service/Venta/PropiedadUnidad.php b/app/src/Service/Venta/PropiedadUnidad.php index 6787b11..441f5d7 100644 --- a/app/src/Service/Venta/PropiedadUnidad.php +++ b/app/src/Service/Venta/PropiedadUnidad.php @@ -32,6 +32,9 @@ class PropiedadUnidad try { $unidad->precios = $this->precioService->getByUnidad($unidad->id); $unidad->currentPrecio = $this->precioService->getVigenteByUnidad($unidad->id); + if ($unidad->valor === 0) { + $unidad->valor = $unidad->currentPrecio->valor; + } } catch (EmptyResult) { } return $unidad; From 0761be6613272f5be176ba58a61ecac79891ad62 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Wed, 29 Nov 2023 21:14:55 -0300 Subject: [PATCH 048/163] Precio = valor propiedad o precio --- app/resources/views/ventas/facturacion/show.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/resources/views/ventas/facturacion/show.blade.php b/app/resources/views/ventas/facturacion/show.blade.php index 171bbfa..2762943 100644 --- a/app/resources/views/ventas/facturacion/show.blade.php +++ b/app/resources/views/ventas/facturacion/show.blade.php @@ -151,7 +151,7 @@ terreno: {{$IPC->readjust($venta->proyecto()->terreno->valor, $venta->proyecto()->terreno->date, $venta->currentEstado()->fecha)}}, uf: {{$UF->get($venta->currentEstado()->fecha)}}, unidades: JSON.parse('{!! json_encode(array_map(function(Incoviba\Model\Venta\PropiedadUnidad $unidad) use ($venta, $UF, $format) { - $precio = $unidad->valor; + $precio = ($unidad->valor > 0) ? $unidad->valor : $unidad->precio($venta->currentEstado())->valor; return [ 'pu_id' => $unidad->pu_id, 'descripcion' => ucwords($unidad->proyectoTipoUnidad->tipoUnidad->descripcion) . ' ' . $unidad->descripcion, From 2600bd409e821e0f4e86778e26b10e010df671fc Mon Sep 17 00:00:00 2001 From: Aldarien Date: Wed, 29 Nov 2023 21:17:06 -0300 Subject: [PATCH 049/163] FIX: fecha estado venta --- app/resources/views/ventas/facturacion/show.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/resources/views/ventas/facturacion/show.blade.php b/app/resources/views/ventas/facturacion/show.blade.php index 2762943..5aebaa1 100644 --- a/app/resources/views/ventas/facturacion/show.blade.php +++ b/app/resources/views/ventas/facturacion/show.blade.php @@ -151,7 +151,7 @@ terreno: {{$IPC->readjust($venta->proyecto()->terreno->valor, $venta->proyecto()->terreno->date, $venta->currentEstado()->fecha)}}, uf: {{$UF->get($venta->currentEstado()->fecha)}}, unidades: JSON.parse('{!! json_encode(array_map(function(Incoviba\Model\Venta\PropiedadUnidad $unidad) use ($venta, $UF, $format) { - $precio = ($unidad->valor > 0) ? $unidad->valor : $unidad->precio($venta->currentEstado())->valor; + $precio = ($unidad->valor > 0) ? $unidad->valor : $unidad->precio($venta->currentEstado()->fecha)->valor; return [ 'pu_id' => $unidad->pu_id, 'descripcion' => ucwords($unidad->proyectoTipoUnidad->tipoUnidad->descripcion) . ' ' . $unidad->descripcion, From 244d304e0474f191b6a89c7181cca6d68e5b8f7e Mon Sep 17 00:00:00 2001 From: Aldarien Date: Wed, 29 Nov 2023 21:18:30 -0300 Subject: [PATCH 050/163] FIX: % descuento --- app/resources/views/ventas/facturacion/show.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/resources/views/ventas/facturacion/show.blade.php b/app/resources/views/ventas/facturacion/show.blade.php index 5aebaa1..cc12bd1 100644 --- a/app/resources/views/ventas/facturacion/show.blade.php +++ b/app/resources/views/ventas/facturacion/show.blade.php @@ -217,7 +217,7 @@ 'SUBTOTAL ' + pesoFormatter.format(subtotal * this.proporcion) + '
    ' + 'Mas valor terreno ' + pesoFormatter.format(terreno * this.proporcion) + '
    ' + 'TOTAL ' + pesoFormatter.format(total * this.proporcion) + ';' + ufFormatter.format(totalUF * this.proporcion) + ' UF

    ' + - 'Descuento Terreno: ' + percentFormatter.format(descuento) + '%

    ' + + 'Descuento Terreno: ' + percentFormatter.format(descuento * 100) + '%

    ' + 'UF: ' + ufFormatter.format(this.uf), '1 UNID', pesoFormatter.format(terreno * this.proporcion), From 91bdef5cc549d6d984031770f8be9b1add940382 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Wed, 29 Nov 2023 21:21:51 -0300 Subject: [PATCH 051/163] FIX: % descuento --- app/resources/views/ventas/facturacion/show.blade.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/resources/views/ventas/facturacion/show.blade.php b/app/resources/views/ventas/facturacion/show.blade.php index cc12bd1..d5a5910 100644 --- a/app/resources/views/ventas/facturacion/show.blade.php +++ b/app/resources/views/ventas/facturacion/show.blade.php @@ -167,6 +167,7 @@ const ufFormatter = new Intl.NumberFormat('es-CL', {maximumFractionDigits: 2, minimumFractionDigits: 2}) const percentFormatter = new Intl.NumberFormat('es-CL', {maximumFractionDigits: 5, minimumFractionDigits: 5}) let terreno = 0 + let prorrateo = 0 let c = 1 const classes = [ '', @@ -179,6 +180,7 @@ this.unidades.forEach(unidad => { const descuento = this.terreno * unidad.prorrateo terreno += descuento + prorrateo += unidad.prorrateo const bruto = unidad.base - descuento const neto = bruto / 1.19 const data = [ @@ -207,7 +209,6 @@ const subtotal = base + iva const total = subtotal + terreno const totalUF = total / this.uf - const descuento = terreno / base const data = [ c, @@ -217,7 +218,7 @@ 'SUBTOTAL ' + pesoFormatter.format(subtotal * this.proporcion) + '
    ' + 'Mas valor terreno ' + pesoFormatter.format(terreno * this.proporcion) + '
    ' + 'TOTAL ' + pesoFormatter.format(total * this.proporcion) + ';' + ufFormatter.format(totalUF * this.proporcion) + ' UF

    ' + - 'Descuento Terreno: ' + percentFormatter.format(descuento * 100) + '%

    ' + + 'Descuento Terreno: ' + percentFormatter.format(prorrateo) + '%

    ' + 'UF: ' + ufFormatter.format(this.uf), '1 UNID', pesoFormatter.format(terreno * this.proporcion), From 9991b7c6a3aa2582034c5a10ef1c655ff1baa9fd Mon Sep 17 00:00:00 2001 From: Aldarien Date: Wed, 29 Nov 2023 21:23:11 -0300 Subject: [PATCH 052/163] FIX: % descuento --- app/resources/views/ventas/facturacion/show.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/resources/views/ventas/facturacion/show.blade.php b/app/resources/views/ventas/facturacion/show.blade.php index d5a5910..9a9947a 100644 --- a/app/resources/views/ventas/facturacion/show.blade.php +++ b/app/resources/views/ventas/facturacion/show.blade.php @@ -218,7 +218,7 @@ 'SUBTOTAL ' + pesoFormatter.format(subtotal * this.proporcion) + '
    ' + 'Mas valor terreno ' + pesoFormatter.format(terreno * this.proporcion) + '
    ' + 'TOTAL ' + pesoFormatter.format(total * this.proporcion) + ';' + ufFormatter.format(totalUF * this.proporcion) + ' UF

    ' + - 'Descuento Terreno: ' + percentFormatter.format(prorrateo) + '%

    ' + + 'Descuento Terreno: ' + percentFormatter.format(prorrateo * 100) + '%

    ' + 'UF: ' + ufFormatter.format(this.uf), '1 UNID', pesoFormatter.format(terreno * this.proporcion), From 17f93dcd34e2fa8b34cb7587c9f746010472d030 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Wed, 29 Nov 2023 22:21:46 -0300 Subject: [PATCH 053/163] Edit Pie --- app/resources/routes/04_ventas.php | 1 + app/resources/routes/api/ventas/pies.php | 6 +++ .../views/ventas/pies/edit.blade.php | 46 +++++++++++++++++++ app/src/Controller/API/Ventas/Pies.php | 31 +++++++++++++ app/src/Controller/Ventas.php | 5 ++ app/src/Service/Venta/Pie.php | 4 ++ 6 files changed, 93 insertions(+) create mode 100644 app/resources/routes/api/ventas/pies.php create mode 100644 app/resources/views/ventas/pies/edit.blade.php create mode 100644 app/src/Controller/API/Ventas/Pies.php diff --git a/app/resources/routes/04_ventas.php b/app/resources/routes/04_ventas.php index 8e02291..7af89dc 100644 --- a/app/resources/routes/04_ventas.php +++ b/app/resources/routes/04_ventas.php @@ -26,6 +26,7 @@ $app->group('/venta/{venta_id:[0-9]+}', function($app) { $app->group('/cuotas', function($app) { $app->get('[/]', [Ventas::class, 'cuotas']); }); + $app->get('[/]', [Ventas::class, 'pie']); }); $app->get('/edit[/]', [Ventas::class, 'edit']); $app->get('[/]', [Ventas::class, 'show']); diff --git a/app/resources/routes/api/ventas/pies.php b/app/resources/routes/api/ventas/pies.php new file mode 100644 index 0000000..7b5abea --- /dev/null +++ b/app/resources/routes/api/ventas/pies.php @@ -0,0 +1,6 @@ +group('/pie/{pie_id}', function($app) { + $app->post('/edit[/]', [Pies::class, 'edit']); +}); diff --git a/app/resources/views/ventas/pies/edit.blade.php b/app/resources/views/ventas/pies/edit.blade.php new file mode 100644 index 0000000..34c2ca5 --- /dev/null +++ b/app/resources/views/ventas/pies/edit.blade.php @@ -0,0 +1,46 @@ +@extends('layout.base') + +@section('page_content') +
    +

    + Pie - + {{$venta->proyecto()->descripcion}} - + {{$venta->propiedad()->summary()}} +

    +
    +
    + +
    + +
    UF
    +
    +
    +
    + + +
    + + +
    +@endsection + +@push('page_scripts') + +@endpush diff --git a/app/src/Controller/API/Ventas/Pies.php b/app/src/Controller/API/Ventas/Pies.php new file mode 100644 index 0000000..12a1b2a --- /dev/null +++ b/app/src/Controller/API/Ventas/Pies.php @@ -0,0 +1,31 @@ +getParsedBody(); + $output = [ + 'pie_id' => $pie_id, + 'input' => $body, + 'edited' => false + ]; + error_log(var_export($output,true).PHP_EOL,3,'/logs/pies'); + try { + $pie = $pieService->getById($pie_id); + $pieService->edit($pie, (array) $body); + $output['edited'] = true; + } catch (EmptyResult) {} + return $this->withJson($response, $output); + } +} diff --git a/app/src/Controller/Ventas.php b/app/src/Controller/Ventas.php index c0c7794..5bb5bf3 100644 --- a/app/src/Controller/Ventas.php +++ b/app/src/Controller/Ventas.php @@ -71,6 +71,11 @@ class Ventas } return $view->render($response, 'ventas.propiedades.edit', compact('propiedad', 'proyecto', 'tiposUnidades', 'unidades', 'venta')); } + public function pie(ServerRequestInterface $request, ResponseInterface $response, View $view, Service\Venta $service, int $venta_id): ResponseInterface + { + $venta = $service->getById($venta_id); + return $view->render($response, 'ventas.pies.edit', compact('venta')); + } public function add(ServerRequestInterface $request, ResponseInterface $response, View $view, Repository\Region $regionRepository, Repository\Proyecto $proyectoRepository): ResponseInterface { $regiones = $regionRepository->fetchAll(); diff --git a/app/src/Service/Venta/Pie.php b/app/src/Service/Venta/Pie.php index 3c07a0a..bdbacfc 100644 --- a/app/src/Service/Venta/Pie.php +++ b/app/src/Service/Venta/Pie.php @@ -27,4 +27,8 @@ class Pie { return $this->cuotaService->add($data); } + public function edit(Model\Venta\Pie $pie, array $data): Model\Venta\Pie + { + return $this->pieRepository->edit($pie, $data); + } } From dc7a39e19351befd45c7ff64c6cc2bbf1b5a910f Mon Sep 17 00:00:00 2001 From: Aldarien Date: Wed, 29 Nov 2023 22:31:53 -0300 Subject: [PATCH 054/163] Output cron execution --- cli/crontab | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cli/crontab b/cli/crontab index e41ff5a..9296d00 100644 --- a/cli/crontab +++ b/cli/crontab @@ -1,8 +1,8 @@ -0 2 * * * php /code/bin/index.php ventas:cuotas:hoy -0 2 * * * php /code/bin/index.php ventas:cuotas:pendientes -0 2 * * * php /code/bin/index.php ventas:cuotas:vencer -0 2 * * * php /code/bin/index.php ventas:cierres:vigentes -0 2 * * * php /code/bin/index.php proyectos:activos -0 2 * * * php /code/bin/index.php comunas -0 2 * * * php /code/bin/index.php money:uf -0 2 1 * * php /code/bin/index.php money:ipc +0 2 * * * php /code/bin/index.php ventas:cuotas:hoy 2>&1 >> /logs/commands +0 2 * * * php /code/bin/index.php ventas:cuotas:pendientes 2>&1 >> /logs/commands +0 2 * * * php /code/bin/index.php ventas:cuotas:vencer 2>&1 >> /logs/commands +0 2 * * * php /code/bin/index.php ventas:cierres:vigentes 2>&1 >> /logs/commands +0 2 * * * php /code/bin/index.php proyectos:activos 2>&1 >> /logs/commands +0 2 * * * php /code/bin/index.php comunas 2>&1 >> /logs/commands +0 2 * * * php /code/bin/index.php money:uf 2>&1 >> /logs/commands +0 2 1 * * php /code/bin/index.php money:ipc 2>&1 >> /logs/commands From f957d2977970ed5aafaa0e2962f788b5c6f7780f Mon Sep 17 00:00:00 2001 From: Aldarien Date: Wed, 29 Nov 2023 23:02:12 -0300 Subject: [PATCH 055/163] Full command --- CLI.Dockerfile | 4 +-- cli/resources/commands/base.php | 2 ++ cli/src/Command/Full.php | 32 ++++++++++++++++++++ cli/src/Command/Ventas/Cuotas/Pendientes.php | 2 +- 4 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 cli/resources/commands/base.php create mode 100644 cli/src/Command/Full.php diff --git a/CLI.Dockerfile b/CLI.Dockerfile index 0dc75d9..059a50f 100644 --- a/CLI.Dockerfile +++ b/CLI.Dockerfile @@ -1,10 +1,10 @@ -FROM php:8.1-fpm +FROM php:8.2-fpm ENV TZ "America/Santiago" RUN apt-get update && apt-get install -y --no-install-recommends cron && rm -r /var/lib/apt/lists/* -RUN pecl install xdebug-3.1.3 \ +RUN pecl install xdebug-3.2.2 \ && docker-php-ext-enable xdebug COPY ./php-errors.ini /usr/local/etc/php/conf.d/docker-php-errors.ini diff --git a/cli/resources/commands/base.php b/cli/resources/commands/base.php new file mode 100644 index 0000000..3150c18 --- /dev/null +++ b/cli/resources/commands/base.php @@ -0,0 +1,2 @@ +add($app->getContainer()->get(Incoviba\Command\Full::class)); diff --git a/cli/src/Command/Full.php b/cli/src/Command/Full.php new file mode 100644 index 0000000..5c7d9d0 --- /dev/null +++ b/cli/src/Command/Full.php @@ -0,0 +1,32 @@ + $command + ]); + $this->getApplication()->doRun($cmd, $output); + } + return Command::SUCCESS; + } +} diff --git a/cli/src/Command/Ventas/Cuotas/Pendientes.php b/cli/src/Command/Ventas/Cuotas/Pendientes.php index 05f1d0f..576475e 100644 --- a/cli/src/Command/Ventas/Cuotas/Pendientes.php +++ b/cli/src/Command/Ventas/Cuotas/Pendientes.php @@ -12,7 +12,7 @@ class Pendientes extends Command public function execute(Console\Input\InputInterface $input, Console\Output\OutputInterface $output) { $this->logger->debug("Running {$this->getName()}"); - $uri = '/api/ventas/cuotas/pendientes'; + $uri = '/api/ventas/cuotas/pendiente'; $output->writeln("GET {$uri}"); $response = $this->client->get($uri); $output->writeln("Response Code: {$response->getStatusCode()}"); From 68821fb0d30d82729e7eb8a7c2e7fdddb354d442 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Wed, 29 Nov 2023 23:07:50 -0300 Subject: [PATCH 056/163] Changed start location in cli --- CLI.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CLI.Dockerfile b/CLI.Dockerfile index 059a50f..44eb32c 100644 --- a/CLI.Dockerfile +++ b/CLI.Dockerfile @@ -9,7 +9,7 @@ RUN pecl install xdebug-3.2.2 \ COPY ./php-errors.ini /usr/local/etc/php/conf.d/docker-php-errors.ini -WORKDIR /code +WORKDIR /code/bin COPY ./cli/crontab /var/spool/cron/crontabs/root From d0a85b2149e7661bf08d651f6d97c0efec4135ec Mon Sep 17 00:00:00 2001 From: Aldarien Date: Thu, 30 Nov 2023 00:06:21 -0300 Subject: [PATCH 057/163] IPC acumulado desde cli --- app/src/Controller/API/Money.php | 2 +- app/src/Service/IPC.php | 2 +- cli/src/Command/Money/IPC.php | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/src/Controller/API/Money.php b/app/src/Controller/API/Money.php index 28a0b14..61a8ae0 100644 --- a/app/src/Controller/API/Money.php +++ b/app/src/Controller/API/Money.php @@ -92,7 +92,7 @@ class Money if ($end > $now) { return $this->withJson($response, $output); } - $dateKey = "{$start->format('Y-m')}-{$end->format('Y-m')}"; + $dateKey = "{$start->format('Y-m')}|{$end->format('Y-m')}"; $output['date_string'] = $dateKey; $output['ipc'] = $ipcService->get($start, $end); return $this->withJson($response, $output); diff --git a/app/src/Service/IPC.php b/app/src/Service/IPC.php index fcba1b4..044b4ff 100644 --- a/app/src/Service/IPC.php +++ b/app/src/Service/IPC.php @@ -17,7 +17,7 @@ class IPC if ($to > $now) { return 0; } - $dateKey = "{$from->format('Y-m')}-{$to->format('Y-m')}"; + $dateKey = "{$from->format('Y-m')}|{$to->format('Y-m')}"; $ipcs = []; try { $ipcs = json_decode($this->redisService->get($this->redisKey), JSON_OBJECT_AS_ARRAY); diff --git a/cli/src/Command/Money/IPC.php b/cli/src/Command/Money/IPC.php index 081dd36..92e8d86 100644 --- a/cli/src/Command/Money/IPC.php +++ b/cli/src/Command/Money/IPC.php @@ -15,10 +15,11 @@ class IPC extends Command { $this->logger->debug("Running {$this->getName()}"); $lastMonth = (new DateTimeImmutable())->sub(new DateInterval('P1M')); - $uri = '/api/money'; + $endLastYear = (new DateTimeImmutable())->sub(new DateInterval('P1Y')); + $uri = '/api/money/ipc'; $data = [ - 'provider' => 'ipc', - 'fecha' => $lastMonth->format('Y-m-1') + 'start' => $endLastYear->format('Y-12-1'), + 'end' => $lastMonth->format('Y-m-1') ]; $output->writeln("POST {$uri}"); $response = $this->client->post($uri, [ From f2efb41977781a694eca1826c6eaaaa235bec9fc Mon Sep 17 00:00:00 2001 From: Aldarien Date: Thu, 30 Nov 2023 00:24:08 -0300 Subject: [PATCH 058/163] IPC rango y sort --- app/src/Service/IPC.php | 1 + app/src/Service/UF.php | 1 + cli/src/Command/Money/IPC.php | 24 ++++++++++++++---------- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/app/src/Service/IPC.php b/app/src/Service/IPC.php index 044b4ff..b6d6699 100644 --- a/app/src/Service/IPC.php +++ b/app/src/Service/IPC.php @@ -27,6 +27,7 @@ class IPC } catch (EmptyRedis) { $ipc = $this->moneyService->getIPC($from, $to); $ipcs[$dateKey] = $ipc; + ksort($ipcs); $this->redisService->set($this->redisKey, json_encode($ipcs), 60 * 60 * 24 * 30); } return $ipcs[$dateKey]; diff --git a/app/src/Service/UF.php b/app/src/Service/UF.php index 434ba42..48916e3 100644 --- a/app/src/Service/UF.php +++ b/app/src/Service/UF.php @@ -22,6 +22,7 @@ class UF } catch (EmptyRedis) { $uf = $this->moneyService->getUF($date); $ufs[$date->format('Y-m-d')] = $uf; + ksort($ufs); $this->redisService->set($this->redisKey, json_encode($ufs), 60 * 60 * 24 * 30); } return $uf; diff --git a/cli/src/Command/Money/IPC.php b/cli/src/Command/Money/IPC.php index 92e8d86..7ed75b4 100644 --- a/cli/src/Command/Money/IPC.php +++ b/cli/src/Command/Money/IPC.php @@ -17,16 +17,20 @@ class IPC extends Command $lastMonth = (new DateTimeImmutable())->sub(new DateInterval('P1M')); $endLastYear = (new DateTimeImmutable())->sub(new DateInterval('P1Y')); $uri = '/api/money/ipc'; - $data = [ - 'start' => $endLastYear->format('Y-12-1'), - 'end' => $lastMonth->format('Y-m-1') - ]; - $output->writeln("POST {$uri}"); - $response = $this->client->post($uri, [ - 'body' => http_build_query($data), - 'headers' => ['Content-Type' => 'application/x-www-form-urlencoded'] - ]); - $output->writeln("Response Code: {$response->getStatusCode()}"); + $current = new DateTimeImmutable($lastMonth->format('Y-m-d')); + while ($current->diff($endLastYear)->days > 30) { + $data = [ + 'start' => $endLastYear->format('Y-12-1'), + 'end' => $current->format('Y-m-1') + ]; + $output->writeln("POST {$uri}"); + $response = $this->client->post($uri, [ + 'body' => http_build_query($data), + 'headers' => ['Content-Type' => 'application/x-www-form-urlencoded'] + ]); + $output->writeln("Response Code: {$response->getStatusCode()}"); + $current = $current->sub(new DateInterval('P1M')); + } return Console\Command\Command::SUCCESS; } } From 04478afa2fbe5c3fa62c5b48d035d734010715e7 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Thu, 30 Nov 2023 18:40:15 -0300 Subject: [PATCH 059/163] Mejoras en Facturacion --- app/resources/routes/api/proyectos.php | 3 + app/resources/routes/api/ventas/unidades.php | 5 + app/resources/views/proyectos/show.blade.php | 20 +++ .../views/proyectos/terreno/edit.blade.php | 5 + .../views/ventas/facturacion/show.blade.php | 148 ++++++++++++++++-- app/resources/views/ventas/list.blade.php | 28 +++- .../views/ventas/show/escritura.blade.php | 4 + app/src/Controller/API/Proyectos.php | 15 ++ app/src/Controller/API/Ventas/Unidades.php | 15 ++ app/src/Controller/Proyectos.php | 2 +- app/src/Model/Proyecto/Terreno.php | 4 +- app/src/Repository/Proyecto.php | 47 +++++- app/src/Repository/Venta/Unidad.php | 35 +++++ app/src/Service/Proyecto.php | 3 +- 14 files changed, 310 insertions(+), 24 deletions(-) create mode 100644 app/resources/views/proyectos/terreno/edit.blade.php diff --git a/app/resources/routes/api/proyectos.php b/app/resources/routes/api/proyectos.php index 3d8cca7..0dd2495 100644 --- a/app/resources/routes/api/proyectos.php +++ b/app/resources/routes/api/proyectos.php @@ -17,4 +17,7 @@ $app->group('/proyecto/{proyecto_id}', function($app) { $app->get('/disponibles[/]', [Proyectos::class, 'disponibles']); $app->get('[/]', [Proyectos::class, 'unidades']); }); + $app->group('/terreno', function($app) { + $app->post('/edit[/]', [Proyectos::class, 'terreno']); + }); }); diff --git a/app/resources/routes/api/ventas/unidades.php b/app/resources/routes/api/ventas/unidades.php index 01630a7..693f963 100644 --- a/app/resources/routes/api/ventas/unidades.php +++ b/app/resources/routes/api/ventas/unidades.php @@ -4,3 +4,8 @@ use Incoviba\Controller\API\Ventas\Unidades; $app->group('/unidades', function($app) { $app->post('/disponibles', [Unidades::class, 'disponibles']); }); +$app->group('/unidad/{unidad_id}', function($app) { + $app->group('/prorrateo', function($app) { + $app->post('[/]', [Unidades::class, 'prorrateo']); + }); +}); diff --git a/app/resources/views/proyectos/show.blade.php b/app/resources/views/proyectos/show.blade.php index 835b783..568c0ca 100644 --- a/app/resources/views/proyectos/show.blade.php +++ b/app/resources/views/proyectos/show.blade.php @@ -42,6 +42,26 @@     + + + + From 57579a52f143f241778c34a3fc3f5576a0ce28d8 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Fri, 1 Dec 2023 15:00:25 -0300 Subject: [PATCH 062/163] Editar propiedad en venta --- .../api/ventas/propiedades/unidades.php | 4 ++ .../views/ventas/propiedades/edit.blade.php | 69 +++++++++++++++++-- .../API/Ventas/PropiedadesUnidades.php | 32 +++++++++ app/src/Model/Venta/PropiedadUnidad.php | 2 + app/src/Repository/Venta/PropiedadUnidad.php | 7 ++ app/src/Service/Venta/PropiedadUnidad.php | 21 +++++- 6 files changed, 127 insertions(+), 8 deletions(-) diff --git a/app/resources/routes/api/ventas/propiedades/unidades.php b/app/resources/routes/api/ventas/propiedades/unidades.php index d48884e..6cb7871 100644 --- a/app/resources/routes/api/ventas/propiedades/unidades.php +++ b/app/resources/routes/api/ventas/propiedades/unidades.php @@ -1,6 +1,10 @@ group('/unidades', function($app) { + $app->post('/add[/]', [PropiedadesUnidades::class, 'add']); +}); $app->group('/unidad/{pu_id}', function($app) { $app->post('/edit[/]', [PropiedadesUnidades::class, 'edit']); + $app->delete('[/]', [PropiedadesUnidades::class, 'remove']); }); diff --git a/app/resources/views/ventas/propiedades/edit.blade.php b/app/resources/views/ventas/propiedades/edit.blade.php index 00dc589..80ce28d 100644 --- a/app/resources/views/ventas/propiedades/edit.blade.php +++ b/app/resources/views/ventas/propiedades/edit.blade.php @@ -45,7 +45,7 @@ @endsection @@ -72,6 +78,7 @@ { id: {{$unidad->id}}, tipo: '{{ucwords($unidad->proyectoTipoUnidad->tipoUnidad->descripcion)}}', + tipo_id: {{$unidad->proyectoTipoUnidad->tipoUnidad->id}}, descripcion: '{{$unidad->descripcion}}', pid: {{$unidad->pu_id}}, valor: {{($unidad->valor > 0) ? $unidad->valor : $unidad->precio($venta->fecha)->valor}} @@ -99,8 +106,51 @@ addUnidad: function() { $('#add_modal').modal('show') }, + doAddUnidad: function() { + const url = '{{$urls->api}}/ventas/propiedades/unidades/add' + const data = new FormData(document.getElementById('add_form')) + data.set('propiedad', {{$propiedad->id}}) + return fetchAPI(url, {method: 'post', body: data}).then(response => { + if (response.ok) { + return response.json() + } + }).then(json => { + if (!json.added) { + return + } + const tipo = json.propiedad_unidad.proyecto_tipo_unidad.tipo_unidad.descripcion + this.unidades.push({ + id: json.propiedad_unidad.id, + tipo: tipo.charAt(0).toUpperCase() + tipo.slice(1), + tipo_id: json.propiedad_unidad.proyecto_tipo_unidad.tipo_unidad.id, + descripcion: json.propiedad_unidad.descripcion, + pid: json.propiedad_unidad.pu_id, + valor: parseFloat(json.propiedad_unidad.valor) + }) + this.draw() + const idx = this.tipos[json.propiedad_unidad.proyecto_tipo_unidad.tipo_unidad.id].findIndex(unidad => unidad.value === json.propiedad_unidad.id) + this.tipos[json.propiedad_unidad.proyecto_tipo_unidad.tipo_unidad.id].splice(idx,1) + }) + }, removeUnidad: function(unidad_id) { - console.debug(unidad_id) + const url = '{{$urls->api}}/ventas/propiedades/unidad/' + unidad_id + return fetchAPI(url, {method: 'delete'}).then(response => { + if (response.ok) { + return response.json() + } + }).then(json => { + if (!json.removed) { + return + } + const idx = this.unidades.findIndex(unidad => unidad.pid === json.propiedad_unidad_id) + const unidad = this.unidades.splice(idx,1)[0] + this.draw() + this.tipos[unidad.tipo_id].push({ + value: unidad.id, + text: unidad.descripcion, + name: unidad.descripcion + }) + }) }, updatePrecio: function(pid, valor) { const idx = this.unidades.findIndex(unidad => unidad.pid === pid) @@ -113,7 +163,7 @@ } const url = '{{$urls->api}}/ventas/propiedades/unidad/' + id + '/edit' const data = new FormData() - data.set('valor', value) + data.set('valor', valor) return fetchAPI(url, {method: 'post', body: data}).then(response => { if (response.ok) { return response.json() @@ -170,7 +220,11 @@ const unidad_id = $(event.currentTarget).data('pid') this.removeUnidad(unidad_id) }) - $('#add_modal').modal() + $('#add_modal').modal({ + onApprove: ($element) => { + this.doAddUnidad() + } + }) const tipo = $('#tipo') tipo.dropdown() tipo.change(event => { @@ -180,7 +234,8 @@ this.changeTipoUnidad(tipo.val()) $('#add_form').submit(event => { event.preventDefault() - tipo.model('hide') + this.doAddUnidad() + tipo.modal('hide') return false }) $('.precio').change(event => { diff --git a/app/src/Controller/API/Ventas/PropiedadesUnidades.php b/app/src/Controller/API/Ventas/PropiedadesUnidades.php index 9b658c4..74ba123 100644 --- a/app/src/Controller/API/Ventas/PropiedadesUnidades.php +++ b/app/src/Controller/API/Ventas/PropiedadesUnidades.php @@ -7,12 +7,30 @@ use Psr\Http\Message\ResponseInterface; use Incoviba\Controller\API\{withJson, emptyBody}; use Incoviba\Controller\withRedis; use Incoviba\Common\Implement\Exception\{EmptyResult,EmptyRedis}; +use Incoviba\Repository; use Incoviba\Service; class PropiedadesUnidades { use emptyBody, withJson, withRedis; + public function add(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\PropiedadUnidad $propiedadUnidadService): ResponseInterface + { + $body = $request->getParsedBody(); + $output = [ + 'input' => $body, + 'propiedad_unidad' => null, + 'added' => false + ]; + try { + $pu = $propiedadUnidadService->add($body); + $output['propiedad_unidad'] = $pu; + $output['added'] = true; + } catch (EmptyResult $exception) { + error_log($exception); + } + return $this->withJson($response, $output); + } public function edit(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\PropiedadUnidad $propiedadUnidadService, int $pu_id): ResponseInterface { @@ -29,4 +47,18 @@ class PropiedadesUnidades } catch (PDOException | EmptyResult) {} return $this->withJson($response, $output); } + public function remove(ServerRequestInterface $request, ResponseInterface $response, + Repository\Venta\PropiedadUnidad $propiedadUnidadRepository, int $pu_id): ResponseInterface + { + $output = [ + 'propiedad_unidad_id' => $pu_id, + 'removed' => false + ]; + try { + $pu = $propiedadUnidadRepository->fetchById($pu_id); + $propiedadUnidadRepository->remove($pu); + $output['removed'] = true; + } catch (EmptyResult) {} + return $this->withJson($response, $output); + } } diff --git a/app/src/Model/Venta/PropiedadUnidad.php b/app/src/Model/Venta/PropiedadUnidad.php index a1bbb3a..9545477 100644 --- a/app/src/Model/Venta/PropiedadUnidad.php +++ b/app/src/Model/Venta/PropiedadUnidad.php @@ -10,6 +10,8 @@ class PropiedadUnidad extends Unidad public function jsonSerialize(): mixed { return array_merge(parent::jsonSerialize(), [ + 'pu_id' => $this->pu_id, + 'propiedad_id' => $this->propiedad_id, 'valor' => $this->valor ]); } diff --git a/app/src/Repository/Venta/PropiedadUnidad.php b/app/src/Repository/Venta/PropiedadUnidad.php index 9402e5f..0febced 100644 --- a/app/src/Repository/Venta/PropiedadUnidad.php +++ b/app/src/Repository/Venta/PropiedadUnidad.php @@ -86,6 +86,13 @@ class PropiedadUnidad extends Ideal\Repository ->group('`unidad`.`id`'); return $this->fetchMany($query, [$propiedad_id]); } + public function remove(Define\Model $model): void + { + $query = $this->connection->getQueryBuilder() + ->delete()->from($this->getTable()) + ->where("id = ?"); + $this->connection->execute($query, [$model->pu_id]); + } protected function update(Define\Model $model, array $columns, array $data): Define\Model { diff --git a/app/src/Service/Venta/PropiedadUnidad.php b/app/src/Service/Venta/PropiedadUnidad.php index 441f5d7..29000ec 100644 --- a/app/src/Service/Venta/PropiedadUnidad.php +++ b/app/src/Service/Venta/PropiedadUnidad.php @@ -8,7 +8,9 @@ use Incoviba\Model; class PropiedadUnidad { - public function __construct(protected Repository\Venta\PropiedadUnidad $propiedadUnidadRepository, protected Precio $precioService) {} + public function __construct(protected Repository\Venta\PropiedadUnidad $propiedadUnidadRepository, + protected Repository\Venta\Unidad $unidadRepository, + protected Precio $precioService) {} public function getById(int $unidad_id): Model\Venta\PropiedadUnidad { @@ -22,6 +24,23 @@ class PropiedadUnidad { return array_map([$this, 'process'], $this->propiedadUnidadRepository->fetchByPropiedad($propiedad_id)); } + public function add(array $data): Model\Venta\PropiedadUnidad + { + $unidad = $this->unidadRepository->fetchById($data['unidad']); + $temp = json_decode(json_encode($unidad), JSON_OBJECT_AS_ARRAY); + $columnMap = [ + 'proyecto_tipo_unidad' => 'pt' + ]; + foreach ($temp as $key => $value) { + if (isset($columnMap[$key])) { + $temp[$columnMap[$key]] = $value['id']; + } + } + $temp['propiedad'] = $data['propiedad']; + $temp['valor'] = $data['valor']; + $pu = $this->propiedadUnidadRepository->create($temp); + return $this->process($this->propiedadUnidadRepository->save($pu)); + } public function edit(Model\Venta\PropiedadUnidad $propiedadUnidad, array $data): Model\Venta\PropiedadUnidad { return $this->process($this->propiedadUnidadRepository->edit($propiedadUnidad, $data)); From 377cf51b44c587a5b7df28023e51ee28b200bc7b Mon Sep 17 00:00:00 2001 From: Aldarien Date: Mon, 4 Dec 2023 19:00:21 -0300 Subject: [PATCH 063/163] Editar valor venta --- app/resources/routes/api/ventas.php | 1 + app/resources/views/ventas/edit.blade.php | 104 ++++++++---------- .../views/ventas/propiedades/edit.blade.php | 4 +- app/src/Controller/API/Ventas.php | 17 +++ app/src/Model/Venta.php | 4 +- 5 files changed, 69 insertions(+), 61 deletions(-) diff --git a/app/resources/routes/api/ventas.php b/app/resources/routes/api/ventas.php index 894128d..cd58933 100644 --- a/app/resources/routes/api/ventas.php +++ b/app/resources/routes/api/ventas.php @@ -24,5 +24,6 @@ $app->group('/ventas', function($app) { $app->group('/venta/{venta_id}', function($app) { $app->get('/unidades', [Ventas::class, 'unidades']); $app->get('/comentarios', [Ventas::class, 'comentarios']); + $app->post('[/]', [Ventas::class, 'edit']); $app->get('[/]', [Ventas::class, 'get']); }); diff --git a/app/resources/views/ventas/edit.blade.php b/app/resources/views/ventas/edit.blade.php index 8596b77..09c52fb 100644 --- a/app/resources/views/ventas/edit.blade.php +++ b/app/resources/views/ventas/edit.blade.php @@ -2,7 +2,10 @@ @section('page_content')
    -

    Editar Venta

    +

    Editar Venta - + {{$venta->proyecto()->descripcion}} - + {{$venta->propiedad()->summary()}} +

    @@ -29,66 +32,53 @@ @push('page_scripts') @endpush diff --git a/app/resources/views/ventas/propiedades/edit.blade.php b/app/resources/views/ventas/propiedades/edit.blade.php index 80ce28d..e54d5d9 100644 --- a/app/resources/views/ventas/propiedades/edit.blade.php +++ b/app/resources/views/ventas/propiedades/edit.blade.php @@ -158,10 +158,10 @@ return } const old_value = this.unidades[idx].valor - if (old_value === parseFloat(value)) { + if (old_value === parseFloat(valor)) { return } - const url = '{{$urls->api}}/ventas/propiedades/unidad/' + id + '/edit' + const url = '{{$urls->api}}/ventas/propiedades/unidad/' + pid + '/edit' const data = new FormData() data.set('valor', valor) return fetchAPI(url, {method: 'post', body: data}).then(response => { diff --git a/app/src/Controller/API/Ventas.php b/app/src/Controller/API/Ventas.php index 770cc12..ab29f17 100644 --- a/app/src/Controller/API/Ventas.php +++ b/app/src/Controller/API/Ventas.php @@ -189,6 +189,23 @@ class Ventas } return $this->withJson($response, $output); } + public function edit(ServerRequestInterface $request, ResponseInterface $response, Repository\Venta $ventaRepository, int $venta_id): ResponseInterface + { + $body = $request->getParsedBody(); + $output = [ + 'venta_id' => $venta_id, + 'input' => $body, + 'edited' => false + ]; + try { + $venta = $ventaRepository->fetchById($venta_id); + $body['valor_uf'] = $body['valor']; + $body['fecha'] = (new DateTimeImmutable($body['fecha']))->format('Y-m-d'); + $ventaRepository->edit($venta, $body); + $output['edited'] = true; + } catch (EmptyResult) {} + return $this->withJson($response, $output); + } public function unidades(ServerRequestInterface $request, ResponseInterface $response, Service\Redis $redisService, Service\Venta\Unidad $unidadService, int $venta_id): ResponseInterface { diff --git a/app/src/Model/Venta.php b/app/src/Model/Venta.php index fa2610c..a9f8098 100644 --- a/app/src/Model/Venta.php +++ b/app/src/Model/Venta.php @@ -75,10 +75,10 @@ class Venta extends Ideal\Model if (!isset($this->valor_util)) { $sum = $this->valor; $sum -= array_reduce($this->propiedad()->estacionamientos(), function(float $sum, Venta\Unidad $unidad) { - return $unidad->precio($this->fecha)->valor; + return $unidad->valor ?? $unidad->precio($this->fecha)->valor; }, 0); $sum -= array_reduce($this->propiedad()->bodegas(), function(float $sum, Venta\Unidad $unidad) { - return $unidad->precio($this->fecha)->valor; + return $unidad->valor ?? $unidad->precio($this->fecha)->valor; }, 0); $this->valor_util = $sum; } From 9aa4e0ae1d2f0ac27e4bab9cd386350cd7318345 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Mon, 4 Dec 2023 19:08:26 -0300 Subject: [PATCH 064/163] FIX: UF/m2 con valor venta --- app/resources/views/ventas/show/propiedad.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/resources/views/ventas/show/propiedad.blade.php b/app/resources/views/ventas/show/propiedad.blade.php index 745b298..33695b5 100644 --- a/app/resources/views/ventas/show/propiedad.blade.php +++ b/app/resources/views/ventas/show/propiedad.blade.php @@ -47,7 +47,7 @@
    diff --git a/app/resources/views/ventas/show/forma_pago/subsidio.blade.php b/app/resources/views/ventas/show/forma_pago/subsidio.blade.php index 1f0dab4..c090946 100644 --- a/app/resources/views/ventas/show/forma_pago/subsidio.blade.php +++ b/app/resources/views/ventas/show/forma_pago/subsidio.blade.php @@ -6,9 +6,11 @@ > Subsidio @if ($subsidio !== null) - - - + + + + + @else diff --git a/app/src/Controller/API/Ventas/Escrituras.php b/app/src/Controller/API/Ventas/Escrituras.php new file mode 100644 index 0000000..1776fc4 --- /dev/null +++ b/app/src/Controller/API/Ventas/Escrituras.php @@ -0,0 +1,38 @@ +getParsedBody(); + $output = [ + 'venta_id' => $venta_id, + 'input' => $body, + 'edited' => false + ]; + try { + $venta = $ventaService->getById($venta_id); + $estado = $venta->currentEstado(); + if (!in_array($estado->tipoEstadoVenta->descripcion, ['escriturando', 'firmado por inmobiliaria'])) { + throw new EmptyResult(''); + } + $body['fecha'] = (new DateTimeImmutable($body['fecha']))->format('Y-m-d'); + $estadoVentaRepository->edit($estado, $body); + $output['edited'] = true; + } catch (EmptyResult) {} + return $this->withJson($response, $output); + } +} diff --git a/app/src/Controller/Ventas/Escrituras.php b/app/src/Controller/Ventas/Escrituras.php new file mode 100644 index 0000000..9437d9a --- /dev/null +++ b/app/src/Controller/Ventas/Escrituras.php @@ -0,0 +1,16 @@ +getById($venta_id); + return $view->render($response, 'ventas.escrituras.show', compact('venta')); + } +} diff --git a/app/src/Controller/Ventas/Estados.php b/app/src/Controller/Ventas/Estados.php new file mode 100644 index 0000000..4e8782f --- /dev/null +++ b/app/src/Controller/Ventas/Estados.php @@ -0,0 +1,17 @@ +getById($venta_id); + return $view->render($response, 'ventas.estado', compact('venta')); + } +} From f362054ea713a79999f7ce63afcf8cc8e16df15c Mon Sep 17 00:00:00 2001 From: Aldarien Date: Tue, 12 Dec 2023 12:47:58 -0300 Subject: [PATCH 067/163] Install --- .key.env.sample | 1 + app/.adminer.env.sample | 1 + app/.db.env.sample | 4 ++++ app/.env.sample | 11 +++++++++++ app/.redis.env.sample | 0 cli/.env.sample | 2 ++ install.sh | 17 +++++++++++++++++ 7 files changed, 36 insertions(+) create mode 100644 .key.env.sample create mode 100644 app/.adminer.env.sample create mode 100644 app/.db.env.sample create mode 100644 app/.env.sample create mode 100644 app/.redis.env.sample create mode 100644 cli/.env.sample create mode 100644 install.sh diff --git a/.key.env.sample b/.key.env.sample new file mode 100644 index 0000000..48204cd --- /dev/null +++ b/.key.env.sample @@ -0,0 +1 @@ +API_KEY= diff --git a/app/.adminer.env.sample b/app/.adminer.env.sample new file mode 100644 index 0000000..b44b711 --- /dev/null +++ b/app/.adminer.env.sample @@ -0,0 +1 @@ +ADMINER_DESIGN=dracula diff --git a/app/.db.env.sample b/app/.db.env.sample new file mode 100644 index 0000000..6e2de9c --- /dev/null +++ b/app/.db.env.sample @@ -0,0 +1,4 @@ +MYSQL_ROOT_PASSWORD= +MYSQL_DATABASE= +MYSQL_USER= +MYSQL_PASSWORD= diff --git a/app/.env.sample b/app/.env.sample new file mode 100644 index 0000000..3483fc3 --- /dev/null +++ b/app/.env.sample @@ -0,0 +1,11 @@ +APP_URL= + +MYSQL_HOST=db + +COOKIE_NAME= +COOKIE_DOMAIN= +COOKIE_PATH=/ +MAX_LOGIN_HOURS=120 + +REDIS_HOST=redis +REDIS_PORT=6379 diff --git a/app/.redis.env.sample b/app/.redis.env.sample new file mode 100644 index 0000000..e69de29 diff --git a/cli/.env.sample b/cli/.env.sample new file mode 100644 index 0000000..8666955 --- /dev/null +++ b/cli/.env.sample @@ -0,0 +1,2 @@ +APP_NAME=incoviba_cli +API_URL=http://proxy/api diff --git a/install.sh b/install.sh new file mode 100644 index 0000000..471e0d1 --- /dev/null +++ b/install.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +#docker run --rm -it -v ${PWD}/app:/app composer install +#docker run --rm -it -v ${PWD}/cli:/app composer install + +find ./app -name "*.env.sample" | cat -n | while read n f; do + echo ./app/"$n" + #cp "$f" ./app/"$n" +done + +#cp ./cli/.env.sample ./cli/.env + +#cp ./.env.sample ./.env + +#echo "API_KEY=$(docker run --rm -it nginx openssl rand -hex 64)" > ./.key.env +#printf "MYSQL_ROOT_PASSWORD=%s\nMYSQL_DATABASE=incoviba\nMYSQL_USER=incoviba\nMYSQL_PASSWORD=%s" "$(docker run --rm -it nginx openssl rand -hex 16)" "$(docker run --rm -it nginx openssl rand -hex 64)" > ./app/.db.env + From e38fdd20ee86811ef532fa48c2acf1bcafd2cf26 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Tue, 12 Dec 2023 12:53:32 -0300 Subject: [PATCH 068/163] FIX: install --- install.sh | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/install.sh b/install.sh index 471e0d1..8402402 100644 --- a/install.sh +++ b/install.sh @@ -1,17 +1,16 @@ #!/bin/bash -#docker run --rm -it -v ${PWD}/app:/app composer install -#docker run --rm -it -v ${PWD}/cli:/app composer install +docker run --rm -it -v ${PWD}/app:/app composer install +docker run --rm -it -v ${PWD}/cli:/app composer install find ./app -name "*.env.sample" | cat -n | while read n f; do - echo ./app/"$n" - #cp "$f" ./app/"$n" + cp "$f" "${f%.sample}" done -#cp ./cli/.env.sample ./cli/.env +cp ./cli/.env.sample ./cli/.env -#cp ./.env.sample ./.env +cp ./.env.sample ./.env -#echo "API_KEY=$(docker run --rm -it nginx openssl rand -hex 64)" > ./.key.env -#printf "MYSQL_ROOT_PASSWORD=%s\nMYSQL_DATABASE=incoviba\nMYSQL_USER=incoviba\nMYSQL_PASSWORD=%s" "$(docker run --rm -it nginx openssl rand -hex 16)" "$(docker run --rm -it nginx openssl rand -hex 64)" > ./app/.db.env +echo "API_KEY=$(docker run --rm -it nginx openssl rand -hex 64)" > ./.key.env +printf "MYSQL_ROOT_PASSWORD=%s\nMYSQL_DATABASE=incoviba\nMYSQL_USER=incoviba\nMYSQL_PASSWORD=%s" "$(docker run --rm -it nginx openssl rand -hex 16)" "$(docker run --rm -it nginx openssl rand -hex 64)" > ./app/.db.env From d699f9bf6289129061fb332e5309ca62812a0239 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Tue, 12 Dec 2023 15:56:00 +0000 Subject: [PATCH 069/163] Install executeable --- install.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 install.sh diff --git a/install.sh b/install.sh old mode 100644 new mode 100755 From 8f2f90aca270b3e350c2f75fd294e46389ad23fc Mon Sep 17 00:00:00 2001 From: Aldarien Date: Tue, 12 Dec 2023 20:19:15 -0300 Subject: [PATCH 070/163] FIX: .env --- .env.sample | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.env.sample b/.env.sample index ea98faf..91c2a2f 100644 --- a/.env.sample +++ b/.env.sample @@ -1,3 +1,6 @@ -COMPOSE_PROFILES=app,db +COMPOSE_PATH_SEPARATOR=: +COMPOSE_FILE=./docker-compose.yml:./adminer-compose.yml +COMPOSE_PROFILES=app,db,cli,cache APP_PATH=./app +CLI_PATH=./cli APP_PORT=8080 From 8b9b02825a917a0d8f3587f55e3afe60b84a3a9a Mon Sep 17 00:00:00 2001 From: Aldarien Date: Wed, 13 Dec 2023 12:44:32 -0300 Subject: [PATCH 071/163] FIX: Precio Unidad no existe --- app/resources/views/ventas/show/propiedad.blade.php | 2 +- app/src/Model/Venta/Unidad.php | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/resources/views/ventas/show/propiedad.blade.php b/app/resources/views/ventas/show/propiedad.blade.php index 33695b5..bd67195 100644 --- a/app/resources/views/ventas/show/propiedad.blade.php +++ b/app/resources/views/ventas/show/propiedad.blade.php @@ -47,7 +47,7 @@ @foreach($venta->propiedad()->unidades as $unidad) + @php + $precio = $unidad->precio($venta->fecha) ? $unidad->precio($venta->fecha)->valor : 0; + @endphp @@ -95,18 +101,34 @@ - + + + + + + + + +
    Tipo UnidadValor
    {{ucwords($unidad->proyectoTipoUnidad->tipoUnidad->descripcion)}} {{$unidad->descripcion}} +
    + +
    UF
    +
    +     		- Piso Metros vendibles PrecioValor Venta UF/m² Orientacion
    {{$format->ufs($unidad->precio($venta->fecha)->valor)}} + {{$format->ufs($unidad->valor)}} + @if ($unidad->proyectoTipoUnidad->tipoUnidad->descripcion === 'departamento') {{$format->number($unidad->precio($venta->fecha)->valor / $unidad->proyectoTipoUnidad->vendible(), 2)}} UF/m² diff --git a/app/src/Controller/Ventas.php b/app/src/Controller/Ventas.php index 1be7461..c0c7794 100644 --- a/app/src/Controller/Ventas.php +++ b/app/src/Controller/Ventas.php @@ -69,7 +69,7 @@ class Ventas $tiposUnidades []= $unidad->proyectoTipoUnidad->tipoUnidad; } } - return $view->render($response, 'ventas.propiedades.edit', compact('propiedad', 'proyecto', 'tiposUnidades', 'unidades', 'venta_id')); + return $view->render($response, 'ventas.propiedades.edit', compact('propiedad', 'proyecto', 'tiposUnidades', 'unidades', 'venta')); } public function add(ServerRequestInterface $request, ResponseInterface $response, View $view, Repository\Region $regionRepository, Repository\Proyecto $proyectoRepository): ResponseInterface { From fe3055708ffad271fea4af90ff3bccdb2a4463f5 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Wed, 29 Nov 2023 20:56:00 -0300 Subject: [PATCH 046/163] FIX: precio->valor --- app/resources/views/ventas/propiedades/edit.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/resources/views/ventas/propiedades/edit.blade.php b/app/resources/views/ventas/propiedades/edit.blade.php index 11c1788..00dc589 100644 --- a/app/resources/views/ventas/propiedades/edit.blade.php +++ b/app/resources/views/ventas/propiedades/edit.blade.php @@ -28,7 +28,7 @@ {{$unidad->descripcion}}
    - +
    UF
    Terreno + + + + + + +
    + {{$format->number($proyecto->terreno->superficie, 2)}}m² + + {{$format->pesos($proyecto->terreno->valor)}} ({{$proyecto->terreno->fecha?->format('d-m-Y')}}) + + + + +
    +
    Superficies diff --git a/app/resources/views/proyectos/terreno/edit.blade.php b/app/resources/views/proyectos/terreno/edit.blade.php new file mode 100644 index 0000000..d1164c2 --- /dev/null +++ b/app/resources/views/proyectos/terreno/edit.blade.php @@ -0,0 +1,5 @@ +@extends('layout.base') + +@push('page_content') + +@endpush diff --git a/app/resources/views/ventas/facturacion/show.blade.php b/app/resources/views/ventas/facturacion/show.blade.php index 9a9947a..68bfc92 100644 --- a/app/resources/views/ventas/facturacion/show.blade.php +++ b/app/resources/views/ventas/facturacion/show.blade.php @@ -13,6 +13,9 @@ {{$venta->propiedad()->summary()}} +
    + Valor Venta: {{$format->ufs($venta->valor)}} +
    @@ -27,13 +30,37 @@ @foreach ($venta->propiedad()->unidades as $unidad)
    -
    +
    UF
    @endforeach
    +
    + @foreach($venta->propiedad()->unidades as $unidad) +
    + @if ($unidad->prorrateo === 0.0) + +
    + +
    %
    +
    + @endif +
    + @endforeach +
    +
    + @php $lastDic = new DateTimeImmutable((new DateTimeImmutable())->sub(new DateInterval('P1Y'))->format('31-12-Y')); @endphp + @if (!isset($venta->proyecto()->terreno->fecha) or $venta->proyecto()->terreno->fecha < $lastDic) +
    + +
    +
    $
    + +
    +
    + @endif
    @@ -44,7 +71,7 @@ {{mb_strtoupper($venta->proyecto()->inmobiliaria()->nombreCompleto())}}
    GIRO:
    - Dirección: + Dirección: {{$venta->proyecto()->direccion()->simple()}}
    @@ -148,12 +175,14 @@ totales: {}, proporcion: 1, precio: {{$UF->transform($venta->currentEstado()->fecha, $venta->valor)}}, - terreno: {{$IPC->readjust($venta->proyecto()->terreno->valor, $venta->proyecto()->terreno->date, $venta->currentEstado()->fecha)}}, + terreno: {{(isset($venta->proyecto()->terreno->fecha) and $venta->proyecto()->terreno->fecha > $lastDic) ? + $IPC->readjust($venta->proyecto()->terreno->valor, $venta->proyecto()->terreno->fecha, $venta->currentEstado()->fecha) : 0}}, uf: {{$UF->get($venta->currentEstado()->fecha)}}, unidades: JSON.parse('{!! json_encode(array_map(function(Incoviba\Model\Venta\PropiedadUnidad $unidad) use ($venta, $UF, $format) { $precio = ($unidad->valor > 0) ? $unidad->valor : $unidad->precio($venta->currentEstado()->fecha)->valor; return [ - 'pu_id' => $unidad->pu_id, + 'id' => $unidad->id, + 'pid' => $unidad->pu_id, 'descripcion' => ucwords($unidad->proyectoTipoUnidad->tipoUnidad->descripcion) . ' ' . $unidad->descripcion, 'precio' => $precio, 'base' => $UF->transform($venta->currentEstado()->fecha, $precio), @@ -168,6 +197,8 @@ const percentFormatter = new Intl.NumberFormat('es-CL', {maximumFractionDigits: 5, minimumFractionDigits: 5}) let terreno = 0 let prorrateo = 0 + let totalUnidades = 0 + let precioUnidades = 0 let c = 1 const classes = [ '', @@ -178,6 +209,8 @@ 'right aligned' ] this.unidades.forEach(unidad => { + totalUnidades += unidad.base + precioUnidades += unidad.precio const descuento = this.terreno * unidad.prorrateo terreno += descuento prorrateo += unidad.prorrateo @@ -203,6 +236,13 @@ }) tbody.append(row) }) + $('#total_unidades') + .attr('class', 'ui compact segment ' + ((totalUnidades.toFixed(2) !== this.precio.toFixed(2)) ? 'inverted red' : 'inverted green')) + .html('Total Unidades: ' + ufFormatter.format(precioUnidades) + ' UF' + + ((totalUnidades.toFixed(2) !== this.precio.toFixed(2)) ? '; Diferencia: ' + ufFormatter.format({{$venta->valor}} - precioUnidades) + ' UF' : '')) + if (totalUnidades.toFixed(2) !== this.precio.toFixed(2)) { + this.highlight() + } const bruto = this.precio - terreno const base = bruto / 1.19 const iva = base * .19 @@ -210,15 +250,16 @@ const total = subtotal + terreno const totalUF = total / this.uf + const emptyTerreno = '
    0
    ' const data = [ c, - 'Valor con Terreno ' + pesoFormatter.format((base + terreno) * this.proporcion) + ' - Menos valor terreno ' + pesoFormatter.format(-terreno * this.proporcion) + '
    ' + + 'Valor con Terreno ' + pesoFormatter.format((base + terreno) * this.proporcion) + ' - Menos valor terreno ' + ((terreno > 0) ? pesoFormatter.format(-terreno * this.proporcion) : emptyTerreno) + '
    ' + 'Base imponible ' + pesoFormatter.format(base * this.proporcion) + '
    ' + 'IVA ' + pesoFormatter.format(iva * this.proporcion) + '
    ' + 'SUBTOTAL ' + pesoFormatter.format(subtotal * this.proporcion) + '
    ' + - 'Mas valor terreno ' + pesoFormatter.format(terreno * this.proporcion) + '
    ' + + 'Mas valor terreno ' + ((terreno > 0) ? pesoFormatter.format(terreno * this.proporcion) : emptyTerreno) + '
    ' + 'TOTAL ' + pesoFormatter.format(total * this.proporcion) + ';' + ufFormatter.format(totalUF * this.proporcion) + ' UF

    ' + - 'Descuento Terreno: ' + percentFormatter.format(prorrateo * 100) + '%

    ' + + 'Descuento Terreno: ' + ((terreno > 0) ? percentFormatter.format(prorrateo * 100) : emptyTerreno) + '%

    ' + 'UF: ' + ufFormatter.format(this.uf), '1 UNID', pesoFormatter.format(terreno * this.proporcion), @@ -244,7 +285,8 @@ update: function() { return { price: (id, value) => { - const idx = this.unidades.findIndex(unidad => unidad.pu_id === id) + this.unhighlight() + const idx = this.unidades.findIndex(unidad => unidad.pid === id) if (idx === -1) { return } @@ -263,11 +305,59 @@ if (!json.edited) { return } - const idx = this.unidades.findIndex(unidad => unidad.pu_id === json.propiedad_unidad_id) + const idx = this.unidades.findIndex(unidad => unidad.pid === json.propiedad_unidad_id) this.unidades[idx].precio = parseInt(json.input.valor) this.unidades[idx].base = parseFloat(json.input.valor * this.unidades[idx].base / old_value) this.build() }) + }, + terreno: value => { + const url = '{{$urls->api}}/proyecto/{{$venta->proyecto()->id}}/terreno/edit' + const data = new FormData() + data.set('valor', value) + data.set('fecha', '{{$lastDic->format('Y-m-d')}}') + return fetchAPI(url, {method: 'post', body: data}).then(response => { + if (response.ok) { + return response.json() + } + }).then(json => { + if (!json.edited) { + return + } + this.terreno = parseInt(json.input.valor) + const data = new FormData() + data.set('start', '{{$lastDic->format('Y-m-d')}}') + data.set('end', '{{$venta->currentEstado()->fecha->sub(new DateInterval('P1M'))->format('Y-m-d')}}') + const url = '{{$urls->api}}/money/ipc' + return fetchAPI(url, {method: 'post', body: data}).then(response => { + if (response.ok) { + return response.json() + } + }).then(json => { + this.terreno *= (1 + parseFloat(json.ipc)) + this.build() + }) + }) + }, + prorrateo: (id, value) => { + if (parseFloat(value) === 0) { + return + } + const url = '{{$urls->api}}/ventas/unidad/' + id + '/prorrateo' + const data = new FormData() + data.set('prorrateo', value) + return fetchAPI(url, {method: 'post', body: data}).then(response => { + if (response.ok) { + return response.json() + } + }).then(json => { + if (!json.edited) { + return + } + const idx = this.unidades.findIndex(unidad => unidad.id === json.unidad_id) + this.unidades[idx].prorrateo = parseFloat(json.input.prorrateo) + this.build() + }) } } }, @@ -283,16 +373,46 @@ this.build() }) }, - prices: (class_name) => { + prices: class_name => { $(class_name).change(event => { const val = $(event.currentTarget).val() const id = $(event.currentTarget).data('id') this.update().price(id, val) }) + }, + prorrateo: class_name => { + $(class_name).change(event => { + const val = $(event.currentTarget).val() + const id = $(event.currentTarget).data('id') + this.update().prorrateo(id, val) + }) + }, + terreno: id => { + $(id).change(event => { + const val = $(event.currentTarget).val() + this.update().terreno(val).then(() => { + $(id).parent().parent().hide() + }) + }) } } }, - setup: function({form_id, tbody_id, input_id, prices_class, totales_ids}) { + highlight: function() { + const pid = this.unidades[0].pid + const input = $('#input' + pid) + input.addClass('error') + input.find('.label').addClass('red') + input.attr('data-content', 'Valor total no es igual a valor de venta') + input.popup() + }, + unhighlight: function() { + const pid = this.unidades[0].pid + const input = $('#input' + pid) + input.removeClass('error') + input.find('.label').removeClass('red') + input.removeAttr('data-content') + }, + setup: function({form_id, tbody_id, input_id, prices_class, prorrateo_class, terreno_id, totales_ids}) { $(form_id).submit(event => { event.preventDefault() return false @@ -302,12 +422,16 @@ this.proporcion = $(input_id).val() / 100 this.watch().proporcion(input_id) this.watch().prices(prices_class) + this.watch().prorrateo(prorrateo_class) + @if (!isset($venta->proyecto()->terreno->fecha) or $venta->proyecto()->terreno->fecha <= $lastDic) + this.watch().terreno(terreno_id) + @endif this.build() } } $(document).ready(() => { factura.setup({form_id: '#venta_form', tbody_id: '#unidades', input_id: '#proporcion', - prices_class: '.price', totales_ids: { + prices_class: '.price', prorrateo_class: '.prorrateo', terreno_id: '#terreno', totales_ids: { afecto: '#neto', exento: '#exento', iva: '#iva', diff --git a/app/resources/views/ventas/list.blade.php b/app/resources/views/ventas/list.blade.php index 0ff7a14..d4ebaed 100644 --- a/app/resources/views/ventas/list.blade.php +++ b/app/resources/views/ventas/list.blade.php @@ -112,15 +112,15 @@ } }).then(data => { if (data.total > 0) { + const progress = this.draw().progress(data.ventas.length) this.data.id = data.proyecto.id this.data.proyecto = data.proyecto.descripcion this.data.venta_ids = data.ventas const promises = [] data.ventas.forEach(venta_id => { - const promise = this.get().venta(venta_id) - /*promise.then(() => { - this.draw().ventas(true) - })*/ + const promise = this.get().venta(venta_id).then(() => { + progress.progress('increment') + }) promises.push(promise) }) Promise.all(promises).then(() => { @@ -185,6 +185,26 @@ parent.show() parent.find('.item.proyecto').click(this.actions().get) }, + progress: cantidad => { + const parent = $(this.ids.proyectos) + parent.html('') + const progress = $('
    ').addClass('ui active progress').append( + $('
    ').addClass('bar').append( + $('
    ').addClass('centered progress') + ) + ).append( + $('
    ').addClass('label').html('Cargando datos') + ) + progress.progress({ + total: cantidad, + label: 'ratio', + text: { + ratio: '{value} de {total} ({percent}%)' + } + }) + parent.append(progress) + return progress + }, ventas: (loading = false) => { const title = $(this.ids.title) const parent = $(this.ids.proyectos) diff --git a/app/resources/views/ventas/show/escritura.blade.php b/app/resources/views/ventas/show/escritura.blade.php index c8beaa4..98d2112 100644 --- a/app/resources/views/ventas/show/escritura.blade.php +++ b/app/resources/views/ventas/show/escritura.blade.php @@ -12,6 +12,10 @@ Firmar +
    + + Factura +
    @else
    diff --git a/app/src/Controller/API/Proyectos.php b/app/src/Controller/API/Proyectos.php index cff4441..616b6eb 100644 --- a/app/src/Controller/API/Proyectos.php +++ b/app/src/Controller/API/Proyectos.php @@ -140,4 +140,19 @@ class Proyectos } return $this->withJson($response, $output); } + public function terreno(ServerRequestInterface $request, ResponseInterface $response, Repository\Proyecto $proyectoRepository, int $proyecto_id): ResponseInterface + { + $body = $request->getParsedBody(); + $output = [ + 'input' => $body, + 'proyecto_id' => $proyecto_id, + 'edited' => false + ]; + try { + $proyecto = $proyectoRepository->fetchById($proyecto_id); + $proyectoRepository->editTerreno($proyecto, $body); + $output['edited'] = true; + } catch (EmptyResult) {} + return $this->withJson($response, $output); + } } diff --git a/app/src/Controller/API/Ventas/Unidades.php b/app/src/Controller/API/Ventas/Unidades.php index 1d29f81..aa0ced4 100644 --- a/app/src/Controller/API/Ventas/Unidades.php +++ b/app/src/Controller/API/Ventas/Unidades.php @@ -83,4 +83,19 @@ class Unidades } return $this->withJson($response, $output); } + public function prorrateo(ServerRequestInterface $request, ResponseInterface $response, Repository\Venta\Unidad $unidadRepository, int $unidad_id): ResponseInterface + { + $body = $request->getParsedBody(); + $output = [ + 'unidad_id' => $unidad_id, + 'input' => $body, + 'edited' => false + ]; + try { + $unidad = $unidadRepository->fetchById($unidad_id); + $unidadRepository->editProrrateo($unidad, $body); + $output['edited'] = true; + } catch (EmptyResult) {} + return $this->withJson($response, $output); + } } diff --git a/app/src/Controller/Proyectos.php b/app/src/Controller/Proyectos.php index 106de6b..80e7bae 100644 --- a/app/src/Controller/Proyectos.php +++ b/app/src/Controller/Proyectos.php @@ -55,7 +55,7 @@ class Proyectos { $redisKey = "proyecto:{$proyecto_id}"; try { - $proyecto = $proyectoService->getById($proyectoRepository->load((array) $this->fetchRedis($redisService, $redisKey))); + $proyecto = $proyectoService->getById($this->fetchRedis($redisService, $redisKey)->id); } catch (EmptyRedis) { $proyecto = $proyectoService->getById($proyecto_id); $this->saveRedis($redisService, $redisKey, $proyecto); diff --git a/app/src/Model/Proyecto/Terreno.php b/app/src/Model/Proyecto/Terreno.php index adcdaad..4f7a8a5 100644 --- a/app/src/Model/Proyecto/Terreno.php +++ b/app/src/Model/Proyecto/Terreno.php @@ -8,14 +8,14 @@ class Terreno implements JsonSerializable { public float $superficie; public float $valor; - public ?DateTimeInterface $date; + public ?DateTimeInterface $fecha; public function jsonSerialize(): mixed { return [ 'superficie' => $this->superficie, 'valor' => $this->valor, - 'date' => $this->date?->format('Y-m-d') + 'date' => $this->fecha?->format('Y-m-d') ]; } } diff --git a/app/src/Repository/Proyecto.php b/app/src/Repository/Proyecto.php index 6aac760..9d5bdbd 100644 --- a/app/src/Repository/Proyecto.php +++ b/app/src/Repository/Proyecto.php @@ -1,6 +1,8 @@ superficie = $data['superficie_terreno']; $terreno->valor = $data['valor_terreno']; - $terreno->date = null; + $terreno->fecha = null; if (isset($data['fecha_terreno']) and $data['fecha_terreno'] !== '') { - $terreno->date = new DateTimeImmutable($data['fecha_terreno']); + $terreno->fecha = new DateTimeImmutable($data['fecha_terreno']); } return $terreno; })) @@ -71,7 +73,7 @@ class Proyecto extends Ideal\Repository 'subterraneos'], $new_data); } - public function fetchById(int $id): Define\Model + public function fetchById(int $id): Model\Proyecto { $query = $this->connection->getQueryBuilder() ->select($this->columns()) @@ -81,7 +83,7 @@ class Proyecto extends Ideal\Repository return $this->fetchOne($query, [$id]); } - public function fetchByName(string $name): Define\Model + public function fetchByName(string $name): Model\Proyecto { $query = $this->connection->getQueryBuilder() ->select($this->columns()) @@ -116,6 +118,43 @@ class Proyecto extends Ideal\Repository ->order('a.descripcion'); return $this->fetchMany($query); } + public function editTerreno(Model\Proyecto $proyecto, array $data): Model\Proyecto + { + $fecha = new DateTimeImmutable($data['fecha']); + try { + $query = $this->connection->getQueryBuilder() + ->select('valor') + ->from('proyecto_terreno') + ->where('proyecto_id = ? AND fecha = ?'); + $result = $this->connection->execute($query, [$proyecto->id, $fecha->format('Y-m-d')])->fetch(PDO::FETCH_ASSOC); + if ($result === false) { + throw new Implement\Exception\EmptyResult($query); + } + if ($result['valor'] !== $data['valor']) { + $query = $this->connection->getQueryBuilder() + ->update('proyecto_terreno') + ->set('valor = ?') + ->where('proyecto_id = ? AND fecha = ?'); + $this->connection->execute($query, [$data['valor'], $proyecto->id, $fecha->format('Y-m-d')]); + $proyecto->terreno->valor = $data['valor']; + } + } catch (PDOException | Implement\Exception\EmptyResult) { + $query = $this->connection->getQueryBuilder() + ->insert() + ->into('proyecto_terreno') + ->columns(['proyecto_id', 'fecha', 'valor', 'tipo_moneda_id']) + ->values(['?', '?', '?', '1']); + try { + $this->connection->execute($query, [$proyecto->id, $fecha->format('Y-m-d'), $data['valor']]); + $proyecto->terreno->fecha = $fecha; + $proyecto->terreno->valor = $data['valor']; + } catch (PDOException $exception) { + error_log($exception); + throw new Implement\Exception\EmptyResult($query); + } + } + return $proyecto; + } /*public function fetchSuperficieVendido(int $proyecto_id): float { diff --git a/app/src/Repository/Venta/Unidad.php b/app/src/Repository/Venta/Unidad.php index 925425e..21fe4be 100644 --- a/app/src/Repository/Venta/Unidad.php +++ b/app/src/Repository/Venta/Unidad.php @@ -2,6 +2,7 @@ namespace Incoviba\Repository\Venta; use PDO; +use PDOException; use Incoviba\Common\Ideal; use Incoviba\Common\Define; use Incoviba\Common\Implement; @@ -38,6 +39,40 @@ class Unidad extends Ideal\Repository { return $this->update($model, ['subtipo', 'piso', 'descripcion', 'orientacion', 'pt'], $new_data); } + public function editProrrateo(Model\Venta\Unidad $model, array $new_data): Model\Venta\Unidad + { + try { + $query = $this->connection->getQueryBuilder() + ->select('prorrateo') + ->from('unidad_prorrateo') + ->where('unidad_id = ?'); + $result = $this->connection->execute($query, [$model->id])->fetch(PDO::FETCH_ASSOC); + if ($result === false) { + throw new Implement\Exception\EmptyResult($query); + } + if ($new_data['prorrateo'] !== $result['prorrateo']) { + $query = $this->connection->getQueryBuilder() + ->update('unidad_prorrateo') + ->set('prorrateo = ?') + ->where('unidad_id = ?'); + $this->connection->execute($query, [$new_data['prorrateo'], $model->id]); + $model->prorrateo = $new_data['prorrateo']; + } + } catch (PDOException | Implement\Exception\EmptyResult) { + $query = $this->connection->getQueryBuilder() + ->insert() + ->into('unidad_prorrateo') + ->columns(['unidad_id', 'prorrateo']) + ->values(['?', '?']); + try { + $this->connection->execute($query, [$model->id, $new_data['prorrateo']]); + $model->prorrateo = $new_data['prorrateo']; + } catch (PDOException) { + throw new Implement\Exception\EmptyResult($query); + } + } + return $model; + } public function fetchById(int $id): Model\Venta\Unidad { diff --git a/app/src/Service/Proyecto.php b/app/src/Service/Proyecto.php index 70b6332..7ac89db 100644 --- a/app/src/Service/Proyecto.php +++ b/app/src/Service/Proyecto.php @@ -27,7 +27,8 @@ class Proyecto { return $this->process($this->proyectoRepository->fetchByName($name)); } - public function process(Model\Proyecto $proyecto): Model\Proyecto + + protected function process(Model\Proyecto $proyecto): Model\Proyecto { $proyecto->addFactory('estados', (new Implement\Repository\Factory()) ->setCallable([$this->estadoProyecto, 'fetchByProyecto']) From 0eaa09bea04d50d0ab3cce567f57ae0f2e299a05 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Thu, 30 Nov 2023 19:06:59 -0300 Subject: [PATCH 060/163] FIX: Fetch terreno --- .../views/ventas/facturacion/show.blade.php | 2 +- app/src/Model/Proyecto/Terreno.php | 1 + app/src/Repository/Proyecto.php | 14 +++++++------- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/resources/views/ventas/facturacion/show.blade.php b/app/resources/views/ventas/facturacion/show.blade.php index 68bfc92..2d4edad 100644 --- a/app/resources/views/ventas/facturacion/show.blade.php +++ b/app/resources/views/ventas/facturacion/show.blade.php @@ -175,7 +175,7 @@ totales: {}, proporcion: 1, precio: {{$UF->transform($venta->currentEstado()->fecha, $venta->valor)}}, - terreno: {{(isset($venta->proyecto()->terreno->fecha) and $venta->proyecto()->terreno->fecha > $lastDic) ? + terreno: {{(isset($venta->proyecto()->terreno->fecha) and $venta->proyecto()->terreno->fecha >= $lastDic) ? $IPC->readjust($venta->proyecto()->terreno->valor, $venta->proyecto()->terreno->fecha, $venta->currentEstado()->fecha) : 0}}, uf: {{$UF->get($venta->currentEstado()->fecha)}}, unidades: JSON.parse('{!! json_encode(array_map(function(Incoviba\Model\Venta\PropiedadUnidad $unidad) use ($venta, $UF, $format) { diff --git a/app/src/Model/Proyecto/Terreno.php b/app/src/Model/Proyecto/Terreno.php index 4f7a8a5..b76a04b 100644 --- a/app/src/Model/Proyecto/Terreno.php +++ b/app/src/Model/Proyecto/Terreno.php @@ -8,6 +8,7 @@ class Terreno implements JsonSerializable { public float $superficie; public float $valor; + public float $valorUnitario; public ?DateTimeInterface $fecha; public function jsonSerialize(): mixed diff --git a/app/src/Repository/Proyecto.php b/app/src/Repository/Proyecto.php index 9d5bdbd..4cd7150 100644 --- a/app/src/Repository/Proyecto.php +++ b/app/src/Repository/Proyecto.php @@ -38,9 +38,11 @@ class Proyecto extends Ideal\Repository ->setFunction(function($data) { $terreno = new Model\Proyecto\Terreno(); $terreno->superficie = $data['superficie_terreno']; - $terreno->valor = $data['valor_terreno']; + $terreno->valorUnitario = $data['valor_unitario_terreno']; + $terreno->valor = 0; $terreno->fecha = null; if (isset($data['fecha_terreno']) and $data['fecha_terreno'] !== '') { + $terreno->valor = $data['valor_terreno']; $terreno->fecha = new DateTimeImmutable($data['fecha_terreno']); } return $terreno; @@ -61,7 +63,7 @@ class Proyecto extends Ideal\Repository ['inmobiliaria', 'descripcion', 'direccion', 'superficie_terreno', 'valor_terreno', 'corredor', 'superficie_sobre_nivel', 'superficie_bajo_nivel', 'pisos', 'subterraneos'], [$model->inmobiliaria()->rut, $model->descripcion, $model->direccion()->id, $model->terreno->superficie, - $model->terreno->valor, $model->corredor, $model->superficie->sobre_nivel, + $model->terreno->valorUnitario, $model->corredor, $model->superficie->sobre_nivel, $model->superficie->bajo_nivel, $model->pisos, $model->subterraneos] ); return $model; @@ -149,7 +151,6 @@ class Proyecto extends Ideal\Repository $proyecto->terreno->fecha = $fecha; $proyecto->terreno->valor = $data['valor']; } catch (PDOException $exception) { - error_log($exception); throw new Implement\Exception\EmptyResult($query); } } @@ -162,14 +163,13 @@ class Proyecto extends Ideal\Repository protected function columns(): string { - return "a.id, a.inmobiliaria, a.descripcion, a.direccion, a.superficie_terreno, - COALESCE(pt.valor, a.valor_terreno) AS valor_terreno, COALESCE(pt.fecha, '') AS fecha_terreno, a.corredor, + return "a.id, a.inmobiliaria, a.descripcion, a.direccion, a.superficie_terreno, valor_terreno AS valor_unitario_terreno, + COALESCE(pt.valor, '') AS valor_terreno, COALESCE(pt.fecha, '') AS fecha_terreno, a.corredor, a.superficie_sobre_nivel, a.superficie_bajo_nivel, a.pisos, a.subterraneos"; } protected function joinTerreno(): string { - return "LEFT OUTER JOIN (SELECT pt1.* FROM proyecto_terreno pt1 JOIN ( - SELECT MAX(id) AS id, proyecto_id FROM proyecto_terreno) pt0 ON pt0.id = pt1.id) pt ON pt.proyecto_id = a.id"; + return "LEFT OUTER JOIN (SELECT pt1.* FROM proyecto_terreno pt1 JOIN (SELECT MAX(id) AS id, proyecto_id FROM proyecto_terreno GROUP BY proyecto_id) pt0 ON pt0.id = pt1.id) pt ON pt.proyecto_id = a.id"; } protected function joinEstado(): string { From af9c6c51d4a013d9e6c2137621ffffa078abe1cd Mon Sep 17 00:00:00 2001 From: Aldarien Date: Fri, 1 Dec 2023 12:39:26 -0300 Subject: [PATCH 061/163] FIX: active -> activo en tipo_estado_pago --- app/resources/views/ventas/pies/cuotas.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/resources/views/ventas/pies/cuotas.blade.php b/app/resources/views/ventas/pies/cuotas.blade.php index 3ab9460..433c4a8 100644 --- a/app/resources/views/ventas/pies/cuotas.blade.php +++ b/app/resources/views/ventas/pies/cuotas.blade.php @@ -45,7 +45,7 @@ class="green" @elseif ($cuota->pago->currentEstado->tipoEstadoPago->descripcion === 'depositado') class="yellow" - @elseif ($cuota->pago->currentEstado->tipoEstadoPago->active !== 1) + @elseif ($cuota->pago->currentEstado->tipoEstadoPago->activo !== 1) class="red" @endif >{{ucwords($cuota->pago->currentEstado->tipoEstadoPago->descripcion)}}
    		 @if ($unidad->proyectoTipoUnidad->tipoUnidad->descripcion === 'departamento') - {{$format->number($unidad->precio($venta->fecha)->valor / $unidad->proyectoTipoUnidad->vendible(), 2)}} UF/m² + {{$format->number(($unidad->valor ?? $unidad->precio($venta->fecha)->valor) / $unidad->proyectoTipoUnidad->vendible(), 2)}} UF/m² @endif From 43977d1bd966f5a31b8c8095b923198c39c2f913 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Mon, 4 Dec 2023 19:51:44 -0300 Subject: [PATCH 065/163] FIX: IPC no disponible --- app/resources/views/ventas/facturacion/show.blade.php | 8 ++++++++ app/src/Model/Proyecto/Terreno.php | 2 +- app/src/Service/IPC.php | 8 +++++++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/app/resources/views/ventas/facturacion/show.blade.php b/app/resources/views/ventas/facturacion/show.blade.php index 2d4edad..aa40a96 100644 --- a/app/resources/views/ventas/facturacion/show.blade.php +++ b/app/resources/views/ventas/facturacion/show.blade.php @@ -62,6 +62,14 @@ @endif + @if ($IPC->get($venta->proyecto()->terreno->fecha, $venta->currentEstado()->fecha) === 0.0) +
    + +
    + IPC no disponible para este mes. +
    +
    + @endif
    diff --git a/app/src/Model/Proyecto/Terreno.php b/app/src/Model/Proyecto/Terreno.php index b76a04b..cdb1bd8 100644 --- a/app/src/Model/Proyecto/Terreno.php +++ b/app/src/Model/Proyecto/Terreno.php @@ -16,7 +16,7 @@ class Terreno implements JsonSerializable return [ 'superficie' => $this->superficie, 'valor' => $this->valor, - 'date' => $this->fecha?->format('Y-m-d') + 'fecha' => $this->fecha?->format('Y-m-d') ]; } } diff --git a/app/src/Service/IPC.php b/app/src/Service/IPC.php index b6d6699..1c1acfc 100644 --- a/app/src/Service/IPC.php +++ b/app/src/Service/IPC.php @@ -26,6 +26,9 @@ class IPC } } catch (EmptyRedis) { $ipc = $this->moneyService->getIPC($from, $to); + if ($ipc === -1.0) { + return 0; + } $ipcs[$dateKey] = $ipc; ksort($ipcs); $this->redisService->set($this->redisKey, json_encode($ipcs), 60 * 60 * 24 * 30); @@ -34,6 +37,9 @@ class IPC } public function readjust(float $base, DateTimeInterface $from, DateTimeInterface $to = new DateTimeImmutable()):float { - return $base * (1 + $this->get($from, $to->sub(new DateInterval('P1M')))); + if (($ipc = $this->get($from, $to->sub(new DateInterval('P1M')))) === 0.0) { + return 0; + } + return $base * (1 + $ipc); } } From f597d552be3d5151a3b5718f65f1420978e3e40d Mon Sep 17 00:00:00 2001 From: Aldarien Date: Mon, 4 Dec 2023 21:43:57 -0300 Subject: [PATCH 066/163] Edit fecha escritura --- .../routes/api/ventas/escrituras.php | 6 ++ app/resources/routes/ventas/escrituras.php | 6 ++ .../views/ventas/escrituras/show.blade.php | 56 +++++++++++++++++++ .../views/ventas/estado/edit.blade.php | 16 ++++++ .../views/ventas/show/escritura.blade.php | 5 ++ .../ventas/show/forma_pago/bono_pie.blade.php | 8 ++- .../ventas/show/forma_pago/credito.blade.php | 8 ++- .../show/forma_pago/escritura.blade.php | 8 ++- .../ventas/show/forma_pago/pie.blade.php | 8 ++- .../ventas/show/forma_pago/subsidio.blade.php | 8 ++- app/src/Controller/API/Ventas/Escrituras.php | 38 +++++++++++++ app/src/Controller/Ventas/Escrituras.php | 16 ++++++ app/src/Controller/Ventas/Estados.php | 17 ++++++ 13 files changed, 185 insertions(+), 15 deletions(-) create mode 100644 app/resources/routes/api/ventas/escrituras.php create mode 100644 app/resources/routes/ventas/escrituras.php create mode 100644 app/resources/views/ventas/escrituras/show.blade.php create mode 100644 app/resources/views/ventas/estado/edit.blade.php create mode 100644 app/src/Controller/API/Ventas/Escrituras.php create mode 100644 app/src/Controller/Ventas/Escrituras.php create mode 100644 app/src/Controller/Ventas/Estados.php diff --git a/app/resources/routes/api/ventas/escrituras.php b/app/resources/routes/api/ventas/escrituras.php new file mode 100644 index 0000000..e2a65f4 --- /dev/null +++ b/app/resources/routes/api/ventas/escrituras.php @@ -0,0 +1,6 @@ +group('/escritura/{venta_id}', function($app) { + $app->post('/edit[/]', [Escrituras::class, 'edit']); +}); diff --git a/app/resources/routes/ventas/escrituras.php b/app/resources/routes/ventas/escrituras.php new file mode 100644 index 0000000..7a310a9 --- /dev/null +++ b/app/resources/routes/ventas/escrituras.php @@ -0,0 +1,6 @@ +group('/escritura/{venta_id}', function($app) { + $app->get('[/]', [Escrituras::class, 'show']); +}); diff --git a/app/resources/views/ventas/escrituras/show.blade.php b/app/resources/views/ventas/escrituras/show.blade.php new file mode 100644 index 0000000..037fe1c --- /dev/null +++ b/app/resources/views/ventas/escrituras/show.blade.php @@ -0,0 +1,56 @@ +@extends('layout.base') + +@section('page_content') +
    +

    + Escritura - + {{$venta->proyecto()->descripcion}} - + + {{$venta->propiedad()->summary()}} + +

    +
    +
    + +
    +
    + + +
    +
    +
    + +
    +
    +@endsection + +@push('page_scripts') + +@endpush diff --git a/app/resources/views/ventas/estado/edit.blade.php b/app/resources/views/ventas/estado/edit.blade.php new file mode 100644 index 0000000..194ebfc --- /dev/null +++ b/app/resources/views/ventas/estado/edit.blade.php @@ -0,0 +1,16 @@ +@extends('layout.base') + +@section('page_content') +
    +

    + Estado Venta - + {{$venta->proyecto()->descripcion}} - + + {{$venta->propiedad()->summary()}} + +

    +

    + {{$venta->currentEstado()->tipoEstadoVenta->descripcion}} +

    +
    +@endsection diff --git a/app/resources/views/ventas/show/escritura.blade.php b/app/resources/views/ventas/show/escritura.blade.php index 98d2112..cd9ce80 100644 --- a/app/resources/views/ventas/show/escritura.blade.php +++ b/app/resources/views/ventas/show/escritura.blade.php @@ -4,6 +4,11 @@ @if (in_array($venta->currentEstado()->tipoEstadoVenta->descripcion, ['escriturando', 'firmado por inmobiliaria', 'archivado']))
    Escriturado {{$venta->currentEstado()->fecha->format('d-m-Y')}} + + + + + Informe diff --git a/app/resources/views/ventas/show/forma_pago/bono_pie.blade.php b/app/resources/views/ventas/show/forma_pago/bono_pie.blade.php index 06022e3..adae804 100644 --- a/app/resources/views/ventas/show/forma_pago/bono_pie.blade.php +++ b/app/resources/views/ventas/show/forma_pago/bono_pie.blade.php @@ -2,9 +2,11 @@
    		Bono Pie @if ($bonoPie !== null) - - - + + + + + @else diff --git a/app/resources/views/ventas/show/forma_pago/credito.blade.php b/app/resources/views/ventas/show/forma_pago/credito.blade.php index 90c3905..0310043 100644 --- a/app/resources/views/ventas/show/forma_pago/credito.blade.php +++ b/app/resources/views/ventas/show/forma_pago/credito.blade.php @@ -2,9 +2,11 @@ Crédito @if ($credito !== null) - - - + + + + + @else diff --git a/app/resources/views/ventas/show/forma_pago/escritura.blade.php b/app/resources/views/ventas/show/forma_pago/escritura.blade.php index 6d329f1..25be00c 100644 --- a/app/resources/views/ventas/show/forma_pago/escritura.blade.php +++ b/app/resources/views/ventas/show/forma_pago/escritura.blade.php @@ -2,9 +2,11 @@ Escritura @if ($escritura !== null) - - - + + + + + @else diff --git a/app/resources/views/ventas/show/forma_pago/pie.blade.php b/app/resources/views/ventas/show/forma_pago/pie.blade.php index a04255d..06f68a2 100644 --- a/app/resources/views/ventas/show/forma_pago/pie.blade.php +++ b/app/resources/views/ventas/show/forma_pago/pie.blade.php @@ -2,9 +2,11 @@
    Pie - - - + + + + + {{$format->ufs($pie->valor)}} @if ($unidad->proyectoTipoUnidad->tipoUnidad->descripcion === 'departamento') - {{$format->number(($unidad->valor ?? $unidad->precio($venta->fecha)->valor) / $unidad->proyectoTipoUnidad->vendible(), 2)}} UF/m² + {{$format->number(($unidad->valor ?? ($unidad->precio($venta->fecha)->valor ?? 0)) / $unidad->proyectoTipoUnidad->vendible(), 2)}} UF/m² @endif diff --git a/app/src/Model/Venta/Unidad.php b/app/src/Model/Venta/Unidad.php index 05a54fb..176e299 100644 --- a/app/src/Model/Venta/Unidad.php +++ b/app/src/Model/Venta/Unidad.php @@ -3,6 +3,7 @@ namespace Incoviba\Model\Venta; use DateTimeInterface; use Incoviba\Common\Ideal; +use Incoviba\Common\Implement\Exception\EmptyResult; use Incoviba\Model; class Unidad extends Ideal\Model @@ -40,6 +41,9 @@ class Unidad extends Ideal\Model return $min->current->fecha < $precio->current->fecha ? $min : $precio; }); } + if ($precio === null) { + throw new EmptyResult('SELECT * FROM precio WHERE unidad = ? AND fecha = ?'); + } return $precio; } From 94906eea8cd81877783c29dba768b3611da9967a Mon Sep 17 00:00:00 2001 From: Aldarien Date: Wed, 13 Dec 2023 13:03:43 -0300 Subject: [PATCH 072/163] FIX: Precio Unidad no existe --- app/src/Model/Venta/Unidad.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/Model/Venta/Unidad.php b/app/src/Model/Venta/Unidad.php index 176e299..461880b 100644 --- a/app/src/Model/Venta/Unidad.php +++ b/app/src/Model/Venta/Unidad.php @@ -20,7 +20,7 @@ class Unidad extends Ideal\Model public function precio(DateTimeInterface $dateTime): Precio { - if ($dateTime > $this->currentPrecio->current->fecha) { + if ($this->currentPrecio !== null and $dateTime > $this->currentPrecio->current->fecha) { return $this->currentPrecio; } $precio = array_reduce(array_filter($this->precios, function(Precio $precio) use ($dateTime) { From 1ba53c9e129bfceb3cca7d665e09d2ddb62127b8 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Wed, 13 Dec 2023 13:28:19 -0300 Subject: [PATCH 073/163] FIX: Precio Unidad no existe en venta y facturacion --- app/resources/views/ventas/facturacion/show.blade.php | 2 +- app/resources/views/ventas/show/propiedad.blade.php | 7 +++++-- app/src/Model/Venta/Unidad.php | 5 +---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/resources/views/ventas/facturacion/show.blade.php b/app/resources/views/ventas/facturacion/show.blade.php index aa40a96..2efebea 100644 --- a/app/resources/views/ventas/facturacion/show.blade.php +++ b/app/resources/views/ventas/facturacion/show.blade.php @@ -187,7 +187,7 @@ $IPC->readjust($venta->proyecto()->terreno->valor, $venta->proyecto()->terreno->fecha, $venta->currentEstado()->fecha) : 0}}, uf: {{$UF->get($venta->currentEstado()->fecha)}}, unidades: JSON.parse('{!! json_encode(array_map(function(Incoviba\Model\Venta\PropiedadUnidad $unidad) use ($venta, $UF, $format) { - $precio = ($unidad->valor > 0) ? $unidad->valor : $unidad->precio($venta->currentEstado()->fecha)->valor; + $precio = ($unidad->valor > 0) ? $unidad->valor : ($unidad->precio($venta->currentEstado()->fecha) ? $unidad->precio($venta->currentEstado()->fecha)->valor : 0); return [ 'id' => $unidad->id, 'pid' => $unidad->pu_id, diff --git a/app/resources/views/ventas/show/propiedad.blade.php b/app/resources/views/ventas/show/propiedad.blade.php index bd67195..5bba106 100644 --- a/app/resources/views/ventas/show/propiedad.blade.php +++ b/app/resources/views/ventas/show/propiedad.blade.php @@ -23,6 +23,9 @@
    {{ucwords($unidad->proyectoTipoUnidad->tipoUnidad->descripcion)}} @@ -40,14 +43,14 @@ {{$format->number($unidad->proyectoTipoUnidad->vendible(), 2)}} m² - {{$format->ufs($unidad->precio($venta->fecha)->valor)}} + {{$format->ufs($precio)}} {{$format->ufs($unidad->valor)}} @if ($unidad->proyectoTipoUnidad->tipoUnidad->descripcion === 'departamento') - {{$format->number(($unidad->valor ?? ($unidad->precio($venta->fecha)->valor ?? 0)) / $unidad->proyectoTipoUnidad->vendible(), 2)}} UF/m² + {{$format->number(($unidad->valor ?? $precio) / $unidad->proyectoTipoUnidad->vendible(), 2)}} UF/m² @endif diff --git a/app/src/Model/Venta/Unidad.php b/app/src/Model/Venta/Unidad.php index 461880b..a52cd4b 100644 --- a/app/src/Model/Venta/Unidad.php +++ b/app/src/Model/Venta/Unidad.php @@ -18,7 +18,7 @@ class Unidad extends Ideal\Model public array $precios = []; public ?Precio $currentPrecio = null; - public function precio(DateTimeInterface $dateTime): Precio + public function precio(DateTimeInterface $dateTime): ?Precio { if ($this->currentPrecio !== null and $dateTime > $this->currentPrecio->current->fecha) { return $this->currentPrecio; @@ -41,9 +41,6 @@ class Unidad extends Ideal\Model return $min->current->fecha < $precio->current->fecha ? $min : $precio; }); } - if ($precio === null) { - throw new EmptyResult('SELECT * FROM precio WHERE unidad = ? AND fecha = ?'); - } return $precio; } From 379a33a4da67c2955a6b93f7f089aad341885cb6 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Wed, 20 Dec 2023 08:44:49 -0300 Subject: [PATCH 074/163] Escriturar --- app/resources/routes/04_ventas.php | 1 + app/resources/routes/api/ventas.php | 1 + .../views/ventas/escriturar.blade.php | 272 ++++++++++++++++++ .../views/ventas/show/escritura.blade.php | 2 +- app/src/Controller/API/Ventas.php | 14 + app/src/Controller/Ventas.php | 34 ++- app/src/Model/Venta.php | 6 +- app/src/Model/Venta/Pie.php | 26 +- app/src/Repository/Venta/Pie.php | 9 + app/src/Service/Venta.php | 59 ++++ app/src/Service/Venta/Pie.php | 22 +- 11 files changed, 430 insertions(+), 16 deletions(-) create mode 100644 app/resources/views/ventas/escriturar.blade.php diff --git a/app/resources/routes/04_ventas.php b/app/resources/routes/04_ventas.php index 7af89dc..54e3ff3 100644 --- a/app/resources/routes/04_ventas.php +++ b/app/resources/routes/04_ventas.php @@ -28,6 +28,7 @@ $app->group('/venta/{venta_id:[0-9]+}', function($app) { }); $app->get('[/]', [Ventas::class, 'pie']); }); + $app->get('/escriturar[/]', [Ventas::class, 'escriturar']); $app->get('/edit[/]', [Ventas::class, 'edit']); $app->get('[/]', [Ventas::class, 'show']); })->add($app->getContainer()->get(Incoviba\Middleware\Authentication::class)); diff --git a/app/resources/routes/api/ventas.php b/app/resources/routes/api/ventas.php index cd58933..b347220 100644 --- a/app/resources/routes/api/ventas.php +++ b/app/resources/routes/api/ventas.php @@ -24,6 +24,7 @@ $app->group('/ventas', function($app) { $app->group('/venta/{venta_id}', function($app) { $app->get('/unidades', [Ventas::class, 'unidades']); $app->get('/comentarios', [Ventas::class, 'comentarios']); + $app->post('/escriturar', [Ventas::class, 'escriturar']); $app->post('[/]', [Ventas::class, 'edit']); $app->get('[/]', [Ventas::class, 'get']); }); diff --git a/app/resources/views/ventas/escriturar.blade.php b/app/resources/views/ventas/escriturar.blade.php new file mode 100644 index 0000000..1faf1c5 --- /dev/null +++ b/app/resources/views/ventas/escriturar.blade.php @@ -0,0 +1,272 @@ +@extends('layout.base') + +@section('page_content') +
    +

    + Escriturar - {{$venta->proyecto()->descripcion}} - + + {{$venta->propiedad()->summary()}} + +

    +
    +
    +
    Faltante
    +
    {{$format->pesos($venta->saldo('pesos'))}}
    +
    {{$format->ufs($venta->saldo())}}
    +
    +
    +
    +
    +
    + +
    +
    + + +
    +
    +
    + @if ($venta->formaPago()->pie->reajuste === null) +

    Reajuste

    +
    +
    + +
    +
    $
    + +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    + @else +

    Reajuste

    +
    +
    + +
    +
    $
    + +
    +
    +
    + +
    + +
    +
    +
    + @endif + @if (!isset($venta->formaPago()->escritura)) +

    Pago en Escritura

    +
    +
    + +
    +
    $
    + +
    +
    +
    + +
    + +
    UF
    +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    + @else +

    Pago en Escritura

    +
    +
    + +
    +
    $
    + +
    +
    +
    + +
    + +
    UF
    +
    +
    +
    + +
    + +
    +
    +
    + @endif + @if (!isset($venta->formaPago()->subsidio)) +

    Subsidio

    +
    +
    + +
    + +
    UF
    +
    +
    +
    + +
    + +
    UF
    +
    +
    +
    + +
    + +
    UF
    +
    +
    +
    + @else +

    Subsidio

    +
    +
    + +
    + +
    UF
    +
    +
    +
    + +
    + +
    UF
    +
    +
    +
    + @endif + @if (isset($venta->formaPago()->credito) and $venta->formaPago()->credito->pago->banco === null) +

    Crédito

    +
    +
    + +
    + +
    UF
    +
    +
    +
    + + +
    +
    + @else +

    Crédito

    +
    +
    + +
    + +
    UF
    +
    +
    +
    + +
    + +
    +
    +
    + @endif + +
    +
    +@endsection + +@push('page_scripts') + +@endpush diff --git a/app/resources/views/ventas/show/escritura.blade.php b/app/resources/views/ventas/show/escritura.blade.php index cd9ce80..ace5790 100644 --- a/app/resources/views/ventas/show/escritura.blade.php +++ b/app/resources/views/ventas/show/escritura.blade.php @@ -25,7 +25,7 @@ @else
    - Escriturar + Escriturar
    @endif diff --git a/app/src/Controller/API/Ventas.php b/app/src/Controller/API/Ventas.php index ab29f17..6667e02 100644 --- a/app/src/Controller/API/Ventas.php +++ b/app/src/Controller/API/Ventas.php @@ -230,4 +230,18 @@ class Ventas } return $this->withJson($response, $output); } + public function escriturar(ServerRequestInterface $request, ResponseInterface $response, Service\Venta $ventaService, int $venta_id): ResponseInterface + { + $data = $request->getParsedBody(); + $output = [ + 'input' => $data, + 'venta_id' => $venta_id, + 'status' => false + ]; + try { + $venta = $ventaService->getById($venta_id); + $output['status'] = $ventaService->escriturar($venta, $data); + } catch (EmptyResult) {} + return $this->withJson($response, $output); + } } diff --git a/app/src/Controller/Ventas.php b/app/src/Controller/Ventas.php index 5bb5bf3..69daa08 100644 --- a/app/src/Controller/Ventas.php +++ b/app/src/Controller/Ventas.php @@ -42,12 +42,14 @@ class Ventas $venta = $service->getByProyectoAndUnidad($proyecto_nombre, $unidad_descripcion); return $view->render($response, 'ventas.show', compact('venta')); } - public function edit(ServerRequestInterface $request, ResponseInterface $response, View $view, Service\Venta $service, int $venta_id): ResponseInterface + public function edit(ServerRequestInterface $request, ResponseInterface $response, View $view, + Service\Venta $service, int $venta_id): ResponseInterface { $venta = $service->getById($venta_id); return $view->render($response, 'ventas.edit', compact('venta')); } - public function propietario(ServerRequestInterface $request, ResponseInterface $response, View $view, Service\Venta $service, Repository\Region $regionRepository, int $venta_id): ResponseInterface + public function propietario(ServerRequestInterface $request, ResponseInterface $response, View $view, + Service\Venta $service, Repository\Region $regionRepository, int $venta_id): ResponseInterface { $venta = $service->getById($venta_id); $propietario = $venta->propietario(); @@ -55,9 +57,11 @@ class Ventas usort($regiones, function(Model\Region $a, Model\Region $b) { return $a->numeracion - $b->numeracion; }); - return $view->render($response, 'ventas.propietarios.edit', compact('propietario', 'venta_id', 'regiones')); + return $view->render($response, 'ventas.propietarios.edit', compact('propietario', + 'venta_id', 'regiones')); } - public function propiedad(ServerRequestInterface $request, ResponseInterface $response, View $view, Service\Venta $service, Service\Venta\Unidad $unidadService, int $venta_id): ResponseInterface + public function propiedad(ServerRequestInterface $request, ResponseInterface $response, View $view, + Service\Venta $service, Service\Venta\Unidad $unidadService, int $venta_id): ResponseInterface { $venta = $service->getById($venta_id); $propiedad = $venta->propiedad(); @@ -69,14 +73,17 @@ class Ventas $tiposUnidades []= $unidad->proyectoTipoUnidad->tipoUnidad; } } - return $view->render($response, 'ventas.propiedades.edit', compact('propiedad', 'proyecto', 'tiposUnidades', 'unidades', 'venta')); + return $view->render($response, 'ventas.propiedades.edit', compact('propiedad', + 'proyecto', 'tiposUnidades', 'unidades', 'venta')); } - public function pie(ServerRequestInterface $request, ResponseInterface $response, View $view, Service\Venta $service, int $venta_id): ResponseInterface + public function pie(ServerRequestInterface $request, ResponseInterface $response, View $view, + Service\Venta $service, int $venta_id): ResponseInterface { $venta = $service->getById($venta_id); return $view->render($response, 'ventas.pies.edit', compact('venta')); } - public function add(ServerRequestInterface $request, ResponseInterface $response, View $view, Repository\Region $regionRepository, Repository\Proyecto $proyectoRepository): ResponseInterface + public function add(ServerRequestInterface $request, ResponseInterface $response, View $view, + Repository\Region $regionRepository, Repository\Proyecto $proyectoRepository): ResponseInterface { $regiones = $regionRepository->fetchAll(); usort($regiones, function(Model\Region $a, Model\Region $b) { @@ -85,9 +92,20 @@ class Ventas $proyectos = $proyectoRepository->fetchAllActive(); return $view->render($response, 'ventas.add', compact('regiones', 'proyectos')); } - public function cuotas(ServerRequestInterface $request, ResponseInterface $response, Service\Venta $ventaService, View $view, int $venta_id): ResponseInterface + public function cuotas(ServerRequestInterface $request, ResponseInterface $response, Service\Venta $ventaService, + View $view, int $venta_id): ResponseInterface { $venta = $ventaService->getById($venta_id); return $view->render($response, 'ventas.pies.cuotas', compact('venta')); } + public function escriturar(ServerRequestInterface $request, ResponseInterface $response, Service\Venta $ventaService, + Repository\Banco $bancoRepository, View $view, int $venta_id): ResponseInterface + { + $venta = $ventaService->getById($venta_id); + $bancos = $bancoRepository->fetchAll(); + usort($bancos, function(Model\Banco $a, Model\Banco $b) { + return strcmp($a->nombre, $b->nombre); + }); + return $view->render($response, 'ventas.escriturar', compact('venta', 'bancos')); + } } diff --git a/app/src/Model/Venta.php b/app/src/Model/Venta.php index a9f8098..19a2c07 100644 --- a/app/src/Model/Venta.php +++ b/app/src/Model/Venta.php @@ -4,6 +4,7 @@ namespace Incoviba\Model; use DateTimeInterface; use Incoviba\Common\Ideal; use Incoviba\Controller\Ventas; +use Incoviba\Model\Venta\Pago; class Venta extends Ideal\Model { @@ -84,9 +85,10 @@ class Venta extends Ideal\Model } return $this->valor_util; } - public function saldo(): float + public function saldo(string $moneda = Pago::UF): float { - return $this->valor - $this->formaPago->total(); + $valor = $this->valor * (($moneda === Pago::UF) ? 1 : $this->uf); + return $valor - $this->formaPago()->total($moneda); } public function jsonSerialize(): mixed diff --git a/app/src/Model/Venta/Pie.php b/app/src/Model/Venta/Pie.php index d4a8d98..666ff59 100644 --- a/app/src/Model/Venta/Pie.php +++ b/app/src/Model/Venta/Pie.php @@ -17,6 +17,9 @@ class Pie extends Model public array $cuotasArray; public function cuotas(bool $pagadas = false): array { + if ($this->asociado !== null) { + return $this->asociado->cuotas($pagadas); + } if (!$pagadas) { return $this->cuotasArray; } @@ -27,9 +30,30 @@ class Pie extends Model public function pagado(string $moneda = Pago::UF): float { + $proporcion = 1; + if (count($this->asociados()) > 0) { + $proporcion = $this->valor / ((($this->asociado) ? $this->asociado->valor : $this->valor) + array_reduce($this->asociados(), function(float $sum, Pie $pie) { + return $sum + $pie->valor; + }, 0)); + } + if ($this->asociado !== null) { + return $this->asociado->pagado($moneda) * $proporcion; + } + return array_reduce($this->cuotas(true), function(float $sum, Cuota $cuota) use ($moneda) { return $sum + $cuota->pago->valor($moneda); - }, 0); + }, 0) * $proporcion; + } + public ?array $asociados; + public function asociados(): array + { + if ($this->asociado !== null) { + return $this->asociado->asociados(); + } + if (!isset($this->asociados) or $this->asociados === []) { + $this->asociados = $this->runFactory('asociados'); + } + return $this->asociados ?? []; } public function jsonSerialize(): mixed diff --git a/app/src/Repository/Venta/Pie.php b/app/src/Repository/Venta/Pie.php index 650760f..e3d46c7 100644 --- a/app/src/Repository/Venta/Pie.php +++ b/app/src/Repository/Venta/Pie.php @@ -47,4 +47,13 @@ class Pie extends Ideal\Repository { return $this->update($model, ['fecha', 'valor', 'uf', 'cuotas', 'asociado', 'reajuste'], $new_data); } + + public function fetchAsociados(int $pie_id): array + { + $query = $this->connection->getQueryBuilder() + ->select() + ->from($this->getTable()) + ->where('asociado = ?'); + return $this->fetchMany($query, [$pie_id]); + } } diff --git a/app/src/Service/Venta.php b/app/src/Service/Venta.php index 512bfac..c475665 100644 --- a/app/src/Service/Venta.php +++ b/app/src/Service/Venta.php @@ -12,6 +12,8 @@ class Venta protected Repository\Venta $ventaRepository, protected Repository\Venta\EstadoVenta $estadoVentaRepository, protected Repository\Venta\TipoEstadoVenta $tipoEstadoVentaRepository, + protected Repository\Venta\Credito $creditoRepository, + protected Repository\Venta\Escritura $escrituraRepository, protected Venta\Propietario $propietarioService, protected Venta\Propiedad $propiedadService, protected Venta\Pie $pieService, @@ -106,6 +108,63 @@ class Venta return $venta; } + public function escriturar(Model\Venta $venta, array $data): bool + { + if (in_array($venta->currentEstado()->tipoEstadoVenta->descripcion, ['escriturando', 'firmado por inmobiliaria', 'archivado'])) { + return true; + } + try { + $tipoEstado = $this->tipoEstadoVentaRepository->fetchByDescripcion('escriturando'); + if (isset($data['valor_reajuste']) and $data['valor_reajuste'] !== '') { + $fecha = new DateTimeImmutable($data['fecha_reajuste']); + $reajusteData = [ + 'valor' => $data['valor_reajuste'], + 'fecha' => $fecha->format('Y-m-d') + ]; + $pie = $venta->formaPago()->pie; + $this->pieService->reajustar($pie, $reajusteData); + } + if (isset($data['valor_pago_pesos']) and $data['valor_pago_pesos'] !== '') { + $fecha = new DateTimeImmutable($data['fecha_pago']); + $uf = $this->moneyService->getUF($fecha); + $valor = $data['valor_pago_ufs'] !== '' ? $data['valor_pago_ufs'] * $uf : $data['valor_pago_pesos']; + $escrituraData = [ + 'valor' => $valor, + 'fecha' => $fecha->format('Y-m-d'), + 'uf' => $uf + ]; + $escritura = $this->escrituraRepository->create($escrituraData); + $escritura = $this->escrituraRepository->save($escritura); + $this->ventaRepository->edit($venta, ['escritura' => $escritura->id]); + } + if (isset($data['banco_credito']) and $data['banco_credito'] !== '') { + $this->creditoRepository->edit($venta->formaPago()->credito, ['banco' => $data['banco_credito']]); + } + $fecha = new DateTimeImmutable($data['fecha']); + $uf = $this->moneyService->getUF($fecha); + if (isset($data['valor_subsidio']) and $data['valor_subsidio'] !== '') { + $subsidioData = [ + 'fecha_venta' => $fecha->format('Y-m-d'), + 'ahorro' => $data['valor_ahorro'], + 'subsidio' => $data['valor_subsidio'], + 'uf' => $uf + ]; + $subsidio = $this->addSubsidio($subsidioData); + $this->ventaRepository->edit($venta, ['subsidio' => $subsidio->id]); + } + $estadoData = [ + 'venta' => $venta->id, + 'estado' => $tipoEstado->id, + 'fecha' => $fecha->format('Y-m-d') + ]; + $estado = $this->estadoVentaRepository->create($estadoData); + $this->estadoVentaRepository->save($estado); + return true; + } catch (Implement\Exception\EmptyResult) { + return false; + } + } + protected function addPropietario(array $data): Model\Venta\Propietario { if (isset($data['natural_uno'])) { diff --git a/app/src/Service/Venta/Pie.php b/app/src/Service/Venta/Pie.php index bdbacfc..8085cee 100644 --- a/app/src/Service/Venta/Pie.php +++ b/app/src/Service/Venta/Pie.php @@ -1,6 +1,7 @@ pieRepository->fetchById($pie_id); - $pie->cuotasArray = $this->cuotaService->getVigenteByPie($pie_id); - return $pie; + return $this->process($this->pieRepository->fetchById($pie_id)); } public function add(array $data): Model\Venta\Pie @@ -31,4 +31,18 @@ class Pie { return $this->pieRepository->edit($pie, $data); } + public function reajustar(Model\Venta\Pie $pie, array $data): Model\Venta\Pie + { + $pago = $this->pagoService->add($data); + return $this->pieRepository->edit($pie, ['reajuste' => $pago->id]); + } + + protected function process(Model\Venta\Pie $pie): Model\Venta\Pie + { + $pie->cuotasArray = $this->cuotaService->getVigenteByPie($pie->id); + try { + $pie->asociados = $this->pieRepository->fetchAsociados($pie->id); + } catch (EmptyResult) {} + return $pie; + } } From abe82e4689ef5f8046ebff1f56023eb9c13a3760 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Wed, 20 Dec 2023 10:50:49 -0300 Subject: [PATCH 075/163] FIX: Default valor unitario terreno --- app/src/Repository/Proyecto.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/Repository/Proyecto.php b/app/src/Repository/Proyecto.php index 4cd7150..5f7d459 100644 --- a/app/src/Repository/Proyecto.php +++ b/app/src/Repository/Proyecto.php @@ -38,7 +38,7 @@ class Proyecto extends Ideal\Repository ->setFunction(function($data) { $terreno = new Model\Proyecto\Terreno(); $terreno->superficie = $data['superficie_terreno']; - $terreno->valorUnitario = $data['valor_unitario_terreno']; + $terreno->valorUnitario = $data['valor_unitario_terreno'] ?? 0; $terreno->valor = 0; $terreno->fecha = null; if (isset($data['fecha_terreno']) and $data['fecha_terreno'] !== '') { From 6f772a56b840be058ad1f8395ccc51a3a54b6f65 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Wed, 20 Dec 2023 12:02:52 -0300 Subject: [PATCH 076/163] FIX: Buscar por nombre con wildcards --- app/src/Repository/Proyecto.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/Repository/Proyecto.php b/app/src/Repository/Proyecto.php index 5f7d459..6780c94 100644 --- a/app/src/Repository/Proyecto.php +++ b/app/src/Repository/Proyecto.php @@ -91,8 +91,8 @@ class Proyecto extends Ideal\Repository ->select($this->columns()) ->from("{$this->getTable()} a") ->joined($this->joinTerreno()) - ->where("a.descripcion = ?"); - return $this->fetchOne($query, [$name]); + ->where("a.descripcion LIKE ?"); + return $this->fetchOne($query, ["%{$name}%"]); } public function fetchAllActive(): array { From 06d5327934b3a24b24e927e3f168c7e275e725f4 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Wed, 20 Dec 2023 12:04:06 -0300 Subject: [PATCH 077/163] Search listado por defecto muestra 25 y cleanup --- app/resources/views/search.blade.php | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/app/resources/views/search.blade.php b/app/resources/views/search.blade.php index bf50a39..8a7b901 100644 --- a/app/resources/views/search.blade.php +++ b/app/resources/views/search.blade.php @@ -224,6 +224,7 @@ parent.append(table) this.table = new DataTable(table, { + pageLength: 25, order: [ [0, 'asc'], [2, 'asc'] @@ -307,6 +308,16 @@ this.id = id this.get().results() + $('#tipo').dropdown().dropdown('set selected', '*') + @if (trim($post) !== '') + $("[name='query']").val('{{$post}}') + @elseif (trim($query) !== '') + $("[name='query']").val('{{$query}}') + @endif + @if (trim($tipo) !== '') + $('#tipo').dropdown('set selected', '{{$tipo}}') + @endif + $('#search_form').submit(event => { event.preventDefault() this.get().results() @@ -316,15 +327,6 @@ } } $(document).ready(() => { - $('#tipo').dropdown().dropdown('set selected', '*') - @if (trim($post) !== '') - $("[name='query']").val('{{$post}}') - @elseif (trim($query) !== '') - $("[name='query']").val('{{$query}}') - @endif - @if (trim($tipo) !== '') - $('#tipo').dropdown('set selected', '{{$tipo}}') - @endif results.setup('#results') }) From 30277e63553d6b3cf0de9e3dabdc90c516dcb22b Mon Sep 17 00:00:00 2001 From: Aldarien Date: Wed, 20 Dec 2023 15:37:47 -0300 Subject: [PATCH 078/163] FIX: cuotas en pie --- app/src/Repository/Venta/Cuota.php | 8 ++++++++ app/src/Service/Venta/Cuota.php | 4 ++++ app/src/Service/Venta/Pie.php | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/app/src/Repository/Venta/Cuota.php b/app/src/Repository/Venta/Cuota.php index 9e3de82..f6c0249 100644 --- a/app/src/Repository/Venta/Cuota.php +++ b/app/src/Repository/Venta/Cuota.php @@ -177,6 +177,14 @@ GROUP BY p1.`fecha`, v1.`descripcion` ORDER BY p1.`fecha`, v1.`descripcion`"; return $this->fetchAsArray($query); } + public function fetchByPie(int $pie_id): array + { + $query = $this->connection->getQueryBuilder() + ->select() + ->from($this->getTable()) + ->where('pie = ?'); + return $this->fetchMany($query, [$pie_id]); + } public function fetchVigenteByPie(int $pie_id): array { $query = "SELECT a.* diff --git a/app/src/Service/Venta/Cuota.php b/app/src/Service/Venta/Cuota.php index c3cda89..4855e77 100644 --- a/app/src/Service/Venta/Cuota.php +++ b/app/src/Service/Venta/Cuota.php @@ -73,6 +73,10 @@ class Cuota } return $cuotas_depositadas; } + public function getByPie(int $pie_id): array + { + return $this->cuotaRepository->fetchByPie($pie_id); + } public function getVigenteByPie(int $pie_id): array { return $this->cuotaRepository->fetchVigenteByPie($pie_id); diff --git a/app/src/Service/Venta/Pie.php b/app/src/Service/Venta/Pie.php index 8085cee..ea84377 100644 --- a/app/src/Service/Venta/Pie.php +++ b/app/src/Service/Venta/Pie.php @@ -39,7 +39,7 @@ class Pie protected function process(Model\Venta\Pie $pie): Model\Venta\Pie { - $pie->cuotasArray = $this->cuotaService->getVigenteByPie($pie->id); + $pie->cuotasArray = $this->cuotaService->getByPie($pie->id); try { $pie->asociados = $this->pieRepository->fetchAsociados($pie->id); } catch (EmptyResult) {} From d99f2a6214e021f070542b11e98f5913a5016108 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Wed, 20 Dec 2023 15:39:13 -0300 Subject: [PATCH 079/163] pageLength for cuotas --- app/resources/views/ventas/pies/cuotas.blade.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/resources/views/ventas/pies/cuotas.blade.php b/app/resources/views/ventas/pies/cuotas.blade.php index 433c4a8..a7546f7 100644 --- a/app/resources/views/ventas/pies/cuotas.blade.php +++ b/app/resources/views/ventas/pies/cuotas.blade.php @@ -134,6 +134,7 @@ zeroRecords: 'No se encotró cuotas con ese criterio', search: 'Buscar: ' }, + pageLength: "25", columnDefs: [ { target: 1, From 93431e41b3911eb2037d1ef4bece690ba05ed126 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Wed, 20 Dec 2023 20:59:43 -0300 Subject: [PATCH 080/163] Porcentajes en cuotas --- .../views/ventas/pies/cuotas.blade.php | 38 +++++++++++++++---- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/app/resources/views/ventas/pies/cuotas.blade.php b/app/resources/views/ventas/pies/cuotas.blade.php index a7546f7..c7794c3 100644 --- a/app/resources/views/ventas/pies/cuotas.blade.php +++ b/app/resources/views/ventas/pies/cuotas.blade.php @@ -79,14 +79,20 @@
    TOTAL - {{$format->pesos(array_reduce($venta->formaPago()->pie->cuotas(), + {{$format->pesos($total_pesos = array_reduce($venta->formaPago()->pie->cuotas(), function(float $sum, Incoviba\Model\Venta\Cuota $cuota) { return $sum + $cuota->pago->valor; }, 0))}} - {{$format->ufs(array_reduce($venta->formaPago()->pie->cuotas(), - function(float $sum, Incoviba\Model\Venta\Cuota $cuota) { + @php + $now = new DateTimeImmutable(); + @endphp + {{$format->ufs($total = array_reduce($venta->formaPago()->pie->cuotas(), + function(float $sum, Incoviba\Model\Venta\Cuota $cuota) use ($now, $venta) { + if ($cuota->pago->fecha > $now) { + return $sum + $cuota->pago->valor / $venta->uf; + } return $sum + $cuota->pago->valor(); }, 0))}}
    TOTAL PAGADO - {{$format->pesos(array_reduce($venta->formaPago()->pie->cuotas(true), - function(float $sum, Incoviba\Model\Venta\Cuota $cuota) { + {{$format->pesos($pagado_pesos = array_reduce($venta->formaPago()->pie->cuotas(true), + function(int $sum, Incoviba\Model\Venta\Cuota $cuota) { return $sum + $cuota->pago->valor; }, 0))}} - {{$format->ufs(array_reduce($venta->formaPago()->pie->cuotas(true), + {{$format->ufs($pagado = array_reduce($venta->formaPago()->pie->cuotas(true), function(float $sum, Incoviba\Model\Venta\Cuota $cuota) { return $sum + $cuota->pago->valor(); - }, 0))}} + }, 0.0))}} + {{$format->number($pagado / $total * 100, 2)}}% +
    POR PAGAR + {{$format->pesos($total_pesos - $pagado_pesos)}} + + {{$format->ufs($total - $pagado)}} + + {{$format->number(($total - $pagado) / $total * 100, 2)}}% +
    From 80a6bf1535ec842f50f897b698c4947b596d73ce Mon Sep 17 00:00:00 2001 From: Aldarien Date: Thu, 21 Dec 2023 18:45:47 -0300 Subject: [PATCH 081/163] Desistir venta --- app/resources/routes/04_ventas.php | 1 + app/resources/routes/api/ventas.php | 7 +- .../views/layout/body/scripts.blade.php | 9 +- app/resources/views/ventas/desistir.blade.php | 75 ++++++++ app/src/Controller/API/Ventas.php | 14 ++ app/src/Controller/Ventas.php | 6 + app/src/Service/UF.php | 6 +- app/src/Service/Venta.php | 165 ++++++++++++------ 8 files changed, 221 insertions(+), 62 deletions(-) create mode 100644 app/resources/views/ventas/desistir.blade.php diff --git a/app/resources/routes/04_ventas.php b/app/resources/routes/04_ventas.php index 54e3ff3..83487cb 100644 --- a/app/resources/routes/04_ventas.php +++ b/app/resources/routes/04_ventas.php @@ -29,6 +29,7 @@ $app->group('/venta/{venta_id:[0-9]+}', function($app) { $app->get('[/]', [Ventas::class, 'pie']); }); $app->get('/escriturar[/]', [Ventas::class, 'escriturar']); + $app->get('/desistir[/]', [Ventas::class, 'desistir']); $app->get('/edit[/]', [Ventas::class, 'edit']); $app->get('[/]', [Ventas::class, 'show']); })->add($app->getContainer()->get(Incoviba\Middleware\Authentication::class)); diff --git a/app/resources/routes/api/ventas.php b/app/resources/routes/api/ventas.php index b347220..13b8000 100644 --- a/app/resources/routes/api/ventas.php +++ b/app/resources/routes/api/ventas.php @@ -22,9 +22,10 @@ $app->group('/ventas', function($app) { $app->post('[/]', [Ventas::class, 'proyecto']); }); $app->group('/venta/{venta_id}', function($app) { - $app->get('/unidades', [Ventas::class, 'unidades']); - $app->get('/comentarios', [Ventas::class, 'comentarios']); - $app->post('/escriturar', [Ventas::class, 'escriturar']); + $app->get('/unidades[/]', [Ventas::class, 'unidades']); + $app->get('/comentarios[/]', [Ventas::class, 'comentarios']); + $app->post('/escriturar[/]', [Ventas::class, 'escriturar']); + $app->post('/desistir[/]', [Ventas::class, 'desistir']); $app->post('[/]', [Ventas::class, 'edit']); $app->get('[/]', [Ventas::class, 'get']); }); diff --git a/app/resources/views/layout/body/scripts.blade.php b/app/resources/views/layout/body/scripts.blade.php index b1925f4..6867230 100644 --- a/app/resources/views/layout/body/scripts.blade.php +++ b/app/resources/views/layout/body/scripts.blade.php @@ -12,7 +12,14 @@ if (!Object.hasOwn(options['headers'], 'Authorization')) { options['headers']['Authorization'] = 'Bearer {{md5($API_KEY)}}' } - return fetch(url, options) + return fetch(url, options).then(response => { + if (response.ok) { + return response + } + throw new Error(JSON.stringify({code: response.status, message: response.statusText, url})) + }).catch(error => { + console.error(error) + }) } const calendar_date_options = { type: 'date', diff --git a/app/resources/views/ventas/desistir.blade.php b/app/resources/views/ventas/desistir.blade.php new file mode 100644 index 0000000..b7db556 --- /dev/null +++ b/app/resources/views/ventas/desistir.blade.php @@ -0,0 +1,75 @@ +@extends('layout.base') + +@section('page_content') +
    +

    + Desistir - {{$venta->proyecto()->descripcion}} - + {{$venta->propiedad()->summary()}} +

    +
    +
    +
    Valor Pagado
    +
    + {{$format->pesos($venta->formaPago()->pie->pagado('pesos'))}} +
    + {{$format->number($venta->formaPago()->pie->pagado() / $venta->valor * 100)}}% de la venta +
    +
    +
    +
    +
    + Multa Estandar +
    5%
    +
    +
    + {{$format->pesos($venta->valor * 0.05 * $UF->get())}} +
    +
    +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    + +
    +
    $
    + +
    +
    + +
    +
    +@endsection + +@push('page_scripts') + +@endpush diff --git a/app/src/Controller/API/Ventas.php b/app/src/Controller/API/Ventas.php index 6667e02..76e2ad5 100644 --- a/app/src/Controller/API/Ventas.php +++ b/app/src/Controller/API/Ventas.php @@ -244,4 +244,18 @@ class Ventas } catch (EmptyResult) {} return $this->withJson($response, $output); } + public function desistir(ServerRequestInterface $request, ResponseInterface $response, Service\Venta $ventaService, int $venta_id): ResponseInterface + { + $data = $request->getParsedBody(); + $output = [ + 'input' => $data, + 'venta_id' => $venta_id, + 'desistida' => false + ]; + try { + $venta = $ventaService->getById($venta_id); + $output['desistida'] = $ventaService->desistir($venta, $data); + } catch (EmptyResult) {} + return $this->withJson($response, $output); + } } diff --git a/app/src/Controller/Ventas.php b/app/src/Controller/Ventas.php index 69daa08..b037f69 100644 --- a/app/src/Controller/Ventas.php +++ b/app/src/Controller/Ventas.php @@ -108,4 +108,10 @@ class Ventas }); return $view->render($response, 'ventas.escriturar', compact('venta', 'bancos')); } + public function desistir(ServerRequestInterface $request, ResponseInterface $response, Service\Venta $ventaService, + View $view, int $venta_id): ResponseInterface + { + $venta = $ventaService->getById($venta_id); + return $view->render($response, 'ventas.desistir', compact('venta')); + } } diff --git a/app/src/Service/UF.php b/app/src/Service/UF.php index 48916e3..d1da508 100644 --- a/app/src/Service/UF.php +++ b/app/src/Service/UF.php @@ -2,6 +2,7 @@ namespace Incoviba\Service; use DateTimeInterface; +use DateTimeImmutable; use Incoviba\Common\Implement\Exception\EmptyRedis; class UF @@ -10,8 +11,11 @@ class UF public function __construct(protected Redis $redisService, protected Money $moneyService) {} - public function get(DateTimeInterface $date): float + public function get(?DateTimeInterface $date = null): float { + if ($date === null) { + $date = new DateTimeImmutable(); + } $ufs = []; try { $ufs = json_decode($this->redisService->get($this->redisKey), JSON_OBJECT_AS_ARRAY); diff --git a/app/src/Service/Venta.php b/app/src/Service/Venta.php index c475665..0f485a9 100644 --- a/app/src/Service/Venta.php +++ b/app/src/Service/Venta.php @@ -14,6 +14,7 @@ class Venta protected Repository\Venta\TipoEstadoVenta $tipoEstadoVentaRepository, protected Repository\Venta\Credito $creditoRepository, protected Repository\Venta\Escritura $escrituraRepository, + protected Repository\Venta\Pago $pagoRepository, protected Venta\Propietario $propietarioService, protected Venta\Propiedad $propiedadService, protected Venta\Pie $pieService, @@ -108,63 +109,6 @@ class Venta return $venta; } - public function escriturar(Model\Venta $venta, array $data): bool - { - if (in_array($venta->currentEstado()->tipoEstadoVenta->descripcion, ['escriturando', 'firmado por inmobiliaria', 'archivado'])) { - return true; - } - try { - $tipoEstado = $this->tipoEstadoVentaRepository->fetchByDescripcion('escriturando'); - if (isset($data['valor_reajuste']) and $data['valor_reajuste'] !== '') { - $fecha = new DateTimeImmutable($data['fecha_reajuste']); - $reajusteData = [ - 'valor' => $data['valor_reajuste'], - 'fecha' => $fecha->format('Y-m-d') - ]; - $pie = $venta->formaPago()->pie; - $this->pieService->reajustar($pie, $reajusteData); - } - if (isset($data['valor_pago_pesos']) and $data['valor_pago_pesos'] !== '') { - $fecha = new DateTimeImmutable($data['fecha_pago']); - $uf = $this->moneyService->getUF($fecha); - $valor = $data['valor_pago_ufs'] !== '' ? $data['valor_pago_ufs'] * $uf : $data['valor_pago_pesos']; - $escrituraData = [ - 'valor' => $valor, - 'fecha' => $fecha->format('Y-m-d'), - 'uf' => $uf - ]; - $escritura = $this->escrituraRepository->create($escrituraData); - $escritura = $this->escrituraRepository->save($escritura); - $this->ventaRepository->edit($venta, ['escritura' => $escritura->id]); - } - if (isset($data['banco_credito']) and $data['banco_credito'] !== '') { - $this->creditoRepository->edit($venta->formaPago()->credito, ['banco' => $data['banco_credito']]); - } - $fecha = new DateTimeImmutable($data['fecha']); - $uf = $this->moneyService->getUF($fecha); - if (isset($data['valor_subsidio']) and $data['valor_subsidio'] !== '') { - $subsidioData = [ - 'fecha_venta' => $fecha->format('Y-m-d'), - 'ahorro' => $data['valor_ahorro'], - 'subsidio' => $data['valor_subsidio'], - 'uf' => $uf - ]; - $subsidio = $this->addSubsidio($subsidioData); - $this->ventaRepository->edit($venta, ['subsidio' => $subsidio->id]); - } - $estadoData = [ - 'venta' => $venta->id, - 'estado' => $tipoEstado->id, - 'fecha' => $fecha->format('Y-m-d') - ]; - $estado = $this->estadoVentaRepository->create($estadoData); - $this->estadoVentaRepository->save($estado); - return true; - } catch (Implement\Exception\EmptyResult) { - return false; - } - } - protected function addPropietario(array $data): Model\Venta\Propietario { if (isset($data['natural_uno'])) { @@ -344,4 +288,111 @@ class Venta ], $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']); + $estadoData = [ + 'venta' => $venta->id, + 'estado' => $tipoEstadoVenta->id, + 'fecha' => $fecha->format('Y-m-d') + ]; + $estado = $this->estadoVentaRepository->create($estadoData); + $this->estadoVentaRepository->save($estado); + } + + public function escriturar(Model\Venta $venta, array $data): bool + { + if (in_array($venta->currentEstado()->tipoEstadoVenta->descripcion, ['escriturando', 'firmado por inmobiliaria', 'archivado'])) { + return true; + } + try { + if ($this->validarData($data, ['fecha_reajuste', 'valor_reajuste'])) { + $this->reajustarEscritura($venta, $data); + } + if ($this->validarData($data, ['fecha_pago'], ['valor_pago_pesos', 'valor_pago_ufs'])) { + $this->abonoEscritura($venta, $data); + } + if ($this->validarData($data, ['banco_credito'])) { + $this->creditoRepository->edit($venta->formaPago()->credito, ['banco' => $data['banco_credito']]); + } + if ($this->validarData($data, ['valor_subsidio', 'valor_ahorro', 'fecha'])) { + $this->subsidioEscritura($venta, $data); + } + $tipoEstado = $this->tipoEstadoVentaRepository->fetchByDescripcion('escriturando'); + $this->addEstado($venta, $tipoEstado, ['fecha' => $data['fecha']]); + return true; + } catch (Implement\Exception\EmptyResult) { + return false; + } + } + protected function validarData(array $data, array $keys, array $optionals = []): bool + { + foreach ($keys as $key) { + if (!isset($data[$key])) { + return false; + } + if ($data[$key] === '') { + return false; + } + } + foreach ($optionals as $key) { + if (isset($data[$key]) and $data[$key] !== '') { + break; + } + } + return true; + } + protected function reajustarEscritura(Model\Venta $venta, array $data): void + { + $fecha = new DateTimeImmutable($data['fecha_reajuste']); + $reajusteData = [ + 'valor' => $data['valor_reajuste'], + 'fecha' => $fecha->format('Y-m-d') + ]; + $pie = $venta->formaPago()->pie; + $this->pieService->reajustar($pie, $reajusteData); + } + protected function abonoEscritura(Model\Venta $venta, array $data): void + { + $fecha = new DateTimeImmutable($data['fecha_pago']); + $uf = $this->moneyService->getUF($fecha); + $valor = $data['valor_pago_ufs'] !== '' ? $data['valor_pago_ufs'] * $uf : $data['valor_pago_pesos']; + $escrituraData = [ + 'valor' => $valor, + 'fecha' => $fecha->format('Y-m-d'), + 'uf' => $uf + ]; + $escritura = $this->escrituraRepository->create($escrituraData); + $escritura = $this->escrituraRepository->save($escritura); + $this->ventaRepository->edit($venta, ['escritura' => $escritura->id]); + } + protected function subsidioEscritura(Model\Venta $venta, array $data): void + { + $fecha = new DateTimeImmutable($data['fecha']); + $uf = $this->moneyService->getUF($fecha); + $subsidioData = [ + 'fecha_venta' => $fecha->format('Y-m-d'), + 'ahorro' => $data['valor_ahorro'], + 'subsidio' => $data['valor_subsidio'], + 'uf' => $uf + ]; + $subsidio = $this->addSubsidio($subsidioData); + $this->ventaRepository->edit($venta, ['subsidio' => $subsidio->id]); + } + + public function desistir(Model\Venta $venta, array $data): bool + { + try { + if ($this->validarData($data, ['fecha', 'devolucion'])) { + $pago = $this->pagoRepository->create(['fecha' => $data['fecha'], 'valor' => $data['devolucion']]); + $pago = $this->pagoRepository->save($pago); + $this->ventaRepository->edit($venta, ['resciliacion' => $pago->id]); + } + $tipoEstado = $this->tipoEstadoVentaRepository->fetchByDescripcion('desistida'); + $this->addEstado($venta, $tipoEstado, ['fecha' => $data['fecha']]); + return true; + } catch (Implement\Exception\EmptyResult) { + return false; + } + } } From d7d17a3051de39b1cbe704aaf561fc97672e8230 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Thu, 21 Dec 2023 19:15:11 -0300 Subject: [PATCH 082/163] Mostrar correctamente venta desistida --- app/common/Implement/Repository/Mapper.php | 2 +- app/resources/views/ventas/show.blade.php | 8 ++++++++ app/src/Model/Venta.php | 8 ++++++++ app/src/Repository/Venta.php | 5 ++++- app/src/Service/Venta.php | 5 ++--- 5 files changed, 23 insertions(+), 5 deletions(-) diff --git a/app/common/Implement/Repository/Mapper.php b/app/common/Implement/Repository/Mapper.php index d54d344..dd23f58 100644 --- a/app/common/Implement/Repository/Mapper.php +++ b/app/common/Implement/Repository/Mapper.php @@ -55,7 +55,7 @@ class Mapper implements Define\Repository\Mapper if ($this->hasProperty()) { $property = $this->property; } - if (isset($data[$column])) { + if (in_array($column, array_keys($data))) { if ($this->hasFactory()) { $model->addFactory($property, $this->factory); return true; diff --git a/app/resources/views/ventas/show.blade.php b/app/resources/views/ventas/show.blade.php index f60a53a..95dfb44 100644 --- a/app/resources/views/ventas/show.blade.php +++ b/app/resources/views/ventas/show.blade.php @@ -26,6 +26,14 @@ Ceder + @else +
    + + {{ucwords($venta->currentEstado()->tipoEstadoVenta->descripcion)}} + ( + {{$format->pesos($venta->resciliacion()->valor)}} + ) +
    @endif
    diff --git a/app/src/Model/Venta.php b/app/src/Model/Venta.php index 19a2c07..50e9bde 100644 --- a/app/src/Model/Venta.php +++ b/app/src/Model/Venta.php @@ -17,6 +17,7 @@ class Venta extends Ideal\Model public bool $relacionado; protected ?Venta\Entrega $entrega; public float $uf; + protected ?Pago $resciliacion; public array $estados; public Venta\EstadoVenta $currentEstado; @@ -49,6 +50,13 @@ class Venta extends Ideal\Model } return $this->entrega; } + public function resciliacion(): ?Venta\Pago + { + if (!isset($this->resciliacion)) { + $this->resciliacion = $this->runFactory('resciliacion'); + } + return $this->resciliacion; + } public function estados(): array { diff --git a/app/src/Repository/Venta.php b/app/src/Repository/Venta.php index d550dfb..ba4102b 100644 --- a/app/src/Repository/Venta.php +++ b/app/src/Repository/Venta.php @@ -115,9 +115,12 @@ class Venta extends Ideal\Repository ->register('fecha_ingreso', new Implement\Repository\Mapper\DateTime('fecha_ingreso', 'fechaIngreso')) //->register('avalchile') //->register('agente') + ->register('resciliacion', (new Implement\Repository\Mapper()) + ->setFactory((new Implement\Repository\Factory()) + ->setCallable([$this->pagoService, 'getById']) + ->setArgs(['pago_id' => $data['resciliacion']]))) ->register('relacionado', new Implement\Repository\Mapper\Boolean('relacionado')); //->register('promocion') - //->register('resciliacion') //->register('devolucion'); return $this->parseData(new Model\Venta(), $data, $map); } diff --git a/app/src/Service/Venta.php b/app/src/Service/Venta.php index 0f485a9..732c785 100644 --- a/app/src/Service/Venta.php +++ b/app/src/Service/Venta.php @@ -14,13 +14,13 @@ class Venta protected Repository\Venta\TipoEstadoVenta $tipoEstadoVentaRepository, protected Repository\Venta\Credito $creditoRepository, protected Repository\Venta\Escritura $escrituraRepository, - protected Repository\Venta\Pago $pagoRepository, protected Venta\Propietario $propietarioService, protected Venta\Propiedad $propiedadService, protected Venta\Pie $pieService, protected Venta\Subsidio $subsidioService, protected Venta\Credito $creditoService, protected Venta\BonoPie $bonoPieService, + protected Venta\Pago $pagoService, protected Money $moneyService ) {} @@ -384,8 +384,7 @@ class Venta { try { if ($this->validarData($data, ['fecha', 'devolucion'])) { - $pago = $this->pagoRepository->create(['fecha' => $data['fecha'], 'valor' => $data['devolucion']]); - $pago = $this->pagoRepository->save($pago); + $pago = $this->pagoService->add(['fecha' => $data['fecha'], 'valor' => $data['devolucion']]); $this->ventaRepository->edit($venta, ['resciliacion' => $pago->id]); } $tipoEstado = $this->tipoEstadoVentaRepository->fetchByDescripcion('desistida'); From ac52305002003f8e97d3504c5db52e02ffe00ad8 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Thu, 21 Dec 2023 21:06:38 -0300 Subject: [PATCH 083/163] Editar desistimiento venta --- app/resources/routes/04_ventas.php | 1 + app/resources/routes/api/ventas/pagos.php | 3 +- .../views/ventas/desistida.blade.php | 78 +++++++++++++++++ app/src/Controller/API/Ventas/Pagos.php | 85 +++++++++++++++++++ app/src/Controller/Ventas.php | 6 ++ app/src/Controller/Ventas/Pagos.php | 52 ------------ app/src/Model/Venta/Pago.php | 2 +- 7 files changed, 173 insertions(+), 54 deletions(-) create mode 100644 app/resources/views/ventas/desistida.blade.php create mode 100644 app/src/Controller/API/Ventas/Pagos.php diff --git a/app/resources/routes/04_ventas.php b/app/resources/routes/04_ventas.php index 83487cb..8ab4684 100644 --- a/app/resources/routes/04_ventas.php +++ b/app/resources/routes/04_ventas.php @@ -30,6 +30,7 @@ $app->group('/venta/{venta_id:[0-9]+}', function($app) { }); $app->get('/escriturar[/]', [Ventas::class, 'escriturar']); $app->get('/desistir[/]', [Ventas::class, 'desistir']); + $app->get('/desistida[/]', [Ventas::class, 'desistida']); $app->get('/edit[/]', [Ventas::class, 'edit']); $app->get('[/]', [Ventas::class, 'show']); })->add($app->getContainer()->get(Incoviba\Middleware\Authentication::class)); diff --git a/app/resources/routes/api/ventas/pagos.php b/app/resources/routes/api/ventas/pagos.php index 6addcda..dc60160 100644 --- a/app/resources/routes/api/ventas/pagos.php +++ b/app/resources/routes/api/ventas/pagos.php @@ -1,5 +1,5 @@ group('/pagos', function($app) { $app->get('/pendientes', [Pagos::class, 'para_pendientes']); @@ -9,4 +9,5 @@ $app->group('/pagos', function($app) { $app->group('/pago/{pago_id:[0-9]+}', function($app) { $app->put('/depositar[/]', [Pagos::class, 'depositar']); $app->put('/abonar[/]', [Pagos::class, 'abonar']); + $app->post('[/]', [Pagos::class, 'edit']); }); diff --git a/app/resources/views/ventas/desistida.blade.php b/app/resources/views/ventas/desistida.blade.php new file mode 100644 index 0000000..4d394df --- /dev/null +++ b/app/resources/views/ventas/desistida.blade.php @@ -0,0 +1,78 @@ +@extends('layout.base') + +@section('page_content') +
    +

    + Desistida - {{$venta->proyecto()->descripcion}} - + + {{$venta->propiedad()->summary()}} + +

    +
    +
    + +
    +
    + + +
    +
    +
    +
    + +
    +
    $
    + +
    +
    +
    +
    +@endsection + +@push('page_scripts') + +@endpush diff --git a/app/src/Controller/API/Ventas/Pagos.php b/app/src/Controller/API/Ventas/Pagos.php new file mode 100644 index 0000000..4e5548f --- /dev/null +++ b/app/src/Controller/API/Ventas/Pagos.php @@ -0,0 +1,85 @@ +getParsedBody(); + $output = [ + 'input' => $body, + 'pago_id' => $pago_id, + 'pago' => null + ]; + try { + $pago = $pagoRepository->fetchById($pago_id); + if (isset($body['fecha'])) { + $fecha = new DateTimeImmutable($body['fecha']); + $body['fecha'] = $fecha->format('Y-m-d'); + } + $output['pago'] = $pagoRepository->edit($pago, $body); + } catch (EmptyResult) {} + return $this->withJson($response, $output); + } + // NOT IMPLEMENTED + public function depositar(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\Pago $pagoService): ResponseInterface + { + $body = $request->getBody(); + $json = json_decode($body->getContents()); + $date = new DateTimeImmutable($json->fecha); + $response->getBody()->write(json_encode(['fecha' => $date->format('d-m-Y'), 'message' => 'Not implemented'])); + return $response->withHeader('Content-Type', 'application/json'); + } + // NOT IMPLEMENTED + public function abonar(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\Pago $pagoService): ResponseInterface + { + $body = $request->getBody(); + $json = json_decode($body->getContents()); + $date = new DateTimeImmutable($json->fecha); + $response->getBody()->write(json_encode(['fecha' => $date->format('d-m-Y'), 'message' => 'Not implemented'])); + return $response->withHeader('Content-Type', 'application/json'); + } + public function para_pendientes(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\Pago $pagoService): ResponseInterface + { + $pagos = $pagoService->getPendientes(); + $pagos_pendientes = []; + foreach ($pagos as $pago) { + $pagos_pendientes []= [ + 'id' => $pago->id + ]; + } + return $this->withJson($response, ['pagos' => $pagos_pendientes, 'total' => count($pagos_pendientes)]); + } + public function para_abonar(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\Pago $pagoService): ResponseInterface + { + $pagos = $pagoService->getDepositados(); + $pagos_depositados = []; + foreach ($pagos as $pago) { + $pagos_depositados []= [ + 'id' => $pago->id + ]; + } + return $this->withJson($response, ['pagos' => $pagos_depositados, 'total' => count($pagos_depositados)]); + } + public function rebotes(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\Pago $pagoService): ResponseInterface + { + $pagos = $pagoService->getRebotes(); + $rebotes = []; + foreach ($pagos as $pago) { + $rebotes []= [ + 'id' => $pago->id + ]; + } + return $this->withJson($response, ['pagos' => $rebotes, 'total' => count($rebotes)]); + } +} diff --git a/app/src/Controller/Ventas.php b/app/src/Controller/Ventas.php index b037f69..4060dc4 100644 --- a/app/src/Controller/Ventas.php +++ b/app/src/Controller/Ventas.php @@ -114,4 +114,10 @@ class Ventas $venta = $ventaService->getById($venta_id); return $view->render($response, 'ventas.desistir', compact('venta')); } + public function desistida(ServerRequestInterface $request, ResponseInterface $response, Service\Venta $ventaService, + View $view, int $venta_id): ResponseInterface + { + $venta = $ventaService->getById($venta_id); + return $view->render($response, 'ventas.desistida', compact('venta')); + } } diff --git a/app/src/Controller/Ventas/Pagos.php b/app/src/Controller/Ventas/Pagos.php index 882c39e..e8de649 100644 --- a/app/src/Controller/Ventas/Pagos.php +++ b/app/src/Controller/Ventas/Pagos.php @@ -13,56 +13,4 @@ class Pagos { return $view->render($response, 'ventas.pagos.pendientes'); } - public function depositar(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\Pago $pagoService): ResponseInterface - { - $body = $request->getBody(); - $json = json_decode($body->getContents()); - $date = new DateTimeImmutable($json->fecha); - $response->getBody()->write(json_encode(['fecha' => $date->format('d-m-Y'), 'message' => 'Not implemented'])); - return $response->withHeader('Content-Type', 'application/json'); - } - public function abonar(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\Pago $pagoService): ResponseInterface - { - $body = $request->getBody(); - $json = json_decode($body->getContents()); - $date = new DateTimeImmutable($json->fecha); - $response->getBody()->write(json_encode(['fecha' => $date->format('d-m-Y'), 'message' => 'Not implemented'])); - return $response->withHeader('Content-Type', 'application/json'); - } - public function para_pendientes(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\Pago $pagoService): ResponseInterface - { - $pagos = $pagoService->getPendientes(); - $pagos_pendientes = []; - foreach ($pagos as $pago) { - $pagos_pendientes []= [ - 'id' => $pago->id - ]; - } - $response->getBody()->write(json_encode(['pagos' => $pagos_pendientes, 'total' => count($pagos_pendientes)])); - return $response->withHeader('Content-Type', 'application/json'); - } - public function para_abonar(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\Pago $pagoService): ResponseInterface - { - $pagos = $pagoService->getDepositados(); - $pagos_depositados = []; - foreach ($pagos as $pago) { - $pagos_depositados []= [ - 'id' => $pago->id - ]; - } - $response->getBody()->write(json_encode(['pagos' => $pagos_depositados, 'total' => count($pagos_depositados)])); - return $response->withHeader('Content-Type', 'application/json'); - } - public function rebotes(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\Pago $pagoService): ResponseInterface - { - $pagos = $pagoService->getRebotes(); - $rebotes = []; - foreach ($pagos as $pago) { - $rebotes []= [ - 'id' => $pago->id - ]; - } - $response->getBody()->write(json_encode(['pagos' => $rebotes, 'total' => count($rebotes)])); - return $response->withHeader('Content-Type', 'application/json'); - } } diff --git a/app/src/Model/Venta/Pago.php b/app/src/Model/Venta/Pago.php index 9b2e1ba..8beda1e 100644 --- a/app/src/Model/Venta/Pago.php +++ b/app/src/Model/Venta/Pago.php @@ -34,7 +34,7 @@ class Pago extends Model 'banco' => $this->banco ?? '', 'tipo_pago' => $this->tipoPago ?? '', 'identificador' => $this->identificador ?? '', - 'fecha' => $this->fecha->format('Y-m-d H:i:S') ?? '', + 'fecha' => $this->fecha->format('Y-m-d H:i:s') ?? '', 'uf' => $this->uf ?? 1, 'pagador' => $this->pagador ?? '', 'asociado' => $this->asociado ?? '' From afbadd520b04a0a19d16e0c3f571088d937b098a Mon Sep 17 00:00:00 2001 From: Aldarien Date: Fri, 22 Dec 2023 12:50:09 -0300 Subject: [PATCH 084/163] FIX: when new value is null --- app/common/Ideal/Repository.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/common/Ideal/Repository.php b/app/common/Ideal/Repository.php index 993d62c..3322bf5 100644 --- a/app/common/Ideal/Repository.php +++ b/app/common/Ideal/Repository.php @@ -116,7 +116,7 @@ abstract class Repository implements Define\Repository $changes = []; $values = []; foreach ($columns as $column) { - if (isset($data[$column])) { + if (in_array($column, array_keys($data))) { $changes []= $column; $values []= $data[$column]; } From 8492d1df2b3e235b71f647d28018cd95348e7795 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Fri, 22 Dec 2023 12:52:04 -0300 Subject: [PATCH 085/163] Eliminar desistimiento y loading en editar desistimiento --- app/resources/routes/api/ventas.php | 5 +- .../views/ventas/desistida.blade.php | 66 ++++++++++++++----- app/src/Controller/API/Ventas.php | 12 ++++ app/src/Service/Venta.php | 16 ++++- app/src/Service/Venta/Pago.php | 15 ++++- 5 files changed, 96 insertions(+), 18 deletions(-) diff --git a/app/resources/routes/api/ventas.php b/app/resources/routes/api/ventas.php index 13b8000..a4acb3a 100644 --- a/app/resources/routes/api/ventas.php +++ b/app/resources/routes/api/ventas.php @@ -25,7 +25,10 @@ $app->group('/venta/{venta_id}', function($app) { $app->get('/unidades[/]', [Ventas::class, 'unidades']); $app->get('/comentarios[/]', [Ventas::class, 'comentarios']); $app->post('/escriturar[/]', [Ventas::class, 'escriturar']); - $app->post('/desistir[/]', [Ventas::class, 'desistir']); + $app->group('/desistir', function($app) { + $app->get('/eliminar[/]', [Ventas::class, 'insistir']); + $app->post('[/]', [Ventas::class, 'desistir']); + }); $app->post('[/]', [Ventas::class, 'edit']); $app->get('[/]', [Ventas::class, 'get']); }); diff --git a/app/resources/views/ventas/desistida.blade.php b/app/resources/views/ventas/desistida.blade.php index 4d394df..303c35a 100644 --- a/app/resources/views/ventas/desistida.blade.php +++ b/app/resources/views/ventas/desistida.blade.php @@ -9,35 +9,50 @@
    -
    - -
    -
    - - +
    +
    + +
    +
    + + +
    -
    -
    - -
    -
    $
    - +
    +
    +
    +
    + +
    +
    $
    + +
    +
    +
    + +
    +
    + +
    @endsection @push('page_scripts') @endpush diff --git a/app/src/Controller/API/Ventas.php b/app/src/Controller/API/Ventas.php index 76e2ad5..684ec99 100644 --- a/app/src/Controller/API/Ventas.php +++ b/app/src/Controller/API/Ventas.php @@ -258,4 +258,16 @@ class Ventas } catch (EmptyResult) {} return $this->withJson($response, $output); } + public function insistir(ServerRequestInterface $request, ResponseInterface $response, Service\Venta $ventaService, int $venta_id): ResponseInterface + { + $output = [ + 'venta_id' => $venta_id, + 'eliminado' => false + ]; + try { + $venta = $ventaService->getById($venta_id); + $output['eliminado'] = $ventaService->insistir($venta); + } catch (EmptyResult) {} + return $this->withJson($response, $output); + } } diff --git a/app/src/Service/Venta.php b/app/src/Service/Venta.php index 732c785..eecc7a2 100644 --- a/app/src/Service/Venta.php +++ b/app/src/Service/Venta.php @@ -384,7 +384,7 @@ class Venta { try { if ($this->validarData($data, ['fecha', 'devolucion'])) { - $pago = $this->pagoService->add(['fecha' => $data['fecha'], 'valor' => $data['devolucion']]); + $pago = $this->pagoService->add(['fecha' => $data['fecha'], 'valor' => str_replace(['.', ','], ['', '.'], $data['devolucion'])]); $this->ventaRepository->edit($venta, ['resciliacion' => $pago->id]); } $tipoEstado = $this->tipoEstadoVentaRepository->fetchByDescripcion('desistida'); @@ -394,4 +394,18 @@ class Venta return false; } } + public function insistir(Model\Venta $venta): bool + { + try { + $pago = $venta->resciliacion(); + $this->pagoService->delete($pago); + $estado = $venta->currentEstado(); + error_log(var_export($estado,true)); + $this->estadoVentaRepository->remove($estado); + $this->ventaRepository->edit($venta, ['resciliacion' => null]); + return true; + } catch (Implement\Exception\EmptyResult) { + return false; + } + } } diff --git a/app/src/Service/Venta/Pago.php b/app/src/Service/Venta/Pago.php index 3d58e3a..9509a91 100644 --- a/app/src/Service/Venta/Pago.php +++ b/app/src/Service/Venta/Pago.php @@ -3,6 +3,7 @@ namespace Incoviba\Service\Venta; use DateTimeInterface; use DateTimeImmutable; +use Incoviba\Common\Implement\Exception\EmptyResult; use Incoviba\Service\Money; use PDOException; use Incoviba\Repository; @@ -66,8 +67,11 @@ class Pago return false; } } - public function getById(int $pago_id): Model\Venta\Pago + public function getById(?int $pago_id): ?Model\Venta\Pago { + if ($pago_id === null) { + return null; + } $pago = $this->pagoRepository->fetchById($pago_id); return $this->process($pago); } @@ -118,6 +122,15 @@ class Pago $pago->currentEstado = $estado; return $pago; } + public function delete(Model\Venta\Pago $pago): bool + { + try { + $this->pagoRepository->remove($pago); + return true; + } catch (EmptyResult|PDOException) { + return false; + } + } protected function process($pago): Model\Venta\Pago { From 20b2bdc6c6a28a41de801c950b99b7302c9d384a Mon Sep 17 00:00:00 2001 From: Aldarien Date: Fri, 22 Dec 2023 13:17:03 -0300 Subject: [PATCH 086/163] FIX: Cuotas vigentes --- app/resources/views/ventas/pies/cuotas/add.blade.php | 2 +- app/src/Model/Venta/Pie.php | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/resources/views/ventas/pies/cuotas/add.blade.php b/app/resources/views/ventas/pies/cuotas/add.blade.php index 22764c3..47cae41 100644 --- a/app/resources/views/ventas/pies/cuotas/add.blade.php +++ b/app/resources/views/ventas/pies/cuotas/add.blade.php @@ -23,7 +23,7 @@ - @for ($i = count($pie->cuotas()); $i < $pie->cuotas - count($pie->cuotas()); $i ++) + @for ($i = count($pie->cuotas()); $i < $pie->cuotas - count($pie->cuotas(vigentes: true)); $i ++) {{$i + 1}} diff --git a/app/src/Model/Venta/Pie.php b/app/src/Model/Venta/Pie.php index 666ff59..30cfd12 100644 --- a/app/src/Model/Venta/Pie.php +++ b/app/src/Model/Venta/Pie.php @@ -15,16 +15,21 @@ class Pie extends Model public ?Pago $reajuste; public array $cuotasArray; - public function cuotas(bool $pagadas = false): array + public function cuotas(bool $pagadas = false, bool $vigentes = false): array { if ($this->asociado !== null) { return $this->asociado->cuotas($pagadas); } - if (!$pagadas) { + if (!$pagadas and !$vigentes) { return $this->cuotasArray; } + if ($pagadas) { + return array_filter($this->cuotasArray, function(Cuota $cuota) { + return $cuota->pago->currentEstado->tipoEstadoPago->descripcion !== 'no pagado'; + }); + } return array_filter($this->cuotasArray, function(Cuota $cuota) { - return $cuota->pago->currentEstado->tipoEstadoPago->descripcion !== 'no pagado'; + return $cuota->pago->currentEstado->tipoEstadoPago->active === 1; }); } From 0829d338a9b1c6b5c56ea1da75c1875a2acc1ab6 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Fri, 22 Dec 2023 14:14:02 -0300 Subject: [PATCH 087/163] FIX: null date --- app/common/Implement/Repository/Mapper/DateTime.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/common/Implement/Repository/Mapper/DateTime.php b/app/common/Implement/Repository/Mapper/DateTime.php index 85ad2f1..bbeb388 100644 --- a/app/common/Implement/Repository/Mapper/DateTime.php +++ b/app/common/Implement/Repository/Mapper/DateTime.php @@ -9,7 +9,7 @@ class DateTime extends Mapper public function __construct(string $column, ?string $property = null) { $this->setFunction(function($data) use ($column) { - return new DateTimeImmutable($data[$column]); + return new DateTimeImmutable($data[$column] ?? ''); }); if ($property !== null) { $this->setProperty($property); From 675b3843ea16af1b045a7f9d70d552eabf2ac7b7 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Fri, 22 Dec 2023 14:15:09 -0300 Subject: [PATCH 088/163] FIX: Pie cuotas vigentes --- app/resources/views/ventas/pies/cuotas/add.blade.php | 8 ++++---- app/resources/views/ventas/show/forma_pago/pie.blade.php | 2 +- app/src/Controller/API/Ventas/Pies.php | 1 - app/src/Controller/Ventas/Cuotas.php | 7 ++++--- app/src/Model/Venta/Cuota.php | 4 ++-- app/src/Model/Venta/Pie.php | 2 +- app/src/Service/Venta.php | 1 - 7 files changed, 12 insertions(+), 13 deletions(-) diff --git a/app/resources/views/ventas/pies/cuotas/add.blade.php b/app/resources/views/ventas/pies/cuotas/add.blade.php index 47cae41..95ee90c 100644 --- a/app/resources/views/ventas/pies/cuotas/add.blade.php +++ b/app/resources/views/ventas/pies/cuotas/add.blade.php @@ -23,7 +23,7 @@ - @for ($i = count($pie->cuotas()); $i < $pie->cuotas - count($pie->cuotas(vigentes: true)); $i ++) + @for ($i = count($pie->cuotas(vigentes: true)); $i < $pie->cuotas; $i ++) {{$i + 1}} @@ -112,7 +112,7 @@ const index = $(event.currentTarget).data('index') const calendar = $(".fecha.calendar[data-index='" + index + "']") const fecha = calendar.calendar('get date') - for (let i = index + 1; i < {{$pie->cuotas - count($pie->cuotas())}}; i ++) { + for (let i = index + 1; i < {{$pie->cuotas}}; i ++) { setDate(i - index, $(".fecha.calendar[data-index='" + i + "']"), fecha) } }) @@ -120,7 +120,7 @@ $('.copy.banco').click(event => { const index = $(event.currentTarget).data('index') const banco = $(".banco.dropdown[data-index='" + index + "']").dropdown('get value') - for (let i = index + 1; i < {{$pie->cuotas - count($pie->cuotas())}}; i ++) { + for (let i = index + 1; i < {{$pie->cuotas}}; i ++) { $(".banco.dropdown[data-index='" + i + "']").dropdown('set selected', banco) } }) @@ -133,7 +133,7 @@ $('.copy.valor').click(event => { const index = $(event.currentTarget).data('index') const valor = $("[name='valor" + index + "']").val() - for (let i = index + 1; i < {{$pie->cuotas - count($pie->cuotas())}}; i ++) { + for (let i = index + 1; i < {{$pie->cuotas}}; i ++) { $("[name='valor" + i + "']").val(valor) } }) diff --git a/app/resources/views/ventas/show/forma_pago/pie.blade.php b/app/resources/views/ventas/show/forma_pago/pie.blade.php index 06f68a2..6471f06 100644 --- a/app/resources/views/ventas/show/forma_pago/pie.blade.php +++ b/app/resources/views/ventas/show/forma_pago/pie.blade.php @@ -14,7 +14,7 @@ Cuotas - {{count($pie->cuotas(true))}}/{{$pie->cuotas}} + {{count($pie->cuotas(true))}}/{{$pie->cuotas}} @if (count($pie->cuotas()) < $pie->cuotas) diff --git a/app/src/Controller/API/Ventas/Pies.php b/app/src/Controller/API/Ventas/Pies.php index 12a1b2a..9c90638 100644 --- a/app/src/Controller/API/Ventas/Pies.php +++ b/app/src/Controller/API/Ventas/Pies.php @@ -20,7 +20,6 @@ class Pies 'input' => $body, 'edited' => false ]; - error_log(var_export($output,true).PHP_EOL,3,'/logs/pies'); try { $pie = $pieService->getById($pie_id); $pieService->edit($pie, (array) $body); diff --git a/app/src/Controller/Ventas/Cuotas.php b/app/src/Controller/Ventas/Cuotas.php index ea2b29d..0c03d72 100644 --- a/app/src/Controller/Ventas/Cuotas.php +++ b/app/src/Controller/Ventas/Cuotas.php @@ -83,13 +83,14 @@ class Cuotas }); return $view->render($response, 'ventas.pies.cuotas.add', compact('pie', 'venta', 'bancos')); } - public function doAdd(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\Pie $pieService, Repository\Venta $ventaRepository, int $pie_id): ResponseInterface + public function doAdd(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\Pie $pieService, + Repository\Venta $ventaRepository, int $pie_id): ResponseInterface { $body = $request->getParsedBody(); $pie = $pieService->getById($pie_id); $venta = $ventaRepository->fetchByPie($pie_id); - $total = $pie->cuotas - count($pie->cuotas()); - $start = count($pie->cuotas()); + $start = count($pie->cuotas(vigentes: true)); + $total = $pie->cuotas; for ($i = $start; $i < $total; $i ++) { $data = [ 'pie' => $pie->id, diff --git a/app/src/Model/Venta/Cuota.php b/app/src/Model/Venta/Cuota.php index 188f4c0..05dfb41 100644 --- a/app/src/Model/Venta/Cuota.php +++ b/app/src/Model/Venta/Cuota.php @@ -27,9 +27,9 @@ class Cuota extends Model 'valor' => $this->valor, 'estado' => $this->estado ?? false, 'banco' => $this->banco, - 'fecha_pago' => $this->fechaPago->format('Y-m-d H:i:s') ?? '', + 'fecha_pago' => $this->fechaPago?->format('Y-m-d H:i:s') ?? '', 'abonado' => $this->abonado ?? false, - 'fecha_abonado' => $this->fechaAbonado->format('Y-m-d H:i:s') ?? '', + 'fecha_abonado' => $this->fechaAbonado?->format('Y-m-d H:i:s') ?? '', 'uf' => $this->uf ?? 1, 'pago' => $this->pago ?? '', 'numero' => $this->numero ?? '' diff --git a/app/src/Model/Venta/Pie.php b/app/src/Model/Venta/Pie.php index 30cfd12..6eb4f5d 100644 --- a/app/src/Model/Venta/Pie.php +++ b/app/src/Model/Venta/Pie.php @@ -29,7 +29,7 @@ class Pie extends Model }); } return array_filter($this->cuotasArray, function(Cuota $cuota) { - return $cuota->pago->currentEstado->tipoEstadoPago->active === 1; + return $cuota->pago->currentEstado->tipoEstadoPago->activo or $cuota->pago->currentEstado->tipoEstadoPago->descripcion === 'devuelto'; }); } diff --git a/app/src/Service/Venta.php b/app/src/Service/Venta.php index eecc7a2..7265668 100644 --- a/app/src/Service/Venta.php +++ b/app/src/Service/Venta.php @@ -400,7 +400,6 @@ class Venta $pago = $venta->resciliacion(); $this->pagoService->delete($pago); $estado = $venta->currentEstado(); - error_log(var_export($estado,true)); $this->estadoVentaRepository->remove($estado); $this->ventaRepository->edit($venta, ['resciliacion' => null]); return true; From bc2333bc95110bc07f8955ea9153e9a51dfd9580 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Mon, 8 Jan 2024 13:16:12 -0300 Subject: [PATCH 089/163] FIX: Pie cuotas valores uf --- .../views/ventas/pies/cuotas.blade.php | 19 +++++++++---------- app/src/Model/Venta/Pago.php | 3 ++- app/src/Model/Venta/Pie.php | 2 +- app/src/Service/Venta/Pago.php | 17 +++++++++++++---- 4 files changed, 25 insertions(+), 16 deletions(-) diff --git a/app/resources/views/ventas/pies/cuotas.blade.php b/app/resources/views/ventas/pies/cuotas.blade.php index c7794c3..a8268c3 100644 --- a/app/resources/views/ventas/pies/cuotas.blade.php +++ b/app/resources/views/ventas/pies/cuotas.blade.php @@ -26,7 +26,10 @@ Fecha Estado ISO - @php $now = new DateTimeImmutable(); @endphp + @php + $now = new DateTimeImmutable(); + $uf_venta = $venta->uf === 0.0 ? $UF->get($venta->currentEstado()->fecha) : $venta->uf; + @endphp @foreach ($venta->formaPago()->pie->cuotas() as $cuota) {{$cuota->numero}} @@ -85,16 +88,12 @@ }, 0))}} - @php - $now = new DateTimeImmutable(); - @endphp {{$format->ufs($total = array_reduce($venta->formaPago()->pie->cuotas(), - function(float $sum, Incoviba\Model\Venta\Cuota $cuota) use ($now, $venta) { - if ($cuota->pago->fecha > $now) { - return $sum + $cuota->pago->valor / $venta->uf; - } - return $sum + $cuota->pago->valor(); - }, 0))}} + function(float $sum, Incoviba\Model\Venta\Cuota $cuota) use ($now, $uf_venta) { + return $sum + (($cuota->pago->fecha > $now or $cuota->pago->uf === null) ? + $cuota->pago->valor / $uf_venta : + $cuota->pago->valor()); + }, 0.0))}} diff --git a/app/src/Model/Venta/Pago.php b/app/src/Model/Venta/Pago.php index 8beda1e..c983b22 100644 --- a/app/src/Model/Venta/Pago.php +++ b/app/src/Model/Venta/Pago.php @@ -24,7 +24,8 @@ class Pago extends Model public function valor(string $moneda = Pago::UF): float { - return $this->valor / (($moneda === Pago::UF) ? ($this->uf > 0 ? $this->uf : 1) : 1); + $uf = $this->uf ?? ($this->uf > 0.0 ? $this->uf : 1); + return $this->valor / (($moneda === Pago::UF) ? $uf : 1); } public function jsonSerialize(): mixed diff --git a/app/src/Model/Venta/Pie.php b/app/src/Model/Venta/Pie.php index 6eb4f5d..ec3f11d 100644 --- a/app/src/Model/Venta/Pie.php +++ b/app/src/Model/Venta/Pie.php @@ -25,7 +25,7 @@ class Pie extends Model } if ($pagadas) { return array_filter($this->cuotasArray, function(Cuota $cuota) { - return $cuota->pago->currentEstado->tipoEstadoPago->descripcion !== 'no pagado'; + return in_array($cuota->pago->currentEstado->tipoEstadoPago->descripcion, ['depositado', 'abonado']); }); } return array_filter($this->cuotasArray, function(Cuota $cuota) { diff --git a/app/src/Service/Venta/Pago.php b/app/src/Service/Venta/Pago.php index 9509a91..b55cd26 100644 --- a/app/src/Service/Venta/Pago.php +++ b/app/src/Service/Venta/Pago.php @@ -136,14 +136,23 @@ class Pago { $pago->estados = $this->estadoPagoRepository->fetchByPago($pago->id); $pago->currentEstado = $this->estadoPagoRepository->fetchCurrentByPago($pago->id); + $pago->uf = $this->getUF($pago); + return $pago; + } + protected function getUF(Model\Venta\Pago $pago): ?float + { if (($pago->uf === null or $pago->uf === 0.0) and $pago->currentEstado->tipoEstadoPago->descripcion === 'abonado' and $pago->currentEstado->fecha <= new DateTimeImmutable()) { - $pago->uf = $this->moneyService->getUF($pago->currentEstado->fecha); - if ($pago->uf !== 0.0) { - $this->pagoRepository->edit($pago, ['uf' => $pago->uf]); + $uf = $this->moneyService->getUF($pago->currentEstado->fecha); + if ($uf !== 0.0) { + $this->pagoRepository->edit($pago, ['uf' => $uf]); + return $uf; } + } elseif ($pago->uf === 0.0) { + $this->pagoRepository->edit($pago, ['uf' => null]); + return null; } - return $pago; + return $pago->uf; } } From d225011ae996e62565117d1f22d0e72adb808ff0 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Mon, 8 Jan 2024 17:33:42 -0300 Subject: [PATCH 090/163] Implement search pago --- app/src/Repository/Venta.php | 37 ++++++ app/src/Repository/Venta/BonoPie.php | 17 +++ app/src/Repository/Venta/Credito.php | 17 +++ app/src/Repository/Venta/Cuota.php | 14 +- app/src/Repository/Venta/Escritura.php | 17 +++ app/src/Repository/Venta/Pago.php | 8 ++ app/src/Repository/Venta/Pie.php | 16 +++ app/src/Repository/Venta/Subsidio.php | 9 ++ app/src/Service/Search.php | 172 ++++++++++++++++++++++--- app/src/Service/Venta/Cuota.php | 3 + 10 files changed, 288 insertions(+), 22 deletions(-) diff --git a/app/src/Repository/Venta.php b/app/src/Repository/Venta.php index ba4102b..0476532 100644 --- a/app/src/Repository/Venta.php +++ b/app/src/Repository/Venta.php @@ -202,6 +202,11 @@ WHERE `proyecto`.`descripcion` = ? AND `unidad`.`descripcion` = ? AND tev.`activ $query = "SELECT * FROM `{$this->getTable()}` WHERE `pie` = ?"; return $this->fetchOne($query, [$pie_id]); } + public function fetchIdByPie(int $pie_id): array + { + $query = "SELECT `id` FROM `{$this->getTable()}` WHERE `pie` = ?"; + return $this->connection->execute($query, [$pie_id])->fetch(PDO::FETCH_ASSOC); + } public function fetchByUnidad(string $unidad, string $tipo): array { $query = "SELECT a.* @@ -275,4 +280,36 @@ WHERE ptu.`proyecto` = ? AND tev.`descripcion` IN ('firmado por inmobiliaria', ' GROUP BY a.`id`"; return $this->fetchMany($query, [$proyecto_id]); } + public function fetchIdByEscritura(int $escritura_id): array + { + $query = $this->connection->getQueryBuilder() + ->select('id') + ->from($this->getTable()) + ->where('escritura = ?'); + return $this->connection->execute($query, [$escritura_id])->fetch(PDO::FETCH_ASSOC); + } + public function fetchIdBySubsidio(int $subsidio_id): array + { + $query = $this->connection->getQueryBuilder() + ->select('id') + ->from($this->getTable()) + ->where('subsidio = ?'); + return $this->connection->execute($query, [$subsidio_id])->fetch(PDO::FETCH_ASSOC); + } + public function fetchIdByCredito(int $credito_id): array + { + $query = $this->connection->getQueryBuilder() + ->select('id') + ->from($this->getTable()) + ->where('credito = ?'); + return $this->connection->execute($query, [$credito_id])->fetch(PDO::FETCH_ASSOC); + } + public function fetchIdByBono(int $bono_id): array + { + $query = $this->connection->getQueryBuilder() + ->select('id') + ->from($this->getTable()) + ->where('bono_pie = ?'); + return $this->connection->execute($query, [$bono_id])->fetch(PDO::FETCH_ASSOC); + } } diff --git a/app/src/Repository/Venta/BonoPie.php b/app/src/Repository/Venta/BonoPie.php index 02332b8..25ee837 100644 --- a/app/src/Repository/Venta/BonoPie.php +++ b/app/src/Repository/Venta/BonoPie.php @@ -35,4 +35,21 @@ class BonoPie extends Ideal\Repository { return $this->update($model, ['valor', 'pago'], $new_data); } + + public function fetchByValue(float $value): array + { + $query = $this->connection->getQueryBuilder() + ->select() + ->from($this->getTable()) + ->where('valor = ?'); + return $this->fetchMany($query, [$value]); + } + public function fetchByPago(int $pago_id): Model\Venta\BonoPie + { + $query = $this->connection->getQueryBuilder() + ->select() + ->from($this->getTable()) + ->where('pago = ?'); + return $this->fetchOne($query, [$pago_id]); + } } diff --git a/app/src/Repository/Venta/Credito.php b/app/src/Repository/Venta/Credito.php index 3767461..bef27bd 100644 --- a/app/src/Repository/Venta/Credito.php +++ b/app/src/Repository/Venta/Credito.php @@ -36,4 +36,21 @@ class Credito extends Ideal\Repository { return $this->update($model, ['banco', 'valor', 'fecha', 'uf', 'abonado', 'fecha_abono', 'pago'], $new_data); } + + public function fetchByValue(int $value): array + { + $query = $this->connection->getQueryBuilder() + ->select() + ->from($this->getTable()) + ->where('valor = ?'); + return $this->fetchMany($query, [$value]); + } + public function fetchByPago(int $pago_id): Model\Venta\Credito + { + $query = $this->connection->getQueryBuilder() + ->select() + ->from($this->getTable()) + ->where('pago = ?'); + return $this->fetchOne($query, [$pago_id]); + } } diff --git a/app/src/Repository/Venta/Cuota.php b/app/src/Repository/Venta/Cuota.php index f6c0249..2a204f1 100644 --- a/app/src/Repository/Venta/Cuota.php +++ b/app/src/Repository/Venta/Cuota.php @@ -182,7 +182,8 @@ ORDER BY p1.`fecha`, v1.`descripcion`"; $query = $this->connection->getQueryBuilder() ->select() ->from($this->getTable()) - ->where('pie = ?'); + ->where('pie = ?') + ->group('id'); return $this->fetchMany($query, [$pie_id]); } public function fetchVigenteByPie(int $pie_id): array @@ -192,7 +193,16 @@ FROM `{$this->getTable()}` a JOIN `pago` ON `pago`.`id` = a.`pago` JOIN (SELECT e1.* FROM `estado_pago` e1 JOIN (SELECT MAX(`id`) AS 'id', `pago` FROM `estado_pago` GROUP BY `pago`) e0 ON e0.`id` = e1.`id`) ep ON ep.`pago` = `pago`.`id` JOIN `tipo_estado_pago` tep ON tep.`id` = ep.`estado` -WHERE a.`pie` = ? AND tep.`active` = 1"; +WHERE a.`pie` = ? AND tep.`active` = 1 +GROUP BY a.`id`"; return $this->fetchMany($query, [$pie_id]); } + public function fetchByPago(int $pago_id): Model\Venta\Cuota + { + $query = $this->connection->getQueryBuilder() + ->select() + ->from($this->getTable()) + ->where('pago = ?'); + return $this->fetchOne($query, [$pago_id]); + } } diff --git a/app/src/Repository/Venta/Escritura.php b/app/src/Repository/Venta/Escritura.php index 2a44ce1..7c43b8a 100644 --- a/app/src/Repository/Venta/Escritura.php +++ b/app/src/Repository/Venta/Escritura.php @@ -38,4 +38,21 @@ class Escritura extends Ideal\Repository { return $this->update($model, ['valor', 'fecha', 'uf', 'abonado', 'fecha_abono', 'pago'], $new_data); } + + public function fetchByValue(int $value): array + { + $query = $this->connection->getQueryBuilder() + ->select() + ->from($this->getTable()) + ->where('valor = ?'); + return $this->fetchMany($query, [$value]); + } + public function fetchByPago(int $pago_id): Model\Venta\Escritura + { + $query = $this->connection->getQueryBuilder() + ->select() + ->from($this->getTable()) + ->where('pago = ?'); + return $this->fetchOne($query, [$pago_id]); + } } diff --git a/app/src/Repository/Venta/Pago.php b/app/src/Repository/Venta/Pago.php index 451789e..f8f6fa4 100644 --- a/app/src/Repository/Venta/Pago.php +++ b/app/src/Repository/Venta/Pago.php @@ -100,4 +100,12 @@ FROM ( WHERE venta_id = ?"; return $this->fetchMany($query, [$venta_id]); } + public function fetchByValue(int $value): array + { + $query = $this->connection->getQueryBuilder() + ->select() + ->from($this->getTable()) + ->where('valor = ? OR ROUND(valor/uf, 3) = ?'); + return $this->fetchMany($query, [$value, $value]); + } } diff --git a/app/src/Repository/Venta/Pie.php b/app/src/Repository/Venta/Pie.php index e3d46c7..d6efa54 100644 --- a/app/src/Repository/Venta/Pie.php +++ b/app/src/Repository/Venta/Pie.php @@ -56,4 +56,20 @@ class Pie extends Ideal\Repository ->where('asociado = ?'); return $this->fetchMany($query, [$pie_id]); } + public function fetchByValue(float $value): array + { + $query = $this->connection->getQueryBuilder() + ->select() + ->from($this->getTable()) + ->where('valor = ?'); + return $this->fetchMany($query, [$value]); + } + public function fetchByReajuste(int $reajuste_id): Model\Venta\Pie + { + $query = $this->connection->getQueryBuilder() + ->select() + ->from($this->getTable()) + ->where('reajuste = ?'); + return $this->fetchOne($query, [$reajuste_id]); + } } diff --git a/app/src/Repository/Venta/Subsidio.php b/app/src/Repository/Venta/Subsidio.php index 180b72f..615cca3 100644 --- a/app/src/Repository/Venta/Subsidio.php +++ b/app/src/Repository/Venta/Subsidio.php @@ -40,4 +40,13 @@ class Subsidio extends Ideal\Repository { return $this->update($model, ['pago', 'subsidio'], $new_data); } + + public function fetchByPago(int $pago_id): Model\Venta\Subsidio + { + $query = $this->connection->getQueryBuilder() + ->select() + ->from($this->getTable()) + ->where('subsidio = ? OR pago = ?'); + return $this->fetchOne($query, [$pago_id, $pago_id]); + } } diff --git a/app/src/Service/Search.php b/app/src/Service/Search.php index 5b66a4e..0132c28 100644 --- a/app/src/Service/Search.php +++ b/app/src/Service/Search.php @@ -13,7 +13,15 @@ class Search protected Venta $ventaService, protected Repository\Venta $ventaRepository, protected Repository\Venta\Unidad $unidadRepository, - protected Repository\Proyecto\TipoUnidad $tipoUnidadRepository) {} + protected Repository\Proyecto\TipoUnidad $tipoUnidadRepository, + protected Repository\Venta\Pie $pieRepository, + protected Repository\Venta\Pago $pagoRepository, + protected Repository\Venta\Cuota $cuotaRepository, + protected Repository\Venta\Credito $creditoRepository, + protected Repository\Venta\Escritura $escrituraRepository, + protected Repository\Venta\Subsidio $subsidioRepository, + protected Repository\Venta\BonoPie $bonoPieRepository + ) {} public function query(string $query, string $tipo): array { @@ -65,27 +73,24 @@ class Search protected function findVentas(string $query, string $tipo): array { $tiposUnidades = $this->getTiposUnidades(); - if ($tipo === 'unidad') { - $results = []; - foreach ($tiposUnidades as $t) { - $this->add($results, $this->findVentas($query, $t)); - } - return $results; - } if (in_array($tipo, $tiposUnidades)) { return $this->findUnidad($query, $tipo); } - if ($tipo === 'propietario') { - return $this->findPropietario($query); - } - if ($tipo === 'precio_venta') { - return $this->findPrecio($query); - } - if ($tipo === 'proyecto') { - return $this->findProyecto($query); - } - if ($tipo === 'pago') { - return $this->findPago($query); + switch ($tipo) { + case 'unidad': + $results = []; + foreach ($tiposUnidades as $t) { + $this->add($results, $this->findVentas($query, $t)); + } + return $results; + case 'propietario': + return $this->findPropietario($query); + case 'precio_venta': + return $this->findPrecio($query); + case 'proyecto': + return $this->findProyecto($query); + case 'pago': + return $this->findPago($query); } return []; } @@ -133,7 +138,134 @@ class Search } protected function findPago(string $query): array { - return []; + $methods = [ + 'findPie', + 'findEscritura', + 'findSubsidio', + 'findCredito', + 'findPromociones', + ]; + $valor = str_replace(['$', '.', ','], ['', '', '.'], $query); + $pagos = []; + try { + $pagos = $this->pagoRepository->fetchByValue($valor); + } catch (EmptyResult) {} + $results = []; + foreach ($methods as $method) { + $this->add($results, $this->{$method}($valor, $pagos)); + } + return $results; + } + protected function findPie(string $query, array $pagos): array + { + $results = []; + try { + $pies = $this->pieRepository->fetchByValue($query); + foreach ($pies as $pie) { + try { + $this->add($results, [$this->ventaRepository->fetchIdByPie($pie->id)]); + } catch (EmptyResult) {} + } + } catch (EmptyResult) {} + $this->add($results, $this->findReajuste($query, $pagos)); + $this->add($results, $this->findCuota($query, $pagos)); + return $results; + } + protected function findReajuste(string $query, array $pagos): array + { + $results = []; + foreach ($pagos as $pago) { + try { + $pie = $this->pieRepository->fetchByReajuste($pago->id); + $this->add($results, [$this->ventaRepository->fetchIdByPie($pie->id)]); + } catch (EmptyResult) {} + } + return $results; + } + protected function findCuota(string $query, array $pagos): array + { + $results = []; + foreach ($pagos as $pago) { + try { + $cuota = $this->cuotaRepository->fetchByPago($pago->id); + $this->add($results, [$this->ventaRepository->fetchIdByPie($cuota->pie->id)]); + } catch (EmptyResult) {} + } + return $results; + } + protected function findEscritura(string $query, array $pagos): array + { + $results = []; + try { + $escrituras = $this->escrituraRepository->fetchByValue($query); + foreach ($escrituras as $escritura) { + try { + $this->add($results, [$this->ventaRepository->fetchIdByEscritura($escritura->id)]); + } catch (EmptyResult) {} + } + } catch (EmptyResult) {} + foreach ($pagos as $pago) { + try { + $escritura = $this->escrituraRepository->fetchByPago($pago->id); + $this->add($results, [$this->ventaRepository->fetchIdByEscritura($escritura->id)]); + } catch (EmptyResult) {} + } + return $results; + } + protected function findSubsidio(string $query, array $pagos): array + { + $results = []; + foreach ($pagos as $pago) { + try { + $subsidio = $this->subsidioRepository->fetchByPago($pago->id); + $this->add($results, [$this->ventaRepository->fetchIdBySubsidio($subsidio->id)]); + } catch (EmptyResult) {} + } + return $results; + } + protected function findCredito(string $query, array $pagos): array + { + $results = []; + try { + $creditos = $this->creditoRepository->fetchByValue($query); + foreach ($creditos as $credito) { + try { + $this->add($results, [$this->ventaRepository->fetchIdByCredito($credito->id)]); + } catch (EmptyResult) {} + } + } catch (EmptyResult) {} + foreach ($pagos as $pago) { + try { + $credito = $this->creditoRepository->fetchByPago($pago->id); + $this->add($results, [$this->ventaRepository->fetchIdByCredito($credito->id)]); + } catch (EmptyResult) {} + } + return $results; + } + protected function findPromociones(string $query, array $pagos): array + { + $results = []; + $this->add($results, $this->findBonoPie($query, $pagos)); + return $results; + } + protected function findBonoPie(string $query, array $pagos): array + { + $results = []; + try { + $bonos = $this->bonoPieRepository->fetchByValue($query); + foreach ($bonos as $bono) { + try { + $this->add($results, [$this->ventaRepository->fetchIdByBono($bono->id)]); + } catch (EmptyResult) {} + } + } catch (EmptyResult) {} + foreach ($pagos as $pago) { + try { + $bono = $this->bonoPieRepository->fetchByPago($pago->id); + $this->add($results, [$this->ventaRepository->fetchIdByBono($bono->id)]); + } catch (EmptyResult) {} + } + return $results; } protected array $tipos; diff --git a/app/src/Service/Venta/Cuota.php b/app/src/Service/Venta/Cuota.php index 4855e77..8f022ca 100644 --- a/app/src/Service/Venta/Cuota.php +++ b/app/src/Service/Venta/Cuota.php @@ -76,6 +76,9 @@ class Cuota public function getByPie(int $pie_id): array { return $this->cuotaRepository->fetchByPie($pie_id); + /*return array_filter($this->cuotaRepository->fetchByPie($pie_id), function(Model\Venta\Cuota $cuota) { + return !in_array($cuota->pago->currentEstado->tipoEstadoPago->descripcion, ['anulado']); + });*/ } public function getVigenteByPie(int $pie_id): array { From 6393a1fced8402aeccd172f1706e55a4e16a1efc Mon Sep 17 00:00:00 2001 From: Aldarien Date: Mon, 8 Jan 2024 21:24:34 -0300 Subject: [PATCH 091/163] Implement movimientos cuotas --- app/resources/routes/api/ventas/pagos.php | 6 +- .../views/ventas/pies/cuotas.blade.php | 164 +++++++++++++++--- app/src/Controller/API/Ventas/Pagos.php | 72 ++++++-- app/src/Service/Venta/Pago.php | 16 ++ 4 files changed, 222 insertions(+), 36 deletions(-) diff --git a/app/resources/routes/api/ventas/pagos.php b/app/resources/routes/api/ventas/pagos.php index dc60160..784f146 100644 --- a/app/resources/routes/api/ventas/pagos.php +++ b/app/resources/routes/api/ventas/pagos.php @@ -7,7 +7,9 @@ $app->group('/pagos', function($app) { $app->get('/rebotes', [Pagos::class, 'rebotes']); }); $app->group('/pago/{pago_id:[0-9]+}', function($app) { - $app->put('/depositar[/]', [Pagos::class, 'depositar']); - $app->put('/abonar[/]', [Pagos::class, 'abonar']); + $app->post('/depositar[/]', [Pagos::class, 'depositar']); + $app->post('/abonar[/]', [Pagos::class, 'abonar']); + $app->post('/devolver[/]', [Pagos::class, 'devolver']); + $app->get('/anular[/]', [Pagos::class, 'anular']); $app->post('[/]', [Pagos::class, 'edit']); }); diff --git a/app/resources/views/ventas/pies/cuotas.blade.php b/app/resources/views/ventas/pies/cuotas.blade.php index a8268c3..c302d8e 100644 --- a/app/resources/views/ventas/pies/cuotas.blade.php +++ b/app/resources/views/ventas/pies/cuotas.blade.php @@ -24,6 +24,7 @@ Estado Fecha Estado Fecha Estado ISO + @php @@ -31,7 +32,10 @@ $uf_venta = $venta->uf === 0.0 ? $UF->get($venta->currentEstado()->fecha) : $venta->uf; @endphp @foreach ($venta->formaPago()->pie->cuotas() as $cuota) - + pago->currentEstado->tipoEstadoPago->descripcion, ['anulado', 'reemplazado'])) + class="disabled" + @endif > {{$cuota->numero}} {{$cuota->pago->fecha->format('d-m-Y')}} {{$cuota->pago->fecha->format('Y-m-d')}} @@ -53,28 +57,33 @@ @endif >{{ucwords($cuota->pago->currentEstado->tipoEstadoPago->descripcion)}} - @if ($cuota->pago->currentEstado->tipoEstadoPago->descripcion === 'abonado') + @if (in_array($cuota->pago->currentEstado->tipoEstadoPago->descripcion, ['abonado', 'anulado', 'reemplazado'])) {{$cuota->pago->currentEstado->fecha->format('d-m-Y')}} - @else -
    -
    -
    - - -
    -
    - - @if ($cuota->pago->currentEstado->tipoEstadoPago->descripcion === 'depositado') - - @endif + @if ($cuota->pago->currentEstado->tipoEstadoPago->descripcion === 'depositado') + + @endif +
    @endif {{$cuota->pago->currentEstado->fecha->format('Y-m-d')}} + + @if ($cuota->pago->currentEstado->tipoEstadoPago->descripcion !== 'anulado') + + @endif + @endforeach @@ -95,7 +104,7 @@ $cuota->pago->valor()); }, 0.0))}} - + TOTAL PAGADO @@ -114,7 +123,7 @@ {{$format->number($pagado / $total * 100, 2)}}% - + POR PAGAR @@ -127,7 +136,7 @@ {{$format->number(($total - $pagado) / $total * 100, 2)}}% - + @@ -139,12 +148,127 @@ @push('page_scripts') +@endpush diff --git a/app/src/Controller/API/CentrosCostos.php b/app/src/Controller/API/CentrosCostos.php new file mode 100644 index 0000000..f1466b5 --- /dev/null +++ b/app/src/Controller/API/CentrosCostos.php @@ -0,0 +1,62 @@ +getParsedBody(); + $output = [ + 'input' => $body, + 'added' => false + ]; + try { + $centroCosto = $centroCostoRepository->create($body); + $centroCosto->id = $body['id']; + $centroCostoRepository->save($centroCosto); + $output['added'] = true; + } catch (EmptyResult) {} + return $this->withJson($response, $output); + } + public function edit(ServerRequestInterface $request, ResponseInterface $response, + Repository\CentroCosto $centroCostoRepository, int $centro_costo_id): ResponseInterface + { + $body = $request->getParsedBody(); + $output = [ + 'centro_costo_id' => $centro_costo_id, + 'input' => $body, + 'edited' => false + ]; + try { + $centroCosto = $centroCostoRepository->fetchById($centro_costo_id); + if ($body['tipo_cuenta_id'] === '') { + $body['tipo_cuenta_id'] = null; + } + $centroCostoRepository->edit($centroCosto, $body); + $output['edited'] = true; + } catch (EmptyResult) {} + return $this->withJson($response, $output); + } + public function remove(ServerRequestInterface $request, ResponseInterface $response, + Repository\CentroCosto $centroCostoRepository, int $centro_costo_id): ResponseInterface + { + $output = [ + 'centro_costo_id' => $centro_costo_id, + 'removed' => false + ]; + try { + $centroCosto = $centroCostoRepository->fetchById($centro_costo_id); + $centroCostoRepository->remove($centroCosto); + $output['removed'] = true; + } catch (EmptyResult) {} + return $this->withJson($response, $output); + } +} diff --git a/app/src/Controller/CentrosCostos.php b/app/src/Controller/CentrosCostos.php new file mode 100644 index 0000000..13fb89a --- /dev/null +++ b/app/src/Controller/CentrosCostos.php @@ -0,0 +1,24 @@ +fetchAll(); + $tiposCentros = $tipoCentroRepository->fetchAll(); + $categorias = $categoriaCentroRepository->fetchAll('descripcion'); + $tiposCuentas = $tipoCuentaRepository->fetchAll(); + return $view->render($response, 'contabilidad.centros_costos', compact('centrosCostos', + 'tiposCentros', 'categorias', 'tiposCuentas')); + } +} diff --git a/app/src/Model/CategoriaCentro.php b/app/src/Model/CategoriaCentro.php new file mode 100644 index 0000000..e131f86 --- /dev/null +++ b/app/src/Model/CategoriaCentro.php @@ -0,0 +1,5 @@ + $this->tipoCentro, + 'categoria' => $this->categoria, + 'tipo_cuenta' => $this->tipoCuenta, + 'cuenta_contable' => $this->cuentaContable, + 'descripcion' => $this->descripcion + ]); + } +} diff --git a/app/src/Model/PagoCentroCosto.php b/app/src/Model/PagoCentroCosto.php new file mode 100644 index 0000000..5be8849 --- /dev/null +++ b/app/src/Model/PagoCentroCosto.php @@ -0,0 +1,18 @@ + $this->pago, + 'centro_costo' => $this->centroCosto + ]); + } +} diff --git a/app/src/Model/TipoCentro.php b/app/src/Model/TipoCentro.php new file mode 100644 index 0000000..9c23000 --- /dev/null +++ b/app/src/Model/TipoCentro.php @@ -0,0 +1,5 @@ +setTable('categorias_centros_costos'); + } + + protected function getBlank(): Define\Model + { + return new Model\CategoriaCentro(); + } +} diff --git a/app/src/Repository/CentroCosto.php b/app/src/Repository/CentroCosto.php new file mode 100644 index 0000000..55c24b2 --- /dev/null +++ b/app/src/Repository/CentroCosto.php @@ -0,0 +1,81 @@ +setTable('centros_costos'); + } + + public function create(?array $data = null): Model\CentroCosto + { + $map = (new MapperParser(['descripcion'])) + ->register('tipo_centro_id', (new Mapper()) + ->setProperty('tipoCentro') + ->setFunction(function(array $data) { + return $this->tipoCentroRepository->fetchById($data['tipo_centro_id']); + })) + ->register('categoria_id', (new Mapper()) + ->setProperty('categoria') + ->setFunction(function(array $data) { + return $this->categoriaCentroRepository->fetchById($data['categoria_id']); + })) + ->register('tipo_cuenta', (new Mapper()) + ->setProperty('tipoCuenta') + ->setFunction(function(array $data) { + return $this->tipoCuentaRepository->fetchById($data['tipo_cuenta_id']); + }) + ->setDefault(null)) + ->register('cuenta_contable', (new Mapper()) + ->setProperty('cuentaContable')); + return $this->parseData(new Model\CentroCosto(), $data, $map); + } + public function save(Define\Model $model): Model\CentroCosto + { + $this->saveNew( + ['id', 'tipo_centro_id', 'categoria_id', 'tipo_cuenta_id', 'cuenta_contable', 'descripcion'], + [$model->id, $model->tipoCentro->id, $model->categoria->id, $model->tipoCuenta?->id, $model->cuentaContable, $model->descripcion] + ); + return $model; + } + 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\CentroCosto + { + $query = $this->connection->getQueryBuilder() + ->select() + ->from($this->getTable()) + ->where('descripcion LIKE ?'); + return $this->fetchOne($query, [$descripcion]); + } + public function fetchByTipoCuenta(string $tipo_cuenta): array + { + $query = $this->connection->getQueryBuilder() + ->select() + ->from($this->getTable()) + ->where('tipo_cuenta_id LIKE ?'); + return $this->fetchMany($query, [$tipo_cuenta]); + } + public function fetchByCategoria(string $categoria): array + { + $query = $this->connection->getQueryBuilder() + ->select() + ->from($this->getTable()) + ->where('categoria_id LIKE ?'); + return $this->fetchMany($query, [$categoria]); + } +} diff --git a/app/src/Repository/PagoCentroCosto.php b/app/src/Repository/PagoCentroCosto.php new file mode 100644 index 0000000..0e2e046 --- /dev/null +++ b/app/src/Repository/PagoCentroCosto.php @@ -0,0 +1,42 @@ +setTable('pagos_centros_costos'); + } + + public function create(?array $data = null): Model\PagoCentroCosto + { + $map = (new Implement\Repository\MapperParser()) + ->register('pago_id', (new Implement\Repository\Mapper()) + ->setProperty('pago') + ->setFunction(function(array $data) { + return $this->pagoRepository->fetchById($data['pago_id']); + })) + ->register('centro_costo_id', (new Implement\Repository\Mapper()) + ->setProperty('centroCosto') + ->setFunction(function(array $data) { + return $this->centroCostoRepository->fetchById($data['centro_costo_id']); + })); + return $this->parseData(new Model\PagoCentroCosto(), $data, $map); + } + 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\PagoCentroCosto + { + return $this->update($model, ['pago_id', 'centro_costo_id'], $new_data); + } +} diff --git a/app/src/Repository/Tipo.php b/app/src/Repository/Tipo.php new file mode 100644 index 0000000..791d47c --- /dev/null +++ b/app/src/Repository/Tipo.php @@ -0,0 +1,37 @@ +parseData($this->getBlank(), $data, $map); + } + public function save(Define\Model $model): Define\Model + { + $model->id = $this->saveNew( + ['descripcion'], + [$model->descripcion] + ); + return $model; + } + public function edit(Define\Model $model, array $new_data): Define\Model + { + return $this->update($model, ['descripcion'], $new_data); + } + + public function fetchByDescripcion(string $descripcion): Define\Model + { + $query = $this->connection->getQueryBuilder() + ->select() + ->from($this->getTable()) + ->where('descripcion LIKE ?'); + return $this->fetchOne($query, [$descripcion]); + } +} diff --git a/app/src/Repository/TipoCentro.php b/app/src/Repository/TipoCentro.php new file mode 100644 index 0000000..db5bae9 --- /dev/null +++ b/app/src/Repository/TipoCentro.php @@ -0,0 +1,19 @@ +setTable('tipos_centros_costos'); + } + + protected function getBlank(): Define\Model + { + return new Model\TipoCentro(); + } +} diff --git a/app/src/Repository/TipoCuenta.php b/app/src/Repository/TipoCuenta.php new file mode 100644 index 0000000..2076a65 --- /dev/null +++ b/app/src/Repository/TipoCuenta.php @@ -0,0 +1,19 @@ +setTable('tipos_cuentas_costos'); + } + + protected function getBlank(): Define\Model + { + return new Model\TipoCuenta(); + } +} From 68e59770fdbbe62c6b7b9a01a6400d23d51fb0c1 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Wed, 10 Jan 2024 19:34:41 -0300 Subject: [PATCH 095/163] Menu contabilidad --- app/resources/views/layout/body/header/menu.blade.php | 2 +- .../views/layout/body/header/menu/contabilidad.blade.php | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/resources/views/layout/body/header/menu.blade.php b/app/resources/views/layout/body/header/menu.blade.php index 7ffdf45..a68f999 100644 --- a/app/resources/views/layout/body/header/menu.blade.php +++ b/app/resources/views/layout/body/header/menu.blade.php @@ -4,7 +4,7 @@ @include('layout.body.header.menu.ventas') @include('layout.body.header.menu.proyectos') @include('layout.body.header.menu.inmobiliarias') - {{--@include('layout.body.header.menu.contabilidad')--}} + @include('layout.body.header.menu.contabilidad') {{--@include('layout.body.header.menu.operadores')--}} {{--@include('layout.body.header.menu.herramientas')--}}
    diff --git a/app/resources/views/layout/body/header/menu/contabilidad.blade.php b/app/resources/views/layout/body/header/menu/contabilidad.blade.php index 7ed6b0c..099e8a3 100644 --- a/app/resources/views/layout/body/header/menu/contabilidad.blade.php +++ b/app/resources/views/layout/body/header/menu/contabilidad.blade.php @@ -2,7 +2,6 @@ Contabilidad
    - Pagos Mes - Resumen + Centros de Costos
    From 316cc51387657864001729e96b1379e0596503d9 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Wed, 10 Jan 2024 20:32:55 -0300 Subject: [PATCH 096/163] FIX: Tipo Cuenta --- app/common/Implement/Repository/Mapper.php | 6 +++++- app/src/Repository/CentroCosto.php | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/common/Implement/Repository/Mapper.php b/app/common/Implement/Repository/Mapper.php index dd23f58..0a15a6e 100644 --- a/app/common/Implement/Repository/Mapper.php +++ b/app/common/Implement/Repository/Mapper.php @@ -62,7 +62,11 @@ class Mapper implements Define\Repository\Mapper } $value = $data[$column]; if ($this->hasFunction()) { - $value = ($this->function)($data); + if ($value !== null) { + $value = ($this->function)($data); + } elseif ($this->hasDefault()) { + $value = $this->default; + } } $model->{$property} = $value; return true; diff --git a/app/src/Repository/CentroCosto.php b/app/src/Repository/CentroCosto.php index 55c24b2..dbd41fb 100644 --- a/app/src/Repository/CentroCosto.php +++ b/app/src/Repository/CentroCosto.php @@ -31,7 +31,7 @@ class CentroCosto extends Ideal\Repository ->setFunction(function(array $data) { return $this->categoriaCentroRepository->fetchById($data['categoria_id']); })) - ->register('tipo_cuenta', (new Mapper()) + ->register('tipo_cuenta_id', (new Mapper()) ->setProperty('tipoCuenta') ->setFunction(function(array $data) { return $this->tipoCuentaRepository->fetchById($data['tipo_cuenta_id']); From dc840a7bffe927fbb2b97533c85f1d80d96343d1 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Wed, 10 Jan 2024 20:36:18 -0300 Subject: [PATCH 097/163] Sort Centros Costos --- app/resources/views/contabilidad/centros_costos.blade.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/resources/views/contabilidad/centros_costos.blade.php b/app/resources/views/contabilidad/centros_costos.blade.php index 81b4f57..4c98f44 100644 --- a/app/resources/views/contabilidad/centros_costos.blade.php +++ b/app/resources/views/contabilidad/centros_costos.blade.php @@ -255,6 +255,7 @@ $(this.ids.table).dataTable({ order: [ [0, 'desc'], + [2, 'asc'], [1, 'asc'], [4, 'asc'] ] From c4f486d3fac2a2513167f2a7826c6af02f6e8ffd Mon Sep 17 00:00:00 2001 From: Aldarien Date: Wed, 10 Jan 2024 20:47:39 -0300 Subject: [PATCH 098/163] Disable edit of Centros Costos --- .../views/contabilidad/centros_costos.blade.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/resources/views/contabilidad/centros_costos.blade.php b/app/resources/views/contabilidad/centros_costos.blade.php index 4c98f44..9e75e7a 100644 --- a/app/resources/views/contabilidad/centros_costos.blade.php +++ b/app/resources/views/contabilidad/centros_costos.blade.php @@ -5,12 +5,12 @@

    Centros de Costos

    -
    + {{--
    -
    +
    --}} @@ -20,8 +20,8 @@ - + {{----}} @@ -33,7 +33,7 @@ - + --}} @endforeach From 674aba801ef7953dcfd178b613a1297fadea74b1 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Wed, 17 Jan 2024 10:33:11 -0300 Subject: [PATCH 099/163] Cartolas --- .gitignore | 1 + app/common/Define/Cartola/Banco.php | 9 + app/common/Define/Contabilidad/Exporter.php | 10 + app/composer.json | 1 + .../routes/api/contabilidad/cartolas.php | 9 + .../routes/api/contabilidad/nubox.php | 11 + app/resources/routes/api/inmobiliarias.php | 10 + .../routes/contabilidad/centros_costos.php | 1 + .../centros_costos/asignar.blade.php | 402 ++++++++++++++++++ app/setup/settings/folders.php | 4 +- app/setup/settings/nubox.php | 8 + app/setup/setups/psr7.php | 8 +- app/setup/setups/services.php | 22 + app/src/Controller/API/Contabilidad.php | 52 +++ app/src/Controller/API/Informes.php | 25 ++ app/src/Controller/API/Inmobiliarias.php | 48 +++ app/src/Controller/API/Nubox.php | 90 ++++ app/src/Controller/API/Proyectos.php | 15 + app/src/Controller/CentrosCostos.php | 8 + app/src/Model/Nubox.php | 18 + app/src/Repository/Inmobiliaria.php | 16 + app/src/Repository/Inmobiliaria/Cuenta.php | 52 +++ app/src/Repository/Nubox.php | 55 +++ app/src/Service/Cartola.php | 29 ++ app/src/Service/Cartola/Security.php | 54 +++ .../Service/Contabilidad/Exporter/Nubox.php | 115 +++++ app/src/Service/Contabilidad/Nubox.php | 139 ++++++ 27 files changed, 1210 insertions(+), 2 deletions(-) create mode 100644 app/common/Define/Cartola/Banco.php create mode 100644 app/common/Define/Contabilidad/Exporter.php create mode 100644 app/resources/routes/api/contabilidad/cartolas.php create mode 100644 app/resources/routes/api/contabilidad/nubox.php create mode 100644 app/resources/routes/api/inmobiliarias.php create mode 100644 app/resources/views/contabilidad/centros_costos/asignar.blade.php create mode 100644 app/setup/settings/nubox.php create mode 100644 app/src/Controller/API/Contabilidad.php create mode 100644 app/src/Controller/API/Informes.php create mode 100644 app/src/Controller/API/Inmobiliarias.php create mode 100644 app/src/Controller/API/Nubox.php create mode 100644 app/src/Model/Nubox.php create mode 100644 app/src/Repository/Inmobiliaria/Cuenta.php create mode 100644 app/src/Repository/Nubox.php create mode 100644 app/src/Service/Cartola.php create mode 100644 app/src/Service/Cartola/Security.php create mode 100644 app/src/Service/Contabilidad/Exporter/Nubox.php create mode 100644 app/src/Service/Contabilidad/Nubox.php diff --git a/.gitignore b/.gitignore index 94a1003..1646ae8 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ **/cache/ **/modules/ **/.idea/ +**/upload?/ diff --git a/app/common/Define/Cartola/Banco.php b/app/common/Define/Cartola/Banco.php new file mode 100644 index 0000000..2a23f06 --- /dev/null +++ b/app/common/Define/Cartola/Banco.php @@ -0,0 +1,9 @@ +group('/cartolas', function($app) { + $app->post('/procesar[/]', [Contabilidad::class, 'procesarCartola']); +}); +$app->group('/cartola', function($app) { + $app->post('/exportar[/]', [Contabilidad::class, 'exportarCartola']); +}); diff --git a/app/resources/routes/api/contabilidad/nubox.php b/app/resources/routes/api/contabilidad/nubox.php new file mode 100644 index 0000000..e1acbf9 --- /dev/null +++ b/app/resources/routes/api/contabilidad/nubox.php @@ -0,0 +1,11 @@ +group('/nubox/{inmobiliaria_rut}', function($app) { + $app->get('/token[/]', [Nubox::class, 'token']); + $app->get('/sistemas[/]', [Nubox::class, 'sistemas']); + $app->group('/libro', function($app) { + $app->post('/mayor[/]', [Nubox::class, 'libroMayor']); + $app->post('/diario[/]', [Nubox::class, 'libroDiario']); + }); +}); diff --git a/app/resources/routes/api/inmobiliarias.php b/app/resources/routes/api/inmobiliarias.php new file mode 100644 index 0000000..55c61fb --- /dev/null +++ b/app/resources/routes/api/inmobiliarias.php @@ -0,0 +1,10 @@ +group('/inmobiliarias', function($app) { + $app->get('[/]', Inmobiliarias::class); +}); +$app->group('/inmobiliaria/{inmobiliaria_rut}', function($app) { + $app->get('/cuentas[/]', [Inmobiliarias::class, 'cuentas']); + $app->get('/proyectos[/]', [Inmobiliarias::class, 'proyectos']); +}); diff --git a/app/resources/routes/contabilidad/centros_costos.php b/app/resources/routes/contabilidad/centros_costos.php index 8af10b3..d1089a4 100644 --- a/app/resources/routes/contabilidad/centros_costos.php +++ b/app/resources/routes/contabilidad/centros_costos.php @@ -2,5 +2,6 @@ use Incoviba\Controller\CentrosCostos; $app->group('/centros_costos', function($app) { + $app->get('/asignar[/]', [CentrosCostos::class, 'asignar']); $app->get('[/]', CentrosCostos::class); }); diff --git a/app/resources/views/contabilidad/centros_costos/asignar.blade.php b/app/resources/views/contabilidad/centros_costos/asignar.blade.php new file mode 100644 index 0000000..2cf50c2 --- /dev/null +++ b/app/resources/views/contabilidad/centros_costos/asignar.blade.php @@ -0,0 +1,402 @@ +@extends('layout.base') + +@section('page_content') +
    +

    Asignar Centros de Costos

    +
    +
    +
    +
    +
    + + +
    +
    + + +
    +
    + +
    +
    + + +
    +
    +
    +
    + + + +
    +
    +
    +
    + +
    +
    + +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    Cuenta Contable Centro de Costo Descripción - +
    {{$centroCosto->cuentaContable}} {{$centroCosto->id}} {{$centroCosto->descripcion}} + {{--
    -
    + + + + + + + + + + + + + + +
    FechaGlosaDocumentoCargoAbonoSaldoCentro de CostoDetalleOrden
    +
    +@endsection + +@include('layout.head.styles.datatables') +@include('layout.body.scripts.datatables') + +@push('page_scripts') + +@endpush diff --git a/app/setup/settings/folders.php b/app/setup/settings/folders.php index 67694f4..e4d1e05 100644 --- a/app/setup/settings/folders.php +++ b/app/setup/settings/folders.php @@ -6,7 +6,9 @@ return [ 'resources' => DI\String('{base}/resources'), 'routes' => DI\String('{resources}/routes'), 'cache' => DI\String('{base}/cache'), - 'templates' => DI\String('{resources}/views') + 'templates' => DI\String('{resources}/views'), + 'public' => DI\String('{base}/public'), + 'uploads' => DI\String('{public}/uploads') ]); } ]; diff --git a/app/setup/settings/nubox.php b/app/setup/settings/nubox.php new file mode 100644 index 0000000..382f46b --- /dev/null +++ b/app/setup/settings/nubox.php @@ -0,0 +1,8 @@ + function() { + return new DI\Container([ + 'url' => 'https://api.nubox.com/Nubox.API' + ]); + } +]; diff --git a/app/setup/setups/psr7.php b/app/setup/setups/psr7.php index af7ff76..7e86808 100644 --- a/app/setup/setups/psr7.php +++ b/app/setup/setups/psr7.php @@ -2,7 +2,13 @@ use Psr\Container\ContainerInterface; return [ + Psr\Http\Message\StreamFactoryInterface::class => function(ContainerInterface $container) { + return $container->get(Nyholm\Psr7\Factory\Psr17Factory::class); + }, + Psr\Http\Message\RequestFactoryInterface::class => function(ContainerInterface $container) { + return $container->get(Nyholm\Psr7\Factory\Psr17Factory::class); + }, Psr\Http\Message\ResponseFactoryInterface::class => function(ContainerInterface $container) { return $container->get(Nyholm\Psr7\Factory\Psr17Factory::class); - } + }, ]; diff --git a/app/setup/setups/services.php b/app/setup/setups/services.php index 9ba91f9..8b2b709 100644 --- a/app/setup/setups/services.php +++ b/app/setup/setups/services.php @@ -1,4 +1,5 @@ $container->get('REDIS_HOST'), 'port' => $container->get('REDIS_PORT') ]); + }, + Incoviba\Service\Cartola::class => function(ContainerInterface $container) { + return (new Incoviba\Service\Cartola( + $container->get(Psr\Http\Message\StreamFactoryInterface::class), + $container->get(Incoviba\Common\Define\Contabilidad\Exporter::class) + ))->register('security', $container->get(Incoviba\Service\Cartola\Security::class)); + }, + Incoviba\Common\Define\Contabilidad\Exporter::class => function(ContainerInterface $container) { + return $container->get(Incoviba\Service\Contabilidad\Exporter\Nubox::class); + }, + Incoviba\Service\Contabilidad\Exporter\Nubox::class => function(ContainerInterface $container) { + return new Incoviba\Service\Contabilidad\Exporter\Nubox($container->get(Incoviba\Repository\CentroCosto::class), + $container->get('folders')->get('uploads')); + }, + Incoviba\Service\Contabilidad\Nubox::class => function(ContainerInterface $container) { + return new Incoviba\Service\Contabilidad\Nubox( + $container->get(Incoviba\Repository\Nubox::class), + $container->get(Incoviba\Service\Redis::class), + new GuzzleHttp\Client(), + $container->get(Psr\Http\Message\RequestFactoryInterface::class), + $container->get('nubox')->get('url')); } ]; diff --git a/app/src/Controller/API/Contabilidad.php b/app/src/Controller/API/Contabilidad.php new file mode 100644 index 0000000..bf35b84 --- /dev/null +++ b/app/src/Controller/API/Contabilidad.php @@ -0,0 +1,52 @@ +getParsedBody(); + $output = [ + 'input' => $body, + 'movimientos' => [] + ]; + try { + $inmobiliaria = $inmobiliariaRepository->fetchById($body['inmobiliaria']); + $banco = $bancoRepository->fetchById($body['banco']); + $mes = new DateTimeImmutable($body['mes']); + $file = $request->getUploadedFiles()['file']; + $output['movimientos'] = $cartolaService->process($inmobiliaria, $banco, $mes, $file); + } catch (EmptyResult) {} + return $this->withJson($response, $output); + } + public function exportarCartola(ServerRequestInterface $request, ResponseInterface $response, + Repository\Inmobiliaria $inmobiliariaRepository, + Repository\Banco $bancoRepository, + Service\Cartola $cartolaService): ResponseInterface + { + $body = $request->getParsedBody(); + $output = [ + 'input' => $body, + 'filename' => '' + ]; + try { + $inmobiliaria = $inmobiliariaRepository->fetchById($body['inmobiliaria']); + $banco = $bancoRepository->fetchById($body['banco']); + $mes = new DateTimeImmutable($body['mes']); + $output['filename'] = $cartolaService->export($inmobiliaria, $banco, $mes, json_decode($body['movimientos'])); + } catch (EmptyResult) {} + return $this->withJson($response, $output); + } +} diff --git a/app/src/Controller/API/Informes.php b/app/src/Controller/API/Informes.php new file mode 100644 index 0000000..5e06ea1 --- /dev/null +++ b/app/src/Controller/API/Informes.php @@ -0,0 +1,25 @@ +getParsedBody(); + $output = [ + 'input' => $body, + 'data' => [] + ]; + try { + $file = $request->getUploadedFiles()['file']; + $output['data'] = $diarioService->process($file); + } catch (\Error) {} + return $this->withJson($response, $output); + } +} diff --git a/app/src/Controller/API/Inmobiliarias.php b/app/src/Controller/API/Inmobiliarias.php new file mode 100644 index 0000000..273e49d --- /dev/null +++ b/app/src/Controller/API/Inmobiliarias.php @@ -0,0 +1,48 @@ + $inmobiliaria_rut, + 'cuentas' => [] + ]; + try { + $inmobiliaria = $inmobiliariaRepository->fetchById($inmobiliaria_rut); + $output['cuentas'] = $cuentaRepository->fetchByInmobiliaria($inmobiliaria->rut); + } catch (EmptyResult) {} + return $this->withJson($response, $output); + } + public function proyectos(ServerRequestInterface $request, ResponseInterface $response, + Repository\Inmobiliaria $inmobiliariaRepository, + Service\Proyecto $proyectoService, int $inmobiliaria_rut): ResponseInterface + { + $output = [ + 'inmobiliaria_rut' => $inmobiliaria_rut, + 'proyectos' => [] + ]; + try { + $inmobiliaria = $inmobiliariaRepository->fetchById($inmobiliaria_rut); + $output['proyectos'] = array_map(function(Model\Proyecto $proyecto) { + $p = json_decode(json_encode($proyecto)); + $p->current_estado = $proyecto->currentEstado(); + $p->estados = $proyecto->estados(); + return $p; + },$proyectoService->getByInmobiliaria($inmobiliaria->rut)); + } catch (EmptyResult) {} + return $this->withJson($response, $output); + } +} diff --git a/app/src/Controller/API/Nubox.php b/app/src/Controller/API/Nubox.php new file mode 100644 index 0000000..cc1d323 --- /dev/null +++ b/app/src/Controller/API/Nubox.php @@ -0,0 +1,90 @@ + $inmobiliaria_rut, + 'token' => '' + ]; + try { + $output['token'] = $nuboxService->getToken($inmobiliaria_rut); + } catch (HttpResponse $exception) { + $output['error'] = [ + 'code' => $exception->getCode(), + 'message' => $exception->getMessage() + ]; + } + return $this->withJson($response, $output); + } + public function sistemas(ServerRequestInterface $request, ResponseInterface $response, + Service\Contabilidad\Nubox $nuboxService, int $inmobiliaria_rut): ResponseInterface + { + $output = [ + 'inmobiliaria_rut' => $inmobiliaria_rut, + 'sistemas' => [] + ]; + try { + $output['sistemas'] = $nuboxService->getSistemas($inmobiliaria_rut); + } catch (HttpResponse $exception) { + $output['error'] = [ + 'code' => $exception->getCode(), + 'message' => $exception->getMessage() + ]; + } + return $this->withJson($response, $output); + } + public function libroMayor(ServerRequestInterface $request, ResponseInterface $response, + Service\Contabilidad\Nubox $nuboxService, int $inmobiliaria_rut): ResponseInterface + { + $body = $request->getParsedBody(); + $output = [ + 'inmobiliaria_rut' => $inmobiliaria_rut, + 'input' => $body, + 'libro_mayor' => [] + ]; + try { + $from = new DateTimeImmutable($body['inicio']); + $to = new DateTimeImmutable($body['termino']); + $output['libro_mayor'] = $nuboxService->getLibroMayor($inmobiliaria_rut, $from, $to); + } catch (HttpResponse $exception) { + $output['error'] = [ + 'code' => $exception->getCode(), + 'message' => $exception->getMessage() + ]; + } + return $this->withJson($response, $output); + } + public function libroDiario(ServerRequestInterface $request, ResponseInterface $response, + Service\Contabilidad\Nubox $nuboxService, int $inmobiliaria_rut): ResponseInterface + { + $body = $request->getParsedBody(); + $output = [ + 'inmobiliaria_rut' => $inmobiliaria_rut, + 'input' => $body, + 'libro_diario' => [] + ]; + try { + $from = new DateTimeImmutable($body['inicio']); + $to = new DateTimeImmutable($body['termino']); + $output['libro_diario'] = $nuboxService->getLibroDiario($inmobiliaria_rut, $from, $to); + } catch (HttpResponse $exception) { + $output['error'] = [ + 'code' => $exception->getCode(), + 'message' => $exception->getMessage() + ]; + } + return $this->withJson($response, $output); + } +} diff --git a/app/src/Controller/API/Proyectos.php b/app/src/Controller/API/Proyectos.php index 616b6eb..dc5e46f 100644 --- a/app/src/Controller/API/Proyectos.php +++ b/app/src/Controller/API/Proyectos.php @@ -155,4 +155,19 @@ class Proyectos } catch (EmptyResult) {} return $this->withJson($response, $output); } + public function tiposUnidades(ServerRequestInterface $request, ResponseInterface $response, + Repository\Proyecto $proyectoRepository, + Repository\Proyecto\TipoUnidad $tipoUnidadRepository, + int $proyecto_id): ResponseInterface + { + $output = [ + 'proyecto_id' => $proyecto_id, + 'tipos' => [] + ]; + try { + $proyecto = $proyectoRepository->fetchById($proyecto_id); + $output['tipos'] = $tipoUnidadRepository->fetchByProyecto($proyecto->id); + } catch (EmptyResult) {} + return $this->withJson($response, $output); + } } diff --git a/app/src/Controller/CentrosCostos.php b/app/src/Controller/CentrosCostos.php index 13fb89a..6854b8b 100644 --- a/app/src/Controller/CentrosCostos.php +++ b/app/src/Controller/CentrosCostos.php @@ -21,4 +21,12 @@ class CentrosCostos 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')); + } } diff --git a/app/src/Model/Nubox.php b/app/src/Model/Nubox.php new file mode 100644 index 0000000..05b223a --- /dev/null +++ b/app/src/Model/Nubox.php @@ -0,0 +1,18 @@ +usuario, $this->password])); + } +} diff --git a/app/src/Repository/Inmobiliaria.php b/app/src/Repository/Inmobiliaria.php index 9b4af20..decedf3 100644 --- a/app/src/Repository/Inmobiliaria.php +++ b/app/src/Repository/Inmobiliaria.php @@ -46,4 +46,20 @@ class Inmobiliaria extends Ideal\Repository { return $this->update($model, ['dv', 'razon', 'abreviacion', 'cuenta', 'banco', 'sociedad'], $new_data); } + + public function fetchAllActive(null|string|array $sorting = null): array + { + $query = $this->connection->getQueryBuilder() + ->select('a.*') + ->from("{$this->getTable()} a") + ->joined('JOIN proyecto ON a.rut = proyecto.inmobiliaria') + ->joined('JOIN (SELECT ep1.* FROM estado_proyecto ep1 JOIN (SELECT MAX(id) AS id, proyecto FROM estado_proyecto GROUP BY proyecto) ep0 ON ep0.id = ep1.id) ep ON ep.proyecto = proyecto.id') + ->joined('JOIN tipo_estado_proyecto tep ON tep.id = ep.estado') + ->joined('JOIN etapa_proyecto ON etapa_proyecto.id = tep.etapa') + ->where('etapa_proyecto.orden BETWEEN ? AND ?'); + if ($sorting !== null) { + $query->order($sorting); + } + return $this->fetchMany($query, [1, 8]); + } } diff --git a/app/src/Repository/Inmobiliaria/Cuenta.php b/app/src/Repository/Inmobiliaria/Cuenta.php new file mode 100644 index 0000000..71e3b5d --- /dev/null +++ b/app/src/Repository/Inmobiliaria/Cuenta.php @@ -0,0 +1,52 @@ +setTable('cuenta'); + } + + public function create(?array $data = null): Model\Inmobiliaria\Cuenta + { + $map = (new Implement\Repository\MapperParser(['cuenta'])) + ->register('inmobiliaria', (new Implement\Repository\Mapper()) + ->setFunction(function(array $data) { + return $this->inmobiliariaRepository->fetchById($data['inmobiliaria']); + })) + ->register('banco', (new Implement\Repository\Mapper()) + ->setFunction(function(array $data) { + return $this->bancoRepository->fetchById($data['banco']); + })); + return $this->parseData(new Model\Inmobiliaria\Cuenta(), $data, $map); + } + public function save(Define\Model $model): Model\Inmobiliaria\Cuenta + { + $model->id = $this->saveNew(['inmobiliaria', 'banco', 'cuenta'], + [$model->inmobiliaria->rut, $model->banco->id, $model->cuenta]); + return $model; + } + public function edit(Define\Model $model, array $new_data): Model\Inmobiliaria\Cuenta + { + return $this->update($model, ['inmobiliaria', 'banco', 'cuenta'], $new_data); + } + + public function fetchByInmobiliaria(int $inmobiliaria_rut): array + { + $query = $this->connection->getQueryBuilder() + ->select() + ->from($this->getTable()) + ->where('inmobiliaria = ?'); + return $this->fetchMany($query, [$inmobiliaria_rut]); + } +} diff --git a/app/src/Repository/Nubox.php b/app/src/Repository/Nubox.php new file mode 100644 index 0000000..3f91268 --- /dev/null +++ b/app/src/Repository/Nubox.php @@ -0,0 +1,55 @@ +setTable('inmobiliarias_nubox'); + } + + public function create(?array $data = null): Model\Nubox + { + $map = (new Implement\Repository\MapperParser(['usuario', 'alias'])) + ->register('inmobiliaria_rut', (new Implement\Repository\Mapper()) + ->setProperty('inmobiliaria') + ->setFunction(function(array $data) { + return $this->inmobiliariaRepository->fetchById($data['inmobiliaria_rut']); + })) + ->register('contraseña', (new Implement\Repository\Mapper()) + ->setProperty('password')); + return $this->parseData(new Model\Nubox(), $data, $map); + } + public function save(Define\Model $model): Model\Nubox + { + $this->saveNew( + ['inmobiliaria_rut', 'alias', 'usuario', 'contraseña'], + [$model->inmobiliaria->rut, $model->alias, $model->usuario, $model->password] + ); + return $model; + } + 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\Nubox + { + $query = $this->connection->getQueryBuilder() + ->select() + ->from($this->getTable()) + ->where('inmobiliaria_rut = ?'); + return $this->fetchOne($query, [$inmobiliaria_rut]); + } + + protected function getKey(): string + { + return 'inmobiliaria_rut'; + } +} diff --git a/app/src/Service/Cartola.php b/app/src/Service/Cartola.php new file mode 100644 index 0000000..231ba7a --- /dev/null +++ b/app/src/Service/Cartola.php @@ -0,0 +1,29 @@ +bancos[$name] = $banco; + return $this; + } + 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\Banco $banco, DateTimeInterface $mes, array $movimientos): string + { + return $this->exporter->export($inmobiliaria, $banco, $mes, $movimientos); + } +} diff --git a/app/src/Service/Cartola/Security.php b/app/src/Service/Cartola/Security.php new file mode 100644 index 0000000..9df63d0 --- /dev/null +++ b/app/src/Service/Cartola/Security.php @@ -0,0 +1,54 @@ +moveTo($filename); + $xlsx = $reader->load($filename); + $worksheet = $xlsx->getActiveSheet(); + $rows = $worksheet->getRowIterator(); + $dataFound = false; + $columns = []; + $data = []; + foreach ($rows as $row) { + $cells = $row->getCellIterator(); + $rowData = []; + foreach ($cells as $cell) { + if ($cell->getColumn() === 'A' and $cell->getCalculatedValue() === "fecha ") { + $cols = $row->getColumnIterator(); + foreach ($cols as $col) { + $columns[$col->getColumn()] = trim($col->getCalculatedValue()); + } + $dataFound = true; + break; + } + if ($cell->getColumn() === 'A' and $cell->getCalculatedValue() === null) { + $dataFound = false; + break; + } + if (!$dataFound) { + break; + } + $col = $columns[$cell->getColumn()]; + $value = $cell->getCalculatedValue(); + if ($col === 'fecha') { + $value = PhpSpreadsheet\Shared\Date::excelToDateTimeObject($cell->getValue(), 'America/Santiago')->format('Y-m-d'); + } + $rowData[$col] = $value; + } + if (count($rowData) > 0) { + $data []= $rowData; + } + } + unlink($filename); + return $data; + } +} diff --git a/app/src/Service/Contabilidad/Exporter/Nubox.php b/app/src/Service/Contabilidad/Exporter/Nubox.php new file mode 100644 index 0000000..ba32e09 --- /dev/null +++ b/app/src/Service/Contabilidad/Exporter/Nubox.php @@ -0,0 +1,115 @@ +getActiveSheet(); + + $rowIndex = $this->buildHeaders($sheet); + + foreach ($movimientos as $movimiento) { + $tipoCentro = ''; + $cuenta = ''; + $centro = ''; + if ($movimiento->centro_costo !== '') { + $centroCosto = $this->centroCostoRepository->fetchById($movimiento->centro_costo); + $tipoCentro = substr($centroCosto->tipoCentro->descripcion, 0, 1); + $cuenta = $centroCosto->cuentaContable; + $centro = $centroCosto->id; + } + $fecha = (new DateTimeImmutable($movimiento->fecha))->format('d/m/Y'); + $rowIndex = $this->add($sheet, [ + 'Número' => '0', + 'Tipo' => $tipoCentro, + 'Fecha' => $fecha, + 'Glosa' => $movimiento->detalle, + 'Cuenta Detalle' => $cuenta, + 'Glosa Detalle' => '', + 'Centro Costo' => $centro, + 'Sucursal' => '', + 'Debe' => $movimiento->abono === 0 ? '' : $movimiento->abono, + 'Haber' => $movimiento->cargo === 0 ? '' : $movimiento->cargo, + 'Tipo Auxiliar' => 'B', + 'A: Rut Cliente-Proveedor/H: Rut Prestador' => '', + 'A: Razon Social/B: Descripción Movimiento Bancario/ H: Nombre Prestador' => $movimiento->glosa, + 'A: Tipo De Documento/H: Tipo De Boleta Honorario' => '', + 'A: Folio /B: Numero Documento/H: Folio Boleta' => $movimiento->documento, + 'A/B/H: Monto' => ($movimiento->abono === 0) ? $movimiento->cargo : $movimiento->abono, + 'A: Fecha Vencimiento /B: Fecha /H: Fecha Emisión (DD/MM/AAAA)' => $fecha + ], $rowIndex); + } + $sheet->getStyle("I1:J{$rowIndex}")->getNumberFormat() + ->setFormatCode('#,##0'); + $sheet->getStyle("O1:O{$rowIndex}")->getNumberFormat() + ->setFormatCode('##0'); + $sheet->getStyle("P1:P{$rowIndex}")->getNumberFormat() + ->setFormatCode('#,##0'); + foreach (range('A', 'Q') as $col) { + $sheet->getColumnDimension($col)->setAutoSize(true); + } + $sheet->getSheetView()->setZoomScale(90); + + $writer = PhpSpreadsheet\IOFactory::createWriter($workbook, 'Xlsx'); + $filename = "Cartola {$banco->nombre} - {$inmobiliaria->abreviacion} - {$mes->format('M Y')}.xlsx"; + $writer->save(implode(DIRECTORY_SEPARATOR, [ + $this->uploadFolder, + $filename + ])); + return $filename; + } + + protected function getHeaders(): array + { + return [ + 'Número', + 'Tipo', + 'Fecha', + 'Glosa', + 'Cuenta Detalle', + 'Glosa Detalle', + 'Centro Costo', + 'Sucursal', + 'Debe', + 'Haber', + 'Tipo Auxiliar', + 'A: Rut Cliente-Proveedor/H: Rut Prestador', + 'A: Razon Social/B: Descripción Movimiento Bancario/ H: Nombre Prestador', + 'A: Tipo De Documento/H: Tipo De Boleta Honorario', + 'A: Folio /B: Numero Documento/H: Folio Boleta', + 'A/B/H: Monto', + 'A: Fecha Vencimiento /B: Fecha /H: Fecha Emisión (DD/MM/AAAA)' + ]; + } + protected function buildHeaders(PhpSpreadsheet\Worksheet\Worksheet &$sheet, int $rowIndex = 1): int + { + $map = $this->getHeaders(); + foreach ($map as $index => $header) { + $columnIndex = $index + 1; + $sheet->getCell([$columnIndex, $rowIndex])->setValue($header); + } + return $rowIndex + 1; + } + protected function add(PhpSpreadsheet\Worksheet\Worksheet &$sheet, array $row, int $rowIndex): int + { + $headers = $this->getHeaders(); + foreach ($headers as $index => $header) { + $columnIndex = $index + 1; + $sheet->getCell([$columnIndex, $rowIndex])->setValue($row[$header]); + $sheet->getCell([$columnIndex, $rowIndex + 1])->setValue(($header === 'Tipo Auxiliar') ? 'A' : ''); + } + return $rowIndex + 2; + } +} diff --git a/app/src/Service/Contabilidad/Nubox.php b/app/src/Service/Contabilidad/Nubox.php new file mode 100644 index 0000000..01b432a --- /dev/null +++ b/app/src/Service/Contabilidad/Nubox.php @@ -0,0 +1,139 @@ +tokens[$inmobiliaria_rut])) { + $redisKey = "token_nubox:{$inmobiliaria_rut}"; + try { + $this->tokens[$inmobiliaria_rut] = $this->redisService->get($redisKey); + } catch (Exception\EmptyRedis) { + $nubox = $this->nuboxRepository->fetchByInmobiliaria($inmobiliaria_rut); + $request = $this->requestFactory + ->createRequest('POST', implode('/', [$this->api_url, 'autenticar'])) + ->withHeader('Authorization', "Basic {$nubox->getLogin()}") + ->withHeader('Content-Type', 'application/json') + ->withHeader('Accept', 'application/json'); + $response = $this->client->sendRequest($request); + if ($response->getStatusCode() !== 200) { + throw new Exception\HttpResponse($response->getReasonPhrase(), $response->getStatusCode()); + } + $sistemas = json_decode($response->getBody()->getContents(), JSON_OBJECT_AS_ARRAY); + + $this->setToken($inmobiliaria_rut, $response->getHeaderLine('Token')) + ->setSistemas($inmobiliaria_rut, $sistemas['Sistemas']); + } + } + return $this->tokens[$inmobiliaria_rut]; + } + public function setToken(int $inmobiliaria_rut, string $token): Nubox + { + $this->tokens[$inmobiliaria_rut] = $token; + + $redisKey = "token_nubox:{$inmobiliaria_rut}"; + $this->redisService->set($redisKey, $this->tokens[$inmobiliaria_rut], 60 * 15); + + return $this; + } + + protected array $sistemas; + public function getSistemas(int $inmobiliaria_rut): array + { + if (!isset($this->sistemas[$inmobiliaria_rut])) { + $redisKey = "nubox:{$inmobiliaria_rut}"; + $this->sistemas[$inmobiliaria_rut] = json_decode($this->redisService->get($redisKey)); + } + return $this->sistemas[$inmobiliaria_rut]; + } + public function setSistemas(int $inmobiliaria_rut, array $sistemas): Nubox + { + $this->sistemas[$inmobiliaria_rut] = $sistemas; + + $redisKey = "nubox:{$inmobiliaria_rut}"; + $this->redisService->set($redisKey, json_encode($sistemas)); + + return $this; + } + + public function getLibroMayor(int $inmobiliaria_rut, DateTimeInterface $from, DateTimeInterface $to): array + { + $inmobiliaria = $this->nuboxRepository->fetchByInmobiliaria($inmobiliaria_rut); + $query = [ + 'NumeroSerie' => 1, + 'CodigoEmpresa' => $inmobiliaria->alias, + 'DDInicio' => $from->format('j'), + 'MMInicio' => $from->format('n'), + 'YYInicio' => $from->format('Y'), + 'DDTermino' => $to->format('j'), + 'MMTermino' => $to->format('n'), + 'YYTermino' => $to->format('Y'), + 'CodigoCentroDeCosto' => 0, + 'CodigoSucursal' => 0, + 'CodigoCuenta' => 0, + 'ModoIFRS' => 'false', + 'CuentasConSaldo' => 'false', + 'IncluirCodigoCuenta' => 'true', + ]; + $uri = 'contabilidad/libro-mayor?' . http_build_query($query); + $response = $this->send($uri, $inmobiliaria_rut); + if ($response->getStatusCode() !== 200) { + throw new Exception\HttpResponse($response->getReasonPhrase(), $response->getStatusCode()); + } + return json_decode($response->getBody()->getContents(), JSON_OBJECT_AS_ARRAY); + } + public function getLibroDiario(int $inmobiliaria_rut, DateTimeInterface $from, DateTimeInterface $to): array + { + $inmobiliaria = $this->nuboxRepository->fetchByInmobiliaria($inmobiliaria_rut); + $query = [ + 'ModoIFRS' => 0, + 'DDInicio' => $from->format('j'), + 'MMInicio' => $from->format('n'), + 'YYInicio' => $from->format('Y'), + 'DDTermino' => $to->format('j'), + 'MMTermino' => $to->format('n'), + 'YYTermino' => $to->format('Y'), + 'Sucursal' => 0, + 'codigoEmpresa' => $inmobiliaria->alias, + 'NumeroSerie' => 1, + 'CuentasConSaldo' => 0, + 'incluirCodigoCuenta' => 1 + ]; + $uri = 'contabilidad/libro-diario?' . http_build_query($query); + $response = $this->send($uri, $inmobiliaria_rut); + if ($response->getStatusCode() !== 200) { + error_log(var_export($uri,true).PHP_EOL,3,'/logs/debug'); + throw new Exception\HttpResponse($response->getReasonPhrase(), $response->getStatusCode()); + } + return json_decode($response->getBody()->getContents(), JSON_OBJECT_AS_ARRAY); + } + + private function send(string $uri, int $inmobiliaria_rut, string $method = 'GET', ?StreamInterface $body = null): ResponseInterface + { + $request = $this->requestFactory + ->createRequest($method, implode('/', [$this->api_url, $uri])) + ->withHeader('token', $this->getToken($inmobiliaria_rut)); + if ($body !== null) { + $request = $request->withBody($body); + } + return $this->client->sendRequest($request); + } +} From 3eb4ce4d213ef637afa8411a91fb21ff167c75da Mon Sep 17 00:00:00 2001 From: Aldarien Date: Wed, 17 Jan 2024 10:49:14 -0300 Subject: [PATCH 100/163] Max log files --- app/setup/setups/logs.php | 6 +++--- cli/setup/setups/logs.php | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/setup/setups/logs.php b/app/setup/setups/logs.php index 0ccd933..046300a 100644 --- a/app/setup/setups/logs.php +++ b/app/setup/setups/logs.php @@ -5,19 +5,19 @@ return [ Psr\Log\LoggerInterface::class => function(ContainerInterface $container) { return new Monolog\Logger('incoviba', [ new Monolog\Handler\FilterHandler( - (new Monolog\Handler\RotatingFileHandler('/logs/debug.log')) + (new Monolog\Handler\RotatingFileHandler('/logs/debug.log', 10)) ->setFormatter(new Monolog\Formatter\LineFormatter(null, null, false, false, true)), Monolog\Level::Debug, Monolog\Level::Notice ), new Monolog\Handler\FilterHandler( - (new Monolog\Handler\RotatingFileHandler('/logs/error.log')) + (new Monolog\Handler\RotatingFileHandler('/logs/error.log', 10)) ->setFormatter(new Monolog\Formatter\LineFormatter(null, null, false, false, true)), Monolog\Level::Warning, Monolog\Level::Error ), new Monolog\Handler\FilterHandler( - (new Monolog\Handler\RotatingFileHandler('/logs/critical.log')) + (new Monolog\Handler\RotatingFileHandler('/logs/critical.log', 10)) ->setFormatter(new Monolog\Formatter\LineFormatter(null, null, false, false, true)), Monolog\Level::Critical ) diff --git a/cli/setup/setups/logs.php b/cli/setup/setups/logs.php index 0ccd933..046300a 100644 --- a/cli/setup/setups/logs.php +++ b/cli/setup/setups/logs.php @@ -5,19 +5,19 @@ return [ Psr\Log\LoggerInterface::class => function(ContainerInterface $container) { return new Monolog\Logger('incoviba', [ new Monolog\Handler\FilterHandler( - (new Monolog\Handler\RotatingFileHandler('/logs/debug.log')) + (new Monolog\Handler\RotatingFileHandler('/logs/debug.log', 10)) ->setFormatter(new Monolog\Formatter\LineFormatter(null, null, false, false, true)), Monolog\Level::Debug, Monolog\Level::Notice ), new Monolog\Handler\FilterHandler( - (new Monolog\Handler\RotatingFileHandler('/logs/error.log')) + (new Monolog\Handler\RotatingFileHandler('/logs/error.log', 10)) ->setFormatter(new Monolog\Formatter\LineFormatter(null, null, false, false, true)), Monolog\Level::Warning, Monolog\Level::Error ), new Monolog\Handler\FilterHandler( - (new Monolog\Handler\RotatingFileHandler('/logs/critical.log')) + (new Monolog\Handler\RotatingFileHandler('/logs/critical.log', 10)) ->setFormatter(new Monolog\Formatter\LineFormatter(null, null, false, false, true)), Monolog\Level::Critical ) From ce0510687afe5f84fad0540328c88d80f6026269 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Wed, 17 Jan 2024 11:05:25 -0300 Subject: [PATCH 101/163] Menu Centros de Costos --- .../views/layout/body/header/menu/contabilidad.blade.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/resources/views/layout/body/header/menu/contabilidad.blade.php b/app/resources/views/layout/body/header/menu/contabilidad.blade.php index 099e8a3..4962aad 100644 --- a/app/resources/views/layout/body/header/menu/contabilidad.blade.php +++ b/app/resources/views/layout/body/header/menu/contabilidad.blade.php @@ -2,6 +2,12 @@ Contabilidad
    - Centros de Costos +
    + + Centros de Costos +
    + Asignar en Cartola +
    +
    From bfdaf0e7f2e21b298e32a62b8828473bf12f1b80 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Wed, 17 Jan 2024 11:10:56 -0300 Subject: [PATCH 102/163] Missing updates --- app/src/Service/Proyecto.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/src/Service/Proyecto.php b/app/src/Service/Proyecto.php index 7ac89db..cfe2f85 100644 --- a/app/src/Service/Proyecto.php +++ b/app/src/Service/Proyecto.php @@ -27,6 +27,10 @@ class Proyecto { return $this->process($this->proyectoRepository->fetchByName($name)); } + public function getByInmobiliaria(int $inmobiliaria_rut): array + { + return array_map([$this, 'process'], $this->proyectoRepository->fetchByInmobiliaria($inmobiliaria_rut)); + } protected function process(Model\Proyecto $proyecto): Model\Proyecto { From 18d7e449f75f014d96a480935a9eb666c07fd150 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Wed, 17 Jan 2024 11:13:27 -0300 Subject: [PATCH 103/163] Missing updates --- app/src/Repository/Proyecto.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/src/Repository/Proyecto.php b/app/src/Repository/Proyecto.php index 6780c94..561868c 100644 --- a/app/src/Repository/Proyecto.php +++ b/app/src/Repository/Proyecto.php @@ -156,6 +156,14 @@ class Proyecto extends Ideal\Repository } return $proyecto; } + public function fetchByInmobiliaria(int $inmobiliaria_rut): array + { + $query = $this->connection->getQueryBuilder() + ->select() + ->from($this->getTable()) + ->where('inmobiliaria = ?'); + return $this->fetchMany($query, [$inmobiliaria_rut]); + } /*public function fetchSuperficieVendido(int $proyecto_id): float { From 5c6bd91425b87223400849e6ad7d9449dfddfdb9 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Wed, 17 Jan 2024 11:15:13 -0300 Subject: [PATCH 104/163] Missing updates --- app/src/Model/Inmobiliaria/Cuenta.php | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 app/src/Model/Inmobiliaria/Cuenta.php diff --git a/app/src/Model/Inmobiliaria/Cuenta.php b/app/src/Model/Inmobiliaria/Cuenta.php new file mode 100644 index 0000000..33487ef --- /dev/null +++ b/app/src/Model/Inmobiliaria/Cuenta.php @@ -0,0 +1,21 @@ + $this->inmobiliaria->rut, + 'banco' => $this->banco, + 'cuenta' => $this->cuenta + ]); + } +} From 4c86ce2a8a2d94b71dde27b12fdb75084752aa69 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Wed, 17 Jan 2024 11:22:10 -0300 Subject: [PATCH 105/163] TipoUnidad por Proyecto --- app/src/Repository/Proyecto/TipoUnidad.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app/src/Repository/Proyecto/TipoUnidad.php b/app/src/Repository/Proyecto/TipoUnidad.php index 1290c4f..8a2788a 100644 --- a/app/src/Repository/Proyecto/TipoUnidad.php +++ b/app/src/Repository/Proyecto/TipoUnidad.php @@ -31,6 +31,18 @@ class TipoUnidad extends Ideal\Repository { return $this->update($model, ['descripcion', 'orden'], $new_data); } + + public function fetchByProyecto(int $proyecto_id): array + { + $query = $this->connection->getQueryBuilder() + ->select('a.*') + ->from("{$this->getTable()} a") + ->joined('JOIN proyecto_tipo_unidad b ON b.tipo = a.id') + ->where('b.proyecto = ?') + ->group('a.id') + ->order('a.orden'); + return $this->fetchMany($query, [$proyecto_id]); + } } From ecdb67a9ab04a8f5ef33a44278695123fb94cffa Mon Sep 17 00:00:00 2001 From: Aldarien Date: Wed, 17 Jan 2024 14:31:49 -0300 Subject: [PATCH 106/163] FIX: Security en htm --- app/src/Service/Cartola/Security.php | 54 +++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/app/src/Service/Cartola/Security.php b/app/src/Service/Cartola/Security.php index 9df63d0..d89fd6f 100644 --- a/app/src/Service/Cartola/Security.php +++ b/app/src/Service/Cartola/Security.php @@ -1,6 +1,8 @@ getStream(); + $stream->seek(3); + if ($stream->read(strlen('table')) === 'table') { + return $this->processHtm($file); + } + return $this->processXls($file); + } + + private function processXls(UploadedFileInterface $file): array + { $filename = '/tmp/cartola.xls'; $file->moveTo($filename); + $reader = PhpSpreadsheet\IOFactory::createReader('Xls'); $xlsx = $reader->load($filename); $worksheet = $xlsx->getActiveSheet(); $rows = $worksheet->getRowIterator(); @@ -51,4 +63,44 @@ class Security implements Banco unlink($filename); return $data; } + private function processHtm(UploadedFileInterface $file): array + { + $filename = '/tmp/cartola.htm'; + $file->moveTo($filename); + + $domDocument = new DOMDocument(); + $domDocument->loadHTML('' . file_get_contents($filename) . ''); + + $tables = $domDocument->getElementsByTagName('table'); + $table = $tables->item(4); + + $columns = []; + $data = []; + foreach ($table->getElementsByTagName('tr')->getIterator() as $rowIndex => $row) { + if ($rowIndex === 0) { + continue; + } + if (str_contains($row->textContent, 'cargos')) { + foreach ($row->getElementsByTagName('td')->getIterator() as $cell) { + $columns []= trim($cell->textContent); + } + continue; + } + $rowData = []; + foreach ($row->getElementsByTagName('td')->getIterator() as $colIndex => $cell) { + $col = $columns[$colIndex]; + $value = trim($cell->textContent); + if ($col === 'fecha') { + $value = DateTimeImmutable::createFromFormat('d/m/Y', $value)->format('Y-m-d'); + } + if (in_array($col, ['cargos', 'abonos', 'saldos'])) { + $value = (float) str_replace(',', '.', $value); + } + $rowData[$col] = $value; + } + $data []= $rowData; + } + + return $data; + } } From d1d3705a7b31275d651434994cfd470bc79f59e5 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Wed, 17 Jan 2024 16:19:38 -0300 Subject: [PATCH 107/163] Cambio base Cartola/Banco e implementacion de Itau --- app/common/Define/Cartola/Banco.php | 1 + app/common/Ideal/Cartola/Banco.php | 20 ++++ .../centros_costos/asignar.blade.php | 10 +- app/setup/setups/services.php | 4 +- app/src/Service/Cartola/Itau.php | 91 +++++++++++++++++++ app/src/Service/Cartola/Security.php | 23 +++-- 6 files changed, 137 insertions(+), 12 deletions(-) create mode 100644 app/common/Ideal/Cartola/Banco.php create mode 100644 app/src/Service/Cartola/Itau.php diff --git a/app/common/Define/Cartola/Banco.php b/app/common/Define/Cartola/Banco.php index 2a23f06..71f1323 100644 --- a/app/common/Define/Cartola/Banco.php +++ b/app/common/Define/Cartola/Banco.php @@ -6,4 +6,5 @@ use Psr\Http\Message\UploadedFileInterface; interface Banco { public function process(UploadedFileInterface $file): array; + } diff --git a/app/common/Ideal/Cartola/Banco.php b/app/common/Ideal/Cartola/Banco.php new file mode 100644 index 0000000..d4e10c6 --- /dev/null +++ b/app/common/Ideal/Cartola/Banco.php @@ -0,0 +1,20 @@ +parseFile($file); + return array_map(function($row) { + $columns = $this->columnMap(); + return array_combine(array_values($columns), array_values($row)); + }, $data); + } + + abstract protected function columnMap(): array; + abstract protected function parseFile(UploadedFileInterface $uploadedFile): array; +} diff --git a/app/resources/views/contabilidad/centros_costos/asignar.blade.php b/app/resources/views/contabilidad/centros_costos/asignar.blade.php index 2cf50c2..13340a3 100644 --- a/app/resources/views/contabilidad/centros_costos/asignar.blade.php +++ b/app/resources/views/contabilidad/centros_costos/asignar.blade.php @@ -206,11 +206,11 @@ fecha.setDate(fecha.getDate() + 1) this.data.movimientos[idx] = { fecha: fecha, - glosa: row['descripción'], - documento: row['número de documentos'], - cargo: row.cargos, - abono: row.abonos, - saldo: row.saldos + glosa: row.descripcion, + documento: row.documento, + cargo: row.cargo, + abono: row.abono, + saldo: row.saldo } }) this.draw().cartola() diff --git a/app/setup/setups/services.php b/app/setup/setups/services.php index 8b2b709..e90b3b3 100644 --- a/app/setup/setups/services.php +++ b/app/setup/setups/services.php @@ -34,7 +34,9 @@ return [ return (new Incoviba\Service\Cartola( $container->get(Psr\Http\Message\StreamFactoryInterface::class), $container->get(Incoviba\Common\Define\Contabilidad\Exporter::class) - ))->register('security', $container->get(Incoviba\Service\Cartola\Security::class)); + )) + ->register('security', $container->get(Incoviba\Service\Cartola\Security::class)) + ->register('itau', $container->get(Incoviba\Service\Cartola\Itau::class)); }, Incoviba\Common\Define\Contabilidad\Exporter::class => function(ContainerInterface $container) { return $container->get(Incoviba\Service\Contabilidad\Exporter\Nubox::class); diff --git a/app/src/Service/Cartola/Itau.php b/app/src/Service/Cartola/Itau.php new file mode 100644 index 0000000..c7d842c --- /dev/null +++ b/app/src/Service/Cartola/Itau.php @@ -0,0 +1,91 @@ + 'fecha', + 'Número de operación' => 'documento', + 'Sucursal' => 'sucursal', + 'Descripción' => 'descripcion', + 'Depósitos o abonos' => 'abono', + 'Giros o cargos' => 'cargo', + 'Saldo diario' => 'saldo' + ]; + } + + protected function parseFile(UploadedFileInterface $uploadedFile): array + { + function log(mixed $elem): void + { + if (!is_string($elem)) { + $elem = var_export($elem,true); + } + error_log($elem.PHP_EOL,3,'/logs/debug'); + } + + $filename = '/tmp/cartola.xls'; + $uploadedFile->moveTo($filename); + + $reader = PhpSpreadsheet\IOFactory::createReader('Xls'); + $xlsx = $reader->load($filename); + $sheet = $xlsx->getActiveSheet(); + + $dates = explode(' - ', $sheet->getCell('C4')->getCalculatedValue()); + $date = DateTimeImmutable::createFromFormat('d/m/Y', $dates[0]); + $year = $date->format('Y'); + + $rowIndex = 26; + $columns = []; + $row = $sheet->getRowIterator($rowIndex)->current(); + $cols = $row->getColumnIterator('A','G'); + foreach ($cols as $col) { + $columns []= trim($col->getCalculatedValue()); + } + $rowIndex ++; + $row = $sheet->getRowIterator($rowIndex)->current(); + $cols = $row->getColumnIterator('A', 'G'); + $colIndex = 0; + foreach ($cols as $col) { + $value = $col->getCalculatedValue(); + if ($value !== null) { + $columns[$colIndex] .= " {$value}"; + } + $colIndex ++; + } + $rowIndex ++; + $data = []; + $rows = $sheet->getRowIterator($rowIndex); + foreach ($rows as $row) { + if ($sheet->getCell("A{$rowIndex}")->getCalculatedValue() === null) { + break; + } + $cols = $row->getColumnIterator('A', 'G'); + $colIndex = 0; + $rowData = []; + foreach ($cols as $col) { + $value = $col->getCalculatedValue(); + $col = $columns[$colIndex]; + if ($col === 'Fecha') { + list($d, $m) = explode('/', $value); + $value = "{$year}-{$m}-{$d}"; + log($value); + } + $rowData[$col] = $value; + $colIndex ++; + } + $data []= $rowData; + $rowIndex ++; + } + + unlink($filename); + return $data; + } +} diff --git a/app/src/Service/Cartola/Security.php b/app/src/Service/Cartola/Security.php index d89fd6f..ae8f26b 100644 --- a/app/src/Service/Cartola/Security.php +++ b/app/src/Service/Cartola/Security.php @@ -5,18 +5,29 @@ use DOMDocument; use DateTimeImmutable; use Psr\Http\Message\UploadedFileInterface; use PhpOffice\PhpSpreadsheet; -use Incoviba\Common\Define\Cartola\Banco; +use Incoviba\Common\Ideal\Cartola\Banco; -class Security implements Banco +class Security extends Banco { - public function process(UploadedFileInterface $file): array + protected function parseFile(UploadedFileInterface $uploadedFile): array { - $stream = $file->getStream(); + $stream = $uploadedFile->getStream(); $stream->seek(3); if ($stream->read(strlen('table')) === 'table') { - return $this->processHtm($file); + return $this->processHtm($uploadedFile); } - return $this->processXls($file); + return $this->processXls($uploadedFile); + } + protected function columnMap(): array + { + return [ + 'fecha' => 'fecha', + 'descripción' => 'glosa', + 'número de documentos' => 'documento', + 'cargos' => 'cargo', + 'abonos' => 'abono', + 'saldos' => 'saldo' + ]; } private function processXls(UploadedFileInterface $file): array From 3684bc2e2137168768c4bc2b4a0f1bcd95ba5706 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Wed, 17 Jan 2024 16:21:40 -0300 Subject: [PATCH 108/163] FIX: glosa --- .../views/contabilidad/centros_costos/asignar.blade.php | 2 +- app/src/Service/Cartola/Itau.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/resources/views/contabilidad/centros_costos/asignar.blade.php b/app/resources/views/contabilidad/centros_costos/asignar.blade.php index 13340a3..ee54783 100644 --- a/app/resources/views/contabilidad/centros_costos/asignar.blade.php +++ b/app/resources/views/contabilidad/centros_costos/asignar.blade.php @@ -206,7 +206,7 @@ fecha.setDate(fecha.getDate() + 1) this.data.movimientos[idx] = { fecha: fecha, - glosa: row.descripcion, + glosa: row.glosa, documento: row.documento, cargo: row.cargo, abono: row.abono, diff --git a/app/src/Service/Cartola/Itau.php b/app/src/Service/Cartola/Itau.php index c7d842c..98117f0 100644 --- a/app/src/Service/Cartola/Itau.php +++ b/app/src/Service/Cartola/Itau.php @@ -14,7 +14,7 @@ class Itau extends Banco 'Fecha' => 'fecha', 'Número de operación' => 'documento', 'Sucursal' => 'sucursal', - 'Descripción' => 'descripcion', + 'Descripción' => 'glosa', 'Depósitos o abonos' => 'abono', 'Giros o cargos' => 'cargo', 'Saldo diario' => 'saldo' From aef1ccd4a0aea35da890aac01ee92df65a69aa65 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Wed, 17 Jan 2024 18:27:29 -0300 Subject: [PATCH 109/163] Santander --- app/common/Ideal/Cartola/Banco.php | 14 +++- .../centros_costos/asignar.blade.php | 45 +++++------ app/setup/setups/services.php | 3 +- app/src/Service/Cartola/Itau.php | 4 +- app/src/Service/Cartola/Santander.php | 80 +++++++++++++++++++ app/src/Service/Cartola/Security.php | 3 +- 6 files changed, 115 insertions(+), 34 deletions(-) create mode 100644 app/src/Service/Cartola/Santander.php diff --git a/app/common/Ideal/Cartola/Banco.php b/app/common/Ideal/Cartola/Banco.php index d4e10c6..16d88e2 100644 --- a/app/common/Ideal/Cartola/Banco.php +++ b/app/common/Ideal/Cartola/Banco.php @@ -9,10 +9,16 @@ abstract class Banco implements Define\Cartola\Banco public function process(UploadedFileInterface $file): array { $data = $this->parseFile($file); - return array_map(function($row) { - $columns = $this->columnMap(); - return array_combine(array_values($columns), array_values($row)); - }, $data); + $temp = []; + $columns = $this->columnMap(); + foreach ($data as $row) { + $r = []; + foreach ($columns as $old => $new) { + $r[$new] = $row[$old]; + } + $temp []= $r; + } + return $temp; } abstract protected function columnMap(): array; diff --git a/app/resources/views/contabilidad/centros_costos/asignar.blade.php b/app/resources/views/contabilidad/centros_costos/asignar.blade.php index ee54783..80fd04f 100644 --- a/app/resources/views/contabilidad/centros_costos/asignar.blade.php +++ b/app/resources/views/contabilidad/centros_costos/asignar.blade.php @@ -77,7 +77,6 @@ Documento Cargo Abono - Saldo Centro de Costo Detalle Orden @@ -138,6 +137,24 @@ })))) !!}'), } }, + dataTableConfig: { + pageLength: 100, + order: [[7, 'asc']], + columnDefs: [ + { + targets: [0, 2, 3, 4], + width: '10%' + }, + { + targets: [1], + width: '20%' + }, + { + targets: [7], + visible: false + } + ], + }, get() { return { bancos: inmobiliaria_rut => { @@ -210,7 +227,6 @@ documento: row.documento, cargo: row.cargo, abono: row.abono, - saldo: row.saldo } }) this.draw().cartola() @@ -291,8 +307,6 @@ $('').addClass('right aligned').html(row.cargo === 0 ? '' : numberFormatter.format(row.cargo)) ).append( $('').addClass('right aligned').html(row.abono === 0 ? '' : numberFormatter.format(row.abono)) - ).append( - $('').addClass('right aligned').html(row.saldo === 0 ? '' : numberFormatter.format(row.saldo)) ).append( $('').append(this.draw().centrosDropdown(idx + 1, row.cargo === 0)) ).append( @@ -306,24 +320,7 @@ ) ) }) - table.DataTable({ - pageLength: 100, - order: [[8, 'asc']], - columnDefs: [ - { - targets: [1, 2, 3, 4, 5], - width: '10%' - }, - { - targets: [1], - width: '20%' - }, - { - targets: [8], - visible: false - } - ], - }) + table.DataTable(this.dataTableConfig) }, centrosDropdown: (idx, ingreso=true) => { const menu = $('
    ').addClass('menu') @@ -336,7 +333,7 @@ $('
    ').addClass('item').attr('data-value', centro.id).html(centro.id + ' - ' + centro.descripcion) ) }) - return $('
    ').addClass('ui selection search dropdown centro').attr('data-index', idx).append( + return $('
    ').addClass('ui selection search dropdown centro').attr('data-index', idx).css('width', '80%').append( $('').attr('type', 'hidden').attr('name', 'centro' + idx) ).append( $('').addClass('dropdown icon') @@ -375,7 +372,7 @@ } $(this.ids.form.mes).calendar(calendar_date_options) $(this.ids.form.base).submit(this.parse().cartola) - $(this.ids.table.base).DataTable() + $(this.ids.table.base).DataTable(this.dataTableConfig) $(this.ids.button).click(this.export().cartola) } diff --git a/app/setup/setups/services.php b/app/setup/setups/services.php index e90b3b3..485eda8 100644 --- a/app/setup/setups/services.php +++ b/app/setup/setups/services.php @@ -36,7 +36,8 @@ return [ $container->get(Incoviba\Common\Define\Contabilidad\Exporter::class) )) ->register('security', $container->get(Incoviba\Service\Cartola\Security::class)) - ->register('itau', $container->get(Incoviba\Service\Cartola\Itau::class)); + ->register('itau', $container->get(Incoviba\Service\Cartola\Itau::class)) + ->register('santander', $container->get(Incoviba\Service\Cartola\Santander::class)); }, Incoviba\Common\Define\Contabilidad\Exporter::class => function(ContainerInterface $container) { return $container->get(Incoviba\Service\Contabilidad\Exporter\Nubox::class); diff --git a/app/src/Service/Cartola/Itau.php b/app/src/Service/Cartola/Itau.php index 98117f0..6634156 100644 --- a/app/src/Service/Cartola/Itau.php +++ b/app/src/Service/Cartola/Itau.php @@ -13,11 +13,9 @@ class Itau extends Banco return [ 'Fecha' => 'fecha', 'Número de operación' => 'documento', - 'Sucursal' => 'sucursal', 'Descripción' => 'glosa', 'Depósitos o abonos' => 'abono', - 'Giros o cargos' => 'cargo', - 'Saldo diario' => 'saldo' + 'Giros o cargos' => 'cargo' ]; } diff --git a/app/src/Service/Cartola/Santander.php b/app/src/Service/Cartola/Santander.php new file mode 100644 index 0000000..748f566 --- /dev/null +++ b/app/src/Service/Cartola/Santander.php @@ -0,0 +1,80 @@ + 'cargo', + 'abono' => 'abono', + 'DESCRIPCIÓN MOVIMIENTO' => 'glosa', + 'FECHA' => 'fecha', + 'N° DOCUMENTO' => 'documento', + ]; + } + protected function parseFile(UploadedFileInterface $uploadedFile): array + { + function log(mixed $elem): void + { + if (!is_string($elem)) { + $elem = var_export($elem,true); + } + error_log($elem.PHP_EOL,3,'/logs/debug'); + } + + $filename = '/tmp/cartola.xlsx'; + $uploadedFile->moveTo($filename); + + $reader = PhpSpreadsheet\IOFactory::createReader('Xlsx'); + $xlsx = $reader->load($filename); + $sheet = $xlsx->getActiveSheet(); + + $rowIndex = 16; + $columns = []; + $row = $sheet->getRowIterator($rowIndex)->current(); + $cols = $row->getColumnIterator('A', 'H'); + foreach ($cols as $col) { + $columns []= $col->getCalculatedValue(); + } + $rowIndex ++; + $rows = $sheet->getRowIterator($rowIndex); + $data = []; + foreach ($rows as $row) { + if ($sheet->getCell("A{$rowIndex}")->getCalculatedValue() === 'Resumen comisiones') { + break; + } + $cols = $row->getColumnIterator('A', 'H'); + $colIndex = 0; + $rowData = []; + foreach ($cols as $col) { + $value = $col->getCalculatedValue(); + $col = $columns[$colIndex]; + if ($col === 'FECHA') { + log($value); + list($d,$m,$Y) = explode('/', $value); + $value = "{$Y}-{$m}-{$d}"; + } + $rowData[$col] = $value; + $colIndex ++; + } + if ($rowData['CARGO/ABONO'] === 'C') { + $rowData['cargo'] = -$rowData['MONTO']; + $rowData['abono'] = 0; + } else { + $rowData['cargo'] = 0; + $rowData['abono'] = $rowData['MONTO']; + } + $data []= $rowData; + $rowIndex ++; + } + + return $data; + } +} diff --git a/app/src/Service/Cartola/Security.php b/app/src/Service/Cartola/Security.php index ae8f26b..28323a2 100644 --- a/app/src/Service/Cartola/Security.php +++ b/app/src/Service/Cartola/Security.php @@ -25,8 +25,7 @@ class Security extends Banco 'descripción' => 'glosa', 'número de documentos' => 'documento', 'cargos' => 'cargo', - 'abonos' => 'abono', - 'saldos' => 'saldo' + 'abonos' => 'abono' ]; } From ad003c7dcffe0647327b02b768cc73b34c1500b1 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Thu, 18 Jan 2024 13:05:36 -0300 Subject: [PATCH 110/163] Cleanup --- app/src/Service/Cartola/Itau.php | 9 --------- app/src/Service/Cartola/Santander.php | 9 --------- 2 files changed, 18 deletions(-) diff --git a/app/src/Service/Cartola/Itau.php b/app/src/Service/Cartola/Itau.php index 6634156..ce15e29 100644 --- a/app/src/Service/Cartola/Itau.php +++ b/app/src/Service/Cartola/Itau.php @@ -21,14 +21,6 @@ class Itau extends Banco protected function parseFile(UploadedFileInterface $uploadedFile): array { - function log(mixed $elem): void - { - if (!is_string($elem)) { - $elem = var_export($elem,true); - } - error_log($elem.PHP_EOL,3,'/logs/debug'); - } - $filename = '/tmp/cartola.xls'; $uploadedFile->moveTo($filename); @@ -74,7 +66,6 @@ class Itau extends Banco if ($col === 'Fecha') { list($d, $m) = explode('/', $value); $value = "{$year}-{$m}-{$d}"; - log($value); } $rowData[$col] = $value; $colIndex ++; diff --git a/app/src/Service/Cartola/Santander.php b/app/src/Service/Cartola/Santander.php index 748f566..94298e9 100644 --- a/app/src/Service/Cartola/Santander.php +++ b/app/src/Service/Cartola/Santander.php @@ -21,14 +21,6 @@ class Santander extends Banco } protected function parseFile(UploadedFileInterface $uploadedFile): array { - function log(mixed $elem): void - { - if (!is_string($elem)) { - $elem = var_export($elem,true); - } - error_log($elem.PHP_EOL,3,'/logs/debug'); - } - $filename = '/tmp/cartola.xlsx'; $uploadedFile->moveTo($filename); @@ -57,7 +49,6 @@ class Santander extends Banco $value = $col->getCalculatedValue(); $col = $columns[$colIndex]; if ($col === 'FECHA') { - log($value); list($d,$m,$Y) = explode('/', $value); $value = "{$Y}-{$m}-{$d}"; } From 1f076bc2f12dc7671a6c3314140c6853eb5c0356 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Thu, 18 Jan 2024 13:15:26 -0300 Subject: [PATCH 111/163] FIX: IPC y factura --- app/resources/views/ventas/facturacion/show.blade.php | 5 +++-- app/src/Service/IPC.php | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/resources/views/ventas/facturacion/show.blade.php b/app/resources/views/ventas/facturacion/show.blade.php index 2efebea..e8f7c03 100644 --- a/app/resources/views/ventas/facturacion/show.blade.php +++ b/app/resources/views/ventas/facturacion/show.blade.php @@ -62,7 +62,8 @@
    @endif - @if ($IPC->get($venta->proyecto()->terreno->fecha, $venta->currentEstado()->fecha) === 0.0) + @if ($venta->currentEstado()->fecha->sub(new DateInterval('P1M')) > $venta->proyecto()->terreno->fecha + and $IPC->get($venta->proyecto()->terreno->fecha, $venta->currentEstado()->fecha->sub(new DateInterval('P1M'))) === 0.0)
    @@ -314,7 +315,7 @@ return } const idx = this.unidades.findIndex(unidad => unidad.pid === json.propiedad_unidad_id) - this.unidades[idx].precio = parseInt(json.input.valor) + this.unidades[idx].precio = parseFloat(json.input.valor) this.unidades[idx].base = parseFloat(json.input.valor * this.unidades[idx].base / old_value) this.build() }) diff --git a/app/src/Service/IPC.php b/app/src/Service/IPC.php index 1c1acfc..f2e59c5 100644 --- a/app/src/Service/IPC.php +++ b/app/src/Service/IPC.php @@ -5,11 +5,12 @@ use DateTimeInterface; use DateTimeImmutable; use DateInterval; use Incoviba\Common\Implement\Exception\EmptyRedis; +use Psr\Log\LoggerInterface; class IPC { protected string $redisKey = 'ipc'; - public function __construct(protected Redis $redisService, protected Money $moneyService) {} + public function __construct(protected Redis $redisService, protected Money $moneyService, protected LoggerInterface $logger) {} public function get(DateTimeInterface $from, DateTimeInterface $to = new DateTimeImmutable()): float { @@ -38,7 +39,7 @@ class IPC public function readjust(float $base, DateTimeInterface $from, DateTimeInterface $to = new DateTimeImmutable()):float { if (($ipc = $this->get($from, $to->sub(new DateInterval('P1M')))) === 0.0) { - return 0; + return $base; } return $base * (1 + $ipc); } From 72f63c5e6c3eda95444cfe39931f3c063049d777 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Thu, 18 Jan 2024 13:17:23 -0300 Subject: [PATCH 112/163] Cleanup --- app/src/Service/IPC.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/Service/IPC.php b/app/src/Service/IPC.php index f2e59c5..b75398d 100644 --- a/app/src/Service/IPC.php +++ b/app/src/Service/IPC.php @@ -5,12 +5,11 @@ use DateTimeInterface; use DateTimeImmutable; use DateInterval; use Incoviba\Common\Implement\Exception\EmptyRedis; -use Psr\Log\LoggerInterface; class IPC { protected string $redisKey = 'ipc'; - public function __construct(protected Redis $redisService, protected Money $moneyService, protected LoggerInterface $logger) {} + public function __construct(protected Redis $redisService, protected Money $moneyService) {} public function get(DateTimeInterface $from, DateTimeInterface $to = new DateTimeImmutable()): float { From e1462657fcd22dde8b9aba42e9644892275f60d4 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Thu, 18 Jan 2024 13:20:02 -0300 Subject: [PATCH 113/163] =?UTF-8?q?Clave=20->=20Contrase=C3=B1a?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/resources/views/login/form.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/resources/views/login/form.blade.php b/app/resources/views/login/form.blade.php index 1352f74..8a20b1f 100644 --- a/app/resources/views/login/form.blade.php +++ b/app/resources/views/login/form.blade.php @@ -8,7 +8,7 @@
    - +
    From 01af47fba1a49c5c775171e9d38da5649e50b8ee Mon Sep 17 00:00:00 2001 From: Aldarien Date: Thu, 18 Jan 2024 15:18:07 -0300 Subject: [PATCH 114/163] FIX: escriturar --- .../views/ventas/escriturar.blade.php | 22 +++++--- app/src/Service/Venta.php | 52 +++++++++++++++++-- 2 files changed, 64 insertions(+), 10 deletions(-) diff --git a/app/resources/views/ventas/escriturar.blade.php b/app/resources/views/ventas/escriturar.blade.php index 1faf1c5..171b8ae 100644 --- a/app/resources/views/ventas/escriturar.blade.php +++ b/app/resources/views/ventas/escriturar.blade.php @@ -86,7 +86,7 @@
    - +
    @@ -160,13 +160,13 @@
    @endif - @if (isset($venta->formaPago()->credito) and $venta->formaPago()->credito->pago->banco === null) + @if (!isset($venta->formaPago()->credito) or $venta->formaPago()->credito->pago->banco === null)

    Crédito

    -
    - +
    +
    UF
    @@ -254,9 +254,15 @@ $('#escriturar_form').submit(event => { event.preventDefault() const url = '{{$urls->api}}/venta/{{$venta->id}}/escriturar' - const data = new FormData(event.currentTarget) - data.set('fecha', $('#fecha').calendar('get date').toISOString()) - fetchAPI(url, {method: 'post', body: data}).then(response => { + const body = new FormData(event.currentTarget) + body.set('fecha', $('#fecha').calendar('get date').toISOString()) + if (body.get('fecha_pago') !== '') { + body.set('fecha_pago', $('#fecha_pago').calendar('get date').toISOString()) + } + if (body.get('fecha_reajuste') !== '') { + body.set('fecha_reajuste', $('#fecha_reajuste').calendar('get date').toISOString()) + } + fetchAPI(url, {method: 'post', body}).then(response => { if (response.ok) { return response.json() } @@ -267,6 +273,8 @@ }) return false }) + $('#fecha_pago').calendar(calendar_date_options) + $('#fecha_reajuste').calendar(calendar_date_options) }) @endpush diff --git a/app/src/Service/Venta.php b/app/src/Service/Venta.php index 7265668..be79d78 100644 --- a/app/src/Service/Venta.php +++ b/app/src/Service/Venta.php @@ -5,6 +5,7 @@ use DateTimeImmutable; use Incoviba\Common\Implement; use Incoviba\Repository; use Incoviba\Model; +use PhpParser\Node\Expr\AssignOp\Mod; class Venta { @@ -14,6 +15,8 @@ class Venta protected Repository\Venta\TipoEstadoVenta $tipoEstadoVentaRepository, protected Repository\Venta\Credito $creditoRepository, protected Repository\Venta\Escritura $escrituraRepository, + protected Repository\Venta\Pago $pagoRepository, + protected Repository\Venta\EstadoPago $estadoPagoRepository, protected Venta\Propietario $propietarioService, protected Venta\Propiedad $propiedadService, protected Venta\Pie $pieService, @@ -312,8 +315,8 @@ class Venta if ($this->validarData($data, ['fecha_pago'], ['valor_pago_pesos', 'valor_pago_ufs'])) { $this->abonoEscritura($venta, $data); } - if ($this->validarData($data, ['banco_credito'])) { - $this->creditoRepository->edit($venta->formaPago()->credito, ['banco' => $data['banco_credito']]); + if ($this->validarData($data, ['banco_credito'], ['valor_credito'])) { + $this->editCredito($venta, $data); } if ($this->validarData($data, ['valor_subsidio', 'valor_ahorro', 'fecha'])) { $this->subsidioEscritura($venta, $data); @@ -357,11 +360,18 @@ class Venta $fecha = new DateTimeImmutable($data['fecha_pago']); $uf = $this->moneyService->getUF($fecha); $valor = $data['valor_pago_ufs'] !== '' ? $data['valor_pago_ufs'] * $uf : $data['valor_pago_pesos']; - $escrituraData = [ + $pagoData = [ 'valor' => $valor, 'fecha' => $fecha->format('Y-m-d'), 'uf' => $uf ]; + $pago = $this->pagoService->add($pagoData); + $escrituraData = [ + 'valor' => $valor, + 'fecha' => $fecha->format('Y-m-d'), + 'uf' => $uf, + 'pago' => $pago->id + ]; $escritura = $this->escrituraRepository->create($escrituraData); $escritura = $this->escrituraRepository->save($escritura); $this->ventaRepository->edit($venta, ['escritura' => $escritura->id]); @@ -379,6 +389,42 @@ class Venta $subsidio = $this->addSubsidio($subsidioData); $this->ventaRepository->edit($venta, ['subsidio' => $subsidio->id]); } + protected function editCredito(Model\Venta $venta, array $data): void + { + $fecha = new DateTimeImmutable($data['fecha']); + $uf = $this->moneyService->getUF($fecha); + $valor = $data['valor_credito'] * $uf; + if ($venta->formaPago()->credito === null) { + $pagoData = [ + 'valor' => $valor, + 'fecha' => $fecha->format('Y-m-d'), + 'uf' => $uf + ]; + $pago = $this->pagoService->add($pagoData); + $creditoData = [ + 'banco' => $data['banco_credito'], + 'valor' => $valor, + 'pago' => $pago->id + ]; + $credito = $this->creditoRepository->create($creditoData); + $credito = $this->creditoRepository->save($credito); + $this->ventaRepository->edit($venta, ['credito' => $credito->id]); + return; + } + $this->pagoRepository->edit($venta->formaPago()->credito->pago, [ + 'valor' => $valor, + 'banco' => $data['banco_credito'], + 'uf' => $uf + ]); + $this->estadoPagoRepository->edit($venta->formaPago()->credito->pago->currentEstado, [ + 'fecha' => $fecha->format('Y-m-d') + ]); + $this->creditoRepository->edit($venta->formaPago()->credito, [ + 'valor' => $valor, + 'fecha' => $fecha->format('Y-m-d'), + 'uf' => $uf + ]); + } public function desistir(Model\Venta $venta, array $data): bool { From ca83472012ebf8e826f68e162015f4b1f2dbbae7 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Thu, 18 Jan 2024 16:41:16 -0300 Subject: [PATCH 115/163] Informe escritura --- app/resources/routes/ventas/escrituras.php | 1 + .../views/ventas/escrituras/informe.blade.php | 91 +++++++++++++++++++ .../views/ventas/show/escritura.blade.php | 2 +- app/src/Controller/Ventas/Escrituras.php | 9 +- app/src/Service/Format.php | 8 +- 5 files changed, 107 insertions(+), 4 deletions(-) create mode 100644 app/resources/views/ventas/escrituras/informe.blade.php diff --git a/app/resources/routes/ventas/escrituras.php b/app/resources/routes/ventas/escrituras.php index 7a310a9..a9ecd40 100644 --- a/app/resources/routes/ventas/escrituras.php +++ b/app/resources/routes/ventas/escrituras.php @@ -2,5 +2,6 @@ use Incoviba\Controller\Ventas\Escrituras; $app->group('/escritura/{venta_id}', function($app) { + $app->get('/informe[/]', [Escrituras::class, 'informe']); $app->get('[/]', [Escrituras::class, 'show']); }); diff --git a/app/resources/views/ventas/escrituras/informe.blade.php b/app/resources/views/ventas/escrituras/informe.blade.php new file mode 100644 index 0000000..3c530fb --- /dev/null +++ b/app/resources/views/ventas/escrituras/informe.blade.php @@ -0,0 +1,91 @@ +@extends('layout.base') + +@section('page_content') +
    +

    + Escritura - + {{$venta->proyecto()->descripcion}} - + {{$venta->propiedad()->summary()}} +

    +
    + El departamento {{$venta->propiedad()->departamentos()[0]->descripcion}}:
    + @php + $estacionamientos = $venta->propiedad()->estacionamientos(); + @endphp + @if (count($estacionamientos) === 0) + no tiene estacionamientos + @else + tiene + {{count($estacionamientos) === 1 ? 'el' : 'los'}} + estacionamiento{{count($estacionamientos) === 1 ? '': 's'}} + {{implode(', ', array_map(function(Incoviba\Model\Venta\Unidad $unidad) { + return $unidad->descripcion; + }, $estacionamientos))}} + @endif + y + @php + $bodegas = $venta->propiedad()->bodegas(); + @endphp + @if (count($bodegas) === 0) + no tiene bodegas + @else + tiene + {{count($bodegas) === 1 ? 'la' : 'las'}} + bodega{{count($bodegas) === 1 ? '' : 's'}} + {{implode(', ', array_map(function(Incoviba\Model\Venta\Unidad $unidad) { + return $unidad->descripcion; + }, $bodegas))}} + @endif +
    +
    + PRECIO + {{$format->ufs($venta->valor)}} +
    +
    + @if (isset($venta->formaPago()->pie)) + @php($pie = $venta->formaPago()->pie) + PIE + {{$pie->cuotas}} cuotas que suman + {{$format->pesos($pie->pagado('pesos'))}} + equivalente a + {{$format->ufs($pie->pagado())}}. +
    + @endif + @if (isset($venta->formaPago()->escritura)) + @php($escritura = $venta->formaPago()->escritura) + ESCRITURA + {{$format->pesos($escritura->pago->valor)}} + el + {{$escritura->fecha->format('d-m-Y')}} + equivalente a + {{$format->ufs($escritura->pago->valor())}} +
    + @endif +
    + TOTAL ANTICIPO + {{$format->ufs($venta->formaPago()->anticipo())}} +
    + @if (isset($venta->formaPago()->bonoPie)) + @php($bono = $venta->formaPago()->bonoPie) + BONO PIE + {{$format->ufs($bono->pago->valor())}} +
    + @endif + @if (isset($venta->formaPago()->credito)) + @php($credito = $venta->formaPago()->credito) + CRÉDITO + {{$format->ufs($credito->pago->valor())}} + en Banco {{$credito->pago->banco->nombre}} +
    + @endif +
    + TOTAL + {{$format->ufs($venta->formaPago()->total())}} + @if (($venta->formaPago()->total() - $venta->valor) !== 0) +
    +
    + Diferencia {{$format->ufs($venta->formaPago()->total() - $venta->valor)}}. ({{$format->percent(($venta->formaPago()->total() - $venta->valor) / $venta->valor * 100)}}) + @endif +
    +
    +@endsection diff --git a/app/resources/views/ventas/show/escritura.blade.php b/app/resources/views/ventas/show/escritura.blade.php index ace5790..7e2aade 100644 --- a/app/resources/views/ventas/show/escritura.blade.php +++ b/app/resources/views/ventas/show/escritura.blade.php @@ -9,7 +9,7 @@ - + Informe diff --git a/app/src/Controller/Ventas/Escrituras.php b/app/src/Controller/Ventas/Escrituras.php index 9437d9a..feb9f89 100644 --- a/app/src/Controller/Ventas/Escrituras.php +++ b/app/src/Controller/Ventas/Escrituras.php @@ -8,9 +8,16 @@ use Incoviba\Service; class Escrituras { - public function show(ServerRequestInterface $request, ResponseInterface $response, View $view, Service\Venta $ventaService, int $venta_id): ResponseInterface + public function show(ServerRequestInterface $request, ResponseInterface $response, View $view, + Service\Venta $ventaService, int $venta_id): ResponseInterface { $venta = $ventaService->getById($venta_id); return $view->render($response, 'ventas.escrituras.show', compact('venta')); } + public function informe(ServerRequestInterface $request, ResponseInterface $response, View $view, + Service\Venta $ventaService, int $venta_id): ResponseInterface + { + $venta = $ventaService->getById($venta_id); + return $view->render($response, 'ventas.escrituras.informe', compact('venta')); + } } diff --git a/app/src/Service/Format.php b/app/src/Service/Format.php index 2af1a3b..21546e0 100644 --- a/app/src/Service/Format.php +++ b/app/src/Service/Format.php @@ -21,12 +21,16 @@ class Format { return number_format($number, $decimal_places, ',', '.'); } + public function percent(float|string $number, int $decimal_places = 2): string + { + return "{$this->number($number, $decimal_places)}%"; + } public function pesos(string $valor): string { - return '$ ' . $this->number($valor); + return "$ {$this->number($valor)}"; } public function ufs(string $valor): string { - return $this->number($valor, 2) . ' UF'; + return "{$this->number($valor, 2)} UF"; } } From f55e4dbd5f3d7ea2d77a2630e10cff1417f198a5 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Thu, 18 Jan 2024 17:15:32 -0300 Subject: [PATCH 116/163] ventas.base --- app/resources/views/ventas/base.blade.php | 36 ++ .../views/ventas/desistida.blade.php | 72 ++-- app/resources/views/ventas/desistir.blade.php | 80 ++-- app/resources/views/ventas/edit.blade.php | 52 ++- .../views/ventas/escriturar.blade.php | 374 +++++++++--------- .../views/ventas/escrituras/informe.blade.php | 169 ++++---- .../views/ventas/escrituras/show.blade.php | 37 +- .../views/ventas/pies/cuotas.blade.php | 273 +++++++------ .../views/ventas/pies/cuotas/add.blade.php | 157 ++++---- .../views/ventas/pies/edit.blade.php | 41 +- app/resources/views/ventas/show.blade.php | 39 +- 11 files changed, 679 insertions(+), 651 deletions(-) create mode 100644 app/resources/views/ventas/base.blade.php diff --git a/app/resources/views/ventas/base.blade.php b/app/resources/views/ventas/base.blade.php new file mode 100644 index 0000000..1a75b85 --- /dev/null +++ b/app/resources/views/ventas/base.blade.php @@ -0,0 +1,36 @@ +@extends('layout.base') + +@section('page_title') + Venta {{$venta->proyecto()->descripcion}} {{$venta->propiedad()->summary()}} +@endsection + +@section('page_content') +
    +
    +
    +

    +
    +
    {{$venta->proyecto()->descripcion}}
    + + {{$venta->propiedad()->summary()}} + +
    +

    + @if (isset($showPropietario) and $showPropietario) +
    + @include('ventas.show.propietario') +
    + @endif +
    + @hasSection('venta_subtitle') +
    +

    + @yield('venta_subtitle') +

    +
    + @endif +
    +
    + @yield('venta_content') +
    +@endsection diff --git a/app/resources/views/ventas/desistida.blade.php b/app/resources/views/ventas/desistida.blade.php index 303c35a..530d572 100644 --- a/app/resources/views/ventas/desistida.blade.php +++ b/app/resources/views/ventas/desistida.blade.php @@ -1,47 +1,43 @@ -@extends('layout.base') +@extends('ventas.base') -@section('page_content') -
    -

    - Desistida - {{$venta->proyecto()->descripcion}} - - - {{$venta->propiedad()->summary()}} - -

    -
    -
    -
    - -
    -
    - - -
    +@section('venta_subtitle') + Desistida +@endsection + +@section('venta_content') + +
    +
    + +
    +
    + +
    -
    - +
    +
    + +
    +
    +
    +
    + +
    +
    $
    +
    -
    -
    - -
    -
    $
    - -
    -
    -
    - -
    +
    +
    - - - -
    +
    + + + @endsection @push('page_scripts') diff --git a/app/resources/views/ventas/desistir.blade.php b/app/resources/views/ventas/desistir.blade.php index b7db556..d853777 100644 --- a/app/resources/views/ventas/desistir.blade.php +++ b/app/resources/views/ventas/desistir.blade.php @@ -1,51 +1,49 @@ -@extends('layout.base') +@extends('ventas.base') -@section('page_content') -
    -

    - Desistir - {{$venta->proyecto()->descripcion}} - - {{$venta->propiedad()->summary()}} -

    -
    -
    -
    Valor Pagado
    -
    - {{$format->pesos($venta->formaPago()->pie->pagado('pesos'))}} -
    - {{$format->number($venta->formaPago()->pie->pagado() / $venta->valor * 100)}}% de la venta -
    -
    -
    -
    -
    - Multa Estandar -
    5%
    -
    -
    - {{$format->pesos($venta->valor * 0.05 * $UF->get())}} +@section('venta_subtitle') + Desistir +@endsection + +@section('venta_content') +
    +
    +
    Valor Pagado
    +
    + {{$format->pesos($venta->formaPago()->pie->pagado('pesos'))}} +
    + {{$format->number($venta->formaPago()->pie->pagado() / $venta->valor * 100)}}% de la venta
    -
    -
    - -
    -
    - - -
    -
    +
    +
    + Multa Estandar +
    5%
    -
    - -
    -
    $
    - -
    +
    + {{$format->pesos($venta->valor * 0.05 * $UF->get())}}
    - - +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    + +
    +
    $
    + +
    +
    + +
    @endsection @push('page_scripts') diff --git a/app/resources/views/ventas/edit.blade.php b/app/resources/views/ventas/edit.blade.php index 09c52fb..9bf3237 100644 --- a/app/resources/views/ventas/edit.blade.php +++ b/app/resources/views/ventas/edit.blade.php @@ -1,33 +1,31 @@ -@extends('layout.base') +@extends('ventas.base') -@section('page_content') -
    -

    Editar Venta - - {{$venta->proyecto()->descripcion}} - - {{$venta->propiedad()->summary()}} -

    -
    -
    - -
    - -
    UF
    +@section('venta_subtitle') + Editar Venta +@endsection + +@section('venta_content') + +
    + +
    + +
    UF
    +
    +
    +
    + +
    +
    + +
    -
    - -
    -
    - - -
    -
    -
    - - -
    +
    + + @endsection @push('page_scripts') diff --git a/app/resources/views/ventas/escriturar.blade.php b/app/resources/views/ventas/escriturar.blade.php index 171b8ae..23445e2 100644 --- a/app/resources/views/ventas/escriturar.blade.php +++ b/app/resources/views/ventas/escriturar.blade.php @@ -1,210 +1,206 @@ -@extends('layout.base') +@extends('ventas.base') -@section('page_content') -
    -

    - Escriturar - {{$venta->proyecto()->descripcion}} - - - {{$venta->propiedad()->summary()}} - -

    -
    -
    -
    Faltante
    -
    {{$format->pesos($venta->saldo('pesos'))}}
    -
    {{$format->ufs($venta->saldo())}}
    +@section('venta_subtitle') + Escriturar +@endsection + +@section('venta_content') +
    +
    +
    Faltante
    +
    {{$format->pesos($venta->saldo('pesos'))}}
    +
    {{$format->ufs($venta->saldo())}}
    +
    +
    +
    +
    +
    + +
    +
    + + +
    -
    - -
    - -
    -
    - - + @if ($venta->formaPago()->pie->reajuste === null) +

    Reajuste

    +
    +
    + +
    +
    $
    + +
    +
    +
    + +
    +
    + + +
    - @if ($venta->formaPago()->pie->reajuste === null) -

    Reajuste

    -
    -
    - -
    -
    $
    - -
    + @else +

    Reajuste

    +
    +
    + +
    +
    $
    +
    -
    - -
    -
    - - -
    +
    +
    + +
    + +
    +
    +
    + @endif + @if (!isset($venta->formaPago()->escritura)) +

    Pago en Escritura

    +
    +
    + +
    +
    $
    + +
    +
    +
    + +
    + +
    UF
    +
    +
    +
    + +
    +
    + +
    - @else -

    Reajuste

    -
    -
    - -
    -
    $
    - -
    +
    + @else +

    Pago en Escritura

    +
    +
    + +
    +
    $
    +
    -
    - -
    - +
    +
    + +
    + +
    UF
    +
    +
    +
    + +
    + +
    +
    +
    + @endif + @if (!isset($venta->formaPago()->subsidio)) +

    Subsidio

    +
    +
    + +
    + +
    UF
    +
    +
    +
    + +
    + +
    UF
    +
    +
    +
    + +
    + +
    UF
    +
    +
    +
    + @else +

    Subsidio

    +
    +
    + +
    + +
    UF
    +
    +
    +
    + +
    + +
    UF
    +
    +
    +
    + @endif + @if (!isset($venta->formaPago()->credito) or $venta->formaPago()->credito->pago->banco === null) +

    Crédito

    +
    +
    + +
    + +
    UF
    +
    +
    +
    + +
    - @endif - @if (!isset($venta->formaPago()->escritura)) -

    Pago en Escritura

    -
    -
    - -
    -
    $
    - -
    -
    -
    - -
    - -
    UF
    -
    -
    -
    - -
    -
    - - -
    -
    +
    + @else +

    Crédito

    +
    +
    + +
    + +
    UF
    - @else -

    Pago en Escritura

    -
    -
    - -
    -
    $
    - -
    -
    -
    - -
    - -
    UF
    -
    -
    -
    - -
    - -
    +
    + +
    +
    - @endif - @if (!isset($venta->formaPago()->subsidio)) -

    Subsidio

    -
    -
    - -
    - -
    UF
    -
    -
    -
    - -
    - -
    UF
    -
    -
    -
    - -
    - -
    UF
    -
    -
    -
    - @else -

    Subsidio

    -
    -
    - -
    - -
    UF
    -
    -
    -
    - -
    - -
    UF
    -
    -
    -
    - @endif - @if (!isset($venta->formaPago()->credito) or $venta->formaPago()->credito->pago->banco === null) -

    Crédito

    -
    -
    - -
    - -
    UF
    -
    -
    -
    - - -
    -
    - @else -

    Crédito

    -
    -
    - -
    - -
    UF
    -
    -
    -
    - -
    - -
    -
    -
    - @endif - - -
    +
    + @endif + + @endsection @push('page_scripts') diff --git a/app/resources/views/ventas/escrituras/informe.blade.php b/app/resources/views/ventas/escrituras/informe.blade.php index 3c530fb..648192c 100644 --- a/app/resources/views/ventas/escrituras/informe.blade.php +++ b/app/resources/views/ventas/escrituras/informe.blade.php @@ -1,91 +1,88 @@ -@extends('layout.base') +@extends('ventas.base') -@section('page_content') -
    -

    - Escritura - - {{$venta->proyecto()->descripcion}} - - {{$venta->propiedad()->summary()}} -

    -
    - El departamento {{$venta->propiedad()->departamentos()[0]->descripcion}}:
    - @php - $estacionamientos = $venta->propiedad()->estacionamientos(); - @endphp - @if (count($estacionamientos) === 0) - no tiene estacionamientos - @else - tiene - {{count($estacionamientos) === 1 ? 'el' : 'los'}} - estacionamiento{{count($estacionamientos) === 1 ? '': 's'}} - {{implode(', ', array_map(function(Incoviba\Model\Venta\Unidad $unidad) { - return $unidad->descripcion; - }, $estacionamientos))}} - @endif - y - @php - $bodegas = $venta->propiedad()->bodegas(); - @endphp - @if (count($bodegas) === 0) - no tiene bodegas - @else - tiene - {{count($bodegas) === 1 ? 'la' : 'las'}} - bodega{{count($bodegas) === 1 ? '' : 's'}} - {{implode(', ', array_map(function(Incoviba\Model\Venta\Unidad $unidad) { - return $unidad->descripcion; - }, $bodegas))}} - @endif +@section('venta_subtitle') + Resumen Escritura +@endsection + +@section('venta_content') +
    + El departamento {{$venta->propiedad()->departamentos()[0]->descripcion}}:
    + @php + $estacionamientos = $venta->propiedad()->estacionamientos(); + @endphp + @if (count($estacionamientos) === 0) + no tiene estacionamientos + @else + tiene + {{count($estacionamientos) === 1 ? 'el' : 'los'}} + estacionamiento{{count($estacionamientos) === 1 ? '': 's'}} + {{implode(', ', array_map(function(Incoviba\Model\Venta\Unidad $unidad) { + return $unidad->descripcion; + }, $estacionamientos))}} + @endif + y + @php + $bodegas = $venta->propiedad()->bodegas(); + @endphp + @if (count($bodegas) === 0) + no tiene bodegas + @else + tiene + {{count($bodegas) === 1 ? 'la' : 'las'}} + bodega{{count($bodegas) === 1 ? '' : 's'}} + {{implode(', ', array_map(function(Incoviba\Model\Venta\Unidad $unidad) { + return $unidad->descripcion; + }, $bodegas))}} + @endif +
    +
    + PRECIO + {{$format->ufs($venta->valor)}} +
    +
    + @if (isset($venta->formaPago()->pie)) + @php($pie = $venta->formaPago()->pie) + PIE + {{$pie->cuotas}} cuotas que suman + {{$format->pesos($pie->pagado('pesos'))}} + equivalente a + {{$format->ufs($pie->pagado())}}. +
    + @endif + @if (isset($venta->formaPago()->escritura)) + @php($escritura = $venta->formaPago()->escritura) + ESCRITURA + {{$format->pesos($escritura->pago->valor)}} + el + {{$escritura->fecha->format('d-m-Y')}} + equivalente a + {{$format->ufs($escritura->pago->valor())}} +
    + @endif +
    + TOTAL ANTICIPO + {{$format->ufs($venta->formaPago()->anticipo())}} +
    + @if (isset($venta->formaPago()->bonoPie)) + @php($bono = $venta->formaPago()->bonoPie) + BONO PIE + {{$format->ufs($bono->pago->valor())}} +
    + @endif + @if (isset($venta->formaPago()->credito)) + @php($credito = $venta->formaPago()->credito) + CRÉDITO + {{$format->ufs($credito->pago->valor())}} + en Banco {{$credito->pago->banco->nombre}} +
    + @endif +
    + TOTAL + {{$format->ufs($venta->formaPago()->total())}} + @if (($venta->formaPago()->total() - $venta->valor) !== 0)

    - PRECIO - {{$format->ufs($venta->valor)}} -
    -
    - @if (isset($venta->formaPago()->pie)) - @php($pie = $venta->formaPago()->pie) - PIE - {{$pie->cuotas}} cuotas que suman - {{$format->pesos($pie->pagado('pesos'))}} - equivalente a - {{$format->ufs($pie->pagado())}}. -
    - @endif - @if (isset($venta->formaPago()->escritura)) - @php($escritura = $venta->formaPago()->escritura) - ESCRITURA - {{$format->pesos($escritura->pago->valor)}} - el - {{$escritura->fecha->format('d-m-Y')}} - equivalente a - {{$format->ufs($escritura->pago->valor())}} -
    - @endif -
    - TOTAL ANTICIPO - {{$format->ufs($venta->formaPago()->anticipo())}} -
    - @if (isset($venta->formaPago()->bonoPie)) - @php($bono = $venta->formaPago()->bonoPie) - BONO PIE - {{$format->ufs($bono->pago->valor())}} -
    - @endif - @if (isset($venta->formaPago()->credito)) - @php($credito = $venta->formaPago()->credito) - CRÉDITO - {{$format->ufs($credito->pago->valor())}} - en Banco {{$credito->pago->banco->nombre}} -
    - @endif -
    - TOTAL - {{$format->ufs($venta->formaPago()->total())}} - @if (($venta->formaPago()->total() - $venta->valor) !== 0) -
    -
    - Diferencia {{$format->ufs($venta->formaPago()->total() - $venta->valor)}}. ({{$format->percent(($venta->formaPago()->total() - $venta->valor) / $venta->valor * 100)}}) - @endif -
    + Diferencia {{$format->ufs($venta->formaPago()->total() - $venta->valor)}}. ({{$format->percent(($venta->formaPago()->total() - $venta->valor) / $venta->valor * 100)}}) + @endif
    @endsection diff --git a/app/resources/views/ventas/escrituras/show.blade.php b/app/resources/views/ventas/escrituras/show.blade.php index 037fe1c..5be5aab 100644 --- a/app/resources/views/ventas/escrituras/show.blade.php +++ b/app/resources/views/ventas/escrituras/show.blade.php @@ -1,27 +1,22 @@ -@extends('layout.base') +@extends('ventas.base') -@section('page_content') -
    -

    - Escritura - - {{$venta->proyecto()->descripcion}} - - - {{$venta->propiedad()->summary()}} - -

    -
    -
    - -
    -
    - - -
    +@section('venta_subtitle') + Escritura +@endsection + +@section('venta_content') + +
    + +
    +
    + +
    - - -
    +
    + + @endsection @push('page_scripts') diff --git a/app/resources/views/ventas/pies/cuotas.blade.php b/app/resources/views/ventas/pies/cuotas.blade.php index c302d8e..e55e961 100644 --- a/app/resources/views/ventas/pies/cuotas.blade.php +++ b/app/resources/views/ventas/pies/cuotas.blade.php @@ -1,146 +1,139 @@ -@extends('layout.base') +@extends('ventas.base') -@section('page_content') -
    -
    -

    -
    -
    {{$venta->proyecto()->descripcion}}
    - {{$venta->propiedad()->summary()}} -
    -

    -
    -

    Cuotas - Pie

    - - - - - - - - - - - - - - - - - @php - $now = new DateTimeImmutable(); - $uf_venta = $venta->uf === 0.0 ? $UF->get($venta->currentEstado()->fecha) : $venta->uf; - @endphp - @foreach ($venta->formaPago()->pie->cuotas() as $cuota) - pago->currentEstado->tipoEstadoPago->descripcion, ['anulado', 'reemplazado'])) - class="disabled" - @endif > - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + +
    #FechaFecha ISOBancoIdentificadorValorValor UFEstadoFecha EstadoFecha Estado ISO
    {{$cuota->numero}}{{$cuota->pago->fecha->format('d-m-Y')}}{{$cuota->pago->fecha->format('Y-m-d')}}{{$cuota->pago->banco->nombre}}{{$cuota->pago->identificador}}{{$format->pesos($cuota->pago->valor)}} - @if ($cuota->pago->currentEstado->tipoEstadoPago->descripcion === 'abonado' and $cuota->pago->currentEstado->fecha <= $now) - {{$format->ufs($cuota->pago->valor())}} - @endif - pago->currentEstado->tipoEstadoPago->descripcion === 'abonado') - class="green" - @elseif ($cuota->pago->currentEstado->tipoEstadoPago->descripcion === 'depositado') - class="yellow" - @elseif ($cuota->pago->currentEstado->tipoEstadoPago->activo !== 1) - class="red" - @endif - >{{ucwords($cuota->pago->currentEstado->tipoEstadoPago->descripcion)}} - @if (in_array($cuota->pago->currentEstado->tipoEstadoPago->descripcion, ['abonado', 'anulado', 'reemplazado'])) - {{$cuota->pago->currentEstado->fecha->format('d-m-Y')}} - @elseif (!in_array($cuota->pago->currentEstado->tipoEstadoPago->descripcion, ['anulado', 'reemplazado'])) -
    -
    - - - - @if ($cuota->pago->currentEstado->tipoEstadoPago->descripcion === 'depositado') - - @endif -
    -
    - @endif -     		{{$cuota->pago->currentEstado->fecha->format('Y-m-d')}} - @if ($cuota->pago->currentEstado->tipoEstadoPago->descripcion !== 'anulado') - +@section('venta_subtitle') + Cuotas - Pie +@endsection + +@section('venta_content') + + + + + + + + + + + + + + + + + @php + $now = new DateTimeImmutable(); + $uf_venta = $venta->uf === 0.0 ? $UF->get($venta->currentEstado()->fecha) : $venta->uf; + @endphp + @foreach ($venta->formaPago()->pie->cuotas() as $cuota) + pago->currentEstado->tipoEstadoPago->descripcion, ['anulado', 'reemplazado'])) + class="disabled" + @endif > + + + + + + + - - @endforeach - - - - - - - + + + + + - - - - - - - - - - - - - - - -
    #FechaFecha ISOBancoIdentificadorValorValor UFEstadoFecha EstadoFecha Estado ISO
    {{$cuota->numero}}{{$cuota->pago->fecha->format('d-m-Y')}}{{$cuota->pago->fecha->format('Y-m-d')}}{{$cuota->pago->banco->nombre}}{{$cuota->pago->identificador}}{{$format->pesos($cuota->pago->valor)}} + @if ($cuota->pago->currentEstado->tipoEstadoPago->descripcion === 'abonado' and $cuota->pago->currentEstado->fecha <= $now) + {{$format->ufs($cuota->pago->valor())}} @endif -
    TOTAL - {{$format->pesos($total_pesos = array_reduce($venta->formaPago()->pie->cuotas(), - function(float $sum, Incoviba\Model\Venta\Cuota $cuota) { - return $sum + $cuota->pago->valor; - }, 0))}} - - {{$format->ufs($total = array_reduce($venta->formaPago()->pie->cuotas(), - function(float $sum, Incoviba\Model\Venta\Cuota $cuota) use ($now, $uf_venta) { - return $sum + (($cuota->pago->fecha > $now or $cuota->pago->uf === null) ? - $cuota->pago->valor / $uf_venta : - $cuota->pago->valor()); - }, 0.0))}} - pago->currentEstado->tipoEstadoPago->descripcion === 'abonado') + class="green" + @elseif ($cuota->pago->currentEstado->tipoEstadoPago->descripcion === 'depositado') + class="yellow" + @elseif ($cuota->pago->currentEstado->tipoEstadoPago->activo !== 1) + class="red" + @endif + >{{ucwords($cuota->pago->currentEstado->tipoEstadoPago->descripcion)}} + @if (in_array($cuota->pago->currentEstado->tipoEstadoPago->descripcion, ['abonado', 'anulado', 'reemplazado'])) + {{$cuota->pago->currentEstado->fecha->format('d-m-Y')}} + @elseif (!in_array($cuota->pago->currentEstado->tipoEstadoPago->descripcion, ['anulado', 'reemplazado'])) +
    +
    + + + + @if ($cuota->pago->currentEstado->tipoEstadoPago->descripcion === 'depositado') + + @endif +
    +
    + @endif +     		{{$cuota->pago->currentEstado->fecha->format('Y-m-d')}} + @if ($cuota->pago->currentEstado->tipoEstadoPago->descripcion !== 'anulado') + + @endif +
    TOTAL PAGADO - {{$format->pesos($pagado_pesos = array_reduce($venta->formaPago()->pie->cuotas(true), - function(int $sum, Incoviba\Model\Venta\Cuota $cuota) { - return $sum + $cuota->pago->valor; - }, 0))}} - - {{$format->ufs($pagado = array_reduce($venta->formaPago()->pie->cuotas(true), - function(float $sum, Incoviba\Model\Venta\Cuota $cuota) { - return $sum + $cuota->pago->valor(); - }, 0.0))}} - - {{$format->number($pagado / $total * 100, 2)}}% -
    POR PAGAR - {{$format->pesos($total_pesos - $pagado_pesos)}} - - {{$format->ufs($total - $pagado)}} - - {{$format->number(($total - $pagado) / $total * 100, 2)}}% -
    - + @endforeach +
    TOTAL + {{$format->pesos($total_pesos = array_reduce($venta->formaPago()->pie->cuotas(), + function(float $sum, Incoviba\Model\Venta\Cuota $cuota) { + return $sum + $cuota->pago->valor; + }, 0))}} + + {{$format->ufs($total = array_reduce($venta->formaPago()->pie->cuotas(), + function(float $sum, Incoviba\Model\Venta\Cuota $cuota) use ($now, $uf_venta) { + return $sum + (($cuota->pago->fecha > $now or $cuota->pago->uf === null) ? + $cuota->pago->valor / $uf_venta : + $cuota->pago->valor()); + }, 0.0))}} +
    TOTAL PAGADO + {{$format->pesos($pagado_pesos = array_reduce($venta->formaPago()->pie->cuotas(true), + function(int $sum, Incoviba\Model\Venta\Cuota $cuota) { + return $sum + $cuota->pago->valor; + }, 0))}} + + {{$format->ufs($pagado = array_reduce($venta->formaPago()->pie->cuotas(true), + function(float $sum, Incoviba\Model\Venta\Cuota $cuota) { + return $sum + $cuota->pago->valor(); + }, 0.0))}} + + {{$format->number($pagado / $total * 100, 2)}}% +
    POR PAGAR + {{$format->pesos($total_pesos - $pagado_pesos)}} + + {{$format->ufs($total - $pagado)}} + + {{$format->number(($total - $pagado) / $total * 100, 2)}}% +
    @endsection @include('layout.body.scripts.datatables') diff --git a/app/resources/views/ventas/pies/cuotas/add.blade.php b/app/resources/views/ventas/pies/cuotas/add.blade.php index 95ee90c..2cffa1a 100644 --- a/app/resources/views/ventas/pies/cuotas/add.blade.php +++ b/app/resources/views/ventas/pies/cuotas/add.blade.php @@ -1,93 +1,86 @@ -@extends('layout.base') +@extends('ventas.base') -@section('page_content') -
    -
    -

    -
    -
    {{$venta->proyecto()->descripcion}}
    - {{$venta->propiedad()->summary()}} -
    -

    -
    -

    Agregar Cuotas - Pie

    -
    - - - - - - - - - - - - @for ($i = count($pie->cuotas(vigentes: true)); $i < $pie->cuotas; $i ++) - - - - + + @endfor + + + + + + +
    #FechaBancoIdentificadorValor
    {{$i + 1}} -
    -
    -
    - - -
    -
    - -
    -     		-
    - - -
    Banco
    -
    - @foreach ($bancos as $banco) - @if ($banco->nombre === '') - @continue - @endif -
    {{$banco->nombre}}
    - @endforeach +@section('venta_subtitle') + Agregar Cuotas - Pie +@endsection + +@section('venta_content') + + + + + + + + + + + + + @for ($i = count($pie->cuotas(vigentes: true)); $i < $pie->cuotas; $i ++) + + + - + - + + - - @endfor - - - - - - -
    #FechaBancoIdentificadorValor
    {{$i + 1}} +
    +
    +
    + +
    - -
    		-
    - +
    +     		+
    + + +
    Banco
    +
    + @foreach ($bancos as $banco) + @if ($banco->nombre === '') + @continue + @endif +
    {{$banco->nombre}}
    + @endforeach
    -
    		-
    -
    -
    $
    - -
    - +
    + +     		+
    + +
    +     		+
    +
    +
    $
    +
    -
    - -
    - -
    +
    +
    + +
    + @endsection @include('layout.body.scripts.dayjs') diff --git a/app/resources/views/ventas/pies/edit.blade.php b/app/resources/views/ventas/pies/edit.blade.php index 34c2ca5..db5d4ce 100644 --- a/app/resources/views/ventas/pies/edit.blade.php +++ b/app/resources/views/ventas/pies/edit.blade.php @@ -1,27 +1,24 @@ -@extends('layout.base') +@extends('ventas.base') -@section('page_content') -
    -

    - Pie - - {{$venta->proyecto()->descripcion}} - - {{$venta->propiedad()->summary()}} -

    -
    -
    - -
    - -
    UF
    -
    +@section('venta_subtitle') + Pie +@endsection + +@section('venta_content') + +
    + +
    + +
    UF
    -
    - - -
    - - -
    +
    +
    + + +
    + + @endsection @push('page_scripts') diff --git a/app/resources/views/ventas/show.blade.php b/app/resources/views/ventas/show.blade.php index 95dfb44..ff7d258 100644 --- a/app/resources/views/ventas/show.blade.php +++ b/app/resources/views/ventas/show.blade.php @@ -1,10 +1,39 @@ -@extends('layout.base') +@extends('ventas.base') -@section('page_title') - Venta {{$venta->proyecto()->descripcion}} {{$venta->propiedad()->summary()}} +@php +$showPropietario = true; +@endphp + +@section('venta_content') +
    + @if ($venta->currentEstado()->tipoEstadoVenta->activa) + + Desistir + + + Ceder + + @else +
    + + {{ucwords($venta->currentEstado()->tipoEstadoVenta->descripcion)}} + ( + {{$format->pesos($venta->resciliacion()->valor)}} + ) +
    + @endif +
    +
    + @include('ventas.show.propiedad') + @include('ventas.show.detalle') + @include('ventas.show.forma_pago', ['formaPago' => $venta->formaPago()]) + @include('ventas.show.escritura') + @include('ventas.show.entrega') + @include('ventas.show.comentarios') +
    @endsection -@section('page_content') +{{--@section('page_content')

    @@ -45,4 +74,4 @@ @include('ventas.show.comentarios')

    -@endsection +@endsection--}} From fa11f5b24046ce7ca3729b4de1c7ece1ce8d9daf Mon Sep 17 00:00:00 2001 From: Aldarien Date: Fri, 19 Jan 2024 23:10:20 -0300 Subject: [PATCH 117/163] Cleanup logs, fixed add Venta, fixed search --- app/resources/routes/api/search.php | 2 +- app/resources/routes/api/ventas/unidades.php | 1 + app/resources/views/search.blade.php | 17 +- app/resources/views/ventas/add.blade.php | 31 ++-- app/setup/setups/logs.php | 10 +- app/src/Controller/API/Search.php | 20 +++ app/src/Controller/API/Ventas.php | 28 ++-- app/src/Controller/Search.php | 7 - app/src/Middleware/NotFound.php | 2 +- app/src/Model/Venta.php | 6 +- app/src/Repository/Venta.php | 163 +++++++++++++++---- app/src/Service/Search.php | 13 +- app/src/Service/Venta.php | 25 +-- app/src/Service/Venta/Propiedad.php | 2 +- php-errors.ini | 2 +- 15 files changed, 238 insertions(+), 91 deletions(-) create mode 100644 app/src/Controller/API/Search.php diff --git a/app/resources/routes/api/search.php b/app/resources/routes/api/search.php index 1339a42..e81221f 100644 --- a/app/resources/routes/api/search.php +++ b/app/resources/routes/api/search.php @@ -1,4 +1,4 @@ post('/search', [Search::class, 'query']); diff --git a/app/resources/routes/api/ventas/unidades.php b/app/resources/routes/api/ventas/unidades.php index 693f963..79ae108 100644 --- a/app/resources/routes/api/ventas/unidades.php +++ b/app/resources/routes/api/ventas/unidades.php @@ -8,4 +8,5 @@ $app->group('/unidad/{unidad_id}', function($app) { $app->group('/prorrateo', function($app) { $app->post('[/]', [Unidades::class, 'prorrateo']); }); + $app->get('[/]', [Unidades::class, 'get']); }); diff --git a/app/resources/views/search.blade.php b/app/resources/views/search.blade.php index 8a7b901..0827590 100644 --- a/app/resources/views/search.blade.php +++ b/app/resources/views/search.blade.php @@ -107,9 +107,10 @@ const uri = '{{$urls->api}}/search' this.data = [] return fetchAPI(uri, {method: 'post', body: data}).then(response => { - if (response.ok) { - return response.json() + if (!response) { + return } + return response.json() }).catch(error => { this.draw().clear() this.draw().error(error) @@ -123,7 +124,11 @@ const promises = [] data.results.forEach(row => { if (row.tipo === 'venta') { - promises.push(this.get().venta(row.id).then(json => { + return promises.push(this.get().venta(row.id).then(json => { + if (json.venta === null) { + console.debug(json) + return + } const venta = json.venta progress.progress('increment') const r = new Row({unidad: venta.propiedad.unidades[0], proyecto: venta.proyecto}) @@ -134,7 +139,6 @@ console.error(row) console.error(error) })) - return } promises.push(this.get().unidad(row.id).then(json => { const unidad = json.unidad @@ -164,9 +168,10 @@ venta: id => { const url = '{{$urls->api}}/venta/' + id return fetchAPI(url).then(response => { - if (response.ok) { - return response.json() + if (!response) { + return } + return response.json() }) } } diff --git a/app/resources/views/ventas/add.blade.php b/app/resources/views/ventas/add.blade.php index 00d7c02..dbbee48 100644 --- a/app/resources/views/ventas/add.blade.php +++ b/app/resources/views/ventas/add.blade.php @@ -3,7 +3,7 @@ @section('page_content')

    Nueva Venta

    -
    +
    @@ -686,7 +686,7 @@ $('
    ').addClass('content').append(tipo.charAt(0).toUpperCase() + tipo.slice(1) + ' ').append( unidad.draw(this.unidades[tipo]) ).append( - $('').addClass('ui icon button').attr('type', 'button').attr('data-number', number).append( + $('').addClass('ui basic red icon button').attr('type', 'button').attr('data-number', number).append( $('').addClass('remove icon') ).click(event => { const number = $(event.currentTarget).attr('data-number') @@ -766,7 +766,7 @@ } function showErrors(errors) { - console.debug(errors) + console.error(errors) } $(document).ready(() => { @@ -789,20 +789,21 @@ $('#add_form').submit(event => { event.preventDefault() - const data = new FormData(event.currentTarget) - const uri = $(event.currentTarget).attr('action') - fetch(uri, {method: 'post', body: data}).then(response => { - if (response.ok) { - return response.json() + const body = new FormData(event.currentTarget) + const uri = '{{$urls->api}}/ventas/add' + return fetchAPI(uri, {method: 'post', body}).then(response => { + if (!response) { + return false } - }).then(data => { - if (data.status) { - window.location = '{{$urls->base}}' - return true - } - showErrors(data.errors) + return response.json().then(data => { + if (data.status) { + window.location = '{{$urls->base}}/venta/' + data.venta_id + return true + } + showErrors(data.errors) + return false + }) }) - return false }) }) diff --git a/app/setup/setups/logs.php b/app/setup/setups/logs.php index 046300a..cb17296 100644 --- a/app/setup/setups/logs.php +++ b/app/setup/setups/logs.php @@ -8,12 +8,18 @@ return [ (new Monolog\Handler\RotatingFileHandler('/logs/debug.log', 10)) ->setFormatter(new Monolog\Formatter\LineFormatter(null, null, false, false, true)), Monolog\Level::Debug, - Monolog\Level::Notice + Monolog\Level::Debug + ), + new Monolog\Handler\FilterHandler( + (new Monolog\Handler\RotatingFileHandler('/logs/info.log', 10)) + ->setFormatter(new Monolog\Formatter\LineFormatter(null, null, false, false, true)), + Monolog\Level::Info, + Monolog\Level::Warning, ), new Monolog\Handler\FilterHandler( (new Monolog\Handler\RotatingFileHandler('/logs/error.log', 10)) ->setFormatter(new Monolog\Formatter\LineFormatter(null, null, false, false, true)), - Monolog\Level::Warning, + Monolog\Level::Error, Monolog\Level::Error ), new Monolog\Handler\FilterHandler( diff --git a/app/src/Controller/API/Search.php b/app/src/Controller/API/Search.php new file mode 100644 index 0000000..7770215 --- /dev/null +++ b/app/src/Controller/API/Search.php @@ -0,0 +1,20 @@ +getParsedBody(); + $results = $service->query($data['query'], $data['tipo']); + $output = compact('results'); + return $this->withJson($response, $output); + } +} diff --git a/app/src/Controller/API/Ventas.php b/app/src/Controller/API/Ventas.php index 684ec99..507f405 100644 --- a/app/src/Controller/API/Ventas.php +++ b/app/src/Controller/API/Ventas.php @@ -1,17 +1,19 @@ null + ]; try { $venta = $this->fetchRedis($redisService, $redisKey); $output = compact('venta'); @@ -64,12 +69,7 @@ class Ventas $output = compact('venta'); $this->saveRedis($redisService, $redisKey, $venta); } catch (EmptyResult $exception) { - $output = [ - 'error' => [ - 'code' => $exception->getCode(), - 'message' => str_replace([PHP_EOL, "\r"], [' ', ''], $exception->getMessage()) - ] - ]; + $this->logger->notice($exception); } } return $this->withJson($response, $output); @@ -178,14 +178,20 @@ class Ventas $data = $request->getParsedBody(); $output = [ 'status' => false, + 'venta_id' => null, 'errors' => [] ]; try { $venta = $ventaService->add($data); $this->saveRedis($redisService, "venta:{$venta->id}", $venta); + $output['venta_id'] = $venta->id; $output['status'] = true; - } catch (\Exception $exception) { - $output['errors'] = $exception; + } catch (EmptyResult | PDOException $exception) { + $output['errors'] = [ + 'code' => $exception->getCode(), + 'message' => $exception->getMessage(), + 'stack' => $exception->getTraceAsString() + ]; } return $this->withJson($response, $output); } diff --git a/app/src/Controller/Search.php b/app/src/Controller/Search.php index 94a6a6f..082d713 100644 --- a/app/src/Controller/Search.php +++ b/app/src/Controller/Search.php @@ -13,11 +13,4 @@ class Search $post = $request->getParsedBody() ?? ''; return $view->render($response, 'search', compact('post', 'query', 'tipo')); } - public function query(ServerRequestInterface $request, ResponseInterface $response, Service\Search $service): ResponseInterface - { - $data = $request->getParsedBody(); - $results = $service->query($data['query'], $data['tipo']); - $response->getBody()->write(json_encode(compact('results'))); - return $response->withHeader('Content-Type', 'application/json'); - } } diff --git a/app/src/Middleware/NotFound.php b/app/src/Middleware/NotFound.php index 8971be4..abccf49 100644 --- a/app/src/Middleware/NotFound.php +++ b/app/src/Middleware/NotFound.php @@ -17,7 +17,7 @@ class NotFound try { return $handler->handle($request); } catch (HttpNotFoundException $exception) { - $this->logger->warning($exception); + $this->logger->notice($exception); $response = $this->responseFactory->createResponse(404); if (str_contains($request->getUri()->getPath(), '/api')) { return $response; diff --git a/app/src/Model/Venta.php b/app/src/Model/Venta.php index 50e9bde..4eca125 100644 --- a/app/src/Model/Venta.php +++ b/app/src/Model/Venta.php @@ -19,8 +19,8 @@ class Venta extends Ideal\Model public float $uf; protected ?Pago $resciliacion; - public array $estados; - public Venta\EstadoVenta $currentEstado; + public ?array $estados; + public ?Venta\EstadoVenta $currentEstado; public function propietario(): Venta\Propietario { @@ -63,7 +63,7 @@ class Venta extends Ideal\Model if (!isset($this->estados)) { $this->estados = $this->runFactory('estados'); } - return $this->estados; + return $this->estados ?? []; } public function currentEstado(): ?Venta\EstadoVenta { diff --git a/app/src/Repository/Venta.php b/app/src/Repository/Venta.php index 0476532..34c4fd2 100644 --- a/app/src/Repository/Venta.php +++ b/app/src/Repository/Venta.php @@ -115,13 +115,15 @@ class Venta extends Ideal\Repository ->register('fecha_ingreso', new Implement\Repository\Mapper\DateTime('fecha_ingreso', 'fechaIngreso')) //->register('avalchile') //->register('agente') - ->register('resciliacion', (new Implement\Repository\Mapper()) - ->setFactory((new Implement\Repository\Factory()) - ->setCallable([$this->pagoService, 'getById']) - ->setArgs(['pago_id' => $data['resciliacion']]))) ->register('relacionado', new Implement\Repository\Mapper\Boolean('relacionado')); //->register('promocion') //->register('devolucion'); + if (array_key_exists('resciliacion', $data)) { + $map = $map->register('resciliacion', (new Implement\Repository\Mapper()) + ->setFactory((new Implement\Repository\Factory()) + ->setCallable([$this->pagoService, 'getById']) + ->setArgs(['pago_id' => $data['resciliacion']]))); + } return $this->parseData(new Model\Venta(), $data, $map); } public function save(Define\Model $model): Model\Venta @@ -147,7 +149,17 @@ class Venta extends Ideal\Repository public function fetchByProyecto(int $proyecto_id): array { - $query = "SELECT a.* + $query = $this->connection->getQueryBuilder() + ->select('a.*') + ->from("{$this->getTable()} a") + ->joined('JOIN propiedad_unidad pu ON pu.propiedad = a.propiedad') + ->joined('JOIN unidad ON unidad.id = pu.unidad AND pu.principal = 1') + ->joined('JOIN proyecto_tipo_unidad ptu ON ptu.id = unidad.pt') + ->joined('JOIN (SELECT ev1.* FROM estado_venta ev1 JOIN (SELECT MAX(id) AS id, venta FROM estado_venta GROUP BY venta) ev0 ON ev0.id = ev1.id) ev ON ev.venta = a.id') + ->joined('JOIN tipo_estado_venta tev ON tev.id = ev.estado') + ->where('ptu.proyecto = ? AND tev.activa') + ->group('a.id'); + /*$query = "SELECT a.* FROM `{$this->getTable()}` a JOIN `propiedad_unidad` pu ON pu.`propiedad` = a.`propiedad` JOIN `unidad` ON `unidad`.`id` = pu.`unidad` AND pu.`principal` = 1 @@ -155,12 +167,22 @@ FROM `{$this->getTable()}` a JOIN (SELECT e1.* FROM `estado_venta` e1 JOIN (SELECT MAX(`id`) AS 'id', `venta` FROM `estado_venta` GROUP BY `venta`) e0 ON e0.`id` = e1.`id`) ev ON ev.`venta` = a.`id` JOIN `tipo_estado_venta` tev ON tev.`id` = ev.`estado` WHERE ptu.`proyecto` = ? AND tev.`activa` -GROUP BY a.`id`"; +GROUP BY a.`id`";*/ return $this->fetchMany($query, [$proyecto_id]); } public function fetchIdsByProyecto(int $proyecto_id): array { - $query = "SELECT a.`id` + $query = $this->connection->getQueryBuilder() + ->select('a.id') + ->from("{$this->getTable()} a") + ->joined('JOIN propiedad_unidad pu ON pu.propiedad = a.propiedad') + ->joined('JOIN unidad ON unidad.id = pu.unidad AND unidad.pt') + ->joined('proyecto_tipo_unidad ptu ON ptu.id = unidad.pt') + ->joined('JOIN (SELECT ev1.* FROM estado_venta ev1 JOIN (SELECT MAX(id) AS id, venta FROM estado_venta GROUP BY venta) ev0 ON ev0.id = ev1.id) ev ON ev.venta = a.id') + ->joined('JOIN tipo_estado_venta tev ON tev.id = ev.estado') + ->where('ptu.proyecto = ? AND tev.activa') + ->group('a.id'); + /*$query = "SELECT a.`id` FROM `{$this->getTable()}` a JOIN `propiedad_unidad` pu ON pu.`propiedad` = a.`propiedad` JOIN `unidad` ON `unidad`.`id` = pu.`unidad` AND pu.`principal` = 1 @@ -168,12 +190,22 @@ FROM `{$this->getTable()}` a JOIN (SELECT e1.* FROM `estado_venta` e1 JOIN (SELECT MAX(`id`) AS 'id', `venta` FROM `estado_venta` GROUP BY `venta`) e0 ON e0.`id` = e1.`id`) ev ON ev.`venta` = a.`id` JOIN `tipo_estado_venta` tev ON tev.`id` = ev.`estado` WHERE ptu.`proyecto` = ? AND tev.`activa` -GROUP BY a.`id`"; +GROUP BY a.`id`";*/ return $this->connection->execute($query, [$proyecto_id])->fetchAll(PDO::FETCH_ASSOC); } public function fetchActivaByProyecto(int $proyecto_id): array { - $query = "SELECT a.* + $query = $this->connection->getQueryBuilder() + ->select('a.*') + ->from("{$this->getTable()} a") + ->joined('JOIN `propiedad_unidad` pu ON pu.`propiedad` = a.`propiedad`') + ->joined('JOIN `unidad` ON `unidad`.`id` = pu.`unidad` AND pu.`principal` = 1') + ->joined('JOIN `proyecto_tipo_unidad` ptu ON ptu.`id` = `unidad`.`pt`') + ->joined("JOIN (SELECT e1.* FROM `estado_venta` e1 JOIN (SELECT MAX(`id`) AS 'id', `venta` FROM `estado_venta` GROUP BY `venta`) e0 ON e0.`id` = e1.`id`) ev ON ev.`venta` = a.`id`") + ->joined('JOIN `tipo_estado_venta` tev ON tev.`id` = ev.`estado`') + ->where('WHERE ptu.`proyecto` = ? AND tev.`activa`') + ->group('a.id'); + /*$query = "SELECT a.* FROM `{$this->getTable()}` a JOIN `propiedad_unidad` pu ON pu.`propiedad` = a.`propiedad` JOIN `unidad` ON `unidad`.`id` = pu.`unidad` AND pu.`principal` = 1 @@ -181,12 +213,22 @@ FROM `{$this->getTable()}` a JOIN (SELECT e1.* FROM `estado_venta` e1 JOIN (SELECT MAX(`id`) AS 'id', `venta` FROM `estado_venta` GROUP BY `venta`) e0 ON e0.`id` = e1.`id`) ev ON ev.`venta` = a.`id` JOIN `tipo_estado_venta` tev ON tev.`id` = ev.`estado` WHERE ptu.`proyecto` = ? AND tev.`activa` -GROUP BY a.`id`"; +GROUP BY a.`id`";*/ return $this->fetchMany($query, [$proyecto_id]); } public function fetchByProyectoAndUnidad(string $proyecto_nombre, int $unidad_descripcion): Model\Venta { - $query = "SELECT a.* + $query = $this->connection->getQueryBuilder() + ->select("a.*") + ->from("`{$this->getTable()}` a") + ->joined('JOIN `propiedad_unidad` pu ON pu.`propiedad` = a.`propiedad`') + ->joined('JOIN `unidad` ON `unidad`.`id` = pu.`unidad` AND pu.`principal` = 1') + ->joined('JOIN `proyecto_tipo_unidad` ptu ON ptu.`id` = `unidad`.`pt`') + ->joined('JOIN `proyecto` ON `proyecto`.`id` = ptu.`proyecto`') + ->joined("JOIN (SELECT e1.* FROM `estado_venta` e1 JOIN (SELECT MAX(`id`) AS 'id', `venta` FROM `estado_venta` GROUP BY `venta`) e0 ON e0.`id` = e1.`id`) ev ON ev.`venta` = a.`id`") + ->joined('JOIN `tipo_estado_venta` tev ON tev.`id` = ev.`estado`') + ->where('WHERE `proyecto`.`descripcion` = ? AND `unidad`.`descripcion` = ? AND tev.`activa`'); + /*$query = "SELECT a.* FROM `{$this->getTable()}` a JOIN `propiedad_unidad` pu ON pu.`propiedad` = a.`propiedad` JOIN `unidad` ON `unidad`.`id` = pu.`unidad` AND pu.`principal` = 1 @@ -194,82 +236,147 @@ FROM `{$this->getTable()}` a JOIN `proyecto` ON `proyecto`.`id` = ptu.`proyecto` JOIN (SELECT e1.* FROM `estado_venta` e1 JOIN (SELECT MAX(`id`) AS 'id', `venta` FROM `estado_venta` GROUP BY `venta`) e0 ON e0.`id` = e1.`id`) ev ON ev.`venta` = a.`id` JOIN `tipo_estado_venta` tev ON tev.`id` = ev.`estado` -WHERE `proyecto`.`descripcion` = ? AND `unidad`.`descripcion` = ? AND tev.`activa`"; +WHERE `proyecto`.`descripcion` = ? AND `unidad`.`descripcion` = ? AND tev.`activa`";*/ return $this->fetchOne($query, [$proyecto_nombre, $unidad_descripcion]); } public function fetchByPie(int $pie_id): Model\Venta { - $query = "SELECT * FROM `{$this->getTable()}` WHERE `pie` = ?"; + $query = $this->connection->getQueryBuilder() + ->select() + ->from($this->getTable()) + ->where('pie = ?'); return $this->fetchOne($query, [$pie_id]); } public function fetchIdByPie(int $pie_id): array { - $query = "SELECT `id` FROM `{$this->getTable()}` WHERE `pie` = ?"; + $query = $this->connection->getQueryBuilder() + ->select('id') + ->from($this->getTable()) + ->where('pie = ?'); return $this->connection->execute($query, [$pie_id])->fetch(PDO::FETCH_ASSOC); } public function fetchByUnidad(string $unidad, string $tipo): array { - $query = "SELECT a.* + $query = $this->connection->getQueryBuilder() + ->select('a.*') + ->from("{$this->getTable()} a") + ->joined('JOIN `propiedad_unidad` pu ON pu.`propiedad` = a.`propiedad`') + ->joined('JOIN `unidad` ON `unidad`.`id` = pu.`unidad`') + ->joined('JOIN `proyecto_tipo_unidad` ptu ON ptu.`id` = `unidad`.`pt`') + ->joined('JOIN `tipo_unidad` tu ON tu.`id` = ptu.`tipo`') + ->where('`unidad`.`descripcion` LIKE ? AND tu.`descripcion` = ?'); + /*$query = "SELECT a.* FROM `{$this->getTable()}` a JOIN `propiedad_unidad` pu ON pu.`propiedad` = a.`propiedad` JOIN `unidad` ON `unidad`.`id` = pu.`unidad` JOIN `proyecto_tipo_unidad` ptu ON ptu.`id` = `unidad`.`pt` JOIN `tipo_unidad` tu ON tu.`id` = ptu.`tipo` -WHERE `unidad`.`descripcion` LIKE ? AND tu.`descripcion` = ?"; +WHERE `unidad`.`descripcion` LIKE ? AND tu.`descripcion` = ?";*/ return $this->fetchMany($query, [$unidad, $tipo]); } public function fetchIdsByUnidad(string $unidad, string $tipo): array { - $query = "SELECT a.id + $query = $this->connection->getQueryBuilder() + ->select('a.id') + ->from("{$this->getTable()} a") + ->joined('JOIN `propiedad_unidad` pu ON pu.`propiedad` = a.`propiedad`') + ->joined('JOIN `unidad` ON `unidad`.`id` = pu.`unidad`') + ->joined('JOIN `proyecto_tipo_unidad` ptu ON ptu.`id` = `unidad`.`pt`') + ->joined('JOIN `tipo_unidad` tu ON tu.`id` = ptu.`tipo`') + ->where('`unidad`.`descripcion` LIKE ? AND tu.`descripcion` = ?'); + /*$query = "SELECT a.id FROM `{$this->getTable()}` a JOIN `propiedad_unidad` pu ON pu.`propiedad` = a.`propiedad` JOIN `unidad` ON `unidad`.`id` = pu.`unidad` JOIN `proyecto_tipo_unidad` ptu ON ptu.`id` = `unidad`.`pt` JOIN `tipo_unidad` tu ON tu.`id` = ptu.`tipo` -WHERE `unidad`.`descripcion` LIKE ? AND tu.`descripcion` = ?"; +WHERE `unidad`.`descripcion` LIKE ? AND tu.`descripcion` = ?";*/ return $this->connection->execute($query, [$unidad, $tipo])->fetchAll(PDO::FETCH_ASSOC); } public function fetchByPrecio(string $precio): array { - $query = "SELECT * FROM `{$this->getTable()}` WHERE `valor_uf` = ?"; + $query = $this->connection->getQueryBuilder() + ->select() + ->from($this->getTable()) + ->where('valor_uf = ?'); return $this->fetchMany($query, [$precio]); } public function fetchIdsByPrecio(string $precio): array { - $query = "SELECT `id` FROM `{$this->getTable()}` WHERE `valor_uf` = ?"; + $query = $this->connection->getQueryBuilder() + ->select('id') + ->from($this->getTable()) + ->where('valor_uf = ?'); return $this->connection->execute($query, [$precio])->fetchAll(PDO::FETCH_ASSOC); } + public function fetchByPropietarioAndPropiedad(int $propietario_rut, int $propiedad_id): Model\Venta + { + $query = $this->connection->getQueryBuilder() + ->select() + ->from($this->getTable()) + ->where('propietario = ? AND propiedad = ?'); + return $this->fetchOne($query, [$propietario_rut, $propiedad_id]); + } public function fetchByPropietario(string $propietario): array { - $query = "SELECT a.* + $query = $this->connection->getQueryBuilder() + ->select('a.*') + ->from("{$this->getTable()} a") + ->joined('JOIN `propietario` ON `propietario`.`rut` = a.`propietario`') + ->where("CONCAT_WS('-', `propietario`.`rut`, `propietario`.`dv`) LIKE :propietario OR `propietario`.`nombres` LIKE :propietario + OR `propietario`.`apellido_paterno` LIKE :propietario OR `propietario`.`apellido_materno` LIKE :propietario + OR CONCAT_WS(' ', `propietario`.`nombres`, `propietario`.`apellido_paterno`, `propietario`.`apellido_materno`) LIKE :propietario"); + /*$query = "SELECT a.* FROM `{$this->getTable()}` a JOIN `propietario` ON `propietario`.`rut` = a.`propietario` WHERE CONCAT_WS('-', `propietario`.`rut`, `propietario`.`dv`) LIKE :propietario OR `propietario`.`nombres` LIKE :propietario OR `propietario`.`apellido_paterno` LIKE :propietario OR `propietario`.`apellido_materno` LIKE :propietario - OR CONCAT_WS(' ', `propietario`.`nombres`, `propietario`.`apellido_paterno`, `propietario`.`apellido_materno`) LIKE :propietario"; + OR CONCAT_WS(' ', `propietario`.`nombres`, `propietario`.`apellido_paterno`, `propietario`.`apellido_materno`) LIKE :propietario";*/ return $this->fetchMany($query, [':propietario' => "%{$propietario}%"]); } public function fetchIdsByPropietario(string $propietario): array { - $query = "SELECT a.id + $query = $this->connection->getQueryBuilder() + ->select('a.id') + ->from("{$this->getTable()} a") + ->joined('JOIN `propietario` ON `propietario`.`rut` = a.`propietario`') + ->where("CONCAT_WS('-', `propietario`.`rut`, `propietario`.`dv`) LIKE :propietario OR `propietario`.`nombres` LIKE :propietario + OR `propietario`.`apellido_paterno` LIKE :propietario OR `propietario`.`apellido_materno` LIKE :propietario + OR CONCAT_WS(' ', `propietario`.`nombres`, `propietario`.`apellido_paterno`, `propietario`.`apellido_materno`) LIKE :propietario"); + /*$query = "SELECT a.id FROM `{$this->getTable()}` a JOIN `propietario` ON `propietario`.`rut` = a.`propietario` WHERE CONCAT_WS('-', `propietario`.`rut`, `propietario`.`dv`) LIKE :propietario OR `propietario`.`nombres` LIKE :propietario OR `propietario`.`apellido_paterno` LIKE :propietario OR `propietario`.`apellido_materno` LIKE :propietario - OR CONCAT_WS(' ', `propietario`.`nombres`, `propietario`.`apellido_paterno`, `propietario`.`apellido_materno`) LIKE :propietario"; + OR CONCAT_WS(' ', `propietario`.`nombres`, `propietario`.`apellido_paterno`, `propietario`.`apellido_materno`) LIKE :propietario";*/ return $this->connection->execute($query, [':propietario' => "%{$propietario}%"])->fetchAll(PDO::FETCH_ASSOC); } public function fetchByPropietarioNombreCompleto(string $propietario): array { - $query = "SELECT a.* + $query = $this->connection->getQueryBuilder() + ->select('a.*') + ->from("{$this->getTable()} a") + ->joined('JOIN `propietario` ON `propietario`.`rut` = a.`propietario`') + ->where("CONCAT_WS(' ', `propietario`.`nombres`, `propietario`.`apellido_paterno`, `propietario`.`apellido_materno`) LIKE ?"); + /*$query = "SELECT a.* FROM `{$this->getTable()}` a JOIN `propietario` ON `propietario`.`rut` = a.`propietario` -WHERE CONCAT_WS(' ', `propietario`.`nombres`, `propietario`.`apellido_paterno`, `propietario`.`apellido_materno`) LIKE ?"; +WHERE CONCAT_WS(' ', `propietario`.`nombres`, `propietario`.`apellido_paterno`, `propietario`.`apellido_materno`) LIKE ?";*/ return $this->fetchMany($query, [$propietario]); } public function fetchEscriturasByProyecto(int $proyecto_id): array { - $query = "SELECT DISTINCT a.* + $query = $this->connection->getQueryBuilder() + ->select('DISTINCT a.*') + ->from("{$this->getTable()} a") + ->joined('JOIN `propiedad_unidad` pu ON pu.`propiedad` = a.`propiedad`') + ->joined('JOIN `unidad` ON `unidad`.`id` = pu.`unidad`') + ->joined('JOIN `proyecto_tipo_unidad` ptu ON ptu.`id` = `unidad`.`id`') + ->joined("JOIN (SELECT e1.* FROM `estado_venta` e1 JOIN (SELECT MAX(`id`) AS 'id', `venta` FROM `estado_venta` GROUP BY `venta`) e0 ON e0.`id` = e1.`id`) ev ON ev.`venta` = a.`id`") + ->joined('JOIN `tipo_estado_venta` tev ON tev.`id` = ev.`estado`') + ->where("ptu.`proyecto` = ? AND tev.`descripcion` IN ('firmado por inmobiliaria', 'escriturando')") + ->group('a.id'); + /*$query = "SELECT DISTINCT a.* FROM `{$this->getTable()}` a JOIN `propiedad_unidad` pu ON pu.`propiedad` = a.`propiedad` JOIN `unidad` ON `unidad`.`id` = pu.`unidad` @@ -277,7 +384,7 @@ FROM `{$this->getTable()}` a JOIN (SELECT e1.* FROM `estado_venta` e1 JOIN (SELECT MAX(`id`) AS 'id', `venta` FROM `estado_venta` GROUP BY `venta`) e0 ON e0.`id` = e1.`id`) ev ON ev.`venta` = a.`id` JOIN `tipo_estado_venta` tev ON tev.`id` = ev.`estado` WHERE ptu.`proyecto` = ? AND tev.`descripcion` IN ('firmado por inmobiliaria', 'escriturando') -GROUP BY a.`id`"; +GROUP BY a.`id`";*/ return $this->fetchMany($query, [$proyecto_id]); } public function fetchIdByEscritura(int $escritura_id): array diff --git a/app/src/Service/Search.php b/app/src/Service/Search.php index 0132c28..9d58d4b 100644 --- a/app/src/Service/Search.php +++ b/app/src/Service/Search.php @@ -65,7 +65,11 @@ class Search foreach ($queries as $q) { $this->add($results, $this->findVentas($q, $tipo)); if (in_array($tipo, $tiposUnidades)) { - $this->add($results, $this->findUnidadesDisponibles($q, $tipo), false); + $disponibles = $this->findUnidadesDisponibles($q, $tipo); + if (count($disponibles) === 0) { + continue; + } + $this->add($results, $disponibles, false); } } return $results; @@ -281,11 +285,10 @@ class Search protected function add(array &$results, array $found, bool $is_venta = true): void { foreach ($found as $item) { + if (!isset($item['tipo'])) { + $item['tipo'] = ($is_venta) ? 'venta' : 'unidad'; + } if (!$this->inResults($item, $results)) { - $item['tipo'] = 'venta'; - if (!$is_venta) { - $item['tipo'] = 'unidad'; - } $results []= $item; } } diff --git a/app/src/Service/Venta.php b/app/src/Service/Venta.php index be79d78..9697d0d 100644 --- a/app/src/Service/Venta.php +++ b/app/src/Service/Venta.php @@ -100,17 +100,22 @@ class Venta $venta_data[$field] = $forma_pago->{$name}->id; } } - $venta = $this->ventaRepository->create($venta_data); - $venta = $this->ventaRepository->save($venta); - $tipoEstado = $this->tipoEstadoVentaRepository->fetchByDescripcion('vigente'); - $estado = $this->estadoVentaRepository->create([ - 'venta' => $venta->id, - 'estado' => $tipoEstado->id, - 'fecha' => $venta->fecha->format('Y-m-d') - ]); - $this->estadoVentaRepository->save($estado); + try { + return $this->ventaRepository->fetchByPropietarioAndPropiedad($propietario->rut, $propiedad->id); + } catch (Implement\Exception\EmptyResult) { + $venta = $this->ventaRepository->create($venta_data); + $venta = $this->ventaRepository->save($venta); - return $venta; + $tipoEstado = $this->tipoEstadoVentaRepository->fetchByDescripcion('vigente'); + $estado = $this->estadoVentaRepository->create([ + 'venta' => $venta->id, + 'estado' => $tipoEstado->id, + 'fecha' => $venta->fecha->format('Y-m-d') + ]); + $this->estadoVentaRepository->save($estado); + + return $venta; + } } protected function addPropietario(array $data): Model\Venta\Propietario { diff --git a/app/src/Service/Venta/Propiedad.php b/app/src/Service/Venta/Propiedad.php index 7de58ba..58788c3 100644 --- a/app/src/Service/Venta/Propiedad.php +++ b/app/src/Service/Venta/Propiedad.php @@ -78,7 +78,7 @@ class Propiedad if (count($diff) === 0) { return; } - $query = "DELECT FROM `propiedad_unidad` WHERE `propiedad` = ? AND `unidad` = ?"; + $query = "DELETE FROM `propiedad_unidad` WHERE `propiedad` = ? AND `unidad` = ?"; $statement = $this->connection->prepare($query); foreach ($diff as $id) { $statement->execute([$propiedad->id, $id]); diff --git a/php-errors.ini b/php-errors.ini index aed1ffb..511b6ac 100644 --- a/php-errors.ini +++ b/php-errors.ini @@ -1,3 +1,3 @@ display_errors=no log_errors=yes -error_log=/logs/errors.log +#error_log=/logs/errors.log From c1792907c0fb1e601b078e57a19cfe591d59346d Mon Sep 17 00:00:00 2001 From: Aldarien Date: Fri, 19 Jan 2024 23:12:13 -0300 Subject: [PATCH 118/163] Basic Controller and Service --- app/common/Ideal/Controller.php | 9 +++++++++ app/common/Ideal/Service.php | 9 +++++++++ 2 files changed, 18 insertions(+) create mode 100644 app/common/Ideal/Controller.php create mode 100644 app/common/Ideal/Service.php diff --git a/app/common/Ideal/Controller.php b/app/common/Ideal/Controller.php new file mode 100644 index 0000000..1d00c9e --- /dev/null +++ b/app/common/Ideal/Controller.php @@ -0,0 +1,9 @@ + Date: Fri, 19 Jan 2024 23:27:06 -0300 Subject: [PATCH 119/163] Base Log cli --- cli/setup/middlewares/98_logs.php | 2 ++ cli/setup/setups/logs.php | 11 ++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 cli/setup/middlewares/98_logs.php diff --git a/cli/setup/middlewares/98_logs.php b/cli/setup/middlewares/98_logs.php new file mode 100644 index 0000000..b81e521 --- /dev/null +++ b/cli/setup/middlewares/98_logs.php @@ -0,0 +1,2 @@ +getContainer()->get(Psr\Log\LoggerInterface::class)); diff --git a/cli/setup/setups/logs.php b/cli/setup/setups/logs.php index 046300a..ec4195f 100644 --- a/cli/setup/setups/logs.php +++ b/cli/setup/setups/logs.php @@ -8,12 +8,18 @@ return [ (new Monolog\Handler\RotatingFileHandler('/logs/debug.log', 10)) ->setFormatter(new Monolog\Formatter\LineFormatter(null, null, false, false, true)), Monolog\Level::Debug, - Monolog\Level::Notice + Monolog\Level::Debug + ), + new Monolog\Handler\FilterHandler( + (new Monolog\Handler\RotatingFileHandler('/logs/info.log', 10)) + ->setFormatter(new Monolog\Formatter\LineFormatter(null, null, false, false, true)), + Monolog\Level::Info, + Monolog\Level::Warning, ), new Monolog\Handler\FilterHandler( (new Monolog\Handler\RotatingFileHandler('/logs/error.log', 10)) ->setFormatter(new Monolog\Formatter\LineFormatter(null, null, false, false, true)), - Monolog\Level::Warning, + Monolog\Level::Error, Monolog\Level::Error ), new Monolog\Handler\FilterHandler( @@ -23,7 +29,6 @@ return [ ) ], [ $container->get(Monolog\Processor\PsrLogMessageProcessor::class), - $container->get(Monolog\Processor\WebProcessor::class), $container->get(Monolog\Processor\IntrospectionProcessor::class), $container->get(Monolog\Processor\MemoryUsageProcessor::class), $container->get(Monolog\Processor\MemoryPeakUsageProcessor::class) From 9d7857621e7126c892aa7578abd8cc04332ec789 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Mon, 22 Jan 2024 12:10:16 -0300 Subject: [PATCH 120/163] FIX: findPago sin numero --- app/src/Repository/Venta.php | 37 ++++++++++++++++++++++++++---------- app/src/Service/Search.php | 15 +++++++++------ 2 files changed, 36 insertions(+), 16 deletions(-) diff --git a/app/src/Repository/Venta.php b/app/src/Repository/Venta.php index 34c4fd2..08f28bc 100644 --- a/app/src/Repository/Venta.php +++ b/app/src/Repository/Venta.php @@ -177,7 +177,7 @@ GROUP BY a.`id`";*/ ->from("{$this->getTable()} a") ->joined('JOIN propiedad_unidad pu ON pu.propiedad = a.propiedad') ->joined('JOIN unidad ON unidad.id = pu.unidad AND unidad.pt') - ->joined('proyecto_tipo_unidad ptu ON ptu.id = unidad.pt') + ->joined('JOIN proyecto_tipo_unidad ptu ON ptu.id = unidad.pt') ->joined('JOIN (SELECT ev1.* FROM estado_venta ev1 JOIN (SELECT MAX(id) AS id, venta FROM estado_venta GROUP BY venta) ev0 ON ev0.id = ev1.id) ev ON ev.venta = a.id') ->joined('JOIN tipo_estado_venta tev ON tev.id = ev.estado') ->where('ptu.proyecto = ? AND tev.activa') @@ -191,7 +191,7 @@ FROM `{$this->getTable()}` a JOIN `tipo_estado_venta` tev ON tev.`id` = ev.`estado` WHERE ptu.`proyecto` = ? AND tev.`activa` GROUP BY a.`id`";*/ - return $this->connection->execute($query, [$proyecto_id])->fetchAll(PDO::FETCH_ASSOC); + return $this->fetchIds($query, [$proyecto_id]); } public function fetchActivaByProyecto(int $proyecto_id): array { @@ -253,7 +253,7 @@ WHERE `proyecto`.`descripcion` = ? AND `unidad`.`descripcion` = ? AND tev.`activ ->select('id') ->from($this->getTable()) ->where('pie = ?'); - return $this->connection->execute($query, [$pie_id])->fetch(PDO::FETCH_ASSOC); + return $this->fetchId($query, [$pie_id]); } public function fetchByUnidad(string $unidad, string $tipo): array { @@ -291,7 +291,7 @@ FROM `{$this->getTable()}` a JOIN `proyecto_tipo_unidad` ptu ON ptu.`id` = `unidad`.`pt` JOIN `tipo_unidad` tu ON tu.`id` = ptu.`tipo` WHERE `unidad`.`descripcion` LIKE ? AND tu.`descripcion` = ?";*/ - return $this->connection->execute($query, [$unidad, $tipo])->fetchAll(PDO::FETCH_ASSOC); + return $this->fetchIds($query, [$unidad, $tipo]); } public function fetchByPrecio(string $precio): array { @@ -307,7 +307,7 @@ WHERE `unidad`.`descripcion` LIKE ? AND tu.`descripcion` = ?";*/ ->select('id') ->from($this->getTable()) ->where('valor_uf = ?'); - return $this->connection->execute($query, [$precio])->fetchAll(PDO::FETCH_ASSOC); + return $this->fetchIds($query, [$precio]); } public function fetchByPropietarioAndPropiedad(int $propietario_rut, int $propiedad_id): Model\Venta { @@ -349,7 +349,7 @@ FROM `{$this->getTable()}` a WHERE CONCAT_WS('-', `propietario`.`rut`, `propietario`.`dv`) LIKE :propietario OR `propietario`.`nombres` LIKE :propietario OR `propietario`.`apellido_paterno` LIKE :propietario OR `propietario`.`apellido_materno` LIKE :propietario OR CONCAT_WS(' ', `propietario`.`nombres`, `propietario`.`apellido_paterno`, `propietario`.`apellido_materno`) LIKE :propietario";*/ - return $this->connection->execute($query, [':propietario' => "%{$propietario}%"])->fetchAll(PDO::FETCH_ASSOC); + return $this->fetchIds($query, [':propietario' => "%{$propietario}%"]); } public function fetchByPropietarioNombreCompleto(string $propietario): array { @@ -393,7 +393,7 @@ GROUP BY a.`id`";*/ ->select('id') ->from($this->getTable()) ->where('escritura = ?'); - return $this->connection->execute($query, [$escritura_id])->fetch(PDO::FETCH_ASSOC); + return $this->fetchId($query, [$escritura_id]); } public function fetchIdBySubsidio(int $subsidio_id): array { @@ -401,7 +401,7 @@ GROUP BY a.`id`";*/ ->select('id') ->from($this->getTable()) ->where('subsidio = ?'); - return $this->connection->execute($query, [$subsidio_id])->fetch(PDO::FETCH_ASSOC); + return $this->fetchId($query, [$subsidio_id]); } public function fetchIdByCredito(int $credito_id): array { @@ -409,7 +409,7 @@ GROUP BY a.`id`";*/ ->select('id') ->from($this->getTable()) ->where('credito = ?'); - return $this->connection->execute($query, [$credito_id])->fetch(PDO::FETCH_ASSOC); + return $this->fetchId($query, [$credito_id]); } public function fetchIdByBono(int $bono_id): array { @@ -417,6 +417,23 @@ GROUP BY a.`id`";*/ ->select('id') ->from($this->getTable()) ->where('bono_pie = ?'); - return $this->connection->execute($query, [$bono_id])->fetch(PDO::FETCH_ASSOC); + return $this->fetchId($query, [$bono_id]); + } + + protected function fetchIds(string $query, ?array $data = null): array + { + $results = $this->connection->execute($query, $data)->fetchAll(PDO::FETCH_ASSOC); + if ($results === false) { + throw new Implement\Exception\EmptyResult($query); + } + return $results; + } + protected function fetchId(string $query, ?array $data = null): array + { + $results = $this->connection->execute($query, $data)->fetch(PDO::FETCH_ASSOC); + if ($results === false) { + throw new Implement\Exception\EmptyResult($query); + } + return $results; } } diff --git a/app/src/Service/Search.php b/app/src/Service/Search.php index 9d58d4b..3fcfee9 100644 --- a/app/src/Service/Search.php +++ b/app/src/Service/Search.php @@ -142,6 +142,9 @@ class Search } protected function findPago(string $query): array { + if ($query != 0) { + return []; + } $methods = [ 'findPie', 'findEscritura', @@ -152,7 +155,7 @@ class Search $valor = str_replace(['$', '.', ','], ['', '', '.'], $query); $pagos = []; try { - $pagos = $this->pagoRepository->fetchByValue($valor); + $pagos = $this->pagoRepository->fetchByValue((int) $valor); } catch (EmptyResult) {} $results = []; foreach ($methods as $method) { @@ -164,7 +167,7 @@ class Search { $results = []; try { - $pies = $this->pieRepository->fetchByValue($query); + $pies = $this->pieRepository->fetchByValue((float) $query); foreach ($pies as $pie) { try { $this->add($results, [$this->ventaRepository->fetchIdByPie($pie->id)]); @@ -180,7 +183,7 @@ class Search $results = []; foreach ($pagos as $pago) { try { - $pie = $this->pieRepository->fetchByReajuste($pago->id); + $pie = $this->pieRepository->fetchByReajuste((int) $pago->id); $this->add($results, [$this->ventaRepository->fetchIdByPie($pie->id)]); } catch (EmptyResult) {} } @@ -201,7 +204,7 @@ class Search { $results = []; try { - $escrituras = $this->escrituraRepository->fetchByValue($query); + $escrituras = $this->escrituraRepository->fetchByValue((int) $query); foreach ($escrituras as $escritura) { try { $this->add($results, [$this->ventaRepository->fetchIdByEscritura($escritura->id)]); @@ -231,7 +234,7 @@ class Search { $results = []; try { - $creditos = $this->creditoRepository->fetchByValue($query); + $creditos = $this->creditoRepository->fetchByValue((int) $query); foreach ($creditos as $credito) { try { $this->add($results, [$this->ventaRepository->fetchIdByCredito($credito->id)]); @@ -256,7 +259,7 @@ class Search { $results = []; try { - $bonos = $this->bonoPieRepository->fetchByValue($query); + $bonos = $this->bonoPieRepository->fetchByValue((float) $query); foreach ($bonos as $bono) { try { $this->add($results, [$this->ventaRepository->fetchIdByBono($bono->id)]); From 5b5a0ed1f5c6f5c25f4899a8977786b36769d537 Mon Sep 17 00:00:00 2001 From: Juan Pablo Vial Date: Tue, 23 Jan 2024 20:07:34 -0300 Subject: [PATCH 121/163] FIX: Link a buscar propietario --- app/resources/views/search.blade.php | 6 +++--- app/setup/setups/database.php | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/resources/views/search.blade.php b/app/resources/views/search.blade.php index 0827590..e150ff8 100644 --- a/app/resources/views/search.blade.php +++ b/app/resources/views/search.blade.php @@ -56,7 +56,7 @@ unidad.html(unidad.html() + ' (I)') } propietario = $('') - .attr('href','{{$urls->base}}/search/' + encodeURIComponent(this.venta.propietario.nombre_completo) + '/propietario') + .attr('href','{{$urls->base}}/search/"' + encodeURIComponent(this.venta.propietario.nombre_completo) + '"/propietario') .html(this.venta.propietario.nombre_completo) fecha = dateFormatter.format(new Date(this.venta.fecha)) if (typeof this.venta.entrega !== 'undefined') { @@ -315,9 +315,9 @@ $('#tipo').dropdown().dropdown('set selected', '*') @if (trim($post) !== '') - $("[name='query']").val('{{$post}}') + $("[name='query']").val('{!! $post !!}') @elseif (trim($query) !== '') - $("[name='query']").val('{{$query}}') + $("[name='query']").val('{!! $query !!}') @endif @if (trim($tipo) !== '') $('#tipo').dropdown('set selected', '{{$tipo}}') diff --git a/app/setup/setups/database.php b/app/setup/setups/database.php index 5ef8d8f..cdea0d2 100644 --- a/app/setup/setups/database.php +++ b/app/setup/setups/database.php @@ -4,10 +4,10 @@ use Psr\Container\ContainerInterface; return [ Incoviba\Common\Define\Database::class => function(ContainerInterface $container) { return new Incoviba\Common\Implement\Database\MySQL( - $container->has('MYSQL_HOST') ? $container->get('MYSQL_HOST') : 'db', - $container->get('MYSQL_DATABASE'), - $container->get('MYSQL_USER'), - $container->get('MYSQL_PASSWORD') + $container->has('DB_HOST') ? $container->get('DB_HOST') : 'db', + $container->get('DB_DATABASE'), + $container->get('DB_USER'), + $container->get('DB_PASSWORD') ); }, Incoviba\Common\Define\Connection::class => function(ContainerInterface $container) { From ac6c5b7d3d3315d607e5c863193c46295c87d7fb Mon Sep 17 00:00:00 2001 From: Juan Pablo Vial Date: Tue, 23 Jan 2024 20:18:02 -0300 Subject: [PATCH 122/163] FIX: activar busqueda cuando tiene query definido --- app/resources/views/search.blade.php | 2 ++ docker-compose.yml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/resources/views/search.blade.php b/app/resources/views/search.blade.php index e150ff8..a1edf69 100644 --- a/app/resources/views/search.blade.php +++ b/app/resources/views/search.blade.php @@ -316,8 +316,10 @@ $('#tipo').dropdown().dropdown('set selected', '*') @if (trim($post) !== '') $("[name='query']").val('{!! $post !!}') + this.get().results() @elseif (trim($query) !== '') $("[name='query']").val('{!! $query !!}') + this.get().results() @endif @if (trim($tipo) !== '') $('#tipo').dropdown('set selected', '{{$tipo}}') diff --git a/docker-compose.yml b/docker-compose.yml index e73d660..ca32980 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -25,7 +25,7 @@ services: <<: *restart env_file: - ${APP_PATH:-.}/.env - - ${APP_PATH:-.}/.db.env +# - ${APP_PATH:-.}/.db.env - ./.key.env #- ${APP_PATH:-.}/.remote.env volumes: From 62edca53359633858db7ceaf20342ee0f05d61e6 Mon Sep 17 00:00:00 2001 From: Juan Pablo Vial Date: Tue, 23 Jan 2024 20:41:52 -0300 Subject: [PATCH 123/163] Simplify set post or query --- app/resources/views/search.blade.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/app/resources/views/search.blade.php b/app/resources/views/search.blade.php index a1edf69..7bd41b6 100644 --- a/app/resources/views/search.blade.php +++ b/app/resources/views/search.blade.php @@ -309,17 +309,23 @@ } } }, + set: function() { + return { + query: value => { + $("[name='query']").val(value) + this.get().results() + } + } + }, setup: function(id) { this.id = id this.get().results() $('#tipo').dropdown().dropdown('set selected', '*') @if (trim($post) !== '') - $("[name='query']").val('{!! $post !!}') - this.get().results() + this.set().query('{!! $post !!}') @elseif (trim($query) !== '') - $("[name='query']").val('{!! $query !!}') - this.get().results() + this.set().query('{!! $query !!}') @endif @if (trim($tipo) !== '') $('#tipo').dropdown('set selected', '{{$tipo}}') From ad3285efd9c452cbc80e50b7dc7a11abb4940021 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Tue, 30 Jan 2024 12:07:43 -0300 Subject: [PATCH 124/163] FIX: find ventas por proyecto y unidad --- app/resources/views/ventas/list.blade.php | 1 + app/src/Repository/Venta.php | 70 +---------------------- 2 files changed, 3 insertions(+), 68 deletions(-) diff --git a/app/resources/views/ventas/list.blade.php b/app/resources/views/ventas/list.blade.php index d4ebaed..b4dd7b0 100644 --- a/app/resources/views/ventas/list.blade.php +++ b/app/resources/views/ventas/list.blade.php @@ -234,6 +234,7 @@ this.table = new DataTable(table, { order: [[0, 'asc']], + pageLength: 50 }) }, table: () => { diff --git a/app/src/Repository/Venta.php b/app/src/Repository/Venta.php index 08f28bc..c4aa63b 100644 --- a/app/src/Repository/Venta.php +++ b/app/src/Repository/Venta.php @@ -182,15 +182,6 @@ GROUP BY a.`id`";*/ ->joined('JOIN tipo_estado_venta tev ON tev.id = ev.estado') ->where('ptu.proyecto = ? AND tev.activa') ->group('a.id'); - /*$query = "SELECT a.`id` -FROM `{$this->getTable()}` a - JOIN `propiedad_unidad` pu ON pu.`propiedad` = a.`propiedad` - JOIN `unidad` ON `unidad`.`id` = pu.`unidad` AND pu.`principal` = 1 - JOIN `proyecto_tipo_unidad` ptu ON ptu.`id` = `unidad`.`pt` - JOIN (SELECT e1.* FROM `estado_venta` e1 JOIN (SELECT MAX(`id`) AS 'id', `venta` FROM `estado_venta` GROUP BY `venta`) e0 ON e0.`id` = e1.`id`) ev ON ev.`venta` = a.`id` - JOIN `tipo_estado_venta` tev ON tev.`id` = ev.`estado` -WHERE ptu.`proyecto` = ? AND tev.`activa` -GROUP BY a.`id`";*/ return $this->fetchIds($query, [$proyecto_id]); } public function fetchActivaByProyecto(int $proyecto_id): array @@ -203,17 +194,8 @@ GROUP BY a.`id`";*/ ->joined('JOIN `proyecto_tipo_unidad` ptu ON ptu.`id` = `unidad`.`pt`') ->joined("JOIN (SELECT e1.* FROM `estado_venta` e1 JOIN (SELECT MAX(`id`) AS 'id', `venta` FROM `estado_venta` GROUP BY `venta`) e0 ON e0.`id` = e1.`id`) ev ON ev.`venta` = a.`id`") ->joined('JOIN `tipo_estado_venta` tev ON tev.`id` = ev.`estado`') - ->where('WHERE ptu.`proyecto` = ? AND tev.`activa`') + ->where('ptu.`proyecto` = ? AND tev.`activa`') ->group('a.id'); - /*$query = "SELECT a.* -FROM `{$this->getTable()}` a - JOIN `propiedad_unidad` pu ON pu.`propiedad` = a.`propiedad` - JOIN `unidad` ON `unidad`.`id` = pu.`unidad` AND pu.`principal` = 1 - JOIN `proyecto_tipo_unidad` ptu ON ptu.`id` = `unidad`.`pt` - JOIN (SELECT e1.* FROM `estado_venta` e1 JOIN (SELECT MAX(`id`) AS 'id', `venta` FROM `estado_venta` GROUP BY `venta`) e0 ON e0.`id` = e1.`id`) ev ON ev.`venta` = a.`id` - JOIN `tipo_estado_venta` tev ON tev.`id` = ev.`estado` -WHERE ptu.`proyecto` = ? AND tev.`activa` -GROUP BY a.`id`";*/ return $this->fetchMany($query, [$proyecto_id]); } public function fetchByProyectoAndUnidad(string $proyecto_nombre, int $unidad_descripcion): Model\Venta @@ -227,16 +209,7 @@ GROUP BY a.`id`";*/ ->joined('JOIN `proyecto` ON `proyecto`.`id` = ptu.`proyecto`') ->joined("JOIN (SELECT e1.* FROM `estado_venta` e1 JOIN (SELECT MAX(`id`) AS 'id', `venta` FROM `estado_venta` GROUP BY `venta`) e0 ON e0.`id` = e1.`id`) ev ON ev.`venta` = a.`id`") ->joined('JOIN `tipo_estado_venta` tev ON tev.`id` = ev.`estado`') - ->where('WHERE `proyecto`.`descripcion` = ? AND `unidad`.`descripcion` = ? AND tev.`activa`'); - /*$query = "SELECT a.* -FROM `{$this->getTable()}` a - JOIN `propiedad_unidad` pu ON pu.`propiedad` = a.`propiedad` - JOIN `unidad` ON `unidad`.`id` = pu.`unidad` AND pu.`principal` = 1 - JOIN `proyecto_tipo_unidad` ptu ON ptu.`id` = `unidad`.`pt` - JOIN `proyecto` ON `proyecto`.`id` = ptu.`proyecto` - JOIN (SELECT e1.* FROM `estado_venta` e1 JOIN (SELECT MAX(`id`) AS 'id', `venta` FROM `estado_venta` GROUP BY `venta`) e0 ON e0.`id` = e1.`id`) ev ON ev.`venta` = a.`id` - JOIN `tipo_estado_venta` tev ON tev.`id` = ev.`estado` -WHERE `proyecto`.`descripcion` = ? AND `unidad`.`descripcion` = ? AND tev.`activa`";*/ + ->where('`proyecto`.`descripcion` = ? AND `unidad`.`descripcion` = ? AND tev.`activa`'); return $this->fetchOne($query, [$proyecto_nombre, $unidad_descripcion]); } public function fetchByPie(int $pie_id): Model\Venta @@ -265,13 +238,6 @@ WHERE `proyecto`.`descripcion` = ? AND `unidad`.`descripcion` = ? AND tev.`activ ->joined('JOIN `proyecto_tipo_unidad` ptu ON ptu.`id` = `unidad`.`pt`') ->joined('JOIN `tipo_unidad` tu ON tu.`id` = ptu.`tipo`') ->where('`unidad`.`descripcion` LIKE ? AND tu.`descripcion` = ?'); - /*$query = "SELECT a.* -FROM `{$this->getTable()}` a - JOIN `propiedad_unidad` pu ON pu.`propiedad` = a.`propiedad` - JOIN `unidad` ON `unidad`.`id` = pu.`unidad` - JOIN `proyecto_tipo_unidad` ptu ON ptu.`id` = `unidad`.`pt` - JOIN `tipo_unidad` tu ON tu.`id` = ptu.`tipo` -WHERE `unidad`.`descripcion` LIKE ? AND tu.`descripcion` = ?";*/ return $this->fetchMany($query, [$unidad, $tipo]); } public function fetchIdsByUnidad(string $unidad, string $tipo): array @@ -284,13 +250,6 @@ WHERE `unidad`.`descripcion` LIKE ? AND tu.`descripcion` = ?";*/ ->joined('JOIN `proyecto_tipo_unidad` ptu ON ptu.`id` = `unidad`.`pt`') ->joined('JOIN `tipo_unidad` tu ON tu.`id` = ptu.`tipo`') ->where('`unidad`.`descripcion` LIKE ? AND tu.`descripcion` = ?'); - /*$query = "SELECT a.id -FROM `{$this->getTable()}` a - JOIN `propiedad_unidad` pu ON pu.`propiedad` = a.`propiedad` - JOIN `unidad` ON `unidad`.`id` = pu.`unidad` - JOIN `proyecto_tipo_unidad` ptu ON ptu.`id` = `unidad`.`pt` - JOIN `tipo_unidad` tu ON tu.`id` = ptu.`tipo` -WHERE `unidad`.`descripcion` LIKE ? AND tu.`descripcion` = ?";*/ return $this->fetchIds($query, [$unidad, $tipo]); } public function fetchByPrecio(string $precio): array @@ -326,12 +285,6 @@ WHERE `unidad`.`descripcion` LIKE ? AND tu.`descripcion` = ?";*/ ->where("CONCAT_WS('-', `propietario`.`rut`, `propietario`.`dv`) LIKE :propietario OR `propietario`.`nombres` LIKE :propietario OR `propietario`.`apellido_paterno` LIKE :propietario OR `propietario`.`apellido_materno` LIKE :propietario OR CONCAT_WS(' ', `propietario`.`nombres`, `propietario`.`apellido_paterno`, `propietario`.`apellido_materno`) LIKE :propietario"); - /*$query = "SELECT a.* -FROM `{$this->getTable()}` a - JOIN `propietario` ON `propietario`.`rut` = a.`propietario` -WHERE CONCAT_WS('-', `propietario`.`rut`, `propietario`.`dv`) LIKE :propietario OR `propietario`.`nombres` LIKE :propietario - OR `propietario`.`apellido_paterno` LIKE :propietario OR `propietario`.`apellido_materno` LIKE :propietario - OR CONCAT_WS(' ', `propietario`.`nombres`, `propietario`.`apellido_paterno`, `propietario`.`apellido_materno`) LIKE :propietario";*/ return $this->fetchMany($query, [':propietario' => "%{$propietario}%"]); } public function fetchIdsByPropietario(string $propietario): array @@ -343,12 +296,6 @@ WHERE CONCAT_WS('-', `propietario`.`rut`, `propietario`.`dv`) LIKE :propietario ->where("CONCAT_WS('-', `propietario`.`rut`, `propietario`.`dv`) LIKE :propietario OR `propietario`.`nombres` LIKE :propietario OR `propietario`.`apellido_paterno` LIKE :propietario OR `propietario`.`apellido_materno` LIKE :propietario OR CONCAT_WS(' ', `propietario`.`nombres`, `propietario`.`apellido_paterno`, `propietario`.`apellido_materno`) LIKE :propietario"); - /*$query = "SELECT a.id -FROM `{$this->getTable()}` a - JOIN `propietario` ON `propietario`.`rut` = a.`propietario` -WHERE CONCAT_WS('-', `propietario`.`rut`, `propietario`.`dv`) LIKE :propietario OR `propietario`.`nombres` LIKE :propietario - OR `propietario`.`apellido_paterno` LIKE :propietario OR `propietario`.`apellido_materno` LIKE :propietario - OR CONCAT_WS(' ', `propietario`.`nombres`, `propietario`.`apellido_paterno`, `propietario`.`apellido_materno`) LIKE :propietario";*/ return $this->fetchIds($query, [':propietario' => "%{$propietario}%"]); } public function fetchByPropietarioNombreCompleto(string $propietario): array @@ -358,10 +305,6 @@ WHERE CONCAT_WS('-', `propietario`.`rut`, `propietario`.`dv`) LIKE :propietario ->from("{$this->getTable()} a") ->joined('JOIN `propietario` ON `propietario`.`rut` = a.`propietario`') ->where("CONCAT_WS(' ', `propietario`.`nombres`, `propietario`.`apellido_paterno`, `propietario`.`apellido_materno`) LIKE ?"); - /*$query = "SELECT a.* -FROM `{$this->getTable()}` a - JOIN `propietario` ON `propietario`.`rut` = a.`propietario` -WHERE CONCAT_WS(' ', `propietario`.`nombres`, `propietario`.`apellido_paterno`, `propietario`.`apellido_materno`) LIKE ?";*/ return $this->fetchMany($query, [$propietario]); } public function fetchEscriturasByProyecto(int $proyecto_id): array @@ -376,15 +319,6 @@ WHERE CONCAT_WS(' ', `propietario`.`nombres`, `propietario`.`apellido_paterno`, ->joined('JOIN `tipo_estado_venta` tev ON tev.`id` = ev.`estado`') ->where("ptu.`proyecto` = ? AND tev.`descripcion` IN ('firmado por inmobiliaria', 'escriturando')") ->group('a.id'); - /*$query = "SELECT DISTINCT a.* -FROM `{$this->getTable()}` a - JOIN `propiedad_unidad` pu ON pu.`propiedad` = a.`propiedad` - JOIN `unidad` ON `unidad`.`id` = pu.`unidad` - JOIN `proyecto_tipo_unidad` ptu ON ptu.`id` = `unidad`.`id` - JOIN (SELECT e1.* FROM `estado_venta` e1 JOIN (SELECT MAX(`id`) AS 'id', `venta` FROM `estado_venta` GROUP BY `venta`) e0 ON e0.`id` = e1.`id`) ev ON ev.`venta` = a.`id` - JOIN `tipo_estado_venta` tev ON tev.`id` = ev.`estado` -WHERE ptu.`proyecto` = ? AND tev.`descripcion` IN ('firmado por inmobiliaria', 'escriturando') -GROUP BY a.`id`";*/ return $this->fetchMany($query, [$proyecto_id]); } public function fetchIdByEscritura(int $escritura_id): array From d8b8787be900b76f1c6ce02b18376c11326e5dfb Mon Sep 17 00:00:00 2001 From: Juan Pablo Vial Date: Wed, 7 Feb 2024 18:35:28 -0300 Subject: [PATCH 125/163] FIX: Find Pago --- app/resources/views/search.blade.php | 2 +- app/src/Service/Search.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/resources/views/search.blade.php b/app/resources/views/search.blade.php index 0827590..3d8f48b 100644 --- a/app/resources/views/search.blade.php +++ b/app/resources/views/search.blade.php @@ -6,7 +6,7 @@
    -
    +
    diff --git a/app/src/Service/Search.php b/app/src/Service/Search.php index 3fcfee9..c077b2b 100644 --- a/app/src/Service/Search.php +++ b/app/src/Service/Search.php @@ -142,7 +142,7 @@ class Search } protected function findPago(string $query): array { - if ($query != 0) { + if ((int) $query === 0) { return []; } $methods = [ @@ -156,6 +156,7 @@ class Search $pagos = []; try { $pagos = $this->pagoRepository->fetchByValue((int) $valor); + error_log(var_export($pagos,true).PHP_EOL,3,'/logs/debug'); } catch (EmptyResult) {} $results = []; foreach ($methods as $method) { From 38962cb9cfd5afed06ccae1280fef471424c9846 Mon Sep 17 00:00:00 2001 From: Juan Pablo Vial Date: Wed, 7 Feb 2024 23:48:31 -0300 Subject: [PATCH 126/163] API Movimientos y cartola diaria --- app/common/Ideal/Cartola/Banco.php | 6 +- .../routes/api/contabilidad/cartolas.php | 3 + app/setup/setups/services.php | 10 +++ app/src/Controller/API/Contabilidad.php | 24 ++++++- app/src/Model/Cartola.php | 26 ++++++++ app/src/Model/Movimiento.php | 29 ++++++++ app/src/Repository/Cartola.php | 60 +++++++++++++++++ app/src/Repository/Inmobiliaria/Cuenta.php | 9 +++ app/src/Repository/Movimiento.php | 64 ++++++++++++++++++ app/src/Service/Cartola/Diaria.php | 66 +++++++++++++++++++ app/src/Service/Cartola/Security.php | 19 ++++-- 11 files changed, 307 insertions(+), 9 deletions(-) create mode 100644 app/src/Model/Cartola.php create mode 100644 app/src/Model/Movimiento.php create mode 100644 app/src/Repository/Cartola.php create mode 100644 app/src/Repository/Movimiento.php create mode 100644 app/src/Service/Cartola/Diaria.php diff --git a/app/common/Ideal/Cartola/Banco.php b/app/common/Ideal/Cartola/Banco.php index 16d88e2..253a952 100644 --- a/app/common/Ideal/Cartola/Banco.php +++ b/app/common/Ideal/Cartola/Banco.php @@ -2,9 +2,10 @@ namespace Incoviba\Common\Ideal\Cartola; use Incoviba\Common\Define; +use Incoviba\Common\Ideal\Service; use Psr\Http\Message\UploadedFileInterface; -abstract class Banco implements Define\Cartola\Banco +abstract class Banco extends Service implements Define\Cartola\Banco { public function process(UploadedFileInterface $file): array { @@ -14,6 +15,9 @@ abstract class Banco implements Define\Cartola\Banco foreach ($data as $row) { $r = []; foreach ($columns as $old => $new) { + if (!isset($row[$old])) { + continue; + } $r[$new] = $row[$old]; } $temp []= $r; diff --git a/app/resources/routes/api/contabilidad/cartolas.php b/app/resources/routes/api/contabilidad/cartolas.php index f81baa7..9f86632 100644 --- a/app/resources/routes/api/contabilidad/cartolas.php +++ b/app/resources/routes/api/contabilidad/cartolas.php @@ -5,5 +5,8 @@ $app->group('/cartolas', function($app) { $app->post('/procesar[/]', [Contabilidad::class, 'procesarCartola']); }); $app->group('/cartola', function($app) { + $app->group('/diaria', function($app) { + $app->post('/procesar[/]', [Contabilidad::class, 'procesarCartolaDiaria']); + }); $app->post('/exportar[/]', [Contabilidad::class, 'exportarCartola']); }); diff --git a/app/setup/setups/services.php b/app/setup/setups/services.php index 485eda8..d998cdd 100644 --- a/app/setup/setups/services.php +++ b/app/setup/setups/services.php @@ -39,6 +39,16 @@ return [ ->register('itau', $container->get(Incoviba\Service\Cartola\Itau::class)) ->register('santander', $container->get(Incoviba\Service\Cartola\Santander::class)); }, + Incoviba\Service\Cartola\Diaria::class => function(ContainerInterface $container) { + return (new Incoviba\Service\Cartola\Diaria( + $container->get(Incoviba\Repository\Inmobiliaria\Cuenta::class), + $container->get(Incoviba\Repository\Movimiento::class), + $container->get(Incoviba\Repository\Cartola::class) + )) + ->register('security', $container->get(Incoviba\Service\Cartola\Security::class)) + ->register('itau', $container->get(Incoviba\Service\Cartola\Itau::class)) + ->register('santander', $container->get(Incoviba\Service\Cartola\Santander::class)); + }, Incoviba\Common\Define\Contabilidad\Exporter::class => function(ContainerInterface $container) { return $container->get(Incoviba\Service\Contabilidad\Exporter\Nubox::class); }, diff --git a/app/src/Controller/API/Contabilidad.php b/app/src/Controller/API/Contabilidad.php index bf35b84..47552ff 100644 --- a/app/src/Controller/API/Contabilidad.php +++ b/app/src/Controller/API/Contabilidad.php @@ -2,13 +2,14 @@ namespace Incoviba\Controller\API; use DateTimeImmutable; +use Incoviba\Common\Ideal\Controller; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Incoviba\Common\Implement\Exception\EmptyResult; use Incoviba\Repository; use Incoviba\Service; -class Contabilidad +class Contabilidad extends Controller { use withJson; @@ -49,4 +50,25 @@ class Contabilidad } catch (EmptyResult) {} return $this->withJson($response, $output); } + public function procesarCartolaDiaria(ServerRequestInterface $request, ResponseInterface $response, + Repository\Inmobiliaria $inmobiliariaRepository, + Repository\Banco $bancoRepository, + Service\Cartola\Diaria $cartolaService): ResponseInterface + { + $body = $request->getParsedBody(); + $output = [ + 'input' => $body, + 'cartola' => [] + ]; + try { + $inmobiliaria = $inmobiliariaRepository->fetchById($body['inmobiliaria_rut']); + $banco = $bancoRepository->fetchById($body['banco_id']); + $fecha = new DateTimeImmutable($body['fecha']); + $file = $request->getUploadedFiles()['file']; + $output['cartola'] = $cartolaService->process($inmobiliaria, $banco, $fecha, $file); + } catch (EmptyResult $exception) { + $this->logger->debug($exception); + } + return $this->withJson($response, $output); + } } diff --git a/app/src/Model/Cartola.php b/app/src/Model/Cartola.php new file mode 100644 index 0000000..49363b6 --- /dev/null +++ b/app/src/Model/Cartola.php @@ -0,0 +1,26 @@ + $this->cuenta->id, + 'fecha' => $this->fecha->format('Y-m-d'), + 'cargos' => $this->cargos, + 'abonos' => $this->abonos, + 'saldo' => $this->saldo + ]); + } +} diff --git a/app/src/Model/Movimiento.php b/app/src/Model/Movimiento.php new file mode 100644 index 0000000..6ca1a36 --- /dev/null +++ b/app/src/Model/Movimiento.php @@ -0,0 +1,29 @@ + $this->cuenta->id, + 'fecha' => $this->fecha->format('Y-m-d'), + 'glosa' => $this->glosa, + 'documento' => $this->documento, + 'cargo' => $this->cargo, + 'abono' => $this->abono, + 'saldo' => $this->saldo + ]); + } +} diff --git a/app/src/Repository/Cartola.php b/app/src/Repository/Cartola.php new file mode 100644 index 0000000..be03b12 --- /dev/null +++ b/app/src/Repository/Cartola.php @@ -0,0 +1,60 @@ +setTable('cartolas'); + } + + public function create(?array $data = null): Model\Cartola + { + $map = (new Implement\Repository\MapperParser(['cargos', 'abonos', 'saldo'])) + ->register('fecha', new Implement\Repository\Mapper\DateTime('fecha')) + ->register('cuenta_id', (new Implement\Repository\Mapper()) + ->setProperty('cuenta') + ->setFunction(function($data) { + return $this->cuentaRepository->fetchById($data['cuenta_id']); + })); + return $this->parseData(new Model\Cartola(), $data, $map); + } + public function save(Define\Model $model): Model\Cartola + { + $model->id = $this->saveNew([ + 'cuenta_id', + 'fecha', + 'cargos', + 'abonos', + 'saldo' + ], [ + $model->cuenta->id, + $model->fecha->format('Y-m-d'), + $model->cargos, + $model->abonos, + $model->saldo + ]); + return $model; + } + public function edit(Define\Model $model, array $new_data): Model\Cartola + { + return $this->update($model, ['cuenta_id', 'fecha', 'cargos', 'abonos', 'saldo'], $new_data); + } + + public function fetchByCuentaAndFecha(int $cuenta_id, DateTimeInterface $fecha): Model\Cartola + { + $query = $this->connection->getQueryBuilder() + ->select() + ->from($this->getTable()) + ->where('cuenta_id = ? AND fecha = ?'); + return $this->fetchOne($query, [$cuenta_id, $fecha->format('Y-m-d')]); + } +} diff --git a/app/src/Repository/Inmobiliaria/Cuenta.php b/app/src/Repository/Inmobiliaria/Cuenta.php index 71e3b5d..5005723 100644 --- a/app/src/Repository/Inmobiliaria/Cuenta.php +++ b/app/src/Repository/Inmobiliaria/Cuenta.php @@ -6,6 +6,7 @@ use Incoviba\Common\Ideal; use Incoviba\Repository; use Incoviba\Model; use Incoviba\Common\Implement; +use PhpParser\Node\Expr\BinaryOp\Mod; class Cuenta extends Ideal\Repository { @@ -49,4 +50,12 @@ class Cuenta extends Ideal\Repository ->where('inmobiliaria = ?'); return $this->fetchMany($query, [$inmobiliaria_rut]); } + public function fetchByInmobiliariaAndBanco(int $inmobiliaria_rut, int $banco_id): Model\Inmobiliaria\Cuenta + { + $query = $this->connection->getQueryBuilder() + ->select() + ->from($this->getTable()) + ->where('inmobiliaria = ? AND banco = ?'); + return $this->fetchOne($query, [$inmobiliaria_rut, $banco_id]); + } } diff --git a/app/src/Repository/Movimiento.php b/app/src/Repository/Movimiento.php new file mode 100644 index 0000000..8e11f06 --- /dev/null +++ b/app/src/Repository/Movimiento.php @@ -0,0 +1,64 @@ +setTable('movimientos'); + } + + 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')) + ->register('cuenta_id', (new Implement\Repository\Mapper()) + ->setProperty('cuenta') + ->setFunction(function($data) { + return $this->cuentaRepository->fetchById($data['cuenta_id']); + }) + ); + return $this->parseData(new Model\Movimiento(), $data, $map); + } + public function save(Define\Model $model): Model\Movimiento + { + $model->id = $this->saveNew([ + 'cuenta_id', + 'fecha', + 'glosa', + 'documento', + 'cargo', + 'abono', + 'saldo' + ], [ + $model->cuenta->id, + $model->fecha->format('Y-m-d'), + $model->glosa, + $model->documento, + $model->cargo, + $model->abono, + $model->saldo + ]); + return $model; + } + 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); + } + + public function fetchByCuentaAndFechaAndMonto(int $cuenta_id, DateTimeInterface $fecha, int $monto): Model\Movimiento + { + $query = $this->connection->getQueryBuilder() + ->select() + ->from($this->getTable()) + ->where('cuenta_id = ? AND fecha = ? AND (cargo = ? OR abono = ?)'); + return $this->fetchOne($query, [$cuenta_id, $fecha->format('Y-m-d'), $monto, $monto]); + } +} diff --git a/app/src/Service/Cartola/Diaria.php b/app/src/Service/Cartola/Diaria.php new file mode 100644 index 0000000..0bff8ec --- /dev/null +++ b/app/src/Service/Cartola/Diaria.php @@ -0,0 +1,66 @@ +bancos[$name] = $banco; + return $this; + } + + public function process(Model\Inmobiliaria $inmobiliaria, Model\Banco $banco, DateTimeInterface $fecha, UploadedFileInterface $file): array + { + $cuenta = $this->cuentaRepository->fetchByInmobiliariaAndBanco($inmobiliaria->rut, $banco->id); + + $ms = $this->bancos[strtolower($banco->nombre)]->process($file); + $ms = array_reverse($ms); + $c = array_shift($ms); + $cargos = 0; + $abonos = 0; + $saldo = $c['saldo']; + + $movimientos = []; + foreach ($ms as $m) { + $m['cuenta_id'] = $cuenta->id; + try { + $movimiento = $this->movimientoRepository->fetchByCuentaAndFechaAndMonto($cuenta->id, new DateTimeImmutable($m['fecha']), $m['cargo'] ?? $m['abono']); + } catch (EmptyResult) { + $movimiento = $this->movimientoRepository->create($m); + $movimiento = $this->movimientoRepository->save($movimiento); + } + $movimientos []= $movimiento; + if ($movimiento->fecha === $fecha) { + $cargos += $movimiento->cargo; + $abonos += $movimiento->abono; + } + $saldo = $m['saldo']; + } + try { + $cartola = $this->cartolaRepository->fetchByCuentaAndFecha($cuenta->id, $fecha); + } catch (EmptyResult) { + $cartola = $this->cartolaRepository->create([ + 'cuenta_id' => $cuenta->id, + 'fecha' => $fecha->format('Y-m-d'), + 'cargos' => $cargos, + 'abonos' => $abonos, + 'saldo' => $saldo + ]); + $cartola = $this->cartolaRepository->save($cartola); + } + return compact('cartola', 'movimientos'); + } +} diff --git a/app/src/Service/Cartola/Security.php b/app/src/Service/Cartola/Security.php index 28323a2..c00861c 100644 --- a/app/src/Service/Cartola/Security.php +++ b/app/src/Service/Cartola/Security.php @@ -24,8 +24,10 @@ class Security extends Banco 'fecha' => 'fecha', 'descripción' => 'glosa', 'número de documentos' => 'documento', + 'nº documento' => 'documento', 'cargos' => 'cargo', - 'abonos' => 'abono' + 'abonos' => 'abono', + 'saldos' => 'saldo' ]; } @@ -33,10 +35,9 @@ class Security extends Banco { $filename = '/tmp/cartola.xls'; $file->moveTo($filename); - $reader = PhpSpreadsheet\IOFactory::createReader('Xls'); - $xlsx = $reader->load($filename); + $xlsx = @PhpSpreadsheet\IOFactory::load($filename); $worksheet = $xlsx->getActiveSheet(); - $rows = $worksheet->getRowIterator(); + $rows = $worksheet->getRowIterator(3); $dataFound = false; $columns = []; $data = []; @@ -44,10 +45,10 @@ class Security extends Banco $cells = $row->getCellIterator(); $rowData = []; foreach ($cells as $cell) { - if ($cell->getColumn() === 'A' and $cell->getCalculatedValue() === "fecha ") { + if ($cell->getColumn() === 'A' and $cell->getCalculatedValue() !== null and strtolower($cell->getCalculatedValue()) === "fecha ") { $cols = $row->getColumnIterator(); foreach ($cols as $col) { - $columns[$col->getColumn()] = trim($col->getCalculatedValue()); + $columns[$col->getColumn()] = trim(strtolower($col->getCalculatedValue()), '  '); } $dataFound = true; break; @@ -62,7 +63,11 @@ class Security extends Banco $col = $columns[$cell->getColumn()]; $value = $cell->getCalculatedValue(); if ($col === 'fecha') { - $value = PhpSpreadsheet\Shared\Date::excelToDateTimeObject($cell->getValue(), 'America/Santiago')->format('Y-m-d'); + if ((int) $cell->getValue() !== $cell->getValue()) { + $value = implode('-', array_reverse(explode('-', $cell->getValue()))); + } else { + $value = PhpSpreadsheet\Shared\Date::excelToDateTimeObject($cell->getValue(), 'America/Santiago')->format('Y-m-d'); + } } $rowData[$col] = $value; } From 1078f4c1880f11d2faa8e8277073a2a07eed3971 Mon Sep 17 00:00:00 2001 From: Juan Pablo Vial Date: Thu, 8 Feb 2024 00:06:29 -0300 Subject: [PATCH 127/163] Simplificacion de Cartola diaria --- app/setup/setups/services.php | 10 +--- app/src/Controller/API/Contabilidad.php | 4 +- app/src/Service/Cartola.php | 54 +++++++++++++++++++- app/src/Service/Cartola/Diaria.php | 66 ------------------------- 4 files changed, 57 insertions(+), 77 deletions(-) delete mode 100644 app/src/Service/Cartola/Diaria.php diff --git a/app/setup/setups/services.php b/app/setup/setups/services.php index d998cdd..fa72cdc 100644 --- a/app/setup/setups/services.php +++ b/app/setup/setups/services.php @@ -33,14 +33,7 @@ return [ Incoviba\Service\Cartola::class => function(ContainerInterface $container) { return (new Incoviba\Service\Cartola( $container->get(Psr\Http\Message\StreamFactoryInterface::class), - $container->get(Incoviba\Common\Define\Contabilidad\Exporter::class) - )) - ->register('security', $container->get(Incoviba\Service\Cartola\Security::class)) - ->register('itau', $container->get(Incoviba\Service\Cartola\Itau::class)) - ->register('santander', $container->get(Incoviba\Service\Cartola\Santander::class)); - }, - Incoviba\Service\Cartola\Diaria::class => function(ContainerInterface $container) { - return (new Incoviba\Service\Cartola\Diaria( + $container->get(Incoviba\Common\Define\Contabilidad\Exporter::class), $container->get(Incoviba\Repository\Inmobiliaria\Cuenta::class), $container->get(Incoviba\Repository\Movimiento::class), $container->get(Incoviba\Repository\Cartola::class) @@ -58,6 +51,7 @@ return [ }, Incoviba\Service\Contabilidad\Nubox::class => function(ContainerInterface $container) { return new Incoviba\Service\Contabilidad\Nubox( + $container->get(Psr\Log\LoggerInterface::class), $container->get(Incoviba\Repository\Nubox::class), $container->get(Incoviba\Service\Redis::class), new GuzzleHttp\Client(), diff --git a/app/src/Controller/API/Contabilidad.php b/app/src/Controller/API/Contabilidad.php index 47552ff..5f8bc56 100644 --- a/app/src/Controller/API/Contabilidad.php +++ b/app/src/Controller/API/Contabilidad.php @@ -53,7 +53,7 @@ class Contabilidad extends Controller public function procesarCartolaDiaria(ServerRequestInterface $request, ResponseInterface $response, Repository\Inmobiliaria $inmobiliariaRepository, Repository\Banco $bancoRepository, - Service\Cartola\Diaria $cartolaService): ResponseInterface + Service\Cartola $cartolaService): ResponseInterface { $body = $request->getParsedBody(); $output = [ @@ -65,7 +65,7 @@ class Contabilidad extends Controller $banco = $bancoRepository->fetchById($body['banco_id']); $fecha = new DateTimeImmutable($body['fecha']); $file = $request->getUploadedFiles()['file']; - $output['cartola'] = $cartolaService->process($inmobiliaria, $banco, $fecha, $file); + $output['cartola'] = $cartolaService->diaria($inmobiliaria, $banco, $fecha, $file); } catch (EmptyResult $exception) { $this->logger->debug($exception); } diff --git a/app/src/Service/Cartola.php b/app/src/Service/Cartola.php index 231ba7a..295ca89 100644 --- a/app/src/Service/Cartola.php +++ b/app/src/Service/Cartola.php @@ -2,15 +2,21 @@ namespace Incoviba\Service; use DateTimeInterface; +use DateTimeImmutable; use Psr\Http\Message\StreamFactoryInterface; use Psr\Http\Message\UploadedFileInterface; 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 { - public function __construct(protected StreamFactoryInterface $streamFactory, protected Exporter $exporter) {} + public function __construct(protected StreamFactoryInterface $streamFactory, protected Exporter $exporter, + protected Repository\Inmobiliaria\Cuenta $cuentaRepository, + protected Repository\Movimiento $movimientoRepository, + protected Repository\Cartola $cartolaRepository) {} protected array $bancos; public function register(string $name, Banco $banco): Cartola @@ -26,4 +32,50 @@ class Cartola { return $this->exporter->export($inmobiliaria, $banco, $mes, $movimientos); } + public function diaria(Model\Inmobiliaria $inmobiliaria, Model\Banco $banco, DateTimeInterface $fecha, UploadedFileInterface $file): array + { + $cuenta = $this->cuentaRepository->fetchByInmobiliariaAndBanco($inmobiliaria->rut, $banco->id); + + $ms = $this->bancos[strtolower($banco->nombre)]->process($file); + $ms = array_reverse($ms); + $c = array_shift($ms); + $cargos = 0; + $abonos = 0; + $saldo = $c['saldo']; + + $movimientos = []; + foreach ($ms as $m) { + $m['cuenta_id'] = $cuenta->id; + try { + $movimiento = $this->movimientoRepository + ->fetchByCuentaAndFechaAndMonto( + $cuenta->id, + new DateTimeImmutable($m['fecha']), + $m['cargo'] ?? $m['abono'] + ); + } catch (Exception\EmptyResult) { + $movimiento = $this->movimientoRepository->create($m); + $movimiento = $this->movimientoRepository->save($movimiento); + } + $movimientos []= $movimiento; + if ($movimiento->fecha === $fecha) { + $cargos += $movimiento->cargo; + $abonos += $movimiento->abono; + } + $saldo = $m['saldo']; + } + try { + $cartola = $this->cartolaRepository->fetchByCuentaAndFecha($cuenta->id, $fecha); + } catch (Exception\EmptyResult) { + $cartola = $this->cartolaRepository->create([ + 'cuenta_id' => $cuenta->id, + 'fecha' => $fecha->format('Y-m-d'), + 'cargos' => $cargos, + 'abonos' => $abonos, + 'saldo' => $saldo + ]); + $cartola = $this->cartolaRepository->save($cartola); + } + return compact('cartola', 'movimientos'); + } } diff --git a/app/src/Service/Cartola/Diaria.php b/app/src/Service/Cartola/Diaria.php deleted file mode 100644 index 0bff8ec..0000000 --- a/app/src/Service/Cartola/Diaria.php +++ /dev/null @@ -1,66 +0,0 @@ -bancos[$name] = $banco; - return $this; - } - - public function process(Model\Inmobiliaria $inmobiliaria, Model\Banco $banco, DateTimeInterface $fecha, UploadedFileInterface $file): array - { - $cuenta = $this->cuentaRepository->fetchByInmobiliariaAndBanco($inmobiliaria->rut, $banco->id); - - $ms = $this->bancos[strtolower($banco->nombre)]->process($file); - $ms = array_reverse($ms); - $c = array_shift($ms); - $cargos = 0; - $abonos = 0; - $saldo = $c['saldo']; - - $movimientos = []; - foreach ($ms as $m) { - $m['cuenta_id'] = $cuenta->id; - try { - $movimiento = $this->movimientoRepository->fetchByCuentaAndFechaAndMonto($cuenta->id, new DateTimeImmutable($m['fecha']), $m['cargo'] ?? $m['abono']); - } catch (EmptyResult) { - $movimiento = $this->movimientoRepository->create($m); - $movimiento = $this->movimientoRepository->save($movimiento); - } - $movimientos []= $movimiento; - if ($movimiento->fecha === $fecha) { - $cargos += $movimiento->cargo; - $abonos += $movimiento->abono; - } - $saldo = $m['saldo']; - } - try { - $cartola = $this->cartolaRepository->fetchByCuentaAndFecha($cuenta->id, $fecha); - } catch (EmptyResult) { - $cartola = $this->cartolaRepository->create([ - 'cuenta_id' => $cuenta->id, - 'fecha' => $fecha->format('Y-m-d'), - 'cargos' => $cargos, - 'abonos' => $abonos, - 'saldo' => $saldo - ]); - $cartola = $this->cartolaRepository->save($cartola); - } - return compact('cartola', 'movimientos'); - } -} From e1eb2c4c5641ff1f13ad576ecd55d5756a9bf03f Mon Sep 17 00:00:00 2001 From: Juan Pablo Vial Date: Thu, 8 Feb 2024 13:04:05 -0300 Subject: [PATCH 128/163] Cleanup --- app/src/Service/Cartola.php | 91 +++++++++++++++++++++++-------------- 1 file changed, 58 insertions(+), 33 deletions(-) diff --git a/app/src/Service/Cartola.php b/app/src/Service/Cartola.php index 295ca89..e870f53 100644 --- a/app/src/Service/Cartola.php +++ b/app/src/Service/Cartola.php @@ -36,46 +36,71 @@ class Cartola { $cuenta = $this->cuentaRepository->fetchByInmobiliariaAndBanco($inmobiliaria->rut, $banco->id); - $ms = $this->bancos[strtolower($banco->nombre)]->process($file); - $ms = array_reverse($ms); - $c = array_shift($ms); - $cargos = 0; - $abonos = 0; - $saldo = $c['saldo']; + $ms = $this->getMovimientosDiarios($banco, $file); + $cartolaData = [ + 'cargos' => 0, + 'abonos' => 0, + 'saldo' => 0 + ]; $movimientos = []; foreach ($ms as $m) { - $m['cuenta_id'] = $cuenta->id; - try { - $movimiento = $this->movimientoRepository - ->fetchByCuentaAndFechaAndMonto( - $cuenta->id, - new DateTimeImmutable($m['fecha']), - $m['cargo'] ?? $m['abono'] - ); - } catch (Exception\EmptyResult) { - $movimiento = $this->movimientoRepository->create($m); - $movimiento = $this->movimientoRepository->save($movimiento); - } + $movimiento = $this->buildMovimiento($cuenta, $m); $movimientos []= $movimiento; + if ($movimiento->fecha === $fecha) { - $cargos += $movimiento->cargo; - $abonos += $movimiento->abono; + $cartolaData['cargos'] += $movimiento->cargo; + $cartolaData['abonos'] += $movimiento->abono; } - $saldo = $m['saldo']; - } - try { - $cartola = $this->cartolaRepository->fetchByCuentaAndFecha($cuenta->id, $fecha); - } catch (Exception\EmptyResult) { - $cartola = $this->cartolaRepository->create([ - 'cuenta_id' => $cuenta->id, - 'fecha' => $fecha->format('Y-m-d'), - 'cargos' => $cargos, - 'abonos' => $abonos, - 'saldo' => $saldo - ]); - $cartola = $this->cartolaRepository->save($cartola); + $cartolaData['saldo'] = $movimiento->saldo; } + $cartola = $this->buildCartola($cuenta, $fecha, $cartolaData); return compact('cartola', 'movimientos'); } + + protected function getMovimientosDiarios(Model\Banco $banco, UploadedFileInterface $file): array + { + $movimientos = $this->bancos[strtolower($banco->nombre)]->process($file); + switch ($banco->nombre) { + case 'security': + $movimientos = $this->processMovimientosDiariosSecurity($movimientos); + break; + case 'itau': + case 'santander': + break; + } + return $movimientos; + } + protected function processMovimientosDiariosSecurity(array $movimientos): array + { + $movimientos = array_reverse($movimientos); + array_shift($movimientos); + return $movimientos; + } + protected function buildCartola(Model\Inmobiliaria\Cuenta $cuenta, DateTimeInterface $fecha, array $data): Model\Cartola + { + try { + return $this->cartolaRepository->fetchByCuentaAndFecha($cuenta->id, $fecha); + } catch (Exception\EmptyResult) { + $data['cuenta_id'] = $cuenta->id; + $data['fecha'] = $fecha->format('Y-m-d'); + $cartola = $this->cartolaRepository->create($data); + return $this->cartolaRepository->save($cartola); + } + } + protected function buildMovimiento(Model\Inmobiliaria\Cuenta $cuenta, array $data): Model\Movimiento + { + try { + return $this->movimientoRepository + ->fetchByCuentaAndFechaAndMonto( + $cuenta->id, + new DateTimeImmutable($data['fecha']), + $data['cargo'] ?? $data['abono'] + ); + } catch (Exception\EmptyResult) { + $data['cuenta_id'] = $cuenta->id; + $movimiento = $this->movimientoRepository->create($data); + return $this->movimientoRepository->save($movimiento); + } + } } From 251dbbe0f0548c35665963b8e74c6f2e846dd73b Mon Sep 17 00:00:00 2001 From: Juan Pablo Vial Date: Sat, 10 Feb 2024 10:37:45 -0300 Subject: [PATCH 129/163] FIX: cron ENV vars --- CLI.Dockerfile | 16 ++++++++++------ cli/bin/incoviba | 5 +++++ cli/crontab | 16 ++++++++-------- docker-compose.yml | 28 ++++++---------------------- 4 files changed, 29 insertions(+), 36 deletions(-) create mode 100644 cli/bin/incoviba diff --git a/CLI.Dockerfile b/CLI.Dockerfile index 44eb32c..447f392 100644 --- a/CLI.Dockerfile +++ b/CLI.Dockerfile @@ -1,16 +1,20 @@ -FROM php:8.2-fpm +FROM php:8.2-cli -ENV TZ "America/Santiago" +ENV TZ "${TZ}" +ENV APP_NAME "${APP_NAME}" +ENV API_URL "${API_URL}" -RUN apt-get update && apt-get install -y --no-install-recommends cron && rm -r /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y --no-install-recommends cron rsyslog nano && rm -r /var/lib/apt/lists/* RUN pecl install xdebug-3.2.2 \ - && docker-php-ext-enable xdebug + && docker-php-ext-enable xdebug \ + && echo "#/bin/bash\nprintenv >> /etc/environment\ncron -f -L 11" > /root/entrypoint && chmod a+x /root/entrypoint COPY ./php-errors.ini /usr/local/etc/php/conf.d/docker-php-errors.ini WORKDIR /code/bin -COPY ./cli/crontab /var/spool/cron/crontabs/root +#COPY --chmod=644 ./cli/crontab /etc/cron.d/cronjob +COPY --chmod=644 ./cli/crontab /var/spool/cron/crontabs/root -CMD ["cron", "-f"] +CMD [ "/root/entrypoint" ] diff --git a/cli/bin/incoviba b/cli/bin/incoviba new file mode 100644 index 0000000..7a750c3 --- /dev/null +++ b/cli/bin/incoviba @@ -0,0 +1,5 @@ +#!/bin/bash + +. /etc/profile + +/usr/local/bin/php /code/bin/index.php "$@" \ No newline at end of file diff --git a/cli/crontab b/cli/crontab index 9296d00..865d38e 100644 --- a/cli/crontab +++ b/cli/crontab @@ -1,8 +1,8 @@ -0 2 * * * php /code/bin/index.php ventas:cuotas:hoy 2>&1 >> /logs/commands -0 2 * * * php /code/bin/index.php ventas:cuotas:pendientes 2>&1 >> /logs/commands -0 2 * * * php /code/bin/index.php ventas:cuotas:vencer 2>&1 >> /logs/commands -0 2 * * * php /code/bin/index.php ventas:cierres:vigentes 2>&1 >> /logs/commands -0 2 * * * php /code/bin/index.php proyectos:activos 2>&1 >> /logs/commands -0 2 * * * php /code/bin/index.php comunas 2>&1 >> /logs/commands -0 2 * * * php /code/bin/index.php money:uf 2>&1 >> /logs/commands -0 2 1 * * php /code/bin/index.php money:ipc 2>&1 >> /logs/commands +0 2 * * * /code/bin/incoviba ventas:cuotas:hoy >> /logs/commands 2>&1 +0 2 * * * /code/bin/incoviba ventas:cuotas:pendientes >> /logs/commands 2>&1 +0 2 * * * /code/bin/incoviba ventas:cuotas:vencer >> /logs/commands 2>&1 +0 2 * * * /code/bin/incoviba ventas:cierres:vigentes >> /logs/commands 2>&1 +0 2 * * * /code/bin/incoviba proyectos:activos >> /logs/commands 2>&1 +0 2 * * * /code/bin/incoviba comunas >> /logs/commands 2>&1 +0 2 * * * /code/bin/incoviba money:uf >> /logs/commands 2>&1 +0 2 1 * * /code/bin/incoviba money:ipc >> /logs/commands 2>&1 diff --git a/docker-compose.yml b/docker-compose.yml index ca32980..866cf6f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,15 +1,10 @@ -version: '3' - -x-restart: &restart - restart: unless-stopped - services: proxy: profiles: - app image: nginx:alpine container_name: incoviba_proxy - <<: *restart + restart: unless-stopped ports: - "${APP_PORT}:80" volumes: @@ -22,12 +17,10 @@ services: - app build: . container_name: incoviba_web - <<: *restart + restart: unless-stopped env_file: - ${APP_PATH:-.}/.env -# - ${APP_PATH:-.}/.db.env - ./.key.env - #- ${APP_PATH:-.}/.remote.env volumes: - ${APP_PATH:-.}/:/code - ./logs/php:/logs @@ -37,7 +30,7 @@ services: - db image: mariadb:latest container_name: incoviba_db - <<: *restart + restart: unless-stopped env_file: ${APP_PATH:-.}/.db.env volumes: - dbdata:/var/lib/mysql @@ -53,22 +46,13 @@ services: - cache image: redis container_name: incoviba_redis - <<: *restart + restart: unless-stopped env_file: ${APP_PATH:-.}/.redis.env volumes: - incoviba_redis:/data ports: - "63790:6379" - python: - profiles: - - python - build: - context: . - dockerfile: Python.Dockerfile - container_name: incoviba_python - <<: *restart - logview: profiles: - log @@ -81,7 +65,7 @@ services: WEB_URL: 'http://provm.cl:8084' WEB_PORT: '8084' volumes: - - "./logs:/logs" + - ./logs:/logs ports: - "8084:80" cli: @@ -91,7 +75,7 @@ services: context: . dockerfile: CLI.Dockerfile container_name: incoviba_cli - <<: *restart + restart: unless-stopped env_file: - ${CLI_PATH:-.}/.env - ./.key.env From e133bd36cff72a4713e93c3bb9ad9fd0872c638a Mon Sep 17 00:00:00 2001 From: Juan Pablo Vial Date: Mon, 12 Feb 2024 09:52:48 -0300 Subject: [PATCH 130/163] Cartola diaria --- .../routes/api/contabilidad/cartolas.php | 9 +- .../routes/contabilidad/cartolas.php | 6 + .../contabilidad/cartolas/diaria.blade.php | 323 ++++++++++++++++++ app/setup/setups/services.php | 1 + app/src/Controller/API/Contabilidad.php | 59 +--- .../Controller/API/Contabilidad/Cartolas.php | 98 ++++++ app/src/Controller/Contabilidad.php | 31 ++ app/src/Service/Cartola.php | 17 +- 8 files changed, 476 insertions(+), 68 deletions(-) create mode 100644 app/resources/routes/contabilidad/cartolas.php create mode 100644 app/resources/views/contabilidad/cartolas/diaria.blade.php create mode 100644 app/src/Controller/API/Contabilidad/Cartolas.php create mode 100644 app/src/Controller/Contabilidad.php diff --git a/app/resources/routes/api/contabilidad/cartolas.php b/app/resources/routes/api/contabilidad/cartolas.php index 9f86632..52cdf3c 100644 --- a/app/resources/routes/api/contabilidad/cartolas.php +++ b/app/resources/routes/api/contabilidad/cartolas.php @@ -1,12 +1,13 @@ group('/cartolas', function($app) { - $app->post('/procesar[/]', [Contabilidad::class, 'procesarCartola']); + $app->post('/procesar[/]', [Cartolas::class, 'procesar']); }); $app->group('/cartola', function($app) { $app->group('/diaria', function($app) { - $app->post('/procesar[/]', [Contabilidad::class, 'procesarCartolaDiaria']); + $app->post('/ayer[/]', [Cartolas::class, 'ayer']); + $app->post('/procesar[/]', [Cartolas::class, 'diaria']); }); - $app->post('/exportar[/]', [Contabilidad::class, 'exportarCartola']); + $app->post('/exportar[/]', [Cartolas::class, 'exportar']); }); diff --git a/app/resources/routes/contabilidad/cartolas.php b/app/resources/routes/contabilidad/cartolas.php new file mode 100644 index 0000000..7bd0058 --- /dev/null +++ b/app/resources/routes/contabilidad/cartolas.php @@ -0,0 +1,6 @@ +group('/cartolas', function($app) { + $app->get('/diaria[/]', [Contabilidad::class, 'diaria']); +}); diff --git a/app/resources/views/contabilidad/cartolas/diaria.blade.php b/app/resources/views/contabilidad/cartolas/diaria.blade.php new file mode 100644 index 0000000..26b4d66 --- /dev/null +++ b/app/resources/views/contabilidad/cartolas/diaria.blade.php @@ -0,0 +1,323 @@ +@extends('layout.base') + +@section('page_content') +
    +

    + Cartola Diaria +

    + +
    +
    + + +
    +
    + + +
    +
    + +
    +
    + + +
    +
    +
    +
    + + + +
    +
    + +
    +
    + +
    +
    +
    +
    +
    + + + + + + + + + + +
    HoyÚltimo SaldoSaldo ActualDiferencia
    +
    +
    + + + + + + + + + + + + + +
    FechaGlosaDocumentoCargoAbonoSaldoOrden
    +
    +@endsection + +@include('layout.head.styles.datatables') +@include('layout.body.scripts.datatables') + +@push('page_scripts') + +@endpush diff --git a/app/setup/setups/services.php b/app/setup/setups/services.php index fa72cdc..d0e986c 100644 --- a/app/setup/setups/services.php +++ b/app/setup/setups/services.php @@ -32,6 +32,7 @@ return [ }, Incoviba\Service\Cartola::class => function(ContainerInterface $container) { return (new Incoviba\Service\Cartola( + $container->get(Psr\Log\LoggerInterface::class), $container->get(Psr\Http\Message\StreamFactoryInterface::class), $container->get(Incoviba\Common\Define\Contabilidad\Exporter::class), $container->get(Incoviba\Repository\Inmobiliaria\Cuenta::class), diff --git a/app/src/Controller/API/Contabilidad.php b/app/src/Controller/API/Contabilidad.php index 5f8bc56..c99ce31 100644 --- a/app/src/Controller/API/Contabilidad.php +++ b/app/src/Controller/API/Contabilidad.php @@ -13,62 +13,5 @@ class Contabilidad extends Controller { use withJson; - public function procesarCartola(ServerRequestInterface $request, ResponseInterface $response, - Repository\Inmobiliaria $inmobiliariaRepository, - Repository\Banco $bancoRepository, - Service\Cartola $cartolaService): ResponseInterface - { - $body = $request->getParsedBody(); - $output = [ - 'input' => $body, - 'movimientos' => [] - ]; - try { - $inmobiliaria = $inmobiliariaRepository->fetchById($body['inmobiliaria']); - $banco = $bancoRepository->fetchById($body['banco']); - $mes = new DateTimeImmutable($body['mes']); - $file = $request->getUploadedFiles()['file']; - $output['movimientos'] = $cartolaService->process($inmobiliaria, $banco, $mes, $file); - } catch (EmptyResult) {} - return $this->withJson($response, $output); - } - public function exportarCartola(ServerRequestInterface $request, ResponseInterface $response, - Repository\Inmobiliaria $inmobiliariaRepository, - Repository\Banco $bancoRepository, - Service\Cartola $cartolaService): ResponseInterface - { - $body = $request->getParsedBody(); - $output = [ - 'input' => $body, - 'filename' => '' - ]; - try { - $inmobiliaria = $inmobiliariaRepository->fetchById($body['inmobiliaria']); - $banco = $bancoRepository->fetchById($body['banco']); - $mes = new DateTimeImmutable($body['mes']); - $output['filename'] = $cartolaService->export($inmobiliaria, $banco, $mes, json_decode($body['movimientos'])); - } catch (EmptyResult) {} - return $this->withJson($response, $output); - } - public function procesarCartolaDiaria(ServerRequestInterface $request, ResponseInterface $response, - Repository\Inmobiliaria $inmobiliariaRepository, - Repository\Banco $bancoRepository, - Service\Cartola $cartolaService): ResponseInterface - { - $body = $request->getParsedBody(); - $output = [ - 'input' => $body, - 'cartola' => [] - ]; - try { - $inmobiliaria = $inmobiliariaRepository->fetchById($body['inmobiliaria_rut']); - $banco = $bancoRepository->fetchById($body['banco_id']); - $fecha = new DateTimeImmutable($body['fecha']); - $file = $request->getUploadedFiles()['file']; - $output['cartola'] = $cartolaService->diaria($inmobiliaria, $banco, $fecha, $file); - } catch (EmptyResult $exception) { - $this->logger->debug($exception); - } - return $this->withJson($response, $output); - } + } diff --git a/app/src/Controller/API/Contabilidad/Cartolas.php b/app/src/Controller/API/Contabilidad/Cartolas.php new file mode 100644 index 0000000..299c011 --- /dev/null +++ b/app/src/Controller/API/Contabilidad/Cartolas.php @@ -0,0 +1,98 @@ +getParsedBody(); + $output = [ + 'input' => $body, + 'movimientos' => [] + ]; + try { + $inmobiliaria = $inmobiliariaRepository->fetchById($body['inmobiliaria']); + $banco = $bancoRepository->fetchById($body['banco']); + $mes = new DateTimeImmutable($body['mes']); + $file = $request->getUploadedFiles()['file']; + $output['movimientos'] = $cartolaService->process($inmobiliaria, $banco, $mes, $file); + } catch (EmptyResult) {} + return $this->withJson($response, $output); + } + public function exportar(ServerRequestInterface $request, ResponseInterface $response, + Repository\Inmobiliaria $inmobiliariaRepository, + Repository\Banco $bancoRepository, + Service\Cartola $cartolaService): ResponseInterface + { + $body = $request->getParsedBody(); + $output = [ + 'input' => $body, + 'filename' => '' + ]; + try { + $inmobiliaria = $inmobiliariaRepository->fetchById($body['inmobiliaria']); + $banco = $bancoRepository->fetchById($body['banco']); + $mes = new DateTimeImmutable($body['mes']); + $output['filename'] = $cartolaService->export($inmobiliaria, $banco, $mes, json_decode($body['movimientos'])); + } catch (EmptyResult) {} + return $this->withJson($response, $output); + } + public function diaria(ServerRequestInterface $request, ResponseInterface $response, + Repository\Inmobiliaria $inmobiliariaRepository, + Repository\Banco $bancoRepository, + Service\Cartola $cartolaService): ResponseInterface + { + $body = $request->getParsedBody(); + $output = [ + 'input' => $body, + 'cartola' => [] + ]; + try { + $inmobiliaria = $inmobiliariaRepository->fetchById($body['inmobiliaria_rut']); + $banco = $bancoRepository->fetchById($body['banco_id']); + $fecha = new DateTimeImmutable($body['fecha']); + $file = $request->getUploadedFiles()['file']; + $output['cartola'] = $cartolaService->diaria($inmobiliaria, $banco, $fecha, $file); + } catch (EmptyResult $exception) { + $this->logger->debug($exception); + } + return $this->withJson($response, $output); + } + public function ayer(ServerRequestInterface $request, ResponseInterface $response, + Repository\Inmobiliaria $inmobiliariaRepository, + Repository\Banco $bancoRepository, + Repository\Inmobiliaria\Cuenta $cuentaRepository, + Repository\Cartola $cartolaRepository): ResponseInterface + { + $body = $request->getParsedBody(); + $output = [ + 'input' => $body, + 'cartola' => [] + ]; + try { + $inmobiliaria = $inmobiliariaRepository->fetchById($body['inmobiliaria_rut']); + $banco = $bancoRepository->fetchById($body['banco_id']); + $cuenta = $cuentaRepository->fetchByInmobiliariaAndBanco($inmobiliaria->rut, $banco->id); + $fecha = new DateTimeImmutable($body['fecha']); + $output['cartola'] = $cartolaRepository->fetchByCuentaAndFecha($cuenta->id, $fecha); + } catch (EmptyResult $exception) { + $this->logger->critical($exception); + } + return $this->withJson($response, $output); + } +} diff --git a/app/src/Controller/Contabilidad.php b/app/src/Controller/Contabilidad.php new file mode 100644 index 0000000..8653d8c --- /dev/null +++ b/app/src/Controller/Contabilidad.php @@ -0,0 +1,31 @@ +fetchRedis($redisService, $redisKey); + } catch (EmptyRedis) { + try { + $inmobiliarias = $inmobiliariaRepository->fetchAll(); + $this->saveRedis($redisService, $redisKey, $inmobiliarias, 30 * 24 * 60 * 60); + } catch (EmptyResult) {} + } + return $view->render($response, 'contabilidad.cartolas.diaria', compact('inmobiliarias')); + } +} diff --git a/app/src/Service/Cartola.php b/app/src/Service/Cartola.php index e870f53..ae7f927 100644 --- a/app/src/Service/Cartola.php +++ b/app/src/Service/Cartola.php @@ -5,18 +5,23 @@ use DateTimeInterface; use DateTimeImmutable; use Psr\Http\Message\StreamFactoryInterface; use Psr\Http\Message\UploadedFileInterface; +use Psr\Log\LoggerInterface; +use Incoviba\Common\Ideal\Service; use Incoviba\Common\Define\Cartola\Banco; use Incoviba\Common\Define\Contabilidad\Exporter; use Incoviba\Common\Implement\Exception; use Incoviba\Model; use Incoviba\Repository; -class Cartola +class Cartola extends Service { - public function __construct(protected StreamFactoryInterface $streamFactory, protected Exporter $exporter, + public function __construct(LoggerInterface $logger, + protected StreamFactoryInterface $streamFactory, protected Exporter $exporter, protected Repository\Inmobiliaria\Cuenta $cuentaRepository, protected Repository\Movimiento $movimientoRepository, - protected Repository\Cartola $cartolaRepository) {} + protected Repository\Cartola $cartolaRepository) { + parent::__construct($logger); + } protected array $bancos; public function register(string $name, Banco $banco): Cartola @@ -46,9 +51,9 @@ class Cartola $movimientos = []; foreach ($ms as $m) { $movimiento = $this->buildMovimiento($cuenta, $m); - $movimientos []= $movimiento; - if ($movimiento->fecha === $fecha) { + if ($movimiento->fecha->getTimestamp() === $fecha->getTimestamp()) { + $movimientos []= $movimiento; $cartolaData['cargos'] += $movimiento->cargo; $cartolaData['abonos'] += $movimiento->abono; } @@ -61,7 +66,7 @@ class Cartola protected function getMovimientosDiarios(Model\Banco $banco, UploadedFileInterface $file): array { $movimientos = $this->bancos[strtolower($banco->nombre)]->process($file); - switch ($banco->nombre) { + switch (strtolower($banco->nombre)) { case 'security': $movimientos = $this->processMovimientosDiariosSecurity($movimientos); break; From a370ffff434f282e5b43e88f27730db5308f26d1 Mon Sep 17 00:00:00 2001 From: Juan Pablo Vial Date: Mon, 12 Feb 2024 09:59:47 -0300 Subject: [PATCH 131/163] Cleanup --- CLI.Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/CLI.Dockerfile b/CLI.Dockerfile index 447f392..87fcff6 100644 --- a/CLI.Dockerfile +++ b/CLI.Dockerfile @@ -14,7 +14,6 @@ COPY ./php-errors.ini /usr/local/etc/php/conf.d/docker-php-errors.ini WORKDIR /code/bin -#COPY --chmod=644 ./cli/crontab /etc/cron.d/cronjob COPY --chmod=644 ./cli/crontab /var/spool/cron/crontabs/root CMD [ "/root/entrypoint" ] From 4738dae7c8dfab92ba4d344dae8b7fd128475e98 Mon Sep 17 00:00:00 2001 From: Juan Pablo Vial Date: Mon, 12 Feb 2024 09:59:15 -0300 Subject: [PATCH 132/163] DAPs API --- app/src/Controller/API/Contabilidad/DAPs.php | 35 +++++++++++++ app/src/Model/DAP.php | 36 +++++++++++++ app/src/Repository/DAP.php | 54 ++++++++++++++++++++ 3 files changed, 125 insertions(+) create mode 100644 app/src/Controller/API/Contabilidad/DAPs.php create mode 100644 app/src/Model/DAP.php create mode 100644 app/src/Repository/DAP.php diff --git a/app/src/Controller/API/Contabilidad/DAPs.php b/app/src/Controller/API/Contabilidad/DAPs.php new file mode 100644 index 0000000..d968318 --- /dev/null +++ b/app/src/Controller/API/Contabilidad/DAPs.php @@ -0,0 +1,35 @@ + $inmobiliaria_rut, + 'daps' => [] + ]; + try { + $inmobiliaria = $inmobiliariaRepository->fetchById($inmobiliaria_rut); + $cuentas = $cuentaRepository->fetchByInmobiliaria($inmobiliaria->rut); + foreach ($cuentas as $cuenta) { + $daps = $dapRepository->fetchByCuenta($cuenta->id); + } + } catch (Implement\Exception\EmptyResult) {} + return $this->withJson($response, $output); + } +} \ No newline at end of file diff --git a/app/src/Model/DAP.php b/app/src/Model/DAP.php new file mode 100644 index 0000000..5e440d4 --- /dev/null +++ b/app/src/Model/DAP.php @@ -0,0 +1,36 @@ +termino->diff($this->inicio)->days; + } + public function interes(): float + { + return ($this->futuro - $this->capital) / $this->capital / $this->periodo() * 365; + } + + public function jsonSerialize(): mixed + { + return array_merge(parent::jsonSerialize(), [ + 'cuenta_id' => $this->cuenta->id, + 'capital' => $this->capital, + 'futuro' => $this->futuro, + 'inicio' => $this->inicio->format('Y-m-d'), + 'termino' => $this->termino->format('Y-m-d'), + 'periodo' => $this->periodo(), + 'interes' => $this->interes() + ]); + } +} \ No newline at end of file diff --git a/app/src/Repository/DAP.php b/app/src/Repository/DAP.php new file mode 100644 index 0000000..8baaf0a --- /dev/null +++ b/app/src/Repository/DAP.php @@ -0,0 +1,54 @@ +setTable('depositos'); + } + + public function create(?array $data = null): Model\DAP + { + $map = (new Implement\Repository\MapperParser(['capital', 'futuro'])) + ->register('cuenta_id', (new Implement\Repository\Mapper()) + ->setProperty('cuenta') + ->setFunction(function(array $data) { + return $this->cuentaRepository->fetchById($data['cuenta_id']); + })) + ->register('inicio', new Implement\Repository\Mapper\DateTime('inicio')) + ->register('termino', new Implement\Repository\Mapper\DateTime('termino')); + return $this->parseData(new Model\DAP(), $data, $map); + } + public function save(Define\Model $model): Model\DAP + { + $model->id = $this->saveNew([ + 'cuenta_id', 'capital', 'futuro', 'inicio', 'termino' + ], [ + $model->cuenta->id, $model->capital, $model->futuro, + $model->inicio->format('Y-m-d'), $model->termino->format('Y-m-d') + ]); + return $model; + } + + public function edit(Define\Model $model, array $new_data): Model\DAP + { + return $this->update($model, ['cuenta_id', 'capital', 'futuro', 'inicio', 'termino'], $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]); + } +} \ No newline at end of file From e44ab30665c53091da7728b8f91375eadc23c83f Mon Sep 17 00:00:00 2001 From: Juan Pablo Vial Date: Tue, 13 Feb 2024 01:16:17 -0300 Subject: [PATCH 133/163] Informe Tesoreria --- .../routes/api/contabilidad/daps.php | 7 + app/resources/routes/contabilidad/daps.php | 6 + .../routes/contabilidad/informes.php | 10 + .../contabilidad/informes/tesoreria.php | 6 + .../views/contabilidad/depositos.blade.php | 235 +++++++++++++++ .../contabilidad/informes/tesoreria.blade.php | 147 ++++++++++ .../body/header/menu/contabilidad.blade.php | 9 + app/setup/setups/services.php | 5 +- app/setup/setups/views.php | 1 + app/src/Controller/API/Contabilidad/DAPs.php | 49 +++- app/src/Controller/Contabilidad.php | 37 ++- app/src/Model/{DAP.php => Deposito.php} | 14 +- app/src/Repository/Cartola.php | 8 + app/src/Repository/{DAP.php => Deposito.php} | 20 +- app/src/Repository/Movimiento.php | 8 + app/src/Service/Cartola.php | 2 + app/src/Service/Contabilidad.php | 20 ++ .../Contabilidad/Informe/Tesoreria.php | 277 ++++++++++++++++++ app/src/Service/Contabilidad/Nubox.php | 19 +- app/src/Service/Format.php | 8 +- app/src/Service/Money.php | 12 + app/src/Service/Money/MiIndicador.php | 2 +- app/src/Service/USD.php | 34 +++ 23 files changed, 896 insertions(+), 40 deletions(-) create mode 100644 app/resources/routes/api/contabilidad/daps.php create mode 100644 app/resources/routes/contabilidad/daps.php create mode 100644 app/resources/routes/contabilidad/informes.php create mode 100644 app/resources/routes/contabilidad/informes/tesoreria.php create mode 100644 app/resources/views/contabilidad/depositos.blade.php create mode 100644 app/resources/views/contabilidad/informes/tesoreria.blade.php rename app/src/Model/{DAP.php => Deposito.php} (77%) rename app/src/Repository/{DAP.php => Deposito.php} (73%) create mode 100644 app/src/Service/Contabilidad.php create mode 100644 app/src/Service/Contabilidad/Informe/Tesoreria.php create mode 100644 app/src/Service/USD.php diff --git a/app/resources/routes/api/contabilidad/daps.php b/app/resources/routes/api/contabilidad/daps.php new file mode 100644 index 0000000..9d929fa --- /dev/null +++ b/app/resources/routes/api/contabilidad/daps.php @@ -0,0 +1,7 @@ +group('/depositos', function($app) { + $app->post('/add[/]', [DAPs::class, 'add']); + $app->get('/inmobiliaria/{inmobiliaria_rut}[/]', [DAPs::class, 'inmobiliaria']); +}); diff --git a/app/resources/routes/contabilidad/daps.php b/app/resources/routes/contabilidad/daps.php new file mode 100644 index 0000000..312c207 --- /dev/null +++ b/app/resources/routes/contabilidad/daps.php @@ -0,0 +1,6 @@ +group('/depositos', function($app) { + $app->get('[/]', [Contabilidad::class, 'depositos']); +}); diff --git a/app/resources/routes/contabilidad/informes.php b/app/resources/routes/contabilidad/informes.php new file mode 100644 index 0000000..66bad08 --- /dev/null +++ b/app/resources/routes/contabilidad/informes.php @@ -0,0 +1,10 @@ +group('/informes', function($app) { + $files = new FilesystemIterator(implode(DIRECTORY_SEPARATOR, [__DIR__, 'informes'])); + foreach ($files as $file) { + if ($file->isDir()) { + continue; + } + include_once $file->getRealPath(); + } +}); diff --git a/app/resources/routes/contabilidad/informes/tesoreria.php b/app/resources/routes/contabilidad/informes/tesoreria.php new file mode 100644 index 0000000..9cbca00 --- /dev/null +++ b/app/resources/routes/contabilidad/informes/tesoreria.php @@ -0,0 +1,6 @@ +group('/tesoreria', function($app) { + $app->get('[/[{fecha}[/]]]', [Contabilidad::class, 'tesoreria']); +}); diff --git a/app/resources/views/contabilidad/depositos.blade.php b/app/resources/views/contabilidad/depositos.blade.php new file mode 100644 index 0000000..d090039 --- /dev/null +++ b/app/resources/views/contabilidad/depositos.blade.php @@ -0,0 +1,235 @@ +@extends('layout.base') + +@section('page_content') +
    +

    Depósitos a Plazo

    + + + + + + + + + + + + + + + + + + @foreach ($depositos as $deposito) + + + + + + + + + + + + + @endforeach + +
    InmobiliariaBancoN° DepósitoCapitalInicioPlazoVencimientoMonto al VencimientoTasa + +
    {{$deposito->cuenta->inmobiliaria->razon}}{{$deposito->cuenta->banco->nombre}}{{$deposito->id}}{{$format->pesos($deposito->capital)}}{{$deposito->inicio->format('d-m-Y')}}{{$deposito->plazo()}}{{$deposito->termino->format('d-m-Y')}}{{$format->pesos($deposito->futuro)}}{{$format->percent($deposito->tasa() * 100, 4)}} + +
    +
    + +@endsection + +@include('layout.head.styles.datatables') +@include('layout.body.scripts.datatables') + +@push('page_scripts') + +@endpush diff --git a/app/resources/views/contabilidad/informes/tesoreria.blade.php b/app/resources/views/contabilidad/informes/tesoreria.blade.php new file mode 100644 index 0000000..d79bf17 --- /dev/null +++ b/app/resources/views/contabilidad/informes/tesoreria.blade.php @@ -0,0 +1,147 @@ +@extends('layout.base') + +@section('page_content') +
    +

    Informe de Tesorería

    +

    {{$fecha->format('d M Y')}}

    +
    +
    +
    + + + + + + + + + +
    Informe anterior{{$anterior->format('d/m/Y')}}
    Informe actual{{$fecha->format('d/m/Y')}}
    +
    +
    +
    + + + + + + + + + +
    Valor UF{{$format->pesos($UF->get($fecha), 2)}}
    Valor Dólar{{$format->pesos($USD->get($fecha), 2)}}
    +
    +
    + + + + + + + + + + + + + + + + + + + + @foreach ($informes['inmobiliarias'] as $inmobiliaria_rut => $informe) + @foreach ($informe->cuentas as $i => $cuenta) + + @if ($i === 0) + + @endif + + + + + + + + + @if ($i === 0) + + + + + @endif + + @endforeach + @endforeach + + + + + + + + + + + + + + + + +
    EMPRESABancoCuentaSaldo AnteriorSaldo ActualDiferenciaFFMMDAPSaldo EmpresaTotal CuentasTotal FFMMTotal DAPCaja Total
    {{$informe->inmobiliaria->razon}}{{$cuenta->banco}}{{$cuenta->numero}}{{$format->pesos($cuenta->anterior)}}{{$format->pesos($cuenta->actual)}}{{$format->pesos($cuenta->diferencia())}}{{$format->pesos($cuenta->ffmm)}}{{$format->pesos($cuenta->deposito)}}{{$format->pesos($cuenta->saldo())}}{{$format->pesos($informe->total())}}{{$format->pesos($informe->ffmm())}}{{$format->pesos($informe->deposito())}}{{$format->pesos($informe->caja())}}
    TOTAL{{$format->pesos($informes['totales']->anterior)}}{{$format->pesos($informes['totales']->actual)}}{{$format->pesos($informes['totales']->diferencia())}}{{$format->pesos($informes['totales']->ffmm)}}{{$format->pesos($informes['totales']->deposito)}}{{$format->pesos($informes['totales']->saldo())}}{{$format->pesos($informes['totales']->cuentas())}}{{$format->pesos($informes['totales']->ffmms())}}{{$format->pesos($informes['totales']->depositos())}}{{$format->pesos($informes['totales']->caja())}}
    + + + + + + + + + + + + + @foreach ($informes['movimientos'] as $tipo => $movimientos) + @if ($tipo === 'capital dap') + @if (count($movimientos['ingresos']) === 0 and count($movimientos['egresos']) === 0) + @continue + @endif + + + + @foreach ($movimientos as $t => $ms) + @foreach ($ms as $movimiento) + + + + + + + + + @endforeach + @endforeach + @continue + @endif + @if (count($movimientos) === 0) + @continue + @endif + + + + @foreach ($movimientos as $movimiento) + + + + + + + + + @endforeach + @endforeach + +
    EMPRESAINGRESOSEGRESOSFECHABANCODESCRIPCIÓN
    {{strtoupper($tipo)}}
    {{$movimiento->cuenta->inmobiliaria->razon}}{{$format->pesos($movimiento->abono)}}{{$format->pesos($movimiento->cargo)}}{{$movimiento->fecha->format('d/m/Y')}}{{$movimiento->cuenta->banco->nombre}}{{$movimiento->glosa}}
    {{strtoupper($tipo)}}
    {{$movimiento->cuenta->inmobiliaria->razon}}{{$format->pesos($movimiento->abono)}}{{$format->pesos($movimiento->cargo)}}{{$movimiento->fecha->format('d/m/Y')}}{{$movimiento->cuenta->banco->nombre}}{{$movimiento->glosa}}
    +@endsection diff --git a/app/resources/views/layout/body/header/menu/contabilidad.blade.php b/app/resources/views/layout/body/header/menu/contabilidad.blade.php index 4962aad..3339500 100644 --- a/app/resources/views/layout/body/header/menu/contabilidad.blade.php +++ b/app/resources/views/layout/body/header/menu/contabilidad.blade.php @@ -2,6 +2,13 @@ Contabilidad
    +
    + + Informes +
    + Tesorería +
    +
    Centros de Costos @@ -9,5 +16,7 @@ Asignar en Cartola
    + Cartola Diaria + Depósitos a Plazo
    diff --git a/app/setup/setups/services.php b/app/setup/setups/services.php index d0e986c..146b6f1 100644 --- a/app/setup/setups/services.php +++ b/app/setup/setups/services.php @@ -20,7 +20,9 @@ return [ $ine = new Incoviba\Service\Money\Ine(new GuzzleHttp\Client([ 'base_uri' => 'https://api-calculadora.ine.cl/ServiciosCalculadoraVariacion' ])); - return (new Incoviba\Service\Money())->register('uf', $mindicador) + return (new Incoviba\Service\Money($container->get(Psr\Log\LoggerInterface::class))) + ->register('uf', $mindicador) + ->register('usd', $mindicador) ->register('ipc', $ine); }, Predis\Client::class => function(ContainerInterface $container) { @@ -35,6 +37,7 @@ return [ $container->get(Psr\Log\LoggerInterface::class), $container->get(Psr\Http\Message\StreamFactoryInterface::class), $container->get(Incoviba\Common\Define\Contabilidad\Exporter::class), + $container->get(Incoviba\Repository\Inmobiliaria::class), $container->get(Incoviba\Repository\Inmobiliaria\Cuenta::class), $container->get(Incoviba\Repository\Movimiento::class), $container->get(Incoviba\Repository\Cartola::class) diff --git a/app/setup/setups/views.php b/app/setup/setups/views.php index 0046530..a502dd4 100644 --- a/app/setup/setups/views.php +++ b/app/setup/setups/views.php @@ -11,6 +11,7 @@ return [ 'format' => $container->get(Incoviba\Service\Format::class), 'API_KEY' => $container->get('API_KEY'), 'UF' => $container->get(Incoviba\Service\UF::class), + 'USD' => $container->get(Incoviba\Service\USD::class), 'IPC' => $container->get(Incoviba\Service\IPC::class) ]; if ($global_variables['login']->isIn()) { diff --git a/app/src/Controller/API/Contabilidad/DAPs.php b/app/src/Controller/API/Contabilidad/DAPs.php index d968318..a7d7a5a 100644 --- a/app/src/Controller/API/Contabilidad/DAPs.php +++ b/app/src/Controller/API/Contabilidad/DAPs.php @@ -1,6 +1,7 @@ $inmobiliaria_rut, - 'daps' => [] + 'depositos' => [] ]; try { $inmobiliaria = $inmobiliariaRepository->fetchById($inmobiliaria_rut); $cuentas = $cuentaRepository->fetchByInmobiliaria($inmobiliaria->rut); foreach ($cuentas as $cuenta) { - $daps = $dapRepository->fetchByCuenta($cuenta->id); + $output['depositos'] = $dapRepository->fetchByCuenta($cuenta->id); } } catch (Implement\Exception\EmptyResult) {} return $this->withJson($response, $output); } -} \ No newline at end of file + public function add(ServerRequestInterface $request, ResponseInterface $response, + Repository\Inmobiliaria $inmobiliariaRepository, Repository\Banco $bancoRepository, + Repository\Inmobiliaria\Cuenta $cuentaRepository, + Repository\Deposito $dapRepository): ResponseInterface + { + $body = $request->getParsedBody(); + $output = [ + 'input' => $body, + 'status' => false + ]; + try { + $inmobiliaria = $inmobiliariaRepository->fetchById($body['inmobiliaria_rut']); + $banco = $bancoRepository->fetchById($body['banco_id']); + $cuenta = $cuentaRepository->fetchByInmobiliariaAndBanco($inmobiliaria->rut, $banco->id); + $data = [ + 'id' => $body['id'], + 'cuenta_id' => $cuenta->id, + 'capital' => $body['capital'], + 'futuro' => $body['futuro'], + 'inicio' => (new DateTimeImmutable($body['inicio']))->format('Y-m-d'), + 'termino' => (new DateTimeImmutable($body['termino']))->format('Y-m-d') + ]; + try { + $dapRepository->fetchById($body['id']); + } catch (Implement\Exception\EmptyResult) { + $dap = $dapRepository->create($data); + $dapRepository->save($dap); + } + $output['status'] = true; + } catch (Implement\Exception\EmptyResult) {} + return $this->withJson($response, $output); + } +} diff --git a/app/src/Controller/Contabilidad.php b/app/src/Controller/Contabilidad.php index 8653d8c..c9bc21e 100644 --- a/app/src/Controller/Contabilidad.php +++ b/app/src/Controller/Contabilidad.php @@ -1,6 +1,9 @@ fetchRedis($redisService, $redisKey); } catch (EmptyRedis) { try { - $inmobiliarias = $inmobiliariaRepository->fetchAll(); + $inmobiliarias = $inmobiliariaRepository->fetchAllActive(); $this->saveRedis($redisService, $redisKey, $inmobiliarias, 30 * 24 * 60 * 60); } catch (EmptyResult) {} } return $view->render($response, 'contabilidad.cartolas.diaria', compact('inmobiliarias')); } + public function depositos(ServerRequestInterface $request, ResponseInterface $response, View $view, + Service\Redis $redisService, + Repository\Inmobiliaria $inmobiliariaRepository, + Repository\Deposito $dapRepository): ResponseInterface + { + $redisKey = 'inmobiliarias'; + $inmobiliarias = []; + try { + $inmobiliarias = $this->fetchRedis($redisService, $redisKey); + } catch (EmptyRedis) { + try { + $inmobiliarias = $inmobiliariaRepository->fetchAllActive(); + $this->saveRedis($redisService, $redisKey, $inmobiliarias, 30 * 24 * 60 * 60); + } catch (EmptyResult) {} + } + $depositos = []; + try { + $depositos = $dapRepository->fetchAll(); + } catch (EmptyResult) {} + return $view->render($response, 'contabilidad.depositos', compact('inmobiliarias', 'depositos')); + } + public function tesoreria(ServerRequestInterface $request, ResponseInterface $response, View $view, + Service\Contabilidad\Informe\Tesoreria $contabilidadService, + string $fecha = 'today'): ResponseInterface + { + $fecha = new DateTimeImmutable($fecha); + $anterior = $contabilidadService->getAnterior($fecha); + $informes = $contabilidadService->build($fecha); + return $view->render($response, 'contabilidad.informes.tesoreria', compact('fecha', 'anterior', 'informes')); + } } diff --git a/app/src/Model/DAP.php b/app/src/Model/Deposito.php similarity index 77% rename from app/src/Model/DAP.php rename to app/src/Model/Deposito.php index 5e440d4..da32727 100644 --- a/app/src/Model/DAP.php +++ b/app/src/Model/Deposito.php @@ -4,7 +4,7 @@ namespace Incoviba\Model; use DateTimeInterface; use Incoviba\Common\Ideal; -class DAP extends Ideal\Model +class Deposito extends Ideal\Model { public Inmobiliaria\Cuenta $cuenta; public int $capital; @@ -12,13 +12,13 @@ class DAP extends Ideal\Model public DateTimeInterface $inicio; public DateTimeInterface $termino; - public function periodo(): int + public function plazo(): int { return $this->termino->diff($this->inicio)->days; } - public function interes(): float + public function tasa(): float { - return ($this->futuro - $this->capital) / $this->capital / $this->periodo() * 365; + return ($this->futuro - $this->capital) / $this->capital; } public function jsonSerialize(): mixed @@ -29,8 +29,8 @@ class DAP extends Ideal\Model 'futuro' => $this->futuro, 'inicio' => $this->inicio->format('Y-m-d'), 'termino' => $this->termino->format('Y-m-d'), - 'periodo' => $this->periodo(), - 'interes' => $this->interes() + 'plazo' => $this->plazo(), + 'tasa' => $this->tasa() ]); } -} \ No newline at end of file +} diff --git a/app/src/Repository/Cartola.php b/app/src/Repository/Cartola.php index be03b12..23e9cc1 100644 --- a/app/src/Repository/Cartola.php +++ b/app/src/Repository/Cartola.php @@ -49,6 +49,14 @@ class Cartola extends Ideal\Repository return $this->update($model, ['cuenta_id', 'fecha', 'cargos', 'abonos', 'saldo'], $new_data); } + public function fetchByFecha(DateTimeInterface $fecha): array + { + $query = $this->connection->getQueryBuilder() + ->select() + ->from($this->getTable()) + ->where('fecha = ?'); + return $this->fetchMany($query, [$fecha->format('Y-m-d')]); + } public function fetchByCuentaAndFecha(int $cuenta_id, DateTimeInterface $fecha): Model\Cartola { $query = $this->connection->getQueryBuilder() diff --git a/app/src/Repository/DAP.php b/app/src/Repository/Deposito.php similarity index 73% rename from app/src/Repository/DAP.php rename to app/src/Repository/Deposito.php index 8baaf0a..c47dd87 100644 --- a/app/src/Repository/DAP.php +++ b/app/src/Repository/Deposito.php @@ -7,7 +7,7 @@ use Incoviba\Common\Implement; use Incoviba\Repository; use Incoviba\Model; -class DAP extends Ideal\Repository +class Deposito extends Ideal\Repository { public function __construct(Define\Connection $connection, protected Repository\Inmobiliaria\Cuenta $cuentaRepository) { @@ -15,9 +15,9 @@ class DAP extends Ideal\Repository $this->setTable('depositos'); } - public function create(?array $data = null): Model\DAP + public function create(?array $data = null): Model\Deposito { - $map = (new Implement\Repository\MapperParser(['capital', 'futuro'])) + $map = (new Implement\Repository\MapperParser(['id', 'capital', 'futuro'])) ->register('cuenta_id', (new Implement\Repository\Mapper()) ->setProperty('cuenta') ->setFunction(function(array $data) { @@ -25,20 +25,20 @@ class DAP extends Ideal\Repository })) ->register('inicio', new Implement\Repository\Mapper\DateTime('inicio')) ->register('termino', new Implement\Repository\Mapper\DateTime('termino')); - return $this->parseData(new Model\DAP(), $data, $map); + return $this->parseData(new Model\Deposito(), $data, $map); } - public function save(Define\Model $model): Model\DAP + public function save(Define\Model $model): Model\Deposito { - $model->id = $this->saveNew([ - 'cuenta_id', 'capital', 'futuro', 'inicio', 'termino' + $this->saveNew([ + 'id', 'cuenta_id', 'capital', 'futuro', 'inicio', 'termino' ], [ - $model->cuenta->id, $model->capital, $model->futuro, + $model->id, $model->cuenta->id, $model->capital, $model->futuro, $model->inicio->format('Y-m-d'), $model->termino->format('Y-m-d') ]); return $model; } - public function edit(Define\Model $model, array $new_data): Model\DAP + public function edit(Define\Model $model, array $new_data): Model\Deposito { return $this->update($model, ['cuenta_id', 'capital', 'futuro', 'inicio', 'termino'], $new_data); } @@ -51,4 +51,4 @@ class DAP extends Ideal\Repository ->where('cuenta_id = ?'); return $this->fetchMany($query, [$cuenta_id]); } -} \ No newline at end of file +} diff --git a/app/src/Repository/Movimiento.php b/app/src/Repository/Movimiento.php index 8e11f06..f74704e 100644 --- a/app/src/Repository/Movimiento.php +++ b/app/src/Repository/Movimiento.php @@ -53,6 +53,14 @@ class Movimiento extends Ideal\Repository return $this->update($model, ['cuenta_id', 'fecha', 'glosa', 'documento', 'cargo', 'abono', 'saldo'], $new_data); } + public function fetchByCuentaAndFecha(int $cuenta_id, DateTimeInterface $fecha): array + { + $query = $this->connection->getQueryBuilder() + ->select() + ->from($this->getTable()) + ->where('cuenta_id = ? AND fecha = ?'); + return $this->fetchMany($query, [$cuenta_id, $fecha->format('Y-m-d')]); + } public function fetchByCuentaAndFechaAndMonto(int $cuenta_id, DateTimeInterface $fecha, int $monto): Model\Movimiento { $query = $this->connection->getQueryBuilder() diff --git a/app/src/Service/Cartola.php b/app/src/Service/Cartola.php index ae7f927..835abfa 100644 --- a/app/src/Service/Cartola.php +++ b/app/src/Service/Cartola.php @@ -3,6 +3,7 @@ namespace Incoviba\Service; use DateTimeInterface; use DateTimeImmutable; +use DateInterval; use Psr\Http\Message\StreamFactoryInterface; use Psr\Http\Message\UploadedFileInterface; use Psr\Log\LoggerInterface; @@ -17,6 +18,7 @@ class Cartola extends Service { public function __construct(LoggerInterface $logger, protected StreamFactoryInterface $streamFactory, protected Exporter $exporter, + protected Repository\Inmobiliaria $inmobiliariaRepository, protected Repository\Inmobiliaria\Cuenta $cuentaRepository, protected Repository\Movimiento $movimientoRepository, protected Repository\Cartola $cartolaRepository) { diff --git a/app/src/Service/Contabilidad.php b/app/src/Service/Contabilidad.php new file mode 100644 index 0000000..a5e87fd --- /dev/null +++ b/app/src/Service/Contabilidad.php @@ -0,0 +1,20 @@ +tesoreriaService->build($fecha); + } +} diff --git a/app/src/Service/Contabilidad/Informe/Tesoreria.php b/app/src/Service/Contabilidad/Informe/Tesoreria.php new file mode 100644 index 0000000..a8f9114 --- /dev/null +++ b/app/src/Service/Contabilidad/Informe/Tesoreria.php @@ -0,0 +1,277 @@ +movimientos = new class() { + public function __construct() + { + $this->dap = new class() + { + public array $ingresos = []; + public array $egresos = []; + }; + } + public object $dap; + public array $ingresos = []; + public array $egresos = []; + + const INGRESOS = 'ingresos'; + const EGRESOS = 'egresos'; + public function addDap(string $tipo, array $movimientos) + { + foreach ($movimientos as $movimiento) { + $this->dap->{$tipo} []= $movimiento; + } + return $this; + } + public function build(): array + { + return [ + 'capital dap' => [ + 'ingresos' => $this->dap->ingresos, + 'egresos' => $this->dap->egresos + ], + 'ingresos' => $this->ingresos, + 'egresos' => $this->egresos + ]; + } + }; + $this->totales = new class() { + public int $anterior = 0; + public int $actual = 0; + public int $ffmm = 0; + public int $deposito = 0; + + public function diferencia(): int + { + return $this->actual - $this->anterior; + } + public function saldo(): int + { + return $this->diferencia() + $this->ffmm + $this->deposito; + } + public function cuentas(): int + { + return $this->actual; + } + public function ffmms(): int + { + return $this->ffmm; + } + public function depositos(): int + { + return $this->deposito; + } + public function caja(): int + { + return $this->cuentas() + $this->ffmms() + $this->depositos(); + } + }; + } + + const DAP_INGRESOS = 'dap->ingresos'; + const DAP_EGRESOS = 'dap->egresos'; + const INGRESOS = 'ingresos'; + const EGRESOS = 'egresos'; + const TOTAL_ANTERIOR = 'anterior'; + const TOTAL_ACTUAL = 'actual'; + const TOTAL_FFMM = 'ffmm'; + const TOTAL_DAP = 'deposito'; + + protected DateTimeInterface $anterior; + protected object $totales; + protected object $movimientos; + + public function getAnterior(DateTimeInterface $fecha): DateTimeInterface + { + if (!isset($this->anterior)) { + $this->anterior = $fecha->sub(new DateInterval('P1D')); + if ($this->anterior->format('N') === '7') { + $this->anterior = $fecha->sub(new DateInterval('P3D')); + } + } + return $this->anterior; + } + public function build(DateTimeInterface $fecha): array + { + try { + $inmobiliarias = $this->inmobiliariaRepository->fetchAllActive(); + } catch (Implement\Exception\EmptyResult) { + return []; + } + $informe = ['inmobiliarias' => []]; + foreach ($inmobiliarias as $inmobiliaria) { + $informe['inmobiliarias'][$inmobiliaria->rut] = $this->buildInmobiliaria($inmobiliaria, $fecha); + } + $informe['movimientos'] = $this->buildMovimientos(); + $informe['totales'] = $this->buildTotales(); + return $informe; + } + + protected function buildInmobiliaria(Model\Inmobiliaria $inmobiliaria, DateTimeInterface $fecha): object + { + $dataInmobiliaria = new class() { + public Model\Inmobiliaria $inmobiliaria; + public array $cuentas = []; + public function total(): int + { + return array_reduce($this->cuentas, function(int $sum, $cuenta) { + return $sum + $cuenta->actual; + }, 0); + } + public function ffmm(): int + { + return array_reduce($this->cuentas, function(int $sum, $cuenta) { + return $sum + $cuenta->ffmm; + }, 0); + } + public function deposito(): int + { + return array_reduce($this->cuentas, function(int $sum, $cuenta) { + return $sum + $cuenta->deposito; + }, 0); + } + public function caja(): int + { + return array_reduce($this->cuentas, function(int $sum, $cuenta) { + return $sum + $cuenta->saldo(); + }, 0); + } + }; + $dataInmobiliaria->inmobiliaria = $inmobiliaria; + try { + $cuentas = $this->cuentaRepository->fetchByInmobiliaria($inmobiliaria->rut); + } catch (Implement\Exception\EmptyResult) { + return $dataInmobiliaria; + } + foreach ($cuentas as $cuenta) { + $data = new class() { + public string $banco; + public string $numero; + public int $anterior = 0; + public int $actual = 0; + public int $ffmm = 0; + public int $deposito = 0; + + public function diferencia(): int + { + return $this->actual - $this->anterior; + } + public function saldo(): int + { + return $this->diferencia() + $this->ffmm + $this->deposito; + } + }; + $data->banco = $cuenta->banco->nombre; + $data->numero = $cuenta->cuenta; + try { + $depositos = $this->depositoRepository->fetchByCuenta($cuenta->id); + foreach ($depositos as $deposito) { + $data->deposito += $deposito->capital; + $this->addTotal(self::TOTAL_DAP, $deposito->capital); + + if ($deposito->inicio === $fecha) { + $this->addMovimientos(self::DAP_EGRESOS, [(object) [ + 'cuenta' => $deposito->cuenta, + 'fecha' => $deposito->inicio, + 'cargo' => - $deposito->capital, + 'abono' => 0, + 'saldo' => - $deposito->capital, + 'glosa' => 'INVERSION DAP' + ]]); + } + if ($deposito->termino === $fecha) { + $data->deposito -= $deposito->capital; + $this->addTotal(self::TOTAL_DAP, -$deposito->capital); + + $this->addMovimientos(self::DAP_INGRESOS, [(object) [ + 'cuenta' => $deposito->cuenta, + 'fecha' => $deposito->termino, + 'cargo' => 0, + 'abono' => $deposito->futuro, + 'saldo' => $deposito->futuro, + 'glosa' => 'RESCATE DAP' + ]]); + } + } + } catch (Implement\Exception\EmptyResult) {} + try { + $cartola = $this->cartolaRepository->fetchByCuentaAndFecha($cuenta->id, $fecha); + $data->actual = $cartola->saldo; + } catch (Implement\Exception\EmptyResult) {} + try { + $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\Movimiento $movimiento) { + return $movimiento->abono > 0; + })); + $this->addMovimientos(self::EGRESOS, + array_filter($movimientos, function(Model\Movimiento $movimiento) { + return $movimiento->cargo > 0; + })); + } catch (Implement\Exception\EmptyResult) {} + } + $dataInmobiliaria->cuentas []= $data; + + $this->addTotal( + [self::TOTAL_ANTERIOR, self::TOTAL_ACTUAL], + [$data->anterior, $data->actual] + ); + } + return $dataInmobiliaria; + } + protected function buildMovimientos(): array + { + return $this->movimientos->build(); + } + protected function buildTotales(): object + { + return $this->totales; + } + protected function addMovimientos(string $tipo, array $movimientos): Tesoreria + { + if (str_contains($tipo, 'dap')) { + list($d, $t) = explode('->', $tipo); + $this->movimientos->addDap($t, $movimientos); + return $this; + } + foreach ($movimientos as $movimiento) { + $this->movimientos->{$tipo} []= $movimiento; + } + return $this; + } + protected function addTotal(string|array $tipo, int|array $total): Tesoreria + { + if (is_array($tipo)) { + foreach ($tipo as $i => $t) { + $this->addTotal($t, $total[$i]); + } + return $this; + } + $this->totales->{$tipo} += $total; + return $this; + } +} diff --git a/app/src/Service/Contabilidad/Nubox.php b/app/src/Service/Contabilidad/Nubox.php index 01b432a..2d880cf 100644 --- a/app/src/Service/Contabilidad/Nubox.php +++ b/app/src/Service/Contabilidad/Nubox.php @@ -4,20 +4,25 @@ namespace Incoviba\Service\Contabilidad; use DateTimeInterface; 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 Psr\Http\Message\ResponseInterface; -use Psr\Http\Message\StreamInterface; -use function Symfony\Component\Translation\t; +use Incoviba\Common\Ideal; -class Nubox +class Nubox extends Ideal\Service { - public function __construct(protected Repository\Nubox $nuboxRepository, + public function __construct(protected LoggerInterface $logger, + protected Repository\Nubox $nuboxRepository, protected Service\Redis $redisService, protected ClientInterface $client, protected RequestFactoryInterface $requestFactory, - protected string $api_url) {} + protected string $api_url) + { + parent::__construct($logger); + } protected array $tokens; public function getToken(int $inmobiliaria_rut): string @@ -120,7 +125,7 @@ class Nubox $uri = 'contabilidad/libro-diario?' . http_build_query($query); $response = $this->send($uri, $inmobiliaria_rut); if ($response->getStatusCode() !== 200) { - error_log(var_export($uri,true).PHP_EOL,3,'/logs/debug'); + $this->logger->debug($uri); throw new Exception\HttpResponse($response->getReasonPhrase(), $response->getStatusCode()); } return json_decode($response->getBody()->getContents(), JSON_OBJECT_AS_ARRAY); diff --git a/app/src/Service/Format.php b/app/src/Service/Format.php index 21546e0..69bde98 100644 --- a/app/src/Service/Format.php +++ b/app/src/Service/Format.php @@ -25,12 +25,12 @@ class Format { return "{$this->number($number, $decimal_places)}%"; } - public function pesos(string $valor): string + public function pesos(string $valor, int $decimal_places = 0): string { - return "$ {$this->number($valor)}"; + return "$ {$this->number($valor, $decimal_places)}"; } - public function ufs(string $valor): string + public function ufs(string $valor, int $decimal_places = 2): string { - return "{$this->number($valor, 2)} UF"; + return "{$this->number($valor, $decimal_places)} UF"; } } diff --git a/app/src/Service/Money.php b/app/src/Service/Money.php index c9a7b8c..5a9dddf 100644 --- a/app/src/Service/Money.php +++ b/app/src/Service/Money.php @@ -7,9 +7,12 @@ use DateInterval; use Incoviba\Common\Define\Money\Provider; use Incoviba\Common\Implement\Exception\EmptyResponse; use Incoviba\Service\Money\MiIndicador; +use Psr\Log\LoggerInterface; class Money { + public function __construct(protected LoggerInterface $logger) {} + protected array $providers; public function register(string $name, Provider $provider): Money { @@ -49,4 +52,13 @@ class Money return 0; } } + public function getUSD(DateTimeInterface $dateTime): float + { + try { + return $this->getProvider('usd')->get(MiIndicador::USD, $dateTime); + } catch (EmptyResponse $exception) { + $this->logger->critical($exception); + return 0; + } + } } diff --git a/app/src/Service/Money/MiIndicador.php b/app/src/Service/Money/MiIndicador.php index a223250..21dba16 100644 --- a/app/src/Service/Money/MiIndicador.php +++ b/app/src/Service/Money/MiIndicador.php @@ -11,7 +11,7 @@ class MiIndicador implements Provider { const UF = 'uf'; const IPC = 'ipc'; - const USD = 'dolar_intercambio'; + const USD = 'dolar'; public function __construct(protected ClientInterface $client) {} diff --git a/app/src/Service/USD.php b/app/src/Service/USD.php new file mode 100644 index 0000000..edfeed5 --- /dev/null +++ b/app/src/Service/USD.php @@ -0,0 +1,34 @@ +redisService->get($this->redisKey), JSON_OBJECT_AS_ARRAY); + if (!isset($usds[$date->format('Y-m-d')])) { + throw new EmptyRedis($this->redisKey); + } + $usd = $usds[$date->format('Y-m-d')]; + } catch (EmptyRedis) { + $usd = $this->moneyService->getUSD($date); + $usds[$date->format('Y-m-d')] = $usd; + ksort($usds); + $this->redisService->set($this->redisKey, json_encode($usds), 60 * 60 * 24 * 30); + } + return $usd; + } +} From d3f188684af715624c6e2f2361d9d1e34b96d610 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Tue, 13 Feb 2024 04:30:29 +0000 Subject: [PATCH 134/163] Increase update of proyectos --- cli/crontab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/crontab b/cli/crontab index 865d38e..afd5668 100644 --- a/cli/crontab +++ b/cli/crontab @@ -2,7 +2,7 @@ 0 2 * * * /code/bin/incoviba ventas:cuotas:pendientes >> /logs/commands 2>&1 0 2 * * * /code/bin/incoviba ventas:cuotas:vencer >> /logs/commands 2>&1 0 2 * * * /code/bin/incoviba ventas:cierres:vigentes >> /logs/commands 2>&1 -0 2 * * * /code/bin/incoviba proyectos:activos >> /logs/commands 2>&1 +*/5 * * * * /code/bin/incoviba proyectos:activos >> /logs/commands 2>&1 0 2 * * * /code/bin/incoviba comunas >> /logs/commands 2>&1 0 2 * * * /code/bin/incoviba money:uf >> /logs/commands 2>&1 0 2 1 * * /code/bin/incoviba money:ipc >> /logs/commands 2>&1 From 4b39f93f3010ceb778b03025f04a2dac79571f64 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Tue, 13 Feb 2024 04:30:54 +0000 Subject: [PATCH 135/163] Update permissions for cli --- cli/bin/incoviba | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 cli/bin/incoviba diff --git a/cli/bin/incoviba b/cli/bin/incoviba old mode 100644 new mode 100755 From 35ab7e7e8b353669bdfb3060d56c58aa8d896543 Mon Sep 17 00:00:00 2001 From: Juan Pablo Vial Date: Tue, 13 Feb 2024 11:10:26 -0300 Subject: [PATCH 136/163] Depositos vencidos no suman ni restan --- .../Controller/API/Contabilidad/{DAPs.php => Depositos.php} | 0 app/src/Service/Contabilidad/Informe/Tesoreria.php | 3 +++ 2 files changed, 3 insertions(+) rename app/src/Controller/API/Contabilidad/{DAPs.php => Depositos.php} (100%) diff --git a/app/src/Controller/API/Contabilidad/DAPs.php b/app/src/Controller/API/Contabilidad/Depositos.php similarity index 100% rename from app/src/Controller/API/Contabilidad/DAPs.php rename to app/src/Controller/API/Contabilidad/Depositos.php diff --git a/app/src/Service/Contabilidad/Informe/Tesoreria.php b/app/src/Service/Contabilidad/Informe/Tesoreria.php index a8f9114..9bec6c3 100644 --- a/app/src/Service/Contabilidad/Informe/Tesoreria.php +++ b/app/src/Service/Contabilidad/Informe/Tesoreria.php @@ -185,6 +185,9 @@ class Tesoreria extends Ideal\Service try { $depositos = $this->depositoRepository->fetchByCuenta($cuenta->id); foreach ($depositos as $deposito) { + if ($deposito->termino < $fecha) { + continue; + } $data->deposito += $deposito->capital; $this->addTotal(self::TOTAL_DAP, $deposito->capital); From 712c70b34dad8342604a96c63883c902d881b306 Mon Sep 17 00:00:00 2001 From: Juan Pablo Vial Date: Tue, 13 Feb 2024 11:11:30 -0300 Subject: [PATCH 137/163] FIX: DAPs -> Depositos --- app/src/Controller/API/Contabilidad/Depositos.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/Controller/API/Contabilidad/Depositos.php b/app/src/Controller/API/Contabilidad/Depositos.php index a7d7a5a..26cb074 100644 --- a/app/src/Controller/API/Contabilidad/Depositos.php +++ b/app/src/Controller/API/Contabilidad/Depositos.php @@ -9,7 +9,7 @@ use Incoviba\Common\Implement; use Incoviba\Controller\API\withJson; use Incoviba\Repository; -class DAPs extends Ideal\Controller +class Depositos extends Ideal\Controller { use withJson; From 1ccc9ab3d4c5417a43cdde6b82b6b844efa55865 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Tue, 13 Feb 2024 14:12:19 +0000 Subject: [PATCH 138/163] Cambio a proyectos:activos --- cli/crontab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/crontab b/cli/crontab index afd5668..3aafd9e 100644 --- a/cli/crontab +++ b/cli/crontab @@ -2,7 +2,7 @@ 0 2 * * * /code/bin/incoviba ventas:cuotas:pendientes >> /logs/commands 2>&1 0 2 * * * /code/bin/incoviba ventas:cuotas:vencer >> /logs/commands 2>&1 0 2 * * * /code/bin/incoviba ventas:cierres:vigentes >> /logs/commands 2>&1 -*/5 * * * * /code/bin/incoviba proyectos:activos >> /logs/commands 2>&1 +* */3 * * * /code/bin/incoviba proyectos:activos >> /logs/commands 2>&1 0 2 * * * /code/bin/incoviba comunas >> /logs/commands 2>&1 0 2 * * * /code/bin/incoviba money:uf >> /logs/commands 2>&1 0 2 1 * * /code/bin/incoviba money:ipc >> /logs/commands 2>&1 From ea068d95d01ef3d1eee060aaccfbc1fe9767ff73 Mon Sep 17 00:00:00 2001 From: Juan Pablo Vial Date: Tue, 13 Feb 2024 11:17:01 -0300 Subject: [PATCH 139/163] FIX: DAPs -> Depositos routes --- app/resources/routes/api/contabilidad/daps.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/resources/routes/api/contabilidad/daps.php b/app/resources/routes/api/contabilidad/daps.php index 9d929fa..037781e 100644 --- a/app/resources/routes/api/contabilidad/daps.php +++ b/app/resources/routes/api/contabilidad/daps.php @@ -1,7 +1,7 @@ group('/depositos', function($app) { - $app->post('/add[/]', [DAPs::class, 'add']); - $app->get('/inmobiliaria/{inmobiliaria_rut}[/]', [DAPs::class, 'inmobiliaria']); + $app->post('/add[/]', [Depositos::class, 'add']); + $app->get('/inmobiliaria/{inmobiliaria_rut}[/]', [Depositos::class, 'inmobiliaria']); }); From 7f25b4b5e1cb56121bb1d9589a392b933101d607 Mon Sep 17 00:00:00 2001 From: Juan Pablo Vial Date: Tue, 13 Feb 2024 11:26:28 -0300 Subject: [PATCH 140/163] FIX: all sociedades & allActive depositos --- app/src/Controller/Contabilidad.php | 2 +- app/src/Repository/Deposito.php | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/src/Controller/Contabilidad.php b/app/src/Controller/Contabilidad.php index c9bc21e..221ee87 100644 --- a/app/src/Controller/Contabilidad.php +++ b/app/src/Controller/Contabilidad.php @@ -42,7 +42,7 @@ class Contabilidad extends Controller $inmobiliarias = $this->fetchRedis($redisService, $redisKey); } catch (EmptyRedis) { try { - $inmobiliarias = $inmobiliariaRepository->fetchAllActive(); + $inmobiliarias = $inmobiliariaRepository->fetchAll(); $this->saveRedis($redisService, $redisKey, $inmobiliarias, 30 * 24 * 60 * 60); } catch (EmptyResult) {} } diff --git a/app/src/Repository/Deposito.php b/app/src/Repository/Deposito.php index c47dd87..b006403 100644 --- a/app/src/Repository/Deposito.php +++ b/app/src/Repository/Deposito.php @@ -1,6 +1,7 @@ where('cuenta_id = ?'); return $this->fetchMany($query, [$cuenta_id]); } + public function fetchAllActive(): array + { + $fecha = new DateTimeImmutable(); + $query = $this->connection->getQueryBuilder() + ->select() + ->from($this->getTable()) + ->where('inicio <= ? AND termino >= ?'); + return $this->fetchMany($query, [$fecha->format('Y-m-d'), $fecha->format('Y-m-d')]); + } } From 4fb75b11c4ac5bca5449fa1e463df6f858380917 Mon Sep 17 00:00:00 2001 From: Juan Pablo Vial Date: Tue, 13 Feb 2024 12:08:25 -0300 Subject: [PATCH 141/163] Mejora en look de depositos y vencidos --- .../views/contabilidad/depositos.blade.php | 106 +++++++++++------- app/src/Controller/Contabilidad.php | 11 +- 2 files changed, 77 insertions(+), 40 deletions(-) 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')

    Depósitos a Plazo

    - - - - - - - - - - - - - - - - - - @foreach ($depositos as $deposito) + +
    +
    +
    +
    InmobiliariaBancoN° DepósitoCapitalInicioPlazoVencimientoMonto al VencimientoTasa - -
    + - - - - - - - - - - + + + + + + + + + + - @endforeach - -
    {{$deposito->cuenta->inmobiliaria->razon}}{{$deposito->cuenta->banco->nombre}}{{$deposito->id}}{{$format->pesos($deposito->capital)}}{{$deposito->inicio->format('d-m-Y')}}{{$deposito->plazo()}}{{$deposito->termino->format('d-m-Y')}}{{$format->pesos($deposito->futuro)}}{{$format->percent($deposito->tasa() * 100, 4)}} - InmobiliariaBancoN° DepósitoCapitalInicioPlazoVencimientoVencimiento ISOMonto al VencimientoTasa + - +
    + + + @foreach ($activos as $deposito) + + {{$deposito->cuenta->inmobiliaria->razon}} + {{$deposito->cuenta->banco->nombre}} + {{$deposito->id}} + {{$format->pesos($deposito->capital)}} + {{$deposito->inicio->format('d-m-Y')}} + {{$deposito->plazo()}} + {{$deposito->termino->format('d-m-Y')}} + {{$deposito->termino->format('Y-m-d')}} + {{$format->pesos($deposito->futuro)}} + {{$format->percent($deposito->tasa() * 100, 4)}} + + + + + @endforeach + @foreach ($vencidos as $deposito) + + {{$deposito->cuenta->inmobiliaria->razon}} + {{$deposito->cuenta->banco->nombre}} + {{$deposito->id}} + {{$format->pesos($deposito->capital)}} + {{$deposito->inicio->format('d-m-Y')}} + {{$deposito->plazo()}} + {{$deposito->termino->format('d-m-Y')}} + {{$deposito->termino->format('Y-m-d')}} + {{$format->pesos($deposito->futuro)}} + {{$format->percent($deposito->tasa() * 100, 4)}} + + + + + @endforeach + + +