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 'fix/sk-41' into 'main'

Browse Source 
Fix/sk 41

See merge request jjimenez/safekat!688
This commit is contained in:
Alvaro
2025-04-12 06:01:17 +00:00
parent de8ae93871 38d60402c0
commit da8917b0d3
5 changed files with 38 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
ci4/app/Views/themes/vuexy/form/clientes/cliente/_clienteFormItems.php
View File

@ -591,29 +591,31 @@
<button id="convert2template" type="button" class="btn btn-secondary waves-effect waves-light float-start"><?= lang("ClientePrecios.convertir2plantilla")?></button> <button id="convert2template" type="button" class="btn btn-secondary waves-effect waves-light float-start"><?= lang("ClientePrecios.convertir2plantilla")?></button>
</div> </div>
</div> </div>
<div class="table-responsive">
<table id="tableOfPrecios" class="table table-striped table-hover" style="width: 100%;"> <table id="tableOfPrecios" class="table table-striped table-hover" style="width: 100%;">
<thead> <thead>
<tr> <tr>
<th>ID</th> <th>ID</th>
<th><?= lang('ClientePrecios.tipo') ?></th> <th><?= lang('ClientePrecios.tipo') ?></th>
<th><?= lang('ClientePrecios.tipo_maquina') ?></th> <th><?= lang('ClientePrecios.tipo_maquina') ?></th>
<th><?= lang('ClientePrecios.tipo_impresion') ?></th> <th><?= lang('ClientePrecios.tipo_impresion') ?></th>
<th><?= lang('ClientePrecios.tiempo_min') ?></th> <th><?= lang('ClientePrecios.tiempo_min') ?></th>
<th><?= lang('ClientePrecios.tiempo_max') ?></th> <th><?= lang('ClientePrecios.tiempo_max') ?></th>
<th class="noFilter"><?= lang('ClientePrecios.precio_hora') ?></th> <th class="noFilter"><?= lang('ClientePrecios.precio_hora') ?></th>
<th class="noFilter"><?= lang('ClientePrecios.margen') ?></th> <th class="noFilter"><?= lang('ClientePrecios.margen') ?></th>
<th class="noFilter"><?= lang('ClientePrecios.total_precio_hora') ?></th> <th class="noFilter"><?= lang('ClientePrecios.total_precio_hora') ?></th>
<th class="noFilter"><?= lang('ClientePrecios.user_updated_id') ?></th> <th class="noFilter"><?= lang('ClientePrecios.user_updated_id') ?></th>
<th class="noFilter"><?= lang('ClientePrecios.updated_at') ?></th> <th class="noFilter"><?= lang('ClientePrecios.updated_at') ?></th>
<th class="noFilter noVis">plantilla_id</th> <th class="noFilter noVis">plantilla_id</th>
<th class="text-nowrap noFilter noVis" style="min-width:100px"><?= lang('Basic.global.Action') ?></th> <th class="text-nowrap noFilter noVis" style="min-width:100px"><?= lang('Basic.global.Action') ?></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
</tbody> </tbody>
</table> </table>
</div>
</div> </div>
@ -637,10 +639,11 @@
<div class="tab-pane fade" id="domicilio-entrega" role="tabpanel"> <div class="tab-pane fade" id="domicilio-entrega" role="tabpanel">
<?= view("themes/vuexy/form/clientes/cliente/_clienteDireccionesForm") ?> <?= view("themes/vuexy/form/clientes/cliente/_clienteDireccionesForm") ?>
<table id="tableOfDireccionesEnvio" class="table dt-responsive dataTable" style="width: 100%;"> <div class="table-responsive">
<thead> <table id="tableOfDireccionesEnvio" class="table dt-responsive dataTable" style="width: 100%;">
<tr> <thead>
<th><?= lang('ClienteDirecciones.alias') ?></th> <tr>
<th><?= lang('ClienteDirecciones.alias') ?></th>
<th><?= lang('ClienteDirecciones.att') ?></th> <th><?= lang('ClienteDirecciones.att') ?></th>
<th><?= lang('ClienteDirecciones.email') ?></th> <th><?= lang('ClienteDirecciones.email') ?></th>
<th><?= lang('ClienteDirecciones.direccion') ?></th> <th><?= lang('ClienteDirecciones.direccion') ?></th>
@ -653,9 +656,10 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
</tbody> </tbody>
</table> </table>
</div>
</div> </div>
<div class="tab-pane fade" id="presupuestos" role="tabpanel"> <div class="tab-pane fade" id="presupuestos" role="tabpanel">

2
ci4/app/Views/themes/vuexy/form/clientes/cliente/viewClienteForm.php
View File

@ -13,7 +13,7 @@
</div><!--//.card-header --> </div><!--//.card-header -->
<form id="clienteForm" data-cliente="<?=$clienteEntity->id?>" <form id="clienteForm" data-cliente="<?=$clienteEntity->id?>"
data-url="<?= auth()->user()->inGroup('cliente-admin') || auth()->user()->inGroup('cliente-editor') ? data-url="<?= auth()->user()->inGroup('cliente-admin') || auth()->user()->inGroup('cliente-editor') ?
'/presupuestos/presupuestocliente/edit/' : '/presupuestoadmin/edit//' ?>" '/presupuestos/presupuestocliente/edit/' : '/presupuestoadmin/edit/' ?>"
method="post" class="card-body" action="<?= $formAction ?>"> method="post" class="card-body" action="<?= $formAction ?>">
<?= csrf_field() ?> <?= csrf_field() ?>
<div class="card-body"> <div class="card-body">

2
httpdocs/assets/js/safekat/pages/cliente/clienteFacturacion.js
View File

@ -18,7 +18,7 @@ class ClienteFacturacion {
$(this).tab('show'); $(this).tab('show');
}); });
$(document).on('click', '.btn-edit', function (e) { $('#tableOfFacturasCliente').on('click', '.btn-edit', function (e) {
window.location.href = '/facturas/edit/' + $(this).attr('data-id'); window.location.href = '/facturas/edit/' + $(this).attr('data-id');
}); });

2
httpdocs/assets/js/safekat/pages/cliente/clientePedidos.js
View File

@ -18,7 +18,7 @@ class ClientePedidos {
$(this).tab('show'); $(this).tab('show');
}); });
$(document).on('click', '.btn-edit', function (e) { $('#tableOfPedidosCliente').on('click', '.btn-edit', function (e) {
window.location.href = '/pedidos/edit/' + $(this).attr('data-id'); window.location.href = '/pedidos/edit/' + $(this).attr('data-id');
}); });

4
httpdocs/assets/js/safekat/pages/cliente/clientePresupuestos.js
View File

@ -17,8 +17,8 @@ class ClientePresupuestos {
$(this).tab('show'); $(this).tab('show');
}); });
$(document).on('click', '.btn-edit', function (e) { $('#tableOfPresupuestosCliente').on('click', '.btn-edit', function (e) {
window.location.href = $('#clienteForm').attr('data-url'); + $(this).attr('data-id'); window.location.href = $('#clienteForm').attr('data-url') + $(this).attr('data-id');
}); });
const lastColNr = $('#tableOfPresupuestosCliente').find("tr:first th").length - 1; const lastColNr = $('#tableOfPresupuestosCliente').find("tr:first th").length - 1;