IO-2782 Adjust to Object for items

Signed-off-by: Allan Carr <allan.carr@thinkimex.com>

bodyshop_translations.babel

@@ -1,4 +1,4 @@
-<babeledit_project be_version="2.7.1" version="1.2">
+<babeledit_project version="1.2" be_version="2.7.1">
     <!--
 
     BabelEdit project file
@@ -22361,6 +22361,27 @@
                             <folder_node>
                                 <name>buttons</name>
                                 <children>
+                                    <concept_node>
+                                        <name>create_short_link</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>goback</name>
                                         <definition_loaded>false</definition_loaded>

client/index.html

@@ -49,23 +49,77 @@
   <% } %> <% if (env.VITE_APP_INSTANCE === 'ROME') { %>
   <meta name="description" content="Rome Online"/>
   <title>Rome Online</title>
-  <script type="text/javascript" id="zsiqchat">
-    var $zoho = $zoho || {};
-    $zoho.salesiq = $zoho.salesiq || {
-      widgetcode: "siq01bb8ac617280bdacddfeb528f07734dadc64ef3f05efef9f769c1ec171af666",
-      values: {},
-      ready: function () {
-      }
-    };
-    var d = document;
-    s = d.createElement("script");
-    s.type = "text/javascript";
-    s.id = "zsiqscript";
-    s.defer = true;
-    s.src = "https://salesiq.zohopublic.com/widget";
-    t = d.getElementsByTagName("script")[0];
-    t.parentNode.insertBefore(s, t);
-  </script>
+
+  <!--Use the below code snippet to provide real time updates to the live chat plugin without the need of copying and paste each time to your website when changes are made via PBX-->
+
+  <call-us-selector phonesystem-url=https://rometech.east.3cx.us:5001
+                    party="LiveChat528346"></call-us-selector>
+
+  <!--Incase you don't want real time updates to the live chat plugin when options are changed, use the below code snippet. Please note that each time you change the settings you will need to copy and paste the snippet code to your website-->
+
+  <!--<call-us
+  
+  phonesystem-url=https://rometech.east.3cx.us:5001
+  
+  style="position:fixed;font-size:16px;line-height:17px;z-index: 99999;right: 20px; bottom: 20px;"
+  
+  id="wp-live-chat-by-3CX"
+  
+  minimized="true"
+  
+  animation-style="noanimation"
+  
+  party="LiveChat528346"
+  
+  minimized-style="bubbleright"
+  
+  allow-call="true"
+  
+  allow-video="false"
+  
+  allow-soundnotifications="true"
+  
+  enable-mute="true"
+  
+  enable-onmobile="true"
+  
+  offline-enabled="true"
+  
+  enable="true"
+  
+  ignore-queueownership="false"
+  
+  authentication="both"
+  
+  show-operator-actual-name="true"
+  
+  aknowledge-received="true"
+  
+  gdpr-enabled="false"
+  
+  message-userinfo-format="name"
+  
+  message-dateformat="both"
+  
+  lang="browser"
+  
+  button-icon-type="default"
+  
+  greeting-visibility="none"
+  
+  greeting-offline-visibility="none"
+  
+  chat-delay="2000"
+  
+  enable-direct-call="true"
+  
+  enable-ga="false"
+  
+  ></call-us>-->
+
+  <script defer src=https://downloads-global.3cx.com/downloads/livechatandtalk/v1/callus.js
+          id="tcx-callus-js" charset="utf-8"></script>
+
 
   <% } %> <% if (env.VITE_APP_INSTANCE === 'PROMANAGER') { %>
   <title>ProManager</title>

client/src/components/card-payment-modal/card-payment-modal.component..jsx

@@ -1,6 +1,6 @@
-import { DeleteFilled } from "@ant-design/icons";
+import { DeleteFilled, CopyFilled } from "@ant-design/icons";
 import { useLazyQuery, useMutation } from "@apollo/client";
-import { Button, Card, Col, Form, Input, Row, Space, Spin, Statistic, notification } from "antd";
+import { Button, Card, Col, Form, Input, Row, Space, Spin, Statistic, message, notification } from "antd";
 import axios from "axios";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -14,10 +14,12 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import CurrencyFormItemComponent from "../form-items-formatted/currency-form-item.component";
 import JobSearchSelectComponent from "../job-search-select/job-search-select.component";
+import { getCurrentUser } from "../../firebase/firebase.utils";
 
 const mapStateToProps = createStructuredSelector({
   cardPaymentModal: selectCardPayment,
-  bodyshop: selectBodyshop
+  bodyshop: selectBodyshop,
+  currentUser: getCurrentUser
 });
 
 const mapDispatchToProps = (dispatch) => ({
@@ -25,11 +27,17 @@ const mapDispatchToProps = (dispatch) => ({
   toggleModalVisible: () => dispatch(toggleModalVisible("cardPayment"))
 });
 
-const CardPaymentModalComponent = ({ bodyshop, cardPaymentModal, toggleModalVisible, insertAuditTrail }) => {
+const CardPaymentModalComponent = ({
+  bodyshop,
+  currentUser,
+  cardPaymentModal,
+  toggleModalVisible,
+  insertAuditTrail
+}) => {
   const { context, actions } = cardPaymentModal;
 
   const [form] = Form.useForm();
-
+  const [paymentLink, setPaymentLink] = useState();
   const [loading, setLoading] = useState(false);
   // const [insertPayment] = useMutation(INSERT_NEW_PAYMENT);
   const [insertPaymentResponse] = useMutation(INSERT_PAYMENT_RESPONSE);
@@ -51,8 +59,7 @@ const CardPaymentModalComponent = ({ bodyshop, cardPaymentModal, toggleModalVisi
       //2024-04-25: Nothing is going to happen here anymore. We'll completely rely on the callback.
       //Add a slight delay to allow the refetch to properly get the data.
       setTimeout(() => {
-        if (actions && actions.refetch && typeof actions.refetch === "function")
-          actions.refetch();
+        if (actions && actions.refetch && typeof actions.refetch === "function") actions.refetch();
         setLoading(false);
         toggleModalVisible();
       }, 750);
@@ -86,7 +93,6 @@ const CardPaymentModalComponent = ({ bodyshop, cardPaymentModal, toggleModalVisi
     });
   };
 
-
   const handleIntelliPayCharge = async () => {
     setLoading(true);
     //Validate
@@ -101,7 +107,7 @@ const CardPaymentModalComponent = ({ bodyshop, cardPaymentModal, toggleModalVisi
       const response = await axios.post("/intellipay/lightbox_credentials", {
         bodyshop,
         refresh: !!window.intellipay,
-        paymentSplitMeta: form.getFieldsValue(),
+        paymentSplitMeta: form.getFieldsValue()
       });
 
       if (window.intellipay) {
@@ -126,6 +132,42 @@ const CardPaymentModalComponent = ({ bodyshop, cardPaymentModal, toggleModalVisi
     }
   };
 
+  const handleIntelliPayChargeShortLink = async () => {
+    setLoading(true);
+    //Validate
+    try {
+      await form.validateFields();
+    } catch (error) {
+      setLoading(false);
+      return;
+    }
+
+    try {
+      const { payments } = form.getFieldsValue();
+      const response = await axios.post("/intellipay/generate_payment_url", {
+        bodyshop,
+        amount: payments?.reduce((acc, val) => {
+          return acc + (val?.amount || 0);
+        }, 0),
+        account: payments && data && data.jobs.length > 0 ? data.jobs.map((j) => j.ro_number).join(", ") : null,
+        comment: btoa(JSON.stringify({ payments, userEmail: currentUser.email })),
+        paymentSplitMeta: form.getFieldsValue()
+      });
+      if (response.data) {
+        setPaymentLink(response.data?.shorUrl);
+        navigator.clipboard.writeText(response.data?.shorUrl);
+        message.success(t("general.actions.copied"));
+      }
+      setLoading(false);
+    } catch (error) {
+      notification.open({
+        type: "error",
+        message: t("job_payments.notifications.error.openingip")
+      });
+      setLoading(false);
+    }
+  };
+
   return (
     <Card title="Card Payment">
       <Spin spinning={loading}>
@@ -208,10 +250,7 @@ const CardPaymentModalComponent = ({ bodyshop, cardPaymentModal, toggleModalVisi
             {() => {
               //If all of the job ids have been fileld in, then query and update the IP field.
               const { payments } = form.getFieldsValue();
-              if (
-                payments?.length > 0 &&
-                payments?.filter((p) => p?.jobid).length === payments?.length
-              ) {
+              if (payments?.length > 0 && payments?.filter((p) => p?.jobid).length === payments?.length) {
                 refetch({ jobids: payments.map((p) => p.jobid) });
               }
               return (
@@ -246,7 +285,6 @@ const CardPaymentModalComponent = ({ bodyshop, cardPaymentModal, toggleModalVisi
               const totalAmountToCharge = payments?.reduce((acc, val) => {
                 return acc + (val?.amount || 0);
               }, 0);
-
               return (
                 <Space style={{ float: "right" }}>
                   <Statistic title="Amount To Charge" value={totalAmountToCharge} precision={2} />
@@ -273,11 +311,36 @@ const CardPaymentModalComponent = ({ bodyshop, cardPaymentModal, toggleModalVisi
                   >
                     {t("job_payments.buttons.proceedtopayment")}
                   </Button>
+                  <Space direction="vertical" align="center">
+                    <Button
+                      type="primary"
+                      //  data-ipayname="submit"
+                      className="ipayfield"
+                      loading={queryLoading || loading}
+                      disabled={!(totalAmountToCharge > 0)}
+                      onClick={handleIntelliPayChargeShortLink}
+                    >
+                      {t("job_payments.buttons.create_short_link")}
+                    </Button>
+                  </Space>
                 </Space>
               );
             }}
           </Form.Item>
         </Form>
+        {paymentLink && (
+          <Space
+            style={{ cursor: "pointer", float: "right" }}
+            align="end"
+            onClick={() => {
+              navigator.clipboard.writeText(paymentLink);
+              message.success(t("general.actions.copied"));
+            }}
+          >
+            <div>{paymentLink}</div>
+            <CopyFilled />
+          </Space>
+        )}
       </Spin>
     </Card>
   );

client/src/components/jobs-list/jobs-list.component.jsx

@@ -250,8 +250,8 @@ export function JobsList({ bodyshop }) {
     },
     {
       title: t("jobs.labels.estimator"),
-      dataIndex: "estimator",
-      key: "estimator",
+      dataIndex: "jobs.labels.estimator",
+      key: "jobs.labels.estimator",
       ellipsis: true,
       responsive: ["xl"],
       sorter: (a, b) =>

client/src/components/payments-generate-link/payments-generate-link.component.jsx

@@ -8,11 +8,12 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { openChatByPhone, setMessage } from "../../redux/messaging/messaging.actions";
-import { selectBodyshop } from "../../redux/user/user.selectors";
+import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import CurrencyFormItemComponent from "../form-items-formatted/currency-form-item.component";
 
 const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop
+  bodyshop: selectBodyshop,
+  currentUser: selectCurrentUser
 });
 const mapDispatchToProps = (dispatch) => ({
   openChatByPhone: (phone) => dispatch(openChatByPhone(phone)),
@@ -20,7 +21,7 @@ const mapDispatchToProps = (dispatch) => ({
 });
 export default connect(mapStateToProps, mapDispatchToProps)(PaymentsGenerateLink);
 
-export function PaymentsGenerateLink({ bodyshop, callback, job, openChatByPhone, setMessage }) {
+export function PaymentsGenerateLink({ bodyshop, currentUser, callback, job, openChatByPhone, setMessage }) {
   const { t } = useTranslation();
   const [form] = Form.useForm();
 
@@ -30,29 +31,35 @@ export function PaymentsGenerateLink({ bodyshop, callback, job, openChatByPhone,
 
   const handleFinish = async ({ amount }) => {
     setLoading(true);
-
-    const p = parsePhoneNumber(job.ownr_ph1, "CA");
+    let p;
+    try {
+      p = parsePhoneNumber(job.ownr_ph1 || "", "CA");
+    } catch (error) {
+      console.log("Unable to parse phone number");
+    }
     setLoading(true);
     const response = await axios.post("/intellipay/generate_payment_url", {
       bodyshop,
       amount: amount,
       account: job.ro_number,
-      invoice: job.id
+      comment: btoa(JSON.stringify({ payments: [{ jobid: job.id, amount }], userEmail: currentUser.email }))
     });
     setLoading(false);
     setPaymentLink(response.data.shorUrl);
 
-    openChatByPhone({
-      phone_num: p.formatInternational(),
-      jobid: job.id
-    });
-    setMessage(
-      t("payments.labels.smspaymentreminder", {
-        shopname: bodyshop.shopname,
-        amount: amount,
-        payment_link: response.data.shorUrl
-      })
-    );
+    if (p) {
+      openChatByPhone({
+        phone_num: p.formatInternational(),
+        jobid: job.id
+      });
+      setMessage(
+        t("payments.labels.smspaymentreminder", {
+          shopname: bodyshop.shopname,
+          amount: amount,
+          payment_link: response.data.shorUrl
+        })
+      );
+    }
 
     //Add in confirmation & errors.
     if (callback) callback();

client/src/components/scoreboard-targets-table/scoreboard-targets-table.util.js

@@ -4,7 +4,7 @@ export const CalculateWorkingDaysThisMonth = () => dayjs().endOf("month").busine
 
 export const CalculateWorkingDaysInPeriod = (start, end) => dayjs(end).businessDiff(dayjs(start));
 
-export const CalculateWorkingDaysAsOfToday = () => dayjs().endOf("day").businessDiff(dayjs().startOf("month"));
+export const CalculateWorkingDaysAsOfToday = () => dayjs().businessDaysInMonth().length;
 
 export const CalculateWorkingDaysLastMonth = () =>
   dayjs().subtract(1, "month").endOf("month").businessDaysInMonth().length;

client/src/translations/en_us/common.json

@@ -1373,6 +1373,7 @@
     },
     "job_payments": {
       "buttons": {
+        "create_short_link": "Generate Short Link",
         "goback": "Go Back",
         "proceedtopayment": "Proceed to Payment",
         "refundpayment": "Refund Payment"

client/src/translations/fr/common.json

@@ -1373,6 +1373,7 @@
 		},
 		"job_payments": {
 			"buttons": {
+				"create_short_link": "",
 				"goback": "",
 				"proceedtopayment": "",
 				"refundpayment": ""

server/cdk/cdk-calculate-allocations.js

@@ -54,6 +54,13 @@ function calculateAllocations(connectionData, job) {
     deubg: true,
     args: [],
     imex: () => ({
+      local: {
+        center: bodyshop.md_responsibility_centers.taxes.local.name,
+        sale: Dinero(job.job_totals.totals.local_tax),
+        cost: Dinero(),
+        profitCenter: bodyshop.md_responsibility_centers.taxes.local,
+        costCenter: bodyshop.md_responsibility_centers.taxes.local
+      },
       state: {
         center: bodyshop.md_responsibility_centers.taxes.state.name,
         sale: Dinero(job.job_totals.totals.state_tax),

server/email/sendemail.js

@@ -96,7 +96,21 @@ const sendServerEmail = async ({ subject, text }) => {
   }
 };
 
-const sendTaskEmail = async ({ to, subject, text, attachments }) => {
+const sendProManagerWelcomeEmail = async ({to, subject, html}) => {
+  try {
+    await transporter.sendMail({
+      from: `ProManager <noreply@promanager.web-est.com>`,
+      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
 };

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
 };

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: `
+            <p>Welcome to the ProManager platform. Please click the link below to reset your password:</p>
+            <p><a href="${resetLink}">Reset your password</a></p>
+            <p>User Details:</p>
+            <ul>
+              <li>Email: ${dbUser.email}</li>
+            </ul>
+          `
+        })
+      });
+    })
+    .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,45 @@ 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
+              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 +246,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 +279,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 +287,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 +299,17 @@ exports.unsubscribe = async (req, res) => {
   }
 };
 
+module.exports = {
+  admin,
+  createUser,
+  updateUser,
+  getUser,
+  sendPromanagerWelcomeEmail,
+  sendNotification,
+  subscribe,
+  unsubscribe
+};
+
 //Admin claims code.
 // const uid = "JEqqYlsadwPEXIiyRBR55fflfko1";
 

server/graphql-client/queries.js

@@ -2502,6 +2502,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
   }
 }
 `;

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: <a href="${endPoints}/manage/jobs/${job.id}">${job.ro_number || "N/A"}</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("<br/>")
+          })
+        });
+        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, {

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;