Merge branch 'feat/add-chat-presupuesto-cliente' into 'dev/presu_cliente_v2'

Feat/add chat presupuesto cliente

See merge request jjimenez/safekat!354

.gitignore

@@ -1,4 +1,5 @@
 ci4/.env
 .vscode/
 
-xdebug.log
+xdebug.log
+xdebug.*

ci4/app/Controllers/Presupuestos/Presupuestocliente.php

@@ -156,7 +156,7 @@ class Presupuestocliente extends \App\Controllers\BaseResourceController
             $this->model->removeIsDuplicado($presupuestoEntity->id);
         }
 
-
+        $this->viewData['presupuestoId'] = $presupuestoEntity->id;
         $this->viewData['boxTitle'] = lang('Basic.global.edit2') . ' ' . $this->viewData['pageTitle'] . ' ' . lang('Basic.global.edit3');
 
         return $this->displayForm(__METHOD__, $id);

ci4/app/Language/es/Chat.php

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

ci4/app/Models/Chat/ChatModel.php

@@ -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;

ci4/app/Views/themes/vuexy/components/chat_internal_factura.php

@@ -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>

ci4/app/Views/themes/vuexy/components/chat_internal_pedido.php

@@ -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">
+                        <?php if (auth()->user()->inGroup('admin') || auth()->user()->inGroup('beta')) { ?>
-                            <?= view("themes/vuexy/components/internal_messages", data: ["modelId" => $modelId, "type" => "pedido"]) ?>
+                            <div class="tab-pane fade" id="navs-pills-top-internal-messages" role="tabpanel">
-                        </div>
+                                <?= view("themes/vuexy/components/internal_messages", data: ["modelId" => $modelId, "type" => "pedido"]) ?>
+                            </div>
+                        <?php } ?>
                     </div>
                 </div>
             </div>

ci4/app/Views/themes/vuexy/components/chat_internal_presupuesto.php

@@ -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">
+                        <?php if (auth()->user()->inGroup('admin') || auth()->user()->inGroup('beta')) { ?>
-                            <?= view("themes/vuexy/components/internal_messages", data: ["modelId" => $modelId, "type" => "presupuesto"]) ?>
+                            <div class="tab-pane fade" id="navs-pills-top-internal-messages" role="tabpanel">
-                        </div>
+                                <?= view("themes/vuexy/components/internal_messages", data: ["modelId" => $modelId, "type" => "presupuesto"]) ?>
+                            </div>
+                        <?php } ?>
                     </div>
                 </div>
             </div>

ci4/app/Views/themes/vuexy/components/chat_pedido.php

@@ -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 -->

ci4/app/Views/themes/vuexy/components/chat_presupuesto.php

@@ -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">
 

ci4/app/Views/themes/vuexy/components/modals/modalNewInternalMessage.php

@@ -31,7 +31,7 @@
                 </form>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-label-secondary" data-bs-dismiss="modal"><?= lang('App.come_back') ?></button>
+                <button type="button" class="btn btn-label-secondary" data-bs-dismiss="modal"><?= lang('App.global_come_back') ?></button>
                 <button type="button" id="submit_new_hebra" class="btn btn-primary  d-none"><?= lang('Chat.modal.btn_send') ?></button>
                 <button type="button" id="submit_update_hebra" class="btn btn-primary  d-none"><?= lang('Chat.modal.btn_send_update') ?></button>
             </div>

ci4/app/Views/themes/vuexy/form/presupuestos/cliente/viewPresupuestoclienteForm.php

@@ -132,8 +132,7 @@
     <div id="form_buttons" class="row col-sm-12 justify-content-center" style="display: none;">
 
     </div>
-    <?php //<?= view("themes/vuexy/components/chat_presupuesto", data: ["modelId" => $presupuestoEntity->id]) 
+    <?= view("themes/vuexy/components/chat_internal_presupuesto",data:["modelId" => $presupuestoId,"type" => "presupuesto"]) ?>
-    ?> */?>
   </div><!--//.row -->
   <?= view("themes/_commonPartialsBs/_modalConfirmDialog") ?>
   <?= view("themes/_commonPartialsBs/_modalMessageDialog") ?>

ci4/app/Views/themes/vuexy/main/defaultlayout.php

@@ -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>
 

httpdocs/assets/js/safekat/components/chat.js

@@ -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,
+
             });
         }
     }

httpdocs/assets/js/safekat/pages/chatFactura.js

@@ -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()
+    }
 
 })

httpdocs/assets/js/safekat/pages/chatPedido.js

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

httpdocs/assets/js/safekat/pages/chatPresupuesto.js

@@ -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()
+    }
 
 })

httpdocs/themes/vuexy/vendor/css/pages/app-chat.css

@@ -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 {