From b2da26223f6d5eb9d87ceddea052b8a5f377b295 Mon Sep 17 00:00:00 2001 From: imnavajas Date: Sat, 15 Jul 2023 12:41:21 +0200 Subject: [PATCH] Unificados JS y CSS ozar + revision de UI maquinas por defecto --- ci4/app/Language/es/App.php | 1 + .../_form_validation_errors.php | 14 -- .../_comunidadAutonomaFormItems.php | 2 +- .../viewComunidadAutonomaForm.php | 10 +- .../viewComunidadAutonomaList.php | 12 +- .../formas-pago/viewFormaDePagoForm.php | 8 +- .../formas-pago/viewFormaDePagoList.php | 17 +- .../formas-pago/viewFormaPagoForm.php | 8 +- .../formas-pago/viewFormaPagoList.php | 17 +- .../imposiciones/viewImposicionList.php | 2 +- .../maquinas/viewMaquinaForm.php | 2 +- .../maquinas/viewMaquinaList.php | 7 +- .../maquinas/viewMaquinaPorDefectoForm.php | 13 +- .../maquinas/viewMaquinaPorDefectoList.php | 153 ++++++++--------- .../configuracion/paises/viewPaisForm.php | 8 +- .../configuracion/paises/viewPaisList.php | 159 ++++++++---------- .../papel/_papelImpresionFormItems.php | 3 +- .../papel/viewPapelImpresionForm.php | 11 +- .../papel/viewPapelImpresionList.php | 3 +- .../provincias/_provinciaFormItems.php | 2 +- .../provincias/viewProvinciaForm.php | 10 +- .../provincias/viewProvinciaList.php | 19 +-- .../tipologias/viewTipologiaLibrosList.php | 2 +- .../manipulado/viewTarifaManipuladoForm.php | 2 +- .../backend/vuexy/main/menu_impresion.php | 12 +- from mac to app.txt | 2 +- 26 files changed, 231 insertions(+), 268 deletions(-) diff --git a/ci4/app/Language/es/App.php b/ci4/app/Language/es/App.php index 7dcda7e4..34dafad2 100644 --- a/ci4/app/Language/es/App.php +++ b/ci4/app/Language/es/App.php @@ -683,6 +683,7 @@ return [ "menu_formaspago" => "Metodos de pago", "menu_imposiciones" => "Imposiciones", "menu_maquina" => "Maquinas", + "menu_maquina_defecto" => "Maquinas por defecto", "menu_papelgenerico" => "Papel generico", "menu_papelimpresion" => "Papel impresión", "menu_seriefactura" => "Series facturas", diff --git a/ci4/app/Views/themes/_commonPartialsBs/_form_validation_errors.php b/ci4/app/Views/themes/_commonPartialsBs/_form_validation_errors.php index f9e1b539..7f83e331 100644 --- a/ci4/app/Views/themes/_commonPartialsBs/_form_validation_errors.php +++ b/ci4/app/Views/themes/_commonPartialsBs/_form_validation_errors.php @@ -20,18 +20,4 @@ - -
-
-
- -

Please correct the errors below:

-
    - -
    • - -
-
-
-
diff --git a/ci4/app/Views/themes/backend/vuexy/form/configuracion/comunidades-autonomas/_comunidadAutonomaFormItems.php b/ci4/app/Views/themes/backend/vuexy/form/configuracion/comunidades-autonomas/_comunidadAutonomaFormItems.php index 818e37fb..f98b3657 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/configuracion/comunidades-autonomas/_comunidadAutonomaFormItems.php +++ b/ci4/app/Views/themes/backend/vuexy/form/configuracion/comunidades-autonomas/_comunidadAutonomaFormItems.php @@ -11,7 +11,7 @@ - $v) : ?> diff --git a/ci4/app/Views/themes/backend/vuexy/form/configuracion/comunidades-autonomas/viewComunidadAutonomaForm.php b/ci4/app/Views/themes/backend/vuexy/form/configuracion/comunidades-autonomas/viewComunidadAutonomaForm.php index 9ba65662..5a2f09bf 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/configuracion/comunidades-autonomas/viewComunidadAutonomaForm.php +++ b/ci4/app/Views/themes/backend/vuexy/form/configuracion/comunidades-autonomas/viewComunidadAutonomaForm.php @@ -1,6 +1,6 @@ -include("Themes/_commonPartialsBs/select2bs5") ?> -include("Themes/_commonPartialsBs/sweetalert") ?> -extend("Themes/" . config("Basics")->theme["name"] . "/AdminLayout/defaultLayout") ?> +include("themes_commonPartialsBs/select2bs5") ?> +include("themes_commonPartialsBs/sweetalert") ?> +extend('themes/backend/vuexy/main/defaultlayout') ?> section("content") ?>
@@ -11,7 +11,7 @@
- + getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?>
@@ -32,7 +32,7 @@ $('#paisId').select2({ - theme: 'bootstrap-5', + allowClear: false, ajax: { url: '', diff --git a/ci4/app/Views/themes/backend/vuexy/form/configuracion/comunidades-autonomas/viewComunidadAutonomaList.php b/ci4/app/Views/themes/backend/vuexy/form/configuracion/comunidades-autonomas/viewComunidadAutonomaList.php index be636171..450b6060 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/configuracion/comunidades-autonomas/viewComunidadAutonomaList.php +++ b/ci4/app/Views/themes/backend/vuexy/form/configuracion/comunidades-autonomas/viewComunidadAutonomaList.php @@ -1,7 +1,7 @@ -include('Themes/_commonPartialsBs/select2bs5') ?> -include('Themes/_commonPartialsBs/datatables') ?> -include('Themes/_commonPartialsBs/sweetalert') ?> -extend('Themes/'.config('Basics')->theme['name'].'/AdminLayout/defaultLayout') ?> +include('themes_commonPartialsBs/select2bs5') ?> +include('themes_commonPartialsBs/datatables') ?> +include('themes_commonPartialsBs/sweetalert') ?> +extend('themes'.config('Basics')->theme['name'].'/AdminLayout/defaultLayout') ?> section('content'); ?>
@@ -11,7 +11,7 @@

- + @@ -64,7 +64,7 @@ stateSave: true, order: [[1, 'asc']], language: { - url: "/assets/dt/languages[$currentLocale] ?? config('Basics')->i18n ?>.json" + url: "//cdn.datatables.net/plug-ins/1.13.4/i18n/i18n ?>.json" }, ajax : $.fn.dataTable.pipeline( { url: '', diff --git a/ci4/app/Views/themes/backend/vuexy/form/configuracion/formas-pago/viewFormaDePagoForm.php b/ci4/app/Views/themes/backend/vuexy/form/configuracion/formas-pago/viewFormaDePagoForm.php index ce7b54d8..29fd7ace 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/configuracion/formas-pago/viewFormaDePagoForm.php +++ b/ci4/app/Views/themes/backend/vuexy/form/configuracion/formas-pago/viewFormaDePagoForm.php @@ -1,6 +1,6 @@ -include("Themes/_commonPartialsBs/select2bs5") ?> -include("Themes/_commonPartialsBs/sweetalert") ?> -extend("Themes/" . config("Basics")->theme["name"] . "/AdminLayout/defaultLayout") ?> +include("themes_commonPartialsBs/select2bs5") ?> +include("themes_commonPartialsBs/sweetalert") ?> +extend('themes/backend/vuexy/main/defaultlayout') ?> section("content") ?>
@@ -11,7 +11,7 @@
- + getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?>
diff --git a/ci4/app/Views/themes/backend/vuexy/form/configuracion/formas-pago/viewFormaDePagoList.php b/ci4/app/Views/themes/backend/vuexy/form/configuracion/formas-pago/viewFormaDePagoList.php index e30bbb48..dfc55df8 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/configuracion/formas-pago/viewFormaDePagoList.php +++ b/ci4/app/Views/themes/backend/vuexy/form/configuracion/formas-pago/viewFormaDePagoList.php @@ -1,6 +1,6 @@ -include('Themes/_commonPartialsBs/datatables') ?> -include('Themes/_commonPartialsBs/sweetalert') ?> -extend('Themes/'.config('Basics')->theme['name'].'/AdminLayout/defaultLayout') ?> +include('themes_commonPartialsBs/datatables') ?> +include('themes_commonPartialsBs/sweetalert') ?> +extend('themes'.config('Basics')->theme['name'].'/AdminLayout/defaultLayout') ?> section('content'); ?>
@@ -10,7 +10,7 @@

- +
@@ -70,7 +70,7 @@ stateSave: true, order: [[1, 'asc']], language: { - url: "/assets/dt/languages[$currentLocale] ?? config('Basics')->i18n ?>.json" + url: "//cdn.datatables.net/plug-ins/1.13.4/i18n/i18n ?>.json" }, ajax : $.fn.dataTable.pipeline( { url: '', @@ -166,20 +166,17 @@ $(document).on('click', '.btn-delete', function(e) { section('css') ?> - + endSection() ?> section('additionalExternalJs') ?> - + - - - endSection() ?> diff --git a/ci4/app/Views/themes/backend/vuexy/form/configuracion/formas-pago/viewFormaPagoForm.php b/ci4/app/Views/themes/backend/vuexy/form/configuracion/formas-pago/viewFormaPagoForm.php index ed8b112c..1ddbfce1 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/configuracion/formas-pago/viewFormaPagoForm.php +++ b/ci4/app/Views/themes/backend/vuexy/form/configuracion/formas-pago/viewFormaPagoForm.php @@ -1,6 +1,6 @@ -include("Themes/_commonPartialsBs/select2bs5") ?> -include("Themes/_commonPartialsBs/sweetalert") ?> -extend("Themes/" . config("Basics")->theme["name"] . "/AdminLayout/defaultLayout") ?> +include("themes_commonPartialsBs/select2bs5") ?> +include("themes_commonPartialsBs/sweetalert") ?> +extend('themes/backend/vuexy/main/defaultlayout') ?> section("content") ?>
@@ -11,7 +11,7 @@
- + getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?>
diff --git a/ci4/app/Views/themes/backend/vuexy/form/configuracion/formas-pago/viewFormaPagoList.php b/ci4/app/Views/themes/backend/vuexy/form/configuracion/formas-pago/viewFormaPagoList.php index 390dfb26..07526fb2 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/configuracion/formas-pago/viewFormaPagoList.php +++ b/ci4/app/Views/themes/backend/vuexy/form/configuracion/formas-pago/viewFormaPagoList.php @@ -1,6 +1,6 @@ -include('Themes/_commonPartialsBs/datatables') ?> -include('Themes/_commonPartialsBs/sweetalert') ?> -extend('Themes/'.config('Basics')->theme['name'].'/AdminLayout/defaultLayout') ?> +include('themes_commonPartialsBs/datatables') ?> +include('themes_commonPartialsBs/sweetalert') ?> +extend('themes'.config('Basics')->theme['name'].'/AdminLayout/defaultLayout') ?> section('content'); ?>
@@ -10,7 +10,7 @@

- +
@@ -87,7 +87,7 @@ "scrollX": true, "stateSave": true, "language": { - url: "/assets/dt/languages[$currentLocale] ?? config('Basics')->i18n ?>.json" + url: "//cdn.datatables.net/plug-ins/1.13.4/i18n/i18n ?>.json" }, "columnDefs": [ { @@ -125,20 +125,17 @@ section('css') ?> - + endSection() ?> section('additionalExternalJs') ?> - + - - - endSection() ?> diff --git a/ci4/app/Views/themes/backend/vuexy/form/configuracion/imposiciones/viewImposicionList.php b/ci4/app/Views/themes/backend/vuexy/form/configuracion/imposiciones/viewImposicionList.php index b9533410..8a3a7c11 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/configuracion/imposiciones/viewImposicionList.php +++ b/ci4/app/Views/themes/backend/vuexy/form/configuracion/imposiciones/viewImposicionList.php @@ -74,7 +74,7 @@ stateSave: true, order: [[1, 'asc']], language: { - url: "/assets/dt/languages[$currentLocale] ?? config('Basics')->i18n ?>.json" + url: "//cdn.datatables.net/plug-ins/1.13.4/i18n/i18n ?>.json" }, ajax : $.fn.dataTable.pipeline( { url: '', diff --git a/ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/viewMaquinaForm.php b/ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/viewMaquinaForm.php index b6772e31..860a7f2c 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/viewMaquinaForm.php +++ b/ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/viewMaquinaForm.php @@ -550,7 +550,7 @@ endSection() ?> section('css') ?> - + endSection() ?> diff --git a/ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/viewMaquinaList.php b/ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/viewMaquinaList.php index 35bc43c0..46c63c0f 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/viewMaquinaList.php +++ b/ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/viewMaquinaList.php @@ -171,20 +171,17 @@ $(document).on('click', '.btn-delete', function(e) { section('css') ?> - + endSection() ?> section('additionalExternalJs') ?> - + - - - endSection() ?> diff --git a/ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/viewMaquinaPorDefectoForm.php b/ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/viewMaquinaPorDefectoForm.php index e2e70ec6..e5d0e061 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/viewMaquinaPorDefectoForm.php +++ b/ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/viewMaquinaPorDefectoForm.php @@ -1,6 +1,7 @@ include("themes/_commonPartialsBs/select2bs5") ?> include("themes/_commonPartialsBs/sweetalert") ?> extend('themes/backend/vuexy/main/defaultlayout') ?> + section("content") ?>
@@ -8,14 +9,12 @@

- + -
- - getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?> - -
-
+ + getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?> + +
include('themes/_commonPartialsBs/datatables') ?> include('themes/_commonPartialsBs/sweetalert') ?> extend('themes/backend/vuexy/main/defaultlayout') ?> + section('content'); ?>
@@ -45,85 +46,82 @@ section('additionalInlineJs') ?> - const lastColNr = $('#tableOfMaquinaspordefecto').find("tr:first th").length - 1; - const actionBtns = function(data) { - return `
`; - }; - theTable = $('#tableOfMaquinaspordefecto').DataTable({ - processing: true, - serverSide: true, - autoWidth: true, - responsive: true, - scrollX: true, - lengthMenu: [ 5, 10, 25, 50, 75, 100, 250, 500, 1000, 2500 ], - pageLength: 10, - lengthChange: true, - "dom": 'lfBrtip', - "buttons": [ - 'copy', 'csv', 'excel', 'print', { - extend: 'pdfHtml5', - orientation: 'landscape', - pageSize: 'A4' - } - ], - stateSave: true, - order: [[1, 'asc']], - language: { - url: "/assets/dt/languages[$currentLocale] ?? config('Basics')->i18n ?>.json" - }, - ajax : $.fn.dataTable.pipeline( { - url: '', - method: 'POST', - headers: {'X-Requested-With': 'XMLHttpRequest'}, - async: true, - }), - columnDefs: [ - { - orderable: false, - searchable: false, - targets: [lastColNr] - } - ], - columns : [ - { 'data': 'tipo', "render": function ( data, type, row, meta ) { - if(data=='bn') - return ''; - else if(data=='bnhq') - return ''; - else if(data=='color') - return ''; - else if(data=='cubierta') - return ''; - else if(data=='portada') - return ''; - else if(data=='rotativa') - return ''; - } - }, - { 'data': 'maquina' }, - { 'data': 'ancho_min' }, - { 'data': 'ancho_max' }, - { 'data': 'alto_min' }, - { 'data': 'alto_max' }, - { 'data': 'tirada_min' }, - { 'data': 'tirada_max' }, - { 'data': actionBtns } - ] - }); + + `; + }; + theTable = $('#tableOfMaquinaspordefecto').DataTable({ + processing: true, + serverSide: true, + autoWidth: true, + responsive: true, + scrollX: true, + lengthMenu: [ 5, 10, 25, 50, 75, 100, 250, 500, 1000, 2500 ], + pageLength: 10, + lengthChange: true, + "dom": 'lfBrtip', + "buttons": [ + 'copy', 'csv', 'excel', 'print', { + extend: 'pdfHtml5', + orientation: 'landscape', + pageSize: 'A4' + } + ], + stateSave: true, + order: [[1, 'asc']], + language: { + url: "//cdn.datatables.net/plug-ins/1.13.4/i18n/i18n ?>.json" + }, + ajax : $.fn.dataTable.pipeline( { + url: '', + method: 'POST', + headers: {'X-Requested-With': 'XMLHttpRequest'}, + async: true, + }), + columnDefs: [ + { + orderable: false, + searchable: false, + targets: [lastColNr] + } + ], + columns : [ + { 'data': 'tipo', "render": function ( data, type, row, meta ) { + if(data=='bn') + return ''; + else if(data=='bnhq') + return ''; + else if(data=='color') + return ''; + else if(data=='cubierta') + return ''; + else if(data=='portada') + return ''; + else if(data=='rotativa') + return ''; + } + }, + { 'data': 'maquina' }, + { 'data': 'ancho_min' }, + { 'data': 'ancho_max' }, + { 'data': 'alto_min' }, + { 'data': 'alto_max' }, + { 'data': 'tirada_min' }, + { 'data': 'tirada_max' }, + { 'data': actionBtns } + ] + }); - - - -$(document).on('click', '.btn-edit', function(e) { + $(document).on('click', '.btn-edit', function(e) { window.location.href = `configuracion/maquinasdefecto/edit/${$(this).attr('data-id')}`; }); -$(document).on('click', '.btn-delete', function(e) { + $(document).on('click', '.btn-delete', function(e) { Swal.fire({ title: '', text: '', @@ -160,21 +158,16 @@ $(document).on('click', '.btn-delete', function(e) { } }); }); - - - endSection() ?> section('css') ?> - + endSection() ?> - section('additionalExternalJs') ?> - - + diff --git a/ci4/app/Views/themes/backend/vuexy/form/configuracion/paises/viewPaisForm.php b/ci4/app/Views/themes/backend/vuexy/form/configuracion/paises/viewPaisForm.php index cd7756c2..75432dcd 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/configuracion/paises/viewPaisForm.php +++ b/ci4/app/Views/themes/backend/vuexy/form/configuracion/paises/viewPaisForm.php @@ -1,6 +1,6 @@ -include("Themes/_commonPartialsBs/select2bs5") ?> -include("Themes/_commonPartialsBs/sweetalert") ?> -extend("Themes/" . config("Basics")->theme["name"] . "/AdminLayout/defaultLayout") ?> +include("themes_commonPartialsBs/select2bs5") ?> +include("themes_commonPartialsBs/sweetalert") ?> +extend('themes/backend/vuexy/main/defaultlayout') ?> section("content") ?>
@@ -11,7 +11,7 @@
- + getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?>
diff --git a/ci4/app/Views/themes/backend/vuexy/form/configuracion/paises/viewPaisList.php b/ci4/app/Views/themes/backend/vuexy/form/configuracion/paises/viewPaisList.php index 3f20c970..0abde836 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/configuracion/paises/viewPaisList.php +++ b/ci4/app/Views/themes/backend/vuexy/form/configuracion/paises/viewPaisList.php @@ -1,6 +1,7 @@ -include('Themes/_commonPartialsBs/datatables') ?> -include('Themes/_commonPartialsBs/sweetalert') ?> -extend('Themes/'.config('Basics')->theme['name'].'/AdminLayout/defaultLayout') ?> +include('themes/_commonPartialsBs/datatables') ?> +include('themes/_commonPartialsBs/sweetalert') ?> +extend('themes/backend/vuexy/main/defaultlayout') ?> + section('content'); ?>
@@ -8,15 +9,14 @@

+ 'btn btn-primary float-end']); ?>
- +
-
+ const lastColNr = $('#tableOfMaquinaspordefecto').find("tr:first th").length - 1; + const actionBtns = function(data) { + return `
 +
-
-
- - @@ -34,7 +34,7 @@
- 'btn btn-primary float-end']); ?> +
@@ -45,82 +45,77 @@ section('additionalInlineJs') ?> - const lastColNr = $('#tableOfPaises').find("tr:first th").length - 1; - const actionBtns = function(data) { - return ` -
- - -
- `; - }; - theTable = $('#tableOfPaises').DataTable({ - processing: true, - serverSide: true, - autoWidth: true, - responsive: true, - scrollX: true, - lengthMenu: [ 5, 10, 25, 50, 75, 100, 250, 500, 1000, 2500 ], - pageLength: 10, - lengthChange: true, - "dom": 'lfrtipB', // 'lfBrtip', // you can try different layout combinations by uncommenting one or the other - // "dom": '<"top"lf><"clear">rt<"bottom"ipB><"clear">', // remember to comment this line if you uncomment the above - "buttons": [ - 'copy', 'csv', 'excel', 'print', { - extend: 'pdfHtml5', - orientation: 'landscape', - pageSize: 'A4' - } - ], - stateSave: true, - order: [[1, 'asc']], - language: { - url: "/assets/dt/languages[$currentLocale] ?? config('Basics')->i18n ?>.json" - }, - ajax : $.fn.dataTable.pipeline( { - url: '', - method: 'POST', - headers: {'X-Requested-With': 'XMLHttpRequest'}, - async: true, - }), - columnDefs: [ - { - orderable: false, - searchable: false, - targets: [0,lastColNr] - } - ], - columns : [ - { 'data': actionBtns }, - { 'data': 'id' }, - { 'data': 'nombre' }, - { 'data': 'code' }, - { 'data': 'code3' }, - { 'data': 'moneda' }, - { 'data': 'url_erp' }, - { 'data': 'user_erp' }, - { 'data': 'key_erp' }, - { 'data': 'show_erp' }, - { 'data': actionBtns } - ] - }); - - - theTable.on( 'draw.dt', function () { - const boolCols = [9]; - for (let coln of boolCols) { - theTable.column(coln, { page: 'current' }).nodes().each( function (cell, i) { - cell.innerHTML = cell.innerHTML == '1' ? '' : ''; - }); + const lastColNr = $('#tableOfPaises').find("tr:first th").length - 1; + const actionBtns = function(data) { + return ` +
+ + +
+ `; + }; + theTable = $('#tableOfPaises').DataTable({ + processing: true, + serverSide: true, + autoWidth: true, + responsive: true, + scrollX: true, + lengthMenu: [ 5, 10, 25, 50, 75, 100, 250, 500, 1000, 2500 ], + pageLength: 10, + lengthChange: true, + "dom": 'lfBrtip', + "buttons": [ + 'copy', 'csv', 'excel', 'print', { + extend: 'pdfHtml5', + orientation: 'landscape', + pageSize: 'A4' } - + ], + stateSave: true, + order: [[1, 'asc']], + language: { + url: "//cdn.datatables.net/plug-ins/1.13.4/i18n/i18n ?>.json" + }, + ajax : $.fn.dataTable.pipeline( { + url: '', + method: 'POST', + headers: {'X-Requested-With': 'XMLHttpRequest'}, + async: true, + }), + columnDefs: [ + { + orderable: false, + searchable: false, + targets: [lastColNr] + } + ], + columns : [ + { 'data': 'nombre' }, + { 'data': 'code' }, + { 'data': 'code3' }, + { 'data': 'moneda' }, + { 'data': 'url_erp' }, + { 'data': 'user_erp' }, + { 'data': 'key_erp' }, + { 'data': 'show_erp' }, + { 'data': actionBtns } + ] + }); + + theTable.on( 'draw.dt', function () { + const boolCols = [7]; + for (let coln of boolCols) { + theTable.column(coln, { page: 'current' }).nodes().each( function (cell, i) { + cell.innerHTML = cell.innerHTML == '1' ? '' : ''; + }); + } }); -$(document).on('click', '.btn-edit', function(e) { + $(document).on('click', '.btn-edit', function(e) { window.location.href = `/${$(this).attr('data-id')}/edit`; }); -$(document).on('click', '.btn-delete', function(e) { + $(document).on('click', '.btn-delete', function(e) { Swal.fire({ title: '', text: '', @@ -155,28 +150,22 @@ $(document).on('click', '.btn-delete', function(e) { } }); }); - - - endSection() ?> section('css') ?> - + endSection() ?> section('additionalExternalJs') ?> - + - - - endSection() ?> diff --git a/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/_papelImpresionFormItems.php b/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/_papelImpresionFormItems.php index 30633eab..9b8d71cb 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/_papelImpresionFormItems.php +++ b/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/_papelImpresionFormItems.php @@ -86,13 +86,12 @@
-
- $v) : ?> diff --git a/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelImpresionForm.php b/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelImpresionForm.php index 62392bb5..30572113 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelImpresionForm.php +++ b/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelImpresionForm.php @@ -130,7 +130,7 @@ - @@ -474,7 +474,7 @@ }); $('#papelGenericoId').select2({ - theme: 'bootstrap-5', + allowClear: false, ajax: { url: '', @@ -509,20 +509,17 @@ endSection() ?> section('css') ?> - + endSection() ?> section('additionalExternalJs') ?> - + - - - endSection() ?> diff --git a/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelImpresionList.php b/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelImpresionList.php index dbfbe5ae..676d8628 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelImpresionList.php +++ b/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelImpresionList.php @@ -2,6 +2,7 @@ include('themes/_commonPartialsBs/datatables') ?> include('themes/_commonPartialsBs/sweetalert') ?> extend('themes/backend/vuexy/main/defaultlayout') ?> + section('content'); ?>
@@ -165,7 +166,7 @@ $(document).on('click', '.btn-delete', function(e) { section('css') ?> - + endSection() ?> diff --git a/ci4/app/Views/themes/backend/vuexy/form/configuracion/provincias/_provinciaFormItems.php b/ci4/app/Views/themes/backend/vuexy/form/configuracion/provincias/_provinciaFormItems.php index 414ec904..d633064d 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/configuracion/provincias/_provinciaFormItems.php +++ b/ci4/app/Views/themes/backend/vuexy/form/configuracion/provincias/_provinciaFormItems.php @@ -18,7 +18,7 @@ - $v) : ?> diff --git a/ci4/app/Views/themes/backend/vuexy/form/configuracion/provincias/viewProvinciaForm.php b/ci4/app/Views/themes/backend/vuexy/form/configuracion/provincias/viewProvinciaForm.php index de46541f..9e9dc4b3 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/configuracion/provincias/viewProvinciaForm.php +++ b/ci4/app/Views/themes/backend/vuexy/form/configuracion/provincias/viewProvinciaForm.php @@ -1,6 +1,6 @@ -include("Themes/_commonPartialsBs/select2bs5") ?> -include("Themes/_commonPartialsBs/sweetalert") ?> -extend("Themes/" . config("Basics")->theme["name"] . "/AdminLayout/defaultLayout") ?> +include("themes_commonPartialsBs/select2bs5") ?> +include("themes_commonPartialsBs/sweetalert") ?> +extend('themes/backend/vuexy/main/defaultlayout') ?> section("content") ?>
@@ -11,7 +11,7 @@
- + getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?>
@@ -30,7 +30,7 @@ $('#paisId').select2({ - theme: 'bootstrap-5', + allowClear: false, ajax: { url: '', diff --git a/ci4/app/Views/themes/backend/vuexy/form/configuracion/provincias/viewProvinciaList.php b/ci4/app/Views/themes/backend/vuexy/form/configuracion/provincias/viewProvinciaList.php index 81f9c292..9aa612c2 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/configuracion/provincias/viewProvinciaList.php +++ b/ci4/app/Views/themes/backend/vuexy/form/configuracion/provincias/viewProvinciaList.php @@ -1,7 +1,7 @@ -include('Themes/_commonPartialsBs/select2bs5') ?> -include('Themes/_commonPartialsBs/datatables') ?> -include('Themes/_commonPartialsBs/sweetalert') ?> -extend('Themes/'.config('Basics')->theme['name'].'/AdminLayout/defaultLayout') ?> +include('themes_commonPartialsBs/select2bs5') ?> +include('themes_commonPartialsBs/datatables') ?> +include('themes_commonPartialsBs/sweetalert') ?> +extend('themes/backend/vuexy/main/defaultlayout') ?> section('content'); ?>
@@ -11,7 +11,7 @@

- + @@ -73,7 +73,7 @@ stateSave: true, order: [[1, 'asc']], language: { - url: "/assets/dt/languages[$currentLocale] ?? config('Basics')->i18n ?>.json" + url: "//cdn.datatables.net/plug-ins/1.13.4/i18n/i18n ?>.json" }, ajax : $.fn.dataTable.pipeline( { url: '', @@ -171,20 +171,17 @@ $(document).on('click', '.btn-delete', function(e) { section('css') ?> - + endSection() ?> section('additionalExternalJs') ?> - + - - - endSection() ?> diff --git a/ci4/app/Views/themes/backend/vuexy/form/configuracion/tipologias/viewTipologiaLibrosList.php b/ci4/app/Views/themes/backend/vuexy/form/configuracion/tipologias/viewTipologiaLibrosList.php index 5ae8c6fc..b5a24c07 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/configuracion/tipologias/viewTipologiaLibrosList.php +++ b/ci4/app/Views/themes/backend/vuexy/form/configuracion/tipologias/viewTipologiaLibrosList.php @@ -93,7 +93,7 @@ "scrollX": true, "stateSave": true, "language": { - url: "/assets/dt/languages[$currentLocale] ?? config('Basics')->i18n ?>.json" + url: "//cdn.datatables.net/plug-ins/1.13.4/i18n/i18n ?>.json" }, "columnDefs": [ { diff --git a/ci4/app/Views/themes/backend/vuexy/form/tarifas/manipulado/viewTarifaManipuladoForm.php b/ci4/app/Views/themes/backend/vuexy/form/tarifas/manipulado/viewTarifaManipuladoForm.php index e5ca200a..9f3f373b 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/tarifas/manipulado/viewTarifaManipuladoForm.php +++ b/ci4/app/Views/themes/backend/vuexy/form/tarifas/manipulado/viewTarifaManipuladoForm.php @@ -246,7 +246,7 @@ endSection() ?> section('css') ?> - + endSection() ?> 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 90bdeb00..7ad6c713 100644 --- a/ci4/app/Views/themes/backend/vuexy/main/menu_impresion.php +++ b/ci4/app/Views/themes/backend/vuexy/main/menu_impresion.php @@ -451,7 +451,8 @@ * MENU CONFIGURACION */ if (allowMenuSection($menus, - ['Calendario', 'Paises', 'Users', 'Group', 'Papelesgenericos', 'Papelesimpresion', 'Maquinas'], 'index')): ?> + ['Calendario', 'Paises', 'Users', 'Group', 'Papelesgenericos', 'Papelesimpresion', 'Maquinas', + 'Maquinasdefecto'], 'index')): ?>
  • @@ -467,6 +468,15 @@
    • + 0): ?> + 0): ?> +
  • + " class="menu-link"> +
    ">
    +     +
    • + + 0): ?> 0): ?>
  • diff --git a/from mac to app.txt b/from mac to app.txt index 935ea43b..4019770b 100644 --- a/from mac to app.txt +++ b/from mac to app.txt @@ -3,7 +3,7 @@ Pasos para usar ficheros del mac 2.- Copiar los ficheros de idioma. Le pone nombre raro (por ejemplo: Manipuladoes.php en lugar de Tarifamanipulado.php). Buscar y reemplazar en todos los ficheros. En este ejemplo: lang('Manipuladoes -> lang('Tarifamanipulado) 3.- Editar los idiomas 4.- En las vistas (formulario y lista) cambiar la segunda linea - Esto: extend("Themes/" . config("Basics")->theme["name"] . "/AdminLayout/defaultLayout") ?> + Esto: extend("themes" . config("Basics")->theme["name"] . "/AdminLayout/defaultLayout") ?> por esto: extend('themes/backend/vuexy/main/defaultlayout') ?> 5.- En las vistas cambiar Themes por themes 6.- Quitar de la tabla la primera columna para que no se repitan los botones. Es decir: