- `;
- }
+ `;
+ }
};
+const autoNumericSubtotal = new AutoNumeric('#subtotal-sum', 0, {
+ decimalPlaces: 2,
+ digitGroupSeparator: ',',
+ decimalCharacter: '.',
+ unformatOnSubmit: true,
+ decimalPlacesShownOnFocus: 2,
+ decimalPlacesShownOnBlur: 2,
+});
+
+const autoNumericIVA = new AutoNumeric('#total-iva-sum', 0, {
+ decimalPlaces: 2,
+ digitGroupSeparator: ',',
+ decimalCharacter: '.',
+ unformatOnSubmit: true,
+ decimalPlacesShownOnFocus: 2,
+ decimalPlacesShownOnBlur: 2,
+});
+
+const autoNumericTotal = new AutoNumeric('#total-sum', 0, {
+ decimalPlaces: 2,
+ digitGroupSeparator: ',',
+ decimalCharacter: '.',
+ unformatOnSubmit: true,
+ decimalPlacesShownOnFocus: 2,
+ decimalPlacesShownOnBlur: 2,
+});
+
+const autoNumericPendientePago = new AutoNumeric('#pendiente-pago', 0, {
+ decimalPlaces: 2,
+ digitGroupSeparator: ',',
+ decimalCharacter: '.',
+ unformatOnSubmit: true,
+ decimalPlacesShownOnFocus: 2,
+ decimalPlacesShownOnBlur: 2,
+});
var editor_lineas = new $.fn.dataTable.Editor( {
ajax: {
@@ -153,14 +182,6 @@ var editor_lineas = new $.fn.dataTable.Editor( {
rows: 5,
style: "height: 120px;"
}
- }, {
- name: "precio_unidad",
- attr: {
- type: "text",
- name : "precio_unidad",
- class :"autonumeric",
- style: "min-width: 65px;"
- }
}, {
name: "iva",
attr: {
@@ -187,56 +208,52 @@ 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()
+ $("input.autonumeric").each(function () {
+ let autoNumericInstance = AutoNumeric.getAutoNumericElement(this)
+ if (autoNumericInstance) {
+ autoNumericInstance.remove()
- }
- new AutoNumeric(this, {
- decimalCharacter: ",",
- digitGroupSeparator: ".",
- allowDecimalPadding : 'floats',
- decimalPlaces: 2,
- unformatOnSubmit: true,
- });
- })
+ }
+ 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('preSubmit', (e, d, type) => {
+ if (d.data) {
+ if ( type === 'create'){
+ d.data[0]['factura_id'] = id ?>;
+ d.data[0]['old_cantidad'] = null;
+ }
+ else if(type === 'edit' ) {
+ for (v in d.data){
+ d.data[v]['factura_id'] = id ?>;
+ d.data[v]['old_cantidad'] = old_cantidad;
}
- })
+ }
+ 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;
});
-editor_lineas.on( 'preSubmit', function ( e, d, type ) {
-
- if ( type === 'create'){
- d.data[0]['factura_id'] = id ?>;
- d.data[0]['old_cantidad'] = null;
- }
- else if(type === 'edit' ) {
- for (v in d.data){
- d.data[v]['factura_id'] = id ?>;
- d.data[v]['old_cantidad'] = old_cantidad;
- }
- }
-});
-
editor_lineas.on( 'postSubmit', function ( e, json, data, action ) {
@@ -310,7 +327,7 @@ var tableLineas = $('#tableOfLineasFactura').DataTable({
-
+
`;
@@ -366,11 +383,10 @@ var tableLineas = $('#tableOfLineasFactura').DataTable({
}
}
},
- {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}`},
+ {data: "iva", className: "text-end", render : (d) => `
${d}`},
+ {data: "base", className: "text-end", render : (d) => `
${d}`},
+ {data: "total_iva", className: "text-end",render : (d) => `
${d}`},
+ {data: "total", className: "text-end", render : (d) => `
${d}`},
],
order: [[1, "asc"]],
dom: 't',
@@ -391,94 +407,85 @@ var tableLineas = $('#tableOfLineasFactura').DataTable({
},
{
visible: false,
- targets: [1, 2, 3, 4, 10, 11]
+ targets: [1, 2, 3, 4, 9, 10]
}
],
drawCallback: function() {
$(this.api().table().container()).find('table').css('width', '100%');
this.api().columns.adjust();
+
+ $('.autonumeric-datatable-lineas').each(function() {
+ if (!$(this).data('autoNumeric')) {
+ new AutoNumeric(this, {
+ decimalPlaces: 2,
+ digitGroupSeparator: '.',
+ decimalCharacter: ',',
+ unformatOnSubmit: true
+ });
+ }
+ });
+
+ $("span.autonumeric-facturas").each(function () {
+ let autoNumericInstance = AutoNumeric.getAutoNumericElement(this)
+ if(autoNumericInstance){
+ autoNumericInstance.remove()
+ }
+ new AutoNumeric(this, {
+ digitGroupSeparator: ".",
+ decimalCharacter: ",",
+ allowDecimalPadding : 'floats',
+ decimalPlaces: 2,
+ unformatOnSubmit: true,
+ decimalPlacesShownOnFocus: 2,
+ decimalPlacesShownOnBlur: 2,
+ allowDecimalPadding: true,
+ });
+ });
+
},
footerCallback: function (row, data, start, end, display) {
- updateFooterLineas(this.api());
+ const table = this.api();
+
+ const totalSubtotal = table.column(8).data().reduce((a, b) => parseFloat(a) + parseFloat(b), 0);
+ const totalIVA = table.column(9).data().reduce((a, b) => parseFloat(a) + parseFloat(b), 0);
+ const totalTotal = table.column(10).data().reduce((a, b) => parseFloat(a) + parseFloat(b), 0);
+
+ autoNumericSubtotal.set(totalSubtotal);
+ autoNumericIVA.set(totalIVA);
+ autoNumericTotal.set(totalTotal);
+
+ var total_pagos = autoNumericTotalCobrado.getNumber();
+ var pendientePago = totalTotal - total_pagos;
+
+ if (isNaN(pendientePago)) pendientePago = 0;
+
+ autoNumericPendientePago.set(pendientePago);
+
+ $.ajax({
+ url: 'id) ?>',
+ method: 'POST',
+ data: {
+ base: totalSubtotal,
+ total: totalTotal,
+ total_pagos: total_pagos,
+ pendiente: pendientePago,
+ : v
+ }
+ }).done(function (data) {
+ if (data.estado_pago === 'pagada') {
+ $('#estado_pago_text').text('').css('color', 'green');
+ } else {
+ $('#estado_pago_text').text('').css('color', 'red');
+ }
+ }).fail(function (jqXHR) {
+ popErrorAlert(jqXHR.responseJSON.messages.error);
+ });
}
+
});
-function updateFooterLineas(table){
-
- // Remove the formatting to get integer data for summation
- var intVal = function (i) {
- return typeof i === 'string' ?
- i.replace(/[\$,]/g, '')*1 :
- typeof i === 'number' ?
- i : 0;
- };
-
- // Total over all pages
- var totalSubtotal = table
- .column(9)
- .data()
- .reduce(function (a, b) {
- return intVal(a) + intVal(b);
- }, 0);
-
- var totalIVA = table
- .column(10)
- .data()
- .reduce(function (a, b) {
- return intVal(a) + intVal(b);
- }, 0);
-
- var totalTotal = table
- .column(11)
- .data()
- .reduce(function (a, b) {
- return intVal(a) + intVal(b);
- }, 0);
-
- // Update footer
- $('#subtotal-sum').html(totalSubtotal.toFixed(2));
- $('#total-iva-sum').html(totalIVA.toFixed(2));
- $('#total-sum').html(totalTotal.toFixed(2));
-
- // Assuming pendiente de pago is totalTotal - totalIVA for this example
- estado == 'borrador') :?>
- var pendientePago = totalTotal ;
- var total_pagos = 0;
-
- var total_pagos = parseFloat($('#totalCobrado-sum').html()).toFixed(2);
- var pendientePago = totalTotal - total_pagos;
-
- if(isNaN(pendientePago)){
- pendientePago = 0;
- }
- $('#pendiente-pago').html(pendientePago.toFixed(2));
-
- $.ajax({
- url: 'id) ?>',
- method: 'POST',
- data: {
- base: totalSubtotal,
- total: totalTotal,
- total_pagos: total_pagos,
- pendiente: pendientePago,
- : v
- }
- }).done((data, textStatus, jqXHR) => {
- if(data.estado_pago == 'pagada'){
- $('#estado_pago_text').text('');
- $('#estado_pago_text').css('color', 'green');
- }
- else{
- $('#estado_pago_text').text('');
- $('#estado_pago_text').css('color', 'red');
- }
- }).fail((jqXHR, textStatus, errorThrown) => {
- popErrorAlert(jqXHR.responseJSON.messages.error)
- })
-}
-
// Delete row
$(document).on('click', '.btn-delete', function(e) {
@@ -510,6 +517,8 @@ function deleteConfirmedLinea(params){
: v
}
}).done((data, textStatus, jqXHR) => {
+ tablelineas.clearPipeline().footerCallback().draw();
+ $('#tableOfLineasPagos').DataTable().clearPipeline().footerCallback().draw();
}).fail((jqXHR, textStatus, errorThrown) => {
popErrorAlert(jqXHR.responseJSON.messages.error)
@@ -577,7 +586,6 @@ $(document).on('click', '.btn-excedentes', function(e) {
pedido_id: pedido_id,
pedido_linea_impresion_id: pedido_linea_impresion_id,
pedido_linea_maquetacion_id: pedido_linea_maquetacion_id,
- precio_unidad: row_data.precio_unidad,
descripcion: row_data.descripcion,
iva: row_data.iva,
descuento: row_data.descuento_tirada_flexible,
diff --git a/ci4/app/Views/themes/vuexy/form/facturas/_pagosFacturasItems.php b/ci4/app/Views/themes/vuexy/form/facturas/_pagosFacturasItems.php
index 136d4181..943f8e8d 100644
--- a/ci4/app/Views/themes/vuexy/form/facturas/_pagosFacturasItems.php
+++ b/ci4/app/Views/themes/vuexy/form/facturas/_pagosFacturasItems.php
@@ -22,12 +22,12 @@
- | Total cobrado: |
- |
+ Total cobrado: |
+ |
- | Total pendiente: |
- |
+ Total pendiente: |
+ |
@@ -73,7 +73,7 @@ const actionBtns_pagos = function(data) {
}
-var editor_pagos = new $.fn.dataTable.Editor( {
+const editor_pagos = new $.fn.dataTable.Editor( {
ajax: {
url: "",
headers: {
@@ -99,8 +99,10 @@ var editor_pagos = new $.fn.dataTable.Editor( {
{
name: "total",
attr: {
- style: "min-width: 65px;"
- }
+ style: "min-width: 65px;",
+ class :"autonumeric",
+ name: 'total'
+ },
},
{
name: "fecha_pago_at",
@@ -132,17 +134,48 @@ var editor_pagos = new $.fn.dataTable.Editor( {
]
});
+editor_pagos.on('open',(event)=>{
+ $("input.autonumeric").each(function () {
+ let autoNumericInstance = AutoNumeric.getAutoNumericElement(this)
+ if(autoNumericInstance){
+ autoNumericInstance.remove()
+ }
+ new AutoNumeric(this, {
+ digitGroupSeparator: ".",
+ decimalCharacter: ",",
+ allowDecimalPadding : 'floats',
+ decimalPlaces: 2,
+ unformatOnSubmit: true,
+ decimalPlacesShownOnFocus: 2,
+ decimalPlacesShownOnBlur: 2,
+
+ });
+ })
+})
editor_pagos.on( 'preSubmit', function ( e, d, type ) {
- if ( type === 'create'){
- d.data[0]['factura_id'] = id ?>;
- }
- else if(type === 'edit' ) {
- for (v in d.data){
- d.data[v]['factura_id'] = id ?>;
+ if (d.data) {
+ if ( type === 'create'){
+ d.data[0]['factura_id'] = id ?>;
}
+ else if(type === 'edit' ) {
+ for (v in d.data){
+ d.data[v]['factura_id'] = id ?>;
+ }
+ }
+ 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
+ }
+ });
+ });
}
});
@@ -152,8 +185,26 @@ editor_pagos.on( 'postSubmit', function ( e, json, data, action ) {
yeniden(json.);
tablePagos.clearPipeline();
tablePagos.draw();
+ updateFooterLineas(tableLineas);
});
+const autoNumericTotalCobrado = new AutoNumeric('#totalCobrado-sum', 0, {
+ decimalPlaces: 2,
+ digitGroupSeparator: ',',
+ decimalCharacter: '.',
+ unformatOnSubmit: true,
+ decimalPlacesShownOnFocus: 2,
+ decimalPlacesShownOnBlur: 2,
+});
+
+const autoNumericPendienteCobro = new AutoNumeric('#pendienteCobro-sum', 0, {
+ decimalPlaces: 2,
+ digitGroupSeparator: ',',
+ decimalCharacter: '.',
+ unformatOnSubmit: true,
+ decimalPlacesShownOnFocus: 2,
+ decimalPlacesShownOnBlur: 2,
+});
var tablePagos = $('#tableOfLineasPagos').DataTable({
processing: true,
@@ -193,7 +244,11 @@ var tablePagos = $('#tableOfLineasPagos').DataTable({
return data!='0000-00-00 00:00:00' ? moment(data).format('DD/MM/YYYY') : '';
}
},
- {data: "total"},
+ {
+ data: "total",
+ className: "text-end",
+ render : (d) => `
${d}`
+ },
],
order: [[1, "asc"]],
dom: 't',
@@ -226,14 +281,27 @@ var tablePagos = $('#tableOfLineasPagos').DataTable({
},
],
+ drawCallback: function (settings) {
+ $("span.autonumeric-pagos").each(function () {
+ let autoNumericInstance = AutoNumeric.getAutoNumericElement(this)
+ if(autoNumericInstance){
+ autoNumericInstance.remove()
+ }
+ new AutoNumeric(this, {
+ digitGroupSeparator: ".",
+ decimalCharacter: ",",
+ allowDecimalPadding : 'floats',
+ decimalPlaces: 2,
+ unformatOnSubmit: true,
+ decimalPlacesShownOnFocus: 2,
+ decimalPlacesShownOnBlur: 2,
+ allowDecimalPadding: true,
+ });
+ });
+ },
footerCallback: function (row, data, start, end, display) {
var api = this.api();
- var intVal = function (i) {
- // Convertir a número o devolver 0 si no es válido
- return typeof i === 'string' ? i.replace(/[\$,]/g, '')*1 : typeof i === 'number' ? i : 0;
- };
-
var filas = [];
api.rows().every(function() {
var data = this.data();
@@ -243,7 +311,7 @@ var tablePagos = $('#tableOfLineasPagos').DataTable({
});
var totalPagos = filas
.reduce(function(a, data) {
- return a + intVal(data['total']); // Aquí asumimos que la columna 6 está en el índice 5
+ return parseFloat(a) + parseFloat(data['total']);
}, 0);
var filas = [];
@@ -255,12 +323,12 @@ var tablePagos = $('#tableOfLineasPagos').DataTable({
});
var totalPendiente = filas
.reduce(function(a, data) {
- return a + intVal(data['total']); // Aquí asumimos que la columna 6 está en el índice 5
+ return parseFloat(a) + parseFloat(data['total']);
}, 0);
// Update footer
- $('#totalCobrado-sum').html(totalPagos.toFixed(2));
- $('#pendienteCobro-sum').html(totalPendiente.toFixed(2));
+ autoNumericTotalCobrado.set(totalPagos);
+ autoNumericPendienteCobro.set(totalPendiente);
// call footerCallback of the other table
if (typeof tableLineas !== 'undefined') {
@@ -269,71 +337,32 @@ var tablePagos = $('#tableOfLineasPagos').DataTable({
}
});
+
function updateFooterLineas(table){
- // Remove the formatting to get integer data for summation
- var intVal = function (i) {
- return typeof i === 'string' ?
- i.replace(/[\$,]/g, '')*1 :
- typeof i === 'number' ?
- i : 0;
- };
-
- // Total over all pages
- var totalSubtotal = table
- .column(9)
- .data()
- .reduce(function (a, b) {
- return intVal(a) + intVal(b);
- }, 0);
-
- var totalIVA = table
- .column(10)
- .data()
- .reduce(function (a, b) {
- return intVal(a) + intVal(b);
- }, 0);
-
- var totalTotal = table
- .column(11)
- .data()
- .reduce(function (a, b) {
- return intVal(a) + intVal(b);
- }, 0);
-
- // Update footer
- $('#subtotal-sum').html(totalSubtotal.toFixed(2));
- $('#total-iva-sum').html(totalIVA.toFixed(2));
- $('#total-sum').html(totalTotal.toFixed(2));
-
// Assuming pendiente de pago is totalTotal - totalIVA for this example
- estado == 'borrador') :?>
- var pendientePago = totalTotal ;
- var total_pagos = 0;
-
- var total_pagos = parseFloat($('#totalCobrado-sum').html()).toFixed(2);
- var pendientePago = totalTotal - total_pagos;
-
+ var total_pagos = autoNumericTotalCobrado.getNumber();
+ var pendientePago = autoNumericTotal.getNumber() - total_pagos;
// Se comprueba si pendientePago es un numero o NAN
if(isNaN(pendientePago)){
pendientePago = 0;
}
- $('#pendiente-pago').html(pendientePago.toFixed(2));
+ autoNumericPendientePago.set(pendientePago);
$.ajax({
url: 'id) ?>',
method: 'POST',
data: {
- base: totalSubtotal,
- total: totalTotal,
+ base: autoNumericSubtotal.getNumber(),
+ total: autoNumericTotal.getNumber(),
total_pagos: total_pagos,
pendiente: pendientePago
}
}).done((data, textStatus, jqXHR) => {
- if($('#pendiente-pago').html() == '0.00'){
+ if(autoNumericPendientePago.getNumber() == 0){
$('#addPagoRow').hide();
} else {
- $('#validarFactura').show();
+ $('#addPagoRow').show();
}
if(data.estado_pago == 'pagada'){
$('#estado_pago_text').text('');
diff --git a/ci4/app/Views/themes/vuexy/form/facturas/viewFacturaForm.php b/ci4/app/Views/themes/vuexy/form/facturas/viewFacturaForm.php
index 0736152a..23911b81 100644
--- a/ci4/app/Views/themes/vuexy/form/facturas/viewFacturaForm.php
+++ b/ci4/app/Views/themes/vuexy/form/facturas/viewFacturaForm.php
@@ -22,7 +22,7 @@
- estado !='borrador' && (strpos($facturaEntity->numero, "REC ") !== 0) ) : ?>
+ numero, "REC ") !== 0) ) : ?>
estado !='borrador' && (strpos($facturaEntity->numero, "REC ") === 0) ) : ?>
@@ -38,6 +38,9 @@
name="validarFactura"
value=""
/>
+
+
+ showDeleteButton == true && $facturaEntity->estado !='validada') : ?>
-
+