copiada la rama presu_cliente_v2 en esta para poder hacer el merge al main

This commit is contained in:
2024-11-07 19:20:12 +01:00
parent aeb5f9106f
commit a880355012
84 changed files with 2983 additions and 1785 deletions

View File

@ -199,7 +199,7 @@ class ChatModel extends Model
}
public function getClienteChatPedidos(array $pedidos) : array
{
$results = $this->db->table("chats")
$q = $this->db->table("chats")
->select([
"chats.id as chatId",
"chats.pedido_id as pedidoId",
@ -209,8 +209,13 @@ class ChatModel extends Model
])
->join("chat_departments","chat_departments.id = chats.chat_department_id","left")
->join("pedidos","pedidos.id = chats.pedido_id","left")
->whereIn("pedidos.id",$pedidos)
->get()->getResultObject();
->where('chats.chat_department_id is NOT NULL', NULL, FALSE);
if(count($pedidos)>0){
$q->whereIn("pedidos.id",$pedidos);
}else{
return [];
}
$results = $q->get()->getResultObject();
$chatMessageModel = model(ChatMessageModel::class);
$count = 0;
foreach ($results as $row) {
@ -220,13 +225,14 @@ class ChatModel extends Model
$count++;
}
}
$row->uri = "/pedidos/edit/".$row->pedidoId;
$row->unreadMessages=$count;
}
return $results;
}
public function getClienteChatFacturas(array $facturas) : array
{
$results = $this->db->table("chats")
$q = $this->db->table("chats")
->select([
"chats.id as chatId",
"chats.factura_id as facturaId",
@ -236,8 +242,14 @@ class ChatModel extends Model
])
->join("chat_departments","chat_departments.id = chats.chat_department_id","left")
->join("facturas","facturas.id = chats.factura_id","left")
->whereIn("facturas.id",$facturas)
->get()->getResultObject();
->where('chats.chat_department_id is NOT NULL', NULL, FALSE);
if(count($facturas)>0){
$q->whereIn("facturas.id",$facturas);
}else{
return [];
}
$results = $q->get()->getResultObject();
$chatMessageModel = model(ChatMessageModel::class);
$count = 0;
foreach ($results as $row) {
@ -247,13 +259,14 @@ class ChatModel extends Model
$count++;
}
}
$row->uri = "/facturas/edit/".$row->facturaId;
$row->unreadMessages=$count;
}
return $results;
}
public function getClienteChatPresupuestos(array $presupuestos) : array
{
$results = $this->db->table("chats")
$q = $this->db->table("chats")
->select([
"chats.id as chatId",
"chats.presupuesto_id as presupuestoId",
@ -263,8 +276,14 @@ class ChatModel extends Model
])
->join("chat_departments","chat_departments.id = chats.chat_department_id","left")
->join("presupuestos","presupuestos.id = chats.presupuesto_id","left")
->whereIn("presupuestos.id",$presupuestos)
->get()->getResultObject();
->where('chats.chat_department_id is NOT NULL', NULL, FALSE);
if(count($presupuestos)>0){
$q->whereIn("presupuestos.id",$presupuestos);
}else{
return [];
}
$results = $q->get()->getResultObject();
$chatMessageModel = model(ChatMessageModel::class);
$count = 0;
foreach ($results as $row) {
@ -274,6 +293,7 @@ class ChatModel extends Model
$count++;
}
}
$row->uri = "/presupuestos/presupuestocliente/edit/".$row->presupuestoId;
$row->unreadMessages=$count;
}