Remove open replay tracker.

Revert Node Version

Approved-by: Patrick Fic

client/package.json

@@ -4,39 +4,39 @@
   "private": true,
   "proxy": "http://localhost:5000",
   "dependencies": {
-    "@apollo/client": "^3.4.10",
-    "@craco/craco": "^6.2.0",
+    "@apollo/client": "^3.4.14",
+    "@craco/craco": "^6.3.0",
     "@fingerprintjs/fingerprintjs": "^3.3.0",
     "@lourenci/react-kanban": "^2.1.0",
-    "@openreplay/tracker": "^3.2.5",
-    "@openreplay/tracker-assist": "^3.0.4",
+    "@openreplay/tracker": "^3.4.0",
+    "@openreplay/tracker-assist": "^3.4.0",
     "@openreplay/tracker-graphql": "^3.0.0",
     "@openreplay/tracker-redux": "^3.0.0",
-    "@sentry/react": "^6.11.0",
-    "@sentry/tracing": "^6.11.0",
-    "@stripe/react-stripe-js": "^1.4.0",
-    "@stripe/stripe-js": "^1.17.1",
+    "@sentry/react": "^6.13.2",
+    "@sentry/tracing": "^6.13.2",
+    "@stripe/react-stripe-js": "^1.5.0",
+    "@stripe/stripe-js": "^1.18.0",
     "@tanem/react-nprogress": "^3.0.79",
     "antd": "^4.16.13",
     "apollo-link-logger": "^2.0.0",
-    "axios": "^0.21.1",
+    "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.3",
-    "firebase": "^9.0.0",
-    "graphql": "^15.5.2",
-    "i18next": "^20.4.0",
+    "firebase": "^9.1.0",
+    "graphql": "^15.6.0",
+    "i18next": "^21.1.1",
     "i18next-browser-languagedetector": "^6.1.2",
-    "jsoneditor": "^9.5.4",
+    "jsoneditor": "^9.5.6",
     "jsreport-browser-client-dist": "^1.3.0",
-    "libphonenumber-js": "^1.9.25",
+    "libphonenumber-js": "^1.9.34",
     "logrocket": "^2.0.0",
-    "markerjs2": "^2.11.2",
+    "markerjs2": "^2.12.0",
     "moment-business-days": "^1.2.0",
-    "phone": "^3.1.6",
+    "phone": "^3.1.8",
     "preval.macro": "^5.0.0",
     "prop-types": "^15.7.2",
     "query-string": "^7.0.1",
@@ -50,38 +50,38 @@
     "react-drag-listview": "^0.1.8",
     "react-grid-gallery": "^0.5.5",
     "react-grid-layout": "^1.3.0",
-    "react-i18next": "^11.11.4",
+    "react-i18next": "^11.12.0",
     "react-icons": "^4.2.0",
     "react-number-format": "^4.7.3",
-    "react-redux": "^7.2.4",
+    "react-redux": "^7.2.5",
     "react-resizable": "^3.0.4",
-    "react-router-dom": "^5.2.1",
+    "react-router-dom": "^5.3.0",
     "react-scripts": "^4.0.3",
     "react-sublime-video": "^0.2.5",
     "react-virtualized": "^9.22.3",
-    "recharts": "^2.1.2",
+    "recharts": "^2.1.4",
     "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.38.2",
+    "sass": "^1.42.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.2.4",
-    "workbox-broadcast-update": "^6.2.4",
-    "workbox-cacheable-response": "^6.2.4",
-    "workbox-core": "^6.2.4",
-    "workbox-expiration": "^6.2.4",
-    "workbox-google-analytics": "^6.2.4",
-    "workbox-navigation-preload": "^6.2.4",
-    "workbox-precaching": "^6.2.4",
-    "workbox-range-requests": "^6.2.4",
-    "workbox-routing": "^6.2.4",
-    "workbox-strategies": "^6.2.4",
-    "workbox-streams": "^6.2.4"
+    "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",

client/src/App/App.container.jsx

@@ -12,6 +12,7 @@ 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({
@@ -21,7 +22,11 @@ export const tracker = new Tracker({
     ? { __DISABLE_SECURE_MODE: true }
     : {}),
   // beaconSize: 10485760,
-  onStart: ({ sessionID }) => console.log("ORS SESSION ", sessionID),
+  onStart: async ({ sessionID }) => {
+    const user = await getCurrentUser();
+    tracker.setUserID(user.email);
+    console.log("ORS SESSION ", sessionID, user.email);
+  },
 });
 
 // tracker.use(

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

@@ -9,8 +9,25 @@ import PayableExportAll from "../payable-export-all-button/payable-export-all-bu
 import { DateFormatter } from "../../utils/DateFormatter";
 import queryString from "query-string";
 import { logImEXEvent } from "../../firebase/firebase.utils";
+import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 
-export default function AccountingPayablesTableComponent({ loading, bills }) {
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(AccountingPayablesTableComponent);
+
+export function AccountingPayablesTableComponent({ bodyshop, loading, bills }) {
   const { t } = useTranslation();
   const [selectedBills, setSelectedBills] = useState([]);
   const [transInProgress, setTransInProgress] = useState(false);
@@ -166,6 +183,9 @@ export default function AccountingPayablesTableComponent({ loading, bills }) {
             loadingCallback={setTransInProgress}
             completedCallback={setSelectedBills}
           />
+          {bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && (
+            <QboAuthorizeComponent />
+          )}
           <Input
             value={state.search}
             onChange={handleSearch}

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

@@ -8,7 +8,26 @@ 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";
+import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
+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);
@@ -180,12 +199,17 @@ 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}
+            />
+          )}
+          {bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && (
+            <QboAuthorizeComponent />
+          )}
           <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-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/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/dms-allocations-summary/dms-allocations-summary.component.jsx

@@ -1,4 +1,4 @@
-import { Button, Table, Typography } from "antd";
+import { Button, Card, Table, Typography } from "antd";
 import React, { useState, useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -21,15 +21,16 @@ export default connect(
   mapDispatchToProps
 )(DmsAllocationsSummary);
 
-export function DmsAllocationsSummary({ socket, bodyshop, jobId }) {
+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.emit("cdk-calculate-allocations", jobId, (ack) => {
+        setAllocationsSummary(ack);
+        socket.allocationsSummary = ack;
+      });
     }
   }, [socket, socket.connected, jobId]);
 
@@ -75,8 +76,9 @@ export function DmsAllocationsSummary({ socket, bodyshop, jobId }) {
   ];
 
   return (
-    <Table
-      title={() => (
+    <Card
+      title={title}
+      extra={
         <Button
           onClick={() => {
             socket.emit("cdk-calculate-allocations", jobId, (ack) =>
@@ -86,43 +88,48 @@ export function DmsAllocationsSummary({ socket, bodyshop, jobId }) {
         >
           <SyncOutlined />
         </Button>
-      )}
-      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(),
-          }
-        );
+      }
+    >
+      <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>
-        );
-      }}
-    />
+          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

@@ -1,11 +1,11 @@
+import { useLazyQuery } from "@apollo/client";
+import { Button, Input, Modal, Table } from "antd";
 import React, { useState } from "react";
-import { Modal, Button, Table, Input } from "antd";
+import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-import { useTranslation } from "react-i18next";
-import { useLazyQuery } from "@apollo/client";
 import { SEARCH_DMS_VEHICLES } from "../../graphql/dms.queries";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import AlertComponent from "../alert/alert.component";
 
 const mapStateToProps = createStructuredSelector({
@@ -26,31 +26,27 @@ export function DmsCdkVehicles({ bodyshop, form, socket, job }) {
     useLazyQuery(SEARCH_DMS_VEHICLES);
   const columns = [
     {
-      title: t("jobs.fields.dms.make"),
+      title: t("vehicles.fields.v_make_desc"),
       dataIndex: "make",
       key: "make",
     },
     {
-      title: t("jobs.fields.dms.model"),
+      title: t("vehicles.fields.v_model_desc"),
       dataIndex: "model",
       key: "model",
     },
     {
-      title: t("jobs.fields.dms.makecode"),
+      title: t("jobs.fields.dms.dms_make"),
       dataIndex: "makecode",
       key: "makecode",
     },
     {
-      title: t("jobs.fields.dms.modelcode"),
+      title: t("jobs.fields.dms.dms_model"),
       dataIndex: "modelcode",
       key: "modelcode",
     },
   ];
 
-  console.log(
-    "🚀  ~ file: dms-cdk-makes.component.jsx  ~ line 95  ~ selectedModel",
-    selectedModel
-  );
   return (
     <div>
       <Modal
@@ -102,7 +98,7 @@ export function DmsCdkVehicles({ bodyshop, form, socket, job }) {
           });
         }}
       >
-        {t("jobs.actions.dms.getmakes")}
+        {t("jobs.actions.dms.findmakemodelcode")}
       </Button>
     </div>
   );

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

@@ -4,6 +4,7 @@ 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,
@@ -15,6 +16,7 @@ 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", {
@@ -26,7 +28,7 @@ export function DmsCdkMakesRefetch({ bodyshop, form, socket }) {
   };
   return (
     <Button loading={loading} onClick={handleRefetch}>
-      Refetch Models
+      {t("jobs.actions.dms.refetchmakesmodels")}
     </Button>
   );
 }

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

@@ -1,4 +1,4 @@
-import { Button, Table } from "antd";
+import { Button, Table, Col , Checkbox} from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -32,6 +32,7 @@ export function DmsCustomerSelector({ bodyshop }) {
   const onUseSelected = () => {
     setVisible(false);
     socket.emit("cdk-selected-customer", selectedCustomer);
+    setSelectedCustomer(null);
   };
 
   const onUseGeneric = () => {
@@ -40,23 +41,36 @@ export function DmsCustomerSelector({ bodyshop }) {
       "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("dms.fields.name1"),
+      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("dms.fields.address"),
+      title: t("jobs.fields.dms.address"),
       //dataIndex: ["name2", "fullName"],
       key: "address",
       render: (record, value) =>
@@ -66,40 +80,42 @@ export function DmsCustomerSelector({ bodyshop }) {
 
   if (!visible) return <></>;
   return (
-    <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 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-post-form/dms-post-form.component.jsx

@@ -1,24 +1,28 @@
 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 Dinero from "dinero.js";
-import { determineDmsType } from "../../pages/dms/dms.container";
 import DmsCdkMakesRefetch from "../dms-cdk-makes/dms-cdk-makes.refetch.component";
+
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
 });
@@ -58,24 +62,90 @@ export function DmsPostForm({ bodyshop, socket, job }) {
   };
 
   return (
-    <Form form={form} layout="vertical" onFinish={handleFinish}>
-      <LayoutFormRow>
-        <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>
+    <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")}
@@ -85,224 +155,186 @@ export function DmsPostForm({ bodyshop, socket, job }) {
             },
           ]}
         >
-          <Input.TextArea />
+          <Input.TextArea maxLength={240} />
         </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>
-        <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.List name={["payers"]}>
-        {(fields, { add, remove }) => {
-          return (
-            <div>
-              {fields.map((field, index) => (
-                <Form.Item key={field.key}>
-                  <LayoutFormRow>
-                    <Form.Item
-                      label={t("jobs.fields.dms.payer.name")}
-                      key={`${index}name`}
-                      name={[field.name, "name"]}
-                      rules={[
-                        {
-                          required: true,
-                        },
-                      ]}
-                    >
-                      <Select
-                        onSelect={(value) => handlePayerSelect(value, index)}
+        <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,
+                          },
+                        ]}
                       >
-                        {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>
+                        <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.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.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
+                        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");
+                      <Form.Item shouldUpdate>
+                        {() => {
+                          const payers = form.getFieldValue("payers");
 
-                        const row = payers && payers[index];
+                          const row = payers && payers[index];
 
-                        const cdkPayer =
-                          bodyshop.cdk_configuration.payers &&
-                          bodyshop.cdk_configuration.payers.find(
-                            (i) => i && row && i.name === row.name
+                          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>
 
-                        return (
-                          <div>
-                            {cdkPayer &&
-                              t(`jobs.fields.${cdkPayer.control_type}`)}
-                          </div>
-                        );
-                      }}
-                    </Form.Item>
-
-                    <DeleteFilled
-                      onClick={() => {
-                        remove(field.name);
-                      }}
-                    />
-                  </LayoutFormRow>
+                      <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>
-              ))}
-              <Form.Item>
-                <Button
-                  type="dashed"
-                  disabled={!(fields.length < 3)}
-                  onClick={() => {
-                    if (fields.length < 3) add();
-                  }}
-                  style={{ width: "100%" }}
-                >
-                  {t("dms.actions.addpayer")}
-                </Button>
-              </Form.Item>
-            </div>
-          );
-        }}
-      </Form.List>
-      <Form.Item shouldUpdate>
-        {() => {
-          //Perform Calculation to determine discrepancy.
-          let totalAllocated = Dinero();
+              </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 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 = Dinero(job.job_totals.totals.total_repairs).subtract(
-            totalAllocated
-          );
-          return (
-            <Space>
-              <Statistic
-                title={t("jobs.labels.dms.totalallocated")}
-                value={totalAllocated.toFormat()}
-              />
-              <Statistic
-                title={t("jobs.fields.subtotal")}
-                value={Dinero(job.job_totals.totals.total_repairs).toFormat()}
-              />
-              <Statistic
-                title={t("jobs.labels.dms.notallocated")}
-                valueStyle={{
-                  color: discrep.getAmount() === 0 ? "green" : "red",
-                }}
-                value={discrep.toFormat()}
-              />
-              <Button //disabled={discrep.getAmount() !== 0} //TODO: REMOVE THIS COMMENT.
-                htmlType="submit"
-              >
-                {t("jobs.actions.dms.post")}
-              </Button>
-              <Button
-                onClick={() => {
-                  socket.emit(`${determineDmsType(bodyshop)}-export-job`, {
-                    jobid: job.id,
-                  });
-                }}
-              >
-                Bypass
-              </Button>
-            </Space>
-          );
-        }}
-      </Form.Item>
-    </Form>
+            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/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx

@@ -53,20 +53,6 @@ export function JobChecklistForm({
     setLoading(true);
     logImEXEvent("job_complete_intake");
 
-    console.log({
-      values,
-      job,
-      production_vars: {
-        ...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,
-      },
-    });
     const result = await intakeJob({
       variables: {
         jobId: jobId,
@@ -78,14 +64,16 @@ export function JobChecklistForm({
           ...(type === "intake" && { actual_in: new Date() }),
           ...(type === "intake" && {
             production_vars: {
-              ...job.production_vars,
+              ...(job ? job.production_vars : {}),
 
               note:
                 values.production_vars &&
                 values.production_vars.note &&
                 values.production_vars.note !== ""
-                  ? values.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" && {

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-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,11 +1,24 @@
-import { useMutation } from "@apollo/client";
-import { Button, Card, Form, InputNumber, notification, Popover } from "antd";
+import { useMutation, useLazyQuery } from "@apollo/client";
+import {
+  Button,
+  Card,
+  Form,
+  InputNumber,
+  notification,
+  Popover,
+  Space,
+} from "antd";
 import moment from "moment";
-import React, { useState } from "react";
+import React, { useState, useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { logImEXEvent } from "../../firebase/firebase.utils";
-import { INSERT_SCOREBOARD_ENTRY } from "../../graphql/scoreboard.queries";
+import {
+  INSERT_SCOREBOARD_ENTRY,
+  QUERY_SCOREBOARD_ENTRY,
+  UPDATE_SCOREBOARD_ENTRY,
+} from "../../graphql/scoreboard.queries";
 import FormDatePicker from "../form-date-picker/form-date-picker.component";
+import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 
 export default function ScoreboardAddButton({
   job,
@@ -14,17 +27,46 @@ export default function ScoreboardAddButton({
 }) {
   const { t } = useTranslation();
   const [insertScoreboardEntry] = useMutation(INSERT_SCOREBOARD_ENTRY);
+  const [updateScoreboardEntry] = useMutation(UPDATE_SCOREBOARD_ENTRY);
   const [loading, setLoading] = useState(false);
   const [form] = Form.useForm();
   const [visibility, setVisibility] = useState(false);
+  const [callQuery, { loading: entryLoading, data: entryData }] = useLazyQuery(
+    QUERY_SCOREBOARD_ENTRY
+  );
+
+  useEffect(() => {
+    if (visibility) {
+      callQuery({ variables: { jobid: job.id } });
+    }
+  }, [visibility, job.id, callQuery]);
+
+  useEffect(() => {
+    console.log("UE", entryData);
+    if (entryData && entryData.scoreboard && entryData.scoreboard[0]) {
+      console.log("Setting FOrm");
+      form.setFieldsValue(entryData.scoreboard[0]);
+    }
+  }, [entryData, form]);
 
   const handleFinish = async (values) => {
     logImEXEvent("job_close_add_to_scoreboard");
 
     setLoading(true);
-    const result = await insertScoreboardEntry({
-      variables: { sbInput: [{ jobid: job.id, ...values }] },
-    });
+    let result;
+
+    if (entryData && entryData.scoreboard && entryData.scoreboard[0]) {
+      result = await updateScoreboardEntry({
+        variables: {
+          sbId: entryData.scoreboard[0].id,
+          sbInput: values,
+        },
+      });
+    } else {
+      result = await insertScoreboardEntry({
+        variables: { sbInput: [{ jobid: job.id, ...values }] },
+      });
+    }
 
     if (!!result.errors) {
       notification["error"]({
@@ -44,53 +86,62 @@ export default function ScoreboardAddButton({
   const overlay = (
     <Card>
       <div>
-        <Form
-          form={form}
-          layout="vertical"
-          onFinish={handleFinish}
-          initialValues={{}}
-        >
-          <Form.Item
-            label={t("scoreboard.fields.date")}
-            name="date"
-            rules={[
-              {
-                required: true,
-                //message: t("general.validation.required"),
-              },
-            ]}
+        {entryLoading ? (
+          <LoadingSpinner />
+        ) : (
+          <Form
+            form={form}
+            layout="vertical"
+            onFinish={handleFinish}
+            initialValues={{}}
           >
-            <FormDatePicker />
-          </Form.Item>
-          <Form.Item
-            label={t("scoreboard.fields.bodyhrs")}
-            name="bodyhrs"
-            rules={[
-              {
-                required: true,
-                //message: t("general.validation.required"),
-              },
-            ]}
-          >
-            <InputNumber precision={1} />
-          </Form.Item>
-          <Form.Item
-            label={t("scoreboard.fields.painthrs")}
-            name="painthrs"
-            rules={[
-              {
-                required: true,
-                //message: t("general.validation.required"),
-              },
-            ]}
-          >
-            <InputNumber precision={1} />
-          </Form.Item>
+            <Form.Item
+              label={t("scoreboard.fields.date")}
+              name="date"
+              rules={[
+                {
+                  required: true,
+                  //message: t("general.validation.required"),
+                },
+              ]}
+            >
+              <FormDatePicker />
+            </Form.Item>
+            <Form.Item
+              label={t("scoreboard.fields.bodyhrs")}
+              name="bodyhrs"
+              rules={[
+                {
+                  required: true,
+                  //message: t("general.validation.required"),
+                },
+              ]}
+            >
+              <InputNumber precision={1} />
+            </Form.Item>
+            <Form.Item
+              label={t("scoreboard.fields.painthrs")}
+              name="painthrs"
+              rules={[
+                {
+                  required: true,
+                  //message: t("general.validation.required"),
+                },
+              ]}
+            >
+              <InputNumber precision={1} />
+            </Form.Item>
 
-          <Button type="primary" htmlType="submit">
-            {t("general.actions.save")}
-          </Button>
-        </Form>
+            <Space wrap>
+              <Button type="primary" htmlType="submit">
+                {t("general.actions.save")}
+              </Button>
+              <Button onClick={() => setVisibility(false)}>
+                {t("general.actions.cancel")}
+              </Button>
+            </Space>
+          </Form>
+        )}
       </div>
     </Card>
   );
@@ -99,7 +150,7 @@ export default function ScoreboardAddButton({
     setLoading(true);
     const v = job.joblines.reduce(
       (acc, val) => {
-        if (val.mod_lbr_ty === "LAB")
+        if (val.mod_lbr_ty !== "LAR")
           acc = { ...acc, bodyhrs: acc.bodyhrs + val.mod_lb_hrs };
         if (val.mod_lbr_ty === "LAR")
           acc = { ...acc, painthrs: acc.painthrs + val.mod_lb_hrs };

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";
@@ -98,23 +99,7 @@ export function JobsAvailableContainer({
       return;
     }
     //IO-539 Check for Parts Rate on PAL for SGI use case.
-
-    if (
-      estData.est_data.parts_tax_rates &&
-      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)
-    ) {
-      console.log("checking");
-      const res = await confirmDialog(
-        `ImEX Online has detected that there is a missing tax rate for used parts. Pressing OK will set the tax rate to ${bodyshop.bill_tax_rates.state_tax_rate}%.`
-      );
-      if (res) {
-        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;
-      }
-    }
+    await CheckTaxRates(estData.est_data, bodyshop);
 
     const newTotals = (
       await Axios.post("/job/totals", {
@@ -155,16 +140,17 @@ export function JobsAvailableContainer({
         : {}),
     };
 
+    if (selectedOwner) {
+      newJob.ownerid = selectedOwner;
+      delete newJob.owner;
+    }
+    if (newJob.vehicleid) {
+      delete newJob.vehicle;
+    }
+
     insertNewJob({
       variables: {
-        job: selectedOwner
-          ? Object.assign(
-              {},
-              newJob,
-              { owner: null },
-              { ownerid: selectedOwner }
-            )
-          : newJob,
+        job: newJob,
       },
     })
       .then((r) => {
@@ -214,26 +200,10 @@ 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.
-      if (
-        estData.est_data.parts_tax_rates &&
-        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)
-      ) {
-        console.log("checking");
-        const res = await confirmDialog(
-          `ImEX Online has detected that there is a missing tax rate for used parts. Pressing OK will set the tax rate to ${bodyshop.bill_tax_rates.state_tax_rate}%.`
-        );
-        if (res) {
-          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;
-        }
-      }
-
       //create upsert job
       let supp = replaceEmpty({ ...estData.est_data });
+      //IO-539 Check for Parts Rate on PAL for SGI use case.
+      await CheckTaxRates(supp, bodyshop);
 
       delete supp.owner;
       delete supp.vehicle;
@@ -421,14 +391,104 @@ function replaceEmpty(someObj, replaceValue = null) {
     value === "" ? replaceValue || null : value;
   //^ because you seem to want to replace (strings) "null" or "undefined" too
   const temp = JSON.stringify(someObj, replacer);
-  console.log("Parsed", JSON.parse(temp));
   return JSON.parse(temp);
 }
 
-function confirmDialog(msg) {
-  return new Promise(function (resolve, reject) {
-    let confirmed = window.confirm(msg);
+async function CheckTaxRates(estData, bodyshop) {
+  console.log(
+    "🚀  ~ file: jobs-available-table.container.jsx  ~ line 398  ~ estData",
+    estData
+  );
+  //LKQ Check
+  if (
+    !estData.parts_tax_rates?.PAL ||
+    estData.parts_tax_rates?.PAL?.prt_tax_rt === null ||
+    estData.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.parts_tax_rates.PAL) {
+        estData.parts_tax_rates.PAL = {
+          prt_discp: 0,
+          prt_mktyp: true,
+          prt_mkupp: 0,
+          prt_type: "PAL",
+        };
+      }
+      estData.parts_tax_rates.PAL.prt_tax_rt =
+        bodyshop.bill_tax_rates.state_tax_rate / 100;
+      estData.parts_tax_rates.PAL.prt_tax_in = true;
+    }
+  }
+  //PAC Check
+  if (
+    !estData.parts_tax_rates?.PAC ||
+    estData.parts_tax_rates?.PAC?.prt_tax_rt === null ||
+    estData.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.parts_tax_rates.PAC) {
+        estData.parts_tax_rates.PAC = {
+          prt_discp: 0,
+          prt_mktyp: true,
+          prt_mkupp: 0,
+          prt_type: "PAC",
+        };
+      }
+      estData.parts_tax_rates.PAC.prt_tax_rt =
+        bodyshop.bill_tax_rates.state_tax_rate / 100;
+      estData.parts_tax_rates.PAC.prt_tax_in = true;
+    }
+  }
+  //PAM Check
+  if (
+    !estData.parts_tax_rates?.PAM ||
+    estData.parts_tax_rates?.PAM?.prt_tax_rt === null ||
+    estData.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.parts_tax_rates.PAM) {
+        estData.parts_tax_rates.PAM = {
+          prt_discp: 0,
+          prt_mktyp: true,
+          prt_mkupp: 0,
+          prt_type: "PAM",
+        };
+      }
+      estData.parts_tax_rates.PAM.prt_tax_rt =
+        bodyshop.bill_tax_rates.state_tax_rate / 100;
+      estData.parts_tax_rates.PAM.prt_tax_in = true;
+    }
+  }
 
-    return confirmed ? resolve(true) : resolve(false);
-  });
+  if (
+    !estData.parts_tax_rates?.PAR ||
+    estData.parts_tax_rates?.PAR?.prt_tax_rt === null ||
+    estData.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.parts_tax_rates.PAR) {
+        estData.parts_tax_rates.PAR = {
+          prt_discp: 0,
+          prt_mktyp: true,
+          prt_mkupp: 0,
+          prt_type: "PAR",
+        };
+      }
+      estData.parts_tax_rates.PAR.prt_tax_rt =
+        bodyshop.bill_tax_rates.state_tax_rate / 100;
+      estData.parts_tax_rates.PAR.prt_tax_in = true;
+    }
+  }
 }

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,56 +27,73 @@ 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 () => {
+    //Check if it's a CDK setup.
+    if (bodyshop.cdk_dealerid) {
+      history.push(`/manage/dms?jobId=${jobId}`);
+      return;
+    }
     logImEXEvent("jobs_close_export");
 
     setLoading(true);
-    let QbXmlResponse;
-    try {
-      QbXmlResponse = await axios.post(
-        "/accounting/qbxml/receivables",
-        { jobIds: [jobId] },
-        {
-          headers: {
-            Authorization: `Bearer ${await auth.currentUser.getIdToken()}`,
-          },
-        }
-      );
-      console.log("handle -> XML", QbXmlResponse);
-    } catch (error) {
-      console.log("Error getting QBXML from Server.", error);
-      notification["error"]({
-        message: t("jobs.errors.exporting", {
-          error: "Unable to retrieve QBXML. " + JSON.stringify(error.message),
-        }),
-      });
-      setLoading(false);
-      return;
-    }
-
+    //Check if it's a QBO Setup.
     let PartnerResponse;
-    try {
-      PartnerResponse = await axios.post(
-        "http://localhost:1337/qb/",
-        // "http://609feaeae986.ngrok.io/qb/",
-        QbXmlResponse.data,
-        {
-          headers: {
-            Authorization: `Bearer ${await auth.currentUser.getIdToken()}`,
-          },
-        }
-      );
-    } catch (error) {
-      console.log("Error connecting to quickbooks or partner.", error);
-      notification["error"]({
-        message: t("jobs.errors.exporting-partner"),
+    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
+      PartnerResponse = await axios.post(`/qbo/receivables`, {
+        withCredentials: true,
+        jobIds: [jobId],
       });
-      setLoading(false);
-      return;
+    } else {
+      //Default is QBD
+
+      let QbXmlResponse;
+      try {
+        QbXmlResponse = await axios.post(
+          "/accounting/qbxml/receivables",
+          { jobIds: [jobId] },
+          {
+            headers: {
+              Authorization: `Bearer ${await auth.currentUser.getIdToken()}`,
+            },
+          }
+        );
+        console.log("handle -> XML", QbXmlResponse);
+      } catch (error) {
+        console.log("Error getting QBXML from Server.", error);
+        notification["error"]({
+          message: t("jobs.errors.exporting", {
+            error: "Unable to retrieve QBXML. " + JSON.stringify(error.message),
+          }),
+        });
+        setLoading(false);
+        return;
+      }
+
+      try {
+        PartnerResponse = await axios.post(
+          "http://localhost:1337/qb/",
+          // "http://609feaeae986.ngrok.io/qb/",
+          QbXmlResponse.data,
+          {
+            headers: {
+              Authorization: `Bearer ${await auth.currentUser.getIdToken()}`,
+            },
+          }
+        );
+      } catch (error) {
+        console.log("Error connecting to quickbooks or partner.", error);
+        notification["error"]({
+          message: t("jobs.errors.exporting-partner"),
+        });
+        setLoading(false);
+        return;
+      }
     }
 
     console.log("PartnerResponse", PartnerResponse);
@@ -159,12 +177,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-actions/jobs-detail-header-actions.csi.component.jsx

@@ -104,7 +104,7 @@ export function JobsDetailHeaderCsi({
               replyTo: bodyshop.email,
             },
             template: {
-              name: TemplateList("job").csi_invitation.key,
+              name: TemplateList("job_special").csi_invitation_action.key,
               variables: {
                 id: result.data.insert_csi.returning[0].id,
               },

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-export-all-button/jobs-export-all-button.component.jsx

@@ -34,53 +34,61 @@ export function JobsExportAllButton({
   const [loading, setLoading] = useState(false);
   const handleQbxml = async () => {
     logImEXEvent("jobs_export_all");
-
-    setLoading(true);
-    let QbXmlResponse;
-    try {
-      QbXmlResponse = await axios.post(
-        "/accounting/qbxml/receivables",
-        { jobIds: jobIds },
-        {
-          headers: {
-            Authorization: `Bearer ${await auth.currentUser.getIdToken()}`,
-          },
-        }
-      );
-    } catch (error) {
-      console.log("Error getting QBXML from Server.", error);
-      notification["error"]({
-        message: t("jobs.errors.exporting", {
-          error: "Unable to retrieve QBXML. " + JSON.stringify(error.message),
-        }),
-      });
-      setLoading(false);
-      return;
-    }
-
     let PartnerResponse;
-    try {
-      PartnerResponse = await axios.post(
-        "http://localhost:1337/qb/",
-        // "http://609feaeae986.ngrok.io/qb/",
-        QbXmlResponse.data,
-        {
-          headers: {
-            Authorization: `Bearer ${await auth.currentUser.getIdToken()}`,
-          },
-        }
-      );
-    } catch (error) {
-      console.log("Error connecting to quickbooks or partner.", error);
-      notification["error"]({
-        message: t("jobs.errors.exporting-partner"),
+    setLoading(true);
+    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
+      PartnerResponse = await axios.post(`/qbo/receivables`, {
+        withCredentials: true,
+        jobIds: jobIds,
       });
-      setLoading(false);
-      return;
-    }
+    } else {
+      let QbXmlResponse;
+      try {
+        QbXmlResponse = await axios.post(
+          "/accounting/qbxml/receivables",
+          { jobIds: jobIds },
+          {
+            headers: {
+              Authorization: `Bearer ${await auth.currentUser.getIdToken()}`,
+            },
+          }
+        );
+      } catch (error) {
+        console.log("Error getting QBXML from Server.", error);
+        notification["error"]({
+          message: t("jobs.errors.exporting", {
+            error: "Unable to retrieve QBXML. " + JSON.stringify(error.message),
+          }),
+        });
+        setLoading(false);
+        return;
+      }
 
+      try {
+        PartnerResponse = await axios.post(
+          "http://localhost:1337/qb/",
+          // "http://609feaeae986.ngrok.io/qb/",
+          QbXmlResponse.data,
+          {
+            headers: {
+              Authorization: `Bearer ${await auth.currentUser.getIdToken()}`,
+            },
+          }
+        );
+      } catch (error) {
+        console.log("Error connecting to quickbooks or partner.", error);
+        notification["error"]({
+          message: t("jobs.errors.exporting-partner"),
+        });
+        setLoading(false);
+        return;
+      }
+    }
     console.log("PartnerResponse", PartnerResponse);
-    const groupedData = _.groupBy(PartnerResponse.data, "id");
+    const groupedData = _.groupBy(
+      PartnerResponse.data,
+      bodyshop.accountingconfig.qbo ? "jobid" : "id"
+    );
 
     await Promise.all(
       Object.keys(groupedData).map(async (key) => {
@@ -157,6 +165,7 @@ export function JobsExportAllButton({
 
     if (!!completedCallback) completedCallback([]);
     if (!!loadingCallback) loadingCallback(false);
+
     setLoading(false);
   };
 

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

@@ -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"),

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.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-all-button/payable-export-all-button.component.jsx

@@ -35,52 +35,61 @@ export function PayableExportAll({
 
   const handleQbxml = async () => {
     logImEXEvent("accounting_payables_export_all");
+    let PartnerResponse;
 
     setLoading(true);
     if (!!loadingCallback) loadingCallback(true);
-
-    let QbXmlResponse;
-    try {
-      QbXmlResponse = await axios.post(
-        "/accounting/qbxml/payables",
-        { bills: billids },
-        {
-          headers: {
-            Authorization: `Bearer ${await auth.currentUser.getIdToken()}`,
-          },
-        }
-      );
-    } catch (error) {
-      console.log("Error getting QBXML from Server.", error);
-      notification["error"]({
-        message: t("bills.errors.exporting", {
-          error: "Unable to retrieve QBXML. " + JSON.stringify(error.message),
-        }),
+    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
+      PartnerResponse = await axios.post(`/qbo/receivables`, {
+        withCredentials: true,
+        bills: billids,
       });
-      if (loadingCallback) loadingCallback(false);
-      setLoading(false);
-      return;
-    }
+    } else {
+      let QbXmlResponse;
+      try {
+        QbXmlResponse = await axios.post(
+          "/accounting/qbxml/payables",
+          { bills: billids },
+          {
+            headers: {
+              Authorization: `Bearer ${await auth.currentUser.getIdToken()}`,
+            },
+          }
+        );
+      } catch (error) {
+        console.log("Error getting QBXML from Server.", error);
+        notification["error"]({
+          message: t("bills.errors.exporting", {
+            error: "Unable to retrieve QBXML. " + JSON.stringify(error.message),
+          }),
+        });
+        if (loadingCallback) loadingCallback(false);
+        setLoading(false);
+        return;
+      }
 
-    let PartnerResponse;
-
-    try {
-      PartnerResponse = await axios.post(
-        "http://localhost:1337/qb/",
-        QbXmlResponse.data
-      );
-    } catch (error) {
-      console.log("Error connecting to quickbooks or partner.", error);
-      notification["error"]({
-        message: t("bills.errors.exporting-partner"),
-      });
-      if (!!loadingCallback) loadingCallback(false);
-      setLoading(false);
-      return;
+      try {
+        PartnerResponse = await axios.post(
+          "http://localhost:1337/qb/",
+          QbXmlResponse.data
+        );
+      } catch (error) {
+        console.log("Error connecting to quickbooks or partner.", error);
+        notification["error"]({
+          message: t("bills.errors.exporting-partner"),
+        });
+        if (!!loadingCallback) loadingCallback(false);
+        setLoading(false);
+        return;
+      }
     }
 
     console.log("handleQbxml -> PartnerResponse", PartnerResponse);
-    const groupedData = _.groupBy(PartnerResponse.data, "id");
+    const groupedData = _.groupBy(
+      PartnerResponse.data,
+      bodyshop.accountingconfig.qbo ? "billid" : "id"
+    );
+
     const proms = [];
     Object.keys(groupedData).forEach((key) => {
       proms.push(

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

@@ -38,44 +38,53 @@ export function PayableExportButton({
     setLoading(true);
     if (!!loadingCallback) loadingCallback(true);
 
-    let QbXmlResponse;
-    try {
-      QbXmlResponse = await axios.post(
-        "/accounting/qbxml/payables",
-        { bills: [billId] },
-        {
-          headers: {
-            Authorization: `Bearer ${await auth.currentUser.getIdToken()}`,
-          },
-        }
-      );
-    } catch (error) {
-      console.log("Error getting QBXML from Server.", error);
-      notification["error"]({
-        message: t("bills.errors.exporting", {
-          error: "Unable to retrieve QBXML. " + JSON.stringify(error.message),
-        }),
-      });
-      if (loadingCallback) loadingCallback(false);
-      setLoading(false);
-      return;
-    }
-
+    //Check if it's a QBO Setup.
     let PartnerResponse;
-
-    try {
-      PartnerResponse = await axios.post(
-        "http://localhost:1337/qb/",
-        QbXmlResponse.data
-      );
-    } catch (error) {
-      console.log("Error connecting to quickbooks or partner.", error);
-      notification["error"]({
-        message: t("bills.errors.exporting-partner"),
+    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
+      PartnerResponse = await axios.post(`/qbo/payables`, {
+        withCredentials: true,
+        bills: [billId],
       });
-      if (!!loadingCallback) loadingCallback(false);
-      setLoading(false);
-      return;
+    } else {
+      //Default is QBD
+
+      let QbXmlResponse;
+      try {
+        QbXmlResponse = await axios.post(
+          "/accounting/qbxml/payables",
+          { bills: [billId] },
+          {
+            headers: {
+              Authorization: `Bearer ${await auth.currentUser.getIdToken()}`,
+            },
+          }
+        );
+      } catch (error) {
+        console.log("Error getting QBXML from Server.", error);
+        notification["error"]({
+          message: t("bills.errors.exporting", {
+            error: "Unable to retrieve QBXML. " + JSON.stringify(error.message),
+          }),
+        });
+        if (loadingCallback) loadingCallback(false);
+        setLoading(false);
+        return;
+      }
+
+      try {
+        PartnerResponse = await axios.post(
+          "http://localhost:1337/qb/",
+          QbXmlResponse.data
+        );
+      } catch (error) {
+        console.log("Error connecting to quickbooks or partner.", error);
+        notification["error"]({
+          message: t("bills.errors.exporting-partner"),
+        });
+        if (!!loadingCallback) loadingCallback(false);
+        setLoading(false);
+        return;
+      }
     }
 
     console.log("handleQbxml -> PartnerResponse", PartnerResponse);
@@ -123,7 +132,14 @@ export function PayableExportButton({
       });
       const billUpdateResponse = await updateBill({
         variables: {
-          billIdList: successfulTransactions.map((st) => st.id),
+          billIdList: successfulTransactions.map(
+            (st) =>
+              st[
+                bodyshop.accountingconfig && bodyshop.accountingconfig.qbo
+                  ? "billid"
+                  : "id"
+              ]
+          ),
           bill: {
             exported: true,
             exported_at: new Date(),

client/src/components/print-center-jobs/print-center-jobs.component.jsx

@@ -1,28 +1,35 @@
 import { Card, Col, Input, Row, Space, Typography } from "antd";
 import _ from "lodash";
 import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectPrintCenter } from "../../redux/modals/modals.selectors";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import { TemplateList } from "../../utils/TemplateConstants";
 import Jobd3RdPartyModal from "../job-3rd-party-modal/job-3rd-party-modal.component";
 import PrintCenterItem from "../print-center-item/print-center-item.component";
 import PrintCenterSpeedPrint from "../print-center-speed-print/print-center-speed-print.component";
-import { useTranslation } from "react-i18next";
 const mapStateToProps = createStructuredSelector({
   printCenterModal: selectPrintCenter,
+  bodyshop: selectBodyshop,
 });
 
 const mapDispatchToProps = (dispatch) => ({});
 
-export function PrintCenterJobsComponent({ printCenterModal }) {
+export function PrintCenterJobsComponent({ printCenterModal, bodyshop }) {
   const [search, setSearch] = useState("");
   const { id: jobId } = printCenterModal.context;
   const tempList = TemplateList("job", {});
   const { t } = useTranslation();
-  const JobsReportsList = Object.keys(tempList).map((key) => {
-    return tempList[key];
-  });
+  const JobsReportsList = Object.keys(tempList)
+    .map((key) => {
+      return tempList[key];
+    })
+    .filter(
+      (temp) =>
+        !temp.regions || (temp.regions && temp.regions[bodyshop.region_config])
+    );
 
   const filteredJobsReportsList =
     search !== ""

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

@@ -1,19 +1,18 @@
-import { Button, Space } from "antd";
+import { Space, Tag } 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 React, { useEffect } from "react";
 import { useCookies } from "react-cookie";
+import { useHistory, useLocation } from "react-router-dom";
+import QboSignIn from "../../assets/qbo/C2QB_green_btn_med_default.svg";
 
 export default function QboAuthorizeComponent() {
   const location = useLocation();
-
-  const [, setCookie] = useCookies(["access_token", "refresh_token"]);
+  const history = useHistory();
+  const [cookies, 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);
@@ -35,42 +34,24 @@ export default function QboAuthorizeComponent() {
         path: "/",
         expires,
       });
+
+      history.push({ pathname: `/manage/accounting/receivables` });
     }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [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>
+    <Space>
+      <img
+        onClick={handleQbSignIn}
+        alt="Sign In to QuickBooks Online"
+        src={QboSignIn}
+        style={{ cursor: "pointer" }}
+      />
+      {!cookies.qbo_realmId && (
+        <Tag color="red">No QuickBooks company has been connected.</Tag>
+      )}
       {error && JSON.parse(decodeURIComponent(error)).error_description}
-    </div>
+    </Space>
   );
 }

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

@@ -18,6 +18,11 @@ 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 graphProps = {
+  strokeWidth: 3,
+};
+
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
 });
@@ -51,7 +56,7 @@ export function ScoreboardChart({ sbEntriesByDate, bodyshop }) {
     }
 
     const theValue = {
-      date: moment(val).format("D dd"),
+      date: moment(val).format("D ddd"),
       paintHrs: _.round(dayhrs.painthrs, 1),
       bodyHrs: _.round(dayhrs.bodyhrs, 1),
       accTargetHrs: _.round(
@@ -81,36 +86,37 @@ export function ScoreboardChart({ sbEntriesByDate, bodyshop }) {
           margin={{ top: 20, right: 20, bottom: 20, left: 20 }}
         >
           <CartesianGrid stroke="#f5f5f5" />
-          <XAxis dataKey="date" />
-          <YAxis />
+          <XAxis dataKey="date" strokeWidth={graphProps.strokeWidth} />
+          <YAxis strokeWidth={graphProps.strokeWidth} />
           <Tooltip />
           <Legend />
           <Area
             type="monotone"
             name="Accumulated Hours"
             dataKey="accHrs"
-            fill="#8884d8"
-            stroke="#8884d8"
+            fill="lightgreen"
+            stroke="green"
           />
           <Bar
             name="Body Hours"
             dataKey="bodyHrs"
             stackId="day"
             barSize={20}
-            fill="#cecece"
+            fill="darkblue"
           />
           <Bar
             name="Paint Hours"
             dataKey="paintHrs"
             stackId="day"
             barSize={20}
-            fill="#413ea0"
+            fill="darkred"
           />
           <Line
             name="Target Hours"
             type="monotone"
             dataKey="accTargetHrs"
             stroke="#ff7300"
+            strokeWidth={graphProps.strokeWidth}
           />
         </ComposedChart>
       </ResponsiveContainer>

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

@@ -1,12 +1,33 @@
 import { Col, Row } from "antd";
-import React from "react";
+import React, { useEffect } from "react";
 import ScoreboardChart from "../scoreboard-chart/scoreboard-chart.component";
 import ScoreboardLastDays from "../scoreboard-last-days/scoreboard-last-days.component";
 import ScoreboardTargetsTable from "../scoreboard-targets-table/scoreboard-targets-table.component";
 
-export default function ScoreboardDisplayComponent({ scoreboardSubscription }) {
-  const { data } = scoreboardSubscription;
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import moment from "moment";
+import { useApolloClient } from "@apollo/client";
+import { GET_BLOCKED_DAYS } from "../../graphql/scoreboard.queries";
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(ScoreboardDisplayComponent);
 
+export function ScoreboardDisplayComponent({
+  bodyshop,
+  scoreboardSubscription,
+}) {
+  const { data } = scoreboardSubscription;
+  const client = useApolloClient();
   const scoreBoardlist = (data && data.scoreboard) || [];
 
   const sbEntriesByDate = {};
@@ -19,6 +40,29 @@ export default function ScoreboardDisplayComponent({ scoreboardSubscription }) {
     sbEntriesByDate[entryDate].push(i);
   });
 
+  useEffect(() => {
+    //Update the locals.
+    async function setMomentSettings() {
+      const {
+        data: { appointments },
+      } = await client.query({
+        query: GET_BLOCKED_DAYS,
+        variables: {
+          start: moment().startOf("month"),
+          end: moment().endOf("month"),
+        },
+      });
+
+      moment.updateLocale("ca", {
+        workingWeekdays: translateSettingsToWorkingDays(bodyshop.workingdays),
+        holidays: appointments.map((h) => moment(h.start).format("MM-DD-YYYY")),
+        holidayFormat: "MM-DD-YYYY",
+      });
+    }
+
+    setMomentSettings();
+  }, [client, bodyshop]);
+
   return (
     <Row gutter={[16, 16]}>
       <Col span={24}>
@@ -35,3 +79,30 @@ export default function ScoreboardDisplayComponent({ scoreboardSubscription }) {
     </Row>
   );
 }
+
+function translateSettingsToWorkingDays(workingdays) {
+  const days = [];
+
+  if (workingdays.monday) {
+    days.push(1);
+  }
+  if (workingdays.tuesday) {
+    days.push(2);
+  }
+  if (workingdays.wednesday) {
+    days.push(3);
+  }
+  if (workingdays.thursday) {
+    days.push(4);
+  }
+  if (workingdays.friday) {
+    days.push(5);
+  }
+  if (workingdays.saturday) {
+    days.push(6);
+  }
+  if (workingdays.sunday) {
+    days.push(0);
+  }
+  return days;
+}

client/src/components/scoreboard-targets-table/scoreboard-targets-table.util.js

@@ -1,8 +1,8 @@
 import moment from "moment-business-days";
 
-moment.updateLocale("ca", {
-  workingWeekdays: [1, 2, 3, 4, 5],
-});
+// moment.updateLocale("ca", {
+//   workingWeekdays: [1, 2, 3, 4, 5, 6],
+// });
 
 export const CalculateWorkingDaysThisMonth = () => {
   return moment().endOf("month").businessDaysIntoMonth();

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

@@ -121,6 +121,13 @@ export default function ShopInfoGeneral({ form }) {
         </Form.Item>
       </LayoutFormRow>
       <LayoutFormRow header={t("bodyshop.labels.accountingsetup")}>
+        <Form.Item
+          label={t("bodyshop.labels.qbo")}
+          valuePropName="checked"
+          name={["accountingconfig", "qbo"]}
+        >
+          <Switch />
+        </Form.Item>
         <Form.Item
           label={t("bodyshop.labels.accountingtiers")}
           rules={[

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

@@ -91,6 +91,18 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
             >
               <Input />
             </Form.Item>
+            <Form.Item
+              label={t("bodyshop.fields.dms.srcco")}
+              rules={[
+                {
+                  required: true,
+                  //message: t("general.validation.required"),
+                },
+              ]}
+              name={["cdk_configuration", "srcco"]}
+            >
+              <Input />
+            </Form.Item>
             <Form.Item
               label={t("bodyshop.fields.dms.generic_customer_number")}
               name={["cdk_configuration", "generic_customer_number"]}
@@ -99,6 +111,12 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
             </Form.Item>
             <Form.Item
               label={t("bodyshop.fields.dms.cashierid")}
+              rules={[
+                {
+                  required: true,
+                  //message: t("general.validation.required"),
+                },
+              ]}
               name={["cdk_configuration", "cashierid"]}
             >
               <Input />
@@ -113,7 +131,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                       <Form.Item key={field.key}>
                         <LayoutFormRow noDivider>
                           <Form.Item
-                            label={t("bodyshop.fields.dms.payer.name")}
+                            label={t("jobs.fields.dms.payer.name")}
                             key={`${index}name`}
                             name={[field.name, "name"]}
                             rules={[
@@ -125,9 +143,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                             <Input />
                           </Form.Item>
                           <Form.Item
-                            label={t(
-                              "bodyshop.fields.dms.payer.dms_acctnumber"
-                            )}
+                            label={t("jobs.fields.dms.payer.dms_acctnumber")}
                             key={`${index}dms_acctnumber`}
                             name={[field.name, "dms_acctnumber"]}
                             rules={[
@@ -139,7 +155,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                             <Input />
                           </Form.Item>
                           <Form.Item
-                            label={t("bodyshop.fields.dms.payer.control_type")}
+                            label={t("jobs.fields.dms.payer.control_type")}
                             key={`${index}control_type`}
                             name={[field.name, "control_type"]}
                             rules={[
@@ -455,20 +471,26 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                     {fields.map((field, index) => (
                       <Form.Item key={field.key}>
                         <div>
-                          <Form.Item
-                            label={t("bodyshop.fields.dms.mappingname")}
-                            key={`${index}name`}
-                            name={[field.name, "name"]}
-                            rules={[
-                              {
-                                required: true,
-                                //message: t("general.validation.required"),
-                              },
-                            ]}
-                          >
-                            <Input />
-                          </Form.Item>
-
+                          <LayoutFormRow>
+                            <Form.Item
+                              label={t("bodyshop.fields.dms.mappingname")}
+                              key={`${index}name`}
+                              name={[field.name, "name"]}
+                              rules={[
+                                {
+                                  required: true,
+                                  //message: t("general.validation.required"),
+                                },
+                              ]}
+                            >
+                              <Input />
+                            </Form.Item>
+                            <DeleteFilled
+                              onClick={() => {
+                                remove(field.name);
+                              }}
+                            />
+                          </LayoutFormRow>
                           <LayoutFormRow
                             header={t("bodyshop.labels.defaultcostsmapping")}
                           >
@@ -682,6 +704,90 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                 ))}
                               </Select>
                             </Form.Item>
+                            <Form.Item
+                              label={t(
+                                "bodyshop.fields.responsibilitycenters.la1"
+                              )}
+                              rules={[
+                                {
+                                  required: true,
+                                  //message: t("general.validation.required"),
+                                },
+                              ]}
+                              key={`${index}costs-LA1`}
+                              name={[field.name, "costs", "LA1"]}
+                            >
+                              <Select>
+                                {costOptions.map((item, idx) => (
+                                  <Select.Option key={idx} value={item}>
+                                    {item}
+                                  </Select.Option>
+                                ))}
+                              </Select>
+                            </Form.Item>
+                            <Form.Item
+                              label={t(
+                                "bodyshop.fields.responsibilitycenters.la2"
+                              )}
+                              rules={[
+                                {
+                                  required: true,
+                                  //message: t("general.validation.required"),
+                                },
+                              ]}
+                              key={`${index}costs-LA2`}
+                              name={[field.name, "costs", "LA2"]}
+                            >
+                              <Select>
+                                {costOptions.map((item, idx) => (
+                                  <Select.Option key={idx} value={item}>
+                                    {item}
+                                  </Select.Option>
+                                ))}
+                              </Select>
+                            </Form.Item>
+                            <Form.Item
+                              label={t(
+                                "bodyshop.fields.responsibilitycenters.la3"
+                              )}
+                              rules={[
+                                {
+                                  required: true,
+                                  //message: t("general.validation.required"),
+                                },
+                              ]}
+                              key={`${index}costs-LA3`}
+                              name={[field.name, "costs", "LA3"]}
+                            >
+                              <Select>
+                                {costOptions.map((item, idx) => (
+                                  <Select.Option key={idx} value={item}>
+                                    {item}
+                                  </Select.Option>
+                                ))}
+                              </Select>
+                            </Form.Item>
+                            <Form.Item
+                              label={t(
+                                "bodyshop.fields.responsibilitycenters.la4"
+                              )}
+                              rules={[
+                                {
+                                  required: true,
+                                  //message: t("general.validation.required"),
+                                },
+                              ]}
+                              key={`${index}costs-LA4`}
+                              name={[field.name, "costs", "LA4"]}
+                            >
+                              <Select>
+                                {costOptions.map((item, idx) => (
+                                  <Select.Option key={idx} value={item}>
+                                    {item}
+                                  </Select.Option>
+                                ))}
+                              </Select>
+                            </Form.Item>
                             <Form.Item
                               label={t(
                                 "bodyshop.fields.responsibilitycenters.paa"
@@ -871,6 +977,27 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                 ))}
                               </Select>
                             </Form.Item>
+                            <Form.Item
+                              label={t(
+                                "bodyshop.fields.responsibilitycenters.pasl"
+                              )}
+                              rules={[
+                                {
+                                  required: true,
+                                  //message: t("general.validation.required"),
+                                },
+                              ]}
+                              key={`${index}costs-PASL`}
+                              name={[field.name, "costs", "PASL"]}
+                            >
+                              <Select>
+                                {costOptions.map((item, idx) => (
+                                  <Select.Option key={idx} value={item}>
+                                    {item}
+                                  </Select.Option>
+                                ))}
+                              </Select>
+                            </Form.Item>
                             <Form.Item
                               label={t(
                                 "bodyshop.fields.responsibilitycenters.tow"
@@ -1148,6 +1275,90 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                 ))}
                               </Select>
                             </Form.Item>
+                            <Form.Item
+                              label={t(
+                                "bodyshop.fields.responsibilitycenters.la1"
+                              )}
+                              rules={[
+                                {
+                                  required: true,
+                                  //message: t("general.validation.required"),
+                                },
+                              ]}
+                              key={`${index}profits-LA1`}
+                              name={[field.name, "profits", "LA1"]}
+                            >
+                              <Select>
+                                {profitOptions.map((item, idx) => (
+                                  <Select.Option key={idx} value={item}>
+                                    {item}
+                                  </Select.Option>
+                                ))}
+                              </Select>
+                            </Form.Item>
+                            <Form.Item
+                              label={t(
+                                "bodyshop.fields.responsibilitycenters.la2"
+                              )}
+                              rules={[
+                                {
+                                  required: true,
+                                  //message: t("general.validation.required"),
+                                },
+                              ]}
+                              key={`${index}profits-LA2`}
+                              name={[field.name, "profits", "LA2"]}
+                            >
+                              <Select>
+                                {profitOptions.map((item, idx) => (
+                                  <Select.Option key={idx} value={item}>
+                                    {item}
+                                  </Select.Option>
+                                ))}
+                              </Select>
+                            </Form.Item>
+                            <Form.Item
+                              label={t(
+                                "bodyshop.fields.responsibilitycenters.la3"
+                              )}
+                              rules={[
+                                {
+                                  required: true,
+                                  //message: t("general.validation.required"),
+                                },
+                              ]}
+                              key={`${index}profits-LA3`}
+                              name={[field.name, "profits", "LA3"]}
+                            >
+                              <Select>
+                                {profitOptions.map((item, idx) => (
+                                  <Select.Option key={idx} value={item}>
+                                    {item}
+                                  </Select.Option>
+                                ))}
+                              </Select>
+                            </Form.Item>
+                            <Form.Item
+                              label={t(
+                                "bodyshop.fields.responsibilitycenters.la4"
+                              )}
+                              rules={[
+                                {
+                                  required: true,
+                                  //message: t("general.validation.required"),
+                                },
+                              ]}
+                              key={`${index}profits-LA4`}
+                              name={[field.name, "profits", "LA4"]}
+                            >
+                              <Select>
+                                {profitOptions.map((item, idx) => (
+                                  <Select.Option key={idx} value={item}>
+                                    {item}
+                                  </Select.Option>
+                                ))}
+                              </Select>
+                            </Form.Item>
                             <Form.Item
                               label={t(
                                 "bodyshop.fields.responsibilitycenters.paa"
@@ -1337,6 +1548,27 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                                 ))}
                               </Select>
                             </Form.Item>
+                            <Form.Item
+                              label={t(
+                                "bodyshop.fields.responsibilitycenters.pasl"
+                              )}
+                              rules={[
+                                {
+                                  required: true,
+                                  //message: t("general.validation.required"),
+                                },
+                              ]}
+                              key={`${index}profits-PASL`}
+                              name={[field.name, "profits", "PASL"]}
+                            >
+                              <Select>
+                                {profitOptions.map((item, idx) => (
+                                  <Select.Option key={idx} value={item}>
+                                    {item}
+                                  </Select.Option>
+                                ))}
+                              </Select>
+                            </Form.Item>
                             <Form.Item
                               label={t(
                                 "bodyshop.fields.responsibilitycenters.tow"
@@ -1401,12 +1633,6 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                               </Select>
                             </Form.Item>
                           </LayoutFormRow>
-
-                          <DeleteFilled
-                            onClick={() => {
-                              remove(field.name);
-                            }}
-                          />
                         </div>
                       </Form.Item>
                     ))}
@@ -1609,6 +1835,78 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
               ))}
             </Select>
           </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.la1")}
+            rules={[
+              {
+                required: true,
+                //message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "costs", "LA1"]}
+          >
+            <Select>
+              {costOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.la2")}
+            rules={[
+              {
+                required: true,
+                //message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "costs", "LA2"]}
+          >
+            <Select>
+              {costOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.la3")}
+            rules={[
+              {
+                required: true,
+                //message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "costs", "LA3"]}
+          >
+            <Select>
+              {costOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.la4")}
+            rules={[
+              {
+                required: true,
+                //message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "costs", "LA4"]}
+          >
+            <Select>
+              {costOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
           <Form.Item
             label={t("bodyshop.fields.responsibilitycenters.paa")}
             rules={[
@@ -1771,6 +2069,24 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
               ))}
             </Select>
           </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.pasl")}
+            rules={[
+              {
+                required: true,
+                //message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "costs", "PASL"]}
+          >
+            <Select>
+              {costOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
           <Form.Item
             label={t("bodyshop.fields.responsibilitycenters.tow")}
             rules={[
@@ -2007,6 +2323,78 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
               ))}
             </Select>
           </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.la1")}
+            rules={[
+              {
+                required: true,
+                //message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "profits", "LA1"]}
+          >
+            <Select>
+              {profitOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.la2")}
+            rules={[
+              {
+                required: true,
+                //message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "profits", "LA2"]}
+          >
+            <Select>
+              {profitOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.la3")}
+            rules={[
+              {
+                required: true,
+                //message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "profits", "LA3"]}
+          >
+            <Select>
+              {profitOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.la4")}
+            rules={[
+              {
+                required: true,
+                //message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "profits", "LA4"]}
+          >
+            <Select>
+              {profitOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
           <Form.Item
             label={t("bodyshop.fields.responsibilitycenters.paa")}
             rules={[
@@ -2169,6 +2557,24 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
               ))}
             </Select>
           </Form.Item>
+          <Form.Item
+            label={t("bodyshop.fields.responsibilitycenters.pasl")}
+            rules={[
+              {
+                required: true,
+                //message: t("general.validation.required"),
+              },
+            ]}
+            name={["md_responsibility_centers", "defaults", "profits", "PASL"]}
+          >
+            <Select>
+              {profitOptions.map((item, idx) => (
+                <Select.Option key={idx} value={item}>
+                  {item}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
           <Form.Item
             label={t("bodyshop.fields.responsibilitycenters.tow")}
             rules={[
@@ -2311,7 +2717,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
         </Form.Item>
         {bodyshop.cdk_dealerid && (
           <Form.Item
-            label={t("bodyshop.fields.responsibilitycenter_dms_acctnumber")}
+            label={t("bodyshop.fields.dms.dms_acctnumber")}
             rules={[
               {
                 required: true,
@@ -2409,7 +2815,7 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
         </Form.Item>
         {bodyshop.cdk_dealerid && (
           <Form.Item
-            label={t("bodyshop.fields.responsibilitycenter_dms_acctnumber")}
+            label={t("bodyshop.fields.dms.dms_acctnumber")}
             rules={[
               {
                 required: true,
@@ -2505,21 +2911,9 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
         >
           <Input />
         </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.responsibilitycenter_rate")}
-          rules={[
-            {
-              required: true,
-              //message: t("general.validation.required"),
-            },
-          ]}
-          name={["md_responsibility_centers", "taxes", "local", "rate"]}
-        >
-          <InputNumber precision={2} />
-        </Form.Item>
         {bodyshop.cdk_dealerid && (
           <Form.Item
-            label={t("bodyshop.fields.responsibilitycenter_dms_acctnumber")}
+            label={t("bodyshop.fields.dms.dms_acctnumber")}
             rules={[
               {
                 required: true,
@@ -2536,6 +2930,18 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
             <Input />
           </Form.Item>
         )}
+        <Form.Item
+          label={t("bodyshop.fields.responsibilitycenter_rate")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_responsibility_centers", "taxes", "local", "rate"]}
+        >
+          <InputNumber precision={2} />
+        </Form.Item>
       </LayoutFormRow>
       <LayoutFormRow header={<div>AR</div>}>
         {/* <Form.Item

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/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,7 +1,8 @@
 import { getAnalytics, logEvent } from "firebase/analytics";
 import { initializeApp } from "firebase/app";
-import { getAuth } from "firebase/auth";
+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";
 
@@ -25,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);
       });
@@ -36,19 +37,7 @@ 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;
@@ -74,13 +63,16 @@ export const logImEXEvent = (eventName, additionalParams, stateProp = null) => {
       null,
     ...additionalParams,
   };
-  console.log(
-    "%c[Analytics]",
-    "background-color: green ;font-weight:bold;",
-    eventName,
-    eventParams
-  );
+  // console.log(
+  //   "%c[Analytics]",
+  //   "background-color: green ;font-weight:bold;",
+  //   eventName,
+  //   eventParams
+  // );
   logEvent(analytics, eventName, eventParams);
+
+  //Log event to OpenReplay server.
+  tracker.event(eventName, eventParams);
 };
 
 // if (messaging) {

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/jobs-lines.queries.js

@@ -160,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
@@ -76,6 +77,7 @@ export const QUERY_PARTS_QUEUE = gql`
     ) {
       ownr_fn
       ownr_ln
+      ownr_co_nm
       ownr_ph1
       ownr_ea
       plate_no
@@ -97,6 +99,7 @@ export const QUERY_PARTS_QUEUE = gql`
       status
       updated_at
       vehicleid
+      ownerid
     }
   }
 `;
@@ -109,6 +112,7 @@ export const SUBSCRIPTION_JOBS_IN_PRODUCTION = gql`
       ro_number
       ownr_fn
       ownr_ln
+      ownr_co_nm
       v_model_yr
       v_model_desc
       clm_no
@@ -362,6 +366,7 @@ export const GET_JOB_BY_PK = gql`
       converted
       lbr_adjustments
       ro_number
+      po_number
       clm_total
       inproduction
       vehicleid
@@ -384,6 +389,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
@@ -434,6 +445,7 @@ export const GET_JOB_BY_PK = gql`
       job_totals
       ownr_fn
       ownr_ln
+      ownr_co_nm
       ownr_ea
       ownr_addr1
       ownr_addr2
@@ -449,6 +461,7 @@ export const GET_JOB_BY_PK = gql`
         id
         ownr_fn
         ownr_ln
+        ownr_co_nm
         ownr_ea
         ownr_addr1
         ownr_addr2
@@ -530,6 +543,7 @@ export const GET_JOB_BY_PK = gql`
         db_ref
         manual_line
         prt_dsmk_p
+        prt_dsmk_m
         billlines(limit: 1, order_by: { bill: { date: desc } }) {
           id
           quantity
@@ -668,6 +682,7 @@ export const QUERY_JOB_CARD_DETAILS = gql`
       inproduction
       production_vars
       ownr_ln
+      ownr_co_nm
       ownr_ph1
       ownr_ea
       ca_gst_registrant
@@ -700,11 +715,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
@@ -1620,6 +1640,7 @@ export const QUERY_ALL_JOBS_PAGINATED_STATUS_FILTERED = gql`
     ) {
       ownr_fn
       ownr_ln
+      ownr_co_nm
       ownerid
       ownr_ph1
       ownr_ea
@@ -1649,6 +1670,7 @@ export const QUERY_ALL_JOBS_PAGINATED_STATUS_FILTERED = gql`
       clm_total
       owner_owing
       ro_number
+      po_number
       scheduled_completion
       scheduled_in
       scheduled_delivery
@@ -1887,9 +1909,60 @@ export const QUERY_JOB_EXPORT_DMS = gql`
       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

@@ -51,3 +51,34 @@ export const UPDATE_SCOREBOARD_ENTRY = gql`
     }
   }
 `;
+
+export const QUERY_SCOREBOARD_ENTRY = gql`
+  query QUERY_SCOREBOARD_ENTRY($jobid: uuid!) {
+    scoreboard(where: { jobid: { _eq: $jobid } }) {
+      bodyhrs
+      date
+      id
+      painthrs
+    }
+  }
+`;
+
+export const GET_BLOCKED_DAYS = gql`
+  query GET_BLOCKED_DAYS($start: timestamptz, $end: timestamptz) {
+    appointments(
+      where: {
+        _and: [
+          { block: { _eq: true } }
+          { canceled: { _eq: false } }
+          { start: { _gte: $start } }
+          { end: { _lte: $end } }
+        ]
+      }
+    ) {
+      id
+      block
+      start
+      end
+    }
+  }
+`;

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

@@ -1,10 +1,19 @@
 import { useQuery } from "@apollo/client";
-import { Button, Col, Result, Row, Select, Space } from "antd";
+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 } from "react-router-dom";
+import { useLocation, useHistory } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import SocketIO from "socket.io-client";
 import AlertComponent from "../../components/alert/alert.component";
@@ -47,7 +56,8 @@ export const socket = SocketIO(
 
 export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
   const { t } = useTranslation();
-  const [logLevel, setLogLevel] = useState("TRACE");
+  const [logLevel, setLogLevel] = useState("DEBUG");
+  const history = useHistory();
   const [logs, setLogs] = useState([]);
   const search = queryString.parse(useLocation().search);
   const { jobId } = search;
@@ -61,6 +71,10 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
     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"),
@@ -69,9 +83,7 @@ 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 [
@@ -90,10 +102,14 @@ 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", logLevel);
-
+    if (socket.disconnected) socket.connect();
     return () => {
       socket.removeAllListeners();
       socket.disconnect();
@@ -101,49 +117,74 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
-  if (!jobId || !bodyshop.cdk_dealerid || !(data && data.jobs_by_pk))
-    return <Result status="404" />;
-
   if (loading) return <LoadingSpinner />;
   if (error) return <AlertComponent message={error.message} type="error" />;
 
+  if (!jobId || !bodyshop.cdk_dealerid || !(data && data.jobs_by_pk))
+    return <Result status="404" />;
+
   return (
     <div>
-      <Row gutter={32}>
-        <Col span={18}>
-          {data && data.jobs_by_pk && data.jobs_by_pk.ro_number}
-          <DmsAllocationsSummary socket={socket} jobId={jobId} />
+      <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>
-        <Col span={6}>
-          <Space>
-            <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>
-          </Space>
-          <div style={{ maxHeight: "500px", overflowY: "auto" }}>
+
+        <DmsCustomerSelector />
+
+        <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} />
-          </div>
+          </Card>
         </Col>
       </Row>
-
-      <DmsCustomerSelector />
     </div>
   );
 }

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

@@ -218,7 +218,7 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
                 },
               ]}
             >
-              <InputNumber disabled={jobRO} />
+              <InputNumber precision={0} disabled={jobRO} />
             </Form.Item>
           )}
           {bodyshop.cdk_dealerid && (
@@ -244,7 +244,7 @@ export function JobsCloseComponent({ job, bodyshop, jobRO }) {
                 }),
               ]}
             >
-              <InputNumber disabled={jobRO} />
+              <InputNumber precision={0} disabled={jobRO} />
             </Form.Item>
           )}
         </LayoutFormRow>

client/src/pages/jobs-create/jobs-create.container.jsx

@@ -85,7 +85,6 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
       });
   };
 
-  console.log("Manual State", state);
   const handleFinish = (values) => {
     let job = Object.assign(
       {},
@@ -142,6 +141,10 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
     }
 
     job = { ...job, ...ownerData };
+
+    if (job.owner === null) delete job.owner;
+    if (job.vehicle === null) delete job.vehicle;
+
     runInsertJob(job);
   };
 

client/src/pages/parts-queue/parts-queue.page.component.jsx

@@ -116,8 +116,8 @@ export function PartsQueuePageComponent({ bodyshop }) {
       // sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
       // sortOrder: sortcolumn === "owner" && sortorder,
       render: (text, record) => {
-        return record.owner ? (
-          <Link to={"/manage/owners/" + record.owner.id}>
+        return record.ownerid ? (
+          <Link to={"/manage/owners/" + record.ownerid}>
             {`${record.ownr_fn || ""} ${record.ownr_ln || ""} ${
               record.ownr_co_nm || ""
             }`}

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/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"
@@ -237,6 +241,9 @@
 					"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 #"
 				},
@@ -385,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",
@@ -406,6 +417,7 @@
 					"pap": "OEM Partial",
 					"par": "Recored",
 					"pas": "Sublet",
+					"pasl": "Sublet (L)",
 					"refund": "Refund",
 					"sales_tax_codes": {
 						"code": "Code",
@@ -497,6 +509,7 @@
 				"orderstatuses": "Order Statuses",
 				"partslocations": "Parts Locations",
 				"printlater": "Print Later",
+				"qbo": "Use QuickBooks Online?",
 				"rbac": "Role Based Access Control",
 				"responsibilitycenters": {
 					"costs": "Cost Centers",
@@ -677,7 +690,8 @@
 			"status": {
 				"in": "Available",
 				"inservice": "In Service",
-				"out": "Rented"
+				"out": "Rented",
+				"sold": "Sold"
 			},
 			"successes": {
 				"saved": "Courtesy Car saved successfully."
@@ -694,7 +708,8 @@
 				"notfoundtitle": "No survey found."
 			},
 			"fields": {
-				"completedon": "Completed On"
+				"completedon": "Completed On",
+				"created_at": "Created At"
 			},
 			"labels": {
 				"nologgedinuser": "Please log out of ImEX Online",
@@ -1033,7 +1048,7 @@
 					"PAP": "OEM Partial",
 					"PAR": "Recored",
 					"PAS": "Sublet",
-					"PASL": "Sublet"
+					"PASL": "Sublet (L)"
 				},
 				"profitcenter_labor": "Profit Center: Labor",
 				"profitcenter_part": "Profit Center: Part",
@@ -1076,8 +1091,10 @@
 				"dms": {
 					"addpayer": "Add Payer",
 					"createnewcustomer": "Create New Customer",
-					"getmakes": "Get Makes",
+					"findmakemodelcode": "Find Make/Model Code",
+					"getmakes": "",
 					"post": "Post",
+					"refetchmakesmodels": "Refetch Make and Model Codes",
 					"usegeneric": "Use Generic Customer",
 					"useselected": "Use Selected Customer"
 				},
@@ -1138,6 +1155,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",
@@ -1169,6 +1209,7 @@
 					"dms_make": "DMS Make",
 					"dms_model": "DMS Model",
 					"dms_wip_acctnumber": "Cost WIP DMS Acct #",
+					"id": "DMS ID",
 					"journal": "Journal #",
 					"name1": "Customer Name",
 					"payer": {
@@ -1180,7 +1221,8 @@
 					},
 					"sale": "Sale",
 					"sale_dms_acctnumber": "Sale DMS Acct #",
-					"story": "Story"
+					"story": "Story",
+					"vinowner": "VIN Owner"
 				},
 				"driveable": "Driveable",
 				"employee_body": "Body",
@@ -1402,8 +1444,11 @@
 				"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",
@@ -1469,6 +1514,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",
@@ -1907,6 +1953,7 @@
 				"coversheet_landscape": "Coversheet (Landscape)",
 				"coversheet_portrait": "Coversheet Portrait",
 				"csi_invitation": "CSI Invitation",
+				"csi_invitation_action": "CSI Invite",
 				"diagnostic_authorization": "Diagnostic Authorization",
 				"estimate": "Estimate Only",
 				"estimate_detail": "Estimate Details",
@@ -1937,6 +1984,8 @@
 				"qc_sheet": "Quality Control Sheet",
 				"ro_totals": "RO Totals",
 				"ro_with_description": "RO Summary with Descriptions",
+				"sgi_certificate_of_repairs": "SGI - Certificate of Repairs",
+				"sgi_windshield_auth": "SGI - Windshield Authorization",
 				"stolen_recovery_checklist": "Stolen Recovery Checklist",
 				"supplement_request": "Supplement Request",
 				"thank_you_ro": "Thank You Letter",
@@ -1969,6 +2018,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"
@@ -2033,10 +2087,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",
@@ -2052,6 +2114,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",
@@ -2246,6 +2309,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",
@@ -2284,6 +2348,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": ""
@@ -237,6 +241,9 @@
 					"dms_acctnumber": "",
 					"dms_wip_acctnumber": "",
 					"generic_customer_number": "",
+					"itc_federal": "",
+					"itc_local": "",
+					"itc_state": "",
 					"mappingname": "",
 					"srcco": ""
 				},
@@ -385,6 +392,10 @@
 					"ar": "",
 					"ats": "",
 					"federal_tax": "",
+					"la1": "",
+					"la2": "",
+					"la3": "",
+					"la4": "",
 					"lab": "",
 					"lad": "",
 					"lae": "",
@@ -406,6 +417,7 @@
 					"pap": "",
 					"par": "",
 					"pas": "",
+					"pasl": "",
 					"refund": "",
 					"sales_tax_codes": {
 						"code": "",
@@ -497,6 +509,7 @@
 				"orderstatuses": "",
 				"partslocations": "",
 				"printlater": "",
+				"qbo": "",
 				"rbac": "",
 				"responsibilitycenters": {
 					"costs": "",
@@ -677,7 +690,8 @@
 			"status": {
 				"in": "",
 				"inservice": "",
-				"out": ""
+				"out": "",
+				"sold": ""
 			},
 			"successes": {
 				"saved": ""
@@ -694,7 +708,8 @@
 				"notfoundtitle": ""
 			},
 			"fields": {
-				"completedon": ""
+				"completedon": "",
+				"created_at": ""
 			},
 			"labels": {
 				"nologgedinuser": "",
@@ -1076,8 +1091,10 @@
 				"dms": {
 					"addpayer": "",
 					"createnewcustomer": "",
+					"findmakemodelcode": "",
 					"getmakes": "",
 					"post": "",
+					"refetchmakesmodels": "",
 					"usegeneric": "",
 					"useselected": ""
 				},
@@ -1138,6 +1155,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": "",
@@ -1169,6 +1209,7 @@
 					"dms_make": "",
 					"dms_model": "",
 					"dms_wip_acctnumber": "",
+					"id": "",
 					"journal": "",
 					"name1": "",
 					"payer": {
@@ -1180,7 +1221,8 @@
 					},
 					"sale": "",
 					"sale_dms_acctnumber": "",
-					"story": ""
+					"story": "",
+					"vinowner": ""
 				},
 				"driveable": "",
 				"employee_body": "",
@@ -1402,8 +1444,11 @@
 				"difference": "",
 				"diskscan": "",
 				"dms": {
+					"defaultstory": "",
 					"kmoutnotgreaterthankmin": "",
+					"logs": "",
 					"notallocated": "",
+					"postingform": "",
 					"totalallocated": ""
 				},
 				"documents": "documentos",
@@ -1469,6 +1514,7 @@
 					"removedpartsstrikethrough": ""
 				},
 				"reconciliationheader": "",
+				"relatedros": "",
 				"returntotals": "",
 				"rosaletotal": "",
 				"sale_labor": "",
@@ -1907,6 +1953,7 @@
 				"coversheet_landscape": "",
 				"coversheet_portrait": "",
 				"csi_invitation": "",
+				"csi_invitation_action": "",
 				"diagnostic_authorization": "",
 				"estimate": "",
 				"estimate_detail": "",
@@ -1937,6 +1984,8 @@
 				"qc_sheet": "",
 				"ro_totals": "",
 				"ro_with_description": "",
+				"sgi_certificate_of_repairs": "",
+				"sgi_windshield_auth": "",
 				"stolen_recovery_checklist": "",
 				"supplement_request": "",
 				"thank_you_ro": "",
@@ -1969,6 +2018,11 @@
 			"payments": {
 				"ca_bc_etf_table": ""
 			},
+			"subjects": {
+				"jobs": {
+					"parts_order": ""
+				}
+			},
 			"vendors": {
 				"purchases_by_vendor_detailed": "",
 				"purchases_by_vendor_summary": ""
@@ -2033,10 +2087,18 @@
 				"employee": "",
 				"filterson": "",
 				"generateasemail": "",
+				"groups": {
+					"customers": "",
+					"jobs": "",
+					"payroll": "",
+					"purchases": "",
+					"sales": ""
+				},
 				"key": "",
 				"objects": {
 					"appointments": "",
 					"bills": "",
+					"csi": "",
 					"exportlogs": "",
 					"jobs": "",
 					"parts_orders": "",
@@ -2052,6 +2114,7 @@
 				"attendance_employee": "",
 				"attendance_summary": "",
 				"credits_not_received_date": "",
+				"csi": "",
 				"estimator_detail": "",
 				"estimator_summary": "",
 				"export_payables": "",
@@ -2246,6 +2309,7 @@
 				"courtesycars-detail": "",
 				"courtesycars-new": "",
 				"dashboard": "",
+				"dms": "",
 				"export-logs": "",
 				"jobs": "",
 				"jobs-active": "",
@@ -2284,6 +2348,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": ""
@@ -237,6 +241,9 @@
 					"dms_acctnumber": "",
 					"dms_wip_acctnumber": "",
 					"generic_customer_number": "",
+					"itc_federal": "",
+					"itc_local": "",
+					"itc_state": "",
 					"mappingname": "",
 					"srcco": ""
 				},
@@ -385,6 +392,10 @@
 					"ar": "",
 					"ats": "",
 					"federal_tax": "",
+					"la1": "",
+					"la2": "",
+					"la3": "",
+					"la4": "",
 					"lab": "",
 					"lad": "",
 					"lae": "",
@@ -406,6 +417,7 @@
 					"pap": "",
 					"par": "",
 					"pas": "",
+					"pasl": "",
 					"refund": "",
 					"sales_tax_codes": {
 						"code": "",
@@ -497,6 +509,7 @@
 				"orderstatuses": "",
 				"partslocations": "",
 				"printlater": "",
+				"qbo": "",
 				"rbac": "",
 				"responsibilitycenters": {
 					"costs": "",
@@ -677,7 +690,8 @@
 			"status": {
 				"in": "",
 				"inservice": "",
-				"out": ""
+				"out": "",
+				"sold": ""
 			},
 			"successes": {
 				"saved": ""
@@ -694,7 +708,8 @@
 				"notfoundtitle": ""
 			},
 			"fields": {
-				"completedon": ""
+				"completedon": "",
+				"created_at": ""
 			},
 			"labels": {
 				"nologgedinuser": "",
@@ -1076,8 +1091,10 @@
 				"dms": {
 					"addpayer": "",
 					"createnewcustomer": "",
+					"findmakemodelcode": "",
 					"getmakes": "",
 					"post": "",
+					"refetchmakesmodels": "",
 					"usegeneric": "",
 					"useselected": ""
 				},
@@ -1138,6 +1155,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": "",
@@ -1169,6 +1209,7 @@
 					"dms_make": "",
 					"dms_model": "",
 					"dms_wip_acctnumber": "",
+					"id": "",
 					"journal": "",
 					"name1": "",
 					"payer": {
@@ -1180,7 +1221,8 @@
 					},
 					"sale": "",
 					"sale_dms_acctnumber": "",
-					"story": ""
+					"story": "",
+					"vinowner": ""
 				},
 				"driveable": "",
 				"employee_body": "",
@@ -1402,8 +1444,11 @@
 				"difference": "",
 				"diskscan": "",
 				"dms": {
+					"defaultstory": "",
 					"kmoutnotgreaterthankmin": "",
+					"logs": "",
 					"notallocated": "",
+					"postingform": "",
 					"totalallocated": ""
 				},
 				"documents": "Les documents",
@@ -1469,6 +1514,7 @@
 					"removedpartsstrikethrough": ""
 				},
 				"reconciliationheader": "",
+				"relatedros": "",
 				"returntotals": "",
 				"rosaletotal": "",
 				"sale_labor": "",
@@ -1907,6 +1953,7 @@
 				"coversheet_landscape": "",
 				"coversheet_portrait": "",
 				"csi_invitation": "",
+				"csi_invitation_action": "",
 				"diagnostic_authorization": "",
 				"estimate": "",
 				"estimate_detail": "",
@@ -1937,6 +1984,8 @@
 				"qc_sheet": "",
 				"ro_totals": "",
 				"ro_with_description": "",
+				"sgi_certificate_of_repairs": "",
+				"sgi_windshield_auth": "",
 				"stolen_recovery_checklist": "",
 				"supplement_request": "",
 				"thank_you_ro": "",
@@ -1969,6 +2018,11 @@
 			"payments": {
 				"ca_bc_etf_table": ""
 			},
+			"subjects": {
+				"jobs": {
+					"parts_order": ""
+				}
+			},
 			"vendors": {
 				"purchases_by_vendor_detailed": "",
 				"purchases_by_vendor_summary": ""
@@ -2033,10 +2087,18 @@
 				"employee": "",
 				"filterson": "",
 				"generateasemail": "",
+				"groups": {
+					"customers": "",
+					"jobs": "",
+					"payroll": "",
+					"purchases": "",
+					"sales": ""
+				},
 				"key": "",
 				"objects": {
 					"appointments": "",
 					"bills": "",
+					"csi": "",
 					"exportlogs": "",
 					"jobs": "",
 					"parts_orders": "",
@@ -2052,6 +2114,7 @@
 				"attendance_employee": "",
 				"attendance_summary": "",
 				"credits_not_received_date": "",
+				"csi": "",
 				"estimator_detail": "",
 				"estimator_summary": "",
 				"export_payables": "",
@@ -2246,6 +2309,7 @@
 				"courtesycars-detail": "",
 				"courtesycars-new": "",
 				"dashboard": "",
+				"dms": "",
 				"export-logs": "",
 				"jobs": "",
 				"jobs-active": "",
@@ -2284,6 +2348,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/GraphQLClient.js

@@ -38,9 +38,9 @@ const roundTripLink = new ApolloLink((operation, forward) => {
   return forward(operation).map((data) => {
     // Called after server responds
     const time = new Date() - operation.getContext().start;
-    console.log(
-      `Operation ${operation.operationName} took ${time} to complete`
-    );
+    // console.log(
+    //   `Operation ${operation.operationName} took ${time} to complete`
+    // );
     TrackExecutionTime(operation.operationName, time);
     return data;
   });

client/src/utils/TemplateConstants.js

@@ -352,6 +352,28 @@ export const TemplateList = (type, context) => {
             disabled: false,
             group: "ro",
           },
+          sgi_certificate_of_repairs: {
+            title: i18n.t("printcenter.jobs.sgi_certificate_of_repairs"),
+            description: "Thank You Letter by RO",
+            key: "sgi_certificate_of_repairs",
+            subject: i18n.t("printcenter.jobs.sgi_certificate_of_repairs"),
+            disabled: false,
+            group: "ro",
+            regions: {
+              CA_SK: true,
+            },
+          },
+          sgi_windshield_auth: {
+            title: i18n.t("printcenter.jobs.sgi_windshield_auth"),
+            description: "Thank You Letter by RO",
+            key: "sgi_windshield_auth",
+            subject: i18n.t("printcenter.jobs.sgi_windshield_auth"),
+            disabled: false,
+            group: "pre",
+            regions: {
+              CA_SK: true,
+            },
+          },
           // parts_label_multi: {
           //   title: i18n.t("printcenter.jobs.parts_label_multi"),
           //   description: "Thank You Letter by RO",
@@ -370,6 +392,13 @@ export const TemplateList = (type, context) => {
             key: "special_thirdpartypayer",
             disabled: false,
           },
+          csi_invitation_action: {
+            title: i18n.t("printcenter.jobs.csi_invitation_action"),
+            description: "CSI invite",
+            key: "csi_invitation_action",
+            subject: i18n.t("printcenter.jobs.csi_invitation_action"),
+            disabled: false,
+          },
         }
       : {}),
     ...(!type || type === "appointment"
@@ -391,7 +420,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 +448,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 +459,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 +477,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 +491,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 +509,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 +523,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 +541,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 +555,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 +573,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 +591,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 +606,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 +623,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 +638,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 +783,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 +796,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 +809,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 +824,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 +837,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 +1007,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 +1020,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 +1033,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 +1046,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 +1059,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 +1072,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 +1085,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 +1098,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 +1112,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 +1125,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 +1138,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 +1151,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 +1164,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 +1177,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 +1190,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 +1203,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 +1216,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 +1229,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 +1242,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 +1255,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 +1268,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 +1281,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 +1294,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 +1307,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 +1320,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 +1333,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 +1346,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;

hasura/config.yaml

@@ -1,2 +1,7 @@
+version: 2
 endpoint: https://bodyshop-dev-db.herokuapp.com
 admin_secret: Dev-BodyShopApp!
+metadata_directory: metadata
+actions:
+  kind: synchronous
+  handler_webhook_baseurl: http://localhost:3000

hasura/metadata/actions.yaml

@@ -0,0 +1,6 @@
+actions: []
+custom_types:
+  enums: []
+  input_objects: []
+  objects: []
+  scalars: []

hasura/metadata/allow_list.yaml

@@ -0,0 +1 @@
+[]

hasura/metadata/cron_triggers.yaml

@@ -0,0 +1 @@
+[]

hasura/metadata/functions.yaml

@@ -0,0 +1,27 @@
+- function:
+    schema: public
+    name: search_bills
+- function:
+    schema: public
+    name: search_cccontracts
+- function:
+    schema: public
+    name: search_dms_vehicles
+- function:
+    schema: public
+    name: search_exportlog
+- function:
+    schema: public
+    name: search_jobs
+- function:
+    schema: public
+    name: search_owners
+- function:
+    schema: public
+    name: search_payments
+- function:
+    schema: public
+    name: search_phonebook
+- function:
+    schema: public
+    name: search_vehicles

hasura/metadata/query_collections.yaml

@@ -0,0 +1 @@
+[]

hasura/metadata/remote_schemas.yaml

@@ -0,0 +1 @@
+[]

hasura/metadata/version.yaml

@@ -0,0 +1 @@
+version: 2

hasura/migrations/1621379721863_alter_table_public_bodyshops_add_column_website/down.sql

@@ -0,0 +1,2 @@
+
+ALTER TABLE "public"."bodyshops" DROP COLUMN "website";

hasura/migrations/1621379721863_alter_table_public_bodyshops_add_column_website/up.sql

@@ -0,0 +1,2 @@
+
+ALTER TABLE "public"."bodyshops" ADD COLUMN "website" text NULL;

hasura/migrations/1621469433708_alter_table_public_documents_add_column_takenat/down.sql

@@ -0,0 +1,2 @@
+
+ALTER TABLE "public"."documents" DROP COLUMN "takenat";

hasura/migrations/1621469433708_alter_table_public_documents_add_column_takenat/up.sql

@@ -0,0 +1,2 @@
+
+ALTER TABLE "public"."documents" ADD COLUMN "takenat" timestamptz NULL;

hasura/migrations/1622147830428_alter_table_public_bodyshops_alter_column_autohouseid/down.sql

@@ -0,0 +1,2 @@
+
+ALTER TABLE "public"."bodyshops" ADD CONSTRAINT "bodyshops_autohouseid_key" UNIQUE ("autohouseid");

hasura/migrations/1622147830428_alter_table_public_bodyshops_alter_column_autohouseid/up.sql

@@ -0,0 +1,2 @@
+
+ALTER TABLE "public"."bodyshops" DROP CONSTRAINT "bodyshops_autohouseid_key";

hasura/migrations/1622147892235_alter_table_public_bodyshops_add_column_jc_hourly_rates/down.sql

@@ -0,0 +1,2 @@
+
+ALTER TABLE "public"."bodyshops" DROP COLUMN "jc_hourly_rates";