`,
+ to,
+ subject,
+ html
+ });
+ } catch (error) {
+ console.log(error);
+ logger.log("server-email-failure", "error", null, null, error);
+ }
+};
+
+const sendTaskEmail = async ({ to, subject, type = "text", html, text, attachments }) => {
try {
transporter.sendMail(
{
@@ -107,7 +121,7 @@ const sendTaskEmail = async ({ to, subject, text, attachments }) => {
}),
to: to,
subject: subject,
- text: text,
+ ...(type === "text" ? { text } : { html }),
attachments: attachments || null
},
(err, info) => {
@@ -309,5 +323,6 @@ module.exports = {
sendEmail,
sendServerEmail,
sendTaskEmail,
+ sendProManagerWelcomeEmail,
emailBounce
};
diff --git a/server/email/tasksEmails.js b/server/email/tasksEmails.js
index aac9ebf4f..a106085f7 100644
--- a/server/email/tasksEmails.js
+++ b/server/email/tasksEmails.js
@@ -94,8 +94,9 @@ const formatPriority = (priority) => {
* @param taskId
* @returns {{header, body: string, subHeader: string}}
*/
-const generateTemplateArgs = (title, priority, description, dueDate, bodyshop, job, taskId) => {
- const endPoints = InstanceManager({
+
+const getEndpoints = () =>
+ InstanceManager({
imex: process.env?.NODE_ENV === "test" ? "https://test.imex.online" : "https://imex.online",
rome:
bodyshop.convenient_company === "promanager"
@@ -106,6 +107,9 @@ const generateTemplateArgs = (title, priority, description, dueDate, bodyshop, j
? "https//test.romeonline.io"
: "https://romeonline.io"
});
+
+const generateTemplateArgs = (title, priority, description, dueDate, bodyshop, job, taskId) => {
+ const endPoints = getEndpoints();
return {
header: title,
subHeader: `Body Shop: ${bodyshop.shopname} | Priority: ${formatPriority(priority)} ${formatDate(dueDate)}`,
@@ -333,5 +337,6 @@ const tasksRemindEmail = async (req, res) => {
module.exports = {
taskAssignedEmail,
- tasksRemindEmail
+ tasksRemindEmail,
+ getEndpoints
};
diff --git a/server/firebase/firebase-handler.js b/server/firebase/firebase-handler.js
index 509bedce9..e47eeffc1 100644
--- a/server/firebase/firebase-handler.js
+++ b/server/firebase/firebase-handler.js
@@ -1,30 +1,28 @@
-const admin = require("firebase-admin");
-const logger = require("../utils/logger");
const path = require("path");
-const { auth } = require("firebase-admin");
-
require("dotenv").config({
path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`)
});
-const client = require("../graphql-client/graphql-client").client;
+const admin = require("firebase-admin");
+const logger = require("../utils/logger");
+const { sendProManagerWelcomeEmail } = require("../email/sendemail");
+const client = require("../graphql-client/graphql-client").client;
const serviceAccount = require(process.env.FIREBASE_ADMINSDK_JSON);
-const adminEmail = require("../utils/adminEmail");
+const generateEmailTemplate = require("../email/generateTemplate");
admin.initializeApp({
credential: admin.credential.cert(serviceAccount),
databaseURL: process.env.FIREBASE_DATABASE_URL
});
-exports.admin = admin;
-
-exports.createUser = async (req, res) => {
+const createUser = async (req, res) => {
logger.log("admin-create-user", "ADMIN", req.user.email, null, {
request: req.body,
ioadmin: true
});
- const { email, displayName, password, shopid, authlevel } = req.body;
+ const { email, displayName, password, shopid, authlevel, validemail } = req.body;
+
try {
const userRecord = await admin.auth().createUser({ email, displayName, password });
@@ -42,6 +40,7 @@ exports.createUser = async (req, res) => {
user: {
email: email.toLowerCase(),
authid: userRecord.uid,
+ validemail,
associations: {
data: [{ shopid, authlevel, active: true }]
}
@@ -58,21 +57,115 @@ exports.createUser = async (req, res) => {
}
};
-exports.updateUser = (req, res) => {
+const sendPromanagerWelcomeEmail = (req, res) => {
+ const { authid, email } = req.body;
+
+ // Fetch user from Firebase
+ admin
+ .auth()
+ .getUser(authid)
+ .then((userRecord) => {
+ if (!userRecord) {
+ return Promise.reject({ status: 404, message: "User not found in Firebase." });
+ }
+
+ // Fetch user data from the database using GraphQL
+ return client.request(
+ `
+ query GET_USER_BY_EMAIL($email: String!) {
+ users(where: { email: { _eq: $email } }) {
+ email
+ validemail
+ associations {
+ id
+ shopid
+ bodyshop {
+ id
+ convenient_company
+ }
+ }
+ }
+ }`,
+ { email: email.toLowerCase() }
+ );
+ })
+ .then((dbUserResult) => {
+ const dbUser = dbUserResult?.users?.[0];
+ if (!dbUser) {
+ return Promise.reject({ status: 404, message: "User not found in database." });
+ }
+
+ // Validate email before proceeding
+ if (!dbUser.validemail) {
+ logger.log("admin-send-welcome-email-skip", "ADMIN", req.user.email, null, {
+ message: "User email is not valid, skipping email.",
+ email
+ });
+ return res.status(200).json({ message: "User email is not valid, email not sent." });
+ }
+
+ // Check if the user's company is ProManager
+ const convenientCompany = dbUser.associations?.[0]?.bodyshop?.convenient_company;
+ if (convenientCompany !== "promanager") {
+ logger.log("admin-send-welcome-email-skip", "ADMIN", req.user.email, null, {
+ message: 'convenient_company is not "promanager", skipping email.',
+ convenientCompany
+ });
+ return res.status(200).json({ message: `convenient_company is not "promanager", email not sent.` });
+ }
+
+ // Generate password reset link
+ return admin
+ .auth()
+ .generatePasswordResetLink(dbUser.email)
+ .then((resetLink) => ({ dbUser, resetLink }));
+ })
+ .then(({ dbUser, resetLink }) => {
+ // Send welcome email (replace with your actual email-sending service)
+ return sendProManagerWelcomeEmail({
+ to: dbUser.email,
+ subject: "Welcome to the ProManager platform.",
+ html: generateEmailTemplate({
+ header: "",
+ subHeader: "",
+ body: `
+ Welcome to the ProManager platform. Please click the link below to reset your password:
+ Reset your password
+ User Details:
+
+ - Email: ${dbUser.email}
+
+ `
+ })
+ });
+ })
+ .then(() => {
+ // Log success and return response
+ logger.log("admin-send-welcome-email", "ADMIN", req.user.email, null, {
+ request: req.body,
+ ioadmin: true,
+ emailSentTo: email
+ });
+ res.status(200).json({ message: "Welcome email sent successfully." });
+ })
+ .catch((error) => {
+ logger.log("admin-send-welcome-email-error", "ERROR", req.user.email, null, { error });
+
+ if (!res.headersSent) {
+ res.status(error.status || 500).json({
+ message: error.message || "Error sending welcome email.",
+ error
+ });
+ }
+ });
+};
+
+const updateUser = (req, res) => {
logger.log("admin-update-user", "ADMIN", req.user.email, null, {
request: req.body,
ioadmin: true
});
- if (!adminEmail.includes(req.user.email) && !req.user.ioadmin) {
- logger.log("admin-update-user-unauthorized", "ERROR", req.user.email, null, {
- request: req.body,
- user: req.user
- });
- res.sendStatus(404);
- return;
- }
-
admin
.auth()
.updateUser(
@@ -105,26 +198,46 @@ exports.updateUser = (req, res) => {
});
};
-exports.getUser = (req, res) => {
+const getUser = (req, res) => {
logger.log("admin-get-user", "ADMIN", req.user.email, null, {
request: req.body,
ioadmin: true
});
- if (!adminEmail.includes(req.user.email) && !req.user.ioadmin) {
- logger.log("admin-update-user-unauthorized", "ERROR", req.user.email, null, {
- request: req.body,
- user: req.user
- });
- res.sendStatus(404);
- return;
- }
-
admin
.auth()
.getUser(req.body.uid)
.then((userRecord) => {
- res.json(userRecord);
+ return client
+ .request(
+ `
+ query GET_USER_BY_AUTHID($authid: String!) {
+ users(where: { authid: { _eq: $authid } }) {
+ email
+ displayName
+ validemail
+ associations {
+ id
+ shopid
+ bodyshop {
+ id
+ convenient_company
+ }
+ }
+ }
+ }
+ `,
+ { authid: req.body.uid }
+ )
+ .then((dbUserResult) => {
+ res.json({
+ ...userRecord,
+ db: {
+ validemail: dbUserResult?.users?.[0]?.validemail,
+ company: dbUserResult?.users?.[0]?.associations?.[0]?.bodyshop?.convenient_company
+ }
+ });
+ });
})
.catch((error) => {
logger.log("admin-get-user-error", "ERROR", req.user.email, null, {
@@ -134,7 +247,7 @@ exports.getUser = (req, res) => {
});
};
-exports.sendNotification = async (req, res) => {
+const sendNotification = async (req, res) => {
setTimeout(() => {
// Send a message to the device corresponding to the provided
// registration token.
@@ -167,7 +280,7 @@ exports.sendNotification = async (req, res) => {
}, 500);
};
-exports.subscribe = async (req, res) => {
+const subscribe = async (req, res) => {
const result = await admin
.messaging()
.subscribeToTopic(req.body.fcm_tokens, `${req.body.imexshopid}-${req.body.type}`);
@@ -175,7 +288,7 @@ exports.subscribe = async (req, res) => {
res.json(result);
};
-exports.unsubscribe = async (req, res) => {
+const unsubscribe = async (req, res) => {
try {
const result = await admin
.messaging()
@@ -187,6 +300,17 @@ exports.unsubscribe = async (req, res) => {
}
};
+module.exports = {
+ admin,
+ createUser,
+ updateUser,
+ getUser,
+ sendPromanagerWelcomeEmail,
+ sendNotification,
+ subscribe,
+ unsubscribe
+};
+
//Admin claims code.
// const uid = "JEqqYlsadwPEXIiyRBR55fflfko1";
diff --git a/server/graphql-client/queries.js b/server/graphql-client/queries.js
index 65cbef473..ff643de8b 100644
--- a/server/graphql-client/queries.js
+++ b/server/graphql-client/queries.js
@@ -832,6 +832,25 @@ exports.AUTOHOUSE_QUERY = `query AUTOHOUSE_EXPORT($start: timestamptz, $bodyshop
}
}`;
+exports.CHATTER_QUERY = `query CHATTER_EXPORT($start: timestamptz, $bodyshopid: uuid!, $end: timestamptz) {
+ bodyshops_by_pk(id: $bodyshopid){
+ id
+ shopname
+ chatterid
+ timezone
+ }
+ jobs(where: {_and: [{converted: {_eq: true}}, {actual_delivery: {_gt: $start}}, {actual_delivery: {_lte: $end}}, {shopid: {_eq: $bodyshopid}}, {_or: [{ownr_ph1: {_is_null: false}}, {ownr_ea: {_is_null: false}}]}]}) {
+ id
+ created_at
+ ro_number
+ ownr_fn
+ ownr_ln
+ ownr_co_nm
+ ownr_ph1
+ ownr_ea
+ }
+}`;
+
exports.CLAIMSCORP_QUERY = `query CLAIMSCORP_EXPORT($start: timestamptz, $bodyshopid: uuid!, $end: timestamptz) {
bodyshops_by_pk(id: $bodyshopid){
id
@@ -1732,6 +1751,16 @@ exports.GET_AUTOHOUSE_SHOPS = `query GET_AUTOHOUSE_SHOPS {
}
}`;
+exports.GET_CHATTER_SHOPS = `query GET_CHATTER_SHOPS {
+ bodyshops(where: {chatterid: {_is_null: false}, _or: {chatterid: {_neq: ""}}}){
+ id
+ shopname
+ chatterid
+ imexshopid
+ timezone
+ }
+}`;
+
exports.GET_CLAIMSCORP_SHOPS = `query GET_CLAIMSCORP_SHOPS {
bodyshops(where: {claimscorpid: {_is_null: false}, _or: {claimscorpid: {_neq: ""}}}){
id
@@ -2502,6 +2531,13 @@ exports.GET_JOBS_BY_PKS = `query GET_JOBS_BY_PKS($ids: [uuid!]!) {
jobs(where: {id: {_in: $ids}}) {
id
shopid
+ ro_number
+ ownr_co_nm
+ ownr_fn
+ ownr_ln
+ v_make_desc
+ v_model_yr
+ v_model_desc
}
}
`;
diff --git a/server/intellipay/intellipay.js b/server/intellipay/intellipay.js
index 8b1688f88..f798bc0bd 100644
--- a/server/intellipay/intellipay.js
+++ b/server/intellipay/intellipay.js
@@ -7,7 +7,9 @@ const axios = require("axios");
const moment = require("moment");
const logger = require("../utils/logger");
const InstanceManager = require("../utils/instanceMgr").default;
-
+const { sendTaskEmail } = require("../email/sendemail");
+const generateEmailTemplate = require("../email/generateTemplate");
+const { getEndpoints } = require("../email/tasksEmails");
require("dotenv").config({
path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`)
});
@@ -129,6 +131,7 @@ exports.generate_payment_url = async (req, res) => {
//...req.body,
amount: Dinero({ amount: Math.round(req.body.amount * 100) }).toFormat("0.00"),
account: req.body.account,
+ comment: req.body.comment,
invoice: req.body.invoice,
createshorturl: true
//The postback URL is set at the CP teller global terminal settings page.
@@ -162,7 +165,67 @@ exports.postback = async (req, res) => {
return;
}
- if (values.invoice) {
+ if (comment) {
+ //Shifted the order to have this first to retain backwards compatibility for the old style of short link.
+ //This has been triggered by IO and may have multiple jobs.
+ const parsedComment = JSON.parse(comment);
+
+ //Adding in the user email to the short pay email.
+ //Need to check this to ensure backwards compatibility for clients that don't update.
+
+ const partialPayments = Array.isArray(parsedComment) ? parsedComment : parsedComment.payments;
+
+ const jobs = await gqlClient.request(queries.GET_JOBS_BY_PKS, {
+ ids: partialPayments.map((p) => p.jobid)
+ });
+
+ const paymentResult = await gqlClient.request(queries.INSERT_NEW_PAYMENT, {
+ paymentInput: partialPayments.map((p) => ({
+ amount: p.amount,
+ transactionid: values.authcode,
+ payer: "Customer",
+ type: values.cardtype,
+ jobid: p.jobid,
+ date: moment(Date.now()),
+ payment_responses: {
+ data: {
+ amount: values.total,
+ bodyshopid: jobs.jobs[0].shopid,
+ jobid: p.jobid,
+ declinereason: "Approved",
+ ext_paymentid: values.paymentid,
+ successful: true,
+ response: values
+ }
+ }
+ }))
+ });
+ logger.log("intellipay-postback-app-success", "DEBUG", req.user?.email, null, {
+ iprequest: values,
+ paymentResult
+ });
+
+ if (values.origin === "OneLink" && parsedComment.userEmail) {
+ //Send an email, it was a text to pay link.
+ const endPoints = getEndpoints();
+ sendTaskEmail({
+ to: parsedComment.userEmail,
+ subject: `New Payment(s) Received - RO ${jobs.jobs.map((j) => j.ro_number).join(", ")}`,
+ type: "html",
+ html: generateEmailTemplate({
+ header: "New Payment(s) Received",
+ subHeader: "",
+ body: jobs.jobs
+ .map(
+ (job) =>
+ `Reference: ${job.ro_number || "N/A"} | ${job.ownr_co_nm ? job.ownr_co_nm : `${job.ownr_fn || ""} ${job.ownr_ln || ""}`.trim()} | ${`${job.v_model_yr || ""} ${job.v_make_desc || ""} ${job.v_model_desc || ""}`.trim()} | $${partialPayments.find((p) => p.jobid === job.id).amount}`
+ )
+ .join("
")
+ })
+ });
+ res.sendStatus(200);
+ }
+ } else if (values.invoice) {
//This is a link email that's been sent out.
const job = await gqlClient.request(queries.GET_JOB_BY_PK, {
id: values.invoice
@@ -198,39 +261,6 @@ exports.postback = async (req, res) => {
paymentResult
});
res.sendStatus(200);
- } else if (comment) {
- //This has been triggered by IO and may have multiple jobs.
- const partialPayments = JSON.parse(comment);
- const jobs = await gqlClient.request(queries.GET_JOBS_BY_PKS, {
- ids: partialPayments.map((p) => p.jobid)
- });
-
- const paymentResult = await gqlClient.request(queries.INSERT_NEW_PAYMENT, {
- paymentInput: partialPayments.map((p) => ({
- amount: p.amount,
- transactionid: values.authcode,
- payer: "Customer",
- type: values.cardtype,
- jobid: p.jobid,
- date: moment(Date.now()),
- payment_responses: {
- data: {
- amount: values.total,
- bodyshopid: jobs.jobs[0].shopid,
- jobid: p.jobid,
- declinereason: "Approved",
- ext_paymentid: values.paymentid,
- successful: true,
- response: values
- }
- }
- }))
- });
- logger.log("intellipay-postback-app-success", "DEBUG", req.user?.email, null, {
- iprequest: values,
- paymentResult
- });
- res.sendStatus(200);
}
} catch (error) {
logger.log("intellipay-postback-error", "ERROR", req.user?.email, null, {
diff --git a/server/routes/adminRoutes.js b/server/routes/adminRoutes.js
index c1d3fe85a..ac0ebb6fb 100644
--- a/server/routes/adminRoutes.js
+++ b/server/routes/adminRoutes.js
@@ -1,18 +1,20 @@
const express = require("express");
const router = express.Router();
-const fb = require("../firebase/firebase-handler");
const validateFirebaseIdTokenMiddleware = require("../middleware/validateFirebaseIdTokenMiddleware");
const { createAssociation, createShop, updateShop, updateCounter } = require("../admin/adminops");
+const { updateUser, getUser, createUser, sendPromanagerWelcomeEmail } = require("../firebase/firebase-handler");
const validateAdminMiddleware = require("../middleware/validateAdminMiddleware");
router.use(validateFirebaseIdTokenMiddleware);
+router.use(validateAdminMiddleware);
-router.post("/createassociation", validateAdminMiddleware, createAssociation);
-router.post("/createshop", validateAdminMiddleware, createShop);
-router.post("/updateshop", validateAdminMiddleware, updateShop);
-router.post("/updatecounter", validateAdminMiddleware, updateCounter);
-router.post("/updateuser", fb.updateUser);
-router.post("/getuser", fb.getUser);
-router.post("/createuser", fb.createUser);
+router.post("/createassociation", createAssociation);
+router.post("/createshop", createShop);
+router.post("/updateshop", updateShop);
+router.post("/updatecounter", updateCounter);
+router.post("/updateuser", updateUser);
+router.post("/getuser", getUser);
+router.post("/createuser", createUser);
+router.post("/promanagerwelcome", sendPromanagerWelcomeEmail);
module.exports = router;
diff --git a/server/routes/dataRoutes.js b/server/routes/dataRoutes.js
index d7fe6e640..a12563282 100644
--- a/server/routes/dataRoutes.js
+++ b/server/routes/dataRoutes.js
@@ -1,9 +1,10 @@
const express = require("express");
const router = express.Router();
-const { autohouse, claimscorp, kaizen } = require("../data/data");
+const { autohouse, claimscorp, chatter, kaizen } = require("../data/data");
router.post("/ah", autohouse);
router.post("/cc", claimscorp);
+router.post("/chatter", chatter);
router.post("/kaizen", kaizen);
module.exports = router;