Merge branch 'dev/menu-tarifas-encuadernacion' into 'main'

Dev/menu tarifas encuadernacion

See merge request jjimenez/safekat!40

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

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]
         ];
 

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]
         ];
 

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]
         ];
 

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]
         ];
 

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]
         ];
 

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';

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]
         ];
 

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]
         ];
 

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]
         ];
 

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",

ci4/app/Views/themes/backend/vuexy/main/activities_layout.php

@@ -230,7 +230,7 @@ if (!empty($token) && $tfa == false) {
                                                 </div>
                                             </div>
                                             <div class="flex-grow-1">
-                                                <span class="fw-semibold d-block"><?= $session->get('first_name') . ' ' . $session->get('first_name') ?></span>
+                                                <span class="fw-semibold d-block"><?= $session->get('first_name') . ' ' . $session->get('last_name') ?></span>
                                                 <small class="text-muted">Admin</small>
                                             </div>
                                         </div>

ci4/app/Views/themes/backend/vuexy/main/all.php

@@ -463,7 +463,7 @@ if (!empty($token) && $tfa == false) {
                                                 </div>
                                             </div>
                                             <div class="flex-grow-1">
-                                                <span class="fw-semibold d-block"><?= $session->get('first_name') . ' ' . $session->get('first_name') ?></span>
+                                                <span class="fw-semibold d-block"><?= $session->get('first_name') . ' ' . $session->get('last_name') ?></span>
                                                 <small class="text-muted">Admin</small>
                                             </div>
                                         </div>

ci4/app/Views/themes/backend/vuexy/main/defaultlayout.php

@@ -233,7 +233,7 @@ if (!empty($token) && $tfa == false) {
                                                 </div>
                                             </div>
                                             <div class="flex-grow-1">
-                                                <span class="fw-semibold d-block"><?= $session->get('first_name') . ' ' . $session->get('first_name') ?></span>
+                                                <span class="fw-semibold d-block"><?= $session->get('first_name') . ' ' . $session->get('last_name') ?></span>
                                                 <small class="text-muted">Admin</small>
                                             </div>
                                         </div>

ci4/app/Views/themes/backend/vuexy/main/demo_view.php

@@ -178,7 +178,7 @@ if (!empty($token) && $tfa == false) {
                                                 </div>
                                             </div>
                                             <div class="flex-grow-1">
-                                                <span class="fw-semibold d-block"><?= $session->get('first_name') . ' ' . $session->get('first_name') ?></span>
+                                                <span class="fw-semibold d-block"><?= $session->get('first_name') . ' ' . $session->get('last_name') ?></span>
                                                 <small class="text-muted">Admin</small>
                                             </div>
                                         </div>

ci4/app/Views/themes/backend/vuexy/main/general_settings_layout.php

@@ -233,7 +233,7 @@ if (!empty($token) && $tfa == false) {
                                                 </div>
                                             </div>
                                             <div class="flex-grow-1">
-                                                <span class="fw-semibold d-block"><?= $session->get('first_name') . ' ' . $session->get('first_name') ?></span>
+                                                <span class="fw-semibold d-block"><?= $session->get('first_name') . ' ' . $session->get('last_name') ?></span>
                                                 <small class="text-muted">Admin</small>
                                             </div>
                                         </div>

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')): ?>
             <!-- Prices -->
             <li class="menu-item">
                 <a href="javascript:void(0);" class="menu-link menu-toggle">
@@ -379,6 +379,15 @@
                             </li>
                         <?php endif; ?>
                     <?php endif; ?>
+                    <?php if (count($temp = getArrayItem($menus, 'name', 'Tarifasencuadernacion')) > 0): ?>
+                        <?php if (count(getArrayItem($temp, 'methods', 'index', true)) > 0): ?>
+                            <li class="menu-item">
+                                <a href="<?= site_url("tarifas/tarifasencuadernacion") ?>" class="menu-link">
+                                    <div data-i18n="<?= lang("App.menu_encuadernacion") ?>"><?= lang("App.menu_encuadernacion") ?></div>
+                                </a>
+                            </li>
+                        <?php endif; ?>
+                    <?php endif; ?>
                     <?php if (count($temp = getArrayItem($menus, 'name', 'Tarifaenvio')) > 0): ?>
                         <?php if (count(getArrayItem($temp, 'methods', 'index', true)) > 0): ?>
                             <li class="menu-item">

ci4/app/Views/themes/backend/vuexy/main/presupuestos_layout.php

@@ -234,7 +234,7 @@ if (!empty($token) && $tfa == false) {
                                                 </div>
                                             </div>
                                             <div class="flex-grow-1">
-                                                <span class="fw-semibold d-block"><?= $session->get('first_name') . ' ' . $session->get('first_name') ?></span>
+                                                <span class="fw-semibold d-block"><?= $session->get('first_name') . ' ' . $session->get('last_name') ?></span>
                                                 <small class="text-muted">Admin</small>
                                             </div>
                                         </div>