Merge branch 'main' into 'feat/backups'

arreglado albaranes para que muestren las cajas. tambien se ha actualizado...

See merge request jjimenez/safekat!856
This commit is contained in:
Ignacio Martinez Navajas
2025-06-09 08:08:21 +00:00
260 changed files with 11053 additions and 3987 deletions

View File

@ -25,11 +25,13 @@ if (auth()->user()->can('catalogo.menu')) {
</a>
</li>
<?php } ?>
<li class="menu-item">
<a href="<?= site_url("catalogo/catalogo/importar") ?>" class="menu-link beta">
<?= lang("App.menu_catalogo_importar") ?>
</a>
</li>
<?php if (auth()->user()->inGroup('beta')) { ?>
<li class="menu-item">
<a href="<?= site_url("catalogo/catalogo/importar") ?>" class="menu-link beta">
<?= lang("App.menu_catalogo_importar") ?>
</a>
</li>
<?php } ?>
</ul>
</li>
<?php } ?>

View File

@ -1,6 +1,9 @@
<li class="menu-item active">
<?php
/**
* MENU DASHBOARD
*/
?>
<li class="menu-item <?= uri_string() === '' ? 'active' : '' ?>">
<a href="<?= route_to("home") ?>" class="menu-link">
<i class="menu-icon tf-icons ti ti-dashboard"></i>
<div><?= lang("App.menu_dashboard") ?></div>

View File

@ -3,14 +3,12 @@
/**
* MENU LOGISTICA
*/
if (auth()->user()->inGroup('beta')) {
if (auth()->user()->can('logistica.menu')) {
?>
<!-- Logistic -->
<li class="menu-item">
<a href="<?= route_to("LogisticaPanel") ?>" class="menu-link">
<i class="menu-icon tf-icons ti ti-truck"></i>
<div> <?= lang("App.menu_logistica") ?></div>
</a>
</li>
<?php } ?>

View File

@ -22,11 +22,6 @@ if (auth()->user()->inGroup('maquina','admin')) {
<div><?= lang("App.menu_maquinista_colas") ?></div>
</a>
</li>
<li class="menu-item">
<a href="<?= route_to("viewProduccionMaquinistaMantenimiento") ?>" class="menu-link beta">
<div><?= lang("App.menu_maquinista_mantenimiento") ?></div>
</a>
</li>
</ul>
</li>
<?php } ?>