Merge branch 'dev/chat' into 'main'

Dev/chat

See merge request jjimenez/safekat!339

ci4/app/Models/Chat/ChatDeparmentModel.php

@@ -71,8 +71,10 @@ class ChatDeparmentModel extends Model
                 "users",
                 "chat_department_users.user_id = users.id",
                 'left'
-            )->where("chat_departments.type",$type)
-            ->where("chat_department_users.user_id",auth()->user()->id);
+            )->where("chat_departments.type",$type);
+            if(auth()->user()->cliente_id == null){
+                $query->where("chat_department_users.user_id",auth()->user()->id);
+            }
         
         $results = $query->get()->getResultArray();
         // Create the desired structure

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

@@ -1,12 +1,12 @@
 <div class="accordion accordion-bordered mt-3" id="accordionChatFactura">
-    <div class="card accordion-item active">
+    <div class="card accordion-item">
         <h2 class="accordion-header" id="headingChatFactura">
             <button type="button" class="accordion-button" data-bs-toggle="collapse"
                 data-bs-target="#accordionChatFacturaTip" aria-expanded="false" aria-controls="accordionChatFacturaTip">
                 <h3><?= lang("Chat.chat") ?></h3>
             </button>
         </h2>
-        <div id="accordionChatFacturaTip" class="accordion-collapse collapse show"
+        <div id="accordionChatFacturaTip" class="accordion-collapse collapse"
             data-bs-parent="#accordionChatFactura">
             <div class="accordion-body">
                 <div class="container-xxl flex-grow-1 container-p-y" id="chat-factura" data-id="<?= $modelId ?>">

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

@@ -1,12 +1,12 @@
 <div class="accordion accordion-bordered mt-3" id="accordionChatPedido">
-    <div class="card accordion-item active">
+    <div class="card accordion-item">
         <h2 class="accordion-header" id="headingChatPedido">
             <button type="button" class="accordion-button" data-bs-toggle="collapse"
                 data-bs-target="#accordionChatPedidoTip" aria-expanded="false" aria-controls="accordionChatPedidoTip">
                 <h3><?= lang("Chat.chat") ?></h3>
             </button>
         </h2>
-        <div id="accordionChatPedidoTip" class="accordion-collapse collapse show" data-bs-parent="#accordionChatPedido">
+        <div id="accordionChatPedidoTip" class="accordion-collapse collapse" data-bs-parent="#accordionChatPedido">
             <div class="accordion-body">
                 <div class="container-xxl flex-grow-1 container-p-y" id="chat-pedido" data-id="<?= $modelId ?>">
 

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

@@ -19,11 +19,11 @@
     <!-- Create Deal Wizard -->
     <div id="wizard-presupuesto-cliente" class="bs-stepper vertical mt-2 linear">
 
-      <?php if($presupuestoEntity->estado_id == 1) : ?>
-      
+      <?php if ($presupuestoEntity->estado_id == 1) : ?>
+
         <div class="bs-stepper-header">
-          
-          <div class="step active" data-target="#tipo-libro" >
+
+          <div class="step active" data-target="#tipo-libro">
             <button type="button" class="step-trigger" aria-selected="false" disabled="disabled">
               <span class="bs-stepper-circle"><i class="ti ti-book ti-sm"></i></span>
               <span class="bs-stepper-label">
@@ -34,7 +34,7 @@
           </div>
           <div class="line"></div>
 
-          <div class="step" data-target="#disenio-libro" >
+          <div class="step" data-target="#disenio-libro">
             <button type="button" class="step-trigger" aria-selected="false" disabled="disabled">
               <span class="bs-stepper-circle"><i class="ti ti-book ti-sm"></i></span>
               <span class="bs-stepper-label">
@@ -45,7 +45,7 @@
           </div>
           <div class="line"></div>
 
-          <div class="step" data-target="#direcciones-libro" >
+          <div class="step" data-target="#direcciones-libro">
             <button type="button" class="step-trigger" aria-selected="false" disabled="disabled">
               <span class="bs-stepper-circle"><i class="ti ti-map-pins ti-sm"></i></span>
               <span class="bs-stepper-label">
@@ -74,21 +74,21 @@
 
           <div id='divTiradasPrecio'>
 
-          </div>        
+          </div>
 
         </div>
 
         <div class="bs-stepper-content">
           <form id="presupuesto-cliente-form" onsubmit="return false">
 
-            
+
             <!-- Tipo Libro -->
-            <div id="tipo-libro" class="content active" dstepper-block fv-plugins-bootstrap5 fv-plugins-framework"  >
+            <div id="tipo-libro" class="content active" dstepper-block fv-plugins-bootstrap5 fv-plugins-framework">
 
               <div class="row g-3">
 
                 <?= view("themes/vuexy/form/presupuestos/cliente/_tipoLibroItems") ?>
-                
+
                 <div class="col-12 d-flex justify-content-between mt-4">
                   <button class="btn btn-primary btn-prev waves-effect waves-light">
                     <i class="ti ti-arrow-left ti-xs me-sm-1 me-0"></i>
@@ -103,7 +103,7 @@
             </div>
 
             <!-- Diseño Libro -->
-            <div id="disenio-libro" class="content dstepper-block fv-plugins-bootstrap5 fv-plugins-framework" >
+            <div id="disenio-libro" class="content dstepper-block fv-plugins-bootstrap5 fv-plugins-framework">
               <div class="row g-3">
 
                 <?= view("themes/vuexy/form/presupuestos/cliente/_disenioLibroItems") ?>
@@ -122,7 +122,7 @@
             </div>
 
             <!-- Direcciones -->
-            <div id="direcciones-libro" class="content fv-plugins-bootstrap5 fv-plugins-framework" >
+            <div id="direcciones-libro" class="content fv-plugins-bootstrap5 fv-plugins-framework">
               <div class="row g-3">
 
                 <?= view("themes/vuexy/form/presupuestos/cliente/_direccionesItems") ?>
@@ -150,14 +150,14 @@
               <div class="col-12 d-flex justify-content-between mt-4">
                 <div class="col-6 d-flex flex-row">
                   <?php if ($presupuestoEntity->estado_id == 1) : ?>
-                  <button class="btn btn-primary btn-prev waves-effect waves-light">
-                    <i class="ti ti-arrow-left ti-xs me-sm-1 me-0"></i>
-                    <span class="align-middle d-sm-inline-block d-none me-sm-1">Anterior</span>
-                  </button>
+                    <button class="btn btn-primary btn-prev waves-effect waves-light">
+                      <i class="ti ti-arrow-left ti-xs me-sm-1 me-0"></i>
+                      <span class="align-middle d-sm-inline-block d-none me-sm-1">Anterior</span>
+                    </button>
                   <?php endif; ?>
                 </div>
                 <div class="col-6 d-flex flex-row-reverse">
-                    <?php if ($presupuestoEntity->estado_id == 1) : ?>
+                  <?php if ($presupuestoEntity->estado_id == 1) : ?>
                     <button id="btnSave" class="btn btn-primary btn-submit waves-effect waves-light ml-2">
                       <span class="align-middle d-sm-inline-block d-none me-sm-1">Guardar</span>
                       <i class="ti ti-arrow-right ti-xs"></i>
@@ -165,28 +165,28 @@
                     <button id="btnConfirm" class="btn btn-success btn-submit btn-next mx-2 waves-effect waves-light ml-2">
                       <span class="align-middle d-sm-inline-block d-none me-sm-1">Confirmar</span><i class="ti ti-check ti-xs"></i>
                     </button>
-                    <?php else: ?>
-                      <button id="btnBack" class="btn btn-success btn-submit btn-next mx-2 waves-effect waves-light">
-                        <span class="align-middle d-sm-inline-block d-none me-sm-1">Volver</span><i class="ti ti-check ti-xs"></i>
-                      </button>
-                    <?php endif; ?>
-                    <button id="btnDuplicar" class="btn btn-primary btn-submit waves-effect waves-light ml-2">
-                      <span class="align-middle d-sm-inline-block d-none me-sm-1">Duplicar</span>
-                      <i class="ti ti-copy ti-xs"></i>
+                  <?php else: ?>
+                    <button id="btnBack" class="btn btn-success btn-submit btn-next mx-2 waves-effect waves-light">
+                      <span class="align-middle d-sm-inline-block d-none me-sm-1">Volver</span><i class="ti ti-check ti-xs"></i>
                     </button>
-                    <?php
-                    // Mostrar boton de impresion solo en presupuestos guardados (no add!)
-                    if($formAction == "edit") {
-                        echo anchor(
-                                route_to("presupuestoToPdf", $presupuestoEntity->id),
-                                lang("Basic.global.Print"),
-                                [
-                                    "class" => "btn btn-dark float-start me-sm-3 ml-2",
-                                    "target" => "_blank"
-                                ]
-                        );
-                    }
-                    ?>
+                  <?php endif; ?>
+                  <button id="btnDuplicar" class="btn btn-primary btn-submit waves-effect waves-light ml-2">
+                    <span class="align-middle d-sm-inline-block d-none me-sm-1">Duplicar</span>
+                    <i class="ti ti-copy ti-xs"></i>
+                  </button>
+                  <?php
+                  // Mostrar boton de impresion solo en presupuestos guardados (no add!)
+                  if ($formAction == "edit") {
+                    echo anchor(
+                      route_to("presupuestoToPdf", $presupuestoEntity->id),
+                      lang("Basic.global.Print"),
+                      [
+                        "class" => "btn btn-dark float-start me-sm-3 ml-2",
+                        "target" => "_blank"
+                      ]
+                    );
+                  }
+                  ?>
                 </div>
               </div>
             </div>
@@ -195,148 +195,148 @@
 
       <?php else: ?>
 
-      <div class="row">
+        <div class="row">
           <div class="card">
-              <div class="card-body">
-                  <form id="presupuesto-cliente-form" onsubmit="return false">
-                      <div class="row g-3">
+            <div class="card-body">
+              <form id="presupuesto-cliente-form" onsubmit="return false">
+                <div class="row g-3">
 
-                          <?= view("themes/vuexy/form/presupuestos/cliente/_resumenItems") ?>
+                  <?= view("themes/vuexy/form/presupuestos/cliente/_resumenItems") ?>
 
-                          <div class="col-12 d-flex justify-content-between mt-4">
-                              <div class="col-6 d-flex flex-row">
-                                  <?php if ($presupuestoEntity->estado_id == 1) : ?>
-                                      <button class="btn btn-primary btn-prev waves-effect waves-light">
-                                          <i class="ti ti-arrow-left ti-xs me-sm-1 me-0"></i>
-                                          <span class="align-middle d-sm-inline-block d-none me-sm-1">Anterior</span>
-                                      </button>
-                                  <?php endif; ?>
-                              </div>
-                              <div class="col-6 d-flex flex-row-reverse">
-                                  <?php if ($presupuestoEntity->estado_id == 1) : ?>
-                                      <button id="btnSave" class="btn btn-primary btn-submit waves-effect waves-light ml-2">
-                                          <span class="align-middle d-sm-inline-block d-none me-sm-1">Guardar</span>
-                                          <i class="ti ti-arrow-right ti-xs"></i>
-                                      </button>
-                                      <button id="btnConfirm" class="btn btn-success btn-submit btn-next mx-2 waves-effect waves-light ml-2">
-                                          <span class="align-middle d-sm-inline-block d-none me-sm-1">Confirmar</span><i class="ti ti-check ti-xs"></i>
-                                      </button>
-                                  <?php else: ?>
-                                      <button id="btnBack" class="btn btn-success btn-submit btn-next mx-2 waves-effect waves-light">
-                                          <span class="align-middle d-sm-inline-block d-none me-sm-1">Volver</span><i class="ti ti-check ti-xs"></i>
-                                      </button>
-                                  <?php endif; ?>
-                                  <button id="btnDuplicar" class="btn btn-primary btn-submit waves-effect waves-light ml-2">
-                                      <span class="align-middle d-sm-inline-block d-none me-sm-1">Duplicar</span>
-                                      <i class="ti ti-copy ti-xs"></i>
-                                  </button>
-                                  <?php
-                                  // Si esta confirmado siempre es un presupuesto guardado
-                                  echo anchor(
-                                      route_to("presupuestoToPdf", $presupuestoEntity->id),
-                                      lang("Basic.global.Print"),
-                                      [
-                                          "class" => "btn btn-dark float-start me-sm-3 ml-2",
-                                          "target" => "_blank"
-                                      ]
-                                  );
-                                  ?>
-                              </div>
-                          </div>
-                  </form>
-              </div>
+                  <div class="col-12 d-flex justify-content-between mt-4">
+                    <div class="col-6 d-flex flex-row">
+                      <?php if ($presupuestoEntity->estado_id == 1) : ?>
+                        <button class="btn btn-primary btn-prev waves-effect waves-light">
+                          <i class="ti ti-arrow-left ti-xs me-sm-1 me-0"></i>
+                          <span class="align-middle d-sm-inline-block d-none me-sm-1">Anterior</span>
+                        </button>
+                      <?php endif; ?>
+                    </div>
+                    <div class="col-6 d-flex flex-row-reverse">
+                      <?php if ($presupuestoEntity->estado_id == 1) : ?>
+                        <button id="btnSave" class="btn btn-primary btn-submit waves-effect waves-light ml-2">
+                          <span class="align-middle d-sm-inline-block d-none me-sm-1">Guardar</span>
+                          <i class="ti ti-arrow-right ti-xs"></i>
+                        </button>
+                        <button id="btnConfirm" class="btn btn-success btn-submit btn-next mx-2 waves-effect waves-light ml-2">
+                          <span class="align-middle d-sm-inline-block d-none me-sm-1">Confirmar</span><i class="ti ti-check ti-xs"></i>
+                        </button>
+                      <?php else: ?>
+                        <button id="btnBack" class="btn btn-success btn-submit btn-next mx-2 waves-effect waves-light">
+                          <span class="align-middle d-sm-inline-block d-none me-sm-1">Volver</span><i class="ti ti-check ti-xs"></i>
+                        </button>
+                      <?php endif; ?>
+                      <button id="btnDuplicar" class="btn btn-primary btn-submit waves-effect waves-light ml-2">
+                        <span class="align-middle d-sm-inline-block d-none me-sm-1">Duplicar</span>
+                        <i class="ti ti-copy ti-xs"></i>
+                      </button>
+                      <?php
+                      // Si esta confirmado siempre es un presupuesto guardado
+                      echo anchor(
+                        route_to("presupuestoToPdf", $presupuestoEntity->id),
+                        lang("Basic.global.Print"),
+                        [
+                          "class" => "btn btn-dark float-start me-sm-3 ml-2",
+                          "target" => "_blank"
+                        ]
+                      );
+                      ?>
+                    </div>
+                  </div>
+              </form>
+            </div>
           </div>
-      </div>
+        </div>
 
 
 
-
-
-        
       <?php endif; ?>
-          
-  </div><!--//.col -->
- 
-</div><!--//.row -->
-<?= view("themes/_commonPartialsBs/_modalConfirmDialog") ?>
-<?= view("themes/_commonPartialsBs/_modalMessageDialog") ?>
 
-<?= $this->endSection() ?>
+    </div><!--//.col -->
+    <?= view("themes/vuexy/components/chat_presupuesto",data:["modelId" => $presupuestoEntity->id]) ?>
+  </div><!--//.row -->
+  <?= view("themes/_commonPartialsBs/_modalConfirmDialog") ?>
+  <?= view("themes/_commonPartialsBs/_modalMessageDialog") ?>
+
+  <?= $this->endSection() ?>
 
 
 
 
-<?= $this->section("additionalInlineJs") ?>
+  <?= $this->section("additionalInlineJs") ?>
 
-window.datosPresupuesto = <?= json_encode($datosPresupuesto) ?>;
-window.token_ajax= {<?= csrf_token() ?? "token" ?>: <?= csrf_token() ?>v};
+  window.datosPresupuesto = <?= json_encode($datosPresupuesto) ?>;
+  window.token_ajax= {<?= csrf_token() ?? "token" ?>: <?= csrf_token() ?>v};
 
-<?php if ($presupuestoEntity->estado_id == 1) : ?>
-  $('#clienteId').select2({
+  <?php if ($presupuestoEntity->estado_id == 1) : ?>
+    $('#clienteId').select2({
     allowClear: false,
     ajax: {
-      url: '<?= route_to("menuItemsOfClientes") ?>',
-      type: 'post',
-      dataType: 'json',
+    url: '<?= route_to("menuItemsOfClientes") ?>',
+    type: 'post',
+    dataType: 'json',
 
-      data: function(params) {
-      return {
-        id: 'id',
-        text: 'nombre',
-        searchTerm: params.term,
-        <?= csrf_token() ?? "token" ?> : <?= csrf_token() ?>v
-      };
+    data: function(params) {
+    return {
+    id: 'id',
+    text: 'nombre',
+    searchTerm: params.term,
+    <?= csrf_token() ?? "token" ?> : <?= csrf_token() ?>v
+    };
     },
     delay: 60,
     processResults: function(response) {
-      yeniden(response.<?= csrf_token() ?>);
-      return {
-        results: response.menu
-      };
+    yeniden(response.<?= csrf_token() ?>);
+    return {
+    results: response.menu
+    };
     },
     cache: true
-  }
-  });
+    }
+    });
 
-  initDisenioLibro();
+    initDisenioLibro();
 
 
-<?php endif; ?>
+  <?php endif; ?>
 
 
 
-<?= $this->endSection() ?>
+  <?= $this->endSection() ?>
 
 
-<?= $this->section('css') ?>
+  <?= $this->section('css') ?>
 
-<link rel="stylesheet" href="<?= site_url('themes/vuexy/vendor/libs/bs-stepper/bs-stepper.css') ?>" />
-<link rel="stylesheet" href="<?= site_url('themes/vuexy/vendor/libs/formvalidation/dist/css/formValidation.min.css') ?>" />
-<link rel="stylesheet" href="<?= site_url('themes/vuexy/vendor/libs/dropzone/dropzone.css') ?>" />
+  <link rel="stylesheet" href="<?= site_url('themes/vuexy/vendor/libs/bs-stepper/bs-stepper.css') ?>" />
+  <link rel="stylesheet" href="<?= site_url('themes/vuexy/vendor/libs/formvalidation/dist/css/formValidation.min.css') ?>" />
+  <link rel="stylesheet" href="<?= site_url('themes/vuexy/vendor/libs/dropzone/dropzone.css') ?>" />
+  <link rel="stylesheet" href="<?= site_url('themes/vuexy/vendor/css/pages/app-chat.css') ?>">
 
-<?= $this->endSection() ?>
+  <?= $this->endSection() ?>
 
-<?= $this->section('additionalExternalJs') ?>
-    <script src="<?= site_url("themes/vuexy/vendor/libs/dropzone/dropzone.js") ?>"></script>
-    <script src="<?= site_url("themes/vuexy/vendor/libs/bs-stepper/bs-stepper.js") ?>"></script>
-    <script src="<?= site_url("themes/vuexy/vendor/libs/formvalidation/dist/js/FormValidation.min.js") ?>"></script>
-    <script src="<?= site_url("themes/vuexy/vendor/libs/formvalidation/dist/js/plugins/Bootstrap5.min.js") ?>"></script>
-    <script src="<?= site_url("themes/vuexy/vendor/libs/formvalidation/dist/js/plugins/AutoFocus.min.js") ?>"></script>
-    <script src="<?= site_url("themes/vuexy/vendor/libs/datatables-sk/plugins/buttons/dataTables.buttons.min.js") ?>"></script>
-    <script src="<?= site_url("themes/vuexy/vendor/libs/datatables-sk/plugins/buttons/buttons.bootstrap5.min.js") ?>"></script>
-    <script src="<?= site_url("themes/vuexy/vendor/libs/datatables-sk/plugins/buttons/buttons.html5.min.js") ?>"></script>
-    <script src="<?= site_url("themes/vuexy/vendor/libs/datatables-sk/plugins/buttons/buttons.print.min.js") ?>"></script>
-    <script src="<?= site_url("themes/vuexy/vendor/libs/datatables-sk/plugins/select/dataTables.select.min.js") ?>"></script>
-    <script src="<?= site_url('themes/vuexy/js/datatables-editor/dataTables.editor.min.js') ?>"></script>
-    <script src="<?= site_url('themes/vuexy/vendor/libs/autosize/autosize.js') ?>"></script>
-    <script src="<?= site_url('themes/vuexy/vendor/libs/two/two.js') ?>"></script>
-    <script src="<?= site_url('js_loader/translate_js/Presupuestos') ?>"></script>
-    <script src="<?= site_url('js_loader/presupuestoClienteResumen_js') ?>"></script>
-    <?php if ($presupuestoEntity->estado_id == 1) : ?>
-      <script src="<?= site_url('js_loader/presupuestoCliente_js') ?>"></script>  
-    <?php endif; ?>
-    <script src="<?= site_url('js_loader/presupuestoClienteTipoLibro_js') ?>"></script>
-    <script src="<?= site_url('js_loader/presupuestoClienteDisenioLibro_js') ?>"></script>
-    <script src="<?= site_url('js_loader/presupuestoClienteDirecciones_js') ?>"></script>
-    <script src="<?= site_url('js_loader/presupuestoClientePreview_js') ?>"></script>
-<?= $this->endSection() ?>
+  <?= $this->section('additionalExternalJs') ?>
+  <script src="<?= site_url("themes/vuexy/vendor/libs/dropzone/dropzone.js") ?>"></script>
+  <script src="<?= site_url("themes/vuexy/vendor/libs/bs-stepper/bs-stepper.js") ?>"></script>
+  <script src="<?= site_url("themes/vuexy/vendor/libs/formvalidation/dist/js/FormValidation.min.js") ?>"></script>
+  <script src="<?= site_url("themes/vuexy/vendor/libs/formvalidation/dist/js/plugins/Bootstrap5.min.js") ?>"></script>
+  <script src="<?= site_url("themes/vuexy/vendor/libs/formvalidation/dist/js/plugins/AutoFocus.min.js") ?>"></script>
+  <script src="<?= site_url("themes/vuexy/vendor/libs/datatables-sk/plugins/buttons/dataTables.buttons.min.js") ?>"></script>
+  <script src="<?= site_url("themes/vuexy/vendor/libs/datatables-sk/plugins/buttons/buttons.bootstrap5.min.js") ?>"></script>
+  <script src="<?= site_url("themes/vuexy/vendor/libs/datatables-sk/plugins/buttons/buttons.html5.min.js") ?>"></script>
+  <script src="<?= site_url("themes/vuexy/vendor/libs/datatables-sk/plugins/buttons/buttons.print.min.js") ?>"></script>
+  <script src="<?= site_url("themes/vuexy/vendor/libs/datatables-sk/plugins/select/dataTables.select.min.js") ?>"></script>
+  <script src="<?= site_url('themes/vuexy/js/datatables-editor/dataTables.editor.min.js') ?>"></script>
+  <script src="<?= site_url('themes/vuexy/vendor/libs/autosize/autosize.js') ?>"></script>
+  <script src="<?= site_url('themes/vuexy/vendor/libs/two/two.js') ?>"></script>
+  <script src="<?= site_url('js_loader/translate_js/Presupuestos') ?>"></script>
+  <script src="<?= site_url('js_loader/presupuestoClienteResumen_js') ?>"></script>
+  <script src="<?= site_url('themes/vuexy/vendor/libs/perfect-scrollbar/perfect-scrollbar.js') ?>"></script>
+
+  <?php if ($presupuestoEntity->estado_id == 1) : ?>
+    <script src="<?= site_url('js_loader/presupuestoCliente_js') ?>"></script>
+  <?php endif; ?>
+  <script src="<?= site_url('js_loader/presupuestoClienteTipoLibro_js') ?>"></script>
+  <script src="<?= site_url('js_loader/presupuestoClienteDisenioLibro_js') ?>"></script>
+  <script src="<?= site_url('js_loader/presupuestoClienteDirecciones_js') ?>"></script>
+  <script src="<?= site_url('js_loader/presupuestoClientePreview_js') ?>"></script>
+  <?= $this->endSection() ?>

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

@@ -309,12 +309,13 @@ class Chat {
 
     }
     _handleListContactsSuccess(contacts) {
-        if (contacts) {
+        if (contacts.length) {
+            console.log(contacts)
             contacts.map((c) => {
                 this._addContactToList(c)
             });
         } else {
-            this.sideBar.find("#contact-list").removeClass("d-none")
+            this.sideBar.find("#contact-list").addClass("d-none")
         }
         this.sideBar.find(".contact-chat").on("click", (e) => {
             $(".contact-chat").parent().removeClass("active")