admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Additional tasks changes.

Browse Source
This commit is contained in:
Patrick Fic
2024-04-18 07:46:05 -07:00
parent 00b91616f5
commit 535f92b7d2
1 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
server/email/tasksEmails.js
View File

@@ -110,29 +110,29 @@ const generateTemplateArgs = (title, createdBy, dueDate, taskId) => {
*/ */
const sendMail = (type, to, subject, html, taskIds, successCallback) => { const sendMail = (type, to, subject, html, taskIds, successCallback) => {
// Push next messages to Nodemailer // Push next messages to Nodemailer
transporter.once("idle", () => { //transporter.once("idle", () => {
// Note: This is commented out because despite being in the documentation, it does not work // Note: This is commented out because despite being in the documentation, it does not work
// and stackoverflow suggests it is not needed // and stackoverflow suggests it is not needed
// if (transporter.isIdle()) { // if (transporter.isIdle()) {
transporter.sendMail( transporter.sendMail(
{ {
from: fromEmails, from: fromEmails,
to, to,
subject, subject,
html html
}, },
(error, info) => { (error, info) => {
if (info) { if (info) {
if (typeof successCallback === "function" && taskIds && taskIds.length) { if (typeof successCallback === "function" && taskIds && taskIds.length) {
successCallback(taskIds); successCallback(taskIds);
}
} else {
logger.log(`task-${type}-email-failure`, "error", null, null, error);
} }
} else {
logger.log(`task-${type}-email-failure`, "error", null, null, error);
} }
); }
// } );
}); // }
// });
}; };
/** /**
@@ -216,7 +216,8 @@ const tasksRemindEmail = async (req, res) => {
if (recipient.count === 1) { if (recipient.count === 1) {
const onlyTask = groupedTasks[recipient.email][0]; const onlyTask = groupedTasks[recipient.email][0];
emailData.subject = `New Task Reminder - ${onlyTask.title} - ${formatDate(onlyTask.due_date)}`; emailData.subject =
`New Task Reminder - ${onlyTask.title} ${onlyTask.due_date ? `- ${formatDate(onlyTask.due_date)}` : ""}`.trim();
emailData.html = generateEmailTemplate( emailData.html = generateEmailTemplate(
generateTemplateArgs(onlyTask.title, onlyTask.created_by, onlyTask.due_date, onlyTask.id) generateTemplateArgs(onlyTask.title, onlyTask.created_by, onlyTask.due_date, onlyTask.id)