feature/IO-3303-logging - Logging

Merged in feature/IO-3294-imgproxy-bill-upload-hotfix (pull request #2401 )
2025-07-14 19:31:31 -04:00 · 2025-07-14 19:28:29 -04:00 · 2025-07-08 21:46:35 +00:00 · 2025-07-08 14:31:32 -07:00 · 2025-07-05 01:21:35 +00:00 · 2025-07-04 21:03:37 +00:00
37 changed files with 6409 additions and 4577 deletions
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -46,7 +46,7 @@
        "logrocket": "^9.0.2",
        "markerjs2": "^2.32.4",
        "memoize-one": "^6.0.0",
-        "normalize-url": "^8.0.1",
+        "normalize-url": "^8.0.2",
        "object-hash": "^3.0.0",
        "phone": "^3.1.59",
        "prop-types": "^15.8.1",
@@ -121,7 +121,7 @@
        "vite-plugin-node-polyfills": "^0.23.0",
        "vite-plugin-pwa": "^1.0.0",
        "vite-plugin-style-import": "^2.0.0",
-        "vitest": "^3.2.2",
+        "vitest": "^3.2.3",
        "workbox-window": "^7.3.0"
      },
      "engines": {
@@ -5843,15 +5843,15 @@
      }
    },
    "node_modules/@vitest/expect": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.2.2.tgz",
-      "integrity": "sha512-ipHw0z669vEMjzz3xQE8nJX1s0rQIb7oEl4jjl35qWTwm/KIHERIg/p/zORrjAaZKXfsv7IybcNGHwhOOAPMwQ==",
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.2.3.tgz",
+      "integrity": "sha512-W2RH2TPWVHA1o7UmaFKISPvdicFJH+mjykctJFoAkUw+SPTJTGjUNdKscFBrqM7IPnCVu6zihtKYa7TkZS1dkQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@types/chai": "^5.2.2",
-        "@vitest/spy": "3.2.2",
-        "@vitest/utils": "3.2.2",
+        "@vitest/spy": "3.2.3",
+        "@vitest/utils": "3.2.3",
        "chai": "^5.2.0",
        "tinyrainbow": "^2.0.0"
      },
@@ -5860,13 +5860,13 @@
      }
    },
    "node_modules/@vitest/mocker": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.2.2.tgz",
-      "integrity": "sha512-jKojcaRyIYpDEf+s7/dD3LJt53c0dPfp5zCPXz9H/kcGrSlovU/t1yEaNzM9oFME3dcd4ULwRI/x0Po1Zf+LTw==",
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.2.3.tgz",
+      "integrity": "sha512-cP6fIun+Zx8he4rbWvi+Oya6goKQDZK+Yq4hhlggwQBbrlOQ4qtZ+G4nxB6ZnzI9lyIb+JnvyiJnPC2AGbKSPA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@vitest/spy": "3.2.2",
+        "@vitest/spy": "3.2.3",
        "estree-walker": "^3.0.3",
        "magic-string": "^0.30.17"
      },
@@ -5907,9 +5907,9 @@
      }
    },
    "node_modules/@vitest/pretty-format": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.2.2.tgz",
-      "integrity": "sha512-FY4o4U1UDhO9KMd2Wee5vumwcaHw7Vg4V7yR4Oq6uK34nhEJOmdRYrk3ClburPRUA09lXD/oXWZ8y/Sdma0aUQ==",
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.2.3.tgz",
+      "integrity": "sha512-yFglXGkr9hW/yEXngO+IKMhP0jxyFw2/qys/CK4fFUZnSltD+MU7dVYGrH8rvPcK/O6feXQA+EU33gjaBBbAng==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -5920,14 +5920,15 @@
      }
    },
    "node_modules/@vitest/runner": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.2.2.tgz",
-      "integrity": "sha512-GYcHcaS3ejGRZYed2GAkvsjBeXIEerDKdX3orQrBJqLRiea4NSS9qvn9Nxmuy1IwIB+EjFOaxXnX79l8HFaBwg==",
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.2.3.tgz",
+      "integrity": "sha512-83HWYisT3IpMaU9LN+VN+/nLHVBCSIUKJzGxC5RWUOsK1h3USg7ojL+UXQR3b4o4UBIWCYdD2fxuzM7PQQ1u8w==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@vitest/utils": "3.2.2",
-        "pathe": "^2.0.3"
+        "@vitest/utils": "3.2.3",
+        "pathe": "^2.0.3",
+        "strip-literal": "^3.0.0"
      },
      "funding": {
        "url": "https://opencollective.com/vitest"
@@ -5941,13 +5942,13 @@
      "license": "MIT"
    },
    "node_modules/@vitest/snapshot": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.2.2.tgz",
-      "integrity": "sha512-aMEI2XFlR1aNECbBs5C5IZopfi5Lb8QJZGGpzS8ZUHML5La5wCbrbhLOVSME68qwpT05ROEEOAZPRXFpxZV2wA==",
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.2.3.tgz",
+      "integrity": "sha512-9gIVWx2+tysDqUmmM1L0hwadyumqssOL1r8KJipwLx5JVYyxvVRfxvMq7DaWbZZsCqZnu/dZedaZQh4iYTtneA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@vitest/pretty-format": "3.2.2",
+        "@vitest/pretty-format": "3.2.3",
        "magic-string": "^0.30.17",
        "pathe": "^2.0.3"
      },
@@ -5973,9 +5974,9 @@
      "license": "MIT"
    },
    "node_modules/@vitest/spy": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.2.2.tgz",
-      "integrity": "sha512-6Utxlx3o7pcTxvp0u8kUiXtRFScMrUg28KjB3R2hon7w4YqOFAEA9QwzPVVS1QNL3smo4xRNOpNZClRVfpMcYg==",
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.2.3.tgz",
+      "integrity": "sha512-JHu9Wl+7bf6FEejTCREy+DmgWe+rQKbK+y32C/k5f4TBIAlijhJbRBIRIOCEpVevgRsCQR2iHRUH2/qKVM/plw==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -5986,13 +5987,13 @@
      }
    },
    "node_modules/@vitest/utils": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.2.2.tgz",
-      "integrity": "sha512-qJYMllrWpF/OYfWHP32T31QCaLa3BAzT/n/8mNGhPdVcjY+JYazQFO1nsJvXU12Kp1xMpNY4AGuljPTNjQve6A==",
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.2.3.tgz",
+      "integrity": "sha512-4zFBCU5Pf+4Z6v+rwnZ1HU1yzOKKvDkMXZrymE2PBlbjKJRlrOxbvpfPSvJTGRIwGoahaOGvp+kbCoxifhzJ1Q==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@vitest/pretty-format": "3.2.2",
+        "@vitest/pretty-format": "3.2.3",
        "loupe": "^3.1.3",
        "tinyrainbow": "^2.0.0"
      },
@@ -12707,9 +12708,9 @@
      }
    },
    "node_modules/normalize-url": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.0.1.tgz",
-      "integrity": "sha512-IO9QvjUMWxPQQhs60oOu10CRkWCiZzSUkzbXGGV9pviYl1fXYcvkzQ5jV9z8Y6un8ARoVRl4EtC6v6jNqbaJ/w==",
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.0.2.tgz",
+      "integrity": "sha512-Ee/R3SyN4BuynXcnTaekmaVdbDAEiNrHqjQIA37mHU8G9pf7aaAD4ZX3XjBLo6rsdcxA/gtkcNYZLt30ACgynw==",
      "license": "MIT",
      "engines": {
        "node": ">=14.16"
@@ -16299,6 +16300,26 @@
        "url": "https://github.com/sponsors/sindresorhus"
      }
    },
+    "node_modules/strip-literal": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-3.0.0.tgz",
+      "integrity": "sha512-TcccoMhJOM3OebGhSBEmp3UZ2SfDMZUEBdRA/9ynfLi8yYajyWX3JiXArcJt4Umh4vISpspkQIY8ZZoCqjbviA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "js-tokens": "^9.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/strip-literal/node_modules/js-tokens": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-9.0.1.tgz",
+      "integrity": "sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ==",
+      "dev": true,
+      "license": "MIT"
+    },
    "node_modules/style-to-js": {
      "version": "1.1.16",
      "resolved": "https://registry.npmjs.org/style-to-js/-/style-to-js-1.1.16.tgz",
@@ -17576,9 +17597,9 @@
      }
    },
    "node_modules/vite-node": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.2.2.tgz",
-      "integrity": "sha512-Xj/jovjZvDXOq2FgLXu8NsY4uHUMWtzVmMC2LkCu9HWdr9Qu1Is5sanX3Z4jOFKdohfaWDnEJWp9pRP0vVpAcA==",
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.2.3.tgz",
+      "integrity": "sha512-gc8aAifGuDIpZHrPjuHyP4dpQmYXqWw7D1GmDnWeNWP654UEXzVfQ5IHPSK5HaHkwB/+p1atpYpSdw/2kOv8iQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -17774,20 +17795,20 @@
      }
    },
    "node_modules/vitest": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.2.2.tgz",
-      "integrity": "sha512-fyNn/Rp016Bt5qvY0OQvIUCwW2vnaEBLxP42PmKbNIoasSYjML+8xyeADOPvBe+Xfl/ubIw4og7Lt9jflRsCNw==",
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.2.3.tgz",
+      "integrity": "sha512-E6U2ZFXe3N/t4f5BwUaVCKRLHqUpk1CBWeMh78UT4VaTPH/2dyvH6ALl29JTovEPu9dVKr/K/J4PkXgrMbw4Ww==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@types/chai": "^5.2.2",
-        "@vitest/expect": "3.2.2",
-        "@vitest/mocker": "3.2.2",
-        "@vitest/pretty-format": "^3.2.2",
-        "@vitest/runner": "3.2.2",
-        "@vitest/snapshot": "3.2.2",
-        "@vitest/spy": "3.2.2",
-        "@vitest/utils": "3.2.2",
+        "@vitest/expect": "3.2.3",
+        "@vitest/mocker": "3.2.3",
+        "@vitest/pretty-format": "^3.2.3",
+        "@vitest/runner": "3.2.3",
+        "@vitest/snapshot": "3.2.3",
+        "@vitest/spy": "3.2.3",
+        "@vitest/utils": "3.2.3",
        "chai": "^5.2.0",
        "debug": "^4.4.1",
        "expect-type": "^1.2.1",
@@ -17801,7 +17822,7 @@
        "tinypool": "^1.1.0",
        "tinyrainbow": "^2.0.0",
        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0",
-        "vite-node": "3.2.2",
+        "vite-node": "3.2.3",
        "why-is-node-running": "^2.3.0"
      },
      "bin": {
@@ -17817,8 +17838,8 @@
        "@edge-runtime/vm": "*",
        "@types/debug": "^4.1.12",
        "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
-        "@vitest/browser": "3.2.2",
-        "@vitest/ui": "3.2.2",
+        "@vitest/browser": "3.2.3",
+        "@vitest/ui": "3.2.3",
        "happy-dom": "*",
        "jsdom": "*"
      },
--- a/client/package.json
+++ b/client/package.json
@@ -45,7 +45,7 @@
    "logrocket": "^9.0.2",
    "markerjs2": "^2.32.4",
    "memoize-one": "^6.0.0",
-    "normalize-url": "^8.0.1",
+    "normalize-url": "^8.0.2",
    "object-hash": "^3.0.0",
    "phone": "^3.1.59",
    "prop-types": "^15.8.1",
@@ -161,7 +161,7 @@
    "vite-plugin-node-polyfills": "^0.23.0",
    "vite-plugin-pwa": "^1.0.0",
    "vite-plugin-style-import": "^2.0.0",
-    "vitest": "^3.2.2",
+    "vitest": "^3.2.3",
    "workbox-window": "^7.3.0"
  }
 }
--- a/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
+++ b/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
@@ -25,6 +25,7 @@ import BillFormContainer from "../bill-form/bill-form.container";
 import { CalculateBillTotal } from "../bill-form/bill-form.totals.utility";
 import { handleUpload as handleLocalUpload } from "../documents-local-upload/documents-local-upload.utility";
 import { handleUpload } from "../documents-upload/documents-upload.utility";
+import { handleUpload as handleUploadToImageProxy } from "../documents-upload-imgproxy/documents-upload-imgproxy.utility";

 const mapStateToProps = createStructuredSelector({
  billEnterModal: selectBillEnterModal,
@@ -53,10 +54,10 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
  const notification = useNotification();

  const {
-    treatments: { Enhanced_Payroll }
+    treatments: { Enhanced_Payroll, Imgproxy }
  } = useSplitTreatments({
    attributes: {},
-    names: ["Enhanced_Payroll"],
+    names: ["Enhanced_Payroll", "Imgproxy"],
    splitKey: bodyshop.imexshopid
  });

@@ -298,20 +299,39 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
          });
        });
      } else {
-        upload.forEach((u) => {
-          handleUpload(
-            { file: u.originFileObj },
-            {
-              bodyshop: bodyshop,
-              uploaded_by: currentUser.email,
-              jobId: values.jobid,
-              billId: billId,
-              tagsArray: null,
-              callback: null
-            },
-            notification
-          );
-        });
+        //Check if using Imgproxy or cloudinary
+
+        if (Imgproxy.treatment === "on") {
+          upload.forEach((u) => {
+            handleUploadToImageProxy(
+              { file: u.originFileObj },
+              {
+                bodyshop: bodyshop,
+                uploaded_by: currentUser.email,
+                jobId: values.jobid,
+                billId: billId,
+                tagsArray: null,
+                callback: null
+              },
+              notification
+            );
+          });
+        } else {
+          upload.forEach((u) => {
+            handleUpload(
+              { file: u.originFileObj },
+              {
+                bodyshop: bodyshop,
+                uploaded_by: currentUser.email,
+                jobId: values.jobid,
+                billId: billId,
+                tagsArray: null,
+                callback: null
+              },
+              notification
+            );
+          });
+        }
      }
    }
    ///////////////////////////
--- a/client/src/components/chat-media-selector/chat-media-selector.component.jsx
+++ b/client/src/components/chat-media-selector/chat-media-selector.component.jsx
@@ -110,7 +110,7 @@ export function ChatMediaSelector({ bodyshop, selectedMedia, setSelectedMedia, c
      trigger="click"
      open={open}
      onOpenChange={handleVisibleChange}
-      overlayClassName="media-selector-popover"
+      classNames={{ root: "media-selector-popover" }}
    >
      <Badge count={selectedMedia.filter((s) => s.isSelected).length}>
        <PictureFilled style={{ margin: "0 .5rem" }} />
--- a/client/src/components/chat-media-selector/chat-media-selector.styles.scss
+++ b/client/src/components/chat-media-selector/chat-media-selector.styles.scss
@@ -1,5 +1,6 @@
 .media-selector-popover {
  .ant-popover-inner-content {
+    position: relative;
    max-width: 640px;
    max-height: 480px;
    overflow-y: auto;
@@ -36,11 +37,6 @@
  border-radius: 4px;
  margin: 4px;
  cursor: pointer;
-  transition: transform 0.2s;
-
-  &:hover {
-    transform: scale(1.05);
-  }
 }

 /* Grid layout for gallery components */
--- a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
+++ b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
@@ -335,7 +335,11 @@ export function JobsDetailHeader({ job, bodyshop, disabled, insertAuditTrail })
        </Card>
      </Col>
      <Col {...colSpan}>
-        <Card style={{ height: "100%" }} title={t("jobs.labels.employeeassignments")}>
+        <Card
+          style={{ height: "100%" }}
+          title=<span id="job-employee-assignments-title">{t("jobs.labels.employeeassignments")}</span>
+          id={"job-employee-assignments"}
+        >
          <div>
            <JobEmployeeAssignments job={job} />
            <Divider style={{ margin: ".5rem" }} />
--- 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
@@ -46,32 +46,40 @@ export function JobsDocumentsImgproxyDownloadButton({ bodyshop, galleryImages, i
  }

  function standardMediaDownload(bufferData) {
-    const a = document.createElement("a");
-    const url = window.URL.createObjectURL(new Blob([bufferData]));
-    a.href = url;
-    a.download = `${identifier || "documents"}.zip`;
-    a.click();
+    try {
+      const a = document.createElement("a");
+      const url = window.URL.createObjectURL(new Blob([bufferData]));
+      a.href = url;
+      a.download = `${identifier || "documents"}.zip`;
+      a.click();
+    } catch (error) {
+      setLoading(false);
+      setDownload(null);
+    }
  }

  const handleDownload = async () => {
    logImEXEvent("jobs_documents_download");
    setLoading(true);
-    const zipUrl = await axios({
-      url: "/media/imgproxy/download",
-      method: "POST",
-      data: { jobId, documentids: imagesToDownload.map((_) => _.id) }
-    });
+    try {
+      const response = await axios({
+        url: "/media/imgproxy/download",
+        method: "POST",
+        responseType: "blob",
+        data: { jobId, documentids: imagesToDownload.map((_) => _.id) },
+        onDownloadProgress: downloadProgress
+      });

-    const theDownloadedZip = await cleanAxios({
-      url: zipUrl.data.url,
-      method: "GET",
-      responseType: "arraybuffer",
-      onDownloadProgress: downloadProgress
-    });
-    setLoading(false);
-    setDownload(null);
+      setLoading(false);
+      setDownload(null);

-    standardMediaDownload(theDownloadedZip.data);
+      // Use the response data (Blob) to trigger download
+      standardMediaDownload(response.data);
+    } catch (error) {
+      setLoading(false);
+      setDownload(null);
+      // handle error (optional)
+    }
  };

  return (
--- 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
@@ -98,7 +98,13 @@ function JobsDocumentsImgproxyComponent({
              jobId={jobId}
              totalSize={totalSize}
              billId={billId}
-              callbackAfterUpload={billsCallback || fetchThumbnails || refetch}
+              callbackAfterUpload={
+                billsCallback ||
+                function () {
+                  isFunction(refetch) && refetch();
+                  isFunction(fetchThumbnails) && fetchThumbnails();
+                }
+              }
              ignoreSizeLimit={ignoreSizeLimit}
            />
          </Card>
--- a/client/src/components/scoreboard-display/scoreboard-display.component.jsx
+++ b/client/src/components/scoreboard-display/scoreboard-display.component.jsx
@@ -1,5 +1,5 @@
 import { Col, Row } from "antd";
-import React, { useEffect } from "react";
+import { useEffect } from "react";
 import ScoreboardChart from "../scoreboard-chart/scoreboard-chart.component";
 import ScoreboardLastDays from "../scoreboard-last-days/scoreboard-last-days.component";
 import ScoreboardTargetsTable from "../scoreboard-targets-table/scoreboard-targets-table.component";
@@ -26,18 +26,18 @@ export function ScoreboardDisplayComponent({ bodyshop }) {
      start: dayjs().startOf("month"),
      end: dayjs().endOf("month")
    },
-    pollInterval: 60000*5
+    pollInterval: 60000 * 5
  });

  const { data } = scoreboardSubscription;
  const client = useApolloClient();
-  const scoreBoardlist = (data && data.scoreboard) || [];
+  const scoreBoardlist = data?.scoreboard || [];

  const sbEntriesByDate = {};

  scoreBoardlist.forEach((i) => {
    const entryDate = i.date;
-    if (!!!sbEntriesByDate[entryDate]) {
+    if (!sbEntriesByDate[entryDate]) {
      sbEntriesByDate[entryDate] = [];
    }
    sbEntriesByDate[entryDate].push(i);
@@ -58,10 +58,9 @@ export function ScoreboardDisplayComponent({ bodyshop }) {
        });
        appointments = data.appointments;
      }
-
-      dayjs.updateLocale("ca", {
+      dayjs.updateLocale(dayjs.locale(), {
        workingWeekdays: translateSettingsToWorkingDays(bodyshop.workingdays),
-        ...(appointments
+        ...(appointments?.length
          ? {
              holidays: appointments.map((h) => dayjs(h.start).format("MM-DD-YYYY"))
            }
@@ -78,11 +77,9 @@ export function ScoreboardDisplayComponent({ bodyshop }) {
      <Col span={24}>
        <ScoreboardTargetsTable scoreBoardlist={scoreBoardlist} />
      </Col>
-
      <Col span={24}>
        <ScoreboardLastDays sbEntriesByDate={sbEntriesByDate} />
      </Col>
-
      <Col span={24}>
        <ScoreboardChart sbEntriesByDate={sbEntriesByDate} />
      </Col>
--- a/client/src/components/shop-employees/shop-employees-form.component.jsx
+++ b/client/src/components/shop-employees/shop-employees-form.component.jsx
@@ -1,13 +1,15 @@
 import { DeleteFilled } from "@ant-design/icons";
 import { useApolloClient, useMutation, useQuery } from "@apollo/client";
+import { useSplitTreatments } from "@splitsoftware/splitio-react";
 import { Button, Card, Form, Input, InputNumber, Select, Switch, Table } from "antd";
 import { useForm } from "antd/es/form/Form";
-import dayjs from "../../utils/day";
-import React, { useEffect } from "react";
+import queryString from "query-string";
+import { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { useLocation, useNavigate } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import {
  CHECK_EMPLOYEE_NUMBER,
@@ -20,19 +22,17 @@ import {
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CiecaSelect from "../../utils/Ciecaselect";
 import { DateFormatter } from "../../utils/DateFormatter";
+import dayjs from "../../utils/day";
 import AlertComponent from "../alert/alert.component";
+import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component.jsx";
 import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import ShopEmployeeAddVacation from "./shop-employees-add-vacation.component";
-import queryString from "query-string";
-import { useSplitTreatments } from "@splitsoftware/splitio-react";
-import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component.jsx";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
 });
-const mapDispatchToProps = (dispatch) => ({
+const mapDispatchToProps = () => ({
  //setUserLanguage: language => dispatch(setUserLanguage(language))
 });

@@ -83,7 +83,7 @@ export function ShopEmployeesFormComponent({ bodyshop }) {
          }
        }
      })
-        .then((r) => {
+        .then(() => {
          notification["success"]({
            message: t("employees.successes.save")
          });
@@ -120,13 +120,13 @@ export function ShopEmployeesFormComponent({ bodyshop }) {
      title: t("employees.fields.vacation.start"),
      dataIndex: "start",
      key: "start",
-      render: (text, record) => <DateFormatter>{text}</DateFormatter>
+      render: (text) => <DateFormatter>{text}</DateFormatter>
    },
    {
      title: t("employees.fields.vacation.end"),
      dataIndex: "end",
      key: "end",
-      render: (text, record) => <DateFormatter>{text}</DateFormatter>
+      render: (text) => <DateFormatter>{text}</DateFormatter>
    },
    {
      title: t("employees.fields.vacation.length"),
@@ -210,7 +210,7 @@ export function ShopEmployeesFormComponent({ bodyshop }) {
                required: true
                //message: t("general.validation.required"),
              },
-              ({ getFieldValue }) => ({
+              () => ({
                async validator(rule, value) {
                  if (value) {
                    const response = await client.query({
@@ -369,8 +369,9 @@ export function ShopEmployeesFormComponent({ bodyshop }) {
                      add();
                    }}
                    style={{ width: "100%" }}
+                    id="add-employee-rate-button"
                  >
-                    {t("employees.actions.newrate")}
+                    <span id="new-employee-rate">{t("employees.actions.newrate")}</span>
                  </Button>
                </Form.Item>
              </div>
@@ -383,7 +384,7 @@ export function ShopEmployeesFormComponent({ bodyshop }) {
        title={() => <ShopEmployeeAddVacation employee={data && data.employees_by_pk} />}
        columns={columns}
        rowKey={"id"}
-        dataSource={data ? data.employees_by_pk.employee_vacations : []}
+        dataSource={data?.employees_by_pk?.employee_vacations ?? []}
      />
    </Card>
  );
--- a/client/src/components/shop-info/shop-info.general.component.jsx
+++ b/client/src/components/shop-info/shop-info.general.component.jsx
@@ -14,6 +14,7 @@ import PhoneFormItem, { PhoneItemFormatterValidation } from "../form-items-forma
 import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";

+// eslint-disable-next-line no-undef
 const timeZonesList = Intl.supportedValuesOf("timeZone");
 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
@@ -143,236 +144,246 @@ export function ShopInfoGeneral({ form, bodyshop }) {
          <InputNumber min={0} />
        </Form.Item>
      </LayoutFormRow>
-      <FeatureWrapper featureName="export" noauth={() => null}>
-        <LayoutFormRow header={t("bodyshop.labels.accountingsetup")} id="accountingsetup">
-          <Form.Item label={t("bodyshop.labels.qbo")} valuePropName="checked" name={["accountingconfig", "qbo"]}>
-            <Switch />
-          </Form.Item>
-          {InstanceRenderManager({
-            imex: (
-              <Form.Item shouldUpdate noStyle>
-                {() => (
+      <LayoutFormRow header={t("bodyshop.labels.accountingsetup")} id="accountingsetup">
+        {HasFeatureAccess({ featureName: "export", bodyshop }) && (
+          <>
+            <Form.Item label={t("bodyshop.labels.qbo")} valuePropName="checked" name={["accountingconfig", "qbo"]}>
+              <Switch />
+            </Form.Item>
+            {InstanceRenderManager({
+              imex: (
+                <Form.Item shouldUpdate noStyle>
+                  {() => (
+                    <Form.Item
+                      label={t("bodyshop.labels.qbo_usa")}
+                      shouldUpdate
+                      valuePropName="checked"
+                      name={["accountingconfig", "qbo_usa"]}
+                    >
+                      <Switch disabled={!form.getFieldValue(["accountingconfig", "qbo"])} />
+                    </Form.Item>
+                  )}
+                </Form.Item>
+              )
+            })}
+            <Form.Item label={t("bodyshop.labels.qbo_departmentid")} name={["accountingconfig", "qbo_departmentid"]}>
+              <Input />
+            </Form.Item>
+            <Form.Item
+              label={t("bodyshop.labels.accountingtiers")}
+              rules={[
+                {
+                  required: true
+                  //message: t("general.validation.required"),
+                }
+              ]}
+              name={["accountingconfig", "tiers"]}
+            >
+              <Radio.Group>
+                <Radio value={2}>2</Radio>
+                <Radio value={3}>3</Radio>
+              </Radio.Group>
+            </Form.Item>
+            <Form.Item shouldUpdate>
+              {() => {
+                return (
                  <Form.Item
-                    label={t("bodyshop.labels.qbo_usa")}
+                    label={t("bodyshop.labels.2tiersetup")}
                    shouldUpdate
-                    valuePropName="checked"
-                    name={["accountingconfig", "qbo_usa"]}
+                    rules={[
+                      {
+                        required: form.getFieldValue(["accountingconfig", "tiers"]) === 2
+                        //message: t("general.validation.required"),
+                      }
+                    ]}
+                    name={["accountingconfig", "twotierpref"]}
                  >
-                    <Switch disabled={!form.getFieldValue(["accountingconfig", "qbo"])} />
+                    <Radio.Group disabled={form.getFieldValue(["accountingconfig", "tiers"]) === 3}>
+                      <Radio value="name">{t("bodyshop.labels.2tiername")}</Radio>
+                      <Radio value="source">{t("bodyshop.labels.2tiersource")}</Radio>
+                    </Radio.Group>
                  </Form.Item>
-                )}
-              </Form.Item>
-            )
-          })}
-          <Form.Item label={t("bodyshop.labels.qbo_departmentid")} name={["accountingconfig", "qbo_departmentid"]}>
-            <Input />
-          </Form.Item>
-          <Form.Item
-            label={t("bodyshop.labels.accountingtiers")}
-            rules={[
-              {
-                required: true
-                //message: t("general.validation.required"),
-              }
-            ]}
-            name={["accountingconfig", "tiers"]}
-          >
-            <Radio.Group>
-              <Radio value={2}>2</Radio>
-              <Radio value={3}>3</Radio>
-            </Radio.Group>
-          </Form.Item>
-          <Form.Item shouldUpdate>
-            {() => {
-              return (
+                );
+              }}
+            </Form.Item>
+            <Form.Item
+              label={t("bodyshop.labels.printlater")}
+              valuePropName="checked"
+              name={["accountingconfig", "printlater"]}
+            >
+              <Switch />
+            </Form.Item>
+            <Form.Item
+              label={t("bodyshop.labels.emaillater")}
+              valuePropName="checked"
+              name={["accountingconfig", "emaillater"]}
+            >
+              <Switch />
+            </Form.Item>
+          </>
+        )}
+        <Form.Item
+          label={t("bodyshop.fields.inhousevendorid")}
+          name={"inhousevendorid"}
+          rules={[
+            {
+              required: true
+              //message: t("general.validation.required"),
+            }
+          ]}
+        >
+          <Input />
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.default_adjustment_rate")}
+          name={"default_adjustment_rate"}
+          rules={[
+            {
+              required: true
+              //message: t("general.validation.required"),
+            }
+          ]}
+        >
+          <InputNumber min={0} precision={2} />
+        </Form.Item>
+        {InstanceRenderManager({
+          imex: (
+            <Form.Item label={t("bodyshop.fields.federal_tax_id")} name="federal_tax_id">
+              <Input />
+            </Form.Item>
+          )
+        })}
+        <Form.Item label={t("bodyshop.fields.state_tax_id")} name="state_tax_id">
+          <Input />
+        </Form.Item>
+        {HasFeatureAccess({ featureName: "bills", bodyshop }) && (
+          <>
+            {InstanceRenderManager({
+              imex: (
                <Form.Item
-                  label={t("bodyshop.labels.2tiersetup")}
-                  shouldUpdate
+                  label={t("bodyshop.fields.invoice_federal_tax_rate")}
+                  name={["bill_tax_rates", "federal_tax_rate"]}
                  rules={[
                    {
-                      required: form.getFieldValue(["accountingconfig", "tiers"]) === 2
+                      required: true
                      //message: t("general.validation.required"),
                    }
                  ]}
-                  name={["accountingconfig", "twotierpref"]}
                >
-                  <Radio.Group disabled={form.getFieldValue(["accountingconfig", "tiers"]) === 3}>
-                    <Radio value="name">{t("bodyshop.labels.2tiername")}</Radio>
-                    <Radio value="source">{t("bodyshop.labels.2tiersource")}</Radio>
-                  </Radio.Group>
+                  <InputNumber />
                </Form.Item>
-              );
-            }}
-          </Form.Item>
-          <Form.Item
-            label={t("bodyshop.labels.printlater")}
-            valuePropName="checked"
-            name={["accountingconfig", "printlater"]}
-          >
-            <Switch />
-          </Form.Item>
-          <Form.Item
-            label={t("bodyshop.labels.emaillater")}
-            valuePropName="checked"
-            name={["accountingconfig", "emaillater"]}
-          >
-            <Switch />
-          </Form.Item>
-          <Form.Item
-            label={t("bodyshop.fields.inhousevendorid")}
-            name={"inhousevendorid"}
-            rules={[
-              {
-                required: true
-                //message: t("general.validation.required"),
-              }
-            ]}
-          >
-            <Input />
-          </Form.Item>
-          <Form.Item
-            label={t("bodyshop.fields.default_adjustment_rate")}
-            name={"default_adjustment_rate"}
-            rules={[
-              {
-                required: true
-                //message: t("general.validation.required"),
-              }
-            ]}
-          >
-            <InputNumber min={0} precision={2} />
-          </Form.Item>
-          {InstanceRenderManager({
-            imex: (
-              <Form.Item label={t("bodyshop.fields.federal_tax_id")} name="federal_tax_id">
+              )
+            })}
+            <Form.Item
+              label={t("bodyshop.fields.invoice_state_tax_rate")}
+              name={["bill_tax_rates", "state_tax_rate"]}
+              rules={[
+                {
+                  required: true
+                  //message: t("general.validation.required"),
+                }
+              ]}
+            >
+              <InputNumber />
+            </Form.Item>
+            <Form.Item
+              label={t("bodyshop.fields.invoice_local_tax_rate")}
+              name={["bill_tax_rates", "local_tax_rate"]}
+              rules={[
+                {
+                  required: true
+                  //message: t("general.validation.required"),
+                }
+              ]}
+            >
+              <InputNumber />
+            </Form.Item>
+          </>
+        )}
+        <Form.Item
+          name={["md_payment_types"]}
+          label={t("bodyshop.fields.md_payment_types")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+              type: "array"
+            }
+          ]}
+        >
+          <Select mode="tags" />
+        </Form.Item>
+        <Form.Item
+          name={["md_categories"]}
+          label={t("bodyshop.fields.md_categories")}
+          rules={[
+            {
+              //message: t("general.validation.required"),
+              type: "array"
+            }
+          ]}
+        >
+          <Select mode="tags" />
+        </Form.Item>
+        {HasFeatureAccess({ featureName: "export", bodyshop }) && (
+          <>
+            <Form.Item
+              name={["accountingconfig", "ReceivableCustomField1"]}
+              label={t("bodyshop.fields.ReceivableCustomField", { number: 1 })}
+            >
+              {ReceivableCustomFieldSelect}
+            </Form.Item>
+            <Form.Item
+              name={["accountingconfig", "ReceivableCustomField2"]}
+              label={t("bodyshop.fields.ReceivableCustomField", { number: 2 })}
+            >
+              {ReceivableCustomFieldSelect}
+            </Form.Item>
+            <Form.Item
+              name={["accountingconfig", "ReceivableCustomField3"]}
+              label={t("bodyshop.fields.ReceivableCustomField", { number: 3 })}
+            >
+              {ReceivableCustomFieldSelect}
+            </Form.Item>
+            <Form.Item
+              name={["md_classes"]}
+              label={t("bodyshop.fields.md_classes")}
+              rules={[
+                ({ getFieldValue }) => {
+                  return {
+                    required: getFieldValue("enforce_class"),
+                    //message: t("general.validation.required"),
+                    type: "array"
+                  };
+                }
+              ]}
+            >
+              <Select mode="tags" />
+            </Form.Item>
+            <Form.Item name={["enforce_class"]} label={t("bodyshop.fields.enforce_class")} valuePropName="checked">
+              <Switch />
+            </Form.Item>
+            {ClosingPeriod.treatment === "on" && (
+              <Form.Item
+                name={["accountingconfig", "ClosingPeriod"]}
+                label={t("bodyshop.fields.closingperiod")} //{t("reportcenter.labels.dates")}
+              >
+                <DatePicker.RangePicker format="MM/DD/YYYY" presets={DatePickerRanges} />
+              </Form.Item>
+            )}
+            {ADPPayroll.treatment === "on" && (
+              <Form.Item name={["accountingconfig", "companyCode"]} label={t("bodyshop.fields.companycode")}>
                <Input />
              </Form.Item>
-            )
-          })}
-          <Form.Item label={t("bodyshop.fields.state_tax_id")} name="state_tax_id">
-            <Input />
-          </Form.Item>
-          {InstanceRenderManager({
-            imex: (
-              <Form.Item
-                label={t("bodyshop.fields.invoice_federal_tax_rate")}
-                name={["bill_tax_rates", "federal_tax_rate"]}
-                rules={[
-                  {
-                    required: true
-                    //message: t("general.validation.required"),
-                  }
-                ]}
-              >
-                <InputNumber />
+            )}
+            {ADPPayroll.treatment === "on" && (
+              <Form.Item name={["accountingconfig", "batchID"]} label={t("bodyshop.fields.batchid")}>
+                <Input />
              </Form.Item>
-            )
-          })}
-          <Form.Item
-            label={t("bodyshop.fields.invoice_state_tax_rate")}
-            name={["bill_tax_rates", "state_tax_rate"]}
-            rules={[
-              {
-                required: true
-                //message: t("general.validation.required"),
-              }
-            ]}
-          >
-            <InputNumber />
-          </Form.Item>
-          <Form.Item
-            label={t("bodyshop.fields.invoice_local_tax_rate")}
-            name={["bill_tax_rates", "local_tax_rate"]}
-            rules={[
-              {
-                required: true
-                //message: t("general.validation.required"),
-              }
-            ]}
-          >
-            <InputNumber />
-          </Form.Item>
-          <Form.Item
-            name={["md_payment_types"]}
-            label={t("bodyshop.fields.md_payment_types")}
-            rules={[
-              {
-                required: true,
-                //message: t("general.validation.required"),
-                type: "array"
-              }
-            ]}
-          >
-            <Select mode="tags" />
-          </Form.Item>
-          <Form.Item
-            name={["md_categories"]}
-            label={t("bodyshop.fields.md_categories")}
-            rules={[
-              {
-                //message: t("general.validation.required"),
-                type: "array"
-              }
-            ]}
-          >
-            <Select mode="tags" />
-          </Form.Item>
-          <Form.Item name={["enforce_class"]} label={t("bodyshop.fields.enforce_class")} valuePropName="checked">
-            <Switch />
-          </Form.Item>
-          <Form.Item
-            name={["accountingconfig", "ReceivableCustomField1"]}
-            label={t("bodyshop.fields.ReceivableCustomField", { number: 1 })}
-          >
-            {ReceivableCustomFieldSelect}
-          </Form.Item>
-          <Form.Item
-            name={["accountingconfig", "ReceivableCustomField2"]}
-            label={t("bodyshop.fields.ReceivableCustomField", { number: 2 })}
-          >
-            {ReceivableCustomFieldSelect}
-          </Form.Item>
-          <Form.Item
-            name={["accountingconfig", "ReceivableCustomField3"]}
-            label={t("bodyshop.fields.ReceivableCustomField", { number: 3 })}
-          >
-            {ReceivableCustomFieldSelect}
-          </Form.Item>
-          <Form.Item
-            name={["md_classes"]}
-            label={t("bodyshop.fields.md_classes")}
-            rules={[
-              ({ getFieldValue }) => {
-                return {
-                  required: getFieldValue("enforce_class"),
-                  //message: t("general.validation.required"),
-                  type: "array"
-                };
-              }
-            ]}
-          >
-            <Select mode="tags" />
-          </Form.Item>
-          {ClosingPeriod.treatment === "on" && (
-            <Form.Item
-              name={["accountingconfig", "ClosingPeriod"]}
-              label={t("bodyshop.fields.closingperiod")} //{t("reportcenter.labels.dates")}
-            >
-              <DatePicker.RangePicker format="MM/DD/YYYY" presets={DatePickerRanges} />
-            </Form.Item>
-          )}
-          {ADPPayroll.treatment === "on" && (
-            <Form.Item name={["accountingconfig", "companyCode"]} label={t("bodyshop.fields.companycode")}>
-              <Input />
-            </Form.Item>
-          )}
-          {ADPPayroll.treatment === "on" && (
-            <Form.Item name={["accountingconfig", "batchID"]} label={t("bodyshop.fields.batchid")}>
-              <Input />
-            </Form.Item>
-          )}
-        </LayoutFormRow>
-      </FeatureWrapper>
+            )}
+          </>
+        )}
+      </LayoutFormRow>
      <FeatureWrapper featureName="scoreboard" noauth={() => null}>
        <LayoutFormRow header={t("bodyshop.labels.scoreboardsetup")} id="scoreboardsetup">
          <Form.Item
@@ -822,7 +833,11 @@ export function ShopInfoGeneral({ form, bodyshop }) {
          }}
        </Form.List>
      </LayoutFormRow>
-      <LayoutFormRow grow header=<span id="insurancecos-header">{t("bodyshop.labels.insurancecos")}</span> id="insurancecos">
+      <LayoutFormRow
+        grow
+        header=<span id="insurancecos-header">{t("bodyshop.labels.insurancecos")}</span>
+        id="insurancecos"
+      >
        <Form.List name={["md_ins_cos"]}>
          {(fields, { add, remove, move }) => {
            return (
--- a/client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx
+++ b/client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx
--- a/client/src/components/shop-info/shop-info.scheduling.component.jsx
+++ b/client/src/components/shop-info/shop-info.scheduling.component.jsx
@@ -13,7 +13,7 @@ import { ColorPicker } from "./shop-info.rostatus.component";
 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
 });
-const mapDispatchToProps = (dispatch) => ({
+const mapDispatchToProps = () => ({
  //setUserLanguage: language => dispatch(setUserLanguage(language))
 });

@@ -22,7 +22,7 @@ export function ShopInfoSchedulingComponent({ form, bodyshop }) {

  return (
    <div>
-      <LayoutFormRow>
+      <LayoutFormRow id="shopinfo-scheduling">
        <Form.Item
          label={t("bodyshop.fields.appt_length")}
          name={"appt_length"}
@@ -44,6 +44,7 @@ export function ShopInfoSchedulingComponent({ form, bodyshop }) {
              //message: t("general.validation.required"),
            }
          ]}
+          id="schedule_start_time"
        >
          <TimePicker disableSeconds={true} format="HH:mm" />
        </Form.Item>
@@ -56,6 +57,7 @@ export function ShopInfoSchedulingComponent({ form, bodyshop }) {
              //message: t("general.validation.required"),
            }
          ]}
+          id="schedule_end_time"
        >
          <TimePicker disableSeconds={true} format="HH:mm" />
        </Form.Item>
--- a/client/src/contexts/SocketIO/socketProvider.jsx
+++ b/client/src/contexts/SocketIO/socketProvider.jsx
@@ -16,7 +16,7 @@ import {
 import { useMutation } from "@apollo/client";
 import { useTranslation } from "react-i18next";
 import { useSplitTreatments } from "@splitsoftware/splitio-react";
-import { SocketContext, INITIAL_NOTIFICATIONS } from "./useSocket.js";
+import { INITIAL_NOTIFICATIONS, SocketContext } from "./useSocket.js";

 /**
 * Socket Provider - Scenario Notifications / Web Socket related items
@@ -157,7 +157,10 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
        auth: { token, bodyshopId: bodyshop.id },
        reconnectionAttempts: Infinity,
        reconnectionDelay: 2000,
-        reconnectionDelayMax: 10000
+        reconnectionDelayMax: 60000,
+        randomizationFactor: 0.5,
+        transports: ["websocket", "polling"], // Add this to prefer WebSocket with polling fallback
+        rememberUpgrade: true
      });

      socketRef.current = socketInstance;
--- a/client/src/pages/scoreboard/scoreboard.page.container.jsx
+++ b/client/src/pages/scoreboard/scoreboard.page.container.jsx
@@ -1,7 +1,7 @@
 import Icon, { FieldTimeOutlined } from "@ant-design/icons";
 import { Card, Tabs } from "antd";
 import queryString from "query-string";
-import React, { useEffect } from "react";
+import { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { FaShieldAlt } from "react-icons/fa";
 import { connect } from "react-redux";
@@ -78,7 +78,7 @@ export function ScoreboardContainer({ setBreadcrumbs, setSelectedHeader }) {
      <RbacWrapper action="scoreboard:view">
        <Tabs
          activeKey={tab || "sb"}
-          destroyInactiveTabPane
+          destroyOnHidden
          onChange={(key) => {
            searchParams.tab = key;
            history({
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -1232,8 +1232,8 @@
        "sizelimit": "The selected items exceed the size limit.",
        "submit-for-testing": "Error submitting Job for testing.",
        "sub_status": {
-          "expired": "The subscription for this shop has expired. Please contact technical support to reactivate.",
-          "trial-expired": "The trial for this shop has expired. Please contact technical support to reactivate."
+          "expired": "The subscription for this shop has expired. Please contact Sales to reactivate.",
+          "trial-expired": "The trial for this shop has expired. Please contact Sales to reactivate."
        }
      },
      "itemtypes": {
--- a/hasura/metadata/tables.yaml
+++ b/hasura/metadata/tables.yaml
@@ -1035,6 +1035,7 @@
          - use_fippa
          - use_paint_scale_data
          - uselocalmediaserver
+          - external_shop_id
          - website
          - workingdays
          - zip_post
@@ -1130,6 +1131,7 @@
          - use_fippa
          - use_paint_scale_data
          - uselocalmediaserver
+          - external_shop_id
          - website
          - workingdays
          - zip_post
--- a/hasura/migrations/1749499292683_alter_table_public_bodyshops_add_column_we_profile_id/down.sql
+++ b/hasura/migrations/1749499292683_alter_table_public_bodyshops_add_column_we_profile_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 "we_profile_id" text
+--  null;
--- a/hasura/migrations/1749499292683_alter_table_public_bodyshops_add_column_we_profile_id/up.sql
+++ b/hasura/migrations/1749499292683_alter_table_public_bodyshops_add_column_we_profile_id/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."bodyshops" add column "we_profile_id" text
+ null;
--- a/hasura/migrations/1749505657175_alter_table_public_bodyshops_alter_column_we_profile_id/down.sql
+++ b/hasura/migrations/1749505657175_alter_table_public_bodyshops_alter_column_we_profile_id/down.sql
@@ -0,0 +1,2 @@
+alter table "public"."bodyshops" rename column "parts_management_key" to "we_profile_id";
+alter table "public"."bodyshops" drop constraint "bodyshops_we_profile_id_key";
--- a/hasura/migrations/1749505657175_alter_table_public_bodyshops_alter_column_we_profile_id/up.sql
+++ b/hasura/migrations/1749505657175_alter_table_public_bodyshops_alter_column_we_profile_id/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."bodyshops" add constraint "bodyshops_we_profile_id_key" unique ("we_profile_id");
+alter table "public"."bodyshops" rename column "we_profile_id" to "parts_management_key";
--- a/hasura/migrations/1749507125123_alter_table_public_bodyshops_alter_column_parts_management_key/down.sql
+++ b/hasura/migrations/1749507125123_alter_table_public_bodyshops_alter_column_parts_management_key/down.sql
@@ -0,0 +1 @@
+alter table "public"."bodyshops" rename column "external_shop_id" to "parts_management_key";
--- a/hasura/migrations/1749507125123_alter_table_public_bodyshops_alter_column_parts_management_key/up.sql
+++ b/hasura/migrations/1749507125123_alter_table_public_bodyshops_alter_column_parts_management_key/up.sql
@@ -0,0 +1 @@
+alter table "public"."bodyshops" rename column "parts_management_key" to "external_shop_id";
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -16,14 +16,14 @@
    "job-totals-fixtures:local": "docker exec node-app /usr/bin/node /app/download-job-totals-fixtures.js"
  },
  "dependencies": {
-    "@aws-sdk/client-cloudwatch-logs": "^3.823.0",
-    "@aws-sdk/client-elasticache": "^3.823.0",
-    "@aws-sdk/client-s3": "^3.824.0",
-    "@aws-sdk/client-secrets-manager": "^3.823.0",
-    "@aws-sdk/client-ses": "^3.823.0",
-    "@aws-sdk/credential-provider-node": "^3.823.0",
-    "@aws-sdk/lib-storage": "^3.824.0",
-    "@aws-sdk/s3-request-presigner": "^3.824.0",
+    "@aws-sdk/client-cloudwatch-logs": "^3.826.0",
+    "@aws-sdk/client-elasticache": "^3.826.0",
+    "@aws-sdk/client-s3": "^3.826.0",
+    "@aws-sdk/client-secrets-manager": "^3.826.0",
+    "@aws-sdk/client-ses": "^3.826.0",
+    "@aws-sdk/credential-provider-node": "^3.826.0",
+    "@aws-sdk/lib-storage": "^3.826.0",
+    "@aws-sdk/s3-request-presigner": "^3.826.0",
    "@opensearch-project/opensearch": "^2.13.0",
    "@socket.io/admin-ui": "^0.5.1",
    "@socket.io/redis-adapter": "^8.3.0",
@@ -38,7 +38,7 @@
    "cookie-parser": "^1.4.7",
    "cors": "^2.8.5",
    "crisp-status-reporter": "^1.2.2",
-    "dd-trace": "^5.54.0",
+    "dd-trace": "^5.55.0",
    "dinero.js": "^1.9.1",
    "dotenv": "^16.4.5",
    "express": "^4.21.1",
@@ -70,7 +70,8 @@
    "winston": "^3.17.0",
    "winston-cloudwatch": "^6.3.0",
    "xml2js": "^0.6.2",
-    "xmlbuilder2": "^3.1.1"
+    "xmlbuilder2": "^3.1.1",
+    "yazl": "^3.3.1"
  },
  "devDependencies": {
    "@eslint/js": "^9.28.0",
@@ -81,6 +82,6 @@
    "p-limit": "^3.1.0",
    "prettier": "^3.5.3",
    "supertest": "^7.1.1",
-    "vitest": "^3.2.2"
+    "vitest": "^3.2.3"
  }
 }
--- a/server/data/usageReport.js
+++ b/server/data/usageReport.js
@@ -35,7 +35,7 @@ exports.default = async (req, res) => {
    //Query the usage data.
    const queryResults = await client.request(queries.STATUS_UPDATE, {
      today: moment().startOf("day").subtract(7, "days"),
-      period: moment().subtract(90, "days").startOf("day")
+      period: moment().subtract(365, "days").startOf("day")
    });

    //Massage the data.
@@ -66,7 +66,7 @@ exports.default = async (req, res) => {
 Usage Report for ${moment().format("MM/DD/YYYY")} for Rome Online Customers. 
        
 Notes:
-  - Days Since Creation: The number of days since the shop was created. Only shops created in the last 90 days are included.
+  - Days Since Creation: The number of days since the shop was created. Only shops created in the last 365 days are included.
  - Updated values should be higher than created values.
  - Counts are inclusive of the last 7 days of data.
        `,
--- a/server/integrations/partsManagement/defaultNewShop.json
+++ b/server/integrations/partsManagement/defaultNewShop.json
--- a/server/integrations/partsManagement/partsManagementProvisioning.js
+++ b/server/integrations/partsManagement/partsManagementProvisioning.js
@@ -0,0 +1,257 @@
+const crypto = require("crypto");
+const admin = require("firebase-admin");
+const client = require("../../graphql-client/graphql-client").client;
+const DefaultNewShop = require("./defaultNewShop.json");
+
+/**
+ * Ensures that the required fields are present in the payload.
+ * @param payload
+ * @param fields
+ */
+const requireFields = (payload, fields) => {
+  for (const field of fields) {
+    if (!payload[field]) {
+      throw { status: 400, message: `${field} is required.` };
+    }
+  }
+};
+
+/**
+ * Ensures that the email is not already registered in Firebase.
+ * @param email
+ * @returns {Promise<void>}
+ */
+const ensureEmailNotRegistered = async (email) => {
+  try {
+    await admin.auth().getUserByEmail(email);
+    throw { status: 400, message: "userEmail is already registered in Firebase." };
+  } catch (err) {
+    if (err.code !== "auth/user-not-found") {
+      throw { status: 500, message: "Error validating userEmail uniqueness", detail: err };
+    }
+  }
+};
+
+/**
+ * Creates a new Firebase user with the provided email.
+ * @param email
+ * @returns {Promise<UserRecord>}
+ */
+const createFirebaseUser = async (email) => {
+  return admin.auth().createUser({ email });
+};
+
+/**
+ * Deletes a Firebase user by their UID.
+ * @param uid
+ * @returns {Promise<void>}
+ */
+const deleteFirebaseUser = async (uid) => {
+  return admin.auth().deleteUser(uid);
+};
+
+/**
+ * Generates a password reset link for the given email.
+ * @param email
+ * @returns {Promise<string>}
+ */
+const generateResetLink = async (email) => {
+  return admin.auth().generatePasswordResetLink(email);
+};
+
+/**
+ * Ensures that the external shop ID is unique in the database.
+ * @param externalId
+ * @returns {Promise<void>}
+ */
+const ensureExternalIdUnique = async (externalId) => {
+  const query = `
+    query CHECK_KEY($key: String!) {
+      bodyshops(where: { external_shop_id: { _eq: $key } }) {
+        external_shop_id
+      }
+    }`;
+  const resp = await client.request(query, { key: externalId });
+  if (resp.bodyshops.length) {
+    throw { status: 400, message: `external_shop_id '${externalId}' is already in use.` };
+  }
+};
+
+/**
+ * Inserts a new bodyshop into the database.
+ * @param input
+ * @returns {Promise<*>}
+ */
+const insertBodyshop = async (input) => {
+  const mutation = `
+    mutation CREATE_SHOP($bs: bodyshops_insert_input!) {
+      insert_bodyshops_one(object: $bs) { id }
+    }`;
+  const resp = await client.request(mutation, { bs: input });
+  return resp.insert_bodyshops_one.id;
+};
+
+/**
+ * Deletes all vendors associated with a specific shop ID.
+ * @param shopId
+ * @returns {Promise<void>}
+ */
+const deleteVendorsByShop = async (shopId) => {
+  const mutation = `
+    mutation DELETE_VENDORS($shopId: uuid!) {
+      delete_vendors(where: { shopid: { _eq: $shopId } }) {
+        affected_rows
+      }
+    }`;
+  await client.request(mutation, { shopId });
+};
+
+/**
+ * Deletes a bodyshop by its ID.
+ * @param shopId
+ * @returns {Promise<void>}
+ */
+const deleteBodyshop = async (shopId) => {
+  const mutation = `
+    mutation DELETE_SHOP($id: uuid!) {
+      delete_bodyshops_by_pk(id: $id) { id }
+    }`;
+  await client.request(mutation, { id: shopId });
+};
+
+/**
+ * Inserts a new user association into the database.
+ * @param uid
+ * @param email
+ * @param shopId
+ * @returns {Promise<*>}
+ */
+const insertUserAssociation = async (uid, email, shopId) => {
+  const mutation = `
+    mutation CREATE_USER($u: users_insert_input!) {
+      insert_users_one(object: $u) {
+        id: authid
+        email
+      }
+    }`;
+  const vars = {
+    u: {
+      email,
+      authid: uid,
+      validemail: true,
+      associations: {
+        data: [{ shopid: shopId, authlevel: 80, active: true }]
+      }
+    }
+  };
+  const resp = await client.request(mutation, vars);
+  return resp.insert_users_one;
+};
+
+/**
+ * Handles the provisioning of a new parts management shop and user.
+ * @param req
+ * @param res
+ * @returns {Promise<*>}
+ */
+const partsManagementProvisioning = async (req, res) => {
+  const { logger } = req;
+  const p = { ...req.body, userEmail: req.body.userEmail?.toLowerCase() };
+
+  try {
+    //  Validate inputs
+    await ensureEmailNotRegistered(p.userEmail);
+    requireFields(p, [
+      "external_shop_id",
+      "shopname",
+      "address1",
+      "city",
+      "state",
+      "zip_post",
+      "country",
+      "email",
+      "phone",
+      "userEmail"
+    ]);
+    await ensureExternalIdUnique(p.external_shop_id);
+
+    logger.log("admin-create-shop-user", "debug", p.userEmail, null, {
+      request: req.body,
+      ioadmin: true
+    });
+
+    //  Create shop
+    const shopInput = {
+      shopname: p.shopname,
+      address1: p.address1,
+      address2: p.address2 || null,
+      city: p.city,
+      state: p.state,
+      zip_post: p.zip_post,
+      country: p.country,
+      email: p.email,
+      external_shop_id: p.external_shop_id,
+      timezone: p.timezone,
+      phone: p.phone,
+      logo_img_path: {
+        src: p.logoUrl,
+        width: "",
+        height: "",
+        headerMargin: DefaultNewShop.logo_img_path.headerMargin
+      },
+      md_ro_statuses: DefaultNewShop.md_ro_statuses,
+      vendors: {
+        data: p.vendors.map((v) => ({
+          name: v.name,
+          street1: v.street1 || null,
+          street2: v.street2 || null,
+          city: v.city || null,
+          state: v.state || null,
+          zip: v.zip || null,
+          country: v.country || null,
+          email: v.email || null,
+          discount: v.discount ?? 0,
+          due_date: v.due_date ?? null,
+          cost_center: v.cost_center || null,
+          favorite: v.favorite ?? [],
+          phone: v.phone || null,
+          active: v.active ?? true,
+          dmsid: v.dmsid || null
+        }))
+      }
+    };
+    const newShopId = await insertBodyshop(shopInput);
+
+    //  Create user + association
+    const userRecord = await createFirebaseUser(p.userEmail);
+    const resetLink = await generateResetLink(p.userEmail);
+    const createdUser = await insertUserAssociation(userRecord.uid, p.userEmail, newShopId);
+
+    return res.status(200).json({
+      shop: { id: newShopId, shopname: p.shopname },
+      user: {
+        id: createdUser.id,
+        email: createdUser.email,
+        resetLink
+      }
+    });
+  } catch (err) {
+    logger.log("admin-create-shop-user-error", "error", p.userEmail, null, {
+      message: err.message,
+      detail: err.detail || err
+    });
+
+    // Cleanup on failure
+    if (err.userRecord) {
+      await deleteFirebaseUser(err.userRecord.uid).catch(() => {});
+    }
+    if (err.newShopId) {
+      await deleteVendorsByShop(err.newShopId).catch(() => {});
+      await deleteBodyshop(err.newShopId).catch(() => {});
+    }
+
+    return res.status(err.status || 500).json({ error: err.message || "Internal server error" });
+  }
+};
+
+module.exports = partsManagementProvisioning;
--- a/server/integrations/partsManagement/swagger.yaml
+++ b/server/integrations/partsManagement/swagger.yaml
@@ -0,0 +1,160 @@
+openapi: 3.0.3
+info:
+  title: Parts Management Provisioning API
+  description: API endpoint to provision a new shop and user in the Parts Management system.
+  version: 1.0.0
+
+paths:
+  /parts-management/provision:
+    post:
+      summary: Provision a new parts management shop and user
+      operationId: partsManagementProvisioning
+      tags:
+        - Parts Management
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              required:
+                - external_shop_id
+                - shopname
+                - address1
+                - city
+                - state
+                - zip_post
+                - country
+                - email
+                - phone
+                - userEmail
+              properties:
+                external_shop_id:
+                  type: string
+                  description: External shop ID (must be unique)
+                shopname:
+                  type: string
+                address1:
+                  type: string
+                address2:
+                  type: string
+                  nullable: true
+                city:
+                  type: string
+                state:
+                  type: string
+                zip_post:
+                  type: string
+                country:
+                  type: string
+                email:
+                  type: string
+                phone:
+                  type: string
+                userEmail:
+                  type: string
+                  format: email
+                logoUrl:
+                  type: string
+                  format: uri
+                  nullable: true
+                timezone:
+                  type: string
+                  nullable: true
+                vendors:
+                  type: array
+                  items:
+                    type: object
+                    properties:
+                      name:
+                        type: string
+                      street1:
+                        type: string
+                        nullable: true
+                      street2:
+                        type: string
+                        nullable: true
+                      city:
+                        type: string
+                        nullable: true
+                      state:
+                        type: string
+                        nullable: true
+                      zip:
+                        type: string
+                        nullable: true
+                      country:
+                        type: string
+                        nullable: true
+                      email:
+                        type: string
+                        format: email
+                        nullable: true
+                      discount:
+                        type: number
+                        nullable: true
+                      due_date:
+                        type: string
+                        format: date
+                        nullable: true
+                      cost_center:
+                        type: string
+                        nullable: true
+                      favorite:
+                        type: array
+                        items:
+                          type: string
+                        nullable: true
+                      phone:
+                        type: string
+                        nullable: true
+                      active:
+                        type: boolean
+                        nullable: true
+                      dmsid:
+                        type: string
+                        nullable: true
+      responses:
+        '200':
+          description: Shop and user successfully created
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  shop:
+                    type: object
+                    properties:
+                      id:
+                        type: string
+                        format: uuid
+                      shopname:
+                        type: string
+                  user:
+                    type: object
+                    properties:
+                      id:
+                        type: string
+                      email:
+                        type: string
+                      resetLink:
+                        type: string
+                        format: uri
+        '400':
+          description: Bad request (missing or invalid fields)
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  error:
+                    type: string
+        '500':
+          description: Internal server error
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  error:
+                    type: string
--- a/server/job/job-costing.js
+++ b/server/job/job-costing.js
@@ -19,7 +19,7 @@ async function JobCosting(req, res) {
  const client = req.userGraphQLClient;

  //Uncomment for further testing
-  // logger.log("job-costing-start", "DEBUG", req.user.email, jobid, null);
+  logger.log("job-costing-start", "DEBUG", req.user.email, jobid, null);

  try {
    const resp = await client.setHeaders({ Authorization: BearerToken }).request(queries.QUERY_JOB_COSTING_DETAILS, {
@@ -47,9 +47,9 @@ async function JobCostingMulti(req, res) {
  const client = req.userGraphQLClient;

  //Uncomment for further testing
-  // logger.log("job-costing-multi-start", "DEBUG", req?.user?.email, null, {
-  //   jobids
-  // });
+  logger.log("job-costing-multi-start", "DEBUG", req?.user?.email, null, {
+    jobids
+  });

  try {
    const resp = await client
@@ -589,7 +589,7 @@ function GenerateCostingData(job) {
          amount: Math.round((job.storage_payable || 0) * 100)
        });
  }
-  
+
  //Is it a DMS Setup?
  const selectedDmsAllocationConfig =
    (job.bodyshop.md_responsibility_centers.dms_defaults &&
--- a/server/job/job-lifecycle.js
+++ b/server/job/job-lifecycle.js
@@ -8,6 +8,7 @@ const getLifecycleStatusColor = require("../utils/getLifecycleStatusColor");
 const jobLifecycle = async (req, res) => {
  // Grab the jobids and statuses from the request body
  const { jobids, statuses } = req.body;
+  const { logger } = req;

  if (!jobids) {
    return res.status(400).json({
@@ -16,102 +17,118 @@ const jobLifecycle = async (req, res) => {
  }

  const jobIDs = _.isArray(jobids) ? jobids : [jobids];
-  const client = req.userGraphQLClient;
-  const resp = await client.request(queries.QUERY_TRANSITIONS_BY_JOBID, { jobids: jobIDs });

-  const transitions = resp.transitions;
+  logger.log("job-lifecycle-start", "DEBUG", req?.user?.email, null, {
+    jobids: jobIDs
+  });
+
+  try {
+    const client = req.userGraphQLClient;
+    const resp = await client.request(queries.QUERY_TRANSITIONS_BY_JOBID, { jobids: jobIDs });
+
+    const transitions = resp.transitions;
+
+    if (!transitions) {
+      return res.status(200).json({
+        jobIDs,
+        transitions: []
+      });
+    }
+
+    const transitionsByJobId = _.groupBy(resp.transitions, "jobid");
+
+    const groupedTransitions = {};
+    const allDurations = [];
+
+    for (let jobId in transitionsByJobId) {
+      let lifecycle = transitionsByJobId[jobId].map((transition) => {
+        transition.start_readable = transition.start ? moment(transition.start).fromNow() : "N/A";
+        transition.end_readable = transition.end ? moment(transition.end).fromNow() : "N/A";
+
+        if (transition.duration) {
+          transition.duration_seconds = Math.round(transition.duration / 1000);
+          transition.duration_minutes = Math.round(transition.duration_seconds / 60);
+          let duration = moment.duration(transition.duration);
+          transition.duration_readable = durationToHumanReadable(duration);
+        } else {
+          transition.duration_seconds = 0;
+          transition.duration_minutes = 0;
+          transition.duration_readable = "N/A";
+        }
+        return transition;
+      });
+
+      const durations = calculateStatusDuration(lifecycle, statuses);
+
+      groupedTransitions[jobId] = {
+        lifecycle,
+        durations
+      };
+
+      if (durations?.summations) {
+        allDurations.push(durations.summations);
+      }
+    }
+
+    const finalSummations = [];
+    const flatGroupedAllDurations = _.groupBy(allDurations.flat(), "status");
+
+    const finalStatusCounts = Object.keys(flatGroupedAllDurations).reduce((acc, status) => {
+      acc[status] = flatGroupedAllDurations[status].length;
+      return acc;
+    }, {});
+    // Calculate total value of all statuses
+    const finalTotal = Object.values(flatGroupedAllDurations).reduce((total, statusArr) => {
+      return total + statusArr.reduce((acc, curr) => acc + curr.value, 0);
+    }, 0);
+
+    Object.keys(flatGroupedAllDurations).forEach((status) => {
+      const value = flatGroupedAllDurations[status].reduce((acc, curr) => acc + curr.value, 0);
+      const humanReadable = durationToHumanReadable(moment.duration(value));
+      const percentage = finalTotal > 0 ? (value / finalTotal) * 100 : 0;
+      const color = getLifecycleStatusColor(status);
+      const roundedPercentage = `${Math.round(percentage)}%`;
+      const averageValue = _.size(jobIDs) > 0 ? value / jobIDs.length : 0;
+      const averageHumanReadable = durationToHumanReadable(moment.duration(averageValue));
+      finalSummations.push({
+        status,
+        value,
+        humanReadable,
+        percentage,
+        color,
+        roundedPercentage,
+        averageValue,
+        averageHumanReadable
+      });
+    });

-  if (!transitions) {
    return res.status(200).json({
      jobIDs,
-      transitions: []
-    });
-  }
-
-  const transitionsByJobId = _.groupBy(resp.transitions, "jobid");
-
-  const groupedTransitions = {};
-  const allDurations = [];
-
-  for (let jobId in transitionsByJobId) {
-    let lifecycle = transitionsByJobId[jobId].map((transition) => {
-      transition.start_readable = transition.start ? moment(transition.start).fromNow() : "N/A";
-      transition.end_readable = transition.end ? moment(transition.end).fromNow() : "N/A";
-
-      if (transition.duration) {
-        transition.duration_seconds = Math.round(transition.duration / 1000);
-        transition.duration_minutes = Math.round(transition.duration_seconds / 60);
-        let duration = moment.duration(transition.duration);
-        transition.duration_readable = durationToHumanReadable(duration);
-      } else {
-        transition.duration_seconds = 0;
-        transition.duration_minutes = 0;
-        transition.duration_readable = "N/A";
+      transition: groupedTransitions,
+      durations: {
+        jobs: jobIDs.length,
+        summations: finalSummations,
+        totalStatuses: finalSummations.length,
+        total: finalTotal,
+        statusCounts: finalStatusCounts,
+        humanReadable: durationToHumanReadable(moment.duration(finalTotal)),
+        averageValue: _.size(jobIDs) > 0 ? finalTotal / jobIDs.length : 0,
+        averageHumanReadable:
+          _.size(jobIDs) > 0
+            ? durationToHumanReadable(moment.duration(finalTotal / jobIDs.length))
+            : durationToHumanReadable(moment.duration(0))
      }
-      return transition;
    });
-
-    const durations = calculateStatusDuration(lifecycle, statuses);
-
-    groupedTransitions[jobId] = {
-      lifecycle,
-      durations
-    };
-
-    if (durations?.summations) {
-      allDurations.push(durations.summations);
-    }
+  } catch (error) {
+    logger.log("job-lifecycle-error", "ERROR", req?.user?.email, null, {
+      jobids: jobIDs,
+      statuses: statuses ? JSON.stringify(statuses) : "N/A",
+      error: error.message
+    });
+    return res.status(500).json({
+      error: "Internal server error"
+    });
  }
-
-  const finalSummations = [];
-  const flatGroupedAllDurations = _.groupBy(allDurations.flat(), "status");
-
-  const finalStatusCounts = Object.keys(flatGroupedAllDurations).reduce((acc, status) => {
-    acc[status] = flatGroupedAllDurations[status].length;
-    return acc;
-  }, {});
-  // Calculate total value of all statuses
-  const finalTotal = Object.values(flatGroupedAllDurations).reduce((total, statusArr) => {
-    return total + statusArr.reduce((acc, curr) => acc + curr.value, 0);
-  }, 0);
-
-  Object.keys(flatGroupedAllDurations).forEach((status) => {
-    const value = flatGroupedAllDurations[status].reduce((acc, curr) => acc + curr.value, 0);
-    const humanReadable = durationToHumanReadable(moment.duration(value));
-    const percentage = finalTotal > 0 ? (value / finalTotal) * 100 : 0;
-    const color = getLifecycleStatusColor(status);
-    const roundedPercentage = `${Math.round(percentage)}%`;
-    const averageValue = _.size(jobIDs) > 0 ? value / jobIDs.length : 0;
-    const averageHumanReadable = durationToHumanReadable(moment.duration(averageValue));
-    finalSummations.push({
-      status,
-      value,
-      humanReadable,
-      percentage,
-      color,
-      roundedPercentage,
-      averageValue,
-      averageHumanReadable
-    });
-  });
-
-  return res.status(200).json({
-    jobIDs,
-    transition: groupedTransitions,
-    durations: {
-      jobs: jobIDs.length,
-      summations: finalSummations,
-      totalStatuses: finalSummations.length,
-      total: finalTotal,
-      statusCounts: finalStatusCounts,
-      humanReadable: durationToHumanReadable(moment.duration(finalTotal)),
-      averageValue: _.size(jobIDs) > 0 ? finalTotal / jobIDs.length : 0,
-      averageHumanReadable:
-        _.size(jobIDs) > 0
-          ? durationToHumanReadable(moment.duration(finalTotal / jobIDs.length))
-          : durationToHumanReadable(moment.duration(0))
-    }
-  });
 };

 module.exports = jobLifecycle;
--- a/server/job/job-totals-USA.js
+++ b/server/job/job-totals-USA.js
@@ -381,7 +381,7 @@ async function CalculateRatesTotals({ job, client }) {

    if (item.mod_lbr_ty) {
      //Check to see if it has 0 hours and a price instead.
-      if (item.mod_lb_hrs === 0 && item.act_price > 0 && item.lbr_op === "OP14") {
+      if (item.lbr_op === "OP14" && item.act_price > 0 && (!item.part_type || item.mod_lb_hrs === 0)) {
        //Scenario where SGI may pay out hours using a part price.
        if (!ret[item.mod_lbr_ty.toLowerCase()].total) {
          ret[item.mod_lbr_ty.toLowerCase()].total = Dinero();
--- a/server/job/job-totals.js
+++ b/server/job/job-totals.js
@@ -314,7 +314,8 @@ function CalculateRatesTotals(ratesList) {

    if (item.mod_lbr_ty) {
      //Check to see if it has 0 hours and a price instead.
-      if (item.mod_lb_hrs === 0 && item.act_price > 0 && item.lbr_op === "OP14") {
+      //Extend for when there are hours and a price.
+      if (item.lbr_op === "OP14" && item.act_price > 0 && (!item.part_type || item.mod_lb_hrs === 0)) {
        //Scenario where SGI may pay out hours using a part price.
        if (!ret[item.mod_lbr_ty.toLowerCase()].total) {
          ret[item.mod_lbr_ty.toLowerCase()].total = Dinero();
--- a/server/media/imgproxy-media.js
+++ b/server/media/imgproxy-media.js
@@ -20,6 +20,7 @@ const {
  GET_DOCUMENTS_BY_IDS,
  DELETE_MEDIA_DOCUMENTS
 } = require("../graphql-client/queries");
+const yazl = require("yazl");

 const imgproxyBaseUrl = process.env.IMGPROXY_BASE_URL; // `https://u4gzpp5wm437dnm75qa42tvza40fguqr.lambda-url.ca-central-1.on.aws` //Direct Lambda function access to bypass CDN.
 const imgproxySalt = process.env.IMGPROXY_SALT;
@@ -102,13 +103,7 @@ const getThumbnailUrls = async (req, res) => {
      //<Cloudfront_to_lambda>/<hmac with SHA of entire request URI path (with base64 encoded URL if needed), beginning with un-encoded/un-hashed Salt>/<remainder of url - resize params >/< base 64 URL encoded to image path>
      //When working with documents from Cloudinary, the URL does not include the extension.

-      let key;
-
-      if (/\.[^/.]+$/.test(document.key)) {
-        key = document.key;
-      } else {
-        key = `${document.key}.${document.extension.toLowerCase()}`;
-      }
+      let key = keyStandardize(document)
      // Build the S3 path to the object.
      const fullS3Path = `s3://${imgproxyDestinationBucket}/${key}`;
      const base64UrlEncodedKeyString = base64UrlEncode(fullS3Path);
@@ -168,78 +163,73 @@ const getThumbnailUrls = async (req, res) => {
 * @returns {Promise<*>}
 */
 const downloadFiles = async (req, res) => {
-  //Given a series of document IDs or keys, generate a file (or a link) to download all images in bulk
  const { jobId, billid, documentids } = req.body;

+  logger.log("imgproxy-download", "DEBUG", req.user?.email, jobId, { billid, jobId, documentids });
+
+  const client = req.userGraphQLClient;
+  let data;
  try {
-    logger.log("imgproxy-download", "DEBUG", req.user?.email, jobId, { billid, jobId, documentids });
-
-    //Delayed as the key structure may change slightly from what it is currently and will require evaluating mobile components.
-    const client = req.userGraphQLClient;
-
-    //Query for the keys of the document IDs
-    const data = await client.request(GET_DOCUMENTS_BY_IDS, { documentIds: documentids });
-
-    //Using the Keys, get all the S3 links, zip them, and send back to the client.
-    const s3client = new S3Client({ region: InstanceRegion() });
-    const archiveStream = archiver("zip");
-
-    archiveStream.on("error", (error) => {
-      console.error("Archival encountered an error:", error);
-      throw new Error(error);
-    });
-
-    const passThrough = new stream.PassThrough();
-
-    archiveStream.pipe(passThrough);
-
-    for (const key of data.documents.map((d) => d.key)) {
-      const response = await s3client.send(
-        new GetObjectCommand({
-          Bucket: imgproxyDestinationBucket,
-          Key: key
-        })
-      );
-
-      archiveStream.append(response.Body, { name: path.basename(key) });
-    }
-
-    await archiveStream.finalize();
-
-    const archiveKey = `archives/${jobId || "na"}/archive-${new Date().toISOString()}.zip`;
-
-    const parallelUploads3 = new Upload({
-      client: s3client,
-      queueSize: 4, // optional concurrency configuration
-      leavePartsOnError: false, // optional manually handle dropped parts
-      params: { Bucket: imgproxyDestinationBucket, Key: archiveKey, Body: passThrough }
-    });
-
-    // Disabled progress logging for upload, uncomment if needed
-    // parallelUploads3.on("httpUploadProgress", (progress) => {
-    //   console.log(progress);
-    // });
-
-    await parallelUploads3.done();
-
-    //Generate the presigned URL to download it.
-    const presignedUrl = await getSignedUrl(
-      s3client,
-      new GetObjectCommand({ Bucket: imgproxyDestinationBucket, Key: archiveKey }),
-      { expiresIn: 360 }
-    );
-
-    return res.json({ success: true, url: presignedUrl });
-    //Iterate over them, build the link based on the media type, and return the array.
+    data = await client.request(GET_DOCUMENTS_BY_IDS, { documentIds: documentids });
  } catch (error) {
-    logger.log("imgproxy-thumbnails-error", "ERROR", req.user?.email, jobId, {
+    logger.log("imgproxy-download-error", "ERROR", req.user?.email, jobId, {
      jobId,
      billid,
      message: error.message,
      stack: error.stack
    });
+    return res.status(400).json({ message: error.message });
+  }

-    return res.status(400).json({ message: error.message, stack: error.stack });
+  const s3client = new S3Client({ region: InstanceRegion() });
+  const zipfile = new yazl.ZipFile();
+
+  const filename = `archive-${jobId || "na"}-${new Date().toISOString().replace(/[:.]/g, "-")}.zip`;
+  res.setHeader("Content-Type", "application/zip");
+  res.setHeader("Content-Disposition", `attachment; filename="${filename}"`);
+
+  // Handle zipfile stream errors
+  zipfile.outputStream.on("error", (err) => {
+    logger.log("imgproxy-download-zipstream-error", "ERROR", req.user?.email, jobId, { message: err.message, stack: err.stack });
+    // Cannot send another response here, just destroy the connection
+    res.destroy(err);
+  });
+
+  zipfile.outputStream.pipe(res);
+
+  try {
+    for (const doc of data.documents) {
+      let key = keyStandardize(doc)
+      let response;
+      try {
+        response = await s3client.send(
+          new GetObjectCommand({
+            Bucket: imgproxyDestinationBucket,
+            Key: key
+          })
+        );
+      } catch (err) {
+        logger.log("imgproxy-download-s3-error", "ERROR", req.user?.email, jobId, { key, message: err.message, stack: err.stack });
+        // Optionally, skip this file or add a placeholder file in the zip
+        continue;
+      }
+      // Attach error handler to S3 stream
+      response.Body.on("error", (err) => {
+        logger.log("imgproxy-download-s3stream-error", "ERROR", req.user?.email, jobId, { key, message: err.message, stack: err.stack });
+        res.destroy(err);
+      });
+      zipfile.addReadStream(response.Body, path.basename(key));
+    }
+    zipfile.end();
+  } catch (error) {
+    logger.log("imgproxy-download-error", "ERROR", req.user?.email, jobId, {
+      jobId,
+      billid,
+      message: error.message,
+      stack: error.stack
+    });
+    // Cannot send another response here, just destroy the connection
+    res.destroy(error);
  }
 };

@@ -392,6 +382,15 @@ const moveFiles = async (req, res) => {
  }
 };

+const keyStandardize = (doc) => {
+  if (/\.[^/.]+$/.test(doc.key)) {
+    return doc.key;
+  } else {
+    return `${doc.key}.${doc.extension.toLowerCase()}`;
+  }
+};
+
+
 module.exports = {
  generateSignedUploadUrls,
  getThumbnailUrls,
--- a/server/middleware/partsManagementIntegrationMiddleware.js
+++ b/server/middleware/partsManagementIntegrationMiddleware.js
@@ -0,0 +1,23 @@
+/**
+ * Middleware to check if the request is authorized for Parts Management Integration.
+ * @param req
+ * @param res
+ * @param next
+ * @returns {*}
+ */
+const partsManagementIntegrationMiddleware = (req, res, next) => {
+  const secret = process.env.PARTS_MANAGEMENT_INTEGRATION_SECRET;
+  if (typeof secret !== "string" || secret.length === 0) {
+    return res.status(500).send("Server misconfiguration");
+  }
+
+  const headerValue = req.headers["parts-management-integration-secret"];
+  if (typeof headerValue !== "string" || headerValue.trim() !== secret) {
+    return res.status(401).send("Unauthorized");
+  }
+
+  req.isPartsManagementIntegrationAuthorized = true;
+  next();
+};
+
+module.exports = partsManagementIntegrationMiddleware;
--- a/server/middleware/vsstaIntegrationMiddleware.js
+++ b/server/middleware/vsstaIntegrationMiddleware.js
@@ -1,16 +1,19 @@
 /**
 * VSSTA Integration Middleware
- * @param req
- * @param res
- * @param next
- * @returns {*}
+ * Fails closed if the env var is missing or empty, and strictly compares header.
 */
 const vsstaIntegrationMiddleware = (req, res, next) => {
-  if (req?.headers?.["vssta-integration-secret"] !== process.env?.VSSTA_INTEGRATION_SECRET) {
+  const secret = process.env.VSSTA_INTEGRATION_SECRET;
+  if (typeof secret !== "string" || secret.length === 0) {
+    return res.status(500).send("Server misconfiguration");
+  }
+
+  const headerValue = req.headers["vssta-integration-secret"];
+  if (typeof headerValue !== "string" || headerValue.trim() !== secret) {
    return res.status(401).send("Unauthorized");
  }

-  req.isIntegrationAuthorized = true;
+  req.isVsstaIntegrationAuthorized = true;
  next();
 };

--- a/server/routes/intergrationRoutes.js
+++ b/server/routes/intergrationRoutes.js
@@ -1,8 +1,27 @@
 const express = require("express");
-const vsstaIntegration = require("../integrations/VSSTA/vsstaIntegrationRoute");
-const vsstaMiddleware = require("../middleware/vsstaIntegrationMiddleware");
 const router = express.Router();

-router.post("/vssta", vsstaMiddleware, vsstaIntegration);
+// Pull secrets from env
+const { VSSTA_INTEGRATION_SECRET, PARTS_MANAGEMENT_INTEGRATION_SECRET } = process.env;
+
+// Only load VSSTA routes if the secret is set
+if (typeof VSSTA_INTEGRATION_SECRET === "string" && VSSTA_INTEGRATION_SECRET.length > 0) {
+  const vsstaIntegration = require("../integrations/VSSTA/vsstaIntegrationRoute");
+  const vsstaMiddleware = require("../middleware/vsstaIntegrationMiddleware");
+
+  router.post("/vssta", vsstaMiddleware, vsstaIntegration);
+} else {
+  console.warn("VSSTA_INTEGRATION_SECRET is not set — skipping /vssta integration route");
+}
+
+// Only load Parts Management routes if that secret is set
+if (typeof PARTS_MANAGEMENT_INTEGRATION_SECRET === "string" && PARTS_MANAGEMENT_INTEGRATION_SECRET.length > 0) {
+  const partsManagementProvisioning = require("../integrations/partsManagement/partsManagementProvisioning");
+  const partsManagementIntegrationMiddleware = require("../middleware/partsManagementIntegrationMiddleware");
+
+  router.post("/parts-management/provision", partsManagementIntegrationMiddleware, partsManagementProvisioning);
+} else {
+  console.warn("PARTS_MANAGEMENT_INTEGRATION_SECRET is not set — skipping /parts-management/provision route");
+}

 module.exports = router;
Author	SHA1	Message	Date
Dave Richer	28abd9707e	feature/IO-3303-logging - Logging	2025-07-14 19:31:31 -04:00
Dave Richer	5f621e1ae0	feature/IO-3303-logging - Logging	2025-07-14 19:28:29 -04:00
Patrick Fic	fbd6766dcd	Merged in feature/IO-3294-imgproxy-bill-upload-hotfix (pull request #2401 ) IO-3294 fix upload to image proxy for bills.	2025-07-08 21:46:35 +00:00
Patrick Fic	9ace531edb	IO-3294 fix upload to image proxy for bills.	2025-07-08 14:31:32 -07:00
Dave Richer	9c59fd4c00	Merged in release/2025-07-04 (pull request #2393 ) DO NOT MERGE - PENDING Release/2025 07 04 into master-AIO - IO-3284 IO-3285 IO-3286 IO-3288	2025-07-05 01:21:35 +00:00
Allan Carr	a9f959cced	Merged in feature/IO-3286-Additional-Product-Fruit-IDs (pull request #2394 ) IO-3286 Additional Product Fruit IDs Approved-by: Dave Richer	2025-07-04 21:03:37 +00:00
Allan Carr	414897bba0	IO-3286 Additional Product Fruit IDs Signed-off-by: Allan Carr <allan@imexsystems.ca>	2025-07-04 13:35:32 -07:00
Allan Carr	7467a31d76	Merged in feature/IO-3284-JobLine-Price-Lbr-Hrs-Totals (pull request #2387 ) IO-3284 JobLine Price Lbr Hrs Total Approved-by: Dave Richer	2025-06-27 18:24:16 +00:00
Allan Carr	894f6bf6d2	Merged in feature/IO-3285-Shop-Config-Lite-Basic (pull request #2388 ) IO-3285 Shop Config Lite Basic Approved-by: Dave Richer	2025-06-27 18:23:41 +00:00
Allan Carr	744dfa8163	Merged in feature/IO-3286-Additional-Product-Fruit-IDs (pull request #2389 ) IO-3286 Additional Product Fruit IDs Approved-by: Dave Richer	2025-06-27 18:22:56 +00:00
Dave Richer	2293119518	Merged in feature/IO-3288-Score-Board-Blocked-Days (pull request #2390 ) feature/IO-3288-Score-Board-Blocked-Days - Fix	2025-06-27 17:57:25 +00:00
Dave Richer	bd529a0dfa	feature/IO-3288-Score-Board-Blocked-Days - Fix	2025-06-27 13:56:18 -04:00
Allan Carr	57ad89747f	IO-3286 Additional Product Fruit IDs Signed-off-by: Allan Carr <allan@imexsystems.ca>	2025-06-26 18:48:09 -07:00
Allan Carr	3ae8f38adb	IO-3285 Shop Config Lite Basic Signed-off-by: Allan Carr <allan@imexsystems.ca>	2025-06-26 18:45:48 -07:00
Allan Carr	dc5ed1a39c	IO-3284 JobLine Price Lbr Hrs Total Signed-off-by: Allan Carr <allan@imexsystems.ca>	2025-06-26 18:40:38 -07:00
Patrick Fic	aa6e6b8980	Merged in hotfix/2025-06-25 (pull request #2386 ) IO-3281 Resolve key issue for downloads.	2025-06-25 23:33:37 +00:00
Patrick Fic	1dc80c068b	Merged in feature/IO-3281-imgproxy-download-hotfix (pull request #2385 ) IO-3281 Resolve key issue for downloads.	2025-06-25 23:33:14 +00:00
Patrick Fic	bd0c4ceae2	IO-3281 Resolve key issue for downloads.	2025-06-25 16:32:47 -07:00
Patrick Fic	30b58c6ea5	Merged in hotfix/2025-06-25 (pull request #2384 ) IO-3281 missed file in previous commit.	2025-06-25 22:48:53 +00:00
Patrick Fic	a55e9224f8	Merged in feature/IO-3281-imgproxy-download-hotfix (pull request #2383 ) IO-3281 missed file in previous commit.	2025-06-25 22:48:41 +00:00
Patrick Fic	0c80abb3ca	IO-3281 missed file in previous commit.	2025-06-25 15:48:06 -07:00
Patrick Fic	7137e611cd	Merged in hotfix/2025-06-25 (pull request #2382 ) IO-3281 Prevent broken stream reseting HTTP headers.	2025-06-25 22:37:01 +00:00
Patrick Fic	6f9d291d36	Merged in feature/IO-3281-imgproxy-download-hotfix (pull request #2381 ) IO-3281 Prevent broken stream reseting HTTP headers.	2025-06-25 22:36:47 +00:00
Patrick Fic	f2a2653eae	IO-3281 Prevent broken stream reseting HTTP headers.	2025-06-25 15:36:03 -07:00
Patrick Fic	73c25ab91f	Merged in hotfix/2025-06-25 (pull request #2380 ) Hotfix/2025 06 25 - IO-3279 IO-3281	2025-06-25 17:08:57 +00:00
Patrick Fic	780449bac6	Merge branch 'hotfix/2025-06-25' of bitbucket.org:snaptsoft/bodyshop into hotfix/2025-06-25	2025-06-25 10:08:09 -07:00
Patrick Fic	2509a1ecf3	Merge branch 'feature/IO-3279-usage-report' into hotfix/2025-06-25	2025-06-25 10:08:02 -07:00
Patrick Fic	16075f7ddd	Merged in feature/IO-3281-imgproxy-download-hotfix (pull request #2378 ) IO-3281 Adjust zip to stream.	2025-06-25 16:43:29 +00:00
Patrick Fic	27d28e7ffc	IO-3281 Adjust zip to stream.	2025-06-25 09:42:45 -07:00
Patrick Fic	66b87e5c45	Merged in feature/IO-3281-imgproxy-download-hotfix (pull request #2376 ) IO-3281 resolve imgproxy download failures.	2025-06-25 15:53:33 +00:00
Patrick Fic	c1e1dff7d2	IO-3281 resolve imgproxy download failures.	2025-06-25 08:51:41 -07:00
Dave Richer	f76eb7abf5	Merged in hotfix/IO-3280-Image-Selection-Bug (pull request #2374 ) hotfix/IO-3280-Image-Selection-Bug - Fix Bug in image selection dialog	2025-06-24 18:43:29 +00:00
Dave Richer	25ea2a80a3	hotfix/IO-3280-Image-Selection-Bug - Fix Bug in image selection dialog	2025-06-24 14:42:06 -04:00
Patrick Fic	633d5668f0	IO-3279 Set usage report to 1 year.	2025-06-23 15:08:36 -07:00
Dave Richer	00cc47553b	Merged in release/2025-06-13 (pull request #2373 ) Release/2025 06 13 into master-AIO - IO-3222 IO-3256 IO-3254	2025-06-19 18:26:08 +00:00
Dave Richer	3c360130a3	Merged in feature/IO-3258-Shop-User-Vendor-Creation (pull request #2371 ) Feature/IO-3258 Shop User Vendor Creation	2025-06-09 22:44:01 +00:00
Dave Richer	13e4143eeb	feature/IO-3258-Shop-User-Vendor-Creation: Finish	2025-06-09 18:43:15 -04:00
Dave Richer	68c7b184d2	feature/IO-3258-Shop-User-Vendor-Creation: Finish	2025-06-09 18:39:29 -04:00
Dave Richer	9b85d15ff1	feature/IO-3258-Shop-User-Vendor-Creation: bump deps	2025-06-09 11:18:08 -04:00
Dave Richer	e7cf49a2ec	Merged in feature/IO-3254-Basic-Lite-Trial-Completion-User-Lockout (pull request #2369 ) feature/IO-3254-Basic-Lite-Trial-Completion-User-Lockout - Translations	2025-06-09 15:11:50 +00:00
Dave Richer	f5bc79cba7	Merged in feature/IO-3254-Basic-Lite-Trial-Completion-User-Lockout (pull request #2367 ) feature/IO-3254-Basic-Lite-Trial-Completion-User-Lockout - Bump deps	2025-06-05 17:25:00 +00:00
				`@@ -0,0 +1 @@`
				`alter table "public"."bodyshops" rename column "external_shop_id" to "parts_management_key";`