Merge branch 'main' into bug/users_overwrited

This commit is contained in:
amazuecos
2025-04-04 01:33:35 +02:00
16 changed files with 293 additions and 211 deletions

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,6 +105,8 @@ class Facturas extends \App\Controllers\BaseResourceController
public function add()
{
checkPermission('facturas.create');
if ($this->request->getPost()):
$nullIfEmpty = true; // !(phpversion() >= '8.1');
@ -200,6 +204,7 @@ class Facturas extends \App\Controllers\BaseResourceController
public function edit($id = null)
{
checkPermission('facturas.edit');
if ($id == null):
return $this->redirect2listView();
@ -328,26 +333,29 @@ class Facturas extends \App\Controllers\BaseResourceController
}
)
->add("action", callback: function ($q) {
if ($q->estado == 'borrador') {
return '
if (auth()->user()->can('facturas.edit')) {
if ($q->estado == 'borrador') {
return '
<div class="btn-group btn-group-sm">
<a href="javascript:void(0);"><i class="ti ti-pencil ti-sm btn-edit mx-2" data-id="' . $q->id . '"></i></a>
</div>
';
} else {
return '
} else {
return '
<div class="btn-group btn-group-sm">
<a href="javascript:void(0);"><i class="ti ti-eye ti-sm btn-edit mx-2" data-id="' . $q->id . '"></i></a>
</div>
';
}
}
} else
return '';
});
if ($clienteId != -1) {
$result->hide('cliente');
$result->hide('creditoAsegurado');
if(!$dataForClienteForm){
if (!$dataForClienteForm) {
$result->hide('estado');
$result->hide('estado_pago');
$result->hide('estado_pago');
}
$result->hide('forma_pago');
$result->hide('vencimiento');
@ -357,7 +365,8 @@ class Facturas extends \App\Controllers\BaseResourceController
return $result->toJson(returnAsObject: true);
}
public function getDatosFacturacionClienteForm($cliente_id){
public function getDatosFacturacionClienteForm($cliente_id)
{
return $this->respond($this->model->getSumatoriosFacturacionCliente($cliente_id));
}
@ -498,7 +507,7 @@ class Facturas extends \App\Controllers\BaseResourceController
->update();
$this->model->db->query('DELETE FROM facturas_pedidos_lineas WHERE factura_id=' . $id);
// $message = lang('Basic.global.deleteSuccess', [$objName]); IMN commented
$message = lang('Basic.global.deleteSuccess', [lang('Basic.global.record')]);
$response = $this->respondDeleted(['id' => $id, 'msg' => $message]);