Skip to content

Commit 02e1caf

Browse files
committed
pulling from origin
1 parent ebf7950 commit 02e1caf

File tree

2 files changed

+15
-11
lines changed

2 files changed

+15
-11
lines changed

connect/service.js

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,18 @@ sgMail.setApiKey(config.SENDGRID_API_KEY);
1111

1212
const sendEmail = (templateId, message) => { // send email
1313

14+
let msg = {}
1415
const from = message.from ? message.from : config.EMAIL_FROM;
1516
const replyTo = message.replyTo ? message.replyTo : config.EMAIL_FROM;
16-
const substitutions = message.data ;
17-
const categories = message.categories ? message.categories: [];
17+
const substitutions = message.data;
18+
const categories = message.categories ? message.categories : [];
1819
const to = message.recipients;
19-
const cc = message.cc ? message.cc : [];
20+
const cc = message.cc ? message.cc : [];
2021
const bcc = message.bcc ? message.bcc : [];
21-
22-
if (message.version && message.version=="v3"){
23-
return sgMail.send({
22+
const sendTime = message.sendTime ? message.sendTime : null;
23+
24+
if (message.version && message.version == "v3") {
25+
msg = {
2426
to,
2527
templateId,
2628
dynamicTemplateData: substitutions,
@@ -29,9 +31,9 @@ const sendEmail = (templateId, message) => { // send email
2931
categories,
3032
cc,
3133
bcc,
32-
});
33-
} else{
34-
return sgMail.send({
34+
};
35+
} else {
36+
msg = {
3537
to,
3638
templateId,
3739
substitutions,
@@ -41,8 +43,9 @@ const sendEmail = (templateId, message) => { // send email
4143
categories,
4244
cc,
4345
bcc,
44-
});
46+
};
4547
}
48+
return sgMail.send(msg)
4649
}
4750
module.exports = {
4851
sendEmail,

package-lock.json

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)