Merge branch 'main' into feat/sk-44

This commit is contained in:
amazuecos
2025-04-27 10:59:41 +02:00
12 changed files with 480 additions and 3 deletions

View File

@ -173,6 +173,37 @@ class AlbaranModel extends \App\Models\BaseModel
return $albaran_data;
}
public function getAlbaranData($albaran_id=null){
if (!$albaran_id) {
return [];
}
$albaran_data = $this->db->table('albaranes t1')
->select("
t1.id,
t1.att_albaran AS att,
t1.direccion_albaran AS direccion,
t1.envio_id,
t1.numero_albaran AS numero_albaran,
DATE_FORMAT(t1.created_at, '%d/%m/%Y') AS fecha_creacion,
DATE_FORMAT(t1.fecha_albaran, '%d/%m/%Y') AS fecha_albaran,
t1.mostrar_precios AS mostrar_precios,
t2.nombre AS cliente,
t1.cajas AS cajas
")
->join('clientes t2', 't1.cliente_id = t2.id', 'left')
->where('t1.id', $albaran_id)
->where('t1.deleted_at IS NULL')
->get()
->getResultObject();
if (count($albaran_data) == 0) {
return [];
}
return $albaran_data[0];
}
/**
* Get resource data for creating PDFs.
*
@ -203,4 +234,25 @@ class AlbaranModel extends \App\Models\BaseModel
return $builder;
}
public function getDatatableQuery()
{
$builder = $this->db
->table($this->table . " t1")
->select(
"t1.id, t1.numero_albaran as numero_albaran, t1.envio_id as envio_id, GROUP_CONCAT(DISTINCT t4.id) AS pedidos,
t5.nombre as cliente, t1.att_albaran as att, t1.direccion_albaran as direccion, SUM(t2.cantidad) as unidades_total,
t1.cajas as cajas"
)
->join("albaranes_lineas t2", "t1.id = t2.albaran_id", "left")
->join("pedidos_linea t3", "t2.pedido_linea_id = t3.id", "left")
->join("pedidos t4", "t3.pedido_id = t4.id", "left")
->join("clientes t5", "t1.cliente_id = t5.id", "left");
$builder->where("t1.deleted_at IS NULL");
$builder->where("t2.deleted_at IS NULL");
$builder->groupBy("t1.id");
return $builder;
}
}