From 071ef874cceb7136019807f564aca783fb9c1fe9 Mon Sep 17 00:00:00 2001 From: imnavajas Date: Wed, 8 May 2024 13:21:39 +0200 Subject: [PATCH] =?UTF-8?q?Eliminada=20carpeta=20backend=20en=20themes,=20?= =?UTF-8?q?a=C3=B1adidos=20breadcrumbs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/safekat.iml | 2 - ci4/app/Config/Routes.php | 6 +- ci4/app/Controllers/Clientes/Cliente.php | 2 +- .../Controllers/Clientes/ClientePrecios.php | 2 +- .../Controllers/Clientes/Clientecontactos.php | 2 +- .../Clientes/Clienteplantillaprecios.php | 2 +- .../Clienteplantillaprecioslineas.php | 2 +- .../Controllers/Clientes/Clienteusuarios.php | 2 +- ci4/app/Controllers/Compras/Proveedores.php | 2 +- .../Controllers/Compras/ProveedoresTipos.php | 2 +- .../Configuracion/Comunidadesautonomas.php | 2 +- .../Controllers/Configuracion/Formaspagos.php | 2 +- .../Configuracion/Imposiciones.php | 2 +- .../Controllers/Configuracion/Maquinas.php | 2 +- .../Configuracion/Maquinasdefecto.php | 2 +- .../Maquinaspapelesimpresion.php | 2 +- .../Maquinastarifasimpresion.php | 2 +- ci4/app/Controllers/Configuracion/Paises.php | 9 ++- .../Configuracion/Papelesgenericos.php | 2 +- .../Configuracion/Papelesimpresion.php | 2 +- .../Configuracion/Papelformato.php | 2 +- .../Configuracion/Papelimpresionmargenes.php | 2 +- .../Papelimpresiontipologias.php | 2 +- .../Controllers/Configuracion/Provincias.php | 2 +- .../Configuracion/Seriefactura.php | 21 ------ .../Configuracion/Serviciocliente.php | 35 ---------- .../Configuracion/Tamanioformatos.php | 35 ---------- .../Configuracion/Tamaniolibros.php | 35 ---------- .../Configuracion/Tareaservicio.php | 35 ---------- .../Controllers/Configuracion/Tipologias.php | 2 +- ci4/app/Controllers/Configuracion/Trabajo.php | 35 ---------- ci4/app/Controllers/Configuracion/Users.php | 9 ++- ci4/app/Controllers/Js_loader.php | 24 +++---- ci4/app/Controllers/Presupuestos/Buscador.php | 2 +- .../Presupuestos/Cosidotapablanda.php | 2 +- .../Presupuestos/Presupuestoacabados.php | 2 +- .../Presupuestos/Presupuestocliente.php | 2 +- .../Presupuestos/Presupuestodirecciones.php | 2 +- .../Presupuestoencuadernaciones.php | 2 +- .../Presupuestos/Presupuestomanipulados.php | 2 +- .../Presupuestopreimpresiones.php | 2 +- .../Presupuestoserviciosextra.php | 2 +- .../Presupuestotiradasalternativas.php | 2 +- ci4/app/Controllers/Sistema/Actividad.php | 2 +- ci4/app/Controllers/Sistema/Ajustes.php | 11 ++- ci4/app/Controllers/Tarifas/Tarifaacabado.php | 2 +- .../Tarifas/Tarifaacabadolineas.php | 2 +- .../Tarifas/Tarifaencuadernacionlineas.php | 2 +- .../Tarifaencuadernacionlineashoras.php | 2 +- ci4/app/Controllers/Tarifas/Tarifaextra.php | 2 +- .../Tarifas/Tarifamanipuladolineas.php | 2 +- .../Tarifas/Tarifapreimpresion.php | 2 +- .../Tarifas/Tarifasencuadernacion.php | 2 +- ci4/app/Controllers/Tarifas/Tarifasenvios.php | 2 +- .../Tarifas/Tarifasenviosprecios.php | 2 +- .../Tarifas/Tarifasenvioszonas.php | 2 +- .../Controllers/Tarifas/Tarifasmanipulado.php | 2 +- ci4/app/Models/Clientes/ClienteModel.php | 2 +- .../vuexy/form/activity/activityList.php | 69 ++----------------- .../cliente/_clienteDireccionesForm.php | 0 .../clientes/cliente/_clienteFormItems.php | 4 +- .../cliente/convert2templateModal.php | 0 .../form/clientes/cliente/viewClienteForm.php | 4 +- .../form/clientes/cliente/viewClienteList.php | 2 +- .../contactos/_contactoDeClienteFormItems.php | 0 .../contactos/viewContactoDeClienteForm.php | 2 +- .../contactos/viewContactoDeClienteList.php | 0 .../_distribuidorDeClienteFormItems.php | 0 .../viewDistribuidorDeClienteForm.php | 2 +- .../viewDistribuidorDeClienteList.php | 0 .../_ClienteplantillapreciosFormItems.php | 0 .../viewClienteplantillapreciosForm.php | 4 +- .../viewClienteplantillapreciosList.php | 2 +- .../proveedores/_proveedorFormItems.php | 0 .../proveedores/_proveedorTipoFormItems.php | 0 .../compras/proveedores/viewProveedorForm.php | 4 +- .../compras/proveedores/viewProveedorList.php | 2 +- .../proveedores/viewProveedorTipoForm.php | 2 +- .../proveedores/viewProveedorTipoList.php | 0 .../_comunidadAutonomaFormItems.php | 0 .../viewComunidadAutonomaForm.php | 4 +- .../viewComunidadAutonomaList.php | 0 .../formas-pago/_formaDePagoFormItems.php | 0 .../formas-pago/viewFormaDePagoForm.php | 4 +- .../formas-pago/viewFormaDePagoList.php | 0 .../imposiciones/_imposicionFormItems.php | 0 .../imposiciones/viewImposicionForm.php | 4 +- .../imposiciones/viewImposicionList.php | 2 +- .../maquinas/_maquinaFormItems.php | 0 .../maquinas/_maquinaPorDefectoFormItems.php | 0 .../maquinas/viewMaquinaForm.php | 4 +- .../maquinas/viewMaquinaList.php | 2 +- .../maquinas/viewMaquinaPorDefectoForm.php | 4 +- .../maquinas/viewMaquinaPorDefectoList.php | 2 +- .../configuracion/paises/_paisFormItems.php | 0 .../configuracion/paises/viewPaisForm.php | 4 +- .../configuracion/paises/viewPaisList.php | 2 +- .../papel/_papelGenericoFormItems.php | 0 .../papel/_papelImpresionFormItems.php | 0 .../papel/viewPapelGenericoForm.php | 4 +- .../papel/viewPapelGenericoList.php | 2 +- .../papel/viewPapelImpresionForm.php | 4 +- .../papel/viewPapelImpresionList.php | 2 +- .../papelformato/_papelFormatoFormItems.php | 0 .../papelformato/viewPapelFormatoForm.php | 2 +- .../papelformato/viewPapelFormatoList.php | 0 .../provincias/_provinciaFormItems.php | 0 .../provincias/viewProvinciaForm.php | 4 +- .../provincias/viewProvinciaList.php | 2 +- .../tipologias/_tipologiaLibrosFormItems.php | 0 .../tipologias/viewTipologiaLibrosForm.php | 4 +- .../tipologias/viewTipologiaLibrosList.php | 0 .../vuexy/form/group/viewUserGroupForm.php | 2 +- .../vuexy/form/group/viewUserGroupList.php | 2 +- .../vuexy/form/my/notification.php | 0 .../{backend => }/vuexy/form/my/view.php | 0 .../buscador/viewBuscadorList.php | 2 +- .../presupuestos/cliente/_datosLibroItems.php | 0 .../cliente/_disenioLibroItems.php | 0 .../presupuestos/cliente/_tipoLibroItems.php | 0 .../form/presupuestos/cliente/disenioLibro.js | 0 .../form/presupuestos/cliente/loader.php | 0 .../cliente/presupuestoCliente.js | 0 .../presupuestos/cliente/tipoLibroItems.js | 0 .../cliente/viewPresupuestoclienteForm.php | 8 +-- .../cosidotapablanda/_comentariosItems.php | 0 .../cosidotapablanda/_datosEnvios.js | 0 .../cosidotapablanda/_datosEnvios.php | 2 +- .../cosidotapablanda/_datosLibroItems.js | 0 .../cosidotapablanda/_datosLibroItems.php | 0 .../_datosPresupuestoClienteItems.php | 0 .../_datosPresupuestoItems.php | 0 .../cosidotapablanda/_datosServiciosItems.js | 0 .../cosidotapablanda/_datosServiciosItems.php | 0 .../_lineasPresupuestoItems.js | 0 .../_lineasPresupuestoItems.php | 0 .../_presupuestoDireccionesForm.php | 0 .../cosidotapablanda/_presupuestos.js | 0 .../cosidotapablanda/_previewItems.php | 0 .../_resumenPresupuestoItems.php | 0 .../cosidotapablanda/_resumenPresupuestos.js | 0 .../_tiradasAlternativasItems.js | 0 .../_tiradasAlternativasItems.php | 0 .../cosidotapablanda/comparador.js | 0 .../presupuestos/cosidotapablanda/previews.js | 0 .../viewCosidotapablandaForm.php | 22 +++--- .../viewCosidotapablandaList.php | 2 +- .../vuexy/form/presupuestos/index.php | 2 +- .../presupuestos/tapa-blanda-encolada.php | 2 +- .../vuexy/form/profile/index.php | 2 +- .../vuexy/form/profile/index_old.php | 0 .../form/settings/_settingsFormItems.php | 0 .../vuexy/form/settings/viewSettingsForm.php | 4 +- .../acabado/_tarifaAcabadoFormItems.php | 0 .../tarifas/acabado/viewTarifaAcabadoForm.php | 4 +- .../tarifas/acabado/viewTarifaAcabadoList.php | 2 +- .../_tarifaEncuadernacionFormItems.php | 0 .../viewTarifaEncuadernacionForm.php | 4 +- .../viewTarifaEncuadernacionList.php | 2 +- .../tarifas/envios/_tarifaEnvioFormItems.php | 0 .../tarifas/envios/viewTarifaEnvioForm.php | 4 +- .../tarifas/envios/viewTarifaEnvioList.php | 2 +- .../tarifas/extra/_tarifaextraFormItems.php | 0 .../tarifas/extra/viewTarifaextraForm.php | 4 +- .../tarifas/extra/viewTarifaextraList.php | 2 +- .../manipulado/_tarifaManipuladoFormItems.php | 0 .../manipulado/viewTarifaManipuladoForm.php | 4 +- .../manipulado/viewTarifaManipuladoList.php | 2 +- .../_tarifapreimpresionFormItems.php | 0 .../viewTarifapreimpresionForm.php | 4 +- .../viewTarifapreimpresionList.php | 2 +- .../vuexy/form/test_js/test_js.js | 0 .../vuexy/form/test_js/viewTest.php | 2 +- .../vuexy/form/user/_userFormItems.php | 0 .../vuexy/form/user/viewUserForm.php | 4 +- .../vuexy/form/user/viewUserList.php | 2 +- .../vuexy/main/activities_layout.php | 0 .../themes/{backend => }/vuexy/main/all.php | 0 .../{backend => }/vuexy/main/breadcrumbs.php | 0 .../vuexy/main/defaultlayout.php | 0 .../{backend => }/vuexy/main/demo_view.php | 0 .../{backend => }/vuexy/main/footer.php | 0 .../vuexy/main/general_settings_layout.php | 0 .../{backend => }/vuexy/main/header.php | 0 .../vuexy/main/menu_digitalizacion.php | 0 .../vuexy/main/menu_impresion.old.php | 0 .../vuexy/main/menu_impresion.php | 2 +- .../vuexy/main/menu_maquetacion.php | 0 .../vuexy/main/menus/clientes_menu.php | 0 .../vuexy/main/menus/dashboard_menu.php | 0 .../vuexy/main/presupuestos_layout.php | 0 .../vuexy/main/selector_menu.php | 0 .../{backend => }/vuexy/pdfs/presupuesto.php | 0 from mac to app.txt | 2 +- 194 files changed, 182 insertions(+), 418 deletions(-) delete mode 100755 ci4/app/Controllers/Configuracion/Seriefactura.php delete mode 100755 ci4/app/Controllers/Configuracion/Serviciocliente.php delete mode 100755 ci4/app/Controllers/Configuracion/Tamanioformatos.php delete mode 100755 ci4/app/Controllers/Configuracion/Tamaniolibros.php delete mode 100755 ci4/app/Controllers/Configuracion/Tareaservicio.php delete mode 100755 ci4/app/Controllers/Configuracion/Trabajo.php rename ci4/app/Views/themes/{backend => }/vuexy/form/activity/activityList.php (78%) rename ci4/app/Views/themes/{backend => }/vuexy/form/clientes/cliente/_clienteDireccionesForm.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/clientes/cliente/_clienteFormItems.php (99%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/clientes/cliente/convert2templateModal.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/clientes/cliente/viewClienteForm.php (97%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/clientes/cliente/viewClienteList.php (98%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/clientes/contactos/_contactoDeClienteFormItems.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/clientes/contactos/viewContactoDeClienteForm.php (95%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/clientes/contactos/viewContactoDeClienteList.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/clientes/distribuidores/_distribuidorDeClienteFormItems.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/clientes/distribuidores/viewDistribuidorDeClienteForm.php (97%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/clientes/distribuidores/viewDistribuidorDeClienteList.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/clientes/plantillaprecios/_ClienteplantillapreciosFormItems.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/clientes/plantillaprecios/viewClienteplantillapreciosForm.php (98%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/clientes/plantillaprecios/viewClienteplantillapreciosList.php (98%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/compras/proveedores/_proveedorFormItems.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/compras/proveedores/_proveedorTipoFormItems.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/compras/proveedores/viewProveedorForm.php (96%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/compras/proveedores/viewProveedorList.php (98%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/compras/proveedores/viewProveedorTipoForm.php (92%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/compras/proveedores/viewProveedorTipoList.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/configuracion/comunidades-autonomas/_comunidadAutonomaFormItems.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/configuracion/comunidades-autonomas/viewComunidadAutonomaForm.php (91%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/configuracion/comunidades-autonomas/viewComunidadAutonomaList.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/configuracion/formas-pago/_formaDePagoFormItems.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/configuracion/formas-pago/viewFormaDePagoForm.php (86%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/configuracion/formas-pago/viewFormaDePagoList.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/configuracion/imposiciones/_imposicionFormItems.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/configuracion/imposiciones/viewImposicionForm.php (87%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/configuracion/imposiciones/viewImposicionList.php (99%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/configuracion/maquinas/_maquinaFormItems.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/configuracion/maquinas/_maquinaPorDefectoFormItems.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/configuracion/maquinas/viewMaquinaForm.php (99%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/configuracion/maquinas/viewMaquinaList.php (98%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/configuracion/maquinas/viewMaquinaPorDefectoForm.php (92%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/configuracion/maquinas/viewMaquinaPorDefectoList.php (99%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/configuracion/paises/_paisFormItems.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/configuracion/paises/viewPaisForm.php (87%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/configuracion/paises/viewPaisList.php (99%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/configuracion/papel/_papelGenericoFormItems.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/configuracion/papel/_papelImpresionFormItems.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/configuracion/papel/viewPapelGenericoForm.php (97%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/configuracion/papel/viewPapelGenericoList.php (98%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/configuracion/papel/viewPapelImpresionForm.php (99%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/configuracion/papel/viewPapelImpresionList.php (99%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/configuracion/papelformato/_papelFormatoFormItems.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/configuracion/papelformato/viewPapelFormatoForm.php (92%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/configuracion/papelformato/viewPapelFormatoList.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/configuracion/provincias/_provinciaFormItems.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/configuracion/provincias/viewProvinciaForm.php (92%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/configuracion/provincias/viewProvinciaList.php (99%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/configuracion/tipologias/_tipologiaLibrosFormItems.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/configuracion/tipologias/viewTipologiaLibrosForm.php (86%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/configuracion/tipologias/viewTipologiaLibrosList.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/group/viewUserGroupForm.php (99%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/group/viewUserGroupList.php (98%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/my/notification.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/my/view.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/presupuestos/buscador/viewBuscadorList.php (99%) rename ci4/app/Views/themes/{backend => }/vuexy/form/presupuestos/cliente/_datosLibroItems.php (100%) rename ci4/app/Views/themes/{backend => }/vuexy/form/presupuestos/cliente/_disenioLibroItems.php (100%) rename ci4/app/Views/themes/{backend => }/vuexy/form/presupuestos/cliente/_tipoLibroItems.php (100%) rename ci4/app/Views/themes/{backend => }/vuexy/form/presupuestos/cliente/disenioLibro.js (100%) rename ci4/app/Views/themes/{backend => }/vuexy/form/presupuestos/cliente/loader.php (100%) rename ci4/app/Views/themes/{backend => }/vuexy/form/presupuestos/cliente/presupuestoCliente.js (100%) rename ci4/app/Views/themes/{backend => }/vuexy/form/presupuestos/cliente/tipoLibroItems.js (100%) rename ci4/app/Views/themes/{backend => }/vuexy/form/presupuestos/cliente/viewPresupuestoclienteForm.php (96%) rename ci4/app/Views/themes/{backend => }/vuexy/form/presupuestos/cosidotapablanda/_comentariosItems.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/presupuestos/cosidotapablanda/_datosEnvios.js (100%) rename ci4/app/Views/themes/{backend => }/vuexy/form/presupuestos/cosidotapablanda/_datosEnvios.php (97%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/presupuestos/cosidotapablanda/_datosLibroItems.js (100%) rename ci4/app/Views/themes/{backend => }/vuexy/form/presupuestos/cosidotapablanda/_datosLibroItems.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/presupuestos/cosidotapablanda/_datosPresupuestoClienteItems.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/presupuestos/cosidotapablanda/_datosPresupuestoItems.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/presupuestos/cosidotapablanda/_datosServiciosItems.js (100%) rename ci4/app/Views/themes/{backend => }/vuexy/form/presupuestos/cosidotapablanda/_datosServiciosItems.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/presupuestos/cosidotapablanda/_lineasPresupuestoItems.js (100%) rename ci4/app/Views/themes/{backend => }/vuexy/form/presupuestos/cosidotapablanda/_lineasPresupuestoItems.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/presupuestos/cosidotapablanda/_presupuestoDireccionesForm.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/presupuestos/cosidotapablanda/_presupuestos.js (100%) rename ci4/app/Views/themes/{backend => }/vuexy/form/presupuestos/cosidotapablanda/_previewItems.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/presupuestos/cosidotapablanda/_resumenPresupuestoItems.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/presupuestos/cosidotapablanda/_resumenPresupuestos.js (100%) rename ci4/app/Views/themes/{backend => }/vuexy/form/presupuestos/cosidotapablanda/_tiradasAlternativasItems.js (100%) rename ci4/app/Views/themes/{backend => }/vuexy/form/presupuestos/cosidotapablanda/_tiradasAlternativasItems.php (100%) rename ci4/app/Views/themes/{backend => }/vuexy/form/presupuestos/cosidotapablanda/comparador.js (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/presupuestos/cosidotapablanda/previews.js (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/presupuestos/cosidotapablanda/viewCosidotapablandaForm.php (92%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/presupuestos/cosidotapablanda/viewCosidotapablandaList.php (99%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/presupuestos/index.php (99%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/presupuestos/tapa-blanda-encolada.php (99%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/profile/index.php (99%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/profile/index_old.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/settings/_settingsFormItems.php (100%) rename ci4/app/Views/themes/{backend => }/vuexy/form/settings/viewSettingsForm.php (85%) rename ci4/app/Views/themes/{backend => }/vuexy/form/tarifas/acabado/_tarifaAcabadoFormItems.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/tarifas/acabado/viewTarifaAcabadoForm.php (98%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/tarifas/acabado/viewTarifaAcabadoList.php (99%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/tarifas/encuadernacion/_tarifaEncuadernacionFormItems.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/tarifas/encuadernacion/viewTarifaEncuadernacionForm.php (99%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/tarifas/encuadernacion/viewTarifaEncuadernacionList.php (98%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/tarifas/envios/_tarifaEnvioFormItems.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/tarifas/envios/viewTarifaEnvioForm.php (99%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/tarifas/envios/viewTarifaEnvioList.php (98%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/tarifas/extra/_tarifaextraFormItems.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/tarifas/extra/viewTarifaextraForm.php (89%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/tarifas/extra/viewTarifaextraList.php (98%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/tarifas/manipulado/_tarifaManipuladoFormItems.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/tarifas/manipulado/viewTarifaManipuladoForm.php (98%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/tarifas/manipulado/viewTarifaManipuladoList.php (98%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/tarifas/preimpresion/_tarifapreimpresionFormItems.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionForm.php (88%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionList.php (98%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/test_js/test_js.js (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/test_js/viewTest.php (93%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/user/_userFormItems.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/user/viewUserForm.php (90%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/form/user/viewUserList.php (98%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/main/activities_layout.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/main/all.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/main/breadcrumbs.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/main/defaultlayout.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/main/demo_view.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/main/footer.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/main/general_settings_layout.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/main/header.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/main/menu_digitalizacion.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/main/menu_impresion.old.php (100%) rename ci4/app/Views/themes/{backend => }/vuexy/main/menu_impresion.php (99%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/main/menu_maquetacion.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/main/menus/clientes_menu.php (100%) rename ci4/app/Views/themes/{backend => }/vuexy/main/menus/dashboard_menu.php (100%) rename ci4/app/Views/themes/{backend => }/vuexy/main/presupuestos_layout.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/main/selector_menu.php (100%) mode change 100755 => 100644 rename ci4/app/Views/themes/{backend => }/vuexy/pdfs/presupuesto.php (100%) mode change 100755 => 100644 diff --git a/.idea/safekat.iml b/.idea/safekat.iml index 91d27d36..3e9830fc 100755 --- a/.idea/safekat.iml +++ b/.idea/safekat.iml @@ -2,8 +2,6 @@ - - diff --git a/ci4/app/Config/Routes.php b/ci4/app/Config/Routes.php index af4d82b1..b92a518d 100755 --- a/ci4/app/Config/Routes.php +++ b/ci4/app/Config/Routes.php @@ -18,12 +18,12 @@ $routes->get('viewmode/(:alpha)', 'Viewmode::index/$1'); $routes->group('activity', ['namespace' => 'App\Controllers\Sistema'], function ($routes) { $routes->get('', 'Actividad::index', ['as' => 'activityList']); - $routes->post('datatable', 'Actividad::datatable', ['as' => 'dataTableOfActividad']); + $routes->post('datatable', 'Actividad::datatable', ['as' => 'activityDT']); }); $routes->group('settings', ['namespace' => 'App\Controllers\Sistema'], function ($routes) { - $routes->get('', 'Ajustes::settings', ['as' => 'settingsEdit']); - $routes->post('', 'Ajustes::settings', ['as' => 'settingsPost']); + $routes->get('', 'Ajustes::settings', ['as' => 'ajustesList']); + $routes->post('', 'Ajustes::settings', ['as' => 'ajustesEdit']); }); diff --git a/ci4/app/Controllers/Clientes/Cliente.php b/ci4/app/Controllers/Clientes/Cliente.php index ab1e47a0..f41401c1 100755 --- a/ci4/app/Controllers/Clientes/Cliente.php +++ b/ci4/app/Controllers/Clientes/Cliente.php @@ -25,7 +25,7 @@ class Cliente extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'cliente'; - protected static $viewPath = 'themes/backend/vuexy/form/clientes/cliente/'; + protected static $viewPath = 'themes/vuexy/form/clientes/cliente/'; protected $indexRoute = 'clienteList'; diff --git a/ci4/app/Controllers/Clientes/ClientePrecios.php b/ci4/app/Controllers/Clientes/ClientePrecios.php index d2d751ec..2a73ba78 100755 --- a/ci4/app/Controllers/Clientes/ClientePrecios.php +++ b/ci4/app/Controllers/Clientes/ClientePrecios.php @@ -25,7 +25,7 @@ class ClientePrecios extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'ClientePrecios'; - protected static $viewPath = 'themes/backend/vuexy/form/clientes/cliente'; + protected static $viewPath = 'themes/vuexy/form/clientes/cliente'; protected $indexRoute = 'clientepreciosList'; diff --git a/ci4/app/Controllers/Clientes/Clientecontactos.php b/ci4/app/Controllers/Clientes/Clientecontactos.php index 05eec982..18eb4eef 100755 --- a/ci4/app/Controllers/Clientes/Clientecontactos.php +++ b/ci4/app/Controllers/Clientes/Clientecontactos.php @@ -27,7 +27,7 @@ class Clientecontactos extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'cliente-contactos'; - protected static $viewPath = 'themes/backend/vuexy/form/clientes/contactos/'; + protected static $viewPath = 'themes/vuexy/form/clientes/contactos/'; protected $indexRoute = 'contactoDeClienteList'; diff --git a/ci4/app/Controllers/Clientes/Clienteplantillaprecios.php b/ci4/app/Controllers/Clientes/Clienteplantillaprecios.php index e8577d0d..f2edea93 100755 --- a/ci4/app/Controllers/Clientes/Clienteplantillaprecios.php +++ b/ci4/app/Controllers/Clientes/Clienteplantillaprecios.php @@ -22,7 +22,7 @@ class Clienteplantillaprecios extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'clienteplantillaprecios'; - protected static $viewPath = 'themes/backend/vuexy/form/clientes/plantillaprecios/'; + protected static $viewPath = 'themes/vuexy/form/clientes/plantillaprecios/'; protected $indexRoute = 'clienteplantillapreciosList'; diff --git a/ci4/app/Controllers/Clientes/Clienteplantillaprecioslineas.php b/ci4/app/Controllers/Clientes/Clienteplantillaprecioslineas.php index 23856445..a2378aec 100755 --- a/ci4/app/Controllers/Clientes/Clienteplantillaprecioslineas.php +++ b/ci4/app/Controllers/Clientes/Clienteplantillaprecioslineas.php @@ -26,7 +26,7 @@ class Clienteplantillaprecioslineas extends \App\Controllers\BaseResourceControl protected static $controllerSlug = 'clienteplantillaprecioslineas'; - protected static $viewPath = 'themes/backend/vuexy/form/clientes/plantillaprecios/'; + protected static $viewPath = 'themes/vuexy/form/clientes/plantillaprecios/'; protected $indexRoute = 'clienteplantillapreciosList'; diff --git a/ci4/app/Controllers/Clientes/Clienteusuarios.php b/ci4/app/Controllers/Clientes/Clienteusuarios.php index 807bbb98..8e2cdaac 100644 --- a/ci4/app/Controllers/Clientes/Clienteusuarios.php +++ b/ci4/app/Controllers/Clientes/Clienteusuarios.php @@ -28,7 +28,7 @@ class Clienteusuarios extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'cliente-contactos'; - protected static $viewPath = 'themes/backend/vuexy/form/clientes/usuarios/'; + protected static $viewPath = 'themes/vuexy/form/clientes/usuarios/'; protected $indexRoute = 'contactoDeClienteList'; diff --git a/ci4/app/Controllers/Compras/Proveedores.php b/ci4/app/Controllers/Compras/Proveedores.php index fcbd1be3..0ac9be3e 100755 --- a/ci4/app/Controllers/Compras/Proveedores.php +++ b/ci4/app/Controllers/Compras/Proveedores.php @@ -21,7 +21,7 @@ class Proveedores extends \App\Controllers\BaseResourceController { protected static $controllerSlug = 'proveedores'; - protected static $viewPath = 'themes/backend/vuexy/form/compras/proveedores/'; + protected static $viewPath = 'themes/vuexy/form/compras/proveedores/'; protected $indexRoute = 'proveedorList'; diff --git a/ci4/app/Controllers/Compras/ProveedoresTipos.php b/ci4/app/Controllers/Compras/ProveedoresTipos.php index 5b245dbe..ebf4bf6d 100755 --- a/ci4/app/Controllers/Compras/ProveedoresTipos.php +++ b/ci4/app/Controllers/Compras/ProveedoresTipos.php @@ -21,7 +21,7 @@ class ProveedoresTipos extends \App\Controllers\BaseResourceController { protected static $controllerSlug = 'proveedorestipos'; - protected static $viewPath = 'themes/backend/vuexy/form/compras/proveedores/'; + protected static $viewPath = 'themes/vuexy/form/compras/proveedores/'; protected $indexRoute = 'proveedorTipoList'; diff --git a/ci4/app/Controllers/Configuracion/Comunidadesautonomas.php b/ci4/app/Controllers/Configuracion/Comunidadesautonomas.php index 05ed4593..86f8ae6b 100755 --- a/ci4/app/Controllers/Configuracion/Comunidadesautonomas.php +++ b/ci4/app/Controllers/Configuracion/Comunidadesautonomas.php @@ -24,7 +24,7 @@ class Comunidadesautonomas extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'comunidades-autonomas'; - protected static $viewPath = 'themes/backend/vuexy/form/configuracion/comunidades-autonomas/'; + protected static $viewPath = 'themes/vuexy/form/configuracion/comunidades-autonomas/'; protected $indexRoute = 'comunidadAutonomaList'; diff --git a/ci4/app/Controllers/Configuracion/Formaspagos.php b/ci4/app/Controllers/Configuracion/Formaspagos.php index 250ccc62..ef027110 100755 --- a/ci4/app/Controllers/Configuracion/Formaspagos.php +++ b/ci4/app/Controllers/Configuracion/Formaspagos.php @@ -22,7 +22,7 @@ class Formaspagos extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'formas-pagos'; - protected static $viewPath = 'themes/backend/vuexy/form/configuracion/formasPagoViews/'; + protected static $viewPath = 'themes/vuexy/form/configuracion/formasPagoViews/'; protected $indexRoute = 'formaDePagoList'; diff --git a/ci4/app/Controllers/Configuracion/Imposiciones.php b/ci4/app/Controllers/Configuracion/Imposiciones.php index aa7c6b5e..9fabc2c1 100755 --- a/ci4/app/Controllers/Configuracion/Imposiciones.php +++ b/ci4/app/Controllers/Configuracion/Imposiciones.php @@ -22,7 +22,7 @@ class Imposiciones extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'imposiciones'; - protected static $viewPath = 'themes/backend/vuexy/form/configuracion/imposiciones/'; + protected static $viewPath = 'themes/vuexy/form/configuracion/imposiciones/'; protected $indexRoute = 'imposicionList'; diff --git a/ci4/app/Controllers/Configuracion/Maquinas.php b/ci4/app/Controllers/Configuracion/Maquinas.php index 827c1ae4..65166b70 100755 --- a/ci4/app/Controllers/Configuracion/Maquinas.php +++ b/ci4/app/Controllers/Configuracion/Maquinas.php @@ -22,7 +22,7 @@ class Maquinas extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'maquinas'; - protected static $viewPath = 'themes/backend/vuexy/form/configuracion/maquinas/'; + protected static $viewPath = 'themes/vuexy/form/configuracion/maquinas/'; protected $indexRoute = 'maquinaList'; diff --git a/ci4/app/Controllers/Configuracion/Maquinasdefecto.php b/ci4/app/Controllers/Configuracion/Maquinasdefecto.php index e798a228..c4831b5c 100755 --- a/ci4/app/Controllers/Configuracion/Maquinasdefecto.php +++ b/ci4/app/Controllers/Configuracion/Maquinasdefecto.php @@ -24,7 +24,7 @@ class Maquinasdefecto extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'maquinasdefecto'; - protected static $viewPath = 'themes/backend/vuexy/form/configuracion/maquinas/'; + protected static $viewPath = 'themes/vuexy/form/configuracion/maquinas/'; protected $indexRoute = 'maquinaPorDefectoList'; diff --git a/ci4/app/Controllers/Configuracion/Maquinaspapelesimpresion.php b/ci4/app/Controllers/Configuracion/Maquinaspapelesimpresion.php index 5ebd428e..59d87354 100755 --- a/ci4/app/Controllers/Configuracion/Maquinaspapelesimpresion.php +++ b/ci4/app/Controllers/Configuracion/Maquinaspapelesimpresion.php @@ -37,7 +37,7 @@ class Maquinaspapelesimpresion extends \App\Controllers\BaseResourceController { protected static $controllerSlug = 'maquinaspapelesimpresion'; - protected static $viewPath = 'themes/backend/vuexy/form/configuracion/maquinas/'; + protected static $viewPath = 'themes/vuexy/form/configuracion/maquinas/'; protected $indexRoute = ''; diff --git a/ci4/app/Controllers/Configuracion/Maquinastarifasimpresion.php b/ci4/app/Controllers/Configuracion/Maquinastarifasimpresion.php index 56c08112..d7fe1bbc 100755 --- a/ci4/app/Controllers/Configuracion/Maquinastarifasimpresion.php +++ b/ci4/app/Controllers/Configuracion/Maquinastarifasimpresion.php @@ -28,7 +28,7 @@ class Maquinastarifasimpresion extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'maquinastarifasimpresion'; - protected static $viewPath = 'themes/backend/vuexy/form/configuracion/maquinas/'; + protected static $viewPath = 'themes/vuexy/form/configuracion/maquinas/'; protected $indexRoute = 'maquinasTarifaImpresionList'; diff --git a/ci4/app/Controllers/Configuracion/Paises.php b/ci4/app/Controllers/Configuracion/Paises.php index f88a1866..2e771c81 100755 --- a/ci4/app/Controllers/Configuracion/Paises.php +++ b/ci4/app/Controllers/Configuracion/Paises.php @@ -22,7 +22,7 @@ class Paises extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'paises'; - protected static $viewPath = 'themes/backend/vuexy/form/configuracion/paises/'; + protected static $viewPath = 'themes/vuexy/form/configuracion/paises/'; protected $indexRoute = 'paisList'; @@ -31,6 +31,13 @@ class Paises extends \App\Controllers\BaseResourceController { $this->viewData['pageTitle'] = lang('Paises.moduleTitle'); $this->viewData['usingSweetAlert'] = true; + + // Breadcrumbs (IMN) + $this->viewData['breadcrumb'] = [ + ['title' => lang("App.menu_configuration"), 'route' => "javascript:void(0);", 'active' => false], + ['title' => lang("App.menu_paises"), 'route' => site_url('configuracion/paises'), 'active' => true] + ]; + parent::initController($request, $response, $logger); } diff --git a/ci4/app/Controllers/Configuracion/Papelesgenericos.php b/ci4/app/Controllers/Configuracion/Papelesgenericos.php index 623fd161..d0b93c2b 100755 --- a/ci4/app/Controllers/Configuracion/Papelesgenericos.php +++ b/ci4/app/Controllers/Configuracion/Papelesgenericos.php @@ -24,7 +24,7 @@ class Papelesgenericos extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'papelesgenericos'; - protected static $viewPath = 'themes/backend/vuexy/form/configuracion/papel/'; + protected static $viewPath = 'themes/vuexy/form/configuracion/papel/'; protected $indexRoute = 'papelGenericoList'; diff --git a/ci4/app/Controllers/Configuracion/Papelesimpresion.php b/ci4/app/Controllers/Configuracion/Papelesimpresion.php index 3669b7eb..15f7160e 100755 --- a/ci4/app/Controllers/Configuracion/Papelesimpresion.php +++ b/ci4/app/Controllers/Configuracion/Papelesimpresion.php @@ -49,7 +49,7 @@ class Papelesimpresion extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'papelesimpresion'; - protected static $viewPath = 'themes/backend/vuexy/form/configuracion/papel/'; + protected static $viewPath = 'themes/vuexy/form/configuracion/papel/'; protected $indexRoute = 'papelImpresionList'; diff --git a/ci4/app/Controllers/Configuracion/Papelformato.php b/ci4/app/Controllers/Configuracion/Papelformato.php index 7541426d..4c55dff7 100755 --- a/ci4/app/Controllers/Configuracion/Papelformato.php +++ b/ci4/app/Controllers/Configuracion/Papelformato.php @@ -21,7 +21,7 @@ class Papelformato extends \App\Controllers\BaseResourceController { protected static $controllerSlug = 'papelformato'; - protected static $viewPath = 'themes/backend/vuexy/form/configuracion/papelformato/'; + protected static $viewPath = 'themes/vuexy/form/configuracion/papelformato/'; protected $indexRoute = 'papelFormatoList'; diff --git a/ci4/app/Controllers/Configuracion/Papelimpresionmargenes.php b/ci4/app/Controllers/Configuracion/Papelimpresionmargenes.php index ad28ac7a..16fe3d07 100755 --- a/ci4/app/Controllers/Configuracion/Papelimpresionmargenes.php +++ b/ci4/app/Controllers/Configuracion/Papelimpresionmargenes.php @@ -32,7 +32,7 @@ class Papelimpresionmargenes extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'papelimpresionmargenes'; - protected static $viewPath = 'themes/backend/vuexy/form/configuracion/papelesimpresion/'; + protected static $viewPath = 'themes/vuexy/form/configuracion/papelesimpresion/'; protected $indexRoute = 'papelesImpresionList'; diff --git a/ci4/app/Controllers/Configuracion/Papelimpresiontipologias.php b/ci4/app/Controllers/Configuracion/Papelimpresiontipologias.php index ec701b66..52f235b0 100755 --- a/ci4/app/Controllers/Configuracion/Papelimpresiontipologias.php +++ b/ci4/app/Controllers/Configuracion/Papelimpresiontipologias.php @@ -35,7 +35,7 @@ class Papelimpresiontipologias extends \App\Controllers\BaseResourceController { protected static $controllerSlug = 'papelimpresiontipologias'; - protected static $viewPath = 'themes/backend/vuexy/form/configuracion/papel/'; + protected static $viewPath = 'themes/vuexy/form/configuracion/papel/'; protected $indexRoute = 'papelImpresionTipologiaList'; diff --git a/ci4/app/Controllers/Configuracion/Provincias.php b/ci4/app/Controllers/Configuracion/Provincias.php index b599a641..573a4a39 100755 --- a/ci4/app/Controllers/Configuracion/Provincias.php +++ b/ci4/app/Controllers/Configuracion/Provincias.php @@ -24,7 +24,7 @@ class Provincias extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'provincias'; - protected static $viewPath = 'themes/backend/vuexy/form/configuracion/provincias/'; + protected static $viewPath = 'themes/vuexy/form/configuracion/provincias/'; protected $indexRoute = 'provinciaList'; diff --git a/ci4/app/Controllers/Configuracion/Seriefactura.php b/ci4/app/Controllers/Configuracion/Seriefactura.php deleted file mode 100755 index 7215f566..00000000 --- a/ci4/app/Controllers/Configuracion/Seriefactura.php +++ /dev/null @@ -1,21 +0,0 @@ -user_model = new UserModel(); $this->viewData['pageTitle'] = lang('Users.moduleTitle'); + + // Breadcrumbs (IMN) + $this->viewData['breadcrumb'] = [ + ['title' => lang("App.menu_configuration"), 'route' => "javascript:void(0);", 'active' => false], + ['title' => lang("App.menu_users"), 'route' => site_url('configuracion/users'), 'active' => true] + ]; + parent::initController($request, $response, $logger); } diff --git a/ci4/app/Controllers/Js_loader.php b/ci4/app/Controllers/Js_loader.php index 8ba7523b..74153781 100755 --- a/ci4/app/Controllers/Js_loader.php +++ b/ci4/app/Controllers/Js_loader.php @@ -17,7 +17,7 @@ class Js_loader extends BaseController function comparadorCosidoTapaBlanda_js() { $this->response->setHeader('Content-Type', 'text/javascript'); - return view('themes/backend/vuexy/form/presupuestos/cosidotapablanda/comparador.js'); + return view('themes/vuexy/form/presupuestos/cosidotapablanda/comparador.js'); } @@ -37,67 +37,67 @@ class Js_loader extends BaseController function datosLibro_js() { $this->response->setHeader('Content-Type', 'text/javascript'); - return view('themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosLibroItems.js'); + return view('themes/vuexy/form/presupuestos/cosidotapablanda/_datosLibroItems.js'); } function previsualizador_js() { $this->response->setHeader('Content-Type', 'text/javascript'); - return view('themes/backend/vuexy/form/presupuestos/cosidotapablanda/previews.js'); + return view('themes/vuexy/form/presupuestos/cosidotapablanda/previews.js'); } function lineasPresupuesto_js() { $this->response->setHeader('Content-Type', 'text/javascript'); - return view('themes/backend/vuexy/form/presupuestos/cosidotapablanda/_lineasPresupuestoItems.js'); + return view('themes/vuexy/form/presupuestos/cosidotapablanda/_lineasPresupuestoItems.js'); } function tiradasAlternativas_js() { $this->response->setHeader('Content-Type', 'text/javascript'); - return view('themes/backend/vuexy/form/presupuestos/cosidotapablanda/_tiradasAlternativasItems.js'); + return view('themes/vuexy/form/presupuestos/cosidotapablanda/_tiradasAlternativasItems.js'); } function datosServicios_js() { $this->response->setHeader('Content-Type', 'text/javascript'); - return view('themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosServiciosItems.js'); + return view('themes/vuexy/form/presupuestos/cosidotapablanda/_datosServiciosItems.js'); } function datosEnvios_js() { $this->response->setHeader('Content-Type', 'text/javascript'); - return view('themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosEnvios.js'); + return view('themes/vuexy/form/presupuestos/cosidotapablanda/_datosEnvios.js'); } function resumenPresupuestos_js() { $this->response->setHeader('Content-Type', 'text/javascript'); - return view('themes/backend/vuexy/form/presupuestos/cosidotapablanda/_resumenPresupuestos.js'); + return view('themes/vuexy/form/presupuestos/cosidotapablanda/_resumenPresupuestos.js'); } function presupuestos_js() { $this->response->setHeader('Content-Type', 'text/javascript'); - return view('themes/backend/vuexy/form/presupuestos/cosidotapablanda/_presupuestos.js'); + return view('themes/vuexy/form/presupuestos/cosidotapablanda/_presupuestos.js'); } function presupuestoCliente_js() { $this->response->setHeader('Content-Type', 'text/javascript'); - return view('themes/backend/vuexy/form/presupuestos/cliente/presupuestoCliente.js'); + return view('themes/vuexy/form/presupuestos/cliente/presupuestoCliente.js'); } function presupuestoClienteTipoLibro_js() { $this->response->setHeader('Content-Type', 'text/javascript'); - return view('themes/backend/vuexy/form/presupuestos/cliente/tipoLibroItems.js'); + return view('themes/vuexy/form/presupuestos/cliente/tipoLibroItems.js'); } function presupuestoClienteDisenioLibro_js() { $this->response->setHeader('Content-Type', 'text/javascript'); - return view('themes/backend/vuexy/form/presupuestos/cliente/disenioLibro.js'); + return view('themes/vuexy/form/presupuestos/cliente/disenioLibro.js'); } } diff --git a/ci4/app/Controllers/Presupuestos/Buscador.php b/ci4/app/Controllers/Presupuestos/Buscador.php index 6c02de80..ef261dea 100644 --- a/ci4/app/Controllers/Presupuestos/Buscador.php +++ b/ci4/app/Controllers/Presupuestos/Buscador.php @@ -32,7 +32,7 @@ class Buscador extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'buscador'; - protected static $viewPath = 'themes/backend/vuexy/form/presupuestos/buscador/'; + protected static $viewPath = 'themes/vuexy/form/presupuestos/buscador/'; protected $indexRoute = 'buscadorPresupuestosList'; diff --git a/ci4/app/Controllers/Presupuestos/Cosidotapablanda.php b/ci4/app/Controllers/Presupuestos/Cosidotapablanda.php index 37471d33..6c091711 100755 --- a/ci4/app/Controllers/Presupuestos/Cosidotapablanda.php +++ b/ci4/app/Controllers/Presupuestos/Cosidotapablanda.php @@ -37,7 +37,7 @@ class Cosidotapablanda extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'cosidotapablanda'; - protected static $viewPath = 'themes/backend/vuexy/form/presupuestos/cosidotapablanda/'; + protected static $viewPath = 'themes/vuexy/form/presupuestos/cosidotapablanda/'; protected $indexRoute = 'cosidotapablandaList'; diff --git a/ci4/app/Controllers/Presupuestos/Presupuestoacabados.php b/ci4/app/Controllers/Presupuestos/Presupuestoacabados.php index 625a0577..47f2eb68 100755 --- a/ci4/app/Controllers/Presupuestos/Presupuestoacabados.php +++ b/ci4/app/Controllers/Presupuestos/Presupuestoacabados.php @@ -23,7 +23,7 @@ class Presupuestoacabados extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'presupuesto-acabados'; - protected static $viewPath = 'themes/backend/vuexy/form/presupuestos/'; + protected static $viewPath = 'themes/vuexy/form/presupuestos/'; diff --git a/ci4/app/Controllers/Presupuestos/Presupuestocliente.php b/ci4/app/Controllers/Presupuestos/Presupuestocliente.php index 5e17c30e..1a5002db 100755 --- a/ci4/app/Controllers/Presupuestos/Presupuestocliente.php +++ b/ci4/app/Controllers/Presupuestos/Presupuestocliente.php @@ -37,7 +37,7 @@ class Presupuestocliente extends \App\Controllers\GoBaseResourceController protected static $controllerSlug = 'presupuestocliente'; - protected static $viewPath = 'themes/backend/vuexy/form/presupuestos/cliente/'; + protected static $viewPath = 'themes/vuexy/form/presupuestos/cliente/'; protected $indexRoute = 'cosidotapablandaList'; diff --git a/ci4/app/Controllers/Presupuestos/Presupuestodirecciones.php b/ci4/app/Controllers/Presupuestos/Presupuestodirecciones.php index 125c034b..d99d9fd3 100755 --- a/ci4/app/Controllers/Presupuestos/Presupuestodirecciones.php +++ b/ci4/app/Controllers/Presupuestos/Presupuestodirecciones.php @@ -23,7 +23,7 @@ class Presupuestodirecciones extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'presupuesto-direcciones'; - protected static $viewPath = 'themes/backend/vuexy/form/presupuestos/'; + protected static $viewPath = 'themes/vuexy/form/presupuestos/'; diff --git a/ci4/app/Controllers/Presupuestos/Presupuestoencuadernaciones.php b/ci4/app/Controllers/Presupuestos/Presupuestoencuadernaciones.php index fccc4889..323fd818 100755 --- a/ci4/app/Controllers/Presupuestos/Presupuestoencuadernaciones.php +++ b/ci4/app/Controllers/Presupuestos/Presupuestoencuadernaciones.php @@ -23,7 +23,7 @@ class Presupuestoencuadernaciones extends \App\Controllers\BaseResourceControlle protected static $controllerSlug = 'presupuesto-encuadernaciones'; - protected static $viewPath = 'themes/backend/vuexy/form/presupuestos/'; + protected static $viewPath = 'themes/vuexy/form/presupuestos/'; public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger) diff --git a/ci4/app/Controllers/Presupuestos/Presupuestomanipulados.php b/ci4/app/Controllers/Presupuestos/Presupuestomanipulados.php index 5ecd9dd1..0423bb19 100755 --- a/ci4/app/Controllers/Presupuestos/Presupuestomanipulados.php +++ b/ci4/app/Controllers/Presupuestos/Presupuestomanipulados.php @@ -24,7 +24,7 @@ class Presupuestomanipulados extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'presupuesto-manipulado'; - protected static $viewPath = 'themes/backend/vuexy/form/presupuestos/'; + protected static $viewPath = 'themes/vuexy/form/presupuestos/'; public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger) diff --git a/ci4/app/Controllers/Presupuestos/Presupuestopreimpresiones.php b/ci4/app/Controllers/Presupuestos/Presupuestopreimpresiones.php index 69d4a9b7..465ad7be 100755 --- a/ci4/app/Controllers/Presupuestos/Presupuestopreimpresiones.php +++ b/ci4/app/Controllers/Presupuestos/Presupuestopreimpresiones.php @@ -19,7 +19,7 @@ class Presupuestopreimpresiones extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'presupuesto-preimpresiones'; - protected static $viewPath = 'themes/backend/vuexy/form/presupuestos/'; + protected static $viewPath = 'themes/vuexy/form/presupuestos/'; diff --git a/ci4/app/Controllers/Presupuestos/Presupuestoserviciosextra.php b/ci4/app/Controllers/Presupuestos/Presupuestoserviciosextra.php index 261de0bf..09497d14 100755 --- a/ci4/app/Controllers/Presupuestos/Presupuestoserviciosextra.php +++ b/ci4/app/Controllers/Presupuestos/Presupuestoserviciosextra.php @@ -19,7 +19,7 @@ class Presupuestoserviciosextra extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'presupuesto-servicios-extra'; - protected static $viewPath = 'themes/backend/vuexy/form/presupuestos/'; + protected static $viewPath = 'themes/vuexy/form/presupuestos/'; diff --git a/ci4/app/Controllers/Presupuestos/Presupuestotiradasalternativas.php b/ci4/app/Controllers/Presupuestos/Presupuestotiradasalternativas.php index c36829f0..05702a7e 100644 --- a/ci4/app/Controllers/Presupuestos/Presupuestotiradasalternativas.php +++ b/ci4/app/Controllers/Presupuestos/Presupuestotiradasalternativas.php @@ -22,7 +22,7 @@ class Presupuestotiradasalternativas extends \App\Controllers\BaseResourceContro protected static $controllerSlug = 'presupuesto-tiradas'; - protected static $viewPath = 'themes/backend/vuexy/form/presupuestos/'; + protected static $viewPath = 'themes/vuexy/form/presupuestos/'; public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger) diff --git a/ci4/app/Controllers/Sistema/Actividad.php b/ci4/app/Controllers/Sistema/Actividad.php index 5bcf1627..263bd8dd 100644 --- a/ci4/app/Controllers/Sistema/Actividad.php +++ b/ci4/app/Controllers/Sistema/Actividad.php @@ -14,7 +14,7 @@ class Actividad extends BaseResourceController protected static $controllerSlug = 'activity'; - protected static $viewPath = 'themes/backend/vuexy/form/activity/'; + protected static $viewPath = 'themes/vuexy/form/activity/'; protected static $indexRoute = 'activityList'; diff --git a/ci4/app/Controllers/Sistema/Ajustes.php b/ci4/app/Controllers/Sistema/Ajustes.php index b70769e7..9165bf0e 100644 --- a/ci4/app/Controllers/Sistema/Ajustes.php +++ b/ci4/app/Controllers/Sistema/Ajustes.php @@ -13,20 +13,27 @@ class Ajustes extends BaseResourceController protected static $controllerSlug = 'settings'; - protected static $viewPath = 'themes/backend/vuexy/form/settings/'; + protected static $viewPath = 'themes/vuexy/form/settings/'; protected static string $formViewName = 'settingsForm'; protected static $singularObjectName = 'settings'; protected static $singularObjectNameCc = 'settings'; - protected $indexRoute = 'settingForm'; + protected $indexRoute = 'ajustesList'; public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger) { $this->viewData['pageTitle'] = lang('Provincias.moduleTitle'); $this->viewData['usingSweetAlert'] = true; + + // Breadcrumbs (IMN) + $this->viewData['breadcrumb'] = [ + ['title' => lang("App.menu_configuration"), 'route' => "javascript:void(0);", 'active' => false], + ['title' => lang("App.menu_settings"), 'route' => route_to('ajustesList'), 'active' => true] + ]; + parent::initController($request, $response, $logger); } diff --git a/ci4/app/Controllers/Tarifas/Tarifaacabado.php b/ci4/app/Controllers/Tarifas/Tarifaacabado.php index b887c0a2..0d09c35e 100755 --- a/ci4/app/Controllers/Tarifas/Tarifaacabado.php +++ b/ci4/app/Controllers/Tarifas/Tarifaacabado.php @@ -22,7 +22,7 @@ class Tarifaacabado extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'tarifasacabado'; - protected static $viewPath = 'themes/backend/vuexy/form/tarifas/acabado/'; + protected static $viewPath = 'themes/vuexy/form/tarifas/acabado/'; protected $indexRoute = 'tarifaAcabadoList'; diff --git a/ci4/app/Controllers/Tarifas/Tarifaacabadolineas.php b/ci4/app/Controllers/Tarifas/Tarifaacabadolineas.php index e2dd423c..2f452f8f 100755 --- a/ci4/app/Controllers/Tarifas/Tarifaacabadolineas.php +++ b/ci4/app/Controllers/Tarifas/Tarifaacabadolineas.php @@ -37,7 +37,7 @@ class Tarifaacabadolineas extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'tarifa-acabado-lineas'; - protected static $viewPath = 'themes/backend/vuexy/form/tarifas/acabado/'; + protected static $viewPath = 'themes/vuexy/form/tarifas/acabado/'; protected $indexRoute = 'tarifaAcabadoLineaList'; diff --git a/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineas.php b/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineas.php index 8790a749..4b104456 100755 --- a/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineas.php +++ b/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineas.php @@ -34,7 +34,7 @@ class Tarifaencuadernacionlineas extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'tarifaencuadernacionlineas'; - protected static $viewPath = 'themes/backend/vuexy/form/tarifas/encuadernacion/'; + protected static $viewPath = 'themes/vuexy/form/tarifas/encuadernacion/'; protected $indexRoute = 'tarifaEncuadernacionLineaList'; diff --git a/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineashoras.php b/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineashoras.php index d6c14c06..7b306ebb 100755 --- a/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineashoras.php +++ b/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineashoras.php @@ -34,7 +34,7 @@ class Tarifaencuadernacionlineashoras extends \App\Controllers\BaseResourceContr protected static $controllerSlug = 'tarifaencuadernacionlineashoras'; - protected static $viewPath = 'themes/backend/vuexy/form/tarifas/encuadernacion/'; + protected static $viewPath = 'themes/vuexy/form/tarifas/encuadernacion/'; protected $indexRoute = 'tarifaEncuadernacionLineaHorasList'; diff --git a/ci4/app/Controllers/Tarifas/Tarifaextra.php b/ci4/app/Controllers/Tarifas/Tarifaextra.php index 83c3b2dc..9dd27d9c 100755 --- a/ci4/app/Controllers/Tarifas/Tarifaextra.php +++ b/ci4/app/Controllers/Tarifas/Tarifaextra.php @@ -15,7 +15,7 @@ class Tarifaextra extends \App\Controllers\GoBaseController protected static $pluralObjectName = 'Tarifasextra'; protected static $controllerSlug = 'tarifaextra'; - protected static $viewPath = 'themes/backend/vuexy/form/tarifas/extra/'; + protected static $viewPath = 'themes/vuexy/form/tarifas/extra/'; protected $indexRoute = 'tarifaextraList'; diff --git a/ci4/app/Controllers/Tarifas/Tarifamanipuladolineas.php b/ci4/app/Controllers/Tarifas/Tarifamanipuladolineas.php index 211e1791..cd668048 100755 --- a/ci4/app/Controllers/Tarifas/Tarifamanipuladolineas.php +++ b/ci4/app/Controllers/Tarifas/Tarifamanipuladolineas.php @@ -34,7 +34,7 @@ class Tarifamanipuladolineas extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'tarifamanipuladolineas'; - protected static $viewPath = 'themes/backend/vuexy/form/tarifas/manipulado/'; + protected static $viewPath = 'themes/vuexy/form/tarifas/manipulado/'; protected $indexRoute = 'tarifaManipuladoLineaList'; diff --git a/ci4/app/Controllers/Tarifas/Tarifapreimpresion.php b/ci4/app/Controllers/Tarifas/Tarifapreimpresion.php index 259cf32c..429bcc19 100755 --- a/ci4/app/Controllers/Tarifas/Tarifapreimpresion.php +++ b/ci4/app/Controllers/Tarifas/Tarifapreimpresion.php @@ -15,7 +15,7 @@ class Tarifapreimpresion extends \App\Controllers\GoBaseController protected static $pluralObjectName = 'Tarifaspreimpresion'; protected static $controllerSlug = 'tarifapreimpresion'; - protected static $viewPath = 'themes/backend/vuexy/form/tarifas/preimpresion/'; + protected static $viewPath = 'themes/vuexy/form/tarifas/preimpresion/'; protected $indexRoute = 'tarifapreimpresionList'; diff --git a/ci4/app/Controllers/Tarifas/Tarifasencuadernacion.php b/ci4/app/Controllers/Tarifas/Tarifasencuadernacion.php index be72c4d0..4d2751dc 100755 --- a/ci4/app/Controllers/Tarifas/Tarifasencuadernacion.php +++ b/ci4/app/Controllers/Tarifas/Tarifasencuadernacion.php @@ -26,7 +26,7 @@ class Tarifasencuadernacion extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'tarifaencuadernacion'; - protected static $viewPath = 'themes/backend/vuexy/form/tarifas/encuadernacion/'; + protected static $viewPath = 'themes/vuexy/form/tarifas/encuadernacion/'; protected $indexRoute = 'tarifaEncuadernacionList'; diff --git a/ci4/app/Controllers/Tarifas/Tarifasenvios.php b/ci4/app/Controllers/Tarifas/Tarifasenvios.php index 497343b3..9bbb02a1 100755 --- a/ci4/app/Controllers/Tarifas/Tarifasenvios.php +++ b/ci4/app/Controllers/Tarifas/Tarifasenvios.php @@ -27,7 +27,7 @@ class Tarifasenvios extends \App\Controllers\BaseResourceController { protected static $controllerSlug = 'tarifasenvios'; - protected static $viewPath = 'themes/backend/vuexy/form/tarifas/envios/'; + protected static $viewPath = 'themes/vuexy/form/tarifas/envios/'; protected $indexRoute = 'tarifaEnvioList'; diff --git a/ci4/app/Controllers/Tarifas/Tarifasenviosprecios.php b/ci4/app/Controllers/Tarifas/Tarifasenviosprecios.php index 48454f0d..7a190c0b 100755 --- a/ci4/app/Controllers/Tarifas/Tarifasenviosprecios.php +++ b/ci4/app/Controllers/Tarifas/Tarifasenviosprecios.php @@ -29,7 +29,7 @@ class Tarifasenviosprecios extends \App\Controllers\BaseResourceController { protected static $controllerSlug = 'tarifasenviosprecios'; - protected static $viewPath = 'themes/backend/vuexy/form/tarifas/envios/'; + protected static $viewPath = 'themes/vuexy/form/tarifas/envios/'; protected $indexRoute = 'tarifaEnvioPrecioList'; diff --git a/ci4/app/Controllers/Tarifas/Tarifasenvioszonas.php b/ci4/app/Controllers/Tarifas/Tarifasenvioszonas.php index 834337c1..3333e716 100755 --- a/ci4/app/Controllers/Tarifas/Tarifasenvioszonas.php +++ b/ci4/app/Controllers/Tarifas/Tarifasenvioszonas.php @@ -30,7 +30,7 @@ class Tarifasenvioszonas extends \App\Controllers\BaseResourceController { protected static $controllerSlug = 'tarifasenvioszonas'; - protected static $viewPath = 'themes/backend/vuexy/form/tarifas/envios/'; + protected static $viewPath = 'themes/vuexy/form/tarifas/envios/'; protected $indexRoute = 'tarifaEnvioZonaList'; diff --git a/ci4/app/Controllers/Tarifas/Tarifasmanipulado.php b/ci4/app/Controllers/Tarifas/Tarifasmanipulado.php index 07d706a0..7528ebf4 100755 --- a/ci4/app/Controllers/Tarifas/Tarifasmanipulado.php +++ b/ci4/app/Controllers/Tarifas/Tarifasmanipulado.php @@ -22,7 +22,7 @@ class Tarifasmanipulado extends \App\Controllers\BaseResourceController protected static $controllerSlug = 'tarifamanipulado'; - protected static $viewPath = 'themes/backend/vuexy/form/tarifas/manipulado/'; + protected static $viewPath = 'themes/vuexy/form/tarifas/manipulado/'; protected $indexRoute = 'tarifaManipuladoList'; diff --git a/ci4/app/Models/Clientes/ClienteModel.php b/ci4/app/Models/Clientes/ClienteModel.php index 1d67958e..0a211f29 100755 --- a/ci4/app/Models/Clientes/ClienteModel.php +++ b/ci4/app/Models/Clientes/ClienteModel.php @@ -301,7 +301,7 @@ class ClienteModel extends \App\Models\BaseModel ->orLike("t1.soporte_id", $search) ->orLike("t1.forma_pago_id", $search) ->orLike("t1.vencimiento", $search) - ->orLike("t5.id_user", $search) + ->orLike("t5.id", $search) ->orLike("t5.first_name", $search) ->orLike("t5.last_name", $search) ->orLike("t7.id", $search) diff --git a/ci4/app/Views/themes/backend/vuexy/form/activity/activityList.php b/ci4/app/Views/themes/vuexy/form/activity/activityList.php similarity index 78% rename from ci4/app/Views/themes/backend/vuexy/form/activity/activityList.php rename to ci4/app/Views/themes/vuexy/form/activity/activityList.php index 1caa4448..e642c016 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/activity/activityList.php +++ b/ci4/app/Views/themes/vuexy/form/activity/activityList.php @@ -1,6 +1,6 @@ include("themes/_commonPartialsBs/select2bs5") ?> include("themes/_commonPartialsBs/datatables") ?> -extend('themes/backend/vuexy/main/defaultlayout') ?> +extend('themes/vuexy/main/defaultlayout') ?> section('content'); ?> @@ -151,7 +151,6 @@ - @@ -171,13 +170,7 @@ const lastColNr = $('#activityTable').find("tr:first th").length - 1; - const actionBtns = function(data) { - return ` -
- -
- `; - }; + theTable = $('#activityTable').DataTable({ processing: true, serverSide: true, @@ -198,10 +191,10 @@ stateSave: true, order: [[1, 'asc']], language: { - url: "/themes/vuexy/vendors/libs/datatables-sk/plugins/i18n/es-ES.json" + url: "/themes/vuexy/vendor/libs/datatables-sk/plugins/i18n/es-ES.json" }, ajax : $.fn.dataTable.pipeline( { - url: '', + url: '', method: 'POST', headers: {'X-Requested-With': 'XMLHttpRequest'}, async: true, @@ -220,60 +213,8 @@ { 'data': 'ip' }, { 'data': 'os' }, { 'data': 'browser' }, - { 'data': 'created_at' }, - { 'data': actionBtns } + { 'data': 'created_at' } ] }); - theTable.on( 'draw.dt', function () { - const boolCols = [7]; - for (let coln of boolCols) { - theTable.column(coln, { page: 'current' }).nodes().each( function (cell, i) { - cell.innerHTML = cell.innerHTML == '1' ? '' : ''; - }); - } - }); - - - /*$(document).on('click', '.btn-delete', function(e) { - Swal.fire({ - title: '', - text: '', - icon: 'warning', - showCancelButton: true, - confirmButtonColor: '#3085d6', - confirmButtonText: '', - cancelButtonText: '', - cancelButtonColor: '#d33' - }) - .then((result) => { - const dataId = $(this).data('id'); - const row = $(this).closest('tr'); - if (result.value) { - $.ajax({ - url: `/${dataId}`, - method: 'DELETE', - }).done((data, textStatus, jqXHR) => { - Toast.fire({ - icon: 'success', - title: data.msg ?? jqXHR.statusText, - }); - - theTable.clearPipeline(); - theTable.row($(row)).invalidate().draw(); - }).fail((jqXHR, textStatus, errorThrown) => { - Toast.fire({ - icon: 'error', - title: jqXHR.responseJSON.messages.error, - }); - }) - } - }); - });*/ - - - - - - endSection() ?> \ No newline at end of file diff --git a/ci4/app/Views/themes/backend/vuexy/form/clientes/cliente/_clienteDireccionesForm.php b/ci4/app/Views/themes/vuexy/form/clientes/cliente/_clienteDireccionesForm.php old mode 100755 new mode 100644 similarity index 100% rename from ci4/app/Views/themes/backend/vuexy/form/clientes/cliente/_clienteDireccionesForm.php rename to ci4/app/Views/themes/vuexy/form/clientes/cliente/_clienteDireccionesForm.php diff --git a/ci4/app/Views/themes/backend/vuexy/form/clientes/cliente/_clienteFormItems.php b/ci4/app/Views/themes/vuexy/form/clientes/cliente/_clienteFormItems.php old mode 100755 new mode 100644 similarity index 99% rename from ci4/app/Views/themes/backend/vuexy/form/clientes/cliente/_clienteFormItems.php rename to ci4/app/Views/themes/vuexy/form/clientes/cliente/_clienteFormItems.php index e80c39cb..6a488651 --- a/ci4/app/Views/themes/backend/vuexy/form/clientes/cliente/_clienteFormItems.php +++ b/ci4/app/Views/themes/vuexy/form/clientes/cliente/_clienteFormItems.php @@ -566,7 +566,7 @@
- +
@@ -628,7 +628,7 @@
- + diff --git a/ci4/app/Views/themes/backend/vuexy/form/clientes/cliente/convert2templateModal.php b/ci4/app/Views/themes/vuexy/form/clientes/cliente/convert2templateModal.php old mode 100755 new mode 100644 similarity index 100% rename from ci4/app/Views/themes/backend/vuexy/form/clientes/cliente/convert2templateModal.php rename to ci4/app/Views/themes/vuexy/form/clientes/cliente/convert2templateModal.php diff --git a/ci4/app/Views/themes/backend/vuexy/form/clientes/cliente/viewClienteForm.php b/ci4/app/Views/themes/vuexy/form/clientes/cliente/viewClienteForm.php old mode 100755 new mode 100644 similarity index 97% rename from ci4/app/Views/themes/backend/vuexy/form/clientes/cliente/viewClienteForm.php rename to ci4/app/Views/themes/vuexy/form/clientes/cliente/viewClienteForm.php index 09387422..6d5cabf2 --- a/ci4/app/Views/themes/backend/vuexy/form/clientes/cliente/viewClienteForm.php +++ b/ci4/app/Views/themes/vuexy/form/clientes/cliente/viewClienteForm.php @@ -1,7 +1,7 @@ include("themes/_commonPartialsBs/datatables") ?> include("themes/_commonPartialsBs/select2bs5") ?> include("themes/_commonPartialsBs/sweetalert") ?> -extend('themes/backend/vuexy/main/defaultlayout') ?> +extend('themes/vuexy/main/defaultlayout') ?> section("content") ?>
@@ -15,7 +15,7 @@
getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?> - +
include('themes/_commonPartialsBs/select2bs5') ?> include('themes/_commonPartialsBs/datatables') ?> include('themes/_commonPartialsBs/_confirm2delete') ?> -extend('themes/backend/vuexy/main/defaultlayout') ?> +extend('themes/vuexy/main/defaultlayout') ?> section('content'); ?>
diff --git a/ci4/app/Views/themes/backend/vuexy/form/clientes/contactos/_contactoDeClienteFormItems.php b/ci4/app/Views/themes/vuexy/form/clientes/contactos/_contactoDeClienteFormItems.php old mode 100755 new mode 100644 similarity index 100% rename from ci4/app/Views/themes/backend/vuexy/form/clientes/contactos/_contactoDeClienteFormItems.php rename to ci4/app/Views/themes/vuexy/form/clientes/contactos/_contactoDeClienteFormItems.php diff --git a/ci4/app/Views/themes/backend/vuexy/form/clientes/contactos/viewContactoDeClienteForm.php b/ci4/app/Views/themes/vuexy/form/clientes/contactos/viewContactoDeClienteForm.php old mode 100755 new mode 100644 similarity index 95% rename from ci4/app/Views/themes/backend/vuexy/form/clientes/contactos/viewContactoDeClienteForm.php rename to ci4/app/Views/themes/vuexy/form/clientes/contactos/viewContactoDeClienteForm.php index 29d2aaf8..d6ee543a --- a/ci4/app/Views/themes/backend/vuexy/form/clientes/contactos/viewContactoDeClienteForm.php +++ b/ci4/app/Views/themes/vuexy/form/clientes/contactos/viewContactoDeClienteForm.php @@ -13,7 +13,7 @@
getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?> - +
diff --git a/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosLibroItems.js b/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_datosLibroItems.js similarity index 100% rename from ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosLibroItems.js rename to ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_datosLibroItems.js diff --git a/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosLibroItems.php b/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_datosLibroItems.php old mode 100755 new mode 100644 similarity index 100% rename from ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosLibroItems.php rename to ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_datosLibroItems.php diff --git a/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosPresupuestoClienteItems.php b/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_datosPresupuestoClienteItems.php old mode 100755 new mode 100644 similarity index 100% rename from ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosPresupuestoClienteItems.php rename to ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_datosPresupuestoClienteItems.php diff --git a/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosPresupuestoItems.php b/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_datosPresupuestoItems.php old mode 100755 new mode 100644 similarity index 100% rename from ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosPresupuestoItems.php rename to ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_datosPresupuestoItems.php diff --git a/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosServiciosItems.js b/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_datosServiciosItems.js similarity index 100% rename from ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosServiciosItems.js rename to ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_datosServiciosItems.js diff --git a/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosServiciosItems.php b/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_datosServiciosItems.php old mode 100755 new mode 100644 similarity index 100% rename from ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosServiciosItems.php rename to ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_datosServiciosItems.php diff --git a/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_lineasPresupuestoItems.js b/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_lineasPresupuestoItems.js similarity index 100% rename from ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_lineasPresupuestoItems.js rename to ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_lineasPresupuestoItems.js diff --git a/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_lineasPresupuestoItems.php b/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_lineasPresupuestoItems.php old mode 100755 new mode 100644 similarity index 100% rename from ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_lineasPresupuestoItems.php rename to ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_lineasPresupuestoItems.php diff --git a/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_presupuestoDireccionesForm.php b/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_presupuestoDireccionesForm.php old mode 100755 new mode 100644 similarity index 100% rename from ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_presupuestoDireccionesForm.php rename to ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_presupuestoDireccionesForm.php diff --git a/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_presupuestos.js b/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_presupuestos.js similarity index 100% rename from ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_presupuestos.js rename to ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_presupuestos.js diff --git a/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_previewItems.php b/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_previewItems.php old mode 100755 new mode 100644 similarity index 100% rename from ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_previewItems.php rename to ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_previewItems.php diff --git a/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_resumenPresupuestoItems.php b/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_resumenPresupuestoItems.php old mode 100755 new mode 100644 similarity index 100% rename from ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_resumenPresupuestoItems.php rename to ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_resumenPresupuestoItems.php diff --git a/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_resumenPresupuestos.js b/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_resumenPresupuestos.js similarity index 100% rename from ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_resumenPresupuestos.js rename to ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_resumenPresupuestos.js diff --git a/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_tiradasAlternativasItems.js b/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_tiradasAlternativasItems.js similarity index 100% rename from ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_tiradasAlternativasItems.js rename to ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_tiradasAlternativasItems.js diff --git a/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_tiradasAlternativasItems.php b/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_tiradasAlternativasItems.php similarity index 100% rename from ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_tiradasAlternativasItems.php rename to ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_tiradasAlternativasItems.php diff --git a/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/comparador.js b/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/comparador.js old mode 100755 new mode 100644 similarity index 100% rename from ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/comparador.js rename to ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/comparador.js diff --git a/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/previews.js b/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/previews.js old mode 100755 new mode 100644 similarity index 100% rename from ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/previews.js rename to ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/previews.js diff --git a/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/viewCosidotapablandaForm.php b/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/viewCosidotapablandaForm.php old mode 100755 new mode 100644 similarity index 92% rename from ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/viewCosidotapablandaForm.php rename to ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/viewCosidotapablandaForm.php index 13af1fbd..b94ec96d --- a/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/viewCosidotapablandaForm.php +++ b/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/viewCosidotapablandaForm.php @@ -1,7 +1,7 @@ include('themes/_commonPartialsBs/datatables') ?> include("themes/_commonPartialsBs/select2bs5") ?> include("themes/_commonPartialsBs/sweetalert") ?> -extend('themes/backend/vuexy/main/defaultlayout') ?> +extend('themes/vuexy/main/defaultlayout') ?> section("content") ?> @@ -25,17 +25,17 @@ value=""> - - + + - - - - - - - - + + + + + + + + diff --git a/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/viewCosidotapablandaList.php b/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/viewCosidotapablandaList.php old mode 100755 new mode 100644 similarity index 99% rename from ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/viewCosidotapablandaList.php rename to ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/viewCosidotapablandaList.php index 4efbc0b9..a7203545 --- a/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/viewCosidotapablandaList.php +++ b/ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/viewCosidotapablandaList.php @@ -2,7 +2,7 @@ include('themes/_commonPartialsBs/datatables') ?> include('themes/_commonPartialsBs/sweetalert') ?> include('themes/_commonPartialsBs/_confirm2delete') ?> -extend('themes/backend/vuexy/main/defaultlayout') ?> +extend('themes/vuexy/main/defaultlayout') ?> section('content'); ?>
diff --git a/ci4/app/Views/themes/backend/vuexy/form/presupuestos/index.php b/ci4/app/Views/themes/vuexy/form/presupuestos/index.php old mode 100755 new mode 100644 similarity index 99% rename from ci4/app/Views/themes/backend/vuexy/form/presupuestos/index.php rename to ci4/app/Views/themes/vuexy/form/presupuestos/index.php index 0023dc5e..32145db7 --- a/ci4/app/Views/themes/backend/vuexy/form/presupuestos/index.php +++ b/ci4/app/Views/themes/vuexy/form/presupuestos/index.php @@ -1,4 +1,4 @@ -extend('themes/backend/vuexy/main/presupuestos_layout') ?> +extend('themes/vuexy/main/presupuestos_layout') ?> section('content'); ?>
diff --git a/ci4/app/Views/themes/backend/vuexy/form/presupuestos/tapa-blanda-encolada.php b/ci4/app/Views/themes/vuexy/form/presupuestos/tapa-blanda-encolada.php old mode 100755 new mode 100644 similarity index 99% rename from ci4/app/Views/themes/backend/vuexy/form/presupuestos/tapa-blanda-encolada.php rename to ci4/app/Views/themes/vuexy/form/presupuestos/tapa-blanda-encolada.php index 0c5e3176..5feb6af5 --- a/ci4/app/Views/themes/backend/vuexy/form/presupuestos/tapa-blanda-encolada.php +++ b/ci4/app/Views/themes/vuexy/form/presupuestos/tapa-blanda-encolada.php @@ -1,4 +1,4 @@ -extend('themes/backend/vuexy/main/presupuestos_layout') ?> +extend('themes/vuexy/main/presupuestos_layout') ?> section('content'); ?>
diff --git a/ci4/app/Views/themes/backend/vuexy/form/profile/index.php b/ci4/app/Views/themes/vuexy/form/profile/index.php old mode 100755 new mode 100644 similarity index 99% rename from ci4/app/Views/themes/backend/vuexy/form/profile/index.php rename to ci4/app/Views/themes/vuexy/form/profile/index.php index 5dec8ad8..e374bd92 --- a/ci4/app/Views/themes/backend/vuexy/form/profile/index.php +++ b/ci4/app/Views/themes/vuexy/form/profile/index.php @@ -1,5 +1,5 @@ include("themes/_commonPartialsBs/select2bs5") ?> -extend('themes/backend/vuexy/main/general_settings_layout') ?> +extend('themes/vuexy/main/general_settings_layout') ?> section('content'); ?> diff --git a/ci4/app/Views/themes/backend/vuexy/form/profile/index_old.php b/ci4/app/Views/themes/vuexy/form/profile/index_old.php old mode 100755 new mode 100644 similarity index 100% rename from ci4/app/Views/themes/backend/vuexy/form/profile/index_old.php rename to ci4/app/Views/themes/vuexy/form/profile/index_old.php diff --git a/ci4/app/Views/themes/backend/vuexy/form/settings/_settingsFormItems.php b/ci4/app/Views/themes/vuexy/form/settings/_settingsFormItems.php similarity index 100% rename from ci4/app/Views/themes/backend/vuexy/form/settings/_settingsFormItems.php rename to ci4/app/Views/themes/vuexy/form/settings/_settingsFormItems.php diff --git a/ci4/app/Views/themes/backend/vuexy/form/settings/viewSettingsForm.php b/ci4/app/Views/themes/vuexy/form/settings/viewSettingsForm.php similarity index 85% rename from ci4/app/Views/themes/backend/vuexy/form/settings/viewSettingsForm.php rename to ci4/app/Views/themes/vuexy/form/settings/viewSettingsForm.php index c20f054a..bbd62541 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/settings/viewSettingsForm.php +++ b/ci4/app/Views/themes/vuexy/form/settings/viewSettingsForm.php @@ -1,6 +1,6 @@ include("themes/_commonPartialsBs/select2bs5") ?> include("themes/_commonPartialsBs/sweetalert") ?> -extend('themes/backend/vuexy/main/defaultlayout') ?> +extend('themes/vuexy/main/defaultlayout') ?> section("content") ?>
@@ -12,7 +12,7 @@
getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?> - +