diff --git a/ci4/app/Controllers/BaseController.php b/ci4/app/Controllers/BaseController.php index 3e1c82a1..11e04e12 100755 --- a/ci4/app/Controllers/BaseController.php +++ b/ci4/app/Controllers/BaseController.php @@ -35,7 +35,7 @@ class BaseController extends Controller * * @var array */ - protected $helpers = ['general', 'go_common', 'rbac']; + protected $helpers = ['general', 'go_common', 'rbac', 'assets']; /** * Constructor. diff --git a/ci4/app/Controllers/BaseResourceController.php b/ci4/app/Controllers/BaseResourceController.php index ce3d7952..2da29e8b 100755 --- a/ci4/app/Controllers/BaseResourceController.php +++ b/ci4/app/Controllers/BaseResourceController.php @@ -85,7 +85,7 @@ abstract class BaseResourceController extends \CodeIgniter\RESTful\ResourceContr * * @var array */ - protected $helpers = ['session', 'go_common', 'form', 'text', 'general', 'rbac']; //JJO + protected $helpers = ['session', 'go_common', 'form', 'text', 'general', 'rbac', 'assets']; //JJO /** * Initializer method. diff --git a/ci4/app/Controllers/GoBaseController.php b/ci4/app/Controllers/GoBaseController.php index 992edbb4..8de2426b 100755 --- a/ci4/app/Controllers/GoBaseController.php +++ b/ci4/app/Controllers/GoBaseController.php @@ -139,7 +139,7 @@ abstract class GoBaseController extends Controller * * @var array */ - protected $helpers = ['session', 'go_common', 'text', 'general', 'jwt', 'rbac']; //JJO + protected $helpers = ['session', 'go_common', 'text', 'general', 'jwt', 'rbac', 'assets']; //JJO public static $queries = []; diff --git a/ci4/app/Helpers/assets_helper.php b/ci4/app/Helpers/assets_helper.php new file mode 100644 index 00000000..4f1631e0 --- /dev/null +++ b/ci4/app/Helpers/assets_helper.php @@ -0,0 +1,10 @@ + section("additionalExternalJs") ?> - + endSection() ?> \ No newline at end of file diff --git a/ci4/app/Views/themes/vuexy/components/chat_factura.php b/ci4/app/Views/themes/vuexy/components/chat_factura.php index 72b1f64a..642ab59f 100755 --- a/ci4/app/Views/themes/vuexy/components/chat_factura.php +++ b/ci4/app/Views/themes/vuexy/components/chat_factura.php @@ -157,6 +157,6 @@ section("additionalExternalJs") ?> - + endSection() ?> \ No newline at end of file diff --git a/ci4/app/Views/themes/vuexy/components/chat_general.php b/ci4/app/Views/themes/vuexy/components/chat_general.php index 45c1f16e..ab56ce7e 100755 --- a/ci4/app/Views/themes/vuexy/components/chat_general.php +++ b/ci4/app/Views/themes/vuexy/components/chat_general.php @@ -144,7 +144,7 @@ section("additionalExternalJs") ?> - + endSection() ?> \ No newline at end of file diff --git a/ci4/app/Views/themes/vuexy/components/chat_orden_trabajo.php b/ci4/app/Views/themes/vuexy/components/chat_orden_trabajo.php index 546e488c..ac3a1a5a 100755 --- a/ci4/app/Views/themes/vuexy/components/chat_orden_trabajo.php +++ b/ci4/app/Views/themes/vuexy/components/chat_orden_trabajo.php @@ -151,6 +151,6 @@ section("additionalExternalJs") ?> - + endSection() ?> \ No newline at end of file diff --git a/ci4/app/Views/themes/vuexy/components/chat_pedido.php b/ci4/app/Views/themes/vuexy/components/chat_pedido.php index d779f831..4ddcdaab 100755 --- a/ci4/app/Views/themes/vuexy/components/chat_pedido.php +++ b/ci4/app/Views/themes/vuexy/components/chat_pedido.php @@ -154,6 +154,6 @@ section("additionalExternalJs") ?> - + endSection() ?> \ No newline at end of file diff --git a/ci4/app/Views/themes/vuexy/components/chat_presupuesto.php b/ci4/app/Views/themes/vuexy/components/chat_presupuesto.php index 9e8d9421..9550d14d 100755 --- a/ci4/app/Views/themes/vuexy/components/chat_presupuesto.php +++ b/ci4/app/Views/themes/vuexy/components/chat_presupuesto.php @@ -152,6 +152,6 @@ section("additionalExternalJs") ?> - + endSection() ?> \ No newline at end of file diff --git a/ci4/app/Views/themes/vuexy/form/catalogo/viewCatalogoLibrosForm.php b/ci4/app/Views/themes/vuexy/form/catalogo/viewCatalogoLibrosForm.php index c7f4d423..02e7b930 100644 --- a/ci4/app/Views/themes/vuexy/form/catalogo/viewCatalogoLibrosForm.php +++ b/ci4/app/Views/themes/vuexy/form/catalogo/viewCatalogoLibrosForm.php @@ -57,5 +57,5 @@ crossorigin="anonymous" referrerpolicy="no-referrer"> + src=""> endSection() ?> \ No newline at end of file diff --git a/ci4/app/Views/themes/vuexy/form/clientes/cliente/viewClienteForm.php b/ci4/app/Views/themes/vuexy/form/clientes/cliente/viewClienteForm.php index 5ba23c96..f402d3d4 100755 --- a/ci4/app/Views/themes/vuexy/form/clientes/cliente/viewClienteForm.php +++ b/ci4/app/Views/themes/vuexy/form/clientes/cliente/viewClienteForm.php @@ -50,5 +50,5 @@ - + endSection() ?> \ No newline at end of file diff --git a/ci4/app/Views/themes/vuexy/form/clientes/cliente/viewClienteList.php b/ci4/app/Views/themes/vuexy/form/clientes/cliente/viewClienteList.php index dd4eca4e..0b540525 100755 --- a/ci4/app/Views/themes/vuexy/form/clientes/cliente/viewClienteList.php +++ b/ci4/app/Views/themes/vuexy/form/clientes/cliente/viewClienteList.php @@ -59,6 +59,6 @@ - + endSection() ?> \ No newline at end of file diff --git a/ci4/app/Views/themes/vuexy/form/clientes/plantillaprecios/viewClienteplantillapreciosForm.php b/ci4/app/Views/themes/vuexy/form/clientes/plantillaprecios/viewClienteplantillapreciosForm.php index 9358b782..d0c7c64c 100755 --- a/ci4/app/Views/themes/vuexy/form/clientes/plantillaprecios/viewClienteplantillapreciosForm.php +++ b/ci4/app/Views/themes/vuexy/form/clientes/plantillaprecios/viewClienteplantillapreciosForm.php @@ -112,6 +112,6 @@ src=""> + src=""> endSection() ?> \ No newline at end of file diff --git a/ci4/app/Views/themes/vuexy/form/clientes/plantillaprecios/viewClienteplantillapreciosList.php b/ci4/app/Views/themes/vuexy/form/clientes/plantillaprecios/viewClienteplantillapreciosList.php index ff910539..d4c65f9d 100755 --- a/ci4/app/Views/themes/vuexy/form/clientes/plantillaprecios/viewClienteplantillapreciosList.php +++ b/ci4/app/Views/themes/vuexy/form/clientes/plantillaprecios/viewClienteplantillapreciosList.php @@ -52,6 +52,6 @@ - + endSection() ?> diff --git a/ci4/app/Views/themes/vuexy/form/configuracion/error_presupuesto/viewErrorPresupuestoForm.php b/ci4/app/Views/themes/vuexy/form/configuracion/error_presupuesto/viewErrorPresupuestoForm.php index dfb2abfc..10d47200 100755 --- a/ci4/app/Views/themes/vuexy/form/configuracion/error_presupuesto/viewErrorPresupuestoForm.php +++ b/ci4/app/Views/themes/vuexy/form/configuracion/error_presupuesto/viewErrorPresupuestoForm.php @@ -84,6 +84,6 @@ endSection() ?> section("additionalExternalJs") ?> - endSection() ?> \ No newline at end of file diff --git a/ci4/app/Views/themes/vuexy/form/configuracion/error_presupuesto/viewErrorPresupuestoList.php b/ci4/app/Views/themes/vuexy/form/configuracion/error_presupuesto/viewErrorPresupuestoList.php index 08069a3b..e0ff68c7 100755 --- a/ci4/app/Views/themes/vuexy/form/configuracion/error_presupuesto/viewErrorPresupuestoList.php +++ b/ci4/app/Views/themes/vuexy/form/configuracion/error_presupuesto/viewErrorPresupuestoList.php @@ -45,6 +45,6 @@ endSection() ?> section("additionalExternalJs") ?> - endSection() ?> \ No newline at end of file diff --git a/ci4/app/Views/themes/vuexy/form/configuracion/imposiciones/viewImposicionEsquemaForm.php b/ci4/app/Views/themes/vuexy/form/configuracion/imposiciones/viewImposicionEsquemaForm.php index 73ad8f27..70674f44 100755 --- a/ci4/app/Views/themes/vuexy/form/configuracion/imposiciones/viewImposicionEsquemaForm.php +++ b/ci4/app/Views/themes/vuexy/form/configuracion/imposiciones/viewImposicionEsquemaForm.php @@ -36,6 +36,6 @@ section('additionalExternalJs') ?> - + endSection() ?> \ No newline at end of file diff --git a/ci4/app/Views/themes/vuexy/form/configuracion/imposiciones/viewImposicionForm.php b/ci4/app/Views/themes/vuexy/form/configuracion/imposiciones/viewImposicionForm.php index 1175e877..6d3ce033 100755 --- a/ci4/app/Views/themes/vuexy/form/configuracion/imposiciones/viewImposicionForm.php +++ b/ci4/app/Views/themes/vuexy/form/configuracion/imposiciones/viewImposicionForm.php @@ -35,6 +35,6 @@ section('additionalExternalJs') ?> - + endSection() ?> \ No newline at end of file diff --git a/ci4/app/Views/themes/vuexy/form/configuracion/imposiciones/viewImposicionList.php b/ci4/app/Views/themes/vuexy/form/configuracion/imposiciones/viewImposicionList.php index 21c90c19..6b677ff6 100755 --- a/ci4/app/Views/themes/vuexy/form/configuracion/imposiciones/viewImposicionList.php +++ b/ci4/app/Views/themes/vuexy/form/configuracion/imposiciones/viewImposicionList.php @@ -83,6 +83,6 @@ - + endSection() ?> \ No newline at end of file diff --git a/ci4/app/Views/themes/vuexy/form/configuracion/imposiciones/viewImposicionNewForm.php b/ci4/app/Views/themes/vuexy/form/configuracion/imposiciones/viewImposicionNewForm.php index 57c5d09f..9b836a75 100755 --- a/ci4/app/Views/themes/vuexy/form/configuracion/imposiciones/viewImposicionNewForm.php +++ b/ci4/app/Views/themes/vuexy/form/configuracion/imposiciones/viewImposicionNewForm.php @@ -35,6 +35,6 @@ section('additionalExternalJs') ?> - + endSection() ?> \ No newline at end of file diff --git a/ci4/app/Views/themes/vuexy/form/configuracion/maquinas/viewMaquinaForm.php b/ci4/app/Views/themes/vuexy/form/configuracion/maquinas/viewMaquinaForm.php index b72b4b83..f7dede10 100755 --- a/ci4/app/Views/themes/vuexy/form/configuracion/maquinas/viewMaquinaForm.php +++ b/ci4/app/Views/themes/vuexy/form/configuracion/maquinas/viewMaquinaForm.php @@ -916,7 +916,7 @@ section('additionalExternalJs') ?> - + diff --git a/ci4/app/Views/themes/vuexy/form/configuracion/maquinas/viewMaquinaList.php b/ci4/app/Views/themes/vuexy/form/configuracion/maquinas/viewMaquinaList.php index a6d48422..1e6ebf72 100755 --- a/ci4/app/Views/themes/vuexy/form/configuracion/maquinas/viewMaquinaList.php +++ b/ci4/app/Views/themes/vuexy/form/configuracion/maquinas/viewMaquinaList.php @@ -57,6 +57,6 @@ - + endSection() ?> diff --git a/ci4/app/Views/themes/vuexy/form/configuracion/messages/configView.php b/ci4/app/Views/themes/vuexy/form/configuracion/messages/configView.php index 20c7e3a0..a47b42c1 100755 --- a/ci4/app/Views/themes/vuexy/form/configuracion/messages/configView.php +++ b/ci4/app/Views/themes/vuexy/form/configuracion/messages/configView.php @@ -49,6 +49,6 @@ - + endSection() ?> \ No newline at end of file diff --git a/ci4/app/Views/themes/vuexy/form/configuracion/messages/editChatDepartmentForm.php b/ci4/app/Views/themes/vuexy/form/configuracion/messages/editChatDepartmentForm.php index 3f8316d8..2d478de5 100755 --- a/ci4/app/Views/themes/vuexy/form/configuracion/messages/editChatDepartmentForm.php +++ b/ci4/app/Views/themes/vuexy/form/configuracion/messages/editChatDepartmentForm.php @@ -34,5 +34,5 @@ - + endSection() ?> \ No newline at end of file diff --git a/ci4/app/Views/themes/vuexy/form/configuracion/papel/viewPapelImpresionForm.php b/ci4/app/Views/themes/vuexy/form/configuracion/papel/viewPapelImpresionForm.php index 55c514b4..79eeb40a 100755 --- a/ci4/app/Views/themes/vuexy/form/configuracion/papel/viewPapelImpresionForm.php +++ b/ci4/app/Views/themes/vuexy/form/configuracion/papel/viewPapelImpresionForm.php @@ -164,7 +164,7 @@ section('additionalExternalJs') ?> - + endSection() ?> diff --git a/ci4/app/Views/themes/vuexy/form/configuracion/variables/viewVariablesList.php b/ci4/app/Views/themes/vuexy/form/configuracion/variables/viewVariablesList.php index 639f57bc..d212e40d 100755 --- a/ci4/app/Views/themes/vuexy/form/configuracion/variables/viewVariablesList.php +++ b/ci4/app/Views/themes/vuexy/form/configuracion/variables/viewVariablesList.php @@ -74,5 +74,5 @@ endSection() ?> section("additionalExternalJs") ?> - + endSection() ?> \ No newline at end of file diff --git a/ci4/app/Views/themes/vuexy/form/facturas/viewFacturaForm.php b/ci4/app/Views/themes/vuexy/form/facturas/viewFacturaForm.php index 03fea05c..057a8f56 100755 --- a/ci4/app/Views/themes/vuexy/form/facturas/viewFacturaForm.php +++ b/ci4/app/Views/themes/vuexy/form/facturas/viewFacturaForm.php @@ -158,7 +158,7 @@ function validatedConfirmed(){ - + endSection() ?> diff --git a/ci4/app/Views/themes/vuexy/form/mensajes/mensajesView.php b/ci4/app/Views/themes/vuexy/form/mensajes/mensajesView.php index e89e19c9..21c5c94b 100755 --- a/ci4/app/Views/themes/vuexy/form/mensajes/mensajesView.php +++ b/ci4/app/Views/themes/vuexy/form/mensajes/mensajesView.php @@ -76,7 +76,7 @@ use Config\App; - diff --git a/ci4/app/Views/themes/vuexy/form/presupuestos/admin/_mensajeria.php b/ci4/app/Views/themes/vuexy/form/presupuestos/admin/_mensajeria.php index 762c129d..7aa0ecd2 100755 --- a/ci4/app/Views/themes/vuexy/form/presupuestos/admin/_mensajeria.php +++ b/ci4/app/Views/themes/vuexy/form/presupuestos/admin/_mensajeria.php @@ -143,7 +143,7 @@ section("additionalExternalJs") ?> - + endSection() ?> diff --git a/ci4/app/Views/themes/vuexy/form/presupuestos/admin/viewPresupuestoadminForm.php b/ci4/app/Views/themes/vuexy/form/presupuestos/admin/viewPresupuestoadminForm.php index 36dd39e3..04f5421c 100755 --- a/ci4/app/Views/themes/vuexy/form/presupuestos/admin/viewPresupuestoadminForm.php +++ b/ci4/app/Views/themes/vuexy/form/presupuestos/admin/viewPresupuestoadminForm.php @@ -308,9 +308,9 @@ - + - + diff --git a/ci4/app/Views/themes/vuexy/form/presupuestos/cliente/viewPresupuestoclienteForm.php b/ci4/app/Views/themes/vuexy/form/presupuestos/cliente/viewPresupuestoclienteForm.php index 7118c132..31185a22 100755 --- a/ci4/app/Views/themes/vuexy/form/presupuestos/cliente/viewPresupuestoclienteForm.php +++ b/ci4/app/Views/themes/vuexy/form/presupuestos/cliente/viewPresupuestoclienteForm.php @@ -287,6 +287,6 @@ + src=""> endSection() ?> \ No newline at end of file diff --git a/ci4/app/Views/themes/vuexy/form/presupuestos/importador/viewImportadorPresupuestos.php b/ci4/app/Views/themes/vuexy/form/presupuestos/importador/viewImportadorPresupuestos.php index 14945aba..4250ba1e 100755 --- a/ci4/app/Views/themes/vuexy/form/presupuestos/importador/viewImportadorPresupuestos.php +++ b/ci4/app/Views/themes/vuexy/form/presupuestos/importador/viewImportadorPresupuestos.php @@ -404,6 +404,6 @@ section('additionalExternalJs') ?> + src=""> endSection() ?> \ No newline at end of file diff --git a/ci4/app/Views/themes/vuexy/form/produccion/viewOrdenTrabajoEdit.php b/ci4/app/Views/themes/vuexy/form/produccion/viewOrdenTrabajoEdit.php index c57b532f..c7823825 100755 --- a/ci4/app/Views/themes/vuexy/form/produccion/viewOrdenTrabajoEdit.php +++ b/ci4/app/Views/themes/vuexy/form/produccion/viewOrdenTrabajoEdit.php @@ -110,5 +110,5 @@ - + endSection() ?> \ No newline at end of file diff --git a/ci4/app/Views/themes/vuexy/form/soporte/viewTicketForm.php b/ci4/app/Views/themes/vuexy/form/soporte/viewTicketForm.php index 785c45a4..29564223 100755 --- a/ci4/app/Views/themes/vuexy/form/soporte/viewTicketForm.php +++ b/ci4/app/Views/themes/vuexy/form/soporte/viewTicketForm.php @@ -199,6 +199,6 @@ section('additionalExternalJs') ?> - + endSection() ?> \ No newline at end of file diff --git a/ci4/app/Views/themes/vuexy/form/soporte/viewTicketList.php b/ci4/app/Views/themes/vuexy/form/soporte/viewTicketList.php index b022bbee..a0310b59 100755 --- a/ci4/app/Views/themes/vuexy/form/soporte/viewTicketList.php +++ b/ci4/app/Views/themes/vuexy/form/soporte/viewTicketList.php @@ -72,5 +72,5 @@ - + endSection() ?> diff --git a/ci4/app/Views/themes/vuexy/form/tarifas/acabado/viewTarifaAcabadoForm.php b/ci4/app/Views/themes/vuexy/form/tarifas/acabado/viewTarifaAcabadoForm.php index 723ea15c..0bb5b2fc 100755 --- a/ci4/app/Views/themes/vuexy/form/tarifas/acabado/viewTarifaAcabadoForm.php +++ b/ci4/app/Views/themes/vuexy/form/tarifas/acabado/viewTarifaAcabadoForm.php @@ -81,7 +81,7 @@ endSection() ?> section("additionalExternalJs") ?> - + endSection() ?> section("additionalInlineJs") ?> diff --git a/ci4/app/Views/themes/vuexy/form/tarifas/encuadernacion/viewTarifaEncuadernacionForm.php b/ci4/app/Views/themes/vuexy/form/tarifas/encuadernacion/viewTarifaEncuadernacionForm.php index 235d92d3..a4eba27b 100755 --- a/ci4/app/Views/themes/vuexy/form/tarifas/encuadernacion/viewTarifaEncuadernacionForm.php +++ b/ci4/app/Views/themes/vuexy/form/tarifas/encuadernacion/viewTarifaEncuadernacionForm.php @@ -148,7 +148,7 @@ endSection() ?> section("additionalExternalJs") ?> - + endSection() ?> diff --git a/ci4/app/Views/themes/vuexy/form/tarifas/manipulado/viewTarifaManipuladoForm.php b/ci4/app/Views/themes/vuexy/form/tarifas/manipulado/viewTarifaManipuladoForm.php index f9822845..29e24557 100755 --- a/ci4/app/Views/themes/vuexy/form/tarifas/manipulado/viewTarifaManipuladoForm.php +++ b/ci4/app/Views/themes/vuexy/form/tarifas/manipulado/viewTarifaManipuladoForm.php @@ -82,7 +82,7 @@ endSection() ?> section("additionalExternalJs") ?> - + endSection() ?> diff --git a/ci4/app/Views/themes/vuexy/form/user/viewUserList.php b/ci4/app/Views/themes/vuexy/form/user/viewUserList.php index e72c8c3f..4de24f1a 100755 --- a/ci4/app/Views/themes/vuexy/form/user/viewUserList.php +++ b/ci4/app/Views/themes/vuexy/form/user/viewUserList.php @@ -55,6 +55,6 @@ - + endSection() ?> diff --git a/ci4/app/Views/themes/vuexy/main/defaultlayout.php b/ci4/app/Views/themes/vuexy/main/defaultlayout.php index c41ca8c8..f91a0def 100755 --- a/ci4/app/Views/themes/vuexy/main/defaultlayout.php +++ b/ci4/app/Views/themes/vuexy/main/defaultlayout.php @@ -363,8 +363,8 @@ $picture = "/assets/img/default-user.png"; - - + + diff --git a/ci4/app/Views/themes/vuexy/pdfs/albaran-anonimo.php b/ci4/app/Views/themes/vuexy/pdfs/albaran-anonimo.php index 7e7fed67..d6ec398c 100644 --- a/ci4/app/Views/themes/vuexy/pdfs/albaran-anonimo.php +++ b/ci4/app/Views/themes/vuexy/pdfs/albaran-anonimo.php @@ -6,7 +6,7 @@ - +