- Merge master-aio, bump packages.

Signed-off-by: Dave Richer <dave@imexsystems.ca>
Merged in release/2024-08-16 (pull request #1625 )
2024-08-19 12:27:30 -04:00 · 2024-08-16 23:31:33 +00:00 · 2024-08-16 19:25:14 +00:00 · 2024-08-16 12:27:26 -07:00 · 2024-08-16 16:16:53 +00:00 · 2024-08-16 16:15:54 +00:00
34 changed files with 1235 additions and 1279 deletions
--- a/client/index.html
+++ b/client/index.html
@@ -1,20 +1,20 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-  <meta charset="utf-8" />
+  <meta charset="utf-8"/>
  <% if (env.VITE_APP_INSTANCE === 'IMEX') { %>
-  <link rel="icon" href="/favicon.png" />
+  <link rel="icon" href="/favicon.png"/>
  <% } %> <% if (env.VITE_APP_INSTANCE === 'ROME') { %>
-  <link rel="icon" href="/ro-favicon.png" />
+  <link rel="icon" href="/ro-favicon.png"/>
  <% } %> <% if (env.VITE_APP_INSTANCE === 'PROMANAGER') { %>
-  <link rel="icon" href="/pm/pm-favicon.ico" />
+  <link rel="icon" href="/pm/pm-favicon.ico"/>
  <% } %>
-  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <meta name="viewport" content="width=device-width, initial-scale=1"/>
-  <meta name="theme-color" content="#1690ff" />
+  <meta name="theme-color" content="#1690ff"/>
  <!-- <link rel="apple-touch-icon" href="logo192.png" /> -->
  <!-- TODO:AIo Update the individual logos for each.-->
-  <link rel="apple-touch-icon" href="public/logo192.png" />
+  <link rel="apple-touch-icon" href="public/logo192.png"/>
  <link rel="mask-icon" href="/mask-icon.svg" color="#FFFFFF">
  <!--
    manifest.json provides metadata used when your web app is installed on a
@@ -30,7 +30,7 @@
    Learn how to configure a non-root public URL by running `npm run build`.
  -->
  <% if (env.VITE_APP_INSTANCE === 'IMEX') { %>
-  <meta name="description" content="ImEX Online" />
+  <meta name="description" content="ImEX Online"/>
  <title>ImEX Online</title>
  <script type="text/javascript">
    window.$crisp = [];
@@ -44,12 +44,13 @@
    })();
  </script>
  <% } %> <% if (env.VITE_APP_INSTANCE === 'ROME') { %>
-  <meta name="description" content="Rome Online" />
+  <meta name="description" content="Rome Online"/>
  <title>Rome Online</title>
  <!--Use the below code snippet to provide real time updates to the live chat plugin without the need of copying and paste each time to your website when changes are made via PBX-->
-  <call-us-selector phonesystem-url=https://rometech.east.3cx.us:5001 party="LiveChat528346"></call-us-selector>
+  <call-us-selector phonesystem-url=https://rometech.east.3cx.us:5001
                    party="LiveChat528346"></call-us-selector>
  <!--Incase you don't want real time updates to the live chat plugin when options are changed, use the below code snippet. Please note that each time you change the settings you will need to copy and paste the snippet code to your website-->
@@ -113,13 +114,13 @@
  ></call-us>-->
-  <script defer src=https://downloads-global.3cx.com/downloads/livechatandtalk/v1/callus.js id="tcx-callus-js" charset="utf-8"></script>
+  <script defer src=https://downloads-global.3cx.com/downloads/livechatandtalk/v1/callus.js
-
+          id="tcx-callus-js" charset="utf-8"></script>
  <% } %> <% if (env.VITE_APP_INSTANCE === 'PROMANAGER') { %>
  <title>ProManager</title>
-  <meta name="description" content="ProManager" />
+  <meta name="description" content="ProManager"/>
  <% } %>
  <script>
@@ -143,12 +144,14 @@
      if (window.noticeable) console.warn('Noticeable SDK code snippet loaded more than once');
      else {
        var n = (window.noticeable = window.noticeable || []);
        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];
--- a/client/package-lock.json
+++ b/client/package-lock.json
--- a/client/package.json
+++ b/client/package.json
@@ -8,22 +8,22 @@
  "private": true,
  "proxy": "http://localhost:4000",
  "dependencies": {
-    "@ant-design/pro-layout": "^7.19.11",
+    "@ant-design/pro-layout": "^7.19.12",
-    "@apollo/client": "^3.10.8",
+    "@apollo/client": "^3.11.4",
    "@emotion/is-prop-valid": "^1.3.0",
    "@fingerprintjs/fingerprintjs": "^4.4.3",
    "@jsreport/browser-client": "^3.1.0",
-    "@reduxjs/toolkit": "^2.2.6",
+    "@reduxjs/toolkit": "^2.2.7",
-    "@sentry/cli": "^2.32.2",
+    "@sentry/cli": "^2.33.1",
    "@sentry/react": "^7.114.0",
-    "@splitsoftware/splitio-react": "^1.12.0",
+    "@splitsoftware/splitio-react": "^1.12.1",
    "@tanem/react-nprogress": "^5.0.51",
    "@vitejs/plugin-react": "^4.3.1",
-    "antd": "^5.19.3",
+    "antd": "^5.20.2",
    "apollo-link-logger": "^2.0.1",
    "apollo-link-sentry": "^3.3.0",
    "autosize": "^6.0.1",
-    "axios": "^1.6.8",
+    "axios": "^1.7.4",
    "classnames": "^2.5.1",
    "css-box-model": "^1.2.1",
    "dayjs": "^1.11.12",
@@ -32,45 +32,44 @@
    "dotenv": "^16.4.5",
    "env-cmd": "^10.1.0",
    "exifr": "^7.1.3",
-    "firebase": "^10.12.4",
+    "firebase": "^10.13.0",
    "graphql": "^16.9.0",
-    "i18next": "^23.12.2",
+    "i18next": "^23.14.0",
    "i18next-browser-languagedetector": "^8.0.0",
    "immutability-helper": "^3.1.1",
-    "libphonenumber-js": "^1.11.4",
+    "libphonenumber-js": "^1.11.7",
-    "logrocket": "^8.1.1",
+    "logrocket": "^8.1.2",
    "markerjs2": "^2.32.1",
    "memoize-one": "^6.0.0",
    "normalize-url": "^8.0.1",
    "object-hash": "^3.0.0",
    "prop-types": "^15.8.1",
-    "query-string": "^9.0.0",
+    "query-string": "^9.1.0",
    "raf-schd": "^4.0.3",
    "react": "^18.3.1",
-    "react-big-calendar": "^1.13.1",
+    "react-big-calendar": "^1.13.3",
    "react-color": "^2.19.3",
-    "react-cookie": "^7.1.4",
+    "react-cookie": "^7.2.0",
    "react-dom": "^18.3.1",
    "react-drag-listview": "^2.0.0",
    "react-grid-gallery": "^1.0.1",
    "react-grid-layout": "1.3.4",
    "react-i18next": "^14.1.3",
-    "react-icons": "^5.2.1",
+    "react-icons": "^5.3.0",
    "react-image-lightbox": "^5.1.4",
    "react-joyride": "^2.8.2",
    "react-markdown": "^9.0.1",
    "react-number-format": "^5.4.0",
    "react-popopo": "^2.1.9",
-    "react-product-fruits": "^2.2.6",
+    "react-product-fruits": "^2.2.61",
    "react-redux": "^9.1.2",
    "react-resizable": "^3.0.5",
-    "react-router-dom": "^6.25.1",
+    "react-router-dom": "^6.26.1",
    "react-sticky": "^6.0.3",
    "react-virtualized": "^9.22.5",
-    "react-virtuoso": "^4.7.12",
+    "react-virtuoso": "^4.10.1",
    "recharts": "^2.12.7",
    "redux": "^5.0.1",
-    "redux-actions": "^3.0.0",
+    "redux-actions": "^3.0.3",
    "redux-persist": "^6.0.0",
    "redux-saga": "^1.3.0",
    "redux-state-sync": "^3.1.4",
@@ -80,7 +79,7 @@
    "styled-components": "^6.1.12",
    "subscriptions-transport-ws": "^0.11.0",
    "use-memo-one": "^1.1.3",
-    "userpilot": "^1.3.2",
+    "userpilot": "^1.3.5",
    "vite-plugin-ejs": "^1.7.0",
    "web-vitals": "^3.5.2"
  },
@@ -131,29 +130,29 @@
  "devDependencies": {
    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
    "@babel/preset-react": "^7.24.7",
-    "@dotenvx/dotenvx": "^1.6.4",
+    "@dotenvx/dotenvx": "^1.7.0",
    "@emotion/babel-plugin": "^11.12.0",
-    "@emotion/react": "^11.12.0",
+    "@emotion/react": "^11.13.0",
-    "@sentry/webpack-plugin": "^2.21.1",
+    "@sentry/webpack-plugin": "^2.22.2",
    "@testing-library/cypress": "^10.0.2",
-    "browserslist": "^4.23.2",
+    "browserslist": "^4.23.3",
    "browserslist-to-esbuild": "^2.1.1",
    "cross-env": "^7.0.3",
-    "cypress": "^13.13.1",
+    "cypress": "^13.13.3",
    "eslint": "^8.57.0",
    "eslint-config-react-app": "^7.0.1",
    "eslint-plugin-cypress": "^2.15.1",
-    "memfs": "^4.9.3",
+    "memfs": "^4.11.1",
    "os-browserify": "^0.3.0",
    "react-error-overlay": "6.0.11",
    "redux-logger": "^3.0.6",
    "source-map-explorer": "^2.5.3",
-    "vite": "^5.3.4",
+    "vite": "^5.4.1",
    "vite-plugin-babel": "^1.2.0",
    "vite-plugin-eslint": "^1.8.1",
    "vite-plugin-legacy": "^2.1.0",
    "vite-plugin-node-polyfills": "^0.22.0",
-    "vite-plugin-pwa": "^0.20.0",
+    "vite-plugin-pwa": "^0.20.1",
    "vite-plugin-style-import": "^2.0.0"
  }
 }
--- a/client/src/App/App.jsx
+++ b/client/src/App/App.jsx
@@ -18,7 +18,7 @@ import { checkUserSession } from "../redux/user/user.actions";
 import { selectBodyshop, selectCurrentEula, selectCurrentUser } from "../redux/user/user.selectors";
 import PrivateRoute from "../components/PrivateRoute";
 import "./App.styles.scss";
-import handleBeta from "../utils/betaHandler";
+import handleBeta from "../utils/handleBeta";
 import Eula from "../components/eula/eula.component";
 import InstanceRenderMgr from "../utils/instanceRenderMgr";
 import ProductFruitsWrapper from "./ProductFruitsWrapper.jsx";
--- a/client/src/components/accounting-receivables-table/accounting-receivables-table.component.jsx
+++ b/client/src/components/accounting-receivables-table/accounting-receivables-table.component.jsx
@@ -13,6 +13,7 @@ import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { DateFormatter } from "../../utils/DateFormatter";
 import ExportLogsCountDisplay from "../export-logs-count-display/export-logs-count-display.component";
 import JobMarkSelectedExported from "../jobs-mark-selected-exported/jobs-mark-selected-exported";
 import OwnerNameDisplay, { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
 import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
@@ -170,13 +171,22 @@ export function AccountingReceivablesTableComponent({ bodyshop, loading, jobs, r
      extra={
        <Space wrap>
          {!bodyshop.cdk_dealerid && !bodyshop.pbs_serialnumber && (
-            <JobsExportAllButton
+            <>
-              jobIds={selectedJobs}
+              <JobMarkSelectedExported
-              disabled={transInProgress || selectedJobs.length === 0}
+                jobIds={selectedJobs}
-              loadingCallback={setTransInProgress}
+                disabled={transInProgress || selectedJobs.length === 0}
-              completedCallback={setSelectedJobs}
+                loadingCallback={setTransInProgress}
-              refetch={refetch}
+                completedCallback={setSelectedJobs}
-            />
+                refetch={refetch}
              />
              <JobsExportAllButton
                jobIds={selectedJobs}
                disabled={transInProgress || selectedJobs.length === 0}
                loadingCallback={setTransInProgress}
                completedCallback={setSelectedJobs}
                refetch={refetch}
              />
            </>
          )}
          {bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && <QboAuthorizeComponent />}
          <Input.Search
--- a/client/src/components/dashboard-components/scheduled-out-today/scheduled-out-today.component.jsx
+++ b/client/src/components/dashboard-components/scheduled-out-today/scheduled-out-today.component.jsx
@@ -36,9 +36,6 @@ export default function DashboardScheduledOutToday({ data, ...cardProps }) {
    };
  });
  console.log("Scheduled Out Today");
  console.dir(scheduledOutToday);
  const tvFontSize = 18;
  const tvFontWeight = "bold";
--- a/client/src/components/header/header.component.jsx
+++ b/client/src/components/header/header.component.jsx
@@ -43,7 +43,7 @@ import { selectRecentItems, selectSelectedHeader } from "../../redux/application
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { signOutStart } from "../../redux/user/user.actions";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
-import { checkBeta, handleBeta, setBeta } from "../../utils/betaHandler";
+import { checkBeta, handleBeta, setBeta } from "../../utils/handleBeta";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
--- a/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx
+++ b/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx
@@ -11,6 +11,7 @@ import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { pageLimit } from "../../utils/config";
 import { alphaSort, statusSort } from "../../utils/sorters";
 import useLocalStorage from "../../utils/useLocalStorage";
 import StartChatButton from "../chat-open-button/chat-open-button.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
@@ -37,7 +38,10 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
      title: t("jobs.fields.ro_number"),
      dataIndex: "ro_number",
      key: "ro_number",
-      sorter: true, //(a, b) => alphaSort(a.ro_number, b.ro_number),
+      sorter: search?.search
        ? (a, b) =>
            parseInt((a.ro_number || "0").replace(/\D/g, "")) - parseInt((b.ro_number || "0").replace(/\D/g, ""))
        : true,
      sortOrder: sortcolumn === "ro_number" && sortorder,
      render: (text, record) => (
        <Link to={"/manage/jobs/" + record.id}>{record.ro_number || t("general.labels.na")}</Link>
@@ -49,7 +53,6 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
      key: "ownr_ln",
      ellipsis: true,
      //sorter: true, // (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
      //sortOrder: sortcolumn === "ownr_ln" && sortorder,
      render: (text, record) => {
        return record.ownerid ? (
@@ -67,7 +70,6 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
      title: t("jobs.fields.ownr_ph1"),
      dataIndex: "ownr_ph1",
      key: "ownr_ph1",
      ellipsis: true,
      render: (text, record) => <StartChatButton phone={record.ownr_ph1} jobid={record.id} />
    },
@@ -75,7 +77,6 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
      title: t("jobs.fields.ownr_ph2"),
      dataIndex: "ownr_ph2",
      key: "ownr_ph2",
      ellipsis: true,
      render: (text, record) => <StartChatButton phone={record.ownr_ph2} jobid={record.id} />
    },
@@ -85,7 +86,7 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
      key: "status",
      ellipsis: true,
-      sorter: true, // (a, b) => alphaSort(a.status, b.status),
+      sorter: search?.search ? (a, b) => statusSort(a.status, b.status, bodyshop.md_ro_statuses.active_statuses) : true,
      sortOrder: sortcolumn === "status" && sortorder,
      render: (text, record) => {
        return record.status || t("general.labels.na");
@@ -100,7 +101,6 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
      title: t("jobs.fields.vehicle"),
      dataIndex: "vehicle",
      key: "vehicle",
      ellipsis: true,
      render: (text, record) => {
        return record.vehicleid ? (
@@ -117,7 +117,7 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
      dataIndex: "plate_no",
      key: "plate_no",
      ellipsis: true,
-      sorter: true, //(a, b) => alphaSort(a.plate_no, b.plate_no),
+      sorter: search?.search ? (a, b) => alphaSort(a.plate_no, b.plate_no) : true,
      sortOrder: sortcolumn === "plate_no" && sortorder,
      render: (text, record) => {
        return record.plate_no ? record.plate_no : "";
@@ -128,7 +128,7 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
      dataIndex: "clm_no",
      key: "clm_no",
      ellipsis: true,
-      sorter: true, //(a, b) => alphaSort(a.clm_no, b.clm_no),
+      sorter: search?.search ? (a, b) => alphaSort(a.clm_no, b.clm_no) : true,
      sortOrder: sortcolumn === "clm_no" && sortorder,
      render: (text, record) => `${record.clm_no || ""}${record.po_number ? ` (PO: ${record.po_number})` : ""}`
    },
@@ -142,8 +142,7 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
      title: t("jobs.fields.clm_total"),
      dataIndex: "clm_total",
      key: "clm_total",
-
+      sorter: search?.search ? (a, b) => a.clm_total - b.clm_total : true,
      sorter: true, //(a, b) => a.clm_total - b.clm_total,
      sortOrder: sortcolumn === "clm_total" && sortorder,
      render: (text, record) => {
        return record.clm_total ? (
@@ -157,7 +156,6 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
      title: t("jobs.fields.owner_owing"),
      dataIndex: "owner_owing",
      key: "owner_owing",
      render: (text, record) => <CurrencyFormatter>{record.owner_owing}</CurrencyFormatter>
    },
    {
--- a/client/src/components/jobs-list/jobs-list.component.jsx
+++ b/client/src/components/jobs-list/jobs-list.component.jsx
@@ -16,18 +16,15 @@ import useLocalStorage from "../../utils/useLocalStorage";
 import AlertComponent from "../alert/alert.component";
 import ChatOpenButton from "../chat-open-button/chat-open-button.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import { setJoyRideSteps } from "../../redux/application/application.actions";
 import { OwnerNameDisplayFunction } from "./../owner-name-display/owner-name-display.component";
 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
 });
-const mapDispatchToProps = (dispatch) => ({
+const mapDispatchToProps = (dispatch) => ({});
  setJoyRideSteps: (steps) => dispatch(setJoyRideSteps(steps))
 });
-export function JobsList({ bodyshop, setJoyRideSteps }) {
+export function JobsList({ bodyshop }) {
  const searchParams = queryString.parse(useLocation().search);
  const { selected } = searchParams;
  const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
--- a/client/src/components/jobs-mark-selected-exported/jobs-mark-selected-exported.jsx
+++ b/client/src/components/jobs-mark-selected-exported/jobs-mark-selected-exported.jsx
@@ -0,0 +1,105 @@
 import { useMutation } from "@apollo/client";
 import { Button, notification, Popconfirm } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
 import { UPDATE_JOBS } from "../../graphql/jobs.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
  currentUser: selectCurrentUser
 });
 const mapDispatchToProps = (dispatch) => ({
  insertAuditTrail: ({ jobid, operation, type }) => dispatch(insertAuditTrail({ jobid, operation, type }))
 });
 export default connect(mapStateToProps, mapDispatchToProps)(JobMarkSelectedExported);
 export function JobMarkSelectedExported({
  bodyshop,
  currentUser,
  jobIds,
  disabled,
  loadingCallback,
  completedCallback,
  refetch,
  insertAuditTrail
 }) {
  const { t } = useTranslation();
  const [loading, setLoading] = useState(false);
  const [open, setOpen] = useState(false);
  const [insertExportLog] = useMutation(INSERT_EXPORT_LOG);
  const [updateJob] = useMutation(UPDATE_JOBS);
  const handleUpdate = async () => {
    setLoading(true);
    loadingCallback(true);
    const result = await updateJob({
      variables: {
        jobIds: jobIds,
        fields: {
          status: bodyshop.md_ro_statuses.default_exported || "Exported*",
          date_exported: new Date()
        }
      },
      update(cache) {}
    });
    await insertExportLog({
      variables: {
        logs: jobIds.map((id) => {
          return {
            bodyshopid: bodyshop.id,
            jobid: id,
            successful: true,
            message: JSON.stringify([t("general.labels.markedexported")]),
            useremail: currentUser.email
          };
        })
      }
    });
    if (!result.errors) {
      notification["success"]({ message: t("jobs.successes.save") });
      result.data.update_jobs.returning.forEach((job) => {
        console.log("results job", job.id, "audit: ", AuditTrailMapping.admin_jobmarkexported());
        insertAuditTrail({
          jobid: job.id,
          operation: AuditTrailMapping.admin_jobmarkexported(),
          type: "admin_jobmarkexported"
        });
      });
    } else {
      notification["error"]({
        message: t("jobs.errors.saving", {
          error: JSON.stringify(result.errors)
        })
      });
    }
    loadingCallback(false);
    completedCallback && completedCallback([]);
    setLoading(false);
    refetch && refetch();
    setOpen(false);
  };
  return (
    <Popconfirm
      open={open}
      title={t("general.labels.areyousure")}
      onCancel={() => setOpen(false)}
      onConfirm={handleUpdate}
      disabled={disabled}
    >
      <Button loading={loading} disabled={disabled} onClick={() => setOpen(true)} type="primary" danger>
        {t("jobs.actions.markasexported")}
      </Button>
    </Popconfirm>
  );
 }
--- a/client/src/components/payable-mark-selected-exported/payable-mark-selected-exported.component.jsx
+++ b/client/src/components/payable-mark-selected-exported/payable-mark-selected-exported.component.jsx
@@ -90,7 +90,7 @@ export function BillMarkSelectedExported({
      onConfirm={handleUpdate}
      disabled={disabled}
    >
-      <Button loading={loading} disabled={disabled} onClick={() => setOpen(true)}>
+      <Button loading={loading} disabled={disabled} onClick={() => setOpen(true)} type="primary" danger>
        {t("bills.labels.markexported")}
      </Button>
    </Popconfirm>
--- a/client/src/components/payment-mark-selected-exported/payment-mark-selected-exported.component.jsx
+++ b/client/src/components/payment-mark-selected-exported/payment-mark-selected-exported.component.jsx
@@ -90,7 +90,7 @@ export function PaymentMarkSelectedExported({
      onConfirm={handleUpdate}
      disabled={disabled}
    >
-      <Button loading={loading} disabled={disabled} onClick={() => setOpen(true)}>
+      <Button loading={loading} disabled={disabled} onClick={() => setOpen(true)} type="primary" danger>
        {t("bills.labels.markexported")}
      </Button>
    </Popconfirm>
--- a/client/src/components/production-board-filters/production-board-filters.component.jsx
+++ b/client/src/components/production-board-filters/production-board-filters.component.jsx
@@ -1,22 +1,32 @@
-import { Input, Space, Spin } from "antd";
+import { Button, Input, Space, Spin } from "antd";
-import React from "react";
+import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { ExclamationCircleFilled, ExclamationCircleOutlined } from "@ant-design/icons";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import EmployeeSearchSelectComponent from "../employee-search-select/employee-search-select.component";
 const mapStateToProps = createStructuredSelector({
  //currentUser: selectCurrentUser
  bodyshop: selectBodyshop
 });
 const mapDispatchToProps = (dispatch) => ({
  //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 export default connect(mapStateToProps, mapDispatchToProps)(ProductionBoardFilters);
 export function ProductionBoardFilters({ bodyshop, filter, setFilter, loading }) {
  const { t } = useTranslation();
  const [alertFilter, setAlertFilter] = useState(false);
  const toggleAlertFilter = () => {
    const newAlertFilter = !alertFilter;
    setAlertFilter(newAlertFilter);
    setFilter({ ...filter, alert: newAlertFilter });
  };
  return (
    <Space wrap>
      {loading && <Spin />}
@@ -35,6 +45,13 @@ export function ProductionBoardFilters({ bodyshop, filter, setFilter, loading })
        onChange={(emp) => setFilter({ ...filter, employeeId: emp })}
        allowClear
      />
      <Button
        type={alertFilter ? "primary" : "default"}
        onClick={toggleAlertFilter}
        icon={alertFilter ? <ExclamationCircleFilled /> : <ExclamationCircleOutlined />}
      >
        {t("production.labels.alerts")}
      </Button>
    </Space>
  );
 }
--- a/client/src/components/production-board-kanban/production-board-kanban.component.jsx
+++ b/client/src/components/production-board-kanban/production-board-kanban.component.jsx
@@ -21,7 +21,7 @@ import { createBoardData } from "./production-board-kanban.utils.js";
 import ProductionBoardKanbanSettings from "./settings/production-board-kanban.settings.component.jsx";
 import cloneDeep from "lodash/cloneDeep";
 import isEqual from "lodash/isEqual";
-import { mergeWithDefaults } from "./settings/defaultKanbanSettings.js";
+import { defaultFilters, mergeWithDefaults } from "./settings/defaultKanbanSettings.js";
 import NoteUpsertModal from "../../components/note-upsert-modal/note-upsert-modal.container";
 const mapStateToProps = createStructuredSelector({
@@ -41,7 +41,7 @@ const mapDispatchToProps = (dispatch) => ({
 function ProductionBoardKanbanComponent({ data, bodyshop, refetch, insertAuditTrail, associationSettings, statuses }) {
  const [boardLanes, setBoardLanes] = useState({ lanes: [] });
-  const [filter, setFilter] = useState({ search: "", employeeId: null });
+  const [filter, setFilter] = useState(defaultFilters);
  const [loading, setLoading] = useState(true);
  const [isMoving, setIsMoving] = useState(false);
  const [orientation, setOrientation] = useState("vertical");
@@ -187,11 +187,9 @@ function ProductionBoardKanbanComponent({ data, bodyshop, refetch, insertAuditTr
    return mergeWithDefaults(kanbanSettings);
  }, [associationSettings]);
-  const handleSettingsChange = useCallback((newSettings) => {
+  const handleSettingsChange = () => {
-    setLoading(true);
+    setFilter(defaultFilters);
-    setOrientation(newSettings.orientation ? "vertical" : "horizontal");
+  };
    setLoading(false);
  }, []);
  if (loading) {
    return <Skeleton active />;
--- a/client/src/components/production-board-kanban/production-board-kanban.utils.js
+++ b/client/src/components/production-board-kanban/production-board-kanban.utils.js
@@ -29,7 +29,7 @@ const sortByParentId = (arr) => {
 // Function to create board data based on statuses and jobs, with optional filtering
 export const createBoardData = ({ statuses, data, filter, cardSettings }) => {
-  const { search, employeeId } = filter;
+  const { search, employeeId, alert } = filter;
  const lanes = statuses.map((status) => ({
    id: status,
@@ -52,6 +52,11 @@ export const createBoardData = ({ statuses, data, filter, cardSettings }) => {
    );
  }
  // Filter jobs by alert if alert filter is true
  if (alert) {
    filteredJobs = filteredJobs.filter((job) => job.production_vars?.alert);
  }
  const DataGroupedByStatus = groupBy(filteredJobs, "status");
  Object.keys(DataGroupedByStatus).forEach((statusGroupKey) => {
--- a/client/src/components/production-board-kanban/settings/defaultKanbanSettings.js
+++ b/client/src/components/production-board-kanban/settings/defaultKanbanSettings.js
@@ -48,6 +48,8 @@ const defaultKanbanSettings = {
  selectedEstimators: []
 };
 const defaultFilters = { search: "", employeeId: null, alert: false };
 const mergeWithDefaults = (settings) => {
  // Create a new object that starts with the default settings
  const mergedSettings = { ...defaultKanbanSettings };
@@ -64,4 +66,4 @@ const mergeWithDefaults = (settings) => {
  return mergedSettings;
 };
-export { defaultKanbanSettings, statisticsItems, mergeWithDefaults };
+export { defaultKanbanSettings, statisticsItems, mergeWithDefaults, defaultFilters };
--- 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
@@ -9,8 +9,9 @@ import InformationSettings from "./InformationSettings.jsx";
 import StatisticsSettings from "./StatisticsSettings.jsx";
 import FilterSettings from "./FilterSettings.jsx";
 import PropTypes from "prop-types";
 import { isFunction } from "lodash";
-function ProductionBoardKanbanSettings({ associationSettings, parentLoading, bodyshop, data }) {
+function ProductionBoardKanbanSettings({ associationSettings, parentLoading, bodyshop, data, onSettingsChange }) {
  const [form] = Form.useForm();
  const [open, setOpen] = useState(false);
  const [loading, setLoading] = useState(false);
@@ -61,6 +62,11 @@ function ProductionBoardKanbanSettings({ associationSettings, parentLoading, bod
    setOpen(false);
    setLoading(false);
    parentLoading(false);
    if (onSettingsChange && isFunction(onSettingsChange)) {
      onSettingsChange(values);
    }
    setHasChanges(false);
  };
@@ -156,6 +162,7 @@ ProductionBoardKanbanSettings.propTypes = {
  associationSettings: PropTypes.object,
  parentLoading: PropTypes.func.isRequired,
  bodyshop: PropTypes.object.isRequired,
  onSettingsChange: PropTypes.func,
  data: PropTypes.array
 };
--- a/client/src/components/production-list-columns/production-list-columns.data.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.data.jsx
@@ -2,10 +2,13 @@ import { BranchesOutlined, PauseCircleOutlined } from "@ant-design/icons";
 import { Checkbox, Space, Tooltip } from "antd";
 import i18n from "i18next";
 import { Link } from "react-router-dom";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { store } from "../../redux/store";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { TimeFormatter } from "../../utils/DateFormatter";
 import PhoneFormatter from "../../utils/PhoneFormatter";
 import { onlyUnique } from "../../utils/arrayHelper";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import { alphaSort, dateSort, statusSort } from "../../utils/sorters";
 import JobAltTransportChange from "../job-at-change/job-at-change.component";
 import JobPartsQueueCount from "../job-parts-queue-count/job-parts-queue-count.component";
@@ -24,9 +27,6 @@ import ProductionListColumnNote from "./production-list-columns.productionnote.c
 import ProductionListColumnCategory from "./production-list-columns.status.category";
 import ProductionListColumnStatus from "./production-list-columns.status.component";
 import ProductionListColumnTouchTime from "./prodution-list-columns.touchtime.component";
 import { store } from "../../redux/store";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
 const r = ({ technician, state, activeStatuses, data, bodyshop, refetch, treatments }) => {
  const { Enhanced_Payroll } = treatments;
@@ -258,7 +258,7 @@ const r = ({ technician, state, activeStatuses, data, bodyshop, refetch, treatme
        { text: "True", value: true },
        { text: "False", value: false }
      ],
-      onFilter: (value, record) => value.includes(record.special_coverage_policy),
+      onFilter: (value, record) => value === record.special_coverage_policy,
      render: (text, record) => <Checkbox checked={record.special_coverage_policy} />
    },
@@ -349,6 +349,11 @@ const r = ({ technician, state, activeStatuses, data, bodyshop, refetch, treatme
      key: "alert",
      sorter: (a, b) => Number(a.production_vars?.alert || false) - Number(b.production_vars?.alert || false),
      sortOrder: state.sortedInfo.columnKey === "alert" && state.sortedInfo.order,
      filters: [
        { text: "True", value: true },
        { text: "False", value: false }
      ],
      onFilter: (value, record) => value === (record.production_vars?.alert || false),
      render: (text, record) => (
        <ProductionListColumnAlert id={record.id} productionVars={record?.production_vars} refetch={refetch} />
      )
--- a/client/src/components/update-alert/update-alert.component.jsx
+++ b/client/src/components/update-alert/update-alert.component.jsx
@@ -1,7 +1,7 @@
 import { AlertOutlined } from "@ant-design/icons";
 import { Alert, Button, Col, Row, Space } from "antd";
 import i18n from "i18next";
-import React from "react";
+import React, { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -12,39 +12,42 @@ import InstanceRenderManager from "../../utils/instanceRenderMgr";
 const mapStateToProps = createStructuredSelector({
  updateAvailable: selectUpdateAvailable
 });
 const mapDispatchToProps = (dispatch) => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
+  // setUserLanguage: language => dispatch(setUserLanguage(language))
 });
-export default connect(mapStateToProps, mapDispatchToProps)(UpdateAlert);
+
 const intervalMS = 10 * 60 * 1000;
 export function UpdateAlert({ updateAvailable }) {
  const { t } = useTranslation();
  const {
-    offlineReady: [
+    offlineReady: [offlineReady],
-      offlineReady //setOfflineReady
+    needRefresh: [needRefresh],
    ],
    needRefresh: [
      needRefresh //setNeedRefresh
    ],
    updateServiceWorker
  } = useRegisterSW({
    onRegistered(r) {
-      // eslint-disable-next-line prefer-template
+      console.log("SW Registered:", r);
-      console.log("SW Registered: " + r);
+      if (r) {
-      r &&
+        setInterval(
-        setInterval(() => {
+          () => {
-          r.update();
+            r.update();
-        }, intervalMS);
+          },
          10 * 60 * 1000
        );
      }
    },
    onRegisterError(error) {
-      console.log("SW registration error", error);
+      console.error("SW registration error", error);
    }
  });
-  if (import.meta.env.DEV) console.log(`SW Status => Refresh? ${needRefresh} - offlineReady? ${offlineReady}`);
+  useEffect(() => {
    if (import.meta.env.DEV) {
      console.log(`SW Status => Refresh? ${needRefresh} - offlineReady? ${offlineReady}`);
    }
  }, [needRefresh, offlineReady]);
  if (!needRefresh) return null;
  return (
    <Alert
      message={t("general.messages.newversiontitle", {
@@ -69,19 +72,10 @@ export function UpdateAlert({ updateAvailable }) {
          </Col>
          <Col sm={24} md={8} lg={6}>
            <Space wrap>
-              <Button
+              <Button onClick={() => window.open("https://imex-online.noticeable.news/", "_blank")}>
                onClick={async () => {
                  window.open("https://imex-online.noticeable.news/", "_blank");
                }}
              >
                {i18n.t("general.actions.viewreleasenotes")}
              </Button>
-              <Button
+              <Button type="primary" onClick={() => updateServiceWorker(true)}>
                type="primary"
                onClick={async () => {
                  updateServiceWorker(true);
                }}
              >
                {i18n.t("general.actions.refresh")}
              </Button>
            </Space>
@@ -93,3 +87,5 @@ export function UpdateAlert({ updateAvailable }) {
    />
  );
 }
 export default connect(mapStateToProps, mapDispatchToProps)(UpdateAlert);
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -1,7 +1,7 @@
 import { gql } from "@apollo/client";
 export const QUERY_ALL_ACTIVE_JOBS_PAGINATED = gql`
-  query QUERY_ALL_JOBS_PAGINATED_STATUS_FILTERED(
+  query QUERY_ALL_ACTIVE_JOBS_PAGINATED(
    $offset: Int
    $limit: Int
    $order: [jobs_order_by!]
--- a/client/src/pages/manage/manage.page.component.jsx
+++ b/client/src/pages/manage/manage.page.component.jsx
@@ -12,7 +12,6 @@ import ErrorBoundary from "../../components/error-boundary/error-boundary.compon
 //import FooterComponent from "../../components/footer/footer.component";
 //Component Imports
 import * as Sentry from "@sentry/react";
 import Joyride from "react-joyride";
 import TestComponent from "../../components/_test/test.page";
 import HeaderContainer from "../../components/header/header.container";
 import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component";
@@ -23,8 +22,6 @@ import { requestForToken } from "../../firebase/firebase.utils";
 import { selectBodyshop, selectInstanceConflict } from "../../redux/user/user.selectors";
 import UpdateAlert from "../../components/update-alert/update-alert.component";
 import { setJoyRideFinished } from "../../redux/application/application.actions.js";
 import { selectEnableJoyRide, selectJoyRideSteps } from "../../redux/application/application.selectors.js";
 import InstanceRenderManager from "../../utils/instanceRenderMgr.js";
 import "./manage.page.styles.scss";
@@ -105,16 +102,12 @@ const { Content, Footer } = Layout;
 const mapStateToProps = createStructuredSelector({
  conflict: selectInstanceConflict,
-  bodyshop: selectBodyshop,
+  bodyshop: selectBodyshop
  enableJoyRide: selectEnableJoyRide,
  joyRideSteps: selectJoyRideSteps
 });
-const mapDispatchToProps = (dispatch) => ({
+const mapDispatchToProps = (dispatch) => ({});
  setJoyRideFinished: (steps) => dispatch(setJoyRideFinished(steps))
 });
-export function Manage({ conflict, bodyshop, enableJoyRide, joyRideSteps, setJoyRideFinished }) {
+export function Manage({ conflict, bodyshop }) {
  const { t } = useTranslation();
  const [chatVisible] = useState(false);
@@ -583,21 +576,6 @@ export function Manage({ conflict, bodyshop, enableJoyRide, joyRideSteps, setJoy
        <UpdateAlert />
        <HeaderContainer />
        <Content className="content-container">
          <Joyride
            debug
            run={enableJoyRide}
            steps={joyRideSteps}
            continuous
            hideCloseButton
            scrollToFirstStep
            showProgress
            showSkipButton
            callback={(props) => {
              if (props.action === "reset") {
                setJoyRideFinished();
              }
            }}
          />
          <PartnerPingComponent />
          <Sentry.ErrorBoundary fallback={<ErrorBoundary />} showDialog>
            {PageContent}
--- a/client/src/redux/application/application.actions.js
+++ b/client/src/redux/application/application.actions.js
@@ -67,11 +67,3 @@ export const setUpdateAvailable = (isUpdateAvailable) => ({
  type: ApplicationActionTypes.SET_UPDATE_AVAILABLE,
  payload: isUpdateAvailable
 });
 export const setJoyRideSteps = (steps) => ({
  type: ApplicationActionTypes.SET_JOYRIDE_STEPS,
  payload: steps
 });
 export const setJoyRideFinished = () => ({
  type: ApplicationActionTypes.SET_JOYRIDE_FINISHED
  //payload: isUpdateAvailable,
 });
--- a/client/src/redux/application/application.reducer.js
+++ b/client/src/redux/application/application.reducer.js
@@ -14,9 +14,7 @@ const INITIAL_STATE = {
    error: null
  },
  jobReadOnly: false,
-  partnerVersion: null,
+  partnerVersion: null
  enableJoyRide: false,
  joyRideSteps: []
 };
 const applicationReducer = (state = INITIAL_STATE, action) => {
@@ -89,12 +87,6 @@ const applicationReducer = (state = INITIAL_STATE, action) => {
    case ApplicationActionTypes.SET_PROBLEM_JOBS: {
      return { ...state, problemJobs: action.payload };
    }
    case ApplicationActionTypes.SET_JOYRIDE_STEPS: {
      return { ...state, enableJoyRide: true, joyRideSteps: action.payload };
    }
    case ApplicationActionTypes.SET_JOYRIDE_FINISHED: {
      return { ...state, enableJoyRide: false, joyRideSteps: [] };
    }
    default:
      return state;
  }
--- a/client/src/redux/application/application.selectors.js
+++ b/client/src/redux/application/application.selectors.js
@@ -22,5 +22,3 @@ export const selectJobReadOnly = createSelector([selectApplication], (applicatio
 export const selectOnline = createSelector([selectApplication], (application) => application.online);
 export const selectProblemJobs = createSelector([selectApplication], (application) => application.problemJobs);
 export const selectUpdateAvailable = createSelector([selectApplication], (application) => application.updateAvailable);
 export const selectEnableJoyRide = createSelector([selectApplication], (application) => application.enableJoyRide);
 export const selectJoyRideSteps = createSelector([selectApplication], (application) => application.joyRideSteps);
--- a/client/src/redux/application/application.types.js
+++ b/client/src/redux/application/application.types.js
@@ -12,8 +12,6 @@ const ApplicationActionTypes = {
  SET_ONLINE_STATUS: "SET_ONLINE_STATUS",
  INSERT_AUDIT_TRAIL: "INSERT_AUDIT_TRAIL",
  SET_PROBLEM_JOBS: "SET_PROBLEM_JOBS",
-  SET_UPDATE_AVAILABLE: "SET_UPDATE_AVAILABLE",
+  SET_UPDATE_AVAILABLE: "SET_UPDATE_AVAILABLE"
  SET_JOYRIDE_STEPS: "SET_JOYRIDE_STEPS",
  SET_JOYRIDE_FINISHED: "SET_JOYRIDE_FINISHED"
 };
 export default ApplicationActionTypes;
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -2833,7 +2833,8 @@
        "sublets": "Sublets",
        "totalhours": "Total Hrs ",
        "touchtime": "T/T",
-        "viewname": "View Name"
+        "viewname": "View Name",
        "alerts": "Alerts"
      },
      "successes": {
        "removed": "Job removed from production."
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -2833,7 +2833,8 @@
        "sublets": "",
        "totalhours": "",
        "touchtime": "",
-        "viewname": ""
+        "viewname": "",
        "alerts": ""
      },
      "successes": {
        "removed": ""
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -2833,7 +2833,8 @@
        "sublets": "",
        "totalhours": "",
        "touchtime": "",
-        "viewname": ""
+        "viewname": "",
        "alerts": ""
      },
      "successes": {
        "removed": ""
--- a/client/src/utils/betaHandler.js
+++ b/client/src/utils/betaHandler.js
@@ -1,36 +0,0 @@
 export const BETA_KEY = "betaSwitchImex";
 export const checkBeta = () => {
  const cookie = document.cookie.split("; ").find((row) => row.startsWith(BETA_KEY));
  return cookie ? cookie.split("=")[1] === "true" : false;
 };
 export const setBeta = (value) => {
  const domain = window.location.hostname.split(".").slice(-2).join(".");
  document.cookie = `${BETA_KEY}=${value}; path=/; domain=.${domain}`;
 };
 export const handleBeta = () => {
  // If the current host name does not start with beta or test, then we don't need to do anything.
  if (window.location.hostname.startsWith("localhost")) {
    console.log("Not on beta or test, so no need to handle beta.");
    return;
  }
  const isBeta = checkBeta();
  const currentHostName = window.location.hostname;
  // Beta is enabled, but the current host name does start with beta.
  if (isBeta && !currentHostName.startsWith("beta")) {
    const href = `${window.location.protocol}//beta.${currentHostName}${window.location.pathname}${window.location.search}${window.location.hash}`;
    window.location.replace(href);
  }
  // Beta is not enabled, but the current host name does start with beta.
  else if (!isBeta && currentHostName.startsWith("beta")) {
    const href = `${window.location.protocol}//${currentHostName.replace("beta.", "")}${window.location.pathname}${window.location.search}${window.location.hash}`;
    window.location.replace(href);
  }
 };
 export default handleBeta;
--- a/client/src/utils/handleBeta.js
+++ b/client/src/utils/handleBeta.js
@@ -11,26 +11,37 @@ export const setBeta = (value) => {
 };
 export const handleBeta = () => {
  // If the current host name does not start with beta or test, then we don't need to do anything.
  if (window.location.hostname.startsWith("localhost")) {
    console.log("Not on beta or test, so no need to handle beta.");
    return;
  }
  const isBeta = checkBeta();
  const currentHostName = window.location.hostname;
-  // Beta is enabled, but the current host name does start with beta.
+  // Determine if the host name starts with "beta" or "www.beta"
-  if (isBeta && !currentHostName.startsWith("beta")) {
+  const isBetaHost = currentHostName.startsWith("beta.");
-    const href = `${window.location.protocol}//beta.${currentHostName}${window.location.pathname}${window.location.search}${window.location.hash}`;
+  const isBetaHostWithWWW = currentHostName.startsWith("www.beta.");
    window.location.replace(href);
  }
-  // Beta is not enabled, but the current host name does start with beta.
+  if (isBeta) {
-  else if (!isBeta && currentHostName.startsWith("beta")) {
+    // If beta is on and we are not on a beta domain, redirect to the beta version
-    const href = `${window.location.protocol}//${currentHostName.replace("beta.", "")}${window.location.pathname}${window.location.search}${window.location.hash}`;
+    if (!isBetaHost && !isBetaHostWithWWW) {
-    window.location.replace(href);
+      const newHostName = currentHostName.startsWith("www.")
        ? `www.beta.${currentHostName.replace(/^www\./, "")}`
        : `beta.${currentHostName}`;
      const href = `${window.location.protocol}//${newHostName}${window.location.pathname}${window.location.search}${window.location.hash}`;
      window.location.replace(href);
    }
    // Otherwise, if beta is on and we're already on a beta domain, stay there
  } else {
    // If beta is off and we are on a beta domain, redirect to the non-beta version
    if (isBetaHost || isBetaHostWithWWW) {
      const newHostName = currentHostName.replace(/^www\.beta\./, "www.").replace(/^beta\./, "");
      const href = `${window.location.protocol}//${newHostName}${window.location.pathname}${window.location.search}${window.location.hash}`;
      window.location.replace(href);
    }
    // Otherwise, if beta is off and we're not on a beta domain, stay there
  }
 };
 export default handleBeta;
--- a/client/vite.config.js
+++ b/client/vite.config.js
@@ -6,8 +6,6 @@ import * as url from "url";
 import { defineConfig } from "vite";
 import { ViteEjsPlugin } from "vite-plugin-ejs";
 import eslint from "vite-plugin-eslint";
 //import CompressionPlugin from 'vite-plugin-compression';
 import { VitePWA } from "vite-plugin-pwa";
 import InstanceRenderManager from "./src/utils/instanceRenderMgr";
@@ -16,7 +14,8 @@ process.env.VITE_APP_GIT_SHA_DATE = new Date().toLocaleString("en-US", {
 });
 const WRONG_CODE = `import { bpfrpt_proptype_WindowScroller } from "../WindowScroller.js";`;
-function reactVirtualized() {
+
 function reactVirtualizedFix() {
  return {
    name: "flat:react-virtualized",
    configResolved: async () => {
@@ -37,10 +36,7 @@ function reactVirtualized() {
 export default defineConfig({
  base: "/",
  plugins: [
-    ViteEjsPlugin((viteConfig) => {
+    ViteEjsPlugin((viteConfig) => ({ env: viteConfig.env })),
      // viteConfig is the current Vite resolved config
      return { env: viteConfig.env };
    }),
    VitePWA({
      injectRegister: "auto",
      registerType: "prompt",
@@ -60,7 +56,6 @@ export default defineConfig({
        description: "The ultimate bodyshop management system.",
        icons: [
          {
            //TODO:AIO Ensure that these are correct for Rome and IO.
            src: InstanceRenderManager({
              instance: process.env.VITE_APP_INSTANCE,
              imex: "favicon.png",
@@ -101,7 +96,7 @@ export default defineConfig({
        gcm_sender_id: "103953800507"
      }
    }),
-    reactVirtualized(),
+    reactVirtualizedFix(),
    react(),
    eslint()
    // CompressionPlugin(), //Cloudfront already compresses assets, so not needed.
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -19,18 +19,18 @@
    "makeitpretty": "prettier --write \"**/*.{css,js,json,jsx,scss}\""
  },
  "dependencies": {
-    "@aws-sdk/client-secrets-manager": "^3.616.0",
+    "@aws-sdk/client-secrets-manager": "^3.632.0",
-    "@aws-sdk/client-ses": "^3.616.0",
+    "@aws-sdk/client-ses": "^3.632.0",
-    "@aws-sdk/credential-provider-node": "^3.616.0",
+    "@aws-sdk/credential-provider-node": "^3.632.0",
-    "@opensearch-project/opensearch": "^2.10.0",
+    "@opensearch-project/opensearch": "^2.11.0",
-    "aws4": "^1.13.0",
+    "aws4": "^1.13.1",
-    "axios": "^1.7.2",
+    "axios": "^1.7.4",
    "better-queue": "^3.8.12",
    "bluebird": "^3.7.2",
    "body-parser": "^1.20.2",
    "canvas": "^2.11.2",
    "chart.js": "^4.4.3",
-    "cloudinary": "^2.3.0",
+    "cloudinary": "^2.4.0",
    "compression": "^1.7.4",
    "cookie-parser": "^1.4.6",
    "cors": "2.8.5",
@@ -38,24 +38,24 @@
    "dinero.js": "^1.9.1",
    "dotenv": "^16.4.5",
    "express": "^4.19.2",
-    "firebase-admin": "^12.2.0",
+    "firebase-admin": "^12.3.1",
    "graphql": "^16.9.0",
    "graphql-request": "^6.1.0",
    "graylog2": "^0.2.1",
    "inline-css": "^4.0.2",
    "intuit-oauth": "^4.1.2",
-    "json-2-csv": "^5.5.4",
+    "json-2-csv": "^5.5.5",
    "lodash": "^4.17.21",
    "moment": "^2.30.1",
    "moment-timezone": "^0.5.45",
    "multer": "^1.4.5-lts.1",
    "node-mailjet": "^6.0.5",
-    "node-persist": "^4.0.2",
+    "node-persist": "^4.0.3",
    "nodemailer": "^6.9.14",
-    "phone": "^3.1.49",
+    "phone": "^3.1.50",
    "recursive-diff": "^1.0.9",
    "rimraf": "^6.0.1",
-    "soap": "^1.1.0",
+    "soap": "^1.1.1",
    "socket.io": "^4.7.5",
    "ssh2-sftp-client": "^10.0.3",
    "twilio": "^4.23.0",
--- a/server/accounting/qb-receivables-lines.js
+++ b/server/accounting/qb-receivables-lines.js
@@ -30,8 +30,14 @@ exports.default = function ({ bodyshop, jobs_by_pk, qbo = false, items, taxCodes
    if (jobline.db_ref === "936007") {
      hasMashLine = true;
    }
    //Check if the line is a Towing Line and flag as such.
    let isTowingLine = false;
    if (jobline.db_ref === "936001" && jobline.line_desc.includes("Towing")) {
      isTowingLine = true;
    }
    //Parts Lines Mappings.
-    if (jobline.profitcenter_part) {
+    if (!isTowingLine && jobline.profitcenter_part) {
      //TODO:AIO This appears to be a net 0 change exept for default quantity as 0 instead of 1 for imex. Need to verify.
      const discountAmount =
        ((jobline.prt_dsmk_m && jobline.prt_dsmk_m !== 0) || (jobline.prt_dsmk_p && jobline.prt_dsmk_p !== 0)) &&
Author	SHA1	Message	Date
Dave Richer	18da11f593	- Merge master-aio, bump packages. Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-08-19 12:27:30 -04:00
Dave Richer	82ecb5533f	Merged in release/2024-08-16 (pull request #1625 ) Release/2024 08 16 Approved-by: Allan Carr	2024-08-16 23:31:33 +00:00
Allan Carr	d3289d85f1	Merged in feature/IO-2879-936001-TOWING-to-QB (pull request #1627 ) IO-2879 Adjust placement of variable	2024-08-16 19:25:14 +00:00
Allan Carr	e628b1364c	IO-2879 Adjust placement of variable Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-08-16 12:27:26 -07:00
Allan Carr	6c421c1447	Merged in feature/IO-2884-Filter-for-Production-Board-Alert (pull request #1620 ) IO-2884 Production List Board Filter Approved-by: Dave Richer	2024-08-16 16:16:53 +00:00
Dave Richer	99369e7040	Merged in feature/IO-2884-Add-Alert-Filter-To-Production-Board (pull request #1622 ) - Add Alert Filter to visual production board	2024-08-16 16:15:54 +00:00
Dave Richer	01cbdf14a9	- Add Alert Filter to visual production board Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-08-16 12:14:52 -04:00
Allan Carr	f691aca241	IO-2884 Production List Board Filter Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-08-16 09:11:29 -07:00
Dave Richer	85495a11e3	Merged in feature/IO-2884-Add-Alert-Filter-To-Production-Board (pull request #1618 ) Feature/IO-2884 Add Alert Filter To Production Board Approved-by: Allan Carr	2024-08-16 15:38:29 +00:00
Dave Richer	134ce05d27	- Add Alert Filter to visual production board Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-08-16 11:16:20 -04:00
Dave Richer	3498fbc8f1	- Add Alert Filter to visual production board Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-08-16 11:14:32 -04:00
Dave Richer	f49f72ce7f	- Revert ZOHO Change Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-08-16 10:49:59 -04:00
Dave Richer	a5e3b6ce33	Merged in feature/IO-2882-Unsaved-Listview-Changes (pull request #1612 ) - Production Board List View Unsaved Changes Prompt Approved-by: Allan Carr	2024-08-16 00:45:48 +00:00
Allan Carr	bb49dd77a1	Merged in feature/IO-2879-936001-TOWING-to-QB (pull request #1613 ) IO-2879 936001 TOWING to QB Approved-by: Dave Richer	2024-08-15 21:16:27 +00:00
Allan Carr	ae705322f8	IO-2879 936001 TOWING to QB Prevent double sending 936001 Towing lines to QB Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-08-15 13:41:33 -07:00
Dave Richer	3ce2b1ab19	- revert (put back in) zoho change Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-08-15 13:35:18 -04:00
Dave Richer	52e756a78a	Merged in feature/IO-2878-Enhance-Beta-Switch (pull request #1607 ) - Improve handle beta code (AIO Version)	2024-08-15 15:21:09 +00:00
Dave Richer	5a36cb7cf1	- Improve handle beta code (AIO Version) Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-08-15 11:19:59 -04:00
Allan Carr	9138f4be16	Merged in feature/IO-2856-Mark-Exported-Buttons (pull request #1601 ) IO-2856 Mark Exported Button Approved-by: Dave Richer	2024-08-14 18:40:51 +00:00
Allan Carr	df93357cec	IO-2856 Mark Exported Button Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-08-14 11:38:35 -07:00
Dave Richer	8ab23c4ca6	Merged in feature/IO-2878-Enhance-Beta-Switch (pull request #1599 ) - Improve handle beta code (AIO Version)	2024-08-14 17:40:50 +00:00
Allan Carr	f179d69420	Merged in feature/IO-2876-Opensearch-Sorters (pull request #1598 ) IO-2876 Filtered Search Sorters correction Approved-by: Dave Richer	2024-08-14 17:39:06 +00:00
Dave Richer	730a7a233d	- Improve handle beta code (AIO Version) Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-08-14 13:29:35 -04:00
Dave Richer	84ad10fa9c	Merged in feature/IO-2877-Package-Updates-Alert-Update (pull request #1597 ) - Remove Joyride and its cause - Package updates (front + back)	2024-08-14 15:56:43 +00:00
Patrick Fic	b1cda41f56	- Remove Joyride and its cause - Package updates (front + back) Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-08-14 11:54:52 -04:00
Allan Carr	0bce921f69	IO-2876 Filtered Search Sorters correction Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2024-08-13 16:00:17 -07:00
Dave Richer	136d52ec0b	- Merge Master, update packages. Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-07-22 14:47:44 -04:00