Merge branch 'main' into 'feat/entidades_modelos_facturas'

Instalada libreria de PHP para Excel y hecho primer ejemplo de creacion de...

See merge request jjimenez/safekat!282

ci4/app/Views/themes/vuexy/form/home/viewHome.php

@@ -0,0 +1,41 @@
+<?= $this->include('themes/_commonPartialsBs/_confirm2delete') ?>
+<?= $this->extend('themes/vuexy/main/defaultlayout') ?>
+
+<?= $this->section('content'); ?>
+
+<div class="row">
+    <div class="col-md-12">
+
+        <div class="card card-info">
+            <div class="card-header">
+                <h3 class="card-title">Inicio</h3>
+            </div><!--//.card-header -->
+            <div class="card-body">
+                <?= view('themes/_commonPartialsBs/_alertBoxes'); ?>
+
+            </div><!--//.card-body -->
+            <div class="card-footer">
+
+            </div><!--//.card-footer -->
+        </div><!--//.card -->
+    </div><!--//.col -->
+</div><!--//.row -->
+
+
+<?= $this->endSection() ?>
+
+
+<?= $this->section('additionalInlineJs') ?>
+
+<?= $this->endSection() ?>
+
+
+<?= $this->section('css') ?>
+
+<?= $this->endSection() ?>
+
+
+<?= $this->section('additionalExternalJs') ?>
+
+<?= $this->endSection() ?>
+

ci4/app/Views/themes/vuexy/main/menus/configuracion_menu.php

@@ -77,7 +77,7 @@ if (
             <?php if (auth()->user()->can('series-facturas.menu')) { ?>
                 <li class="menu-item">
                     <a href="<?= route_to("seriesFacturasList") ?>" class="menu-link">
-                        <?= lang("App.menu_series_factura") ?>
+                        <?= lang("App.menu_series_facturas") ?>
                     </a>
                 </li>
             <?php } ?>

ci4/app/Views/themes/vuexy/main/menus/presupuesto_cliente_menu.php

@@ -3,14 +3,22 @@
  * MENU PRESUPUESTOS VISTA CLIENTES
  */
 if (auth()->user()->inGroup('cliente-admin')
-    || auth()->user()->inGroup('cliente-editor')) {
+    || auth()->user()->inGroup('cliente-editor')
+    || auth()->user()->inGroup('admin')
+) {
 
-    if (auth()->user()->can('presupuesto-cliente.menu')) {
+    if (auth()->user()->can('presupuesto-cliente.menu') || auth()->user()->inGroup('admin')) {
         ?>
         <li class="menu-item">
             <a href="javascript:void(0);" class="menu-link menu-toggle">
                 <i class="menu-icon tf-icons ti ti-currency-dollar"></i>
-                <?= lang("App.menu_presupuestos") ?>
+                <?php
+                echo(
+                auth()->user()->inGroup('admin') ?
+                    lang("App.menu_presupuestos_clientes") :
+                    lang("App.menu_presupuestos")
+                );
+                ?>
             </a>
             <ul class="menu-sub">
                 <li class="menu-item">

ci4/app/Views/themes/vuexy/main/menus/tarifas_menu.php

@@ -7,7 +7,8 @@ if (
     auth()->user()->can('tarifa-manipulado.menu') ||
     auth()->user()->can('tarifa-acabado.menu') ||
     auth()->user()->can('tarifa-encuadernacion.menu') ||
-    auth()->user()->can('tarifa-envio.menu')
+    auth()->user()->can('tarifa-envio.menu') ||
+    auth()->user()->can('tarifa-extra.menu')
 ) {
     ?>
     <!-- Prices -->
@@ -52,6 +53,13 @@ if (
                     </a>
                 </li>
             <?php } ?>
+            <?php if (auth()->user()->can('tarifa-extra.menu')) { ?>
+                <li class="menu-item">
+                    <a href="<?= site_url("tarifas/tarifaextra") ?>" class="menu-link">
+                        <?= lang("App.menu_tarifaextra") ?>
+                    </a>
+                </li>
+            <?php } ?>
         </ul>
     </li>
 <?php } ?>