From 21e907ad5034e5fd57b08165bab145c3b689cc50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaime=20Jim=C3=A9nez?= <jaimejimenezortega@gmail.com>
Date: Mon, 5 May 2025 19:27:17 +0200
Subject: [PATCH 1/3] prueba

---
 ci4/app/Services/EtiquetasTitulosService.php  | 3 +--
 ci4/app/Services/ImpresoraEtiquetaService.php | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ci4/app/Services/EtiquetasTitulosService.php b/ci4/app/Services/EtiquetasTitulosService.php
index 55c6b53e..af9c579a 100644
--- a/ci4/app/Services/EtiquetasTitulosService.php
+++ b/ci4/app/Services/EtiquetasTitulosService.php
@@ -283,7 +283,6 @@ class EtiquetasTitulosService
             array_push($data['grupos'], [
             ]);
 
-            $prefix = 1;
             $lineas = array_filter($etiquetas_lineas, function ($linea) use ($caja) {
                 return $linea->numero_caja == $caja;
             });
@@ -313,7 +312,7 @@ class EtiquetasTitulosService
 
 
                 $data['grupos'][$index_etiqueta][] = [
-                    'prefix' => $caja,
+                    'prefix' => $lineaCounter,
                     'titulo' => mb_substr($datos_etiqueta->titulo, 0, 40),
                     'cantidad' => $linea->unidades,
                     'tirada' => $datos_etiqueta->total_tirada,
diff --git a/ci4/app/Services/ImpresoraEtiquetaService.php b/ci4/app/Services/ImpresoraEtiquetaService.php
index d2e5026d..88e4e4f2 100755
--- a/ci4/app/Services/ImpresoraEtiquetaService.php
+++ b/ci4/app/Services/ImpresoraEtiquetaService.php
@@ -96,7 +96,7 @@ class ImpresoraEtiquetaService extends BaseService
 
             // Crear variables específicas del grupo
             foreach ($grupo as $libro) {
-                $prefix = $libro['prefix'];
+                $prefix = $libro['prefix']==0 ? '' : $libro['prefix'];
 
                 $variables = [
                     "titulo$prefix" => $libro['titulo'],

From 247fa7e6f934732ecc3ef922d337054fdbe0aa61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaime=20Jim=C3=A9nez?= <jaimejimenezortega@gmail.com>
Date: Mon, 5 May 2025 19:36:33 +0200
Subject: [PATCH 2/3] prueba2

---
 ci4/app/Services/EtiquetasTitulosService.php  | 4 ++--
 ci4/app/Services/ImpresoraEtiquetaService.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ci4/app/Services/EtiquetasTitulosService.php b/ci4/app/Services/EtiquetasTitulosService.php
index af9c579a..35d617a8 100644
--- a/ci4/app/Services/EtiquetasTitulosService.php
+++ b/ci4/app/Services/EtiquetasTitulosService.php
@@ -312,12 +312,12 @@ class EtiquetasTitulosService
 
 
                 $data['grupos'][$index_etiqueta][] = [
-                    'prefix' => $lineaCounter,
+                    'prefix' => $lineaCounter+1,
                     'titulo' => mb_substr($datos_etiqueta->titulo, 0, 40),
                     'cantidad' => $linea->unidades,
                     'tirada' => $datos_etiqueta->total_tirada,
                     'ean' => str_replace('-', '', $datos_etiqueta->isbn),
-                    'npedido' => $datos_etiqueta->id,
+                    'npedido' => $datos_etiqueta->id_pedido,
                     'refcliente' => $datos_etiqueta->referencia_cliente,
                 ];
 
diff --git a/ci4/app/Services/ImpresoraEtiquetaService.php b/ci4/app/Services/ImpresoraEtiquetaService.php
index 88e4e4f2..fa823e24 100755
--- a/ci4/app/Services/ImpresoraEtiquetaService.php
+++ b/ci4/app/Services/ImpresoraEtiquetaService.php
@@ -96,7 +96,7 @@ class ImpresoraEtiquetaService extends BaseService
 
             // Crear variables específicas del grupo
             foreach ($grupo as $libro) {
-                $prefix = $libro['prefix']==0 ? '' : $libro['prefix'];
+                $prefix = $libro['prefix']==1 ? '' : $libro['prefix'];
 
                 $variables = [
                     "titulo$prefix" => $libro['titulo'],

From c6fb4b32131bbf582c223d98a907d7e32a0d9265 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaime=20Jim=C3=A9nez?= <jaimejimenezortega@gmail.com>
Date: Mon, 5 May 2025 19:42:45 +0200
Subject: [PATCH 3/3] terminado

---
 .../assets/js/safekat/pages/logistica/etiquetaEdit.js     | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/httpdocs/assets/js/safekat/pages/logistica/etiquetaEdit.js b/httpdocs/assets/js/safekat/pages/logistica/etiquetaEdit.js
index 0ac7b9ca..3139bebb 100644
--- a/httpdocs/assets/js/safekat/pages/logistica/etiquetaEdit.js
+++ b/httpdocs/assets/js/safekat/pages/logistica/etiquetaEdit.js
@@ -64,6 +64,11 @@ class EtiquetaEdit {
             }
         });
 
+        if (ids.length == 0) {
+            popErrorAlert('Seleccione al menos una linea');
+            return;
+        }
+
         $.post(
             '/etiquetasTitulos/imprimirEtiquetas',
             {
@@ -283,6 +288,9 @@ class EtiquetaEdit {
     }
 
     _addLineas() {
+
+        const self = this;
+
         if (this.buscador.item.select2('data').length > 0) {
 
             let maxUnidades = 0;