@tiledesk/tiledesk-server 2.3.70 → 2.3.72

package/CHANGELOG.md

@@ -1,9 +1,22 @@
 
 
-💥 TILEDESK SERVER v2.3.69 💥
+💥 TILEDESK SERVER v2.3.71 💥
 🚀        TAGGED AND PUBLISHED ON NPM           🚀
 🚀        IN PRODUCTION                        🚀
-(https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.69) 
+(https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.71) 
+
+# 2.3.71
+- Email service send email direct fit without request_id
+- Removed strong from transcript email template
+- Added for updateWaitingTimeByRequestId the field enable_populate
+- Added cache for message send endpoint 
+- Added support to mention and group to mail endpoint
+- Now user role can use /users/search (for smtp)
+- Disable text validation for send message
+- Logo email fix
+
+# 2.3.70
+- Update tiledesk-tybot-connector to 0.1.42
 
 # 2.3.69
 - Update tiledesk-dialogflow-connector to 1.8.3

package/channels/chat21/chat21WebHook.js

@@ -210,7 +210,12 @@ router.post('/', function (req, res) {
                       }
 
 
-                    
+                      // var auto_close;
+
+                      // // qui projecy nn c'è devi leggerlo
+                      // // if (req.project.attributes.auto_close === false) {
+                      // //   auto_close = 10;
+                      // // }
 
                       
                       var new_request = {
@@ -218,7 +223,7 @@ router.post('/', function (req, res) {
                         departmentid:departmentid, sourcePage:sourcePage, language:language, userAgent:client, status:requestStatus, createdBy: undefined,
                         attributes:rAttributes, subject:undefined, preflight:false, channel:undefined, location:undefined,
                         lead:createdLead, requester:project_user
-                        
+                        // , auto_close: auto_close
                       };
     
                       winston.debug("new_request", new_request);
@@ -303,8 +308,8 @@ router.post('/', function (req, res) {
                        
                       // TODO it doesn't work for internal requests bacause participanets == message.sender⁄
                       if (request.participants && request.participants.indexOf(message.sender) > -1) { //update waiitng time if write an  agent (member of participants)
-                        winston.debug("updateWaitingTimeByRequestId");
-                        return requestService.updateWaitingTimeByRequestId(request.request_id, request.id_project).then(function(upRequest) {
+                        winston.debug("updateWaitingTimeByRequestId*******");
+                        return requestService.updateWaitingTimeByRequestId(request.request_id, request.id_project, false).then(function(upRequest) {
                           return res.json(upRequest);
                         });
                       }else {
@@ -486,6 +491,10 @@ router.post('/', function (req, res) {
 
           winston.debug("request",request.toObject());
                    // lead_id used. Change it?
+
+          // winston.info("request.snapshot.lead",request.snapshot.lead);
+          // if (request.snapshot.lead && request.snapshot.lead.lead_id==new_member) {   
+
           if (request.lead && request.lead.lead_id==new_member) {            
             winston.debug("don't  joining request.lead or a lead");
             return res.status(400).send({success: false, msg: "don't  joining request.lead or a lead" });
@@ -612,7 +621,7 @@ router.post('/', function (req, res) {
 }
 else if (req.body.event_type == "typing-start") {
 
-  winston.debug("event_type","typing-start");
+  winston.debug("event_type typing-start");
 
   winston.debug("typing-start req.body",req.body);
 

package/models/faq.js

@@ -87,6 +87,10 @@ var FaqSchema = new Schema({
   form: {
     type: Object,
     required: false
+  },
+  actions: {
+    type: Array,
+    required: false
   }
 }, {
   timestamps: true,

package/models/message.js

@@ -45,13 +45,13 @@ var MessageSchema = new Schema({
   },
   text: {
     type: String,
-    required: function() {
-      if (this.type === "text") {
-        return true;
-      }else {
-        return false;
-      }
-    }
+    // required: function() {
+    //   if (this.type === "text") {
+    //     return true;
+    //   }else {
+    //     return false;
+    //   }
+    // }
   },
   language: { //ISO 639-1 (Two letter codes) https://docs.mongodb.com/manual/reference/text-search-languages/#text-search-languages
     type: String,
@@ -97,6 +97,8 @@ MessageSchema.index({ recipient: 1, updatedAt:1 });
 MessageSchema.index({ id_project: 1, recipient:1, updatedAt: 1 });
 MessageSchema.index({ id_project: 1, "attributes._answerid": 1 });
 
+
+
 // https://docs.mongodb.com/manual/core/index-text/
 // https://docs.mongodb.com/manual/tutorial/specify-language-for-text-index/
 // https://docs.mongodb.com/manual/reference/text-search-languages/#text-search-languages

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.3.70",
+  "version": "2.3.72",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -36,8 +36,9 @@
     "@tiledesk-ent/tiledesk-server-enterprise": "^1.0.0"
   },
   "dependencies": {
-    "@tiledesk/tiledesk-apps": "^1.0.9",
+    "@tiledesk/tiledesk-apps": "^1.0.12",
     "@tiledesk/tiledesk-whatsapp-connector": "^0.1.19",
+    "@tiledesk/tiledesk-kaleyra-proxy": "^0.1.6",
     "@tiledesk/tiledesk-chat21-app": "^1.1.7",
     "@tiledesk/tiledesk-chatbot-util": "^0.8.33",
     "@tiledesk/tiledesk-json-rules-engine": "^4.0.3",
@@ -76,7 +77,6 @@
     "moment": "^2.29.3",
     "moment-timezone": "^0.5.33",
     "mongoose": "^5.13.14",
-    "mongoose-auto-increment": "^5.0.1",
     "mongoose-sequence": "^5.3.1",
     "morgan": "^1.10.0",
     "multer": "^1.4.4",

package/pubmodules/apps/listener.js

@@ -14,6 +14,7 @@ class Listener {
         apps.startApp({
             ACCESS_TOKEN_SECRET: process.env.APPS_ACCESS_TOKEN_SECRET || 'nodeauthsecret',
             MONGODB_URI: process.env.APPS_MONGODB_URI || config.databaseUri,
+            KALEYRA_ENABLED: process.env.KALEYRA_ENABLED || config.kaleyra_enabled
         }, () => {
             winston.info("Tiledesk Apps proxy server succesfully started.")
         })

package/pubmodules/kaleyra/index.js

@@ -0,0 +1,6 @@
+const listener = require('./listener');
+
+const kaleyra = require('@tiledesk/tiledesk-kaleyra-proxy');
+const kaleyraRoute = kaleyra.router;
+
+module.exports = { listener: listener, kaleyraRoute: kaleyraRoute }

package/pubmodules/kaleyra/listener.js

@@ -0,0 +1,32 @@
+const kaleyra = require("@tiledesk/tiledesk-kaleyra-proxy");
+var winston = require('../../config/winston');
+var configGlobal = require('../../config/global');
+
+const apiUrl = process.env.API_URL || configGlobal.apiUrl;
+winston.info("Kaleyra apiUrl: " + apiUrl);
+ 
+class Listener {
+
+    listen(config) {
+        winston.info("Kaleyra Listener listen");
+        if (config.databaseUri) {
+            winston.debug("kaleyra config databaseUri: " + config.databaseUri);
+        }
+
+        kaleyra.startApp({
+            MONGODB_URL: config.databaseUri,
+            API_URL: apiUrl,
+            BASE_URL: apiUrl + "/modules/kaleyra",
+            APPS_API_URL: apiUrl + "/modules/apps",
+            KALEYRA_API_URL: process.env.KALEYRA_API_URL,
+            API_KEY: process.env.API_KEY,
+            log: process.env.KALEYRA_LOG
+        }, () => {
+            winston.info("Tiledesk Kaleyra proxy server succesfully started.");
+        })
+    }
+}
+
+var listener = new Listener();
+
+module.exports = listener;

package/pubmodules/pubModulesManager.js

@@ -27,6 +27,9 @@ class PubModulesManager {
         this.whatsapp = undefined;
         this.whatsappRoute = undefined;
 
+        this.kaleyra = undefined;
+        this.kaleyraRoute = undefined;
+
         this.activityArchiver = undefined;
         this.activityRoute = undefined;
 
@@ -67,11 +70,15 @@ class PubModulesManager {
             app.use('/modules/whatsapp', this.whatsappRoute);
             winston.info("ModulesManager whatsappRoute controller loaded");
         }
+        if (this.kaleyraRoute) {
+            app.use('/modules/kaleyra', this.kaleyraRoute);
+            winston.info("ModulesManager kaleyraRoute controller loaded");
+        }
         if (this.tilebotRoute) {
             app.use('/modules/tilebot', this.tilebotRoute);
             winston.info("ModulesManager tilebot controller loaded");       
         }
-        
+
         if (this.dialogFlow) {
             app.use("/modules/dialogFlow", this.dialogFlow.dialogflowRoute);
             winston.info("ModulesManager dialogFlow controller loaded");       
@@ -263,6 +270,21 @@ class PubModulesManager {
             }
         }
         
+        try {
+            this.kaleyra = require('./kaleyra');
+            winston.debug("this.kaleyra: " + this.kaleyra);
+            this.kaleyra.listener.listen(config);
+
+            this.kaleyraRoute = this.kaleyra.kaleyraRoute;
+
+            winston.info("PubModulesManager initialized apps.");
+        } catch(err) {
+            if (err.code == 'MODULE_NOT_FOUND') { 
+                winston.info("PubModulesManager init apps module not found");
+            }else {
+                winston.info("PubModulesManager error initializing init apps module", err);
+            }
+        }
 
         try {
             this.activityArchiver = require('./activities').activityArchiver;

package/routes/email.js

@@ -4,6 +4,9 @@ var router = express.Router();
 
 var emailService = require("../services/emailService");
 var winston = require('../config/winston');
+const recipientEmailUtil = require("../utils/recipientEmailUtil");
+
+
 
 router.get('/templates/:templateid', 
  async (req, res) => {
@@ -29,25 +32,28 @@ router.post('/test/send',
     
 });
 
-
+//TODO add cc
 router.post('/send', 
  async (req, res) => {
   let to = req.body.to;
-  winston.info("to: " + to);
+  winston.debug("to: " + to);
 
   let text = req.body.text;
-  winston.info("text: " + text);
+  winston.debug("text: " + text);
 
   let request_id = req.body.request_id;
-  winston.info("request_id: " + request_id);
+  winston.debug("request_id: " + request_id);
 
   let subject = req.body.subject;
-  winston.info("subject: " + subject);
+  winston.debug("subject: " + subject);
+
+  winston.debug("req.project", req.project);
 
-  winston.info("req.project", req.project);
+  let newto = await recipientEmailUtil.process(to, req.projectid);
+  winston.debug("newto: " + newto);
 
              //sendEmailDirect(to, text, project, request_id, subject, tokenQueryString, sourcePage)
-  emailService.sendEmailDirect(to, text, req.project, request_id, subject, undefined, undefined);
+  emailService.sendEmailDirect(newto, text, req.project, request_id, subject, undefined, undefined);
   
   res.json({"queued": true});
     

package/routes/faq.js

@@ -130,6 +130,9 @@ router.post('/', function (req, res) {
     if (req.body.enabled != undefined) {
       newFaq.enabled = req.body.enabled;
     }
+    if (req.body.actions) {
+      newFaq.actions = req.body.actions
+    }
 
     newFaq.save(function (err, savedFaq) {
       if (err) {
@@ -194,6 +197,9 @@ router.put('/:faqid', function (req, res) {
   if (req.body.form!=undefined) {
     update.form = req.body.form;
   }
+  if (req.body.actions != undefined) {
+    update.actions = req.body.actions;
+  }
 
   Faq.findByIdAndUpdate(req.params.faqid, update, { new: true, upsert: true }, function (err, updatedFaq) {
     if (err) {

package/routes/faq_kb.js

@@ -432,7 +432,8 @@ router.post('/importjson/:id_faq_kb', upload.single('uploadFile'), (req, res) =>
         form: intent.form,
         enabled: intent.enabled,
         webhook_enabled: intent.webhook_enabled,
-        language: intent.language
+        language: intent.language,
+        actions: intent.actions
       }
 
       // overwrite duplicated intents
@@ -491,7 +492,8 @@ router.post('/importjson/:id_faq_kb', upload.single('uploadFile'), (req, res) =>
             form: intent.form,
             enabled: intent.enabled,
             webhook_enabled: intent.webhook_enabled,
-            language: intent.language
+            language: intent.language,
+            actions: intent.actions
           }
 
           // TO DELETE: no used when req.query.create = 'true'
@@ -533,7 +535,7 @@ router.post('/importjson/:id_faq_kb', upload.single('uploadFile'), (req, res) =>
         return res.status(200).send(savedFaq_kb);
 
       }).catch((err) => {
-        console.error("error saving faq_kb: ", err);
+        winston.error("error saving faq_kb: ", err);
         return res.status(500).send(err);
       })
 
@@ -587,7 +589,8 @@ router.post('/importjson/:id_faq_kb', upload.single('uploadFile'), (req, res) =>
               form: intent.form,
               enabled: intent.enabled,
               webhook_enabled: intent.webhook_enabled,
-              language: intent.language
+              language: intent.language,
+              actions: intent.actions
             }
   
             // overwrite duplicated intents

package/routes/message.js

@@ -49,13 +49,17 @@ async (req, res)  => {
   winston.debug('req.params: ', req.params);
   winston.debug('req.params.request_id: ' + req.params.request_id);
 
-  if (!req.body.text &&  (!req.body.type || req.body.type=="text") ) {
-    return res.status(422).json({ errors: ["text field is required"] });
-  } 
-  const errors = validationResult(req);
-  if (!errors.isEmpty()) {
-    return res.status(422).json({ errors: errors.array() });
-  }
+  // sponz: 4/01/23 disable it
+  // if (!req.body.text &&  (!req.body.type || req.body.type=="text") ) {
+  //   return res.status(422).json({ errors: ["text field is required"] });
+  // } 
+  // const errors = validationResult(req);
+  // if (!errors.isEmpty()) {
+  //   return res.status(422).json({ errors: errors.array() });
+  // }
+
+
+
   
   // TODO se sei agent non puoi cambiare sender
   // verificare validazione invio immagine senza caption 
@@ -247,7 +251,7 @@ async (req, res)  => {
                      
                     if (request.participants && request.participants.indexOf(sender) > -1) { //update waiitng time if write an  agent (member of participants)
                       winston.debug("updateWaitingTimeByRequestId");
-                      return requestService.updateWaitingTimeByRequestId(request.request_id, request.id_project).then(function(upRequest) {
+                      return requestService.updateWaitingTimeByRequestId(request.request_id, request.id_project, true).then(function(upRequest) {
                           let message = savedMessage.toJSON();
                           message.request = upRequest;
 
@@ -257,13 +261,26 @@ async (req, res)  => {
                     }else {
                       let message = savedMessage.toJSON();
 
-                      request.populate('lead')
+                      winston.debug("getting request for response");
+
+                      let q =
+                      Request.findOne({request_id:  request.request_id, id_project: request.id_project})
+                      // request
+                      .populate('lead')
                       .populate('department')
                       .populate('participatingBots')
                       .populate('participatingAgents')  
                       // .populate('followers')  
-                      .populate({path:'requester',populate:{path:'id_user'}})
-                      .execPopulate(function (err, requestPopulated){    
+                      .populate({path:'requester',populate:{path:'id_user'}});
+
+
+                      if (cacheEnabler.request) {
+                        q.cache(cacheUtil.defaultTTL, request.id_project+":requests:request_id:"+request.request_id)
+                        winston.debug('request cache enabled for messages');
+                      }
+
+                      q.exec(function (err, requestPopulated){    
+                        // q.execPopulate(function (err, requestPopulated){    
 
                         if (err) {
                           return winston.error("Error gettting savedRequestPopulated for send Message", err);
@@ -282,7 +299,7 @@ async (req, res)  => {
                     message: 'Error creating message endpoint: '+ JSON.stringify(err) + " " + JSON.stringify(req.body) ,
                     label: req.projectid
                   });
-                  // winston.error("Error creating message", err);
+                  winston.error("Error creating message", err);
                   return res.status(500).send({success: false, msg: 'Error creating message', err:err });
                 });
 

package/routes/project_user.js

@@ -375,7 +375,8 @@ router.get('/:project_userid', [passport.authenticate(['basic', 'jwt'], { sessio
 });
 
 
-router.get('/users/search', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent', ['subscription'])], async (req, res, next) => {
+router.get('/users/search', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('user', ['subscription'])], async (req, res, next) => { //changed for smtp 
+  // router.get('/users/search', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent', ['subscription'])], async (req, res, next) => {
   winston.debug("--> users search  ");
 
   if (!req.project) {

package/services/emailService.js

@@ -124,7 +124,7 @@ class EmailService {
     }
     winston.info('EmailService headers: ' + JSON.stringify(this.headers));
 
-    this.ccEnabled = false 
+    this.ccEnabled = false //cc creates loop when you send an email with cc: support@tiledesk.com -> Tiledesk generates an email with ticket id with in cc support@tiledesk.com that loop 
 
     if (process.env.EMAIL_CC_ENABLED ==="true" || process.env.EMAIL_CC_ENABLED === true ) {
       this.ccEnabled = true;
@@ -1463,6 +1463,7 @@ async sendEmailDirect(to, text, project, request_id, subject, tokenQueryString,
 
   var replacements = {        
     project: project,
+    request_id: request_id,
     seamlessPage: sourcePage,
     msgText: msgText,
     tokenQueryString: tokenQueryString,
@@ -1474,7 +1475,7 @@ async sendEmailDirect(to, text, project, request_id, subject, tokenQueryString,
 
   
   let replyTo;
-  if (this.replyEnabled) {
+  if (this.replyEnabled && request_id) {
     replyTo = request_id + this.inboundDomainDomainWithAt;
   }
 
@@ -1730,7 +1731,7 @@ async sendEmailDirect(to, text, project, request_id, subject, tokenQueryString,
 // ok
 
 async sendRequestTranscript(to, messages, request, project) {
-
+  winston.debug("sendRequestTranscript: "+to); 
 
      //if the request came from rabbit mq?
      if (request.toJSON) {

package/services/messageService.js

@@ -17,7 +17,7 @@ class MessageService {
        if (!id) {
            return this.create(sender, senderFullname, recipient, text, id_project, createdBy, status, attributes, type, metadata, language);
        } else {
-            winston.debug("Message changeStatus", status);
+            winston.debug("Message upsert changeStatus:"+ status);
             return this.changeStatus(id, status);
        }
    }
@@ -176,6 +176,7 @@ class MessageService {
 // attento già scatta su chat21handler
 
   changeStatus(message_id, newstatus) {
+    winston.debug("changeStatus. "+message_id + " "+ newstatus);
     var that = this;
     return new Promise(function (resolve, reject) {
      // winston.debug("request_id", request_id);

package/services/requestService.js

@@ -970,19 +970,25 @@ class RequestService {
   
     }
 
-  updateWaitingTimeByRequestId(request_id, id_project) {
+  updateWaitingTimeByRequestId(request_id, id_project, enable_populate) {
 
     return new Promise(function (resolve, reject) {
      // winston.debug("request_id", request_id);
      // winston.debug("newstatus", newstatus);
 
       let q = Request       
-      .findOne({request_id: request_id, id_project: id_project})
-      .populate('lead')
-      .populate('department')
-      .populate('participatingBots')
-      .populate('participatingAgents')  
-      .populate({path:'requester',populate:{path:'id_user'}});
+      .findOne({request_id: request_id, id_project: id_project});
+
+      if (enable_populate==true) {
+        winston.debug("updateWaitingTimeByRequestId  enable_populate");
+
+        q.populate('lead')
+        .populate('department')
+        .populate('participatingBots')
+        .populate('participatingAgents')  
+        .populate({path:'requester',populate:{path:'id_user'}});
+      }
+      
 
       // if (cacheEnabler.request) {  //attention this cache is not usable bacause cacheoose don't support populate without .lean.. so if cached populated field is not returned with cacheoose, updateWaitingTime is only used in chat21webhook but i thik it is important for messages route
       //   q.cache(cacheUtil.defaultTTL, id_project+":requests:request_id:"+request_id)           //request_cache

package/template/email/assignedEmailMessage.html

@@ -11,9 +11,19 @@
     img {
         max-width: 100%;
         margin-left:16px;
-        margin-bottom:16px;
         text-align:center !important;
     }
+    img.CToWUd {
+        margin-bottom: 16px;
+        max-width: 200px !important;
+        width: 200px !important;
+        min-width: 200px !important;
+        outline: none;
+        text-decoration: none;
+        border: none;
+        height: auto;
+        margin-left: 0px;
+    }
     body {
         -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%; line-height: 1.6em;
     }
@@ -82,8 +92,7 @@
 
             <div style="text-align:center">
             <a href="http://www.tiledesk.com" style="color:#2daae1;font-weight:bold;text-decoration:none;word-break:break-word" target="_blank">
-                <!--<img src="https://tiledesk.com/wp-content/uploads/2022/07/tiledesk_v2.png" style="width:10%;outline:none;text-decoration:none;border:none;min-height:36px" class="CToWUd">-->
-                <img src="https://tiledesk.com/wp-content/uploads/2022/09/tiledeesk_log_email.png" style="max-width:200px;outline:none;text-decoration:none;border:none;height:auto;margin-left:0px;" class="CToWUd">
+                <img src="https://tiledesk.com/wp-content/uploads/2023/01/tiledesk_log_email_200.png" class="CToWUd">
             </a>
             </div>
             </tr>
@@ -103,7 +112,7 @@
                 <table width="100%" cellpadding="0" cellspacing="0" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
 
             <tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">              
-                <td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
+                <td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0;" valign="top">
 {{#ifEquals message.type "text"}}
 <div style="white-space: pre-wrap;">{{{msgText}}}</div>
 {{/ifEquals}}
@@ -121,26 +130,26 @@
 
 
                 <tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
-                <td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
+                <td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0;" valign="top">
                 Project name : <strong style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">{{project.name}}</strong>
                 </td>
                 </tr>
                                 
 
                 <tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
-                <td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
+                <td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0;" valign="top">
                 Department name : <strong style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">{{request.department.name}}</strong>
                 </td>
                 </tr>
 
                 <tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
-                <td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
+                <td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0;" valign="top">
                 From email : <strong style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">{{request.lead.email}}</strong>
                 </td>
                 </tr>
 
                 <tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
-                <td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
+                <td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0;" valign="top">
                 Contact name : <strong style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">{{request.lead.fullname}}</strong>
                 </td>
                 </tr>
@@ -152,7 +161,7 @@
                 </tr> -->
 
                 <tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
-                <td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
+                <td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0;" valign="top">
                 Channel : <strong style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
                     {{#ifEquals request.channel.name "chat21"}}
                         Chat
@@ -164,7 +173,7 @@
                 </tr>
 
                 <tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
-                <td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
+                <td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0;" valign="top">
                 <a href="{{baseScope.baseUrl}}/#/project/{{request.id_project}}/wsrequest/{{request.request_id}}/messages">Open the dashboard</a>.
                     
                 </td>
@@ -175,7 +184,7 @@
 
                 
                     <tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
-                    <td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
+                    <td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0;" valign="top">
                     </td>
                     </tr>
                 </table>
@@ -185,7 +194,7 @@
             <div class="footer" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; width: 100%; clear: both; color: #999; margin: 0; padding: 20px;">
             <table width="100%" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
                 <tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
-                <td class="aligncenter content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; vertical-align: top; color: #999; text-align: center; margin: 0; padding: 0 0 20px;" align="center" valign="top">
+                <td class="aligncenter content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; vertical-align: top; color: #999; text-align: center; margin: 0;" align="center" valign="top">
                     <span><a href="http://www.tiledesk.com" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; color: #999; text-decoration: underline; margin: 0;" > Tiledesk.com </a></span>
                     <br><span><a href="%unsubscribe_url%"  style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; color: #999; text-decoration: underline; margin: 0;">Unsubscribe</a></span>
                 </td>