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 'bugs/varios' into 'main'

Browse Source 
Bugs/varios

See merge request jjimenez/safekat!321
This commit is contained in:
Ignacio Martinez Navajas
2024-09-13 19:09:29 +00:00
parent 9e57aef8bc 2239d39919
commit 6e0c22d981
5 changed files with 146 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -138,56 +138,62 @@ $picture = "/assets/img/default-user.png";
<!--/ Search Budgets --> <!--/ Search Budgets -->
<!-- View Mode links --> <!-- View Mode links -->
<li class="nav-item dropdown-shortcuts navbar-dropdown dropdown me-2 me-xl-0"> <?php
<a if (auth()->user()->inGroup('beta')) :
class="nav-link dropdown-toggle hide-arrow" ?>
href="javascript:void(0);" <li class="nav-item dropdown-shortcuts navbar-dropdown dropdown me-2 me-xl-0">
data-bs-toggle="dropdown" <a
data-bs-auto-close="outside" class="nav-link dropdown-toggle hide-arrow"
aria-expanded="false" href="javascript:void(0);"
> data-bs-toggle="dropdown"
<i class="ti ti-building ti-md"></i> data-bs-auto-close="outside"
</a> aria-expanded="false"
<div class="dropdown-menu dropdown-menu-end py-0"> >
<div class="dropdown-menu-header border-bottom"> <i class="ti ti-building ti-md"></i>
<div class="dropdown-header d-flex align-items-center py-3"> </a>
<h5 class="text-body mb-0 me-auto">Vistas</h5> <div class="dropdown-menu dropdown-menu-end py-0">
<div class="dropdown-menu-header border-bottom">
<div class="dropdown-header d-flex align-items-center py-3">
<h5 class="text-body mb-0 me-auto">Vistas</h5>
</div>
</div> </div>
</div>
<div class="dropdown-shortcuts-list scrollable-container"> <div class="dropdown-shortcuts-list scrollable-container">
<div class="row row-bordered overflow-visible g-0"> <div class="row row-bordered overflow-visible g-0">
<div class="dropdown-shortcuts-item col"> <div class="dropdown-shortcuts-item col">
<span class="dropdown-shortcuts-icon rounded-circle mb-2"> <span class="dropdown-shortcuts-icon rounded-circle mb-2">
<i class="ti ti-printer fs-4"></i> <i class="ti ti-printer fs-4"></i>
</span> </span>
<small class="text-muted mb-0">Vista</small> <small class="text-muted mb-0">Vista</small>
<a href="<?= site_url('viewmode/' . config("Basics")->vista_impresion); ?>" <a href="<?= site_url('viewmode/' . config("Basics")->vista_impresion); ?>"
class="stretched-link">Impresión</a> class="stretched-link">Impresión</a>
</div> </div>
<div class="dropdown-shortcuts-item col"> <div class="dropdown-shortcuts-item col">
<span class="dropdown-shortcuts-icon rounded-circle mb-2"> <span class="dropdown-shortcuts-icon rounded-circle mb-2">
<i class="ti ti-ruler-2 fs-4"></i> <i class="ti ti-ruler-2 fs-4"></i>
</span> </span>
<small class="text-muted mb-0">Vista</small> <small class="text-muted mb-0">Vista</small>
<a href="<?= site_url('viewmode/' . config("Basics")->vista_maquetacion); ?>" <a href="<?= site_url('viewmode/' . config("Basics")->vista_maquetacion); ?>"
class="stretched-link">Maquetación</a> class="stretched-link">Maquetación</a>
</div>
</div> </div>
</div> <div class="row row-bordered overflow-visible g-0">
<div class="row row-bordered overflow-visible g-0"> <div class="dropdown-shortcuts-item col">
<div class="dropdown-shortcuts-item col">
<span class="dropdown-shortcuts-icon rounded-circle mb-2"> <span class="dropdown-shortcuts-icon rounded-circle mb-2">
<i class="ti ti-file-code-2 fs-4"></i> <i class="ti ti-file-code-2 fs-4"></i>
</span> </span>
<small class="text-muted mb-0">Vista</small> <small class="text-muted mb-0">Vista</small>
<a href="<?= site_url('viewmode/' . config("Basics")->vista_digitalizacion); ?>" <a href="<?= site_url('viewmode/' . config("Basics")->vista_digitalizacion); ?>"
class="stretched-link">Digitalización</a> class="stretched-link">Digitalización</a>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </li>
</li> <?php
endif;
?>
<!-- View Mode links --> <!-- View Mode links -->
<!-- Language --> <!-- Language -->

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

@ -28,6 +28,8 @@
require "menus/pedidos_menu.php"; require "menus/pedidos_menu.php";
require "menus/pedidos_cliente_menu.php";
require "menus/produccion_menu.php"; require "menus/produccion_menu.php";
require "menus/importacion_menu.php"; require "menus/importacion_menu.php";
@ -36,6 +38,8 @@
require "menus/facturacion_menu.php"; require "menus/facturacion_menu.php";
require "menus/facturacion_cliente_menu.php";
require "menus/logistica_menu.php"; require "menus/logistica_menu.php";
require "menus/tarifas_menu.php"; require "menus/tarifas_menu.php";

26
ci4/app/Views/themes/vuexy/main/menus/facturacion_cliente_menu.php Normal file
View File

@ -0,0 +1,26 @@
<?php
/**
* MENU FACTURACION
*/
if (auth()->user()->inGroup('cliente-admin') || auth()->user()->inGroup('cliente-editor')) {
?>
<!-- Invoicing -->
<li class="menu-item">
<a href="javascript:void(0);" class="menu-link menu-toggle">
<i class="menu-icon tf-icons ti ti-file-dollar"></i>
<?= lang("App.menu_facturación") ?>
</a>
<ul class="menu-sub">
<li class="menu-item">
<a href="<?= site_url("facturas/list") ?>" class="menu-link">
<?= lang("App.menu_facturas") ?>
</a>
</li>
<li class="menu-item">
<a href="<?= site_url("facturas/albaranes") ?>" class="menu-link">
<?= lang("App.menu_albaran") ?>
</a>
</li>
</ul>
</li>
<?php } ?>

36
ci4/app/Views/themes/vuexy/main/menus/pedidos_cliente_menu.php Normal file
View File

@ -0,0 +1,36 @@
<?php
/**
* MENU PEDIDOS
*/
if (auth()->user()->inGroup('cliente-admin') || auth()->user()->inGroup('cliente-editor')) {
?>
<!-- Orders -->
<li class="menu-item">
<a href="javascript:void(0);" class="menu-link menu-toggle">
<i class="menu-icon tf-icons ti ti-file-description"></i>
<?= lang("App.menu_pedidos") ?>
</a>
<ul class="menu-sub">
<li class="menu-item">
<a href="<?= site_url("pedidos/pedido/activos") ?>" class="menu-link">
<?= lang("App.menu_pedidos_activos") ?>
</a>
</li>
<li class="menu-item">
<a href="<?= site_url("pedidos/pedido/finalizados") ?>" class="menu-link">
<?= lang("App.menu_pedidos_finalizados") ?>
</a>
</li>
<li class="menu-item">
<a href="<?= site_url("pedidos/pedido/cancelados") ?>" class="menu-link">
<?= lang("App.menu_pedidos_cancelados") ?>
</a>
</li>
<li class="menu-item">
<a href="<?= site_url("pedidos/pedido/todos") ?>" class="menu-link">
<?= lang("App.menu_pedidos_todos") ?>
</a>
</li>
</ul>
</li>
<?php } ?>

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

@ -1,16 +1,7 @@
<?php <?php
$session = session(); $session = session();
$token = $session->get('token') ?? '';
$tfa = $session->get('tfa') ?? false;
$settings = $session->get('settings'); $settings = $session->get('settings');
$picture = "/assets/img/default-user.png"; $picture = "/assets/img/default-user.png";
$pulse = session()->get('pulse');
$notification = session()->get('notification');
if (!empty($token) && $tfa == false) {
//echo "<script>window.location.href = '/'; </script>";
}
?> ?>
<!DOCTYPE html> <!DOCTYPE html>
@ -154,56 +145,62 @@ if (!empty($token) && $tfa == false) {
<!--/ Search Budgets --> <!--/ Search Budgets -->
<!-- View Mode links --> <!-- View Mode links -->
<li class="nav-item dropdown-shortcuts navbar-dropdown dropdown me-2 me-xl-0"> <?php
<a if (auth()->user()->inGroup('beta')) :
class="nav-link dropdown-toggle hide-arrow" ?>
href="javascript:void(0);" <li class="nav-item dropdown-shortcuts navbar-dropdown dropdown me-2 me-xl-0">
data-bs-toggle="dropdown" <a
data-bs-auto-close="outside" class="nav-link dropdown-toggle hide-arrow"
aria-expanded="false" href="javascript:void(0);"
> data-bs-toggle="dropdown"
<i class="ti ti-building ti-md"></i> data-bs-auto-close="outside"
</a> aria-expanded="false"
<div class="dropdown-menu dropdown-menu-end py-0"> >
<div class="dropdown-menu-header border-bottom"> <i class="ti ti-building ti-md"></i>
<div class="dropdown-header d-flex align-items-center py-3"> </a>
<h5 class="text-body mb-0 me-auto">Vistas</h5> <div class="dropdown-menu dropdown-menu-end py-0">
<div class="dropdown-menu-header border-bottom">
<div class="dropdown-header d-flex align-items-center py-3">
<h5 class="text-body mb-0 me-auto">Vistas</h5>
</div>
</div> </div>
</div>
<div class="dropdown-shortcuts-list scrollable-container"> <div class="dropdown-shortcuts-list scrollable-container">
<div class="row row-bordered overflow-visible g-0"> <div class="row row-bordered overflow-visible g-0">
<div class="dropdown-shortcuts-item col"> <div class="dropdown-shortcuts-item col">
<span class="dropdown-shortcuts-icon rounded-circle mb-2"> <span class="dropdown-shortcuts-icon rounded-circle mb-2">
<i class="ti ti-printer fs-4"></i> <i class="ti ti-printer fs-4"></i>
</span> </span>
<small class="text-muted mb-0">Vista</small> <small class="text-muted mb-0">Vista</small>
<a href="<?= site_url('viewmode/' . config("Basics")->vista_impresion); ?>" <a href="<?= site_url('viewmode/' . config("Basics")->vista_impresion); ?>"
class="stretched-link">Impresión</a> class="stretched-link">Impresión</a>
</div> </div>
<div class="dropdown-shortcuts-item col"> <div class="dropdown-shortcuts-item col">
<span class="dropdown-shortcuts-icon rounded-circle mb-2"> <span class="dropdown-shortcuts-icon rounded-circle mb-2">
<i class="ti ti-ruler-2 fs-4"></i> <i class="ti ti-ruler-2 fs-4"></i>
</span> </span>
<small class="text-muted mb-0">Vista</small> <small class="text-muted mb-0">Vista</small>
<a href="<?= site_url('viewmode/' . config("Basics")->vista_maquetacion); ?>" <a href="<?= site_url('viewmode/' . config("Basics")->vista_maquetacion); ?>"
class="stretched-link">Maquetación</a> class="stretched-link">Maquetación</a>
</div>
</div> </div>
</div> <div class="row row-bordered overflow-visible g-0">
<div class="row row-bordered overflow-visible g-0"> <div class="dropdown-shortcuts-item col">
<div class="dropdown-shortcuts-item col">
<span class="dropdown-shortcuts-icon rounded-circle mb-2"> <span class="dropdown-shortcuts-icon rounded-circle mb-2">
<i class="ti ti-file-code-2 fs-4"></i> <i class="ti ti-file-code-2 fs-4"></i>
</span> </span>
<small class="text-muted mb-0">Vista</small> <small class="text-muted mb-0">Vista</small>
<a href="<?= site_url('viewmode/' . config("Basics")->vista_digitalizacion); ?>" <a href="<?= site_url('viewmode/' . config("Basics")->vista_digitalizacion); ?>"
class="stretched-link">Digitalización</a> class="stretched-link">Digitalización</a>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </li>
</li> <?php
endif;
?>
<!-- View Mode links --> <!-- View Mode links -->
<!-- Language --> <!-- Language -->