diff --git a/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosServiciosItems.php b/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosServiciosItems.php
new file mode 100644
index 00000000..3045316b
--- /dev/null
+++ b/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosServiciosItems.php
@@ -0,0 +1,712 @@
+
+
+
+
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+section("additionalInlineJs") ?>
+
+ const lastColNr = $('#tableOfServiciosAcabado').find("tr:first th").length - 1;
+ const url = window.location.href;
+ const url_parts = url.split('/');
+ if(url_parts[url_parts.length-2] == 'edit'){
+ id = url_parts[url_parts.length-1];
+ }
+ else{
+ id = 200000; // id=-1
+ }
+
+ const actionBtns = function(data) {
+ return `
+
+
+
+ `;
+ };
+
+ editor = new $.fn.dataTable.Editor( {
+ ajax: {
+ url: "",
+ headers: {
+ : v,
+ },
+ },
+ table : "#tableOfServiciosAcabado",
+ idSrc: 'id',
+ fields: [ {
+ "name": "tarifa_acabado_id",
+ "type": "select"
+ }, {
+ "name": "precio_unidad"
+ }, {
+ "name": "precio_total"
+ }, {
+ "name": "presupuesto_id",
+ "type": "hidden"
+ },
+ ]
+ } );
+
+ // Generación de la lista de servicios de acabado (id, nombre)
+ const acabadosList = ;
+ editor.field( 'tarifa_acabado_id' ).update( acabadosList );
+
+ editor.on( 'preSubmit', function ( e, d, type ) {
+ if ( type === 'create'){
+ d.data[0]['presupuesto_id'] = id;
+ }
+ else if(type === 'edit' ) {
+ for (v in d.data){
+ d.data[v]['presupuesto_id'] = id;
+ }
+ }
+ });
+
+ editor.on( 'postSubmit', function ( e, json, data, action ) {
+ yeniden(json.);
+ });
+
+ editor.on( 'submitSuccess', function ( e, json, data, action ) {
+ theTable.clearPipeline();
+ theTable.draw();
+ });
+
+ // Activate an inline edit on click of a table cell
+ $('#tableOfServiciosAcabado').on( 'click', 'tbody span.edit', function (e) {
+ editor.inline(
+ theTable.cells(this.parentNode.parentNode, '*').nodes(),
+ {
+ cancelHtml: '
',
+ cancelTrigger: 'span.cancel',
+ submitHtml: '
',
+ submitTrigger: 'span.edit',
+ submit: 'allIfChanged'
+ }
+ );
+ } );
+
+ // Delete row
+ $(document).on('click', '.btn-delete', function(e) {
+ $(".btn-remove").attr('data-id', $(this).attr('data-id'));
+ });
+
+ $(document).on('click', '.btn-remove', function(e) {
+ const dataId = $(this).attr('data-id');
+ const row = $(this).closest('tr');
+ if ($.isNumeric(dataId)) {
+ $.ajax({
+ url: `/presupuestos/presupuestoacabados/delete/${dataId}`,
+ method: 'GET',
+ }).done((data, textStatus, jqXHR) => {
+ $('#confirm2delete').modal('toggle');
+ theTable.clearPipeline();
+ theTable.row($(row)).invalidate().draw();
+ popSuccessAlert(data.msg ?? jqXHR.statusText);
+ }).fail((jqXHR, textStatus, errorThrown) => {
+ popErrorAlert(jqXHR.responseJSON.messages.error)
+ })
+ }
+ });
+
+ var theTable = $('#tableOfServiciosAcabado').DataTable( {
+ serverSide: true,
+ processing: true,
+ autoWidth: true,
+ responsive: true,
+ lengthMenu: [ 5, 10, 25],
+ order: [[ 0, "asc" ], [ 1, "asc" ]],
+ pageLength: 10,
+ lengthChange: true,
+ searching: false,
+ paging: true,
+ info: false,
+ dom: '<"mt-4"><"float-start"l>
<"mt-4 mb-3"p>',
+ ajax : $.fn.dataTable.pipeline( {
+ url: '',
+ data: {
+ id_presupuesto: id,
+ },
+ method: 'POST',
+ headers: {'X-Requested-With': 'XMLHttpRequest'},
+ async: true,
+ }),
+ columns: [
+ {'data': 'tarifa_acabado_id',
+ render: function(data, type, row, meta) {
+ var value = acabadosList.find(element => element.value === data);
+ return value['label'];
+ },
+ },
+ { 'data': 'precio_unidad' },
+ { 'data': 'precio_total' },
+ {
+ data: actionBtns,
+ className: 'row-edit dt-center'
+ }
+ ],
+ columnDefs: [
+ {
+ orderable: false,
+ searchable: false,
+ targets: [lastColNr]
+ },
+ {
+ "orderData": [ 0, 1 ],
+ "targets": 0
+ },
+
+ ],
+ language: {
+ url: "//cdn.datatables.net/plug-ins/1.13.4/i18n/i18n ?>.json"
+ },
+ buttons: [ {
+ className: 'btn btn-primary float-end me-sm-3 me-1',
+ extend: "createInline",
+ editor: editor,
+ formOptions: {
+ submitTrigger: -1,
+ submitHtml: ''
+ }
+ } ]
+ } );
+
+endSection() ?>
+
+
+
+
+section("additionalInlineJs") ?>
+
+ const lastColNr2 = $('#tableOfServiciosEncuadernacion').find("tr:first th").length - 1;
+
+ editor2 = new $.fn.dataTable.Editor( {
+ ajax: {
+ url: "",
+ headers: {
+ : v,
+ },
+ },
+ table : "#tableOfServiciosEncuadernacion",
+ idSrc: 'id',
+ fields: [ {
+ "name": "tarifa_encuadernado_id",
+ "type": "select"
+ }, {
+ "name": "precio_unidad"
+ }, {
+ "name": "precio_total"
+ }, {
+ "name": "presupuesto_id",
+ "type": "hidden"
+ },
+ ]
+ } );
+
+ // Generación de la lista de servicios de acabado (id, nombre)
+ const encuadernadosList = ;
+ editor2.field( 'tarifa_encuadernado_id' ).update( encuadernadosList );
+
+ editor2.on( 'preSubmit', function ( e, d, type ) {
+ if ( type === 'create'){
+ d.data[0]['presupuesto_id'] = id;
+ }
+ else if(type === 'edit' ) {
+ for (v in d.data){
+ d.data[v]['presupuesto_id'] = id;
+ }
+ }
+ });
+
+ editor2.on( 'postSubmit', function ( e, json, data, action ) {
+ yeniden(json.);
+ });
+
+ editor2.on( 'submitSuccess', function ( e, json, data, action ) {
+ theTable2.clearPipeline();
+ theTable2.draw();
+ });
+
+ // Activate an inline edit on click of a table cell
+ $('#tableOfServiciosEncuadernacion').on( 'click', 'tbody span.edit', function (e) {
+ editor2.inline(
+ theTable2.cells(this.parentNode.parentNode, '*').nodes(),
+ {
+ cancelHtml: '',
+ cancelTrigger: 'span.cancel',
+ submitHtml: '',
+ submitTrigger: 'span.edit',
+ submit: 'allIfChanged'
+ }
+ );
+ } );
+
+
+ var theTable2 = $('#tableOfServiciosEncuadernacion').DataTable( {
+ serverSide: true,
+ processing: true,
+ autoWidth: true,
+ responsive: true,
+ lengthMenu: [ 5, 10, 25],
+ order: [[ 0, "asc" ], [ 1, "asc" ]],
+ pageLength: 10,
+ lengthChange: true,
+ searching: false,
+ paging: true,
+ info: false,
+ dom: '<"mt-4"><"float-start"l><"mt-4 mb-3"p>',
+ ajax : $.fn.dataTable.pipeline( {
+ url: '',
+ data: {
+ id_presupuesto: id,
+ },
+ method: 'POST',
+ headers: {'X-Requested-With': 'XMLHttpRequest'},
+ async: true,
+ }),
+ columns: [
+ {'data': 'tarifa_encuadernado_id',
+ render: function(data, type, row, meta) {
+ var value = encuadernadosList.find(element => element.value === data);
+ return value['label'];
+ },
+ },
+ { 'data': 'precio_unidad' },
+ { 'data': 'precio_total' },
+ {
+ data: actionBtns,
+ className: 'row-edit dt-center'
+ }
+ ],
+ columnDefs: [
+ {
+ orderable: false,
+ searchable: false,
+ targets: [lastColNr2]
+ },
+ {
+ "orderData": [ 0, 1 ],
+ "targets": 0
+ },
+
+ ],
+ language: {
+ url: "//cdn.datatables.net/plug-ins/1.13.4/i18n/i18n ?>.json"
+ },
+ buttons: [ {
+ className: 'btn btn-primary float-end me-sm-3 me-1',
+ extend: "createInline",
+ editor: editor2,
+ formOptions: {
+ submitTrigger: -1,
+ submitHtml: ''
+ }
+ } ]
+ } );
+
+endSection() ?>
+
+
+
+
+section("additionalInlineJs") ?>
+
+ const lastColNr3 = $('#tableOfServiciosManipulado').find("tr:first th").length - 1;
+
+ editor3 = new $.fn.dataTable.Editor( {
+ ajax: {
+ url: "",
+ headers: {
+ : v,
+ },
+ },
+ table : "#tableOfServiciosManipulado",
+ idSrc: 'id',
+ fields: [ {
+ "name": "tarifa_manipulado_id",
+ "type": "select"
+ }, {
+ "name": "precio_unidad"
+ }, {
+ "name": "precio_total"
+ }, {
+ "name": "presupuesto_id",
+ "type": "hidden"
+ },
+ ]
+ } );
+
+ // Generación de la lista de servicios de acabado (id, nombre)
+ const manipuladosList = ;
+ editor3.field( 'tarifa_manipulado_id' ).update( manipuladosList );
+
+ editor3.on( 'preSubmit', function ( e, d, type ) {
+ if ( type === 'create'){
+ d.data[0]['presupuesto_id'] = id;
+ }
+ else if(type === 'edit' ) {
+ for (v in d.data){
+ d.data[v]['presupuesto_id'] = id;
+ }
+ }
+ });
+
+ editor3.on( 'postSubmit', function ( e, json, data, action ) {
+ yeniden(json.);
+ });
+
+ editor3.on( 'submitSuccess', function ( e, json, data, action ) {
+ theTable3.clearPipeline();
+ theTable3.draw();
+ });
+
+ // Activate an inline edit on click of a table cell
+ $('#tableOfServiciosManipulado').on( 'click', 'tbody span.edit', function (e) {
+ editor3.inline(
+ theTable3.cells(this.parentNode.parentNode, '*').nodes(),
+ {
+ cancelHtml: '',
+ cancelTrigger: 'span.cancel',
+ submitHtml: '',
+ submitTrigger: 'span.edit',
+ submit: 'allIfChanged'
+ }
+ );
+ } );
+
+
+ // Delete row
+
+
+ var theTable3 = $('#tableOfServiciosManipulado').DataTable( {
+ serverSide: true,
+ processing: true,
+ autoWidth: true,
+ responsive: true,
+ lengthMenu: [ 5, 10, 25],
+ order: [[ 0, "asc" ], [ 1, "asc" ]],
+ pageLength: 10,
+ lengthChange: true,
+ searching: false,
+ paging: true,
+ info: false,
+ dom: '<"mt-4"><"float-start"l><"mt-4 mb-3"p>',
+ ajax : $.fn.dataTable.pipeline( {
+ url: '',
+ data: {
+ id_presupuesto: id,
+ },
+ method: 'POST',
+ headers: {'X-Requested-With': 'XMLHttpRequest'},
+ async: true,
+ }),
+ columns: [
+ {'data': 'tarifa_manipulado_id',
+ render: function(data, type, row, meta) {
+ var value = manipuladosList.find(element => element.value === data);
+ return value['label'];
+ },
+ },
+ { 'data': 'precio_unidad' },
+ { 'data': 'precio_total' },
+ {
+ data: actionBtns,
+ className: 'row-edit dt-center'
+ }
+ ],
+ columnDefs: [
+ {
+ orderable: false,
+ searchable: false,
+ targets: [lastColNr3]
+ },
+ {
+ "orderData": [ 0, 1 ],
+ "targets": 0
+ },
+
+ ],
+ language: {
+ url: "//cdn.datatables.net/plug-ins/1.13.4/i18n/i18n ?>.json"
+ },
+ buttons: [ {
+ className: 'btn btn-primary float-end me-sm-3 me-1',
+ extend: "createInline",
+ editor: editor3,
+ formOptions: {
+ submitTrigger: -1,
+ submitHtml: ''
+ }
+ } ]
+ } );
+
+endSection() ?>
+
+
+
+
+
+section("additionalInlineJs") ?>
+
+ const lastColNr4 = $('#tableOfServiciosPreimpresion').find("tr:first th").length - 1;
+
+ editor4 = new $.fn.dataTable.Editor( {
+ ajax: {
+ url: "",
+ headers: {
+ : v,
+ },
+ },
+ table : "#tableOfServiciosPreimpresion",
+ idSrc: 'id',
+ fields: [ {
+ "name": "tarifa_preimpresion_id",
+ "type": "select"
+ }, {
+ "name": "precio_unidad"
+ }, {
+ "name": "precio_total"
+ }, {
+ "name": "presupuesto_id",
+ "type": "hidden"
+ },
+ ]
+ } );
+
+ // Generación de la lista de servicios de acabado (id, nombre)
+ const preimpresionesList = ;
+ editor4.field( 'tarifa_preimpresion_id' ).update( preimpresionesList );
+
+ editor4.on( 'preSubmit', function ( e, d, type ) {
+ if ( type === 'create'){
+ d.data[0]['presupuesto_id'] = id;
+ }
+ else if(type === 'edit' ) {
+ for (v in d.data){
+ d.data[v]['presupuesto_id'] = id;
+ }
+ }
+ });
+
+ editor4.on( 'postSubmit', function ( e, json, data, action ) {
+ yeniden(json.);
+ });
+
+ editor4.on( 'submitSuccess', function ( e, json, data, action ) {
+ theTable4.clearPipeline();
+ theTable4.draw();
+ });
+
+ // Activate an inline edit on click of a table cell
+ $('#tableOfServiciosPreimpresion').on( 'click', 'tbody span.edit', function (e) {
+ editor4.inline(
+ theTable4.cells(this.parentNode.parentNode, '*').nodes(),
+ {
+ cancelHtml: '',
+ cancelTrigger: 'span.cancel',
+ submitHtml: '',
+ submitTrigger: 'span.edit',
+ submit: 'allIfChanged'
+ }
+ );
+ } );
+
+
+ // Delete row
+
+
+ var theTable4 = $('#tableOfServiciosPreimpresion').DataTable( {
+ serverSide: true,
+ processing: true,
+ autoWidth: true,
+ responsive: true,
+ lengthMenu: [ 5, 10, 25],
+ order: [[ 0, "asc" ], [ 1, "asc" ]],
+ pageLength: 10,
+ lengthChange: true,
+ searching: false,
+ paging: true,
+ info: false,
+ dom: '<"mt-4"><"float-start"l><"mt-4 mb-3"p>',
+ ajax : $.fn.dataTable.pipeline( {
+ url: '',
+ data: {
+ id_presupuesto: id,
+ },
+ method: 'POST',
+ headers: {'X-Requested-With': 'XMLHttpRequest'},
+ async: true,
+ }),
+ columns: [
+ {'data': 'tarifa_preimpresion_id',
+ render: function(data, type, row, meta) {
+ var value = preimpresionesList.find(element => element.value === data);
+ return value['label'];
+ },
+ },
+ { 'data': 'precio_unidad' },
+ { 'data': 'precio_total' },
+ {
+ data: actionBtns,
+ className: 'row-edit dt-center'
+ }
+ ],
+ columnDefs: [
+ {
+ orderable: false,
+ searchable: false,
+ targets: [lastColNr4]
+ },
+ {
+ "orderData": [ 0, 1 ],
+ "targets": 0
+ },
+
+ ],
+ language: {
+ url: "//cdn.datatables.net/plug-ins/1.13.4/i18n/i18n ?>.json"
+ },
+ buttons: [ {
+ className: 'btn btn-primary float-end me-sm-3 me-1',
+ extend: "createInline",
+ editor: editor4,
+ formOptions: {
+ submitTrigger: -1,
+ submitHtml: ''
+ }
+ } ]
+ } );
+
+endSection() ?>
\ No newline at end of file
diff --git a/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_resumenPresupuestoItems.php b/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_resumenPresupuestoItems.php
new file mode 100644
index 00000000..16f88389
--- /dev/null
+++ b/ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_resumenPresupuestoItems.php
@@ -0,0 +1,81 @@
+
+
+
+
+
+
+
+
+
+
+
+
Detalles del presupuesto
+
+ - Coste papel
+ - NaN €
+ - Margen papel
+ - NaN €
+
+ - Coste impresión
+ - NaN €
+ - Margen impresión
+ - NaN €
+
+ - Coste servicios
+ - NaN €
+ - Margen servicios
+ - NaN €
+
+ - Costes
+ - NaN €
+ - Margen
+ - NaN €
+
+ - Descuento
+ - NaN €
+
+ - Precio unidad
+ - NaN €
+ - Coste de envío
+ - NaN €
+
+
+
+
+
+
+ - Total impresión
+ - NaN €
+ - Total presupuesto
+ - NaN €
+
+
+
+
+ confirmarPresupuesto == true ? 'checked' : ''; ?>>
+
+
+
+
+
+
+
+
+
+
"
/>
- "btn btn-secondary float-start",]) ?>
+ "btn btn-dark float-start me-sm-3 me-1",]) ?>
+ "btn btn-info float-start me-sm-3 me-1",]) ?>
+ "btn btn-secondary float-start",]) ?>
-
endSection() ?>
section('additionalExternalJs') ?>
+
+
diff --git a/ci4/app/Views/themes/backend/vuexy/main/menu_impresion.php b/ci4/app/Views/themes/backend/vuexy/main/menu_impresion.php
index 4a7622a4..d773389b 100644
--- a/ci4/app/Views/themes/backend/vuexy/main/menu_impresion.php
+++ b/ci4/app/Views/themes/backend/vuexy/main/menu_impresion.php
@@ -76,7 +76,7 @@
@@ -125,16 +125,6 @@
- 0): ?>
- 0): ?>
-
-
-
-
0): ?>
0): ?>