Merge branch 'bugs/varios' into 'main'

Bugs/varios

See merge request jjimenez/safekat!321
This commit is contained in:
Ignacio Martinez Navajas
2024-09-13 19:09:29 +00:00
5 changed files with 146 additions and 77 deletions

View File

@ -138,6 +138,9 @@ $picture = "/assets/img/default-user.png";
<!--/ Search Budgets --> <!--/ Search Budgets -->
<!-- View Mode links --> <!-- View Mode links -->
<?php
if (auth()->user()->inGroup('beta')) :
?>
<li class="nav-item dropdown-shortcuts navbar-dropdown dropdown me-2 me-xl-0"> <li class="nav-item dropdown-shortcuts navbar-dropdown dropdown me-2 me-xl-0">
<a <a
class="nav-link dropdown-toggle hide-arrow" class="nav-link dropdown-toggle hide-arrow"
@ -188,6 +191,9 @@ $picture = "/assets/img/default-user.png";
</div> </div>
</div> </div>
</li> </li>
<?php
endif;
?>
<!-- View Mode links --> <!-- View Mode links -->
<!-- Language --> <!-- Language -->

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

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 } ?>

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 } ?>

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,6 +145,9 @@ if (!empty($token) && $tfa == false) {
<!--/ Search Budgets --> <!--/ Search Budgets -->
<!-- View Mode links --> <!-- View Mode links -->
<?php
if (auth()->user()->inGroup('beta')) :
?>
<li class="nav-item dropdown-shortcuts navbar-dropdown dropdown me-2 me-xl-0"> <li class="nav-item dropdown-shortcuts navbar-dropdown dropdown me-2 me-xl-0">
<a <a
class="nav-link dropdown-toggle hide-arrow" class="nav-link dropdown-toggle hide-arrow"
@ -204,6 +198,9 @@ if (!empty($token) && $tfa == false) {
</div> </div>
</div> </div>
</li> </li>
<?php
endif;
?>
<!-- View Mode links --> <!-- View Mode links -->
<!-- Language --> <!-- Language -->