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

fix mensajes internos

Browse Source
This commit is contained in:
amazuecos
2024-10-23 05:14:31 +00:00
parent a3561d7623 6865d810da
commit 8f2f19df1b
13 changed files with 40 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ci4/app/Language/es/Chat.php
View File

@ -2,6 +2,7 @@
return [
"chat" => "Mensajería",
"messages" => "Mensajes",
"modal" => [
"new_hebra" => "Nueva hebra",
"title" => "Título",

3
ci4/app/Models/Chat/ChatModel.php
View File

@ -210,6 +210,7 @@ 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)
->where("chats.chat_department_id is NOT NULL",NULL,FALSE)
->get()->getResultObject();
$chatMessageModel = model(ChatMessageModel::class);
$count = 0;
@ -237,6 +238,7 @@ 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)
->where("chats.chat_department_id is NOT NULL",NULL,FALSE)
->get()->getResultObject();
$chatMessageModel = model(ChatMessageModel::class);
$count = 0;
@ -264,6 +266,7 @@ 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)
->where("chats.chat_department_id is NOT NULL",NULL,FALSE)
->get()->getResultObject();
$chatMessageModel = model(ChatMessageModel::class);
$count = 0;

4
ci4/app/Views/themes/vuexy/components/chat_internal_factura.php
View File

@ -15,17 +15,21 @@
<li class="nav-item">
<button type="button" class="nav-link active" role="tab" data-bs-toggle="tab" data-bs-target="#navs-pills-top-chat" aria-controls="navs-pills-top-internal-chat" aria-selected="false">Chat</button>
</li>
<?php if (auth()->user()->inGroup('admin') || auth()->user()->inGroup('beta')) { ?>
<li class="nav-item">
<button type="button" class="nav-link" role="tab" data-bs-toggle="tab" data-bs-target="#navs-pills-top-internal-messages" aria-controls="navs-pills-top-internal-messages" aria-selected="false">Mensajes internos</button>
</li>
<?php } ?>
</ul>
<div class="tab-content">
<div class="tab-pane fade show active" id="navs-pills-top-chat" role="tabpanel">
<?= view("themes/vuexy/components/chat_factura", data: ["modelId" => $modelId,"type" => "factura"]) ?>
</div>
<?php if (auth()->user()->inGroup('admin') || auth()->user()->inGroup('beta')) { ?>
<div class="tab-pane fade" id="navs-pills-top-internal-messages" role="tabpanel">
<?= view("themes/vuexy/components/internal_messages", data: ["modelId" => $modelId,"type" => "factura"]) ?>
</div>
<?php } ?>
</div>
</div>
</div>

10
ci4/app/Views/themes/vuexy/components/chat_internal_pedido.php
View File

@ -15,17 +15,21 @@
<li class="nav-item">
<button type="button" class="nav-link active" role="tab" data-bs-toggle="tab" data-bs-target="#navs-pills-top-chat" aria-controls="navs-pills-top-internal-chat" aria-selected="false">Chat</button>
</li>
<?php if (auth()->user()->inGroup('admin') || auth()->user()->inGroup('beta')) { ?>
<li class="nav-item">
<button type="button" class="nav-link" role="tab" data-bs-toggle="tab" data-bs-target="#navs-pills-top-internal-messages" aria-controls="navs-pills-top-internal-messages" aria-selected="false">Mensajes internos</button>
</li>
<?php } ?>
</ul>
<div class="tab-content">
<div class="tab-pane fade show active" id="navs-pills-top-chat" role="tabpanel">
<?= view("themes/vuexy/components/chat_pedido", data: ["modelId" => $modelId, "type" => "pedido"]) ?>
</div>
<div class="tab-pane fade" id="navs-pills-top-internal-messages" role="tabpanel">
<?= view("themes/vuexy/components/internal_messages", data: ["modelId" => $modelId, "type" => "pedido"]) ?>
</div>
<?php if (auth()->user()->inGroup('admin') || auth()->user()->inGroup('beta')) { ?>
<div class="tab-pane fade" id="navs-pills-top-internal-messages" role="tabpanel">
<?= view("themes/vuexy/components/internal_messages", data: ["modelId" => $modelId, "type" => "pedido"]) ?>
</div>
<?php } ?>
</div>
</div>
</div>

10
ci4/app/Views/themes/vuexy/components/chat_internal_presupuesto.php
View File

@ -15,17 +15,21 @@
<li class="nav-item">
<button type="button" class="nav-link active" role="tab" data-bs-toggle="tab" data-bs-target="#navs-pills-top-chat" aria-controls="navs-pills-top-internal-chat" aria-selected="false">Chat</button>
</li>
<?php if (auth()->user()->inGroup('admin') || auth()->user()->inGroup('beta')) { ?>
<li class="nav-item">
<button type="button" class="nav-link" role="tab" data-bs-toggle="tab" data-bs-target="#navs-pills-top-internal-messages" aria-controls="navs-pills-top-internal-messages" aria-selected="false">Mensajes internos</button>
</li>
<?php } ?>
</ul>
<div class="tab-content">
<div class="tab-pane fade show active" id="navs-pills-top-chat" role="tabpanel">
<?= view("themes/vuexy/components/chat_presupuesto", data: ["modelId" => $modelId, "type" => "presupuesto"]) ?>
</div>
<div class="tab-pane fade" id="navs-pills-top-internal-messages" role="tabpanel">
<?= view("themes/vuexy/components/internal_messages", data: ["modelId" => $modelId, "type" => "presupuesto"]) ?>
</div>
<?php if (auth()->user()->inGroup('admin') || auth()->user()->inGroup('beta')) { ?>
<div class="tab-pane fade" id="navs-pills-top-internal-messages" role="tabpanel">
<?= view("themes/vuexy/components/internal_messages", data: ["modelId" => $modelId, "type" => "presupuesto"]) ?>
</div>
<?php } ?>
</div>
</div>
</div>

10
ci4/app/Views/themes/vuexy/components/chat_pedido.php
View File

@ -37,16 +37,6 @@
<!-- CHAT LIST -->
</ul>
<!-- Contacts -->
<ul class="list-unstyled chat-contact-list mb-0" id="contact-list">
<li class="chat-contact-list-item chat-contact-list-item-title">
<h5 class="text-primary mb-0">Contactos</h5>
</li>
<li class="chat-contact-list-item contact-list-item-0 d-none">
<h6 class="text-muted mb-0">No Contacts Found</h6>
</li>
</ul>
</div>
</div>
<!-- /Chat contacts -->

2
ci4/app/Views/themes/vuexy/components/chat_presupuesto.php
View File

@ -1,4 +1,4 @@
<div class="container-xl flex-grow-1 container-p-y" id="chat-presupuesto" data-id="<?= $modelId ?>">
<div id="chat-presupuesto" data-id="<?= $modelId ?>">
<div class="app-chat card overflow-hidden">
<div class="row g-0">

2
ci4/app/Views/themes/vuexy/main/defaultlayout.php
View File

@ -124,7 +124,7 @@ $picture = "/assets/img/default-user.png";
<div class="dropdown-menu dropdown-menu-end py-0">
<div class="dropdown-menu-header border-bottom">
<div class="dropdown-header d-flex align-items-center py-3">
<h5 class="text-body mb-0 me-auto">Chats</h5>
<h5 class="text-body mb-0 me-auto"><?= lang("Chat.messages") ?></h5>
</div>
</div>

5
httpdocs/assets/js/safekat/components/chat.js
View File

@ -54,14 +54,15 @@ class Chat {
if (this.chatContactsBody[0]) {
this.scrollbarContacts = new PerfectScrollbar(this.chatContactsBody[0], {
wheelPropagation: false,
suppressScrollX: true
suppressScrollX: true,
});
}
if (this.chatHistoryBody[0]) {
this.scrollbarChatHistory = new PerfectScrollbar(this.chatHistoryBody[0], {
wheelPropagation: false,
suppressScrollX: true
suppressScrollX: true,
});
}
}

2
httpdocs/assets/js/safekat/pages/chatFactura.js
View File

@ -5,7 +5,9 @@ $(document).ready(() => {
let chat = new Chat($("#chat-factura"))
chat.init()
chat.initFactura()
if($("#internal_messages_chat").length > 0){
let internalMessages = new InternalMessages($("#internal_messages_chat"))
internalMessages.init()
}
})

6
httpdocs/assets/js/safekat/pages/chatPedido.js
View File

@ -5,7 +5,9 @@ $(document).ready(() => {
let chat = new Chat($("#chat-pedido"))
chat.init()
chat.initPedido()
let internalMessages = new InternalMessages($("#internal_messages_chat"))
internalMessages.init()
if($("#internal_messages_chat").length > 0){
let internalMessages = new InternalMessages($("#internal_messages_chat"))
internalMessages.init()
}
})

2
httpdocs/assets/js/safekat/pages/chatPresupuesto.js
View File

@ -5,7 +5,9 @@ $(document).ready(() => {
let chat = new Chat($("#chat-presupuesto"))
chat.init()
chat.initPresupuesto()
if($("#internal_messages_chat").length > 0){
let internalMessages = new InternalMessages($("#internal_messages_chat"))
internalMessages.init()
}
})

10
httpdocs/themes/vuexy/vendor/css/pages/app-chat.css vendored
View File

@ -7,7 +7,7 @@ a.send-msg-btn {
}
@media (min-width: 1200px) {
.layout-horizontal .app-chat {
height: calc(100vh - 11.5rem - 2.2rem) !important;
height: calc(100vh - 20rem - 2.2rem) !important;
}
}
@media (max-width: 992px) {
@ -35,7 +35,7 @@ a.send-msg-btn {
}
@media (min-width: 1200px) {
.layout-horizontal .app-chat .app-chat-contacts {
height: calc(100vh - 11.5rem - 2.2rem);
height: calc(100vh - 20rem - 2.2rem);
}
}
@media (min-width: 992px) {
@ -97,7 +97,7 @@ a.send-msg-btn {
}
@media (min-width: 1200px) {
.layout-horizontal .app-chat .app-chat-sidebar-left {
height: calc(100vh - 11.5rem - 2.2rem);
height: calc(100vh - 20rem - 2.2rem);
}
}
.app-chat .app-chat-sidebar-left.show {
@ -119,7 +119,7 @@ a.send-msg-btn {
}
@media (min-width: 1200px) {
.layout-horizontal .app-chat .app-chat-history {
height: calc(100vh - 11.5rem - 2.2rem);
height: calc(100vh - 20rem - 2.2rem);
}
}
.app-chat .app-chat-history .chat-history-header {
@ -182,7 +182,7 @@ a.send-msg-btn {
}
@media (min-width: 1200px) {
.layout-horizontal .app-chat .app-chat-sidebar-right {
height: calc(100vh - 11.5rem - 2.2rem);
height: calc(100vh - 20rem - 2.2rem);
}
}
.app-chat .app-chat-sidebar-right.show {