diff --git a/ci4/app/Controllers/Configuracion/Papelimpresionmargenes.php b/ci4/app/Controllers/Configuracion/Papelimpresionmargenes.php index 16fe3d07..339bf938 100755 --- a/ci4/app/Controllers/Configuracion/Papelimpresionmargenes.php +++ b/ci4/app/Controllers/Configuracion/Papelimpresionmargenes.php @@ -166,7 +166,7 @@ class Papelimpresionmargenes extends \App\Controllers\BaseResourceController $id_PI = $reqData['id_PI'] ?? -1; $resourceData = $this->model->getResource("", $id_PI)->orderBy($order, $dir)->limit($length, $start)->get()->getResultObject(); - + return $this->respond(Collection::datatable( $resourceData, $this->model->getResource()->countAllResults(), diff --git a/ci4/app/Controllers/Tarifas/Acabados/TarifaAcabadosLineas.php b/ci4/app/Controllers/Tarifas/Acabados/TarifaAcabadosLineas.php index e3021245..353ae4f9 100644 --- a/ci4/app/Controllers/Tarifas/Acabados/TarifaAcabadosLineas.php +++ b/ci4/app/Controllers/Tarifas/Acabados/TarifaAcabadosLineas.php @@ -216,7 +216,7 @@ class TarifaAcabadosLineas extends \App\Controllers\BaseResourceController $searchValues = get_filter_datatables_columns($reqData); $resourceData = $this->model->getResource($searchValues, $id_TA)->orderBy($order, $dir)->limit($length, $start)->get()->getResultObject(); - + return $this->respond(Collection::datatable( $resourceData, $this->model->getResource()->countAllResults(), diff --git a/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineas.php b/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineas.php index 850225b9..5b2746e8 100755 --- a/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineas.php +++ b/ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineas.php @@ -1,4 +1,5 @@ failUnauthorized('Invalid request', 403); } @@ -384,7 +384,6 @@ class Tarifaencuadernacionlineas extends \App\Controllers\BaseResourceController $csrfTokenName => $newTokenHash ]; return $this->respond($data); - } else { if (!isset($reqData['draw']) || !isset($reqData['columns'])) { @@ -412,9 +411,8 @@ class Tarifaencuadernacionlineas extends \App\Controllers\BaseResourceController $id_TE = $reqData['tirada_id'] ?? -1; - $resourceData = $this->model->getResource("", $id_TE)-> - orderBy($order1, $dir1)->orderBy($order2, $dir2)->orderBy($order3, $dir3)->limit($length, $start)->get()->getResultObject(); - + $resourceData = $this->model->getResource("", $id_TE)->orderBy($order1, $dir1)->orderBy($order2, $dir2)->orderBy($order3, $dir3)->limit($length, $start)->get()->getResultObject(); + return $this->respond(Collection::datatable( $resourceData, $this->model->getResource()->countAllResults(), @@ -475,5 +473,4 @@ class Tarifaencuadernacionlineas extends \App\Controllers\BaseResourceController return $this->failUnauthorized('Invalid request', 403); } } - } diff --git a/ci4/app/Controllers/Tarifas/Tarifaencuadernaciontiradas.php b/ci4/app/Controllers/Tarifas/Tarifaencuadernaciontiradas.php index 4ad0710c..f881944f 100755 --- a/ci4/app/Controllers/Tarifas/Tarifaencuadernaciontiradas.php +++ b/ci4/app/Controllers/Tarifas/Tarifaencuadernaciontiradas.php @@ -223,7 +223,6 @@ class Tarifaencuadernaciontiradas extends \App\Controllers\BaseResourceControlle $resourceData = $model->getResource("", $id_TM)-> orderBy($order0, $dir0)->orderBy($order1, $dir1)->orderBy($order2, $dir2)-> limit($length, $start)->get()->getResultObject(); - return $this->respond(Collection::datatable( $resourceData, $model->getResource()->countAllResults(), diff --git a/ci4/app/Language/es/Chat.php b/ci4/app/Language/es/Chat.php index 0f130fb1..62d3ad0c 100644 --- a/ci4/app/Language/es/Chat.php +++ b/ci4/app/Language/es/Chat.php @@ -4,6 +4,10 @@ return [ "chat" => "Mensajería", "messages" => "Mensajes", "message" => "Mensaje", + "messages_internal" => "Mensajes internos", + "message_internal" => "Mensaje interno", + "messages_client" => "Mensajes Clientes", + "message_client" => "Mensaje cliente", "modal" => [ "new_hebra" => "Nuevo hilo", "title" => "Título", diff --git a/ci4/app/Views/themes/vuexy/components/chat_factura.php b/ci4/app/Views/themes/vuexy/components/chat_factura.php index c9e9748d..be1ebf0b 100644 --- a/ci4/app/Views/themes/vuexy/components/chat_factura.php +++ b/ci4/app/Views/themes/vuexy/components/chat_factura.php @@ -101,7 +101,7 @@
+ placeholder="" />
+ placeholder="" />
diff --git a/ci4/app/Views/themes/vuexy/components/chat_internal_factura.php b/ci4/app/Views/themes/vuexy/components/chat_internal_factura.php index bfd881f0..9fe95860 100644 --- a/ci4/app/Views/themes/vuexy/components/chat_internal_factura.php +++ b/ci4/app/Views/themes/vuexy/components/chat_internal_factura.php @@ -13,11 +13,11 @@
  • - +
    • user()->inGroup('admin') || auth()->user()->inGroup('beta')) { ?>
  • - +
diff --git a/ci4/app/Views/themes/vuexy/components/chat_internal_pedido.php b/ci4/app/Views/themes/vuexy/components/chat_internal_pedido.php index f751d5b3..de9143bb 100644 --- a/ci4/app/Views/themes/vuexy/components/chat_internal_pedido.php +++ b/ci4/app/Views/themes/vuexy/components/chat_internal_pedido.php @@ -13,11 +13,11 @@
  • - +
    • user()->inGroup('admin') || auth()->user()->inGroup('beta')) { ?>
  • - +
diff --git a/ci4/app/Views/themes/vuexy/components/chat_internal_presupuesto.php b/ci4/app/Views/themes/vuexy/components/chat_internal_presupuesto.php index 8e399ead..efaa51da 100644 --- a/ci4/app/Views/themes/vuexy/components/chat_internal_presupuesto.php +++ b/ci4/app/Views/themes/vuexy/components/chat_internal_presupuesto.php @@ -13,11 +13,11 @@
  • - +
    • user()->inGroup('admin') || auth()->user()->inGroup('beta')) { ?>
  • - +
diff --git a/ci4/app/Views/themes/vuexy/components/chat_pedido.php b/ci4/app/Views/themes/vuexy/components/chat_pedido.php index 9422acf7..d6a5d1db 100644 --- a/ci4/app/Views/themes/vuexy/components/chat_pedido.php +++ b/ci4/app/Views/themes/vuexy/components/chat_pedido.php @@ -98,7 +98,7 @@
+ placeholder="" />
+ placeholder="" />
{ + $("input.autonumeric").each(function () { + let autoNumericInstance = AutoNumeric.getAutoNumericElement(this) + if (autoNumericInstance) { + autoNumericInstance.remove() + + } + new AutoNumeric(this, { + decimalCharacter: ",", + digitGroupSeparator: ".", + allowDecimalPadding : 'floats', + decimalPlaces: 2, + unformatOnSubmit: true, + }); + }) + }) editor.on( 'preSubmit', function ( e, d, type ) { + if (d.data) { + Object.keys(d.data).forEach(function (key) { + // Find all elements with class .autonumeric + $("input.autonumeric").each(function () { + let autoNumericInstance = AutoNumeric.getAutoNumericElement(this) + if (autoNumericInstance) { + // Get raw value and update the corresponding field + let rawValue = autoNumericInstance.getNumericString(); + d.data[key][this.name] = rawValue; // Ensure the correct name attribute is used + } + }); + }); + } if ( type === 'create'){ d.data[0]['maquina_id'] = id; } @@ -511,9 +544,9 @@ return ''; } }, - { 'data': 'precio' }, - { 'data': 'margen' }, - { 'data': 'is_deleted',}, + { 'data': 'precio',render : (d) => `${d}` }, + { 'data': 'margen',render : (d) => `${d}` }, + { 'data': 'is_deleted'}, { data: actionBtns, className: 'row-edit dt-center' @@ -523,7 +556,7 @@ columnDefs: [ { target: 4, - visible: false + visible: true }, { orderable: false, @@ -585,7 +618,7 @@ }, { 'data': 'papel_generico'}, { 'data': 'papel_impresion'}, - { 'data': 'gramaje'}, + { 'data': 'gramaje',render : (d) => `${d}`}, { 'data': 'bn'}, { 'data': 'color'}, { 'data': 'cubierta'}, @@ -731,9 +764,19 @@ fields: [ { name: "formas" }, { - name: "internas" + name: "internas", + attr: { + type: "text", + name : "internas", + class :"autonumeric" + } }, { - name: "externas" + name: "externas", + attr: { + type: "text", + name : "externas", + class :"autonumeric" + } }, { "name": "maquina_id", "type": "hidden" @@ -746,7 +789,37 @@ }, ] } ); + editor3.on('open', (event) => { + $("input.autonumeric").each(function () { + let autoNumericInstance = AutoNumeric.getAutoNumericElement(this) + if (autoNumericInstance) { + autoNumericInstance.remove() + } + new AutoNumeric(this, { + decimalCharacter: ",", + digitGroupSeparator: ".", + allowDecimalPadding : 'floats', + decimalPlaces: 2, + unformatOnSubmit: true, + }); + }) + }) + editor3.on('preSubmit', (e, d, type) => { + if (d.data) { + Object.keys(d.data).forEach(function (key) { + // Find all elements with class .autonumeric + $("input.autonumeric").each(function () { + let autoNumericInstance = AutoNumeric.getAutoNumericElement(this) + if (autoNumericInstance) { + // Get raw value and update the corresponding field + let rawValue = autoNumericInstance.getNumericString(); + d.data[key][this.name] = rawValue; // Ensure the correct name attribute is used + } + }); + }); + } + }) editor3.on( 'preSubmit', function ( e, d, type ) { if ( type === 'create'){ @@ -799,8 +872,8 @@ }), columns : [ { 'data': 'formas' }, - { 'data': 'internas' }, - { 'data': 'externas' }, + { 'data': 'internas',render : (d) => `${d}` }, + { 'data': 'externas',render : (d) => `${d}` }, { data: actionBtns, className: 'row-edit dt-center'} ], diff --git a/ci4/app/Views/themes/vuexy/form/configuracion/maquinas/viewMaquinaPorDefectoList.php b/ci4/app/Views/themes/vuexy/form/configuracion/maquinas/viewMaquinaPorDefectoList.php index d6d31e0c..5dc87547 100644 --- a/ci4/app/Views/themes/vuexy/form/configuracion/maquinas/viewMaquinaPorDefectoList.php +++ b/ci4/app/Views/themes/vuexy/form/configuracion/maquinas/viewMaquinaPorDefectoList.php @@ -107,12 +107,12 @@ } }, { 'data': 'maquina' }, - { 'data': 'ancho_min' }, - { 'data': 'ancho_max' }, - { 'data': 'alto_min' }, - { 'data': 'alto_max' }, - { 'data': 'tirada_min' }, - { 'data': 'tirada_max' }, + { 'data': 'ancho_min',render : (d) => `${d}` }, + { 'data': 'ancho_max',render : (d) => `${d}` }, + { 'data': 'alto_min',render : (d) => `${d}` }, + { 'data': 'alto_max',render : (d) => `${d}` }, + { 'data': 'tirada_min',render : (d) => `${d}` }, + { 'data': 'tirada_max',render : (d) => `${d}` }, { 'data': actionBtns } ] }); diff --git a/ci4/app/Views/themes/vuexy/form/configuracion/papel/viewPapelGenericoForm.php b/ci4/app/Views/themes/vuexy/form/configuracion/papel/viewPapelGenericoForm.php index 0d231599..b9b1b815 100644 --- a/ci4/app/Views/themes/vuexy/form/configuracion/papel/viewPapelGenericoForm.php +++ b/ci4/app/Views/themes/vuexy/form/configuracion/papel/viewPapelGenericoForm.php @@ -113,7 +113,7 @@ columns : [ { 'data': 'defecto' }, { 'data': 'nombre' }, - { 'data': 'gramaje' }, + { 'data': 'gramaje',render : (d) => `${d}` }, { 'data': actionBtns } ] }); diff --git a/ci4/app/Views/themes/vuexy/form/configuracion/papel/viewPapelImpresionForm.php b/ci4/app/Views/themes/vuexy/form/configuracion/papel/viewPapelImpresionForm.php index 9b60a8cf..cec4fae0 100644 --- a/ci4/app/Views/themes/vuexy/form/configuracion/papel/viewPapelImpresionForm.php +++ b/ci4/app/Views/themes/vuexy/form/configuracion/papel/viewPapelImpresionForm.php @@ -276,17 +276,23 @@ { name: "paginas_min", attr: { - type: "number" + type: "text", + name : "paginas_min", + class :"autonumeric" } },{ name: "paginas_max", attr: { - type: "number" + type: "text", + name : "paginas_max", + class :"autonumeric" } },{ name: "margen", attr: { - type: "number" + type: "text", + name : "margen", + class :"autonumeric" } }, { "name": "papel_impresion_id", @@ -302,6 +308,20 @@ } ); + editor3.on('open',(event)=>{ + $("input.autonumeric").each(function () { + let autoNumericInstance = AutoNumeric.getAutoNumericElement(this) + if(autoNumericInstance){ + autoNumericInstance.remove() + + } + new AutoNumeric(this, { + decimalCharacter: ",", + digitGroupSeparator: ".", + unformatOnSubmit : true, + }); + }) + }) // Definición de la tabla theTable3 = $('#tableOfPapelimpresionmargenes').DataTable({ @@ -332,13 +352,14 @@ async: true, }), columns : [ - { 'data': 'paginas_min' }, - { 'data': 'paginas_max' }, - { 'data': 'margen' }, + { 'data': 'paginas_min' , render : (d) => `${d}` }, + { 'data': 'paginas_max' , render : (d) => `${d}`}, + { 'data': 'margen', render : (d) => `${d}`}, { data: actionBtns3, className: 'row-edit dt-center'} ], columnDefs: [ + { orderable: false, searchable: false, @@ -356,7 +377,7 @@ } ] }); - + // Activate an inline edit on click of a table cell $(document).on('click', '.btn-edit3', function(e) { editor3.inline( @@ -371,9 +392,22 @@ ); } ); - + // Obtención del id para editar editor3.on( 'preSubmit', function ( e, d, type ) { + if (d.data) { + Object.keys(d.data).forEach(function (key) { + // Find all elements with class .autonumeric + $("input.autonumeric").each(function () { + let autoNumericInstance = AutoNumeric.getAutoNumericElement(this) + if (autoNumericInstance) { + // Get raw value and update the corresponding field + let rawValue = autoNumericInstance.getNumericString(); + d.data[key][this.name] = rawValue; // Ensure the correct name attribute is used + } + }); + }); + } if ( type === 'create'){ d.data[0]['papel_impresion_id'] = id; } @@ -701,10 +735,10 @@ className: 'dt-body-center' }, { 'data': 'maquina'}, - { 'data': 'ancho'}, - { 'data': 'alto'}, - { 'data': 'anchoimpresion'}, - { 'data': 'altoimpresion'}, + { 'data': 'ancho',render : (d) => `${d}`}, + { 'data': 'alto',render : (d) => `${d}`}, + { 'data': 'anchoimpresion',render : (d) => `${d}`}, + { 'data': 'altoimpresion',render : (d) => `${d}`}, { data: actionBtns2, className: 'row-edit dt-center'} ], diff --git a/ci4/app/Views/themes/vuexy/form/configuracion/papel/viewPapelImpresionList.php b/ci4/app/Views/themes/vuexy/form/configuracion/papel/viewPapelImpresionList.php index 5dcf2c20..3702621a 100644 --- a/ci4/app/Views/themes/vuexy/form/configuracion/papel/viewPapelImpresionList.php +++ b/ci4/app/Views/themes/vuexy/form/configuracion/papel/viewPapelImpresionList.php @@ -100,7 +100,7 @@ columns : [ { 'data': 'nombre' }, { 'data': 'papel_generico_id' }, - { 'data': 'gramaje' }, + { 'data': 'gramaje', render : (d) => `${d}`}, { 'data': 'interior' }, { 'data': 'bn' }, { 'data': 'color' }, diff --git a/ci4/app/Views/themes/vuexy/form/facturas/_facturaLineasItems.php b/ci4/app/Views/themes/vuexy/form/facturas/_facturaLineasItems.php index 15e4109b..cf98966d 100644 --- a/ci4/app/Views/themes/vuexy/form/facturas/_facturaLineasItems.php +++ b/ci4/app/Views/themes/vuexy/form/facturas/_facturaLineasItems.php @@ -141,7 +141,11 @@ var editor_lineas = new $.fn.dataTable.Editor( { fields: [ { name: "cantidad", - + attr: { + type: "text", + name : "cantidad", + class :"autonumeric" + } }, { name: "descripcion", type: "textarea", @@ -152,10 +156,18 @@ var editor_lineas = new $.fn.dataTable.Editor( { }, { name: "precio_unidad", attr: { + type: "text", + name : "precio_unidad", + class :"autonumeric", style: "min-width: 65px;" } }, { name: "iva", + attr: { + type: "text", + name : "iva", + class :"autonumeric" + } }, { name: "pedido_linea_impresion_id", type: "hidden" @@ -174,7 +186,37 @@ var editor_lineas = new $.fn.dataTable.Editor( { var old_cantidad = 0; +editor_lineas.on('open', (event) => { + $("input.autonumeric").each(function () { + let autoNumericInstance = AutoNumeric.getAutoNumericElement(this) + if (autoNumericInstance) { + autoNumericInstance.remove() + } + new AutoNumeric(this, { + decimalCharacter: ",", + digitGroupSeparator: ".", + allowDecimalPadding : 'floats', + decimalPlaces: 2, + unformatOnSubmit: true, + }); + }) + }) + editor_lineas.on('preSubmit', (e, d, type) => { + if (d.data) { + Object.keys(d.data).forEach(function (key) { + // Find all elements with class .autonumeric + $("input.autonumeric").each(function () { + let autoNumericInstance = AutoNumeric.getAutoNumericElement(this) + if (autoNumericInstance) { + // Get raw value and update the corresponding field + let rawValue = autoNumericInstance.getNumericString(); + d.data[key][this.name] = rawValue; // Ensure the correct name attribute is used + } + }); + }); + } + }) editor_lineas.on( 'preEdit', function ( e, json, data, id ) { old_cantidad = data.cantidad; @@ -239,7 +281,7 @@ var tableLineas = $('#tableOfLineasFactura').DataTable({ {data: "pedido_linea_impresion_id"}, {data: "pedido_maquetacion_id"}, {data: "pedido_id"}, - {data: "cantidad"}, + {data: "cantidad",render : (d) => `${d}`}, { data: "descripcion", render: function (data, type, row, meta) { @@ -324,11 +366,11 @@ var tableLineas = $('#tableOfLineasFactura').DataTable({ } } }, - {data: "precio_unidad"}, - {data: "iva"}, - {data: "base"}, - {data: "total_iva"}, - {data: "total"}, + {data: "precio_unidad",render : (d) => `${d}`}, + {data: "iva",render : (d) => `${d}`}, + {data: "base",render : (d) => `${d}`}, + {data: "total_iva",render : (d) => `${d}`}, + {data: "total",render : (d) => `${d}`}, ], order: [[1, "asc"]], dom: 't', diff --git a/ci4/app/Views/themes/vuexy/form/facturas/viewFacturasList.php b/ci4/app/Views/themes/vuexy/form/facturas/viewFacturasList.php index 3e2a82ea..2741c977 100644 --- a/ci4/app/Views/themes/vuexy/form/facturas/viewFacturasList.php +++ b/ci4/app/Views/themes/vuexy/form/facturas/viewFacturasList.php @@ -160,9 +160,9 @@ { 'data': 'numero' }, { 'data': 'fecha_factura_at' }, { 'data': 'cliente' }, - { 'data': 'base' }, - { 'data': 'total' }, - { 'data': 'pendiente' }, + { 'data': 'base' ,render : (d) => `${d}`}, + { 'data': 'total',render : (d) => `${d}`}, + { 'data': 'pendiente',render : (d) => `${d}` }, { 'data': 'creditoAsegurado' , render: function(data, type, row, meta) { switch(data){ diff --git a/ci4/app/Views/themes/vuexy/form/pedidos/viewPedidosList.php b/ci4/app/Views/themes/vuexy/form/pedidos/viewPedidosList.php index f582f5aa..1bbb709e 100644 --- a/ci4/app/Views/themes/vuexy/form/pedidos/viewPedidosList.php +++ b/ci4/app/Views/themes/vuexy/form/pedidos/viewPedidosList.php @@ -72,10 +72,10 @@ $('#tableOfPedidos thead tr:eq(1) th').each(function (i) { var title = $(this).text(); if($(this).hasClass("totalizador")){ if(i==9){ - $(this).html('