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 @@ - Cajas: cajas ?> + Total cajas: cajas ?> @@ -76,6 +76,8 @@ Título ISBN Ref. Cliente + Cajas + Unidades/Caja €/ud. Subtotal @@ -109,6 +111,12 @@
ref_cliente ?>
+ +
cajas ?>
+ + +
unidades_cajas ?>
+ titulo, "IVA")): ?> @@ -140,6 +148,12 @@
+ +
+ + +
+
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 @@ - Cajas: cajas ?> + Total cajas: cajas ?> @@ -82,6 +82,8 @@ Título ISBN Ref. Cliente + Cajas + Unidades/Caja €/ud. Subtotal @@ -115,6 +117,12 @@
ref_cliente ?>
+ +
cajas ?>
+ + +
unidades_cajas ?>
+ titulo, "IVA")): ?> @@ -146,6 +154,12 @@
+ +
+ + +
+
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',