IO-70 Add basic functions of OEC.

release/2021-11-19

Approved-by: Patrick Fic

.gitignore

@@ -112,3 +112,4 @@ firebase/.env
 .elasticbeanstalk/*
 !.elasticbeanstalk/*.cfg.yml
 !.elasticbeanstalk/*.global.yml
+logs/oAuthClient-log.log

client/craco.config.js

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

client/package.json

@@ -2,83 +2,90 @@
   "name": "bodyshop",
   "version": "0.1.1",
   "private": true,
-  "proxy": "http://localhost:5000",
+  "proxy": "http://localhost:4000",
   "dependencies": {
-    "@apollo/client": "^3.3.21",
-    "@craco/craco": "^6.2.0",
-    "@fingerprintjs/fingerprintjs": "^3.2.0",
-    "@lourenci/react-kanban": "^2.1.0",
-    "@sentry/react": "^6.10.0",
-    "@sentry/tracing": "^6.10.0",
-    "@stripe/react-stripe-js": "^1.4.0",
-    "@stripe/stripe-js": "^1.16.0",
-    "@tanem/react-nprogress": "^3.0.74",
-    "antd": "^4.16.8",
+    "@apollo/client": "^3.4.17",
+    "@asseinfo/react-kanban": "^2.2.0",
+    "@craco/craco": "^6.4.0",
+    "@fingerprintjs/fingerprintjs": "^3.3.0",
+    "@openreplay/tracker": "^3.4.7",
+    "@openreplay/tracker-assist": "^3.4.4",
+    "@openreplay/tracker-graphql": "^3.0.0",
+    "@openreplay/tracker-redux": "^3.0.0",
+    "@sentry/react": "^6.14.3",
+    "@sentry/tracing": "^6.14.3",
+    "@splitsoftware/splitio-react": "^1.3.0",
+    "@stripe/react-stripe-js": "^1.6.0",
+    "@stripe/stripe-js": "^1.21.1",
+    "@tanem/react-nprogress": "^3.0.82",
+    "antd": "^4.16.13",
     "apollo-link-logger": "^2.0.0",
-    "axios": "^0.21.1",
-    "craco-less": "^1.18.0",
-    "dinero.js": "^1.9.0",
+    "axios": "^0.24.0",
+    "craco-less": "^1.20.0",
+    "dinero.js": "^1.9.1",
     "dotenv": "^10.0.0",
     "enquire-js": "^0.2.1",
     "env-cmd": "^10.1.0",
-    "exifr": "^7.1.2",
-    "firebase": "^8.7.1",
-    "graphql": "^15.5.1",
-    "i18next": "^20.3.4",
+    "exifr": "^7.1.3",
+    "firebase": "^9.4.1",
+    "graphql": "^16.0.1",
+    "i18next": "^21.4.2",
     "i18next-browser-languagedetector": "^6.1.2",
-    "jsoneditor": "^9.5.2",
+    "jsoneditor": "^9.5.7",
     "jsreport-browser-client-dist": "^1.3.0",
-    "libphonenumber-js": "^1.9.22",
-    "logrocket": "^1.2.0",
-    "markerjs2": "^2.9.0",
+    "libphonenumber-js": "^1.9.42",
+    "logrocket": "^2.1.1",
+    "markerjs2": "^2.17.0",
     "moment-business-days": "^1.2.0",
-    "phone": "^3.1.2",
+    "phone": "^3.1.9",
     "preval.macro": "^5.0.0",
     "prop-types": "^15.7.2",
     "query-string": "^7.0.1",
     "rc-queue-anim": "^2.0.0",
     "rc-scroll-anim": "^2.7.6",
     "react": "^17.0.1",
-    "react-big-calendar": "^0.33.2",
+    "react-big-calendar": "^0.38.1",
     "react-color": "^2.19.3",
+    "react-cookie": "^4.1.1",
     "react-dom": "^17.0.1",
     "react-drag-listview": "^0.1.8",
     "react-grid-gallery": "^0.5.5",
-    "react-grid-layout": "^1.2.5",
-    "react-i18next": "^11.11.3",
-    "react-icons": "^4.2.0",
-    "react-number-format": "^4.6.4",
-    "react-redux": "^7.2.4",
+    "react-grid-layout": "^1.3.0",
+    "react-i18next": "^11.14.2",
+    "react-icons": "^4.3.1",
+    "react-number-format": "^4.8.0",
+    "react-redux": "^7.2.6",
     "react-resizable": "^3.0.4",
-    "react-router-dom": "^5.2.0",
+    "react-router-dom": "^5.3.0",
     "react-scripts": "^4.0.3",
     "react-sublime-video": "^0.2.5",
     "react-virtualized": "^9.22.3",
-    "recharts": "^2.0.10",
-    "redux": "^4.1.0",
+    "recharts": "^2.1.6",
+    "redux": "^4.1.2",
     "redux-persist": "^6.0.0",
     "redux-saga": "^1.1.3",
     "redux-state-sync": "^3.1.2",
-    "reselect": "^4.0.0",
-    "sass": "^1.35.2",
-    "socket.io-client": "^4.1.3",
-    "styled-components": "^5.3.0",
-    "subscriptions-transport-ws": "^0.9.18",
-    "web-vitals": "^2.1.0",
-    "workbox-background-sync": "^6.1.5",
-    "workbox-broadcast-update": "^6.1.5",
-    "workbox-cacheable-response": "^6.1.5",
-    "workbox-core": "^6.1.5",
-    "workbox-expiration": "^6.1.5",
-    "workbox-google-analytics": "^6.1.5",
-    "workbox-navigation-preload": "^6.1.5",
-    "workbox-precaching": "^6.1.5",
-    "workbox-range-requests": "^6.1.5",
-    "workbox-routing": "^6.1.5",
-    "workbox-strategies": "^6.1.5",
-    "workbox-streams": "^6.1.5"
+    "reselect": "^4.1.2",
+    "sass": "^1.43.4",
+    "socket.io-client": "^4.3.2",
+    "styled-components": "^5.3.3",
+    "subscriptions-transport-ws": "^0.11.0",
+    "web-vitals": "^2.1.2",
+    "workbox-background-sync": "^6.3.0",
+    "workbox-broadcast-update": "^6.3.0",
+    "workbox-cacheable-response": "^6.3.0",
+    "workbox-core": "^6.3.0",
+    "workbox-expiration": "^6.3.0",
+    "workbox-google-analytics": "^6.3.0",
+    "workbox-navigation-preload": "^6.3.0",
+    "workbox-precaching": "^6.3.0",
+    "workbox-range-requests": "^6.3.0",
+    "workbox-routing": "^6.3.0",
+    "workbox-strategies": "^6.3.0",
+    "workbox-streams": "^6.3.0"
   },
   "scripts": {
+    "postinstall": "patch-package",
     "analyze": "source-map-explorer 'build/static/js/*.js'",
     "start": "craco start",
     "build": "REACT_APP_GIT_SHA=`git rev-parse --short HEAD` craco build",
@@ -108,6 +115,8 @@
     ]
   },
   "devDependencies": {
+    "@sentry/webpack-plugin": "^1.18.3",
+    "patch-package": "^6.4.7",
     "redux-logger": "^3.0.6",
     "source-map-explorer": "^2.5.2"
   }

client/src/App/App.container.jsx

@@ -1,4 +1,8 @@
 import { ApolloProvider } from "@apollo/client";
+//import trackerRedux from "@openreplay/tracker-redux";
+import Tracker from "@openreplay/tracker";
+import trackerGraphQL from "@openreplay/tracker-graphql";
+import { SplitFactory, SplitSdk } from "@splitsoftware/splitio-react";
 import { ConfigProvider } from "antd";
 import enLocale from "antd/es/locale/en_US";
 import LogRocket from "logrocket";
@@ -6,12 +10,40 @@ import moment from "moment";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import GlobalLoadingBar from "../components/global-loading-bar/global-loading-bar.component";
+//import trackerAssist from "@openreplay/tracker-assist";
+import { getCurrentUser } from "../firebase/firebase.utils";
 import client from "../utils/GraphQLClient";
 import App from "./App";
+
 moment.locale("en-US");
 
+export const tracker = new Tracker({
+  projectKey: "trDmOZlEXUpjGsMtHroA",
+  ingestPoint: "https://replay.imex.online/ingest",
+  ...(process.env.NODE_ENV === null || process.env.NODE_ENV === "development"
+    ? { __DISABLE_SECURE_MODE: true }
+    : {}),
+  // beaconSize: 10485760,
+  onStart: async ({ sessionID }) => {
+    const user = await getCurrentUser();
+    if (user) tracker.setUserID(user.email);
+  },
+});
+
+// tracker.use(
+//   trackerAssist({ confirmText: "Technical support is about to assist you." })
+// ); // check the list of available options below
+export const recordGraphQL = tracker.use(trackerGraphQL());
+tracker.start();
 if (process.env.NODE_ENV === "production") LogRocket.init("gvfvfw/bodyshopapp");
 
+export const factory = SplitSdk({
+  core: {
+    authorizationKey: process.env.REACT_APP_SPLIT_API,
+    key: "anon",
+  },
+});
+
 export default function AppContainer() {
   const { t } = useTranslation();
 
@@ -29,7 +61,9 @@ export default function AppContainer() {
         }}
       >
         <GlobalLoadingBar />
-        <App />
+        <SplitFactory factory={factory}>
+          <App />
+        </SplitFactory>
       </ConfigProvider>
     </ApolloProvider>
   );

client/src/App/App.jsx

@@ -53,7 +53,6 @@ export function App({ checkUserSession, currentUser, online, setOnline }) {
   const { t } = useTranslation();
 
   window.addEventListener("offline", function (e) {
-    console.log("Internet connection lost.");
     setOnline(false);
   });
 

client/src/App/App.styles.scss

@@ -124,3 +124,13 @@
     z-index: 2 !important;
   }
 }
+
+.react-kanban-column {
+  background-color: #ddd !important;
+}
+
+.production-list-table {
+  td.ant-table-column-sort {
+    background: unset;
+  }
+}

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

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

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

@@ -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);
@@ -109,6 +126,17 @@ export default function AccountingPayablesTableComponent({ loading, bills }) {
         <Checkbox disabled checked={record.is_credit_memo} />
       ),
     },
+    {
+      title: t("exportlogs.labels.attempts"),
+      dataIndex: "attempts",
+      key: "attempts",
+
+      render: (text, record) => {
+        const success = record.exportlogs.filter((e) => e.successful).length;
+        const attempts = record.exportlogs.length;
+        return `${success}/${attempts}`;
+      },
+    },
     {
       title: t("general.labels.actions"),
       dataIndex: "actions",
@@ -121,6 +149,7 @@ export default function AccountingPayablesTableComponent({ loading, bills }) {
             billId={record.id}
             disabled={transInProgress || !!record.exported}
             loadingCallback={setTransInProgress}
+            setSelectedBills={setSelectedBills}
           />
         </div>
       ),
@@ -154,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-payments-table/accounting-payments-table.component.jsx

@@ -8,8 +8,26 @@ import { DateFormatter, DateTimeFormatter } from "../../utils/DateFormatter";
 import { alphaSort, dateSort } from "../../utils/sorters";
 import PaymentExportButton from "../payment-export-button/payment-export-button.component";
 import PaymentsExportAllButton from "../payments-export-all-button/payments-export-all-button.component";
+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({
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(AccountingPayablesTableComponent);
+
+export function AccountingPayablesTableComponent({
+  bodyshop,
   loading,
   payments,
 }) {
@@ -108,7 +126,17 @@ export default function AccountingPayablesTableComponent({
         <DateTimeFormatter>{record.exportedat}</DateTimeFormatter>
       ),
     },
+    {
+      title: t("exportlogs.labels.attempts"),
+      dataIndex: "attempts",
+      key: "attempts",
 
+      render: (text, record) => {
+        const success = record.exportlogs.filter((e) => e.successful).length;
+        const attempts = record.exportlogs.length;
+        return `${success}/${attempts}`;
+      },
+    },
     {
       title: t("general.labels.actions"),
       dataIndex: "actions",
@@ -120,6 +148,7 @@ export default function AccountingPayablesTableComponent({
           paymentId={record.id}
           disabled={transInProgress || !!record.exportedat}
           loadingCallback={setTransInProgress}
+          setSelectedPayments={setSelectedPayments}
         />
       ),
     },
@@ -152,6 +181,9 @@ export default function AccountingPayablesTableComponent({
             loadingCallback={setTransInProgress}
             completedCallback={setSelectedPayments}
           />
+          {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);
@@ -114,17 +133,28 @@ export default function AccountingReceivablesTableComponent({ loading, jobs }) {
         );
       },
     },
+    {
+      title: t("exportlogs.labels.attempts"),
+      dataIndex: "attempts",
+      key: "attempts",
+
+      render: (text, record) => {
+        const success = record.exportlogs.filter((e) => e.successful).length;
+        const attempts = record.exportlogs.length;
+        return `${success}/${attempts}`;
+      },
+    },
     {
       title: t("general.labels.actions"),
       dataIndex: "actions",
       key: "actions",
-      sorter: (a, b) => a.clm_total - b.clm_total,
 
       render: (text, record) => (
         <Space wrap>
           <JobExportButton
             jobId={record.id}
             disabled={!!record.date_exported}
+            setSelectedJobs={setSelectedJobs}
           />
           <Link to={`/manage/jobs/${record.id}/close`}>
             <Button>{t("jobs.labels.viewallocations")}</Button>
@@ -169,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 && !bodyshop.pbs_serialnumber && (
+            <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({ ...form.getFieldsValue(), billlines: [] });
     } else {
       toggleModalVisible();
     }
@@ -208,23 +234,6 @@ function BillEnterModalContainer({
     if (enterAgain) form.submit();
   }, [enterAgain, form]);
 
-  const formValues = useMemo(() => {
-    return {
-      ...billEnterModal.context.bill,
-      jobid:
-        (billEnterModal.context.job && billEnterModal.context.job.id) || null,
-      federal_tax_rate:
-        (bodyshop.bill_tax_rates && bodyshop.bill_tax_rates.federal_tax_rate) ||
-        0,
-      state_tax_rate:
-        (bodyshop.bill_tax_rates && bodyshop.bill_tax_rates.state_tax_rate) ||
-        0,
-      local_tax_rate:
-        (bodyshop.bill_tax_rates && bodyshop.bill_tax_rates.local_tax_rate) ||
-        0,
-    };
-  }, [billEnterModal, bodyshop]);
-
   useEffect(() => {
     if (billEnterModal.visible) {
       form.setFieldsValue(formValues);

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

@@ -72,9 +72,11 @@ export function BillEnterModalLinesComponent({
                         quantity: opt.part_qty || 1,
                         actual_price: opt.cost,
                         cost_center: opt.part_type
-                          ? responsibilityCenters.defaults.costs[
+                          ? responsibilityCenters.defaults &&
+                            (responsibilityCenters.defaults.costs[
                               opt.part_type
-                            ] || null
+                            ] ||
+                              null)
                           : null,
                       };
                     }
@@ -154,18 +156,7 @@ export function BillEnterModalLinesComponent({
               setFieldsValue({
                 billlines: getFieldsValue("billlines").billlines.map(
                   (item, idx) => {
-                    console.log("Checking", index, idx);
                     if (idx === index) {
-                      console.log(
-                        "Found and setting.",
-                        !!item.actual_cost
-                          ? item.actual_cost
-                          : Math.round(
-                              (parseFloat(e.target.value) * (1 - discount) +
-                                Number.EPSILON) *
-                                100
-                            ) / 100
-                      );
                       return {
                         ...item,
                         actual_cost: !!item.actual_cost
@@ -500,9 +491,9 @@ const EditableCell = ({
             labelCol={{ span: 0 }}
             {...(formItemProps && formItemProps(record))}
           >
-            {(formInput && formInput(record, record.key)) || children}
+            {(formInput && formInput(record, record.name)) || children}
           </Form.Item>
-          {additional && additional(record, record.key)}
+          {additional && additional(record, record.name)}
         </Space>
       </td>
     );
@@ -514,7 +505,7 @@ const EditableCell = ({
         name={dataIndex}
         {...(formItemProps && formItemProps(record))}
       >
-        {(formInput && formInput(record, record.key)) || children}
+        {(formInput && formInput(record, record.name)) || children}
       </Form.Item>
     </td>
   );

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

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

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

@@ -12,7 +12,18 @@ const BillLineSearchSelect = ({ options, disabled, ...restProps }, ref) => {
       disabled={disabled}
       ref={ref}
       showSearch
-      optionFilterProp="line_desc"
+      //  optionFilterProp="line_desc"
+      filterOption={(inputValue, option) => {
+        return (
+          (option.line_desc &&
+            option.line_desc
+              .toLowerCase()
+              .includes(inputValue.toLowerCase())) ||
+          (option.oem_partno &&
+            option.oem_partno.toLowerCase().includes(inputValue.toLowerCase()))
+        );
+      }}
+      notFoundContent={"Removed."}
       {...restProps}
     >
       <Select.Option key={null} value={"noline"} cost={0} line_desc={""}>
@@ -21,14 +32,19 @@ 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}
+              oem_partno={item.oem_partno}
+              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/chat-new-conversation/chat-new-conversation.component.jsx

@@ -20,7 +20,6 @@ export function ChatNewConversation({ openChatByPhone }) {
   const { t } = useTranslation();
   const [form] = Form.useForm();
   const handleFinish = (values) => {
-    console.log("values :>> ", values);
     openChatByPhone({ phone_num: values.phoneNumber });
     form.resetFields();
   };

client/src/components/chat-popup/chat-popup.component.jsx

@@ -1,5 +1,5 @@
-import { ShrinkOutlined } from "@ant-design/icons";
-import { Col, Row, Typography } from "antd";
+import { ShrinkOutlined, InfoCircleOutlined } from "@ant-design/icons";
+import { Col, Row, Tooltip, Typography } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -31,6 +31,9 @@ export function ChatPopupComponent({
           {t("messaging.labels.messaging")}
         </Typography.Title>
         <ChatNewConversation />
+        <Tooltip title={t("messaging.labels.recentonly")}>
+          <InfoCircleOutlined />
+        </Tooltip>
       </div>
       <ShrinkOutlined
         onClick={() => toggleChatVisible()}

client/src/components/contract-convert-to-ro/contract-convert-to-ro.component.jsx

@@ -53,6 +53,7 @@ export function ContractConvertToRo({
     const billingLines = [];
     if (contractLength > 0)
       billingLines.push({
+        manual_line:true,
         unq_seq: 1,
         line_no: 1,
         line_ref: 1,
@@ -70,6 +71,7 @@ export function ContractConvertToRo({
       contract.kmend - contract.kmstart - contract.dailyfreekm * contractLength;
     if (mileageDiff > 0) {
       billingLines.push({
+        manual_line:true,
         unq_seq: 2,
         line_no: 2,
         line_ref: 2,
@@ -86,6 +88,7 @@ export function ContractConvertToRo({
 
     if (values.refuelqty > 0) {
       billingLines.push({
+        manual_line:true,
         unq_seq: 3,
         line_no: 3,
         line_ref: 3,
@@ -101,6 +104,7 @@ export function ContractConvertToRo({
     }
     if (values.applyCleanupCharge) {
       billingLines.push({
+        manual_line:true,
         unq_seq: 4,
         line_no: 4,
         line_ref: 4,
@@ -117,6 +121,7 @@ export function ContractConvertToRo({
     if (contract.damagewaiver) {
       //Add for cleanup fee.
       billingLines.push({
+        manual_line:true,
         unq_seq: 5,
         line_no: 5,
         line_ref: 5,

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

@@ -42,7 +42,6 @@ export default function ContractFormComponent({
             <ContractStatusSelector />
           </Form.Item>
         )}
-
         <Form.Item
           label={t("contracts.fields.start")}
           name="start"

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

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

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

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

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

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

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

@@ -86,10 +86,7 @@ export function DashboardGridComponent({ currentUser, bodyshop }) {
   const handleRemoveComponent = (key) => {
     logImEXEvent("dashboard_remove_component", { name: key });
     const idxToRemove = state.items.findIndex((i) => i.i === key);
-    console.log(
-      "🚀  ~ file: dashboard-grid.component.jsx  ~ line 81  ~ idxToRemove",
-      idxToRemove
-    );
+
     const items = _.cloneDeep(state.items);
 
     items.splice(idxToRemove, 1);
@@ -244,7 +241,7 @@ const componentList = {
     h: 3,
   },
   MonthlyPartsSales: {
-    label: i18next.t("dashboard.titles.productiondollars"),
+    label: i18next.t("dashboard.titles.monthlypartssales"),
     component: DashboardMonthlyPartsSales,
     gqlFragment: null,
     minW: 2,
@@ -253,7 +250,7 @@ const componentList = {
     h: 2,
   },
   MonthlyLaborSales: {
-    label: i18next.t("dashboard.titles.monthlypartssales"),
+    label: i18next.t("dashboard.titles.monthlylaborsales"),
     component: DashboardMonthlyLaborSales,
     gqlFragment: null,
     minW: 2,

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

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

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

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

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

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

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

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

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

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

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

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

client/src/components/document-editor/document-editor.component.jsx

@@ -58,11 +58,9 @@ export function DocumentEditorComponent({ currentUser, bodyshop, document }) {
     if (imgRef.current !== null) {
       // create a marker.js MarkerArea
       markerArea.current = new markerjs2.MarkerArea(imgRef.current);
-      console.log(`markerArea.current`, markerArea.current);
+
       // attach an event handler to assign annotated image back to our image element
-      markerArea.current.addCloseEventListener((closeEvent) => {
-        console.log("Close Event", closeEvent);
-      });
+      markerArea.current.addCloseEventListener((closeEvent) => {});
 
       markerArea.current.addRenderEventListener((dataUrl) => {
         imgRef.current.src = dataUrl;

client/src/components/documents-upload/documents-upload.utility.js

@@ -14,8 +14,6 @@ var cleanAxios = axios.create();
 cleanAxios.interceptors.request.eject(axiosAuthInterceptorId);
 
 export const handleUpload = (ev, context) => {
-  console.log("Handling Upload", ev);
-
   logImEXEvent("document_upload", { filetype: ev.file.type });
 
   const { onError, onSuccess, onProgress } = ev;
@@ -61,7 +59,7 @@ export const uploadToCloudinary = async (
   //  let eager = process.env.REACT_APP_CLOUDINARY_THUMB_TRANSFORMATIONS;
 
   //Get the signed url.
-  console.log("fileType", fileType);
+
   const upload_preset = fileType.startsWith("video")
     ? "incoming_upload_video"
     : "incoming_upload";
@@ -74,7 +72,6 @@ export const uploadToCloudinary = async (
   });
 
   if (signedURLResponse.status !== 200) {
-    console.log("Error Getting Signed URL", signedURLResponse.statusText);
     if (!!onError) onError(signedURLResponse.statusText);
     notification["error"]({
       message: i18n.t("documents.errors.getpresignurl", {
@@ -113,13 +110,8 @@ export const uploadToCloudinary = async (
       ...options,
     }
   );
-  console.log("Upload Response", cloudinaryUploadResponse.data);
 
   if (cloudinaryUploadResponse.status !== 200) {
-    console.log(
-      "Error uploading to cloudinary.",
-      cloudinaryUploadResponse.statusText
-    );
     if (!!onError) onError(cloudinaryUploadResponse.statusText);
     notification["error"]({
       message: i18n.t("documents.errors.insert", {

client/src/components/email-documents/email-documents.component.jsx

@@ -35,10 +35,6 @@ export function EmailDocumentsComponent({
     },
     skip: !emailConfig.jobid,
   });
-  console.log(
-    "🚀  ~ file: email-documents.component.jsx  ~ line 38  ~ emailConfig",
-    emailConfig
-  );
 
   return (
     <div>

client/src/components/email-overlay/email-overlay.component.jsx

@@ -1,15 +1,71 @@
-import { UploadOutlined } from "@ant-design/icons";
-import { Divider, Form, Input, Select, Tabs, Upload } from "antd";
+import { UploadOutlined, UserAddOutlined } from "@ant-design/icons";
+import {
+  Divider,
+  Form,
+  Input,
+  Select,
+  Tabs,
+  Upload,
+  Space,
+  Menu,
+  Dropdown,
+} from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import EmailDocumentsComponent from "../email-documents/email-documents.component";
+import _ from "lodash";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(EmailOverlayComponent);
 
-export default function EmailOverlayComponent({ form, selectedMediaState }) {
+export function EmailOverlayComponent({ form, selectedMediaState, bodyshop }) {
   const { t } = useTranslation();
+  const handleClick = ({ item, key, keyPath }) => {
+    const email = item.props.value;
+    form.setFieldsValue({ to: _.uniq([...form.getFieldValue("to"), email]) });
+  };
+
+  const menu = (
+    <div>
+      <Menu onClick={handleClick}>
+        {bodyshop.employees
+          .filter((e) => e.user_email)
+          .map((e, idx) => (
+            <Menu.Item value={e.user_email} key={idx}>
+              {`${e.first_name} ${e.last_name}`}
+            </Menu.Item>
+          ))}
+      </Menu>
+    </div>
+  );
+
   return (
     <div>
       <Form.Item
-        label={t("emails.fields.to")}
+        label={
+          <Space>
+            {t("emails.fields.to")}
+            <Dropdown overlay={menu}>
+              <a
+                className="ant-dropdown-link"
+                href=" #"
+                onClick={(e) => e.preventDefault()}
+              >
+                <UserAddOutlined />
+              </a>
+            </Dropdown>
+          </Space>
+        }
         name="to"
         rules={[
           {

client/src/components/email-overlay/email-overlay.container.jsx

@@ -51,7 +51,9 @@ export function EmailOverlayContainer({
 
   const defaultEmailFrom = {
     from: {
-      name: `${currentUser.displayName} @ ${bodyshop.shopname}`,
+      name: currentUser.displayName
+        ? `${currentUser.displayName} @ ${bodyshop.shopname}`
+        : bodyshop.shopname,
       address: EmailSettings.fromAddress,
     },
     ReplyTo: {
@@ -109,7 +111,6 @@ export function EmailOverlayContainer({
       notification["success"]({ message: t("emails.successes.sent") });
       toggleEmailOverlayVisible();
     } catch (error) {
-      console.log(JSON.stringify(error));
       notification["error"]({
         message: t("emails.errors.notsent", { message: error.message }),
       });
@@ -147,6 +148,18 @@ export function EmailOverlayContainer({
       html: response.data,
       fileList: [],
     });
+
+    if (
+      bodyshop.md_email_cc[emailConfig.template.name] &&
+      bodyshop.md_email_cc[emailConfig.template.name].length > 0
+    ) {
+      form.setFieldsValue({
+        cc: [
+          ...(form.getFieldValue("cc") || []),
+          ...bodyshop.md_email_cc[emailConfig.template.name],
+        ],
+      });
+    }
     setLoading(false);
   };
 

client/src/components/email-test/email-test-component.jsx

@@ -7,10 +7,12 @@ import { selectCurrentUser } from "../../redux/user/user.selectors";
 import { GenerateDocument } from "../../utils/RenderTemplate";
 import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
+import moment from "moment";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
 });
+
 const mapDispatchToProps = (dispatch) => ({
   setEmailOptions: (e) => dispatch(setEmailOptions(e)),
 });
@@ -19,14 +21,24 @@ export function EmailTestComponent({ currentUser, setEmailOptions }) {
   const [form] = Form.useForm();
 
   const handleFinish = (values) => {
-    console.log("values", values);
     GenerateDocument(
       {
         name: values.key,
         variables: {
+          ...(values.start
+            ? {
+                start: moment(values.start).startOf("day").format("YYYY-MM-DD"),
+              }
+            : {}),
+          ...(values.end
+            ? { end: moment(values.end).endOf("day").format("YYYY-MM-DD") }
+            : {}),
+          ...(values.start
+            ? { starttz: moment(values.start).startOf("day") }
+            : {}),
+          ...(values.end ? { endtz: moment(values.end).endOf("day") } : {}),
+
           ...(values.id ? { id: values.id } : {}),
-          ...(values.start ? { start: values.start } : {}),
-          ...(values.end ? { end: values.end } : {}),
         },
       },
       {

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

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

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

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

client/src/components/form-items-formatted/phone-form-item.component.jsx

@@ -21,7 +21,7 @@ export const PhoneItemFormatterValidation = (getFieldValue, name) => ({
       return Promise.resolve();
     } else {
       const p = parsePhoneNumber(value, "CA");
-      if (p.isValid()) {
+      if (p && p.isValid()) {
         return Promise.resolve();
       } else {
         return Promise.reject(i18n.t("general.validation.invalidphone"));

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

@@ -62,13 +62,16 @@ export default function GlobalSearch() {
               }`,
               label: (
                 <Link to={`/manage/owners/${owner.id}`}>
-                  <Space size="small" split={<Divider type="vertical" />}>
+                  <Space size="small" split={<Divider type="vertical" />} wrap>
                     <span>{`${owner.ownr_fn || ""} ${owner.ownr_ln || ""} ${
                       owner.ownr_co_nm || ""
                     }`}</span>
                     <PhoneNumberFormatter>
                       {owner.ownr_ph1}
                     </PhoneNumberFormatter>
+                    <PhoneNumberFormatter>
+                      {owner.ownr_ph2}
+                    </PhoneNumberFormatter>
                   </Space>
                 </Link>
               ),
@@ -168,7 +171,6 @@ export default function GlobalSearch() {
     <AutoComplete
       options={options}
       onSearch={handleSearch}
-      allowClear
       placeholder={t("general.labels.globalsearch")}
     >
       <Input.Search loading={loading} />

client/src/components/header/header.component.jsx

@@ -46,12 +46,16 @@ import {
 } from "../../redux/application/application.selectors";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { signOutStart } from "../../redux/user/user.actions";
-import { selectCurrentUser } from "../../redux/user/user.selectors";
+import {
+  selectBodyshop,
+  selectCurrentUser,
+} from "../../redux/user/user.selectors";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
   recentItems: selectRecentItems,
   selectedHeader: selectSelectedHeader,
+  bodyshop: selectBodyshop,
 });
 
 const mapDispatchToProps = (dispatch) => ({
@@ -69,6 +73,7 @@ const mapDispatchToProps = (dispatch) => ({
 function Header({
   handleMenuClick,
   currentUser,
+  bodyshop,
   selectedHeader,
   signOutStart,
   setBillEnterContext,
@@ -237,16 +242,26 @@ function Header({
                 {t("menus.header.accounting-receivables")}
               </Link>
             </Menu.Item>
-            <Menu.Item key="payables">
-              <Link to="/manage/accounting/payables">
-                {t("menus.header.accounting-payables")}
-              </Link>
-            </Menu.Item>
-            <Menu.Item key="payments">
-              <Link to="/manage/accounting/payments">
-                {t("menus.header.accounting-payments")}
-              </Link>
-            </Menu.Item>
+            {!(
+              (bodyshop && bodyshop.cdk_dealerid) ||
+              (bodyshop && bodyshop.pbs_serialnumber)
+            ) && (
+              <Menu.Item key="payables">
+                <Link to="/manage/accounting/payables">
+                  {t("menus.header.accounting-payables")}
+                </Link>
+              </Menu.Item>
+            )}
+            {!(
+              (bodyshop && bodyshop.cdk_dealerid) ||
+              (bodyshop && bodyshop.pbs_serialnumber)
+            ) && (
+              <Menu.Item key="payments">
+                <Link to="/manage/accounting/payments">
+                  {t("menus.header.accounting-payments")}
+                </Link>
+              </Menu.Item>
+            )}
             <Menu.Item key="export-logs">
               <Link to="/manage/accounting/exportlogs">
                 {t("menus.header.export-logs")}

client/src/components/help-rescue/help-rescue.component.jsx

@@ -10,15 +10,11 @@ export default function HelpRescue() {
     var bodyFormData = new FormData();
     bodyFormData.append("Code", code);
     bodyFormData.append("hostederrorhandling", 1);
-    const res1 = await fetch(
-      "https://secure.logmeinrescue.com/Customer/Code.aspx",
-      {
-        mode: "no-cors",
-        method: "POST",
-        body: bodyFormData,
-      }
-    );
-    console.log("handleClick -> res1", await res1.text());
+    await fetch("https://secure.logmeinrescue.com/Customer/Code.aspx", {
+      mode: "no-cors",
+      method: "POST",
+      body: bodyFormData,
+    });
   };
 
   return (
@@ -40,7 +36,6 @@ export default function HelpRescue() {
           method="post"
           id="logmeinsupport"
           onSubmit={(...props) => {
-            console.log(`props`, props);
             alert();
           }}
         >

client/src/components/job-3rd-party-modal/job-3rd-party-modal.component.jsx

@@ -44,7 +44,7 @@ export function Jobd3RdPartyModal({ bodyshop, jobId }) {
   };
   const handleFinish = (values) => {
     const { sendtype, ...restVals } = values;
-    console.log(restVals);
+
     GenerateDocument(
       {
         name: TemplateList("job_special").thirdpartypayer.key,

client/src/components/job-at-change/schedule-event.color.component.jsx

@@ -56,7 +56,7 @@ export function ScheduleEventColor({ bodyshop, event }) {
       <Menu.Item key={"null"}>{t("general.actions.clear")}</Menu.Item>
     </Menu>
   );
-  console.log(`event`, event);
+
   return (
     <Dropdown overlay={menu}>
       <a href=" #" onClick={(e) => e.preventDefault()}>

client/src/components/job-at-change/schedule-event.component.jsx

@@ -106,6 +106,12 @@ export function ScheduleEventComponent({
               jobid={event.job.id}
             />
           </DataLabel>
+          <DataLabel label={t("jobs.fields.ownr_ph2")}>
+            <ChatOpenButton
+              phone={event.job && event.job.ownr_ph2}
+              jobid={event.job.id}
+            />
+          </DataLabel>
           <DataLabel label={t("jobs.fields.alt_transport")}>
             {(event.job && event.job.alt_transport) || ""}
             <ScheduleAtChange job={event && event.job} />
@@ -170,7 +176,7 @@ export function ScheduleEventComponent({
                       t("appointments.labels.reminder", {
                         shopname: bodyshop.shopname,
                         date: moment(event.start).format("MM/DD/YYYY"),
-                        time: moment(event.start).format("HH:MM a"),
+                        time: moment(event.start).format("HH:mm a"),
                       })
                     );
                     setVisible(false);
@@ -203,6 +209,9 @@ export function ScheduleEventComponent({
                 jobId: event.job.id,
                 job: event.job,
                 previousEvent: event.id,
+                color: event.color,
+                alt_transport: event.job && event.job.alt_transport,
+                note: event.note,
               },
             });
           }}

client/src/components/job-bills-total/job-bills-total.component.jsx

@@ -55,7 +55,6 @@ export default function JobBillsTotalComponent({
         );
       }
       if (il.deductedfromlbr) {
-        console.log(i, "Deducting from labor.");
         lbrAdjustments = lbrAdjustments.add(
           Dinero({
             amount: Math.round((il.actual_price || 0) * 100),

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

@@ -18,6 +18,7 @@ import DateTimePicker from "../../../form-date-time-picker/form-date-time-picker
 import moment from "moment-business-days";
 import { insertAuditTrail } from "../../../../redux/application/application.actions";
 import AuditTrailMapping from "../../../../utils/AuditTrailMappings";
+import { UPDATE_OWNER } from "../../../../graphql/owners.queries";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -41,6 +42,8 @@ export function JobChecklistForm({
   const [intakeJob] = useMutation(UPDATE_JOB);
   const [loading, setLoading] = useState(false);
   const [markAptArrived] = useMutation(MARK_LATEST_APPOINTMENT_AS_ARRIVED);
+  const [updateOwner] = useMutation(UPDATE_OWNER);
+
   const { jobId } = useParams();
   const history = useHistory();
   const search = queryString.parse(useLocation().search);
@@ -61,14 +64,16 @@ export function JobChecklistForm({
           ...(type === "intake" && { actual_in: new Date() }),
           ...(type === "intake" && {
             production_vars: {
-              ...job.production_vars,
-              ...values.production_vars,
+              ...(job ? job.production_vars : {}),
+
               note:
                 values.production_vars &&
                 values.production_vars.note &&
                 values.production_vars.note !== ""
-                  ? job.production_vars && values.production_vars.note
-                  : job.production_vars && job.production_vars.note,
+                  ? values &&
+                    values.production_vars &&
+                    values.production_vars.note
+                  : job && job.production_vars && job.production_vars.note,
             },
           }),
           ...(type === "intake" && {
@@ -114,6 +119,24 @@ export function JobChecklistForm({
         });
       }
     }
+    if (type === "intake" && job.owner && job.owner.id) {
+      //Updae Owner Allow to Text
+      const updateOwnerResult = await updateOwner({
+        variables: {
+          ownerId: job.owner.id,
+          owner: { allow_text_message: values.allow_text_message },
+        },
+      });
+
+      if (!!updateOwnerResult.errors) {
+        notification["error"]({
+          message: t("checklist.errors.complete", {
+            error: JSON.stringify(result.errors),
+          }),
+        });
+      }
+    }
+
     setLoading(false);
 
     if (!!!result.errors) {
@@ -144,7 +167,11 @@ export function JobChecklistForm({
       title={t("checklist.labels.checklist")}
       extra={
         !readOnly && (
-          <Button loading={loading} onClick={() => form.submit()}>
+          <Button
+            loading={loading}
+            type="primary"
+            onClick={() => form.submit()}
+          >
             {t("general.actions.submit")}
           </Button>
         )
@@ -156,14 +183,17 @@ export function JobChecklistForm({
         initialValues={{
           ...(type === "intake" && {
             addToProduction: true,
+            allow_text_message: job.owner && job.owner.allow_text_message,
             scheduled_completion:
               (job && job.scheduled_completion) ||
-              moment().businessAdd(
-                (job.labhrs.aggregate.sum.mod_lb_hrs +
-                  job.larhrs.aggregate.sum.mod_lb_hrs) /
-                  bodyshop.target_touchtime,
-                "days"
-              ),
+              (job.labbrs && job.larhrs
+                ? moment().businessAdd(
+                    (job.labhrs.aggregate.sum.mod_lb_hrs +
+                      job.larhrs.aggregate.sum.mod_lb_hrs) /
+                      bodyshop.target_touchtime,
+                    "days"
+                  )
+                : null),
             scheduled_delivery: job && job.scheduled_delivery,
           }),
           ...(type === "deliver" && {
@@ -191,6 +221,14 @@ export function JobChecklistForm({
             >
               <Switch disabled={readOnly} />
             </Form.Item>
+            <Form.Item
+              name="allow_text_message"
+              valuePropName="checked"
+              label={t("checklist.labels.allow_text_message")}
+              disabled={readOnly}
+            >
+              <Switch disabled={readOnly} />
+            </Form.Item>
             <Form.Item
               name="scheduled_completion"
               label={t("jobs.fields.scheduled_completion")}
@@ -215,6 +253,7 @@ export function JobChecklistForm({
               name={["production_vars", "note"]}
               label={t("jobs.fields.production_vars.note")}
               disabled={readOnly}
+              trigger="onChange"
             >
               <Input.TextArea rows={3} disabled={readOnly} />
             </Form.Item>

client/src/components/job-checklist/components/job-checklist-template-list/job-checklist-template-list.component.jsx

@@ -34,7 +34,7 @@ export default function JobIntakeTemplateList({ templates }) {
   const renderAllTemplates = async () => {
     logImEXEvent("checklist_render_all_templates");
     setLoading(true);
-    console.log("templates :>> ", templates);
+
     await GenerateDocuments(
       templates.map((key) => {
         return { name: key, variables: { id: jobId } };

client/src/components/job-costing-modal/job-costing-modal.container.jsx

@@ -35,7 +35,7 @@ export function JobCostingModalContainer({
     async function getData() {
       if (jobId && visible) {
         const { data } = await axios.post("/job/costing", { jobid: jobId });
-        console.log(data);
+
         setCostingData(data);
       }
     }

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

@@ -77,7 +77,6 @@ export default function JobCostingPartsTable({ data, summaryData }) {
             .includes(searchText.toLowerCase())
         );
 
-  console.log("data :>> ", data);
   return (
     <div>
       <Table

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

@@ -112,60 +112,46 @@ export function JobDetailCards({ setPrintCenterContext }) {
           <Divider type="horizontal" />
           <Row gutter={[16, 16]}>
             <Col {...span}>
-              <Card.Grid style={{ width: "100%", height: "100%" }}>
-                <JobDetailCardsInsuranceComponent
-                  loading={loading}
-                  data={data ? data.jobs_by_pk : null}
-                />
-              </Card.Grid>
+              <JobDetailCardsInsuranceComponent
+                loading={loading}
+                data={data ? data.jobs_by_pk : null}
+              />
             </Col>
             <Col {...span}>
-              <Card.Grid style={{ width: "100%", height: "100%" }}>
-                <JobDetailCardsTotalsComponent
-                  loading={loading}
-                  data={data ? data.jobs_by_pk : null}
-                />
-              </Card.Grid>
+              <JobDetailCardsTotalsComponent
+                loading={loading}
+                data={data ? data.jobs_by_pk : null}
+              />
             </Col>
             <Col {...span}>
-              <Card.Grid style={{ width: "100%", height: "100%" }}>
-                <JobDetailCardsDatesComponent
-                  loading={loading}
-                  data={data ? data.jobs_by_pk : null}
-                />
-              </Card.Grid>
+              <JobDetailCardsDatesComponent
+                loading={loading}
+                data={data ? data.jobs_by_pk : null}
+              />
             </Col>
             <Col {...span}>
-              <Card.Grid style={{ width: "100%", height: "100%" }}>
-                <JobDetailCardsPartsComponent
-                  loading={loading}
-                  data={data ? data.jobs_by_pk : null}
-                />
-              </Card.Grid>
+              <JobDetailCardsPartsComponent
+                loading={loading}
+                data={data ? data.jobs_by_pk : null}
+              />
             </Col>
             <Col {...span}>
-              <Card.Grid style={{ width: "100%", height: "100%" }}>
-                <JobDetailCardsNotesComponent
-                  loading={loading}
-                  data={data ? data.jobs_by_pk : null}
-                />
-              </Card.Grid>
+              <JobDetailCardsNotesComponent
+                loading={loading}
+                data={data ? data.jobs_by_pk : null}
+              />
             </Col>
             <Col {...span}>
-              <Card.Grid style={{ width: "100%", height: "100%" }}>
-                <JobDetailCardsDocumentsComponent
-                  loading={loading}
-                  data={data ? data.jobs_by_pk : null}
-                />
-              </Card.Grid>
+              <JobDetailCardsDocumentsComponent
+                loading={loading}
+                data={data ? data.jobs_by_pk : null}
+              />
             </Col>
             <Col {...span}>
-              <Card.Grid style={{ width: "100%", height: "100%" }}>
-                <JobDetailCardsDamageComponent
-                  loading={loading}
-                  data={data ? data.jobs_by_pk : null}
-                />
-              </Card.Grid>
+              <JobDetailCardsDamageComponent
+                loading={loading}
+                data={data ? data.jobs_by_pk : null}
+              />
             </Col>
           </Row>
         </Card>

client/src/components/job-detail-cards/job-detail-cards.dates.component.jsx

@@ -1,7 +1,7 @@
 import { Timeline } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
-import { DateFormatter } from "../../utils/DateFormatter";
+import { DateTimeFormatter } from "../../utils/DateFormatter";
 import CardTemplate from "./job-detail-cards.template.component";
 
 export default function JobDetailCardsDatesComponent({ loading, data }) {
@@ -26,80 +26,86 @@ export default function JobDetailCardsDatesComponent({ loading, data }) {
           ) ? (
             <div>{t("jobs.errors.nodates")}</div>
           ) : null}
+          {data.date_last_contacted ? (
+            <Timeline.Item>
+              <label>{t("jobs.fields.date_last_contacted")}: </label>
+              <DateTimeFormatter>{data.date_last_contacted}</DateTimeFormatter>
+            </Timeline.Item>
+          ) : null}
           {data.date_open ? (
             <Timeline.Item>
               <label>{t("jobs.fields.date_open")}: </label>
-              <DateFormatter>{data.date_open}</DateFormatter>
+              <DateTimeFormatter>{data.date_open}</DateTimeFormatter>
             </Timeline.Item>
           ) : null}
 
           {data.date_estimated ? (
             <Timeline.Item>
               <label>{t("jobs.fields.date_estimated")}: </label>
-              <DateFormatter>{data.date_estimated}</DateFormatter>
+              <DateTimeFormatter>{data.date_estimated}</DateTimeFormatter>
             </Timeline.Item>
           ) : null}
 
           {data.date_scheduled ? (
             <Timeline.Item>
               <label>{t("jobs.fields.date_scheduled")}: </label>
-              <DateFormatter>{data.date_scheduled}</DateFormatter>
+              <DateTimeFormatter>{data.date_scheduled}</DateTimeFormatter>
             </Timeline.Item>
           ) : null}
 
           {data.scheduled_in ? (
             <Timeline.Item>
               <label>{t("jobs.fields.scheduled_in")}: </label>
-              <DateFormatter>{data.scheduled_in}</DateFormatter>
+              <DateTimeFormatter>{data.scheduled_in}</DateTimeFormatter>
             </Timeline.Item>
           ) : null}
 
           {data.actual_in ? (
             <Timeline.Item>
               <label>{t("jobs.fields.actual_in")}: </label>
-              <DateFormatter>{data.actual_in}</DateFormatter>
+              <DateTimeFormatter>{data.actual_in}</DateTimeFormatter>
             </Timeline.Item>
           ) : null}
 
           {data.scheduled_completion ? (
             <Timeline.Item>
               <label>{t("jobs.fields.scheduled_completion")}: </label>
-              <DateFormatter>{data.scheduled_completion}</DateFormatter>
+              <DateTimeFormatter>{data.scheduled_completion}</DateTimeFormatter>
             </Timeline.Item>
           ) : null}
 
           {data.actual_completion ? (
             <Timeline.Item>
               <label>{t("jobs.fields.actual_completion")}: </label>
-              <DateFormatter>{data.actual_completion}</DateFormatter>
+              <DateTimeFormatter>{data.actual_completion}</DateTimeFormatter>
             </Timeline.Item>
           ) : null}
 
           {data.scheduled_delivery ? (
             <Timeline.Item>
               <label>{t("jobs.fields.scheduled_delivery")}: </label>
-              <DateFormatter>{data.scheduled_delivery}</DateFormatter>
+              <DateTimeFormatter>{data.scheduled_delivery}</DateTimeFormatter>
             </Timeline.Item>
           ) : null}
 
           {data.actual_delivery ? (
             <Timeline.Item>
               <label>{t("jobs.fields.actual_delivery")}: </label>
-              <DateFormatter>{data.actual_delivery}</DateFormatter>
+              <DateTimeFormatter>{data.actual_delivery}</DateTimeFormatter>
             </Timeline.Item>
           ) : null}
 
           {data.date_invoiced ? (
             <Timeline.Item>
               <label>{t("jobs.fields.date_invoiced")}: </label>
-              <DateFormatter>{data.date_invoiced}</DateFormatter>
+              <DateTimeFormatter>{data.date_invoiced}</DateTimeFormatter>
             </Timeline.Item>
           ) : null}
 
           {data.date_exported ? (
             <Timeline.Item>
               <label>{t("jobs.fields.date_exported")}: </label>
-              <DateFormatter>{data.date_exported}</DateFormatter>
+              <DateTimeFormatter>{data.date_exported}</DateTimeFormatter>
             </Timeline.Item>
           ) : null}
         </Timeline>

client/src/components/job-detail-cards/job-detail-cards.documents.component.jsx

@@ -1,8 +1,8 @@
 import { Carousel } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
+import { GenerateThumbUrl } from "../jobs-documents-gallery/job-documents.utility";
 import CardTemplate from "./job-detail-cards.template.component";
-import { DetermineFileType } from "../documents-upload/documents-upload.utility";
 export default function JobDetailCardsDocumentsComponent({ loading, data }) {
   const { t } = useTranslation();
 
@@ -22,15 +22,7 @@ export default function JobDetailCardsDocumentsComponent({ loading, data }) {
       {data.documents.length > 0 ? (
         <Carousel autoplay>
           {data.documents.map((item) => (
-            <img
-              key={item.id}
-              src={`${
-                process.env.REACT_APP_CLOUDINARY_ENDPOINT
-              }/${DetermineFileType(item.type)}/upload/${
-                process.env.REACT_APP_CLOUDINARY_THUMB_TRANSFORMATIONS
-              }/${item.key}`}
-              alt={item.name}
-            />
+            <img key={item.id} src={GenerateThumbUrl(item)} alt={item.name} />
           ))}
         </Carousel>
       ) : (

client/src/components/job-detail-cards/job-detail-cards.template.component.jsx

@@ -12,11 +12,13 @@ export default function JobDetailCardTemplate({
   if (extraLink) extra = { extra: <Link to={extraLink}>More</Link> };
   return (
     <Card
-      size='small'
-      className='job-card'
+      size="small"
+      className="job-card"
       title={title}
       loading={loading}
-      {...extra}>
+      style={{ height: "100%" }}
+      {...extra}
+    >
       {otherProps.children}
     </Card>
   );

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

@@ -36,6 +36,7 @@ import JobLinesBillRefernece from "../job-lines-bill-reference/job-lines-bill-re
 // import AllocationsBulkAssignmentContainer from "../allocations-bulk-assignment/allocations-bulk-assignment.container";
 // import AllocationsEmployeeLabelContainer from "../allocations-employee-label/allocations-employee-label.container";
 import PartsOrderModalContainer from "../parts-order-modal/parts-order-modal.container";
+import _ from "lodash";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -161,7 +162,11 @@ export function JobLinesComponent({
       ellipsis: true,
       render: (text, record) => (
         <>
-          <CurrencyFormatter>{record.act_price}</CurrencyFormatter>
+          <CurrencyFormatter>
+            {record.db_ref === "900510" || record.db_ref === "900511"
+              ? record.prt_dsmk_m
+              : record.act_price}
+          </CurrencyFormatter>
           {record.prt_dsmk_p && record.prt_dsmk_p !== 0 ? (
             <span
               style={{ marginLeft: ".2rem" }}
@@ -295,18 +300,17 @@ export function JobLinesComponent({
                 onClick={async () => {
                   await deleteJobLine({
                     variables: { joblineId: record.id },
-                    // update(cache) {
-                    //   cache.modify({
-                    //     id: cache.identify(job),
-                    //     fields: {
-                    //       joblines(existingJobLines, { readField }) {
-                    //         return existingJobLines.filter(
-                    //           (jlRef) => record.id !== readField("id", jlRef)
-                    //         );
-                    //       },
-                    //     },
-                    //   });
-                    // },
+                    update(cache) {
+                      cache.modify({
+                        fields: {
+                          joblines(existingJobLines, { readField }) {
+                            return existingJobLines.filter(
+                              (jlRef) => record.id !== readField("id", jlRef)
+                            );
+                          },
+                        },
+                      });
+                    },
                   });
                   await axios.post("/job/totalsssu", {
                     id: job.id,
@@ -334,10 +338,12 @@ export function JobLinesComponent({
       const markedTypes = [e.key];
       if (e.key === "PAN") markedTypes.push("PAP");
       if (e.key === "PAS") markedTypes.push("PASL");
-      setSelectedLines([
-        ...selectedLines,
-        ...jobLines.filter((item) => markedTypes.includes(item.part_type)),
-      ]);
+      setSelectedLines(
+        _.uniq([
+          ...selectedLines,
+          ...jobLines.filter((item) => markedTypes.includes(item.part_type)),
+        ])
+      );
     }
   };
 
@@ -400,7 +406,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 +441,7 @@ export function JobLinesComponent({
         columns={columns}
         rowKey="id"
         loading={loading}
-        pagination={{ position: "top", defaultPageSize: 50 }}
+        pagination={false}
         dataSource={jobLines}
         onChange={handleTableChange}
         scroll={{

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

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

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

@@ -1,4 +1,4 @@
-import { Form, Input, InputNumber, Modal, Select } from "antd";
+import { Form, Input, InputNumber, Modal, Select, Switch } from "antd";
 import React, { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import InputCurrency from "../form-items-formatted/currency-form-item.component";
@@ -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,49 +169,49 @@ 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>
-          <Form.Item label={t("joblines.fields.db_price")} name="db_price">
+          {/* <Form.Item label={t("joblines.fields.db_price")} name="db_price">
             <InputCurrency precision={2} min={0} />
-          </Form.Item>
+          </Form.Item> */}
           <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>
@@ -222,6 +222,14 @@ export default function JobLinesUpsertModalComponent({
           >
             <InputNumber precision={0} min={0} max={100} />
           </Form.Item>
+          <Form.Item
+            label={t("joblines.fields.tax_part")}
+            name="tax_part"
+            valuePropName="checked"
+            initialValue={true}
+          >
+            <Switch />
+          </Form.Item>
         </LayoutFormRow>
       </Form>
     </Modal>

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

@@ -44,6 +44,7 @@ function JobLinesUpsertModalContainer({
             },
           ],
         },
+        refetchQueries: ["GET_LINE_TICKET_BY_PK"],
       });
       if (!r.errors) {
         await Axios.post("/job/totalsssu", {
@@ -69,6 +70,7 @@ function JobLinesUpsertModalContainer({
           lineId: jobLineEditModal.context.id,
           line: values,
         },
+        refetchQueries: ["GET_LINE_TICKET_BY_PK"],
       });
       if (!r.errors) {
         notification["success"]({

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}
@@ -102,6 +108,9 @@ export default function JobReconciliationBillsTable({
         rowSelection={{
           onChange: handleOnRowClick,
           selectedRowKeys: selectedLines,
+          getCheckboxProps: (record) => {
+            return { disabled: record.deductedfromlbr };
+          },
         }}
       />
     </div>

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-reconciliation-totals/job-reconciliation-totals.utility.js

@@ -11,7 +11,7 @@ export const reconcileByAssocLine = (
   const [selectedJobLines, setSelectedJobLines] = jobLineState;
 
   const allJoblinesFromBills = billLines
-    .filter((bl) => bl.joblineid && !(bl.jobline && bl.jobline.removed))
+    .filter((bl) => bl.joblineid && bl.jobline && !bl.jobline.removed)
     .map((bl) => bl.joblineid);
 
   const duplicatedJobLinesbyInvoiceId = _.filter(
@@ -73,7 +73,7 @@ export const reconcileByPrice = (
 
   jobLines.forEach((jl) => {
     const matchingBillLineIds = billLines
-      .filter((bl) => bl.actual_price === jl.act_price && !jl.removed)
+      .filter((bl) => bl.actual_price === jl.act_price && bl.quantity === jl.part_qty && !jl.removed)
       .map((bl) => bl.id);
 
     if (matchingBillLineIds.length > 1) {

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

@@ -1,12 +1,24 @@
-import { useMutation } from "@apollo/client";
-import { Button, Card, Form, 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 InputNumberCalculator from "../form-input-number-calculator/form-input-number-calculator.component";
+import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 
 export default function ScoreboardAddButton({
   job,
@@ -15,17 +27,44 @@ 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(() => {
+    if (entryData && entryData.scoreboard && entryData.scoreboard[0]) {
+      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"]({
@@ -45,53 +84,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"),
-              },
-            ]}
-          >
-            <InputNumberCalculator precision={1} />
-          </Form.Item>
-          <Form.Item
-            label={t("scoreboard.fields.painthrs")}
-            name="painthrs"
-            rules={[
-              {
-                required: true,
-                //message: t("general.validation.required"),
-              },
-            ]}
-          >
-            <InputNumberCalculator 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>
   );
@@ -100,7 +148,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-admin-class/jobs-admin-class.component.jsx

@@ -22,7 +22,6 @@ export function JobsAdminClass({ bodyshop, job }) {
   const [updateJob] = useMutation(UPDATE_JOB);
 
   const handleFinish = async (values) => {
-    console.log(values);
     setLoading(true);
     const result = await updateJob({
       variables: { jobId: job.id, job: values },

client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx

@@ -13,7 +13,6 @@ export default function JobsAdminDatesChange({ job }) {
   const [updateJob] = useMutation(UPDATE_JOB);
 
   const handleFinish = async (values) => {
-    console.log(values);
     setLoading(true);
     const result = await updateJob({
       variables: { jobId: job.id, job: values },
@@ -74,7 +73,12 @@ export default function JobsAdminDatesChange({ job }) {
           <Form.Item label={t("jobs.fields.actual_in")} name="actual_in">
             <DateTimePicker />
           </Form.Item>
-
+          <Form.Item
+            label={t("jobs.fields.date_last_contacted")}
+            name="date_last_contacted"
+          >
+            <DateTimePicker />
+          </Form.Item>
           <Form.Item
             label={t("jobs.fields.scheduled_completion")}
             name="scheduled_completion"

client/src/components/jobs-admin-delete-intake/jobs-admin-delete-intake.component.jsx

@@ -22,10 +22,10 @@ export default function JobAdminDeleteIntake({ job }) {
     mutation DELETE_DELIVERY($jobId: uuid!) {
       update_jobs_by_pk(
         pk_columns: { id: $jobId }
-        _set: { deliverychecklist: null }
+        _set: { deliverchecklist: null }
       ) {
         id
-        deliverychecklist
+        deliverchecklist
       }
     }
   `);

client/src/components/jobs-admin-owner-reassociate/jobs-admin-owner-reassociate.component.jsx

@@ -10,7 +10,6 @@ export default function JobAdminOwnerReassociate({ job }) {
   const [form] = Form.useForm();
   const [updateJob] = useMutation(UPDATE_JOB);
   const handleFinish = async (values) => {
-    console.log(values);
     setLoading(true);
     const result = await updateJob({
       variables: { jobId: job.id, job: { ownerid: values.ownerid } },

client/src/components/jobs-admin-vehicle-reassociate/jobs-admin-vehicle-reassociate.component.jsx

@@ -10,7 +10,6 @@ export default function JobAdminOwnerReassociate({ job }) {
   const [form] = Form.useForm();
   const [updateJob] = useMutation(UPDATE_JOB);
   const handleFinish = async (values) => {
-    console.log(values);
     setLoading(true);
     const result = await updateJob({
       variables: { jobId: job.id, job: { vehicleid: values.vehicleid } },

client/src/components/jobs-available-table/jobs-available-supplement.estlines.util.js

@@ -3,8 +3,6 @@ import { gql } from "@apollo/client";
 import _ from "lodash";
 
 export const GetSupplementDelta = async (client, jobId, newLines) => {
-  console.log("-----Begin Supplement-----");
-
   const {
     data: { joblines: existingLinesFromDb },
   } = await client.query({

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

@@ -8,7 +8,6 @@ import {
 import { Col, notification, Row } from "antd";
 import Axios from "axios";
 import Dinero from "dinero.js";
-import _ from "lodash";
 import moment from "moment";
 import queryString from "query-string";
 import React, { useCallback, useEffect, useState } from "react";
@@ -30,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";
@@ -75,7 +75,7 @@ export function JobsAvailableContainer({
   const client = useApolloClient();
 
   const estDataLazyLoad = useLazyQuery(QUERY_AVAILABLE_NEW_JOBS_EST_DATA_BY_PK);
-  const [loadEstData, estData] = estDataLazyLoad;
+  const [loadEstData, estDataRaw] = estDataLazyLoad;
 
   const importOptionsState = useState({ overrideHeaders: false });
   const importOptions = importOptionsState[0];
@@ -88,13 +88,9 @@ export function JobsAvailableContainer({
     setOwnerModalVisible(false);
     setInsertLoading(true);
 
-    if (
-      !(
-        estData.data &&
-        estData.data.available_jobs_by_pk &&
-        estData.data.available_jobs_by_pk.est_data
-      )
-    ) {
+    const estData = replaceEmpty(estDataRaw.data.available_jobs_by_pk);
+
+    if (!(estData && estData.est_data)) {
       //We don't have the right data. Error!
       setInsertLoading(false);
       notification["error"]({
@@ -102,32 +98,31 @@ export function JobsAvailableContainer({
       });
       return;
     }
-
+    //IO-539 Check for Parts Rate on PAL for SGI use case.
+    await CheckTaxRates(estData.est_data, bodyshop);
+    console.log(estData);
     const newTotals = (
       await Axios.post("/job/totals", {
         job: {
-          ...estData.data.available_jobs_by_pk.est_data,
-          joblines: estData.data.available_jobs_by_pk.est_data.joblines.data,
+          ...estData.est_data,
+          joblines: estData.est_data.joblines.data,
         },
       })
     ).data;
 
     let existingVehicles;
-    if (
-      estData.data.available_jobs_by_pk.est_data.vehicle &&
-      estData.data.available_jobs_by_pk.est_data.vin
-    ) {
+    if (estData.est_data.vehicle && estData.est_data.vin) {
       //There's vehicle data, need to double check the VIN.
       existingVehicles = await client.query({
         query: SEARCH_VEHICLE_BY_VIN,
         variables: {
-          vin: estData.data.available_jobs_by_pk.est_data.vehicle.data.v_vin,
+          vin: estData.est_data.vehicle.data.v_vin,
         },
       });
     }
 
     const newJob = {
-      ...estData.data.available_jobs_by_pk.est_data,
+      ...estData.est_data,
       clm_total: Dinero(newTotals.totals.total_repairs).toFormat("0.00"),
       owner_owing: Dinero(newTotals.totals.custPayable.total).toFormat("0.00"),
       job_totals: newTotals,
@@ -145,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) => {
@@ -172,7 +168,7 @@ export function JobsAvailableContainer({
         });
 
         deleteJob({
-          variables: { id: estData.data.available_jobs_by_pk.id },
+          variables: { id: estData.id },
         }).then((r) => {
           refetch();
           setInsertLoading(false);
@@ -195,13 +191,9 @@ export function JobsAvailableContainer({
     setJobModalVisible(false);
     setInsertLoading(true);
 
-    if (
-      !(
-        estData.data &&
-        estData.data.available_jobs_by_pk &&
-        estData.data.available_jobs_by_pk.est_data
-      )
-    ) {
+    const estData = estDataRaw.data.available_jobs_by_pk;
+
+    if (!(estData && estData.est_data)) {
       //We don't have the right data. Error!
       setInsertLoading(false);
       notification["error"]({
@@ -209,18 +201,21 @@ export function JobsAvailableContainer({
       });
     } else {
       //create upsert job
-      let supp = _.cloneDeep(estData.data.available_jobs_by_pk.est_data);
+      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;
-      if (importOptions.overrideHeaders) {
+      delete supp.ins_co_nm;
+      if (!importOptions.overrideHeaders) {
         HeaderFields.forEach((item) => delete supp[item]);
       }
 
       let suppDelta = await GetSupplementDelta(
         client,
         selectedJob,
-        estData.data.available_jobs_by_pk.est_data.joblines.data
+        supp.joblines.data
       );
 
       delete supp.joblines;
@@ -279,7 +274,7 @@ export function JobsAvailableContainer({
       //Job has been inserted. Clean up the available jobs record.
 
       deleteJob({
-        variables: { id: estData.data.available_jobs_by_pk.id },
+        variables: { id: estData.id },
       }).then((r) => {
         refetch();
         setInsertLoading(false);
@@ -305,13 +300,13 @@ export function JobsAvailableContainer({
   };
 
   const owner =
-    estData.data &&
-    estData.data.available_jobs_by_pk &&
-    estData.data.available_jobs_by_pk.est_data &&
-    estData.data.available_jobs_by_pk.est_data.owner &&
-    estData.data.available_jobs_by_pk.est_data.owner.data &&
-    !estData.data.available_jobs_by_pk.issupplement
-      ? estData.data.available_jobs_by_pk.est_data.owner.data
+    estDataRaw.data &&
+    estDataRaw.data.available_jobs_by_pk &&
+    estDataRaw.data.available_jobs_by_pk.est_data &&
+    estDataRaw.data.available_jobs_by_pk.est_data.owner &&
+    estDataRaw.data.available_jobs_by_pk.est_data.owner.data &&
+    !estDataRaw.data.available_jobs_by_pk.issupplement
+      ? estDataRaw.data.available_jobs_by_pk.est_data.owner.data
       : null;
 
   const onOwnerModalCancel = () => {
@@ -349,8 +344,8 @@ export function JobsAvailableContainer({
       message={t("jobs.labels.creating_new_job")}
     >
       <OwnerFindModalContainer
-        loading={estData.loading}
-        error={estData.error}
+        loading={estDataRaw.loading}
+        error={estDataRaw.error}
         owner={owner}
         selectedOwner={selectedOwner}
         setSelectedOwner={setSelectedOwner}
@@ -359,8 +354,8 @@ export function JobsAvailableContainer({
         onCancel={onOwnerModalCancel}
       />
       <JobsFindModalContainer
-        loading={estData.loading}
-        error={estData.error}
+        loading={estDataRaw.loading}
+        error={estDataRaw.error}
         selectedJob={selectedJob}
         setSelectedJob={setSelectedJob}
         importOptionsState={importOptionsState}
@@ -390,3 +385,125 @@ export default connect(
   mapStateToProps,
   mapDispatchToProps
 )(JobsAvailableContainer);
+
+function replaceEmpty(someObj, replaceValue = null) {
+  const replacer = (key, value) =>
+    value === "" ? replaceValue || null : value;
+  //^ because you seem to want to replace (strings) "null" or "undefined" too
+  const temp = JSON.stringify(someObj, replacer);
+  return JSON.parse(temp);
+}
+
+async function CheckTaxRates(estData, bodyshop) {
+  //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;
+    }
+  }
+
+  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;
+    }
+  }
+
+  //IO-1387 If a sublet line is NOT R&R, use the labor tax. If it is, use the sublet tax rate.
+  //Currently limited to SK shops only.
+  //if (bodyshop.region_config === "CA_SK") {
+  estData.joblines.data.forEach((jl, index) => {
+    if (
+      (jl.part_type === "PASL" || jl.part_type === "PAS") &&
+      jl.lbr_op !== "OP11"
+    ) {
+      estData.joblines.data[index].tax_part = jl.lbr_tax;
+    }
+
+    //Set markup lines and tax lines as taxable.
+    //900510 is a mark up. 900510 is a discount.
+    if (jl.db_ref === "900510") {
+      estData.joblines.data[index].tax_part = true;
+    }
+  });
+  //}
+}

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

@@ -1,4 +1,4 @@
-import { Button } from "antd";
+import { Button, Dropdown, Menu } from "antd";
 import _ from "lodash";
 import React from "react";
 import { useTranslation } from "react-i18next";
@@ -12,11 +12,8 @@ const mapStateToProps = createStructuredSelector({
 
 export function JobsCloseAutoAllocate({ bodyshop, joblines, form, disabled }) {
   const { t } = useTranslation();
-  const handleAllocate = () => {
-    logImEXEvent("jobs_close_allocate_auto");
-
-    const { defaults } = bodyshop.md_responsibility_centers;
 
+  const handleAllocate = (defaults) => {
     form.setFieldsValue({
       joblines: joblines.map((jl) => {
         const ret = _.cloneDeep(jl);
@@ -32,7 +29,7 @@ export function JobsCloseAutoAllocate({ bodyshop, joblines, form, disabled }) {
         }
         //Verify that this is also manually updated in server/job-costing
         if (!jl.part_type && !jl.mod_lbr_ty) {
-          const lineDesc = jl.line_desc.toLowerCase();
+          const lineDesc = jl.line_desc ? jl.line_desc.toLowerCase() : "";
           if (lineDesc.includes("shop materials")) {
             ret.profitcenter_part = defaults.profits["MASH"];
           } else if (lineDesc.includes("paint/materials")) {
@@ -48,8 +45,36 @@ export function JobsCloseAutoAllocate({ bodyshop, joblines, form, disabled }) {
     });
   };
 
-  return (
-    <Button onClick={handleAllocate} disabled={disabled}>
+  const handleAutoAllocateClick = () => {
+    logImEXEvent("jobs_close_allocate_auto");
+
+    const { defaults } = bodyshop.md_responsibility_centers;
+    handleAllocate(defaults);
+  };
+
+  const handleMenuClick = ({ item, key, keyPath, domEvent }) => {
+    logImEXEvent("jobs_close_allocate_auto_dms");
+    handleAllocate(
+      bodyshop.md_responsibility_centers.dms_defaults.find(
+        (x) => x.name === key
+      )
+    );
+  };
+
+  const overlay = (bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) && (
+    <Menu onClick={handleMenuClick}>
+      {bodyshop.md_responsibility_centers.dms_defaults.map((mapping) => (
+        <Menu.Item key={mapping.name}>{mapping.name}</Menu.Item>
+      ))}
+    </Menu>
+  );
+
+  return bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber ? (
+    <Dropdown overlay={overlay}>
+      <Button disabled={disabled}>{t("jobs.actions.dmsautoallocate")}</Button>
+    </Dropdown>
+  ) : (
+    <Button onClick={handleAutoAllocateClick} disabled={disabled}>
       {t("jobs.actions.autoallocate")}
     </Button>
   );

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

@@ -13,6 +13,8 @@ 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,
@@ -24,57 +26,78 @@ export function JobsCloseExportButton({
   currentUser,
   jobId,
   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 || bodyshop.pbs_serialnumber) {
+      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 {
+    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
       PartnerResponse = await axios.post(
-        "http://localhost:1337/qb/",
-        // "http://609feaeae986.ngrok.io/qb/",
-        QbXmlResponse.data,
+        `/qbo/receivables`,
         {
-          headers: {
-            Authorization: `Bearer ${await auth.currentUser.getIdToken()}`,
-          },
-        }
+          jobIds: [jobId],
+        },
+        
       );
-    } catch (error) {
-      console.log("Error connecting to quickbooks or partner.", error);
-      notification["error"]({
-        message: t("jobs.errors.exporting-partner"),
-      });
-      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);
@@ -147,18 +170,18 @@ export function JobsCloseExportButton({
           }),
         });
       }
+      if (setSelectedJobs) {
+        setSelectedJobs((selectedJobs) => {
+          return selectedJobs.filter((i) => i !== jobId);
+        });
+      }
     }
 
     setLoading(false);
   };
 
   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-close-lines/jobs-close-lines.component.jsx

@@ -31,6 +31,7 @@ export function JobsCloseLines({ bodyshop, job, jobRO }) {
                   <th>{t("joblines.fields.line_desc")}</th>
                   <th>{t("joblines.fields.part_type")}</th>
                   <th>{t("joblines.fields.act_price")}</th>
+                  <th>{t("joblines.fields.prt_dsmk_m")}</th>
                   <th>{t("joblines.fields.op_code_desc")}</th>
                   <th>{t("joblines.fields.mod_lbr_ty")}</th>
                   <th>{t("joblines.fields.mod_lb_hrs")}</th>
@@ -70,6 +71,16 @@ export function JobsCloseLines({ bodyshop, job, jobRO }) {
                         <ReadOnlyFormItem type="currency" />
                       </Form.Item>
                     </td>
+                    <td>
+                      <Form.Item
+                        span={2}
+                        //  label={t("joblines.fields.prt_dsmk_m")}
+                        key={`${index}prt_dsmk_m`}
+                        name={[field.name, "prt_dsmk_m"]}
+                      >
+                        <ReadOnlyFormItem type="currency" />
+                      </Form.Item>
+                    </td>
                     <td>
                       <Form.Item
                         span={2}
@@ -108,7 +119,9 @@ export function JobsCloseLines({ bodyshop, job, jobRO }) {
                         labelCol={{ span: 0 }}
                         rules={[
                           {
-                            required: !!job.joblines[index].act_price,
+                            required:
+                              !!job.joblines[index].act_price ||
+                              !!job.joblines[index].prt_dsmk_m,
                             //message: t("general.validation.required"),
                           },
                         ]}

client/src/components/jobs-convert-button/jobs-convert-button.component.jsx

@@ -2,6 +2,7 @@ import { useMutation } from "@apollo/client";
 import {
   Button,
   Form,
+  Input,
   notification,
   Popover,
   Select,
@@ -34,6 +35,7 @@ export function JobsConvertButton({
   refetch,
   jobRO,
   insertAuditTrail,
+  parentFormIsFieldsTouched,
 }) {
   const [visible, setVisible] = useState(false);
   const [loading, setLoading] = useState(false);
@@ -42,6 +44,10 @@ export function JobsConvertButton({
   const [form] = Form.useForm();
 
   const handleConvert = async (values) => {
+    if (parentFormIsFieldsTouched()) {
+      alert(t("jobs.labels.savebeforeconversion"));
+      return;
+    }
     setLoading(true);
     const res = await mutationConvertJob({
       variables: { jobId: job.id, ...values },
@@ -112,24 +118,32 @@ export function JobsConvertButton({
           </Form.Item>
         )}
         {bodyshop.enforce_referral && (
-          <Form.Item
-            name={"referral_source"}
-            label={t("jobs.fields.referralsource")}
-            rules={[
-              {
-                required: bodyshop.enforce_referral,
-                //message: t("general.validation.required"),
-              },
-            ]}
-          >
-            <Select>
-              {bodyshop.md_referral_sources.map((s) => (
-                <Select.Option key={s} value={s}>
-                  {s}
-                </Select.Option>
-              ))}
-            </Select>
-          </Form.Item>
+          <>
+            <Form.Item
+              name={"referral_source"}
+              label={t("jobs.fields.referralsource")}
+              rules={[
+                {
+                  required: bodyshop.enforce_referral,
+                  //message: t("general.validation.required"),
+                },
+              ]}
+            >
+              <Select>
+                {bodyshop.md_referral_sources.map((s) => (
+                  <Select.Option key={s} value={s}>
+                    {s}
+                  </Select.Option>
+                ))}
+              </Select>
+            </Form.Item>
+            <Form.Item
+              label={t("jobs.fields.referral_source_extra")}
+              name="referral_source_extra"
+            >
+              <Input />
+            </Form.Item>
+          </>
         )}
         <Form.Item
           label={t("jobs.fields.ca_gst_registrant")}

client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx

@@ -150,6 +150,9 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
             <Form.Item label={t("jobs.fields.loss_desc")} name="loss_desc">
               <Input />
             </Form.Item>
+            <Form.Item label={t("jobs.fields.loss_of_use")} name="loss_of_use">
+              <Input />
+            </Form.Item>
             <Form.Item label={t("jobs.fields.ponumber")} name="po_number">
               <Input />
             </Form.Item>
@@ -181,6 +184,12 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
                 ))}
               </Select>
             </Form.Item>
+            <Form.Item
+              label={t("jobs.fields.referral_source_extra")}
+              name="referral_source_extra"
+            >
+              <Input />
+            </Form.Item>
           </LayoutFormRow>
         </Collapse.Panel>
         <Collapse.Panel
@@ -191,7 +200,7 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
           <JobsMarkPstExempt form={form} />
           <LayoutFormRow>
             <Form.Item label={t("jobs.fields.ded_amt")} name="ded_amt">
-              <CurrencyInput />
+              <CurrencyInput min={0} />
             </Form.Item>
             <Form.Item label={t("jobs.fields.ded_status")} name="ded_status">
               <Select>

client/src/components/jobs-create-owner-info/jobs-create-owner-info.new.component.jsx

@@ -129,6 +129,19 @@ export default function JobsCreateOwnerInfoNewComponent() {
         >
           <FormItemPhone disabled={!state.owner.new} />
         </Form.Item>
+        <Form.Item
+          label={t("owners.fields.ownr_ph2")}
+          name={["owner", "data", "ownr_ph2"]}
+          rules={[
+            ({ getFieldValue }) =>
+              PhoneItemFormatterValidation(
+                getFieldValue,
+                "owner.data.ownr_ph2"
+              ),
+          ]}
+        >
+          <FormItemPhone disabled={!state.owner.new} />
+        </Form.Item>
       </LayoutFormRow>
       <LayoutFormRow grow>
         <Form.Item

client/src/components/jobs-create-owner-info/jobs-create-owner-info.search.component.jsx

@@ -84,6 +84,18 @@ export default function JobsCreateOwnerInfoSearchComponent({
         tableState.sortedInfo.columnKey === "ownr_ph1" &&
         tableState.sortedInfo.order,
     },
+    {
+      title: t("owners.fields.ownr_ph2"),
+      dataIndex: "ownr_ph2",
+      key: "ownr_ph2",
+      render: (text, record) => (
+        <PhoneFormatter>{record.ownr_ph2}</PhoneFormatter>
+      ),
+      sorter: (a, b) => alphaSort(a.ownr_ph2, b.ownr_ph2),
+      sortOrder:
+        tableState.sortedInfo.columnKey === "ownr_ph2" &&
+        tableState.sortedInfo.order,
+    },
   ];
 
   const handleTableChange = (pagination, filters, sorter) => {

client/src/components/jobs-detail-change-estimator/jobs-detail-change-estimator.component.jsx

@@ -0,0 +1,43 @@
+import { DownOutlined } from "@ant-design/icons";
+import { Dropdown, Menu } from "antd";
+import React from "react";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+
+export function JobsDetailChangeEstimator({ disabled, form, bodyshop }) {
+  const handleClick = ({ item, key, keyPath }) => {
+    const est = item.props.value;
+    form.setFieldsValue(est);
+  };
+
+  const menu = (
+    <div>
+      <Menu onClick={handleClick}>
+        {bodyshop.md_estimators.map((est, idx) => (
+          <Menu.Item value={est} key={idx}>
+            {`${est.est_ct_fn} ${est.est_ct_ln}`}
+          </Menu.Item>
+        ))}
+      </Menu>
+    </div>
+  );
+
+  return (
+    <Dropdown overlay={menu} disabled={disabled}>
+      <a
+        className="ant-dropdown-link"
+        href=" #"
+        onClick={(e) => e.preventDefault()}
+      >
+        <DownOutlined />
+      </a>
+    </Dropdown>
+  );
+}
+
+export default connect(mapStateToProps, null)(JobsDetailChangeEstimator);

client/src/components/jobs-detail-change-filehandler/jobs-detail-change-filehandler.component.jsx

@@ -0,0 +1,43 @@
+import { DownOutlined } from "@ant-design/icons";
+import { Dropdown, Menu } from "antd";
+import React from "react";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+
+export function JobsDetailChangeFilehandler({ disabled, form, bodyshop }) {
+  const handleClick = ({ item, key, keyPath }) => {
+    const est = item.props.value;
+    form.setFieldsValue(est);
+  };
+
+  const menu = (
+    <div>
+      <Menu onClick={handleClick}>
+        {bodyshop.md_filehandlers.map((est, idx) => (
+          <Menu.Item value={est} key={idx}>
+            {`${est.ins_ct_fn} ${est.ins_ct_ln}`}
+          </Menu.Item>
+        ))}
+      </Menu>
+    </div>
+  );
+
+  return (
+    <Dropdown overlay={menu} disabled={disabled}>
+      <a
+        className="ant-dropdown-link"
+        href=" #"
+        onClick={(e) => e.preventDefault()}
+      >
+        <DownOutlined />
+      </a>
+    </Dropdown>
+  );
+}
+
+export default connect(mapStateToProps, null)(JobsDetailChangeFilehandler);

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

@@ -69,6 +69,18 @@ export function JobsDetailDatesComponent({ jobRO, job, bodyshop }) {
         </Tooltip>
       </FormRow>
       <FormRow header={t("jobs.forms.repairdates")}>
+        <Form.Item
+          label={t("jobs.fields.date_last_contacted")}
+          name="date_last_contacted"
+        >
+          <DateTimePicker />
+        </Form.Item>
+        <Form.Item
+          label={t("jobs.fields.date_next_contact")}
+          name="date_next_contact"
+        >
+          <DateTimePicker />
+        </Form.Item>
         <Form.Item
           label={t("jobs.fields.scheduled_completion")}
           name="scheduled_completion"
@@ -93,7 +105,6 @@ export function JobsDetailDatesComponent({ jobRO, job, bodyshop }) {
             );
           }}
         </Form.Item>
-
         <Form.Item
           label={t("jobs.fields.scheduled_delivery")}
           name="scheduled_delivery"

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

@@ -1,4 +1,14 @@
-import { Col, Form, Input, InputNumber, Row, Select, Switch } from "antd";
+import {
+  Col,
+  Divider,
+  Form,
+  Input,
+  InputNumber,
+  Row,
+  Select,
+  Space,
+  Switch,
+} from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -12,8 +22,9 @@ import FormItemPhone, {
   PhoneItemFormatterValidation,
 } from "../form-items-formatted/phone-form-item.component";
 import Car from "../job-damage-visual/job-damage-visual.component";
+import JobsDetailChangeEstimator from "../jobs-detail-change-estimator/jobs-detail-change-estimator.component";
 import FormRow from "../layout-form-row/layout-form-row.component";
-
+import JobsDetailChangeFileHandler from "../jobs-detail-change-filehandler/jobs-detail-change-filehandler.component";
 const mapStateToProps = createStructuredSelector({
   jobRO: selectJobReadOnly,
   bodyshop: selectBodyshop,
@@ -44,7 +55,14 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) {
           </Select>
         </Form.Item>
         <Form.Item label={t("jobs.fields.ded_amt")} name="ded_amt">
-          <CurrencyInput disabled={jobRO} />
+          <CurrencyInput disabled={jobRO} min={0} />
+        </Form.Item>
+        <Form.Item label={t("jobs.fields.ded_note")} name="ded_note">
+          <Select disabled={jobRO}>
+            {bodyshop.md_ded_notes.map((n, index) => (
+              <Select.Option key={index}>{n}</Select.Option>
+            ))}
+          </Select>
         </Form.Item>
         <Form.Item label={t("jobs.fields.policy_no")} name="policy_no">
           <Input disabled={jobRO} />
@@ -68,7 +86,15 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) {
         <Form.Item label={t("jobs.fields.ins_city")} name="ins_city">
           <Input disabled={jobRO} />
         </Form.Item>
-        <Form.Item label={t("jobs.fields.ins_ct_ln")} name="ins_ct_ln">
+        <Form.Item
+          label={
+            <Space>
+              {t("jobs.fields.ins_ct_ln")}
+              <JobsDetailChangeFileHandler form={form} disabled={jobRO} />
+            </Space>
+          }
+          name="ins_ct_ln"
+        >
           <Input disabled={jobRO} />
         </Form.Item>
         <Form.Item label={t("jobs.fields.ins_ct_fn")} name="ins_ct_fn">
@@ -114,6 +140,12 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) {
             ))}
           </Select>
         </Form.Item>
+        <Form.Item
+          label={t("jobs.fields.referral_source_extra")}
+          name="referral_source_extra"
+        >
+          <Input disabled={jobRO} />
+        </Form.Item>
         <Form.Item label={t("jobs.fields.alt_transport")} name="alt_transport">
           <Select disabled={jobRO} allowClear>
             {bodyshop.appt_alt_transport.map((s) => (
@@ -133,6 +165,9 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) {
             <Form.Item label={t("jobs.fields.loss_date")} name="loss_date">
               <FormDatePicker disabled={jobRO} />
             </Form.Item>
+            <Form.Item label={t("jobs.fields.loss_of_use")} name="loss_of_use">
+              <Input disabled={jobRO} />
+            </Form.Item>
             <Form.Item label={t("jobs.fields.kmin")} name="kmin">
               <InputNumber precision={0} min={0} disabled={jobRO} />
             </Form.Item>
@@ -185,12 +220,27 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) {
           )}
         </Col>
       </Row>
+      <Divider
+        orientation="left"
+        type="horizontal"
+        style={{ marginTop: ".8rem", float: "right" }}
+      >
+        {t("jobs.forms.appraiserinfo")}
+      </Divider>
 
-      <FormRow header={t("jobs.forms.appraiserinfo")}>
+      <FormRow noDivider>
         <Form.Item label={t("jobs.fields.est_co_nm")} name="est_co_nm">
           <Input disabled={jobRO} />
         </Form.Item>
-        <Form.Item label={t("jobs.fields.est_ct_fn")} name="est_ct_fn">
+        <Form.Item
+          label={
+            <Space>
+              {t("jobs.fields.est_ct_fn")}
+              <JobsDetailChangeEstimator form={form} disabled={jobRO} />
+            </Space>
+          }
+          name="est_ct_fn"
+        >
           <Input disabled={jobRO} />
         </Form.Item>
         <Form.Item label={t("jobs.fields.est_ct_ln")} name="est_ct_ln">

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

@@ -101,6 +101,7 @@ export function JobsDetailHeaderActions({
             context: {
               jobId: job.id,
               job: job,
+              alt_transport: job.alt_transport,
             },
           });
         }}