IO-233 CDK Updates.

release/2021-11-12

Approved-by: Patrick Fic

.gitignore

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

client/package.json

@@ -2,86 +2,87 @@
   "name": "bodyshop",
   "version": "0.1.1",
   "private": true,
-  "proxy": "http://localhost:5000",
+  "proxy": "http://localhost:4000",
   "dependencies": {
-    "@apollo/client": "^3.4.10",
-    "@craco/craco": "^6.2.0",
+    "@apollo/client": "^3.4.17",
+    "@asseinfo/react-kanban": "^2.2.0",
+    "@craco/craco": "^6.4.0",
     "@fingerprintjs/fingerprintjs": "^3.3.0",
-    "@lourenci/react-kanban": "^2.1.0",
-    "@openreplay/tracker": "^3.3.1",
-    "@openreplay/tracker-assist": "^3.1.1",
+    "@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.11.0",
-    "@sentry/tracing": "^6.11.0",
-    "@stripe/react-stripe-js": "^1.4.0",
-    "@stripe/stripe-js": "^1.17.1",
-    "@tanem/react-nprogress": "^3.0.79",
+    "@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.4",
+    "axios": "^0.24.0",
     "craco-less": "^1.20.0",
-    "dinero.js": "^1.9.0",
+    "dinero.js": "^1.9.1",
     "dotenv": "^10.0.0",
     "enquire-js": "^0.2.1",
     "env-cmd": "^10.1.0",
     "exifr": "^7.1.3",
-    "firebase": "^9.0.0",
-    "graphql": "^15.5.3",
-    "i18next": "^20.4.0",
+    "firebase": "^9.4.1",
+    "graphql": "^16.0.1",
+    "i18next": "^21.4.2",
     "i18next-browser-languagedetector": "^6.1.2",
-    "jsoneditor": "^9.5.4",
+    "jsoneditor": "^9.5.7",
     "jsreport-browser-client-dist": "^1.3.0",
-    "libphonenumber-js": "^1.9.26",
-    "logrocket": "^2.0.0",
-    "markerjs2": "^2.11.2",
+    "libphonenumber-js": "^1.9.42",
+    "logrocket": "^2.1.1",
+    "markerjs2": "^2.17.0",
     "moment-business-days": "^1.2.0",
-    "phone": "^3.1.6",
+    "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.35.0",
+    "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.3.0",
-    "react-i18next": "^11.11.4",
-    "react-icons": "^4.2.0",
-    "react-number-format": "^4.7.3",
-    "react-redux": "^7.2.5",
+    "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.3.0",
     "react-scripts": "^4.0.3",
     "react-sublime-video": "^0.2.5",
     "react-virtualized": "^9.22.3",
-    "recharts": "^2.1.2",
-    "redux": "^4.1.1",
+    "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.38.2",
-    "socket.io-client": "^4.2.0",
-    "styled-components": "^5.3.1",
-    "subscriptions-transport-ws": "^0.9.18",
-    "web-vitals": "^2.1.0",
-    "workbox-background-sync": "^6.2.4",
-    "workbox-broadcast-update": "^6.2.4",
-    "workbox-cacheable-response": "^6.2.4",
-    "workbox-core": "^6.2.4",
-    "workbox-expiration": "^6.2.4",
-    "workbox-google-analytics": "^6.2.4",
-    "workbox-navigation-preload": "^6.2.4",
-    "workbox-precaching": "^6.2.4",
-    "workbox-range-requests": "^6.2.4",
-    "workbox-routing": "^6.2.4",
-    "workbox-strategies": "^6.2.4",
-    "workbox-streams": "^6.2.4"
+    "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",
@@ -114,7 +115,7 @@
     ]
   },
   "devDependencies": {
-    "@sentry/webpack-plugin": "^1.17.1",
+    "@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,11 @@ 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";
-import trackerGraphQL from "@openreplay/tracker-graphql";
-//import trackerRedux from "@openreplay/tracker-redux";
-import Tracker from "@openreplay/tracker";
-//import trackerAssist from "@openreplay/tracker-assist";
+
 moment.locale("en-US");
 
 export const tracker = new Tracker({
@@ -21,7 +24,11 @@ export const tracker = new Tracker({
     ? { __DISABLE_SECURE_MODE: true }
     : {}),
   // beaconSize: 10485760,
-  onStart: ({ sessionID }) => console.log("ORS SESSION ", sessionID),
+  onStart: async ({ sessionID }) => {
+    const user = await getCurrentUser();
+    if (user) tracker.setUserID(user.email);
+    console.log("ORS SESSION ", sessionID, user && user.email);
+  },
 });
 
 // tracker.use(
@@ -31,6 +38,13 @@ 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();
 
@@ -48,7 +62,9 @@ export default function AppContainer() {
         }}
       >
         <GlobalLoadingBar />
-        <App />
+        <SplitFactory factory={factory}>
+          <App />
+        </SplitFactory>
       </ConfigProvider>
     </ApolloProvider>
   );

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/accounting-payables-table/accounting-payables-table.component.jsx

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

client/src/components/accounting-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,
 }) {
@@ -163,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

@@ -11,6 +11,7 @@ import JobsExportAllButton from "../jobs-export-all-button/jobs-export-all-butto
 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,
 });
@@ -198,7 +199,7 @@ export function AccountingReceivablesTableComponent({
     <Card
       extra={
         <Space wrap>
-          {!bodyshop.cdk_dealerid && (
+          {!bodyshop.cdk_dealerid && !bodyshop.pbs_serialnumber && (
             <JobsExportAllButton
               jobIds={selectedJobs}
               disabled={transInProgress || selectedJobs.length === 0}
@@ -206,6 +207,9 @@ export function AccountingReceivablesTableComponent({
               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

@@ -156,7 +156,6 @@ export function BillEnterModalLinesComponent({
               setFieldsValue({
                 billlines: getFieldsValue("billlines").billlines.map(
                   (item, idx) => {
-                    console.log("Checking", index, idx);
                     if (idx === index) {
                       console.log(
                         "Found and setting.",
@@ -502,9 +501,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>
     );
@@ -516,7 +515,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-line-search-select/bill-line-search-select.component.jsx

@@ -12,7 +12,19 @@ const BillLineSearchSelect = ({ options, disabled, ...restProps }, ref) => {
       disabled={disabled}
       ref={ref}
       showSearch
-      optionFilterProp="line_desc"
+      //  optionFilterProp="line_desc"
+      filterOption={(inputValue, option) => {
+        console.log(inputValue);
+        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 +33,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-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/courtesy-car-status-select/courtesy-car-status-select.component.jsx

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

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

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

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

@@ -1,4 +1,4 @@
-import { Button, Table, Col , Checkbox} from "antd";
+import { Button, Table, Col, Checkbox } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -23,15 +23,26 @@ export function DmsCustomerSelector({ bodyshop }) {
   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("cdk-selected-customer", selectedCustomer);
+    socket.emit(`${dmsType}-selected-customer`, selectedCustomer);
     setSelectedCustomer(null);
   };
 
@@ -50,7 +61,7 @@ export function DmsCustomerSelector({ bodyshop }) {
     setSelectedCustomer(null);
   };
 
-  const columns = [
+  const cdkColumns = [
     {
       title: t("jobs.fields.dms.id"),
       dataIndex: ["id", "value"],
@@ -60,13 +71,14 @@ export function DmsCustomerSelector({ bodyshop }) {
       title: t("jobs.fields.dms.vinowner"),
       dataIndex: "vinOwner",
       key: "vinOwner",
-      render: (text, record) => <Checkbox disabled checked={record.vinOwner}/>
+      render: (text, record) => <Checkbox disabled checked={record.vinOwner} />,
     },
     {
       title: t("jobs.fields.dms.name1"),
       dataIndex: ["name1", "fullName"],
       key: "name1",
-      sorter: (a, b) => alphaSort(a.name1?.fullName, b.name1?.fullName),
+      sorter: (a, b) =>
+        alphaSort(a.name1 && a.name1.fullName, b.name1 && b.name1.fullName),
     },
 
     {
@@ -74,11 +86,43 @@ export function DmsCustomerSelector({ bodyshop }) {
       //dataIndex: ["name2", "fullName"],
       key: "address",
       render: (record, value) =>
-        `${record?.address?.addressLine[0]}, ${record.address?.city} ${record.address?.stateOrProvince} ${record.address?.postalCode}`,
+        `${record.address && record.address.addressLine[0]}, ${
+          record.address && record.address.city
+        } ${record.address && record.address.stateOrProvince} ${
+          record.address && record.address.postalCode
+        }`,
     },
   ];
 
-  if (!visible) return <></>;
+  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
@@ -104,13 +148,17 @@ export function DmsCustomerSelector({ bodyshop }) {
           </div>
         )}
         pagination={{ position: "top" }}
-        columns={columns}
-        rowKey={(record) => record.id.value}
+        columns={dmsType === "cdk" ? cdkColumns : pbsColumns}
+        rowKey={(record) =>
+          dmsType === "cdk" ? record.id.value : record.ContactId
+        }
         dataSource={customerList}
         //onChange={handleTableChange}
         rowSelection={{
-          onSelect: (props) => {
-            setSelectedCustomer(props.id.value);
+          onSelect: (record) => {
+            setSelectedCustomer(
+              dmsType === "cdk" ? record.id.value : record.ContactId
+            );
           },
           type: "radio",
           selectedRowKeys: [selectedCustomer],

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

@@ -119,33 +119,35 @@ export function DmsPostForm({ bodyshop, socket, job }) {
           </Form.Item>
         </LayoutFormRow>
 
-        <LayoutFormRow style={{ justifyContent: "center" }} grow>
-          <Form.Item
-            name="dms_make"
-            label={t("jobs.fields.dms.dms_make")}
-            rules={[
-              {
-                required: true,
-              },
-            ]}
-          >
-            <Input disabled />
-          </Form.Item>
-          <Form.Item
-            name="dms_model"
-            label={t("jobs.fields.dms.dms_model")}
-            rules={[
-              {
-                required: true,
-              },
-            ]}
-          >
-            <Input disabled />
-          </Form.Item>
+        {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>
+            <DmsCdkMakes form={form} socket={socket} job={job} />
+            <DmsCdkMakesRefetch />
+          </LayoutFormRow>
+        )}
         <Form.Item
           name="story"
           label={t("jobs.fields.dms.story")}
@@ -157,6 +159,7 @@ export function DmsPostForm({ bodyshop, socket, job }) {
         >
           <Input.TextArea maxLength={240} />
         </Form.Item>
+
         <Divider />
         <Form.List name={["payers"]}>
           {(fields, { add, remove }) => {
@@ -259,7 +262,6 @@ export function DmsPostForm({ bodyshop, socket, job }) {
                 ))}
                 <Form.Item>
                   <Button
-                    type="dashed"
                     disabled={!(fields.length < 3)}
                     onClick={() => {
                       if (fields.length < 3) add();

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: {

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)),
 });
@@ -24,9 +26,20 @@ export function EmailTestComponent({ currentUser, setEmailOptions }) {
       {
         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/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>
               ),

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/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} />
@@ -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-checklist/components/job-checklist-form/job-checklist-form.component.jsx

@@ -167,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>
         )
@@ -182,12 +186,14 @@ export function JobChecklistForm({
             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" && {

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

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

@@ -74,7 +74,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-available-table/jobs-available-table.container.jsx

@@ -29,6 +29,7 @@ import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
+import confirmDialog from "../../utils/asyncConfirm";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import AlertComponent from "../alert/alert.component";
 import JobsAvailableScan from "../jobs-available-scan/jobs-available-scan.component";
@@ -98,8 +99,8 @@ export function JobsAvailableContainer({
       return;
     }
     //IO-539 Check for Parts Rate on PAL for SGI use case.
-    await CheckTaxRates(estData, bodyshop);
-
+    await CheckTaxRates(estData.est_data, bodyshop);
+    console.log(estData);
     const newTotals = (
       await Axios.post("/job/totals", {
         job: {
@@ -139,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) => {
@@ -198,11 +200,10 @@ export function JobsAvailableContainer({
         message: t("jobs.errors.creating", { error: "No job data present." }),
       });
     } else {
-      //IO-539 Check for Parts Rate on PAL for SGI use case.
-      await CheckTaxRates(estData, bodyshop);
-
       //create upsert job
       let supp = replaceEmpty({ ...estData.est_data });
+      //IO-539 Check for Parts Rate on PAL for SGI use case.
+      await CheckTaxRates(supp, bodyshop);
 
       delete supp.owner;
       delete supp.vehicle;
@@ -390,109 +391,119 @@ function replaceEmpty(someObj, replaceValue = null) {
     value === "" ? replaceValue || null : value;
   //^ because you seem to want to replace (strings) "null" or "undefined" too
   const temp = JSON.stringify(someObj, replacer);
-  console.log("Parsed", JSON.parse(temp));
   return JSON.parse(temp);
 }
 
-function confirmDialog(msg) {
-  return new Promise(function (resolve, reject) {
-    let confirmed = window.confirm(msg);
-
-    return confirmed ? resolve(true) : resolve(false);
-  });
-}
-
 async function CheckTaxRates(estData, bodyshop) {
   //LKQ Check
   if (
-    !estData.est_data.parts_tax_rates?.PAL ||
-    estData.est_data.parts_tax_rates?.PAL?.prt_tax_rt === null ||
-    estData.est_data.parts_tax_rates?.PAL?.prt_tax_rt === 0
+    !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.est_data.parts_tax_rates.PAL) {
-        estData.est_data.parts_tax_rates.PAL = {
+      if (!estData.parts_tax_rates.PAL) {
+        estData.parts_tax_rates.PAL = {
           prt_discp: 0,
           prt_mktyp: true,
           prt_mkupp: 0,
           prt_type: "PAL",
         };
       }
-      estData.est_data.parts_tax_rates.PAL.prt_tax_rt =
+      estData.parts_tax_rates.PAL.prt_tax_rt =
         bodyshop.bill_tax_rates.state_tax_rate / 100;
-      estData.est_data.parts_tax_rates.PAL.prt_tax_in = true;
+      estData.parts_tax_rates.PAL.prt_tax_in = true;
     }
   }
   //PAC Check
   if (
-    !estData.est_data.parts_tax_rates?.PAC ||
-    estData.est_data.parts_tax_rates?.PAC?.prt_tax_rt === null ||
-    estData.est_data.parts_tax_rates?.PAC?.prt_tax_rt === 0
+    !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.est_data.parts_tax_rates.PAC) {
-        estData.est_data.parts_tax_rates.PAC = {
+      if (!estData.parts_tax_rates.PAC) {
+        estData.parts_tax_rates.PAC = {
           prt_discp: 0,
           prt_mktyp: true,
           prt_mkupp: 0,
           prt_type: "PAC",
         };
       }
-      estData.est_data.parts_tax_rates.PAC.prt_tax_rt =
+      estData.parts_tax_rates.PAC.prt_tax_rt =
         bodyshop.bill_tax_rates.state_tax_rate / 100;
-      estData.est_data.parts_tax_rates.PAC.prt_tax_in = true;
+      estData.parts_tax_rates.PAC.prt_tax_in = true;
     }
   }
   //PAM Check
   if (
-    !estData.est_data.parts_tax_rates?.PAM ||
-    estData.est_data.parts_tax_rates?.PAM?.prt_tax_rt === null ||
-    estData.est_data.parts_tax_rates?.PAM?.prt_tax_rt === 0
+    !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.est_data.parts_tax_rates.PAM) {
-        estData.est_data.parts_tax_rates.PAM = {
+      if (!estData.parts_tax_rates.PAM) {
+        estData.parts_tax_rates.PAM = {
           prt_discp: 0,
           prt_mktyp: true,
           prt_mkupp: 0,
           prt_type: "PAM",
         };
       }
-      estData.est_data.parts_tax_rates.PAM.prt_tax_rt =
+      estData.parts_tax_rates.PAM.prt_tax_rt =
         bodyshop.bill_tax_rates.state_tax_rate / 100;
-      estData.est_data.parts_tax_rates.PAM.prt_tax_in = true;
+      estData.parts_tax_rates.PAM.prt_tax_in = true;
     }
   }
 
   if (
-    !estData.est_data.parts_tax_rates?.PAR ||
-    estData.est_data.parts_tax_rates?.PAR?.prt_tax_rt === null ||
-    estData.est_data.parts_tax_rates?.PAR?.prt_tax_rt === 0
+    !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.est_data.parts_tax_rates.PAR) {
-        estData.est_data.parts_tax_rates.PAR = {
+      if (!estData.parts_tax_rates.PAR) {
+        estData.parts_tax_rates.PAR = {
           prt_discp: 0,
           prt_mktyp: true,
           prt_mkupp: 0,
           prt_type: "PAR",
         };
       }
-      estData.est_data.parts_tax_rates.PAR.prt_tax_rt =
+      estData.parts_tax_rates.PAR.prt_tax_rt =
         bodyshop.bill_tax_rates.state_tax_rate / 100;
-      estData.est_data.parts_tax_rates.PAR.prt_tax_in = true;
+      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

@@ -61,7 +61,7 @@ export function JobsCloseAutoAllocate({ bodyshop, joblines, form, disabled }) {
     );
   };
 
-  const overlay = bodyshop.cdk_dealerid && (
+  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>
@@ -69,7 +69,7 @@ export function JobsCloseAutoAllocate({ bodyshop, joblines, form, disabled }) {
     </Menu>
   );
 
-  return bodyshop.cdk_dealerid ? (
+  return bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber ? (
     <Dropdown overlay={overlay}>
       <Button disabled={disabled}>{t("jobs.actions.dmsautoallocate")}</Button>
     </Dropdown>

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

@@ -15,6 +15,7 @@ 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,
   currentUser: selectCurrentUser,
@@ -34,55 +35,69 @@ export function JobsCloseExportButton({
   const [loading, setLoading] = useState(false);
 
   const handleQbxml = async () => {
-    if (bodyshop.cdk_dealerid) {
+    //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);

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,
             },
           });
         }}

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

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

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

@@ -21,47 +21,57 @@ export function JobsDetailHeaderActionexportCustomerData({
 
   const handleExportCustData = async (e) => {
     logImEXEvent("job_export_cust_data");
-    let QbXmlResponse;
-    try {
-      QbXmlResponse = await axios.post(
-        "/accounting/qbxml/receivables",
-        { jobIds: [job.id], custDataOnly: true },
-        {
-          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),
-        }),
-      });
-
-      return;
-    }
-
     let PartnerResponse;
-    try {
-      PartnerResponse = await axios.post(
-        "http://localhost:1337/qb/",
-        QbXmlResponse.data,
-        {
-          headers: {
-            Authorization: `Bearer ${await auth.currentUser.getIdToken()}`,
-          },
-        }
-      );
-    } catch (error) {
-      console.log("Error connecting to quickbooks or partner.", error);
-      notification["error"]({
-        message: t("jobs.errors.exporting-partner"),
+    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
+      PartnerResponse = await axios.post(`/qbo/receivables`, {
+        jobIds: [job.id],
+        custDataOnly: true,
       });
+    } else {
+      //Default is QBD
 
-      return;
+      let QbXmlResponse;
+      try {
+        QbXmlResponse = await axios.post(
+          "/accounting/qbxml/receivables",
+          { jobIds: [job.id], custDataOnly: true },
+          {
+            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),
+          }),
+        });
+
+        return;
+      }
+
+      //let PartnerResponse;
+      try {
+        PartnerResponse = await axios.post(
+          "http://localhost:1337/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"),
+        });
+
+        return;
+      }
     }
     //Check to see if any of them failed. If they didn't don't execute the update.
     const failedTransactions = PartnerResponse.data.filter((r) => !r.success);

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

@@ -16,6 +16,7 @@ import JobEmployeeAssignments from "../job-employee-assignments/job-employee-ass
 import ProductionListColumnProductionNote from "../production-list-columns/production-list-columns.productionnote.component";
 import "./jobs-detail-header.styles.scss";
 import JobsRelatedRos from "../jobs-related-ros/jobs-related-ros.component";
+import { DateTimeFormatter } from "../../utils/DateFormatter";
 
 const mapStateToProps = createStructuredSelector({
   jobRO: selectJobReadOnly,
@@ -70,12 +71,21 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
                 {job.production_vars && job.production_vars.alert ? (
                   <ExclamationCircleFilled className="production-alert" />
                 ) : null}
+                {job.status === bodyshop.md_ro_statuses.default_scheduled &&
+                job.scheduled_in ? (
+                  <Tag>
+                    <DateTimeFormatter>{job.scheduled_in}</DateTimeFormatter>
+                  </Tag>
+                ) : null}
               </Space>
             </DataLabel>
             <DataLabel label={t("jobs.fields.ins_co_nm_short")}>
               {job.ins_co_nm}
             </DataLabel>
             <DataLabel label={t("jobs.fields.clm_no")}>{job.clm_no}</DataLabel>
+            <DataLabel label={t("jobs.fields.ponumber")} hideIfNull>
+              {job.po_number}
+            </DataLabel>
             <DataLabel label={t("jobs.fields.repairtotal")}>
               <CurrencyFormatter>{job.clm_total}</CurrencyFormatter>
               <span style={{ margin: "0rem .5rem" }}>/</span>
@@ -138,6 +148,9 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
             <DataLabel key="2" label={t("jobs.fields.ownr_ph1")}>
               <ChatOpenButton phone={job.ownr_ph1} jobid={job.id} />
             </DataLabel>
+            <DataLabel key="22" label={t("jobs.fields.ownr_ph2")}>
+              <ChatOpenButton phone={job.ownr_ph2} jobid={job.id} />
+            </DataLabel>
             <DataLabel key="3" label={t("owners.fields.address")}>
               {`${job.ownr_addr1 || ""} ${job.ownr_addr2 || ""} ${
                 job.ownr_city || ""

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

@@ -38,7 +38,7 @@ export function JobsDetailRates({ jobRO, form, job, bodyshop }) {
           label={t("jobs.fields.depreciation_taxes")}
           name="depreciation_taxes"
         >
-          <CurrencyInput disabled={jobRO} />
+          <CurrencyInput disabled={jobRO} min={0} />
         </Form.Item>
         <Tooltip title={t("jobs.labels.ca_gst_all_if_null")}>
           <Form.Item
@@ -47,6 +47,7 @@ export function JobsDetailRates({ jobRO, form, job, bodyshop }) {
           >
             <CurrencyInput
               disabled={jobRO}
+              min={0}
               max={
                 Math.round(
                   (job.job_totals &&
@@ -61,19 +62,19 @@ export function JobsDetailRates({ jobRO, form, job, bodyshop }) {
           label={t("jobs.fields.other_amount_payable")}
           name="other_amount_payable"
         >
-          <CurrencyInput disabled={jobRO} />
+          <CurrencyInput disabled={jobRO} min={0} />
         </Form.Item>
         <Form.Item
           label={t("jobs.fields.towing_payable")}
           name="towing_payable"
         >
-          <CurrencyInput disabled={jobRO} />
+          <CurrencyInput disabled={jobRO} min={0} />
         </Form.Item>
         <Form.Item
           label={t("jobs.fields.storage_payable")}
           name="storage_payable"
         >
-          <CurrencyInput disabled={jobRO} />
+          <CurrencyInput disabled={jobRO} min={0} />
         </Form.Item>
         <Form.Item
           label={t("jobs.fields.adjustment_bottom_line")}
@@ -83,7 +84,7 @@ export function JobsDetailRates({ jobRO, form, job, bodyshop }) {
         </Form.Item>
         <Space align="end">
           <Form.Item label={t("jobs.fields.ca_bc_pvrt")} name="ca_bc_pvrt">
-            <CurrencyInput disabled={jobRO} />
+            <CurrencyInput disabled={jobRO} min={0} />
           </Form.Item>
           <CABCpvrtCalculator form={form} disabled={jobRO} />
         </Space>
@@ -123,7 +124,6 @@ export function JobsDetailRates({ jobRO, form, job, bodyshop }) {
         {t("jobs.forms.laborrates")}
       </Divider>
       <Space>
-        <div></div>
         <JobsDetailRatesChangeButton form={form} disabled={jobRO} />
         <JobsMarkPstExempt form={form} />
       </Space>
@@ -135,72 +135,72 @@ export function JobsDetailRates({ jobRO, form, job, bodyshop }) {
           <Input disabled={jobRO} />
         </Form.Item>
         <Form.Item label={t("jobs.fields.rate_laa")} name="rate_laa">
-          <CurrencyInput disabled={jobRO} />
+          <CurrencyInput min={0} disabled={jobRO} />
         </Form.Item>
         <Form.Item label={t("jobs.fields.rate_lab")} name="rate_lab">
-          <CurrencyInput disabled={jobRO} />
+          <CurrencyInput min={0} disabled={jobRO} />
         </Form.Item>
         <Form.Item label={t("jobs.fields.rate_lad")} name="rate_lad">
-          <CurrencyInput disabled={jobRO} />
+          <CurrencyInput min={0} disabled={jobRO} />
         </Form.Item>
         <Form.Item label={t("jobs.fields.rate_lae")} name="rate_lae">
-          <CurrencyInput disabled={jobRO} />
+          <CurrencyInput min={0} disabled={jobRO} />
         </Form.Item>
         <Form.Item label={t("jobs.fields.rate_lar")} name="rate_lar">
-          <CurrencyInput disabled={jobRO} />
+          <CurrencyInput min={0} disabled={jobRO} />
         </Form.Item>
         <Form.Item label={t("jobs.fields.rate_las")} name="rate_las">
-          <CurrencyInput disabled={jobRO} />
+          <CurrencyInput min={0} disabled={jobRO} />
         </Form.Item>
         <Form.Item label={t("jobs.fields.rate_laf")} name="rate_laf">
-          <CurrencyInput disabled={jobRO} />
+          <CurrencyInput min={0} disabled={jobRO} />
         </Form.Item>
         <Form.Item label={t("jobs.fields.rate_lam")} name="rate_lam">
-          <CurrencyInput disabled={jobRO} />
+          <CurrencyInput min={0} disabled={jobRO} />
         </Form.Item>
         <Form.Item label={t("jobs.fields.rate_lag")} name="rate_lag">
-          <CurrencyInput disabled={jobRO} />
+          <CurrencyInput min={0} disabled={jobRO} />
         </Form.Item>
         <Form.Item label={t("jobs.fields.rate_la1")} name="rate_la1">
-          <CurrencyInput disabled={jobRO} />
+          <CurrencyInput min={0} disabled={jobRO} />
         </Form.Item>
         <Form.Item label={t("jobs.fields.rate_la2")} name="rate_la2">
-          <CurrencyInput disabled={jobRO} />
+          <CurrencyInput min={0} disabled={jobRO} />
         </Form.Item>
         <Form.Item label={t("jobs.fields.rate_la3")} name="rate_la3">
-          <CurrencyInput disabled={jobRO} />
+          <CurrencyInput min={0} disabled={jobRO} />
         </Form.Item>
         <Form.Item label={t("jobs.fields.rate_la4")} name="rate_la4">
-          <CurrencyInput disabled={jobRO} />
+          <CurrencyInput min={0} disabled={jobRO} />
         </Form.Item>
         <Form.Item label={t("jobs.fields.rate_lau")} name="rate_lau">
-          <CurrencyInput disabled={jobRO} />
+          <CurrencyInput min={0} disabled={jobRO} />
         </Form.Item>
         <Form.Item label={t("jobs.fields.rate_mapa")} name="rate_mapa">
-          <CurrencyInput disabled={jobRO} />
+          <CurrencyInput min={0} disabled={jobRO} />
         </Form.Item>
         <Form.Item label={t("jobs.fields.rate_mash")} name="rate_mash">
-          <CurrencyInput disabled={jobRO} />
+          <CurrencyInput min={0} disabled={jobRO} />
         </Form.Item>
         <Form.Item label={t("jobs.fields.rate_mahw")} name="rate_mahw">
-          <CurrencyInput disabled={jobRO} />
+          <CurrencyInput min={0} disabled={jobRO} />
         </Form.Item>
         <Form.Item label={t("jobs.fields.rate_ma2s")} name="rate_ma2s">
-          <CurrencyInput disabled={jobRO} />
+          <CurrencyInput min={0} disabled={jobRO} />
         </Form.Item>
         <Form.Item label={t("jobs.fields.rate_ma3s")} name="rate_ma3s">
-          <CurrencyInput disabled={jobRO} />
+          <CurrencyInput min={0} disabled={jobRO} />
         </Form.Item>
         {
           // <Form.Item label={t("jobs.fields.rate_mabl")} name="rate_mabl">
-          //   <CurrencyInput disabled={jobRO} />
+          //   <CurrencyInput  min={0}disabled={jobRO} />
           // </Form.Item>
           // <Form.Item label={t("jobs.fields.rate_macs")} name="rate_macs">
-          //   <CurrencyInput disabled={jobRO} />
+          //   <CurrencyInput  min={0}disabled={jobRO} />
           // </Form.Item>
         }
         <Form.Item label={t("jobs.fields.rate_matd")} name="rate_matd">
-          <CurrencyInput disabled={jobRO} />
+          <CurrencyInput min={0} disabled={jobRO} />
         </Form.Item>
       </FormRow>
       <JobsDetailRatesParts form={form} />

client/src/components/jobs-documents-gallery/jobs-documents-gallery.component.jsx

@@ -29,20 +29,6 @@ function JobsDocumentsComponent({
     setIndex(index);
   };
 
-  // useEffect(() => {
-  //   console.log("Added event listening for reteching.");
-  //   window.addEventListener("storage", (ev) => {
-  //     if (ev.key === "refetch" && ev.newValue === true) {
-  //       refetch && refetch();
-  //       localStorage.setItem("refetch", false);
-  //     }
-  //   });
-
-  //   return () => {
-  //     window.removeEventListener("storage");
-  //   };
-  // }, [refetch]);
-
   useEffect(() => {
     let documents = data.reduce(
       (acc, value) => {

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

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

@@ -69,6 +69,20 @@ export default function JobsFindModalComponent({
         );
       },
     },
+    {
+      title: t("jobs.fields.ownr_ph2"),
+      dataIndex: "ownr_ph2",
+      key: "ownr_ph2",
+      width: "12%",
+      ellipsis: true,
+      render: (text, record) => {
+        return record.ownr_ph2 ? (
+          <PhoneFormatter>{record.ownr_ph2}</PhoneFormatter>
+        ) : (
+          t("general.labels.unknown")
+        );
+      },
+    },
     {
       title: t("jobs.fields.status"),
       dataIndex: "status",

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

@@ -73,6 +73,16 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
         <StartChatButton phone={record.ownr_ph1} jobid={record.id} />
       ),
     },
+    {
+      title: t("jobs.fields.ownr_ph2"),
+      dataIndex: "ownr_ph2",
+      key: "ownr_ph2",
+      width: "12%",
+      ellipsis: true,
+      render: (text, record) => (
+        <StartChatButton phone={record.ownr_ph2} jobid={record.id} />
+      ),
+    },
     {
       title: t("jobs.fields.status"),
       dataIndex: "status",
@@ -130,13 +140,10 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
       ellipsis: true,
       sorter: true, //(a, b) => alphaSort(a.clm_no, b.clm_no),
       sortOrder: sortcolumn === "clm_no" && sortorder,
-      render: (text, record) => {
-        return record.clm_no ? (
-          <span>{record.clm_no}</span>
-        ) : (
-          t("general.labels.unknown")
-        );
-      },
+      render: (text, record) =>
+        `${record.clm_no || ""}${
+          record.po_number ? ` (PO: ${record.po_number})` : ""
+        }`,
     },
     {
       title: t("jobs.fields.ins_co_nm"),

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

@@ -145,6 +145,16 @@ export function JobsList({ bodyshop }) {
         <ChatOpenButton phone={record.ownr_ph1} jobid={record.id} />
       ),
     },
+    {
+      title: t("jobs.fields.ownr_ph2"),
+      dataIndex: "ownr_ph2",
+      key: "ownr_ph2",
+      ellipsis: true,
+      responsive: ["md"],
+      render: (text, record) => (
+        <ChatOpenButton phone={record.ownr_ph2} jobid={record.id} />
+      ),
+    },
 
     {
       title: t("jobs.fields.status"),
@@ -208,6 +218,10 @@ export function JobsList({ bodyshop }) {
       sorter: (a, b) => alphaSort(a.clm_no, b.clm_no),
       sortOrder:
         state.sortedInfo.columnKey === "clm_no" && state.sortedInfo.order,
+      render: (text, record) =>
+        `${record.clm_no || ""}${
+          record.po_number ? ` (PO: ${record.po_number})` : ""
+        }`,
     },
     {
       title: t("jobs.fields.ins_co_nm"),

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

@@ -3,15 +3,28 @@ import { notification } from "antd";
 import React, { useState } from "react";
 //import SpinComponent from "../../components/loading-spinner/loading-spinner.component";
 import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
 import AlertComponent from "../../components/alert/alert.component";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import {
   DELETE_NOTE,
   QUERY_NOTES_BY_JOB_PK,
 } from "../../graphql/notes.queries";
+import { insertAuditTrail } from "../../redux/application/application.actions";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import JobNotesComponent from "./jobs.notes.component";
 
-export default function JobNotesContainer({ jobId }) {
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+});
+const mapDispatchToProps = (dispatch) => ({
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
+});
+export default connect(mapStateToProps, mapDispatchToProps)(JobNotesContainer);
+
+export function JobNotesContainer({ jobId, insertAuditTrail }) {
   const { loading, error, data, refetch } = useQuery(QUERY_NOTES_BY_JOB_PK, {
     variables: { id: jobId },
     fetchPolicy: "network-only",
@@ -32,6 +45,10 @@ export default function JobNotesContainer({ jobId }) {
       notification["success"]({
         message: t("notes.successes.deleted"),
       });
+      insertAuditTrail({
+        jobid: jobId,
+        operation: AuditTrailMapping.jobnotedeleted(),
+      });
     });
     setDeleteLoading(false);
   };
@@ -46,6 +63,7 @@ export default function JobNotesContainer({ jobId }) {
       refetch={refetch}
       deleteLoading={deleteLoading}
       handleNoteDelete={handleNoteDelete}
+      ro_number={data ? data.jobs_by_pk.ro_number : null}
     />
   );
 }

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

@@ -13,7 +13,9 @@ import { createStructuredSelector } from "reselect";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
+import { TemplateList } from "../../utils/TemplateConstants";
 import NoteUpsertModal from "../note-upsert-modal/note-upsert-modal.container";
+import PrintWrapperComponent from "../print-wrapper/print-wrapper.component";
 
 const mapStateToProps = createStructuredSelector({
   jobRO: selectJobReadOnly,
@@ -33,8 +35,12 @@ export function JobNotesComponent({
   jobId,
   setNoteUpsertContext,
   deleteLoading,
+  ro_number,
 }) {
   const { t } = useTranslation();
+  const Templates = TemplateList("job_special", {
+    ro_number,
+  });
 
   const columns = [
     {
@@ -107,6 +113,18 @@ export function JobNotesComponent({
           >
             <EditFilled />
           </Button>
+          <PrintWrapperComponent
+            emailOnly
+            templateObject={{
+              name: Templates.individual_job_note.key,
+
+              variables: { id: record.id },
+            }}
+            messageObject={{
+              subject: Templates.individual_job_note.subject,
+            }}
+            id={record.id}
+          />
         </Space>
       ),
     },

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

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

client/src/components/owner-detail-form/owner-detail-form.component.jsx

@@ -81,6 +81,16 @@ export default function OwnerDetailFormComponent({ form, loading }) {
         >
           <FormItemPhone />
         </Form.Item>
+        <Form.Item
+          label={t("owners.fields.ownr_ph2")}
+          name="ownr_ph2"
+          rules={[
+            ({ getFieldValue }) =>
+              PhoneItemFormatterValidation(getFieldValue, "ownr_ph2"),
+          ]}
+        >
+          <FormItemPhone />
+        </Form.Item>
         <Form.Item
           label={t("owners.fields.preferred_contact")}
           name="preferred_contact"

client/src/components/owner-find-modal/owner-find-modal.component.jsx

@@ -51,6 +51,14 @@ export default function OwnerFindModalComponent({
         <PhoneFormatter>{record.ownr_ph1}</PhoneFormatter>
       ),
     },
+    {
+      title: t("owners.fields.ownr_ph2"),
+      dataIndex: "ownr_ph2",
+      key: "ownr_ph2",
+      render: (text, record) => (
+        <PhoneFormatter>{record.ownr_ph2}</PhoneFormatter>
+      ),
+    },
   ];
 
   const handleOnRowClick = (record) => {
@@ -66,7 +74,6 @@ export default function OwnerFindModalComponent({
   return (
     <div>
       <Table
-        title={() => t("owners.labels.existing_owners")}
         pagination={{ position: "bottom" }}
         columns={columns}
         rowKey="id"

client/src/components/owner-find-modal/owner-find-modal.container.jsx

@@ -1,6 +1,6 @@
-import { Modal } from "antd";
-import React from "react";
-import { useQuery } from "@apollo/client";
+import { useLazyQuery } from "@apollo/client";
+import { Input, Modal } from "antd";
+import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { QUERY_SEARCH_OWNER_BY_IDX } from "../../graphql/owners.queries";
 import AlertComponent from "../alert/alert.component";
@@ -17,14 +17,27 @@ export default function OwnerFindModalContainer({
 }) {
   //use owner object to run query and find what possible owners there are.
   const { t } = useTranslation();
+  const [searchText, setSearchText] = useState(null);
 
-  const ownersList = useQuery(QUERY_SEARCH_OWNER_BY_IDX, {
-    variables: {
-      search: owner ? `${owner.ownr_fn || ""} ${owner.ownr_ln || ""}` : null,
-    },
-    skip: !owner,
-    fetchPolicy: "network-only",
-  });
+  const [callSearchowners, ownersList] = useLazyQuery(
+    QUERY_SEARCH_OWNER_BY_IDX,
+    {
+      variables: {
+        search: searchText,
+      },
+    }
+  );
+
+  useEffect(() => {
+    if (modalProps.visible && owner) {
+      const s = `${owner.ownr_fn || ""} ${owner.ownr_ln || ""} ${
+        owner.ownr_co_nm || ""
+      }`;
+
+      setSearchText(s.trim());
+      callSearchowners({ variables: { search: s.trim() } });
+    }
+  }, [callSearchowners, modalProps.visible, owner]);
 
   return (
     <Modal
@@ -35,16 +48,25 @@ export default function OwnerFindModalContainer({
       {loading ? <LoadingSpinner /> : null}
       {error ? <AlertComponent message={error.message} type="error" /> : null}
       {owner ? (
-        <OwnerFindModalComponent
-          selectedOwner={selectedOwner}
-          setSelectedOwner={setSelectedOwner}
-          ownersListLoading={ownersList.loading}
-          ownersList={
-            ownersList.data && ownersList.data.search_owners
-              ? ownersList.data.search_owners
-              : null
-          }
-        />
+        <>
+          <Input.Search
+            value={searchText}
+            onChange={(e) => setSearchText(e.target.value)}
+            onSearch={(val) =>
+              callSearchowners({ variables: { search: val.trim() } })
+            }
+          />
+          <OwnerFindModalComponent
+            selectedOwner={selectedOwner}
+            setSelectedOwner={setSelectedOwner}
+            ownersListLoading={ownersList.loading}
+            ownersList={
+              ownersList.data && ownersList.data.search_owners
+                ? ownersList.data.search_owners
+                : null
+            }
+          />
+        </>
       ) : null}
     </Modal>
   );

client/src/components/owner-tag-popover/owner-tag-popover.component.jsx

@@ -16,6 +16,9 @@ export default function OwnerTagPopoverComponent({ job }) {
             <Descriptions.Item key="2" label={t("jobs.fields.ownr_ph1")}>
               <PhoneFormatter>{job.ownr_ph1 || ""}</PhoneFormatter>
             </Descriptions.Item>
+            <Descriptions.Item key="22" label={t("jobs.fields.ownr_ph2")}>
+              <PhoneFormatter>{job.ownr_ph2 || ""}</PhoneFormatter>
+            </Descriptions.Item>
             <Descriptions.Item key="3" label={t("owners.fields.address")}>
               {`${job.ownr_addr1 || ""} ${job.ownr_addr2 || ""} ${
                 job.ownr_city || ""
@@ -36,6 +39,12 @@ export default function OwnerTagPopoverComponent({ job }) {
             <Descriptions.Item key="2" label={t("jobs.fields.ownr_ph1")}>
               <PhoneFormatter>{job.owner.ownr_ph1 || ""}</PhoneFormatter>
             </Descriptions.Item>
+            <Descriptions.Item key="22" label={t("jobs.fields.ownr_ph2")}>
+              <PhoneFormatter>{job.owner.ownr_ph2 || ""}</PhoneFormatter>
+            </Descriptions.Item>
+            <Descriptions.Item key="2" label={t("jobs.fields.ownr_ph2")}>
+              <PhoneFormatter>{job.owner.ownr_ph2 || ""}</PhoneFormatter>
+            </Descriptions.Item>
             <Descriptions.Item key="3" label={t("owners.fields.address")}>
               {`${job.owner.ownr_addr1 || ""} ${job.owner.ownr_addr2 || ""} ${
                 job.owner.ownr_city || ""

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

@@ -47,6 +47,14 @@ export default function OwnersListComponent({
         return <PhoneFormatter>{record.ownr_ph1}</PhoneFormatter>;
       },
     },
+    {
+      title: t("owners.fields.ownr_ph2"),
+      dataIndex: "ownr_ph2",
+      key: "ownr_ph2",
+      render: (text, record) => {
+        return <PhoneFormatter>{record.ownr_ph2}</PhoneFormatter>;
+      },
+    },
     {
       title: t("owners.fields.ownr_ea"),
       dataIndex: "ownr_ea",

client/src/components/parts-order-list-table/parts-order-list-table.component.jsx

@@ -27,6 +27,7 @@ import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter } from "../../utils/DateFormatter";
 import { alphaSort } from "../../utils/sorters";
 import { TemplateList } from "../../utils/TemplateConstants";
+import DataLabel from "../data-label/data-label.component";
 import PartsOrderBackorderEta from "../parts-order-backorder-eta/parts-order-backorder-eta.component";
 import PartsOrderLineBackorderButton from "../parts-order-line-backorder-button/parts-order-line-backorder-button.component";
 import PartsReceiveModalContainer from "../parts-receive-modal/parts-receive-modal.container";
@@ -118,7 +119,7 @@ export function PartsOrderListTableComponent({
       </Button>
       <Popconfirm
         title={t("parts_orders.labels.confirmdelete")}
-        disabled={jobRO || !record.return}
+        disabled={jobRO}
         onConfirm={async () => {
           //Delete the parts return.!
 
@@ -138,7 +139,7 @@ export function PartsOrderListTableComponent({
           });
         }}
       >
-        <Button disabled={jobRO || !record.return}>
+        <Button disabled={jobRO}>
           <DeleteFilled />
         </Button>
       </Popconfirm>
@@ -379,6 +380,9 @@ export function PartsOrderListTableComponent({
           rowKey="id"
           dataSource={record.parts_order_lines}
         />
+        <DataLabel label={t("parts_orders.fields.comments")}>
+          <div style={{ whiteSpace: "pre" }}>{record.comments}</div>
+        </DataLabel>
       </div>
     );
   };

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

@@ -73,7 +73,7 @@ export default function PartsOrderModalComponent({
                 <Form.Item required={false} key={field.key}>
                   <LayoutFormRow grow noDivider>
                     <Form.Item
-                      span={8}
+                      //span={8}
                       label={t("parts_orders.fields.line_desc")}
                       key={`${index}line_desc`}
                       name={[field.name, "line_desc"]}
@@ -132,19 +132,21 @@ export default function PartsOrderModalComponent({
                       </Form.Item>
                     )}
 
-                    <div>
-                      <DeleteFilled
-                        style={{ margin: "1rem" }}
-                        onClick={() => {
-                          remove(field.name);
-                        }}
-                      />
+                    <Space wrap align="center">
+                      <div>
+                        <DeleteFilled
+                          style={{ margin: "1rem" }}
+                          onClick={() => {
+                            remove(field.name);
+                          }}
+                        />
+                      </div>
                       <FormListMoveArrows
                         move={move}
                         index={index}
                         total={fields.length}
                       />
-                    </div>
+                    </Space>
                   </LayoutFormRow>
                 </Form.Item>
               ))}
@@ -152,6 +154,9 @@ export default function PartsOrderModalComponent({
           );
         }}
       </Form.List>
+      <Form.Item name="comments" label={t("parts_orders.fields.comments")}>
+        <Input.TextArea rows={3} />
+      </Form.Item>
       <Radio.Group
         defaultValue={sendType}
         onChange={(e) => setSendType(e.target.value)}

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

@@ -176,7 +176,7 @@ export function PartsOrderModalContainer({
 
     if (refetch) refetch();
     toggleModalVisible();
-    const Templates = TemplateList("partsorder");
+    const Templates = TemplateList("partsorder", context);
 
     if (sendType === "e") {
       const matchingVendor = data.vendors.filter(
@@ -260,7 +260,7 @@ export function PartsOrderModalContainer({
       onCancel={() => toggleModalVisible()}
       onOk={() => form.submit()}
       destroyOnClose
-      width="50%"
+      width="75%"
       forceRender
     >
       {error ? <AlertComponent message={error.message} type="error" /> : null}

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

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

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

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

@@ -8,6 +8,7 @@ import { createStructuredSelector } from "reselect";
 import { auth, logImEXEvent } from "../../firebase/firebase.utils";
 import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
 import { UPDATE_PAYMENTS } from "../../graphql/payments.queries";
+
 import {
   selectBodyshop,
   selectCurrentUser,
@@ -33,55 +34,63 @@ export function PaymentExportButton({
 
   const handleQbxml = async () => {
     logImEXEvent("accounting_payment_export");
-
     setLoading(true);
-    if (!!loadingCallback) loadingCallback(true);
-
-    let QbXmlResponse;
-    try {
-      QbXmlResponse = await axios.post(
-        "/accounting/qbxml/payments",
-        { payments: [paymentId] },
-        {
-          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("payments.errors.exporting", {
-          error: "Unable to retrieve QBXML. " + JSON.stringify(error.message),
-        }),
-      });
-      if (loadingCallback) loadingCallback(false);
-      setLoading(false);
-      return;
-    }
-
+    //Check if it's a QBO Setup.
     let PartnerResponse;
-
-    try {
-      PartnerResponse = await axios.post(
-        "http://localhost:1337/qb/",
-        //"http://609feaeae986.ngrok.io/qb/",
-        QbXmlResponse.data
-      );
-    } catch (error) {
-      console.log("Error connecting to quickbooks or partner.", error);
-      notification["error"]({
-        message: t("payments.errors.exporting-partner"),
+    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
+      PartnerResponse = await axios.post(`/qbo/payments`, {
+        payments: [paymentId],
       });
-      if (!!loadingCallback) loadingCallback(false);
-      setLoading(false);
-      return;
+    } else {
+      //Default is QBD
+
+      if (!!loadingCallback) loadingCallback(true);
+
+      let QbXmlResponse;
+      try {
+        QbXmlResponse = await axios.post(
+          "/accounting/qbxml/payments",
+          { payments: [paymentId] },
+          {
+            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("payments.errors.exporting", {
+            error: "Unable to retrieve QBXML. " + JSON.stringify(error.message),
+          }),
+        });
+        if (loadingCallback) loadingCallback(false);
+        setLoading(false);
+        return;
+      }
+
+      try {
+        PartnerResponse = await axios.post(
+          "http://localhost:1337/qb/",
+          QbXmlResponse.data
+        );
+      } catch (error) {
+        console.log("Error connecting to quickbooks or partner.", error);
+        notification["error"]({
+          message: t("payments.errors.exporting-partner"),
+        });
+        if (!!loadingCallback) loadingCallback(false);
+        setLoading(false);
+        return;
+      }
     }
 
     console.log("handleQbxml -> PartnerResponse", PartnerResponse);
     const failedTransactions = PartnerResponse.data.filter((r) => !r.success);
-
+    const successfulTransactions = PartnerResponse.data.filter(
+      (r) => r.success
+    );
     if (failedTransactions.length > 0) {
       //Uh oh. At least one was no good.
       failedTransactions.map((ft) =>
@@ -123,7 +132,14 @@ export function PaymentExportButton({
 
       const paymentUpdateResponse = await updatePayment({
         variables: {
-          paymentIdList: [paymentId],
+          paymentIdList: successfulTransactions.map(
+            (st) =>
+              st[
+                bodyshop.accountingconfig && bodyshop.accountingconfig.qbo
+                  ? "paymentid"
+                  : "id"
+              ]
+          ),
           payment: {
             exportedat: new Date(),
           },
@@ -155,12 +171,7 @@ export function PaymentExportButton({
   };
 
   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/payments-export-all-button/payments-export-all-button.component.jsx

@@ -8,6 +8,7 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
 import { UPDATE_PAYMENTS } from "../../graphql/payments.queries";
+
 import {
   selectBodyshop,
   selectCurrentUser,
@@ -33,42 +34,49 @@ export function PaymentsExportAllButton({
   const handleQbxml = async () => {
     setLoading(true);
     if (!!loadingCallback) loadingCallback(true);
-
-    let QbXmlResponse;
-    try {
-      QbXmlResponse = await axios.post("/accounting/qbxml/payments", {
+    let PartnerResponse;
+    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
+      PartnerResponse = await axios.post(`/qbo/payments`, {
         payments: paymentIds,
       });
-    } catch (error) {
-      console.log("Error getting QBXML from Server.", error);
-      notification["error"]({
-        message: t("payments.errors.exporting", {
-          error: "Unable to retrieve QBXML. " + JSON.stringify(error.message),
-        }),
-      });
-      if (loadingCallback) loadingCallback(false);
-      setLoading(false);
-      return;
+    } else {
+      let QbXmlResponse;
+      try {
+        QbXmlResponse = await axios.post("/accounting/qbxml/payments", {
+          payments: paymentIds,
+        });
+      } catch (error) {
+        console.log("Error getting QBXML from Server.", error);
+        notification["error"]({
+          message: t("payments.errors.exporting", {
+            error: "Unable to retrieve QBXML. " + JSON.stringify(error.message),
+          }),
+        });
+        if (loadingCallback) loadingCallback(false);
+        setLoading(false);
+        return;
+      }
+
+      try {
+        PartnerResponse = await axios.post(
+          "http://localhost:1337/qb/",
+          QbXmlResponse.data
+        );
+      } catch (error) {
+        console.log("Error connecting to quickbooks or partner.", error);
+        notification["error"]({
+          message: t("payments.errors.exporting-partner"),
+        });
+        if (!!loadingCallback) loadingCallback(false);
+        setLoading(false);
+        return;
+      }
     }
 
-    let PartnerResponse;
-
-    try {
-      PartnerResponse = await axios.post(
-        "http://localhost:1337/qb/",
-        QbXmlResponse.data
-      );
-    } catch (error) {
-      console.log("Error connecting to quickbooks or partner.", error);
-      notification["error"]({
-        message: t("payments.errors.exporting-partner"),
-      });
-      if (!!loadingCallback) loadingCallback(false);
-      setLoading(false);
-      return;
-    }
-
-    const groupedData = _.groupBy(PartnerResponse.data, "id");
+    const groupedData = _.groupBy(
+      PartnerResponse.data,
+      bodyshop.accountingconfig.qbo ? "paymentid" : "id"
+    );
     const proms = [];
     Object.keys(groupedData).forEach((key) => {
       proms.push(
@@ -144,12 +152,7 @@ export function PaymentsExportAllButton({
   };
 
   return (
-    <Button
-      onClick={handleQbxml}
-      loading={loading}
-      disabled={disabled}
-      type="dashed"
-    >
+    <Button onClick={handleQbxml} loading={loading} disabled={disabled}>
       {t("jobs.actions.exportselected")}
     </Button>
   );

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

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

client/src/components/print-wrapper/print-wrapper.component.jsx

@@ -8,6 +8,7 @@ export default function PrintWrapperComponent({
   messageObject = {},
   children,
   id,
+  emailOnly = false,
 }) {
   const [loading, setLoading] = useState(false);
   const handlePrint = async (type) => {
@@ -19,7 +20,7 @@ export default function PrintWrapperComponent({
   return (
     <Space>
       {children || null}
-      <PrinterFilled onClick={() => handlePrint("p")} />
+      {!emailOnly && <PrinterFilled onClick={() => handlePrint("p")} />}
       <MailFilled onClick={() => handlePrint("e")} />
       {loading && <Spin />}
     </Space>

client/src/components/production-board-filters/production-board-filters.component.jsx

@@ -1,4 +1,4 @@
-import { Input, PageHeader, Space, Spin } from "antd";
+import { Input, Space, Spin } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -26,8 +26,7 @@ export function ProductionBoardFilters({
   const { t } = useTranslation();
 
   return (
-    <PageHeader
-      extra={
+
         <Space wrap>
           {loading && <Spin />}
           <Input.Search
@@ -38,6 +37,7 @@ export function ProductionBoardFilters({
             }}
           />
           <EmployeeSearchSelectComponent
+            style={{ minWidth: "20rem" }}
             options={bodyshop.employees.filter((e) => e.active)}
             value={filter.employeeId}
             placeholder={t("production.labels.employeesearch")}
@@ -45,7 +45,6 @@ export function ProductionBoardFilters({
             allowClear
           />
         </Space>
-      }
-    ></PageHeader>
+
   );
 }

client/src/components/production-board-kanban-card/production-board-kanban-card.component.jsx

@@ -1,106 +1,171 @@
+import { CalendarOutlined, EyeFilled } from "@ant-design/icons";
+import { Card, Col, Row, Space } from "antd";
 import React from "react";
-import { Card, Row, Col, Dropdown } from "antd";
+import { useTranslation } from "react-i18next";
+import { Link } from "react-router-dom";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
 import ProductionAlert from "../production-list-columns/production-list-columns.alert.component";
-import { EyeFilled } from "@ant-design/icons";
-import { Link } from "react-router-dom";
-import "./production-board-card.styles.scss";
-import ProductionRemoveButton from "../production-remove-button/production-remove-button.component";
-import { useTranslation } from "react-i18next";
-import ProductionSubletsManageComponent from "../production-sublets-manage/production-sublets-manage.component";
 import ProductionListColumnProductionNote from "../production-list-columns/production-list-columns.productionnote.component";
+import ProductionSubletsManageComponent from "../production-sublets-manage/production-sublets-manage.component";
+import "./production-board-card.styles.scss";
 
-export default function ProductionBoardCard(technician, card) {
+export default function ProductionBoardCard(
+  technician,
+  card,
+  bodyshop,
+  cardSettings
+) {
   const { t } = useTranslation();
-  const menu = (
-    <div>
-      <Card title={t("general.labels.actions")}>
-        <ProductionRemoveButton jobId={card.id} />
-      </Card>
-    </div>
-  );
+
+  let employee_body, employee_prep, employee_refinish; //employee_csr;
+  if (card.employee_body) {
+    employee_body = bodyshop.employees.find((e) => e.id === card.employee_body);
+  }
+  if (card.employee_prep) {
+    employee_prep = bodyshop.employees.find((e) => e.id === card.employee_prep);
+  }
+  if (card.employee_refinish) {
+    employee_refinish = bodyshop.employees.find(
+      (e) => e.id === card.employee_refinish
+    );
+  }
+  // if (card.employee_csr) {
+  //   employee_csr = bodyshop.employees.find((e) => e.id === card.employee_csr);
+  // }
 
   return (
-    <Dropdown overlay={menu} trigger={["contextMenu"]}>
-      <Card
-        className="react-kanban-card imex-kanban-card tight-antd-rows"
-        //style={{ margin: ".2rem 0rem" }}
-        title={`${card.ro_number || t("general.labels.na")} - ${
-          card.v_model_yr
-        } ${card.v_make_desc || ""} ${card.v_model_desc || ""}`}
-      >
-        <Row>
+    <Card
+      className="react-kanban-card imex-kanban-card"
+      size="small"
+      title={
+        <Space>
+          <ProductionAlert record={card} key="alert" />
+          <span style={{ fontWeight: "bolder" }}>
+            {card.ro_number || t("general.labels.na")}
+          </span>
+        </Space>
+      }
+      extra={
+        technician ? (
+          <Link to={`/tech/joblookup?selected=${card.id}`}>
+            <EyeFilled />
+          </Link>
+        ) : (
+          <Link to={`/manage/jobs/${card.id}`}>
+            <EyeFilled />
+          </Link>
+        )
+      }
+    >
+      <Row>
+        {cardSettings && cardSettings.ownr_nm && (
           <Col span={24}>
-            <div className="ellipses">{`${card.ownr_fn || ""} ${
-              card.ownr_ln || ""
-            } ${card.ownr_co_nm || ""}`}</div>
+            {cardSettings && cardSettings.compact ? (
+              <div className="ellipses">{`${card.ownr_ln || ""} ${
+                card.ownr_co_nm || ""
+              }`}</div>
+            ) : (
+              <div className="ellipses">{`${card.ownr_ln || ""}, ${
+                card.ownr_fn || ""
+              } ${card.ownr_co_nm || ""}`}</div>
+            )}
           </Col>
-        </Row>
-        <Row>
-          <Col span={12}>
-            <div className="ellipses">{card.clm_no || ""}</div>
-          </Col>
-          <Col span={12}>
+        )}
+        <Col span={24}>
+          <div className="ellipses">{`${card.v_model_yr || ""} ${
+            card.v_make_desc || ""
+          } ${card.v_model_desc || ""}`}</div>
+        </Col>
+        {cardSettings && cardSettings.ins_co_nm && card.ins_co_nm && (
+          <Col span={cardSettings && cardSettings.compact ? 24 : 12}>
             <div className="ellipses">{card.ins_co_nm || ""}</div>
           </Col>
-        </Row>
-        <Row>
+        )}
+        {cardSettings && cardSettings.clm_no && card.clm_no && (
+          <Col span={cardSettings && cardSettings.compact ? 24 : 12}>
+            <div className="ellipses">{card.clm_no || ""}</div>
+          </Col>
+        )}
+
+        {cardSettings && cardSettings.employeeassignments && (
           <Col span={24}>
-            <div className="imex-flex-row imex-flex-row__flex-space-around">
-              <div className="mex-flex-row__margin">
-                <div>{`B: ${card.labhrs.aggregate.sum.mod_lb_hrs || "?"}`}</div>
-                <div>{`R: ${card.larhrs.aggregate.sum.mod_lb_hrs || "?"}`}</div>
-              </div>
-              <div className="mex-flex-row__margin">
-                <div>{`B: ${
-                  card.employee_body_rel
-                    ? `${card.employee_body_rel.first_name} ${card.employee_body_rel.last_name}`
-                    : ""
-                }`}</div>
-                <div>{`P: ${
-                  card.employee_prep_rel
-                    ? `${card.employee_prep_rel.first_name} ${card.employee_prep_rel.last_name}`
-                    : ""
-                }`}</div>
-                <div>{`R: ${
-                  card.employee_refinish_rel
-                    ? `${card.employee_refinish_rel.first_name} ${card.employee_refinish_rel.last_name}`
-                    : ""
-                }`}</div>
-                <div>{`CSR: ${
-                  card.employee_csr_rel
-                    ? `${card.employee_csr_rel.first_name} ${card.employee_csr_rel.last_name}`
-                    : ""
-                }`}</div>
-              </div>
-            </div>
+            <Row>
+              <Col span={cardSettings && cardSettings.compact ? 24 : 12}>{`B: ${
+                employee_body
+                  ? `${employee_body.first_name.substr(
+                      0,
+                      3
+                    )} ${employee_body.last_name.charAt(0)}`
+                  : ""
+              } ${card.labhrs.aggregate.sum.mod_lb_hrs || "?"}h`}</Col>
+              <Col span={cardSettings && cardSettings.compact ? 24 : 12}>{`P: ${
+                employee_prep
+                  ? `${employee_prep.first_name.substr(
+                      0,
+                      3
+                    )} ${employee_prep.last_name.charAt(0)}`
+                  : ""
+              }`}</Col>
+              <Col span={cardSettings && cardSettings.compact ? 24 : 12}>{`R: ${
+                employee_refinish
+                  ? `${employee_refinish.first_name.substr(
+                      0,
+                      3
+                    )} ${employee_refinish.last_name.charAt(0)}`
+                  : ""
+              } ${card.larhrs.aggregate.sum.mod_lb_hrs || "?"}h`}</Col>
+              {/* <Col span={cardSettings && cardSettings.compact ? 24 : 12}>{`C: ${
+                employee_csr
+                  ? `${employee_csr.first_name} ${employee_csr.last_name}`
+                  : ""
+              }`}</Col> */}
+            </Row>
           </Col>
-        </Row>
-        <Row>
-          <Col span={18}>
-            <DateTimeFormatter>{card.scheduled_completion}</DateTimeFormatter>
+        )}
+        {/* {cardSettings && cardSettings.laborhrs && (
+          <Col span={24}>
+            <Row>
+              <Col span={cardSettings && cardSettings.compact ? 24 : 12}>{`B: ${
+                card.labhrs.aggregate.sum.mod_lb_hrs || "?"
+              } hrs`}</Col>
+              <Col span={cardSettings && cardSettings.compact ? 24 : 12}>{`R: ${
+                card.larhrs.aggregate.sum.mod_lb_hrs || "?"
+              } hrs`}</Col>
+            </Row>
           </Col>
-          <Col span={6}>
+        )} */}
+        {cardSettings &&
+          cardSettings.scheduled_completion &&
+          card.scheduled_completion && (
+            <Col span={cardSettings && cardSettings.compact ? 24 : 12}>
+              <Space>
+                <CalendarOutlined />
+                <DateTimeFormatter format="MM/DD">
+                  {card.scheduled_completion}
+                </DateTimeFormatter>
+              </Space>
+            </Col>
+          )}
+        {cardSettings && cardSettings.ats && card.alt_transport && (
+          <Col span={12}>
             <div>{card.alt_transport || ""}</div>
           </Col>
-        </Row>
-        <div>
-          <ProductionListColumnProductionNote record={card} />
-        </div>
-        <div className="imex-flex-row imex-flex-row__flex-space-around">
-          <ProductionAlert record={card} key="alert" />
-          <ProductionSubletsManageComponent subletJobLines={card.subletLines} />
-          {technician ? (
-            <Link to={`/tech/joblookup?selected=${card.id}`}>
-              <EyeFilled />
-            </Link>
-          ) : (
-            <Link to={`/manage/jobs/${card.id}`}>
-              <EyeFilled />
-            </Link>
-          )}
-        </div>
-      </Card>
-    </Dropdown>
+        )}
+        {cardSettings && cardSettings.sublets && (
+          <Col span={12}>
+            <ProductionSubletsManageComponent
+              subletJobLines={card.subletLines}
+            />
+          </Col>
+        )}
+        {cardSettings && cardSettings.production_note && (
+          <Col span={24}>
+            {cardSettings && cardSettings.production_note && (
+              <ProductionListColumnProductionNote record={card} />
+            )}
+          </Col>
+        )}
+      </Row>
+    </Card>
   );
 }

client/src/components/production-board-kanban/production-board-kanban.card-settings.component.jsx

@@ -0,0 +1,154 @@
+import { useMutation } from "@apollo/client";
+import {
+  Button,
+  Card,
+  Col,
+  Form,
+  notification,
+  Popover,
+  Row,
+  Switch,
+} from "antd";
+import React, { useEffect, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { UPDATE_KANBAN_SETTINGS } from "../../graphql/user.queries";
+
+export default function ProductionBoardKanbanCardSettings({
+  associationSettings,
+}) {
+  const [form] = Form.useForm();
+  const [visible, setVisible] = useState(false);
+  const [loading, setLoading] = useState(false);
+  const [updateKbSettings] = useMutation(UPDATE_KANBAN_SETTINGS);
+
+  useEffect(() => {
+    form.setFieldsValue(
+      associationSettings && associationSettings.kanban_settings
+    );
+  }, [form, associationSettings, visible]);
+
+  const { t } = useTranslation();
+
+  const handleFinish = async (values) => {
+    setLoading(true);
+    const result = await updateKbSettings({
+      variables: {
+        id: associationSettings && associationSettings.id,
+        ks: values,
+      },
+    });
+    if (result.errors) {
+      notification.open({
+        type: "error",
+        message: t("production.errors.settings", {
+          error: JSON.stringify(result.errors),
+        }),
+      });
+    }
+    setVisible(false);
+    setLoading(false);
+  };
+
+  const overlay = (
+    <div>
+      <Card>
+        <Form form={form} onFinish={handleFinish} layout="vertical">
+          <Row gutter={[16, 16]}>
+            <Col span={12}>
+              <Form.Item
+                label={t("production.labels.compact")}
+                name="compact"
+                valuePropName="checked"
+              >
+                <Switch />
+              </Form.Item>
+              <Form.Item
+                valuePropName="checked"
+                label={t("production.labels.ownr_nm")}
+                name="ownr_nm"
+              >
+                <Switch />
+              </Form.Item>
+              <Form.Item
+                valuePropName="checked"
+                label={t("production.labels.clm_no")}
+                name="clm_no"
+              >
+                <Switch />
+              </Form.Item>
+              <Form.Item
+                valuePropName="checked"
+                label={t("production.labels.ins_co_nm")}
+                name="ins_co_nm"
+              >
+                <Switch />
+              </Form.Item>
+              {/* <Form.Item
+                valuePropName="checked"
+                label={t("production.labels.laborhrs")}
+                name="laborhrs"
+              >
+                <Switch />
+              </Form.Item> */}
+              <Form.Item
+                valuePropName="checked"
+                label={t("production.labels.employeeassignments")}
+                name="employeeassignments"
+              >
+                <Switch />
+              </Form.Item>
+            </Col>
+            <Col span={12}>
+              <Form.Item
+                valuePropName="checked"
+                label={t("production.labels.scheduled_completion")}
+                name="scheduled_completion"
+              >
+                <Switch />
+              </Form.Item>
+              <Form.Item
+                valuePropName="checked"
+                label={t("production.labels.ats")}
+                name="ats"
+              >
+                <Switch />
+              </Form.Item>
+              <Form.Item
+                valuePropName="checked"
+                label={t("production.labels.production_note")}
+                name="production_note"
+              >
+                <Switch />
+              </Form.Item>
+              {/* <Form.Item
+              valuePropName='checked' label={t("production.labels.alert")} name="alert">
+                <Switch/>
+              </Form.Item> */}
+              <Form.Item
+                valuePropName="checked"
+                label={t("production.labels.sublets")}
+                name="sublets"
+              >
+                <Switch />
+              </Form.Item>
+            </Col>
+          </Row>
+        </Form>
+        <Button
+          onClick={() => {
+            form.submit();
+          }}
+        >
+          {t("general.actions.save")}
+        </Button>
+      </Card>
+    </div>
+  );
+  return (
+    <Popover content={overlay} visible={visible}>
+      <Button loading={loading} onClick={() => setVisible(true)}>
+        {t("production.labels.cardsettings")}
+      </Button>
+    </Popover>
+  );
+}

client/src/components/production-board-kanban/production-board-kanban.component.jsx

@@ -1,7 +1,8 @@
 import { useApolloClient } from "@apollo/client";
-import Board, { moveCard } from "@lourenci/react-kanban";
-import "@lourenci/react-kanban/dist/styles.css";
-import { notification } from "antd";
+import Board, { moveCard } from "@asseinfo/react-kanban";
+//import "@asseinfo/react-kanban/dist/styles.css";
+import "./production-board-kanban.styles.scss";
+import { Grid, notification, PageHeader, Space, Statistic } from "antd";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -16,6 +17,8 @@ import ProductionBoardFilters from "../production-board-filters/production-board
 import { selectTechnician } from "../../redux/tech/tech.selectors";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
+import ProductionBoardKanbanCardSettings from "./production-board-kanban.card-settings.component";
+import styled from "styled-components";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -32,6 +35,7 @@ export function ProductionBoardKanbanComponent({
   bodyshop,
   technician,
   insertAuditTrail,
+  associationSettings,
 }) {
   const [boardLanes, setBoardLanes] = useState({
     columns: [{ id: "Loading...", title: "Loading...", cards: [] }],
@@ -116,6 +120,7 @@ export function ProductionBoardKanbanComponent({
         newChildCard ? newChildCard.id : null,
         newChildCardNewParent
       ),
+      // TODO: optimisticResponse
     });
     insertAuditTrail({
       jobid: card.id,
@@ -131,21 +136,112 @@ export function ProductionBoardKanbanComponent({
     }
   };
 
+  const totalHrs = data
+    .reduce(
+      (acc, val) =>
+        acc +
+        (val.labhrs?.aggregate?.sum?.mod_lb_hrs || 0) +
+        (val.larhrs?.aggregate?.sum?.mod_lb_hrs || 0),
+      0
+    )
+    .toFixed(1);
+  const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
+    .filter((screen) => !!screen[1])
+    .slice(-1)[0];
+
+  const standardSizes = {
+    xs: "250",
+    sm: "250",
+    md: "250",
+    lg: "250",
+    xl: "250",
+    xxl: "250",
+  };
+  const compactSizes = {
+    xs: "150",
+    sm: "150",
+    md: "150",
+    lg: "150",
+    xl: "155",
+    xxl: "155",
+  };
+
+  const width = selectedBreakpoint
+    ? associationSettings &&
+      associationSettings.kanban_settings &&
+      associationSettings.kanban_settings.compact
+      ? compactSizes[selectedBreakpoint[0]]
+      : standardSizes[selectedBreakpoint[0]]
+    : "250";
+
+  const Container = styled.div`
+    .react-kanban-card-skeleton,
+    .react-kanban-card,
+    .react-kanban-card-adder-form {
+      box-sizing: border-box;
+      max-width: ${width}px;
+      min-width: ${width}px;
+    }
+  `;
+
   return (
-    <div>
+    <Container>
       <IndefiniteLoading loading={isMoving} />
-      <ProductionBoardFilters
-        filter={filter}
-        setFilter={setFilter}
-        loading={isMoving}
+      <PageHeader
+        title={
+          <Space>
+            <Statistic
+              title={t("dashboard.titles.productionhours")}
+              value={totalHrs}
+            />
+            <Statistic
+              title={t("appointments.labels.inproduction")}
+              value={data && data.length}
+            />
+          </Space>
+        }
+        extra={
+          <Space wrap>
+            <ProductionBoardFilters
+              filter={filter}
+              setFilter={setFilter}
+              loading={isMoving}
+            />
+            <ProductionBoardKanbanCardSettings
+              associationSettings={associationSettings}
+            />
+          </Space>
+        }
       />
+
       <Board
         children={boardLanes}
         disableCardDrag={isMoving}
-        renderCard={(card) => ProductionBoardCard(technician, card)}
+        renderCard={(card) =>
+          ProductionBoardCard(
+            technician,
+            card,
+            bodyshop,
+            associationSettings &&
+              associationSettings.kanban_settings &&
+              Object.keys(associationSettings.kanban_settings).length > 0
+              ? associationSettings.kanban_settings
+              : {
+                  ats: true,
+                  clm_no: true,
+                  compact: false,
+                  ownr_nm: true,
+                  sublets: true,
+                  ins_co_nm: true,
+                  production_note: true,
+                  employeeassignments: true,
+                  scheduled_completion: true,
+                }
+          )
+        }
         onCardDragEnd={handleDragEnd}
       />
-    </div>
+    </Container>
   );
 }
 export default connect(

client/src/components/production-board-kanban/production-board-kanban.container.jsx

@@ -1,25 +1,40 @@
-import { useSubscription } from "@apollo/client";
+import { useQuery, useSubscription } from "@apollo/client";
 import React from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { SUBSCRIPTION_JOBS_IN_PRODUCTION } from "../../graphql/jobs.queries";
-import { selectBodyshop } from "../../redux/user/user.selectors";
+import { QUERY_KANBAN_SETTINGS } from "../../graphql/user.queries";
+import {
+  selectBodyshop,
+  selectCurrentUser,
+} from "../../redux/user/user.selectors";
 import ProductionBoardKanbanComponent from "./production-board-kanban.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
+  currentUser: selectCurrentUser,
 });
 
-export function ProductionBoardKanbanContainer({ bodyshop }) {
+export function ProductionBoardKanbanContainer({ bodyshop, currentUser }) {
   const { loading, data } = useSubscription(
     SUBSCRIPTION_JOBS_IN_PRODUCTION,
     {}
   );
 
+  const { loading: associationSettingsLoading, data: associationSettings } =
+    useQuery(QUERY_KANBAN_SETTINGS, {
+      variables: { email: currentUser.email },
+    });
+
   return (
     <ProductionBoardKanbanComponent
-      loading={loading}
+      loading={loading || associationSettingsLoading}
       data={data ? data.jobs : []}
+      associationSettings={
+        associationSettings && associationSettings.associations[0]
+          ? associationSettings.associations[0]
+          : null
+      }
     />
   );
 }