jjimenez/safekat
1
0
Fork 0
mirror of https://git.imnavajas.es/jjimenez/safekat.git synced 2025-07-25 22:52:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

finalizar envio ok

Browse Source
This commit is contained in:
Jaime Jiménez
2025-04-22 22:20:03 +02:00
parent 2cfe03b2ec
commit 5ac1e3d4c1
10 changed files with 481 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ci4/app/Models/Logistica/EnvioLineaModel.php
View File

@ -46,13 +46,21 @@ class EnvioLineaModel extends Model
WHERE e.finalizado = 1
AND t_sub.pedido_id = t1.pedido_id
AND e.direccion = d.direccion COLLATE utf8mb3_general_ci
AND (
t_sub.envio_id <> t1.envio_id
OR (t_sub.envio_id = t1.envio_id AND (
SELECT finalizado FROM envios WHERE id = t1.envio_id
) = 1)
)
), 0) as unidadesEnviadas,
IFNULL((
SELECT ROUND(SUM(peso) / 1000, 1)
FROM presupuesto_linea
WHERE presupuesto_id = t3.id
), 0) AS pesoUnidad"
), 0) AS pesoUnidad,
t2.finalizado as finalizado,"
);
$builder->join("envios t2", "t1.envio_id = t2.id", "left");
$builder->join("presupuestos t3", "t1.presupuesto_id = t3.id", "left");
$builder->where("t1.envio_id", $envio_id);
@ -60,5 +68,5 @@ class EnvioLineaModel extends Model
return $builder;
}
}