diff --git a/ci4/app/Controllers/Catalogo/CatalogoLibros.php b/ci4/app/Controllers/Catalogo/CatalogoLibros.php
index 499e2275..b990feaa 100644
--- a/ci4/app/Controllers/Catalogo/CatalogoLibros.php
+++ b/ci4/app/Controllers/Catalogo/CatalogoLibros.php
@@ -251,13 +251,12 @@ class CatalogoLibros extends BaseResourceController
->setSearchableColumns([
't1.id',
't1.created_at',
- 't1.titulo',
- 't1.paginas',
't1.tirada',
't1.total',
't1.estado'
])
->edit('total', fn($row) => number_format((float) $row->total, 2, ',', '.') . ' €')
+ ->edit('precio_ud', fn($row) => number_format((float) $row->total, 2, ',', '.') . ' €')
->edit('created_at', fn($row) => date('d/m/Y', strtotime($row->created_at)))
->add('actionBtns', function ($row) {
return '
diff --git a/ci4/app/Language/es/Catalogo.php b/ci4/app/Language/es/Catalogo.php
index cc6ae34e..14f78ffb 100644
--- a/ci4/app/Language/es/Catalogo.php
+++ b/ci4/app/Language/es/Catalogo.php
@@ -63,6 +63,10 @@ return [
'createdAt' => 'Fecha de Creación',
'updatedAt' => 'Fecha de Actualización',
'deletedAt' => 'Fecha de Eliminación',
+ 'tirada' => 'Tirada',
+ 'precioUd' => 'Precio Ud.',
+ 'total' => 'Total',
+ 'estado' => 'Estado',
'catalogoLibro' => 'Libro',
'catalogoLibroList' => 'Lista de Libros',
diff --git a/ci4/app/Models/Presupuestos/ImportadorModel.php b/ci4/app/Models/Presupuestos/ImportadorModel.php
index ba559de7..bb8c4ee0 100755
--- a/ci4/app/Models/Presupuestos/ImportadorModel.php
+++ b/ci4/app/Models/Presupuestos/ImportadorModel.php
@@ -132,7 +132,16 @@ class ImportadorModel extends \App\Models\BaseModel
$db = \Config\Database::connect($this->DBGroup);
$builder = $db->table('pedido_libro t1')
- ->select('t1.id, t1.created_at, t1.titulo, t1.paginas, t1.tirada, t1.total, t1.estado');
+ ->select(
+ 't1.id,
+ t1.created_at,
+ t1.tirada,
+ (CASE
+ WHEN t1.tirada > 0 THEN t1.total / t1.tirada
+ ELSE 0
+ END) AS precio_ud,
+ t1.total,
+ t1.estado');
if ($catalogoId !== null) {
$builder->where('t1.catalogo_id', $catalogoId);
diff --git a/ci4/app/Views/themes/vuexy/form/catalogo/_historicoPedidos.php b/ci4/app/Views/themes/vuexy/form/catalogo/_historicoPedidos.php
index 64e7776d..7fd66c69 100644
--- a/ci4/app/Views/themes/vuexy/form/catalogo/_historicoPedidos.php
+++ b/ci4/app/Views/themes/vuexy/form/catalogo/_historicoPedidos.php
@@ -22,9 +22,8 @@
| ID |
Fecha |
- Título |
- Nº Páginas |
Tirada |
+ Precio ud. |
Total |
Estado |
Acciones |
@@ -34,25 +33,26 @@
-->
-
-
Pedidos - Antiguo ERP
-
-
-
- | ID |
- Fecha |
- Título |
- Nº Páginas |
- Tirada |
- Total |
- Estado |
- Acciones |
-
-
-
-
+
+
Pedidos - Antiguo ERP
+
+
+
+ | = lang('Catalogo.id') ?> |
+ = lang('Catalogo.createdAt') ?> |
+ = lang('Catalogo.tirada') ?> |
+ = lang('Catalogo.precioUd') ?> |
+ = lang('Catalogo.total') ?> |
+ = lang('Catalogo.estado') ?> |
+ = lang('Basic.global.Action') ?> |
+
+
+
+
+
+
\ No newline at end of file
diff --git a/httpdocs/assets/js/safekat/pages/catalogo/catalogo.js b/httpdocs/assets/js/safekat/pages/catalogo/catalogo.js
index e06e5e25..17d99e2e 100644
--- a/httpdocs/assets/js/safekat/pages/catalogo/catalogo.js
+++ b/httpdocs/assets/js/safekat/pages/catalogo/catalogo.js
@@ -297,6 +297,10 @@ class Catalogo {
this.initPedidosTable();
+ $('#collapsePedidos').on('shown.bs.collapse', function () {
+ $('#tablaPedidosAntiguos').DataTable().columns.adjust().responsive.recalc();
+ });
+
// Al cargar la página
this.toggleSobrecubiertaFields();
@@ -343,14 +347,7 @@ class Catalogo {
lengthMenu: [5, 10, 25, 50, 75, 100],
pageLength: 10,
lengthChange: true,
- dom: 'lfBrtip',
- buttons: [
- 'copy', 'csv', 'excel', 'print', {
- extend: 'pdfHtml5',
- orientation: 'landscape',
- pageSize: 'A4'
- }
- ],
+ dom: 'lfrtip',
order: [[1, 'desc']],
language: {
url: "/themes/vuexy/vendor/libs/datatables-sk/plugins/i18n/es-ES.json"
@@ -372,9 +369,8 @@ class Catalogo {
columns: [
{ data: 'id' },
{ data: 'created_at' },
- { data: 'titulo' },
- { data: 'paginas' },
{ data: 'tirada' },
+ { data: 'precio_ud' , searchable: false, orderable: false },
{ data: 'total' },
{ data: 'estado' },
{ data: 'actionBtns' }