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 'add/ajustar_margen' of https://git.imnavajas.es/jjimenez/safekat into add/ajustar_margen

Browse Source
This commit is contained in:
Jaime Jiménez
2025-04-03 23:37:20 +02:00
parent cdf70c19ff 1d4f8696e1
commit eae40ff4d8
12 changed files with 260 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ci4/app/Controllers/Compras/Proveedores.php
View File

@ -51,6 +51,8 @@ class Proveedores extends \App\Controllers\BaseResourceController {
public function index() {
checkPermission('proveedores.menu');
$viewData = [
'currentModule' => static::$controllerSlug,
'pageSubTitle' => lang('Basic.global.ManageAllRecords', [lang('Proveedores.proveedor')]),
@ -67,9 +69,7 @@ class Proveedores extends \App\Controllers\BaseResourceController {
public function add() {
checkPermission('proveedores.create');
if ($this->request->getPost()) :
@ -139,6 +139,8 @@ class Proveedores extends \App\Controllers\BaseResourceController {
public function edit($requestedId = null) {
checkPermission('proveedores.edit');
if ($requestedId == null) :
return $this->redirect2listView();
endif;

10
ci4/app/Controllers/Facturacion/Facturas.php
View File

@ -41,6 +41,7 @@ class Facturas extends \App\Controllers\BaseResourceController
public function index()
{
checkPermission('facturas.menu');
if (auth()->user()->inGroup('cliente-admin') || auth()->user()->inGroup('cliente-editor')) {
// Se obtiene el cliente ID a partir del usuario de la sesion
@ -62,6 +63,7 @@ class Facturas extends \App\Controllers\BaseResourceController
public function list()
{
checkGroups(['admin', 'cliente-admin', 'cliente-editor', 'contabilidad']);
$viewData = [
'currentModule' => static::$controllerSlug,
@ -103,8 +105,8 @@ class Facturas extends \App\Controllers\BaseResourceController
public function add()
{
if(!auth()->user()->can('facturas.create'))
return $this->failForbidden(lang('Basic.global.noPermission'), 403);
checkPermission('facturas.create');
if ($this->request->getPost()):
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@ -202,9 +204,7 @@ class Facturas extends \App\Controllers\BaseResourceController
public function edit($id = null)
{
if(!auth()->user()->can('facturas.edit'))
return $this->failForbidden(lang('Basic.global.noPermission'), 403);
checkPermission('facturas.edit');
if ($id == null):
return $this->redirect2listView();

1
ci4/app/Controllers/Sistema/Actividad.php
View File

@ -35,6 +35,7 @@ class Actividad extends BaseResourceController
public function index()
{
checkPermission('actividad.menu');
$viewData = [

1
ci4/app/Controllers/Sistema/Ajustes.php
View File

@ -40,6 +40,7 @@ class Ajustes extends BaseResourceController
public function settings()
{
checkPermission('ajustes.menu');
$id = 1;
$settingsEntity = $this->model->find($id);

7
ci4/app/Controllers/Soporte/Ticketcontroller.php
View File

@ -44,7 +44,7 @@ class Ticketcontroller extends \App\Controllers\BaseResourceController
public function index()
{
//checkPermission('tickets.menu');
checkPermission('tickets.menu');
$viewData = [
'currentModule' => static::$controllerSlug,
@ -69,7 +69,7 @@ class Ticketcontroller extends \App\Controllers\BaseResourceController
public function add()
{
//checkPermission('tickets.create', $this->indexRoute);
checkPermission('tickets.create');
if ($this->request->getPost()):
@ -145,6 +145,9 @@ class Ticketcontroller extends \App\Controllers\BaseResourceController
public function edit($requestedId = null)
{
checkPermission('tickets.edit');
$modelRespuesta = new \App\Models\Soporte\TicketRespuestaModel();
if ($requestedId == null):

34
ci4/app/Helpers/rbac_helper.php
View File

@ -120,3 +120,37 @@ if (!function_exists('checkPermission')) {
}
}
if (!function_exists('checkGroups')) {
/**
* Verifica si el usuario pertenece a alguno de los grupos especificados.
*
* @param array $groups Lista de grupos permitidos.
* @param string|null $redirectRoute Ruta de redirección si no pertenece a ningún grupo.
* @return \CodeIgniter\HTTP\RedirectResponse|null
*/
function checkGroups(array $groups, string $redirectRoute = null)
{
$session = \Config\Services::session();
$response = \Config\Services::response();
$auth = auth(); // Shield auth service
$user = $auth->user();
$inGroup = false;
foreach ($groups as $group) {
if ($user->inGroup($group)) {
$inGroup = true;
break;
}
}
if (!$inGroup) {
$session->setFlashdata('errorMessage', 'No tiene permisos de acceso.');
$route = $redirectRoute ?? 'home';
return $response->redirect(route_to($route));
}
return null;
}
}

24
ci4/app/Views/themes/vuexy/main/menus/compras_menu.php
View File

@ -2,15 +2,28 @@
/**
* MENU COMPRAS
*/
if (auth()->user()->inGroup('beta')) {
if (
auth()->user()->can('proveedores.menu') ||
auth()->user()->inGroup('beta')
) {
?>
<!-- BUY -->
<!-- COMPRAS -->
<li class="menu-item">
<a href="javascript:void(0);" class="menu-link menu-toggle">
<i class="menu-icon tf-icons ti ti-shopping-cart"></i>
<?= lang("App.menu_compras") ?>
</a>
<ul class="menu-sub">
<?php if (auth()->user()->can('proveedores.menu')) { ?>
<li class="menu-item">
<a href="<?= site_url("compras/proveedores") ?>" class="menu-link">
<?= lang("App.menu_proveedores") ?>
</a>
</li>
<?php } ?>
<?php if (auth()->user()->inGroup('beta')) { ?>
<li class="menu-item">
<a href="<?= site_url("servicios/compras") ?>" class="menu-link">
<?= lang("App.menu_compras") ?>
@ -21,16 +34,13 @@ if (auth()->user()->inGroup('beta')) {
<?= lang("App.menu_productos") ?>
</a>
</li>
<li class="menu-item">
<a href="<?= site_url("compras/proveedores") ?>" class="menu-link">
<?= lang("App.menu_proveedores") ?>
</a>
</li>
<li class="menu-item">
<a href="<?= site_url("servicios/compras/ajustes") ?>" class="menu-link">
<?= lang("App.menu_compras_ajustes") ?>
</a>
</li>
<?php } ?>
</ul>
</li>
<?php } ?>

10
ci4/app/Views/themes/vuexy/main/menus/configuracion_menu.php
View File

@ -6,7 +6,7 @@
if (
auth()->user()->can('paises.menu') ||
auth()->user()->can('formas-pago.menu') ||
auth()->user()->can('papel-genericosk .menu') ||
auth()->user()->can('papel-generico.menu') ||
auth()->user()->can('papel-impresion.menu') ||
auth()->user()->can('maquinas.menu') ||
auth()->user()->can('maquinas-defecto.menu') ||
@ -63,7 +63,7 @@ if (
</a>
</li>
<?php } ?>
<?php if (auth()->user()->inGroup('admin') || auth()->user()->inGroup('beta')) { ?>
<?php if (auth()->user()->inGroup('admin')) { ?>
<li class="menu-item">
<a href="<?= route_to("maquinaTareaList") ?>" class="menu-link">
<?= lang("App.menu_maquina_tareas") ?>
@ -106,21 +106,21 @@ if (
</li>
<?php } ?>
<?php if (auth()->user()->inGroup('admin') || auth()->user()->inGroup('beta')) { ?>
<?php if (auth()->user()->inGroup('admin')) { ?>
<li class="menu-item">
<a href="<?= route_to('erroresPresupuestoIndex') ?>" class="menu-link">
<?= lang("App.menu_error_presupuesto") ?>
</a>
</li>
<?php } ?>
<?php if (auth()->user()->inGroup('admin') || auth()->user()->inGroup('beta')) { ?>
<?php if (auth()->user()->inGroup('admin')) { ?>
<li class="menu-item">
<a href="<?= route_to('variablesIndex') ?>" class="menu-link">
<?= lang("App.menu_variables") ?>
</a>
</li>
<?php } ?>
<?php if (auth()->user()->inGroup('admin') || auth()->user()->inGroup('beta')) { ?>
<?php if (auth()->user()->inGroup('admin')) { ?>
<li class="menu-item">
<a href="<?= route_to('configMessagesIndex') ?>" class="menu-link">
<?= lang("App.menu_config_messages") ?>

7
ci4/app/Views/themes/vuexy/main/menus/facturacion_cliente_menu.php
View File

@ -12,15 +12,10 @@ if (auth()->user()->inGroup('cliente-admin') || auth()->user()->inGroup('cliente
</a>
<ul class="menu-sub">
<li class="menu-item">
<a href="<?= site_url("facturas/list") ?>" class="menu-link">
<a href="<?= route_to('facturasList') ?>" 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 } ?>

11
ci4/app/Views/themes/vuexy/main/menus/facturacion_menu.php
View File

@ -2,9 +2,9 @@
/**
* MENU FACTURACION
*/
if (auth()->user()->inGroup('beta') || auth()->user()->can('facturas.menu')) {
if (auth()->user()->can('facturas.menu')) {
?>
<!-- Invoicing -->
<!-- FACTURACION -->
<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>
@ -19,7 +19,7 @@ if (auth()->user()->inGroup('beta') || auth()->user()->can('facturas.menu')) {
</li>
<?php endif; ?>
<li class="menu-item">
<a href="<?= site_url("facturas/list") ?>" class="menu-link">
<a href="<?= route_to('facturasList') ?>" class="menu-link">
<?= lang("App.menu_facturas") ?>
</a>
</li>
@ -30,11 +30,6 @@ if (auth()->user()->inGroup('beta') || auth()->user()->can('facturas.menu')) {
</a>
</li>
<?php endif; ?>
<li class="menu-item">
<a href="<?= site_url("facturas/albaranes") ?>" class="menu-link">
<?= lang("App.menu_albaran") ?>
</a>
</li>
</ul>
</li>
<?php } ?>

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

@ -2,9 +2,9 @@
/**
* MENU MENSAJES
*/
if (auth()->user()->inGroup('beta') || auth()->user()->inGroup('cliente-editor')) {
if (auth()->user()->inGroup('cliente-editor')) {
?>
<!-- Messages -->
<!-- Mensajeria -->
<li class="menu-item">
<a href="<?= route_to('mensajeriaView') ?>" class="menu-link">
<i class="menu-icon tf-icons ti ti-message"></i>

15
ci4/app/Views/themes/vuexy/main/menus/soporte_menu.php
View File

@ -1,3 +1,12 @@
<?php
/**
* MENU SOPORTE
*/
if (
auth()->user()->can('tickets.menu')
) {
?>
<!-- Soporte -->
<li class="menu-item">
<a href="javascript:void(0);" class="menu-link menu-toggle">
@ -6,17 +15,23 @@
</a>
<ul class="menu-sub">
<?php if (auth()->user()->can('tickets.create')) { ?>
<li class="menu-item">
<a href="<?= route_to("NewTicket") ?>" class="menu-link">
<?= lang("App.menu_soporte_new_ticket") ?>
</a>
</li>
<?php } ?>
<?php if (auth()->user()->can('tickets.edit')) { ?>
<li class="menu-item">
<a href="<?= route_to("TicketIndex") ?>" class="menu-link">
<?= lang("App.menu_soporte_ticket_list") ?>
</a>
</li>
<?php } ?>
</ul>
</li>
<?php } ?>