feature/IO-3223-canny - Small syntactic update

feature/IO-3223-canny - Merge release / fix conflicts
IO-3223 Add Canny for feature request and change log.
2025-04-25 17:12:18 -04:00 · 2025-04-25 17:06:44 -04:00 · 2025-04-25 14:02:40 -07:00 · 2025-04-25 11:58:47 -04:00 · 2025-04-25 11:54:36 -04:00 · 2025-04-25 14:59:13 +00:00
130 changed files with 9649 additions and 6674 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -127,4 +127,6 @@ vitest-report*/
 vitest-coverage/
 *.vitest.log
 test-output.txt
+server/job/test/fixtures

+.github
--- a/3
+++ b/3
@@ -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"]
--- a/_reference/localEmailViewer/package-lock.json
+++ b/_reference/localEmailViewer/package-lock.json
--- a/_reference/localEmailViewer/package.json
+++ b/_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"
  }
 }
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
--- a/client/index.html
+++ b/client/index.html
@@ -74,50 +74,8 @@
      })();
    </script>
    <% } %>
-    <script>
-      !(function () {
-        "use strict";
-        var e = [
-          "debug",
-          "destroy",
-          "do",
-          "help",
-          "identify",
-          "is",
-          "off",
-          "on",
-          "ready",
-          "render",
-          "reset",
-          "safe",
-          "set"
-        ];
-        if (window.noticeable) console.warn("Noticeable SDK code snippet loaded more than once");
-        else {
-          var n = (window.noticeable = window.noticeable || []);
+    <script>!function(w,d,i,s){function l(){if(!d.getElementById(i)){var f=d.getElementsByTagName(s)[0],e=d.createElement(s);e.type="text/javascript",e.async=!0,e.src="https://canny.io/sdk.js",f.parentNode.insertBefore(e,f)}}if("function"!=typeof w.Canny){var c=function(){c.q.push(arguments)};c.q=[],w.Canny=c,"complete"===d.readyState?l():w.attachEvent?w.attachEvent("onload",l):w.addEventListener("load",l,!1)}}(window,document,"canny-jssdk","script");</script>

-          function t(e) {
-            return function () {
-              var t = Array.prototype.slice.call(arguments);
-              return t.unshift(e), n.push(t), n;
-            };
-          }
-
-          !(function () {
-            for (var o = 0; o < e.length; o++) {
-              var r = e[o];
-              n[r] = t(r);
-            }
-          })(),
-            (function () {
-              var e = document.createElement("script");
-              (e.async = !0), (e.src = "https://sdk.noticeable.io/l.js");
-              var n = document.head;
-              n.insertBefore(e, n.firstChild);
-            })();
-        }
-      })();
-    </script>
  </head>
  <body>
    <noscript>You need to enable JavaScript to run this app.</noscript>
--- a/client/package-lock.json
+++ b/client/package-lock.json
--- a/client/package.json
+++ b/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"
  }
 }
--- a/client/src/App/App.jsx
+++ b/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
--- a/client/src/App/ProductFruitsWrapper.jsx
+++ b/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
 };
--- a/client/src/components/chat-affix/chat-affix.container.jsx
+++ b/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();
--- a/client/src/components/chat-archive-button/chat-archive-button.component.jsx
+++ b/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
--- a/client/src/components/chat-conversation-title-tags/chat-conversation-title-tags.component.jsx
+++ b/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
--- a/client/src/components/chat-conversation/chat-conversation.container.jsx
+++ b/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,
--- a/client/src/components/chat-label/chat-label.component.jsx
+++ b/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
--- a/client/src/components/chat-new-conversation/chat-new-conversation.component.jsx
+++ b/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
--- a/client/src/components/chat-open-button/chat-open-button.component.jsx
+++ b/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({
--- a/client/src/components/chat-popup/chat-popup.component.jsx
+++ b/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,
--- a/client/src/components/chat-tag-ro/chat-tag-ro.container.jsx
+++ b/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
--- a/client/src/components/header/header.component.jsx
+++ b/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({
--- a/client/src/components/job-at-change/schedule-event.component.jsx
+++ b/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,41 @@ 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) {
+        const totalHours =
+          (data.jobs_by_pk.labhrs?.aggregate?.sum?.mod_lb_hrs || 0) +
+          (data.jobs_by_pk.larhrs?.aggregate?.sum?.mod_lb_hrs || 0);
+        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
+            ? data.jobs_by_pk.scheduled_completion
+            : totalHours && bodyshop.ss_configuration.nobusinessdays
+              ? dayjs().businessDaysAdd(totalHours / (bodyshop.target_touchtime || 1), "day")
+              : dayjs().add(totalHours / (bodyshop.target_touchtime || 1), "day"),
+          scheduled_delivery: data.jobs_by_pk.scheduled_delivery
+        });
+      }
+    },
+    fetchPolicy: "network-only"
+  });

  const blockContent = (
    <Space direction="vertical" wrap>
@@ -89,6 +121,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 +394,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 +403,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>
  );
--- a/client/src/components/job-detail-cards/job-detail-cards.component.jsx
+++ b/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";
--- a/client/src/components/job-reconciliation-modal/job-reconciliation-modal.component.jsx
+++ b/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) =>
--- a/client/src/components/jobs-detail-general/jobs-detail-general.component.jsx
+++ b/client/src/components/jobs-detail-general/jobs-detail-general.component.jsx
@@ -1,5 +1,4 @@
 import { Col, Form, Input, InputNumber, Row, Select, Space, Switch } from "antd";
-import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -188,6 +187,12 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) {
            <Form.Item label={t("jobs.fields.tlos_ind")} name="tlos_ind" valuePropName="checked">
              <Switch disabled={jobRO} />
            </Form.Item>
+            <Form.Item label={t("jobs.fields.hit_and_run")} name="hit_and_run" valuePropName="checked">
+              <Switch disabled={jobRO} />
+            </Form.Item>
+            <Form.Item label={t("jobs.fields.acv_amount")} name="acv_amount">
+              <CurrencyInput disabled={jobRO} min={0} />
+            </Form.Item>
          </FormRow>
        </Col>
        <Col {...lossColDamage}>
--- a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
+++ b/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"
--- a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.toggle-production.jsx
+++ b/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({
@@ -44,9 +44,16 @@ export function JobsDetailHeaderActionsToggleProduction({
    variables: { id: job.id },
    onCompleted: (data) => {
      if (data?.jobs_by_pk) {
+        const totalHours =
+          (data.jobs_by_pk.labhrs?.aggregate?.sum?.mod_lb_hrs || 0) +
+          (data.jobs_by_pk.larhrs?.aggregate?.sum?.mod_lb_hrs || 0);
        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
+            : totalHours && bodyshop.ss_configuration.nobusinessdays
+              ? dayjs().businessDaysAdd(totalHours / (bodyshop.target_touchtime || 1), "day")
+              : dayjs().add(totalHours / (bodyshop.target_touchtime || 1), "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
--- a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
+++ b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
@@ -10,6 +10,7 @@ import { setModalContext } from "../../redux/modals/modals.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
+import dayjs from "../../utils/day";
 import PhoneNumberFormatter from "../../utils/PhoneFormatter";
 import ChatOpenButton from "../chat-open-button/chat-open-button.component";
 import DataLabel from "../data-label/data-label.component";
@@ -21,7 +22,6 @@ import ProductionListColumnComment from "../production-list-columns/production-l
 import ProductionListColumnProductionNote from "../production-list-columns/production-list-columns.productionnote.component";
 import VehicleVinDisplay from "../vehicle-vin-display/vehicle-vin-display.component";
 import "./jobs-detail-header.styles.scss";
-import dayjs from "../../utils/day";

 const mapStateToProps = createStructuredSelector({
  jobRO: selectJobReadOnly,
@@ -149,6 +149,14 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
                  </Space>
                </Tag>
              )}
+              {job.hit_and_run && (
+                <Tag color="green">
+                  <Space>
+                    <WarningFilled />
+                    <span>{t("jobs.fields.hit_and_run")}</span>
+                  </Space>
+                </Tag>
+              )}
            </Space>
          </div>
        </Card>
--- a/client/src/components/jobs-documents-imgproxy-gallery/jobs-document-imgproxy-gallery.download.component.jsx
+++ b/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({
--- a/client/src/components/jobs-documents-imgproxy-gallery/jobs-documents-imgproxy-gallery.component.jsx
+++ b/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}
--- a/client/src/components/notification-center/notification-center.container.jsx
+++ b/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;
--- a/client/src/components/payments-generate-link/payments-generate-link.component.jsx
+++ b/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,
--- a/client/src/components/production-board-kanban/production-board-kanban.container.jsx
+++ b/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,
--- a/client/src/components/production-board-kanban/settings/FilterSettings.jsx
+++ b/client/src/components/production-board-kanban/settings/FilterSettings.jsx
@@ -1,7 +1,6 @@
-import React from "react";
 import { Card, Form, Select } from "antd";
-import { useTranslation } from "react-i18next";
 import PropTypes from "prop-types";
+import { useTranslation } from "react-i18next";

 const FilterSettings = ({
  selectedMdInsCos,
--- a/client/src/components/production-board-kanban/settings/InformationSettings.jsx
+++ b/client/src/components/production-board-kanban/settings/InformationSettings.jsx
@@ -1,10 +1,9 @@
 import { Card, Checkbox, Col, Form, Row } from "antd";
-import React from "react";
 import PropTypes from "prop-types";

 const InformationSettings = ({ t }) => (
-  <Card title={t("production.settings.information")}>
-    <Row gutter={[16, 16]}>
+  <Card title={t("production.settings.information")} style={{ maxWidth: "100%", overflowX: "auto" }}>
+    <Row gutter={[16, 16]} wrap>
      {[
        "model_info",
        "ownr_nm",
@@ -21,7 +20,7 @@ const InformationSettings = ({ t }) => (
        "subtotal",
        "tasks"
      ].map((item) => (
-        <Col span={4} key={item}>
+        <Col xs={24} sm={12} md={8} lg={6} key={item}>
          <Form.Item name={item} valuePropName="checked">
            <Checkbox>{t(`production.labels.${item}`)}</Checkbox>
          </Form.Item>
--- a/client/src/components/production-board-kanban/settings/LayoutSettings.jsx
+++ b/client/src/components/production-board-kanban/settings/LayoutSettings.jsx
@@ -1,9 +1,8 @@
 import { Card, Col, Form, Radio, Row } from "antd";
-import React from "react";
 import PropTypes from "prop-types";

 const LayoutSettings = ({ t }) => (
-  <Card title={t("production.settings.layout")}>
+  <Card title={t("production.settings.layout")} style={{ maxWidth: "100%", overflowX: "auto" }}>
    <Row gutter={[16, 16]}>
      {[
        {
@@ -48,9 +47,9 @@ const LayoutSettings = ({ t }) => (
          ]
        }
      ].map(({ name, label, options }) => (
-        <Col span={4} key={name}>
+        <Col xs={24} sm={16} md={10} lg={8} key={name}>
          <Form.Item name={name} label={label}>
-            <Radio.Group>
+            <Radio.Group style={{ display: "flex", flexWrap: "nowrap" }}>
              {options.map((option) => (
                <Radio.Button key={option.value.toString()} value={option.value}>
                  {option.label}
--- a/client/src/components/production-board-kanban/settings/StatisticsSettings.jsx
+++ b/client/src/components/production-board-kanban/settings/StatisticsSettings.jsx
@@ -1,8 +1,7 @@
+import { Card, Checkbox, Form } from "antd";
+import PropTypes from "prop-types";
 import { DragDropContext, Draggable, Droppable } from "../trello-board/dnd/lib/index.js";
 import { statisticsItems } from "./defaultKanbanSettings.js";
-import { Card, Checkbox, Form } from "antd";
-import React from "react";
-import PropTypes from "prop-types";

 const StatisticsSettings = ({ t, statisticsOrder, setStatisticsOrder, setHasChanges }) => {
  const onDragEnd = (result) => {
--- a/client/src/components/production-board-kanban/settings/production-board-kanban.settings.component.jsx
+++ b/client/src/components/production-board-kanban/settings/production-board-kanban.settings.component.jsx
@@ -1,17 +1,17 @@
+import { SettingOutlined } from "@ant-design/icons";
 import { useMutation } from "@apollo/client";
 import { Button, Card, Col, Form, Popover, Row, Tabs } from "antd";
+import { isFunction } from "lodash";
+import PropTypes from "prop-types";
 import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
+import { useNotification } from "../../../contexts/Notifications/notificationContext.jsx";
 import { UPDATE_KANBAN_SETTINGS } from "../../../graphql/user.queries.js";
 import { defaultKanbanSettings, mergeWithDefaults } from "./defaultKanbanSettings.js";
-import LayoutSettings from "./LayoutSettings.jsx";
-import InformationSettings from "./InformationSettings.jsx";
-import StatisticsSettings from "./StatisticsSettings.jsx";
 import FilterSettings from "./FilterSettings.jsx";
-import PropTypes from "prop-types";
-import { isFunction } from "lodash";
-import { useNotification } from "../../../contexts/Notifications/notificationContext.jsx";
-import { SettingOutlined } from "@ant-design/icons";
+import InformationSettings from "./InformationSettings.jsx";
+import LayoutSettings from "./LayoutSettings.jsx";
+import StatisticsSettings from "./StatisticsSettings.jsx";

 function ProductionBoardKanbanSettings({ associationSettings, parentLoading, bodyshop, data, onSettingsChange }) {
  const [form] = Form.useForm();
@@ -87,7 +87,7 @@ function ProductionBoardKanbanSettings({ associationSettings, parentLoading, bod
  };

  const overlay = (
-    <Card style={{ minWidth: "80vw" }}>
+    <Card style={{ maxWidth: "80vw", width: "100%"}}>
      <Form form={form} onFinish={handleFinish} layout="vertical" onValuesChange={handleValuesChange}>
        <Tabs
          defaultActiveKey="1"
--- a/client/src/components/production-list-detail/production-list-detail.component.jsx
+++ b/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";
--- a/client/src/components/production-list-table/production-list-table.container.jsx
+++ b/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();
--- a/client/src/components/profile-my/profile-my.component.jsx
+++ b/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({
--- a/client/src/components/profile-shops/profile-shops.container.jsx
+++ b/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();
  };

--- a/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx
+++ b/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx
@@ -1,6 +1,6 @@
 import { Button, Col, Form, Input, Row, Select, Space, Switch, Typography } from "antd";
 import axios from "axios";
-import React, { useState } from "react";
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -8,16 +8,16 @@ import { calculateScheduleLoad } from "../../redux/application/application.actio
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { DateFormatter } from "../../utils/DateFormatter";
 import dayjs from "../../utils/day";
+import BlurWrapper from "../feature-wrapper/blur-wrapper.component";
 import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
 import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component";
 import EmailInput from "../form-items-formatted/email-form-item.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
+import LockWrapperComponent from "../lock-wrapper/lock-wrapper.component";
 import ScheduleDayViewContainer from "../schedule-day-view/schedule-day-view.container";
 import ScheduleExistingAppointmentsList from "../schedule-existing-appointments-list/schedule-existing-appointments-list.component";
-import "./schedule-job-modal.scss";
-import LockWrapperComponent from "../lock-wrapper/lock-wrapper.component";
-import BlurWrapper from "../feature-wrapper/blur-wrapper.component";
 import UpsellComponent, { upsellEnum } from "../upsell/upsell.component";
+import "./schedule-job-modal.scss";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
@@ -60,10 +60,12 @@ export function ScheduleJobModalComponent({
      const totalHours =
        lbrHrsData.jobs_by_pk.labhrs.aggregate.sum.mod_lb_hrs + lbrHrsData.jobs_by_pk.larhrs.aggregate.sum.mod_lb_hrs;

-      if (values.start && !values.scheduled_completion)
-        form.setFieldsValue({
-          scheduled_completion: dayjs(values.start).businessDaysAdd(totalHours / bodyshop.target_touchtime, "day")
-        });
+      if (values.start && !values.scheduled_completion) {
+        const addDays = bodyshop.ss_configuration.nobusinessdays
+          ? dayjs(values.start).add(totalHours / (bodyshop.target_touchtime || 1), "day")
+          : dayjs(values.start).businessDaysAdd(totalHours / (bodyshop.target_touchtime || 1), "day");
+        form.setFieldsValue({ scheduled_completion: addDays });
+      }
    }
  };

--- a/client/src/components/shop-info/shop-info.general.component.jsx
+++ b/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>
--- a/client/src/components/shop-info/shop-info.scheduling.component.jsx
+++ b/client/src/components/shop-info/shop-info.scheduling.component.jsx
@@ -1,16 +1,15 @@
 import { DeleteFilled } from "@ant-design/icons";
 import { Button, Divider, Form, Input, InputNumber, Select, Space, Switch, TimePicker } from "antd";
-import React from "react";
 import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
 import ColorpickerFormItemComponent from "../form-items-formatted/colorpicker-form-item.component";
 import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import { ColorPicker } from "./shop-info.rostatus.component";

-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors";
 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
 });
@@ -78,6 +77,13 @@ export function ShopInfoSchedulingComponent({ form, bodyshop }) {
        >
          <InputNumber min={0} />
        </Form.Item>
+        <Form.Item
+          name={["ss_configuration", "nobusinessdays"]}
+          label={t("bodyshop.fields.ss_configuration.nobusinessdays")}
+          valuePropName="checked"
+        >
+          <Switch />
+        </Form.Item>
        <Form.Item
          name={["md_lost_sale_reasons"]}
          label={t("bodyshop.fields.md_lost_sale_reasons")}
--- a/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
+++ b/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
@@ -1,7 +1,6 @@
 import { useLazyQuery } from "@apollo/client";
 import { useSplitTreatments } from "@splitsoftware/splitio-react";
-import { Form, Input, InputNumber, Select, Switch } from "antd";
-import React from "react";
+import { Card, Form, Input, InputNumber, Select, Space, Switch } from "antd";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -19,6 +18,7 @@ import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
 import { HasRbacAccess } from "../rbac-wrapper/rbac-wrapper.component";
 import TimeTicketList from "../time-ticket-list/time-ticket-list.component";
+import JobEmployeeAssignmentsContainer from "./../job-employee-assignments/job-employee-assignments.container";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -319,10 +319,15 @@ export function TimeTicketModalComponent({
 }

 export function LaborAllocationContainer({ jobid, loading, lineTicketData, hideTimeTickets = false }) {
+  const { t } = useTranslation();
  if (loading) return <LoadingSkeleton />;
  if (!lineTicketData) return null;
+  if (!jobid) return null;
  return (
-    <div>
+    <Space direction="vertical" style={{ width: "100%" }}>
+      <Card style={{ height: "100%" }} title={t("jobs.labels.employeeassignments")}>
+        <JobEmployeeAssignmentsContainer job={lineTicketData.jobs_by_pk} />
+      </Card>
      <LaborAllocationsTable
        jobId={jobid}
        joblines={lineTicketData.joblines}
@@ -332,6 +337,6 @@ export function LaborAllocationContainer({ jobid, loading, lineTicketData, hideT
      {!hideTimeTickets && (
        <TimeTicketList loading={loading} timetickets={jobid ? lineTicketData.timetickets : []} techConsole />
      )}
-    </div>
+    </Space>
  );
 }
--- a/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx
+++ b/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx
@@ -2,10 +2,11 @@ import { PageHeader } from "@ant-design/pro-layout";
 import { useMutation, useQuery } from "@apollo/client";
 import { useSplitTreatments } from "@splitsoftware/splitio-react";
 import { Button, Form, Modal, Space } from "antd";
-import React, { useEffect, useState } from "react";
+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 { QUERY_ACTIVE_EMPLOYEES } from "../../graphql/employees.queries";
 import { INSERT_NEW_TIME_TICKET, UPDATE_TIME_TICKET } from "../../graphql/timetickets.queries";
 import { toggleModalVisible } from "../../redux/modals/modals.actions";
@@ -14,7 +15,6 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import dayjs from "../../utils/day";
 import TimeTicketsCommitToggleComponent from "../time-tickets-commit-toggle/time-tickets-commit-toggle.component";
 import TimeTicketModalComponent from "./time-ticket-modal.component";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";

 const mapStateToProps = createStructuredSelector({
  timeTicketModal: selectTimeTicket,
@@ -81,7 +81,7 @@ export function TimeTicketModalContainer({ timeTicketModal, toggleModalVisible,
    }
  };

-  const handleMutationSuccess = (response) => {
+  const handleMutationSuccess = () => {
    notification["success"]({
      message: t("timetickets.successes.created")
    });
@@ -123,7 +123,7 @@ export function TimeTicketModalContainer({ timeTicketModal, toggleModalVisible,
    if (timeTicketModal.open) form.resetFields();
  }, [timeTicketModal.open, form]);

-  const handleFieldsChange = (changedFields, allFields) => {
+  const handleFieldsChange = (changedFields) => {
    if (!!changedFields.employeeid && !!EmployeeAutoCompleteData) {
      const emps = EmployeeAutoCompleteData.employees.filter((e) => e.id === changedFields.employeeid);
      form.setFieldsValue({
@@ -182,6 +182,7 @@ export function TimeTicketModalContainer({ timeTicketModal, toggleModalVisible,
        </Space>
      }
      destroyOnClose
+      id="time-ticket-modal"
    >
      <Form
        onFinish={handleFinish}
--- a/client/src/components/update-alert/update-alert.component.jsx
+++ b/client/src/components/update-alert/update-alert.component.jsx
@@ -113,7 +113,7 @@ export function UpdateAlert({ updateAvailable }) {
          </Col>
          <Col sm={24} md={8} lg={6}>
            <Space wrap>
-              <Button onClick={() => window.open("https://imex-online.noticeable.news/", "_blank")}>
+              <Button onClick={() => window.open("https://shopmanagement.canny.io/changelog", "_blank")}>
                {i18n.t("general.actions.viewreleasenotes")}
              </Button>
              <Button loading={loading} type="primary" onClick={() => ReloadNewVersion()}>
--- a/client/src/contexts/SocketIO/socketProvider.jsx
+++ b/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;
--- a/client/src/contexts/SocketIO/useSocket.js
+++ b/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 };
--- a/client/src/graphql/bodyshop.queries.js
+++ b/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
--- a/client/src/graphql/jobs-lines.queries.js
+++ b/client/src/graphql/jobs-lines.queries.js
@@ -35,6 +35,30 @@ export const GET_LINE_TICKET_BY_PK = gql`
      lbr_adjustments
      converted
      status
+      employee_body
+      employee_body_rel {
+        id
+        first_name
+        last_name
+      }
+      employee_csr
+      employee_csr_rel {
+        id
+        first_name
+        last_name
+      }
+      employee_prep
+      employee_prep_rel {
+        id
+        first_name
+        last_name
+      }
+      employee_refinish
+      employee_refinish_rel {
+        id
+        first_name
+        last_name
+      }
    }
    joblines(where: { jobid: { _eq: $id }, removed: { _eq: false } }) {
      id
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -423,6 +423,7 @@ export const GET_JOB_BY_PK = gql`
      actual_completion
      actual_delivery
      actual_in
+      acv_amount
      adjustment_bottom_line
      alt_transport
      area_of_damage
@@ -511,6 +512,7 @@ export const GET_JOB_BY_PK = gql`
      est_ph1
      flat_rate_ats
      federal_tax_rate
+      hit_and_run
      id
      inproduction
      ins_addr1
@@ -2570,6 +2572,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
+          }
+        }
+      }
    }
  }
 `;
--- a/client/src/graphql/parts-orders.queries.js
+++ b/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
--- a/client/src/pages/feature-request/feature-request.page.jsx
+++ b/client/src/pages/feature-request/feature-request.page.jsx
@@ -0,0 +1,42 @@
+import axios from "axios";
+import React, { useEffect } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
+import InstanceRenderManager from "../../utils/instanceRenderMgr";
+
+const mapDispatchToProps = (dispatch) => ({
+  setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
+  setSelectedHeader: (key) => dispatch(setSelectedHeader(key))
+});
+
+export function FeedbackPage({ setBreadcrumbs, setSelectedHeader }) {
+  const { t } = useTranslation();
+
+  useEffect(() => {
+    document.title = t("titles.feature-request", {
+      app: InstanceRenderManager({
+        imex: "$t(titles.imexonline)",
+        rome: "$t(titles.romeonline)"
+      })
+    });
+    setBreadcrumbs([{ link: "/manage/feature-request", label: t("titles.bc.feature-request") }]);
+  }, [t, setBreadcrumbs, setSelectedHeader]);
+
+  useEffect(() => {
+    async function RenderCanny() {
+      const ssoToken = await axios.post("/sso/canny");
+      window.Canny("render", {
+        boardToken: "bba97b06-70db-0334-dee7-8108d73ef614",
+        basePath: `/manage/feature-request`, // See step 2
+        ssoToken: ssoToken.data, // See step 3,
+        theme: "light" // options: light [default], dark, auto
+      });
+    }
+    RenderCanny();
+  }, []);
+
+  return <div data-canny />;
+}
+
+export default connect(null, mapDispatchToProps)(FeedbackPage);
--- a/client/src/pages/jobs-detail/jobs-detail.page.component.jsx
+++ b/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({
--- a/client/src/pages/manage/manage.page.component.jsx
+++ b/client/src/pages/manage/manage.page.component.jsx
@@ -1,4 +1,5 @@
-import { FloatButton, Layout, Spin } from "antd";
+import { Button, FloatButton, Layout, Space, Spin } from "antd";
+import { AlertOutlined, BulbOutlined } from "@ant-design/icons";

 // import preval from "preval.macro";
 import React, { lazy, Suspense, useEffect, useState } from "react";
@@ -19,8 +20,6 @@ import LoadingSpinner from "../../components/loading-spinner/loading-spinner.com
 import PartnerPingComponent from "../../components/partner-ping/partner-ping.component";
 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"));

@@ -56,6 +56,7 @@ const ContractCreatePage = lazy(() => import("../contract-create/contract-create
 const ContractDetailPage = lazy(() => import("../contract-detail/contract-detail.page.container"));
 const ContractsList = lazy(() => import("../contracts/contracts.page.container"));
 const BillsListPage = lazy(() => import("../bills/bills.page.container"));
+const FeatureRequestPage = lazy(() => import("../feature-request/feature-request.page.jsx"));

 const JobCostingModal = lazy(() => import("../../components/job-costing-modal/job-costing-modal.container"));
 const ReportCenterModal = lazy(() => import("../../components/report-center-modal/report-center-modal.container"));
@@ -180,15 +181,12 @@ export function Manage({ conflict, bodyshop, alerts, setAlerts }) {
      });
    }
  }, [alerts, displayedAlertIds, notification]);
-
  useEffect(() => {
-    const widgetId = InstanceRenderManager({
-      imex: "IABVNO4scRKY11XBQkNr",
-      rome: "mQdqARMzkZRUVugJ6TdS"
-    });
-    window.noticeable.render("widget", widgetId);
-    requestForToken().catch((error) => {
-      console.error(`Unable to request for token.`, error);
+    window.Canny("initChangelog", {
+      appID: "680bd2c7ee501290377f6686",
+      position: "top",
+      align: "left",
+      theme: "light" // options: light [default], dark, auto
    });
  }, []);

@@ -480,6 +478,8 @@ export function Manage({ conflict, bodyshop, alerts, setAlerts }) {
          // element={<ShopTemplates />}
          //   />
        }
+        <Route path="/feature-request/*" index element={<FeatureRequestPage />} />
+
        <Route
          path="/shop/vendors"
          element={
@@ -669,7 +669,12 @@ export function Manage({ conflict, bodyshop, alerts, setAlerts }) {
              margin: "1rem 0rem"
            }}
          >
-            <div style={{ display: "flex" }}>
+            <Link to="/manage/feature-request">
+              <Button icon={<BulbOutlined />} type="text">
+                {t("general.labels.feature-request")}
+              </Button>
+            </Link>
+            <Space>
              <WssStatusDisplayComponent />
              <div onClick={broadcastMessage}>
                {`${InstanceRenderManager({
@@ -677,8 +682,10 @@ export function Manage({ conflict, bodyshop, alerts, setAlerts }) {
                  rome: t("titles.romeonline")
                })} - ${import.meta.env.VITE_APP_GIT_SHA_DATE}`}
              </div>
-              <div id="noticeable-widget" style={{ marginLeft: "1rem" }} />
-            </div>
+              <Button icon={<AlertOutlined />} data-canny-changelog type="text">
+                {t("general.labels.changelog")}
+              </Button>
+            </Space>
            <Link to="/disclaimer" target="_blank" style={{ color: "#ccc" }}>
              Disclaimer & Notices
            </Link>
--- a/client/src/redux/user/user.sagas.js
+++ b/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);
    }
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -335,7 +335,6 @@
        "intellipay_config": {
          "cash_discount_percentage": "Cash Discount %",
          "enable_cash_discount": "Enable Cash Discounting",
-          "payment_type": "Payment Type Map",
          "payment_map": {
            "amex": "American Express",
            "disc": "Discover",
@@ -344,7 +343,8 @@
            "jcb": "JCB",
            "mast": "MasterCard",
            "visa": "Visa"
-          }
+          },
+          "payment_type": "Payment Type Map"
        },
        "invoice_federal_tax_rate": "Invoices - Federal Tax Rate",
        "invoice_local_tax_rate": "Invoices - Local Tax Rate",
@@ -601,7 +601,8 @@
          "templates": "Templates"
        },
        "ss_configuration": {
-          "dailyhrslimit": "Daily Incoming Hours Limit"
+          "dailyhrslimit": "Daily Incoming Hours Limit",
+          "nobusinessdays": "Include Weekends"
        },
        "ssbuckets": {
          "color": "Job Color",
@@ -1220,7 +1221,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",
@@ -1234,6 +1236,7 @@
        "areyousure": "Are you sure?",
        "barcode": "Barcode",
        "cancel": "Are you sure you want to cancel? Your changes will not be saved.",
+        "changelog": "Change Log",
        "clear": "Clear",
        "confirmpassword": "Confirm Password",
        "created_at": "Created At",
@@ -1243,6 +1246,7 @@
        "errors": "Errors",
        "excel": "Excel",
        "exceptiontitle": "An error has occurred.",
+        "feature-request": "Have a feature request?",
        "friday": "Friday",
        "globalsearch": "Global Search",
        "help": "Help",
@@ -1321,6 +1325,7 @@
        "notfoundtitle": "We couldn't find what you're looking for...",
        "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.",
+        "submit-for-testing": "Submitted Job for testing successfully.",
        "unsavedchanges": "You have unsaved changes.",
        "unsavedchangespopup": "You have unsaved changes. Are you sure you want to leave?"
      },
@@ -1633,6 +1638,7 @@
        "actual_completion": "Actual Completion",
        "actual_delivery": "Actual Delivery",
        "actual_in": "Actual In",
+        "acv_amount": "ACV Amount",
        "adjustment_bottom_line": "Adjustments",
        "adjustmenthours": "Adjustment Hours",
        "alt_transport": "Alt. Trans.",
@@ -1758,9 +1764,10 @@
        "est_ct_ln": "Estimator Last Name",
        "est_ea": "Estimator Email",
        "est_ph1": "Estimator Phone #",
-        "flat_rate_ats": "Flat Rate ATS?",
        "federal_tax_payable": "Federal Tax Payable",
        "federal_tax_rate": "Federal Tax Rate",
+        "flat_rate_ats": "Flat Rate ATS?",
+        "hit_and_run": "Hit and Run",
        "ins_addr1": "Insurance Co. Address",
        "ins_city": "Insurance Co. City",
        "ins_co_id": "Insurance Co. ID",
@@ -2314,6 +2321,7 @@
        "duplicate": "Duplicate this Job",
        "duplicatenolines": "Duplicate this Job without Repair Data",
        "newcccontract": "Create Courtesy Car Contract",
+        "submit-for-testing": "Submit for Testing",
        "void": "Void Job"
      },
      "jobsdetail": {
@@ -2420,6 +2428,60 @@
        "updated": "Note updated successfully."
      }
    },
+    "notifications": {
+      "actions": {
+        "remove": "Remove"
+      },
+      "aria": {
+        "toggle": "Toggle Watching Job"
+      },
+      "channels": {
+        "app": "App",
+        "email": "Email",
+        "fcm": "Push"
+      },
+      "labels": {
+        "add-watchers": "Add Watchers",
+        "add-watchers-team": "Add Team Members",
+        "employee-search": "Search for an Employee",
+        "mark-all-read": "Mark All Read",
+        "new-notification-title": "New Notification:",
+        "no-watchers": "No Watchers",
+        "notification-center": "Notification Center",
+        "notification-popup-title": "Changes for Job #{{ro_number}}",
+        "notification-settings-failure": "Error saving Notification Settings. {{error}}",
+        "notification-settings-success": "Notification Settings saved successfully.",
+        "notificationscenarios": "Job Notification Scenarios",
+        "ro-number": "RO #{{ro_number}}",
+        "save": "Save Scenarios",
+        "scenario": "Scenario",
+        "show-unread-only": "Show Unread Only",
+        "teams-search": "Search for a Team",
+        "unwatch": "Unwatch",
+        "watch": "Watch",
+        "watching-issue": "Watching"
+      },
+      "scenarios": {
+        "alternate-transport-changed": "Alternate Transport Changed",
+        "bill-posted": "Bill Posted",
+        "critical-parts-status-changed": "Critical Parts Status Changed",
+        "intake-delivery-checklist-completed": "Intake or Delivery Checklist Completed",
+        "job-added-to-production": "Job Added to Production",
+        "job-assigned-to-me": "Job Assigned to Me",
+        "job-status-change": "Job Status Changed",
+        "new-media-added-reassigned": "New Media Added or Reassigned",
+        "new-note-added": "New Note Added",
+        "new-time-ticket-posted": "New Time Ticket Posted",
+        "part-marked-back-ordered": "Part Marked Back Ordered",
+        "payment-collected-completed": "Payment Collected / Completed",
+        "schedule-dates-changed": "Schedule Dates Changed",
+        "supplement-imported": "Supplement Imported",
+        "tasks-updated-created": "Tasks Updated / Created"
+      },
+      "tooltips": {
+        "job-watchers": "Job Watchers"
+      }
+    },
    "owner": {
      "labels": {
        "noownerinfo": "No owner information."
@@ -3416,6 +3478,7 @@
        "dashboard": "Dashboard",
        "dms": "DMS Export",
        "export-logs": "Export Logs",
+        "feature-request": "Feature Requet",
        "inventory": "Inventory",
        "jobs": "Jobs",
        "jobs-active": "Active Jobs",
@@ -3460,6 +3523,7 @@
      "dashboard": "Dashboard | {{app}}",
      "dms": "DMS Export | {{app}}",
      "export-logs": "Export Logs | {{app}}",
+      "feature-request": "Feature Request | {{app}}",
      "imexonline": "ImEX Online",
      "inventory": "Inventory | {{app}}",
      "jobs": "Active Jobs | {{app}}",
@@ -3677,10 +3741,10 @@
    "users": {
      "errors": {
        "signinerror": {
+          "auth/invalid-email": "A user with this email does not exist.",
          "auth/user-disabled": "User account disabled. ",
          "auth/user-not-found": "A user with this email does not exist.",
-          "auth/wrong-password": "The email and password combination you provided is incorrect.",
-          "auth/invalid-email": "A user with this email does not exist."
+          "auth/wrong-password": "The email and password combination you provided is incorrect."
        }
      }
    },
@@ -3780,60 +3844,6 @@
      "validation": {
        "unique_vendor_name": "You must enter a unique vendor name."
      }
-    },
-    "notifications": {
-      "labels": {
-        "notification-center": "Notification Center",
-        "scenario": "Scenario",
-        "notificationscenarios": "Job Notification Scenarios",
-        "save": "Save Scenarios",
-        "watching-issue": "Watching",
-        "add-watchers": "Add Watchers",
-        "employee-search": "Search for an Employee",
-        "teams-search": "Search for a Team",
-        "add-watchers-team": "Add Team Members",
-        "new-notification-title": "New Notification:",
-        "show-unread-only": "Show Unread Only",
-        "mark-all-read": "Mark All Read",
-        "notification-popup-title": "Changes for Job #{{ro_number}}",
-        "ro-number": "RO #{{ro_number}}",
-        "no-watchers": "No Watchers",
-        "notification-settings-success": "Notification Settings saved successfully.",
-        "notification-settings-failure": "Error saving Notification Settings. {{error}}",
-        "watch": "Watch",
-        "unwatch": "Unwatch"
-      },
-      "actions": {
-        "remove": "Remove"
-      },
-      "aria": {
-        "toggle": "Toggle Watching Job"
-      },
-      "tooltips": {
-        "job-watchers": "Job Watchers"
-      },
-      "scenarios": {
-        "job-assigned-to-me": "Job Assigned to Me",
-        "bill-posted": "Bill Posted",
-        "critical-parts-status-changed": "Critical Parts Status Changed",
-        "part-marked-back-ordered": "Part Marked Back Ordered",
-        "new-note-added": "New Note Added",
-        "supplement-imported": "Supplement Imported",
-        "schedule-dates-changed": "Schedule Dates Changed",
-        "tasks-updated-created": "Tasks Updated / Created",
-        "new-media-added-reassigned": "New Media Added or Reassigned",
-        "new-time-ticket-posted": "New Time Ticket Posted",
-        "intake-delivery-checklist-completed": "Intake or Delivery Checklist Completed",
-        "job-added-to-production": "Job Added to Production",
-        "job-status-change": "Job Status Changed",
-        "payment-collected-completed": "Payment Collected / Completed",
-        "alternate-transport-changed": "Alternate Transport Changed"
-      },
-      "channels": {
-        "app": "App",
-        "email": "Email",
-        "fcm": "Push"
-      }
    }
  }
 }
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -335,7 +335,6 @@
        "intellipay_config": {
          "cash_discount_percentage": "",
          "enable_cash_discount": "",
-          "payment_type": "",
          "payment_map": {
            "amex": "American Express",
            "disc": "Discover",
@@ -344,7 +343,8 @@
            "jcb": "JCB",
            "mast": "MasterCard",
            "visa": "Visa"
-          }
+          },
+          "payment_type": ""
        },
        "invoice_federal_tax_rate": "",
        "invoice_local_tax_rate": "",
@@ -601,7 +601,8 @@
          "templates": ""
        },
        "ss_configuration": {
-          "dailyhrslimit": ""
+          "dailyhrslimit": "",
+          "nobusinessdays": ""
        },
        "ssbuckets": {
          "color": "",
@@ -1220,7 +1221,8 @@
      "errors": {
        "fcm": "",
        "notfound": "",
-        "sizelimit": ""
+        "sizelimit": "",
+        "submit-for-testing": ""
      },
      "itemtypes": {
        "contract": "",
@@ -1234,6 +1236,7 @@
        "areyousure": "",
        "barcode": "código de barras",
        "cancel": "",
+        "changelog": "",
        "clear": "",
        "confirmpassword": "",
        "created_at": "",
@@ -1243,6 +1246,7 @@
        "errors": "",
        "excel": "",
        "exceptiontitle": "",
+        "feature-request": "",
        "friday": "",
        "globalsearch": "",
        "help": "",
@@ -1321,6 +1325,7 @@
        "notfoundtitle": "",
        "partnernotrunning": "",
        "rbacunauth": "",
+        "submit-for-testing": "",
        "unsavedchanges": "Usted tiene cambios no guardados.",
        "unsavedchangespopup": ""
      },
@@ -1633,6 +1638,7 @@
        "actual_completion": "Realización real",
        "actual_delivery": "Entrega real",
        "actual_in": "Real en",
+        "acv_amount": "",
        "adjustment_bottom_line": "Ajustes",
        "adjustmenthours": "",
        "alt_transport": "",
@@ -1758,9 +1764,10 @@
        "est_ct_ln": "Apellido del tasador",
        "est_ea": "Correo electrónico del tasador",
        "est_ph1": "Número de teléfono del tasador",
-        "flat_rate_ats": "",
        "federal_tax_payable": "Impuesto federal por pagar",
        "federal_tax_rate": "",
+        "flat_rate_ats": "",
+        "hit_and_run": "",
        "ins_addr1": "Dirección de Insurance Co.",
        "ins_city": "Ciudad de seguros",
        "ins_co_id": "ID de la compañía de seguros",
@@ -2314,6 +2321,7 @@
        "duplicate": "",
        "duplicatenolines": "",
        "newcccontract": "",
+        "submit-for-testing": "",
        "void": ""
      },
      "jobsdetail": {
@@ -2420,6 +2428,60 @@
        "updated": "Nota actualizada con éxito."
      }
    },
+    "notifications": {
+      "actions": {
+        "remove": ""
+      },
+      "aria": {
+        "toggle": ""
+      },
+      "channels": {
+        "app": "",
+        "email": "",
+        "fcm": ""
+      },
+      "labels": {
+        "add-watchers": "",
+        "add-watchers-team": "",
+        "employee-search": "",
+        "mark-all-read": "",
+        "new-notification-title": "",
+        "no-watchers": "",
+        "notification-center": "",
+        "notification-popup-title": "",
+        "notification-settings-failure": "",
+        "notification-settings-success": "",
+        "notificationscenarios": "",
+        "ro-number": "",
+        "save": "",
+        "scenario": "",
+        "show-unread-only": "",
+        "teams-search": "",
+        "unwatch": "",
+        "watch": "",
+        "watching-issue": ""
+      },
+      "scenarios": {
+        "alternate-transport-changed": "",
+        "bill-posted": "",
+        "critical-parts-status-changed": "",
+        "intake-delivery-checklist-completed": "",
+        "job-added-to-production": "",
+        "job-assigned-to-me": "",
+        "job-status-change": "",
+        "new-media-added-reassigned": "",
+        "new-note-added": "",
+        "new-time-ticket-posted": "",
+        "part-marked-back-ordered": "",
+        "payment-collected-completed": "",
+        "schedule-dates-changed": "",
+        "supplement-imported": "",
+        "tasks-updated-created": ""
+      },
+      "tooltips": {
+        "job-watchers": ""
+      }
+    },
    "owner": {
      "labels": {
        "noownerinfo": ""
@@ -3416,6 +3478,7 @@
        "dashboard": "",
        "dms": "",
        "export-logs": "",
+        "feature-request": "",
        "inventory": "",
        "jobs": "",
        "jobs-active": "",
@@ -3460,6 +3523,7 @@
      "dashboard": "",
      "dms": "",
      "export-logs": "",
+      "feature-request": "",
      "imexonline": "",
      "inventory": "",
      "jobs": "Todos los trabajos | {{app}}",
@@ -3677,10 +3741,10 @@
    "users": {
      "errors": {
        "signinerror": {
+          "auth/invalid-email": "",
          "auth/user-disabled": "",
          "auth/user-not-found": "",
-          "auth/wrong-password": "",
-          "auth/invalid-email": ""
+          "auth/wrong-password": ""
        }
      }
    },
@@ -3780,60 +3844,6 @@
      "validation": {
        "unique_vendor_name": ""
      }
-    },
-    "notifications": {
-      "labels": {
-        "notification-center": "",
-        "scenario": "",
-        "notificationscenarios": "",
-        "save": "",
-        "watching-issue": "",
-        "add-watchers": "",
-        "employee-search": "",
-        "teams-search": "",
-        "add-watchers-team": "",
-        "new-notification-title": "",
-        "show-unread-only": "",
-        "mark-all-read": "",
-        "notification-popup-title": "",
-        "ro-number": "",
-        "no-watchers": "",
-        "notification-settings-success": "",
-        "notification-settings-failure": "",
-        "watch": "",
-        "unwatch": ""
-      },
-      "actions": {
-        "remove": ""
-      },
-      "aria": {
-        "toggle": ""
-      },
-      "tooltips": {
-        "job-watchers": ""
-      },
-      "scenarios": {
-        "job-assigned-to-me": "",
-        "bill-posted": "",
-        "critical-parts-status-changed": "",
-        "part-marked-back-ordered": "",
-        "new-note-added": "",
-        "supplement-imported": "",
-        "schedule-dates-changed": "",
-        "tasks-updated-created": "",
-        "new-media-added-reassigned": "",
-        "new-time-ticket-posted": "",
-        "intake-delivery-checklist-completed": "",
-        "job-added-to-production": "",
-        "job-status-change": "",
-        "payment-collected-completed": "",
-        "alternate-transport-changed": ""
-      },
-      "channels": {
-        "app": "",
-        "email": "",
-        "fcm": ""
-      }
    }
  }
 }
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -335,7 +335,6 @@
        "intellipay_config": {
          "cash_discount_percentage": "",
          "enable_cash_discount": "",
-          "payment_type": "",
          "payment_map": {
            "amex": "American Express",
            "disc": "Discover",
@@ -344,7 +343,8 @@
            "jcb": "JCB",
            "mast": "MasterCard",
            "visa": "Visa"
-          }
+          },
+          "payment_type": ""
        },
        "invoice_federal_tax_rate": "",
        "invoice_local_tax_rate": "",
@@ -601,7 +601,8 @@
          "templates": ""
        },
        "ss_configuration": {
-          "dailyhrslimit": ""
+          "dailyhrslimit": "",
+          "nobusinessdays": ""
        },
        "ssbuckets": {
          "color": "",
@@ -1220,7 +1221,8 @@
      "errors": {
        "fcm": "",
        "notfound": "",
-        "sizelimit": ""
+        "sizelimit": "",
+        "submit-for-testing": ""
      },
      "itemtypes": {
        "contract": "",
@@ -1234,6 +1236,7 @@
        "areyousure": "",
        "barcode": "code à barre",
        "cancel": "",
+        "changelog": "",
        "clear": "",
        "confirmpassword": "",
        "created_at": "",
@@ -1243,6 +1246,7 @@
        "errors": "",
        "excel": "",
        "exceptiontitle": "",
+        "feature-request": "",
        "friday": "",
        "globalsearch": "",
        "help": "",
@@ -1321,6 +1325,7 @@
        "notfoundtitle": "",
        "partnernotrunning": "",
        "rbacunauth": "",
+        "submit-for-testing": "",
        "unsavedchanges": "Vous avez des changements non enregistrés.",
        "unsavedchangespopup": ""
      },
@@ -1633,6 +1638,7 @@
        "actual_completion": "Achèvement réel",
        "actual_delivery": "Livraison réelle",
        "actual_in": "En réel",
+        "acv_amount": "",
        "adjustment_bottom_line": "Ajustements",
        "adjustmenthours": "",
        "alt_transport": "",
@@ -1758,9 +1764,10 @@
        "est_ct_ln": "Nom de l'évaluateur",
        "est_ea": "Courriel de l'évaluateur",
        "est_ph1": "Numéro de téléphone de l'évaluateur",
-        "flat_rate_ats": "",
        "federal_tax_payable": "Impôt fédéral à payer",
        "federal_tax_rate": "",
+        "flat_rate_ats": "",
+        "hit_and_run": "",
        "ins_addr1": "Adresse Insurance Co.",
        "ins_city": "Insurance City",
        "ins_co_id": "ID de la compagnie d'assurance",
@@ -2314,6 +2321,7 @@
        "duplicate": "",
        "duplicatenolines": "",
        "newcccontract": "",
+        "submit-for-testing": "",
        "void": ""
      },
      "jobsdetail": {
@@ -2420,6 +2428,60 @@
        "updated": "Remarque mise à jour avec succès."
      }
    },
+    "notifications": {
+      "actions": {
+        "remove": ""
+      },
+      "aria": {
+        "toggle": ""
+      },
+      "channels": {
+        "app": "",
+        "email": "",
+        "fcm": ""
+      },
+      "labels": {
+        "add-watchers": "",
+        "add-watchers-team": "",
+        "employee-search": "",
+        "mark-all-read": "",
+        "new-notification-title": "",
+        "no-watchers": "",
+        "notification-center": "",
+        "notification-popup-title": "",
+        "notification-settings-failure": "",
+        "notification-settings-success": "",
+        "notificationscenarios": "",
+        "ro-number": "",
+        "save": "",
+        "scenario": "",
+        "show-unread-only": "",
+        "teams-search": "",
+        "unwatch": "",
+        "watch": "",
+        "watching-issue": ""
+      },
+      "scenarios": {
+        "alternate-transport-changed": "",
+        "bill-posted": "",
+        "critical-parts-status-changed": "",
+        "intake-delivery-checklist-completed": "",
+        "job-added-to-production": "",
+        "job-assigned-to-me": "",
+        "job-status-change": "",
+        "new-media-added-reassigned": "",
+        "new-note-added": "",
+        "new-time-ticket-posted": "",
+        "part-marked-back-ordered": "",
+        "payment-collected-completed": "",
+        "schedule-dates-changed": "",
+        "supplement-imported": "",
+        "tasks-updated-created": ""
+      },
+      "tooltips": {
+        "job-watchers": ""
+      }
+    },
    "owner": {
      "labels": {
        "noownerinfo": ""
@@ -3416,6 +3478,7 @@
        "dashboard": "",
        "dms": "",
        "export-logs": "",
+        "feature-request": "",
        "inventory": "",
        "jobs": "",
        "jobs-active": "",
@@ -3460,6 +3523,7 @@
      "dashboard": "",
      "dms": "",
      "export-logs": "",
+      "feature-request": "",
      "imexonline": "",
      "inventory": "",
      "jobs": "Tous les emplois | {{app}}",
@@ -3677,10 +3741,10 @@
    "users": {
      "errors": {
        "signinerror": {
+          "auth/invalid-email": "",
          "auth/user-disabled": "",
          "auth/user-not-found": "",
-          "auth/wrong-password": "",
-          "auth/invalid-email": ""
+          "auth/wrong-password": ""
        }
      }
    },
@@ -3780,60 +3844,6 @@
      "validation": {
        "unique_vendor_name": ""
      }
-    },
-    "notifications": {
-      "labels": {
-        "notification-center": "",
-        "scenario": "",
-        "notificationscenarios": "",
-        "save": "",
-        "watching-issue": "",
-        "add-watchers": "",
-        "employee-search": "",
-        "teams-search": "",
-        "add-watchers-team": "",
-        "new-notification-title": "",
-        "show-unread-only": "",
-        "mark-all-read": "",
-        "notification-popup-title": "",
-        "ro-number": "",
-        "no-watchers": "",
-        "notification-settings-success": "",
-        "notification-settings-failure": "",
-        "watch": "",
-        "unwatch": ""
-      },
-      "actions": {
-        "remove": ""
-      },
-      "aria": {
-        "toggle": ""
-      },
-      "tooltips": {
-        "job-watchers": ""
-      },
-      "scenarios": {
-        "job-assigned-to-me": "",
-        "bill-posted": "",
-        "critical-parts-status-changed": "",
-        "part-marked-back-ordered": "",
-        "new-note-added": "",
-        "supplement-imported": "",
-        "schedule-dates-changed": "",
-        "tasks-updated-created": "",
-        "new-media-added-reassigned": "",
-        "new-time-ticket-posted": "",
-        "intake-delivery-checklist-completed": "",
-        "job-added-to-production": "",
-        "job-status-change": "",
-        "payment-collected-completed": "",
-        "alternate-transport-changed": ""
-      },
-      "channels": {
-        "app": "",
-        "email": "",
-        "fcm": ""
-      }
    }
  }
 }
--- a/client/src/utils/AuditTrailMappings.js
+++ b/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"),
--- a/client/src/utils/RegisterSw.js
+++ b/client/src/utils/RegisterSw.js
@@ -14,10 +14,7 @@ const onServiceWorkerUpdate = (registration) => {
      <Button
        onClick={async () => {
          window.open(
-            InstanceRenderManager({
-              imex: "https://imex-online.noticeable.news/",
-              rome: "https://rome-online.noticeable.news/"
-            }),
+            `https://shopmanagement.canny.io/changelog`,
            "_blank"
          );
        }}
--- a/client/src/utils/sentry.js
+++ b/client/src/utils/sentry.js
@@ -15,7 +15,7 @@ const currentDatePST = new Date()
  .reverse()
  .join("-");
 const sentryRelease =
-  `${import.meta.env.VITE_APP_IS_TEST ? "test" : "production"}-${currentDatePST}-${process.env.VITE_GIT_COMMIT_HASH}`.trim();
+  `${import.meta.env.VITE_APP_IS_TEST ? "test" : "production"}-${currentDatePST}`.trim();

 if (!import.meta.env.DEV) {
  Sentry.init({
--- a/docker-compose.yml
+++ b/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:
--- a/download-job-totals-fixtures.js
+++ b/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;
--- a/hasura/metadata/cron_triggers.yaml
+++ b/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
--- a/hasura/metadata/tables.yaml
+++ b/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
@@ -3592,6 +3595,7 @@
          - actual_completion
          - actual_delivery
          - actual_in
+          - acv_amount
          - adj_g_disc
          - adj_strdis
          - adj_towdis
@@ -3697,6 +3701,7 @@
          - federal_tax_rate
          - flat_rate_ats
          - g_bett_amt
+          - hit_and_run
          - id
          - inproduction
          - ins_addr1
@@ -3863,6 +3868,7 @@
          - actual_completion
          - actual_delivery
          - actual_in
+          - acv_amount
          - adj_g_disc
          - adj_strdis
          - adj_towdis
@@ -3969,6 +3975,7 @@
          - federal_tax_rate
          - flat_rate_ats
          - g_bett_amt
+          - hit_and_run
          - id
          - inproduction
          - ins_addr1
@@ -4147,6 +4154,7 @@
          - actual_completion
          - actual_delivery
          - actual_in
+          - acv_amount
          - adj_g_disc
          - adj_strdis
          - adj_towdis
@@ -4253,6 +4261,7 @@
          - federal_tax_rate
          - flat_rate_ats
          - g_bett_amt
+          - hit_and_run
          - id
          - inproduction
          - ins_addr1
--- a/hasura/migrations/1743531377681_alter_table_public_bodyshops_add_column_intellipay_merchant_id/down.sql
+++ b/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;
--- a/hasura/migrations/1743531377681_alter_table_public_bodyshops_add_column_intellipay_merchant_id/up.sql
+++ b/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;
--- a/hasura/migrations/1744302073757_alter_table_public_bodyshops_add_column_tours_enabled/down.sql
+++ b/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';
--- a/hasura/migrations/1744302073757_alter_table_public_bodyshops_add_column_tours_enabled/up.sql
+++ b/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';
--- a/hasura/migrations/1744847142775_alter_table_public_bodyshops_add_column_podiumid/down.sql
+++ b/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;
--- a/hasura/migrations/1744847142775_alter_table_public_bodyshops_add_column_podiumid/up.sql
+++ b/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;
--- a/hasura/migrations/1745427508374_alter_table_public_jobs_add_column_hit_and_run/down.sql
+++ b/hasura/migrations/1745427508374_alter_table_public_jobs_add_column_hit_and_run/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"."jobs" add column "hit_and_run" boolean
+--  null default 'false';
--- a/hasura/migrations/1745427508374_alter_table_public_jobs_add_column_hit_and_run/up.sql
+++ b/hasura/migrations/1745427508374_alter_table_public_jobs_add_column_hit_and_run/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "hit_and_run" boolean
+ null default 'false';
--- a/hasura/migrations/1745438734125_alter_table_public_jobs_add_column_acv_amount/down.sql
+++ b/hasura/migrations/1745438734125_alter_table_public_jobs_add_column_acv_amount/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"."jobs" add column "acv_amount" numeric
+--  null;
--- a/hasura/migrations/1745438734125_alter_table_public_jobs_add_column_acv_amount/up.sql
+++ b/hasura/migrations/1745438734125_alter_table_public_jobs_add_column_acv_amount/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "acv_amount" numeric
+ null;
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/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",
@@ -52,6 +52,7 @@
    "intuit-oauth": "^4.2.0",
    "ioredis": "^5.6.0",
    "json-2-csv": "^5.5.9",
+    "jsonwebtoken": "^9.0.2",
    "juice": "^11.0.1",
    "lodash": "^4.17.21",
    "moment": "^2.30.1",
@@ -69,7 +70,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 +78,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"
  }
 }
--- a/server.js
+++ b/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,8 @@ 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("/sso", require("./server/routes/ssoRoutes"));
+  app.use("/integrations", require("./server/routes/intergrationRoutes"));

  // Default route for forbidden access
  app.get("/", (req, res) => {
--- a/server/accounting/pbs/pbs-ap-allocations.js
+++ b/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
--- a/server/accounting/pbs/pbs-job-export.js
+++ b/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 || ""}`);
--- a/server/data/chatter.js
+++ b/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");
--- a/server/data/data.js
+++ b/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;
--- a/server/data/podium.js
+++ b/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();
+  }
+}
--- a/server/data/usageReport.js
+++ b/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. 
--- a/server/email/generateTemplate.js
+++ b/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)
  );
 };

--- a/server/email/html.js
+++ b/server/email/html.js
--- a/server/email/sendemail.js
+++ b/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
 };
--- a/server/email/tasksEmails.js
+++ b/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>`
--- a/server/firebase/firebase-handler.js
+++ b/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,
-//       },
-//     });
-//   });
--- a/server/graphql-client/graphql-client.js
+++ b/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
+};
--- a/server/graphql-client/queries.js
+++ b/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
+      }
+    }
+  }
+`;
--- a/server/integrations/VSSTA/vsstaIntegrationRoute.js
+++ b/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;
--- a/server/intellipay/intellipay.js
+++ b/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
+};
--- a/server/intellipay/lib/aws-secrets-manager.js
+++ b/server/intellipay/lib/aws-secrets-manager.js
--- a/server/intellipay/lib/decodeComment.js
+++ b/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;
--- a/server/intellipay/lib/getCptellerUrl.js
+++ b/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;
--- a/server/intellipay/lib/getPaymentType.js
+++ b/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;
--- a/server/intellipay/lib/getShopCredentials.js
+++ b/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;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Dave Richer	f50b198c21	feature/IO-3223-canny - Small syntactic update	2025-04-25 17:12:18 -04:00
Dave Richer	3495326de3	feature/IO-3223-canny - Merge release / fix conflicts	2025-04-25 17:06:44 -04:00
Patrick Fic	b5973085e7	IO-3223 Add Canny for feature request and change log.	2025-04-25 14:02:40 -07:00
Dave Richer	8687214420	release/2025-04-25 - update handleInvoiceBasedPayment.test.js	2025-04-25 11:58:47 -04:00
Dave Richer	d61b89a1e5	release/2025-04-25 - Add logging around handleInvoiceBasePayment paymentResponse, toned logs down. fixed issue in paymentResponseResults	2025-04-25 11:54:36 -04:00
Allan Carr	468b42abd2	Merged in feature/IO-3220-VPB-Popup (pull request #2284 ) IO-3220 VPB Board Settings Popup Approved-by: Dave Richer	2025-04-25 14:59:13 +00:00
Allan Carr	fc03e5f983	IO-3220 VPB Board Settings Popup Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2025-04-24 13:32:27 -07:00
Allan Carr	c4742e38ea	Merged in feature/IO-3213-Hit-and-Run-Toggle (pull request #2280 ) IO-3213 Hit and Run Toggle Approved-by: Dave Richer	2025-04-24 15:41:41 +00:00
Allan Carr	99e1adbe13	Merge branch 'release/2025-04-25' into feature/IO-3213-Hit-and-Run-Toggle Signed-off-by: Allan Carr <allan.carr@thinkimex.com> # Conflicts: # client/src/components/jobs-detail-general/jobs-detail-general.component.jsx	2025-04-24 08:42:32 -07:00
Allan Carr	eb5c797a43	Merged in feature/IO-3215-Employee-Assignment-Timeticket-Modal (pull request #2279 ) IO-3215 Employee Assignment Timeticket Modal Approved-by: Dave Richer	2025-04-24 15:34:42 +00:00
Allan Carr	0595c5545e	Merged in feature/IO-3212-ACV-Amount (pull request #2281 ) IO-3212 ACV Amount Approved-by: Dave Richer	2025-04-24 15:33:41 +00:00
Allan Carr	55944257aa	IO-3212 ACV Amount Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2025-04-23 13:16:49 -07:00
Allan Carr	03241778fa	IO-3212 ACV Amount Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2025-04-23 13:10:42 -07:00
Allan Carr	555b81fb14	IO-3213 Hit and Run Toggle Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2025-04-23 12:04:29 -07:00
Allan Carr	a56b720e09	IO-3215 Employee Assignment Timeticket Modal Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2025-04-23 09:51:44 -07:00
Allan Carr	b89eede164	Merged in feature/IO-3164-Schedule-Completion-Business-Days (pull request #2277 ) IO-3164 Schedule Completion Business Days Approved-by: Dave Richer	2025-04-22 13:48:43 +00:00
Allan Carr	c21cc8d6b9	IO-3164 Schedule Completion Business Days Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2025-04-21 12:27:33 -07:00
Dave Richer	d02a6bc197	Merged in feature/IO-2282-VSSTA-Integration (pull request #2270 ) [DO NOT MERGE] Feature/IO-2282 VSSTA Integration into release/2025-04-25	2025-04-21 17:00:07 +00:00
Dave Richer	360c1ce82d	feature/IO-2282-VSSTA-Integration	2025-04-21 12:57:00 -04:00
Allan Carr	a7ef02976c	Merged in feature/IO-3200-Extended-Crisp-Segments (pull request #2276 ) IO-3200 Extended Crisp Segments for BASIC/LITE Approved-by: Dave Richer	2025-04-21 16:54:31 +00:00
Allan Carr	6a9e36ea4d	IO-3200 Extended Crisp Segments for BASIC/LITE Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2025-04-17 16:20:34 -07:00
Allan Carr	5ebca3ff06	Merged in feature/IO-3210-Podium-Datapump (pull request #2275 ) IO-3210 Podium Datapump CRON Trigger	2025-04-17 19:42:05 +00:00
Allan Carr	37d4c0a40f	IO-3210 Podium Datapump CRON Trigger Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2025-04-17 12:42:19 -07:00
Allan Carr	1969a92226	Merged in feature/IO-3210-Podium-Datapump (pull request #2273 ) IO-3210 Podium Datapump Approved-by: Dave Richer	2025-04-17 17:40:59 +00:00
Allan Carr	8840ffc9ba	IO-3210 Product Fruits Insurance Company Add Button ID Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2025-04-17 10:03:08 -07:00
Allan Carr	19e42ef397	IO-3210 Podium Datapump Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2025-04-16 17:52:22 -07:00
Allan Carr	c7eb026986	Merged in feature/IO-3190-Quick-Intake-Schedule-Event (pull request #2271 ) IO-3190 Quick Intake Schedule Event Approved-by: Dave Richer	2025-04-16 20:16:41 +00:00
Allan Carr	b0dcd3618e	IO-3190 Quick Intake Schedule Event Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2025-04-16 13:00:01 -07:00
Allan Carr	5f23f135f2	Merged in feature/IO-3187-Admin-Enhancements (pull request #2269 ) IO-3187 Admin Enhancements Approved-by: Dave Richer	2025-04-16 19:10:03 +00:00
Allan Carr	159ee7364d	IO-3187 Admin Enhancements add BCC Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2025-04-15 22:08:21 -07:00
Dave Richer	aa6ad109c9	feature/IO-3187-Admin-Enhancements - Minor cleanup	2025-04-15 14:21:28 -04:00
Dave Richer	f2a896d568	feature/IO-3187-Admin-Enhancements - Minor cleanup	2025-04-15 14:02:29 -04:00
Dave Richer	546ebba0bd	feature/IO-3187-Admin-Enhancements - Minor cleanup	2025-04-15 13:57:50 -04:00
Dave Richer	0e75f54d6e	feature/IO-2282-VSSTA-Integration: - doc blocks / cleanup	2025-04-15 13:39:34 -04:00
Dave Richer	30f34a17ea	feature/IO-2282-VSSTA-Integration: - doc blocks / cleanup	2025-04-15 13:20:07 -04:00
Dave Richer	6035d94404	feature/IO-2282-VSSTA-Integration: - doc blocks / cleanup	2025-04-15 13:05:42 -04:00
Dave Richer	0b7a23d555	feature/IO-2282-VSSTA-Integration: - include some tests for media utils	2025-04-15 13:02:54 -04:00
Dave Richer	91fe1f4af9	feature/IO-2282-VSSTA-Integration: - Finish Integration	2025-04-15 12:55:38 -04:00
Dave Richer	f09cb7b247	feature/IO-2282-VSSTA-Integration: - Finish Integration	2025-04-15 12:40:33 -04:00
Dave Richer	35a7222f5e	feature/IO-2282-VSSTA-Integration: - checkpoint	2025-04-15 11:29:44 -04:00
Dave Richer	d444821cf7	feature/IO-2282-VSSTA-Integration: - checkpoint	2025-04-15 10:46:49 -04:00
Allan Carr	b5cb520944	IO-3187 Admin Enhancements Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2025-04-14 17:07:57 -07:00
Allan Carr	6814a3bc33	Merge branch 'master-AIO' into feature/IO-3187-Admin-Enhancements Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2025-04-14 16:57:20 -07:00
Patrick Fic	19c2b19abc	Merged in feature/IO-3066-partner-refresh (pull request #2268 ) IO-3066 Call partner refresh on shop change.	2025-04-14 22:32:44 +00:00
Patrick Fic	22b011139d	IO-3066 Call partner refresh on shop change.	2025-04-14 15:29:45 -07:00
Dave Richer	5b30daefe5	Merge remote-tracking branch 'origin/master-AIO' into feature/IO-2282-VSSTA-Integration	2025-04-14 11:03:29 -04:00
Dave Richer	e015d3574a	Merged in release/2025-04-11 (pull request #2267 ) Release/2025-04-11 into master-AIO - IO-2769, IO-2885, IO-3045, IO-3066, IO-3193, IO-3198, IO-3202	2025-04-12 01:27:08 +00:00
Dave Richer	60140902d4	Merged in feature/IO-3045-Product-Fruits-Tours-Modifications (pull request #2265 ) feature/IO-3045-Product-Fruits-Tours-Modifications - Add in roles prop on Product fruits, tie the usage of it to a new db bodyshop var tours_enabled.	2025-04-10 16:28:21 +00:00
Dave Richer	84f41b2c11	feature/IO-3045-Product-Fruits-Tours-Modifications - Add in roles prop on Product fruits, tie the usage of it to a new db bodyshop var tours_enabled.	2025-04-10 12:27:54 -04:00
Dave Richer	e8b9fcbc6e	feature/IO-2282-VSSTA-Integration: - Clean up imgproxy-media.js	2025-04-10 09:37:31 -04:00
Dave Richer	5adf591670	feature/IO-2282-VSSTA-Integration: - Clean up imgproxy-media.js	2025-04-10 09:27:49 -04:00
Dave Richer	f55764e859	feature/IO-2282-VSSTA-Integration: - Boilerplate in new route - Fix issues with imgproxy - Clean up imgproxy	2025-04-09 14:56:49 -04:00
Dave Richer	282fa787a9	Merged in feature/IO-2769-Job-Totals-Testing (pull request #2263 ) feature/IO-2769-Job-Totals-Testing - packages, final update	2025-04-09 16:53:04 +00:00
Dave Richer	037efff81c	feature/IO-2769-Job-Totals-Testing - packages, final update	2025-04-09 12:52:23 -04:00
Patrick Fic	e26eb17d09	Merged in feature/IO-3066-ems-parts-order-data (pull request #2262 ) IO-3066 Add additional CIECA fields for new partner Approved-by: Patrick Fic	2025-04-09 16:34:42 +00:00
Patrick Fic	fbea9fde27	IO-3066 Add additional CIECA fields for new partner	2025-04-09 09:33:37 -07:00
Dave Richer	ce7cf6bdbe	Merged in feature/IO-2769-Job-Totals-Testing (pull request #2260 ) feature/IO-2769-Job-Totals-Testing - updated tests	2025-04-09 15:19:09 +00:00
Dave Richer	2c47e5d852	feature/IO-2769-Job-Totals-Testing - updated tests	2025-04-09 11:18:09 -04:00
Dave Richer	a6f809b20a	Merged in feature/IO-2769-Job-Totals-Testing (pull request #2258 ) feature/IO-2769-Job-Totals-Testing - non-related	2025-04-08 22:14:52 +00:00
Dave Richer	2bcad68351	feature/IO-2769-Job-Totals-Testing - non-related	2025-04-08 18:14:20 -04:00
Dave Richer	6b1b393804	Merged in feature/IO-2769-Job-Totals-Testing (pull request #2256 ) Feature/IO-2769 Job Totals Testing	2025-04-08 22:11:26 +00:00
Dave Richer	c5181d1c5d	feature/IO-2769-Job-Totals-Testing - non-related	2025-04-08 18:10:28 -04:00
Dave Richer	e33ff2a45d	feature/IO-2769-Job-Totals-Testing - cleanup	2025-04-08 17:04:50 -04:00
Allan Carr	9eb77964db	Merged in feature/IO-3202-HasFeatureAccess-Boolean (pull request #2250 ) IO-3202 HasFeatureAccess Boolean Approved-by: Dave Richer	2025-04-08 17:17:50 +00:00
Dave Richer	11928d9a7e	Merged in feature/IO-2769-Job-Totals-Testing (pull request #2253 ) Feature/IO-2769 Job Totals Testing	2025-04-08 16:23:34 +00:00
Dave Richer	c169bb5d5d	feature/IO-2769-Job-Totals-Testing - update end point	2025-04-08 12:19:33 -04:00
Dave Richer	3cc4f1c63e	feature/IO-2769-Job-Totals-Testing - fix typo	2025-04-08 12:00:43 -04:00
Dave Richer	5237b1d535	Merged in feature/IO-2769-Job-Totals-Testing (pull request #2251 ) feature/IO-2769-Job-Totals-Testing	2025-04-08 15:47:09 +00:00
Dave Richer	cd56c50cf9	feature/IO-2769-Job-Totals-Testing	2025-04-08 11:46:16 -04:00
Dave Richer	a18ce18d72	feature/IO-2769-Job-Totals-Testing	2025-04-08 11:42:27 -04:00
Dave Richer	5f66488410	release/2025-04-11 - Remove unused constant from server.js	2025-04-07 13:06:47 -04:00
Dave Richer	d1be7f6e09	Merged in test-AIO (pull request #2249 ) Test AIO	2025-04-07 17:04:04 +00:00
Dave Richer	44f02f28a6	Merged in release/2025-04-11 (pull request #2248 ) release/2025-04-11 - Add Ivana to Usage Report	2025-04-07 17:03:00 +00:00
Dave Richer	6d33622b4e	release/2025-04-11 - Add Ivana to Usage Report	2025-04-07 13:01:23 -04:00
Dave Richer	f8b8e23ef4	Merged in release/2025-04-11 (pull request #2247 ) release/2025-04-11 - Fix Packages	2025-04-07 16:12:42 +00:00
Dave Richer	db09d09428	release/2025-04-11 - Fix Packages	2025-04-07 12:11:53 -04:00
Dave Richer	451820a67c	Merged in release/2025-04-11 (pull request #2246 ) Release/2025 04 11	2025-04-04 18:19:46 +00:00
Dave Richer	ba0ce5027e	Merged in feature/IO-2769-Job-Totals-Testing (pull request #2245 ) feature/IO-2769-Job-Totals-testing: Setup testing method for job totals Approved-by: Patrick Fic	2025-04-04 18:18:51 +00:00
Dave Richer	f777d26cc1	feature/IO-2769-Job-Totals-testing: Allow for both american and canadian capture + tests	2025-04-04 14:15:30 -04:00
Dave Richer	1463037878	feature/IO-2769-Job-Totals-testing: Allow for both american and canadian capture + tests	2025-04-04 13:54:53 -04:00
Dave Richer	7ddec0bb0f	feature/IO-2769-Job-Totals-testing: Allow for both american and canadian capture + tests	2025-04-04 13:49:21 -04:00
Dave Richer	51c2d3351a	feature/IO-2769-Job-Totals-testing: Allow for both american and canadian capture + tests	2025-04-04 13:47:38 -04:00
Dave Richer	8323fa6696	feature/IO-2769-Job-Totals-testing: Allow for both american and canadian capture + tests	2025-04-04 13:45:45 -04:00
Dave Richer	27a3932c08	feature/IO-2769-Job-Totals-testing: Allow for both american and canadian capture + tests	2025-04-04 13:43:19 -04:00
Dave Richer	add88659a4	feature/IO-2769-Job-Totals-testing: Setup testing method for job totals	2025-04-04 13:23:33 -04:00
Dave Richer	320ad065d0	feature/IO-2769-Job-Totals-testing: Setup testing method for job totals	2025-04-04 13:19:44 -04:00
Dave Richer	a9bc51949a	Merged in release/2025-04-11 (pull request #2244 ) feature/IO-3198-Seperate-Socket-Provider-useSocket	2025-04-03 17:12:19 +00:00
Dave Richer	39d1397221	Merged in feature/IO-3198-Seperate-Socket-Provider-useSocket (pull request #2243 ) feature/IO-3198-Seperate-Socket-Provider-useSocket	2025-04-03 17:11:55 +00:00
Dave Richer	b44b71072f	feature/IO-3198-Seperate-Socket-Provider-useSocket	2025-04-03 13:10:24 -04:00
Dave Richer	f3e2a83bab	Merged in release/2025-04-11 (pull request #2242 ) IO-3193 Reconciliation Zero Part Price or Qty	2025-04-03 16:37:40 +00:00
Allan Carr	0ef030bb89	Merged in feature/IO-3193-Reconciliation-Zero-Part (pull request #2241 ) IO-3193 Reconciliation Zero Part Price or Qty Approved-by: Dave Richer	2025-04-03 15:26:21 +00:00
Allan Carr	3e9e6baf32	IO-3193 Reconciliation Zero Part Price or Qty Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2025-04-02 13:56:02 -07:00
Dave Richer	c03d45b3fc	Merged in release/2025-04-11 (pull request #2240 ) Release/2025 04 11	2025-04-02 18:15:36 +00:00
Dave Richer	0a9b583c4b	Merged in feature/IO-2885-IntelliPay-App-Postback-Support (pull request #2236 ) Feature/IO-2885 IntelliPay App Postback Support	2025-04-02 18:15:07 +00:00
Dave Richer	54ac0c84a7	Merged release/2025-04-11 into feature/IO-2885-IntelliPay-App-Postback-Support	2025-04-02 17:44:54 +00:00
Dave Richer	4d59798d8d	Merged in release/2025-03-28 (pull request #2239 ) release/2025-03-28 - Add Cookies Provider	2025-04-02 17:44:40 +00:00
Dave Richer	f95dab544d	Merged release/2025-04-11 into feature/IO-2885-IntelliPay-App-Postback-Support	2025-04-02 16:59:45 +00:00
Dave Richer	41e43dda96	feature/IO-2885-IntelliPay-App-Postback-Support - Cleanup	2025-04-02 11:59:54 -04:00
Dave Richer	cec60db78c	Merge branch 'release/2025-03-28' into feature/IO-2885-IntelliPay-App-Postback-Support	2025-04-02 11:50:42 -04:00
Dave Richer	24d47ae1c5	Merged in release/2025-03-28 (pull request #2237 ) Release/2025 03 28	2025-04-02 15:39:16 +00:00
Dave Richer	09c4662436	feature/IO-2885-IntelliPay-App-Postback - Add Tests	2025-04-02 11:34:48 -04:00
Dave Richer	9bf6ba9cf0	feature/IO-2885-IntelliPay-App-Postback - Refactor / Add Tests	2025-04-02 11:09:03 -04:00
Dave Richer	c78b9866a3	feature/IO-2885-IntelliPay-App-Postback - Finish ticket	2025-04-01 15:15:48 -04:00
Dave Richer	09c1a8ae35	feature/IO-2885-IntelliPay-App-Postback-Support - Clean intellipay.js	2025-04-01 12:57:32 -04:00
Dave Richer	0ef2814de3	feature/IO-2885-IntelliPay-App-Postback-Support - Clean intellipay.js, add new route scaffolding	2025-04-01 12:33:41 -04:00
Dave Richer	8e105f0b36	feature/IO-2885-IntelliPay-App-Postback-Support - Replace/Remove body-parser with Expresses built in body parsing middleware	2025-04-01 12:20:50 -04:00
Dave Richer	ba4da3e35c	feature/IO-2885-IntelliPay-App-Postback-Support - Packages	2025-04-01 12:04:14 -04:00
Dave Richer	1b8be56c15	Merged in release/2025-03-28 (pull request #2234 ) Release/2025-03-28 into test-AIO - IO-3181	2025-03-28 16:18:08 +00:00
Dave Richer	2b26db78eb	Merged in release/2025-03-28 (pull request #2232 ) IO-3187 Admin Enhancements	2025-03-27 14:04:43 +00:00
Dave Richer	c2d96922c8	Merged in release/2025-03-28 (pull request #2230 ) IO-3176 IntelliPay Payment Mapping	2025-03-26 18:24:26 +00:00
Dave Richer	70b4ec7948	Merged in release/2025-03-28 (pull request #2228 ) release/2025-03-28 - Modify vite config	2025-03-25 20:53:36 +00:00
Dave Richer	a3ec364034	Merged in release/2025-03-28 (pull request #2227 ) release/2025-03-28 - Modify vite config	2025-03-25 20:48:25 +00:00
Dave Richer	e1728b275b	Merged in release/2025-03-28 (pull request #2226 ) release/2025-03-28 - Package locks	2025-03-25 20:38:36 +00:00
Dave Richer	10d55df461	Merged in release/2025-03-28 (pull request #2224 ) Release/2025 03 28	2025-03-25 19:07:28 +00:00