diff --git a/ci4/.env b/ci4/.env index d1721449..347f66d5 100644 --- a/ci4/.env +++ b/ci4/.env @@ -22,7 +22,7 @@ CI_ENVIRONMENT = development # APP #-------------------------------------------------------------------- -app.baseURL = 'https://sk-jjo.imnavajas.es' +app.baseURL = 'https://sk-imn.imnavajas.es' #app.baseURL = 'https://sk-imn.imnavajas.es' # app.baseURL = "http://safekat.test/" # app.forceGlobalSecureRequests = false @@ -114,9 +114,9 @@ database.default.dump = # SECURITY #-------------------------------------------------------------------- - security.tokenName = 'webguard_token' + security.tokenName = 'safekat_token' security.headerName = 'X-CSRF-TOKEN' - security.cookieName = 'webguard_cookie' + security.cookieName = 'safekat_cookie' security.expires = 7200 security.regenerate = true security.redirect = true diff --git a/ci4/app/Controllers/Clientes/Cliente.php b/ci4/app/Controllers/Clientes/Cliente.php index 2ae6d61a..d019e862 100644 --- a/ci4/app/Controllers/Clientes/Cliente.php +++ b/ci4/app/Controllers/Clientes/Cliente.php @@ -43,7 +43,7 @@ class Cliente extends \App\Controllers\GoBaseResourceController { // Breadcrumbs (IMN) $this->viewData['breadcrumb'] = [ - ['title' => lang("App.menu_clientes"), 'route' => "", 'active' => false], + ['title' => lang("App.menu_clientes"), 'route' => "javascript:void(0);", 'active' => false], ['title' => lang("App.menu_cliente"), 'route' => site_url('clientes/cliente'), 'active' => true] ]; diff --git a/ci4/app/Controllers/Configuracion/Maquinas.php b/ci4/app/Controllers/Configuracion/Maquinas.php index 9a6eaa02..91e9c361 100644 --- a/ci4/app/Controllers/Configuracion/Maquinas.php +++ b/ci4/app/Controllers/Configuracion/Maquinas.php @@ -40,7 +40,7 @@ class Maquinas extends \App\Controllers\GoBaseResourceController { // Breadcrumbs (IMN) $this->viewData['breadcrumb'] = [ - ['title' => lang("App.menu_configuration"), 'route' => "", 'active' => false], + ['title' => lang("App.menu_configuration"), 'route' => "javascript:void(0);", 'active' => false], ['title' => lang("App.menu_maquina"), 'route' => site_url('configuracion/maquinas'), 'active' => true] ]; diff --git a/ci4/app/Controllers/Configuracion/Papelesgenericos.php b/ci4/app/Controllers/Configuracion/Papelesgenericos.php index 8f24642e..407abe29 100644 --- a/ci4/app/Controllers/Configuracion/Papelesgenericos.php +++ b/ci4/app/Controllers/Configuracion/Papelesgenericos.php @@ -42,7 +42,7 @@ class Papelesgenericos extends \App\Controllers\GoBaseResourceController // Breadcrumbs (IMN) $this->viewData['breadcrumb'] = [ - ['title' => lang("App.menu_configuration"), 'route' => "", 'active' => false], + ['title' => lang("App.menu_configuration"), 'route' => "javascript:void(0);", 'active' => false], ['title' => lang("App.menu_papelgenerico"), 'route' => site_url('configuracion/papelesgenericos'), 'active' => true] ]; diff --git a/ci4/app/Controllers/Configuracion/Papelesimpresion.php b/ci4/app/Controllers/Configuracion/Papelesimpresion.php index 716259cf..05143b21 100644 --- a/ci4/app/Controllers/Configuracion/Papelesimpresion.php +++ b/ci4/app/Controllers/Configuracion/Papelesimpresion.php @@ -65,7 +65,7 @@ class Papelesimpresion extends \App\Controllers\GoBaseResourceController // Breadcrumbs $this->viewData['breadcrumb'] = [ - ['title' => lang("App.menu_configuration"), 'route' => "", 'active' => false], + ['title' => lang("App.menu_configuration"), 'route' => "javascript:void(0);", 'active' => false], ['title' => lang("App.menu_papelimpresion"), 'route' => site_url('configuracion/papelesimpresion'), 'active' => true] ]; diff --git a/ci4/app/Controllers/Tarifas/Tarifaacabado.php b/ci4/app/Controllers/Tarifas/Tarifaacabado.php index 289ada4e..87019c48 100644 --- a/ci4/app/Controllers/Tarifas/Tarifaacabado.php +++ b/ci4/app/Controllers/Tarifas/Tarifaacabado.php @@ -41,7 +41,7 @@ class Tarifaacabado extends \App\Controllers\GoBaseResourceController // Breadcrumbs $this->viewData['breadcrumb'] = [ - ['title' => lang("App.menu_tarifas"), 'route' => "", 'active' => false], + ['title' => lang("App.menu_tarifas"), 'route' => "javascript:void(0);", 'active' => false], ['title' => lang("App.menu_tarifaacabado"), 'route' => site_url('tarifas/tarifaacabado'), 'active' => true] ]; diff --git a/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineas.php b/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineas.php index 407d5a26..178dbf92 100644 --- a/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineas.php +++ b/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineas.php @@ -21,7 +21,7 @@ use DataTables\Editor\ValidateOptions; -class Tarifaencuadernacionlineas extends \App\Controllers\GoBaseResourceController { +class Tarifaencuadernacionlineas extends \App\Controllers\GoBaseResourceController { protected $modelName = TarifaEncuadernacionLineaModel::class; protected $format = 'json'; diff --git a/ci4/app/Controllers/Tarifas/Tarifapreimpresion.php b/ci4/app/Controllers/Tarifas/Tarifapreimpresion.php index 81939631..6a0f0742 100644 --- a/ci4/app/Controllers/Tarifas/Tarifapreimpresion.php +++ b/ci4/app/Controllers/Tarifas/Tarifapreimpresion.php @@ -29,7 +29,7 @@ class Tarifapreimpresion extends \App\Controllers\GoBaseController { // Breadcrumbs $this->viewData['breadcrumb'] = [ - ['title' => lang("App.menu_tarifas"), 'route' => "", 'active' => false], + ['title' => lang("App.menu_tarifas"), 'route' => "javascript:void(0);", 'active' => false], ['title' => lang("App.menu_tarifapreimpresion"), 'route' => site_url('tarifas/tarifapreimpresion'), 'active' => true] ]; diff --git a/ci4/app/Controllers/Tarifas/Tarifasencuadernacion.php b/ci4/app/Controllers/Tarifas/Tarifasencuadernacion.php index 7c4d5421..b39ad5c3 100644 --- a/ci4/app/Controllers/Tarifas/Tarifasencuadernacion.php +++ b/ci4/app/Controllers/Tarifas/Tarifasencuadernacion.php @@ -40,7 +40,7 @@ class Tarifasencuadernacion extends \App\Controllers\GoBaseResourceController { // Breadcrumbs $this->viewData['breadcrumb'] = [ - ['title' => lang("App.menu_tarifas"), 'route' => "", 'active' => false], + ['title' => lang("App.menu_tarifas"), 'route' => "javascript:void(0);", 'active' => false], ['title' => lang("App.menu_tarifaencuadernacion"), 'route' => site_url('tarifas/tarifasencuadernacion'), 'active' => true] ]; diff --git a/ci4/app/Controllers/Tarifas/Tarifasmanipulado.php b/ci4/app/Controllers/Tarifas/Tarifasmanipulado.php index c203f17c..a5d5b9b2 100644 --- a/ci4/app/Controllers/Tarifas/Tarifasmanipulado.php +++ b/ci4/app/Controllers/Tarifas/Tarifasmanipulado.php @@ -40,7 +40,7 @@ class Tarifasmanipulado extends \App\Controllers\GoBaseResourceController { // Breadcrumbs $this->viewData['breadcrumb'] = [ - ['title' => lang("App.menu_tarifas"), 'route' => "", 'active' => false], + ['title' => lang("App.menu_tarifas"), 'route' => "javascript:void(0);", 'active' => false], ['title' => lang("App.menu_tarifamanipulado"), 'route' => site_url('tarifas/tarifasmanipulado'), 'active' => true] ]; diff --git a/ci4/app/Language/es/App.php b/ci4/app/Language/es/App.php index c2c074a9..3a15357b 100644 --- a/ci4/app/Language/es/App.php +++ b/ci4/app/Language/es/App.php @@ -765,6 +765,7 @@ return [ "menu_tarifapapeldefecto" => "Papel defecto", "menu_tarifaenvio" => "Envío", "menu_tarifaimpresion" => "Impresión", + "menu_encuadernacion" => "Encuadernación", "menu_users" => "Usuarios", "menu_permission_group" => "Roles y permisos", diff --git a/ci4/app/Views/themes/backend/vuexy/main/activities_layout.php b/ci4/app/Views/themes/backend/vuexy/main/activities_layout.php index bd2a4e67..fb37147c 100644 --- a/ci4/app/Views/themes/backend/vuexy/main/activities_layout.php +++ b/ci4/app/Views/themes/backend/vuexy/main/activities_layout.php @@ -230,7 +230,7 @@ if (!empty($token) && $tfa == false) {
- get('first_name') . ' ' . $session->get('first_name') ?> + get('first_name') . ' ' . $session->get('last_name') ?> Admin
diff --git a/ci4/app/Views/themes/backend/vuexy/main/all.php b/ci4/app/Views/themes/backend/vuexy/main/all.php index fc100a31..c7127724 100644 --- a/ci4/app/Views/themes/backend/vuexy/main/all.php +++ b/ci4/app/Views/themes/backend/vuexy/main/all.php @@ -463,7 +463,7 @@ if (!empty($token) && $tfa == false) {
- get('first_name') . ' ' . $session->get('first_name') ?> + get('first_name') . ' ' . $session->get('last_name') ?> Admin
diff --git a/ci4/app/Views/themes/backend/vuexy/main/defaultlayout.php b/ci4/app/Views/themes/backend/vuexy/main/defaultlayout.php index 991f9015..8f4932fc 100644 --- a/ci4/app/Views/themes/backend/vuexy/main/defaultlayout.php +++ b/ci4/app/Views/themes/backend/vuexy/main/defaultlayout.php @@ -233,7 +233,7 @@ if (!empty($token) && $tfa == false) {
- get('first_name') . ' ' . $session->get('first_name') ?> + get('first_name') . ' ' . $session->get('last_name') ?> Admin
diff --git a/ci4/app/Views/themes/backend/vuexy/main/demo_view.php b/ci4/app/Views/themes/backend/vuexy/main/demo_view.php index 496f4006..5c96ceb5 100644 --- a/ci4/app/Views/themes/backend/vuexy/main/demo_view.php +++ b/ci4/app/Views/themes/backend/vuexy/main/demo_view.php @@ -178,7 +178,7 @@ if (!empty($token) && $tfa == false) {
- get('first_name') . ' ' . $session->get('first_name') ?> + get('first_name') . ' ' . $session->get('last_name') ?> Admin
diff --git a/ci4/app/Views/themes/backend/vuexy/main/general_settings_layout.php b/ci4/app/Views/themes/backend/vuexy/main/general_settings_layout.php index 1da9e545..67d418c0 100644 --- a/ci4/app/Views/themes/backend/vuexy/main/general_settings_layout.php +++ b/ci4/app/Views/themes/backend/vuexy/main/general_settings_layout.php @@ -233,7 +233,7 @@ if (!empty($token) && $tfa == false) {
- get('first_name') . ' ' . $session->get('first_name') ?> + get('first_name') . ' ' . $session->get('last_name') ?> Admin
diff --git a/ci4/app/Views/themes/backend/vuexy/main/menu_impresion.php b/ci4/app/Views/themes/backend/vuexy/main/menu_impresion.php index 7ad6c713..12f6d562 100644 --- a/ci4/app/Views/themes/backend/vuexy/main/menu_impresion.php +++ b/ci4/app/Views/themes/backend/vuexy/main/menu_impresion.php @@ -344,7 +344,7 @@ * MENU TARIFAS */ if (allowMenuSection($menus, - ['Tarifapreimpresion', 'Tarifamanipulado', 'Tarifaacabado', 'Tarifaenvio'], 'index')): ?> + ['Tarifapreimpresion', 'Tarifasmanipulado', 'Tarifaacabado', 'Tarifaenvio', 'Tarifasencuadernacion'], 'index')): ?>
  • @@ -379,6 +379,15 @@
    • + 0): ?> + 0): ?> +
  • + " class="menu-link"> +
    ">
    +     +
    • + + 0): ?> 0): ?>
  • diff --git a/ci4/app/Views/themes/backend/vuexy/main/presupuestos_layout.php b/ci4/app/Views/themes/backend/vuexy/main/presupuestos_layout.php index 2b95148c..ae5a4b4d 100644 --- a/ci4/app/Views/themes/backend/vuexy/main/presupuestos_layout.php +++ b/ci4/app/Views/themes/backend/vuexy/main/presupuestos_layout.php @@ -234,7 +234,7 @@ if (!empty($token) && $tfa == false) {
    - get('first_name') . ' ' . $session->get('first_name') ?> + get('first_name') . ' ' . $session->get('last_name') ?> Admin