jjimenez/safekat
1
0
Fork 0
mirror of https://git.imnavajas.es/jjimenez/safekat.git synced 2025-07-25 22:52:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Dev/menu tarifas encuadernacion

See merge request jjimenez/safekat!40
This commit is contained in:
Ignacio Martinez Navajas
2023-07-22 21:09:30 +00:00
parent 203a615103 21d2826607
commit 0af4d78f23
18 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ci4/.env
View File

@ -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

2
ci4/app/Controllers/Clientes/Cliente.php
View File

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

2
ci4/app/Controllers/Configuracion/Maquinas.php
View File

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

2
ci4/app/Controllers/Configuracion/Papelesgenericos.php
View File

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

2
ci4/app/Controllers/Configuracion/Papelesimpresion.php
View File

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

2
ci4/app/Controllers/Tarifas/Tarifaacabado.php
View File

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

2
ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineas.php
View File

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

2
ci4/app/Controllers/Tarifas/Tarifapreimpresion.php
View File

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

2
ci4/app/Controllers/Tarifas/Tarifasencuadernacion.php
View File

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

2
ci4/app/Controllers/Tarifas/Tarifasmanipulado.php
View File

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

1
ci4/app/Language/es/App.php
View File

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

2
ci4/app/Views/themes/backend/vuexy/main/activities_layout.php
View File

@ -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>

2
ci4/app/Views/themes/backend/vuexy/main/all.php
View File

@ -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>

2
ci4/app/Views/themes/backend/vuexy/main/defaultlayout.php
View File

@ -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>

2
ci4/app/Views/themes/backend/vuexy/main/demo_view.php
View File

@ -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>

2
ci4/app/Views/themes/backend/vuexy/main/general_settings_layout.php
View File

@ -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>

11
ci4/app/Views/themes/backend/vuexy/main/menu_impresion.php
View File

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

2
ci4/app/Views/themes/backend/vuexy/main/presupuestos_layout.php
View File

@ -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>