From 49140cea40c7990c217bf36000caeef23b7f4979 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaime=20Jim=C3=A9nez?= <jaimejimenezortega@gmail.com>
Date: Thu, 5 Jun 2025 21:25:48 +0200
Subject: [PATCH] =?UTF-8?q?arreglado=20albaranes=20para=20que=20muestren?=
 =?UTF-8?q?=20las=20cajas.=20tambien=20se=20ha=20actualizado=20para=20que?=
 =?UTF-8?q?=20cuando=20se=20modifiquen=20las=20cajas=20de=20la=20linea=20s?=
 =?UTF-8?q?e=20modifiquen=20el=20total=20del=20albar=C3=A1n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ci4/app/Controllers/Albaranes/Albaran.php     | 19 +++++++++++++++++++
 .../Models/Albaranes/AlbaranLineaModel.php    |  2 +-
 .../themes/vuexy/pdfs/albaran-anonimo.php     | 16 +++++++++++++++-
 ci4/app/Views/themes/vuexy/pdfs/albaran.php   | 16 +++++++++++++++-
 .../js/safekat/components/albaranComponent.js |  3 +++
 5 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/ci4/app/Controllers/Albaranes/Albaran.php b/ci4/app/Controllers/Albaranes/Albaran.php
index 99eda620..91915ead 100755
--- a/ci4/app/Controllers/Albaranes/Albaran.php
+++ b/ci4/app/Controllers/Albaranes/Albaran.php
@@ -476,10 +476,29 @@ class Albaran extends \App\Controllers\BaseResourceController
             
             $model_linea->update($id, $linea->toArray());
 
+            if($fieldName == 'cajas'){
+                $cajas = $model_linea->where('albaran_id', $linea->albaran_id)
+                    ->where('cajas > 0')
+                    ->select('SUM(cajas) as total_cajas')
+                    ->get();
+                
+                $albaranModel = model('App\Models\Albaranes\AlbaranModel');
+                $albaran = $albaranModel->find($linea->albaran_id);
+                if($albaran != false) {
+                    $albaran->cajas = $cajas->getRow()->total_cajas;
+                    $albaran->user_updated_id = auth()->user()->id;
+                    $albaran->updated_at = date('Y-m-d H:i:s');
+                    $albaranModel->update($linea->albaran_id, $albaran->toArray());
+                }
+            }
+
             $data = [
                 'success' => true,
                 'message' => lang('Basic.global.updateSuccess', [lang('Basic.global.record')]) . '.',
             ];
+            if($fieldName == 'cajas') {
+                $data['cajas'] = $cajas->getRow()->total_cajas;
+            };
             return $this->respond($data);
             
         } else {
diff --git a/ci4/app/Models/Albaranes/AlbaranLineaModel.php b/ci4/app/Models/Albaranes/AlbaranLineaModel.php
index 6467be3c..9d49cd06 100755
--- a/ci4/app/Models/Albaranes/AlbaranLineaModel.php
+++ b/ci4/app/Models/Albaranes/AlbaranLineaModel.php
@@ -54,7 +54,7 @@ class AlbaranLineaModel extends \App\Models\BaseModel
             ->select(
                 "t1.id, t1.titulo as titulo, t1.isbn as isbn, t1.ref_cliente as ref_cliente, 
             t1.cantidad as unidades, t1.precio_unidad as precio_unidad, t1.iva_reducido as iva_reducido, 
-            t1.total as total, pedidos.id AS pedido"
+            t1.total as total, pedidos.id AS pedido, t1.cajas, t1.unidades_cajas"
             )
             ->join("pedidos_linea", "t1.pedido_linea_id = pedidos_linea.id", "left")
             ->join("pedidos", "pedidos_linea.pedido_id = pedidos.id", "left");
diff --git a/ci4/app/Views/themes/vuexy/pdfs/albaran-anonimo.php b/ci4/app/Views/themes/vuexy/pdfs/albaran-anonimo.php
index db93eda4..7e7fed67 100644
--- a/ci4/app/Views/themes/vuexy/pdfs/albaran-anonimo.php
+++ b/ci4/app/Views/themes/vuexy/pdfs/albaran-anonimo.php
@@ -63,7 +63,7 @@
                 <tr>
                 </tr>
                 <tr>
-                    <td colspan="6">Cajas: <?= $albaran->cajas ?></td>
+                    <td colspan="6">Total cajas: <?= $albaran->cajas ?></td>
                 </tr>
             </tbody>
         </table>
@@ -76,6 +76,8 @@
                     <th class="concepto">Título</th>
                     <th class="concepto">ISBN</th>
                     <th class="concepto">Ref. Cliente</th>
+                    <th class="concepto">Cajas</th>
+                    <th class="concepto">Unidades/Caja</th>
                     <?php if ($mostrarPrecios): ?>
                         <th class="precio_unidad">€/ud.</th>
                         <th class="subtotal">Subtotal</th>
@@ -109,6 +111,12 @@
                         <td>
                             <div><?= $linea->ref_cliente ?></div>
                         </td>
+                        <td>
+                            <div><?= $linea->cajas ?></div>
+                        </td>
+                        <td>
+                            <div><?= $linea->unidades_cajas ?></div>
+                        </td>
                         <?php if ($mostrarPrecios): ?>
                             <td class="precio_unidad">
                                 <?php if (!str_contains($linea->titulo, "IVA")): ?>
@@ -140,6 +148,12 @@
                             <td>
                                 <div></div>
                             </td>
+                            <td>
+                                <div></div>
+                            </td>
+                            <td>
+                                <div></div>
+                            </td>
                             <?php if ($mostrarPrecios): ?>
                                 <td class="precio_unidad">
                                     <div></div>
diff --git a/ci4/app/Views/themes/vuexy/pdfs/albaran.php b/ci4/app/Views/themes/vuexy/pdfs/albaran.php
index 00ebc343..07e61438 100755
--- a/ci4/app/Views/themes/vuexy/pdfs/albaran.php
+++ b/ci4/app/Views/themes/vuexy/pdfs/albaran.php
@@ -69,7 +69,7 @@
                 <tr>
                 </tr>
                 <tr>
-                    <td colspan="6">Cajas: <?= $albaran->cajas ?></td>
+                    <td colspan="6">Total cajas: <?= $albaran->cajas ?></td>
                 </tr>
             </tbody>
         </table>
@@ -82,6 +82,8 @@
                     <th class="concepto">Título</th>
                     <th class="concepto">ISBN</th>
                     <th class="concepto">Ref. Cliente</th>
+                    <th class="concepto">Cajas</th>
+                    <th class="concepto">Unidades/Caja</th>
                     <?php if ($mostrarPrecios): ?>
                         <th class="precio_unidad">€/ud.</th>
                         <th class="subtotal">Subtotal</th>
@@ -115,6 +117,12 @@
                         <td>
                             <div><?= $linea->ref_cliente ?></div>
                         </td>
+                        <td>
+                            <div><?= $linea->cajas ?></div>
+                        </td>
+                        <td>
+                            <div><?= $linea->unidades_cajas ?></div>
+                        </td>
                         <?php if ($mostrarPrecios): ?>
                             <td class="precio_unidad">
                                 <?php if (!str_contains($linea->titulo, "IVA")): ?>
@@ -146,6 +154,12 @@
                             <td>
                                 <div></div>
                             </td>
+                            <td>
+                                <div></div>
+                            </td>
+                            <td>
+                                <div></div>
+                            </td>
                             <?php if ($mostrarPrecios): ?>
                                 <td class="precio_unidad">
                                     <div></div>
diff --git a/httpdocs/assets/js/safekat/components/albaranComponent.js b/httpdocs/assets/js/safekat/components/albaranComponent.js
index 964a2053..598c96a7 100644
--- a/httpdocs/assets/js/safekat/components/albaranComponent.js
+++ b/httpdocs/assets/js/safekat/components/albaranComponent.js
@@ -511,6 +511,9 @@ class AlbaranComponent {
             }, (response) => {
                 if (response.success) {
                     this.table.ajax.reload(null, false);
+                    if(response.cajas != null){
+                        $('#cajas_albaran_' + this.id).val(response.cajas);
+                    }
                 } else {
                     Swal.fire({
                         title: 'Error',