Merge branch 'main' into feat/sk-32

This commit is contained in:
amazuecos
2025-04-06 06:03:44 +02:00
37 changed files with 789 additions and 618 deletions

View File

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

View File

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