Merge branch 'main' into 'add/ajustar_margen'

Main

See merge request jjimenez/safekat!651
This commit is contained in:
2025-04-03 21:36:49 +00:00
12 changed files with 260 additions and 204 deletions

View File

@ -50,6 +50,8 @@ class Proveedores extends \App\Controllers\BaseResourceController {
public function index() {
checkPermission('proveedores.menu');
$viewData = [
'currentModule' => static::$controllerSlug,
@ -67,9 +69,7 @@ class Proveedores extends \App\Controllers\BaseResourceController {
public function add() {
checkPermission('proveedores.create');
if ($this->request->getPost()) :
@ -138,6 +138,8 @@ class Proveedores extends \App\Controllers\BaseResourceController {
} // end function add()
public function edit($requestedId = null) {
checkPermission('proveedores.edit');
if ($requestedId == null) :
return $this->redirect2listView();

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();

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

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):