From be33305cf130497c2ec2456fbc32cc354444aa05 Mon Sep 17 00:00:00 2001 From: Juan Pablo Vial Date: Mon, 24 Jul 2023 20:41:38 -0400 Subject: [PATCH] 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;