Merge branch 'feat_faro' of github.com:AdrianoRobson/projeto-hit into feat_faro

backend/src/services/WbotServices/wbotMessageListener.ts

@@ -278,7 +278,7 @@ const question = async (
     ) {
       await botSendMessage(
         ticket,
-        "¡Envía uno o más archivos simultáneamente!"
+        "Por favor adjuntar evidencias.\n¡Envía uno o más archivos simultáneamente!"
       );
       return;
     }
@@ -327,22 +327,9 @@ const question = async (
       }
     }
 
-    // currentId = await get({ key: `form:${ticket.id}:current` });
-
     let index = ask.findIndex((obj: any) => obj.id == currentId);
 
     if (index != -1) {
-      console.log(
-        "msg?.body: ",
-        msg?.body,
-        " | sendFile?.filePath: ",
-        sendFile?.filePath,
-        " | index: ",
-        index,
-        " | ask[index]?.item?.file: ",
-        ask[index]?.item?.file
-      );
-
       if (!ask[index]?.item?.file && !sendFile) {
         ask[index].value = msg?.body;
       }
@@ -352,18 +339,22 @@ const question = async (
 
       if (index + 1 <= ask.length - 1) {
         if (ask[index + 1]?.item?.file && !sendFile) {
-          await botSendMessage(
+          // await botSendMessage(
-            ticket,
+          //   ticket,
-            "¿Quieres enviar archivo? Ingrese *Sí* o *No*"
+          //   "¿Quieres enviar archivo? Ingrese *Sí* o *No*"
-          );
+          // );
           await set(
             `form:${ticket.id}:file`,
             JSON.stringify({ status: "waiting" })
           );
-          return;
+          set(
+            `form:${ticket.id}:file`,
+            JSON.stringify({ ...sendFile, status: "yes" })
+          );
+          // return;
         }
-
         // Next question
+
         await botSendMessage(ticket, ask[index + 1].question);
         await set(`form:${ticket.id}:current`, `${ask[index + 1].id}`);
       } else {
@@ -1222,7 +1213,7 @@ const handleMessage = async (
         return;
       }
     }
- 
+
     //
 
     if (
@@ -1390,7 +1381,7 @@ const handleMessage = async (
           msg?.body?.trim() != "0" &&
           msg?.body?.trim() != "#"
         ) {
-          await question(fillingOutForm, msg, ticket, contact, wbot); 
+          await question(fillingOutForm, msg, ticket, contact, wbot);
           return;
         }
 
@@ -1614,7 +1605,7 @@ const menu = async (userTyped: string, whatsappId: any, contactId: any, ticket:
   const data: any = await get({
     key: whatsapp?.number ? `ura_${whatsapp?.number}` : "ura",
     parse: true
-  }); 
+  });
 
   if (!lastId[0]) {
     await createObject({
@@ -1982,7 +1973,7 @@ async function backUra(whatsappId: any, contactId: any, data: any) {
 
   let uraOptionSelected = await findObject(
     whatsappId,
-    contactId, 
+    contactId,
     _whatsapp?.number ? `ura_${_whatsapp?.number}` : "ura"
   );
 
@@ -2223,6 +2214,13 @@ async function setSoport(ticket: any, wbot: any, contact: any) {
     })
     .join("");
 
+  let request = await get({
+    key: `form:${ticket.id}:request`,
+    parse: true
+  });
+
+  payload += `<nit_transp>${request.nit}</nit_transp>`;
+
   let payloadFile = fillingOutForm.ask.find((a: any) => a?.item?.file);
 
   let files = "";
@@ -2269,7 +2267,7 @@ async function setSoport(ticket: any, wbot: any, contact: any) {
    </soapenv:Body>
 </soapenv:Envelope>`;
 
-  // console.log("DATA: ", data);
+  console.log("DATA REQUEST: ", data);
 
   // return;
   var config = {

frontend/src/components/TicketListItem/index.js

@@ -229,7 +229,7 @@ const TicketListItem = ({ ticket, remoteTicketsControll, settings }) => {
 									variant="body2"
 									color="textPrimary"
 								>
-									{ticket.contact.name}
+									{ticket?.contact?.name}
 								</Typography>
 								{ticket.status === "closed" && (
 									<Badge