feature/IO-2282-VSSTA-Integration

IO-3200 Extended Crisp Segments for BASIC/LITE

Approved-by: Dave Richer

.gitignore

@@ -127,4 +127,6 @@ vitest-report*/
 vitest-coverage/
 *.vitest.log
 test-output.txt
+server/job/test/fixtures
 
+.github

Dockerfile

@@ -56,4 +56,5 @@ COPY . .
 EXPOSE 4000 9229
 
 # Start the application
-CMD ["nodemon", "--legacy-watch", "--inspect=0.0.0.0:9229", "server.js"]
+RUN echo "Starting the application..."
+CMD ["nodemon", "--ignore", "./server/job/test/fixtures", "--legacy-watch", "--inspect=0.0.0.0:9229", "server.js"]

_reference/localEmailViewer/package.json

@@ -11,8 +11,8 @@
   "license": "ISC",
   "description": "",
   "dependencies": {
-    "express": "^4.21.1",
-    "mailparser": "^3.7.1",
+    "express": "^5.1.0",
+    "mailparser": "^3.7.2",
     "node-fetch": "^3.3.2"
   }
 }

client/package.json

@@ -8,23 +8,23 @@
   "private": true,
   "proxy": "http://localhost:4000",
   "dependencies": {
-    "@ant-design/pro-layout": "^7.22.3",
-    "@apollo/client": "^3.13.5",
+    "@ant-design/pro-layout": "^7.22.4",
+    "@apollo/client": "^3.13.6",
     "@emotion/is-prop-valid": "^1.3.1",
     "@fingerprintjs/fingerprintjs": "^4.6.1",
     "@firebase/analytics": "^0.10.12",
-    "@firebase/app": "^0.11.3",
-    "@firebase/auth": "^1.9.1",
+    "@firebase/app": "^0.11.4",
+    "@firebase/auth": "^1.10.0",
     "@firebase/firestore": "^4.7.10",
     "@firebase/messaging": "^0.12.17",
     "@jsreport/browser-client": "^3.1.0",
     "@reduxjs/toolkit": "^2.6.1",
-    "@sentry/cli": "^2.42.4",
-    "@sentry/react": "^9.9.0",
-    "@sentry/vite-plugin": "^3.2.2",
-    "@splitsoftware/splitio-react": "^2.0.1",
+    "@sentry/cli": "^2.43.0",
+    "@sentry/react": "^9.11.0",
+    "@sentry/vite-plugin": "^3.3.1",
+    "@splitsoftware/splitio-react": "^2.1.1",
     "@tanem/react-nprogress": "^5.0.53",
-    "antd": "^5.24.5",
+    "antd": "^5.24.6",
     "apollo-link-logger": "^2.0.1",
     "apollo-link-sentry": "^4.2.0",
     "autosize": "^6.0.1",
@@ -57,7 +57,7 @@
     "react-dom": "^18.3.1",
     "react-drag-listview": "^2.0.0",
     "react-grid-gallery": "^1.0.1",
-    "react-grid-layout": "1.3.4",
+    "react-grid-layout": "^1.3.4",
     "react-i18next": "^15.4.1",
     "react-icons": "^5.5.0",
     "react-image-lightbox": "^5.1.4",
@@ -70,16 +70,16 @@
     "react-router-dom": "^6.30.0",
     "react-sticky": "^6.0.3",
     "react-virtuoso": "^4.12.5",
-    "recharts": "^2.15.0",
+    "recharts": "^2.15.2",
     "redux": "^5.0.1",
     "redux-actions": "^3.0.3",
     "redux-persist": "^6.0.0",
     "redux-saga": "^1.3.0",
     "redux-state-sync": "^3.1.4",
     "reselect": "^5.1.1",
-    "sass": "^1.86.0",
+    "sass": "^1.86.3",
     "socket.io-client": "^4.8.1",
-    "styled-components": "^6.1.16",
+    "styled-components": "^6.1.17",
     "subscriptions-transport-ws": "^0.11.0",
     "use-memo-one": "^1.1.3",
     "vite-plugin-ejs": "^1.7.0",
@@ -130,22 +130,22 @@
     "@ant-design/icons": "^6.0.0",
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@babel/preset-react": "^7.26.3",
-    "@dotenvx/dotenvx": "^1.39.0",
+    "@dotenvx/dotenvx": "^1.39.1",
     "@emotion/babel-plugin": "^11.13.5",
     "@emotion/react": "^11.14.0",
-    "@eslint/js": "^9.23.0",
+    "@eslint/js": "^9.24.0",
     "@playwright/test": "^1.51.1",
-    "@sentry/webpack-plugin": "^3.2.2",
+    "@sentry/webpack-plugin": "^3.3.1",
     "@testing-library/dom": "^10.4.0",
     "@testing-library/jest-dom": "^6.6.3",
-    "@testing-library/react": "^16.2.0",
+    "@testing-library/react": "^16.3.0",
     "@vitejs/plugin-react": "^4.3.4",
     "browserslist": "^4.24.4",
     "browserslist-to-esbuild": "^2.1.1",
     "chalk": "^5.4.1",
     "eslint": "^8.57.1",
     "eslint-config-react-app": "^7.0.1",
-    "eslint-plugin-react": "^7.37.4",
+    "eslint-plugin-react": "^7.37.5",
     "globals": "^15.15.0",
     "jsdom": "^26.0.0",
     "memfs": "^4.17.0",
@@ -154,13 +154,13 @@
     "react-error-overlay": "^6.1.0",
     "redux-logger": "^3.0.6",
     "source-map-explorer": "^2.5.3",
-    "vite": "^6.2.3",
+    "vite": "^6.2.5",
     "vite-plugin-babel": "^1.3.0",
     "vite-plugin-eslint": "^1.8.1",
     "vite-plugin-node-polyfills": "^0.23.0",
-    "vite-plugin-pwa": "^0.21.2",
+    "vite-plugin-pwa": "^1.0.0",
     "vite-plugin-style-import": "^2.0.0",
-    "vitest": "^3.0.9",
+    "vitest": "^3.1.1",
     "workbox-window": "^7.3.0"
   }
 }

client/src/App/App.jsx

@@ -21,8 +21,8 @@ import "./App.styles.scss";
 import Eula from "../components/eula/eula.component";
 import InstanceRenderMgr from "../utils/instanceRenderMgr";
 import ProductFruitsWrapper from "./ProductFruitsWrapper.jsx";
-import { SocketProvider } from "../contexts/SocketIO/useSocket.jsx";
 import { NotificationProvider } from "../contexts/Notifications/notificationContext.jsx";
+import SocketProvider from "../contexts/SocketIO/socketProvider.jsx";
 
 const ResetPassword = lazy(() => import("../pages/reset-password/reset-password.component"));
 const ManagePage = lazy(() => import("../pages/manage/manage.page.container"));
@@ -142,11 +142,10 @@ export function App({ bodyshop, checkUserSession, currentUser, online, setOnline
     >
       <ProductFruitsWrapper
         currentUser={currentUser}
-        workspaceCode={InstanceRenderMgr({
-          imex: null,
-          rome: "9BkbEseqNqxw8jUH"
-        })}
+        bodyshop={bodyshop}
+        workspaceCode={bodyshop?.tours_enabled ? "9BkbEseqNqxw8jUH" : ""}
       />
+
       <NotificationProvider>
         <Routes>
           <Route

client/src/App/ProductFruitsWrapper.jsx

@@ -1,8 +1,16 @@
 import React from "react";
-import { ProductFruits } from "react-product-fruits";
 import PropTypes from "prop-types";
+import { ProductFruits } from "react-product-fruits";
+import dayjs from "dayjs";
+
+const ProductFruitsWrapper = React.memo(({ currentUser, bodyshop, workspaceCode }) => {
+  const featureProps = bodyshop?.features
+    ? Object.entries(bodyshop.features).reduce((acc, [key, value]) => {
+        acc[key] = value === true || (typeof value === "string" && dayjs(value).isAfter(dayjs()));
+        return acc;
+      }, {})
+    : {};
 
-const ProductFruitsWrapper = React.memo(({ currentUser, workspaceCode }) => {
   return (
     workspaceCode &&
     currentUser?.authorized === true &&
@@ -14,7 +22,8 @@ const ProductFruitsWrapper = React.memo(({ currentUser, workspaceCode }) => {
         language="en"
         user={{
           email: currentUser.email,
-          username: currentUser.email
+          username: currentUser.email,
+          props: featureProps
         }}
       />
     )
@@ -28,5 +37,6 @@ ProductFruitsWrapper.propTypes = {
     authorized: PropTypes.bool,
     email: PropTypes.string
   }),
-  workspaceCode: PropTypes.string
+  workspaceCode: PropTypes.string,
+  bodyshop: PropTypes.object
 };

client/src/components/chat-affix/chat-affix.container.jsx

@@ -3,11 +3,11 @@ import { getToken } from "@firebase/messaging";
 import axios from "axios";
 import { useEffect } from "react";
 import { useTranslation } from "react-i18next";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
 import { messaging, requestForToken } from "../../firebase/firebase.utils";
 import ChatPopupComponent from "../chat-popup/chat-popup.component";
 import "./chat-affix.styles.scss";
 import { registerMessagingHandlers, unregisterMessagingHandlers } from "./registerMessagingSocketHandlers";
+import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 
 export function ChatAffixContainer({ bodyshop, chatVisible }) {
   const { t } = useTranslation();

client/src/components/chat-archive-button/chat-archive-button.component.jsx

@@ -3,10 +3,10 @@ import { Button } from "antd";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { TOGGLE_CONVERSATION_ARCHIVE } from "../../graphql/conversations.queries";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors.js";
 import { connect } from "react-redux";
+import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop

client/src/components/chat-conversation-title-tags/chat-conversation-title-tags.component.jsx

@@ -4,10 +4,10 @@ import { Link } from "react-router-dom";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { REMOVE_CONVERSATION_TAG } from "../../graphql/job-conversations.queries";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors.js";
 import { connect } from "react-redux";
+import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop

client/src/components/chat-conversation/chat-conversation.container.jsx

@@ -3,11 +3,11 @@ import axios from "axios";
 import { useCallback, useEffect, useState } from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
 import { CONVERSATION_SUBSCRIPTION_BY_PK, GET_CONVERSATION_DETAILS } from "../../graphql/conversations.queries";
 import { selectSelectedConversation } from "../../redux/messaging/messaging.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import ChatConversationComponent from "./chat-conversation.component";
+import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 
 const mapStateToProps = createStructuredSelector({
   selectedConversation: selectSelectedConversation,

client/src/components/chat-label/chat-label.component.jsx

@@ -4,11 +4,11 @@ import { Input, Spin, Tag, Tooltip } from "antd";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { UPDATE_CONVERSATION_LABEL } from "../../graphql/conversations.queries";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors.js";
 import { connect } from "react-redux";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop

client/src/components/chat-new-conversation/chat-new-conversation.component.jsx

@@ -5,7 +5,7 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { openChatByPhone } from "../../redux/messaging/messaging.actions";
 import PhoneFormItem, { PhoneItemFormatterValidation } from "../form-items-formatted/phone-form-item.component";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
+import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser

client/src/components/chat-open-button/chat-open-button.component.jsx

@@ -7,7 +7,7 @@ import PhoneNumberFormatter from "../../utils/PhoneFormatter";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { searchingForConversation } from "../../redux/messaging/messaging.selectors";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
+import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({

client/src/components/chat-popup/chat-popup.component.jsx

@@ -12,9 +12,9 @@ import ChatConversationListComponent from "../chat-conversation-list/chat-conver
 import ChatConversationContainer from "../chat-conversation/chat-conversation.container";
 import ChatNewConversation from "../chat-new-conversation/chat-new-conversation.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
 
 import "./chat-popup.styles.scss";
+import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 
 const mapStateToProps = createStructuredSelector({
   selectedConversation: selectSelectedConversation,

client/src/components/chat-tag-ro/chat-tag-ro.container.jsx

@@ -8,10 +8,10 @@ import { logImEXEvent } from "../../firebase/firebase.utils";
 import { INSERT_CONVERSATION_TAG } from "../../graphql/job-conversations.queries";
 import { SEARCH_FOR_JOBS } from "../../graphql/jobs.queries";
 import ChatTagRo from "./chat-tag-ro.component";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors.js";
 import { connect } from "react-redux";
+import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop

client/src/components/header/header.component.jsx

@@ -40,7 +40,6 @@ import { RiSurveyLine } from "react-icons/ri";
 import { connect } from "react-redux";
 import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
 import { GET_UNREAD_COUNT } from "../../graphql/notifications.queries.js";
 import { selectRecentItems, selectSelectedHeader } from "../../redux/application/application.selectors";
 import { setModalContext } from "../../redux/modals/modals.actions";
@@ -51,6 +50,7 @@ import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
 import LockWrapper from "../lock-wrapper/lock-wrapper.component";
 import NotificationCenterContainer from "../notification-center/notification-center.container.jsx";
+import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 
 // Redux mappings
 const mapStateToProps = createStructuredSelector({

client/src/components/job-at-change/schedule-event.component.jsx

@@ -1,5 +1,5 @@
 import { AlertFilled } from "@ant-design/icons";
-import { useMutation } from "@apollo/client";
+import { useLazyQuery, useMutation } from "@apollo/client";
 import { Button, Divider, Dropdown, Form, Input, Popover, Select, Space } from "antd";
 import parsePhoneNumber from "libphonenumber-js";
 import queryString from "query-string";
@@ -8,24 +8,30 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link, useLocation, useNavigate } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 import { UPDATE_APPOINTMENT } from "../../graphql/appointments.queries";
+import { GET_JOB_BY_PK_QUICK_INTAKE, JOB_PRODUCTION_TOGGLE } from "../../graphql/jobs.queries";
+import { insertAuditTrail } from "../../redux/application/application.actions";
 import { openChatByPhone, setMessage } from "../../redux/messaging/messaging.actions";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
+import { DateTimeFormatterFunction } from "../../utils/DateFormatter";
 import dayjs from "../../utils/day";
 import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
 import ChatOpenButton from "../chat-open-button/chat-open-button.component";
 import DataLabel from "../data-label/data-label.component";
+import FormDateTimePickerComponent from "../form-date-time-picker/form-date-time-picker.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import ProductionListColumnComment from "../production-list-columns/production-list-columns.comment.component";
 import ScheduleManualEvent from "../schedule-manual-event/schedule-manual-event.component";
+import { HasFeatureAccess } from "./../feature-wrapper/feature-wrapper.component";
 import ScheduleAtChange from "./job-at-change.component";
 import ScheduleEventColor from "./schedule-event.color.component";
 import ScheduleEventNote from "./schedule-event.note.component";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -33,7 +39,8 @@ const mapStateToProps = createStructuredSelector({
 const mapDispatchToProps = (dispatch) => ({
   setScheduleContext: (context) => dispatch(setModalContext({ context: context, modal: "schedule" })),
   openChatByPhone: (phone) => dispatch(openChatByPhone(phone)),
-  setMessage: (text) => dispatch(setMessage(text))
+  setMessage: (text) => dispatch(setMessage(text)),
+  insertAuditTrail: ({ jobid, operation }) => dispatch(insertAuditTrail({ jobid, operation }))
 });
 
 export function ScheduleEventComponent({
@@ -43,16 +50,36 @@ export function ScheduleEventComponent({
   event,
   refetch,
   handleCancel,
-  setScheduleContext
+  setScheduleContext,
+  insertAuditTrail
 }) {
   const { t } = useTranslation();
   const [open, setOpen] = useState(false);
   const history = useNavigate();
   const searchParams = queryString.parse(useLocation().search);
   const [updateAppointment] = useMutation(UPDATE_APPOINTMENT);
+  const [mutationUpdateJob] = useMutation(JOB_PRODUCTION_TOGGLE);
   const [title, setTitle] = useState(event.title);
   const { socket } = useSocket();
   const notification = useNotification();
+  const [form] = Form.useForm();
+  const [popOverVisible, setPopOverVisible] = useState(false);
+
+  const [getJobDetails] = useLazyQuery(GET_JOB_BY_PK_QUICK_INTAKE, {
+    variables: { id: event.job.id },
+    onCompleted: (data) => {
+      if (data?.jobs_by_pk) {
+        form.setFieldsValue({
+          actual_in: data.jobs_by_pk.actual_in ? data.jobs_by_pk.actual_in : dayjs(),
+          scheduled_completion: data.jobs_by_pk.scheduled_completion,
+          actual_completion: data.jobs_by_pk.actual_completion,
+          scheduled_delivery: data.jobs_by_pk.scheduled_delivery,
+          actual_delivery: data.jobs_by_pk.actual_delivery
+        });
+      }
+    },
+    fetchPolicy: "network-only"
+  });
 
   const blockContent = (
     <Space direction="vertical" wrap>
@@ -89,6 +116,74 @@ export function ScheduleEventComponent({
     </Space>
   );
 
+  const handleConvert = async (values) => {
+    const res = await mutationUpdateJob({
+      variables: {
+        jobId: event.job.id,
+        job: {
+          ...values,
+          status: bodyshop.md_ro_statuses.default_arrived,
+          inproduction: true
+        }
+      }
+    });
+
+    if (!res.errors) {
+      notification["success"]({
+        message: t("jobs.successes.converted")
+      });
+      insertAuditTrail({
+        jobid: event.job.id,
+        operation: AuditTrailMapping.jobintake(
+          res.data.update_jobs.returning[0].status,
+          DateTimeFormatterFunction(values.scheduled_completion)
+        )
+      });
+      setPopOverVisible(false);
+      refetch();
+    }
+  };
+
+  const popMenu = (
+    <div onClick={(e) => e.stopPropagation()}>
+      <Form layout="vertical" form={form} onFinish={handleConvert}>
+        <Form.Item
+          name={["actual_in"]}
+          label={t("jobs.fields.actual_in")}
+          rules={[
+            {
+              required: true
+              //message: t("general.validation.required"),
+            }
+          ]}
+        >
+          <FormDateTimePickerComponent disabled={event.ro_number} />
+        </Form.Item>
+        <Form.Item
+          name={["scheduled_completion"]}
+          label={t("jobs.fields.scheduled_completion")}
+          rules={[
+            {
+              required: true
+              //message: t("general.validation.required"),
+            }
+          ]}
+        >
+          <FormDateTimePickerComponent disabled={event.ro_number} />
+        </Form.Item>
+        <Form.Item name={["scheduled_delivery"]} label={t("jobs.fields.scheduled_delivery")}>
+          <FormDateTimePickerComponent disabled={event.ro_number} />
+        </Form.Item>
+
+        <Space wrap>
+          <Button type="primary" onClick={() => form.submit()}>
+            {t("general.actions.save")}
+          </Button>
+        </Space>
+      </Form>
+    </div>
+  );
+
   const popoverContent = (
     <div style={{ maxWidth: "40vw" }}>
       {!event.isintake ? (
@@ -294,7 +389,7 @@ export function ScheduleEventComponent({
         ) : (
           <ScheduleManualEvent event={event} />
         )}
-        {event.isintake ? (
+        {event.isintake && HasFeatureAccess({ featureName: "checklist", bodyshop }) ? (
           <Link
             to={{
               pathname: `/manage/jobs/${event.job && event.job.id}/intake`,
@@ -303,7 +398,21 @@ export function ScheduleEventComponent({
           >
             <Button disabled={event.arrived}>{t("appointments.actions.intake")}</Button>
           </Link>
-        ) : null}
+        ) : (
+          <Popover //open={open}
+            content={popMenu}
+            open={popOverVisible}
+            onOpenChange={setPopOverVisible}
+            onClick={(e) => {
+              getJobDetails();
+              e.stopPropagation();
+            }}
+            getPopupContainer={(trigger) => trigger.parentNode}
+            trigger="click"
+          >
+            <Button disabled={event.arrived}>{t("jobs.actions.intake_quick")}</Button>
+          </Popover>
+        )}
       </Space>
     </div>
   );

client/src/components/job-detail-cards/job-detail-cards.component.jsx

@@ -6,7 +6,8 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link, useLocation, useNavigate } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
+import { useSocket } from "../../contexts/SocketIO/useSocket.js";
+
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { QUERY_JOB_CARD_DETAILS, UPDATE_JOB } from "../../graphql/jobs.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions.js";

client/src/components/job-reconciliation-modal/job-reconciliation-modal.component.jsx

@@ -1,9 +1,9 @@
 import { Col, Row } from "antd";
-import React, { useState } from "react";
+import { useState } from "react";
+import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import JobReconciliationBillsTable from "../job-reconciliation-bills-table/job-reconciliation-bills-table.component";
 import JobReconciliationPartsTable from "../job-reconciliation-parts-table/job-reconciliation-parts-table.component";
 import JobReconciliationTotals from "../job-reconciliation-totals/job-reconciliation-totals.component";
-import InstanceRenderManager from "../../utils/instanceRenderMgr";
 
 export default function JobReconciliationModalComponent({ job, bills }) {
   const jobLineState = useState([]);
@@ -20,7 +20,7 @@ export default function JobReconciliationModalComponent({ job, bills }) {
 
   const filterFunction = InstanceRenderManager({
     imex: (j) =>
-      (j.part_type !== null && j.part_type !== "PAE") ||
+      (j.part_type !== null && j.part_type !== "PAE" && j.act_price !== 0 && j.part_qty !== 0) ||
       (j.line_desc && j.line_desc.toLowerCase().includes("towing") && j.lbr_op === "OP13") ||
       j.db_ref === "936004", //ADD SHIPPING LINE.
     rome: (j) =>

client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx

@@ -9,7 +9,7 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link, useNavigate } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
+import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 import { auth, logImEXEvent } from "../../firebase/firebase.utils";
 import { CANCEL_APPOINTMENTS_BY_JOB_ID, INSERT_MANUAL_APPT } from "../../graphql/appointments.queries";
 import { GET_CURRENT_QUESTIONSET_ID, INSERT_CSI } from "../../graphql/csi.queries";
@@ -133,6 +133,16 @@ export function JobsDetailHeaderActions({
   const { socket } = useSocket();
   const notification = useNotification();
 
+  const isDevEnv = import.meta.env.DEV;
+  const isProdEnv = import.meta.env.PROD;
+  const userEmail = currentUser?.email || "";
+
+  const devEmails = ["imex.dev", "rome.dev"];
+  const prodEmails = ["imex.prod", "rome.prod", "imex.test", "rome.test"];
+
+  const hasValidEmail = (emails) => emails.some((email) => userEmail.endsWith(email));
+  const canSubmitForTesting = (isDevEnv && hasValidEmail(devEmails)) || (isProdEnv && hasValidEmail(prodEmails));
+
   const {
     treatments: { ImEXPay }
   } = useSplitTreatments({
@@ -171,7 +181,7 @@ export function JobsDetailHeaderActions({
       { defaultOpenStatus: bodyshop.md_ro_statuses.default_imported },
       (newJobId) => {
         history(`/manage/jobs/${newJobId}`);
-        notification["success"]({
+        notification.success({
           message: t("jobs.successes.duplicated")
         });
       },
@@ -181,7 +191,7 @@ export function JobsDetailHeaderActions({
   const handleDuplicateConfirm = () =>
     DuplicateJob(client, job.id, { defaultOpenStatus: bodyshop.md_ro_statuses.default_imported }, (newJobId) => {
       history(`/manage/jobs/${newJobId}`);
-      notification["success"]({
+      notification.success({
         message: t("jobs.successes.duplicated")
       });
     });
@@ -217,13 +227,13 @@ export function JobsDetailHeaderActions({
     const result = await deleteJob({ variables: { id: job.id } });
 
     if (!result.errors) {
-      notification["success"]({
+      notification.success({
         message: t("jobs.successes.delete")
       });
       //go back to jobs list.
       history(`/manage/`);
     } else {
-      notification["error"]({
+      notification.error({
         message: t("jobs.errors.deleted", {
           error: JSON.stringify(result.errors)
         })
@@ -275,9 +285,9 @@ export function JobsDetailHeaderActions({
         });
 
         if (!result.errors) {
-          notification["success"]({ message: t("csi.successes.created") });
+          notification.success({ message: t("csi.successes.created") });
         } else {
-          notification["error"]({
+          notification.error({
             message: t("csi.errors.creating", {
               message: JSON.stringify(result.errors)
             })
@@ -316,7 +326,7 @@ export function JobsDetailHeaderActions({
               `${window.location.protocol}//${window.location.host}/csi/${result.data.insert_csi.returning[0].id}`
             );
           } else {
-            notification["error"]({
+            notification.error({
               message: t("messaging.error.invalidphone")
             });
           }
@@ -328,7 +338,7 @@ export function JobsDetailHeaderActions({
           );
         }
       } else {
-        notification["error"]({
+        notification.error({
           message: t("csi.errors.notconfigured")
         });
       }
@@ -358,7 +368,7 @@ export function JobsDetailHeaderActions({
           });
           setMessage(`${window.location.protocol}//${window.location.host}/csi/${job.csiinvites[0].id}`);
         } else {
-          notification["error"]({
+          notification.error({
             message: t("messaging.error.invalidphone")
           });
         }
@@ -398,7 +408,7 @@ export function JobsDetailHeaderActions({
     });
 
     if (!result.errors) {
-      notification["success"]({
+      notification.success({
         message: t("jobs.successes.voided")
       });
       insertAuditTrail({
@@ -409,7 +419,7 @@ export function JobsDetailHeaderActions({
       //go back to jobs list.
       history(`/manage/`);
     } else {
-      notification["error"]({
+      notification.error({
         message: t("jobs.errors.voiding", {
           error: JSON.stringify(result.errors)
         })
@@ -442,7 +452,7 @@ export function JobsDetailHeaderActions({
         console.log("handle -> XML", QbXmlResponse);
       } catch (error) {
         console.log("Error getting QBXML from Server.", error);
-        notification["error"]({
+        notification.error({
           message: t("jobs.errors.exporting", {
             error: "Unable to retrieve QBXML. " + JSON.stringify(error.message)
           })
@@ -460,7 +470,7 @@ export function JobsDetailHeaderActions({
         });
       } catch (error) {
         console.log("Error connecting to quickbooks or partner.", error);
-        notification["error"]({
+        notification.error({
           message: t("jobs.errors.exporting-partner")
         });
 
@@ -556,7 +566,7 @@ export function JobsDetailHeaderActions({
       }
     });
     if (!jobUpdate.errors) {
-      notification["success"]({
+      notification.success({
         message: t("appointments.successes.canceled")
       });
       insertAuditTrail({
@@ -931,11 +941,11 @@ export function JobsDetailHeaderActions({
         });
 
         if (!result.errors) {
-          notification["success"]({
+          notification.success({
             message: t("jobs.successes.partsqueue")
           });
         } else {
-          notification["error"]({
+          notification.error({
             message: t("jobs.errors.saving", {
               error: JSON.stringify(result.errors)
             })
@@ -1111,6 +1121,27 @@ export function JobsDetailHeaderActions({
     });
   }
 
+  if (canSubmitForTesting) {
+    menuItems.push({
+      key: "submitfortesting",
+      id: "job-actions-submitfortesting",
+      label: t("menus.jobsactions.submit-for-testing"),
+      onClick: async () => {
+        try {
+          await axios.post("/job/totals-recorder", { id: job.id });
+          notification.success({
+            message: t("general.messages.submit-for-testing")
+          });
+        } catch (err) {
+          console.error(`Error submitting job for testing: ${err?.message}`);
+          notification.error({
+            message: t("general.errors.submit-for-testing-error")
+          });
+        }
+      }
+    });
+  }
+
   const menu = {
     items: menuItems,
     key: "popovermenu"

client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.toggle-production.jsx

@@ -5,6 +5,7 @@ import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 import { GET_JOB_BY_PK_QUICK_INTAKE, JOB_PRODUCTION_TOGGLE } from "../../graphql/jobs.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
@@ -12,7 +13,6 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import { DateTimeFormatterFunction } from "../../utils/DateFormatter";
 import FormDateTimePickerComponent from "../form-date-time-picker/form-date-time-picker.component";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component.jsx";
 
 const mapStateToProps = createStructuredSelector({
@@ -46,7 +46,16 @@ export function JobsDetailHeaderActionsToggleProduction({
       if (data?.jobs_by_pk) {
         form.setFieldsValue({
           actual_in: data.jobs_by_pk.actual_in ? data.jobs_by_pk.actual_in : dayjs(),
-          scheduled_completion: data.jobs_by_pk.scheduled_completion,
+          scheduled_completion: data.jobs_by_pk.scheduled_completion
+            ? data.jobs_by_pk.scheduled_completion
+            : data.jobs_by_pk.labhrs &&
+              data.jobs_by_pk.larhrs &&
+              dayjs().businessDaysAdd(
+                (data.jobs_by_pk.labhrs.aggregate.sum.mod_lb_hrs ||
+                  0 + data.jobs_by_pk.larhrs.aggregate.sum.mod_lb_hrs ||
+                  0) / bodyshop.target_touchtime,
+                "day"
+              ),
           actual_completion: data.jobs_by_pk.actual_completion,
           scheduled_delivery: data.jobs_by_pk.scheduled_delivery,
           actual_delivery: data.jobs_by_pk.actual_delivery

client/src/components/jobs-documents-imgproxy-gallery/jobs-document-imgproxy-gallery.download.component.jsx

@@ -1,12 +1,10 @@
 import { Button, Space } from "antd";
 import axios from "axios";
-import React, { useState } from "react";
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import cleanAxios from "../../utils/CleanAxios";
 import formatBytes from "../../utils/formatbytes";
-//import yauzl from "yauzl";
-
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
@@ -28,7 +26,7 @@ const mapDispatchToProps = (dispatch) => ({
 
 export default connect(mapStateToProps, mapDispatchToProps)(JobsDocumentsImgproxyDownloadButton);
 
-export function JobsDocumentsImgproxyDownloadButton({ bodyshop, galleryImages, identifier }) {
+export function JobsDocumentsImgproxyDownloadButton({ bodyshop, galleryImages, identifier, jobId }) {
   const { t } = useTranslation();
   const [download, setDownload] = useState(null);
   const [loading, setLoading] = useState(false);
@@ -46,6 +44,7 @@ export function JobsDocumentsImgproxyDownloadButton({ bodyshop, galleryImages, i
       };
     });
   }
+
   function standardMediaDownload(bufferData) {
     const a = document.createElement("a");
     const url = window.URL.createObjectURL(new Blob([bufferData]));
@@ -53,13 +52,14 @@ export function JobsDocumentsImgproxyDownloadButton({ bodyshop, galleryImages, i
     a.download = `${identifier || "documents"}.zip`;
     a.click();
   }
+
   const handleDownload = async () => {
     logImEXEvent("jobs_documents_download");
     setLoading(true);
     const zipUrl = await axios({
       url: "/media/imgproxy/download",
       method: "POST",
-      data: { documentids: imagesToDownload.map((_) => _.id) }
+      data: { jobId, documentids: imagesToDownload.map((_) => _.id) }
     });
 
     const theDownloadedZip = await cleanAxios({

client/src/components/jobs-documents-imgproxy-gallery/jobs-documents-imgproxy-gallery.component.jsx

@@ -75,7 +75,7 @@ function JobsDocumentsImgproxyComponent({
               <SyncOutlined />
             </Button>
             <JobsDocumentsGallerySelectAllComponent galleryImages={galleryImages} setGalleryImages={setGalleryImages} />
-            <JobsDocumentsDownloadButton galleryImages={galleryImages} identifier={downloadIdentifier} />
+            <JobsDocumentsDownloadButton galleryImages={galleryImages} identifier={downloadIdentifier} jobId={jobId} />
             <JobsDocumentsDeleteButton
               galleryImages={galleryImages}
               deletionCallback={billsCallback || fetchThumbnails || refetch}

client/src/components/notification-center/notification-center.container.jsx

@@ -3,10 +3,10 @@ import { useQuery } from "@apollo/client";
 import { connect } from "react-redux";
 import NotificationCenterComponent from "./notification-center.component";
 import { GET_NOTIFICATIONS } from "../../graphql/notifications.queries";
-import { INITIAL_NOTIFICATIONS, useSocket } from "../../contexts/SocketIO/useSocket.jsx";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors.js";
 import day from "../../utils/day.js";
+import { INITIAL_NOTIFICATIONS, useSocket } from "../../contexts/SocketIO/useSocket.js";
 
 // This will be used to poll for notifications when the socket is disconnected
 const NOTIFICATION_POLL_INTERVAL_SECONDS = 60;

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

@@ -10,7 +10,7 @@ import { createStructuredSelector } from "reselect";
 import { openChatByPhone, setMessage } from "../../redux/messaging/messaging.actions";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import CurrencyFormItemComponent from "../form-items-formatted/currency-form-item.component";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
+import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,

client/src/components/production-board-kanban/production-board-kanban.container.jsx

@@ -12,7 +12,7 @@ import { QUERY_KANBAN_SETTINGS } from "../../graphql/user.queries";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import ProductionBoardKanbanComponent from "./production-board-kanban.component";
 import { useSplitTreatments } from "@splitsoftware/splitio-react";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
+import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,

client/src/components/production-list-detail/production-list-detail.component.jsx

@@ -7,7 +7,7 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { useLocation, useNavigate } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
+import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 import { logImEXEvent } from "../../firebase/firebase.utils.js";
 import { QUERY_JOB_CARD_DETAILS, UPDATE_JOB } from "../../graphql/jobs.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions.js";

client/src/components/production-list-table/production-list-table.container.jsx

@@ -10,7 +10,7 @@ import {
 import ProductionListTable from "./production-list-table.component";
 import _ from "lodash";
 import { useSplitTreatments } from "@splitsoftware/splitio-react";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
+import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 
 export default function ProductionListTableContainer({ bodyshop, subscriptionType = "direct" }) {
   const client = useApolloClient();

client/src/components/profile-my/profile-my.component.jsx

@@ -8,7 +8,7 @@ import { selectCurrentUser } from "../../redux/user/user.selectors";
 import { logImEXEvent, updateCurrentPassword } from "../../firebase/firebase.utils";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
+import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 import NotificationSettingsForm from "../notification-settings/notification-settings-form.component.jsx";
 
 const mapStateToProps = createStructuredSelector({

client/src/components/profile-shops/profile-shops.container.jsx

@@ -54,6 +54,9 @@ export function ProfileShopsContainer({ bodyshop, currentUser }) {
 
     //Force window refresh.
 
+    //Ping the new partner to refresh.
+    axios.post("http://localhost:1337/refresh");
+
     window.location.reload();
   };
 

client/src/components/shop-info/shop-info.general.component.jsx

@@ -906,6 +906,7 @@ export function ShopInfoGeneral({ form, bodyshop }) {
                       add();
                     }}
                     style={{ width: "100%" }}
+                    id="insurancecos-add-button"
                   >
                     {t("general.actions.add")}
                   </Button>

client/src/contexts/SocketIO/socketProvider.jsx

@@ -1,4 +1,5 @@
-import { createContext, useContext, useEffect, useRef, useState } from "react";
+// SocketProvider.js
+import { useEffect, useRef, useState } from "react";
 import SocketIO from "socket.io-client";
 import { auth } from "../../firebase/firebase.utils";
 import { store } from "../../redux/store";
@@ -15,10 +16,7 @@ import {
 import { useMutation } from "@apollo/client";
 import { useTranslation } from "react-i18next";
 import { useSplitTreatments } from "@splitsoftware/splitio-react";
-
-const SocketContext = createContext(null);
-
-const INITIAL_NOTIFICATIONS = 10;
+import { SocketContext, INITIAL_NOTIFICATIONS } from "./useSocket.js";
 
 /**
  * Socket Provider - Scenario Notifications / Web Socket related items
@@ -216,7 +214,6 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
       };
 
       const handleNotification = (data) => {
-        // Scenario Notifications have been disabled, bail.
         if (Realtime_Notifications_UI?.treatment !== "on") {
           return;
         }
@@ -336,7 +333,6 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
       };
 
       const handleSyncNotificationRead = ({ notificationId, timestamp }) => {
-        // Scenario Notifications have been disabled, bail.
         if (Realtime_Notifications_UI?.treatment !== "on") {
           return;
         }
@@ -378,7 +374,6 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
       };
 
       const handleSyncAllNotificationsRead = ({ timestamp }) => {
-        // Scenario Notifications have been disabled, bail.
         if (Realtime_Notifications_UI?.treatment !== "on") {
           return;
         }
@@ -490,11 +485,4 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
   );
 };
 
-const useSocket = () => {
-  const context = useContext(SocketContext);
-  // NOTE: Not sure if we absolutely require this, does cause slipups on dev env
-  if (!context) throw new Error("useSocket must be used within a SocketProvider");
-  return context;
-};
-
-export { SocketContext, SocketProvider, INITIAL_NOTIFICATIONS, useSocket };
+export default SocketProvider;

client/src/contexts/SocketIO/useSocket.js

@@ -0,0 +1,13 @@
+import { createContext, useContext } from "react";
+
+const SocketContext = createContext(null);
+
+const INITIAL_NOTIFICATIONS = 10;
+
+const useSocket = () => {
+  const context = useContext(SocketContext);
+  if (!context) throw new Error("useSocket must be used within a SocketProvider");
+  return context;
+};
+
+export { SocketContext, INITIAL_NOTIFICATIONS, useSocket };

client/src/graphql/bodyshop.queries.js

@@ -57,6 +57,7 @@ export const QUERY_BODYSHOP = gql`
       logo_img_path
       md_ro_statuses
       md_order_statuses
+      tours_enabled
       md_functionality_toggles
       shopname
       state
@@ -186,6 +187,7 @@ export const UPDATE_SHOP = gql`
         phone
         federal_tax_id
         id
+        tours_enabled
         insurance_vendor_id
         logo_img_path
         md_ro_statuses

client/src/graphql/jobs.queries.js

@@ -2570,6 +2570,20 @@ export const GET_JOB_BY_PK_QUICK_INTAKE = gql`
       actual_completion
       scheduled_delivery
       actual_delivery
+      labhrs: joblines_aggregate(where: { _and: [{ mod_lbr_ty: { _neq: "LAR" } }, { removed: { _eq: false } }] }) {
+        aggregate {
+          sum {
+            mod_lb_hrs
+          }
+        }
+      }
+      larhrs: joblines_aggregate(where: { _and: [{ mod_lbr_ty: { _eq: "LAR" } }, { removed: { _eq: false } }] }) {
+        aggregate {
+          sum {
+            mod_lb_hrs
+          }
+        }
+      }
     }
   }
 `;

client/src/graphql/parts-orders.queries.js

@@ -78,6 +78,9 @@ export const QUERY_PARTS_ORDER_OEC = gql`
         }
         ro_number
         clm_no
+        cieca_stl
+        cieca_ttl
+        cieca_pfl
         asgn_no
         asgn_date
         state_tax_rate
@@ -164,6 +167,7 @@ export const QUERY_PARTS_ORDER_OEC = gql`
         loss_desc
         loss_of_use
         loss_type
+        materials
         ownr_addr1
         ownr_addr2
         ownr_city

client/src/pages/jobs-detail/jobs-detail.page.component.jsx

@@ -56,7 +56,7 @@ import { DateTimeFormat } from "../../utils/DateFormatter";
 import dayjs from "../../utils/day";
 import UndefinedToNull from "../../utils/undefinedtonull";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
+import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 import JobWatcherToggleContainer from "../../components/job-watcher-toggle/job-watcher-toggle.container.jsx";
 
 const mapStateToProps = createStructuredSelector({

client/src/pages/manage/manage.page.component.jsx

@@ -20,7 +20,6 @@ import PartnerPingComponent from "../../components/partner-ping/partner-ping.com
 import PrintCenterModalContainer from "../../components/print-center-modal/print-center-modal.container";
 import ShopSubStatusComponent from "../../components/shop-sub-status/shop-sub-status.component";
 import { requestForToken } from "../../firebase/firebase.utils";
-import { useSocket } from "../../contexts/SocketIO/useSocket.jsx";
 import { selectBodyshop, selectInstanceConflict } from "../../redux/user/user.selectors";
 import UpdateAlert from "../../components/update-alert/update-alert.component";
 import InstanceRenderManager from "../../utils/instanceRenderMgr.js";
@@ -29,6 +28,7 @@ import WssStatusDisplayComponent from "../../components/wss-status-display/wss-s
 import { selectAlerts } from "../../redux/application/application.selectors.js";
 import { addAlerts } from "../../redux/application/application.actions.js";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 
 const JobsPage = lazy(() => import("../jobs/jobs.page"));
 

client/src/redux/user/user.sagas.js

@@ -1,7 +1,4 @@
 import FingerprintJS from "@fingerprintjs/fingerprintjs";
-import * as Sentry from "@sentry/browser";
-import { notification } from "antd";
-import axios from "axios";
 import { setUserId, setUserProperties } from "@firebase/analytics";
 import {
   checkActionCode,
@@ -12,6 +9,9 @@ import {
 } from "@firebase/auth";
 import { arrayUnion, doc, getDoc, setDoc, updateDoc } from "@firebase/firestore";
 import { getToken } from "@firebase/messaging";
+import * as Sentry from "@sentry/browser";
+import { notification } from "antd";
+import axios from "axios";
 import i18next from "i18next";
 import LogRocket from "logrocket";
 import { all, call, delay, put, select, takeLatest } from "redux-saga/effects";
@@ -351,7 +351,14 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
       });
       payload.features?.allAccess === true
         ? window.$crisp.push(["set", "session:segments", [["allAccess"]]])
-        : window.$crisp.push(["set", "session:segments", [["basic"]]]);
+        : (() => {
+            const featureKeys = Object.keys(payload.features).filter(
+              (key) =>
+                payload.features[key] === true ||
+                (typeof payload.features[key] === "string" && !isNaN(Date.parse(payload.features[key])))
+            );
+            window.$crisp.push(["set", "session:segments", [["basic", ...featureKeys]]]);
+          })();
     } catch (error) {
       console.warn("Couldnt find $crisp.", error.message);
     }

client/src/translations/en_us/common.json

@@ -1220,7 +1220,8 @@
       "errors": {
         "fcm": "You must allow notification permissions to have real time messaging.  Click to try again.",
         "notfound": "No record was found.",
-        "sizelimit": "The selected items exceed the size limit."
+        "sizelimit": "The selected items exceed the size limit.",
+        "submit-for-testing": "Error submitting Job for testing."
       },
       "itemtypes": {
         "contract": "CC Contract",
@@ -1322,7 +1323,8 @@
         "partnernotrunning": "{{app}} has detected that the partner is not running. Please ensure it is running to enable full functionality.",
         "rbacunauth": "You are not authorized to view this content. Please reach out to your shop manager to change your access level.",
         "unsavedchanges": "You have unsaved changes.",
-        "unsavedchangespopup": "You have unsaved changes. Are you sure you want to leave?"
+        "unsavedchangespopup": "You have unsaved changes. Are you sure you want to leave?",
+        "submit-for-testing": "Submitted Job for testing successfully."
       },
       "validation": {
         "dateRangeExceeded": "The date range has been exceeded.",
@@ -2314,7 +2316,8 @@
         "duplicate": "Duplicate this Job",
         "duplicatenolines": "Duplicate this Job without Repair Data",
         "newcccontract": "Create Courtesy Car Contract",
-        "void": "Void Job"
+        "void": "Void Job",
+        "submit-for-testing": "Submit for Testing"
       },
       "jobsdetail": {
         "claimdetail": "Claim Details",

client/src/translations/es/common.json

@@ -1220,7 +1220,8 @@
       "errors": {
         "fcm": "",
         "notfound": "",
-        "sizelimit": ""
+        "sizelimit": "",
+        "submit-for-testing": ""
       },
       "itemtypes": {
         "contract": "",
@@ -1322,7 +1323,8 @@
         "partnernotrunning": "",
         "rbacunauth": "",
         "unsavedchanges": "Usted tiene cambios no guardados.",
-        "unsavedchangespopup": ""
+        "unsavedchangespopup": "",
+        "submit-for-testing": ""
       },
       "validation": {
         "dateRangeExceeded": "",
@@ -2314,7 +2316,8 @@
         "duplicate": "",
         "duplicatenolines": "",
         "newcccontract": "",
-        "void": ""
+        "void": "",
+        "submit-for-testing": ""
       },
       "jobsdetail": {
         "claimdetail": "Detalles de la reclamación",

client/src/translations/fr/common.json

@@ -1220,7 +1220,8 @@
       "errors": {
         "fcm": "",
         "notfound": "",
-        "sizelimit": ""
+        "sizelimit": "",
+        "submit-for-testing": ""
       },
       "itemtypes": {
         "contract": "",
@@ -1322,7 +1323,9 @@
         "partnernotrunning": "",
         "rbacunauth": "",
         "unsavedchanges": "Vous avez des changements non enregistrés.",
-        "unsavedchangespopup": ""
+        "unsavedchangespopup": "",
+        "submit-for-testing": ""
+
       },
       "validation": {
         "dateRangeExceeded": "",
@@ -2314,7 +2317,8 @@
         "duplicate": "",
         "duplicatenolines": "",
         "newcccontract": "",
-        "void": ""
+        "void": "",
+        "submit-for-testing": ""
       },
       "jobsdetail": {
         "claimdetail": "Détails de la réclamation",

client/src/utils/AuditTrailMappings.js

@@ -15,8 +15,8 @@ const AuditTrailMapping = {
   jobchecklist: (type, inproduction, status) =>
     i18n.t("audit_trail.messages.jobchecklist", { type, inproduction, status }),
   jobconverted: (ro_number) => i18n.t("audit_trail.messages.jobconverted", { ro_number }),
-  jobintake: (status, email, scheduled_completion) =>
-    i18n.t("audit_trail.messages.jobintake", { status, email, scheduled_completion }),
+  jobintake: (status, scheduled_completion) =>
+    i18n.t("audit_trail.messages.jobintake", { status, scheduled_completion }),
   jobdelivery: (status, email, actual_completion) =>
     i18n.t("audit_trail.messages.jobdelivery", { status, email, actual_completion }),
   jobexported: () => i18n.t("audit_trail.messages.jobexported"),

docker-compose.yml

@@ -117,6 +117,7 @@ services:
         aws --endpoint-url=http://localstack:4566 secretsmanager create-secret --name CHATTER_PRIVATE_KEY --secret-string file:///tmp/certs/io-ftp-test.key
         aws --endpoint-url=http://localstack:4566 logs create-log-group --log-group-name development --region ca-central-1
         aws --endpoint-url=http://localstack:4566 s3api create-bucket --bucket imex-large-log --create-bucket-configuration LocationConstraint=ca-central-1
+        aws --endpoint-url=http://localstack:4566 s3api create-bucket --bucket imex-job-totals --create-bucket-configuration LocationConstraint=ca-central-1
       "
   # Node App: The Main IMEX API
   node-app:

download-job-totals-fixtures.js

@@ -0,0 +1,77 @@
+const fs = require("fs");
+const path = require("path");
+const logger = require("./server/utils/logger"); // Assuming same logger utility
+const s3Client = require("./server/utils/s3"); // Using the S3 client utilities with LocalStack support
+
+// Set bucket name for development with LocalStack
+const S3_BUCKET_NAME = "imex-job-totals";
+
+// Set fixtures directory path
+const FIXTURES_DIR = path.join(__dirname, "server", "job", "test", "fixtures", "job-totals");
+
+const ensureFixturesDirectory = () => {
+  if (!fs.existsSync(FIXTURES_DIR)) {
+    fs.mkdirSync(FIXTURES_DIR, { recursive: true });
+    logger.log(`Created fixtures directory: ${FIXTURES_DIR}`, "info");
+  }
+};
+
+const downloadJsonFiles = async (userInfo = { email: "system" }) => {
+  logger.log(`Starting download of JSON files from bucket: ${S3_BUCKET_NAME}`, "debug", userInfo.email);
+
+  try {
+    ensureFixturesDirectory();
+    const contents = await s3Client.listFilesInS3Bucket(S3_BUCKET_NAME);
+
+    if (!contents.length) {
+      logger.log("No files found in bucket", "info", userInfo.email);
+      return;
+    }
+
+    logger.log(`Found ${contents.length} files in bucket`, "info", userInfo.email);
+
+    for (const item of contents) {
+      if (!item.Key.endsWith(".json")) {
+        logger.log(`Skipping non-JSON file: ${item.Key}`, "debug", userInfo.email);
+        continue;
+      }
+
+      logger.log(`Downloading: ${item.Key}`, "debug", userInfo.email);
+      const fileData = await s3Client.downloadFileFromS3({
+        bucketName: S3_BUCKET_NAME,
+        key: item.Key
+      });
+
+      const fileContent = await fileData.transformToString();
+      const fileName = path.basename(item.Key);
+      const filePath = path.join(FIXTURES_DIR, fileName);
+
+      fs.writeFileSync(filePath, fileContent);
+      logger.log(`Saved: ${filePath}`, "info", userInfo.email);
+    }
+
+    logger.log("Download completed successfully", "info", userInfo.email);
+  } catch (error) {
+    logger.log("Failed to download JSON files", "error", userInfo.email, null, {
+      error: error?.message,
+      stack: error?.stack
+    });
+    throw error; // Re-throw to trigger process exit with error code
+  }
+};
+
+// Run the download if script is executed directly
+if (require.main === module) {
+  (async () => {
+    try {
+      await downloadJsonFiles();
+      console.log("Script completed successfully");
+      process.exit(0); // Explicitly exit with success code
+    } catch (error) {
+      console.error("Fatal error downloading files:", error);
+      process.exit(1); // Explicitly exit with error code
+    }
+  })();
+}
+
+module.exports = downloadJsonFiles;

hasura/metadata/cron_triggers.yaml

@@ -31,6 +31,15 @@
   headers:
     - name: x-imex-auth
       value_from_env: DATAPUMP_AUTH
+- name: Podium Data Pump
+  webhook: '{{HASURA_API_URL}}/data/podium'
+  schedule: 15 5 * * *
+  include_in_metadata: true
+  payload: {}
+  headers:
+    - name: x-imex-auth
+      value_from_env: DATAPUMP_AUTH
+  comment: ""
 - name: Rome Usage Report
   webhook: '{{HASURA_API_URL}}/data/usagereport'
   schedule: 0 12 * * 5

hasura/metadata/tables.yaml

@@ -965,6 +965,7 @@
           - insurance_vendor_id
           - intakechecklist
           - intellipay_config
+          - intellipay_merchant_id
           - jc_hourly_rates
           - jobsizelimit
           - last_name_first
@@ -1004,6 +1005,7 @@
           - pbs_configuration
           - pbs_serialnumber
           - phone
+          - podiumid
           - prodtargethrs
           - production_config
           - region_config
@@ -1023,6 +1025,7 @@
           - template_header
           - textid
           - timezone
+          - tours_enabled
           - tt_allow_post_to_invoiced
           - tt_enforce_hours_for_tech_console
           - updated_at

hasura/migrations/1743531377681_alter_table_public_bodyshops_add_column_intellipay_merchant_id/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."bodyshops" add column "intellipay_merchant_id" text
+--  null unique;

hasura/migrations/1743531377681_alter_table_public_bodyshops_add_column_intellipay_merchant_id/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."bodyshops" add column "intellipay_merchant_id" text
+ null unique;

hasura/migrations/1744302073757_alter_table_public_bodyshops_add_column_tours_enabled/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."bodyshops" add column "tours_enabled" boolean
+--  not null default 'true';

hasura/migrations/1744302073757_alter_table_public_bodyshops_add_column_tours_enabled/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."bodyshops" add column "tours_enabled" boolean
+ not null default 'true';

hasura/migrations/1744847142775_alter_table_public_bodyshops_add_column_podiumid/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."bodyshops" add column "podiumid" text
+--  null;

hasura/migrations/1744847142775_alter_table_public_bodyshops_add_column_podiumid/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."bodyshops" add column "podiumid" text
+ null;

package.json

@@ -12,17 +12,18 @@
     "start": "node server.js",
     "makeitpretty": "prettier --write \"**/*.{css,js,json,jsx,scss}\"",
     "test:unit": "vitest run",
-    "test:watch": "vitest"
+    "test:watch": "vitest",
+    "job-totals-fixtures:local": "docker exec node-app /usr/bin/node /app/download-job-totals-fixtures.js"
   },
   "dependencies": {
-    "@aws-sdk/client-cloudwatch-logs": "^3.772.0",
-    "@aws-sdk/client-elasticache": "^3.772.0",
-    "@aws-sdk/client-s3": "^3.772.0",
-    "@aws-sdk/client-secrets-manager": "^3.772.0",
-    "@aws-sdk/client-ses": "^3.772.0",
-    "@aws-sdk/credential-provider-node": "^3.772.0",
-    "@aws-sdk/lib-storage": "^3.774.0",
-    "@aws-sdk/s3-request-presigner": "^3.774.0",
+    "@aws-sdk/client-cloudwatch-logs": "^3.782.0",
+    "@aws-sdk/client-elasticache": "^3.782.0",
+    "@aws-sdk/client-s3": "^3.782.0",
+    "@aws-sdk/client-secrets-manager": "^3.782.0",
+    "@aws-sdk/client-ses": "^3.782.0",
+    "@aws-sdk/credential-provider-node": "^3.782.0",
+    "@aws-sdk/lib-storage": "^3.782.0",
+    "@aws-sdk/s3-request-presigner": "^3.782.0",
     "@opensearch-project/opensearch": "^2.13.0",
     "@socket.io/admin-ui": "^0.5.1",
     "@socket.io/redis-adapter": "^8.3.0",
@@ -32,8 +33,7 @@
     "bee-queue": "^1.7.1",
     "better-queue": "^3.8.12",
     "bluebird": "^3.7.2",
-    "body-parser": "^1.20.3",
-    "bullmq": "^5.44.4",
+    "bullmq": "^5.48.0",
     "chart.js": "^4.4.8",
     "cloudinary": "^2.6.0",
     "compression": "^1.8.0",
@@ -41,7 +41,7 @@
     "cors": "2.8.5",
     "crisp-status-reporter": "^1.2.2",
     "csrf": "^3.1.0",
-    "dd-trace": "^5.43.0",
+    "dd-trace": "^5.45.0",
     "dinero.js": "^1.9.1",
     "dotenv": "^16.4.5",
     "express": "^4.21.1",
@@ -69,7 +69,7 @@
     "socket.io": "^4.8.1",
     "socket.io-adapter": "^2.5.5",
     "ssh2-sftp-client": "^11.0.0",
-    "twilio": "^5.5.1",
+    "twilio": "^5.5.2",
     "uuid": "^11.1.0",
     "winston": "^3.17.0",
     "winston-cloudwatch": "^6.3.0",
@@ -77,15 +77,16 @@
     "xmlbuilder2": "^3.1.1"
   },
   "devDependencies": {
-    "@eslint/js": "^9.23.0",
+    "@eslint/js": "^9.24.0",
     "@trivago/prettier-plugin-sort-imports": "^5.2.2",
-    "eslint": "^9.23.0",
-    "eslint-plugin-react": "^7.37.4",
+    "eslint": "^9.24.0",
+    "eslint-plugin-react": "^7.37.5",
     "globals": "^15.15.0",
+    "mock-require": "^3.0.3",
     "p-limit": "^3.1.0",
     "prettier": "^3.5.3",
     "source-map-explorer": "^2.5.2",
     "supertest": "^7.1.0",
-    "vitest": "^3.0.9"
+    "vitest": "^3.1.1"
   }
 }

server.js

@@ -16,7 +16,6 @@ const cors = require("cors");
 const http = require("http");
 const Redis = require("ioredis");
 const express = require("express");
-const bodyParser = require("body-parser");
 const compression = require("compression");
 const cookieParser = require("cookie-parser");
 const { Server } = require("socket.io");
@@ -84,8 +83,8 @@ const SOCKETIO_CORS_ORIGIN_DEV = ["http://localhost:3333", "https://localhost:33
 const applyMiddleware = ({ app }) => {
   app.use(compression());
   app.use(cookieParser());
-  app.use(bodyParser.json({ limit: "50mb" }));
-  app.use(bodyParser.urlencoded({ limit: "50mb", extended: true }));
+  app.use(express.json({ limit: "50mb" }));
+  app.use(express.urlencoded({ limit: "50mb", extended: true }));
   app.use(cors({ credentials: true, exposedHeaders: ["set-cookie"] }));
 
   // Helper middleware
@@ -118,6 +117,7 @@ const applyRoutes = ({ app }) => {
   app.use("/cdk", require("./server/routes/cdkRoutes"));
   app.use("/csi", require("./server/routes/csiRoutes"));
   app.use("/payroll", require("./server/routes/payrollRoutes"));
+  app.use("/integrations", require("./server/routes/intergrationRoutes"));
 
   // Default route for forbidden access
   app.get("/", (req, res) => {

server/accounting/pbs/pbs-ap-allocations.js

@@ -217,7 +217,7 @@ exports.PbsExportAp = async function (socket, { billids, txEnvelope }) {
 
       socket.emit("ap-export-success", billid);
     } else {
-      CdkBase.createLogEvent(socket, "ERROR", `Export was not succesful.`);
+      CdkBase.createLogEvent(socket, "ERROR", `Export was not successful.`);
       socket.emit("ap-export-failure", {
         billid,
         error: AccountPostingChange.Message

server/accounting/pbs/pbs-job-export.js

@@ -105,14 +105,14 @@ exports.PbsSelectedCustomer = async function PbsSelectedCustomer(socket, selecte
 
       socket.emit("export-success", socket.JobData.id);
     } else {
-      CdkBase.createLogEvent(socket, "ERROR", `Export was not succesful.`);
+      CdkBase.createLogEvent(socket, "ERROR", `Export was not successful.`);
     }
   } catch (error) {
     CdkBase.createLogEvent(socket, "ERROR", `Error encountered in CdkSelectedCustomer. ${error}`);
     await InsertFailedExportLog(socket, error);
   }
 };
-
+// Was Successful
 async function CheckForErrors(socket, response) {
   if (response.WasSuccessful === undefined || response.WasSuccessful === true) {
     CdkBase.createLogEvent(socket, "DEBUG", `Successful response from DMS. ${response.Message || ""}`);

server/data/chatter.js

@@ -2,7 +2,6 @@ const path = require("path");
 const queries = require("../graphql-client/queries");
 const moment = require("moment-timezone");
 const converter = require("json-2-csv");
-const _ = require("lodash");
 const logger = require("../utils/logger");
 const fs = require("fs");
 const { SecretsManagerClient, GetSecretValueCommand } = require("@aws-sdk/client-secrets-manager");

server/data/data.js

@@ -3,4 +3,5 @@ exports.autohouse = require("./autohouse").default;
 exports.chatter = require("./chatter").default;
 exports.claimscorp = require("./claimscorp").default;
 exports.kaizen = require("./kaizen").default;
-exports.usageReport = require("./usageReport").default;
+exports.usageReport = require("./usageReport").default;
+exports.podium = require("./podium").default;

server/data/podium.js

@@ -0,0 +1,211 @@
+const path = require("path");
+const queries = require("../graphql-client/queries");
+const moment = require("moment-timezone");
+const converter = require("json-2-csv");
+const logger = require("../utils/logger");
+const fs = require("fs");
+require("dotenv").config({
+  path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`)
+});
+let Client = require("ssh2-sftp-client");
+
+const client = require("../graphql-client/graphql-client").client;
+const { sendServerEmail } = require("../email/sendemail");
+
+const ftpSetup = {
+  host: process.env.PODIUM_HOST,
+  port: process.env.PODIUM_PORT,
+  username: process.env.PODIUM_USER,
+  password: process.env.PODIUM_PASSWORD,
+  debug:
+    process.env.NODE_ENV !== "production"
+      ? (message, ...data) => logger.log(message, "DEBUG", "api", null, data)
+      : () => {},
+  algorithms: {
+    serverHostKey: ["ssh-rsa", "ssh-dss", "rsa-sha2-256", "rsa-sha2-512", "ecdsa-sha2-nistp256", "ecdsa-sha2-nistp384"]
+  }
+};
+
+exports.default = async (req, res) => {
+  // Only process if in production environment.
+  if (process.env.NODE_ENV !== "production") {
+    res.sendStatus(403);
+    return;
+  }
+  // Only process if the appropriate token is provided.
+  if (req.headers["x-imex-auth"] !== process.env.AUTOHOUSE_AUTH_TOKEN) {
+    res.sendStatus(401);
+    return;
+  }
+
+  // Send immediate response and continue processing.
+  res.status(202).json({
+    success: true,
+    message: "Processing request ...",
+    timestamp: new Date().toISOString()
+  });
+
+  try {
+    logger.log("podium-start", "DEBUG", "api", null, null);
+    const allCSVResults = [];
+    const allErrors = [];
+
+    const { bodyshops } = await client.request(queries.GET_PODIUM_SHOPS); //Query for the List of Bodyshop Clients.
+    const specificShopIds = req.body.bodyshopIds; // ['uuid];
+    const { start, end, skipUpload } = req.body; //YYYY-MM-DD
+
+    const shopsToProcess =
+      specificShopIds?.length > 0 ? bodyshops.filter((shop) => specificShopIds.includes(shop.id)) : bodyshops;
+    logger.log("podium-shopsToProcess-generated", "DEBUG", "api", null, null);
+
+    if (shopsToProcess.length === 0) {
+      logger.log("podium-shopsToProcess-empty", "DEBUG", "api", null, null);
+      return;
+    }
+
+    await processShopData(shopsToProcess, start, end, skipUpload, allCSVResults, allErrors);
+
+    await sendServerEmail({
+      subject: `Podium Report ${moment().format("MM-DD-YY")}`,
+      text: `Errors:\n${JSON.stringify(allErrors, null, 2)}\n\nUploaded:\n${JSON.stringify(
+        allCSVResults.map((x) => ({
+          imexshopid: x.imexshopid,
+          filename: x.filename,
+          count: x.count,
+          result: x.result
+        })),
+        null,
+        2
+      )}`
+    });
+
+    logger.log("podium-end", "DEBUG", "api", null, null);
+  } catch (error) {
+    logger.log("podium-error", "ERROR", "api", null, { error: error.message, stack: error.stack });
+  }
+};
+
+async function processShopData(shopsToProcess, start, end, skipUpload, allCSVResults, allErrors) {
+  for (const bodyshop of shopsToProcess) {
+    const erroredJobs = [];
+    try {
+      logger.log("podium-start-shop-extract", "DEBUG", "api", bodyshop.id, {
+        shopname: bodyshop.shopname
+      });
+
+      const { jobs, bodyshops_by_pk } = await client.request(queries.PODIUM_QUERY, {
+        bodyshopid: bodyshop.id,
+        start: start ? moment(start).startOf("day") : moment().subtract(2, "days").startOf("day"),
+        ...(end && { end: moment(end).endOf("day") })
+      });
+
+      const podiumObject = jobs.map((j) => {
+        return {
+          "Podium Account ID": bodyshops_by_pk.podiumid,
+          "First Name": j.ownr_co_nm ? null : j.ownr_fn,
+          "Last Name": j.ownr_co_nm ? j.ownr_co_nm : j.ownr_ln,
+          "SMS Number": null,
+          "Phone 1": j.ownr_ph1,
+          "Phone 2": j.ownr_ph2,
+          Email: j.ownr_ea,
+          "Delivered Date":
+            (j.actual_delivery && moment(j.actual_delivery).tz(bodyshop.timezone).format("MM/DD/YYYY")) || ""
+        };
+      });
+
+      if (erroredJobs.length > 0) {
+        logger.log("podium-failed-jobs", "ERROR", "api", bodyshop.id, {
+          count: erroredJobs.length,
+          jobs: JSON.stringify(erroredJobs.map((j) => j.job.ro_number))
+        });
+      }
+
+      const csvObj = {
+        bodyshopid: bodyshop.id,
+        imexshopid: bodyshop.imexshopid,
+        csv: converter.json2csv(podiumObject, { emptyFieldValue: "" }),
+        filename: `${bodyshop.podiumid}-${moment().format("YYYYMMDDTHHMMss")}.csv`,
+        count: podiumObject.length
+      };
+
+      if (skipUpload) {
+        fs.writeFileSync(`./logs/${csvObj.filename}`, csvObj.csv);
+      } else {
+        await uploadViaSFTP(csvObj);
+      }
+
+      allCSVResults.push({
+        bodyshopid: bodyshop.id,
+        imexshopid: bodyshop.imexshopid,
+        podiumid: bodyshop.podiumid,
+        count: csvObj.count,
+        filename: csvObj.filename,
+        result: csvObj.result
+      });
+
+      logger.log("podium-end-shop-extract", "DEBUG", "api", bodyshop.id, {
+        shopname: bodyshop.shopname
+      });
+    } catch (error) {
+      //Error at the shop level.
+      logger.log("podium-error-shop", "ERROR", "api", bodyshop.id, { error: error.message, stack: error.stack });
+
+      allErrors.push({
+        bodyshopid: bodyshop.id,
+        imexshopid: bodyshop.imexshopid,
+        podiumid: bodyshop.podiumid,
+        fatal: true,
+        errors: [error.toString()]
+      });
+    } finally {
+      allErrors.push({
+        bodyshopid: bodyshop.id,
+        imexshopid: bodyshop.imexshopid,
+        podiumid: bodyshop.podiumid,
+        errors: erroredJobs.map((ej) => ({
+          ro_number: ej.job?.ro_number,
+          jobid: ej.job?.id,
+          error: ej.error
+        }))
+      });
+    }
+  }
+}
+
+async function uploadViaSFTP(csvObj) {
+  const sftp = new Client();
+  sftp.on("error", (errors) =>
+    logger.log("podium-sftp-connection-error", "ERROR", "api", csvObj.bodyshopid, {
+      error: errors.message,
+      stack: errors.stack
+    })
+  );
+  try {
+    //Connect to the FTP and upload all.
+    await sftp.connect(ftpSetup);
+
+    try {
+      csvObj.result = await sftp.put(Buffer.from(csvObj.xml), `${csvObj.filename}`);
+      logger.log("podium-sftp-upload", "DEBUG", "api", csvObj.bodyshopid, {
+        imexshopid: csvObj.imexshopid,
+        filename: csvObj.filename,
+        result: csvObj.result
+      });
+    } catch (error) {
+      logger.log("podium-sftp-upload-error", "ERROR", "api", csvObj.bodyshopid, {
+        filename: csvObj.filename,
+        error: error.message,
+        stack: error.stack
+      });
+      throw error;
+    }
+  } catch (error) {
+    logger.log("podium-sftp-error", "ERROR", "api", csvObj.bodyshopid, {
+      error: error.message,
+      stack: error.stack
+    });
+    throw error;
+  } finally {
+    sftp.end();
+  }
+}

server/data/usageReport.js

@@ -55,7 +55,12 @@ exports.default = async (req, res) => {
     const csv = converter.json2csv(shopList, { emptyFieldValue: "" });
     emailer
       .sendTaskEmail({
-        to: ["patrick.fic@convenient-brands.com", "bradley.rhoades@convenient-brands.com", "jrome@rometech.com"],
+        to: [
+          "patrick.fic@convenient-brands.com",
+          "bradley.rhoades@convenient-brands.com",
+          "jrome@rometech.com",
+          "ivana@imexsystems.ca"
+        ],
         subject: `RO Usage Report - ${moment().format("MM/DD/YYYY")}`,
         text: `
 Usage Report for ${moment().format("MM/DD/YYYY")} for Rome Online Customers. 

server/email/generateTemplate.js

@@ -1,5 +1,3 @@
-const moment = require("moment");
-const { default: RenderInstanceManager } = require("../utils/instanceMgr");
 const { header, end, start } = require("./html");
 
 // Required Strings
@@ -7,19 +5,6 @@ const { header, end, start } = require("./html");
 // - subHeader - The subheader of the email
 // - body - The body of the email
 
-// Optional Strings (Have default values)
-// - footer - The footer of the email
-// - dateLine - The date line of the email
-
-const defaultFooter = () => {
-  return RenderInstanceManager({
-    imex: "ImEX Online Collision Repair Management System",
-    rome: "Rome Technologies"
-  });
-};
-
-const now = () => moment().format("MM/DD/YYYY @ hh:mm a");
-
 /**
  * Generate the email template
  * @param strings
@@ -32,81 +17,48 @@ const generateEmailTemplate = (strings) => {
     header +
     start +
     `
-<table class="row">
-    <tbody>
-        <tr>
-          <th class="small-12 large-12 columns first last">
-            <table>
-                <tbody>
-                    <tr>
-                        <td>
-                            <h6 style="text-align:left"><strong>${strings.header}</strong></h6>
-                        </td>
-                    </tr>
-                     <tr>
-                        <td>
-                            <p style="font-size:90%">${strings.subHeader}</p>
-                        </td>
-                    </tr>
-                </tbody>
-            </table>
-          </th>
-        </tr>
-    </tbody>
-</table>
+<!-- Report Title -->
+    ${
+      strings.header &&
+      `
+    <table class="row" style="border-spacing: 0; border-collapse: collapse; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; padding: 0; width: 100%; position: relative; display: table;"><tbody style="font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; display: table-row-group;"><tr style="padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif;">
+        <th class="small-12 large-12 columns first last" style="word-wrap: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; vertical-align: top; color: #0a0a0a; font-weight: normal; padding-top: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 15px; line-height: 1.2; margin: 0 auto; Margin: 0 auto; padding-bottom: 8px; width: 734px; padding-left: 8px; padding-right: 8px; border-collapse: collapse;"><table style="border-spacing: 0; border-collapse: collapse; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; width: 100%;">
+            <tr style="padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif;"><td style="word-wrap: break-word; vertical-align: top; color: #0a0a0a; font-weight: normal; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; margin: 0; Margin: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 15px; word-break: keep-all; -moz-hyphens: none; -ms-hyphens: none; -webkit-hyphens: none; hyphens: none; line-height: 1.2; border-collapse: collapse;">
+                <h6 style="padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; margin: 0; Margin: 0; color: inherit; word-wrap: normal; font-weight: normal; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 23px; line-height: 1.2; margin-bottom: 0px; Margin-bottom: 0px; text-align: center;"><strong style="font-family: 'Montserrat', 'Montserrat Alternates', sans-serif;">${strings.header}</strong></h6>
+            </td></tr>
+        </tbody></table></th>
+    </tr></tbody></table>
+    `
+    }
+    ${
+      strings.subHeader &&
+      `
+    <table class="row" style="border-spacing: 0; border-collapse: collapse; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; padding: 0; width: 100%; position: relative; display: table;"><tbody style="font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; display: table-row-group;"><tr style="padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif;">
+        <th class="small-12 large-12 columns first last" style="word-wrap: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; vertical-align: top; color: #0a0a0a; font-weight: normal; padding-top: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 15px; line-height: 1.2; margin: 0 auto; Margin: 0 auto; padding-bottom: 16px; width: 734px; padding-left: 8px; padding-right: 8px; border-collapse: collapse;"><table style="border-spacing: 0; border-collapse: collapse; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; width: 100%;">
+            <tr style="padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif;"><td style="word-wrap: break-word; vertical-align: top; color: #0a0a0a; font-weight: normal; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; margin: 0; Margin: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 15px; word-break: keep-all; -moz-hyphens: none; -ms-hyphens: none; -webkit-hyphens: none; hyphens: none; line-height: 1.2; border-collapse: collapse;">
+                <p style="color: #0a0a0a; font-weight: normal; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; margin: 0 0 0 0px; Margin: 0 0 0 0px; line-height: 1.2; margin-bottom: 0px; Margin-bottom: 0px; font-size: 95%;">${strings.subHeader}</p>
+            </td></tr>
+        </tbody></table></th>
+    </tr></tbody></table>
+    `
+    }
 <!-- End Report Title -->
-<!-- Task Detail -->
-<table class="row">
-    <tbody>
-        <tr>
-            <th class="small-12 large-12 columns first last">
-                <table>
-                    <tbody>
-                        <tr>
-                            <td>${strings.body}</td>
-                        </tr>
-                    </tbody>
-                </table>
-            </th>
-        </tr>
-    </tbody>
-</table>
-<!-- End Task Detail -->
-<!-- Footer -->
-<table class="row collapsed footer" id="non-printable">
-    <tbody>
-        <tr>
-            <th class="small-3 large-3 columns first">
-                <table>
-                    <tbody>
-                        <tr>
-                            <td><p style="font-size:70%; padding-right:10px">${strings?.dateLine || now()}</p></td>
-                        </tr>
-                    </tbody>
-                </table>
-            </th>
-             <th class="small-6 large-6 columns">
-                <table>
-                    <tbody>
-                        <tr>
-                            <td><p style="font-size:70%; text-align:center">${strings?.footer || defaultFooter()}</p></td>
-                        </tr>
-                    </tbody>
-                </table>
-            </th>
-            <th class="small-3 large-3 columns last">
-                <table>
-                    <tbody>
-                        <tr>
-                            <td><p style="font-size:70%">&nbsp;</p></td>
-                        </tr>
-                    </tbody>
-                </table>
-            </th>
-        </tr>
-    </tbody>
-</table>` +
-    end
+    ${
+      strings.body &&
+      `
+<!-- Report Detail -->
+    <table class="row" style="border-spacing: 0; border-collapse: collapse; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; padding: 0; width: 100%; position: relative; display: table;"><tbody style="font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; display: table-row-group;"><tr style="padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif;">
+        <th class="small-12 large-12 columns first last" style="word-wrap: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; vertical-align: top; color: #0a0a0a; font-weight: normal; padding-top: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 15px; line-height: 1.2; margin: 0 auto; Margin: 0 auto; padding-bottom: 16px; width: 734px; padding-left: 8px; padding-right: 8px; border-collapse: collapse;"><table style="border-spacing: 0; border-collapse: collapse; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; width: 100%;">
+            <tr style="padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif;"><td style="word-wrap: break-word; vertical-align: top; color: #0a0a0a; font-weight: normal; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; margin: 0; Margin: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 15px; word-break: keep-all; -moz-hyphens: none; -ms-hyphens: none; -webkit-hyphens: none; hyphens: none; line-height: 1.2; border-collapse: collapse;">
+                ${strings.body}
+            </td></tr>
+        </tbody></table></th>
+    </tr></tbody></table>
+<!-- End Report Detail -->
+    `
+    }
+    ` +
+    end(strings.dateLine)
   );
 };
 

server/email/sendemail.js

@@ -40,7 +40,9 @@ const logEmail = async (req, email) => {
       to: req?.body?.to,
       cc: req?.body?.cc,
       subject: req?.body?.subject,
-      email
+      email,
+      errorMessage: error?.message,
+      errorStack: error?.stack
       // info,
     });
   }
@@ -68,6 +70,7 @@ const sendServerEmail = async ({ subject, text }) => {
           ]
         }
       },
+      // eslint-disable-next-line no-unused-vars
       (err, info) => {
         logger.log("server-email-failure", err ? "error" : "debug", null, null, {
           message: err?.message,
@@ -80,6 +83,108 @@ const sendServerEmail = async ({ subject, text }) => {
   }
 };
 
+const sendWelcomeEmail = async ({ to, resetLink, dateLine, features, bcc }) => {
+  try {
+    await mailer.sendMail({
+      from: InstanceManager({
+        imex: `ImEX Online <noreply@imex.online>`,
+        rome: `Rome Online <noreply@romeonline.io>`
+      }),
+      to,
+      bcc,
+      subject: InstanceManager({
+        imex: "Welcome to the ImEX Online platform.",
+        rome: "Welcome to the Rome Online platform."
+      }),
+      html: generateEmailTemplate({
+        header: InstanceManager({
+          imex: "Welcome to the ImEX Online platform.",
+          rome: "Welcome to the Rome Online platform."
+        }),
+        subHeader: `Your ${InstanceManager({imex: features?.allAccess ? "ImEX Online": "ImEX Lite", rome: features?.allAccess ? "RO Manager" : "RO Basic"})} shop setup has been completed, and this email will include all the information you need to begin.`,
+        body: `
+                <p style="color: #0a0a0a; font-weight: normal; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; margin: 0 0 0 0px; Margin: 0 0 0 0px; line-height: 1.2; margin-bottom: 0px; Margin-bottom: 0px; font-size: 90%;">To finish setting up your account, visit this link and enter your desired password. <a href=${resetLink} style="color: #2199e8; text-decoration: none; font-weight: normal; padding: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 90%; line-height: 1.2;">Reset Password</a></p>
+              </td></tr>
+            </tbody></table></th>
+          </tr></tbody></table>
+          <table class="row" style="border-spacing: 0; border-collapse: collapse; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; padding: 0; width: 100%; position: relative; display: table;"><tbody style="font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; display: table-row-group;"><tr style="padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif;">
+            <th class="small-12 large-12 columns first last" style="word-wrap: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; vertical-align: top; color: #0a0a0a; font-weight: normal; padding-top: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 15px; line-height: 1.2; margin: 0 auto; Margin: 0 auto; padding-bottom: 16px; width: 734px; padding-left: 8px; padding-right: 8px; border-collapse: collapse;"><table style="border-spacing: 0; border-collapse: collapse; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; width: 100%;">
+              <tr style="padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif;"><td style="word-wrap: break-word; vertical-align: top; color: #0a0a0a; font-weight: normal; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; margin: 0; Margin: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 15px; word-break: keep-all; -moz-hyphens: none; -ms-hyphens: none; -webkit-hyphens: none; hyphens: none; line-height: 1.2; border-collapse: collapse;">
+                <p style="color: #0a0a0a; font-weight: normal; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; margin: 0 0 0 0px; Margin: 0 0 0 0px; line-height: 1.2; margin-bottom: 0px; Margin-bottom: 0px; font-size: 90%;">To access your ${InstanceManager({imex: features.allAccess ? "ImEX Online": "ImEX Lite", rome: features.allAccess ? "RO Manager" : "RO Basic"})} shop, visit <a href=${InstanceManager({imex: "https://imex.online/", rome: "https://romeonline.io/"})} style="color: #2199e8; text-decoration: none; font-weight: normal; padding: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 90%; line-height: 1.2;">${InstanceManager({imex: "imex.online", rome: "romeonline.io"})}</a>. Your username is your email, and your password is what you previously set up. Contact support for additional logins.</p>
+              </td></tr>
+            </tbody></table></th>
+          </tr></tbody></table>
+          ${InstanceManager({
+          rome: `
+            <table class="row" style="border-spacing: 0; border-collapse: collapse; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; padding: 0; width: 100%; position: relative; display: table;"><tbody style="font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; display: table-row-group;"><tr style="padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif;">
+              <th class="small-12 large-12 columns first last" style="word-wrap: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; vertical-align: top; color: #0a0a0a; font-weight: normal; padding-top: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 15px; line-height: 1.2; margin: 0 auto; Margin: 0 auto; padding-bottom: 16px; width: 734px; padding-left: 8px; padding-right: 8px; border-collapse: collapse;"><table style="border-spacing: 0; border-collapse: collapse; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; width: 100%;">
+                <tr style="padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif;"><td style="word-wrap: break-word; vertical-align: top; color: #0a0a0a; font-weight: normal; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; margin: 0; Margin: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 15px; word-break: keep-all; -moz-hyphens: none; -ms-hyphens: none; -webkit-hyphens: none; hyphens: none; line-height: 1.2; border-collapse: collapse;">
+                  <p style="color: #0a0a0a; font-weight: normal; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; margin: 0 0 0 0px; Margin: 0 0 0 0px; line-height: 1.2; margin-bottom: 0px; Margin-bottom: 0px; font-size: 90%;">To push estimates over from your estimating system, you must download the Web-Est EMS Unzipper & Rome Online Partner (Computers using Windows only). Here are some steps to help you get started.</p>
+                </td><tr>
+                <tr style="padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif;"><td style="word-wrap: break-word; vertical-align: top; color: #0a0a0a; font-weight: normal; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; margin: 0; Margin: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 15px; word-break: keep-all; -moz-hyphens: none; -ms-hyphens: none; -webkit-hyphens: none; hyphens: none; line-height: 1.2; border-collapse: collapse;">
+                  <ul style="font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; margin: 1%; padding-left: 30px;">
+                    <li style="font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 90%;">Download and set up the Web-Est EMS Unzipper - <a href="https://help.imex.online/en/article/how-to-set-up-the-ems-unzip-downloader-on-web-est-n9hbcv/" style="color: #2199e8; text-decoration: none; font-weight: normal; padding: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 90%; line-height: 1.2;">How to setup the EMS Unzip Downloader on Web-Est</a></li>
+                    <li style="font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 90%;">Download and set up Rome Online Partner - <a href="https://help.imex.online/en/article/setting-up-the-rome-online-partner-1xsw8tb/" style="color: #2199e8; text-decoration: none; font-weight: normal; padding: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 90%; line-height: 1.2;">Setting up the Rome Online Partner</a></li>
+                  </ul>
+                </td></tr>
+              </tbody></table></th>
+            </tr></tbody></table>
+            <table class="row" style="border-spacing: 0; border-collapse: collapse; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; padding: 0; width: 100%; position: relative; display: table;"><tbody style="font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; display: table-row-group;"><tr style="padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif;">
+              <th class="small-12 large-12 columns first last" style="word-wrap: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; vertical-align: top; color: #0a0a0a; font-weight: normal; padding-top: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 15px; line-height: 1.2; margin: 0 auto; Margin: 0 auto; padding-bottom: 16px; width: 734px; padding-left: 8px; padding-right: 8px; border-collapse: collapse;"><table style="border-spacing: 0; border-collapse: collapse; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; width: 100%;">
+                <tr style="padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif;"><td style="word-wrap: break-word; vertical-align: top; color: #0a0a0a; font-weight: normal; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; margin: 0; Margin: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 15px; word-break: keep-all; -moz-hyphens: none; -ms-hyphens: none; -webkit-hyphens: none; hyphens: none; line-height: 1.2; border-collapse: collapse;">
+                  <p style="color: #0a0a0a; font-weight: normal; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; margin: 0 0 0 0px; Margin: 0 0 0 0px; line-height: 1.2; margin-bottom: 0px; Margin-bottom: 0px; font-size: 90%;">Once you successfully set up the partner, now it's time to do some initial in-product items: Please note, <b>an estimate must be exported from the estimating platform to use tours.</b></p>
+                </td><tr>
+                <tr style="padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif;"><td style="word-wrap: break-word; vertical-align: top; color: #0a0a0a; font-weight: normal; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; margin: 0; Margin: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 15px; word-break: keep-all; -moz-hyphens: none; -ms-hyphens: none; -webkit-hyphens: none; hyphens: none; line-height: 1.2; border-collapse: collapse;">
+                  <ul style="font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; margin: 1%; padding-left: 30px;">
+                    <li style="font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 90%;">Send estimate from Web-Est to RO Basic - <a href="https://help.imex.online/en/article/how-to-send-estimates-from-web-est-to-the-management-system-ox0h9a/" style="color: #2199e8; text-decoration: none; font-weight: normal; padding: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 90%; line-height: 1.2;">How to setup the EMS Unzip Downloader on Web-Est</a></li>
+                    <li style="font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 90%;">Once completed, learn how to use RO Basic by accessing the tours at the bottom middle of the screen (labeled “Training Tours”). These walkthroughs will show you how to navigate from creating an RO to closing an RO - <a href="https://www.youtube.com/watch?v=gcbSe5med0I" style="color: #2199e8; text-decoration: none; font-weight: normal; padding: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 90%; line-height: 1.2;">ROME Collision Management Youtube Training Videos</a></li>
+                  </ul>
+                </td></tr>
+              </tbody></table></th>
+            </tr></tbody></table>
+            <table class="row" style="border-spacing: 0; border-collapse: collapse; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; padding: 0; width: 100%; position: relative; display: table;"><tbody style="font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; display: table-row-group;"><tr style="padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif;">
+              <th class="small-12 large-12 columns first last" style="word-wrap: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; vertical-align: top; color: #0a0a0a; font-weight: normal; padding-top: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 15px; line-height: 1.2; margin: 0 auto; Margin: 0 auto; padding-bottom: 16px; width: 734px; padding-left: 8px; padding-right: 8px; border-collapse: collapse;"><table style="border-spacing: 0; border-collapse: collapse; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; width: 100%;">
+                <tr style="padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif;"><td style="word-wrap: break-word; vertical-align: top; color: #0a0a0a; font-weight: normal; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; margin: 0; Margin: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 15px; word-break: keep-all; -moz-hyphens: none; -ms-hyphens: none; -webkit-hyphens: none; hyphens: none; line-height: 1.2; border-collapse: collapse;">
+                  <p style="color: #0a0a0a; font-weight: normal; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; margin: 0 0 0 0px; Margin: 0 0 0 0px; line-height: 1.2; margin-bottom: 0px; Margin-bottom: 0px; font-size: 90%;">If you need any assistance with setting up the programs, or if you want a dedicated Q&A session with one of our customer success specialists, schedule by clicking this link - <a href="https://rometech.zohobookings.com/#/PSAT" style="color: #2199e8; text-decoration: none; font-weight: normal; padding: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 90%; line-height: 1.2;">Rome Basic Training Booking</a></p>
+                </td></tr>
+              </tbody></table></th>
+            </tr></tbody></table>
+            <table class="row" style="border-spacing: 0; border-collapse: collapse; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; padding: 0; width: 100%; position: relative; display: table;"><tbody style="font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; display: table-row-group;"><tr style="padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif;">
+              <th class="small-12 large-12 columns first last" style="word-wrap: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; vertical-align: top; color: #0a0a0a; font-weight: normal; padding-top: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 15px; line-height: 1.2; margin: 0 auto; Margin: 0 auto; padding-bottom: 16px; width: 734px; padding-left: 8px; padding-right: 8px; border-collapse: collapse;"><table style="border-spacing: 0; border-collapse: collapse; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; width: 100%;">
+                <tr style="padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif;"><td style="word-wrap: break-word; vertical-align: top; color: #0a0a0a; font-weight: normal; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; margin: 0; Margin: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 15px; word-break: keep-all; -moz-hyphens: none; -ms-hyphens: none; -webkit-hyphens: none; hyphens: none; line-height: 1.2; border-collapse: collapse;">
+                  <p style="color: #0a0a0a; font-weight: normal; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; margin: 0 0 0 0px; Margin: 0 0 0 0px; line-height: 1.2; margin-bottom: 0px; Margin-bottom: 0px; font-size: 90%;">If you have additional questions or need any support, feel free to use the RO Basic support chat (blue chat box located in the bottom right corner) or give us a call at <a href="tel:14103576700" style="color: #2199e8; text-decoration: none; font-weight: normal; padding: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 90%; line-height: 1.2;">(410) 357-6700</a>. We are here to help make your experience seamless!</p>
+                </td></tr>
+              </tbody></table></th>
+            </tr></tbody></table>
+          `
+          })}
+          <table class="row" style="border-spacing: 0; border-collapse: collapse; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; padding: 0; width: 100%; position: relative; display: table;"><tbody style="font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; display: table-row-group;"><tr style="padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif;">
+            <th class="small-12 large-12 columns first last" style="word-wrap: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; vertical-align: top; color: #0a0a0a; font-weight: normal; padding-top: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 15px; line-height: 1.2; margin: 0 auto; Margin: 0 auto; padding-bottom: 16px; width: 734px; padding-left: 8px; padding-right: 8px; border-collapse: collapse;"><table style="border-spacing: 0; border-collapse: collapse; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; width: 100%;">
+              <tr style="padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif;"><td style="word-wrap: break-word; vertical-align: top; color: #0a0a0a; font-weight: normal; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; margin: 0; Margin: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 15px; word-break: keep-all; -moz-hyphens: none; -ms-hyphens: none; -webkit-hyphens: none; hyphens: none; line-height: 1.2; border-collapse: collapse;">
+                <p style="color: #0a0a0a; font-weight: normal; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; margin: 0 0 0 0px; Margin: 0 0 0 0px; line-height: 1.2; margin-bottom: 0px; Margin-bottom: 0px; font-size: 90%;">In addition to the training tour, you can also book a live one-on-one demo to see exactly how our system can help streamline the repair process at your shop, schedule by clicking this link - <a href="https://outlook.office.com/bookwithme/user/0aa3ae2c6d59497d9f93fb72479848dc@imexsystems.ca/meetingtype/Qy7CsXl5MkuUJ0NRD7B1AA2?anonymous&ep=mlink" style="color: #2199e8; text-decoration: none; font-weight: normal; padding: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 90%; line-height: 1.2;">${InstanceManager({imex: "ImEX Lite", rome: "Rome Basic"})} Demo Booking</a></p>
+              </td></tr>
+            </tbody></table></th>
+          </tr></tbody></table>
+          <table class="row" style="border-spacing: 0; border-collapse: collapse; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; padding: 0; width: 100%; position: relative; display: table;"><tbody style="font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; display: table-row-group;"><tr style="padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif;">
+            <th class="small-12 large-12 columns first last" style="word-wrap: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; vertical-align: top; color: #0a0a0a; font-weight: normal; padding-top: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 15px; line-height: 1.2; margin: 0 auto; Margin: 0 auto; padding-bottom: 8px; width: 734px; padding-left: 0px; padding-right: 8px; border-collapse: collapse;"><table style="border-spacing: 0; border-collapse: collapse; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; width: 100%;">
+              <tr style="padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif;"><td style="word-wrap: break-word; vertical-align: top; color: #0a0a0a; font-weight: normal; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; margin: 0; Margin: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 15px; word-break: keep-all; -moz-hyphens: none; -ms-hyphens: none; -webkit-hyphens: none; hyphens: none; line-height: 1.2; border-collapse: collapse;">
+                <p style="color: #0a0a0a; font-weight: normal; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; margin: 0 0 0 0px; Margin: 0 0 0 0px; line-height: 1.2; margin-bottom: 0px; Margin-bottom: 0px; font-size: 90%;">Thanks,</p>
+              </td></tr>
+            </tbody></table></th>
+          </tr></tbody></table>
+          <table class="row" style="border-spacing: 0; border-collapse: collapse; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; padding: 0; width: 100%; position: relative; display: table;"><tbody style="font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; display: table-row-group;"><tr style="padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif;">
+            <th class="small-12 large-12 columns first last" style="word-wrap: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; vertical-align: top; color: #0a0a0a; font-weight: normal; padding-top: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 15px; line-height: 1.2; margin: 0 auto; Margin: 0 auto; padding-bottom: 8px; width: 734px; padding-left: 0px; padding-right: 8px; border-collapse: collapse;"><table style="border-spacing: 0; border-collapse: collapse; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; width: 100%;">
+              <tr style="padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif;"><td style="word-wrap: break-word; vertical-align: top; color: #0a0a0a; font-weight: normal; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; margin: 0; Margin: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 15px; word-break: keep-all; -moz-hyphens: none; -ms-hyphens: none; -webkit-hyphens: none; hyphens: none; line-height: 1.2; border-collapse: collapse;">
+                <p style="color: #0a0a0a; font-weight: normal; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; margin: 0 0 0 0px; Margin: 0 0 0 0px; line-height: 1.2; margin-bottom: 0px; Margin-bottom: 0px; font-size: 90%;">The ${InstanceManager({imex: "ImEX Online", rome: "Rome Online"})} Team</p>
+        `,
+        dateLine
+      })
+    });
+  } catch (error) {
+    logger.log("server-email-failure", "error", null, null, { error });
+  }
+};
+
 const sendTaskEmail = async ({ to, subject, type = "text", html, text, attachments }) => {
   try {
     mailer.sendMail(
@@ -93,6 +198,7 @@ const sendTaskEmail = async ({ to, subject, type = "text", html, text, attachmen
         ...(type === "text" ? { text } : { html }),
         attachments: attachments || null
       },
+      // eslint-disable-next-line no-unused-vars
       (err, info) => {
         // (message, type, user, record, meta
         logger.log("server-email", err ? "error" : "debug", null, null, { message: err?.message, stack: err?.stack });
@@ -143,22 +249,20 @@ const sendEmail = async (req, res) => {
       to: req.body.to,
       cc: req.body.cc,
       subject: req.body.subject,
-      attachments:
-        [
-          ...((req.body.attachments &&
-            req.body.attachments.map((a) => {
-              return {
-                filename: a.filename,
-                path: a.path
-              };
-            })) ||
-            []),
-          ...downloadedMedia.map((a) => {
+      attachments: [
+        ...(req.body.attachments &&
+          req.body.attachments.map((a) => {
             return {
-              path: a
+              filename: a.filename,
+              path: a.path
             };
-          })
-        ] || null,
+          })),
+        ...downloadedMedia.map((a) => {
+          return {
+            path: a
+          };
+        })
+      ],
       html: isObject(req.body?.templateStrings) ? generateEmailTemplate(req.body.templateStrings) : req.body.html,
       ses: {
         // optional extra arguments for SendRawEmail
@@ -273,6 +377,7 @@ ${body.bounce?.bouncedRecipients.map(
 )}
         `
         },
+        // eslint-disable-next-line no-unused-vars
         (err, info) => {
           logger.log("sns-error", err ? "error" : "debug", "api", null, {
             errorMessage: err?.message,
@@ -294,5 +399,6 @@ module.exports = {
   sendEmail,
   sendServerEmail,
   sendTaskEmail,
-  emailBounce
+  emailBounce,
+  sendWelcomeEmail
 };

server/email/tasksEmails.js

@@ -17,11 +17,13 @@ const { formatTaskPriority } = require("../notifications/stringHelpers");
 const tasksEmailQueue = taskEmailQueue();
 
 // Cleanup function for the Tasks Email Queue
+// eslint-disable-next-line no-unused-vars
 const tasksEmailQueueCleanup = async () => {
   try {
     // Example async operation
     // console.log("Performing Tasks Email Reminder process cleanup...");
     await new Promise((resolve) => tasksEmailQueue.destroy(() => resolve()));
+  // eslint-disable-next-line no-unused-vars
   } catch (err) {
     // console.error("Tasks Email Reminder process cleanup failed:", err);
   }
@@ -254,10 +256,15 @@ const tasksRemindEmail = async (req, res) => {
           header: `${allTasks.length} Tasks require your attention`,
           subHeader: `Please click on the Tasks below to view the Task.`,
           dateLine,
-          body: `<ul>
+          body: `
+            <ul style="font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 90%; margin: 1%; padding-left: 30px;">
               ${allTasks
                 .map((task) =>
-                  `<li><a href="${InstanceEndpoints()}/manage/tasks/alltasks?taskid=${task.id}">${task.title} - Priority: ${formatTaskPriority(task.priority)} ${task.due_date ? `${formatDate(task.due_date)}` : ""} | Bodyshop: ${task.bodyshop.shopname}</a></li>`.trim()
+                  `
+                    <li style="font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 90%;">
+                      <a href="${InstanceEndpoints()}/manage/tasks/alltasks?taskid=${task.id}" style="color: #2199e8; text-decoration: none; font-weight: normal; padding: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 90%; line-height: 1.2;">${task.title} - Priority: ${formatTaskPriority(task.priority)} ${task.due_date ? `${formatDate(task.due_date)}` : ""} | Bodyshop: ${task.bodyshop.shopname}</a>
+                    </li>
+                  `.trim()  
                 )
                 .join("")}
             </ul>`

server/firebase/firebase-handler.js

@@ -1,14 +1,10 @@
-const path = require("path");
-require("dotenv").config({
-  path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`)
-});
-
-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 generateEmailTemplate = require("../email/generateTemplate");
+const admin = require("firebase-admin");
+const moment = require("moment-timezone");
+const logger = require("../utils/logger");
+const client = require("../graphql-client/graphql-client").client;
+const { sendWelcomeEmail } = require("../email/sendemail");
+const { GET_USER_BY_EMAIL } = require("../graphql-client/queries");
 
 admin.initializeApp({
   credential: admin.credential.cert(serviceAccount),
@@ -201,6 +197,94 @@ const unsubscribe = async (req, res) => {
   }
 };
 
+const getWelcomeEmail = async (req, res) => {
+  const { authid, email, bcc } = req.body;
+
+  try {
+    // Fetch user from Firebase
+    const userRecord = await admin.auth().getUser(authid);
+    if (!userRecord) {
+      throw { status: 404, message: "User not found in Firebase." };
+    }
+
+    // Fetch user data from the database using GraphQL
+    const dbUserResult = await client.request(GET_USER_BY_EMAIL, { email: email.toLowerCase() });
+
+    const dbUser = dbUserResult?.users?.[0];
+    if (!dbUser) {
+      throw { status: 404, message: "User not found in database." };
+    }
+
+    // Validate email before proceeding
+    if (!dbUser.validemail) {
+      logger.log("admin-send-welcome-email-skip", "debug", 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." });
+    }
+
+    // Generate password reset link
+    const resetLink = await admin.auth().generatePasswordResetLink(dbUser.email);
+
+    // Send welcome email
+    await sendWelcomeEmail({
+      to: dbUser.email,
+      resetLink,
+      dateLine: moment().tz(dbUser.associations?.[0]?.bodyshop?.timezone).format("MM/DD/YYYY @ hh:mm a"),
+      features: dbUser.associations?.[0]?.bodyshop?.features,
+      bcc
+    });
+
+    // Log success and return response
+    logger.log("admin-send-welcome-email", "debug", req.user.email, null, {
+      request: req.body,
+      ioadmin: true,
+      emailSentTo: email
+    });
+
+    return 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) {
+      return res.status(error.status || 500).json({
+        message: error.message || "Error sending welcome email.",
+        error
+      });
+    }
+  }
+};
+
+const getResetLink = async (req, res) => {
+  const { authid, email } = req.body;
+  logger.log("admin-reset-link", "debug", req.user.email, null, { authid, email });
+
+  try {
+    // Fetch user from Firebase
+    const userRecord = await admin.auth().getUser(authid);
+    if (!userRecord) {
+      throw { status: 404, message: "User not found in Firebase." };
+    }
+
+    // Generate password reset link
+    const resetLink = await admin.auth().generatePasswordResetLink(email);
+
+    // Log success and return response
+    logger.log("admin-reset-link-success", "debug", req.user.email, null, {
+      request: req.body,
+      ioadmin: true
+    });
+
+    return res.status(200).json({ message: "Reset link generated successfully.", resetLink });
+  } catch (error) {
+    return res.status(error.status || 500).json({
+      message: error.message || "Error generating reset link.",
+      error
+    });
+  }
+};
+
 module.exports = {
   admin,
   createUser,
@@ -208,23 +292,7 @@ module.exports = {
   getUser,
   sendNotification,
   subscribe,
-  unsubscribe
+  unsubscribe,
+  getWelcomeEmail,
+  getResetLink
 };
-
-//Admin claims code.
-// const uid = "JEqqYlsadwPEXIiyRBR55fflfko1";
-
-// admin
-//   .auth()
-//   .getUser(uid)
-//   .then((user) => {
-//     console.log(user);
-//     admin.auth().setCustomUserClaims(uid, {
-//       ioadmin: true,
-//       "https://hasura.io/jwt/claims": {
-//         "x-hasura-default-role": "debug",
-//         "x-hasura-allowed-roles": ["admin"],
-//         "x-hasura-user-id": uid,
-//       },
-//     });
-//   });

server/graphql-client/graphql-client.js

@@ -1,17 +1,19 @@
 const GraphQLClient = require("graphql-request").GraphQLClient;
-const path = require("path");
-require("dotenv").config({
-  path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`)
-});
+
 //New bug introduced with Graphql Request.
 // https://github.com/prisma-labs/graphql-request/issues/206
 // const { Headers } = require("cross-fetch");
 // global.Headers = global.Headers || Headers;
 
-exports.client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {
+const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {
   headers: {
     "x-hasura-admin-secret": process.env.HASURA_ADMIN_SECRET
   }
 });
 
-exports.unauthclient = new GraphQLClient(process.env.GRAPHQL_ENDPOINT);
+const unauthorizedClient = new GraphQLClient(process.env.GRAPHQL_ENDPOINT);
+
+module.exports = {
+  client,
+  unauthorizedClient
+};

server/graphql-client/queries.js

@@ -1323,6 +1323,27 @@ exports.KAIZEN_QUERY = `query KAIZEN_EXPORT($start: timestamptz, $bodyshopid: uu
   }
 }`;
 
+exports.PODIUM_QUERY = `query PODIUM_EXPORT($start: timestamptz, $bodyshopid: uuid!, $end: timestamptz) {
+  bodyshops_by_pk(id: $bodyshopid){
+    id
+    shopname 
+    podiumid
+    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}}]}]}) {
+    actual_delivery
+    id
+    created_at
+    ro_number
+    ownr_fn
+    ownr_ln
+    ownr_co_nm
+    ownr_ph1
+    ownr_ph2
+    ownr_ea
+  }
+}`;
+
 exports.UPDATE_JOB = `
   mutation UPDATE_JOB($jobId: uuid!, $job: jobs_set_input!) {
     update_jobs(where: { id: { _eq: $jobId } }, _set: $job) {
@@ -1848,6 +1869,16 @@ exports.GET_KAIZEN_SHOPS = `query GET_KAIZEN_SHOPS($imexshopid: [String]) {
   }
 }`;
 
+exports.GET_PODIUM_SHOPS = `query GET_PODIUM_SHOPS {
+  bodyshops(where: {podiumid: {_is_null: false}, _or: {podiumid: {_neq: ""}}}){
+    id
+    shopname
+    podiumid
+    imexshopid
+    timezone
+  }
+}`;
+
 exports.DELETE_ALL_DMS_VEHICLES = `mutation DELETE_ALL_DMS_VEHICLES{
   delete_dms_vehicles(where: {}) {
     affected_rows
@@ -2832,3 +2863,68 @@ exports.GET_DOCUMENTS_BY_IDS = `
     takenat
   }
 }`;
+
+exports.GET_JOBID_BY_MERCHANTID_RONUMBER = `
+query GET_JOBID_BY_MERCHANTID_RONUMBER($merchantID: String!, $roNumber: String!) {
+  jobs(where: {ro_number: {_eq: $roNumber}, bodyshop: {intellipay_merchant_id: {_eq: $merchantID}}}) {
+    id
+    shopid
+    bodyshop {
+      id
+      intellipay_config
+      email
+    }
+  }
+}`;
+
+exports.GET_BODYSHOP_BY_MERCHANT_ID = `
+query GET_BODYSHOP_BY_MERCHANTID($merchantID: String!) {
+  bodyshops(where: {intellipay_merchant_id: {_eq: $merchantID}}) {
+    id
+    email
+  }
+}`;
+
+exports.GET_USER_BY_EMAIL = `
+query GET_USER_BY_EMAIL($email: String!) {
+  users(where: {email: {_eq: $email}}) {
+    email
+    validemail
+    associations {
+      id
+      shopid
+      bodyshop {
+        id
+        convenient_company
+        features
+        timezone
+      }
+    }
+  }
+}`;
+
+// Define the GraphQL query to get a job by RO number and shop ID
+exports.GET_JOB_BY_RO_NUMBER_AND_SHOP_ID = `
+  query GET_JOB_BY_RO_NUMBER_AND_SHOP_ID($roNumber: String!, $shopId: uuid!) {
+    jobs(where: {ro_number: {_eq: $roNumber}, shopid: {_eq: $shopId}}, limit: 1) {
+      id
+      shopid
+      bodyshop {
+        timezone
+      }
+    }
+  }
+`;
+
+// Define the mutation to insert a new document
+exports.INSERT_NEW_DOCUMENT = `
+  mutation INSERT_NEW_DOCUMENT($docInput: [documents_insert_input!]!) {
+    insert_documents(objects: $docInput) {
+      returning {
+        id
+        name
+        key
+      }
+    }
+  }
+`;

server/integrations/VSSTA/vsstaIntegrationRoute.js

@@ -0,0 +1,143 @@
+// Notes: At the moment we take in RO Number, and ShopID. This is not very good considering the RO number can often be null, need
+// to ask if it is possible that we just send the Job ID itself, this way we don't need to really care about the bodyshop, and we
+// don't risk getting a null
+
+const axios = require("axios");
+const { S3Client, PutObjectCommand } = require("@aws-sdk/client-s3");
+const { getSignedUrl } = require("@aws-sdk/s3-request-presigner");
+const { GET_JOB_BY_RO_NUMBER_AND_SHOP_ID, INSERT_NEW_DOCUMENT } = require("../../graphql-client/queries");
+const { InstanceRegion } = require("../../utils/instanceMgr");
+const moment = require("moment/moment");
+const client = require("../../graphql-client/graphql-client").client;
+
+const S3_BUCKET = process.env?.IMGPROXY_DESTINATION_BUCKET;
+
+/**
+ * @description VSSTA integration route
+ * @type {string[]}
+ */
+const requiredParams = [
+  "shop_id",
+  "ro_nbr",
+  "pdf_download_link",
+  "company_api_key",
+  "scan_type",
+  "scan_time",
+  "technician",
+  "year",
+  "make",
+  "model"
+];
+
+const vsstaIntegrationRoute = async (req, res) => {
+  const { logger } = req;
+
+  if (!S3_BUCKET) {
+    logger.log("vssta-integration-missing-bucket", "error", "api", "vssta");
+    return res.status(500).json({ error: "Improper configuration" });
+  }
+
+  try {
+    const missingParams = requiredParams.filter((param) => !req.body[param]);
+
+    if (missingParams.length > 0) {
+      logger.log(`vssta-integration-missing-param`, "error", "api", "vssta", {
+        params: missingParams
+      });
+
+      return res.status(400).json({
+        error: "Missing required parameters",
+        missingParams
+      });
+    }
+
+    // technician, year, make, model, is also available.
+    const { shop_id, ro_nbr, pdf_download_link, scan_type, scan_time, company_api_key } = req.body;
+
+    // 1. Get the job record by ro_number and shop_id
+    const jobResult = await client.request(GET_JOB_BY_RO_NUMBER_AND_SHOP_ID, {
+      roNumber: ro_nbr,
+      shopId: shop_id
+    });
+
+    if (!jobResult.jobs || jobResult.jobs.length === 0) {
+      logger.log(`vssta-integration-missing-ro`, "error", "api", "vssta");
+
+      return res.status(404).json({ error: "Job not found" });
+    }
+
+    const job = jobResult.jobs[0];
+
+    // 2. Download the base64-encoded PDF string from the provided link
+    const pdfResponse = await axios.get(pdf_download_link, {
+      responseType: "text", // Expect base64 string
+      headers: {
+        "auth-token": company_api_key
+      }
+    });
+
+    // 3. Decode the base64 string to a PDF buffer
+    const base64String = pdfResponse.data.replace(/^data:application\/pdf;base64,/, "");
+    const pdfBuffer = Buffer.from(base64String, "base64");
+
+    // 4. Generate key for S3
+    const timestamp = moment(scan_time).tz(job.bodyshop.timezone).format("YYYYMMDD-HHmmss");
+    const fileName = `${timestamp}_VSSTA_${scan_type}`;
+    const s3Key = `${job.shopid}/${job.id}/${fileName.replace(/[^A-Z0-9]+/gi, "_")}.pdf`;
+
+    // 5. Generate presigned URL for S3 upload
+    const s3Client = new S3Client({ region: InstanceRegion() });
+
+    const putCommand = new PutObjectCommand({
+      Bucket: S3_BUCKET,
+      Key: s3Key,
+      ContentType: "application/pdf",
+      StorageClass: "INTELLIGENT_TIERING"
+    });
+
+    const presignedUrl = await getSignedUrl(s3Client, putCommand, { expiresIn: 360 });
+
+    // 6. Upload the decoded PDF to S3
+    await axios.put(presignedUrl, pdfBuffer, {
+      headers: { "Content-Type": "application/pdf" }
+    });
+
+    // 7. Create document record in database
+    const documentMeta = {
+      jobid: job.id,
+      uploaded_by: "VSSTA Integration",
+      name: fileName,
+      key: s3Key,
+      type: "application/pdf",
+      extension: "pdf",
+      bodyshopid: job.shopid,
+      size: pdfBuffer.length,
+      takenat: scan_time
+    };
+
+    const documentInsert = await client.request(INSERT_NEW_DOCUMENT, {
+      docInput: [documentMeta]
+    });
+
+    if (!documentInsert.insert_documents?.returning?.length) {
+      logger.log(`vssta-integration-failed-to-create-document-record`, "error", "api", "vssta", {
+        params: missingParams
+      });
+      return res.status(500).json({ error: "Failed to create document record" });
+    }
+
+    return res.status(200).json({
+      message: "VSSTA integration successful",
+      documentId: documentInsert.insert_documents.returning[0].id
+    });
+  } catch (error) {
+    logger.log(`vssta-integration-general`, "error", "api", "vssta", {
+      error: error?.message,
+      stack: error?.stack
+    });
+
+    return res.status(500).json({ error: error.message });
+  }
+};
+
+module.exports = vsstaIntegrationRoute;

server/intellipay/intellipay.js

@@ -1,64 +1,22 @@
-const path = require("path");
-require("dotenv").config({
-  path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`)
-});
-const queries = require("../graphql-client/queries");
 const Dinero = require("dinero.js");
 const qs = require("query-string");
 const axios = require("axios");
-const moment = require("moment");
 const logger = require("../utils/logger");
-const { sendTaskEmail } = require("../email/sendemail");
-const generateEmailTemplate = require("../email/generateTemplate");
+const { isEmpty, isNumber } = require("lodash");
+const handleCommentBasedPayment = require("./lib/handleCommentBasedPayment");
+const handleInvoiceBasedPayment = require("./lib/handleInvoiceBasedPayment");
+const logValidationError = require("./lib/handlePaymentValidationError");
+const getCptellerUrl = require("./lib/getCptellerUrl");
+const getShopCredentials = require("./lib/getShopCredentials");
+const decodeComment = require("./lib/decodeComment");
 
-const domain = process.env.NODE_ENV ? "secure" : "test";
-
-const { SecretsManagerClient, GetSecretValueCommand } = require("@aws-sdk/client-secrets-manager");
-const { InstanceRegion, InstanceEndpoints } = require("../utils/instanceMgr");
-
-const client = new SecretsManagerClient({
-  region: InstanceRegion()
-});
-
-const gqlClient = require("../graphql-client/graphql-client").client;
-
-const getShopCredentials = async (bodyshop) => {
-  // Development only
-  if (process.env.NODE_ENV === undefined) {
-    return {
-      merchantkey: process.env.INTELLIPAY_MERCHANTKEY,
-      apikey: process.env.INTELLIPAY_APIKEY
-    };
-  }
-
-  // Production code
-  if (bodyshop?.imexshopid) {
-    try {
-      const secret = await client.send(
-        new GetSecretValueCommand({
-          SecretId: `intellipay-credentials-${bodyshop.imexshopid}`,
-          VersionStage: "AWSCURRENT" // VersionStage defaults to AWSCURRENT if unspecified
-        })
-      );
-      return JSON.parse(secret.SecretString);
-    } catch (error) {
-      return {
-        error: error.message
-      };
-    }
-  }
-};
-
-const decodeComment = (comment) => {
-  try {
-    return comment ? JSON.parse(Buffer.from(comment, "base64").toString()) : null;
-  // eslint-disable-next-line no-unused-vars
-  } catch (error) {
-    return null; // Handle malformed base64 string gracefully
-  }
-};
-
-exports.lightbox_credentials = async (req, res) => {
+/**
+ * @description Get lightbox credentials for the shop
+ * @param req
+ * @param res
+ * @returns {Promise<void>}
+ */
+const lightboxCredentials = async (req, res) => {
   const decodedComment = decodeComment(req.body?.comment);
   const logMeta = {
     iPayData: req.body?.iPayData,
@@ -74,17 +32,17 @@ exports.lightbox_credentials = async (req, res) => {
 
   const shopCredentials = await getShopCredentials(req.body.bodyshop);
 
-  if (shopCredentials.error) {
+  if (shopCredentials?.error) {
     logger.log("intellipay-credentials-error", "ERROR", req.user?.email, null, {
       message: shopCredentials.error?.message,
       ...logMeta
     });
-    res.json({
+
+    return res.json({
       message: shopCredentials.error?.message,
       type: "intellipay-credentials-error",
       ...logMeta
     });
-    return;
   }
 
   try {
@@ -95,7 +53,10 @@ exports.lightbox_credentials = async (req, res) => {
         ...shopCredentials,
         operatingenv: "businessattended"
       }),
-      url: `https://${domain}.cpteller.com/api/custapi.cfc?method=autoterminal${req.body.refresh ? "_refresh" : ""}` //autoterminal_refresh
+      url: getCptellerUrl({
+        apiType: "custapi",
+        params: { method: `autoterminal${req.body.refresh ? "_refresh" : ""}` }
+      })
     };
 
     const response = await axios(options);
@@ -105,13 +66,14 @@ exports.lightbox_credentials = async (req, res) => {
       ...logMeta
     });
 
-    res.send(response.data);
+    return res.send(response.data);
   } catch (error) {
     logger.log("intellipay-lightbox-error", "ERROR", req.user?.email, null, {
       message: error?.message,
       ...logMeta
     });
-    res.json({
+
+    return res.json({
       message: error?.message,
       type: "intellipay-lightbox-error",
       ...logMeta
@@ -119,7 +81,13 @@ exports.lightbox_credentials = async (req, res) => {
   }
 };
 
-exports.payment_refund = async (req, res) => {
+/**
+ * @description Process payment refund
+ * @param req
+ * @param res
+ * @returns {Promise<void>}
+ */
+const paymentRefund = async (req, res) => {
   const decodedComment = decodeComment(req.body.iPayData?.comment);
   const logResponseMeta = {
     iPayData: req.body?.iPayData,
@@ -137,18 +105,17 @@ exports.payment_refund = async (req, res) => {
 
   const shopCredentials = await getShopCredentials(req.body.bodyshop);
 
-  if (shopCredentials.error) {
+  if (shopCredentials?.error) {
     logger.log("intellipay-refund-credentials-error", "ERROR", req.user?.email, null, {
       credentialsError: shopCredentials.error,
       ...logResponseMeta
     });
 
-    res.status(400).json({
+    return res.status(400).json({
       credentialsError: shopCredentials.error,
       type: "intellipay-refund-credentials-error",
       ...logResponseMeta
     });
-    return;
   }
 
   try {
@@ -161,7 +128,11 @@ exports.payment_refund = async (req, res) => {
         paymentid: req.body.paymentid,
         amount: req.body.amount
       }),
-      url: `https://${domain}.cpteller.com/api/26/webapi.cfc?method=payment_refund`
+      url: getCptellerUrl({
+        apiType: "webapi",
+        version: "26",
+        params: { method: "payment_refund" }
+      })
     };
 
     logger.log("intellipay-refund-options-prepared", "DEBUG", req.user?.email, null, {
@@ -176,13 +147,14 @@ exports.payment_refund = async (req, res) => {
       ...logResponseMeta
     });
 
-    res.send(response.data);
+    return res.send(response.data);
   } catch (error) {
     logger.log("intellipay-refund-error", "ERROR", req.user?.email, null, {
       message: error?.message,
       ...logResponseMeta
     });
-    res.status(500).json({
+
+    return res.status(500).json({
       message: error?.message,
       type: "intellipay-refund-error",
       ...logResponseMeta
@@ -190,7 +162,13 @@ exports.payment_refund = async (req, res) => {
   }
 };
 
-exports.generate_payment_url = async (req, res) => {
+/**
+ * @description Generate payment URL for the shop
+ * @param req
+ * @param res
+ * @returns {Promise<void>}
+ */
+const generatePaymentUrl = async (req, res) => {
   const decodedComment = decodeComment(req.body.comment);
   const logResponseMeta = {
     iPayData: req.body?.iPayData,
@@ -210,17 +188,17 @@ exports.generate_payment_url = async (req, res) => {
 
   const shopCredentials = await getShopCredentials(req.body.bodyshop);
 
-  if (shopCredentials.error) {
+  if (shopCredentials?.error) {
     logger.log("intellipay-generate-payment-url-credentials-error", "ERROR", req.user?.email, null, {
       message: shopCredentials.error?.message,
       ...logResponseMeta
     });
-    res.status(400).json({
+
+    return res.status(400).json({
       message: shopCredentials.error?.message,
       type: "intellipay-generate-payment-url-credentials-error",
       ...logResponseMeta
     });
-    return;
   }
 
   try {
@@ -235,7 +213,10 @@ exports.generate_payment_url = async (req, res) => {
         invoice: req.body.invoice,
         createshorturl: true
       }),
-      url: `https://${domain}.cpteller.com/api/custapi.cfc?method=generate_lightbox_url`
+      url: getCptellerUrl({
+        apiType: "custapi",
+        params: { method: "generate_lightbox_url" }
+      })
     };
 
     logger.log("intellipay-generate-payment-url-options-prepared", "DEBUG", req.user?.email, null, {
@@ -251,18 +232,25 @@ exports.generate_payment_url = async (req, res) => {
       ...logResponseMeta
     });
 
-    res.send(response.data);
+    return res.send(response.data);
   } catch (error) {
     logger.log("intellipay-generate-payment-url-error", "ERROR", req.user?.email, null, {
       message: error?.message,
       ...logResponseMeta
     });
-    res.status(500).json({ message: error?.message, ...logResponseMeta });
+
+    return res.status(500).json({ message: error?.message, ...logResponseMeta });
   }
 };
 
-//Reference: https://intellipay.com/dist/webapi26.html#operation/fee
-exports.checkfee = async (req, res) => {
+/**
+ * @description Check the fee for a given amount
+ * Reference: https://intellipay.com/dist/webapi26.html#operation/fee
+ * @param req
+ * @param res
+ * @returns {Promise<void>}
+ */
+const checkFee = async (req, res) => {
   const logResponseMeta = {
     bodyshop: {
       id: req.body?.bodyshop?.id,
@@ -275,24 +263,24 @@ exports.checkfee = async (req, res) => {
 
   logger.log("intellipay-checkfee-request-received", "DEBUG", req.user?.email, null, logResponseMeta);
 
-  if (!req.body.amount || req.body.amount <= 0) {
+  if (!isNumber(req.body?.amount) || req.body?.amount <= 0) {
     logger.log("intellipay-checkfee-skip", "DEBUG", req.user?.email, null, {
       message: "Amount is zero or undefined, skipping fee check.",
       ...logResponseMeta
     });
-    res.json({ fee: 0 });
-    return;
+
+    return res.json({ fee: 0 });
   }
 
   const shopCredentials = await getShopCredentials(req.body.bodyshop);
 
-  if (shopCredentials.error) {
+  if (shopCredentials?.error) {
     logger.log("intellipay-checkfee-credentials-error", "ERROR", req.user?.email, null, {
       message: shopCredentials.error?.message,
       ...logResponseMeta
     });
-    res.status(400).json({ error: shopCredentials.error?.message, ...logResponseMeta });
-    return;
+
+    return res.status(400).json({ error: shopCredentials.error?.message, ...logResponseMeta });
   }
 
   try {
@@ -313,7 +301,7 @@ exports.checkfee = async (req, res) => {
         },
         { sort: false } // Ensure query string order is preserved
       ),
-      url: `https://${domain}.cpteller.com/api/26/webapi.cfc`
+      url: getCptellerUrl({ apiType: "webapi", version: "26" })
     };
 
     logger.log("intellipay-checkfee-options-prepared", "DEBUG", req.user?.email, null, {
@@ -328,200 +316,92 @@ exports.checkfee = async (req, res) => {
         message: response.data?.error,
         ...logResponseMeta
       });
-      res.status(400).json({
+
+      return res.status(400).json({
         error: response.data?.error,
         type: "intellipay-checkfee-api-error",
         ...logResponseMeta
       });
-    } else if (response.data < 0) {
+    }
+
+    if (response.data < 0) {
       logger.log("intellipay-checkfee-negative-fee", "ERROR", req.user?.email, null, {
         message: "Fee amount returned is negative.",
         ...logResponseMeta
       });
-      res.json({
+
+      return res.json({
         error: "Fee amount negative. Check API credentials & account configuration.",
         ...logResponseMeta,
         type: "intellipay-checkfee-negative-fee"
       });
-    } else {
-      logger.log("intellipay-checkfee-success", "DEBUG", req.user?.email, null, {
-        fee: response.data,
-        ...logResponseMeta
-      });
-      res.json({ fee: response.data, ...logResponseMeta });
     }
+
+    logger.log("intellipay-checkfee-success", "DEBUG", req.user?.email, null, {
+      fee: response.data,
+      ...logResponseMeta
+    });
+
+    return res.json({ fee: response.data, ...logResponseMeta });
   } catch (error) {
     logger.log("intellipay-checkfee-error", "ERROR", req.user?.email, null, {
       message: error?.message,
       ...logResponseMeta
     });
-    res.status(500).json({ error: error?.message, logResponseMeta });
+
+    return res.status(500).json({ error: error?.message, logResponseMeta });
   }
 };
 
-exports.postback = async (req, res) => {
+/**
+ * @description Handle the postback from Intellipay
+ * @param req
+ * @param res
+ * @returns {Promise<void>}
+ */
+/**
+ * Handle the postback from Intellipay payment system
+ */
+const postBack = async (req, res) => {
   const { body: values } = req;
   const decodedComment = decodeComment(values?.comment);
+  const logMeta = { iprequest: values, decodedComment };
 
-  const logResponseMeta = {
-    iprequest: values,
-    decodedComment
-  };
-
-  logger.log("intellipay-postback-received", "DEBUG", "api", null, logResponseMeta);
+  logger.log("intellipay-postback-received", "DEBUG", "api", null, logMeta);
 
   try {
-    if ((!values.invoice || values.invoice === "") && !decodedComment) {
-      //invoice is specified through the pay link. Comment by IO.
+    // Handle empty/invalid requests
+    if (isEmpty(values?.invoice) && !decodedComment) {
       logger.log("intellipay-postback-ignored", "DEBUG", "api", null, {
         message: "No invoice or comment provided",
-        ...logResponseMeta
+        ...logMeta
       });
-      res.sendStatus(200);
-      return;
+      return res.sendStatus(200);
     }
 
+    // Process payment based on data type
     if (decodedComment) {
-      //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 = decodedComment;
-
-      logger.log("intellipay-postback-parsed-comment", "DEBUG", "api", null, {
-        parsedComment,
-        ...logResponseMeta
-      });
-
-      //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;
-
-      // Fetch jobs by job IDs
-      const jobs = await gqlClient.request(queries.GET_JOBS_BY_PKS, {
-        ids: partialPayments.map((p) => p.jobid)
-      });
-      const bodyshop = await gqlClient.request(queries.GET_BODYSHOP_BY_ID, {
-        id: jobs.jobs[0].shopid
-      });
-      const ipMapping = bodyshop.bodyshops_by_pk.intellipay_config?.payment_map;
-
-      logger.log("intellipay-postback-jobs-fetched", "DEBUG", "api", null, {
-        jobs,
-        parsedComment,
-        ...logResponseMeta
-      });
-
-      // Insert new payments
-      const paymentResult = await gqlClient.request(queries.INSERT_NEW_PAYMENT, {
-        paymentInput: partialPayments.map((p) => ({
-          amount: p.amount,
-          transactionid: values.authcode,
-          payer: "Customer",
-          type: ipMapping ? ipMapping[(values.cardtype || "").toLowerCase()] || values.cardtype : values.cardtype,
-          jobid: p.jobid,
-          date: moment(Date.now()),
-          payment_responses: {
-            data: {
-              amount: values.total,
-              bodyshopid: bodyshop.bodyshops_by_pk.id,
-              jobid: p.jobid,
-              declinereason: "Approved",
-              ext_paymentid: values.paymentid,
-              successful: true,
-              response: values
-            }
-          }
-        }))
-      });
-
-      logger.log("intellipay-postback-payment-success", "DEBUG", "api", null, {
-        paymentResult,
-        jobs,
-        parsedComment,
-        ...logResponseMeta
-      });
-
-      if (values.origin === "OneLink" && parsedComment.userEmail) {
-        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="${InstanceEndpoints()}/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/>")
-          })
-        }).catch((error) => {
-          logger.log("intellipay-postback-email-error", "ERROR", "api", null, {
-            message: error.message,
-            jobs,
-            paymentResult,
-            ...logResponseMeta
-          });
-        });
-      }
-      res.sendStatus(200);
-    } else if (values.invoice) {
-      const job = await gqlClient.request(queries.GET_JOB_BY_PK, {
-        id: values.invoice
-      });
-
-      const bodyshop = await gqlClient.request(queries.GET_BODYSHOP_BY_ID, {
-        id: job.jobs_by_pk.shopid
-      });
-      const ipMapping = bodyshop.bodyshops_by_pk.intellipay_config?.payment_map;
-
-      logger.log("intellipay-postback-invoice-job-fetched", "DEBUG", "api", null, {
-        job,
-        bodyshop,
-        ...logResponseMeta
-      });
-
-      const paymentResult = await gqlClient.request(queries.INSERT_NEW_PAYMENT, {
-        paymentInput: {
-          amount: values.total,
-          transactionid: values.authcode,
-          payer: "Customer",
-          type: ipMapping ? ipMapping[(values.cardtype || "").toLowerCase()] || values.cardtype : values.cardtype,
-          jobid: values.invoice,
-          date: moment(Date.now())
-        }
-      });
-
-      logger.log("intellipay-postback-invoice-payment-success", "DEBUG", "api", null, {
-        paymentResult,
-        ...logResponseMeta
-      });
-
-      const responseResults = await gqlClient.request(queries.INSERT_PAYMENT_RESPONSE, {
-        paymentResponse: {
-          amount: values.total,
-          bodyshopid: bodyshop.bodyshops_by_pk.id,
-          paymentid: paymentResult.id,
-          jobid: values.invoice,
-          declinereason: "Approved",
-          ext_paymentid: values.paymentid,
-          successful: true,
-          response: values
-        }
-      });
-
-      logger.log("intellipay-postback-invoice-response-success", "DEBUG", "api", null, {
-        responseResults,
-        ...logResponseMeta
-      });
-      res.sendStatus(200);
+      return await handleCommentBasedPayment(values, decodedComment, logger, logMeta, res);
+    } else if (values?.invoice) {
+      return await handleInvoiceBasedPayment(values, logger, logMeta, res);
+    } else {
+      // This should be caught by first validation, but as a safeguard
+      logValidationError("intellipay-postback-invalid", "No valid invoice or comment provided", logMeta);
+      return res.status(400).send("Bad Request: No valid invoice or comment provided");
     }
   } catch (error) {
     logger.log("intellipay-postback-error", "ERROR", "api", null, {
       message: error?.message,
-      ...logResponseMeta
+      ...logMeta
     });
-    res.status(400).json({ successful: false, error: error.message, ...logResponseMeta });
+    return res.status(400).json({ successful: false, error: error.message, ...logMeta });
   }
 };
+
+module.exports = {
+  lightboxCredentials,
+  paymentRefund,
+  generatePaymentUrl,
+  checkFee,
+  postBack
+};

server/intellipay/lib/decodeComment.js

@@ -0,0 +1,14 @@
+/**
+ * @description Decode the comment from base64
+ * @param comment
+ * @returns {any|null}
+ */
+const decodeComment = (comment) => {
+  try {
+    return comment ? JSON.parse(Buffer.from(comment, "base64").toString()) : null;
+  } catch (error) {
+    return null; // Handle malformed base64 string gracefully
+  }
+};
+
+module.exports = decodeComment;

server/intellipay/lib/getCptellerUrl.js

@@ -0,0 +1,34 @@
+/**
+ * Generates a properly formatted Cpteller API URL
+ * @param {Object} options - URL configuration options
+ * @param {string} options.apiType - 'webapi' or 'custapi'
+ * @param {string} [options.version] - API version (e.g., '26' for webapi)
+ * @param {Object} [options.params] - URL query parameters
+ * @returns {string} - The formatted Cpteller URL
+ */
+const getCptellerUrl = (options) => {
+  const domain = process.env?.NODE_ENV === "production" ? "secure" : "test";
+
+  const { apiType = "webapi", version, params = {} } = options;
+
+  // Base URL construction
+  let url = `https://${domain}.cpteller.com/api/`;
+
+  // Add version if specified for webapi
+  if (apiType === "webapi" && version) {
+    url += `${version}/`;
+  }
+
+  // Add the API endpoint
+  url += `${apiType}.cfc`;
+
+  // Add query parameters if any exist
+  const queryParams = new URLSearchParams(params).toString();
+  if (queryParams) {
+    url += `?${queryParams}`;
+  }
+
+  return url;
+};
+
+module.exports = getCptellerUrl;

server/intellipay/lib/getPaymentType.js

@@ -0,0 +1,12 @@
+/**
+ * @description Get payment type based on IP mapping
+ * @param ipMapping
+ * @param cardType
+ * @returns {*}
+ */
+const getPaymentType = (ipMapping, cardType) => {
+  const normalizedCardType = (cardType || "").toLowerCase();
+  return ipMapping ? ipMapping[normalizedCardType] || cardType : cardType;
+};
+
+module.exports = getPaymentType;

server/intellipay/lib/getShopCredentials.js

@@ -0,0 +1,40 @@
+const { SecretsManagerClient, GetSecretValueCommand } = require("@aws-sdk/client-secrets-manager");
+const { InstanceRegion } = require("../../utils/instanceMgr");
+
+const client = new SecretsManagerClient({
+  region: InstanceRegion()
+});
+
+/**
+ * @description Get shop credentials from AWS Secrets Manager
+ * @param bodyshop
+ * @returns {Promise<{error}|{merchantkey: *, apikey: *}|any>}
+ */
+const getShopCredentials = async (bodyshop) => {
+  // In Dev/Testing we will use the environment variables
+  if (process.env?.NODE_ENV !== "production") {
+    return {
+      merchantkey: process.env.INTELLIPAY_MERCHANTKEY,
+      apikey: process.env.INTELLIPAY_APIKEY
+    };
+  }
+
+  // In Production, we will use the AWS Secrets Manager
+  if (bodyshop?.imexshopid) {
+    try {
+      const secret = await client.send(
+        new GetSecretValueCommand({
+          SecretId: `intellipay-credentials-${bodyshop.imexshopid}`,
+          VersionStage: "AWSCURRENT" // VersionStage defaults to AWSCURRENT if unspecified
+        })
+      );
+      return JSON.parse(secret.SecretString);
+    } catch (error) {
+      return {
+        error: error.message
+      };
+    }
+  }
+};
+
+module.exports = getShopCredentials;

server/intellipay/lib/handleCommentBasedPayment.js

@@ -0,0 +1,81 @@
+const sendPaymentNotificationEmail = require("./sendPaymentNotificationEmail");
+const { INSERT_NEW_PAYMENT, GET_BODYSHOP_BY_ID, GET_JOBS_BY_PKS } = require("../../graphql-client/queries");
+const getPaymentType = require("./getPaymentType");
+const moment = require("moment");
+
+const gqlClient = require("../../graphql-client/graphql-client").client;
+
+/**
+ * @description Handle comment-based payment processing
+ * @param values
+ * @param decodedComment
+ * @param logger
+ * @param logMeta
+ * @param res
+ * @returns {Promise<*>}
+ */
+const handleCommentBasedPayment = async (values, decodedComment, logger, logMeta, res) => {
+  logger.log("intellipay-postback-parsed-comment", "DEBUG", "api", null, {
+    parsedComment: decodedComment,
+    ...logMeta
+  });
+
+  const partialPayments = Array.isArray(decodedComment) ? decodedComment : decodedComment.payments;
+
+  // Fetch job data
+  const jobs = await gqlClient.request(GET_JOBS_BY_PKS, {
+    ids: partialPayments.map((p) => p.jobid)
+  });
+
+  // Fetch bodyshop data
+  const bodyshop = await gqlClient.request(GET_BODYSHOP_BY_ID, {
+    id: jobs.jobs[0].shopid
+  });
+
+  const ipMapping = bodyshop.bodyshops_by_pk.intellipay_config?.payment_map;
+
+  logger.log("intellipay-postback-jobs-fetched", "DEBUG", "api", null, {
+    jobs,
+    parsedComment: decodedComment,
+    ...logMeta
+  });
+
+  // Create payment records
+  const paymentResult = await gqlClient.request(INSERT_NEW_PAYMENT, {
+    paymentInput: partialPayments.map((p) => ({
+      amount: p.amount,
+      transactionid: values.authcode,
+      payer: "Customer",
+      type: getPaymentType(ipMapping, values.cardtype),
+      jobid: p.jobid,
+      date: moment(Date.now()),
+      payment_responses: {
+        data: {
+          amount: values.total,
+          bodyshopid: bodyshop.bodyshops_by_pk.id,
+          jobid: p.jobid,
+          declinereason: "Approved",
+          ext_paymentid: values.paymentid,
+          successful: true,
+          response: values
+        }
+      }
+    }))
+  });
+
+  logger.log("intellipay-postback-payment-success", "DEBUG", "api", null, {
+    paymentResult,
+    jobs,
+    parsedComment: decodedComment,
+    ...logMeta
+  });
+
+  // Send notification email if needed
+  if (values?.origin === "OneLink" && decodedComment?.userEmail) {
+    await sendPaymentNotificationEmail(decodedComment.userEmail, jobs, partialPayments, logger, logMeta);
+  }
+
+  return res.sendStatus(200);
+};
+
+module.exports = handleCommentBasedPayment;

server/intellipay/lib/handleInvoiceBasedPayment.js

@@ -0,0 +1,131 @@
+const handlePaymentValidationError = require("./handlePaymentValidationError");
+const {
+  GET_JOBID_BY_MERCHANTID_RONUMBER,
+  INSERT_PAYMENT_RESPONSE,
+  INSERT_NEW_PAYMENT,
+  GET_BODYSHOP_BY_MERCHANT_ID
+} = require("../../graphql-client/queries");
+
+const { sendTaskEmail } = require("../../email/sendemail");
+const getPaymentType = require("./getPaymentType");
+const moment = require("moment");
+
+const gqlClient = require("../../graphql-client/graphql-client").client;
+
+/**
+ * @description Handle invoice-based payment processing
+ * @param values
+ * @param logger
+ * @param logMeta
+ * @param res
+ * @returns {Promise<*>}
+ */
+const handleInvoiceBasedPayment = async (values, logger, logMeta, res) => {
+  // Validate required fields
+  if (!values.merchantid) {
+    return handlePaymentValidationError(
+      res,
+      logger,
+      "intellipay-postback-no-merchantid",
+      "Merchant ID is missing",
+      logMeta
+    );
+  }
+
+  // Fetch job data
+  const result = await gqlClient.request(GET_JOBID_BY_MERCHANTID_RONUMBER, {
+    merchantID: values.merchantid,
+    roNumber: values.invoice
+  });
+
+  if (!result?.jobs?.length) {
+    // Fetch bodyshop data
+    const bodyshop = await gqlClient.request(GET_BODYSHOP_BY_MERCHANT_ID, {
+      merchantID: values.merchantid
+    });
+
+    if (bodyshop?.bodyshops?.[0]) {
+      // Note: changed bodyshops to bodyshop to match query name
+      const email = bodyshop.bodyshops[0].email;
+
+      await sendTaskEmail({
+        to: email,
+        subject: `Failed to Insert Payment`,
+        text: `The system has attempted to insert a payment that was generated by your merchant terminal but could not find an associated invoice. Transaction details are below. Please input this payment to your system manually.\n\n${Object.keys(
+          values
+        )
+          .map((key) => `${key}: ${values[key]}`)
+          .join("\n")}`
+      });
+    }
+
+    return handlePaymentValidationError(
+      res,
+      logger,
+      "intellipay-postback-job-not-found",
+      "Job not found",
+      logMeta,
+      200
+    );
+  }
+
+  const job = result.jobs[0];
+  const bodyshop = job?.bodyshop;
+
+  if (!bodyshop) {
+    return handlePaymentValidationError(
+      res,
+      logger,
+      "intellipay-postback-bodyshop-not-found",
+      "Bodyshop not found",
+      logMeta
+    );
+  }
+
+  const ipMapping = bodyshop.intellipay_config?.payment_map;
+
+  logger.log("intellipay-postback-invoice-job-fetched", "DEBUG", "api", null, {
+    job,
+    ...logMeta
+  });
+
+  // Create payment record
+  const paymentResult = await gqlClient.request(INSERT_NEW_PAYMENT, {
+    paymentInput: {
+      amount: values.total,
+      transactionid: values.authcode,
+      payer: "Customer",
+      type: getPaymentType(ipMapping, values.cardtype),
+      jobid: job.id,
+      date: moment(Date.now())
+    }
+  });
+
+  logger.log("intellipay-postback-invoice-payment-success", "DEBUG", "api", null, {
+    paymentResult,
+    ...logMeta
+  });
+
+  // Create payment response record
+  const responseResults = await gqlClient.request(INSERT_PAYMENT_RESPONSE, {
+    paymentResponse: {
+      amount: values.total,
+      bodyshopid: bodyshop.id,
+      paymentid: paymentResult.id,
+      jobid: job.id,
+      declinereason: "Approved",
+      ext_paymentid: values.paymentid,
+      successful: true,
+      response: values
+    }
+  });
+
+  logger.log("intellipay-postback-invoice-response-success", "DEBUG", "api", null, {
+    responseResults,
+    ...logMeta
+  });
+
+  return res.sendStatus(200);
+};
+
+module.exports = handleInvoiceBasedPayment;

server/intellipay/lib/handlePaymentValidationError.js

@@ -0,0 +1,19 @@
+/**
+ * @description Log validation error and send response
+ * @param res
+ * @param logger
+ * @param logCode
+ * @param message
+ * @param logMeta
+ * @param returnCode
+ * @returns {*}
+ */
+const handlePaymentValidationError = (res, logger, logCode, message, logMeta, returnCode) => {
+  logger.log(logCode, "ERROR", "api", null, {
+    message,
+    ...logMeta
+  });
+  return res.status(returnCode || 400).send(`Bad Request: ${message}`);
+};
+
+module.exports = handlePaymentValidationError;

server/intellipay/lib/sendPaymentNotificationEmail.js

@@ -0,0 +1,40 @@
+const { sendTaskEmail } = require("../../email/sendemail");
+const generateEmailTemplate = require("../../email/generateTemplate");
+const { InstanceEndpoints } = require("../../utils/instanceMgr");
+
+/**
+ * @description Send notification email to the user
+ * @param userEmail
+ * @param jobs
+ * @param partialPayments
+ * @param logger
+ * @param logMeta
+ * @returns {Promise<void>}
+ */
+const sendPaymentNotificationEmail = async (userEmail, jobs, partialPayments, logger, logMeta) => {
+  try {
+    await sendTaskEmail({
+      to: 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) =>
+              `<p style="color: #0a0a0a; font-weight: normal; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; margin: 0 0 0 0px; Margin: 0 0 0 0px; line-height: 1.2; margin-bottom: 0px; Margin-bottom: 0px; font-size: 90%;">Reference: <a href="${InstanceEndpoints()}/manage/jobs/${job.id}" style="color: #2199e8; text-decoration: none; font-weight: normal; padding: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 90%; line-height: 1.2;">${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}</p>`
+          )
+          .join("")
+      })
+    });
+  } catch (error) {
+    logger.log("intellipay-postback-email-error", "ERROR", "api", null, {
+      message: error.message,
+      jobs,
+      ...logMeta
+    });
+  }
+};
+
+module.exports = sendPaymentNotificationEmail;

server/intellipay/lib/tests/handleCommentBasedPayment.test.js

@@ -0,0 +1,152 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import mockRequire from "mock-require";
+
+const gqlRequestMock = { request: vi.fn() };
+const getPaymentTypeMock = vi.fn(() => "American Express");
+const sendPaymentNotificationEmailMock = vi.fn();
+
+let handleCommentBasedPayment;
+
+beforeEach(() => {
+  vi.resetModules();
+  vi.clearAllMocks();
+
+  // Mock dependencies using mock-require BEFORE requiring the target module
+  mockRequire("../../../graphql-client/graphql-client", {
+    client: gqlRequestMock
+  });
+
+  mockRequire("../getPaymentType", getPaymentTypeMock);
+  mockRequire("../sendPaymentNotificationEmail", sendPaymentNotificationEmailMock);
+
+  // Now require the module under test
+  handleCommentBasedPayment = require("../handleCommentBasedPayment");
+
+  // Chain your GraphQL mocks
+  gqlRequestMock.request
+    .mockResolvedValueOnce({
+      jobs: [
+        {
+          id: "c1ffe09c-e7d4-46b3-aac5-f23e39563181",
+          shopid: "bfec8c8c-b7f1-49e0-be4c-524455f4e582"
+        }
+      ]
+    })
+    .mockResolvedValueOnce({
+      bodyshops_by_pk: {
+        id: "bfec8c8c-b7f1-49e0-be4c-524455f4e582",
+        intellipay_config: {
+          payment_map: {
+            amex: "American Express"
+          }
+        }
+      }
+    })
+    .mockResolvedValueOnce({
+      insert_payments: {
+        returning: [{ id: "5dfda3c4-c0a6-4b09-a73d-176ed0ac6499" }]
+      }
+    });
+});
+
+describe("handleCommentBasedPayment", () => {
+  const mockLogger = { log: vi.fn() };
+  const mockRes = { sendStatus: vi.fn() };
+
+  const values = {
+    authcode: "5557301",
+    total: "0.01",
+    origin: "Dejavoo",
+    paymentid: "24294378",
+    cardtype: "Amex"
+  };
+
+  const decodedComment = {
+    payments: [{ jobid: "c1ffe09c-e7d4-46b3-aac5-f23e39563181", amount: 0.01 }],
+    userEmail: "test@example.com"
+  };
+
+  const logMeta = { op: "xyz123" };
+
+  it("processes comment-based payment and returns 200", async () => {
+    await handleCommentBasedPayment(values, decodedComment, mockLogger, logMeta, mockRes);
+
+    expect(gqlRequestMock.request).toHaveBeenCalledTimes(3);
+    expect(getPaymentTypeMock).toHaveBeenCalledWith({ amex: "American Express" }, "Amex");
+    expect(sendPaymentNotificationEmailMock).not.toHaveBeenCalled();
+    expect(mockRes.sendStatus).toHaveBeenCalledWith(200);
+  });
+
+  it("sends notification if origin is OneLink and userEmail exists", async () => {
+    const oneLinkValues = { ...values, origin: "OneLink" };
+
+    await handleCommentBasedPayment(oneLinkValues, decodedComment, mockLogger, logMeta, mockRes);
+
+    expect(sendPaymentNotificationEmailMock).toHaveBeenCalledWith(
+      "test@example.com",
+      expect.anything(),
+      expect.anything(),
+      mockLogger,
+      logMeta
+    );
+
+    expect(mockRes.sendStatus).toHaveBeenCalledWith(200);
+  });
+
+  it("handles decodedComment as a direct array", async () => {
+    const arrayComment = [{ jobid: "c1ffe09c-e7d4-46b3-aac5-f23e39563181", amount: 0.01 }];
+
+    await handleCommentBasedPayment(values, arrayComment, mockLogger, logMeta, mockRes);
+
+    expect(gqlRequestMock.request).toHaveBeenCalledTimes(3);
+    expect(mockRes.sendStatus).toHaveBeenCalledWith(200);
+  });
+
+  it("does not send email if origin is OneLink but userEmail is missing", async () => {
+    const commentWithoutEmail = {
+      payments: decodedComment.payments
+      // no userEmail
+    };
+
+    const oneLinkValues = { ...values, origin: "OneLink" };
+
+    await handleCommentBasedPayment(oneLinkValues, commentWithoutEmail, mockLogger, logMeta, mockRes);
+
+    expect(sendPaymentNotificationEmailMock).not.toHaveBeenCalled();
+    expect(mockRes.sendStatus).toHaveBeenCalledWith(200);
+  });
+
+  it("logs important stages of the process", async () => {
+    await handleCommentBasedPayment(values, decodedComment, mockLogger, logMeta, mockRes);
+
+    const logCalls = mockLogger.log.mock.calls.map(([tag]) => tag);
+
+    expect(logCalls).toContain("intellipay-postback-parsed-comment");
+    expect(logCalls).toContain("intellipay-postback-payment-success");
+  });
+
+  it("handles missing payment_map safely", async () => {
+    gqlRequestMock.request.mockReset(); // 🧹 Clear previous .mockResolvedValueOnce calls
+
+    gqlRequestMock.request
+      .mockResolvedValueOnce({
+        jobs: [{ id: "job1", shopid: "shop1" }]
+      })
+      .mockResolvedValueOnce({
+        bodyshops_by_pk: {
+          id: "shop1",
+          intellipay_config: null
+        }
+      })
+      .mockResolvedValueOnce({
+        insert_payments: {
+          returning: [{ id: "payment1" }]
+        }
+      });
+
+    await handleCommentBasedPayment(values, decodedComment, mockLogger, logMeta, mockRes);
+
+    expect(getPaymentTypeMock).toHaveBeenCalledWith(undefined, "Amex");
+    expect(mockRes.sendStatus).toHaveBeenCalledWith(200);
+  });
+});

server/intellipay/lib/tests/handleInvoiceBasedPayment.test.js

@@ -0,0 +1,130 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import mockRequire from "mock-require";
+
+const gqlRequestMock = { request: vi.fn() };
+const getPaymentTypeMock = vi.fn(() => "Visa");
+const handlePaymentValidationErrorMock = vi.fn();
+
+let handleInvoiceBasedPayment;
+
+beforeEach(() => {
+  vi.resetModules();
+  vi.clearAllMocks();
+
+  mockRequire("../../../graphql-client/graphql-client", {
+    client: gqlRequestMock
+  });
+
+  mockRequire("../getPaymentType", getPaymentTypeMock);
+  mockRequire("../handlePaymentValidationError", handlePaymentValidationErrorMock);
+
+  handleInvoiceBasedPayment = require("../handleInvoiceBasedPayment");
+
+  gqlRequestMock.request
+    .mockResolvedValueOnce({
+      jobs: [
+        {
+          id: "job123",
+          bodyshop: {
+            id: "shop123",
+            intellipay_config: {
+              payment_map: {
+                visa: "Visa"
+              }
+            }
+          }
+        }
+      ]
+    })
+    .mockResolvedValueOnce({
+      id: "payment123"
+    })
+    .mockResolvedValueOnce({
+      insert_payment_response: {
+        returning: [{ id: "response123" }]
+      }
+    });
+});
+
+describe("handleInvoiceBasedPayment", () => {
+  const mockLogger = { log: vi.fn() };
+  const mockRes = { sendStatus: vi.fn() };
+
+  const values = {
+    merchantid: "m123",
+    invoice: "INV-001",
+    total: 100.0,
+    authcode: "AUTH123",
+    cardtype: "visa",
+    paymentid: "P789"
+  };
+
+  const logMeta = { op: "abc123" };
+
+  it("processes a valid invoice-based payment", async () => {
+    await handleInvoiceBasedPayment(values, mockLogger, logMeta, mockRes);
+
+    expect(gqlRequestMock.request).toHaveBeenCalledTimes(3);
+    expect(getPaymentTypeMock).toHaveBeenCalledWith({ visa: "Visa" }, "visa");
+    expect(mockRes.sendStatus).toHaveBeenCalledWith(200);
+    expect(handlePaymentValidationErrorMock).not.toHaveBeenCalled();
+  });
+
+  it("handles missing merchantid with validation error", async () => {
+    const invalidValues = { ...values, merchantid: undefined };
+
+    await handleInvoiceBasedPayment(invalidValues, mockLogger, logMeta, mockRes);
+
+    expect(handlePaymentValidationErrorMock).toHaveBeenCalledWith(
+      mockRes,
+      mockLogger,
+      "intellipay-postback-no-merchantid",
+      "Merchant ID is missing",
+      logMeta
+    );
+    expect(gqlRequestMock.request).not.toHaveBeenCalled();
+  });
+
+  it("handles job not found with validation error", async () => {
+    gqlRequestMock.request.mockReset();
+    gqlRequestMock.request.mockResolvedValueOnce({ jobs: [] });
+
+    await handleInvoiceBasedPayment(values, mockLogger, logMeta, mockRes);
+
+    expect(handlePaymentValidationErrorMock).toHaveBeenCalledWith(
+      mockRes,
+      mockLogger,
+      "intellipay-postback-job-not-found",
+      "Job not found",
+      logMeta,
+      200
+    );
+  });
+
+  it("handles missing bodyshop with validation error", async () => {
+    gqlRequestMock.request.mockReset();
+    gqlRequestMock.request.mockResolvedValueOnce({
+      jobs: [{ id: "job123", bodyshop: null }]
+    });
+
+    await handleInvoiceBasedPayment(values, mockLogger, logMeta, mockRes);
+
+    expect(handlePaymentValidationErrorMock).toHaveBeenCalledWith(
+      mockRes,
+      mockLogger,
+      "intellipay-postback-bodyshop-not-found",
+      "Bodyshop not found",
+      logMeta
+    );
+  });
+
+  it("logs all expected stages of the process", async () => {
+    await handleInvoiceBasedPayment(values, mockLogger, logMeta, mockRes);
+
+    const logTags = mockLogger.log.mock.calls.map(([tag]) => tag);
+
+    expect(logTags).toContain("intellipay-postback-invoice-job-fetched");
+    expect(logTags).toContain("intellipay-postback-invoice-payment-success");
+    expect(logTags).toContain("intellipay-postback-invoice-response-success");
+  });
+});

server/intellipay/lib/tests/intelliPayGeneralLibs.test.js

@@ -0,0 +1,277 @@
+import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
+
+const getPaymentType = require("../getPaymentType");
+const decodeComment = require("../decodeComment");
+const getCptellerUrl = require("../getCptellerUrl");
+const handlePaymentValidationError = require("../handlePaymentValidationError");
+const getShopCredentials = require("../getShopCredentials");
+
+describe("Payment Processing Functions", () => {
+  // DecodeComment Tests
+  describe("decodeComment", () => {
+    it("decodes a valid base64-encoded JSON comment", () => {
+      const encoded = "eyJ0ZXN0IjoiZGF0YSJ9";
+      const expected = { test: "data" };
+      expect(decodeComment(encoded)).toEqual(expected);
+    });
+
+    it("decodes a complex base64-encoded JSON with payments", () => {
+      const encoded = "eyJwYXltZW50cyI6W3siam9iaWQiOiIxMjMifV19";
+      const expected = { payments: [{ jobid: "123" }] };
+      expect(decodeComment(encoded)).toEqual(expected);
+    });
+
+    it("returns null when comment is null", () => {
+      expect(decodeComment(null)).toBeNull();
+    });
+
+    it("returns null when comment is undefined", () => {
+      expect(decodeComment(undefined)).toBeNull();
+    });
+
+    it("returns null when comment is an empty string", () => {
+      expect(decodeComment("")).toBeNull();
+    });
+
+    it("returns null when comment is malformed base64", () => {
+      expect(decodeComment("!@#$%")).toBeNull();
+    });
+
+    it("returns null when comment is valid base64 but not valid JSON", () => {
+      expect(decodeComment("aW52YWxpZA==")).toBeNull();
+    });
+  });
+
+  // GetPaymentType Tests
+  describe("getPaymentType", () => {
+    it("returns mapped value when card type exists in mapping", () => {
+      const ipMapping = { visa: "Visa Card", amex: "American Express" };
+      expect(getPaymentType(ipMapping, "visa")).toBe("Visa Card");
+    });
+
+    it("returns original value when card type not in mapping", () => {
+      const ipMapping = { visa: "Visa Card" };
+      expect(getPaymentType(ipMapping, "mastercard")).toBe("mastercard");
+    });
+
+    it("handles lowercase conversion", () => {
+      const ipMapping = { visa: "Visa Card" };
+      expect(getPaymentType(ipMapping, "VISA")).toBe("Visa Card");
+    });
+
+    it("handles null mapping", () => {
+      expect(getPaymentType(null, "visa")).toBe("visa");
+    });
+
+    it("handles undefined mapping", () => {
+      expect(getPaymentType(undefined, "visa")).toBe("visa");
+    });
+
+    it("handles empty string card type", () => {
+      const ipMapping = { visa: "Visa Card" };
+      expect(getPaymentType(ipMapping, "")).toBe("");
+    });
+
+    it("handles undefined card type", () => {
+      const ipMapping = { visa: "Visa Card" };
+      expect(getPaymentType(ipMapping, undefined)).toBe(undefined);
+    });
+  });
+
+  // GetCptellerUrl Tests
+  describe("getCptellerUrl", () => {
+    const originalEnv = process.env.NODE_ENV;
+
+    afterEach(() => {
+      process.env.NODE_ENV = originalEnv;
+    });
+
+    it("uses test domain in non-production environment", () => {
+      process.env.NODE_ENV = "";
+      const url = getCptellerUrl({ apiType: "webapi" });
+      expect(url).toEqual("https://test.cpteller.com/api/webapi.cfc");
+    });
+
+    it("uses secure domain in production environment", () => {
+      process.env.NODE_ENV = "production";
+      const url = getCptellerUrl({ apiType: "webapi" });
+      expect(url).toEqual("https://secure.cpteller.com/api/webapi.cfc");
+    });
+
+    it("adds version number for webapi type", () => {
+      process.env.NODE_ENV = "";
+      const url = getCptellerUrl({ apiType: "webapi", version: "26" });
+      expect(url).toEqual("https://test.cpteller.com/api/26/webapi.cfc");
+    });
+
+    it("constructs custapi URL without version number", () => {
+      process.env.NODE_ENV = "";
+      const url = getCptellerUrl({ apiType: "custapi", version: "26" });
+      expect(url).toEqual("https://test.cpteller.com/api/custapi.cfc");
+    });
+
+    it("adds query parameters to the URL", () => {
+      process.env.NODE_ENV = "";
+      const url = getCptellerUrl({
+        apiType: "webapi",
+        params: { method: "payment_refund", test: "value" }
+      });
+      expect(url).toEqual("https://test.cpteller.com/api/webapi.cfc?method=payment_refund&test=value");
+    });
+
+    it("handles empty params object", () => {
+      process.env.NODE_ENV = "";
+      const url = getCptellerUrl({ apiType: "webapi", params: {} });
+      expect(url).toEqual("https://test.cpteller.com/api/webapi.cfc");
+    });
+
+    it("defaults to webapi when no apiType is provided", () => {
+      process.env.NODE_ENV = "";
+      const url = getCptellerUrl({});
+      expect(url).toEqual("https://test.cpteller.com/api/webapi.cfc");
+    });
+
+    it("combines version and query parameters correctly", () => {
+      process.env.NODE_ENV = "";
+      const url = getCptellerUrl({
+        apiType: "webapi",
+        version: "26",
+        params: { method: "fee" }
+      });
+      expect(url).toEqual("https://test.cpteller.com/api/26/webapi.cfc?method=fee");
+    });
+  });
+
+  // GetShopCredentials Tests
+  describe("getShopCredentials", () => {
+    const originalEnv = { ...process.env };
+    let mockSend;
+
+    beforeEach(() => {
+      mockSend = vi.fn();
+      vi.mock("@aws-sdk/client-secrets-manager", () => {
+        return {
+          SecretsManagerClient: vi.fn(() => ({
+            send: mockSend
+          })),
+          GetSecretValueCommand: vi.fn((input) => input)
+        };
+      });
+
+      process.env.INTELLIPAY_MERCHANTKEY = "test-merchant-key";
+      process.env.INTELLIPAY_APIKEY = "test-api-key";
+      vi.resetModules();
+    });
+
+    afterEach(() => {
+      process.env = { ...originalEnv };
+      vi.restoreAllMocks();
+      vi.unmock("@aws-sdk/client-secrets-manager");
+    });
+
+    it("returns environment variables in non-production environment", async () => {
+      process.env.NODE_ENV = "development";
+      const result = await getShopCredentials({ imexshopid: "12345" });
+      expect(result).toEqual({
+        merchantkey: "test-merchant-key",
+        apikey: "test-api-key"
+      });
+      expect(mockSend).not.toHaveBeenCalled();
+    });
+
+    it("returns undefined when imexshopid is missing in production", async () => {
+      process.env.NODE_ENV = "production";
+      const result = await getShopCredentials({ name: "Test Shop" });
+      expect(result).toBeUndefined();
+      expect(mockSend).not.toHaveBeenCalled();
+    });
+
+    it("returns undefined for null bodyshop in production", async () => {
+      process.env.NODE_ENV = "production";
+      const result = await getShopCredentials(null);
+      expect(result).toBeUndefined();
+      expect(mockSend).not.toHaveBeenCalled();
+    });
+
+    it("returns undefined for undefined bodyshop in production", async () => {
+      process.env.NODE_ENV = "production";
+      const result = await getShopCredentials(undefined);
+      expect(result).toBeUndefined();
+      expect(mockSend).not.toHaveBeenCalled();
+    });
+  });
+
+  // HandlePaymentValidationError Tests
+  describe("handlePaymentValidationError", () => {
+    it("logs error and sends 400 response", () => {
+      const mockLog = vi.fn();
+      const mockLogger = { log: mockLog };
+      const mockRes = {
+        status: vi.fn().mockReturnThis(),
+        send: vi.fn().mockReturnThis()
+      };
+
+      const logCode = "test-validation-error";
+      const message = "Invalid data";
+      const logMeta = { field: "test", value: 123 };
+
+      const result = handlePaymentValidationError(mockRes, mockLogger, logCode, message, logMeta);
+
+      expect(mockLog).toHaveBeenCalledWith(logCode, "ERROR", "api", null, {
+        message,
+        ...logMeta
+      });
+      expect(mockRes.status).toHaveBeenCalledWith(400);
+      expect(mockRes.send).toHaveBeenCalledWith(`Bad Request: ${message}`);
+      expect(result).toBe(mockRes);
+    });
+
+    it("formats different error messages correctly", () => {
+      const mockLog = vi.fn();
+      const mockLogger = { log: mockLog };
+      const mockRes = {
+        status: vi.fn().mockReturnThis(),
+        send: vi.fn().mockReturnThis()
+      };
+
+      handlePaymentValidationError(mockRes, mockLogger, "error-code", "Custom error");
+      expect(mockRes.send).toHaveBeenCalledWith("Bad Request: Custom error");
+    });
+
+    it("passes different logCodes to logger", () => {
+      const mockLog = vi.fn();
+      const mockLogger = { log: mockLog };
+      const mockRes = {
+        status: vi.fn().mockReturnThis(),
+        send: vi.fn().mockReturnThis()
+      };
+
+      handlePaymentValidationError(mockRes, mockLogger, "custom-log-code", "Error message");
+      expect(mockLog).toHaveBeenCalledWith("custom-log-code", "ERROR", "api", null, { message: "Error message" });
+    });
+
+    it("works with minimal logMeta", () => {
+      const mockLog = vi.fn();
+      const mockLogger = { log: mockLog };
+      const mockRes = {
+        status: vi.fn().mockReturnThis(),
+        send: vi.fn().mockReturnThis()
+      };
+
+      handlePaymentValidationError(mockRes, mockLogger, "error-code", "Error message", {});
+      expect(mockLog).toHaveBeenCalledWith("error-code", "ERROR", "api", null, { message: "Error message" });
+    });
+
+    it("works with undefined logMeta", () => {
+      const mockLog = vi.fn();
+      const mockLogger = { log: mockLog };
+      const mockRes = {
+        status: vi.fn().mockReturnThis(),
+        send: vi.fn().mockReturnThis()
+      };
+
+      handlePaymentValidationError(mockRes, mockLogger, "error-code", "Error message");
+      expect(mockLog).toHaveBeenCalledWith("error-code", "ERROR", "api", null, { message: "Error message" });
+    });
+  });
+});

server/job/job-totals-USA.js

@@ -1,7 +1,5 @@
 const Dinero = require("dinero.js");
 const queries = require("../graphql-client/queries");
-// const adminClient = require("../graphql-client/graphql-client").client;
-// const _ = require("lodash");
 const logger = require("../utils/logger");
 const InstanceMgr = require("../utils/instanceMgr").default;
 
@@ -45,9 +43,11 @@ exports.totalsSsu = async function (req, res) {
       }
     });
 
-    if (result) {
-      res.status(200).send();
+    if (!result) {
+      throw new Error("Failed to update job totals");
     }
+
+    res.status(200).send();
   } catch (error) {
     logger.log("job-totals-ssu-USA-error", "ERROR", req?.user?.email, id, {
       jobid: id,
@@ -58,7 +58,7 @@ exports.totalsSsu = async function (req, res) {
   }
 };
 
-//IMPORTANT*** These two functions MUST be mirrrored.
+//IMPORTANT*** These two functions MUST be mirrored.
 async function TotalsServerSide(req, res) {
   const { job, client } = req.body;
   await AtsAdjustmentsIfRequired({ job: job, client: client, user: req?.user });
@@ -133,6 +133,9 @@ async function TotalsServerSide(req, res) {
   }
 }
 
+// Exported for testing purposes.
+exports.TotalsServerSide = TotalsServerSide;
+
 async function Totals(req, res) {
   const { job, id } = req.body;
 

server/job/job-totals-recorder.js

@@ -0,0 +1,139 @@
+const logger = require("../utils/logger");
+const queries = require("../graphql-client/queries");
+const moment = require("moment");
+const { captureFixture } = require("./utils/seralizeHelper");
+const { TotalsServerSide: totalsServerSideCA } = require("./job-totals"); // Canadian version (imex)
+const { TotalsServerSide: totalsServerSideUS } = require("./job-totals-USA");
+const InstanceMgr = require("../utils/instanceMgr").default;
+const { uploadFileToS3 } = require("../utils/s3");
+
+// requires two buckets be made per env, job-totals-test, job-totals-production, locally it will
+// use `job-totals` in the owncloud stack
+
+/**
+ * Returns the environment prefix based on NODE_ENV
+ * @returns {string}
+ */
+const getEnvPrefix = () => {
+  switch (process.env?.NODE_ENV) {
+    case "test":
+      return "test";
+    case "production":
+      return "production";
+    default:
+      return "test";
+  }
+};
+
+const envPrefix = getEnvPrefix();
+
+const S3_BUCKET_NAME =
+  process.env?.NODE_ENV === "development"
+    ? "imex-job-totals"
+    : InstanceMgr({
+        imex: `job-totals-${envPrefix}`,
+        rome: `job-totals-${envPrefix}-rome`
+      });
+
+/**
+ * Generates a unique S3 key for the job totals file
+ * @param {string} jobId - The job ID
+ * @returns {string} - S3 key with timestamp
+ */
+const generateS3Key = (jobId) => `${jobId}-${moment().toISOString()}.json`;
+
+/**
+ * Uploads job totals data to S3
+ * @param {object} data - The data to upload
+ * @param {string} jobId - The job ID
+ * @param {object} userInfo - User information for logging
+ * @returns {Promise<string>} - The S3 key
+ */
+const uploadJobTotalsToS3 = async (data, jobId, userInfo) => {
+  const key = generateS3Key(jobId);
+
+  try {
+    await uploadFileToS3({
+      bucketName: S3_BUCKET_NAME,
+      key: key,
+      content: JSON.stringify(data, null, 2),
+      contentType: "application/json"
+    });
+
+    logger.log(`Job totals uploaded successfully to ${key}`, "info", userInfo.email, jobId);
+    return key;
+  } catch (error) {
+    logger.log("Failed to upload job totals to S3", "error", userInfo.email, jobId, {
+      error: error?.message,
+      stack: error?.stack
+    });
+    throw error; // Re-throw for the main handler to catch
+  }
+};
+
+/**
+ * Fetches job data using GraphQL
+ * @param {object} client - GraphQL client
+ * @param {string} token - Bearer token
+ * @param {string} jobId - Job ID to fetch
+ * @returns {Promise<object>} - Job data
+ */
+const fetchJobData = async (client, token, jobId) => {
+  return client
+    .setHeaders({ Authorization: token })
+    .request(queries.GET_JOB_BY_PK, { id: jobId })
+    .then((response) => response.jobs_by_pk);
+};
+
+/**
+ * This function is used to capture job totals json files.
+ * @param {object} req - Express request
+ * @param {object} res - Express response
+ * @returns {Promise<void>}
+ */
+const jobTotalsRecorder = async (req, res) => {
+  const { id: jobId } = req.body;
+  const bearerToken = req.BearerToken;
+  const client = req.userGraphQLClient;
+  const userEmail = req?.user?.email;
+
+  logger.log("Starting job totals recording", "debug", userEmail, jobId);
+
+  try {
+    // Fetch job data
+    const jobData = await fetchJobData(client, bearerToken, jobId);
+
+    // Get the appropriate totals function based on instance
+    const totalsFunction = InstanceMgr({
+      imex: totalsServerSideCA,
+      rome: totalsServerSideUS
+    });
+
+    // Calculate the totals
+    const calculatedTotals = await totalsFunction({ body: { job: jobData, client }, req }, res, true);
+
+    // Prepare data for storage
+    const dataToSave = captureFixture(jobData, calculatedTotals);
+
+    // Upload to S3
+    await uploadJobTotalsToS3(dataToSave, jobId, { email: userEmail });
+
+    res.status(200).json({ success: true, message: "Job totals recorded successfully" });
+  } catch (error) {
+    logger.log("Failed to record job totals", "error", userEmail, jobId, {
+      error: error?.message,
+      stack: error?.stack
+    });
+
+    // Avoid sending response if it's already been sent
+    if (!res.headersSent) {
+      res.status(503).json({
+        success: false,
+        message: "Error processing job totals",
+        error: error.message
+      });
+    }
+  }
+};
+
+module.exports = jobTotalsRecorder;

server/job/job-totals.js

@@ -30,6 +30,7 @@ exports.totalsSsu = async function (req, res) {
       id: id
     });
 
+    // Capture the output of TotalsServerSide
     const newTotals = await TotalsServerSide({ body: { job: job.jobs_by_pk, client: client } }, res, true);
 
     const result = await client.setHeaders({ Authorization: BearerToken }).request(queries.UPDATE_JOB, {
@@ -57,7 +58,7 @@ exports.totalsSsu = async function (req, res) {
   }
 };
 
-//IMPORTANT*** These two functions MUST be mirrrored.
+//IMPORTANT*** These two functions MUST be mirrored.
 async function TotalsServerSide(req, res) {
   const { job, client } = req.body;
   await AtsAdjustmentsIfRequired({ job: job, client: client, user: req?.user });
@@ -81,6 +82,9 @@ async function TotalsServerSide(req, res) {
   }
 }
 
+// Exported for testing purposes
+exports.TotalsServerSide = TotalsServerSide;
+
 async function Totals(req, res) {
   const { job, id } = req.body;
 

server/job/test/job-totals.test.js

@@ -0,0 +1,72 @@
+import fs from "fs";
+import path from "path";
+import { describe, it, expect } from "vitest";
+import { TotalsServerSide as TotalsServerSideCA } from "../job-totals"; // Canadian version (imex)
+import { TotalsServerSide as TotalsServerSideUS } from "../job-totals-USA";
+import { isFunction } from "lodash"; // US version (rome)
+
+/**
+ * This function is used to replace the values in the object with their toObject() representation.
+ * @param key
+ * @param value
+ * @returns {*}
+ */
+const dineroReplacer = (key, value) => {
+  if (isFunction(value)) {
+    return value.toObject();
+  }
+  return value;
+};
+
+/**
+ * Normalizes the output of the TotalsServerSide function by converting
+ * @param obj
+ * @returns {any}
+ */
+const normalizeOutput = (obj) => {
+  return JSON.parse(JSON.stringify(obj, dineroReplacer));
+};
+
+/**
+ * This test suite is designed to validate the functionality of the TotalsServerSide function
+ */
+describe("TotalsServerSide fixture tests", () => {
+  const fixturesDir = path.join(__dirname, "fixtures", "job-totals");
+
+  const fixtureFiles = fs.readdirSync(fixturesDir).filter((f) => f.endsWith(".json"));
+
+  const dummyClient = {
+    request: async () => {
+      return {};
+    }
+  };
+
+  const dummyRes = {
+    status: () => ({ send: () => {} })
+  };
+
+  fixtureFiles.forEach((file) => {
+    it(`should produce matching output for fixture file ${file}`, async () => {
+      const fixturePath = path.join(fixturesDir, file);
+      const fixtureData = JSON.parse(fs.readFileSync(fixturePath, "utf8"));
+
+      const { environment, input, output: expectedOutput } = fixtureData;
+
+      const req = {
+        body: {
+          job: input,
+          client: dummyClient
+        },
+        user: {}
+      };
+
+      const computedOutput =
+        environment === "us" ? await TotalsServerSideUS(req, dummyRes) : await TotalsServerSideCA(req, dummyRes);
+
+      const normalizedComputed = normalizeOutput(computedOutput);
+      const normalizedExpected = normalizeOutput(expectedOutput);
+
+      expect(normalizedComputed).toEqual(normalizedExpected);
+    });
+  });
+});

server/job/utils/seralizeHelper.js

@@ -0,0 +1,58 @@
+const fs = require("fs");
+const path = require("path");
+const { default: InstanceMgr } = require("../../utils/instanceMgr");
+
+const fixtureDir = path.join(__dirname, "..", "test", "fixtures", "job-totals");
+
+/**
+ * Custom serializer for Dinero.js objects.
+ * @param key
+ * @param value
+ * @returns {*}
+ */
+const serializeDinero = (key, value) => {
+  if (value && typeof value === "object" && typeof value.toObject === "function") {
+    return value.toObject();
+  }
+  return value;
+};
+
+/**
+ * Capture a fixture for job totals.
+ * @param inputData
+ * @param outputData
+ * @param saveLocally
+ */
+const captureFixture = (inputData, outputData, saveLocally) => {
+  const fileName = `${inputData.id}.json`;
+  const filePath = path.join(fixtureDir, fileName);
+
+  const dataToSave = {
+    environment: InstanceMgr({
+      imex: "ca",
+      rome: "us"
+    }),
+    meta: {
+      ro_number: inputData.ro_number,
+      updated_at: inputData.updated_at
+    },
+    input: inputData,
+    output: outputData
+  };
+
+  // Save the file using our custom serializer.
+  if (saveLocally) {
+    if (!fs.existsSync(fixtureDir)) {
+      fs.mkdirSync(fixtureDir, { recursive: true });
+    }
+
+    fs.writeFileSync(filePath, JSON.stringify(dataToSave, serializeDinero, 2), "utf8");
+  }
+
+  return dataToSave;
+};
+
+module.exports = {
+  captureFixture,
+  serializeDinero
+};

server/media/imgproxy-media.js

@@ -1,8 +1,12 @@
 const path = require("path");
-require("dotenv").config({
-  path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`)
-});
 const logger = require("../utils/logger");
+const { Upload } = require("@aws-sdk/lib-storage");
+const { getSignedUrl } = require("@aws-sdk/s3-request-presigner");
+const { InstanceRegion } = require("../utils/instanceMgr");
+const archiver = require("archiver");
+const stream = require("node:stream");
+const base64UrlEncode = require("./util/base64UrlEncode");
+const createHmacSha256 = require("./util/createHmacSha256");
 const {
   S3Client,
   PutObjectCommand,
@@ -10,35 +14,36 @@ const {
   CopyObjectCommand,
   DeleteObjectCommand
 } = require("@aws-sdk/client-s3");
-const { Upload } = require("@aws-sdk/lib-storage");
-
-const { getSignedUrl } = require("@aws-sdk/s3-request-presigner");
-const crypto = require("crypto");
-const { InstanceRegion } = require("../utils/instanceMgr");
 const {
   GET_DOCUMENTS_BY_JOB,
   QUERY_TEMPORARY_DOCS,
   GET_DOCUMENTS_BY_IDS,
   DELETE_MEDIA_DOCUMENTS
 } = require("../graphql-client/queries");
-const archiver = require("archiver");
-const stream = require("node:stream");
 
 const imgproxyBaseUrl = process.env.IMGPROXY_BASE_URL; // `https://u4gzpp5wm437dnm75qa42tvza40fguqr.lambda-url.ca-central-1.on.aws` //Direct Lambda function access to bypass CDN.
-const imgproxyKey = process.env.IMGPROXY_KEY;
 const imgproxySalt = process.env.IMGPROXY_SALT;
 const imgproxyDestinationBucket = process.env.IMGPROXY_DESTINATION_BUCKET;
 
-//Generate a signed upload link for the S3 bucket.
-//All uploads must be going to the same shop and jobid.
-exports.generateSignedUploadUrls = async (req, res) => {
+/**
+ * Generate a Signed URL Link for the s3 bucket.
+ * All Uploads must be going to the same Shop and JobId
+ * @param req
+ * @param res
+ * @returns {Promise<*>}
+ */
+const generateSignedUploadUrls = async (req, res) => {
   const { filenames, bodyshopid, jobid } = req.body;
   try {
-    logger.log("imgproxy-upload-start", "DEBUG", req.user?.email, jobid, { filenames, bodyshopid, jobid });
+    logger.log("imgproxy-upload-start", "DEBUG", req.user?.email, jobid, {
+      filenames,
+      bodyshopid,
+      jobid
+    });
 
     const signedUrls = [];
     for (const filename of filenames) {
-      const key = filename; 
+      const key = filename;
       const client = new S3Client({ region: InstanceRegion() });
       const command = new PutObjectCommand({
         Bucket: imgproxyDestinationBucket,
@@ -50,24 +55,32 @@ exports.generateSignedUploadUrls = async (req, res) => {
     }
 
     logger.log("imgproxy-upload-success", "DEBUG", req.user?.email, jobid, { signedUrls });
-    res.json({
+
+    return res.json({
       success: true,
       signedUrls
     });
   } catch (error) {
-    res.status(400).json({
-      success: false,
+    logger.log("imgproxy-upload-error", "ERROR", req.user?.email, jobid, {
       message: error.message,
       stack: error.stack
     });
-    logger.log("imgproxy-upload-error", "ERROR", req.user?.email, jobid, {
+
+    return res.status(400).json({
+      success: false,
       message: error.message,
       stack: error.stack
     });
   }
 };
 
-exports.getThumbnailUrls = async (req, res) => {
+/**
+ * Get Thumbnail URLS
+ * @param req
+ * @param res
+ * @returns {Promise<*>}
+ */
+const getThumbnailUrls = async (req, res) => {
   const { jobid, billid } = req.body;
 
   try {
@@ -86,10 +99,11 @@ exports.getThumbnailUrls = async (req, res) => {
 
     for (const document of data.documents) {
       //Format to follow:
-      //<Cloudfront_to_lambda>/<hmac with SHA of entire request URI path (with base64 encoded URL if needed), beginning with unencoded/unhashed Salt>/<remainder of url - resize params >/< base 64 URL encoded to image path>
-
+      //<Cloudfront_to_lambda>/<hmac with SHA of entire request URI path (with base64 encoded URL if needed), beginning with un-encoded/un-hashed Salt>/<remainder of url - resize params >/< base 64 URL encoded to image path>
       //When working with documents from Cloudinary, the URL does not include the extension.
+
       let key;
+
       if (/\.[^/.]+$/.test(document.key)) {
         key = document.key;
       } else {
@@ -98,12 +112,12 @@ exports.getThumbnailUrls = async (req, res) => {
       // Build the S3 path to the object.
       const fullS3Path = `s3://${imgproxyDestinationBucket}/${key}`;
       const base64UrlEncodedKeyString = base64UrlEncode(fullS3Path);
+
       //Thumbnail Generation Block
       const thumbProxyPath = `${thumbResizeParams}/${base64UrlEncodedKeyString}`;
       const thumbHmacSalt = createHmacSha256(`${imgproxySalt}/${thumbProxyPath}`);
 
       //Full Size URL block
-
       const fullSizeProxyPath = `${base64UrlEncodedKeyString}`;
       const fullSizeHmacSalt = createHmacSha256(`${imgproxySalt}/${fullSizeProxyPath}`);
 
@@ -114,8 +128,8 @@ exports.getThumbnailUrls = async (req, res) => {
           Bucket: imgproxyDestinationBucket,
           Key: key
         });
-        const presignedGetUrl = await getSignedUrl(s3client, command, { expiresIn: 360 });
-        s3Props.presignedGetUrl = presignedGetUrl;
+
+        s3Props.presignedGetUrl = await getSignedUrl(s3client, command, { expiresIn: 360 });
 
         const originalProxyPath = `raw:1/${base64UrlEncodedKeyString}`;
         const originalHmacSalt = createHmacSha256(`${imgproxySalt}/${originalProxyPath}`);
@@ -133,7 +147,7 @@ exports.getThumbnailUrls = async (req, res) => {
       });
     }
 
-    res.json(proxiedUrls);
+    return res.json(proxiedUrls);
     //Iterate over them, build the link based on the media type, and return the array.
   } catch (error) {
     logger.log("imgproxy-thumbnails-error", "ERROR", req.user?.email, jobid, {
@@ -142,57 +156,72 @@ exports.getThumbnailUrls = async (req, res) => {
       message: error.message,
       stack: error.stack
     });
-    res.status(400).json({ message: error.message, stack: error.stack });
+
+    return res.status(400).json({ message: error.message, stack: error.stack });
   }
 };
 
-exports.getBillFiles = async (req, res) => {
-  //Givena  bill ID, get the documents associated to it.
-};
-
-exports.downloadFiles = async (req, res) => {
+/**
+ * Download Files
+ * @param req
+ * @param res
+ * @returns {Promise<*>}
+ */
+const downloadFiles = async (req, res) => {
   //Given a series of document IDs or keys, generate a file (or a link) to download all images in bulk
-  const { jobid, billid, documentids } = req.body;
+  const { jobId, billid, documentids } = req.body;
+
   try {
-    logger.log("imgproxy-download", "DEBUG", req.user?.email, jobid, { billid, jobid, documentids });
+    logger.log("imgproxy-download", "DEBUG", req.user?.email, jobId, { billid, jobId, documentids });
 
     //Delayed as the key structure may change slightly from what it is currently and will require evaluating mobile components.
     const client = req.userGraphQLClient;
+
     //Query for the keys of the document IDs
     const data = await client.request(GET_DOCUMENTS_BY_IDS, { documentIds: documentids });
-    //Using the Keys, get all of the S3 links, zip them, and send back to the client.
+
+    //Using the Keys, get all the S3 links, zip them, and send back to the client.
     const s3client = new S3Client({ region: InstanceRegion() });
     const archiveStream = archiver("zip");
+
     archiveStream.on("error", (error) => {
       console.error("Archival encountered an error:", error);
       throw new Error(error);
     });
-    const passthrough = new stream.PassThrough();
 
-    archiveStream.pipe(passthrough);
+    const passThrough = new stream.PassThrough();
+
+    archiveStream.pipe(passThrough);
+
     for (const key of data.documents.map((d) => d.key)) {
-      const response = await s3client.send(new GetObjectCommand({ Bucket: imgproxyDestinationBucket, Key: key }));
-      // :: `response.Body` is a Buffer
-      console.log(path.basename(key));
+      const response = await s3client.send(
+        new GetObjectCommand({
+          Bucket: imgproxyDestinationBucket,
+          Key: key
+        })
+      );
+
       archiveStream.append(response.Body, { name: path.basename(key) });
     }
 
-    archiveStream.finalize();
+    await archiveStream.finalize();
 
-    const archiveKey = `archives/${jobid}/archive-${new Date().toISOString()}.zip`;
+    const archiveKey = `archives/${jobId || "na"}/archive-${new Date().toISOString()}.zip`;
 
     const parallelUploads3 = new Upload({
       client: s3client,
       queueSize: 4, // optional concurrency configuration
       leavePartsOnError: false, // optional manually handle dropped parts
-      params: { Bucket: imgproxyDestinationBucket, Key: archiveKey, Body: passthrough }
+      params: { Bucket: imgproxyDestinationBucket, Key: archiveKey, Body: passThrough }
     });
 
-    parallelUploads3.on("httpUploadProgress", (progress) => {
-      console.log(progress);
-    });
+    // Disabled progress logging for upload, uncomment if needed
+    // parallelUploads3.on("httpUploadProgress", (progress) => {
+    //   console.log(progress);
+    // });
+
+    await parallelUploads3.done();
 
-    const uploadResult = await parallelUploads3.done();
     //Generate the presigned URL to download it.
     const presignedUrl = await getSignedUrl(
       s3client,
@@ -200,20 +229,27 @@ exports.downloadFiles = async (req, res) => {
       { expiresIn: 360 }
     );
 
-    res.json({ success: true, url: presignedUrl });
+    return res.json({ success: true, url: presignedUrl });
     //Iterate over them, build the link based on the media type, and return the array.
   } catch (error) {
-    logger.log("imgproxy-thumbnails-error", "ERROR", req.user?.email, jobid, {
-      jobid,
+    logger.log("imgproxy-thumbnails-error", "ERROR", req.user?.email, jobId, {
+      jobId,
       billid,
       message: error.message,
       stack: error.stack
     });
-    res.status(400).json({ message: error.message, stack: error.stack });
+
+    return res.status(400).json({ message: error.message, stack: error.stack });
   }
 };
 
-exports.deleteFiles = async (req, res) => {
+/**
+ * Delete Files
+ * @param req
+ * @param res
+ * @returns {Promise<*>}
+ */
+const deleteFiles = async (req, res) => {
   //Mark a file for deletion in s3. Lifecycle deletion will actually delete the copy in the future.
   //Mark as deleted from the documents section of the database.
   const { ids } = req.body;
@@ -232,7 +268,7 @@ exports.deleteFiles = async (req, res) => {
         (async () => {
           try {
             // Delete the original object
-            const deleteResult = await s3client.send(
+            await s3client.send(
               new DeleteObjectCommand({
                 Bucket: imgproxyDestinationBucket,
                 Key: document.key
@@ -250,23 +286,30 @@ exports.deleteFiles = async (req, res) => {
     const result = await Promise.all(deleteTransactions);
     const errors = result.filter((d) => d.error);
 
-    //Delete only the succesful deletes.
+    //Delete only the successful deletes.
     const deleteMutationResult = await client.request(DELETE_MEDIA_DOCUMENTS, {
       ids: result.filter((t) => !t.error).map((d) => d.id)
     });
 
-    res.json({ errors, deleteMutationResult });
+    return res.json({ errors, deleteMutationResult });
   } catch (error) {
     logger.log("imgproxy-delete-files-error", "ERROR", req.user.email, null, {
       ids,
       message: error.message,
       stack: error.stack
     });
-    res.status(400).json({ message: error.message, stack: error.stack });
+
+    return res.status(400).json({ message: error.message, stack: error.stack });
   }
 };
 
-exports.moveFiles = async (req, res) => {
+/**
+ * Move Files
+ * @param req
+ * @param res
+ * @returns {Promise<*>}
+ */
+const moveFiles = async (req, res) => {
   const { documents, tojobid } = req.body;
   try {
     logger.log("imgproxy-move-files", "DEBUG", req.user.email, null, { documents, tojobid });
@@ -278,7 +321,7 @@ exports.moveFiles = async (req, res) => {
         (async () => {
           try {
             // Copy the object to the new key
-            const copyresult = await s3client.send(
+            await s3client.send(
               new CopyObjectCommand({
                 Bucket: imgproxyDestinationBucket,
                 CopySource: `${imgproxyDestinationBucket}/${document.from}`,
@@ -288,7 +331,7 @@ exports.moveFiles = async (req, res) => {
             );
 
             // Delete the original object
-            const deleteResult = await s3client.send(
+            await s3client.send(
               new DeleteObjectCommand({
                 Bucket: imgproxyDestinationBucket,
                 Key: document.from
@@ -297,7 +340,12 @@ exports.moveFiles = async (req, res) => {
 
             return document;
           } catch (error) {
-            return { id: document.id, from: document.from, error: error, bucket: imgproxyDestinationBucket };
+            return {
+              id: document.id,
+              from: document.from,
+              error: error,
+              bucket: imgproxyDestinationBucket
+            };
           }
         })()
       );
@@ -307,6 +355,7 @@ exports.moveFiles = async (req, res) => {
     const errors = result.filter((d) => d.error);
 
     let mutations = "";
+
     result
       .filter((d) => !d.error)
       .forEach((d, idx) => {
@@ -321,14 +370,16 @@ exports.moveFiles = async (req, res) => {
       });
 
     const client = req.userGraphQLClient;
+
     if (mutations !== "") {
       const mutationResult = await client.request(`mutation {
             ${mutations}
           }`);
-      res.json({ errors, mutationResult });
-    } else {
-      res.json({ errors: "No images were succesfully moved on remote server. " });
+
+      return res.json({ errors, mutationResult });
     }
+
+    return res.json({ errors: "No images were successfully moved on remote server. " });
   } catch (error) {
     logger.log("imgproxy-move-files-error", "ERROR", req.user.email, null, {
       documents,
@@ -336,13 +387,15 @@ exports.moveFiles = async (req, res) => {
       message: error.message,
       stack: error.stack
     });
-    res.status(400).json({ message: error.message, stack: error.stack });
+
+    return res.status(400).json({ message: error.message, stack: error.stack });
   }
 };
 
-function base64UrlEncode(str) {
-  return Buffer.from(str).toString("base64").replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
-}
-function createHmacSha256(data) {
-  return crypto.createHmac("sha256", imgproxyKey).update(data).digest("base64url");
-}
+module.exports = {
+  generateSignedUploadUrls,
+  getThumbnailUrls,
+  downloadFiles,
+  deleteFiles,
+  moveFiles
+};

server/media/media.js

@@ -1,42 +1,55 @@
-const path = require("path");
 const _ = require("lodash");
 const logger = require("../utils/logger");
 const client = require("../graphql-client/graphql-client").client;
-const queries = require("../graphql-client/queries");
+const determineFileType = require("./util/determineFileType");
+const { DELETE_MEDIA_DOCUMENTS } = require("../graphql-client/queries");
 
-require("dotenv").config({
-  path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`)
-});
-
-var cloudinary = require("cloudinary").v2;
+const cloudinary = require("cloudinary").v2;
 cloudinary.config(process.env.CLOUDINARY_URL);
 
+/**
+ * @description Creates a signed upload URL for Cloudinary.
+ * @param req
+ * @param res
+ */
 const createSignedUploadURL = (req, res) => {
   logger.log("media-signed-upload", "DEBUG", req.user.email, null, null);
   res.send(cloudinary.utils.api_sign_request(req.body, process.env.CLOUDINARY_API_SECRET));
 };
 
-exports.createSignedUploadURL = createSignedUploadURL;
-
+/**
+ * @description Downloads files from Cloudinary.
+ * @param req
+ * @param res
+ */
 const downloadFiles = (req, res) => {
   const { ids } = req.body;
+
   logger.log("media-bulk-download", "DEBUG", req.user.email, ids, null);
 
   const url = cloudinary.utils.download_zip_url({
     public_ids: ids,
     flatten_folders: true
   });
+
   res.send(url);
 };
-exports.downloadFiles = downloadFiles;
 
+/**
+ * @description Deletes files from Cloudinary and Apollo.
+ * @param req
+ * @param res
+ * @returns {Promise<void>}
+ */
 const deleteFiles = async (req, res) => {
   const { ids } = req.body;
-  const types = _.groupBy(ids, (x) => DetermineFileType(x.type));
+
+  const types = _.groupBy(ids, (x) => determineFileType(x.type));
 
   logger.log("media-bulk-delete", "DEBUG", req.user.email, ids, null);
 
   const returns = [];
+
   if (types.image) {
     //delete images
 
@@ -47,8 +60,8 @@ const deleteFiles = async (req, res) => {
       )
     );
   }
+
   if (types.video) {
-    //delete images  returns.push(
     returns.push(
       await cloudinary.api.delete_resources(
         types.video.map((x) => x.key),
@@ -56,8 +69,8 @@ const deleteFiles = async (req, res) => {
       )
     );
   }
+
   if (types.raw) {
-    //delete images  returns.push(
     returns.push(
       await cloudinary.api.delete_resources(
         types.raw.map((x) => `${x.key}.${x.extension}`),
@@ -68,6 +81,7 @@ const deleteFiles = async (req, res) => {
 
   // Delete it on apollo.
   const successfulDeletes = [];
+
   returns.forEach((resType) => {
     Object.keys(resType.deleted).forEach((key) => {
       if (resType.deleted[key] === "deleted" || resType.deleted[key] === "not_found") {
@@ -77,7 +91,7 @@ const deleteFiles = async (req, res) => {
   });
 
   try {
-    const result = await client.request(queries.DELETE_MEDIA_DOCUMENTS, {
+    const result = await client.request(DELETE_MEDIA_DOCUMENTS, {
       ids: ids.filter((i) => successfulDeletes.includes(i.key)).map((i) => i.id)
     });
 
@@ -91,24 +105,29 @@ const deleteFiles = async (req, res) => {
   }
 };
 
-exports.deleteFiles = deleteFiles;
-
+/**
+ * @description Renames keys in Cloudinary and updates the database.
+ * @param req
+ * @param res
+ * @returns {Promise<void>}
+ */
 const renameKeys = async (req, res) => {
   const { documents, tojobid } = req.body;
+
   logger.log("media-bulk-rename", "DEBUG", req.user.email, null, documents);
 
   const proms = [];
+
   documents.forEach((d) => {
     proms.push(
       (async () => {
         try {
-          const res = {
+          return {
             id: d.id,
             ...(await cloudinary.uploader.rename(d.from, d.to, {
-              resource_type: DetermineFileType(d.type)
+              resource_type: determineFileType(d.type)
             }))
           };
-          return res;
         } catch (error) {
           return { id: d.id, from: d.from, error: error };
         }
@@ -148,18 +167,13 @@ const renameKeys = async (req, res) => {
       }`);
     res.json({ errors, mutationResult });
   } else {
-    res.json({ errors: "No images were succesfully moved on remote server. " });
+    res.json({ errors: "No images were successfully moved on remote server. " });
   }
 };
-exports.renameKeys = renameKeys;
 
-//Also needs to be updated in upload utility and mobile app.
-function DetermineFileType(filetype) {
-  if (!filetype) return "auto";
-  else if (filetype.startsWith("image")) return "image";
-  else if (filetype.startsWith("video")) return "video";
-  else if (filetype.startsWith("application/pdf")) return "image";
-  else if (filetype.startsWith("application")) return "raw";
-
-  return "auto";
-}
+module.exports = {
+  createSignedUploadURL,
+  downloadFiles,
+  deleteFiles,
+  renameKeys
+};

server/media/tests/media-utils.test.js

@@ -0,0 +1,98 @@
+import { describe, it, expect, beforeEach, afterEach, vi } from "vitest";
+import determineFileType from "../util/determineFileType";
+import base64UrlEncode from "../util/base64UrlEncode";
+
+describe("Media Utils", () => {
+  describe("base64UrlEncode", () => {
+    it("should encode string to base64url format", () => {
+      expect(base64UrlEncode("hello world")).toBe("aGVsbG8gd29ybGQ");
+    });
+
+    it('should replace "+" with "-"', () => {
+      // '+' in base64 appears when encoding specific binary data
+      expect(base64UrlEncode("hello+world")).toBe("aGVsbG8rd29ybGQ");
+    });
+
+    it('should replace "/" with "_"', () => {
+      expect(base64UrlEncode("path/to/resource")).toBe("cGF0aC90by9yZXNvdXJjZQ");
+    });
+
+    it('should remove trailing "=" characters', () => {
+      // Using a string that will produce padding in base64
+      expect(base64UrlEncode("padding==")).toBe("cGFkZGluZz09");
+    });
+  });
+
+  describe("createHmacSha256", () => {
+    let createHmacSha256;
+    const originalEnv = process.env;
+
+    beforeEach(async () => {
+      vi.resetModules();
+      process.env = { ...originalEnv };
+      process.env.IMGPROXY_KEY = "test-key";
+
+      // Dynamically import the module after setting env var
+      const module = await import("../util/createHmacSha256");
+      createHmacSha256 = module.default;
+    });
+
+    afterEach(() => {
+      process.env = originalEnv;
+    });
+
+    it("should create a valid HMAC SHA-256 hash", () => {
+      const result = createHmacSha256("test-data");
+      expect(typeof result).toBe("string");
+      expect(result.length).toBeGreaterThan(0);
+    });
+
+    it("should produce consistent hashes for the same input", () => {
+      const hash1 = createHmacSha256("test-data");
+      const hash2 = createHmacSha256("test-data");
+      expect(hash1).toBe(hash2);
+    });
+
+    it("should produce different hashes for different inputs", () => {
+      const hash1 = createHmacSha256("test-data-1");
+      const hash2 = createHmacSha256("test-data-2");
+      expect(hash1).not.toBe(hash2);
+    });
+  });
+
+  describe("determineFileType", () => {
+    it('should return "auto" when no filetype is provided', () => {
+      expect(determineFileType()).toBe("auto");
+      expect(determineFileType(null)).toBe("auto");
+      expect(determineFileType(undefined)).toBe("auto");
+    });
+
+    it('should return "image" for image filetypes', () => {
+      expect(determineFileType("image/jpeg")).toBe("image");
+      expect(determineFileType("image/png")).toBe("image");
+      expect(determineFileType("image/gif")).toBe("image");
+    });
+
+    it('should return "video" for video filetypes', () => {
+      expect(determineFileType("video/mp4")).toBe("video");
+      expect(determineFileType("video/quicktime")).toBe("video");
+      expect(determineFileType("video/x-msvideo")).toBe("video");
+    });
+
+    it('should return "image" for PDF files', () => {
+      expect(determineFileType("application/pdf")).toBe("image");
+    });
+
+    it('should return "raw" for other application types', () => {
+      expect(determineFileType("application/zip")).toBe("raw");
+      expect(determineFileType("application/json")).toBe("raw");
+      expect(determineFileType("application/msword")).toBe("raw");
+    });
+
+    it('should return "auto" for unrecognized types', () => {
+      expect(determineFileType("audio/mpeg")).toBe("auto");
+      expect(determineFileType("text/html")).toBe("auto");
+      expect(determineFileType("unknown-type")).toBe("auto");
+    });
+  });
+});

server/media/util/base64UrlEncode.js

@@ -0,0 +1,9 @@
+/**
+ * @description Converts a string to a base64url encoded string.
+ * @param str
+ * @returns {string}
+ */
+const base64UrlEncode = (str) =>
+  Buffer.from(str).toString("base64").replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
+
+module.exports = base64UrlEncode;

server/media/util/createHmacSha256.js

@@ -0,0 +1,12 @@
+const crypto = require("crypto");
+
+const imgproxyKey = process.env.IMGPROXY_KEY;
+
+/**
+ * @description Creates a HMAC SHA-256 hash of the given data.
+ * @param data
+ * @returns {string}
+ */
+const createHmacSha256 = (data) => crypto.createHmac("sha256", imgproxyKey).update(data).digest("base64url");
+
+module.exports = createHmacSha256;

server/media/util/determineFileType.js

@@ -0,0 +1,17 @@
+/**
+ * @description Determines the file type based on the filetype string.
+ * @note Also needs to be updated in the mobile app utility.
+ * @param filetype
+ * @returns {string}
+ */
+const determineFileType = (filetype) => {
+  if (!filetype) return "auto";
+  else if (filetype.startsWith("image")) return "image";
+  else if (filetype.startsWith("video")) return "video";
+  else if (filetype.startsWith("application/pdf")) return "image";
+  else if (filetype.startsWith("application")) return "raw";
+
+  return "auto";
+};
+
+module.exports = determineFileType;

server/middleware/vsstaIntegrationMiddleware.js

@@ -0,0 +1,17 @@
+/**
+ * VSSTA Integration Middleware
+ * @param req
+ * @param res
+ * @param next
+ * @returns {*}
+ */
+const vsstaIntegrationMiddleware = (req, res, next) => {
+  if (req.headers["vssta-integration-secret"] !== process.env.VSSTA_INTEGRATION_SECRET) {
+    return res.status(401).send("Unauthorized");
+  }
+
+  req.isIntegrationAuthorized = true;
+  next();
+};
+
+module.exports = vsstaIntegrationMiddleware;

server/notifications/queues/emailQueue.js

@@ -133,11 +133,19 @@ const loadEmailQueue = async ({ pubClient, logger }) => {
                   subHeader: `Dear ${firstName},`,
                   dateLine: moment().tz(timezone).format("MM/DD/YYYY hh:mm a"),
                   body: `
-                    <p>There have been updates to job ${jobRoNumber || "N/A"} at ${bodyShopName}:</p><br/>
-                    <ul>
-                      ${messages.map((msg) => `<li>${msg}</li>`).join("")}
-                    </ul><br/><br/>
-                    <p><a href="${InstanceEndpoints()}/manage/jobs/${jobId}">Please check the job for more details.</a></p>
+                        <p style="color: #0a0a0a; font-weight: normal; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; margin: 0 0 0 0px; Margin: 0 0 0 0px; line-height: 1.2; margin-bottom: 0px; Margin-bottom: 0px; font-size: 100%;">There have been updates to job ${jobRoNumber || "N/A"} at ${bodyShopName}:</p>
+                      </td></tr></table></th>
+                    </tr></tbody></table>
+                    <table class="row" style="border-spacing: 0; border-collapse: collapse; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; padding: 0; width: 100%; position: relative; display: table;"><tbody style="font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; display: table-row-group;"><tr style="padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif;">
+                      <th class="small-12 large-12 columns first last" style="word-wrap: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; vertical-align: top; color: #0a0a0a; font-weight: normal; padding-top: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 15px; line-height: 1.2; margin: 0 auto; Margin: 0 auto; padding-bottom: 16px; width: 734px; padding-left: 8px; padding-right: 8px; border-collapse: collapse;"><table style="border-spacing: 0; border-collapse: collapse; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; width: 100%;"><tr style="padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif;"><td style="word-wrap: break-word; vertical-align: top; color: #0a0a0a; font-weight: normal; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; margin: 0; Margin: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 15px; word-break: keep-all; -moz-hyphens: none; -ms-hyphens: none; -webkit-hyphens: none; hyphens: none; line-height: 1.2; border-collapse: collapse;">
+                        <ul style="font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; margin: 1%; padding-left: 30px;">
+                          ${messages.map((msg) => `<li style="font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 90%;">${msg}</li>`).join("")}
+                        </ul>
+                      </td></tr></table></th>
+                    </tr><tbody></table>
+                    <table class="row" style="border-spacing: 0; border-collapse: collapse; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; padding: 0; width: 100%; position: relative; display: table;"><tbody style="font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; display: table-row-group;"><tr style="padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif;">
+                      <th class="small-12 large-12 columns first last" style="word-wrap: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; vertical-align: top; color: #0a0a0a; font-weight: normal; padding-top: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 15px; line-height: 1.2; margin: 0 auto; Margin: 0 auto; padding-bottom: 16px; width: 734px; padding-left: 8px; padding-right: 8px; border-collapse: collapse;"><table style="border-spacing: 0; border-collapse: collapse; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; width: 100%;"><tr style="padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif;"><td style="word-wrap: break-word; vertical-align: top; color: #0a0a0a; font-weight: normal; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; margin: 0; Margin: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 15px; word-break: keep-all; -moz-hyphens: none; -ms-hyphens: none; -webkit-hyphens: none; hyphens: none; line-height: 1.2; border-collapse: collapse;">
+                        <p style="color: #0a0a0a; font-weight: normal; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; margin: 0 0 0 0px; Margin: 0 0 0 0px; line-height: 1.2; margin-bottom: 0px; Margin-bottom: 0px; font-size: 90%;"><a href="${InstanceEndpoints()}/manage/jobs/${jobId}" style="color: #2199e8; text-decoration: none; font-weight: normal; padding: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 90%; line-height: 1.2;">Please check the job for more details.</a></p>
                   `
                 });
                 await sendTaskEmail({
@@ -226,6 +234,7 @@ const getQueue = () => {
  * @param {Object} options.logger - Logger instance for logging dispatch events.
  * @returns {Promise<void>} Resolves when all notifications are added to the queue.
  */
+// eslint-disable-next-line no-unused-vars
 const dispatchEmailsToQueue = async ({ emailsToDispatch, logger }) => {
   const emailAddQueue = getQueue();
 

server/notifications/scenarioBuilders.js

@@ -182,7 +182,7 @@ const newMediaAddedReassignedBuilder = (data) => {
       : data.changedFields?.jobid && data.changedFields.jobid.old !== data.changedFields.jobid.new
         ? "moved to this job"
         : "updated";
-  const body = `An ${mediaType} has been ${action}.`;
+  const body = `A ${mediaType} has been ${action}.`;
 
   return buildNotification(data, "notifications.job.newMediaAdded", body, {
     mediaType,

server/routes/adminRoutes.js

@@ -2,7 +2,7 @@ const express = require("express");
 const router = express.Router();
 const validateFirebaseIdTokenMiddleware = require("../middleware/validateFirebaseIdTokenMiddleware");
 const { createAssociation, createShop, updateShop, updateCounter } = require("../admin/adminops");
-const { updateUser, getUser, createUser } = require("../firebase/firebase-handler");
+const { updateUser, getUser, createUser, getWelcomeEmail, getResetLink } = require("../firebase/firebase-handler");
 const validateAdminMiddleware = require("../middleware/validateAdminMiddleware");
 
 router.use(validateFirebaseIdTokenMiddleware);
@@ -15,5 +15,7 @@ router.post("/updatecounter", updateCounter);
 router.post("/updateuser", updateUser);
 router.post("/getuser", getUser);
 router.post("/createuser", createUser);
+router.post("/sendwelcome", getWelcomeEmail);
+router.post("/resetlink", getResetLink);
 
 module.exports = router;