Revert Node Version

IO-233 Add refetch.

client/craco.config.js

@@ -1,9 +1,25 @@
 // craco.config.js
 const TerserPlugin = require("terser-webpack-plugin");
 const CracoLessPlugin = require("craco-less");
+const SentryWebpackPlugin = require("@sentry/webpack-plugin");
 
 module.exports = {
   plugins: [
+    {
+      plugin: SentryWebpackPlugin,
+      options: {
+        // sentry-cli configuration
+        authToken:
+          "6b45b028a02342db97a9a2f92c0959058665443d379d4a3a876430009e744260",
+        org: "snapt-software",
+        project: "imexonline",
+        release: process.env.REACT_APP_GIT_SHA,
+
+        // webpack-specific configuration
+        include: ".",
+        ignore: ["node_modules", "webpack.config.js"],
+      },
+    },
     {
       plugin: CracoLessPlugin,
       options: {
@@ -53,4 +69,5 @@ module.exports = {
       },
     }),
   },
+  devtool: "source-map",
 };

client/package.json

@@ -4,81 +4,87 @@
   "private": true,
   "proxy": "http://localhost:5000",
   "dependencies": {
-    "@apollo/client": "^3.3.21",
-    "@craco/craco": "^6.2.0",
-    "@fingerprintjs/fingerprintjs": "^3.2.0",
+    "@apollo/client": "^3.4.13",
+    "@craco/craco": "^6.3.0",
+    "@fingerprintjs/fingerprintjs": "^3.3.0",
     "@lourenci/react-kanban": "^2.1.0",
-    "@sentry/react": "^6.10.0",
-    "@sentry/tracing": "^6.10.0",
+    "@openreplay/tracker": "^3.3.1",
+    "@openreplay/tracker-assist": "^3.1.1",
+    "@openreplay/tracker-graphql": "^3.0.0",
+    "@openreplay/tracker-redux": "^3.0.0",
+    "@sentry/react": "^6.13.0",
+    "@sentry/tracing": "^6.13.0",
     "@stripe/react-stripe-js": "^1.4.0",
-    "@stripe/stripe-js": "^1.16.0",
-    "@tanem/react-nprogress": "^3.0.74",
-    "antd": "^4.16.8",
+    "@stripe/stripe-js": "^1.17.1",
+    "@tanem/react-nprogress": "^3.0.79",
+    "antd": "^4.16.13",
     "apollo-link-logger": "^2.0.0",
-    "axios": "^0.21.1",
-    "craco-less": "^1.18.0",
+    "axios": "^0.21.4",
+    "craco-less": "^1.20.0",
     "dinero.js": "^1.9.0",
     "dotenv": "^10.0.0",
     "enquire-js": "^0.2.1",
     "env-cmd": "^10.1.0",
-    "exifr": "^7.1.2",
-    "firebase": "^8.7.1",
-    "graphql": "^15.5.1",
-    "i18next": "^20.3.4",
+    "exifr": "^7.1.3",
+    "firebase": "^9.0.2",
+    "graphql": "^15.5.3",
+    "i18next": "^21.0.0",
     "i18next-browser-languagedetector": "^6.1.2",
-    "jsoneditor": "^9.5.2",
+    "jsoneditor": "^9.5.4",
     "jsreport-browser-client-dist": "^1.3.0",
-    "libphonenumber-js": "^1.9.22",
-    "logrocket": "^1.2.0",
-    "markerjs2": "^2.9.0",
+    "libphonenumber-js": "^1.9.34",
+    "logrocket": "^2.0.0",
+    "markerjs2": "^2.11.2",
     "moment-business-days": "^1.2.0",
-    "phone": "^3.1.2",
+    "phone": "^3.1.8",
     "preval.macro": "^5.0.0",
     "prop-types": "^15.7.2",
     "query-string": "^7.0.1",
     "rc-queue-anim": "^2.0.0",
     "rc-scroll-anim": "^2.7.6",
     "react": "^17.0.1",
-    "react-big-calendar": "^0.33.2",
+    "react-big-calendar": "^0.35.0",
     "react-color": "^2.19.3",
+    "react-cookie": "^4.1.1",
     "react-dom": "^17.0.1",
     "react-drag-listview": "^0.1.8",
     "react-grid-gallery": "^0.5.5",
-    "react-grid-layout": "^1.2.5",
-    "react-i18next": "^11.11.3",
+    "react-grid-layout": "^1.3.0",
+    "react-i18next": "^11.12.0",
     "react-icons": "^4.2.0",
-    "react-number-format": "^4.6.4",
-    "react-redux": "^7.2.4",
+    "react-number-format": "^4.7.3",
+    "react-redux": "^7.2.5",
     "react-resizable": "^3.0.4",
-    "react-router-dom": "^5.2.0",
+    "react-router-dom": "^5.3.0",
     "react-scripts": "^4.0.3",
     "react-sublime-video": "^0.2.5",
     "react-virtualized": "^9.22.3",
-    "recharts": "^2.0.10",
-    "redux": "^4.1.0",
+    "recharts": "^2.1.3",
+    "redux": "^4.1.1",
     "redux-persist": "^6.0.0",
     "redux-saga": "^1.1.3",
     "redux-state-sync": "^3.1.2",
     "reselect": "^4.0.0",
-    "sass": "^1.35.2",
-    "socket.io-client": "^4.1.3",
-    "styled-components": "^5.3.0",
+    "sass": "^1.41.1",
+    "socket.io-client": "^4.2.0",
+    "styled-components": "^5.3.1",
     "subscriptions-transport-ws": "^0.9.18",
     "web-vitals": "^2.1.0",
-    "workbox-background-sync": "^6.1.5",
-    "workbox-broadcast-update": "^6.1.5",
-    "workbox-cacheable-response": "^6.1.5",
-    "workbox-core": "^6.1.5",
-    "workbox-expiration": "^6.1.5",
-    "workbox-google-analytics": "^6.1.5",
-    "workbox-navigation-preload": "^6.1.5",
-    "workbox-precaching": "^6.1.5",
-    "workbox-range-requests": "^6.1.5",
-    "workbox-routing": "^6.1.5",
-    "workbox-strategies": "^6.1.5",
-    "workbox-streams": "^6.1.5"
+    "workbox-background-sync": "^6.3.0",
+    "workbox-broadcast-update": "^6.3.0",
+    "workbox-cacheable-response": "^6.3.0",
+    "workbox-core": "^6.3.0",
+    "workbox-expiration": "^6.3.0",
+    "workbox-google-analytics": "^6.3.0",
+    "workbox-navigation-preload": "^6.3.0",
+    "workbox-precaching": "^6.3.0",
+    "workbox-range-requests": "^6.3.0",
+    "workbox-routing": "^6.3.0",
+    "workbox-strategies": "^6.3.0",
+    "workbox-streams": "^6.3.0"
   },
   "scripts": {
+    "postinstall": "patch-package",
     "analyze": "source-map-explorer 'build/static/js/*.js'",
     "start": "craco start",
     "build": "REACT_APP_GIT_SHA=`git rev-parse --short HEAD` craco build",
@@ -108,6 +114,8 @@
     ]
   },
   "devDependencies": {
+    "@sentry/webpack-plugin": "^1.17.1",
+    "patch-package": "^6.4.7",
     "redux-logger": "^3.0.6",
     "source-map-explorer": "^2.5.2"
   }

client/src/App/App.container.jsx

@@ -8,8 +8,32 @@ import { useTranslation } from "react-i18next";
 import GlobalLoadingBar from "../components/global-loading-bar/global-loading-bar.component";
 import client from "../utils/GraphQLClient";
 import App from "./App";
+import trackerGraphQL from "@openreplay/tracker-graphql";
+//import trackerRedux from "@openreplay/tracker-redux";
+import Tracker from "@openreplay/tracker";
+import trackerAssist from "@openreplay/tracker-assist";
+import { getCurrentUser } from "../firebase/firebase.utils";
 moment.locale("en-US");
 
+export const tracker = new Tracker({
+  projectKey: "trDmOZlEXUpjGsMtHroA",
+  ingestPoint: "https://replay.imex.online/ingest",
+  ...(process.env.NODE_ENV === null || process.env.NODE_ENV === "development"
+    ? { __DISABLE_SECURE_MODE: true }
+    : {}),
+  // beaconSize: 10485760,
+  onStart: async ({ sessionID }) => {
+    const user = await getCurrentUser();
+    tracker.setUserID(user.email);
+    console.log("ORS SESSION ", sessionID, user.email);
+  },
+});
+
+tracker.use(
+  trackerAssist({ confirmText: "Technical support is about to assist you." })
+); // check the list of available options below
+export const recordGraphQL = tracker.use(trackerGraphQL());
+tracker.start();
 if (process.env.NODE_ENV === "production") LogRocket.init("gvfvfw/bodyshopapp");
 
 export default function AppContainer() {

client/src/components/_test/test.component.jsx

@@ -1,25 +1,9 @@
-import Axios from "axios";
 import React from "react";
+import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
 export default function Test() {
-  const handleQbSignIn = async () => {
-    const result = await Axios.post("/qbo/authorize", { userId: "1234" });
-    console.log("handleQbSignIn -> result", result.data);
-    // window.open(result.data, "_blank", "toolbar=0,location=0,menubar=0");
-
-    var parameters = "location=1,width=800,height=650";
-    parameters +=
-      ",left=" +
-      (window.screen.width - 800) / 2 +
-      ",top=" +
-      (window.screen.height - 650) / 2;
-
-    // Launch Popup
-    window.open(result.data, "connectPopup", parameters);
-  };
-
   return (
     <div>
-      <button onClick={handleQbSignIn}>Sign Into Qb.</button>
+      <QboAuthorizeComponent />
     </div>
   );
 }

client/src/components/accounting-payables-table/accounting-payables-table.component.jsx

@@ -109,6 +109,17 @@ export default function AccountingPayablesTableComponent({ loading, bills }) {
         <Checkbox disabled checked={record.is_credit_memo} />
       ),
     },
+    {
+      title: t("exportlogs.labels.attempts"),
+      dataIndex: "attempts",
+      key: "attempts",
+
+      render: (text, record) => {
+        const success = record.exportlogs.filter((e) => e.successful).length;
+        const attempts = record.exportlogs.length;
+        return `${success}/${attempts}`;
+      },
+    },
     {
       title: t("general.labels.actions"),
       dataIndex: "actions",

client/src/components/accounting-payments-table/accounting-payments-table.component.jsx

@@ -108,7 +108,17 @@ export default function AccountingPayablesTableComponent({
         <DateTimeFormatter>{record.exportedat}</DateTimeFormatter>
       ),
     },
+    {
+      title: t("exportlogs.labels.attempts"),
+      dataIndex: "attempts",
+      key: "attempts",
 
+      render: (text, record) => {
+        const success = record.exportlogs.filter((e) => e.successful).length;
+        const attempts = record.exportlogs.length;
+        return `${success}/${attempts}`;
+      },
+    },
     {
       title: t("general.labels.actions"),
       dataIndex: "actions",

client/src/components/accounting-receivables-table/accounting-receivables-table.component.jsx

@@ -8,7 +8,25 @@ import { alphaSort } from "../../utils/sorters";
 import JobExportButton from "../jobs-close-export-button/jobs-close-export-button.component";
 import JobsExportAllButton from "../jobs-export-all-button/jobs-export-all-button.component";
 
-export default function AccountingReceivablesTableComponent({ loading, jobs }) {
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(AccountingReceivablesTableComponent);
+
+export function AccountingReceivablesTableComponent({
+  bodyshop,
+  loading,
+  jobs,
+}) {
   const { t } = useTranslation();
   const [selectedJobs, setSelectedJobs] = useState([]);
   const [transInProgress, setTransInProgress] = useState(false);
@@ -114,11 +132,21 @@ export default function AccountingReceivablesTableComponent({ loading, jobs }) {
         );
       },
     },
+    {
+      title: t("exportlogs.labels.attempts"),
+      dataIndex: "attempts",
+      key: "attempts",
+
+      render: (text, record) => {
+        const success = record.exportlogs.filter((e) => e.successful).length;
+        const attempts = record.exportlogs.length;
+        return `${success}/${attempts}`;
+      },
+    },
     {
       title: t("general.labels.actions"),
       dataIndex: "actions",
       key: "actions",
-      sorter: (a, b) => a.clm_total - b.clm_total,
 
       render: (text, record) => (
         <Space wrap>
@@ -170,12 +198,14 @@ export default function AccountingReceivablesTableComponent({ loading, jobs }) {
     <Card
       extra={
         <Space wrap>
-          <JobsExportAllButton
-            jobIds={selectedJobs}
-            disabled={transInProgress || selectedJobs.length === 0}
-            loadingCallback={setTransInProgress}
-            completedCallback={setSelectedJobs}
-          />
+          {!bodyshop.cdk_dealerid && (
+            <JobsExportAllButton
+              jobIds={selectedJobs}
+              disabled={transInProgress || selectedJobs.length === 0}
+              loadingCallback={setTransInProgress}
+              completedCallback={setSelectedJobs}
+            />
+          )}
           <Input.Search
             value={state.search}
             onChange={handleSearch}

client/src/components/bill-enter-modal/bill-enter-modal.container.jsx

@@ -18,8 +18,10 @@ import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
+import confirmDialog from "../../utils/asyncConfirm";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import BillFormContainer from "../bill-form/bill-form.container";
+import { CalculateBillTotal } from "../bill-form/bill-form.totals.utility";
 import { handleUpload } from "../documents-upload/documents-upload.utility";
 
 const mapStateToProps = createStructuredSelector({
@@ -48,7 +50,31 @@ function BillEnterModalContainer({
   const [loading, setLoading] = useState(false);
   const client = useApolloClient();
 
+  const formValues = useMemo(() => {
+    return {
+      ...billEnterModal.context.bill,
+      jobid:
+        (billEnterModal.context.job && billEnterModal.context.job.id) || null,
+      federal_tax_rate:
+        (bodyshop.bill_tax_rates && bodyshop.bill_tax_rates.federal_tax_rate) ||
+        0,
+      state_tax_rate:
+        (bodyshop.bill_tax_rates && bodyshop.bill_tax_rates.state_tax_rate) ||
+        0,
+      local_tax_rate:
+        (bodyshop.bill_tax_rates && bodyshop.bill_tax_rates.local_tax_rate) ||
+        0,
+    };
+  }, [billEnterModal, bodyshop]);
+
   const handleFinish = async (values) => {
+    let totals = CalculateBillTotal(values);
+    if (totals.discrepancy.getAmount() !== 0) {
+      if (!(await confirmDialog(t("bills.labels.savewithdiscrepancy")))) {
+        return;
+      }
+    }
+
     setLoading(true);
     const { upload, location, ...remainingValues } = values;
 
@@ -190,7 +216,7 @@ function BillEnterModalContainer({
 
     if (enterAgain) {
       form.resetFields();
-      form.setFieldsValue({ billlines: [] });
+      form.setFieldsValue(formValues);
     } else {
       toggleModalVisible();
     }
@@ -208,23 +234,6 @@ function BillEnterModalContainer({
     if (enterAgain) form.submit();
   }, [enterAgain, form]);
 
-  const formValues = useMemo(() => {
-    return {
-      ...billEnterModal.context.bill,
-      jobid:
-        (billEnterModal.context.job && billEnterModal.context.job.id) || null,
-      federal_tax_rate:
-        (bodyshop.bill_tax_rates && bodyshop.bill_tax_rates.federal_tax_rate) ||
-        0,
-      state_tax_rate:
-        (bodyshop.bill_tax_rates && bodyshop.bill_tax_rates.state_tax_rate) ||
-        0,
-      local_tax_rate:
-        (bodyshop.bill_tax_rates && bodyshop.bill_tax_rates.local_tax_rate) ||
-        0,
-    };
-  }, [billEnterModal, bodyshop]);
-
   useEffect(() => {
     if (billEnterModal.visible) {
       form.setFieldsValue(formValues);

client/src/components/bill-form/bill-form.lines.component.jsx

@@ -72,9 +72,11 @@ export function BillEnterModalLinesComponent({
                         quantity: opt.part_qty || 1,
                         actual_price: opt.cost,
                         cost_center: opt.part_type
-                          ? responsibilityCenters.defaults.costs[
+                          ? responsibilityCenters.defaults &&
+                            (responsibilityCenters.defaults.costs[
                               opt.part_type
-                            ] || null
+                            ] ||
+                              null)
                           : null,
                       };
                     }

client/src/components/bill-form/bill-form.totals.utility.js

@@ -1,13 +1,8 @@
 import Dinero from "dinero.js";
 
 export const CalculateBillTotal = (invoice) => {
-  const {
-    total,
-    billlines,
-    federal_tax_rate,
-    local_tax_rate,
-    state_tax_rate,
-  } = invoice;
+  const { total, billlines, federal_tax_rate, local_tax_rate, state_tax_rate } =
+    invoice;
 
   //TODO Determine why this recalculates so many times.
   let subtotal = Dinero({ amount: 0 });
@@ -20,8 +15,7 @@ export const CalculateBillTotal = (invoice) => {
   billlines.forEach((i) => {
     if (!!i) {
       const itemTotal = Dinero({
-        amount:
-          Math.round(((i.actual_cost || 0) * 100 + Number.EPSILON) * 100) / 100,
+        amount: Math.round((i.actual_cost || 0) * 100),
       }).multiply(i.quantity || 1);
 
       subtotal = subtotal.add(itemTotal);

client/src/components/bill-line-search-select/bill-line-search-select.component.jsx

@@ -13,6 +13,7 @@ const BillLineSearchSelect = ({ options, disabled, ...restProps }, ref) => {
       ref={ref}
       showSearch
       optionFilterProp="line_desc"
+      notFoundContent={"Removed."}
       {...restProps}
     >
       <Select.Option key={null} value={"noline"} cost={0} line_desc={""}>
@@ -21,14 +22,18 @@ const BillLineSearchSelect = ({ options, disabled, ...restProps }, ref) => {
       {options
         ? options.map((item) => (
             <Option
+              disabled={item.removed}
               key={item.id}
               value={item.id}
               cost={item.act_price ? item.act_price : 0}
               part_type={item.part_type}
               line_desc={item.line_desc}
               part_qty={item.part_qty}
+              style={{
+                ...(item.removed ? { textDecoration: "line-through" } : {}),
+              }}
             >
-              {`${item.line_desc}${
+              {`${item.removed ? `(REMOVED) ` : ""}${item.line_desc}${
                 item.oem_partno ? ` - ${item.oem_partno}` : ""
               }`}
             </Option>

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

@@ -8,6 +8,7 @@ import { selectSelectedConversation } from "../../redux/messaging/messaging.sele
 import PhoneFormatter from "../../utils/PhoneFormatter";
 import "./chat-conversation-list.styles.scss";
 import { useTranslation } from "react-i18next";
+import { TimeAgoFormatter } from "../../utils/DateFormatter";
 
 const mapStateToProps = createStructuredSelector({
   selectedConversation: selectSelectedConversation,
@@ -60,13 +61,18 @@ export function ChatConversationListComponent({
             ) : (
               <PhoneFormatter>{item.phone_num}</PhoneFormatter>
             )}
-            {item.job_conversations.length > 0
-              ? item.job_conversations.map((j, idx) => (
-                  <Tag key={idx} className="ro-number-tag">
-                    {j.job.ro_number}
-                  </Tag>
-                ))
-              : null}
+            <div sryle={{ display: "inline-block" }}>
+              <div>
+                {item.job_conversations.length > 0
+                  ? item.job_conversations.map((j, idx) => (
+                      <Tag key={idx} className="ro-number-tag">
+                        {j.job.ro_number}
+                      </Tag>
+                    ))
+                  : null}
+              </div>
+              <TimeAgoFormatter>{item.updated_at}</TimeAgoFormatter>
+            </div>
             <Badge count={item.messages_aggregate.aggregate.count || 0} />
           </List.Item>
         )}

client/src/components/chat-messages-list/chat-message-list.component.jsx

@@ -1,4 +1,5 @@
 import Icon from "@ant-design/icons";
+import { Tooltip } from "antd";
 import i18n from "i18next";
 import moment from "moment";
 import React, { useEffect, useRef } from "react";
@@ -9,6 +10,7 @@ import {
   CellMeasurerCache,
   List,
 } from "react-virtualized";
+import { DateTimeFormatter } from "../../utils/DateFormatter";
 import "./chat-message-list.styles.scss";
 
 export default function ChatMessageListComponent({ messages }) {
@@ -85,17 +87,22 @@ export default function ChatMessageListComponent({ messages }) {
 
 const MessageRender = (message) => {
   return (
-    <div>
-      {message.image_path &&
-        message.image_path.map((i, idx) => (
-          <div key={idx} style={{ display: "flex", justifyContent: "center" }}>
-            <a href={i} target="__blank">
-              <img alt="Received" className="message-img" src={i} />
-            </a>
-          </div>
-        ))}
-      <div>{message.text}</div>
-    </div>
+    <Tooltip title={DateTimeFormatter({ children: message.created_at })}>
+      <div>
+        {message.image_path &&
+          message.image_path.map((i, idx) => (
+            <div
+              key={idx}
+              style={{ display: "flex", justifyContent: "center" }}
+            >
+              <a href={i} target="__blank">
+                <img alt="Received" className="message-img" src={i} />
+              </a>
+            </div>
+          ))}
+        <div>{message.text}</div>
+      </div>
+    </Tooltip>
   );
 };
 

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

@@ -83,8 +83,10 @@ export function ContractsList({
       render: (text, record) => (
         <Link to={`/manage/courtesycars/${record.courtesycar.id}`}>{`${
           record.courtesycar.year
-        } ${record.courtesycar.make} ${record.courtesycar.model} ${
-          record.courtesycar.plate ? `(${record.courtesycar.plate})` : ""
+        } ${record.courtesycar.make} ${record.courtesycar.model}${
+          record.courtesycar.plate ? ` (${record.courtesycar.plate})` : ""
+        }${
+          record.courtesycar.fleetnumber ? ` (${record.courtesycar.fleetnumber})` : ""
         }`}</Link>
       ),
     },

client/src/components/courtesy-car-status-select/courtesy-car-status-select.component.jsx

@@ -31,6 +31,9 @@ const CourtesyCarStatusComponent = ({ value, onChange }, ref) => {
       <Option value="courtesycars.status.out">
         {t("courtesycars.status.out")}
       </Option>
+      <Option value="courtesycars.status.sold">
+        {t("courtesycars.status.sold")}
+      </Option>
     </Select>
   );
 };

client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx

@@ -45,6 +45,10 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
           text: t("courtesycars.status.out"),
           value: "courtesycars.status.out",
         },
+        {
+          text: t("courtesycars.status.sold"),
+          value: "courtesycars.status.sold",
+        },
       ],
       onFilter: (value, record) => value.includes(record.status),
       sortOrder:

client/src/components/dashboard-grid/dashboard-grid.component.jsx

@@ -244,7 +244,7 @@ const componentList = {
     h: 3,
   },
   MonthlyPartsSales: {
-    label: i18next.t("dashboard.titles.productiondollars"),
+    label: i18next.t("dashboard.titles.monthlypartssales"),
     component: DashboardMonthlyPartsSales,
     gqlFragment: null,
     minW: 2,
@@ -253,7 +253,7 @@ const componentList = {
     h: 2,
   },
   MonthlyLaborSales: {
-    label: i18next.t("dashboard.titles.monthlypartssales"),
+    label: i18next.t("dashboard.titles.monthlylaborsales"),
     component: DashboardMonthlyLaborSales,
     gqlFragment: null,
     minW: 2,

client/src/components/dms-allocations-summary/dms-allocations-summary.component.jsx

@@ -0,0 +1,135 @@
+import { Button, Card, Table, Typography } from "antd";
+import React, { useState, useEffect } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import Dinero from "dinero.js";
+import { SyncOutlined } from "@ant-design/icons";
+
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+  bodyshop: selectBodyshop,
+});
+
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(DmsAllocationsSummary);
+
+export function DmsAllocationsSummary({ socket, bodyshop, jobId, title }) {
+  const { t } = useTranslation();
+  const [allocationsSummary, setAllocationsSummary] = useState([]);
+
+  useEffect(() => {
+    if (socket.connected) {
+      socket.emit("cdk-calculate-allocations", jobId, (ack) => {
+        setAllocationsSummary(ack);
+        socket.allocationsSummary = ack;
+      });
+    }
+  }, [socket, socket.connected, jobId]);
+
+  const columns = [
+    {
+      title: t("jobs.fields.dms.center"),
+      dataIndex: "center",
+      key: "center",
+    },
+    {
+      title: t("jobs.fields.dms.sale"),
+      dataIndex: "sale",
+      key: "sale",
+      render: (text, record) => Dinero(record.sale).toFormat(),
+    },
+    {
+      title: t("jobs.fields.dms.cost"),
+      dataIndex: "cost",
+      key: "cost",
+      render: (text, record) => Dinero(record.cost).toFormat(),
+    },
+    {
+      title: t("jobs.fields.dms.sale_dms_acctnumber"),
+      dataIndex: "sale_dms_acctnumber",
+      key: "sale_dms_acctnumber",
+      render: (text, record) =>
+        record.profitCenter && record.profitCenter.dms_acctnumber,
+    },
+    {
+      title: t("jobs.fields.dms.cost_dms_acctnumber"),
+      dataIndex: "cost_dms_acctnumber",
+      key: "cost_dms_acctnumber",
+      render: (text, record) =>
+        record.costCenter && record.costCenter.dms_acctnumber,
+    },
+    {
+      title: t("jobs.fields.dms.dms_wip_acctnumber"),
+      dataIndex: "dms_wip_acctnumber",
+      key: "dms_wip_acctnumber",
+      render: (text, record) =>
+        record.costCenter && record.costCenter.dms_wip_acctnumber,
+    },
+  ];
+
+  return (
+    <Card
+      title={title}
+      extra={
+        <Button
+          onClick={() => {
+            socket.emit("cdk-calculate-allocations", jobId, (ack) =>
+              setAllocationsSummary(ack)
+            );
+          }}
+        >
+          <SyncOutlined />
+        </Button>
+      }
+    >
+      <Table
+        pagination={{ position: "top", defaultPageSize: 50 }}
+        columns={columns}
+        rowKey="center"
+        dataSource={allocationsSummary}
+        summary={() => {
+          const totals = allocationsSummary.reduce(
+            (acc, val) => {
+              return {
+                totalSale: acc.totalSale.add(Dinero(val.sale)),
+                totalCost: acc.totalCost.add(Dinero(val.cost)),
+              };
+            },
+            {
+              totalSale: Dinero(),
+              totalCost: Dinero(),
+            }
+          );
+
+          return (
+            <Table.Summary.Row>
+              <Table.Summary.Cell>
+                <Typography.Title level={4}>
+                  {t("general.labels.totals")}
+                </Typography.Title>
+              </Table.Summary.Cell>
+              <Table.Summary.Cell>
+                {totals.totalSale.toFormat()}
+              </Table.Summary.Cell>
+              <Table.Summary.Cell>
+                {
+                  //  totals.totalCost.toFormat()
+                }
+              </Table.Summary.Cell>
+              <Table.Summary.Cell></Table.Summary.Cell>
+              <Table.Summary.Cell></Table.Summary.Cell>
+            </Table.Summary.Row>
+          );
+        }}
+      />
+    </Card>
+  );
+}

client/src/components/dms-cdk-makes/dms-cdk-makes.component.jsx

@@ -0,0 +1,105 @@
+import { useLazyQuery } from "@apollo/client";
+import { Button, Input, Modal, Table } from "antd";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { SEARCH_DMS_VEHICLES } from "../../graphql/dms.queries";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import AlertComponent from "../alert/alert.component";
+
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(mapStateToProps, mapDispatchToProps)(DmsCdkVehicles);
+
+export function DmsCdkVehicles({ bodyshop, form, socket, job }) {
+  const [visible, setVisible] = useState(false);
+  const [selectedModel, setSelectedModel] = useState(null);
+  const { t } = useTranslation();
+
+  const [callSearch, { loading, error, data }] =
+    useLazyQuery(SEARCH_DMS_VEHICLES);
+  const columns = [
+    {
+      title: t("vehicles.fields.v_make_desc"),
+      dataIndex: "make",
+      key: "make",
+    },
+    {
+      title: t("vehicles.fields.v_model_desc"),
+      dataIndex: "model",
+      key: "model",
+    },
+    {
+      title: t("jobs.fields.dms.dms_make"),
+      dataIndex: "makecode",
+      key: "makecode",
+    },
+    {
+      title: t("jobs.fields.dms.dms_model"),
+      dataIndex: "modelcode",
+      key: "modelcode",
+    },
+  ];
+
+  return (
+    <div>
+      <Modal
+        width={"90%"}
+        visible={visible}
+        onCancel={() => setVisible(false)}
+        onOk={() => {
+          form.setFieldsValue({
+            dms_make: selectedModel.makecode,
+            dms_model: selectedModel.modelcode,
+          });
+          setVisible(false);
+        }}
+      >
+        {error && <AlertComponent error={error.message} />}
+        <Table
+          title={() => (
+            <Input.Search
+              onSearch={(val) => callSearch({ variables: { search: val } })}
+              placeholder={t("general.labels.search")}
+            />
+          )}
+          columns={columns}
+          loading={loading}
+          rowKey="id"
+          dataSource={data ? data.search_dms_vehicles : []}
+          onRow={(record) => {
+            return {
+              onClick: () => setSelectedModel(record),
+            };
+          }}
+          rowSelection={{
+            onSelect: (record) => {
+              setSelectedModel(record);
+            },
+
+            type: "radio",
+            selectedRowKeys: [selectedModel && selectedModel.id],
+          }}
+        />
+      </Modal>
+      <Button
+        onClick={() => {
+          setVisible(true);
+          callSearch({
+            variables: {
+              search: job && job.v_model_desc && job.v_model_desc.substr(0, 3),
+            },
+          });
+        }}
+      >
+        {t("jobs.actions.dms.findmakemodelcode")}
+      </Button>
+    </div>
+  );
+}

client/src/components/dms-cdk-makes/dms-cdk-makes.refetch.component.jsx

@@ -0,0 +1,34 @@
+import { Button } from "antd";
+import axios from "axios";
+import React, { useState } from "react";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import { useTranslation } from "react-i18next";
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(mapStateToProps, mapDispatchToProps)(DmsCdkMakesRefetch);
+
+export function DmsCdkMakesRefetch({ bodyshop, form, socket }) {
+  const [loading, setLoading] = useState(false);
+  const { t } = useTranslation();
+  const handleRefetch = async () => {
+    setLoading(true);
+    const response = await axios.post("/cdk/getvehicles", {
+      cdk_dealerid: bodyshop.cdk_dealerid,
+      bodyshopid: bodyshop.id,
+    });
+    console.log(response);
+    setLoading(false);
+  };
+  return (
+    <Button loading={loading} onClick={handleRefetch}>
+      {t("jobs.actions.dms.refetchmakesmodels")}
+    </Button>
+  );
+}

client/src/components/dms-customer-selector/dms-customer-selector.component.jsx

@@ -0,0 +1,121 @@
+import { Button, Table, Col , Checkbox} from "antd";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { socket } from "../../pages/dms/dms.container";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import { alphaSort } from "../../utils/sorters";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(DmsCustomerSelector);
+
+export function DmsCustomerSelector({ bodyshop }) {
+  const { t } = useTranslation();
+  const [customerList, setcustomerList] = useState([]);
+  const [visible, setVisible] = useState(false);
+  const [selectedCustomer, setSelectedCustomer] = useState(null);
+
+  socket.on("cdk-select-customer", (customerList, callback) => {
+    setVisible(true);
+    setcustomerList(customerList);
+  });
+
+  const onUseSelected = () => {
+    setVisible(false);
+    socket.emit("cdk-selected-customer", selectedCustomer);
+    setSelectedCustomer(null);
+  };
+
+  const onUseGeneric = () => {
+    setVisible(false);
+    socket.emit(
+      "cdk-selected-customer",
+      bodyshop.cdk_configuration.generic_customer_number
+    );
+    setSelectedCustomer(null);
+  };
+
+  const onCreateNew = () => {
+    setVisible(false);
+    socket.emit("cdk-selected-customer", null);
+    setSelectedCustomer(null);
+  };
+
+  const columns = [
+    {
+      title: t("jobs.fields.dms.id"),
+      dataIndex: ["id", "value"],
+      key: "id",
+    },
+    {
+      title: t("jobs.fields.dms.vinowner"),
+      dataIndex: "vinOwner",
+      key: "vinOwner",
+      render: (text, record) => <Checkbox disabled checked={record.vinOwner}/>
+    },
+    {
+      title: t("jobs.fields.dms.name1"),
+      dataIndex: ["name1", "fullName"],
+      key: "name1",
+      sorter: (a, b) => alphaSort(a.name1?.fullName, b.name1?.fullName),
+    },
+
+    {
+      title: t("jobs.fields.dms.address"),
+      //dataIndex: ["name2", "fullName"],
+      key: "address",
+      render: (record, value) =>
+        `${record?.address?.addressLine[0]}, ${record.address?.city} ${record.address?.stateOrProvince} ${record.address?.postalCode}`,
+    },
+  ];
+
+  if (!visible) return <></>;
+  return (
+    <Col span={24}>
+      <Table
+        title={() => (
+          <div>
+            <Button onClick={onUseSelected} disabled={!selectedCustomer}>
+              {t("jobs.actions.dms.useselected")}
+            </Button>
+            <Button
+              onClick={onUseGeneric}
+              disabled={
+                !(
+                  bodyshop.cdk_configuration &&
+                  bodyshop.cdk_configuration.generic_customer_number
+                )
+              }
+            >
+              {t("jobs.actions.dms.usegeneric")}
+            </Button>
+            <Button onClick={onCreateNew}>
+              {t("jobs.actions.dms.createnewcustomer")}
+            </Button>
+          </div>
+        )}
+        pagination={{ position: "top" }}
+        columns={columns}
+        rowKey={(record) => record.id.value}
+        dataSource={customerList}
+        //onChange={handleTableChange}
+        rowSelection={{
+          onSelect: (props) => {
+            setSelectedCustomer(props.id.value);
+          },
+          type: "radio",
+          selectedRowKeys: [selectedCustomer],
+        }}
+      />
+    </Col>
+  );
+}

client/src/components/dms-log-events/dms-log-events.component.jsx

@@ -0,0 +1,55 @@
+import { Divider, Space, Tag, Timeline } from "antd";
+import moment from "moment";
+import React from "react";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import {
+  setBreadcrumbs,
+  setSelectedHeader,
+} from "../../redux/application/application.actions";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+
+const mapDispatchToProps = (dispatch) => ({
+  setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
+  setSelectedHeader: (key) => dispatch(setSelectedHeader(key)),
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(DmsLogEvents);
+
+export function DmsLogEvents({ socket, logs, bodyshop }) {
+  return (
+    <Timeline pending reverse={true}>
+      {logs.map((log, idx) => (
+        <Timeline.Item key={idx} color={LogLevelHierarchy(log.level)}>
+          <Space wrap align="start" style={{}}>
+            <Tag color={LogLevelHierarchy(log.level)}>{log.level}</Tag>
+            <span>{moment(log.timestamp).format("MM/DD/YYYY HH:MM:ss")}</span>
+            <Divider type="vertical" />
+            <span>{log.message}</span>
+          </Space>
+        </Timeline.Item>
+      ))}
+    </Timeline>
+  );
+}
+
+function LogLevelHierarchy(level) {
+  switch (level) {
+    case "TRACE":
+      return "pink";
+    case "DEBUG":
+      return "orange";
+    case "INFO":
+      return "blue";
+    case "WARNING":
+      return "yellow";
+    case "ERROR":
+      return "red";
+    default:
+      return 0;
+  }
+}

client/src/components/dms-post-form/dms-post-form.component.jsx

@@ -0,0 +1,340 @@
+import { DeleteFilled } from "@ant-design/icons";
+import {
+  Button,
+  Card,
+  Divider,
+  Form,
+  Input,
+  InputNumber,
+  Select,
+  Space,
+  Statistic,
+  Typography,
+} from "antd";
+import Dinero from "dinero.js";
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { determineDmsType } from "../../pages/dms/dms.container";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import DmsCdkMakes from "../dms-cdk-makes/dms-cdk-makes.component";
+import CurrencyInput from "../form-items-formatted/currency-form-item.component";
+import LayoutFormRow from "../layout-form-row/layout-form-row.component";
+import DmsCdkMakesRefetch from "../dms-cdk-makes/dms-cdk-makes.refetch.component";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(mapStateToProps, mapDispatchToProps)(DmsPostForm);
+
+export function DmsPostForm({ bodyshop, socket, job }) {
+  const [form] = Form.useForm();
+  const { t } = useTranslation();
+
+  const handlePayerSelect = (value, index) => {
+    form.setFieldsValue({
+      payers: form.getFieldValue("payers").map((payer, mapIndex) => {
+        if (index !== mapIndex) return payer;
+        const cdkPayer =
+          bodyshop.cdk_configuration.payers &&
+          bodyshop.cdk_configuration.payers.find((i) => i.name === value);
+
+        if (!cdkPayer) return payer;
+
+        return {
+          ...cdkPayer,
+          dms_acctnumber: cdkPayer.dms_acctnumber,
+          controlnumber: job && job[cdkPayer.control_type],
+        };
+      }),
+    });
+  };
+
+  const handleFinish = (values) => {
+    socket.emit(`${determineDmsType(bodyshop)}-export-job`, {
+      jobid: job.id,
+      txEnvelope: values,
+    });
+  };
+
+  return (
+    <Card title={t("jobs.labels.dms.postingform")}>
+      <Form
+        form={form}
+        layout="vertical"
+        onFinish={handleFinish}
+        initialValues={{
+          story: t("jobs.labels.dms.defaultstory", {
+            ro_number: job.ro_number,
+            area_of_damage: job.area_of_damage && job.area_of_damage.impact1,
+          }).substr(0, 239),
+        }}
+      >
+        <LayoutFormRow grow>
+          <Form.Item
+            name="journal"
+            label={t("jobs.fields.dms.journal")}
+            initialValue={
+              bodyshop.cdk_configuration &&
+              bodyshop.cdk_configuration.default_journal
+            }
+            rules={[
+              {
+                required: true,
+                //message: t("general.validation.required"),
+              },
+            ]}
+          >
+            <Input />
+          </Form.Item>
+          <Form.Item
+            name="kmin"
+            label={t("jobs.fields.kmin")}
+            initialValue={job && job.kmin}
+            rules={[
+              {
+                required: true,
+                //message: t("general.validation.required"),
+              },
+            ]}
+          >
+            <InputNumber disabled />
+          </Form.Item>
+          <Form.Item
+            name="kmout"
+            label={t("jobs.fields.kmout")}
+            initialValue={job && job.kmout}
+            rules={[
+              {
+                required: true,
+                //message: t("general.validation.required"),
+              },
+            ]}
+          >
+            <InputNumber disabled />
+          </Form.Item>
+        </LayoutFormRow>
+
+        <LayoutFormRow style={{ justifyContent: "center" }} grow>
+          <Form.Item
+            name="dms_make"
+            label={t("jobs.fields.dms.dms_make")}
+            rules={[
+              {
+                required: true,
+              },
+            ]}
+          >
+            <Input disabled />
+          </Form.Item>
+          <Form.Item
+            name="dms_model"
+            label={t("jobs.fields.dms.dms_model")}
+            rules={[
+              {
+                required: true,
+              },
+            ]}
+          >
+            <Input disabled />
+          </Form.Item>
+
+          <DmsCdkMakes form={form} socket={socket} job={job} />
+          <DmsCdkMakesRefetch />
+        </LayoutFormRow>
+        <Form.Item
+          name="story"
+          label={t("jobs.fields.dms.story")}
+          rules={[
+            {
+              required: true,
+            },
+          ]}
+        >
+          <Input.TextArea maxLength={240} />
+        </Form.Item>
+        <Divider />
+        <Form.List name={["payers"]}>
+          {(fields, { add, remove }) => {
+            return (
+              <div>
+                {fields.map((field, index) => (
+                  <Form.Item key={field.key}>
+                    <Space wrap>
+                      <Form.Item
+                        label={t("jobs.fields.dms.payer.name")}
+                        key={`${index}name`}
+                        name={[field.name, "name"]}
+                        rules={[
+                          {
+                            required: true,
+                          },
+                        ]}
+                      >
+                        <Select
+                          style={{ minWidth: "15rem" }}
+                          onSelect={(value) => handlePayerSelect(value, index)}
+                        >
+                          {bodyshop.cdk_configuration &&
+                            bodyshop.cdk_configuration.payers &&
+                            bodyshop.cdk_configuration.payers.map((payer) => (
+                              <Select.Option key={payer.name}>
+                                {payer.name}
+                              </Select.Option>
+                            ))}
+                        </Select>
+                      </Form.Item>
+
+                      <Form.Item
+                        label={t("jobs.fields.dms.payer.dms_acctnumber")}
+                        key={`${index}dms_acctnumber`}
+                        name={[field.name, "dms_acctnumber"]}
+                        rules={[
+                          {
+                            required: true,
+                          },
+                        ]}
+                      >
+                        <Input disabled />
+                      </Form.Item>
+
+                      <Form.Item
+                        label={t("jobs.fields.dms.payer.amount")}
+                        key={`${index}amount`}
+                        name={[field.name, "amount"]}
+                        rules={[
+                          {
+                            required: true,
+                          },
+                        ]}
+                      >
+                        <CurrencyInput min={0} />
+                      </Form.Item>
+
+                      <Form.Item
+                        label={t("jobs.fields.dms.payer.controlnumber")}
+                        key={`${index}controlnumber`}
+                        name={[field.name, "controlnumber"]}
+                        rules={[
+                          {
+                            required: true,
+                          },
+                        ]}
+                      >
+                        <Input />
+                      </Form.Item>
+
+                      <Form.Item shouldUpdate>
+                        {() => {
+                          const payers = form.getFieldValue("payers");
+
+                          const row = payers && payers[index];
+
+                          const cdkPayer =
+                            bodyshop.cdk_configuration.payers &&
+                            bodyshop.cdk_configuration.payers.find(
+                              (i) => i && row && i.name === row.name
+                            );
+
+                          return (
+                            <div>
+                              {cdkPayer &&
+                                t(`jobs.fields.${cdkPayer.control_type}`)}
+                            </div>
+                          );
+                        }}
+                      </Form.Item>
+
+                      <DeleteFilled
+                        onClick={() => {
+                          remove(field.name);
+                        }}
+                      />
+                    </Space>
+                  </Form.Item>
+                ))}
+                <Form.Item>
+                  <Button
+                    type="dashed"
+                    disabled={!(fields.length < 3)}
+                    onClick={() => {
+                      if (fields.length < 3) add();
+                    }}
+                    style={{ width: "100%" }}
+                  >
+                    {t("jobs.actions.dms.addpayer")}
+                  </Button>
+                </Form.Item>
+              </div>
+            );
+          }}
+        </Form.List>
+        <Form.Item shouldUpdate>
+          {() => {
+            //Perform Calculation to determine discrepancy.
+            let totalAllocated = Dinero();
+
+            const payers = form.getFieldValue("payers");
+            payers &&
+              payers.forEach((payer) => {
+                totalAllocated = totalAllocated.add(
+                  Dinero({ amount: Math.round((payer?.amount || 0) * 100) })
+                );
+              });
+
+            const totals =
+              socket.allocationsSummary &&
+              socket.allocationsSummary.reduce(
+                (acc, val) => {
+                  return {
+                    totalSale: acc.totalSale.add(Dinero(val.sale)),
+                    totalCost: acc.totalCost.add(Dinero(val.cost)),
+                  };
+                },
+                {
+                  totalSale: Dinero(),
+                  totalCost: Dinero(),
+                }
+              );
+            const discrep = totals
+              ? totals.totalSale.subtract(totalAllocated)
+              : Dinero();
+            return (
+              <Space size="large" wrap align="center">
+                <Statistic
+                  title={t("jobs.labels.subtotal")}
+                  value={(totals ? totals.totalSale : Dinero()).toFormat()}
+                />
+                <Typography.Title>-</Typography.Title>
+                <Statistic
+                  title={t("jobs.labels.dms.totalallocated")}
+                  value={totalAllocated.toFormat()}
+                />
+                <Typography.Title>=</Typography.Title>
+                <Statistic
+                  title={t("jobs.labels.dms.notallocated")}
+                  valueStyle={{
+                    color: discrep.getAmount() === 0 ? "green" : "red",
+                  }}
+                  value={discrep.toFormat()}
+                />
+                <Button
+                  disabled={
+                    !socket.allocationsSummary || discrep.getAmount() !== 0
+                  }
+                  htmlType="submit"
+                >
+                  {t("jobs.actions.dms.post")}
+                </Button>
+              </Space>
+            );
+          }}
+        </Form.Item>
+      </Form>
+    </Card>
+  );
+}

client/src/components/error-boundary/error-boundary.component.jsx

@@ -9,6 +9,7 @@ import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
+import { tracker } from "../../App/App.container";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
@@ -36,6 +37,7 @@ class ErrorBoundary extends React.Component {
   componentDidCatch(error, info) {
     console.log("Exception Caught by Error Boundary.", error, info);
     this.setState({ ...this.state, error, info });
+    tracker.event("error_boundary", error, true);
   }
 
   handleErrorSubmit = () => {

client/src/components/fcm-notification/fcm-notification.component.jsx

@@ -2,7 +2,7 @@ import { withApollo } from "@apollo/client/react/hoc";
 import React, { Component } from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { logImEXEvent, messaging } from "../../firebase/firebase.utils";
+//import { logImEXEvent, messaging } from "../../firebase/firebase.utils";
 import { selectCurrentUser } from "../../redux/user/user.selectors";
 
 const mapStateToProps = createStructuredSelector({
@@ -15,21 +15,20 @@ const mapDispatchToProps = (dispatch) => ({
 class FcmNotificationComponent extends Component {
   async componentDidMount() {
     //const { client, currentUser } = this.props;
-    if (!!!messaging) return; //Skip all of the notification functionality if the firebase SDK could not start.
-
-    messaging
-      .requestPermission()
-      .then(async function () {
-        // const token = await messaging.getToken();
-        // client.mutate({
-        //   mutation: UPDATE_FCM_TOKEN,
-        //   variables: { authEmail: currentUser.email, token: { [token]: true } },
-        // });
-      })
-      .catch(function (err) {
-        console.log("Unable to get permission to notify.", err);
-        logImEXEvent("fcm_permission_denied", { message: err });
-      });
+    // if (!!!messaging) return; //Skip all of the notification functionality if the firebase SDK could not start.
+    // messaging
+    //   .requestPermission()
+    //   .then(async function () {
+    //     // const token = await messaging.getToken();
+    //     // client.mutate({
+    //     //   mutation: UPDATE_FCM_TOKEN,
+    //     //   variables: { authEmail: currentUser.email, token: { [token]: true } },
+    //     // });
+    //   })
+    //   .catch(function (err) {
+    //     console.log("Unable to get permission to notify.", err);
+    //     logImEXEvent("fcm_permission_denied", { message: err });
+    //   });
   }
 
   render() {

client/src/components/global-search/global-search.component.jsx

@@ -168,7 +168,6 @@ export default function GlobalSearch() {
     <AutoComplete
       options={options}
       onSearch={handleSearch}
-      allowClear
       placeholder={t("general.labels.globalsearch")}
     >
       <Input.Search loading={loading} />

client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx

@@ -64,14 +64,16 @@ export function JobChecklistForm({
           ...(type === "intake" && { actual_in: new Date() }),
           ...(type === "intake" && {
             production_vars: {
-              ...job.production_vars,
-              ...values.production_vars,
+              ...(job ? job.production_vars : {}),
+
               note:
                 values.production_vars &&
                 values.production_vars.note &&
                 values.production_vars.note !== ""
-                  ? job.production_vars && values.production_vars.note
-                  : job.production_vars && job.production_vars.note,
+                  ? values &&
+                    values.production_vars &&
+                    values.production_vars.note
+                  : job && job.production_vars && job.production_vars.note,
             },
           }),
           ...(type === "intake" && {
@@ -245,6 +247,7 @@ export function JobChecklistForm({
               name={["production_vars", "note"]}
               label={t("jobs.fields.production_vars.note")}
               disabled={readOnly}
+              trigger="onChange"
             >
               <Input.TextArea rows={3} disabled={readOnly} />
             </Form.Item>

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

@@ -400,7 +400,7 @@ export function JobLinesComponent({
                 setState({
                   ...state,
                   filteredInfo: {
-                    part_type: ["PAN,PAC,PAR,PAL,PAA,PAM,PAP,PAS,PASL"],
+                    part_type: ["PAN,PAC,PAR,PAL,PAA,PAM,PAP,PAS,PASL,PAG"],
                   },
                 });
               }}
@@ -435,7 +435,7 @@ export function JobLinesComponent({
         columns={columns}
         rowKey="id"
         loading={loading}
-        pagination={{ position: "top", defaultPageSize: 50 }}
+        pagination={false}
         dataSource={jobLines}
         onChange={handleTableChange}
         scroll={{

client/src/components/job-line-status-popup/job-line-status-popup.component.jsx

@@ -72,7 +72,7 @@ export function JobLineStatusPopup({ bodyshop, jobline, disabled }) {
     );
   return (
     <div
-      style={{ width: "100%", minHeight: "2rem", cursor: "pointer" }}
+      style={{ width: "100%", minHeight: "1rem", cursor: "pointer" }}
       onClick={() => !disabled && setEditing(true)}
     >
       {jobline.status}

client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.component.jsx

@@ -115,18 +115,18 @@ export default function JobLinesUpsertModalComponent({
           <Form.Item
             label={t("joblines.fields.mod_lb_hrs")}
             name="mod_lb_hrs"
-            // rules={[
-            //   ({ getFieldValue }) => ({
-            //     validator(rule, value) {
-            //       if (!!getFieldValue("mod_lbr_ty") === !!value) {
-            //         return Promise.resolve();
-            //       }
-            //       return Promise.reject(
-            //         t("joblines.validations.hrsrequirediflbrtyp")
-            //       );
-            //     },
-            //   }),
-            // ]}
+            rules={[
+              ({ getFieldValue }) => ({
+                validator(rule, value) {
+                  if (!!getFieldValue("mod_lbr_ty") === !!value) {
+                    return Promise.resolve();
+                  }
+                  return Promise.reject(
+                    t("joblines.validations.hrsrequirediflbrtyp")
+                  );
+                },
+              }),
+            ]}
           >
             <InputNumber precision={1} />
           </Form.Item>
@@ -169,18 +169,18 @@ export default function JobLinesUpsertModalComponent({
           <Form.Item
             label={t("joblines.fields.part_qty")}
             name="part_qty"
-            // rules={[
-            //   ({ getFieldValue }) => ({
-            //     validator(rule, value) {
-            //       if (!!getFieldValue("part_type") === !!value) {
-            //         return Promise.resolve();
-            //       }
-            //       return Promise.reject(
-            //         t("joblines.validations.requiredifparttype")
-            //       );
-            //     },
-            //   }),
-            // ]}
+            rules={[
+              ({ getFieldValue }) => ({
+                validator(rule, value) {
+                  if (!!getFieldValue("part_type") === !!value) {
+                    return Promise.resolve();
+                  }
+                  return Promise.reject(
+                    t("joblines.validations.requiredifparttype")
+                  );
+                },
+              }),
+            ]}
           >
             <InputNumber precision={0} min={0} />
           </Form.Item>
@@ -190,28 +190,28 @@ export default function JobLinesUpsertModalComponent({
           <Form.Item
             label={t("joblines.fields.act_price")}
             name="act_price"
-            // rules={[
-            //   ({ getFieldValue }) => ({
-            //     validator(rule, value) {
-            //       if (!value || getFieldValue("part_type") !== "PAE") {
-            //         return Promise.resolve();
-            //       }
-            //       return Promise.reject(
-            //         t("joblines.validations.zeropriceexistingpart")
-            //       );
-            //     },
-            //   }),
-            //   ({ getFieldValue }) => ({
-            //     validator(rule, value) {
-            //       if (!!getFieldValue("part_type") === !!value) {
-            //         return Promise.resolve();
-            //       }
-            //       return Promise.reject(
-            //         t("joblines.validations.requiredifparttype")
-            //       );
-            //     },
-            //   }),
-            // ]}
+            rules={[
+              ({ getFieldValue }) => ({
+                validator(rule, value) {
+                  if (!value || getFieldValue("part_type") !== "PAE") {
+                    return Promise.resolve();
+                  }
+                  return Promise.reject(
+                    t("joblines.validations.zeropriceexistingpart")
+                  );
+                },
+              }),
+              ({ getFieldValue }) => ({
+                validator(rule, value) {
+                  if (!!getFieldValue("part_type") === !!value) {
+                    return Promise.resolve();
+                  }
+                  return Promise.reject(
+                    t("joblines.validations.requiredifparttype")
+                  );
+                },
+              }),
+            ]}
           >
             <InputCurrency precision={2} min={0} />
           </Form.Item>

client/src/components/job-reconciliation-bills-table/job-reconciliation-bills-table.component.jsx

@@ -21,7 +21,8 @@ export default function JobReconciliationBillsTable({
       title: t("billlines.fields.line_desc"),
       dataIndex: "line_desc",
       key: "line_desc",
-      width: "35%",
+      ellipsis: true,
+      minWidth: "65rem",
       sorter: (a, b) => alphaSort(a.line_desc, b.line_desc),
       sortOrder:
         state.sortedInfo.columnKey === "line_desc" && state.sortedInfo.order,
@@ -30,7 +31,7 @@ export default function JobReconciliationBillsTable({
       title: t("billlines.labels.from"),
       dataIndex: "from",
       key: "from",
-      width: "20%",
+
       ellipsis: true,
       render: (text, record) =>
         `${record.bill.vendor && record.bill.vendor.name} / ${
@@ -42,6 +43,7 @@ export default function JobReconciliationBillsTable({
       dataIndex: "actual_price",
       key: "actual_price",
       sorter: (a, b) => a.actual_price - b.actual_price,
+      width: "7rem",
       sortOrder:
         state.sortedInfo.columnKey === "actual_price" && state.sortedInfo.order,
       render: (text, record) => (
@@ -53,6 +55,7 @@ export default function JobReconciliationBillsTable({
       dataIndex: "actual_cost",
       key: "actual_cost",
       sorter: (a, b) => a.actual_cost - b.actual_cost,
+      width: "7rem",
       sortOrder:
         state.sortedInfo.columnKey === "actual_cost" && state.sortedInfo.order,
       render: (text, record) => (
@@ -64,6 +67,7 @@ export default function JobReconciliationBillsTable({
       dataIndex: "quantity",
       key: "quantity",
       sorter: (a, b) => a.quantity - b.quantity,
+      width: "4rem",
       sortOrder:
         state.sortedInfo.columnKey === "quantity" && state.sortedInfo.order,
     },
@@ -72,9 +76,11 @@ export default function JobReconciliationBillsTable({
       dataIndex: "is_credit_memo",
       key: "is_credit_memo",
       sorter: (a, b) => a.bill.is_credit_memo - b.bill.is_credit_memo,
+      width: "8rem",
       sortOrder:
         state.sortedInfo.columnKey === "is_credit_memo" &&
         state.sortedInfo.order,
+
       render: (text, record) => (
         <Checkbox disabled checked={record.bill.is_credit_memo} />
       ),
@@ -94,7 +100,7 @@ export default function JobReconciliationBillsTable({
       <Table
         pagination={false}
         size="small"
-        scroll={{ y: "80vh", x: true }}
+        scroll={{ y: "60vh" }}
         columns={columns}
         rowKey="id"
         dataSource={invoiceLineData}

client/src/components/job-reconciliation-modal/job-reconciliation-modal.styles.scss

@@ -1,12 +1,12 @@
 .imex-reconciliation-modal {
   top: 20px;
-  .ant-modal-content {
-    height: 95vh;
-    display: flex;
-    flex-direction: column;
-    .ant-modal-body {
-      display: flex;
-      flex: 1;
-    }
-  }
+  // .ant-modal-content {
+  //   height: 95vh;
+  //   display: flex;
+  //   flex-direction: column;
+  //   .ant-modal-body {
+  //     display: flex;
+  //     flex: 1;
+  //   }
+  // }
 }

client/src/components/job-reconciliation-parts-table/job-reconciliation-parts-table.component.jsx

@@ -23,6 +23,7 @@ export default function JobReconcilitionPartsTable({
       dataIndex: "line_desc",
       key: "line_desc",
       sorter: (a, b) => alphaSort(a.line_desc, b.line_desc),
+      ellipses: true,
       sortOrder:
         state.sortedInfo.columnKey === "line_desc" && state.sortedInfo.order,
     },
@@ -57,6 +58,7 @@ export default function JobReconcilitionPartsTable({
       dataIndex: "act_price",
       key: "act_price",
       sorter: (a, b) => a.act_price - b.act_price,
+      width: "7rem",
       sortOrder:
         state.sortedInfo.columnKey === "act_price" && state.sortedInfo.order,
 
@@ -68,10 +70,12 @@ export default function JobReconcilitionPartsTable({
       title: t("joblines.fields.part_qty"),
       dataIndex: "part_qty",
       key: "part_qty",
+      width: "4rem",
     },
     {
       title: t("joblines.fields.total"),
       dataIndex: "total",
+      width: "7rem",
       key: "total",
       sorter: (a, b) => a.act_price * a.part_qty - b.act_price * b.part_qty,
       sortOrder:
@@ -89,6 +93,7 @@ export default function JobReconcilitionPartsTable({
       dataIndex: "status",
       key: "status",
       sorter: (a, b) => alphaSort(a.status, b.status),
+      width: "6rem",
       sortOrder:
         state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
     },
@@ -108,7 +113,7 @@ export default function JobReconcilitionPartsTable({
         pagination={false}
         columns={columns}
         size="small"
-        scroll={{ y: "80vh", x: true }}
+        scroll={{ y: "60vh" }}
         rowKey="id"
         dataSource={jobLineData}
         onChange={handleTableChange}

client/src/components/job-scoreboard-add-button/job-scoreboard-add-button.component.jsx

@@ -1,12 +1,11 @@
 import { useMutation } from "@apollo/client";
-import { Button, Card, Form, notification, Popover } from "antd";
+import { Button, Card, Form, InputNumber, notification, Popover } from "antd";
 import moment from "moment";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { INSERT_SCOREBOARD_ENTRY } from "../../graphql/scoreboard.queries";
 import FormDatePicker from "../form-date-picker/form-date-picker.component";
-import InputNumberCalculator from "../form-input-number-calculator/form-input-number-calculator.component";
 
 export default function ScoreboardAddButton({
   job,
@@ -73,7 +72,7 @@ export default function ScoreboardAddButton({
               },
             ]}
           >
-            <InputNumberCalculator precision={1} />
+            <InputNumber precision={1} />
           </Form.Item>
           <Form.Item
             label={t("scoreboard.fields.painthrs")}
@@ -85,7 +84,7 @@ export default function ScoreboardAddButton({
               },
             ]}
           >
-            <InputNumberCalculator precision={1} />
+            <InputNumber precision={1} />
           </Form.Item>
 
           <Button type="primary" htmlType="submit">

client/src/components/jobs-available-table/jobs-available-table.container.jsx

@@ -29,6 +29,7 @@ import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
+import confirmDialog from "../../utils/asyncConfirm";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import AlertComponent from "../alert/alert.component";
 import JobsAvailableScan from "../jobs-available-scan/jobs-available-scan.component";
@@ -97,6 +98,8 @@ export function JobsAvailableContainer({
       });
       return;
     }
+    //IO-539 Check for Parts Rate on PAL for SGI use case.
+    await CheckTaxRates(estData, bodyshop);
 
     const newTotals = (
       await Axios.post("/job/totals", {
@@ -196,6 +199,9 @@ export function JobsAvailableContainer({
         message: t("jobs.errors.creating", { error: "No job data present." }),
       });
     } else {
+      //IO-539 Check for Parts Rate on PAL for SGI use case.
+      await CheckTaxRates(estData, bodyshop);
+
       //create upsert job
       let supp = replaceEmpty({ ...estData.est_data });
 
@@ -388,3 +394,98 @@ function replaceEmpty(someObj, replaceValue = null) {
   console.log("Parsed", JSON.parse(temp));
   return JSON.parse(temp);
 }
+
+async function CheckTaxRates(estData, bodyshop) {
+  //LKQ Check
+  if (
+    !estData.est_data.parts_tax_rates?.PAL ||
+    estData.est_data.parts_tax_rates?.PAL?.prt_tax_rt === null ||
+    estData.est_data.parts_tax_rates?.PAL?.prt_tax_rt === 0
+  ) {
+    const res = await confirmDialog(
+      `ImEX Online has detected that there is a missing tax rate for LKQ parts. Pressing OK will set the tax rate to ${bodyshop.bill_tax_rates.state_tax_rate}% and enable the rate. Pressing cancel will keep the tax rate as is.`
+    );
+    if (res) {
+      if (!estData.est_data.parts_tax_rates.PAL) {
+        estData.est_data.parts_tax_rates.PAL = {
+          prt_discp: 0,
+          prt_mktyp: true,
+          prt_mkupp: 0,
+          prt_type: "PAL",
+        };
+      }
+      estData.est_data.parts_tax_rates.PAL.prt_tax_rt =
+        bodyshop.bill_tax_rates.state_tax_rate / 100;
+      estData.est_data.parts_tax_rates.PAL.prt_tax_in = true;
+    }
+  }
+  //PAC Check
+  if (
+    !estData.est_data.parts_tax_rates?.PAC ||
+    estData.est_data.parts_tax_rates?.PAC?.prt_tax_rt === null ||
+    estData.est_data.parts_tax_rates?.PAC?.prt_tax_rt === 0
+  ) {
+    const res = await confirmDialog(
+      `ImEX Online has detected that there is a missing tax rate for rechromed parts. Pressing OK will set the tax rate to ${bodyshop.bill_tax_rates.state_tax_rate}% and enable the rate. Pressing cancel will keep the tax rate as is.`
+    );
+    if (res) {
+      if (!estData.est_data.parts_tax_rates.PAC) {
+        estData.est_data.parts_tax_rates.PAC = {
+          prt_discp: 0,
+          prt_mktyp: true,
+          prt_mkupp: 0,
+          prt_type: "PAC",
+        };
+      }
+      estData.est_data.parts_tax_rates.PAC.prt_tax_rt =
+        bodyshop.bill_tax_rates.state_tax_rate / 100;
+      estData.est_data.parts_tax_rates.PAC.prt_tax_in = true;
+    }
+  }
+  //PAM Check
+  if (
+    !estData.est_data.parts_tax_rates?.PAM ||
+    estData.est_data.parts_tax_rates?.PAM?.prt_tax_rt === null ||
+    estData.est_data.parts_tax_rates?.PAM?.prt_tax_rt === 0
+  ) {
+    const res = await confirmDialog(
+      `ImEX Online has detected that there is a missing tax rate for remanufactured parts. Pressing OK will set the tax rate to ${bodyshop.bill_tax_rates.state_tax_rate}% and enable the rate. Pressing cancel will keep the tax rate as is.`
+    );
+    if (res) {
+      if (!estData.est_data.parts_tax_rates.PAM) {
+        estData.est_data.parts_tax_rates.PAM = {
+          prt_discp: 0,
+          prt_mktyp: true,
+          prt_mkupp: 0,
+          prt_type: "PAM",
+        };
+      }
+      estData.est_data.parts_tax_rates.PAM.prt_tax_rt =
+        bodyshop.bill_tax_rates.state_tax_rate / 100;
+      estData.est_data.parts_tax_rates.PAM.prt_tax_in = true;
+    }
+  }
+
+  if (
+    !estData.est_data.parts_tax_rates?.PAR ||
+    estData.est_data.parts_tax_rates?.PAR?.prt_tax_rt === null ||
+    estData.est_data.parts_tax_rates?.PAR?.prt_tax_rt === 0
+  ) {
+    const res = await confirmDialog(
+      `ImEX Online has detected that there is a missing tax rate for recored parts. Pressing OK will set the tax rate to ${bodyshop.bill_tax_rates.state_tax_rate}% and enable the rate. Pressing cancel will keep the tax rate as is.`
+    );
+    if (res) {
+      if (!estData.est_data.parts_tax_rates.PAR) {
+        estData.est_data.parts_tax_rates.PAR = {
+          prt_discp: 0,
+          prt_mktyp: true,
+          prt_mkupp: 0,
+          prt_type: "PAR",
+        };
+      }
+      estData.est_data.parts_tax_rates.PAR.prt_tax_rt =
+        bodyshop.bill_tax_rates.state_tax_rate / 100;
+      estData.est_data.parts_tax_rates.PAR.prt_tax_in = true;
+    }
+  }
+}

client/src/components/jobs-close-auto-allocate/jobs-close-auto-allocate.component.jsx

@@ -1,4 +1,4 @@
-import { Button } from "antd";
+import { Button, Dropdown, Menu } from "antd";
 import _ from "lodash";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -12,11 +12,8 @@ const mapStateToProps = createStructuredSelector({
 
 export function JobsCloseAutoAllocate({ bodyshop, joblines, form, disabled }) {
   const { t } = useTranslation();
-  const handleAllocate = () => {
-    logImEXEvent("jobs_close_allocate_auto");
-
-    const { defaults } = bodyshop.md_responsibility_centers;
 
+  const handleAllocate = (defaults) => {
     form.setFieldsValue({
       joblines: joblines.map((jl) => {
         const ret = _.cloneDeep(jl);
@@ -48,8 +45,36 @@ export function JobsCloseAutoAllocate({ bodyshop, joblines, form, disabled }) {
     });
   };
 
-  return (
-    <Button onClick={handleAllocate} disabled={disabled}>
+  const handleAutoAllocateClick = () => {
+    logImEXEvent("jobs_close_allocate_auto");
+
+    const { defaults } = bodyshop.md_responsibility_centers;
+    handleAllocate(defaults);
+  };
+
+  const handleMenuClick = ({ item, key, keyPath, domEvent }) => {
+    logImEXEvent("jobs_close_allocate_auto_dms");
+    handleAllocate(
+      bodyshop.md_responsibility_centers.dms_defaults.find(
+        (x) => x.name === key
+      )
+    );
+  };
+
+  const overlay = bodyshop.cdk_dealerid && (
+    <Menu onClick={handleMenuClick}>
+      {bodyshop.md_responsibility_centers.dms_defaults.map((mapping) => (
+        <Menu.Item key={mapping.name}>{mapping.name}</Menu.Item>
+      ))}
+    </Menu>
+  );
+
+  return bodyshop.cdk_dealerid ? (
+    <Dropdown overlay={overlay}>
+      <Button disabled={disabled}>{t("jobs.actions.dmsautoallocate")}</Button>
+    </Dropdown>
+  ) : (
+    <Button onClick={handleAutoAllocateClick} disabled={disabled}>
       {t("jobs.actions.autoallocate")}
     </Button>
   );

client/src/components/jobs-close-export-button/jobs-close-export-button.component.jsx

@@ -13,6 +13,7 @@ import {
 } from "../../redux/user/user.selectors";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
+import { useHistory } from "react-router-dom";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -26,11 +27,17 @@ export function JobsCloseExportButton({
   disabled,
   setSelectedJobs,
 }) {
+  const history = useHistory();
   const { t } = useTranslation();
   const [updateJob] = useMutation(UPDATE_JOB);
   const [insertExportLog] = useMutation(INSERT_EXPORT_LOG);
   const [loading, setLoading] = useState(false);
+
   const handleQbxml = async () => {
+    if (bodyshop.cdk_dealerid) {
+      history.push(`/manage/dms?jobId=${jobId}`);
+      return;
+    }
     logImEXEvent("jobs_close_export");
 
     setLoading(true);
@@ -150,7 +157,7 @@ export function JobsCloseExportButton({
       }
       if (setSelectedJobs) {
         setSelectedJobs((selectedJobs) => {
-          return selectedJobs.filter((i) => i.id !== jobId);
+          return selectedJobs.filter((i) => i !== jobId);
         });
       }
     }
@@ -159,12 +166,7 @@ export function JobsCloseExportButton({
   };
 
   return (
-    <Button
-      onClick={handleQbxml}
-      loading={loading}
-      disabled={disabled}
-      type="dashed"
-    >
+    <Button onClick={handleQbxml} loading={loading} disabled={disabled}>
       {t("jobs.actions.export")}
     </Button>
   );

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

@@ -15,6 +15,7 @@ import JobAltTransportChange from "../job-at-change/job-at-change.component";
 import JobEmployeeAssignments from "../job-employee-assignments/job-employee-assignments.container";
 import ProductionListColumnProductionNote from "../production-list-columns/production-list-columns.productionnote.component";
 import "./jobs-detail-header.styles.scss";
+import JobsRelatedRos from "../jobs-related-ros/jobs-related-ros.component";
 
 const mapStateToProps = createStructuredSelector({
   jobRO: selectJobReadOnly,
@@ -75,11 +76,15 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
               {job.ins_co_nm}
             </DataLabel>
             <DataLabel label={t("jobs.fields.clm_no")}>{job.clm_no}</DataLabel>
+            <DataLabel label={t("jobs.fields.ponumber")} hideIfNull>
+              {job.po_number}
+            </DataLabel>
             <DataLabel label={t("jobs.fields.repairtotal")}>
               <CurrencyFormatter>{job.clm_total}</CurrencyFormatter>
               <span style={{ margin: "0rem .5rem" }}>/</span>
               <CurrencyFormatter>{job.owner_owing}</CurrencyFormatter>
             </DataLabel>
+
             <DataLabel label={t("jobs.fields.alt_transport")}>
               {job.alt_transport}
               <JobAltTransportChange job={job} />
@@ -177,6 +182,9 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
             <DataLabel key="4" label={t("vehicles.fields.v_vin")}>
               {`${job.v_vin || t("general.labels.na")}`}
             </DataLabel>
+            <DataLabel label={t("jobs.labels.relatedros")}>
+              <JobsRelatedRos jobid={job.id} job={job} />
+            </DataLabel>
           </div>
         </Card>
       </Col>

client/src/components/jobs-detail-rates/jobs-detail-rates.component.jsx

@@ -13,6 +13,7 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import CABCpvrtCalculator from "../ca-bc-pvrt-calculator/ca-bc-pvrt-calculator.component";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import JobsDetailRatesChangeButton from "../jobs-detail-rates-change-button/jobs-detail-rates-change-button.component";
@@ -22,9 +23,10 @@ import JobsDetailRatesParts from "./jobs-detail-rates.parts.component";
 
 const mapStateToProps = createStructuredSelector({
   jobRO: selectJobReadOnly,
+  bodyshop: selectBodyshop,
 });
 
-export function JobsDetailRates({ jobRO, form, job }) {
+export function JobsDetailRates({ jobRO, form, job, bodyshop }) {
   const { t } = useTranslation();
   return (
     <div>
@@ -77,7 +79,7 @@ export function JobsDetailRates({ jobRO, form, job }) {
           label={t("jobs.fields.adjustment_bottom_line")}
           name="adjustment_bottom_line"
         >
-          <CurrencyInput disabled={jobRO} />
+          <CurrencyInput disabled={jobRO || bodyshop.cdk_dealerid} />
         </Form.Item>
         <Space align="end">
           <Form.Item label={t("jobs.fields.ca_bc_pvrt")} name="ca_bc_pvrt">

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

@@ -130,13 +130,10 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
       ellipsis: true,
       sorter: true, //(a, b) => alphaSort(a.clm_no, b.clm_no),
       sortOrder: sortcolumn === "clm_no" && sortorder,
-      render: (text, record) => {
-        return record.clm_no ? (
-          <span>{record.clm_no}</span>
-        ) : (
-          t("general.labels.unknown")
-        );
-      },
+      render: (text, record) =>
+        `${record.clm_no || ""}${
+          record.po_number ? ` (PO: ${record.po_number})` : ""
+        }`,
     },
     {
       title: t("jobs.fields.ins_co_nm"),

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

@@ -208,6 +208,10 @@ export function JobsList({ bodyshop }) {
       sorter: (a, b) => alphaSort(a.clm_no, b.clm_no),
       sortOrder:
         state.sortedInfo.columnKey === "clm_no" && state.sortedInfo.order,
+      render: (text, record) =>
+        `${record.clm_no || ""}${
+          record.po_number ? ` (PO: ${record.po_number})` : ""
+        }`,
     },
     {
       title: t("jobs.fields.ins_co_nm"),

client/src/components/jobs-notes/jobs-notes.container.jsx

@@ -10,8 +10,21 @@ import {
   QUERY_NOTES_BY_JOB_PK,
 } from "../../graphql/notes.queries";
 import JobNotesComponent from "./jobs.notes.component";
+import { insertAuditTrail } from "../../redux/application/application.actions";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
 
-export default function JobNotesContainer({ jobId }) {
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+});
+const mapDispatchToProps = (dispatch) => ({
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
+});
+export default connect(mapStateToProps, mapDispatchToProps)(JobNotesContainer);
+
+export function JobNotesContainer({ jobId, insertAuditTrail }) {
   const { loading, error, data, refetch } = useQuery(QUERY_NOTES_BY_JOB_PK, {
     variables: { id: jobId },
     fetchPolicy: "network-only",
@@ -32,6 +45,10 @@ export default function JobNotesContainer({ jobId }) {
       notification["success"]({
         message: t("notes.successes.deleted"),
       });
+      insertAuditTrail({
+        jobid: jobId,
+        operation: AuditTrailMapping.jobnotedeleted(),
+      });
     });
     setDeleteLoading(false);
   };

client/src/components/jobs-related-ros/jobs-related-ros.component.jsx

@@ -0,0 +1,20 @@
+import { Space, Tag } from "antd";
+import React from "react";
+import { Link } from "react-router-dom";
+
+export default function JobsRelatedRos({ jobid, job }) {
+  if (!(job && job.vehicle && job.vehicle.jobs)) return null;
+  return (
+    <Space wrap>
+      {job.vehicle.jobs
+        .filter((j) => j.id !== job.id)
+        .map((j) => (
+          <Tag key={j.id}>
+            <Link to={`/manage/jobs/${j?.id}`}>{`${j.ro_number || "N/A"}${
+              j.clm_no ? ` | ${j.clm_no}` : ""
+            }${j.status ? ` | ${j.status}` : ""}`}</Link>
+          </Tag>
+        ))}
+    </Space>
+  );
+}

client/src/components/labor-allocations-table/labor-allocations-table.component.jsx

@@ -10,7 +10,7 @@ import { alphaSort } from "../../utils/sorters";
 import LaborAllocationsAdjustmentEdit from "../labor-allocations-adjustment-edit/labor-allocations-adjustment-edit.component";
 import "./labor-allocations-table.styles.scss";
 import { CalculateAllocationsTotals } from "./labor-allocations-table.utility";
-
+import _ from "lodash";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   technician: selectTechnician,
@@ -57,6 +57,7 @@ export function LaborAllocationsTable({
       sorter: (a, b) => alphaSort(a.cost_center, b.cost_center),
       sortOrder:
         state.sortedInfo.columnKey === "cost_center" && state.sortedInfo.order,
+      render: (text, record) => `${record.cost_center} (${record.mod_lbr_ty})`,
     },
     {
       title: t("jobs.labels.hrs_total"),
@@ -113,7 +114,7 @@ export function LaborAllocationsTable({
             color: record.difference >= 0 ? "green" : "red",
           }}
         >
-          {record.difference}
+          {_.round(record.difference, 1)}
         </strong>
       ),
     },

client/src/components/labor-allocations-table/labor-allocations-table.utility.js

@@ -16,6 +16,7 @@ export const CalculateAllocationsTotals = (
     const r = {
       opcode: value,
       cost_center: responsibilitycenters.defaults.costs[value],
+      mod_lbr_ty: value,
       total: joblines.reduce((acc2, val2) => {
         return val2.mod_lbr_ty === value ? acc2 + val2.mod_lb_hrs : acc2;
       }, 0),

client/src/components/note-upsert-modal/note-upsert-modal.container.jsx

@@ -10,6 +10,8 @@ import { selectNoteUpsert } from "../../redux/modals/modals.selectors";
 import { selectCurrentUser } from "../../redux/user/user.selectors";
 import NoteUpsertModalComponent from "./note-upsert-modal.component";
 import { logImEXEvent } from "../../firebase/firebase.utils";
+import { insertAuditTrail } from "../../redux/application/application.actions";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
@@ -17,12 +19,15 @@ const mapStateToProps = createStructuredSelector({
 });
 const mapDispatchToProps = (dispatch) => ({
   toggleModalVisible: () => dispatch(toggleModalVisible("noteUpsert")),
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 
 export function NoteUpsertModalContainer({
   currentUser,
   noteUpsertModal,
   toggleModalVisible,
+  insertAuditTrail,
 }) {
   const { t } = useTranslation();
   const [insertNote] = useMutation(INSERT_NEW_NOTE);
@@ -56,6 +61,10 @@ export function NoteUpsertModalContainer({
         notification["success"]({
           message: t("notes.successes.updated"),
         });
+        insertAuditTrail({
+          jobid: context.jobId,
+          operation: AuditTrailMapping.jobnoteupdated(),
+        });
       });
       if (refetch) refetch();
       toggleModalVisible();
@@ -75,6 +84,10 @@ export function NoteUpsertModalContainer({
         notification["success"]({
           message: t("notes.successes.create"),
         });
+        insertAuditTrail({
+          jobid: context.jobId,
+          operation: AuditTrailMapping.jobnoteadded(),
+        });
       });
     }
   };

client/src/components/parts-order-modal/parts-order-modal.component.jsx

@@ -106,6 +106,12 @@ export default function PartsOrderModalComponent({
                       label={t("parts_orders.fields.quantity")}
                       key={`${index}quantity`}
                       name={[field.name, "quantity"]}
+                      rules={[
+                        {
+                          required: true,
+                          //message: t("general.validation.required"),
+                        },
+                      ]}
                     >
                       <InputNumber />
                     </Form.Item>

client/src/components/parts-order-modal/parts-order-modal.container.jsx

@@ -176,7 +176,7 @@ export function PartsOrderModalContainer({
 
     if (refetch) refetch();
     toggleModalVisible();
-    const Templates = TemplateList("partsorder");
+    const Templates = TemplateList("partsorder", context);
 
     if (sendType === "e") {
       const matchingVendor = data.vendors.filter(

client/src/components/payable-export-button/payable-export-button.component.jsx

@@ -145,7 +145,7 @@ export function PayableExportButton({
       }
       if (setSelectedBills) {
         setSelectedBills((selectedBills) => {
-          return selectedBills.filter((i) => i.id !== billId);
+          return selectedBills.filter((i) => i !== billId);
         });
       }
     }

client/src/components/payment-export-button/payment-export-button.component.jsx

@@ -145,7 +145,7 @@ export function PaymentExportButton({
 
       if (setSelectedPayments) {
         setSelectedPayments((selectedBills) => {
-          return selectedBills.filter((i) => i.id !== paymentId);
+          return selectedBills.filter((i) => i !== paymentId);
         });
       }
     }

client/src/components/payments-export-all-button/payments-export-all-button.component.jsx

@@ -6,7 +6,6 @@ import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { auth } from "../../firebase/firebase.utils";
 import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
 import { UPDATE_PAYMENTS } from "../../graphql/payments.queries";
 import {
@@ -37,15 +36,9 @@ export function PaymentsExportAllButton({
 
     let QbXmlResponse;
     try {
-      QbXmlResponse = await axios.post(
-        "/accounting/qbxml/payments",
-        { payments: paymentIds },
-        {
-          headers: {
-            Authorization: `Bearer ${await auth.currentUser.getIdToken()}`,
-          },
-        }
-      );
+      QbXmlResponse = await axios.post("/accounting/qbxml/payments", {
+        payments: paymentIds,
+      });
     } catch (error) {
       console.log("Error getting QBXML from Server.", error);
       notification["error"]({

client/src/components/qbo-authorize/qbo-authorize.component.jsx

@@ -0,0 +1,76 @@
+import { Button, Space } from "antd";
+import Axios from "axios";
+import React, { useEffect } from "react";
+//import QboImg from "./qbo_signin.png";
+import queryString from "query-string";
+import { useLocation } from "react-router-dom";
+import { useCookies } from "react-cookie";
+
+export default function QboAuthorizeComponent() {
+  const location = useLocation();
+
+  const [, setCookie] = useCookies(["access_token", "refresh_token"]);
+
+  const handleQbSignIn = async () => {
+    const result = await Axios.post("/qbo/authorize");
+    console.log("pushing to history", result.data);
+    window.location.href = result.data;
+  };
+  const qs = queryString.parse(location.search);
+
+  const { error } = qs;
+
+  useEffect(() => {
+    const { code, state, realmId } = qs;
+    const hasBeenCalledBack = code && realmId && state;
+
+    if (hasBeenCalledBack) {
+      setCookie("qbo_code", code, { path: "/" });
+      setCookie("qbo_state", state, { path: "/" });
+
+      let expires = new Date();
+      expires.setTime(expires.getTime() + 8726400 * 1000);
+
+      setCookie("qbo_realmId", realmId, {
+        path: "/",
+        expires,
+      });
+    }
+  }, [qs, location, setCookie]);
+
+  return (
+    <div>
+      <Space wrap>
+        <Button onClick={handleQbSignIn}>
+          {/* <img
+            src={QboImg}
+            alt="Sign in with Intuit"
+            onClick={handleQbSignIn}
+          /> */}
+          auth
+        </Button>
+        <Button
+          onClick={async () => {
+            const response = await Axios.get(`/qbo/refresh`, {
+              withCredentials: true,
+            });
+            console.log(response);
+          }}
+        >
+          Refresh Token
+        </Button>
+        <Button
+          onClick={async () => {
+            const response = await Axios.post(`/qbo/receivables`, {
+              withCredentials: true,
+            });
+            console.log(response);
+          }}
+        >
+          REC
+        </Button>
+      </Space>
+      {error && JSON.parse(decodeURIComponent(error)).error_description}
+    </div>
+  );
+}

client/src/components/rbac-wrapper/rbac-defaults.js

@@ -52,8 +52,9 @@ const ret = {
 
   "shiftclock:view": 2,
 
+  "shop:config": 4,
+  "shop:rbac": 5,
   "shop:vendors": 2,
-  "shop:rbac": 1,
   "shop:dashboard": 3,
   "shop:templates": 4,
 

client/src/components/report-center-modal/report-center-modal.component.jsx

@@ -1,5 +1,16 @@
 import { useLazyQuery } from "@apollo/client";
-import { Button, DatePicker, Form, Radio, Space } from "antd";
+import {
+  Button,
+  Card,
+  Col,
+  DatePicker,
+  Form,
+  Input,
+  Radio,
+  Row,
+  Typography,
+} from "antd";
+import _ from "lodash";
 import moment from "moment";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -14,7 +25,6 @@ import { TemplateList } from "../../utils/TemplateConstants";
 import EmployeeSearchSelect from "../employee-search-select/employee-search-select.component";
 import VendorSearchSelect from "../vendor-search-select/vendor-search-select.component";
 import "./report-center-modal.styles.scss";
-
 const mapStateToProps = createStructuredSelector({
   reportCenterModal: selectReportCenter,
 });
@@ -28,9 +38,14 @@ export default connect(
 
 export function ReportCenterModalComponent({ reportCenterModal }) {
   const [form] = Form.useForm();
+  const [search, setSearch] = useState("");
+
   const [loading, setLoading] = useState(false);
   const { t } = useTranslation();
   const Templates = TemplateList("report_center");
+  const ReportsList = Object.keys(Templates).map((key) => {
+    return Templates[key];
+  });
   const { visible } = reportCenterModal;
 
   const [callVendorQuery, { data: vendorData, called: vendorCalled }] =
@@ -67,6 +82,9 @@ export function ReportCenterModalComponent({ reportCenterModal }) {
           ...(end
             ? { end: moment(end).endOf("day").format("YYYY-MM-DD") }
             : {}),
+          ...(start ? { starttz: moment(start).startOf("day") } : {}),
+          ...(end ? { endtz: moment(end).endOf("day") } : {}),
+
           ...(id ? { id: id } : {}),
         },
       },
@@ -80,6 +98,17 @@ export function ReportCenterModalComponent({ reportCenterModal }) {
     setLoading(false);
   };
 
+  const FilteredReportsList =
+    search !== ""
+      ? ReportsList.filter((r) =>
+          r.title.toLowerCase().includes(search.toLowerCase())
+        )
+      : ReportsList;
+
+  //Group it, create cards, and then filter out.
+
+  const grouped = _.groupBy(FilteredReportsList, "group");
+
   return (
     <div>
       <Form
@@ -88,6 +117,10 @@ export function ReportCenterModalComponent({ reportCenterModal }) {
         layout="vertical"
         form={form}
       >
+        <Input.Search
+          onChange={(e) => setSearch(e.target.value)}
+          value={search}
+        />
         <Form.Item
           name="key"
           label={t("reportcenter.labels.key")}
@@ -100,23 +133,42 @@ export function ReportCenterModalComponent({ reportCenterModal }) {
           ]}
         >
           <Radio.Group>
-            <Space
-              direction="vertical"
-              wrap
-              size="small"
-              style={{
-                maxHeight: "50vh",
-              }}
-            >
-              {Object.keys(Templates).map((key) => (
+            {/* {Object.keys(Templates).map((key) => (
                 <Radio key={key} value={key}>
                   {Templates[key].title}
                 </Radio>
+              ))} */}
+
+            <Row gutter={[16, 16]}>
+              {Object.keys(grouped).map((key) => (
+                <Col md={8} sm={12} key={key}>
+                  <Card.Grid
+                    style={{
+                      width: "100%",
+                      height: "100%",
+                      maxHeight: "33vh",
+                      overflowY: "scroll",
+                    }}
+                  >
+                    <Typography.Title level={4}>
+                      {t(`reportcenter.labels.groups.${key}`)}
+                    </Typography.Title>
+                    <ul style={{ columns: "2 auto" }}>
+                      {grouped[key].map((item) => (
+                        <li key={item.key}>
+                          <Radio key={item.key} value={item.key}>
+                            {item.title}
+                          </Radio>
+                        </li>
+                      ))}
+                    </ul>
+                  </Card.Grid>
+                </Col>
               ))}
-            </Space>
+            </Row>
           </Radio.Group>
         </Form.Item>
-        <Form.Item dependencies={["key"]}>
+        <Form.Item style={{ margin: 0, padding: 0 }} dependencies={["key"]}>
           {() => {
             const key = form.getFieldValue("key");
             if (!key) return null;
@@ -137,14 +189,14 @@ export function ReportCenterModalComponent({ reportCenterModal }) {
           shouldUpdate={(prev, cur) =>
             Templates[prev.key]?.idtype !== Templates[cur.key]?.idtype
           }
-          style={{ display: "none" }}
+          style={{ display: "none", margin: 0, padding: 0 }}
         >
           {() => {
             form.setFieldsValue({ id: null });
             return null;
           }}
         </Form.Item>
-        <Form.Item dependencies={["key"]}>
+        <Form.Item style={{ margin: 0, padding: 0 }} dependencies={["key"]}>
           {() => {
             const key = form.getFieldValue("key");
             if (!key) return null;
@@ -204,7 +256,7 @@ export function ReportCenterModalComponent({ reportCenterModal }) {
           ]}
         >
           <DatePicker.RangePicker
-            format="YYYY-MM-DD"
+            format="MM/DD/YYYY"
             ranges={DatePIckerRanges}
           />
         </Form.Item>

client/src/components/scoreboard-chart/scoreboard-chart.component.jsx

@@ -17,7 +17,7 @@ import {
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import * as Utils from "../scoreboard-targets-table/scoreboard-targets-table.util";
-
+import _ from "lodash";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
 });
@@ -52,17 +52,22 @@ export function ScoreboardChart({ sbEntriesByDate, bodyshop }) {
 
     const theValue = {
       date: moment(val).format("D dd"),
-      paintHrs: dayhrs.painthrs,
-      bodyHrs: dayhrs.bodyhrs,
-      accTargetHrs: Utils.AsOfDateTargetHours(
-        bodyshop.scoreboard_target.dailyBodyTarget +
-          bodyshop.scoreboard_target.dailyPaintTarget,
-        val
+      paintHrs: _.round(dayhrs.painthrs, 1),
+      bodyHrs: _.round(dayhrs.bodyhrs, 1),
+      accTargetHrs: _.round(
+        Utils.AsOfDateTargetHours(
+          bodyshop.scoreboard_target.dailyBodyTarget +
+            bodyshop.scoreboard_target.dailyPaintTarget,
+          val
+        ),
+        1
       ),
-      accHrs:
+      accHrs: _.round(
         acc.length > 0
           ? acc[acc.length - 1].accHrs + dayhrs.painthrs + dayhrs.bodyhrs
           : dayhrs.painthrs + dayhrs.bodyhrs,
+        1
+      ),
     };
 
     return [...acc, theValue];

client/src/components/scoreboard-entry-edit/scoreboard-entry-edit.component.jsx

@@ -1,10 +1,9 @@
-import { Button, Card, Dropdown, Form, notification } from "antd";
-import React, { useState } from "react";
 import { useMutation } from "@apollo/client";
+import { Button, Card, Dropdown, Form, InputNumber, notification } from "antd";
+import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { UPDATE_SCOREBOARD_ENTRY } from "../../graphql/scoreboard.queries";
 import FormDatePicker from "../form-date-picker/form-date-picker.component";
-import InputNumberCalculator from "../form-input-number-calculator/form-input-number-calculator.component";
 
 export default function ScoreboardEntryEdit({ entry }) {
   const [visible, setVisible] = useState(false);
@@ -64,7 +63,7 @@ export default function ScoreboardEntryEdit({ entry }) {
             },
           ]}
         >
-          <InputNumberCalculator precision={1} />
+          <InputNumber precision={1} />
         </Form.Item>
         <Form.Item
           label={t("scoreboard.fields.painthrs")}
@@ -76,7 +75,7 @@ export default function ScoreboardEntryEdit({ entry }) {
             },
           ]}
         >
-          <InputNumberCalculator precision={1} />
+          <InputNumber precision={1} />
         </Form.Item>
 
         <Button type="primary" loading={loading} htmlType="submit">

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

@@ -1,6 +1,9 @@
 import { Button, Card, Tabs } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import ShopInfoGeneral from "./shop-info.general.component";
 import ShopInfoIntakeChecklistComponent from "./shop-info.intake.component";
 import ShopInfoLaborRates from "./shop-info.laborrates.component";
@@ -11,7 +14,15 @@ import ShopInfoROStatusComponent from "./shop-info.rostatus.component";
 import ShopInfoSchedulingComponent from "./shop-info.scheduling.component";
 import ShopInfoSpeedPrint from "./shop-info.speedprint.component";
 
-export default function ShopInfoComponent({ form, saveLoading }) {
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(mapStateToProps, mapDispatchToProps)(ShopInfoComponent);
+
+export function ShopInfoComponent({ bodyshop, form, saveLoading }) {
   const { t } = useTranslation();
   return (
     <Card
@@ -53,6 +64,7 @@ export default function ShopInfoComponent({ form, saveLoading }) {
         >
           <ShopInfoResponsibilityCenterComponent form={form} />
         </Tabs.TabPane>
+
         <Tabs.TabPane key="checklists" tab={t("bodyshop.labels.checklists")}>
           <ShopInfoIntakeChecklistComponent form={form} />
         </Tabs.TabPane>

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

@@ -165,6 +165,20 @@ export default function ShopInfoGeneral({ form }) {
             );
           }}
         </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"}

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

@@ -513,6 +513,18 @@ export default function ShopInfoRbacComponent({ form }) {
         >
           <InputNumber />
         </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.rbac.shop.config")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_rbac", "shop:config"]}
+        >
+          <InputNumber />
+        </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.rbac.shop.rbac")}
           rules={[

client/src/components/time-ticket-list/time-ticket-list.component.jsx

@@ -1,9 +1,10 @@
-import { Card, Space, Table } from "antd";
 import { EditFilled } from "@ant-design/icons";
+import { Card, Space, Table } from "antd";
 import moment from "moment";
 import React, { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
+import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import {
   selectAuthLevel,
@@ -16,8 +17,6 @@ import RbacWrapper, {
   HasRbacAccess,
 } from "../rbac-wrapper/rbac-wrapper.component";
 import TimeTicketEnterButton from "../time-ticket-enter-button/time-ticket-enter-button.component";
-import { Link } from "react-router-dom";
-
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   authLevel: selectAuthLevel,
@@ -268,8 +267,12 @@ export function TimeTicketList({
               <Table.Summary.Cell />
               <Table.Summary.Cell />
               <Table.Summary.Cell />
-              <Table.Summary.Cell>{totals.productivehrs}</Table.Summary.Cell>
-              <Table.Summary.Cell>{totals.actualhrs}</Table.Summary.Cell>
+              <Table.Summary.Cell>
+                {totals.productivehrs.toFixed(1)}
+              </Table.Summary.Cell>
+              <Table.Summary.Cell>
+                {totals.actualhrs.toFixed(1)}
+              </Table.Summary.Cell>
               <Table.Summary.Cell>
                 {totals.actualhrs === 0 || !totals.actualhrs
                   ? "∞"

client/src/components/time-ticket-modal/time-ticket-modal.component.jsx

@@ -1,5 +1,5 @@
 import { useQuery } from "@apollo/client";
-import { Form, Input, InputNumber, Select } from "antd";
+import { Form, Input, InputNumber, Select, Switch } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -48,7 +48,9 @@ export function TimeTicketModalComponent({
         {emps &&
           emps.rates.map((item) => (
             <Select.Option key={item.cost_center}>
-              {item.cost_center}
+              {item.cost_center === "timetickets.labels.shift"
+                ? t(item.cost_center)
+                : item.cost_center}
             </Select.Option>
           ))}
       </Select>
@@ -111,7 +113,17 @@ export function TimeTicketModalComponent({
             },
           ]}
         >
-          <EmployeeSearchSelect options={employeeAutoCompleteOptions} />
+          <EmployeeSearchSelect
+            options={employeeAutoCompleteOptions}
+            onSelect={(value) => {
+              console.log(value);
+              const emps =
+                employeeAutoCompleteOptions &&
+                employeeAutoCompleteOptions.filter((e) => e.id === value)[0];
+              console.log(emps);
+              form.setFieldsValue({ flat_rate: emps && emps.flat_rate });
+            }}
+          />
         </Form.Item>
         <Form.Item
           shouldUpdate={(prev, cur) => prev.employeeid !== cur.employeeid}
@@ -138,6 +150,14 @@ export function TimeTicketModalComponent({
             );
           }}
         </Form.Item>
+
+        <Form.Item
+          name="flat_rate"
+          label={t("timetickets.fields.flat_rate")}
+          valuePropName="checked"
+        >
+          <Switch />
+        </Form.Item>
       </LayoutFormRow>
 
       <LayoutFormRow>

client/src/components/time-tickets-summary-employees/time-tickets-summary-employees.component.jsx

@@ -132,8 +132,8 @@ const JobRelatedTicketsTable = ({
           return {
             id: `${item.jobKey}${costCenter}`,
             item,
-            actHrs,
-            prodHrs,
+            actHrs: actHrs.toFixed(1),
+            prodHrs: prodHrs.toFixed(1),
             clockHrs,
           };
         });

client/src/components/user-validate-pw-reset/user-validate-pw-reset.component.jsx

@@ -7,6 +7,7 @@ import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import ImEXOnlineLogo from "../../assets/logo192.png";
 import { auth } from "../../firebase/firebase.utils";
+import { checkActionCode } from "@firebase/auth";
 import { validatePasswordResetStart } from "../../redux/user/user.actions";
 import { selectPasswordReset } from "../../redux/user/user.selectors";
 import AlertComponent from "../alert/alert.component";
@@ -35,7 +36,7 @@ export function UserValidatePwReset({
   useEffect(() => {
     async function checkCodeValid() {
       try {
-        const codeValid = await auth.checkActionCode(oobCode);
+        const codeValid = await checkActionCode(auth, oobCode);
         console.log("codeValid :>> ", codeValid);
         setCodeValid({ loading: false, ...codeValid });
       } catch (error) {

client/src/components/vendors-form/vendors-form.component.jsx

@@ -153,7 +153,7 @@ export default function VendorsFormComponent({
       </LayoutFormRow>
       <LayoutFormRow grow>
         <Form.Item label={t("vendors.fields.discount")} name="discount">
-          <InputNumber min={0} max={1} precision={2} />
+          <InputNumber min={0} max={1} precision={2} step={0.01} />
         </Form.Item>
         <Form.Item label={t("vendors.fields.due_date")} name="due_date">
           <InputNumber />

client/src/firebase/firebase.utils.js

@@ -1,20 +1,19 @@
-import "firebase/analytics";
-import firebase from "firebase/app";
-import "firebase/auth";
-import "firebase/database";
-import "firebase/firestore";
-import "firebase/messaging";
+import { getAnalytics, logEvent } from "firebase/analytics";
+import { initializeApp } from "firebase/app";
+import { getAuth, updatePassword, updateProfile } from "firebase/auth";
+import { getFirestore } from "firebase/firestore";
+import { tracker } from "../App/App.container";
+//import { getMessaging } from "firebase/messaging";
 import { store } from "../redux/store";
 
 const config = JSON.parse(process.env.REACT_APP_FIREBASE_CONFIG);
-firebase.initializeApp(config);
+initializeApp(config);
 
-export const auth = firebase.auth();
-export const firestore = firebase.firestore();
-export const analytics = firebase.analytics();
-
-export default firebase;
+export const auth = getAuth();
+export const firestore = getFirestore();
+export const analytics = getAnalytics();
 
+//export default firebase;
 export const getCurrentUser = () => {
   return new Promise((resolve, reject) => {
     const unsubscribe = auth.onAuthStateChanged((userAuth) => {
@@ -27,7 +26,7 @@ export const getCurrentUser = () => {
 export const updateCurrentUser = (userDetails) => {
   return new Promise((resolve, reject) => {
     const unsubscribe = auth.onAuthStateChanged((userAuth) => {
-      userAuth.updateProfile(userDetails).then((r) => {
+      updateProfile(userAuth, userDetails).then((r) => {
         unsubscribe();
         resolve(userAuth);
       });
@@ -38,32 +37,20 @@ export const updateCurrentUser = (userDetails) => {
 export const updateCurrentPassword = async (password) => {
   const currentUser = await getCurrentUser();
 
-  return currentUser.updatePassword(password);
-
-  // return new Promise((resolve, reject) => {
-  //   const unsubscribe = auth.onAuthStateChanged(
-  //     (userAuth) => {
-  //       userAuth.updatePassword(password).then((r) => {
-  //         unsubscribe();
-  //         resolve(userAuth);
-  //       });
-  //     },
-  //     (error) => reject(error)
-  //   );
-  // });
+  return updatePassword(currentUser, password);
 };
 
-let messaging;
-try {
-  messaging = firebase.messaging();
-  // Project Settings => Cloud Messaging => Web Push certificates
-  messaging.usePublicVapidKey(process.env.REACT_APP_FIREBASE_PUBLIC_VAPID_KEY);
-  console.log("[FCM UTIL] FCM initialized successfully.");
-} catch {
-  console.log("[FCM UTIL] Firebase Messaging is likely unsupported.");
-}
+//let messaging;
+// try {
+//   messaging = getMessaging();
+//   // Project Settings => Cloud Messaging => Web Push certificates
+//   messaging.usePublicVapidKey(process.env.REACT_APP_FIREBASE_PUBLIC_VAPID_KEY);
+//   console.log("[FCM UTIL] FCM initialized successfully.");
+// } catch {
+//   console.log("[FCM UTIL] Firebase Messaging is likely unsupported.");
+// }
 
-export { messaging };
+// export { messaging };
 
 export const logImEXEvent = (eventName, additionalParams, stateProp = null) => {
   const state = stateProp || store.getState();
@@ -82,59 +69,62 @@ export const logImEXEvent = (eventName, additionalParams, stateProp = null) => {
     eventName,
     eventParams
   );
-  analytics.logEvent(eventName, eventParams);
+  logEvent(analytics, eventName, eventParams);
+
+  //Log event to OpenReplay server.
+  tracker.event(eventName, eventParams);
 };
 
-if (messaging) {
-  messaging.onMessage(async (payload) => {
-    console.log("[FCM] UTILS Message received. ", payload);
-    navigator.serviceWorker.getRegistration().then((registration) => {
-      return registration.showNotification(
-        "[UTIL]" + payload.notification.title,
-        payload.notification
-      );
-    });
+// if (messaging) {
+//   onMessage(async (payload) => {
+//     console.log("[FCM] UTILS Message received. ", payload);
+//     navigator.serviceWorker.getRegistration().then((registration) => {
+//       return registration.showNotification(
+//         "[UTIL]" + payload.notification.title,
+//         payload.notification
+//       );
+//     });
 
-    // if (!payload.clientId) return;
+//     // if (!payload.clientId) return;
 
-    // // Get the client.
-    // const client = await clients.get(payload.clientId);
-    // // Exit early if we don't get the client.
-    // // Eg, if it closed.
-    // if (!client) return;
+//     // // Get the client.
+//     // const client = await clients.get(payload.clientId);
+//     // // Exit early if we don't get the client.
+//     // // Eg, if it closed.
+//     // if (!client) return;
 
-    // // Send a message to the client.
-    // console.log("Posting to client.");
-    // client.postMessage({
-    //   msg: "Hey I just got a fetch from you!",
-    //   url: payload.request.url,
-    // });
+//     // // Send a message to the client.
+//     // console.log("Posting to client.");
+//     // client.postMessage({
+//     //   msg: "Hey I just got a fetch from you!",
+//     //   url: payload.request.url,
+//     // });
 
-    // [START_EXCLUDE]
-    // Update the UI to include the received message.
-    //appendMessage(payload);
+//     // [START_EXCLUDE]
+//     // Update the UI to include the received message.
+//     //appendMessage(payload);
 
-    // [END_EXCLUDE]
-  });
+//     // [END_EXCLUDE]
+//   });
 
-  messaging.onTokenRefresh(() => {
-    messaging
-      .getToken()
-      .then((refreshedToken) => {
-        console.log("[FCM] Token refreshed.");
-        // Indicate that the new Instance ID token has not yet been sent to the
-        // app server.
-        // setTokenSentToServer(false);
-        // // Send Instance ID token to app server.
-        // sendTokenToServer(refreshedToken);
-        // // [START_EXCLUDE]
-        // // Display new Instance ID token and clear UI of all previous messages.
-        // resetUI();
-        // [END_EXCLUDE]
-      })
-      .catch((err) => {
-        console.log("[FCM] Unable to retrieve refreshed token ", err);
-        // showToken("Unable to retrieve refreshed token ", err);
-      });
-  });
-}
+//   messaging.onTokenRefresh(() => {
+//     messaging
+//       .getToken()
+//       .then((refreshedToken) => {
+//         console.log("[FCM] Token refreshed.");
+//         // Indicate that the new Instance ID token has not yet been sent to the
+//         // app server.
+//         // setTokenSentToServer(false);
+//         // // Send Instance ID token to app server.
+//         // sendTokenToServer(refreshedToken);
+//         // // [START_EXCLUDE]
+//         // // Display new Instance ID token and clear UI of all previous messages.
+//         // resetUI();
+//         // [END_EXCLUDE]
+//       })
+//       .catch((err) => {
+//         console.log("[FCM] Unable to retrieve refreshed token ", err);
+//         // showToken("Unable to retrieve refreshed token ", err);
+//       });
+//   });
+// }

client/src/graphql/accounting.queries.js

@@ -24,6 +24,10 @@ export const QUERY_JOBS_FOR_EXPORT = gql`
       clm_total
       clm_no
       ins_co_nm
+      exportlogs {
+        id
+        successful
+      }
     }
   }
 `;
@@ -37,6 +41,10 @@ export const QUERY_BILLS_FOR_EXPORT = gql`
       invoice_number
       is_credit_memo
       total
+      exportlogs {
+        id
+        successful
+      }
       job {
         id
         ro_number
@@ -73,6 +81,10 @@ export const QUERY_PAYMENTS_FOR_EXPORT = gql`
       transactionid
       paymentnum
       date
+      exportlogs {
+        id
+        successful
+      }
     }
   }
 `;

client/src/graphql/bodyshop.queries.js

@@ -93,6 +93,7 @@ export const QUERY_BODYSHOP = gql`
       features
       attach_pdf_to_email
       tt_allow_post_to_invoiced
+      cdk_configuration
       employees {
         id
         active
@@ -182,6 +183,7 @@ export const UPDATE_SHOP = gql`
         cdk_dealerid
         attach_pdf_to_email
         tt_allow_post_to_invoiced
+        cdk_configuration
         employees {
           id
           first_name

client/src/graphql/conversations.queries.js

@@ -9,6 +9,7 @@ export const CONVERSATION_LIST_SUBSCRIPTION = gql`
     ) {
       phone_num
       id
+      updated_at
       job_conversations {
         job {
           id

client/src/graphql/dms.queries.js

@@ -0,0 +1,13 @@
+import { gql } from "@apollo/client";
+
+export const SEARCH_DMS_VEHICLES = gql`
+  query SEARCH_DMS_VEHICLES($search: String) {
+    search_dms_vehicles(args: { search: $search }) {
+      id
+      make
+      makecode
+      model
+      modelcode
+    }
+  }
+`;

client/src/graphql/jobs-lines.queries.js

@@ -58,6 +58,7 @@ export const GET_LINE_TICKET_BY_PK = gql`
       jobid
       employeeid
       memo
+      flat_rate
       employee {
         id
         first_name
@@ -159,7 +160,8 @@ export const UPDATE_JOB_LINE = gql`
 
 export const GET_JOB_LINES_TO_ENTER_BILL = gql`
   query GET_JOB_LINES_TO_ENTER_BILL($id: uuid!) {
-    joblines(where: { jobid: { _eq: $id }, removed: { _eq: false } }) {
+    joblines(where: { jobid: { _eq: $id } }) {
+      removed
       id
       line_desc
       part_type

client/src/graphql/jobs.queries.js

@@ -31,6 +31,7 @@ export const QUERY_ALL_ACTIVE_JOBS = gql`
       id
       ins_co_nm
       clm_no
+      po_number
       clm_total
       owner_owing
       ro_number
@@ -318,6 +319,7 @@ export const QUERY_JOB_COSTING_DETAILS = gql`
         cost_center
         actualhrs
         productivehrs
+        flat_rate
       }
     }
   }
@@ -361,6 +363,7 @@ export const GET_JOB_BY_PK = gql`
       converted
       lbr_adjustments
       ro_number
+      po_number
       clm_total
       inproduction
       vehicleid
@@ -383,6 +386,12 @@ export const GET_JOB_BY_PK = gql`
         v_model_desc
         v_make_desc
         v_color
+        jobs {
+          id
+          ro_number
+          status
+          clm_no
+        }
       }
       available_jobs {
         id
@@ -433,6 +442,7 @@ export const GET_JOB_BY_PK = gql`
       job_totals
       ownr_fn
       ownr_ln
+      ownr_co_nm
       ownr_ea
       ownr_addr1
       ownr_addr2
@@ -448,6 +458,7 @@ export const GET_JOB_BY_PK = gql`
         id
         ownr_fn
         ownr_ln
+        ownr_co_nm
         ownr_ea
         ownr_addr1
         ownr_addr2
@@ -667,6 +678,7 @@ export const QUERY_JOB_CARD_DETAILS = gql`
       inproduction
       production_vars
       ownr_ln
+      ownr_co_nm
       ownr_ph1
       ownr_ea
       ca_gst_registrant
@@ -699,11 +711,16 @@ export const QUERY_JOB_CARD_DETAILS = gql`
         v_model_desc
         v_color
         plate_no
+        jobs {
+          id
+          clm_no
+          ro_number
+        }
       }
       actual_completion
       actual_delivery
       actual_in
-
+      po_number
       id
       ins_co_nm
       ins_ct_fn
@@ -1648,6 +1665,7 @@ export const QUERY_ALL_JOBS_PAGINATED_STATUS_FILTERED = gql`
       clm_total
       owner_owing
       ro_number
+      po_number
       scheduled_completion
       scheduled_in
       scheduled_delivery
@@ -1725,6 +1743,8 @@ export const QUERY_JOB_CLOSE_DETAILS = gql`
       actual_delivery
       scheduled_in
       actual_in
+      kmin
+      kmout
       joblines(where: { removed: { _eq: false } }) {
         id
         removed
@@ -1875,3 +1895,69 @@ export const FIND_JOBS_BY_CLAIM = gql`
     }
   }
 `;
+
+export const QUERY_JOB_EXPORT_DMS = gql`
+  query QUERY_JOB_EXPORT_DMS($id: uuid!) {
+    jobs_by_pk(id: $id) {
+      id
+      ro_number
+      po_number
+      clm_no
+      job_totals
+      ownr_fn
+      ownr_ln
+      ownr_co_nm
+      kmin
+      kmout
+      v_make_desc
+      v_model_yr
+      v_model_desc
+      area_of_damage
+    }
+  }
+`;
+export const QUERY_RELATED_ROS = gql`
+  query QUERY_RELATED_ROS($jobid: uuid!) {
+    relatedjobs(
+      where: {
+        _or: [{ childjob: { _eq: $jobid } }, { parentjob: { _eq: $jobid } }]
+      }
+    ) {
+      parentjob
+      id
+      parentjob_rel {
+        id
+        ro_number
+      }
+      childjob
+      childjob_rel {
+        id
+        ro_number
+      }
+    }
+  }
+`;
+export const INSERT_RELATED_ROS = gql`
+  mutation INSERT_RELATED_ROS($relationship: relatedjobs_insert_input!) {
+    insert_relatedjobs_one(object: $relationship) {
+      parentjob
+      id
+      parentjob_rel {
+        id
+        ro_number
+      }
+      childjob
+      childjob_rel {
+        id
+        ro_number
+      }
+    }
+  }
+`;
+export const DELETE_RELATED_RO = gql`
+  mutation DELETE_RELATED_RO($relationshipid: uuid!) {
+    delete_relatedjobs_by_pk(id: $relationshipid) {
+      id
+    }
+  }
+`;

client/src/graphql/scoreboard.queries.js

@@ -2,7 +2,10 @@ import { gql } from "@apollo/client";
 
 export const SUBSCRIPTION_SCOREBOARD = gql`
   subscription SUBSCRIPTION_SCOREBOARD($start: date!, $end: date!) {
-    scoreboard(where: { _and: { date: { _gte: $start, _lte: $end } } }) {
+    scoreboard(
+      where: { _and: { date: { _gte: $start, _lte: $end } } }
+      order_by: { date: asc }
+    ) {
       id
       painthrs
       bodyhrs

client/src/graphql/timetickets.queries.js

@@ -14,6 +14,7 @@ export const QUERY_TICKETS_BY_JOBID = gql`
       id
       memo
       jobid
+      flat_rate
       employee {
         employee_number
         first_name
@@ -42,6 +43,7 @@ export const QUERY_TIME_TICKETS_IN_RANGE = gql`
       productivehrs
       memo
       jobid
+      flat_rate
       job {
         id
         ro_number
@@ -72,6 +74,7 @@ export const INSERT_NEW_TIME_TICKET = gql`
         ciecacode
         date
         memo
+        flat_rate
       }
     }
   }
@@ -98,6 +101,7 @@ export const UPDATE_TIME_TICKET = gql`
         updated_at
         jobid
         date
+        flat_rate
         memo
       }
     }
@@ -121,6 +125,7 @@ export const QUERY_ACTIVE_TIME_TICKETS = gql`
       clockon
       memo
       cost_center
+      flat_rate
       jobid
       job {
         id

client/src/pages/accounting-qbo/accounting-qbo.page.jsx

@@ -0,0 +1,47 @@
+import React, { useEffect } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import QboAuthorizeComponent from "../../components/qbo-authorize/qbo-authorize.component";
+import {
+  setBreadcrumbs,
+  setSelectedHeader,
+} from "../../redux/application/application.actions";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+
+const mapDispatchToProps = (dispatch) => ({
+  setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
+  setSelectedHeader: (key) => dispatch(setSelectedHeader(key)),
+});
+export function AccountingReceivablesContainer({
+  bodyshop,
+  setBreadcrumbs,
+  setSelectedHeader,
+}) {
+  const { t } = useTranslation();
+
+  useEffect(() => {
+    document.title = t("titles.accounting-qbo");
+    setSelectedHeader("qbo");
+    setBreadcrumbs([
+      {
+        link: "/manage/accounting/qbo",
+        label: t("titles.bc.accounting-qbo"),
+      },
+    ]);
+  }, [t, setBreadcrumbs, setSelectedHeader]);
+
+  return (
+    <div>
+      <QboAuthorizeComponent />
+    </div>
+  );
+}
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(AccountingReceivablesContainer);

client/src/pages/dms/dms.container.jsx

@@ -1,16 +1,34 @@
-import { Result, Timeline, Space, Tag, Divider, Button } from "antd";
+import { useQuery } from "@apollo/client";
+import {
+  Button,
+  Card,
+  Col,
+  notification,
+  Result,
+  Row,
+  Select,
+  Space,
+} from "antd";
+import queryString from "query-string";
 import React, { useEffect, useState } from "react";
+import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
+import { useLocation, useHistory } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
+import SocketIO from "socket.io-client";
+import AlertComponent from "../../components/alert/alert.component";
+import DmsAllocationsSummary from "../../components/dms-allocations-summary/dms-allocations-summary.component";
+import DmsCustomerSelector from "../../components/dms-customer-selector/dms-customer-selector.component";
+import DmsLogEvents from "../../components/dms-log-events/dms-log-events.component";
+import DmsPostForm from "../../components/dms-post-form/dms-post-form.component";
+import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component";
+import { auth } from "../../firebase/firebase.utils";
+import { QUERY_JOB_EXPORT_DMS } from "../../graphql/jobs.queries";
 import {
   setBreadcrumbs,
   setSelectedHeader,
 } from "../../redux/application/application.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import { useTranslation } from "react-i18next";
-import SocketIO from "socket.io-client";
-import { auth } from "../../firebase/firebase.utils";
-import moment from "moment";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -38,12 +56,25 @@ export const socket = SocketIO(
 
 export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
   const { t } = useTranslation();
+  const [logLevel, setLogLevel] = useState("DEBUG");
+  const history = useHistory();
   const [logs, setLogs] = useState([]);
+  const search = queryString.parse(useLocation().search);
+  const { jobId } = search;
+
+  const { loading, error, data } = useQuery(QUERY_JOB_EXPORT_DMS, {
+    variables: { id: jobId },
+    skip: !jobId,
+  });
 
   useEffect(() => {
     document.title = t("titles.dms");
     setSelectedHeader("dms");
     setBreadcrumbs([
+      {
+        link: "/manage/accounting/receivables",
+        label: t("titles.bc.accounting-receivables"),
+      },
       {
         link: "/manage/dms",
         label: t("titles.bc.dms"),
@@ -52,8 +83,18 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
   }, [t, setBreadcrumbs, setSelectedHeader]);
 
   useEffect(() => {
-    socket.on("connected", () => {
-      console.log("Connected again.");
+    socket.on("connect", () => socket.emit("set-log-level", logLevel));
+    socket.on("reconnect", () => {
+      setLogs((logs) => {
+        return [
+          ...logs,
+          {
+            timestamp: new Date(),
+            level: "WARNING",
+            message: "Reconnected to CDK Export Service",
+          },
+        ];
+      });
     });
 
     socket.on("log-event", (payload) => {
@@ -61,77 +102,94 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
         return [...logs, payload];
       });
     });
+    socket.on("export-success", (payload) => {
+      notification.success({
+        message: t("jobs.successes.exported"),
+      });
+      history.push("/manage/accounting/receivables");
+    });
 
-    socket.connect();
-    socket.emit("set-log-level", "TRACE");
-
+    if (socket.disconnected) socket.connect();
     return () => {
       socket.removeAllListeners();
       socket.disconnect();
     };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
-  if (!bodyshop.cdk_dealerid) return <Result status="404" />;
+  if (loading) return <LoadingSpinner />;
+  if (error) return <AlertComponent message={error.message} type="error" />;
 
-  const dmsType = determineDmsType(bodyshop);
+  if (!jobId || !bodyshop.cdk_dealerid || !(data && data.jobs_by_pk))
+    return <Result status="404" />;
 
   return (
     <div>
-      <Button
-        onClick={() => {
-          socket.emit(
-            `${dmsType}-export-job`,
-            "752a4f5f-22ab-414b-b182-98d4e62227ef"
-          );
-        }}
-      >
-        Export
-      </Button>
+      <Row gutter={[16, 16]}>
+        <Col span={10}>
+          <DmsAllocationsSummary
+            title={`${data && data.jobs_by_pk && data.jobs_by_pk.ro_number} | ${
+              data.jobs_by_pk.ownr_fn || ""
+            } ${data.jobs_by_pk.ownr_ln || ""} ${
+              data.jobs_by_pk.ownr_co_nm || ""
+            } | ${data.jobs_by_pk.v_model_yr || ""} ${
+              data.jobs_by_pk.v_make_desc || ""
+            } ${data.jobs_by_pk.v_model_desc || ""}`}
+            socket={socket}
+            jobId={jobId}
+          />
+        </Col>
+        <Col span={14}>
+          <DmsPostForm
+            socket={socket}
+            jobId={jobId}
+            job={data && data.jobs_by_pk}
+          />
+        </Col>
 
-      <Button
-        onClick={() => {
-          setLogs([]);
-          socket.disconnect();
-          socket.connect();
-        }}
-      >
-        reconnect
-      </Button>
+        <DmsCustomerSelector />
 
-      <Timeline pending={socket.connected && "Processing..."} reverse={true}>
-        {logs.map((log, idx) => (
-          <Timeline.Item key={idx} color={LogLevelHierarchy(log.level)}>
-            <Space wrap align="start" style={{}}>
-              <Tag color={LogLevelHierarchy(log.level)}>{log.level}</Tag>
-              <span>{moment(log.timestamp).format("MM/DD/YYYY HH:MM:ss")}</span>
-              <Divider type="vertical" />
-              <span>{log.message}</span>
-            </Space>
-          </Timeline.Item>
-        ))}
-      </Timeline>
+        <Col span={24}>
+          <Card
+            title={t("jobs.labels.dms.logs")}
+            extra={
+              <Space wrap>
+                <Select
+                  placeholder="Log Level"
+                  value={logLevel}
+                  onChange={(value) => {
+                    setLogLevel(value);
+                    socket.emit("set-log-level", value);
+                  }}
+                >
+                  <Select.Option key="TRACE">TRACE</Select.Option>
+                  <Select.Option key="DEBUG">DEBUG</Select.Option>
+                  <Select.Option key="INFO">INFO</Select.Option>
+                  <Select.Option key="WARNING">WARNING</Select.Option>
+                  <Select.Option key="ERROR">ERROR</Select.Option>
+                </Select>
+                <Button onClick={() => setLogs([])}>Clear Logs</Button>
+                <Button
+                  onClick={() => {
+                    setLogs([]);
+                    socket.disconnect();
+                    socket.connect();
+                  }}
+                >
+                  Reconnect
+                </Button>
+              </Space>
+            }
+          >
+            <DmsLogEvents socket={socket} logs={logs} />
+          </Card>
+        </Col>
+      </Row>
     </div>
   );
 }
 
-function LogLevelHierarchy(level) {
-  switch (level) {
-    case "TRACE":
-      return "pink";
-    case "DEBUG":
-      return "orange";
-    case "INFO":
-      return "blue";
-    case "WARNING":
-      return "yellow";
-    case "ERROR":
-      return "red";
-    default:
-      return 0;
-  }
-}
-
-const determineDmsType = (bodyshop) => {
+export const determineDmsType = (bodyshop) => {
   if (bodyshop.cdk_dealerid) return "cdk";
   else {
     return "pbs";

client/src/pages/jobs-close/jobs-close.component.jsx

@@ -8,6 +8,7 @@ import {
   Alert,
   Divider,
   PageHeader,
+  InputNumber,
 } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -56,6 +57,8 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
           actual_in: values.actual_in,
           actual_completion: values.actual_completion,
           actual_delivery: values.actual_delivery,
+          kmin: values.kmin,
+          kmout: values.kmout,
         },
       },
       refetchQueries: ["QUERY_JOB_CLOSE_DETAILS"],
@@ -63,7 +66,7 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
     });
 
     if (!result.errors) {
-      notification["success"]({ message: t("jobs.successes.save") });
+      // notification["success"]({ message: t("jobs.successes.save") });
       //  form.resetFields();
     } else {
       notification["error"]({
@@ -112,6 +115,8 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
           actual_delivery: job.actual_delivery
             ? moment(job.actual_delivery)
             : job.scheduled_delivery && moment(job.scheduled_delivery),
+          kmin: job.kmin,
+          kmout: job.kmout,
         }}
         scrollToFirstError
       >
@@ -203,6 +208,45 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
           >
             <DateTimePicker disabled={jobRO} />
           </Form.Item>
+          {bodyshop.cdk_dealerid && (
+            <Form.Item
+              label={t("jobs.fields.kmin")}
+              name="kmin"
+              rules={[
+                {
+                  required: true,
+                },
+              ]}
+            >
+              <InputNumber precision={0} disabled={jobRO} />
+            </Form.Item>
+          )}
+          {bodyshop.cdk_dealerid && (
+            <Form.Item
+              label={t("jobs.fields.kmout")}
+              name="kmout"
+              dependencies={["kmin"]}
+              hasFeedback
+              rules={[
+                {
+                  required: true,
+                },
+                ({ getFieldValue }) => ({
+                  validator(_, value) {
+                    if (!value || getFieldValue("kmin") <= value) {
+                      return Promise.resolve();
+                    }
+
+                    return Promise.reject(
+                      new Error(t("jobs.labels.dms.kmoutnotgreaterthankmin"))
+                    );
+                  },
+                }),
+              ]}
+            >
+              <InputNumber precision={0} disabled={jobRO} />
+            </Form.Item>
+          )}
         </LayoutFormRow>
         <Divider />
         <JobsCloseLines job={job} />

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

@@ -116,6 +116,9 @@ const JobChecklistView = lazy(() =>
 const JobDeliver = lazy(() =>
   import("../jobs-deliver/jobs-delivery.page.container")
 );
+const AccountingQboCallback = lazy(() =>
+  import("../accounting-qbo/accounting-qbo.page")
+);
 const AccountingReceivables = lazy(() =>
   import("../accounting-receivables/accounting-receivables.container")
 );
@@ -333,6 +336,13 @@ export function Manage({ match, conflict, bodyshop }) {
         path={`${match.path}/shop/csi`}
         component={ShopCsiPageContainer}
       />
+
+      <Route
+        exact
+        path={`${match.path}/accounting/qbo`}
+        component={AccountingQboCallback}
+      />
+
       <Route
         exact
         path={`${match.path}/accounting/receivables`}

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

@@ -4,6 +4,7 @@ import { useTranslation } from "react-i18next";
 import ShopEmployeesContainer from "../../components/shop-employees/shop-employees.container";
 import ShopInfoContainer from "../../components/shop-info/shop-info.container";
 import ShopCsiConfig from "../../components/shop-csi-config/shop-csi-config.component";
+import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
 
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -35,20 +36,22 @@ export function ShopPage({ bodyshop, setSelectedHeader, setBreadcrumbs }) {
   }, [t, setSelectedHeader, setBreadcrumbs, bodyshop.shopname]);
 
   return (
-    <Tabs>
-      <Tabs.TabPane tab={t("bodyshop.labels.shopinfo")} key="info">
-        <ShopInfoContainer />
-      </Tabs.TabPane>
-      <Tabs.TabPane tab={t("bodyshop.labels.employees")} key="employees">
-        <ShopEmployeesContainer />
-      </Tabs.TabPane>
-      <Tabs.TabPane tab={t("bodyshop.labels.licensing")} key="licensing">
-        <ShopInfoUsersComponent />
-      </Tabs.TabPane>
-      <Tabs.TabPane tab={t("bodyshop.labels.csiq")} key="csiq">
-        <ShopCsiConfig />
-      </Tabs.TabPane>
-    </Tabs>
+    <RbacWrapper action="shop:config">
+      <Tabs>
+        <Tabs.TabPane tab={t("bodyshop.labels.shopinfo")} key="info">
+          <ShopInfoContainer />
+        </Tabs.TabPane>
+        <Tabs.TabPane tab={t("bodyshop.labels.employees")} key="employees">
+          <ShopEmployeesContainer />
+        </Tabs.TabPane>
+        <Tabs.TabPane tab={t("bodyshop.labels.licensing")} key="licensing">
+          <ShopInfoUsersComponent />
+        </Tabs.TabPane>
+        <Tabs.TabPane tab={t("bodyshop.labels.csiq")} key="csiq">
+          <ShopCsiConfig />
+        </Tabs.TabPane>
+      </Tabs>
+    </RbacWrapper>
   );
 }
 export default connect(mapStateToProps, mapDispatchToProps)(ShopPage);

client/src/redux/dms/dms.actions.js

@@ -1,6 +0,0 @@
-import DmsActions from "./dms.types";
-
-export const endLoading = (options) => ({
-  //  type: DmsActions.END_LOADING,
-  payload: options,
-});

client/src/redux/dms/dms.reducer.js

@@ -1,20 +0,0 @@
-import DmsActionTypes from "./dms.types";
-
-const INITIAL_STATE = {
-  eventLog: [],
-};
-
-const dmsReducer = (state = INITIAL_STATE, action) => {
-  switch (action.type) {
-    // case ApplicationActionTypes.SET_SELECTED_HEADER:
-    //   return {
-    //     ...state,
-    //     selectedHeader: action.payload,
-    //   };
-
-    default:
-      return state;
-  }
-};
-
-export default dmsReducer;

client/src/redux/dms/dms.sagas.js

@@ -1,14 +0,0 @@
-import { all, call } from "redux-saga/effects";
-//import DmsActionTypes from "./dms.types";
-
-export function* onCalculateScheduleLoad() {
-  //   yield takeLatest(
-  //     DmsActionTypes.CALCULATE_SCHEDULE_LOAD,
-  //     calculateScheduleLoad
-  //   );
-}
-export function* calculateScheduleLoad({ payload: end }) {}
-
-export function* dmsSagas() {
-  yield all([call()]);
-}

client/src/redux/dms/dms.selectors.js

@@ -1,8 +0,0 @@
-import { createSelector } from "reselect";
-
-const selectDms = (state) => state.dms;
-
-export const selectEventLog = createSelector(
-  [selectDms],
-  (dms) => dms.eventLog
-);

client/src/redux/dms/dms.types.js

@@ -1,4 +0,0 @@
-const DmsActionTypes = {
-  ADD_EVENT: "ADD_EVENT",
-};
-export default DmsActionTypes;

client/src/redux/messaging/messaging.sagas.js

@@ -90,8 +90,6 @@ export function* onSendMessage() {
 }
 export function* sendMessage({ payload }) {
   try {
-    yield logImEXEvent("messaging_send_message");
-
     const response = yield call(axios.post, "/sms/send", payload);
     if (response.status === 200) {
       yield put(sendMessageSuccess(payload));

client/src/redux/store.js

@@ -27,7 +27,7 @@ const middlewares = [
 if (process.env.NODE_ENV === "development") {
   middlewares.push(createLogger({ collapsed: true, diff: true }));
 }
-
+//middlewares.push(Tracker.use(trackerRedux()));
 const composeEnhancers =
   typeof window === "object" && window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__
     ? window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__({

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

@@ -1,12 +1,20 @@
 import Fingerprint2 from "@fingerprintjs/fingerprintjs";
+import * as Sentry from "@sentry/browser";
 import { notification } from "antd";
+import { auth, analytics, firestore } from "../../firebase/firebase.utils";
+import { setUserId, setUserProperties } from "firebase/analytics";
+import {
+  checkActionCode,
+  confirmPasswordReset,
+  signInWithEmailAndPassword,
+  signOut,
+} from "firebase/auth";
+import { doc } from "firebase/firestore";
 import i18next from "i18next";
 import LogRocket from "logrocket";
 import { all, call, delay, put, select, takeLatest } from "redux-saga/effects";
+import { tracker } from "../../App/App.container";
 import {
-  analytics,
-  auth,
-  firestore,
   getCurrentUser,
   logImEXEvent,
   updateCurrentUser,
@@ -28,7 +36,6 @@ import {
   validatePasswordResetSuccess,
 } from "./user.actions";
 import UserActionTypes from "./user.types";
-import * as Sentry from "@sentry/browser";
 
 export function* onEmailSignInStart() {
   yield takeLatest(UserActionTypes.EMAIL_SIGN_IN_START, signInWithEmail);
@@ -37,7 +44,7 @@ export function* signInWithEmail({ payload: { email, password } }) {
   try {
     logImEXEvent("redux_sign_in_attempt", { user: email });
 
-    const { user } = yield auth.signInWithEmailAndPassword(email, password);
+    const { user } = yield signInWithEmailAndPassword(auth, email, password);
 
     yield put(
       signInSuccess({
@@ -68,6 +75,7 @@ export function* isUserAuthenticated() {
     }
 
     LogRocket.identify(user.email);
+    tracker.setUserID(user.email);
     yield put(
       signInSuccess({
         uid: user.uid,
@@ -88,7 +96,7 @@ export function* signOutStart() {
   try {
     logImEXEvent("redux_sign_out");
 
-    yield auth.signOut();
+    yield signOut(auth);
     yield put(signOutSuccess());
     localStorage.removeItem("token");
   } catch (error) {
@@ -102,10 +110,7 @@ export function* onUpdateUserDetails() {
 export function* updateUserDetails(userDetails) {
   try {
     const updatedDetails = yield updateCurrentUser(userDetails.payload);
-    console.log(
-      "🚀  ~ file: user.sagas.js  ~ line 104  ~ updatedDetails",
-      updatedDetails
-    );
+
     yield put(updateUserDetailsSuccess(updatedDetails));
     notification.open({
       type: "success",
@@ -120,7 +125,7 @@ export function* onSetInstanceId() {
 }
 export function* setInstanceIdSaga({ payload: uid }) {
   try {
-    const userInstanceRef = firestore.doc(`userInstance/${uid}`);
+    const userInstanceRef = doc(firestore, `userInstance/${uid}`);
 
     const fingerprint = Fingerprint2.x64hash128(
       (yield Fingerprint2.getPromise({})).map((c) => c.value).join(""),
@@ -145,7 +150,7 @@ export function* onCheckInstanceId() {
 }
 export function* checkInstanceIdSaga({ payload: uid }) {
   try {
-    const userInstanceRef = firestore.doc(`userInstance/${uid}`);
+    const userInstanceRef = doc(firestore, `userInstance/${uid}`);
 
     const snapshot = yield userInstanceRef.get();
     let fingerprint = yield select((state) => state.user.fingerprint);
@@ -169,6 +174,8 @@ export function* onSignInSuccess() {
 
 export function* signInSuccessSaga({ payload }) {
   LogRocket.identify(payload.email);
+  tracker.setUserID(payload.email);
+
   try {
     // window.$crisp.push(["set", "user:email", [payload.email]]);
     console.log("$crisp set nickname", [payload.displayName || payload.email]);
@@ -189,8 +196,8 @@ export function* signInSuccessSaga({ payload }) {
   }
 
   // if (!payload.email.includes("@imex.")) yield put(setInstanceId(payload.uid));
-  analytics.setUserId(payload.email);
-  analytics.setUserProperties(payload);
+  setUserId(analytics, payload.email);
+  setUserProperties(analytics, payload);
   yield logImEXEvent("redux_sign_in_success");
 }
 
@@ -206,7 +213,7 @@ export function* onSendPasswordResetStart() {
 }
 export function* sendPasswordResetEmail({ payload }) {
   try {
-    yield auth.sendPasswordResetEmail(payload, {
+    yield sendPasswordResetEmail(payload, {
       url: "https://imex.online/passwordreset",
     });
 
@@ -224,8 +231,8 @@ export function* onValidatePasswordResetStart() {
 }
 export function* validatePasswordResetStart({ payload: { password, code } }) {
   try {
-    auth.checkActionCode(code);
-    yield auth.confirmPasswordReset(code, password);
+    checkActionCode(auth, code);
+    yield confirmPasswordReset(auth, code, password);
     yield put(validatePasswordResetSuccess());
   } catch (error) {
     console.log("function*validatePasswordResetStart -> error", error);

client/src/translations/en_us/common.json

@@ -96,6 +96,9 @@
 				"jobimported": "Job imported.",
 				"jobinproductionchange": "Job production status set to {{inproduction}}",
 				"jobmodifylbradj": "Labor adjustments modified.",
+				"jobnoteadded": "Note added to job.",
+				"jobnotedeleted": "Note deleted from job.",
+				"jobnoteupdated": "Note updated on job.",
 				"jobspartsorder": "Parts order {{order_number}} added to job.",
 				"jobspartsreturn": "Parts return {{order_number}} added to job.",
 				"jobstatuschange": "Job status changed to {{status}}.",
@@ -179,6 +182,7 @@
 				"noneselected": "No bill selected.",
 				"onlycmforinvoiced": "Only credit memos can be entered for any job that has been invoiced,  exported,  or voided.",
 				"retailtotal": "Bills Retail Total",
+				"savewithdiscrepancy": "You are about to save this bill with a discrepancy.  The system will continue to use the calculated amount using the bill lines.  Press cancel to return to the bill.",
 				"state_tax": "Provincial/State Tax",
 				"subtotal": "Subtotal",
 				"totalreturns": "Total Returns"
@@ -231,6 +235,18 @@
 				"deliver": {
 					"templates": "Delivery Templates"
 				},
+				"dms": {
+					"cashierid": "Cashier ID",
+					"default_journal": "Default Journal",
+					"dms_acctnumber": "DMS Account #",
+					"dms_wip_acctnumber": "DMS W.I.P.  Account #",
+					"generic_customer_number": "Generic Customer Number",
+					"itc_federal": "Federal Tax is ITC?",
+					"itc_local": "Local Tax is ITC?",
+					"itc_state": "State Tax is ITC?",
+					"mappingname": "DMS Mapping Name",
+					"srcco": "Source Company #/Dealer #"
+				},
 				"email": "General Shop Email",
 				"enforce_class": "Enforce Class on Conversion?",
 				"enforce_referral": "Enforce Referrals",
@@ -346,6 +362,7 @@
 						"view": "Shift Clock -> View"
 					},
 					"shop": {
+						"config": "Shop -> Config",
 						"dashboard": "Shop -> Dashboard",
 						"rbac": "Shop -> RBAC",
 						"templates": "Shop -> Templates",
@@ -375,6 +392,10 @@
 					"ar": "Accounts Receivable",
 					"ats": "ATS",
 					"federal_tax": "Federal Tax",
+					"la1": "LA1",
+					"la2": "LA2",
+					"la3": "LA3",
+					"la4": "LA4",
 					"lab": "Body",
 					"lad": "Diagnostic",
 					"lae": "Electrical",
@@ -396,6 +417,7 @@
 					"pap": "OEM Partial",
 					"par": "Recored",
 					"pas": "Sublet",
+					"pasl": "Sublet (L)",
 					"refund": "Refund",
 					"sales_tax_codes": {
 						"code": "Code",
@@ -467,6 +489,14 @@
 				"defaultcostsmapping": "Default Costs Mapping",
 				"defaultprofitsmapping": "Default Profits Mapping",
 				"deliverchecklist": "Delivery Checklist",
+				"dms": {
+					"cdk": {
+						"payers": "CDK Payers"
+					},
+					"cdk_dealerid": "CDK Dealer ID",
+					"title": "DMS"
+				},
+				"emaillater": "Email Later",
 				"employees": "Employees",
 				"insurancecos": "Insurance Companies",
 				"intakechecklist": "Intake Checklist",
@@ -478,6 +508,7 @@
 				"notespresets": "Notes Presets",
 				"orderstatuses": "Order Statuses",
 				"partslocations": "Parts Locations",
+				"printlater": "Print Later",
 				"rbac": "Role Based Access Control",
 				"responsibilitycenters": {
 					"costs": "Cost Centers",
@@ -658,7 +689,8 @@
 			"status": {
 				"in": "Available",
 				"inservice": "In Service",
-				"out": "Rented"
+				"out": "Rented",
+				"sold": "Sold"
 			},
 			"successes": {
 				"saved": "Courtesy Car saved successfully."
@@ -675,7 +707,8 @@
 				"notfoundtitle": "No survey found."
 			},
 			"fields": {
-				"completedon": "Completed On"
+				"completedon": "Completed On",
+				"created_at": "Created At"
 			},
 			"labels": {
 				"nologgedinuser": "Please log out of ImEX Online",
@@ -815,6 +848,9 @@
 		"exportlogs": {
 			"fields": {
 				"createdat": "Created At"
+			},
+			"labels": {
+				"attempts": "Export Attempts"
 			}
 		},
 		"general": {
@@ -1011,7 +1047,7 @@
 					"PAP": "OEM Partial",
 					"PAR": "Recored",
 					"PAS": "Sublet",
-					"PASL": "Sublet"
+					"PASL": "Sublet (L)"
 				},
 				"profitcenter_labor": "Profit Center: Labor",
 				"profitcenter_part": "Profit Center: Part",
@@ -1051,6 +1087,17 @@
 				"changestatus": "Change Status",
 				"convert": "Convert",
 				"deliver": "Deliver",
+				"dms": {
+					"addpayer": "Add Payer",
+					"createnewcustomer": "Create New Customer",
+					"findmakemodelcode": "Find Make/Model Code",
+					"getmakes": "",
+					"post": "Post",
+					"refetchmakesmodels": "Refetch Make and Model Codes",
+					"usegeneric": "Use Generic Customer",
+					"useselected": "Use Selected Customer"
+				},
+				"dmsautoallocate": "DMS Auto Allocate",
 				"export": "Export",
 				"exportcustdata": "Export Customer Data",
 				"exportselected": "Export Selected",
@@ -1107,6 +1154,29 @@
 				"adjustment_bottom_line": "Adjustments",
 				"adjustmenthours": "Adjustment Hours",
 				"alt_transport": "Alt. Trans.",
+				"area_of_damage_impact": {
+					"10": "Left Front Side",
+					"11": "Left Front Corner",
+					"12": "Front",
+					"13": "Rollover",
+					"14": "Unknown",
+					"15": "Total Loss",
+					"16": "Non-collision",
+					"25": "Hood",
+					"26": "Deck-lid",
+					"27": "Roof",
+					"28": "Undercarriage",
+					"34": "All Over",
+					"01": "Right Front Corner",
+					"02": "Right Front Side",
+					"03": "Right Side",
+					"04": "Right Rear Side",
+					"05": "Right Rear Corner",
+					"06": "Rear",
+					"07": "Left Rear Corner",
+					"08": "Left Rear Side",
+					"09": "Left Side"
+				},
 				"ca_bc_pvrt": "PVRT",
 				"ca_customer_gst": "Customer Portion of GST",
 				"ca_gst_registrant": "GST Registrant",
@@ -1130,6 +1200,29 @@
 				"ded_amt": "Deductible",
 				"ded_status": "Deductible Status",
 				"depreciation_taxes": "Depreciation/Taxes",
+				"dms": {
+					"address": "Customer Address",
+					"center": "Center",
+					"cost": "Cost",
+					"cost_dms_acctnumber": "Cost DMS Acct #",
+					"dms_make": "DMS Make",
+					"dms_model": "DMS Model",
+					"dms_wip_acctnumber": "Cost WIP DMS Acct #",
+					"id": "DMS ID",
+					"journal": "Journal #",
+					"name1": "Customer Name",
+					"payer": {
+						"amount": "Amount",
+						"control_type": "Control Type",
+						"controlnumber": "Control Number",
+						"dms_acctnumber": "DMS Account #",
+						"name": "Payer Name"
+					},
+					"sale": "Sale",
+					"sale_dms_acctnumber": "Sale DMS Acct #",
+					"story": "Story",
+					"vinowner": "VIN Owner"
+				},
 				"driveable": "Driveable",
 				"employee_body": "Body",
 				"employee_csr": "Customer Service Rep.",
@@ -1349,6 +1442,14 @@
 				"deliverchecklist": "Deliver Checklist",
 				"difference": "Difference",
 				"diskscan": "Scan Disk for Estimates",
+				"dms": {
+					"defaultstory": "Bodyshop RO {{ro_number}}.  Damage to $t(jobs.fields.area_of_damage_impact.{{area_of_damage}}).",
+					"kmoutnotgreaterthankmin": "Mileage out must be greater than mileage in.",
+					"logs": "Logs",
+					"notallocated": "Not Allocated",
+					"postingform": "Posting Form",
+					"totalallocated": "Total Amount Allocated"
+				},
 				"documents": "Documents",
 				"documents-images": "Images",
 				"documents-other": "Other Documents",
@@ -1396,7 +1497,7 @@
 					"partstotal": "This is the total of all parts and sublet amounts on the vehicle (some of these may require an in-house invoice).<br/>\nItems such as shop and paint materials, labor online lines, etc. are not included in this total.",
 					"totalreturns": "The total amount of returns created for this job."
 				},
-				"prt_dsmk_total": "Line Item Markup",
+				"prt_dsmk_total": "Line Item Adjustment",
 				"rates": "Rates",
 				"rates_subtotal": "All Rates Subtotal",
 				"reconciliation": {
@@ -1412,6 +1513,7 @@
 					"removedpartsstrikethrough": "Strike through lines represent parts that have been removed from the estimate. They are included for completeness of reconciliation."
 				},
 				"reconciliationheader": "Parts & Sublet Reconciliation",
+				"relatedros": "Related ROs",
 				"returntotals": "Return Totals",
 				"rosaletotal": "RO  Parts Total",
 				"sale_labor": "Sales - Labor",
@@ -1912,6 +2014,11 @@
 			"payments": {
 				"ca_bc_etf_table": "ICBC ETF Table"
 			},
+			"subjects": {
+				"jobs": {
+					"parts_order": "$t(printcenter.jobs.parts_order) PO: {{ro_number}}"
+				}
+			},
 			"vendors": {
 				"purchases_by_vendor_detailed": "Purchases by Vendor - Detailed",
 				"purchases_by_vendor_summary": "Purchases by Vendor - Summary"
@@ -1976,10 +2083,18 @@
 				"employee": "Employee",
 				"filterson": "Filters on {{object}}: {{field}}",
 				"generateasemail": "Generate as Email?",
+				"groups": {
+					"customers": "Customers",
+					"jobs": "Jobs & Costing",
+					"payroll": "Payroll",
+					"purchases": "Purchases",
+					"sales": "Sales"
+				},
 				"key": "Report",
 				"objects": {
 					"appointments": "Appointments",
 					"bills": "Bills",
+					"csi": "CSI",
 					"exportlogs": "Export Logs",
 					"jobs": "Jobs",
 					"parts_orders": "Parts Orders",
@@ -1995,6 +2110,7 @@
 				"attendance_employee": "Employee Attendance",
 				"attendance_summary": "Attendance Summary (All Employees)",
 				"credits_not_received_date": "Credits not Received by Date",
+				"csi": "CSI Responses",
 				"estimator_detail": "Jobs by Estimator (Detail)",
 				"estimator_summary": "Jobs by Estimator (Summary)",
 				"export_payables": "Export Log - Payables",
@@ -2090,6 +2206,11 @@
 				"updated": "Scoreboard updated."
 			}
 		},
+		"scoredboard": {
+			"successes": {
+				"updated": "Scoreboard entry updated."
+			}
+		},
 		"tech": {
 			"fields": {
 				"employeeid": "Employee ID",
@@ -2133,6 +2254,7 @@
 				"date": "Ticket Date",
 				"efficiency": "Efficiency",
 				"employee": "Employee",
+				"flat_rate": "Flat Rate?",
 				"memo": "Memo",
 				"productivehrs": "Productive Hours",
 				"ro_number": "Job to Post Against"
@@ -2183,6 +2305,7 @@
 				"courtesycars-detail": "Courtesy Car {{number}}",
 				"courtesycars-new": "New Courtesy Car",
 				"dashboard": "Dashboard",
+				"dms": "DMS Export",
 				"export-logs": "Export Logs",
 				"jobs": "Jobs",
 				"jobs-active": "Active Jobs",
@@ -2221,6 +2344,7 @@
 			"courtesycars-create": "New Courtesy Car | $t(titles.app)",
 			"courtesycars-detail": "Courtesy Car {{id}} | $t(titles.app)",
 			"dashboard": "Dashboard | $t(titles.app)",
+			"dms": "DMS Export | $t(titles.app)",
 			"export-logs": "Export Logs | $t(titles.app)",
 			"jobs": "Active Jobs | $t(titles.app)",
 			"jobs-admin": "Job {{ro_number}} - Admin | $t(titles.app)",

client/src/translations/es/common.json

@@ -96,6 +96,9 @@
 				"jobimported": "",
 				"jobinproductionchange": "",
 				"jobmodifylbradj": "",
+				"jobnoteadded": "",
+				"jobnotedeleted": "",
+				"jobnoteupdated": "",
 				"jobspartsorder": "",
 				"jobspartsreturn": "",
 				"jobstatuschange": "",
@@ -179,6 +182,7 @@
 				"noneselected": "",
 				"onlycmforinvoiced": "",
 				"retailtotal": "",
+				"savewithdiscrepancy": "",
 				"state_tax": "",
 				"subtotal": "",
 				"totalreturns": ""
@@ -231,6 +235,18 @@
 				"deliver": {
 					"templates": ""
 				},
+				"dms": {
+					"cashierid": "",
+					"default_journal": "",
+					"dms_acctnumber": "",
+					"dms_wip_acctnumber": "",
+					"generic_customer_number": "",
+					"itc_federal": "",
+					"itc_local": "",
+					"itc_state": "",
+					"mappingname": "",
+					"srcco": ""
+				},
 				"email": "",
 				"enforce_class": "",
 				"enforce_referral": "",
@@ -346,6 +362,7 @@
 						"view": ""
 					},
 					"shop": {
+						"config": "",
 						"dashboard": "",
 						"rbac": "",
 						"templates": "",
@@ -375,6 +392,10 @@
 					"ar": "",
 					"ats": "",
 					"federal_tax": "",
+					"la1": "",
+					"la2": "",
+					"la3": "",
+					"la4": "",
 					"lab": "",
 					"lad": "",
 					"lae": "",
@@ -396,6 +417,7 @@
 					"pap": "",
 					"par": "",
 					"pas": "",
+					"pasl": "",
 					"refund": "",
 					"sales_tax_codes": {
 						"code": "",
@@ -467,6 +489,14 @@
 				"defaultcostsmapping": "",
 				"defaultprofitsmapping": "",
 				"deliverchecklist": "",
+				"dms": {
+					"cdk": {
+						"payers": ""
+					},
+					"cdk_dealerid": "",
+					"title": ""
+				},
+				"emaillater": "",
 				"employees": "",
 				"insurancecos": "",
 				"intakechecklist": "",
@@ -478,6 +508,7 @@
 				"notespresets": "",
 				"orderstatuses": "",
 				"partslocations": "",
+				"printlater": "",
 				"rbac": "",
 				"responsibilitycenters": {
 					"costs": "",
@@ -658,7 +689,8 @@
 			"status": {
 				"in": "",
 				"inservice": "",
-				"out": ""
+				"out": "",
+				"sold": ""
 			},
 			"successes": {
 				"saved": ""
@@ -675,7 +707,8 @@
 				"notfoundtitle": ""
 			},
 			"fields": {
-				"completedon": ""
+				"completedon": "",
+				"created_at": ""
 			},
 			"labels": {
 				"nologgedinuser": "",
@@ -815,6 +848,9 @@
 		"exportlogs": {
 			"fields": {
 				"createdat": ""
+			},
+			"labels": {
+				"attempts": ""
 			}
 		},
 		"general": {
@@ -1051,6 +1087,17 @@
 				"changestatus": "Cambiar Estado",
 				"convert": "Convertir",
 				"deliver": "",
+				"dms": {
+					"addpayer": "",
+					"createnewcustomer": "",
+					"findmakemodelcode": "",
+					"getmakes": "",
+					"post": "",
+					"refetchmakesmodels": "",
+					"usegeneric": "",
+					"useselected": ""
+				},
+				"dmsautoallocate": "",
 				"export": "",
 				"exportcustdata": "",
 				"exportselected": "",
@@ -1107,6 +1154,29 @@
 				"adjustment_bottom_line": "Ajustes",
 				"adjustmenthours": "",
 				"alt_transport": "",
+				"area_of_damage_impact": {
+					"10": "",
+					"11": "",
+					"12": "",
+					"13": "",
+					"14": "",
+					"15": "",
+					"16": "",
+					"25": "",
+					"26": "",
+					"27": "",
+					"28": "",
+					"34": "",
+					"01": "",
+					"02": "",
+					"03": "",
+					"04": "",
+					"05": "",
+					"06": "",
+					"07": "",
+					"08": "",
+					"09": ""
+				},
 				"ca_bc_pvrt": "",
 				"ca_customer_gst": "",
 				"ca_gst_registrant": "",
@@ -1130,6 +1200,29 @@
 				"ded_amt": "Deducible",
 				"ded_status": "Estado deducible",
 				"depreciation_taxes": "Depreciación / Impuestos",
+				"dms": {
+					"address": "",
+					"center": "",
+					"cost": "",
+					"cost_dms_acctnumber": "",
+					"dms_make": "",
+					"dms_model": "",
+					"dms_wip_acctnumber": "",
+					"id": "",
+					"journal": "",
+					"name1": "",
+					"payer": {
+						"amount": "",
+						"control_type": "",
+						"controlnumber": "",
+						"dms_acctnumber": "",
+						"name": ""
+					},
+					"sale": "",
+					"sale_dms_acctnumber": "",
+					"story": "",
+					"vinowner": ""
+				},
 				"driveable": "",
 				"employee_body": "",
 				"employee_csr": "Representante de servicio al cliente.",
@@ -1349,6 +1442,14 @@
 				"deliverchecklist": "",
 				"difference": "",
 				"diskscan": "",
+				"dms": {
+					"defaultstory": "",
+					"kmoutnotgreaterthankmin": "",
+					"logs": "",
+					"notallocated": "",
+					"postingform": "",
+					"totalallocated": ""
+				},
 				"documents": "documentos",
 				"documents-images": "",
 				"documents-other": "",
@@ -1412,6 +1513,7 @@
 					"removedpartsstrikethrough": ""
 				},
 				"reconciliationheader": "",
+				"relatedros": "",
 				"returntotals": "",
 				"rosaletotal": "",
 				"sale_labor": "",
@@ -1912,6 +2014,11 @@
 			"payments": {
 				"ca_bc_etf_table": ""
 			},
+			"subjects": {
+				"jobs": {
+					"parts_order": ""
+				}
+			},
 			"vendors": {
 				"purchases_by_vendor_detailed": "",
 				"purchases_by_vendor_summary": ""
@@ -1976,10 +2083,18 @@
 				"employee": "",
 				"filterson": "",
 				"generateasemail": "",
+				"groups": {
+					"customers": "",
+					"jobs": "",
+					"payroll": "",
+					"purchases": "",
+					"sales": ""
+				},
 				"key": "",
 				"objects": {
 					"appointments": "",
 					"bills": "",
+					"csi": "",
 					"exportlogs": "",
 					"jobs": "",
 					"parts_orders": "",
@@ -1995,6 +2110,7 @@
 				"attendance_employee": "",
 				"attendance_summary": "",
 				"credits_not_received_date": "",
+				"csi": "",
 				"estimator_detail": "",
 				"estimator_summary": "",
 				"export_payables": "",
@@ -2090,6 +2206,11 @@
 				"updated": ""
 			}
 		},
+		"scoredboard": {
+			"successes": {
+				"updated": ""
+			}
+		},
 		"tech": {
 			"fields": {
 				"employeeid": "",
@@ -2133,6 +2254,7 @@
 				"date": "",
 				"efficiency": "",
 				"employee": "",
+				"flat_rate": "",
 				"memo": "",
 				"productivehrs": "",
 				"ro_number": ""
@@ -2183,6 +2305,7 @@
 				"courtesycars-detail": "",
 				"courtesycars-new": "",
 				"dashboard": "",
+				"dms": "",
 				"export-logs": "",
 				"jobs": "",
 				"jobs-active": "",
@@ -2221,6 +2344,7 @@
 			"courtesycars-create": "",
 			"courtesycars-detail": "",
 			"dashboard": "",
+			"dms": "",
 			"export-logs": "",
 			"jobs": "Todos los trabajos | $t(titles.app)",
 			"jobs-admin": "",

client/src/translations/fr/common.json

@@ -96,6 +96,9 @@
 				"jobimported": "",
 				"jobinproductionchange": "",
 				"jobmodifylbradj": "",
+				"jobnoteadded": "",
+				"jobnotedeleted": "",
+				"jobnoteupdated": "",
 				"jobspartsorder": "",
 				"jobspartsreturn": "",
 				"jobstatuschange": "",
@@ -179,6 +182,7 @@
 				"noneselected": "",
 				"onlycmforinvoiced": "",
 				"retailtotal": "",
+				"savewithdiscrepancy": "",
 				"state_tax": "",
 				"subtotal": "",
 				"totalreturns": ""
@@ -231,6 +235,18 @@
 				"deliver": {
 					"templates": ""
 				},
+				"dms": {
+					"cashierid": "",
+					"default_journal": "",
+					"dms_acctnumber": "",
+					"dms_wip_acctnumber": "",
+					"generic_customer_number": "",
+					"itc_federal": "",
+					"itc_local": "",
+					"itc_state": "",
+					"mappingname": "",
+					"srcco": ""
+				},
 				"email": "",
 				"enforce_class": "",
 				"enforce_referral": "",
@@ -346,6 +362,7 @@
 						"view": ""
 					},
 					"shop": {
+						"config": "",
 						"dashboard": "",
 						"rbac": "",
 						"templates": "",
@@ -375,6 +392,10 @@
 					"ar": "",
 					"ats": "",
 					"federal_tax": "",
+					"la1": "",
+					"la2": "",
+					"la3": "",
+					"la4": "",
 					"lab": "",
 					"lad": "",
 					"lae": "",
@@ -396,6 +417,7 @@
 					"pap": "",
 					"par": "",
 					"pas": "",
+					"pasl": "",
 					"refund": "",
 					"sales_tax_codes": {
 						"code": "",
@@ -467,6 +489,14 @@
 				"defaultcostsmapping": "",
 				"defaultprofitsmapping": "",
 				"deliverchecklist": "",
+				"dms": {
+					"cdk": {
+						"payers": ""
+					},
+					"cdk_dealerid": "",
+					"title": ""
+				},
+				"emaillater": "",
 				"employees": "",
 				"insurancecos": "",
 				"intakechecklist": "",
@@ -478,6 +508,7 @@
 				"notespresets": "",
 				"orderstatuses": "",
 				"partslocations": "",
+				"printlater": "",
 				"rbac": "",
 				"responsibilitycenters": {
 					"costs": "",
@@ -658,7 +689,8 @@
 			"status": {
 				"in": "",
 				"inservice": "",
-				"out": ""
+				"out": "",
+				"sold": ""
 			},
 			"successes": {
 				"saved": ""
@@ -675,7 +707,8 @@
 				"notfoundtitle": ""
 			},
 			"fields": {
-				"completedon": ""
+				"completedon": "",
+				"created_at": ""
 			},
 			"labels": {
 				"nologgedinuser": "",
@@ -815,6 +848,9 @@
 		"exportlogs": {
 			"fields": {
 				"createdat": ""
+			},
+			"labels": {
+				"attempts": ""
 			}
 		},
 		"general": {
@@ -1051,6 +1087,17 @@
 				"changestatus": "Changer le statut",
 				"convert": "Convertir",
 				"deliver": "",
+				"dms": {
+					"addpayer": "",
+					"createnewcustomer": "",
+					"findmakemodelcode": "",
+					"getmakes": "",
+					"post": "",
+					"refetchmakesmodels": "",
+					"usegeneric": "",
+					"useselected": ""
+				},
+				"dmsautoallocate": "",
 				"export": "",
 				"exportcustdata": "",
 				"exportselected": "",
@@ -1107,6 +1154,29 @@
 				"adjustment_bottom_line": "Ajustements",
 				"adjustmenthours": "",
 				"alt_transport": "",
+				"area_of_damage_impact": {
+					"10": "",
+					"11": "",
+					"12": "",
+					"13": "",
+					"14": "",
+					"15": "",
+					"16": "",
+					"25": "",
+					"26": "",
+					"27": "",
+					"28": "",
+					"34": "",
+					"01": "",
+					"02": "",
+					"03": "",
+					"04": "",
+					"05": "",
+					"06": "",
+					"07": "",
+					"08": "",
+					"09": ""
+				},
 				"ca_bc_pvrt": "",
 				"ca_customer_gst": "",
 				"ca_gst_registrant": "",
@@ -1130,6 +1200,29 @@
 				"ded_amt": "Déductible",
 				"ded_status": "Statut de franchise",
 				"depreciation_taxes": "Amortissement / taxes",
+				"dms": {
+					"address": "",
+					"center": "",
+					"cost": "",
+					"cost_dms_acctnumber": "",
+					"dms_make": "",
+					"dms_model": "",
+					"dms_wip_acctnumber": "",
+					"id": "",
+					"journal": "",
+					"name1": "",
+					"payer": {
+						"amount": "",
+						"control_type": "",
+						"controlnumber": "",
+						"dms_acctnumber": "",
+						"name": ""
+					},
+					"sale": "",
+					"sale_dms_acctnumber": "",
+					"story": "",
+					"vinowner": ""
+				},
 				"driveable": "",
 				"employee_body": "",
 				"employee_csr": "représentant du service à la clientèle",
@@ -1349,6 +1442,14 @@
 				"deliverchecklist": "",
 				"difference": "",
 				"diskscan": "",
+				"dms": {
+					"defaultstory": "",
+					"kmoutnotgreaterthankmin": "",
+					"logs": "",
+					"notallocated": "",
+					"postingform": "",
+					"totalallocated": ""
+				},
 				"documents": "Les documents",
 				"documents-images": "",
 				"documents-other": "",
@@ -1412,6 +1513,7 @@
 					"removedpartsstrikethrough": ""
 				},
 				"reconciliationheader": "",
+				"relatedros": "",
 				"returntotals": "",
 				"rosaletotal": "",
 				"sale_labor": "",
@@ -1912,6 +2014,11 @@
 			"payments": {
 				"ca_bc_etf_table": ""
 			},
+			"subjects": {
+				"jobs": {
+					"parts_order": ""
+				}
+			},
 			"vendors": {
 				"purchases_by_vendor_detailed": "",
 				"purchases_by_vendor_summary": ""
@@ -1976,10 +2083,18 @@
 				"employee": "",
 				"filterson": "",
 				"generateasemail": "",
+				"groups": {
+					"customers": "",
+					"jobs": "",
+					"payroll": "",
+					"purchases": "",
+					"sales": ""
+				},
 				"key": "",
 				"objects": {
 					"appointments": "",
 					"bills": "",
+					"csi": "",
 					"exportlogs": "",
 					"jobs": "",
 					"parts_orders": "",
@@ -1995,6 +2110,7 @@
 				"attendance_employee": "",
 				"attendance_summary": "",
 				"credits_not_received_date": "",
+				"csi": "",
 				"estimator_detail": "",
 				"estimator_summary": "",
 				"export_payables": "",
@@ -2090,6 +2206,11 @@
 				"updated": ""
 			}
 		},
+		"scoredboard": {
+			"successes": {
+				"updated": ""
+			}
+		},
 		"tech": {
 			"fields": {
 				"employeeid": "",
@@ -2133,6 +2254,7 @@
 				"date": "",
 				"efficiency": "",
 				"employee": "",
+				"flat_rate": "",
 				"memo": "",
 				"productivehrs": "",
 				"ro_number": ""
@@ -2183,6 +2305,7 @@
 				"courtesycars-detail": "",
 				"courtesycars-new": "",
 				"dashboard": "",
+				"dms": "",
 				"export-logs": "",
 				"jobs": "",
 				"jobs-active": "",
@@ -2221,6 +2344,7 @@
 			"courtesycars-create": "",
 			"courtesycars-detail": "",
 			"dashboard": "",
+			"dms": "",
 			"export-logs": "",
 			"jobs": "Tous les emplois | $t(titles.app)",
 			"jobs-admin": "",

client/src/utils/AuditTrailMappings.js

@@ -26,6 +26,9 @@ const AuditTrailMapping = {
     i18n.t("audit_trail.messages.jobinproductionchange", { inproduction }),
   jobchecklist: (type, inproduction, status) =>
     i18n.t("audit_trail.messages.jobchecklist", { type, inproduction, status }),
+  jobnoteadded: () => i18n.t("audit_trail.messages.jobnoteadded"),
+  jobnoteupdated: () => i18n.t("audit_trail.messages.jobnoteupdated"),
+  jobnotedeleted: () => i18n.t("audit_trail.messages.jobnotedeleted"),
 };
 
 export default AuditTrailMapping;

client/src/utils/CleanAxios.js

@@ -14,6 +14,7 @@ export const axiosAuthInterceptorId = axios.interceptors.request.use(
         config.headers.Authorization = `Bearer ${token}`;
       }
     }
+
     return config;
   },
   (error) => Promise.reject(error)

client/src/utils/TemplateConstants.js

@@ -391,7 +391,9 @@ export const TemplateList = (type, context) => {
             title: i18n.t("printcenter.jobs.parts_order"),
             description: "Parts Order",
             key: "parts_order",
-            subject: i18n.t("printcenter.jobs.parts_order"),
+            subject: i18n.t("printcenter.subjects.jobs.parts_order", {
+              ro_number: context && context.job && context.job.ro_number,
+            }),
             disabled: false,
           },
           parts_return_slip: {
@@ -417,222 +419,6 @@ export const TemplateList = (type, context) => {
     ...(!type || type === "csi" ? {} : {}),
     ...(!type || type === "report_center"
       ? {
-          payments_by_date: {
-            title: i18n.t("reportcenter.templates.payments_by_date"),
-            subject: i18n.t("reportcenter.templates.payments_by_date"),
-            key: "payments_by_date",
-            disabled: false,
-            rangeFilter: {
-              object: i18n.t("reportcenter.labels.objects.payments"),
-              field: i18n.t("payments.fields.date"),
-            },
-          },
-          payments_by_date_type: {
-            title: i18n.t("reportcenter.templates.payments_by_date_type"),
-            subject: i18n.t("reportcenter.templates.payments_by_date_type"),
-            key: "payments_by_date_type",
-            disabled: false,
-            rangeFilter: {
-              object: i18n.t("reportcenter.labels.objects.payments"),
-              field: i18n.t("payments.fields.date"),
-            },
-          },
-          purchases_by_date_range_detail: {
-            title: i18n.t(
-              "reportcenter.templates.purchases_by_date_range_detail"
-            ),
-            subject: i18n.t(
-              "reportcenter.templates.purchases_by_date_range_detail"
-            ),
-            key: "purchases_by_date_range_detail",
-            disabled: false,
-            rangeFilter: {
-              object: i18n.t("reportcenter.labels.objects.bills"),
-              field: i18n.t("bills.fields.date"),
-            },
-          },
-          purchases_by_date_range_summary: {
-            title: i18n.t(
-              "reportcenter.templates.purchases_by_date_range_summary"
-            ),
-            subject: i18n.t(
-              "reportcenter.templates.purchases_by_date_range_summary"
-            ),
-            key: "purchases_by_date_range_summary",
-            disabled: false,
-            rangeFilter: {
-              object: i18n.t("reportcenter.labels.objects.bills"),
-              field: i18n.t("bills.fields.date"),
-            },
-          },
-          purchases_by_vendor_detailed_date_range: {
-            title: i18n.t(
-              "reportcenter.templates.purchases_by_vendor_detailed_date_range"
-            ),
-            subject: i18n.t(
-              "reportcenter.templates.purchases_by_vendor_detailed_date_range"
-            ),
-            key: "purchases_by_vendor_detailed_date_range",
-            idtype: "vendor",
-            disabled: false,
-            rangeFilter: {
-              object: i18n.t("reportcenter.labels.objects.bills"),
-              field: i18n.t("bills.fields.date"),
-            },
-          },
-          purchases_by_vendor_summary_date_range: {
-            title: i18n.t(
-              "reportcenter.templates.purchases_by_vendor_summary_date_range"
-            ),
-            subject: i18n.t(
-              "reportcenter.templates.purchases_by_vendor_summary_date_range"
-            ),
-            key: "purchases_by_vendor_summary_date_range",
-            idtype: "vendor",
-            disabled: false,
-            rangeFilter: {
-              object: i18n.t("reportcenter.labels.objects.bills"),
-              field: i18n.t("bills.fields.date"),
-            },
-          },
-          purchases_by_cost_center_detail: {
-            title: i18n.t(
-              "reportcenter.templates.purchases_by_cost_center_detail"
-            ),
-            description: "",
-            subject: i18n.t(
-              "reportcenter.templates.purchases_by_cost_center_detail"
-            ),
-            key: "purchases_by_cost_center_detail",
-            //idtype: "vendor",
-            disabled: false,
-            rangeFilter: {
-              object: i18n.t("reportcenter.labels.objects.bills"),
-              field: i18n.t("bills.fields.date"),
-            },
-          },
-          purchases_by_cost_center_summary: {
-            title: i18n.t(
-              "reportcenter.templates.purchases_by_cost_center_summary"
-            ),
-            description: "",
-            subject: i18n.t(
-              "reportcenter.templates.purchases_by_cost_center_summary"
-            ),
-            key: "purchases_by_cost_center_summary",
-            //idtype: "vendor",
-            disabled: false,
-            rangeFilter: {
-              object: i18n.t("reportcenter.labels.objects.bills"),
-              field: i18n.t("bills.fields.date"),
-            },
-          },
-          purchases_grouped_by_vendor_detailed: {
-            title: i18n.t(
-              "reportcenter.templates.purchases_grouped_by_vendor_detailed"
-            ),
-            description: "",
-            subject: i18n.t(
-              "reportcenter.templates.purchases_grouped_by_vendor_detailed"
-            ),
-            key: "purchases_grouped_by_vendor_detailed",
-            //idtype: "vendor",
-            disabled: false,
-            rangeFilter: {
-              object: i18n.t("reportcenter.labels.objects.jobs"),
-              field: i18n.t("bills.fields.date"),
-            },
-          },
-          purchases_grouped_by_vendor_summary: {
-            title: i18n.t(
-              "reportcenter.templates.purchases_grouped_by_vendor_summary"
-            ),
-            description: "",
-            subject: i18n.t(
-              "reportcenter.templates.purchases_grouped_by_vendor_summary"
-            ),
-            key: "purchases_grouped_by_vendor_summary",
-            //idtype: "vendor",
-            disabled: false,
-            rangeFilter: {
-              object: i18n.t("reportcenter.labels.objects.jobs"),
-              field: i18n.t("bills.fields.date"),
-            },
-          },
-          schedule: {
-            title: i18n.t("reportcenter.templates.schedule"),
-            subject: i18n.t("reportcenter.templates.schedule"),
-            key: "schedule",
-            disabled: false,
-            rangeFilter: {
-              object: i18n.t("reportcenter.labels.objects.appointments"),
-              field: i18n.t("appointments.fields.time"),
-            },
-          },
-
-          timetickets: {
-            title: i18n.t("reportcenter.templates.timetickets"),
-            subject: i18n.t("reportcenter.templates.timetickets"),
-            key: "timetickets",
-            disabled: false,
-            rangeFilter: {
-              object: i18n.t("reportcenter.labels.objects.timetickets"),
-              field: i18n.t("timetickets.fields.date"),
-            },
-          },
-          timetickets_employee: {
-            title: i18n.t("reportcenter.templates.timetickets_employee"),
-            subject: i18n.t("reportcenter.templates.timetickets_employee"),
-            key: "timetickets_employee",
-            idtype: "employee",
-            disabled: false,
-          },
-          attendance_detail: {
-            title: i18n.t("reportcenter.templates.attendance_detail"),
-            subject: i18n.t("reportcenter.templates.attendance_detail"),
-            key: "attendance_detail",
-
-            disabled: false,
-            rangeFilter: {
-              object: i18n.t("reportcenter.labels.objects.timetickets"),
-              field: i18n.t("timetickets.fields.date"),
-            },
-          },
-          attendance_summary: {
-            title: i18n.t("reportcenter.templates.attendance_summary"),
-            subject: i18n.t("reportcenter.templates.attendance_summary"),
-            key: "attendance_summary",
-
-            disabled: false,
-            rangeFilter: {
-              object: i18n.t("reportcenter.labels.objects.timetickets"),
-              field: i18n.t("timetickets.fields.date"),
-            },
-          },
-          attendance_employee: {
-            title: i18n.t("reportcenter.templates.attendance_employee"),
-            subject: i18n.t("reportcenter.templates.attendance_employee"),
-            key: "attendance_employee",
-            idtype: "employee",
-            disabled: false,
-            rangeFilter: {
-              object: i18n.t("reportcenter.labels.objects.timetickets"),
-              field: i18n.t("timetickets.fields.date"),
-            },
-          },
-
-          timetickets_summary: {
-            title: i18n.t("reportcenter.templates.timetickets_summary"),
-            subject: i18n.t("reportcenter.templates.timetickets_summary"),
-            key: "timetickets_summary",
-            //idtype: "vendor",
-            disabled: false,
-            rangeFilter: {
-              object: i18n.t("reportcenter.labels.objects.timetickets"),
-              field: i18n.t("timetickets.fields.date"),
-            },
-          },
-
           hours_sold_detail_closed: {
             title: i18n.t("reportcenter.templates.hours_sold_detail_closed"),
             description: "",
@@ -644,6 +430,7 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.jobs"),
               field: i18n.t("jobs.fields.date_invoiced"),
             },
+            group: "sales",
           },
 
           hours_sold_detail_closed_ins_co: {
@@ -661,6 +448,7 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.jobs"),
               field: i18n.t("jobs.fields.date_invoiced"),
             },
+            group: "sales",
           },
 
           hours_sold_summary_closed: {
@@ -674,6 +462,7 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.jobs"),
               field: i18n.t("jobs.fields.date_invoiced"),
             },
+            group: "sales",
           },
 
           hours_sold_summary_closed_ins_co: {
@@ -691,6 +480,7 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.jobs"),
               field: i18n.t("jobs.fields.date_invoiced"),
             },
+            group: "sales",
           },
 
           hours_sold_detail_open: {
@@ -704,6 +494,7 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.jobs"),
               field: i18n.t("jobs.fields.date_open"),
             },
+            group: "sales",
           },
 
           hours_sold_detail_open_ins_co: {
@@ -721,6 +512,7 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.jobs"),
               field: i18n.t("jobs.fields.date_open"),
             },
+            group: "sales",
           },
 
           hours_sold_summary_open: {
@@ -734,6 +526,7 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.jobs"),
               field: i18n.t("jobs.fields.date_open"),
             },
+            group: "sales",
           },
 
           hours_sold_summary_open_ins_co: {
@@ -751,6 +544,7 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.jobs"),
               field: i18n.t("jobs.fields.date_open"),
             },
+            group: "sales",
           },
 
           hours_sold_detail_closed_csr: {
@@ -768,6 +562,7 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.jobs"),
               field: i18n.t("jobs.fields.date_invoiced"),
             },
+            group: "sales",
           },
           hours_sold_detail_open_csr: {
             title: i18n.t("reportcenter.templates.hours_sold_detail_open_csr"),
@@ -782,6 +577,7 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.jobs"),
               field: i18n.t("jobs.fields.date_open"),
             },
+            group: "sales",
           },
           hours_sold_summary_closed_csr: {
             title: i18n.t(
@@ -798,6 +594,7 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.jobs"),
               field: i18n.t("jobs.fields.date_invoiced"),
             },
+            group: "sales",
           },
           hours_sold_summary_open_csr: {
             title: i18n.t("reportcenter.templates.hours_sold_summary_open_csr"),
@@ -812,54 +609,137 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.jobs"),
               field: i18n.t("jobs.fields.date_invoiced"),
             },
+            group: "sales",
           },
-          estimator_detail: {
-            title: i18n.t("reportcenter.templates.estimator_detail"),
+          purchases_by_date_range_detail: {
+            title: i18n.t(
+              "reportcenter.templates.purchases_by_date_range_detail"
+            ),
+            subject: i18n.t(
+              "reportcenter.templates.purchases_by_date_range_detail"
+            ),
+            key: "purchases_by_date_range_detail",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.bills"),
+              field: i18n.t("bills.fields.date"),
+            },
+            group: "purchases",
+          },
+          purchases_by_date_range_summary: {
+            title: i18n.t(
+              "reportcenter.templates.purchases_by_date_range_summary"
+            ),
+            subject: i18n.t(
+              "reportcenter.templates.purchases_by_date_range_summary"
+            ),
+            key: "purchases_by_date_range_summary",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.bills"),
+              field: i18n.t("bills.fields.date"),
+            },
+            group: "purchases",
+          },
+          purchases_by_vendor_detailed_date_range: {
+            title: i18n.t(
+              "reportcenter.templates.purchases_by_vendor_detailed_date_range"
+            ),
+            subject: i18n.t(
+              "reportcenter.templates.purchases_by_vendor_detailed_date_range"
+            ),
+            key: "purchases_by_vendor_detailed_date_range",
+            idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.bills"),
+              field: i18n.t("bills.fields.date"),
+            },
+            group: "purchases",
+          },
+          purchases_by_vendor_summary_date_range: {
+            title: i18n.t(
+              "reportcenter.templates.purchases_by_vendor_summary_date_range"
+            ),
+            subject: i18n.t(
+              "reportcenter.templates.purchases_by_vendor_summary_date_range"
+            ),
+            key: "purchases_by_vendor_summary_date_range",
+            idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.bills"),
+              field: i18n.t("bills.fields.date"),
+            },
+            group: "purchases",
+          },
+          purchases_by_cost_center_detail: {
+            title: i18n.t(
+              "reportcenter.templates.purchases_by_cost_center_detail"
+            ),
             description: "",
-            subject: i18n.t("reportcenter.templates.estimator_detail"),
-            key: "estimator_detail",
+            subject: i18n.t(
+              "reportcenter.templates.purchases_by_cost_center_detail"
+            ),
+            key: "purchases_by_cost_center_detail",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.bills"),
+              field: i18n.t("bills.fields.date"),
+            },
+            group: "purchases",
+          },
+          purchases_by_cost_center_summary: {
+            title: i18n.t(
+              "reportcenter.templates.purchases_by_cost_center_summary"
+            ),
+            description: "",
+            subject: i18n.t(
+              "reportcenter.templates.purchases_by_cost_center_summary"
+            ),
+            key: "purchases_by_cost_center_summary",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.bills"),
+              field: i18n.t("bills.fields.date"),
+            },
+            group: "purchases",
+          },
+          purchases_grouped_by_vendor_detailed: {
+            title: i18n.t(
+              "reportcenter.templates.purchases_grouped_by_vendor_detailed"
+            ),
+            description: "",
+            subject: i18n.t(
+              "reportcenter.templates.purchases_grouped_by_vendor_detailed"
+            ),
+            key: "purchases_grouped_by_vendor_detailed",
             //idtype: "vendor",
             disabled: false,
             rangeFilter: {
               object: i18n.t("reportcenter.labels.objects.jobs"),
-              field: i18n.t("jobs.fields.date_invoiced"),
+              field: i18n.t("bills.fields.date"),
             },
+            group: "purchases",
           },
-          estimator_summary: {
-            title: i18n.t("reportcenter.templates.estimator_summary"),
+          purchases_grouped_by_vendor_summary: {
+            title: i18n.t(
+              "reportcenter.templates.purchases_grouped_by_vendor_summary"
+            ),
             description: "",
-            subject: i18n.t("reportcenter.templates.estimator_summary"),
-            key: "estimator_summary",
+            subject: i18n.t(
+              "reportcenter.templates.purchases_grouped_by_vendor_summary"
+            ),
+            key: "purchases_grouped_by_vendor_summary",
             //idtype: "vendor",
             disabled: false,
             rangeFilter: {
               object: i18n.t("reportcenter.labels.objects.jobs"),
-              field: i18n.t("jobs.fields.date_invoiced"),
-            },
-          },
-          supplement_ratio_ins_co: {
-            title: i18n.t("reportcenter.templates.supplement_ratio_ins_co"),
-            description: "",
-            subject: i18n.t("reportcenter.templates.supplement_ratio_ins_co"),
-            key: "supplement_ratio_ins_co",
-            //idtype: "vendor",
-            disabled: false,
-            rangeFilter: {
-              object: i18n.t("reportcenter.labels.objects.jobs"),
-              field: i18n.t("jobs.fields.date_invoiced"),
-            },
-          },
-          credits_not_received_date: {
-            title: i18n.t("reportcenter.templates.credits_not_received_date"),
-            description: "",
-            subject: i18n.t("reportcenter.templates.credits_not_received_date"),
-            key: "credits_not_received_date",
-            //idtype: "vendor",
-            disabled: false,
-            rangeFilter: {
-              object: i18n.t("reportcenter.labels.objects.jobs"),
-              field: i18n.t("jobs.fields.date_open"),
+              field: i18n.t("bills.fields.date"),
             },
+            group: "purchases",
           },
           job_costing_ro_date_summary: {
             title: i18n.t("reportcenter.templates.job_costing_ro_date_summary"),
@@ -874,6 +754,7 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.jobs"),
               field: i18n.t("jobs.fields.date_invoiced"),
             },
+            group: "jobs",
           },
           job_costing_ro_csr: {
             title: i18n.t("reportcenter.templates.job_costing_ro_csr"),
@@ -886,6 +767,7 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.jobs"),
               field: i18n.t("jobs.fields.date_open"),
             },
+            group: "jobs",
           },
           job_costing_ro_ins_co: {
             title: i18n.t("reportcenter.templates.job_costing_ro_ins_co"),
@@ -898,6 +780,7 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.jobs"),
               field: i18n.t("jobs.fields.date_invoiced"),
             },
+            group: "jobs",
           },
           job_costing_ro_date_detail: {
             title: i18n.t("reportcenter.templates.job_costing_ro_date_detail"),
@@ -912,6 +795,7 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.jobs"),
               field: i18n.t("jobs.fields.date_invoiced"),
             },
+            group: "jobs",
           },
           job_costing_ro_estimator: {
             title: i18n.t("reportcenter.templates.job_costing_ro_estimator"),
@@ -924,7 +808,165 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.jobs"),
               field: i18n.t("jobs.fields.date_invoiced"),
             },
+            group: "jobs",
           },
+          payments_by_date: {
+            title: i18n.t("reportcenter.templates.payments_by_date"),
+            subject: i18n.t("reportcenter.templates.payments_by_date"),
+            key: "payments_by_date",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.payments"),
+              field: i18n.t("payments.fields.date"),
+            },
+            group: "customers",
+          },
+          payments_by_date_type: {
+            title: i18n.t("reportcenter.templates.payments_by_date_type"),
+            subject: i18n.t("reportcenter.templates.payments_by_date_type"),
+            key: "payments_by_date_type",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.payments"),
+              field: i18n.t("payments.fields.date"),
+            },
+            group: "customers",
+          },
+
+          schedule: {
+            title: i18n.t("reportcenter.templates.schedule"),
+            subject: i18n.t("reportcenter.templates.schedule"),
+            key: "schedule",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.appointments"),
+              field: i18n.t("appointments.fields.time"),
+            },
+            group: "customers",
+          },
+
+          timetickets: {
+            title: i18n.t("reportcenter.templates.timetickets"),
+            subject: i18n.t("reportcenter.templates.timetickets"),
+            key: "timetickets",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.timetickets"),
+              field: i18n.t("timetickets.fields.date"),
+            },
+            group: "payroll",
+          },
+          timetickets_employee: {
+            title: i18n.t("reportcenter.templates.timetickets_employee"),
+            subject: i18n.t("reportcenter.templates.timetickets_employee"),
+            key: "timetickets_employee",
+            idtype: "employee",
+            disabled: false,
+            group: "payroll",
+          },
+          attendance_detail: {
+            title: i18n.t("reportcenter.templates.attendance_detail"),
+            subject: i18n.t("reportcenter.templates.attendance_detail"),
+            key: "attendance_detail",
+
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.timetickets"),
+              field: i18n.t("timetickets.fields.date"),
+            },
+            group: "payroll",
+          },
+          attendance_summary: {
+            title: i18n.t("reportcenter.templates.attendance_summary"),
+            subject: i18n.t("reportcenter.templates.attendance_summary"),
+            key: "attendance_summary",
+
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.timetickets"),
+              field: i18n.t("timetickets.fields.date"),
+            },
+            group: "payroll",
+          },
+          attendance_employee: {
+            title: i18n.t("reportcenter.templates.attendance_employee"),
+            subject: i18n.t("reportcenter.templates.attendance_employee"),
+            key: "attendance_employee",
+            idtype: "employee",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.timetickets"),
+              field: i18n.t("timetickets.fields.date"),
+            },
+            group: "payroll",
+          },
+
+          timetickets_summary: {
+            title: i18n.t("reportcenter.templates.timetickets_summary"),
+            subject: i18n.t("reportcenter.templates.timetickets_summary"),
+            key: "timetickets_summary",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.timetickets"),
+              field: i18n.t("timetickets.fields.date"),
+            },
+            group: "payroll",
+          },
+
+          estimator_detail: {
+            title: i18n.t("reportcenter.templates.estimator_detail"),
+            description: "",
+            subject: i18n.t("reportcenter.templates.estimator_detail"),
+            key: "estimator_detail",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_invoiced"),
+            },
+            group: "sales",
+          },
+          estimator_summary: {
+            title: i18n.t("reportcenter.templates.estimator_summary"),
+            description: "",
+            subject: i18n.t("reportcenter.templates.estimator_summary"),
+            key: "estimator_summary",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_invoiced"),
+            },
+            group: "sales",
+          },
+          supplement_ratio_ins_co: {
+            title: i18n.t("reportcenter.templates.supplement_ratio_ins_co"),
+            description: "",
+            subject: i18n.t("reportcenter.templates.supplement_ratio_ins_co"),
+            key: "supplement_ratio_ins_co",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_invoiced"),
+            },
+            group: "sales",
+          },
+          credits_not_received_date: {
+            title: i18n.t("reportcenter.templates.credits_not_received_date"),
+            description: "",
+            subject: i18n.t("reportcenter.templates.credits_not_received_date"),
+            key: "credits_not_received_date",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_open"),
+            },
+            group: "purchases",
+          },
+
           void_ros: {
             title: i18n.t("reportcenter.templates.void_ros"),
             description: "",
@@ -936,6 +978,7 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.jobs"),
               field: i18n.t("jobs.fields.date_open"),
             },
+            group: "sales",
           },
           gsr_by_csr: {
             title: i18n.t("reportcenter.templates.gsr_by_csr"),
@@ -948,6 +991,7 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.jobs"),
               field: i18n.t("jobs.fields.date_invoiced"),
             },
+            group: "sales",
           },
           gsr_by_make: {
             title: i18n.t("reportcenter.templates.gsr_by_make"),
@@ -960,6 +1004,7 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.jobs"),
               field: i18n.t("jobs.fields.date_invoiced"),
             },
+            group: "sales",
           },
           gsr_by_delivery_date: {
             title: i18n.t("reportcenter.templates.gsr_by_delivery_date"),
@@ -972,6 +1017,7 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.jobs"),
               field: i18n.t("jobs.fields.actual_delivery"),
             },
+            group: "sales",
           },
           gsr_by_referral: {
             title: i18n.t("reportcenter.templates.gsr_by_referral"),
@@ -984,6 +1030,7 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.jobs"),
               field: i18n.t("jobs.fields.date_invoiced"),
             },
+            group: "sales",
           },
           gsr_by_ro: {
             title: i18n.t("reportcenter.templates.gsr_by_ro"),
@@ -996,6 +1043,7 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.jobs"),
               field: i18n.t("jobs.fields.date_invoiced"),
             },
+            group: "sales",
           },
           gsr_by_ins_co: {
             title: i18n.t("reportcenter.templates.gsr_by_ins_co"),
@@ -1008,6 +1056,7 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.jobs"),
               field: i18n.t("jobs.fields.date_invoiced"),
             },
+            group: "sales",
           },
           gsr_by_exported_date: {
             title: i18n.t("reportcenter.templates.gsr_by_exported_date"),
@@ -1020,6 +1069,7 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.jobs"),
               field: i18n.t("jobs.fields.date_exported"),
             },
+            group: "sales",
           },
 
           gsr_by_estimator: {
@@ -1033,6 +1083,7 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.jobs"),
               field: i18n.t("jobs.fields.date_invoiced"),
             },
+            group: "sales",
           },
           gsr_labor_only: {
             title: i18n.t("reportcenter.templates.gsr_labor_only"),
@@ -1045,6 +1096,7 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.jobs"),
               field: i18n.t("jobs.fields.date_invoiced"),
             },
+            group: "sales",
           },
           open_orders: {
             title: i18n.t("reportcenter.templates.open_orders"),
@@ -1057,6 +1109,7 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.jobs"),
               field: i18n.t("jobs.fields.date_open"),
             },
+            group: "jobs",
           },
           open_orders_csr: {
             title: i18n.t("reportcenter.templates.open_orders_csr"),
@@ -1069,6 +1122,7 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.jobs"),
               field: i18n.t("jobs.fields.date_open"),
             },
+            group: "jobs",
           },
           open_orders_estimator: {
             title: i18n.t("reportcenter.templates.open_orders_estimator"),
@@ -1081,6 +1135,7 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.jobs"),
               field: i18n.t("jobs.fields.date_open"),
             },
+            group: "jobs",
           },
           open_orders_ins_co: {
             title: i18n.t("reportcenter.templates.open_orders_ins_co"),
@@ -1093,6 +1148,7 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.jobs"),
               field: i18n.t("jobs.fields.date_open"),
             },
+            group: "jobs",
           },
           export_payables: {
             title: i18n.t("reportcenter.templates.export_payables"),
@@ -1105,6 +1161,7 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.exportlogs"),
               field: i18n.t("exportlogs.fields.createdat"),
             },
+            group: "purchases",
           },
           export_payments: {
             title: i18n.t("reportcenter.templates.export_payments"),
@@ -1117,6 +1174,7 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.exportlogs"),
               field: i18n.t("exportlogs.fields.createdat"),
             },
+            group: "customers",
           },
           export_receivables: {
             title: i18n.t("reportcenter.templates.export_receivables"),
@@ -1129,6 +1187,7 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.exportlogs"),
               field: i18n.t("exportlogs.fields.createdat"),
             },
+            group: "sales",
           },
           parts_backorder: {
             title: i18n.t("reportcenter.templates.parts_backorder"),
@@ -1141,6 +1200,7 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.jobs"),
               field: i18n.t("jobs.fields.actual_in"),
             },
+            group: "purchases",
           },
           thank_you_date: {
             title: i18n.t("reportcenter.templates.thank_you_date"),
@@ -1153,6 +1213,7 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.jobs"),
               field: i18n.t("jobs.fields.date_invoiced"),
             },
+            group: "customers",
           },
           unclaimed_hrs: {
             title: i18n.t("reportcenter.templates.unclaimed_hrs"),
@@ -1165,6 +1226,7 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.jobs"),
               field: i18n.t("jobs.fields.date_open"),
             },
+            group: "payroll",
           },
           work_in_progress_labour: {
             title: i18n.t("reportcenter.templates.work_in_progress_labour"),
@@ -1177,6 +1239,7 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.jobs"),
               field: i18n.t("jobs.fields.date_open"),
             },
+            group: "jobs",
           },
           work_in_progress_payables: {
             title: i18n.t("reportcenter.templates.work_in_progress_payables"),
@@ -1189,6 +1252,7 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.jobs"),
               field: i18n.t("jobs.fields.date_open"),
             },
+            group: "jobs",
           },
           lag_time: {
             title: i18n.t("reportcenter.templates.lag_time"),
@@ -1201,6 +1265,7 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.jobs"),
               field: i18n.t("jobs.fields.date_invoiced"),
             },
+            group: "jobs",
           },
           parts_not_recieved: {
             title: i18n.t("reportcenter.templates.parts_not_recieved"),
@@ -1213,6 +1278,7 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.parts_orders"),
               field: i18n.t("parts_orders.fields.order_date"),
             },
+            group: "purchases",
           },
           scoreboard_detail: {
             title: i18n.t("reportcenter.templates.scoreboard_detail"),
@@ -1225,6 +1291,7 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.scoreboard"),
               field: i18n.t("scoreboard.fields.date"),
             },
+            group: "payroll",
           },
           scoreboard_summary: {
             title: i18n.t("reportcenter.templates.scoreboard_summary"),
@@ -1237,6 +1304,7 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.scoreboard"),
               field: i18n.t("scoreboard.fields.date"),
             },
+            group: "payroll",
           },
           anticipated_revenue: {
             title: i18n.t("reportcenter.templates.anticipated_revenue"),
@@ -1249,6 +1317,20 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.jobs"),
               field: i18n.t("jobs.fields.scheduled_completion"), // Also date invoice.
             },
+            group: "sales",
+          },
+          csi: {
+            title: i18n.t("reportcenter.templates.csi"),
+            description: "",
+            subject: i18n.t("reportcenter.templates.csi"),
+            key: "csi",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.csi"),
+              field: i18n.t("csi.fields.created_at"), // Also date invoice.
+            },
+            group: "customers",
           },
         }
       : {}),

client/src/utils/asyncConfirm.js

@@ -0,0 +1,9 @@
+function confirmDialog(msg) {
+  return new Promise(function (resolve, reject) {
+    let confirmed = window.confirm(msg);
+
+    return confirmed ? resolve(true) : resolve(false);
+  });
+}
+
+export default confirmDialog;